From: vincent@cubedesigners.com Date: Mon, 7 Dec 2015 14:44:37 +0000 (+0000) Subject: #couzy update Wordpress and plugins for Pavillon Madeleine X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=20daaa2f68f80086d1346fb5e39aeb61709ede6f;p=couzy.git #couzy update Wordpress and plugins for Pavillon Madeleine --- diff --git a/pavillonmadeleine.fr/.htaccess b/pavillonmadeleine.fr/.htaccess index 6e449325..89369efc 100644 --- a/pavillonmadeleine.fr/.htaccess +++ b/pavillonmadeleine.fr/.htaccess @@ -1,3 +1,5 @@ +SetEnv PHP_VER 5 + # BEGIN W3TC Browser Cache AddType text/css .css diff --git a/pavillonmadeleine.fr/43d2b08e22dd1f536f19b516da98c751.txt b/pavillonmadeleine.fr/43d2b08e22dd1f536f19b516da98c751.txt new file mode 100644 index 00000000..e69de29b diff --git a/pavillonmadeleine.fr/license.txt b/pavillonmadeleine.fr/license.txt new file mode 100644 index 00000000..c21e12bc --- /dev/null +++ b/pavillonmadeleine.fr/license.txt @@ -0,0 +1,385 @@ +WordPress - Web publishing software + +Copyright 2015 by the contributors + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +This program incorporates work covered by the following copyright and +permission notices: + + b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com - + http://tidakada.com + + Wherever third party code has been used, credit has been given in the code's + comments. + + b2 is released under the GPL + +and + + WordPress - Web publishing software + + Copyright 2003-2010 by the contributors + + WordPress is released under the GPL + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 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. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, 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 or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +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 give any other recipients of the Program a copy of this License +along with the Program. + +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 Program or any portion +of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +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 Program, 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 Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) 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; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, 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 executable. However, as a +special exception, the source code 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. + +If distribution of executable or 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 counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program 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. + + 5. 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program 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 to +this License. + + 7. 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 Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program 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 Program. + +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. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program 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. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 Program +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 Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, 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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), 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 Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. 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 program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; 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. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + +WRITTEN OFFER + +The source code for any program binaries or compressed scripts that are +included with WordPress can be freely obtained at the following URL: + + https://wordpress.org/download/source/ diff --git a/pavillonmadeleine.fr/readme.bddf3a99303ce0131860f6948cb40055.html b/pavillonmadeleine.fr/readme.bddf3a99303ce0131860f6948cb40055.html new file mode 100644 index 00000000..7d27aa7c --- /dev/null +++ b/pavillonmadeleine.fr/readme.bddf3a99303ce0131860f6948cb40055.html @@ -0,0 +1,98 @@ + + + + + + WordPress › ReadMe + + + +

+ +
Version 4.3.1 +

Semantic Personal Publishing Platform

+ +

First Things First

Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.

— Matt Mullenweg

+ +

Installation: Famous 5-minute install

Unzip the package in an empty directory and upload everything.
Open wp-admin/install.php in your browser. It will take you through the process to set up a wp-config.php file with your database connection details. +
1. If for some reason this doesn’t work, don’t worry. It doesn’t work on all web hosts. Open up wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details.
2. Save the file as wp-config.php and upload it.
3. Open wp-admin/install.php in your browser.
+
Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
If you did not enter a password, note the password given to you. If you did not provide a username, it will be admin.
The installer should then send you to the login page. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on “Profile” to change the password.

+ +

Updating

Using the Automatic Updater

If you are updating from version 2.7 or higher, you can use the automatic updater:

Open wp-admin/update-core.php in your browser and follow the instructions.
You wanted more, perhaps? That’s it!

+ +

Updating Manually

Before you update anything, make sure you have backup copies of any files you may have modified such as index.php.
Delete your old WordPress files, saving ones you’ve modified.
Upload the new files.
Point your browser to /wp-admin/upgrade.php.

+ +

Migrating from other systems

WordPress can import from a number of systems. First you need to get WordPress installed and working as described above, before using our import tools.

+ +

System Requirements

PHP version 5.2.4 or higher.
MySQL version 5.0 or higher.

+ +

Recommendations

PHP version 5.4 or higher.
MySQL version 5.5 or higher.
The mod_rewrite Apache module.
A link to wordpress.org on your site.

+ +

Online Resources

If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:

The WordPress Codex: The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
The WordPress Blog: This is where you’ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.
WordPress Planet: The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.
WordPress Support Forums: If you’ve looked everywhere and still can’t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
WordPress IRC Channel: There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpress)

+ +

Final Notes

If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the Support Forums.
WordPress has a robust plugin API that makes extending the code easy. If you are a developer interested in utilizing this, see the plugin documentation in the Codex. You shouldn’t modify any of the core code.

+ +

Share the Love

WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.

+ +

WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

+ +

License

WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.

+ + + diff --git a/pavillonmadeleine.fr/wp-admin/about.php b/pavillonmadeleine.fr/wp-admin/about.php index 8105de98..57943fcc 100644 --- a/pavillonmadeleine.fr/wp-admin/about.php +++ b/pavillonmadeleine.fr/wp-admin/about.php @@ -21,25 +21,107 @@ $title = __( 'About' ); list( $display_version ) = explode( '-', $wp_version ); include( ABSPATH . 'wp-admin/admin-header.php' ); +<<<<<<< .mine +||||||| .r11156 ?> +

- -

- +======= +?> +

+>>>>>>> .r12027 + +$video_url = 'https://videopress.com/embed/T54Iy7Tw'; +$locale = str_replace( '_', '-', get_locale() ); +if ( 'en-AU' !== $locale ) { + list( $locale ) = explode( '-', $locale ); +} +if ( 'en' !== $locale ) { + $video_url = add_query_arg( 'defaultLangCode', $locale, $video_url ); +} + +<<<<<<< .mine +$major_features = array( + array( + 'src' => array( + 'mp4' => '//s.w.org/images/core/4.3/formatting.mp4', + 'ogv' => '//s.w.org/images/core/4.3/formatting.ogv', + 'webm' => '//s.w.org/images/core/4.3/formatting.webm', + ), + 'heading' => __( 'Formatting Shortcuts' ), + /* Translators: 1: asterisks; 2: number sign; */ + 'description' => sprintf( __( 'Your writing flow just got faster with new formatting shortcuts in WordPress 4.3. Use asterisks to create lists and number signs to make a heading. No more breaking your flow; your text looks great with a %1$s and a %2$s.' ), '*', '#' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/menu-customizer.png', + 'heading' => __( 'Menus in the Customizer' ), + 'description' => __( 'Create your menu, update it, and assign it, all while live-previewing in the customizer. The streamlined customizer design provides a mobile-friendly and accessible interface. With every release, it becomes easier and faster to make your site just the way you want it.' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/better-passwords.png', + 'heading' => __( 'Better Passwords' ), + 'description' => __( 'Keep your site more secure with WordPress’ improved approach to passwords. Instead of receiving passwords via email, you’ll get a password reset link. When you add new users to your site or edit a user profile, WordPress will automatically generate a secure password.' ), + ), + array( + 'src' => '//s.w.org/images/core/4.3/site-icon-customizer.png', + 'heading' => __( 'Site Icons' ), + 'description' => __( 'Site icons represent your site in browser tabs, bookmark menus, and on the home screen of mobile devices. Add your unique site icon in the customizer; it will even stay in place when you switch themes. Make your whole site reflect your brand.' ), + ), +); +shuffle( $major_features ); +||||||| .r11156 +

+=======

- -

- - - - - - - -

- +>>>>>>> .r12027 + +$minor_features = array( + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MDAgNDAwIj48cGF0aCBmaWxsPSIjMDBhMGQyIiBkPSJNNTAgMjE1aDI0MHYzMEg1MHpNNTAgMjc1aDI0MHYzMEg1MHpNNTAgMTU1aDI0MHYzMEg1MHpNNTAgOTVoMjQwdjMwSDUwek0zMTAuMSA5NWwxOS45IDMwIDIwLjEtMzAiLz48L3N2Zz4=', + 'heading' => __( 'A smoother admin experience' ), + 'description' => __( 'Refinements to the list view across the admin make your WordPress more accessible and easier to work with on any device.' ), + ), + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTUgMmgxMHEuODIgMCAxLjQxLjU5VDE3IDR2OHEwIC44Mi0uNTkgMS40MVQxNSAxNGgtMmwtNSA1di01SDVxLS44MiAwLTEuNDEtLjU5VDMgMTJWNHEwLS44Mi41OS0xLjQxVDUgMnptOC41IDguNUwxMSA4bDIuNS0yLjUtMS0xTDEwIDcgNy41IDQuNWwtMSAxTDkgOGwtMi41IDIuNSAxIDFMMTAgOWwyLjUgMi41eiIvPjwvc3ZnPg==', + 'heading' => __( 'Comments turned off on pages' ), + 'description' => __( 'All new pages that you create will have comments turned off. Keep discussions to your blog, right where they’re supposed to happen.' ), + ), + array( + 'src' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMiAzMiI+PHBhdGggZmlsbD0iIzAwYTBkMiIgZD0iTTI5LjMyOCA1LjcxMnEuMDQ4LS4xNDQuMDk2LS4zODR0LS4wNjQtLjgxNi0uNTI4LS45NzZxLS4zODQtLjM2OC0uODcyLS40NjR0LS43OTIgMGwtLjI4OC4wOHEtMS40NTYuNzItNS44OCAzLjczNnQtNi4zOTIgNS4xNzZxLS43MzYuODMyLTEuNDA4IDIuMzJ0LS44OCAzIC41NDQgMi4zOTJxLjgzMi43MzYgMi4zNDQuNTc2dDMuMDcyLS44MjQgMi4yNDgtMS4zNTJxMi4xNDQtMi4xNDQgNS4xNjgtNi42NTZ0My42MzItNS44MDh6TTIuMjQgMjguMjRxMS4wNTYtLjY4OCAxLjcxMi0xLjUyOHQuOTUyLTEuNjE2LjU0NC0xLjUyLjcyLTEuNDggMS4yNC0xLjI4cTEuMDg4LS44IDIuNTA0LS43MDR0Mi40MjQgMS4xNjhxLjgxNi44OC44MjQgMi42NHQtMS4wOCAyLjg5NnEtMS4yMTYgMS4xMi0yLjkwNCAxLjYyNHQtMy40MjQuNDI0LTMuNTEyLS42MjR6Ii8+PC9zdmc+', + 'heading' => __( 'Customize your site quickly' ), + 'description' => __( 'Wherever you are on the front-end, you can click the customize link in the toolbar to swiftly make changes to your site.' ), + ), +); + +$tech_features = array( + array( + 'heading' => __( 'Taxonomy Roadmap' ), + 'description' => __( 'Terms shared across multiple taxonomies are now split into separate terms.' ), + ), + array( + 'heading' => __( 'Template Hierarchy' ), + /* Translators: 1: singular.php; 2: single.php; 3:page.php */ + 'description' => sprintf( __( 'Added %1$s as a fallback for %2$s and %3$s' ), 'singular.php', 'single.php', 'page.php' ), + ), + array( + 'heading' => 'WP_List_Table', + 'description' => __( 'List tables can and should designate a primary column.' ), + ), +); + +<<<<<<< .mine +?> +

+||||||| .r11156 +

Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', 23 ), '4.0.1', number_format_i18n( 23 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_4.0.1' ); ?> +

+=======

Version %1$s addressed some security issues and fixed %2$s bug.', @@ -59,13 +141,61 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); the release notes.' ), 'http://codex.wordpress.org/Version_4.2.1' ); ?>

- +>>>>>>> .r12027 + +<<<<<<< .mine +

+||||||| .r11156 +

+ +

+ +

+=======

- +>>>>>>> .r12027 + +<<<<<<< .mine +

+ + + +

+||||||| .r11156 +

+=======

+>>>>>>> .r12027 + +<<<<<<< .mine +

Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', 26 ), '4.3.1', number_format_i18n( 26 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_4.3.1' ); ?> +

+ + +

+||||||| .r11156 +

+=======

@@ -75,17 +205,111 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

+>>>>>>> .r12027 + +<<<<<<< .mine +

+ +

+ $feature['src']['mp4'], + 'ogv' => $feature['src']['ogv'], + 'webm' => $feature['src']['webm'], + 'loop' => true, + 'autoplay' => true, + 'width' => 500, + 'height' => 284 + ) ); + + // Image. + else: + ?> +

+ +

+||||||| .r11156 +

+ '//s.w.org/images/core/4.0/embed.mp4', + 'ogv' => '//s.w.org/images/core/4.0/embed.ogv', + 'webm' => '//s.w.org/images/core/4.0/embed.webm', + 'loop' => true, + 'autoplay' => true, + 'width' => 500, + 'height' => 352 + ) ); + ?> +

Check out all of the embeds that WordPress supports.' ); ?>

+=======

+>>>>>>> .r12027

+<<<<<<< .mine +

+ +

+||||||| .r11156 +

+ +

+ '//s.w.org/images/core/4.0/focus.mp4', + 'ogv' => '//s.w.org/images/core/4.0/focus.ogv', + 'webm' => '//s.w.org/images/core/4.0/focus.webm', + 'loop' => true, + 'autoplay' => true, + 'width' => 500, + 'height' => 281 + ) ); + ?> +

+=======

+>>>>>>> .r12027

@@ -96,6 +320,33 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

+<<<<<<< .mine +

+ +

+||||||| .r11156 +

+ +

+=======

@@ -113,7 +364,42 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

Update Now and watch the magic happen.' ); ?>

+>>>>>>> .r12027 + +<<<<<<< .mine +

+ + + + | + + +

+ +

+||||||| .r11156 +

+ +

ORDER BY', 'WP_Query' ); + ?>

+=======

@@ -141,6 +427,26 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); printf( __( '%1$s, %2$s, and %3$s now support complex ordering with named meta query clauses.' ), 'WP_Query', 'WP_Comment_Query', 'WP_User_Query' ); ?>

+>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + +

+ +

+ + | + + +

+ +

+=======

@@ -156,6 +462,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

+>>>>>>> .r12027 >>>>>> .r12027 ); +// Deprecated +$core_actions_post[] = 'wp-fullscreen-save-post'; + // Register core Ajax calls. if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 ); diff --git a/pavillonmadeleine.fr/wp-admin/admin-footer.php b/pavillonmadeleine.fr/wp-admin/admin-footer.php index ce8b4153..a99eabac 100644 --- a/pavillonmadeleine.fr/wp-admin/admin-footer.php +++ b/pavillonmadeleine.fr/wp-admin/admin-footer.php @@ -81,6 +81,7 @@ do_action( 'admin_print_footer_scripts' ); * * @since 2.8.0 * + * @global string $hook_suffix * @param string $hook_suffix The current admin page. */ do_action( "admin_footer-" . $GLOBALS['hook_suffix'] ); diff --git a/pavillonmadeleine.fr/wp-admin/admin-header.php b/pavillonmadeleine.fr/wp-admin/admin-header.php index 8b6b6a02..e471ff93 100644 --- a/pavillonmadeleine.fr/wp-admin/admin-header.php +++ b/pavillonmadeleine.fr/wp-admin/admin-header.php @@ -10,7 +10,19 @@ if ( ! defined( 'WP_ADMIN' ) ) require_once( dirname( __FILE__ ) . '/admin.php' ); -// In case admin-header.php is included in a function. +/** + * In case admin-header.php is included in a function. + * + * @global string $title + * @global string $hook_suffix + * @global WP_Screen $current_screen + * @global WP_Locale $wp_locale + * @global string $pagenow + * @global string $wp_version + * @global string $update_title + * @global int $total_update_count + * @global string $parent_file + */ global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, $update_title, $total_update_count, $parent_file; @@ -24,7 +36,7 @@ $title = esc_html( strip_tags( $title ) ); if ( is_network_admin() ) $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) ); elseif ( is_user_admin() ) - $admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); + $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); else $admin_title = get_bloginfo( 'name' ); diff --git a/pavillonmadeleine.fr/wp-admin/admin.php b/pavillonmadeleine.fr/wp-admin/admin.php index 22813cc7..fa84aed4 100644 --- a/pavillonmadeleine.fr/wp-admin/admin.php +++ b/pavillonmadeleine.fr/wp-admin/admin.php @@ -94,6 +94,28 @@ $time_format = get_option('time_format'); wp_enqueue_script( 'common' ); +<<<<<<< .mine + + + +/** + * $pagenow is set in vars.php + * $wp_importers is sometimes set in wp-admin/includes/import.php + * The remaining variables are imported as globals elsewhere, declared as globals here + * + * @global string $pagenow + * @global array $wp_importers + * @global string $hook_suffix + * @global string $plugin_page + * @global string $typenow + * @global string $taxnow + */ +global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow; + +$page_hook = null; + +||||||| .r11156 +======= // $pagenow is set in vars.php // $wp_importers is sometimes set in wp-admin/includes/import.php // @@ -103,6 +125,7 @@ global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow; $page_hook = null; +>>>>>>> .r12027 $editing = false; if ( isset($_GET['page']) ) { diff --git a/pavillonmadeleine.fr/wp-admin/comment.php b/pavillonmadeleine.fr/wp-admin/comment.php index c2487335..3ac2aed1 100644 --- a/pavillonmadeleine.fr/wp-admin/comment.php +++ b/pavillonmadeleine.fr/wp-admin/comment.php @@ -12,7 +12,15 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; +<<<<<<< .mine +/** + * @global string $action + */ +global $action; +||||||| .r11156 +======= global $action; +>>>>>>> .r12027 wp_reset_vars( array('action') ); if ( isset( $_POST['deletecomment'] ) ) @@ -66,7 +74,7 @@ case 'editcomment' : $comment_id = absint( $_GET['c'] ); if ( !$comment = get_comment( $comment_id ) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); + comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); if ( !current_user_can( 'edit_comment', $comment_id ) ) comment_footer_die( __('You are not allowed to edit this comment.') ); @@ -114,13 +122,25 @@ case 'spam' : ?>

+<<<<<<< .mine +

+||||||| .r11156 +

+ +======= +>>>>>>> .r12027 >>>>>> .r12027 break; case 'trash' : $caution_msg = __('You are about to move the following comment to the Trash:'); @@ -174,6 +194,45 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved +<<<<<<< .mine + + + comment_post_ID; + if ( current_user_can( 'edit_post', $post_id ) ) { + $post_link = ""; + $post_link .= esc_html( get_the_title( $post_id ) ) . ''; + } else { + $post_link = esc_html( get_the_title( $post_id ) ); + } + echo $post_link; + + if ( $comment->comment_parent ) { + $parent = get_comment( $comment->comment_parent ); + $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); + $name = get_comment_author( $parent->comment_ID ); + printf( ' | ' . __( 'In reply to %2$s.' ), $parent_link, $name ); + } + ?> + + + + + + %2$s at %3$s' ), + esc_url( get_comment_link( $comment->comment_ID ) ), + /* translators: comment date format. See http://php.net/date */ + get_comment_date( __( 'Y/m/d' ) ), + get_comment_date( get_option( 'time_format' ) ) + ); + ?> + + + +||||||| .r11156 +======= comment_approved != '0' ) { // if not unapproved +>>>>>>> .r12027 comment_content; ?> @@ -249,7 +309,7 @@ case 'unapprovecomment' : $noredir = isset($_REQUEST['noredir']); if ( !$comment = get_comment($comment_id) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'edit-comments.php') ); + comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', 'edit-comments.php') ); if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) comment_footer_die( __('You are not allowed to edit comments on this post.') ); diff --git a/pavillonmadeleine.fr/wp-admin/credits.php b/pavillonmadeleine.fr/wp-admin/credits.php index 4e160f4e..1eea109c 100644 --- a/pavillonmadeleine.fr/wp-admin/credits.php +++ b/pavillonmadeleine.fr/wp-admin/credits.php @@ -18,7 +18,7 @@ $title = __( 'Credits' ); * * @since 3.2.0 * - * @return array|bool A list of all of the contributors, or false on error. + * @return array|false A list of all of the contributors, or false on error. */ function wp_credits() { global $wp_version; @@ -55,7 +55,6 @@ function wp_credits() { * @param string &$display_name The contributor's display name, passed by reference. * @param string $username The contributor's username. * @param string $profiles URL to the contributor's WordPress.org profile page. - * @return string A contributor's display name, hyperlinked to a WordPress.org profile page. */ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) { $display_name = '' . esc_html( $display_name ) . ''; @@ -68,10 +67,9 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) { * @since 3.2.0 * * @param string &$data External library data, passed by reference. - * @return string Link to the external library. */ function _wp_credits_build_object_link( &$data ) { - $data = '' . $data[0] . ''; + $data = '' . esc_html( $data[0] ) . ''; } list( $display_version ) = explode( '-', $wp_version ); @@ -82,7 +80,13 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

+<<<<<<< .mine +

+||||||| .r11156 +

+=======

+>>>>>>> .r12027

@@ -111,8 +115,6 @@ if ( ! $credits ) { echo '

' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "

\n"; -$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/'; - foreach ( $credits['groups'] as $group_slug => $group_data ) { if ( $group_data['name'] ) { if ( 'Translators' == $group_data['name'] ) { @@ -124,7 +126,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { $title = translate( $group_data['name'] ); } - echo '

' . $title . "

\n"; + echo '

' . esc_html( $title ) . "

\n"; } if ( ! empty( $group_data['shuffle'] ) ) @@ -144,11 +146,28 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' ); echo '

' . "\n\t"; + echo ''; + $size = 'compact' == $group_data['type'] ? 30 : 60; + $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); + $size *= 2; + $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); + echo '' . "\n\t"; + echo '' . esc_html( $person_data[0] ) . "\n\t"; +||||||| .r11156 + echo '
' . "\n\t"; + echo ''; + $size = 'compact' == $group_data['type'] ? '30' : '60'; + echo '' . "\n\t"; + echo '' . $person_data[0] . "\n\t"; +======= echo '
' . "\n\t"; echo ''; $size = 'compact' == $group_data['type'] ? '30' : '60'; echo '' . "\n\t"; echo '' . $person_data[0] . "\n\t"; +>>>>>>> .r12027 if ( ! $compact ) echo '' . translate( $person_data[3] ) . "\n"; echo "

@@ -260,6 +259,7 @@ class Custom_Background { + + @@ -357,7 +358,6 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * @since 3.0.0 */ public function handle_upload() { - if ( empty($_FILES) ) return; @@ -433,7 +433,15 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) /** * * @since 3.4.0 +<<<<<<< .mine * @deprecated 3.5.0 + * + * @param array $form_fields + * @return array $form_fields +||||||| .r11156 +======= + * @deprecated 3.5.0 +>>>>>>> .r12027 */ public function attachment_fields_to_edit( $form_fields ) { return $form_fields; @@ -442,7 +450,15 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) /** * * @since 3.4.0 +<<<<<<< .mine + * @deprecated 3.5.0 + * + * @param array $tabs + * @return array $tabs +||||||| .r11156 +======= * @deprecated 3.5.0 +>>>>>>> .r12027 */ public function filter_upload_tabs( $tabs ) { return $tabs; diff --git a/pavillonmadeleine.fr/wp-admin/custom-header.php b/pavillonmadeleine.fr/wp-admin/custom-header.php index a56c7602..e61feb78 100644 --- a/pavillonmadeleine.fr/wp-admin/custom-header.php +++ b/pavillonmadeleine.fr/wp-admin/custom-header.php @@ -228,6 +228,8 @@ class Custom_Image_Header { * Process the default headers * * @since 3.0.0 + * + * @global array $_wp_default_headers */ public function process_default_headers() { global $_wp_default_headers; @@ -267,7 +269,7 @@ class Custom_Image_Header { if ( 1 < count( $headers ) ) { echo '

'; echo ''; - echo __( 'Random: Show a different image on each page.' ); + _e( 'Random: Show a different image on each page.' ); echo ''; echo '

'; } @@ -277,12 +279,13 @@ class Custom_Image_Header { $header_thumbnail = $header['thumbnail_url']; $header_url = $header['url']; $header_desc = empty( $header['description'] ) ? '' : $header['description']; + $header_alt_text = empty( $header['alt_text'] ) ? $header_desc : $header['alt_text']; echo '

'; echo ''; $width = ''; if ( !empty( $header['attachment_id'] ) ) $width = ' width="230"'; - echo ' ' . esc_attr( $header_desc ) .'

'; + echo ' ' . esc_attr( $header_alt_text ) .'

'; echo '

'; } echo '

'; @@ -315,7 +318,6 @@ class Custom_Image_Header { } } ?> - + + + + ID is needed for the embed shortcode so we can show oEmbed previews in the editor. + * Maybe find a way without it. + */ + $post = get_default_post_to_edit( 'post', true ); + $post_ID = (int) $post->ID; + + wp_enqueue_media( array( 'post' => $post_ID ) ); + wp_enqueue_style( 'press-this' ); + wp_enqueue_script( 'press-this' ); + wp_enqueue_script( 'json2' ); + wp_enqueue_script( 'editor' ); + + $supports_formats = false; + $post_format = 0; + + if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) { + $supports_formats = true; + + if ( ! ( $post_format = get_post_format( $post_ID ) ) ) { + $post_format = 0; + } + } + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_enqueue_scripts', 'press-this.php' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_print_styles-press-this.php' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_print_styles' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_print_scripts-press-this.php' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_print_scripts' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_head-press-this.php' ); + + /** This action is documented in wp-admin/admin-header.php */ + do_action( 'admin_head' ); + ?> + + + +

+ + + + +

+ +

+ + + + + + + + +

+ version > $data['v'] ) { + ?> +

+ your bookmarklet to the latest version!' ), admin_url( 'tools.php' ) ); ?> +

+ +

+ + true, + 'editor_height' => 600, + 'media_buttons' => false, + 'textarea_name' => 'post_content', + 'teeny' => true, + 'tinymce' => array( + 'resize' => false, + 'wordpress_adv_hidden' => false, + 'add_unload_trigger' => false, + 'statusbar' => false, + 'autoresize_min_height' => 600, + 'wp_autoresize_on' => true, + 'plugins' => 'lists,media,paste,tabfocus,fullscreen,wordpress,wpautoresize,wpeditimage,wpgallery,wplink,wptextpattern,wpview', + 'toolbar1' => 'bold,italic,bullist,numlist,blockquote,link,unlink', + 'toolbar2' => 'undo,redo', + ), + 'quicktags' => array( + 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more', + ), + ) ); + + ?> +

+ +

+ + + + + + + + +

+ +

+ + + + +>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-site-icon.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-site-icon.php new file mode 100644 index 00000000..c7184593 --- /dev/null +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-site-icon.php @@ -0,0 +1,237 @@ +guid; + $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url ); + + $size = @getimagesize( $cropped ); + $image_type = ( $size ) ? $size['mime'] : 'image/jpeg'; + + $object = array( + 'ID' => $parent_attachment_id, + 'post_title' => basename( $cropped ), + 'post_content' => $url, + 'post_mime_type' => $image_type, + 'guid' => $url, + 'context' => 'site-icon' + ); + + return $object; + } + + /** + * Inserts an attachment. + * + * @since 4.3.0 + * @access public + * + * @param array $object Attachment object. + * @param string $file File path of the attached image. + * @return int Attachment ID + */ + public function insert_attachment( $object, $file ) { + $attachment_id = wp_insert_attachment( $object, $file ); + $metadata = wp_generate_attachment_metadata( $attachment_id, $file ); + + /** + * Filter the site icon attachment metadata. + * + * @since 4.3.0 + * + * @see wp_generate_attachment_metadata() + * + * @param array $metadata Attachment metadata. + */ + $metadata = apply_filters( 'site_icon_attachment_metadata', $metadata ); + wp_update_attachment_metadata( $attachment_id, $metadata ); + + return $attachment_id; + } + + /** + * Adds additional sizes to be made when creating the site_icon images. + * + * @since 4.3.0 + * @access public + * + * @param array $sizes List of additional sizes. + * @return array Additional image sizes. + */ + public function additional_sizes( $sizes = array() ) { + $only_crop_sizes = array(); + + /** + * Filter the different dimensions that a site icon is saved in. + * + * @since 4.3.0 + * + * @param array $site_icon_sizes Sizes available for the Site Icon. + */ + $this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes ); + + // Use a natural sort of numbers. + natsort( $this->site_icon_sizes ); + $this->site_icon_sizes = array_reverse( $this->site_icon_sizes ); + + // ensure that we only resize the image into + foreach ( $sizes as $name => $size_array ) { + if ( isset( $size_array['crop'] ) ) { + $only_crop_sizes[ $name ] = $size_array; + } + } + + foreach ( $this->site_icon_sizes as $size ) { + if ( $size < $this->min_size ) { + $only_crop_sizes[ 'site_icon-' . $size ] = array( + 'width ' => $size, + 'height' => $size, + 'crop' => true, + ); + } + } + + return $only_crop_sizes; + } + + /** + * Adds Site Icon sizes to the array of image sizes on demand. + * + * @since 4.3.0 + * @access public + * + * @param array $sizes List of image sizes. + * @return array List of intermediate image sizes. + */ + public function intermediate_image_sizes( $sizes = array() ) { + /** This filter is documented in wp-admin/includes/class-wp-site-icon.php */ + $this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes ); + foreach ( $this->site_icon_sizes as $size ) { + $sizes[] = 'site_icon-' . $size; + } + + return $sizes; + } + + /** + * Deletes the Site Icon when the image file is deleted. + * + * @since 4.3.0 + * @access public + * + * @param int $post_id Attachment ID. + */ + public function delete_attachment_data( $post_id ) { + $site_icon_id = get_option( 'site_icon' ); + + if ( $site_icon_id && $post_id == $site_icon_id ) { + delete_option( 'site_icon' ); + } + } + + /** + * Adds custom image sizes when meta data for an image is requested, that happens to be used as Site Icon. + * + * @since 4.3.0 + * @access public + * + * @param null|array|string $value The value get_metadata() should return a single metadata value, or an + * array of values. + * @param int $post_id Post ID. + * @param string $meta_key Meta key. + * @param string|array $single Meta value, or an array of values. + * @return array|null|string The attachment metadata value, array of values, or null. + */ + public function get_post_metadata( $value, $post_id, $meta_key, $single ) { + $site_icon_id = get_option( 'site_icon' ); + + if ( $post_id == $site_icon_id && '_wp_attachment_backup_sizes' == $meta_key && $single ) { + add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) ); + } + + return $value; + } +} + +/** + * @global WP_Site_Icon $wp_site_icon + */ +$GLOBALS['wp_site_icon'] = new WP_Site_Icon; diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-terms-list-table.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-terms-list-table.php index 5eda1869..83f373e4 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-terms-list-table.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-terms-list-table.php @@ -21,6 +21,11 @@ class WP_Terms_List_Table extends WP_List_Table { * * @see WP_List_Table::__construct() for more information on default arguments. * + * @global string $post_type + * @global string $taxonomy + * @global string $action + * @global object $tax + * * @param array $args An associative array of arguments. */ public function __construct( $args = array() ) { @@ -50,10 +55,17 @@ class WP_Terms_List_Table extends WP_List_Table { } + /** + * + * @return bool + */ public function ajax_user_can() { return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms ); } + /** + * @access public + */ public function prepare_items() { $tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' ); @@ -109,15 +121,34 @@ class WP_Terms_List_Table extends WP_List_Table { ) ); } + /** + * + * @return bool + */ public function has_items() { // todo: populate $this->items in prepare_items() return true; } +<<<<<<< .mine + /** + * @access public + */ public function no_items() { echo get_taxonomy( $this->screen->taxonomy )->labels->not_found; } + /** + * + * @return array + */ +||||||| .r11156 +======= + public function no_items() { + echo get_taxonomy( $this->screen->taxonomy )->labels->not_found; + } + +>>>>>>> .r12027 protected function get_bulk_actions() { $actions = array(); $actions['delete'] = __( 'Delete' ); @@ -125,6 +156,10 @@ class WP_Terms_List_Table extends WP_List_Table { return $actions; } + /** + * + * @return string + */ public function current_action() { if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) ) return 'bulk-delete'; @@ -132,6 +167,10 @@ class WP_Terms_List_Table extends WP_List_Table { return parent::current_action(); } + /** + * + * @return array + */ public function get_columns() { $columns = array( 'cb' => '', @@ -149,6 +188,10 @@ class WP_Terms_List_Table extends WP_List_Table { return $columns; } + /** + * + * @return array + */ protected function get_sortable_columns() { return array( 'name' => 'name', @@ -159,6 +202,9 @@ class WP_Terms_List_Table extends WP_List_Table { ); } + /** + * @access public + */ public function display_rows_or_placeholder() { $taxonomy = $this->screen->taxonomy; @@ -185,7 +231,7 @@ class WP_Terms_List_Table extends WP_List_Table { } $terms = get_terms( $taxonomy, $args ); - if ( empty( $terms ) ) { + if ( empty( $terms ) || ! is_array( $terms ) ) { echo ''; $this->no_items(); echo ''; @@ -201,13 +247,25 @@ class WP_Terms_List_Table extends WP_List_Table { // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count ); } else { - $terms = get_terms( $taxonomy, $args ); foreach ( $terms as $term ) { $this->single_row( $term ); } } } +<<<<<<< .mine + /** + * @param string $taxonomy + * @param array $terms + * @param array $children + * @param int $start + * @param int $per_page + * @param int $count + * @param int $parent + * @param int $level + */ +||||||| .r11156 +======= /** * @param string $taxonomy * @param array $terms @@ -218,6 +276,7 @@ class WP_Terms_List_Table extends WP_List_Table { * @param int $parent * @param int $level */ +>>>>>>> .r12027 private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) { $end = $start + $per_page; @@ -302,9 +361,6 @@ class WP_Terms_List_Table extends WP_List_Table { */ public function column_name( $tag ) { $taxonomy = $this->screen->taxonomy; - $tax = get_taxonomy( $taxonomy ); - - $default_term = get_option( 'default_' . $taxonomy ); $pad = str_repeat( '— ', max( 0, $this->level ) ); @@ -328,6 +384,50 @@ class WP_Terms_List_Table extends WP_List_Table { $out = '' . $name . '
'; + $out .= ''; + + return $out; + } + + /** + * Gets the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'name'. + */ + protected function get_default_primary_column_name() { + return 'name'; + } + + /** + * Generates and displays row action links. + * + * @since 4.3.0 + * @access protected + * + * @param object $tag Tag being acted upon. + * @param string $column_name Current column name. + * @param string $primary Primary column name. + * @return string Row actions output for terms. + */ + protected function handle_row_actions( $tag, $column_name, $primary ) { + if ( $primary !== $column_name ) { + return ''; + } + + $taxonomy = $this->screen->taxonomy; + $tax = get_taxonomy( $taxonomy ); + $default_term = get_option( 'default_' . $taxonomy ); + + $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) ); + $actions = array(); if ( current_user_can( $tax->cap->edit_terms ) ) { $actions['edit'] = '' . __( 'Edit' ) . ''; @@ -363,15 +463,7 @@ class WP_Terms_List_Table extends WP_List_Table { */ $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag ); - $out .= $this->row_actions( $actions ); - $out .= ''; - - return $out; + return $this->row_actions( $actions ); } /** diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-theme-install-list-table.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-theme-install-list-table.php index e90f144d..427c5391 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-theme-install-list-table.php @@ -11,10 +11,22 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { public $features = array(); + /** + * + * @return bool + */ public function ajax_user_can() { return current_user_can( 'install_themes' ); } + /** + * + * @global array $tabs + * @global string $tab + * @global int $paged + * @global string $type + * @global array $theme_field_defaults + */ public function prepare_items() { include( ABSPATH . 'wp-admin/includes/theme-install.php' ); @@ -133,10 +145,19 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { ) ); } + /** + * @access public + */ public function no_items() { _e( 'No themes match your request.' ); } + /** + * + * @global array $tabs + * @global string $tab + * @return array + */ protected function get_views() { global $tabs, $tab; @@ -150,6 +171,9 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { return $display_tabs; } + /** + * @access public + */ public function display() { wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); ?> @@ -176,6 +200,9 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { $this->tablenav( 'bottom' ); } + /** + * @access public + */ public function display_rows() { $themes = $this->items; foreach ( $themes as $theme ) { @@ -191,6 +218,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { /** * Prints a theme from the WordPress.org API. * + * @global array $themes_allowedtags + * * @param object $theme An object that contains theme data returned by the WordPress.org API. * * Example theme data: @@ -299,10 +328,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {

@@ -332,6 +361,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { /** * Prints the info for a theme (to be used in the theme installer modal). * + * @global array $themes_allowedtags + * * @param object $theme - A WordPress.org Theme API object. */ public function install_theme_info( $theme ) { @@ -396,8 +427,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { * @since 3.4.0 * @access public * - * @uses $tab Global; current tab within Themes->Install screen - * @uses $type Global; type of search. + * @global string $tab Current tab within Themes->Install screen + * @global string $type Type of search. + * + * @param array $extra_args Unused. */ public function _js_vars( $extra_args = array() ) { global $tab, $type; diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-themes-list-table.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-themes-list-table.php index 84acfed2..be172f05 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-themes-list-table.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-themes-list-table.php @@ -29,11 +29,18 @@ class WP_Themes_List_Table extends WP_List_Table { ) ); } + /** + * + * @return bool + */ public function ajax_user_can() { // Do not check edit_theme_options here. AJAX calls for available themes require switch_themes. return current_user_can( 'switch_themes' ); } + /** + * @access public + */ public function prepare_items() { $themes = wp_get_themes( array( 'allowed' => true ) ); @@ -67,6 +74,9 @@ class WP_Themes_List_Table extends WP_List_Table { ) ); } + /** + * @access public + */ public function no_items() { if ( $this->search_terms || $this->features ) { _e( 'No items found.' ); @@ -95,10 +105,17 @@ class WP_Themes_List_Table extends WP_List_Table { printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) ); } +<<<<<<< .mine + /** + * @param string $which + */ +||||||| .r11156 +======= /** * @param string $which * @return null */ +>>>>>>> .r12027 public function tablenav( $which = 'top' ) { if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) return; @@ -111,6 +128,9 @@ class WP_Themes_List_Table extends WP_List_Table { @@ -124,10 +144,17 @@ class WP_Themes_List_Table extends WP_List_Table { has_items() ) { $this->display_rows(); @@ -138,6 +165,9 @@ class WP_Themes_List_Table extends WP_List_Table { } } + /** + * @access public + */ public function display_rows() { $themes = $this->items; @@ -152,17 +182,10 @@ class WP_Themes_List_Table extends WP_List_Table { $activate_link = wp_nonce_url( "themes.php?action=activate&template=" . urlencode( $template ) . "&stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet ); - $preview_link = esc_url( add_query_arg( - array( 'preview' => 1, 'template' => urlencode( $template ), 'stylesheet' => urlencode( $stylesheet ), 'preview_iframe' => true, 'TB_iframe' => 'true' ), - home_url( '/' ) ) ); - $actions = array(); $actions['activate'] = '' . __( 'Activate' ) . ''; - $actions['preview'] = '' . __( 'Preview' ) . ''; - if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { $actions['preview'] .= '' . __( 'Live Preview' ) . ''; @@ -183,11 +206,11 @@ class WP_Themes_List_Table extends WP_List_Table { ?> - + get_screenshot() ) : ?>

- + get_screenshot() ) : ?>

diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader-skins.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader-skins.php index 942542e0..17e1095c 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader-skins.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader-skins.php @@ -22,6 +22,10 @@ class WP_Upgrader_Skin { public $result = false; public $options = array(); + /** + * + * @param array $args + */ public function __construct($args = array()) { $defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false ); $this->options = wp_parse_args($args, $defaults); @@ -36,14 +40,34 @@ class WP_Upgrader_Skin { $this->add_strings(); } + /** + * @access public + */ public function add_strings() { } + /** + * + * @param string|false|WP_Error $result + */ public function set_result($result) { $this->result = $result; } +<<<<<<< .mine + /** + * + * @param bool $error + * @param string $context + * @param bool $allow_relaxed_file_ownership + * @return type + */ + public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) { +||||||| .r11156 + public function request_filesystem_credentials($error = false) { +======= public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) { +>>>>>>> .r12027 $url = $this->options['url']; if ( ! $context ) { $context = $this->options['context']; @@ -57,14 +81,21 @@ class WP_Upgrader_Skin { return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership ); } + /** + * @access public + */ public function header() { if ( $this->done_header ) { return; } $this->done_header = true; echo '

'; - echo '

' . $this->options['title'] . '

'; + echo '

' . $this->options['title'] . '

'; } + + /** + * @access public + */ public function footer() { if ( $this->done_footer ) { return; @@ -73,6 +104,10 @@ class WP_Upgrader_Skin { echo '

$string

\n"; } + /** + * @access public + */ public function header() { // Nothing, This will be displayed within a iframe. } + /** + * @access public + */ public function footer() { // Nothing, This will be displayed within a iframe. } + + /** + * + * @param string|WP_Error $error + */ public function error($error) { if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) $this->error = $this->upgrader->strings[$error]; @@ -273,14 +359,24 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { echo ''; } + /** + * @access public + */ public function bulk_header() { $this->feedback('skin_upgrade_start'); } + /** + * @access public + */ public function bulk_footer() { $this->feedback('skin_upgrade_end'); } + /** + * + * @param string $title + */ public function before($title = '') { $this->in_loop = true; printf( '

' . $this->upgrader->strings['skin_before_update_header'] . '

', $title, $this->upgrader->update_current, $this->upgrader->update_count); @@ -289,6 +385,10 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { $this->flush_output(); } + /** + * + * @param string $title + */ public function after($title = '') { echo '

'; if ( $this->error || ! $this->result ) { @@ -309,11 +409,17 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { $this->flush_output(); } + /** + * @access public + */ public function reset() { $this->in_loop = false; $this->error = false; } + /** + * @access public + */ public function flush_output() { wp_ob_end_flush_all(); flush(); @@ -328,19 +434,31 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin { $this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)'); } + /** + * + * @param string $title + */ public function before($title = '') { parent::before($this->plugin_info['Title']); } + /** + * + * @param string $title + */ public function after($title = '') { parent::after($this->plugin_info['Title']); $this->decrement_update_count( 'plugin' ); } + + /** + * @access public + */ public function bulk_footer() { parent::bulk_footer(); $update_actions = array( - 'plugins_page' => '' . __('Return to Plugins page') . '', - 'updates_page' => '' . __('Return to WordPress Updates') . '' + 'plugins_page' => '' . __( 'Return to Plugins page' ) . '', + 'updates_page' => '' . __( 'Return to WordPress Updates page' ) . '' ); if ( ! current_user_can( 'activate_plugins' ) ) unset( $update_actions['plugins_page'] ); @@ -368,20 +486,31 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin { $this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)'); } + /** + * + * @param string $title + */ public function before($title = '') { parent::before( $this->theme_info->display('Name') ); } + /** + * + * @param string $title + */ public function after($title = '') { parent::after( $this->theme_info->display('Name') ); $this->decrement_update_count( 'theme' ); } + /** + * @access public + */ public function bulk_footer() { parent::bulk_footer(); $update_actions = array( - 'themes_page' => '' . __('Return to Themes page') . '', - 'updates_page' => '' . __('Return to WordPress Updates') . '' + 'themes_page' => '' . __( 'Return to Themes page' ) . '', + 'updates_page' => '' . __( 'Return to WordPress Updates page' ) . '' ); if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) unset( $update_actions['themes_page'] ); @@ -412,6 +541,10 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { public $api; public $type; + /** + * + * @param array $args + */ public function __construct($args = array()) { $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' ); $args = wp_parse_args($args, $defaults); @@ -422,13 +555,18 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { parent::__construct($args); } + /** + * @access public + */ public function before() { if ( !empty($this->api) ) $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin %s %s.'), $this->api->name, $this->api->version); } + /** + * @access public + */ public function after() { - $plugin_file = $this->upgrader->plugin_info(); $install_actions = array(); @@ -436,21 +574,38 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins'; if ( 'import' == $from ) - $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; + $install_actions['activate_plugin'] = '' . __( 'Activate Plugin & Run Importer' ) . ''; else - $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; + $install_actions['activate_plugin'] = '' . __( 'Activate Plugin' ) . ''; if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { - $install_actions['network_activate'] = '' . __('Network Activate') . ''; + $install_actions['network_activate'] = '' . __( 'Network Activate' ) . ''; unset( $install_actions['activate_plugin'] ); } +<<<<<<< .mine + if ( 'import' == $from ) { + $install_actions['importers_page'] = '' . __( 'Return to Importers' ) . ''; + } elseif ( $this->type == 'web' ) { + $install_actions['plugins_page'] = '' . __( 'Return to Plugin Installer' ) . ''; + } else { + $install_actions['plugins_page'] = '' . __( 'Return to Plugins page' ) . ''; + } +||||||| .r11156 + if ( 'import' == $from ) + $install_actions['importers_page'] = '' . __('Return to Importers') . ''; + else if ( $this->type == 'web' ) + $install_actions['plugins_page'] = '' . __('Return to Plugin Installer') . ''; + else + $install_actions['plugins_page'] = '' . __('Return to Plugins page') . ''; +======= if ( 'import' == $from ) { $install_actions['importers_page'] = '' . __('Return to Importers') . ''; } elseif ( $this->type == 'web' ) { $install_actions['plugins_page'] = '' . __('Return to Plugin Installer') . ''; } else { $install_actions['plugins_page'] = '' . __('Return to Plugins page') . ''; +>>>>>>> .r12027 } if ( ! $this->result || is_wp_error($this->result) ) { @@ -488,6 +643,10 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { public $api; public $type; + /** + * + * @param array $args + */ public function __construct($args = array()) { $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' ); $args = wp_parse_args($args, $defaults); @@ -498,11 +657,17 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { parent::__construct($args); } + /** + * @access public + */ public function before() { if ( !empty($this->api) ) $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version); } + /** + * @access public + */ public function after() { if ( empty($this->upgrader->result['destination_name']) ) return; @@ -515,12 +680,6 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $stylesheet = $this->upgrader->result['destination_name']; $template = $theme_info->get_template(); - $preview_link = add_query_arg( array( - 'preview' => 1, - 'template' => urlencode( $template ), - 'stylesheet' => urlencode( $stylesheet ), - ), trailingslashit( home_url() ) ); - $activate_link = add_query_arg( array( 'action' => 'activate', 'template' => urlencode( $template ), @@ -529,19 +688,19 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet ); $install_actions = array(); - $install_actions['preview'] = '' . __('Preview') . ''; + if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $install_actions['preview'] .= '' . __('Live Preview') . ''; + $install_actions['preview'] = ''; } - $install_actions['activate'] = '' . __('Activate') . ''; + $install_actions['activate'] = ''; if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) - $install_actions['network_enable'] = '' . __( 'Network Enable' ) . ''; + $install_actions['network_enable'] = '' . __( 'Network Enable' ) . ''; if ( $this->type == 'web' ) - $install_actions['themes_page'] = '' . __('Return to Theme Installer') . ''; + $install_actions['themes_page'] = '' . __( 'Return to Theme Installer' ) . ''; elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) - $install_actions['themes_page'] = '' . __('Return to Themes page') . ''; + $install_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) unset( $install_actions['activate'], $install_actions['preview'] ); @@ -572,6 +731,10 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { class Theme_Upgrader_Skin extends WP_Upgrader_Skin { public $theme = ''; + /** + * + * @param array $args + */ public function __construct($args = array()) { $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); $args = wp_parse_args($args, $defaults); @@ -581,6 +744,9 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { parent::__construct($args); } + /** + * @access public + */ public function after() { $this->decrement_update_count( 'theme' ); @@ -590,12 +756,6 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { $stylesheet = $this->upgrader->result['destination_name']; $template = $theme_info->get_template(); - $preview_link = add_query_arg( array( - 'preview' => 1, - 'template' => urlencode( $template ), - 'stylesheet' => urlencode( $stylesheet ), - ), trailingslashit( home_url() ) ); - $activate_link = add_query_arg( array( 'action' => 'activate', 'template' => urlencode( $template ), @@ -605,21 +765,20 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { if ( get_stylesheet() == $stylesheet ) { if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $update_actions['preview'] = '' . __('Customize') . ''; + $update_actions['preview'] = ''; } } elseif ( current_user_can( 'switch_themes' ) ) { - $update_actions['preview'] = '' . __('Preview') . ''; if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { - $update_actions['preview'] .= '' . __('Live Preview') . ''; + $update_actions['preview'] .= ''; } - $update_actions['activate'] = '' . __('Activate') . ''; + $update_actions['activate'] = ''; } if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) unset( $update_actions['preview'], $update_actions['activate'] ); } - $update_actions['themes_page'] = '' . __('Return to Themes page') . ''; + $update_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; /** * Filter the list of action links available following a single theme update. @@ -649,6 +808,10 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin { public $done_footer = false; public $display_footer_actions = true; + /** + * + * @param array $args + */ public function __construct( $args = array() ) { $defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false ); $args = wp_parse_args( $args, $defaults ); @@ -660,6 +823,9 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin { parent::__construct( $args ); } + /** + * @access public + */ public function before() { $name = $this->upgrader->get_name_for_update( $this->language_update ); @@ -668,20 +834,30 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin { printf( '

' . __( 'Updating translations for %1$s (%2$s)…' ) . '

', $name, $this->language_update->language ); } + /** + * + * @param string|WP_Error $error + */ public function error( $error ) { echo '

'; parent::error( $error ); echo '

'; } + /** + * @access public + */ public function after() { echo '

'; } + /** + * @access public + */ public function bulk_footer() { $this->decrement_update_count( 'translation' ); $update_actions = array(); - $update_actions['updates_page'] = '' . __( 'Return to WordPress Updates' ) . ''; + $update_actions['updates_page'] = '' . __( 'Return to WordPress Updates page' ) . ''; /** * Filter the list of action links available following a translations update. @@ -710,8 +886,23 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin { class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { protected $messages = array(); +<<<<<<< .mine + /** + * + * @param bool $error + * @param string $context + * @param bool $allow_relaxed_file_ownership + * @return bool + */ + public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) { + if ( $context ) { +||||||| .r11156 + public function request_filesystem_credentials( $error = false, $context = '' ) { + if ( $context ) +======= public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) { if ( $context ) { +>>>>>>> .r12027 $this->options['context'] = $context; } // TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version @@ -722,6 +913,11 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { return $result; } + /** + * @access public + * + * @return array + */ public function get_upgrade_messages() { return $this->messages; } @@ -765,19 +961,19 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin { $this->messages[] = $string; } + /** + * @access public + */ public function header() { ob_start(); } + /** + * @access public + */ public function footer() { - $output = ob_get_contents(); + $output = ob_get_clean(); if ( ! empty( $output ) ) $this->feedback( $output ); - ob_end_clean(); } - - public function bulk_header() {} - public function bulk_footer() {} - public function before() {} - public function after() {} } diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader.php index 5d2370d0..58ac0158 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-upgrader.php @@ -132,11 +132,31 @@ class WP_Upgrader { $this->strings['folder_exists'] = __('Destination folder already exists.'); $this->strings['mkdir_failed'] = __('Could not create directory.'); $this->strings['incompatible_archive'] = __('The package could not be installed.'); + $this->strings['files_not_writable'] = __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ); $this->strings['maintenance_start'] = __('Enabling Maintenance mode…'); $this->strings['maintenance_end'] = __('Disabling Maintenance mode…'); } +<<<<<<< .mine + /** + * Connect to the filesystem. + * + * @since 2.8.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param array $directories Optional. A list of directories. If any of these do + * not exist, a {@see WP_Error} object will be returned. + * Default empty array. + * @param bool $allow_relaxed_file_ownership Whether to allow relaxed file ownership. + * Default false. + * @return bool|WP_Error True if able to connect, false or a {@see WP_Error} otherwise. + */ + public function fs_connect( $directories = array(), $allow_relaxed_file_ownership = false ) { +||||||| .r11156 + public function fs_connect( $directories = array() ) { +======= /** * Connect to the filesystem. * @@ -150,6 +170,7 @@ class WP_Upgrader { * @return bool|WP_Error True if able to connect, false or a {@see WP_Error} otherwise. */ public function fs_connect( $directories = array(), $allow_relaxed_file_ownership = false ) { +>>>>>>> .r12027 global $wp_filesystem; if ( false === ( $credentials = $this->skin->request_filesystem_credentials( false, $directories[0], $allow_relaxed_file_ownership ) ) ) { @@ -239,6 +260,23 @@ class WP_Upgrader { return $download_file; } +<<<<<<< .mine + /** + * Unpack a compressed package file. + * + * @since 2.8.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param string $package Full path to the package file. + * @param bool $delete_package Optional. Whether to delete the package file after attempting + * to unpack it. Default true. + * @return string|WP_Error The path to the unpacked contents, or a {@see WP_Error} on failure. + */ + public function unpack_package( $package, $delete_package = true ) { +||||||| .r11156 + public function unpack_package($package, $delete_package = true) { +======= /** * Unpack a compressed package file. * @@ -250,6 +288,7 @@ class WP_Upgrader { * @return string|WP_Error The path to the unpacked contents, or a {@see WP_Error} on failure. */ public function unpack_package( $package, $delete_package = true ) { +>>>>>>> .r12027 global $wp_filesystem; $this->skin->feedback('unpack_package'); @@ -288,6 +327,66 @@ class WP_Upgrader { return $working_dir; } +<<<<<<< .mine + /** + * Clears the directory where this item is going to be installed into. + * + * @since 4.3.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param string $remote_destination The location on the remote filesystem to be cleared + * @return bool|WP_Error True upon success, WP_Error on failure. + */ + public function clear_destination( $remote_destination ) { + global $wp_filesystem; + + if ( ! $wp_filesystem->exists( $remote_destination ) ) { + return true; + } + + // Check all files are writable before attempting to clear the destination. + $unwritable_files = array(); + + $_files = $wp_filesystem->dirlist( $remote_destination, true, true ); + + // Flatten the resulting array, iterate using each as we append to the array during iteration. + while ( $f = each( $_files ) ) { + $file = $f['value']; + $name = $f['key']; + + if ( ! isset( $file['files'] ) ) { + continue; + } + + foreach ( $file['files'] as $filename => $details ) { + $_files[ $name . '/' . $filename ] = $details; + } + } + + // Check writability. + foreach ( $_files as $filename => $file_details ) { + if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) { + + // Attempt to alter permissions to allow writes and try again. + $wp_filesystem->chmod( $remote_destination . $filename, ( 'd' == $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) ); + if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) { + $unwritable_files[] = $filename; + } + } + } + + if ( ! empty( $unwritable_files ) ) { + return new WP_Error( 'files_not_writable', $this->strings['files_not_writable'], implode( ', ', $unwritable_files ) ); + } + + if ( ! $wp_filesystem->delete( $remote_destination, true ) ) { + return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] ); + } + + return true; + } + /** * Install a package. * @@ -297,6 +396,9 @@ class WP_Upgrader { * * @since 2.8.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * @global array $wp_theme_directories + * * @param array|string $args { * Optional. Array or string of arguments for installing a package. Default empty array. * @@ -315,6 +417,36 @@ class WP_Upgrader { * * @return array|WP_Error The result (also stored in `WP_Upgrader:$result`), or a {@see WP_Error} on failure. */ +||||||| .r11156 +======= + /** + * Install a package. + * + * Copies the contents of a package form a source directory, and installs them in + * a destination directory. Optionally removes the source. It can also optionally + * clear out the destination folder if it already exists. + * + * @since 2.8.0 + * + * @param array|string $args { + * Optional. Array or string of arguments for installing a package. Default empty array. + * + * @type string $source Required path to the package source. Default empty. + * @type string $destination Required path to a folder to install the package in. + * Default empty. + * @type bool $clear_destination Whether to delete any files already in the destination + * folder. Default false. + * @type bool $clear_working Whether to delete the files form the working directory + * after copying to the destination. Default false. + * @type bool $abort_if_destination_exists Whether to abort the installation if + * the destination folder already exists. Default true. + * @type array $hook_extra Extra arguments to pass to the filter hooks called by + * {@see WP_Upgrader::install_package()}. Default empty array. + * } + * + * @return array|WP_Error The result (also stored in `WP_Upgrader:$result`), or a {@see WP_Error} on failure. + */ +>>>>>>> .r12027 public function install_package( $args = array() ) { global $wp_filesystem, $wp_theme_directories; @@ -410,29 +542,33 @@ class WP_Upgrader { } if ( $clear_destination ) { - //We're going to clear the destination if there's something there + // We're going to clear the destination if there's something there $this->skin->feedback('remove_old'); - $removed = true; - if ( $wp_filesystem->exists( $remote_destination ) ) { - $removed = $wp_filesystem->delete( $remote_destination, true ); - } + + $removed = $this->clear_destination( $remote_destination ); /** * Filter whether the upgrader cleared the destination. * * @since 2.8.0 * - * @param bool $removed Whether the destination was cleared. + * @param mixed $removed Whether the destination was cleared. true on success, WP_Error on failure * @param string $local_destination The local package destination. * @param string $remote_destination The remote package destination. * @param array $hook_extra Extra arguments passed to hooked filters. */ $removed = apply_filters( 'upgrader_clear_destination', $removed, $local_destination, $remote_destination, $args['hook_extra'] ); - if ( is_wp_error($removed) ) { + if ( is_wp_error( $removed ) ) { return $removed; +<<<<<<< .mine +||||||| .r11156 + } else if ( ! $removed ) { + return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); +======= } elseif ( ! $removed ) { return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); +>>>>>>> .r12027 } } elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists($remote_destination) ) { //If we're not clearing the destination folder and something exists there already, Bail. @@ -539,6 +675,25 @@ class WP_Upgrader { $options = wp_parse_args( $options, $defaults ); + /** + * Filter the package options before running an update. + * + * @since 4.3.0 + * + * @param array $options { + * Options used by the upgrader. + * + * @type string $package Package for update. + * @type string $destination Update location. + * @type bool $clear_destination Clear the destination resource. + * @type bool $clear_working Clear the working resource. + * @type bool $abort_if_destination_exists Abort if the Destination directory exists. + * @type bool $is_multi Whether the upgrader is running multiple times. + * @type array $hook_extra Extra hook arguments. + * } + */ + $options = apply_filters( 'upgrader_package_options', $options ); + if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times $this->skin->header(); } @@ -619,6 +774,22 @@ class WP_Upgrader { return $result; } +<<<<<<< .mine + /** + * Toggle maintenance mode for the site. + * + * Creates/deletes the maintenance file to enable/disable maintenance mode. + * + * @since 2.8.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param bool $enable True to enable maintenance mode, false to disable. + */ + public function maintenance_mode( $enable = false ) { +||||||| .r11156 + public function maintenance_mode($enable = false) { +======= /** * Toggle maintenance mode for the site. * @@ -629,6 +800,7 @@ class WP_Upgrader { * @param bool $enable True to enable maintenance mode, false to disable. */ public function maintenance_mode( $enable = false ) { +>>>>>>> .r12027 global $wp_filesystem; $file = $wp_filesystem->abspath() . '.maintenance'; if ( $enable ) { @@ -949,6 +1121,7 @@ class Plugin_Upgrader extends WP_Upgrader { return $results; } +<<<<<<< .mine /** * Check a source package to be sure it contains a plugin. * @@ -957,9 +1130,25 @@ class Plugin_Upgrader extends WP_Upgrader { * * @since 3.3.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $source The path to the downloaded package source. * @return string|WP_Error The source as passed, or a {@see WP_Error} object if no plugins were found. */ +||||||| .r11156 +======= + /** + * Check a source package to be sure it contains a plugin. + * + * This function is added to the {@see 'upgrader_source_selection'} filter by + * {@see Plugin_Upgrader::install()}. + * + * @since 3.3.0 + * + * @param string $source The path to the downloaded package source. + * @return string|WP_Error The source as passed, or a {@see WP_Error} object if no plugins were found. + */ +>>>>>>> .r12027 public function check_package($source) { global $wp_filesystem; @@ -1046,6 +1235,7 @@ class Plugin_Upgrader extends WP_Upgrader { return $return; } +<<<<<<< .mine /** * Delete the old plugin during an upgrade. * @@ -1053,7 +1243,27 @@ class Plugin_Upgrader extends WP_Upgrader { * {@see Plugin_Upgrader::upgrade()} and {@see Plugin_Upgrader::bulk_upgrade()}. * * @since 2.8.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param bool|WP_Error $removed + * @param string $local_destination + * @param string $remote_destination + * @param array $plugin + * @return WP_Error|bool */ +||||||| .r11156 + //Hooked to upgrade_clear_destination +======= + /** + * Delete the old plugin during an upgrade. + * + * Hooked to the {@see 'upgrader_clear_destination'} filter by + * {@see Plugin_Upgrader::upgrade()} and {@see Plugin_Upgrader::bulk_upgrade()}. + * + * @since 2.8.0 + */ +>>>>>>> .r12027 public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) { global $wp_filesystem; @@ -1150,14 +1360,32 @@ class Theme_Upgrader extends WP_Upgrader { $this->strings['parent_theme_not_found'] = __('The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.'); } +<<<<<<< .mine /** * Check if a child theme is being installed and we need to install its parent. * * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::install()}. * * @since 3.4.0 + * + * @param bool $install_result + * @param array $hook_extra + * @param array $child_result + * @return type */ public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) { +||||||| .r11156 + public function check_parent_theme_filter($install_result, $hook_extra, $child_result) { +======= + /** + * Check if a child theme is being installed and we need to install its parent. + * + * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::install()}. + * + * @since 3.4.0 + */ + public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) { +>>>>>>> .r12027 // Check to see if we need to install a parent theme $theme_info = $this->theme_info(); @@ -1216,6 +1444,23 @@ class Theme_Upgrader extends WP_Upgrader { return $install_result; } +<<<<<<< .mine + /** + * Don't display the activate and preview actions to the user. + * + * Hooked to the {@see 'install_theme_complete_actions'} filter by + * {@see Theme_Upgrader::check_parent_theme_filter()} when installing + * a child theme and installing the parent theme fails. + * + * @since 3.4.0 + * + * @param array $actions Preview actions. + * @return array + */ + public function hide_activate_preview_actions( $actions ) { +||||||| .r11156 + public function hide_activate_preview_actions($actions) { +======= /** * Don't display the activate and preview actions to the user. * @@ -1228,6 +1473,7 @@ class Theme_Upgrader extends WP_Upgrader { * @param array $actions Preview actions. */ public function hide_activate_preview_actions( $actions ) { +>>>>>>> .r12027 unset($actions['activate'], $actions['preview']); return $actions; } @@ -1466,6 +1712,25 @@ class Theme_Upgrader extends WP_Upgrader { return $results; } +<<<<<<< .mine + /** + * Check that the package source contains a valid theme. + * + * Hooked to the {@see 'upgrader_source_selection'} filter by {@see Theme_Upgrader::install()}. + * It will return an error if the theme doesn't have style.css or index.php + * files. + * + * @since 3.3.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param string $source The full path to the package source. + * @return string|WP_Error The source or a WP_Error. + */ + public function check_package( $source ) { +||||||| .r11156 + public function check_package($source) { +======= /** * Check that the package source contains a valid theme. * @@ -1479,6 +1744,7 @@ class Theme_Upgrader extends WP_Upgrader { * @return string|WP_Error The source or a WP_Error. */ public function check_package( $source ) { +>>>>>>> .r12027 global $wp_filesystem; if ( is_wp_error($source) ) @@ -1505,6 +1771,21 @@ class Theme_Upgrader extends WP_Upgrader { return $source; } +<<<<<<< .mine + /** + * Turn on maintenance mode before attempting to upgrade the current theme. + * + * Hooked to the {@see 'upgrader_pre_install'} filter by {@see Theme_Upgrader::upgrade()} and + * {@see Theme_Upgrader::bulk_upgrade()}. + * + * @since 2.8.0 + * + * @param bool|WP_Error $return + * @param array $theme + * @return bool|WP_Error + */ +||||||| .r11156 +======= /** * Turn on maintenance mode before attempting to upgrade the current theme. * @@ -1513,8 +1794,8 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 2.8.0 */ +>>>>>>> .r12027 public function current_before($return, $theme) { - if ( is_wp_error($return) ) return $return; @@ -1529,6 +1810,21 @@ class Theme_Upgrader extends WP_Upgrader { return $return; } +<<<<<<< .mine + /** + * Turn off maintenance mode after upgrading the current theme. + * + * Hooked to the {@see 'upgrader_post_install'} filter by {@see Theme_Upgrader::upgrade()} + * and {@see Theme_Upgrader::bulk_upgrade()}. + * + * @since 2.8.0 + * + * @param bool|WP_Error $return + * @param array $theme + * @return bool|WP_Error + */ +||||||| .r11156 +======= /** * Turn off maintenance mode after upgrading the current theme. * @@ -1537,6 +1833,7 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 2.8.0 */ +>>>>>>> .r12027 public function current_after($return, $theme) { if ( is_wp_error($return) ) return $return; @@ -1559,6 +1856,25 @@ class Theme_Upgrader extends WP_Upgrader { return $return; } +<<<<<<< .mine + /** + * Delete the old theme during an upgrade. + * + * Hooked to the {@see 'upgrader_clear_destination'} filter by {@see Theme_Upgrader::upgrade()} + * and {@see Theme_Upgrader::bulk_upgrade()}. + * + * @since 2.8.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param bool $removed + * @param string $local_destination + * @param string $remote_destination + * @param array $theme + * @return bool + */ +||||||| .r11156 +======= /** * Delete the old theme during an upgrade. * @@ -1567,6 +1883,7 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 2.8.0 */ +>>>>>>> .r12027 public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) { global $wp_filesystem; @@ -1610,8 +1927,6 @@ class Theme_Upgrader extends WP_Upgrader { } -add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 ); - /** * Language pack upgrader, for updating translations of plugins, themes, and core. * @@ -1638,6 +1953,20 @@ class Language_Pack_Upgrader extends WP_Upgrader { */ public $bulk = true; +<<<<<<< .mine + /** + * Asynchronously upgrade language packs after other upgrades have been made. + * + * Hooked to the {@see 'upgrader_process_complete'} action by default. + * + * @since 3.7.0 + * + * @static + * + * @param false|WP_Upgrader $upgrader + */ +||||||| .r11156 +======= /** * Asynchronously upgrade language packs after other upgrades have been made. * @@ -1645,6 +1974,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * * @since 3.7.0 */ +>>>>>>> .r12027 public static function async_upgrade( $upgrader = false ) { // Avoid recursion. if ( $upgrader && $upgrader instanceof Language_Pack_Upgrader ) { @@ -1709,6 +2039,19 @@ class Language_Pack_Upgrader extends WP_Upgrader { $this->strings['process_success'] = __( 'Translation updated successfully.' ); } +<<<<<<< .mine + /** + * Upgrade a language pack. + * + * @since 3.7.0 + * + * @param string|false $update Optional. Whether an update offer is available. Default false. + * @param array $args Optional. Other optional arguments, see + * {@see Language_Pack_Upgrader::bulk_upgrade()}. Default empty array. + * @return array|bool|WP_Error The result of the upgrade, or a {@see wP_Error} object instead. + */ +||||||| .r11156 +======= /** * Upgrade a language pack. * @@ -1719,6 +2062,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * {@see Language_Pack_Upgrader::bulk_upgrade()}. Default empty array. * @return array|WP_Error The result of the upgrade, or a {@see wP_Error} object instead. */ +>>>>>>> .r12027 public function upgrade( $update = false, $args = array() ) { if ( $update ) { $update = array( $update ); @@ -1733,6 +2077,26 @@ class Language_Pack_Upgrader extends WP_Upgrader { return $results[0]; } +<<<<<<< .mine + /** + * Bulk upgrade language packs. + * + * @since 3.7.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param array $language_updates Optional. Language pack updates. Default empty array. + * @param array $args { + * Optional. Other arguments for upgrading multiple language packs. Default empty array + * + * @type bool $clear_update_cache Whether to clear the update cache when done. + * Default true. + * } + * @return array|bool|WP_Error Will return an array of results, or true if there are no updates, + * false or WP_Error for initial errors. + */ +||||||| .r11156 +======= /** * Bulk upgrade language packs. * @@ -1748,6 +2112,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * @return array|true|false|WP_Error Will return an array of results, or true if there are no updates, * false or WP_Error for initial errors. */ +>>>>>>> .r12027 public function bulk_upgrade( $language_updates = array(), $args = array() ) { global $wp_filesystem; @@ -1779,7 +2144,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { // Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230 remove_all_filters( 'upgrader_pre_install' ); remove_all_filters( 'upgrader_clear_destination' ); - remove_all_filterS( 'upgrader_post_install' ); + remove_all_filters( 'upgrader_post_install' ); remove_all_filters( 'upgrader_source_selection' ); add_filter( 'upgrader_source_selection', array( $this, 'check_package' ), 10, 2 ); @@ -1855,6 +2220,22 @@ class Language_Pack_Upgrader extends WP_Upgrader { return $results; } +<<<<<<< .mine + /** + * Check the package source to make sure there are .mo and .po files. + * + * Hooked to the {@see 'upgrader_source_selection'} filter by + * {@see Language_Pack_Upgrader::bulk_upgrade()}. + * + * @since 3.7.0 + * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param string|WP_Error $source + * @param string $remote_source + */ +||||||| .r11156 +======= /** * Check the package source to make sure there are .mo and .po files. * @@ -1863,6 +2244,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * * @since 3.7.0 */ +>>>>>>> .r12027 public function check_package( $source, $remote_source ) { global $wp_filesystem; @@ -1888,6 +2270,17 @@ class Language_Pack_Upgrader extends WP_Upgrader { return $source; } +<<<<<<< .mine + /** + * Get the name of an item being updated. + * + * @since 3.7.0 + * + * @param object $update The data for an update. + * @return string The name of the item being updated. + */ +||||||| .r11156 +======= /** * Get the name of an item being updated. * @@ -1896,6 +2289,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * @param object The data for an update. * @return string The name of the item being updated. */ +>>>>>>> .r12027 public function get_name_for_update( $update ) { switch ( $update->type ) { case 'core': @@ -1943,11 +2337,15 @@ class Core_Upgrader extends WP_Upgrader { $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' ); } +<<<<<<< .mine /** * Upgrade WordPress core. * * @since 2.8.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * @global callback $_wp_filesystem_direct_method + * * @param object $current Response object for whether WordPress is current. * @param array $args { * Optional. Arguments for upgrading WordPress core. Default empty array. @@ -1961,6 +2359,27 @@ class Core_Upgrader extends WP_Upgrader { * } * @return null|false|WP_Error False or WP_Error on failure, null on success. */ +||||||| .r11156 +======= + /** + * Upgrade WordPress core. + * + * @since 2.8.0 + * + * @param object $current Response object for whether WordPress is current. + * @param array $args { + * Optional. Arguments for upgrading WordPress core. Default empty array. + * + * @type bool $pre_check_md5 Whether to check the file checksums before + * attempting the upgrade. Default true. + * @type bool $attempt_rollback Whether to attempt to rollback the chances if + * there is a problem. Default false. + * @type bool $do_rollback Whether to perform this "upgrade" as a rollback. + * Default false. + * } + * @return null|false|WP_Error False or WP_Error on failure, null on success. + */ +>>>>>>> .r12027 public function upgrade( $current, $args = array() ) { global $wp_filesystem; @@ -2110,15 +2529,32 @@ class Core_Upgrader extends WP_Upgrader { return $result; } +<<<<<<< .mine /** * Determines if this WordPress Core version should update to an offered version or not. * * @since 3.7.0 * + * @static + * * @param string $offered_ver The offered version, of the format x.y.z. * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { +||||||| .r11156 + // Determines if this WordPress Core version should update to $offered_ver or not + public static function should_update_to_version( $offered_ver /* x.y.z */ ) { +======= + /** + * Determines if this WordPress Core version should update to an offered version or not. + * + * @since 3.7.0 + * + * @param string $offered_ver The offered version, of the format x.y.z. + * @return bool True if we should update to the offered version, otherwise false. + */ + public static function should_update_to_version( $offered_ver ) { +>>>>>>> .r12027 include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y @@ -2216,13 +2652,27 @@ class Core_Upgrader extends WP_Upgrader { return false; } +<<<<<<< .mine /** * Compare the disk file checksums agains the expected checksums. * * @since 3.7.0 * + * @global string $wp_version + * @global string $wp_local_package + * * @return bool True if the checksums match, otherwise false. */ +||||||| .r11156 +======= + /** + * Compare the disk file checksums agains the expected checksums. + * + * @since 3.7.0 + * + * @return bool True if the checksums match, otherwise false. + */ +>>>>>>> .r12027 public function check_files() { global $wp_version, $wp_local_package; @@ -2466,6 +2916,8 @@ class WP_Automatic_Updater { * * @since 3.7.0 * + * @global wpdb $wpdb + * * @param string $type The type of update being checked: 'core', 'theme', * 'plugin', 'translation'. * @param object $item The update offer. @@ -2592,6 +3044,8 @@ class WP_Automatic_Updater { * * @param string $type The type of update being checked: 'core', 'theme', 'plugin', 'translation'. * @param object $item The update offer. + * + * @return null|WP_Error */ public function update( $type, $item ) { $skin = new Automatic_Upgrader_Skin; @@ -2690,6 +3144,9 @@ class WP_Automatic_Updater { * Kicks off the background update process, looping through all pending updates. * * @since 3.7.0 + * + * @global wpdb $wpdb + * @global string $wp_version */ public function run() { global $wpdb, $wp_version; @@ -2825,7 +3282,9 @@ class WP_Automatic_Updater { * If we tried to perform a core update, check if we should send an email, * and if we need to avoid processing future updates. * - * @param object $update_result The result of the core update. Includes the update offer and result. + * @global string $wp_version + * + * @param object|WP_Error $update_result The result of the core update. Includes the update offer and result. */ protected function after_core_update( $update_result ) { global $wp_version; @@ -2912,6 +3371,8 @@ class WP_Automatic_Updater { * * @since 3.7.0 * + * @global string $wp_version + * * @param string $type The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'. * @param object $core_update The update offer that was attempted. * @param mixed $result Optional. The result for the core update. Can be WP_Error. diff --git a/pavillonmadeleine.fr/wp-admin/includes/class-wp-users-list-table.php b/pavillonmadeleine.fr/wp-admin/includes/class-wp-users-list-table.php index 50067363..ba1bf451 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/class-wp-users-list-table.php +++ b/pavillonmadeleine.fr/wp-admin/includes/class-wp-users-list-table.php @@ -56,6 +56,8 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @return bool */ public function ajax_user_can() { if ( $this->is_site_users ) @@ -69,6 +71,9 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @global string $role + * @global string $usersearch */ public function prepare_items() { global $role, $usersearch; @@ -133,10 +138,14 @@ class WP_Users_List_Table extends WP_List_Table { * @since 3.1.0 * @access protected * + * @global string $role + * * @return array An array of HTML links, one for each view. */ protected function get_views() { - global $wp_roles, $role; + global $role; + + $wp_roles = wp_roles(); if ( $this->is_site_users ) { $url = 'site-users.php?id=' . $this->site_id; @@ -339,7 +348,7 @@ class WP_Users_List_Table extends WP_List_Table { * @return string Output for a single row. */ public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { - global $wp_roles; + $wp_roles = wp_roles(); if ( ! ( $user_object instanceof WP_User ) ) { $user_object = get_userdata( (int) $user_object ); @@ -384,7 +393,6 @@ class WP_Users_List_Table extends WP_List_Table { * @param WP_User $user_object WP_User object for the currently-listed user. */ $actions = apply_filters( 'user_row_actions', $actions, $user_object ); - $edit .= $this->row_actions( $actions ); // Set up the checkbox ( because the user is editable, otherwise it's empty ) $checkbox = '' @@ -398,63 +406,85 @@ class WP_Users_List_Table extends WP_List_Table { $r = ""; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; - - $style = ''; - if ( in_array( $column_name, $hidden ) ) - $style = ' style="display:none;"'; - - $attributes = "$class$style"; - - switch ( $column_name ) { - case 'cb': - $r .= "$checkbox"; - break; - case 'username': - $r .= "$avatar $edit"; - break; - case 'name': - $r .= "$user_object->first_name $user_object->last_name"; - break; - case 'email': - $r .= "$email"; - break; - case 'role': - $r .= "$role_name"; - break; - case 'posts': - $attributes = 'class="posts column-posts num"' . $style; - $r .= ""; - if ( $numposts > 0 ) { - $r .= ""; - $r .= $numposts; - $r .= ''; - } else { - $r .= 0; - } - $r .= ""; - break; - default: - $r .= ""; - - /** - * Filter the display output of custom columns in the Users list table. - * - * @since 2.8.0 - * - * @param string $output Custom column output. Default empty. - * @param string $column_name Column name. - * @param int $user_id ID of the currently-listed user. - */ - $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); - $r .= ""; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } + if ( 'posts' === $column_name ) { + $classes .= ' num'; // Special case for that column + } + + if ( in_array( $column_name, $hidden ) ) { + $classes .= ' hidden'; + } + + $data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"'; + + $attributes = "class='$classes' $data"; + + if ( 'cb' === $column_name ) { + $r .= "$checkbox"; + } else { + $r .= ""; + switch ( $column_name ) { + case 'username': + $r .= "$avatar $edit"; + break; + case 'name': + $r .= "$user_object->first_name $user_object->last_name"; + break; + case 'email': + $r .= "$email"; + break; + case 'role': + $r .= $role_name; + break; + case 'posts': + if ( $numposts > 0 ) { + $r .= ""; + $r .= ''; + $r .= ''; + $r .= ''; + } else { + $r .= 0; + } + break; + default: + /** + * Filter the display output of custom columns in the Users list table. + * + * @since 2.8.0 + * + * @param string $output Custom column output. Default empty. + * @param string $column_name Column name. + * @param int $user_id ID of the currently-listed user. + */ + $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); + } + + if ( $primary === $column_name ) { + $r .= $this->row_actions( $actions ); + } + $r .= ""; } } $r .= ''; return $r; } + + /** + * Gets the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'username'. + */ + protected function get_default_primary_column_name() { + return 'username'; + } } diff --git a/pavillonmadeleine.fr/wp-admin/includes/comment.php b/pavillonmadeleine.fr/wp-admin/includes/comment.php index 06447d41..36954b23 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/comment.php +++ b/pavillonmadeleine.fr/wp-admin/includes/comment.php @@ -20,11 +20,11 @@ function comment_exists($comment_author, $comment_date) { global $wpdb; - $comment_author = stripslashes($comment_author); - $comment_date = stripslashes($comment_date); - return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments - WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) ); + WHERE comment_author = %s AND comment_date = %s", + stripslashes( $comment_author ), + stripslashes( $comment_date ) + ) ); } /** @@ -33,7 +33,6 @@ function comment_exists($comment_author, $comment_date) { * @since 2.0.0 */ function edit_comment() { - if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) wp_die ( __( 'You are not allowed to edit comments on this post.' ) ); @@ -80,7 +79,7 @@ function edit_comment() { * @since 2.0.0 * * @param int $id ID of comment to retrieve. - * @return bool|object Comment if found. False on failure. + * @return object|false Comment if found. False on failure. */ function get_comment_to_edit( $id ) { if ( !$comment = get_comment($id) ) @@ -156,7 +155,8 @@ function get_pending_comments_num( $post_id ) { * Add avatars to relevant places in admin, or try to. * * @since 2.5.0 - * @uses $comment + * + * @global object $comment * * @param string $name User name. * @return string Avatar with Admin name. @@ -167,6 +167,9 @@ function floated_admin_avatar( $name ) { return "$avatar $name"; } +/** + * @since 2.7.0 + */ function enqueue_comment_hotkeys_js() { if ( 'true' == get_user_option( 'comment_shortcuts' ) ) wp_enqueue_script( 'jquery-table-hotkeys' ); diff --git a/pavillonmadeleine.fr/wp-admin/includes/dashboard.php b/pavillonmadeleine.fr/wp-admin/includes/dashboard.php index b7dda132..49fcdd92 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/dashboard.php +++ b/pavillonmadeleine.fr/wp-admin/includes/dashboard.php @@ -12,6 +12,10 @@ * Handles POST data, sets up filters. * * @since 2.5.0 + * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls + * @global array $wp_dashboard_control_callbacks */ function wp_dashboard_setup() { global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks; @@ -125,6 +129,16 @@ function wp_dashboard_setup() { do_action( 'do_meta_boxes', $screen->id, 'side', '' ); } +/** + * + * @global array $wp_dashboard_control_callbacks + * + * @param string $widget_id + * @param string $widget_name + * @param callback $callback + * @param callback $control_callback + * @param array $callback_args + */ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) { $screen = get_current_screen(); global $wp_dashboard_control_callbacks; @@ -154,6 +168,11 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_ add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args ); } +/** + * + * @param type $dashboard + * @param type $meta_box + */ function _wp_dashboard_control_callback( $dashboard, $meta_box ) { echo '

"; } +/** + * @global object $comment + * + * @param object $comment + * @param bool $show_date + */ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $GLOBALS['comment'] =& $comment; @@ -599,7 +631,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { comment_type || 'comment' == $comment->comment_type ) : ?> -

' . get_comment_author_link() . '', $comment_post_link.' '.$comment_link, ' ' . __( '[Pending]' ) . '' ); ?> @@ -619,7 +651,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { } $type = esc_html( $type ); ?> -
+

$type", $comment_post_link." ".$comment_link ); ?>

@@ -770,6 +802,9 @@ function wp_dashboard_recent_comments( $total_items = 5 ) { $comments_query['status'] = 'approve'; while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) { + if ( ! is_array( $possible ) ) { + break; + } foreach ( $possible as $comment ) { if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) continue; @@ -845,7 +880,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar $check_urls = array( $widgets[$widget_id]['url'] ); } - $cache_key = 'dash_' . md5( $widget_id ); + $locale = get_locale(); + $cache_key = 'dash_' . md5( $widget_id . '_' . $locale ); if ( false !== ( $output = get_transient( $cache_key ) ) ) { echo $output; return true; @@ -875,6 +911,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar * * @since 2.5.0 * + * @global array $wp_dashboard_control_callbacks + * * @param int $widget_control_id Registered Widget ID. */ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) { @@ -1174,7 +1212,6 @@ function wp_dashboard_quota() {
search_term = wp_unslash( $search_term ); @@ -492,6 +492,20 @@ class WP_User_Search { $this->do_paging(); } + /** + * PHP4 Constructor - Sets up the object properties. + * + * @since 2.1.0 + * + * @param string $search_term Search terms string. + * @param int $page Optional. Page ID. + * @param string $role Role name. + * @return WP_User_Search + */ + public function WP_User_Search( $search_term = '', $page = '', $role = '' ) { + self::__construct( $search_term, $page, $role ); + } + /** * {@internal Missing Short Description}} * @@ -572,9 +586,9 @@ class WP_User_Search { function do_paging() { if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results $args = array(); - if( ! empty($this->search_term) ) + if ( ! empty($this->search_term) ) $args['usersearch'] = urlencode($this->search_term); - if( ! empty($this->role) ) + if ( ! empty($this->role) ) $args['role'] = urlencode($this->role); $this->paging_text = paginate_links( array( @@ -732,6 +746,8 @@ function wp_dashboard_quick_press_output() { * @deprecated 3.3.0 * @deprecated Use wp_editor() * @see wp_editor() + * + * @staticvar int $num / function wp_tiny_mce( $teeny = false, $settings = false ) { _deprecated_function( FUNCTION, '3.3', 'wp_editor()' ); diff --git a/pavillonmadeleine.fr/wp-admin/includes/export.php b/pavillonmadeleine.fr/wp-admin/includes/export.php index cd50e61b..3d7b51a1 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/export.php +++ b/pavillonmadeleine.fr/wp-admin/includes/export.php @@ -20,7 +20,16 @@ define( 'WXR_VERSION', '1.2' ); * @since 2.1.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * @global WP_Post $post + * + * @param array $args Filters defining what should be included in the export. +||||||| .r11156 + * @param array $args Filters defining what should be included in the export +======= * @param array $args Filters defining what should be included in the export. +>>>>>>> .r12027 / function export_wp( $args = array() ) { global $wpdb, $post; @@ -130,9 +139,9 @@ function export_wp( $args = array() ) { @return string / function wxr_cdata( $str ) { - if ( seems_utf8( $str ) == false ) + if ( ! seems_utf8( $str ) ) { $str = utf8_encode( $str ); - + } // $str = ent2ncr(esc_html($str)); $str = '', ']]]]>', $str ) . ']]>'; @@ -244,6 +253,8 @@ function export_wp( $args = array() ) { * @since 3.1.0 * + * @global wpdb $wpdb + * * @param array $post_ids Array of post IDs to filter the query by. Optional. */ function wxr_authors_list( array $post_ids = null ) { @@ -310,6 +321,12 @@ function export_wp( $args = array() ) { } } + /** + * + * @param bool $return_me + * @param string $meta_key + * @return bool + / function wxr_filter_postmeta( $return_me, $meta_key ) { if ( '_edit_lock' == $meta_key ) $return_me = true; @@ -375,6 +392,9 @@ function export_wp( $args = array() ) { ?> >>>>>> .r12027 @param string $file Filesystem path or filename * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist / @@ -516,6 +523,8 @@ function verify_file_md5( $filename, $expected_md5 ) { * @since 2.5.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @return mixed WP_Error on failure, True on success @@ -579,6 +588,8 @@ function unzip_file($file, $to) { * @see unzip_file * @access private * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @param array $needed_dirs A partial list of required folders needed to be created. @@ -677,6 +688,8 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { * @see unzip_file * @access private * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $file Full path and filename of zip archive * @param string $to Full path on the filesystem to extract archive to * @param array $needed_dirs A partial list of required folders needed to be created. @@ -769,6 +782,8 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) { * * @since 2.5.0 * + * @global WP_Filesystem_Base $wp_filesystem Subclass + * * @param string $from source directory * @param string $to destination directory * @param array $skip_list a list of files/folders to skip copying @@ -823,6 +838,19 @@ function copy_dir($from, $to, $skip_list = array() ) { * * @since 2.5.0 * +<<<<<<< .mine + * @global WP_Filesystem_Base $wp_filesystem Subclass + * + * @param array|false $args Optional. Connection args, These are passed directly to + * the `WP_Filesystem_()` classes. Default false. + @param string|false $context Optional. Context for get_filesystem_method(). Default false. + * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false. + * @return null|bool false on failure, true on success. +||||||| .r11156 + * @param array $args (optional) Connection args, These are passed directly to the WP_Filesystem_() classes. + @param string $context (optional) Context for get_filesystem_method(), See function declaration for more information. + * @return boolean false on failure, true on success +======= * @param array $args Optional. Connection args, These are passed directly to * the `WP_Filesystem_()` classes. Default false. @param string $context Optional. Context for {@see get_filesystem_method()}. @@ -830,6 +858,7 @@ function copy_dir($from, $to, $skip_list = array() ) { * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. * Default false. * @return null|boolean false on failure, true on success. +>>>>>>> .r12027 / function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) { global $wp_filesystem; @@ -902,11 +931,24 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own * @since 2.5.0 * +<<<<<<< .mine + * @global callback $_wp_filesystem_direct_method + * * @param array $args Optional. Connection details. Default empty array. * @param string $context Optional. Full path to the directory that is tested * for being writable. Default false. * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. * Default false. +||||||| .r11156 + * @param array $args Connection details. + * @param string $context Full path to the directory that is tested for being writable. +======= + * @param array $args Optional. Connection details. Default empty array. + * @param string $context Optional. Full path to the directory that is tested + * for being writable. Default false. + * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. + * Default false. +>>>>>>> .r12027 * @return string The transport to use, see description for valid return values. / function get_filesystem_method( $args = array(), $context = false, $allow_relaxed_file_ownership = false ) { @@ -984,6 +1026,24 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe * @since 2.5. * +<<<<<<< .mine + * @todo Properly mark optional arguments as such + * + * @param string $form_post the URL to post the form to + * @param string $type the chosen Filesystem method in use + * @param bool $error if the current request has failed to connect + * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method() + * @param array $extra_fields Extra POST fields which should be checked for to be included in the post. + * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable. + * @return bool False on failure. True on success. +||||||| .r11156 + * @param string $form_post the URL to post the form to + * @param string $type the chosen Filesystem method in use + * @param boolean $error if the current request has failed to connect + * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method() + * @param string $extra_fields Extra POST fields which should be checked for to be included in the post. + * @return boolean False on failure. True on success. +======= * @todo Properly mark optional arguments as such * * @param string $form_post the URL to post the form to @@ -993,6 +1053,7 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe * @param array $extra_fields Extra POST fields which should be checked for to be included in the post. * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable. * @return boolean False on failure. True on success. +>>>>>>> .r12027 / function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) { diff --git a/pavillonmadeleine.fr/wp-admin/includes/image-edit.php b/pavillonmadeleine.fr/wp-admin/includes/image-edit.php index 5a82b415..c15562f3 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/image-edit.php +++ b/pavillonmadeleine.fr/wp-admin/includes/image-edit.php @@ -208,7 +208,7 @@ function wp_image_editor($post_id, $msg = false) { @param WP_Image_Editor $image * @param string $mime_type * @param int $post_id - * @return boolean + * @return bool / function wp_stream_image( $image, $mime_type, $post_id ) { if ( $image instanceof WP_Image_Editor ) { @@ -264,7 +264,7 @@ function wp_stream_image( $image, $mime_type, $post_id ) { @param WP_Image_Editor $image * @param string $mime_type * @param int $post_id - * @return boolean + * @return bool / function wp_save_image_file( $filename, $image, $mime_type, $post_id ) { if ( $image instanceof WP_Image_Editor ) { @@ -552,7 +552,7 @@ function image_edit_apply_changes( $image, $changes ) { in $_REQUEST['history'] * * @param int $post_id - * @return boolean + * @return bool / function stream_preview_image( $post_id ) { $post = get_post( $post_id ); @@ -672,6 +672,8 @@ function wp_restore_image($post_id) { Saves image to post along with enqueued changes * in $_REQUEST['history'] * + * @global array $_wp_additional_image_sizes + * * @param int $post_id * @return \stdClass / diff --git a/pavillonmadeleine.fr/wp-admin/includes/image.php b/pavillonmadeleine.fr/wp-admin/includes/image.php index 355a63d7..be023e23 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/image.php +++ b/pavillonmadeleine.fr/wp-admin/includes/image.php @@ -67,6 +67,8 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s * @since 2.1.0 * + * @global array $_wp_additional_image_sizes + * * @param int $attachment_id Attachment Id to process. * @param string $file Filepath of the Attached image. * @return mixed Metadata for attachment. @@ -190,8 +192,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { } // Remove the blob of binary data from the array. - if ( isset( $metadata['image']['data'] ) ) - unset( $metadata['image']['data'] ); + unset( $metadata['image']['data'] ); /** * Filter the generated attachment meta data. diff --git a/pavillonmadeleine.fr/wp-admin/includes/import.php b/pavillonmadeleine.fr/wp-admin/includes/import.php index 55c6e78b..8b673743 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/import.php +++ b/pavillonmadeleine.fr/wp-admin/includes/import.php @@ -11,6 +11,7 @@ * * @since 2.0.0 * + * @global array $wp_importers * @return array / function get_importers() { @@ -42,10 +43,12 @@ function _usort_by_first_member( $a, $b ) { * @since 2.0.0 * - * @param string $id Importer tag. Used to uniquely identify importer. - * @param string $name Importer name and title. - * @param string $description Importer description. - * @param callback $callback Callback to run. + * @global array $wp_importers + * + * @param string $id Importer tag. Used to uniquely identify importer. + * @param string $name Importer name and title. + * @param string $description Importer description. + * @param callback $callback Callback to run. * @return WP_Error Returns WP_Error when $callback is WP_Error. / function register_importer( $id, $name, $description, $callback ) { diff --git a/pavillonmadeleine.fr/wp-admin/includes/list-table.php b/pavillonmadeleine.fr/wp-admin/includes/list-table.php index 04b552f1..97b4077e 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/list-table.php +++ b/pavillonmadeleine.fr/wp-admin/includes/list-table.php @@ -13,6 +13,8 @@ @access private * @since 3.1.0 * + * @global string $hook_suffix + * * @param string $class The type of the list table, which is the class name. * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'. * @return object|bool Object on success, false if the class does not exist. @@ -99,6 +101,11 @@ class _WP_List_Table_Compat extends WP_List_Table { } } + /** + * @access protected + * + * @return array + */ protected function get_column_info() { $columns = get_column_headers( $this->_screen ); $hidden = get_hidden_columns( $this->_screen ); @@ -107,6 +114,11 @@ class _WP_List_Table_Compat extends WP_List_Table { return array( $columns, $hidden, $sortable ); } + /** + * @access public + * + * @return array + / public function get_columns() { return $this->_columns; } diff --git a/pavillonmadeleine.fr/wp-admin/includes/media.php b/pavillonmadeleine.fr/wp-admin/includes/media.php index 75811962..ac87b7f0 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/media.php +++ b/pavillonmadeleine.fr/wp-admin/includes/media.php @@ -36,6 +36,8 @@ function media_upload_tabs() { * @since 2.5.0 * + * @global wpdb $wpdb + * * @param array $tabs * @return array $tabs with gallery if post has image attachment */ @@ -61,12 +63,13 @@ function update_gallery_tab($tabs) { return $tabs; } -add_filter('media_upload_tabs', 'update_gallery_tab'); /** * {@internal Missing Short Description}} * * @since 2.5.0 + * + * @global string $redir_tab / function the_media_upload_tabs() { global $redir_tab; @@ -216,7 +219,6 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $ / return apply_filters( 'image_add_caption_shortcode', $shcode, $html ); } -add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); /** * Private preg_replace callback used in image_add_caption() @@ -355,8 +357,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override ), $post_data ); // This should never be set as it would then overwrite an existing attachment. - if ( isset( $attachment['ID'] ) ) - unset( $attachment['ID'] ); + unset( $attachment['ID'] ); // Save the data $id = wp_insert_attachment($attachment, $file, $post_id); @@ -419,8 +420,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = ), $post_data ); // This should never be set as it would then overwrite an existing attachment. - if ( isset( $attachment['ID'] ) ) - unset( $attachment['ID'] ); + unset( $attachment['ID'] ); // Save the attachment metadata $id = wp_insert_attachment($attachment, $file, $post_id); @@ -435,7 +435,15 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = * * @since 2.5.0 * +<<<<<<< .mine + * @global int $body_id + * * @param string|callable $content_func +||||||| .r11156 + * @param array $content_func +======= + * @param string|callable $content_func +>>>>>>> .r12027 / function wp_iframe($content_func / ... /) { _wp_admin_html_begin(); @@ -529,6 +537,10 @@ document.body.className = document.body.className.replace('no-js', 'js'); * @since 2.5.0 * + * @global int $post_ID + * + * @staticvar int $instance + * * @param string $editor_id / function media_buttons($editor_id = 'content') { @@ -546,10 +558,9 @@ function media_buttons($editor_id = 'content') { $img = ' '; $id_attribute = $instance === 1 ? ' id="insert-media-button"' : ''; - printf( '%s', + printf( '', $id_attribute, esc_attr( $editor_id ), - esc_attr( 'Add Media' ), $img . ( 'Add Media' ) ); / @@ -569,7 +580,6 @@ function media_buttons($editor_id = 'content') { echo $legacy_filter; } } -add_action( 'media_buttons', 'media_buttons' ); / @@ -822,18 +832,33 @@ function wp_media_upload_handler() { } /** - * Download an image from the specified URL and attach it to a post. + * Downloads an image from the specified URL and attaches it to a post. * * @since 2.6.0 - * + * @since 4.2.0 Introduced the `$return` parameter. + * +<<<<<<< .mine + * @param string $file The URL of the image to download. + * @param int $post_id The post ID the media is to be associated with. + * @param string $desc Optional. Description of the image. + * @param string $return Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'. + * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise. +||||||| .r11156 + * @param string $file The URL of the image to download + * @param int $post_id The post ID the media is to be associated with + * @param string $desc Optional. Description of the image + * @return string|WP_Error Populated HTML img tag on success +======= * @param string $file The URL of the image to download * @param int $post_id The post ID the media is to be associated with * @param string $desc Optional. Description of the image * @param string $return Optional. What to return: an image tag (default) or only the src. * @return string|WP_Error Populated HTML img tag on success +>>>>>>> .r12027 */ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) { if ( ! empty( $file ) ) { + // Set variables for storage, fix file filename for query strings. preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches ); $file_array = array(); @@ -859,7 +884,7 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) $src = wp_get_attachment_url( $id ); } - // Finally check to make sure the file has been saved, then return the HTML. + // Finally, check to make sure the file has been saved, then return the HTML. if ( ! empty( $src ) ) { if ( $return === 'src' ) { return $src; @@ -1050,6 +1075,14 @@ function image_link_input_fields($post, $url_type = '') { "; } +/** + * Output a textarea element for inputting an attachment caption. + * + * @since 3.4.0 + * + * @param WP_Post $edit_post Attachment WP_Post object. + * @return string HTML markup for the textarea element. + */ function wp_caption_input_textarea($edit_post) { // Post data is already escaped. $name = "attachments[{$edit_post->ID}][post_excerpt]"; @@ -1123,8 +1156,6 @@ function image_attachment_fields_to_save( $post, $attachment ) { return $post; } -add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 ); - /** * {@internal Missing Short Description}} * @@ -1150,8 +1181,6 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) { return $html; } -add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3); - /** * {@internal Missing Short Description}} * @@ -1280,6 +1309,8 @@ function get_attachment_fields_to_edit($post, $errors = null) { * * @since 2.5.0 * + * @global WP_Query $wp_the_query + * * @param int $post_id Optional. Post ID. * @param array $errors Errors for attachment, if any. * @return string @@ -1314,6 +1345,8 @@ function get_media_items( $post_id, $errors ) { * * @since 2.5.0 * + * @global string $redir_tab + * * @param int $attachment_id Attachment ID for modification. * @param string|array $args Optional. Override defaults. * @return string HTML form for attachment. @@ -1478,8 +1511,12 @@ function get_media_item( $attachment_id, $args = null ) { } if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) { + + $calling_post = get_post( $calling_post_id ); + $calling_post_type_object = get_post_type_object( $calling_post->post_type ); + $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" ); - $thumbnail = "" . esc_html__( "Use as featured image" ) . ""; + $thumbnail = "" . esc_html( $calling_post_type_object->labels->use_featured_image ) . ""; } if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) { @@ -1559,6 +1596,13 @@ function get_media_item( $attachment_id, $args = null ) { return $item; } +/** + * @since 3.5.0 + * + * @param int $attachment_id + * @param array $args + * @return array + / function get_compat_media_markup( $attachment_id, $args = null ) { $post = get_post( $attachment_id ); @@ -1715,7 +1759,8 @@ function get_compat_media_markup( $attachment_id, $args = null ) { / function media_upload_header() { $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0; - echo '\n"; + + echo ''; if ( empty( $_GET['chromeless'] ) ) { echo '
'; the_media_upload_tabs(); @@ -1728,7 +1773,18 @@ function media_upload_header() { * * @since 2.5.0 * +<<<<<<< .mine + * @global string $type + * @global string $tab + * @global bool $is_IE + * @global bool $is_opera + * * @param array $errors +||||||| .r11156 + * @param unknown_type $errors +======= + * @param array $errors +>>>>>>> .r12027 / function media_upload_form( $errors = null ) { global $type, $tab, $is_IE, $is_opera; @@ -2127,6 +2183,10 @@ echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); * @since 2.5.0 * + * @global string $redir_tab + * @global string $type + * @global string $tab + * * @param array $errors / function media_upload_gallery_form($errors) { @@ -2272,6 +2332,13 @@ jQuery(function($){ * @since 2.5.0 * + * @global wpdb $wpdb + * @global WP_Query $wp_query + * @global WP_Locale $wp_locale + * @global string $type + * @global string $tab + * @global array $post_mime_types + * * @param array $errors / function media_upload_library_form($errors) { @@ -2556,6 +2623,8 @@ function wp_media_insert_url_form( $default_view = 'image' ) { Displays the multi-file uploader message. * * @since 2.6.0 + * + * @global int $post_ID */ function media_upload_flash_bypass() { $browser_uploader = admin_url( 'media-new.php?browser-uploader' ); @@ -2571,7 +2640,6 @@ function media_upload_flash_bypass() {
$data ) { if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) { - if (false == $separator_found) { + if ( ! $separator_found ) { $separator_found = true; } else { unset($menu[$id]); @@ -194,13 +194,23 @@ foreach ( $menu as $id => $data ) { } unset($id, $data); +/** + * + * @param string $add + * @param string $class + * @return string + */ function add_cssclass($add, $class) { $class = empty($class) ? $add : $class .= ' ' . $add; return $class; } +/** + * + * @param array $menu + * @return array + */ function add_menu_classes($menu) { - $first = $lastorder = false; $i = 0; $mc = count($menu); @@ -279,6 +289,15 @@ if ( apply_filters( 'custom_menu_order', false ) ) { $menu_order = array_flip($menu_order); $default_menu_order = array_flip($default_menu_order); + /** + * + * @global array $menu_order + * @global array $default_menu_order + * + * @param array $a + * @param array $b + * @return int + / function sort_menu($a, $b) { global $menu_order, $default_menu_order; $a = $a[2]; diff --git a/pavillonmadeleine.fr/wp-admin/includes/meta-boxes.php b/pavillonmadeleine.fr/wp-admin/includes/meta-boxes.php index 70057534..a7a895a1 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/meta-boxes.php +++ b/pavillonmadeleine.fr/wp-admin/includes/meta-boxes.php @@ -7,6 +7,8 @@ * @since 2.7.0 * + * @global string $action + * * @param object $post / function post_submit_meta_box($post, $args = array() ) { @@ -204,7 +206,10 @@ if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> -
+
+ + +

@@ -368,10 +373,13 @@ function post_format_meta_box( $post, $box ) { $post_formats[0][] = $post_format; ?>
- /> - -
/> -
+
+ + /> + +
/> + +

- link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('link_name )); ?>') ) {return true;}return false;"> + link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('link_name )); ?>') ) {return true;}return false;">
@@ -913,6 +923,8 @@ function link_target_meta_box($link) { ?> * @since 1.0.1 * + * @global object $link + * * @param string $class * @param string $value * @param mixed $deprecated Never used. diff --git a/pavillonmadeleine.fr/wp-admin/includes/misc.php b/pavillonmadeleine.fr/wp-admin/includes/misc.php index 367611b0..013a994b 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/misc.php +++ b/pavillonmadeleine.fr/wp-admin/includes/misc.php @@ -38,6 +38,8 @@ function got_mod_rewrite() { * * @since 3.7.0 * + * @global bool $is_nginx + * * @return bool Whether the server supports URL rewriting. / function got_url_rewrite() { @@ -153,6 +155,8 @@ function insert_with_markers( $filename, $marker, $insertion ) { blank out old rules. * * @since 1.5.0 + * + * @global WP_Rewrite $wp_rewrite / function save_mod_rewrite_rules() { if ( is_multisite() ) @@ -183,6 +187,8 @@ function save_mod_rewrite_rules() { * @since 2.8.0 * + * @global WP_Rewrite $wp_rewrite + * * @return bool True if web.config was updated successfully */ function iis7_save_url_rewrite_rules(){ @@ -244,10 +250,6 @@ function update_home_siteurl( $old_value, $value ) { flush_rewrite_rules(); } -add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 ); - /** * Shorten an URL, to be used as link text * @@ -308,6 +310,12 @@ function show_message($message) { flush(); } +/** + * @since 2.8.0 + * + * @param string $content + * @return array + / function wp_doc_link_parse( $content ) { if ( !is_string( $content ) || empty( $content ) ) return array(); @@ -593,6 +601,8 @@ function saveDomDocument($doc, $filename) { Display the default admin color scheme picker (Used in user-edit.php) * * @since 3.0.0 + * + * @global array $_wp_admin_css_colors */ function admin_color_scheme_picker( $user_id ) { global $_wp_admin_css_colors; @@ -646,6 +656,10 @@ function admin_color_scheme_picker( $user_id ) { var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";\n"; } -add_action( 'admin_head', 'wp_color_scheme_settings' ); +/** + * @since 3.3.0 + */ function _ipad_meta() { if ( wp_is_mobile() ) { ?> @@ -676,7 +692,6 @@ function _ipad_meta() { 1 ); - if ( ! $post_id = absint( $received['post_id'] ) ) + if ( ! $post_id = absint( $received['post_id'] ) ) { return $response; + } - if ( ! current_user_can( 'edit_post', $post_id ) || empty( $received['post_nonce'] ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) { return $response; - - if ( 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) { - $response['wp-refresh-post-nonces'] = array( - 'replace' => array( - 'getpermalinknonce' => wp_create_nonce('getpermalink'), - 'samplepermalinknonce' => wp_create_nonce('samplepermalink'), - 'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'), - '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ), - '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ), - ), - 'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ), - ); } + + $response['wp-refresh-post-nonces'] = array( + 'replace' => array( + 'getpermalinknonce' => wp_create_nonce('getpermalink'), + 'samplepermalinknonce' => wp_create_nonce('samplepermalink'), + 'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'), + '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ), + '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ), + ), + 'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ), + ); } return $response; } -add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 ); /** * Disable suspension of Heartbeat on the Add/Edit Post screens. * * @since 3.8.0 * + * @global string $pagenow + * * @param array $settings An array of Heartbeat settings. * @return array Filtered Heartbeat settings. */ @@ -799,7 +813,6 @@ function wp_heartbeat_set_suspension( $settings ) { return $settings; } -add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' ); /** * Autosave with heartbeat @@ -824,8 +837,6 @@ function heartbeat_autosave( $response, $data ) { return $response; } -// Run later as we have to set DOING_AUTOSAVE for back-compat -add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); /** * Disables autocomplete on the 'post' form (Add/Edit Post screens) for WebKit browsers, @@ -833,6 +844,9 @@ add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); * when the user navigates to it with the browser's Back button. See #28037 * * @since 4.0 + * + * @global bool $is_safari + * @global bool $is_chrome */ function post_form_autocomplete_off() { global $is_safari, $is_chrome; @@ -843,6 +857,53 @@ function post_form_autocomplete_off() { } add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' ); +<<<<<<< .mine +/** + * Remove single-use URL parameters and create canonical link based on new URL. + * + * Remove specific query string parameters from a URL, create the canonical link, + * put it in the admin header, and change the current URL to match. + * + * @since 4.2.0 + */ +function wp_admin_canonical_url() { + $removable_query_args = array( + 'message', 'settings-updated', 'saved', + 'update', 'updated', 'activated', + 'activate', 'deactivate', 'locked', + 'deleted', 'trashed', 'untrashed', + 'enabled', 'disabled', 'skipped', + 'spammed', 'unspammed', + ); + + /** + * Filter the list of URL parameters to remove. + * + * @since 4.2.0 + * + * @param array $removable_query_args An array of parameters to remove from the URL. + / + $removable_query_args = apply_filters( 'removable_query_args', $removable_query_args ); + + if ( empty( $removable_query_args ) ) { + return; + } + + // Ensure we're using an absolute URL. + $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ); + $filtered_url = remove_query_arg( $removable_query_args, $current_url ); + ?> + + +>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/includes/ms-admin-filters.php b/pavillonmadeleine.fr/wp-admin/includes/ms-admin-filters.php new file mode 100644 index 00000000..b49490eb --- /dev/null +++ b/pavillonmadeleine.fr/wp-admin/includes/ms-admin-filters.php @@ -0,0 +1,42 @@ +>>>>>> .r12027 / function wpmu_delete_blog( $blog_id, $drop = false ) { global $wpdb; @@ -169,6 +179,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { restore_current_blog(); } +<<<<<<< .mine /** * Delete a user from the network and remove from all sites. * @@ -176,9 +187,25 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { * * @todo Merge with wp_delete_user() ? * + * @global wpdb $wpdb + * * @param int $id The user ID. * @return bool True if the user was deleted, otherwise false. */ +||||||| .r11156 +// @todo Merge with wp_delete_user() ? +======= +/** + * Delete a user from the network and remove from all sites. + * + * @since 3.0.0 + * + * @todo Merge with wp_delete_user() ? + * + * @param int $id The user ID. + * @return bool True if the user was deleted, otherwise false. + */ +>>>>>>> .r12027 function wpmu_delete_user( $id ) { global $wpdb; @@ -187,6 +214,13 @@ function wpmu_delete_user( $id ) { if ( !$user->exists() ) return false; + + // Global super-administrators are protected, and cannot be deleted. + $_super_admins = get_super_admins(); + if ( in_array( $user->user_login, $_super_admins, true ) ) { + return false; + } + /** * Fires before a user is deleted from the network. * @@ -253,7 +287,14 @@ function update_option_new_admin_email( $old_value, $value ) { ); update_option( 'adminhash', $new_admin_email ); +<<<<<<< .mine + /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. / + $email_text = __( 'Howdy ###USERNAME###, +||||||| .r11156 + $email_text = __( 'Dear user, +======= $email_text = __( 'Howdy ###USERNAME###, +>>>>>>> .r12027 You recently requested to have the administration email address on your site changed. @@ -287,7 +328,13 @@ All at ###SITENAME### / $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email ); +<<<<<<< .mine + $current_user = wp_get_current_user(); + $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); +||||||| .r11156 +======= $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); +>>>>>>> .r12027 $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); @@ -295,8 +342,6 @@ All at ###SITENAME### wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); } -add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); -add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); /** * Sends an email when an email address change is requested. @@ -334,7 +379,14 @@ function send_confirmation_on_profile_email() { ); update_option( $current_user->ID . '_new_email', $new_user_email ); +<<<<<<< .mine + /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */ + $email_text = __( 'Howdy ###USERNAME###, +||||||| .r11156 + $email_text = __( 'Dear user, +======= $email_text = __( 'Howdy ###USERNAME###, +>>>>>>> .r12027 You recently requested to have the email address on your account changed. @@ -377,7 +429,6 @@ All at ###SITENAME### $_POST['email'] = $current_user->user_email; } } -add_action( 'personal_options_update', 'send_confirmation_on_profile_email' ); /** * Adds an admin notice alerting the user to check for confirmation email @@ -389,7 +440,6 @@ function new_user_email_admin_notice() { if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) echo "
" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "
"; } -add_action( 'admin_notices', 'new_user_email_admin_notice' ); /** * Check whether a blog has used its allotted upload space. @@ -452,9 +502,9 @@ function display_space_usage() { * @return int Max size in bytes */ function fix_import_form_size( $size ) { - if ( upload_is_user_over_quota( false ) == true ) + if ( upload_is_user_over_quota( false ) ) { return 0; - + } $available = get_upload_space_available(); return min( $size, $available ); } @@ -484,8 +534,26 @@ function upload_space_setting( $id ) { >>>>>> .r12027 function update_user_status( $id, $pref, $value, $deprecated = null ) { global $wpdb; @@ -613,7 +682,6 @@ function sync_category_tag_slugs( $term, $taxonomy ) { } return $term; } -add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 ); /** * Displays an access denied message when a user tries to view a site's dashboard they @@ -654,7 +722,6 @@ function _access_denied_splash() { wp_die( $output, 403 ); } -add_action( 'admin_page_access_denied', '_access_denied_splash', 99 ); /** * Checks if the current user has permissions to import new users. @@ -669,7 +736,6 @@ function check_import_new_users( $permission ) { return false; return true; } -add_filter( 'import_allow_create_users', 'check_import_new_users' ); // See "import_allow_fetch_attachments" and "import_attachment_size_limit" filters too. / @@ -722,13 +788,26 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) { echo implode( "\n\t", $output ); } +<<<<<<< .mine / * Displays an admin notice to upgrade all sites after a core upgrade. * * @since 3.0.0 * * @global int $wp_db_version The version number of the database. + * + * @return false False if the current user is not a super admin. */ +||||||| .r11156 +======= +/** + * Displays an admin notice to upgrade all sites after a core upgrade. + * + * @since 3.0.0 + * + * @global int $wp_db_version The version number of the database. + */ +>>>>>>> .r12027 function site_admin_notice() { global $wp_db_version; if ( !is_super_admin() ) @@ -736,8 +815,6 @@ function site_admin_notice() { if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) echo "
" . sprintf( __( 'Thank you for Updating! Please visit the Upgrade Network page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "
"; } -add_action( 'admin_notices', 'site_admin_notice' ); -add_action( 'network_admin_notices', 'site_admin_notice' ); /** * Avoids a collision between a site slug and a permalink slug. @@ -772,7 +849,6 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) { } return $data; } -add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 ); /** * Handles the display of choosing a user's primary site. @@ -808,8 +884,16 @@ function choose_primary_blog() { update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id ); } } elseif ( count( $all_blogs ) == 1 ) { +<<<<<<< .mine $blog = reset( $all_blogs ); + echo esc_url( get_home_url( $blog->userblog_id ) ); +||||||| .r11156 + $blog = array_shift( $all_blogs ); echo $blog->domain; +======= + $blog = reset( $all_blogs ); + echo $blog->domain; +>>>>>>> .r12027 if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list. update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id ); } else { @@ -837,7 +921,14 @@ function choose_primary_blog() { * Grants Super Admin privileges. * * @since 3.0.0 +<<<<<<< .mine + * + * @global array $super_admins * +||||||| .r11156 +======= + * +>>>>>>> .r12027 * @param int $user_id ID of the user to be granted Super Admin privileges. * @return bool True on success, false on failure. This can fail when the user is * already a super admin or when the `$super_admins` global is defined. @@ -882,7 +973,14 @@ function grant_super_admin( $user_id ) { * Revokes Super Admin privileges. * * @since 3.0.0 +<<<<<<< .mine + * + * @global array $super_admins * +||||||| .r11156 +======= + * +>>>>>>> .r12027 * @param int $user_id ID of the user Super Admin privileges to be revoked from. * @return bool True on success, false on failure. This can fail when the user's email * is the network admin email or when the `$super_admins` global is defined. @@ -932,9 +1030,19 @@ function revoke_super_admin( $user_id ) { * this allows for this to be overridden. * * @since 3.1.0 +<<<<<<< .mine + * + * @global wpdb $wpdb + * + * @param int $site_id The network/site ID to check. + * @return bool True if network can be edited, otherwise false. +||||||| .r11156 + * @param integer $site_id The network/site ID to check. +======= * * @param int $site_id The network/site ID to check. * @return bool True if network can be edited, otherwise false. +>>>>>>> .r12027 / function can_edit_network( $site_id ) { global $wpdb; diff --git a/pavillonmadeleine.fr/wp-admin/includes/nav-menu.php b/pavillonmadeleine.fr/wp-admin/includes/nav-menu.php index 95752974..43af11aa 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/nav-menu.php +++ b/pavillonmadeleine.fr/wp-admin/includes/nav-menu.php @@ -40,6 +40,8 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { @see Walker_Nav_Menu::start_el() * @since 3.0.0 * + * @global int $_wp_nav_menu_max_depth + * * @param string $output Passed by reference. Used to append additional content. * @param object $item Menu item data object. * @param int $depth Depth of menu item. Used for padding. @@ -97,8 +99,8 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { ?>
-
-
+
+
> type_label ); ?> @@ -133,11 +135,11 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) ); ?>"> -
-
+

- type ) : ?> + type ) : ?>

@@ -145,13 +147,13 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

@@ -195,7 +197,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

- type && $original_title !== false ) : ?> + type && $original_title !== false ) : ?>

url ) . '">' . esc_html( $original_title ) . '' ); ?>

@@ -235,6 +237,10 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { * @uses Walker_Nav_Menu */ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { + /** + * + * @param array $fields + */ public function __construct( $fields = false ) { if ( $fields ) { $this->db_fields = $fields; @@ -280,6 +286,8 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu { * * @since 3.0.0 * + * @global int $_nav_menu_placeholder + * * @param string $output Passed by reference. Used to append additional content. * @param object $item Menu item data object. * @param int $depth Depth of menu item. Used for padding. @@ -451,18 +459,20 @@ function wp_nav_menu_setup() { add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); // If first time editing, disable advanced items by default. - if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { + if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { $user = wp_get_current_user(); update_user_option($user->ID, 'managenav-menuscolumnshidden', - array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', ), + array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ), true); } } /** - * Limit the amount of meta boxes to just links, pages and cats for first time users. + * Limit the amount of meta boxes to pages, posts, links, and categories for first time users. * * @since 3.0.0 + * + * @global array $wp_meta_boxes **/ function wp_initial_nav_menu_meta_boxes() { global $wp_meta_boxes; @@ -470,7 +480,7 @@ function wp_initial_nav_menu_meta_boxes() { if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) return; - $initial_meta_boxes = array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category' ); + $initial_meta_boxes = array( 'add-page', 'add-post', 'add-custom-links', 'add-category' ); $hidden_meta_boxes = array(); foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) { @@ -549,7 +559,14 @@ function wp_nav_menu_taxonomy_meta_boxes() { * * @since 3.6.0 * +<<<<<<< .mine + * @global bool $one_theme_location_no_menus to determine if no menus exist +||||||| .r11156 + * @uses global $one_theme_location_no_menus to determine if no menus exist + * @uses disabled() to output the disabled attribute in $other_attributes param in submit_button() +======= * @uses global $one_theme_location_no_menus to determine if no menus exist +>>>>>>> .r12027 * * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu * @return string Disabled attribute if at least one menu exists, false if not @@ -567,6 +584,9 @@ function wp_nav_menu_disabled_check( $nav_menu_selected_id ) { * Displays a metabox for the custom links menu item. * * @since 3.0.0 + * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id */ function wp_nav_menu_item_link_meta_box() { global $_nav_menu_placeholder, $nav_menu_selected_id; @@ -606,6 +626,9 @@ function wp_nav_menu_item_link_meta_box() { * * @since 3.0.0 * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $post_type The post type object. */ @@ -712,6 +735,21 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { $recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) ); $most_recent = $get_posts->query( $recent_args ); $args['walker'] = $walker; + + /** + * Filter the posts displayed in the 'Most Recent' tab of the current + * post type's menu items meta box. + * + * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name. + * + * @since 4.3.0 + * + * @param array $most_recent An array of post objects being listed. + * @param array $args An array of WP_Query arguments. + * @param object $post_type The current post type object for this menu item meta box. + */ + $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type ); + echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args ); ?> @@ -849,6 +887,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { * * @since 3.0.0 * + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $taxonomy The taxonomy object. */ @@ -1162,7 +1202,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { $result .= '

' . __( 'Add menu items from the column on the left.' ) . '

'; $result .= '

'; - if( empty($menu_items) ) + if ( empty($menu_items) ) return $result . ' '; /** @@ -1215,6 +1255,7 @@ function wp_nav_menu_manage_columns() { return array( '_title' => __('Show advanced menu properties'), 'cb' => '', + 'title-attribute' => __('Title Attribute'), 'link-target' => __('Link Target'), 'css-classes' => __('CSS Classes'), 'xfn' => __('Link Relationship (XFN)'), @@ -1228,6 +1269,7 @@ function wp_nav_menu_manage_columns() { * @access private * @since 3.0.0 * + * @global wpdb $wpdb */ function _wp_delete_orphaned_draft_menu_items() { global $wpdb; @@ -1239,7 +1281,6 @@ function _wp_delete_orphaned_draft_menu_items() { foreach( (array) $menu_items_to_delete as $menu_item_id ) wp_delete_post( $menu_item_id, true ); } -add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items'); /** * Saves nav menu items @@ -1280,10 +1321,11 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args ); - if ( is_wp_error( $menu_item_db_id ) ) + if ( is_wp_error( $menu_item_db_id ) ) { $messages[] = '

' . $menu_item_db_id->get_error_message() . '

'; - elseif ( isset( $menu_items[$menu_item_db_id] ) ) - unset( $menu_items[$menu_item_db_id] ); + } else { + unset( $menu_items[ $menu_item_db_id ] ); + } } } diff --git a/pavillonmadeleine.fr/wp-admin/includes/plugin-install.php b/pavillonmadeleine.fr/wp-admin/includes/plugin-install.php index b8cf32f0..326f3ced 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/plugin-install.php +++ b/pavillonmadeleine.fr/wp-admin/includes/plugin-install.php @@ -130,6 +130,9 @@ function install_popular_tags( $args = array() ) { return $tags; } +/** + * @since 2.7.0 + */ function install_dashboard() { ?>

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

@@ -148,22 +151,28 @@ function install_dashboard() { } else { //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud() $tags = array(); - foreach ( (array)$api_tags as $tag ) - $tags[ $tag['name'] ] = (object) array( - 'link' => esc_url( self_admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ), - 'name' => $tag['name'], - 'id' => sanitize_title_with_dashes($tag['name']), - 'count' => $tag['count'] ); + foreach ( (array) $api_tags as $tag ) { + $url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) ); + $data = array( + 'link' => esc_url( $url ), + 'name' => $tag['name'], + 'slug' => $tag['slug'], + 'id' => sanitize_title_with_dashes( $tag['name'] ), + 'count' => $tag['count'] + ); + $tags[ $tag['name'] ] = (object) $data; + } echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) ); } echo '

'; } -add_action( 'install_plugins_featured', 'install_dashboard' ); /** * Display search form for searching plugins. * * @since 2.7.0 + * + * @param bool $type_selector */ function install_search_form( $type_selector = true ) { $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term'; @@ -209,7 +218,12 @@ function install_plugins_upload() {

>>>>>> .r12027 /** * Show a username form for the favorites page @@ -235,6 +249,8 @@ function install_plugins_favorites_form() { * Display plugin content based on plugin list. * * @since 2.7.0 + * + * @global WP_List_Table $wp_list_table */ function display_plugins_table() { global $wp_list_table; @@ -256,17 +272,30 @@ function display_plugins_table() { >>>>>> .r12027 /** * Determine the status we can perform on a plugin. * * @since 3.0.0 + * + * @param array|object $api + * @param bool $loop + * @return type */ function install_plugin_install_status($api, $loop = false) { // This function is called recursively, $loop prevents further loops. @@ -337,6 +366,9 @@ function install_plugin_install_status($api, $loop = false) { * Display plugin information in dialog box form. * * @since 2.7.0 + * + * @global string $tab + * @global string $wp_version */ function install_plugin_information() { global $tab; @@ -577,4 +609,3 @@ function install_plugin_information() { iframe_footer(); exit; } -add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); diff --git a/pavillonmadeleine.fr/wp-admin/includes/plugin.php b/pavillonmadeleine.fr/wp-admin/includes/plugin.php index bb16117f..e1d61800 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/plugin.php +++ b/pavillonmadeleine.fr/wp-admin/includes/plugin.php @@ -219,9 +219,9 @@ function get_plugin_files($plugin) { * * WordPress only supports plugin files in the base plugins directory * (wp-content/plugins) and in one directory above the plugins directory - * (wp-content/plugins/my-plugin). The file it looks for has the plugin data and - * must be found in those two locations. It is recommended that do keep your - * plugin files in directories. + * (wp-content/plugins/my-plugin). The file it looks for has the plugin data + * and must be found in those two locations. It is recommended to keep your + * plugin files in their own directories. * * The file with the plugin data is the file that will be included and therefore * needs to have the main execution for the plugin. This does not mean @@ -576,9 +576,11 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen } if ( $network_wide ) { + $current = get_site_option( 'active_sitewide_plugins', array() ); $current[$plugin] = time(); update_site_option( 'active_sitewide_plugins', $current ); } else { + $current = get_option( 'active_plugins', array() ); $current[] = $plugin; sort($current); update_option('active_plugins', $current); @@ -749,6 +751,8 @@ function activate_plugins( $plugins, $redirect = '', $network_wide = false, $sil * * @since 2.6.0 * + * @global WP_Filesystem_Base $wp_filesystem + * * @param array $plugins List of plugins to delete. * @param string $deprecated Deprecated. * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure. @@ -767,8 +771,8 @@ function delete_plugins( $plugins, $deprecated = '' ) { ob_start(); $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins'); if ( false === ($credentials = request_filesystem_credentials($url)) ) { - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ){ include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -780,8 +784,8 @@ function delete_plugins( $plugins, $deprecated = '' ) { if ( ! WP_Filesystem($credentials) ) { request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ){ include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -944,6 +948,7 @@ function is_uninstallable_plugin($plugin) { * @since 2.7.0 * * @param string $plugin Relative plugin path from Plugin Directory. + * @return true True if a plugin's uninstall.php file has been found and included. */ function uninstall_plugin($plugin) { $file = plugin_basename($plugin); @@ -999,6 +1004,11 @@ function uninstall_plugin($plugin) { * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * + * @global array $menu + * @global array $admin_page_hooks + * @global array $_registered_pages + * @global array $_parent_pages + * * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected * @param string $menu_title The text to be used for the menu * @param string $capability The capability required for this menu to be displayed to the user. @@ -1057,6 +1067,8 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * + * @global int $_wp_last_object_menu + * * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected * @param string $menu_title The text to be used for the menu * @param string $capability The capability required for this menu to be displayed to the user. @@ -1083,6 +1095,8 @@ function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $fu * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * + * @global int $_wp_last_utility_menu + * * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected * @param string $menu_title The text to be used for the menu * @param string $capability The capability required for this menu to be displayed to the user. @@ -1109,6 +1123,13 @@ function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $f * The function which is hooked in to handle the output of the page must check * that the user has the required capability as well. * + * @global array $submenu + * @global array $menu + * @global type $_wp_real_parent_file + * @global bool $_wp_submenu_nopriv + * @global array $_registered_pages + * @global array $_parent_pages + * * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page) * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected * @param string $menu_title The text to be used for the menu @@ -1119,12 +1140,8 @@ function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $f * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required. */ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) { - global $submenu; - global $menu; - global $_wp_real_parent_file; - global $_wp_submenu_nopriv; - global $_registered_pages; - global $_parent_pages; + global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv, + $_registered_pages, $_parent_pages; $menu_slug = plugin_basename( $menu_slug ); $parent_slug = plugin_basename( $parent_slug); @@ -1410,6 +1427,8 @@ function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $ * * @since 3.1.0 * + * @global array $menu + * * @param string $menu_slug The slug of the menu * @return array|bool The removed menu on success, False if not found */ @@ -1431,6 +1450,8 @@ function remove_menu_page( $menu_slug ) { * * @since 3.1.0 * + * @global array $submenu + * * @param string $menu_slug The slug for the parent menu * @param string $submenu_slug The slug of the submenu * @return array|bool The removed submenu on success, False if not found @@ -1458,6 +1479,8 @@ function remove_submenu_page( $menu_slug, $submenu_slug ) { * * @since 3.0.0 * + * @global array $_parent_pages + * * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) * @param bool $echo Whether or not to echo the url - default is true * @return string the url @@ -1487,17 +1510,21 @@ function menu_page_url($menu_slug, $echo = true) { // // Pluggable Menu Support -- Private // - +/** + * + * @global string $parent_file + * @global array $menu + * @global array $submenu + * @global string $pagenow + * @global string $typenow + * @global string $plugin_page + * @global string $_wp_real_parent_file + * @global array $_wp_menu_nopriv + * @global array $_wp_submenu_nopriv + */ function get_admin_page_parent( $parent = '' ) { - global $parent_file; - global $menu; - global $submenu; - global $pagenow; - global $typenow; - global $plugin_page; - global $_wp_real_parent_file; - global $_wp_menu_nopriv; - global $_wp_submenu_nopriv; + global $parent_file, $menu, $submenu, $pagenow, $typenow, + $plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv; if ( !empty ( $parent ) && 'admin.php' != $parent ) { if ( isset( $_wp_real_parent_file[$parent] ) ) @@ -1551,13 +1578,17 @@ function get_admin_page_parent( $parent = '' ) { return ''; } +/** + * + * @global string $title + * @global array $menu + * @global array $submenu + * @global string $pagenow + * @global string $plugin_page + * @global string $typenow + */ function get_admin_page_title() { - global $title; - global $menu; - global $submenu; - global $pagenow; - global $plugin_page; - global $typenow; + global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow; if ( ! empty ( $title ) ) return $title; @@ -1627,6 +1658,13 @@ function get_admin_page_title() { return $title; } +/** + * @since 2.3.0 + * + * @param string $plugin_page + * @param string $parent_page + * @return string|null + */ function get_plugin_page_hook( $plugin_page, $parent_page ) { $hook = get_plugin_page_hookname( $plugin_page, $parent_page ); if ( has_action($hook) ) @@ -1635,6 +1673,12 @@ function get_plugin_page_hook( $plugin_page, $parent_page ) { return null; } +/** + * + * @global array $admin_page_hooks + * @param string $plugin_page + * @param string $parent_page + */ function get_plugin_page_hookname( $plugin_page, $parent_page ) { global $admin_page_hooks; @@ -1656,14 +1700,19 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { return $page_type . '_page_' . $plugin_name; } +/** + * + * @global string $pagenow + * @global array $menu + * @global array $submenu + * @global array $_wp_menu_nopriv + * @global array $_wp_submenu_nopriv + * @global string $plugin_page + * @global array $_registered_pages + */ function user_can_access_admin_page() { - global $pagenow; - global $menu; - global $submenu; - global $_wp_menu_nopriv; - global $_wp_submenu_nopriv; - global $plugin_page; - global $_registered_pages; + global $pagenow, $menu, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv, + $plugin_page, $_registered_pages; $parent = get_admin_page_parent(); @@ -1736,6 +1785,8 @@ function user_can_access_admin_page() { * * @since 2.7.0 * + * @global array $new_whitelist_options + * * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. @@ -1764,9 +1815,22 @@ function register_setting( $option_group, $option_name, $sanitize_callback = '' * * @since 2.7.0 * +<<<<<<< .mine + * @global array $new_whitelist_options + * + * @param string $option_group + * @param string $option_name + * @param callable $sanitize_callback +||||||| .r11156 + * @param unknown_type $option_group + * @param unknown_type $option_name + * @param unknown_type $sanitize_callback + * @return unknown +======= * @param string $option_group * @param string $option_name * @param callable $sanitize_callback +>>>>>>> .r12027 */ function unregister_setting( $option_group, $option_name, $sanitize_callback = '' ) { global $new_whitelist_options; @@ -1781,7 +1845,7 @@ function unregister_setting( $option_group, $option_name, $sanitize_callback = ' $option_group = 'reading'; } - $pos = array_search( $option_name, (array) $new_whitelist_options ); + $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] ); if ( $pos !== false ) unset( $new_whitelist_options[ $option_group ][ $pos ] ); if ( $sanitize_callback != '' ) @@ -1793,8 +1857,18 @@ function unregister_setting( $option_group, $option_name, $sanitize_callback = ' * * @since 2.7.0 * +<<<<<<< .mine + * @global array $new_whitelist_options + * * @param array $options * @return array +||||||| .r11156 + * @param unknown_type $options + * @return unknown +======= + * @param array $options + * @return array +>>>>>>> .r12027 */ function option_update_filter( $options ) { global $new_whitelist_options; @@ -1804,16 +1878,27 @@ function option_update_filter( $options ) { return $options; } -add_filter( 'whitelist_options', 'option_update_filter' ); /** * {@internal Missing Short Description}} * * @since 2.7.0 * +<<<<<<< .mine + * @global array $whitelist_options + * * @param array $new_options * @param string|array $options * @return array +||||||| .r11156 + * @param unknown_type $new_options + * @param unknown_type $options + * @return unknown +======= + * @param array $new_options + * @param string|array $options + * @return array +>>>>>>> .r12027 */ function add_option_whitelist( $new_options, $options = '' ) { if ( $options == '' ) @@ -1842,9 +1927,21 @@ function add_option_whitelist( $new_options, $options = '' ) { * * @since 2.7.0 * +<<<<<<< .mine + * @global array $whitelist_options + * + * @param array $del_options + * @param string|array $options + * @return array +||||||| .r11156 + * @param unknown_type $del_options + * @param unknown_type $options + * @return unknown +======= * @param array $del_options * @param string|array $options * @return array +>>>>>>> .r12027 */ function remove_option_whitelist( $del_options, $options = '' ) { if ( $options == '' ) diff --git a/pavillonmadeleine.fr/wp-admin/includes/post.php b/pavillonmadeleine.fr/wp-admin/includes/post.php index 3885c2e1..14b81187 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/post.php +++ b/pavillonmadeleine.fr/wp-admin/includes/post.php @@ -173,6 +173,8 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { * * @since 1.5.0 * + * @global wpdb $wpdb + * * @param array $post_data Optional. * @return int Post ID. */ @@ -383,7 +385,7 @@ function edit_post( $post_data = null ) { wp_set_post_lock( $post_ID ); - if ( current_user_can( $ptype->cap->edit_others_posts ) ) { + if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) { if ( ! empty( $post_data['sticky'] ) ) stick_post( $post_ID ); else @@ -401,6 +403,8 @@ function edit_post( $post_data = null ) { * * @since 2.7.0 * + * @global wpdb $wpdb + * * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal. * @return array */ @@ -606,8 +610,8 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) $post->post_status = 'draft'; $post->to_ping = ''; $post->pinged = ''; - $post->comment_status = get_option( 'default_comment_status' ); - $post->ping_status = get_option( 'default_ping_status' ); + $post->comment_status = get_default_comment_status( $post_type ); + $post->ping_status = get_default_comment_status( $post_type, 'pingback' ); $post->post_pingback = get_option( 'default_pingback_flag' ); $post->post_category = get_option( 'default_category' ); $post->page_template = 'default'; @@ -654,6 +658,8 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param string $title Post title * @param string $content Optional post content * @param string $date Optional post date @@ -695,7 +701,15 @@ function post_exists($title, $content = '', $date = '') { * * @since 2.1.0 * +<<<<<<< .mine + * @global WP_User $current_user + * * @return int|WP_Error +||||||| .r11156 + * @return unknown +======= + * @return int|WP_Error +>>>>>>> .r12027 */ function wp_write_post() { if ( isset($_POST['post_type']) ) @@ -834,7 +848,15 @@ function delete_meta( $mid ) { * * @since 1.2.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * * @return mixed +||||||| .r11156 + * @return unknown +======= + * @return mixed +>>>>>>> .r12027 */ function get_meta_keys() { global $wpdb; @@ -865,8 +887,18 @@ function get_post_meta_by_id( $mid ) { * * @since 1.2.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * * @param int $postid * @return mixed +||||||| .r11156 + * @param unknown_type $postid + * @return unknown +======= + * @param int $postid + * @return mixed +>>>>>>> .r12027 */ function has_meta( $postid ) { global $wpdb; @@ -1055,8 +1087,18 @@ function wp_edit_posts_query( $q = false ) { * * @since 2.5.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * * @param string $type * @return mixed +||||||| .r11156 + * @param unknown_type $type + * @return unknown +======= + * @param string $type + * @return mixed +>>>>>>> .r12027 */ function get_available_post_mime_types($type = 'attachment') { global $wpdb; @@ -1304,7 +1346,7 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { } if ( isset( $view_post ) ) { - if( 'draft' == $post->post_status ) { + if ( 'draft' == $post->post_status ) { $preview_link = set_url_scheme( get_permalink( $post->ID ) ); /** This filter is documented in wp-admin/includes/meta-boxes.php */ $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ); @@ -1338,6 +1380,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { * * @since 2.9.0 * + * @global int $content_width + * @global array $_wp_additional_image_sizes + * * @param int $thumbnail_id ID of the attachment used for thumbnail * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post. * @return string html @@ -1345,11 +1390,16 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { global $content_width, $_wp_additional_image_sizes; - $post = get_post( $post ); + $post = get_post( $post ); + $post_type_object = get_post_type_object( $post->post_type ); + $set_thumbnail_link = '

'; + $upload_iframe_src = get_upload_iframe_src( 'image', $post->ID ); - $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) ); - $set_thumbnail_link = '

'; - $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) ); + $content = sprintf( $set_thumbnail_link, + esc_attr( $post_type_object->labels->set_featured_image ), + esc_url( $upload_iframe_src ), + esc_html( $post_type_object->labels->set_featured_image ) + ); if ( $thumbnail_id && get_post( $thumbnail_id ) ) { $old_content_width = $content_width; @@ -1360,8 +1410,12 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' ); if ( !empty( $thumbnail_html ) ) { $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID ); - $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html ); - $content .= '

' . esc_html__( 'Remove featured image' ) . '

'; + $content = sprintf( $set_thumbnail_link, + esc_attr( $post_type_object->labels->set_featured_image ), + esc_url( $upload_iframe_src ), + $thumbnail_html + ); + $content .= '

' . esc_html( $post_type_object->labels->remove_featured_image ) . '

'; } $content_width = $old_content_width; } diff --git a/pavillonmadeleine.fr/wp-admin/includes/schema.php b/pavillonmadeleine.fr/wp-admin/includes/schema.php index c522ab56..0379a3a1 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/schema.php +++ b/pavillonmadeleine.fr/wp-admin/includes/schema.php @@ -8,14 +8,17 @@ * @subpackage Administration */ -// Declare these as global in case schema.php is included from a function. +/** + * Declare these as global in case schema.php is included from a function. + * + * @global wpdb $wpdb + * @global array $wp_queries + * @global string $charset_collate + */ global $wpdb, $wp_queries, $charset_collate; /** * The database character collate. - * @var string - * @global string - * @name $charset_collate */ $charset_collate = $wpdb->get_charset_collate(); @@ -24,6 +27,8 @@ $charset_collate = $wpdb->get_charset_collate(); * * @since 3.3.0 * + * @global wpdb $wpdb + * * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all. * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. * @return string The SQL needed to create the requested tables. @@ -331,9 +336,19 @@ $wp_queries = wp_get_db_schema( 'all' ); * Create WordPress options and set the default values. * * @since 1.5.0 +<<<<<<< .mine + * + * @global wpdb $wpdb WordPress database abstraction object. + * @global int $wp_db_version + * @global int $wp_current_db_version +||||||| .r11156 + * @uses $wpdb + * @uses $wp_db_version +======= * * @global wpdb $wpdb WordPress database abstraction object. * @uses $wp_db_version +>>>>>>> .r12027 */ function populate_options() { global $wpdb, $wp_db_version, $wp_current_db_version; @@ -490,6 +505,9 @@ function populate_options() { // 3.5 'link_manager_enabled' => 0, + + // 4.3.0 + 'finished_splitting_shared_terms' => 1, ); // 3.3 @@ -862,6 +880,11 @@ endif; * * @since 3.0.0 * + * @global wpdb $wpdb + * @global object $current_site + * @global int $wp_db_version + * @global WP_Rewrite $wp_rewrite + * * @param int $network_id ID of network to populate. * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful, * so the error code must be checked) or failure. @@ -917,7 +940,14 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam $site_admins = get_site_option( 'site_admins' ); } +<<<<<<< .mine + /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */ + $welcome_email = __( 'Howdy USERNAME, +||||||| .r11156 + $welcome_email = __( 'Dear User, +======= $welcome_email = __( 'Howdy USERNAME, +>>>>>>> .r12027 Your new SITE_NAME site has been successfully set up at: BLOG_URL diff --git a/pavillonmadeleine.fr/wp-admin/includes/screen.php b/pavillonmadeleine.fr/wp-admin/includes/screen.php index 3572446d..7131e74a 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/screen.php +++ b/pavillonmadeleine.fr/wp-admin/includes/screen.php @@ -11,6 +11,8 @@ * * @since 2.7.0 * + * @staticvar array $column_headers + * * @param string|WP_Screen $screen The screen you want the headers for * @return array Containing the headers in the format id => UI String */ @@ -60,7 +62,15 @@ function get_hidden_columns( $screen ) { * * @since 2.7.0 * +<<<<<<< .mine + * @global array $wp_meta_boxes + * * @param WP_Screen $screen +||||||| .r11156 + * @param string|WP_Screen $screen +======= + * @param WP_Screen $screen +>>>>>>> .r12027 */ function meta_box_prefs( $screen ) { global $wp_meta_boxes; @@ -73,9 +83,12 @@ function meta_box_prefs( $screen ) { $hidden = get_hidden_meta_boxes($screen); - foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) { - foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) { - foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) { + foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) { + foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) { + if ( ! isset( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] ) ) { + continue; + } + foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) { if ( false == $box || ! $box['title'] ) continue; // Submit box cannot be hidden @@ -162,6 +175,8 @@ function add_screen_option( $option, $args = array() ) { * * @since 3.1.0 * + * @global WP_Screen $current_screen + * * @return WP_Screen Current screen object */ function get_current_screen() { @@ -179,7 +194,7 @@ function get_current_screen() { * @since 3.0.0 * * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen, - * or an existing screen object. + * or an existing screen object. */ function set_current_screen( $hook_name = '' ) { WP_Screen::get( $hook_name )->set_current_screen(); @@ -323,6 +338,11 @@ final class WP_Screen { /** * Stores old string-based help. + * + * @static + * @access private + * + * @var array */ private static $_old_compat_help = array(); @@ -339,8 +359,11 @@ final class WP_Screen { * The screen object registry. * * @since 3.3.0 - * @var array + * + * @static * @access private + * + * @var array */ private static $_registry = array(); @@ -368,13 +391,32 @@ final class WP_Screen { * @since 3.3.0 * @access public * +<<<<<<< .mine + * @static + * + * @global string $hook_suffix + * + * @param string|WP_Screen $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen. + * Defaults to the current $hook_suffix global. +||||||| .r11156 + * @param string $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen. + * Defaults to the current $hook_suffix global. +======= * @param string|WP_Screen $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen. * Defaults to the current $hook_suffix global. +>>>>>>> .r12027 * @return WP_Screen Screen object. */ public static function get( $hook_name = '' ) { +<<<<<<< .mine + if ( $hook_name instanceof WP_Screen ) { +||||||| .r11156 + + if ( is_a( $hook_name, 'WP_Screen' ) ) +======= if ( $hook_name instanceof WP_Screen ) { +>>>>>>> .r12027 return $hook_name; } @@ -529,6 +571,10 @@ final class WP_Screen { * * @see set_current_screen() * @since 3.3.0 + * + * @global WP_Screen $current_screen + * @global string $taxnow + * @global string $typenow */ public function set_current_screen() { global $current_screen, $taxnow, $typenow; @@ -560,9 +606,8 @@ final class WP_Screen { * @since 3.5.0 * * @param string $admin The admin to check against (network | user | site). - * If empty any of the three admins will result in true. - * @return boolean True if the screen is in the indicated admin, false otherwise. - * + * If empty any of the three admins will result in true. + * @return bool True if the screen is in the indicated admin, false otherwise. */ public function in_admin( $admin = null ) { if ( empty( $admin ) ) @@ -578,6 +623,8 @@ final class WP_Screen { * * @since 3.3.0 * + * @static + * * @param WP_Screen $screen A screen object. * @param string $help Help text. */ @@ -787,6 +834,8 @@ final class WP_Screen { * This will trigger the deprecated filters for backwards compatibility. * * @since 3.3.0 + * + * @global string $screen_layout_columns */ public function render_screen_meta() { @@ -947,18 +996,24 @@ final class WP_Screen {

get_help_tabs() ) : ?>

- +

show_screen_options() ) : ?>

- +

>>>>>> .r12027 */ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) { global $wp_list_table; @@ -476,7 +489,7 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $ ?>

- @@ -453,25 +485,121 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ); if ( $show_password_fields ) : ?> +<<<<<<< .mine +

+'; } +/** + * + * @global int $upgrading + * @return false|void + */ function maintenance_nag() { include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version global $upgrading; @@ -431,5 +503,3 @@ function maintenance_nag() { echo "

$msg

"; } -add_action( 'admin_notices', 'maintenance_nag' ); -add_action( 'network_admin_notices', 'maintenance_nag' ); diff --git a/pavillonmadeleine.fr/wp-admin/includes/upgrade.php b/pavillonmadeleine.fr/wp-admin/includes/upgrade.php index cb2188b4..77cae470 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/upgrade.php +++ b/pavillonmadeleine.fr/wp-admin/includes/upgrade.php @@ -118,6 +118,10 @@ if ( !function_exists('wp_install_defaults') ) : * * @since 2.1.0 * + * @global wpdb $wpdb + * @global WP_Rewrite $wp_rewrite + * @global string $table_prefix + * * @param int $user_id User ID. */ function wp_install_defaults( $user_id ) { @@ -152,31 +156,31 @@ function wp_install_defaults( $user_id ) { $first_post = get_site_option( 'first_post' ); if ( empty($first_post) ) - $first_post = __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!' ); + $first_post = __( 'Welcome to SITE_NAME. This is your first post. Edit or delete it, then start writing!' ); $first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post ); $first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post ); } else { - $first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'); + $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ); } $wpdb->insert( $wpdb->posts, array( - 'post_author' => $user_id, - 'post_date' => $now, - 'post_date_gmt' => $now_gmt, - 'post_content' => $first_post, - 'post_excerpt' => '', - 'post_title' => __('Hello world!'), - /* translators: Default post slug */ - 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ), - 'post_modified' => $now, - 'post_modified_gmt' => $now_gmt, - 'guid' => $first_post_guid, - 'comment_count' => 1, - 'to_ping' => '', - 'pinged' => '', - 'post_content_filtered' => '' - )); + 'post_author' => $user_id, + 'post_date' => $now, + 'post_date_gmt' => $now_gmt, + 'post_content' => $first_post, + 'post_excerpt' => '', + 'post_title' => __('Hello world!'), + /* translators: Default post slug */ + 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ), + 'post_modified' => $now, + 'post_modified_gmt' => $now_gmt, + 'guid' => $first_post_guid, + 'comment_count' => 1, + 'to_ping' => '', + 'pinged' => '', + 'post_content_filtered' => '' + )); $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) ); // Default comment @@ -190,19 +194,19 @@ To delete a comment, just log in and view the post's comments. There you wi $first_comment = get_site_option( 'first_comment', $first_comment ); } $wpdb->insert( $wpdb->comments, array( - 'comment_post_ID' => 1, - 'comment_author' => $first_comment_author, - 'comment_author_email' => '', - 'comment_author_url' => $first_comment_url, - 'comment_date' => $now, - 'comment_date_gmt' => $now_gmt, - 'comment_content' => $first_comment - )); + 'comment_post_ID' => 1, + 'comment_author' => $first_comment_author, + 'comment_author_email' => '', + 'comment_author_url' => $first_comment_url, + 'comment_date' => $now, + 'comment_date_gmt' => $now_gmt, + 'comment_content' => $first_comment + )); // First Page $first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this: -

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

...or something like this: @@ -213,22 +217,23 @@ As a new WordPress user, you should go to your dashboard to d $first_page = get_site_option( 'first_page', $first_page ); $first_post_guid = get_option('home') . '/?page_id=2'; $wpdb->insert( $wpdb->posts, array( - 'post_author' => $user_id, - 'post_date' => $now, - 'post_date_gmt' => $now_gmt, - 'post_content' => $first_page, - 'post_excerpt' => '', - 'post_title' => __( 'Sample Page' ), - /* translators: Default page slug */ - 'post_name' => __( 'sample-page' ), - 'post_modified' => $now, - 'post_modified_gmt' => $now_gmt, - 'guid' => $first_post_guid, - 'post_type' => 'page', - 'to_ping' => '', - 'pinged' => '', - 'post_content_filtered' => '' - )); + 'post_author' => $user_id, + 'post_date' => $now, + 'post_date_gmt' => $now_gmt, + 'post_content' => $first_page, + 'post_excerpt' => '', + 'comment_status' => 'closed', + 'post_title' => __( 'Sample Page' ), + /* translators: Default page slug */ + 'post_name' => __( 'sample-page' ), + 'post_modified' => $now, + 'post_modified_gmt' => $now_gmt, + 'guid' => $first_post_guid, + 'post_type' => 'page', + 'to_ping' => '', + 'pinged' => '', + 'post_content_filtered' => '' + )); $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) ); // Set up default widgets for default theme. @@ -385,7 +390,15 @@ if ( !function_exists('wp_upgrade') ) : * * @since 2.1.0 * +<<<<<<< .mine + * @global int $wp_current_db_version + * @global int $wp_db_version + * @global wpdb $wpdb +||||||| .r11156 + * @return null +======= * @return null If no update is necessary or site isn't completely installed, null. +>>>>>>> .r12027 */ function wp_upgrade() { global $wp_current_db_version, $wp_db_version, $wpdb; @@ -434,8 +447,15 @@ endif; * based on database version and WP version being updated-to. * * @since 1.0.1 +<<<<<<< .mine + * + * @global int $wp_current_db_version + * @global int $wp_db_version +||||||| .r11156 +======= * * @return null If no update is necessary, null. +>>>>>>> .r12027 */ function upgrade_all() { global $wp_current_db_version, $wp_db_version; @@ -524,12 +544,22 @@ function upgrade_all() { if ( $wp_current_db_version < 29630 ) upgrade_400(); +<<<<<<< .mine + if ( $wp_current_db_version < 33055 ) + upgrade_430(); + + if ( $wp_current_db_version < 33056 ) + upgrade_431(); + +||||||| .r11156 +======= if ( $wp_current_db_version < 31534 ) upgrade_422(); if ( $wp_current_db_version < 31536 ) upgrade_423(); +>>>>>>> .r12027 maybe_disable_link_manager(); maybe_disable_automattic_widgets(); @@ -542,6 +572,8 @@ function upgrade_all() { * Execute changes made in WordPress 1.0. * * @since 1.0.0 + * + * @global wpdb $wpdb */ function upgrade_100() { global $wpdb; @@ -598,6 +630,8 @@ function upgrade_100() { * Execute changes made in WordPress 1.0.1. * * @since 1.0.1 + * + * @global wpdb $wpdb */ function upgrade_101() { global $wpdb; @@ -616,6 +650,8 @@ function upgrade_101() { * Execute changes made in WordPress 1.2. * * @since 1.2.0 + * + * @global wpdb $wpdb */ function upgrade_110() { global $wpdb; @@ -676,6 +712,8 @@ function upgrade_110() { * Execute changes made in WordPress 1.5. * * @since 1.5.0 + * + * @global wpdb $wpdb */ function upgrade_130() { global $wpdb; @@ -760,6 +798,9 @@ function upgrade_130() { * Execute changes made in WordPress 2.0. * * @since 2.0.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_160() { global $wpdb, $wp_current_db_version; @@ -843,6 +884,9 @@ function upgrade_160() { * Execute changes made in WordPress 2.1. * * @since 2.1.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_210() { global $wpdb, $wp_current_db_version; @@ -887,6 +931,9 @@ function upgrade_210() { * Execute changes made in WordPress 2.3. * * @since 2.3.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_230() { global $wp_current_db_version, $wpdb; @@ -1063,6 +1110,8 @@ function upgrade_230() { * Remove old options from the database. * * @since 2.3.0 + * + * @global wpdb $wpdb */ function upgrade_230_options_table() { global $wpdb; @@ -1077,6 +1126,8 @@ function upgrade_230_options_table() { * Remove old categories, link2cat, and post2cat database tables. * * @since 2.3.0 + * + * @global wpdb $wpdb */ function upgrade_230_old_tables() { global $wpdb; @@ -1089,6 +1140,8 @@ function upgrade_230_old_tables() { * Upgrade old slugs made in version 2.2. * * @since 2.2.0 + * + * @global wpdb $wpdb */ function upgrade_old_slugs() { // Upgrade people who were using the Redirect Old Slugs plugin. @@ -1100,6 +1153,8 @@ function upgrade_old_slugs() { * Execute changes made in WordPress 2.5.0. * * @since 2.5.0 + * + * @global int $wp_current_db_version */ function upgrade_250() { global $wp_current_db_version; @@ -1114,6 +1169,8 @@ function upgrade_250() { * Execute changes made in WordPress 2.5.2. * * @since 2.5.2 + * + * @global wpdb $wpdb */ function upgrade_252() { global $wpdb; @@ -1125,6 +1182,8 @@ function upgrade_252() { * Execute changes made in WordPress 2.6. * * @since 2.6.0 + * + * @global int $wp_current_db_version */ function upgrade_260() { global $wp_current_db_version; @@ -1137,6 +1196,9 @@ function upgrade_260() { * Execute changes made in WordPress 2.7. * * @since 2.7.0 + * + * @global wpdb $wpdb + * @global int $wp_current_db_version */ function upgrade_270() { global $wpdb, $wp_current_db_version; @@ -1153,6 +1215,9 @@ function upgrade_270() { * Execute changes made in WordPress 2.8. * * @since 2.8.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_280() { global $wp_current_db_version, $wpdb; @@ -1180,6 +1245,8 @@ function upgrade_280() { * Execute changes made in WordPress 2.9. * * @since 2.9.0 + * + * @global int $wp_current_db_version */ function upgrade_290() { global $wp_current_db_version; @@ -1197,6 +1264,9 @@ function upgrade_290() { * Execute changes made in WordPress 3.0. * * @since 3.0.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_300() { global $wp_current_db_version, $wpdb; @@ -1208,7 +1278,7 @@ function upgrade_300() { add_site_option( 'siteurl', '' ); // 3.0 screen options key name changes. - if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { + if ( wp_should_upgrade_global_tables() ) { $sql = "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE %s OR meta_key LIKE %s @@ -1239,11 +1309,16 @@ function upgrade_300() { * Execute changes made in WordPress 3.3. * * @since 3.3.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb + * @global array $wp_registered_widgets + * @global array $sidebars_widgets */ function upgrade_330() { global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets; - if ( $wp_current_db_version < 19061 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) { $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" ); } @@ -1308,6 +1383,9 @@ function upgrade_330() { * Execute changes made in WordPress 3.4. * * @since 3.4.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_340() { global $wp_current_db_version, $wpdb; @@ -1324,7 +1402,7 @@ function upgrade_340() { $wpdb->show_errors(); } - if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) { $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" ); } @@ -1341,6 +1419,9 @@ function upgrade_340() { * Execute changes made in WordPress 3.5. * * @since 3.5.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_350() { global $wp_current_db_version, $wpdb; @@ -1348,7 +1429,7 @@ function upgrade_350() { if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options() - if ( $wp_current_db_version < 21811 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) { $meta_keys = array(); foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) { if ( false !== strpos( $name, '-' ) ) @@ -1368,6 +1449,8 @@ function upgrade_350() { * Execute changes made in WordPress 3.7. * * @since 3.7.0 + * + * @global int $wp_current_db_version */ function upgrade_370() { global $wp_current_db_version; @@ -1380,6 +1463,8 @@ function upgrade_370() { * * @since 3.7.2 * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_372() { global $wp_current_db_version; @@ -1391,6 +1476,8 @@ function upgrade_372() { * Execute changes made in WordPress 3.8.0. * * @since 3.8.0 + * + * @global int $wp_current_db_version */ function upgrade_380() { global $wp_current_db_version; @@ -1403,6 +1490,8 @@ function upgrade_380() { * Execute changes made in WordPress 4.0.0. * * @since 4.0.0 + * + * @global int $wp_current_db_version */ function upgrade_400() { global $wp_current_db_version; @@ -1420,6 +1509,120 @@ function upgrade_400() { /** * Execute changes made in WordPress 4.2.0. * +<<<<<<< .mine + * @since 4.2.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb + */ +function upgrade_420() {} + +/** + * Executes changes made in WordPress 4.3.0. + * + * @since 4.3.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_430() { + global $wp_current_db_version, $wpdb; + + if ( $wp_current_db_version < 32364 ) { + upgrade_430_fix_comments(); + } + + // Shared terms are split in a separate process. + if ( $wp_current_db_version < 32814 ) { + update_option( 'finished_splitting_shared_terms', 0 ); + wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' ); + } + + if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) { + if ( is_multisite() ) { + $tables = $wpdb->tables( 'blog' ); + } else { + $tables = $wpdb->tables( 'all' ); + if ( ! wp_should_upgrade_global_tables() ) { + $global_tables = $wpdb->tables( 'global' ); + $tables = array_diff_assoc( $tables, $global_tables ); + } + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } +} + +/** + * Executes comments changes made in WordPress 4.3.0. + * + * @since 4.3.0 + * + * @global int $wp_current_db_version Current version. + * @global wpdb $wpdb WordPress database abstraction object. + */ +function upgrade_430_fix_comments() { + global $wp_current_db_version, $wpdb; + + $content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' ); + + if ( is_wp_error( $content_length ) ) { + return; + } + + if ( false === $content_length ) { + $content_length = array( + 'type' => 'byte', + 'length' => 65535, + ); + } elseif ( ! is_array( $content_length ) ) { + $length = (int) $content_length > 0 ? (int) $content_length : 65535; + $content_length = array( + 'type' => 'byte', + 'length' => $length + ); + } + + if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) { + // Sites with malformed DB schemas are on their own. + return; + } + + $allowed_length = intval( $content_length['length'] ) - 10; + + $comments = $wpdb->get_results( + "SELECT `comment_ID` FROM `{$wpdb->comments}` + WHERE `comment_date_gmt` > '2015-04-26' + AND LENGTH( `comment_content` ) >= {$allowed_length} + AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )" + ); + + foreach ( $comments as $comment ) { + wp_delete_comment( $comment->comment_ID, true ); + } +} + +/** + * Executes changes made in WordPress 4.3.1. + * + * @since 4.3.1 + */ +function upgrade_431() { + // Fix incorrect cron entries for term splitting + $cron_array = _get_cron_array(); + if ( isset( $cron_array['wp_batch_split_terms'] ) ) { + unset( $cron_array['wp_batch_split_terms'] ); + _set_cron_array( $cron_array ); + } +} + +/** + * Executes network-level upgrade routines. + * +||||||| .r11156 +======= * @since 4.2.0 */ function upgrade_420() { @@ -1509,7 +1712,11 @@ function upgrade_423() { /** * Executes network-level upgrade routines. * +>>>>>>> .r12027 * @since 3.0.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function upgrade_network() { global $wp_current_db_version, $wpdb; @@ -1602,6 +1809,59 @@ function upgrade_network() { update_site_option( 'illegal_names', $illegal_names ); } } +<<<<<<< .mine + + // 4.2 + if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) { + if ( wp_should_upgrade_global_tables() ) { + $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" ); + $wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" ); + + $tables = $wpdb->tables( 'global' ); + + // sitecategories may not exist. + if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) { + unset( $tables['sitecategories'] ); + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } + } + + // 4.3 + if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) { + if ( wp_should_upgrade_global_tables() ) { + $upgrade = false; + $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" ); + foreach( $indexes as $index ) { + if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) { + $upgrade = true; + break; + } + } + + if ( $upgrade ) { + $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" ); + } + + $tables = $wpdb->tables( 'global' ); + + // sitecategories may not exist. + if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) { + unset( $tables['sitecategories'] ); + } + + foreach ( $tables as $table ) { + maybe_convert_table_to_utf8mb4( $table ); + } + } + } +||||||| .r11156 +======= // 4.2 if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) { @@ -1647,6 +1907,7 @@ function upgrade_network() { } } } +>>>>>>> .r12027 } // @@ -1662,6 +1923,8 @@ function upgrade_network() { * * @since 1.0.0 * + * @global wpdb $wpdb + * * @param string $table_name Database table name to create. * @param string $create_ddl SQL statement to create table. * @return bool If table already exists or was created by function. @@ -1690,9 +1953,11 @@ function maybe_create_table($table_name, $create_ddl) { * * @since 1.0.1 * + * @global wpdb $wpdb + * * @param string $table Database table name. * @param string $index Index name to drop. - * @return bool True, when finished. + * @return true True, when finished. */ function drop_index($table, $index) { global $wpdb; @@ -1711,9 +1976,11 @@ function drop_index($table, $index) { * * @since 1.0.1 * + * @global wpdb $wpdb + * * @param string $table Database table name. * @param string $index Database table index column. - * @return bool True, when done with execution. + * @return true True, when done with execution. */ function add_clean_index($table, $index) { global $wpdb; @@ -1723,6 +1990,23 @@ function add_clean_index($table, $index) { } /** +<<<<<<< .mine + * Adds column to a database table if it doesn't already exist. + * + * @since 1.3.0 + * + * @global wpdb $wpdb + * + * @param string $table_name The table name to modify. + * @param string $column_name The column name to add to the table. + * @param string $create_ddl The SQL statement used to add the column. + * @return bool True if already exists or on successful completion, false on error. +||||||| .r11156 + ** maybe_add_column() + ** Add column to db table if it doesn't exist. + ** Returns: true if already exists or on successful completion + ** false on error +======= * Adds column to a database table if it doesn't already exist. * * @since 1.3.0 @@ -1731,6 +2015,7 @@ function add_clean_index($table, $index) { * @param string $column_name The column name to add to the table. * @param string $create_ddl The SQL statement used to add the column. * @return True if already exists or on successful completion, false on error. +>>>>>>> .r12027 */ function maybe_add_column($table_name, $column_name, $create_ddl) { global $wpdb; @@ -1753,6 +2038,52 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { } /** +<<<<<<< .mine + * If a table only contains utf8 or utf8mb4 columns, convert it to utf8mb4. + * + * @since 4.2.0 + * + * @global wpdb $wpdb + * + * @param string $table The table to convert. + * @return bool true if the table was converted, false if it wasn't. + */ +function maybe_convert_table_to_utf8mb4( $table ) { + global $wpdb; + + $results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" ); + if ( ! $results ) { + return false; + } + + foreach ( $results as $column ) { + if ( $column->Collation ) { + list( $charset ) = explode( '_', $column->Collation ); + $charset = strtolower( $charset ); + if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) { + // Don't upgrade tables that have non-utf8 columns. + return false; + } + } + } + + $table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" ); + if ( ! $table_details ) { + return false; + } + + list( $table_charset ) = explode( '_', $table_details->Collation ); + $table_charset = strtolower( $table_charset ); + if ( 'utf8mb4' === $table_charset ) { + return true; + } + + return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" ); +} + +/** +||||||| .r11156 +======= * If a table only contains utf8 or utf8mb4 columns, convert it to utf8mb4. * * @since 4.2.0 @@ -1794,11 +2125,20 @@ function maybe_convert_table_to_utf8mb4( $table ) { } /** +>>>>>>> .r12027 * Retrieve all options as it was for 1.2. * * @since 1.2.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * + * @return stdClass List of options. +||||||| .r11156 + * @return array List of options. +======= * @return stdClass List of options. +>>>>>>> .r12027 */ function get_alloptions_110() { global $wpdb; @@ -1820,6 +2160,8 @@ function get_alloptions_110() { * @since 1.5.1 * @access private * + * @global wpdb $wpdb + * * @param string $setting Option name. * @return mixed */ @@ -1879,12 +2221,27 @@ function deslash($content) { * * @since 1.5.0 * +<<<<<<< .mine + * @global wpdb $wpdb + * * @param string|array $queries Optional. The query to run. Can be multiple queries * in an array, or a string of queries separated by * semicolons. Default empty. * @param bool $execute Optional. Whether or not to execute the query right away. * Default true. * @return array Strings containing the results of the various update queries. +||||||| .r11156 + * @param unknown_type $queries + * @param unknown_type $execute + * @return unknown +======= + * @param string|array $queries Optional. The query to run. Can be multiple queries + * in an array, or a string of queries separated by + * semicolons. Default empty. + * @param bool $execute Optional. Whether or not to execute the query right away. + * Default true. + * @return array Strings containing the results of the various update queries. +>>>>>>> .r12027 */ function dbDelta( $queries = '', $execute = true ) { global $wpdb; @@ -1951,8 +2308,8 @@ function dbDelta( $queries = '', $execute = true ) { $global_tables = $wpdb->tables( 'global' ); foreach ( $cqueries as $table => $qry ) { - // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined. - if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) { + // Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal. + if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) { unset( $cqueries[ $table ], $for_update[ $table ] ); continue; } @@ -2211,7 +2568,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { // Don't copy anything. continue; - } + } } if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) @@ -2262,9 +2619,19 @@ function make_site_theme_from_oldschool($theme_name, $template) { * * @since 1.5.0 * +<<<<<<< .mine + * @param string $theme_name The name of the theme. + * @param string $template The directory name of the theme. + * @return false|void +||||||| .r11156 + * @param unknown_type $theme_name + * @param unknown_type $template + * @return unknown +======= * @param string $theme_name The name of the theme. * @param string $template The directory name of the theme. * @return null|false +>>>>>>> .r12027 */ function make_site_theme_from_default($theme_name, $template) { $site_dir = WP_CONTENT_DIR . "/themes/$template"; @@ -2402,7 +2769,15 @@ function translate_level_to_role($level) { /** * Checks the version of the installed MySQL binary. * +<<<<<<< .mine * @since 2.1.0 + * +||||||| .r11156 + * {@internal Missing Long Description}} + * +======= +>>>>>>> .r12027 + * @global wpdb $wpdb */ function wp_check_mysql_version() { global $wpdb; @@ -2432,6 +2807,9 @@ function maybe_disable_automattic_widgets() { * Disables the Link Manager on upgrade if, at the time of upgrade, no links exist in the DB. * * @since 3.5.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function maybe_disable_link_manager() { global $wp_current_db_version, $wpdb; @@ -2444,6 +2822,9 @@ function maybe_disable_link_manager() { * Runs before the schema is upgraded. * * @since 2.9.0 + * + * @global int $wp_current_db_version + * @global wpdb $wpdb */ function pre_schema_upgrade() { global $wp_current_db_version, $wpdb; @@ -2461,7 +2842,7 @@ function pre_schema_upgrade() { } // Multisite schema upgrades. - if ( $wp_current_db_version < 25448 && is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && is_main_network() ) { + if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) { // Upgrade verions prior to 3.7 if ( $wp_current_db_version < 25179 ) { @@ -2476,6 +2857,21 @@ function pre_schema_upgrade() { $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" ); } } +<<<<<<< .mine + + // Upgrade versions prior to 4.2. + if ( $wp_current_db_version < 31351 ) { + if ( ! is_multisite() && wp_should_upgrade_global_tables() ) { + $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + } + $wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); + $wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" ); + } +||||||| .r11156 +======= // Upgrade versions prior to 4.2. if ( $wp_current_db_version < 31351 ) { @@ -2488,6 +2884,7 @@ function pre_schema_upgrade() { $wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" ); $wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" ); } +>>>>>>> .r12027 } /** @@ -2495,6 +2892,8 @@ function pre_schema_upgrade() { * * @since 3.0.0 * + * @global wpdb $wpdb + * @global string $charset_collate */ if ( !function_exists( 'install_global_terms' ) ) : function install_global_terms() { @@ -2514,3 +2913,49 @@ CREATE TABLE $wpdb->sitecategories ( dbDelta( $ms_queries ); } endif; + +/** + * Determine if global tables should be upgraded. + * + * This function performs a series of checks to ensure the environment allows + * for the safe upgrading of global WordPress database tables. It is necessary + * because global tables will commonly grow to millions of rows on large + * installations, and the ability to control their upgrade routines can be + * critical to the operation of large networks. + * + * In a future iteration, this function may use `wp_is_large_network()` to more- + * intelligently prevent global table upgrades. Until then, we make sure + * WordPress is on the main site of the main network, to avoid running queries + * more than once in multi-site or multi-network environments. + * + * @since 4.3.0 + * + * @return bool Whether to run the upgrade routines on global tables. + */ +function wp_should_upgrade_global_tables() { + + // Return false early if explicitly not upgrading + if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + return false; + } + + // Assume global tables should be upgraded + $should_upgrade = true; + + // Set to false if not on main network (does not matter if not multi-network) + if ( ! is_main_network() ) { + $should_upgrade = false; + } + + // Set to false if not on main site of current network (does not matter if not multi-site) + if ( ! is_main_site() ) { + $should_upgrade = false; + } + + /** + * Filter if upgrade routines should be run on global tables. + * + * @param bool $should_upgrade Whether to run the upgrade routines on global tables. + */ + return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade ); +} diff --git a/pavillonmadeleine.fr/wp-admin/includes/user.php b/pavillonmadeleine.fr/wp-admin/includes/user.php index 49062fcb..8e1df4f2 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/user.php +++ b/pavillonmadeleine.fr/wp-admin/includes/user.php @@ -11,7 +11,7 @@ * * @since 2.0.0 * - * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters. + * @return int|WP_Error WP_Error or User ID. */ function add_user() { return edit_user(); @@ -25,10 +25,10 @@ function add_user() { * @since 2.0.0 * * @param int $user_id Optional. User ID. - * @return int user id of the updated user + * @return int|WP_Error user id of the updated user */ function edit_user( $user_id = 0 ) { - global $wp_roles; + $wp_roles = wp_roles(); $user = new stdClass; if ( $user_id ) { $update = true; @@ -176,7 +176,7 @@ function edit_user( $user_id = 0 ) { $user_id = wp_update_user( $user ); } else { $user_id = wp_insert_user( $user ); - wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' ); + wp_new_user_notification( $user_id, null, 'both' ); } return $user_id; } @@ -198,9 +198,7 @@ function edit_user( $user_id = 0 ) { * @return array */ function get_editable_roles() { - global $wp_roles; - - $all_roles = $wp_roles->roles; + $all_roles = wp_roles()->roles; /** * Filter the list of editable roles. @@ -236,6 +234,8 @@ function get_user_to_edit( $user_id ) { * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param int $user_id User ID. * @return array */ @@ -264,6 +264,8 @@ function get_users_drafts( $user_id ) { * * @since 2.0.0 * + * @global wpdb $wpdb + * * @param int $id User ID. * @param int $reassign Optional. Reassign posts and links to new User ID. * @return bool True when finished. @@ -384,9 +386,12 @@ function wp_revoke_user($id) { $user->remove_all_caps(); } -add_action('admin_init', 'default_password_nag_handler'); /** * @since 2.8.0 + * + * @global int $user_ID + * + * @param false $errors Deprecated. */ function default_password_nag_handler($errors = false) { global $user_ID; @@ -401,10 +406,11 @@ function default_password_nag_handler($errors = false) { } } -add_action('profile_update', 'default_password_nag_edit_user', 10, 2); - /** * @since 2.8.0 + * + * @param int $user_ID + * @param object $old_data */ function default_password_nag_edit_user($user_ID, $old_data) { // Short-circuit it. @@ -420,10 +426,10 @@ function default_password_nag_edit_user($user_ID, $old_data) { } } -add_action('admin_notices', 'default_password_nag'); - /** * @since 2.8.0 + * + * @global string $pagenow */ function default_password_nag() { global $pagenow; @@ -434,7 +440,7 @@ function default_password_nag() { echo '

'; echo '

'; echo '' . __('Notice:') . ' '; - _e('You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?'); + _e('You’re using the auto-generated password for your account. Would you like to change it?'); echo '

'; printf( '' . __('Yes, take me to my profile page') . ' | ', get_edit_profile_url() . '#password' ); printf( '' . __('No thanks, do not remind me again') . '', '?default_password_nag=0' ); diff --git a/pavillonmadeleine.fr/wp-admin/includes/widgets.php b/pavillonmadeleine.fr/wp-admin/includes/widgets.php index e3b231bb..36cf6449 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/widgets.php +++ b/pavillonmadeleine.fr/wp-admin/includes/widgets.php @@ -10,6 +10,9 @@ * Display list of the available widgets. * * @since 2.5.0 + * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls */ function wp_list_widgets() { global $wp_registered_widgets, $wp_registered_widget_controls; @@ -51,6 +54,8 @@ function wp_list_widgets() { * * @since 3.1.0 * @access private + * + * @return int */ function _sort_name_callback( $a, $b ) { return strnatcasecmp( $a['name'], $b['name'] ); @@ -99,6 +104,10 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { * * @since 2.5.0 * + * @global array $wp_registered_widgets + * + * @staticvar int $i + * * @param array $params * @return array */ @@ -123,7 +132,14 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) { return $params; } -function next_widget_id_number($id_base) { +/** + * + * @global array $wp_registered_widgets + * + * @param string $id_base + * @return int + */ +function next_widget_id_number( $id_base ) { global $wp_registered_widgets; $number = 1; @@ -143,6 +159,10 @@ function next_widget_id_number($id_base) { * * @since 2.5.0 * + * @global array $wp_registered_widgets + * @global array $wp_registered_widget_controls + * @global array $sidebars_widgets + * * @param array $sidebar_args * @return array */ diff --git a/pavillonmadeleine.fr/wp-admin/index.php b/pavillonmadeleine.fr/wp-admin/index.php index 40c7c7f2..91439289 100644 --- a/pavillonmadeleine.fr/wp-admin/index.php +++ b/pavillonmadeleine.fr/wp-admin/index.php @@ -93,7 +93,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

<?php _e( 'WordPress › Installation' ); ?> @@ -82,6 +85,8 @@ function display_header( $body_classes = '' ) { * Display installer setup form. * * @since 2.8.0 + * + * @param string|null $error */ function display_setup_form( $error = null ) { global $wpdb; @@ -124,16 +129,57 @@ function display_setup_form( $error = null ) { -

+ + + + + + + + + @@ -143,11 +189,19 @@ function display_setup_form( $error = null ) {

+<<<<<<< .mine + + +||||||| .r11156 + + +======= +>>>>>>> .r12027

@@ -603,17 +616,29 @@ function list_meta( $meta ) { * * @since 2.5.0 * +<<<<<<< .mine + * @staticvar string $update_nonce + * * @param array $entry * @param int $count * @return string +\|\|\|\|\|\|\| .r11156 + * @param unknown_type $entry + * @param unknown_type $count + * @return unknown +======= + * @param array $entry + * @param int $count + * @return string +>>>>>>> .r12027 / function _list_meta_row( $entry, &$count ) { - static $update_nonce = false; + static $update_nonce = ''; if ( is_protected_meta( $entry['meta_key'], 'post' ) ) return ''; - if ( !$update_nonce ) + if ( ! $update_nonce ) $update_nonce = wp_create_nonce( 'add-meta' ); $r = ''; @@ -656,6 +681,8 @@ function _list_meta_row( $entry, &$count ) { * @since 1.2.0 * + * @global wpdb $wpdb + * * @param WP_Post $post Optional. The post being edited. / function meta_form( $post = null ) { @@ -671,9 +698,9 @@ function meta_form( $post = null ) { @param int $limit Number of custom fields to retrieve. Default 30. / $limit = apply_filters( 'postmeta_form_limit', 30 ); - $sql = "SELECT meta_key + $sql = "SELECT DISTINCT meta_key FROM $wpdb->postmeta - GROUP BY meta_key + WHERE meta_key NOT BETWEEN '_' AND '_z' HAVING meta_key NOT LIKE %s ORDER BY meta_key LIMIT %d"; @@ -737,6 +764,9 @@ function meta_form( $post = null ) { * @since 0.71 * + * @global WP_Locale $wp_locale + * @global object $comment + * * @param int\|bool $edit Accepts 1\|true for editing the date, 0\|false for adding the date. * @param int\|bool $for_post Accepts 1\|true for applying the date to a post, 0\|false for a comment. * @param int $tab_index The tabindex attribute to add. Default 0. @@ -772,23 +802,24 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { $cur_hh = gmdate( 'H', $time_adj ); $cur_mn = gmdate( 'i', $time_adj ); - $month = '' . __( 'Month' ) . '\n"; for ( $i = 1; $i < 13; $i = $i +1 ) { $monthnum = zeroise($i, 2); - $month .= "\t\t\t" . '\n"; + $month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "\n"; } - $month .= ''; + $month .= ''; - $day = '' . __( 'Day' ) . ''; - $year = '' . __( 'Year' ) . ''; - $hour = '' . __( 'Hour' ) . ''; - $minute = '' . __( 'Minute' ) . ''; + $day = '' . __( 'Day' ) . ''; + $year = '' . __( 'Year' ) . ''; + $hour = '' . __( 'Hour' ) . ''; + $minute = '' . __( 'Minute' ) . ''; echo ' '; /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute / - printf( __( '%1$s %2$s, %3$s @ %4$s : %5$s' ), $month, $day, $year, $hour, $minute ); + printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute ); echo ' '; @@ -839,6 +870,8 @@ function page_template_dropdown( $default = '' ) { * @since 1.5.0 * + * @global wpdb $wpdb + * * @param int $default Optional. The default page ID to be pre-selected. Default 0. * @param int $parent Optional. The parent page ID. Default 0. * @param int $level Optional. Page depth level. Default 0. @@ -934,6 +967,8 @@ function wp_import_upload_form( $action ) { * * @since 2.5.0 * + * @global array $wp_meta_boxes + * * @param string $id String for use in the 'id' attribute of tags. * @param string $title Title of the meta box. * @param callback $callback Function that fills the box with the desired content. @@ -1022,10 +1057,23 @@ function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advan * * @since 2.5.0 * +<<<<<<< .mine + * @global array $wp_meta_boxes + * + * @staticvar bool $already_sorted + * @param string\|WP_Screen $screen Screen identifier + * @param string $context box context + * @param mixed $object gets passed to the box callback function as first parameter +\|\|\|\|\|\|\| .r11156 + * @param string\|object $screen Screen identifier + * @param string $context box context + * @param mixed $object gets passed to the box callback function as first parameter +======= * @staticvar bool $already_sorted * @param string\|WP_Screen $screen Screen identifier * @param string $context box context * @param mixed $object gets passed to the box callback function as first parameter +>>>>>>> .r12027 * @return int number of meta_boxes / function do_meta_boxes( $screen, $context, $object ) { @@ -1090,9 +1138,11 @@ function do_meta_boxes( $screen, $context, $object ) { * @since 2.6.0 * - * @param string $id String for use in the 'id' attribute of tags. - * @param string\|object $screen The screen on which to show the box (post, page, link). - * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). + * @global array $wp_meta_boxes + * + * @param string $id String for use in the 'id' attribute of tags. + * @param string\|object $screen The screen on which to show the box (post, page, link). + * @param string $context The context within the page where the boxes should show ('normal', 'advanced'). / function remove_meta_box($id, $screen, $context) { global $wp_meta_boxes; @@ -1126,9 +1176,9 @@ function remove_meta_box($id, $screen, $context) { * @uses global $wp_meta_boxes Used to retrieve registered meta boxes. * - * @param string\|object $screen The screen identifier. - * @param string $context The meta box context. - * @param mixed $object gets passed to the section callback function as first parameter. + * @param string\|object $screen The screen identifier. + * @param string $context The meta box context. + * @param mixed $object gets passed to the section callback function as first parameter. * @return int number of meta boxes as accordion sections. / function do_accordion_sections( $screen, $context, $object ) { @@ -1204,10 +1254,10 @@ function do_accordion_sections( $screen, $context, $object ) { * @global $wp_settings_sections Storage array of all settings sections added to admin pages * - * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags. - * @param string $title Formatted title of the section. Shown as the heading for the section. + * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags. + * @param string $title Formatted title of the section. Shown as the heading for the section. * @param string $callback Function that echos out any content at the top of the section (between heading and fields). - * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page(); + * @param string $page The slug-name of the settings page on which to show the section. Built-in pages include 'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using add_options_page(); / function add_settings_section($id, $title, $callback, $page) { global $wp_settings_sections; @@ -1465,9 +1515,9 @@ function get_settings_errors( $setting = '', $sanitize = false ) { * @since 3.0.0 * - * @param string $setting Optional slug title of a specific setting who's errors you want. - * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors. - * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted. + * @param string $setting Optional slug title of a specific setting who's errors you want. + * @param bool $sanitize Whether to re-sanitize the setting value before returning errors. + * @param bool $hide_on_update If set to true errors will not be shown if the settings page has already been submitted. / function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) { @@ -1576,8 +1626,18 @@ function _admin_search_query() { * @since 2.7.0 * +<<<<<<< .mine + * @global string $hook_suffix + * @global string $admin_body_class + * @global WP_Locale $wp_locale + * * @param string $title Optional. Title of the Iframe page. Default empty. * @param bool $deprecated Not used. +\|\|\|\|\|\|\| .r11156 +======= + * @param string $title Optional. Title of the Iframe page. Default empty. + * @param bool $deprecated Not used. +>>>>>>> .r12027 / function iframe_header( $title = '', $deprecated = false ) { show_admin_bar( false ); @@ -1633,11 +1693,26 @@ if ( is_rtl() ) ?> +<<<<<<< .mine + + class="wp-admin wp-core-ui no-js iframe "> +\|\|\|\|\|\|\| .r11156 + + class="wp-admin wp-core-ui no-js iframe "> +======= class="wp-admin wp-core-ui no-js iframe "> +>>>>>>> .r12027 + >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/includes/translation-install.php b/pavillonmadeleine.fr/wp-admin/includes/translation-install.php index 25358f44..8e1b827c 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/translation-install.php +++ b/pavillonmadeleine.fr/wp-admin/includes/translation-install.php @@ -124,6 +124,8 @@ function wp_get_available_translations() { * @since 4.0.0 * + * @global string $wp_local_package + * * @param array $languages Array of available languages (populated via the Translation API). / function wp_install_language_form( $languages ) { diff --git a/pavillonmadeleine.fr/wp-admin/includes/update-core.php b/pavillonmadeleine.fr/wp-admin/includes/update-core.php index 04cd780b..46a1f6d9 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/update-core.php +++ b/pavillonmadeleine.fr/wp-admin/includes/update-core.php @@ -659,6 +659,50 @@ $_old_files = array( 'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js', 'wp-includes/js/tinymce/plugins/paste/pastetext.htm', 'wp-includes/js/tinymce/langs/wp-langs.php', +<<<<<<< .mine +// 4.1 +'wp-includes/js/jquery/ui/jquery.ui.accordion.min.js', +'wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js', +'wp-includes/js/jquery/ui/jquery.ui.button.min.js', +'wp-includes/js/jquery/ui/jquery.ui.core.min.js', +'wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js', +'wp-includes/js/jquery/ui/jquery.ui.dialog.min.js', +'wp-includes/js/jquery/ui/jquery.ui.draggable.min.js', +'wp-includes/js/jquery/ui/jquery.ui.droppable.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js', +'wp-includes/js/jquery/ui/jquery.ui.effect.min.js', +'wp-includes/js/jquery/ui/jquery.ui.menu.min.js', +'wp-includes/js/jquery/ui/jquery.ui.mouse.min.js', +'wp-includes/js/jquery/ui/jquery.ui.position.min.js', +'wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js', +'wp-includes/js/jquery/ui/jquery.ui.resizable.min.js', +'wp-includes/js/jquery/ui/jquery.ui.selectable.min.js', +'wp-includes/js/jquery/ui/jquery.ui.slider.min.js', +'wp-includes/js/jquery/ui/jquery.ui.sortable.min.js', +'wp-includes/js/jquery/ui/jquery.ui.spinner.min.js', +'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js', +'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js', +'wp-includes/js/jquery/ui/jquery.ui.widget.min.js', +'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png', +// 4.3 +'wp-admin/js/wp-fullscreen.js', +'wp-admin/js/wp-fullscreen.min.js', +'wp-includes/js/tinymce/wp-mce-help.php', +'wp-includes/js/tinymce/plugins/wpfullscreen', +\|\|\|\|\|\|\| .r11156 +======= // 4.1 'wp-includes/js/jquery/ui/jquery.ui.accordion.min.js', 'wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js', @@ -695,6 +739,7 @@ $_old_files = array( 'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js', 'wp-includes/js/jquery/ui/jquery.ui.widget.min.js', 'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png' +>>>>>>> .r12027 ); /* @@ -768,8 +813,16 @@ $_new_bundled_files = array( * * @since 2.7.0 * + * @global WP_Filesystem_Base $wp_filesystem + * @global array $_old_files + * @global array $_new_bundled_files + * @global wpdb $wpdb + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * * @param string $from New release unzipped path. - * @param string $to Path to old WordPress installation. + * @param string $to Path to old WordPress installation. * @return WP_Error\|null WP_Error on failure, null on success. / function update_core($from, $to) { @@ -810,8 +863,17 @@ function update_core($from, $to) { return new WP_Error( 'insane_distro', __('The update could not be unpacked') ); } - // Import $wp_version, $required_php_version, and $required_mysql_version from the new version - // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + + /* + * Import $wp_version, $required_php_version, and $required_mysql_version from the new version + * $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + * + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + / + global $wp_version, $required_php_version, $required_mysql_version; + global $wp_version, $required_php_version, $required_mysql_version; $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; @@ -1101,8 +1163,10 @@ function update_core($from, $to) { @since 3.7.0 Updated not to use a regular expression for the skip list * @see copy_dir() * - * @param string $from source directory - * @param string $to destination directory + * @global WP_Filesystem_Base $wp_filesystem + * + * @param string $from source directory + * @param string $to destination directory * @param array $skip_list a list of files/folders to skip copying * @return mixed WP_Error on failure, True on success. / @@ -1156,6 +1220,11 @@ function _copy_dir($from, $to, $skip_list = array() ) { * @since 3.3.0 * + * @global string $wp_version + * @global string $pagenow + * @global string $action + * + * @param string $new_version / function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; @@ -1190,6 +1259,80 @@ window.location = 'about.php?updated'; include(ABSPATH . 'wp-admin/admin-footer.php'); exit(); } +<<<<<<< .mine + +/* + * Cleans up Genericons example files. + * + * @since 4.2.2 + * + * @global array $wp_theme_directories + * @global WP_Filesystem_Base $wp_filesystem + / +function _upgrade_422_remove_genericons() { + global $wp_theme_directories, $wp_filesystem; + + // A list of the affected files using the filesystem absolute paths. + $affected_files = array(); + + // Themes + foreach ( $wp_theme_directories as $directory ) { + $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory ); + $affected_files = array_merge( $affected_files, $affected_theme_files ); + } + + // Plugins + $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR ); + $affected_files = array_merge( $affected_files, $affected_plugin_files ); + + foreach ( $affected_files as $file ) { + $gen_dir = $wp_filesystem->find_folder( trailingslashit( dirname( $file ) ) ); + if ( empty( $gen_dir ) ) { + continue; + } + + // The path when the file is accessed via WP_Filesystem may differ in the case of FTP + $remote_file = $gen_dir . basename( $file ); + + if ( ! $wp_filesystem->exists( $remote_file ) ) { + continue; + } + + if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) { + $wp_filesystem->put_contents( $remote_file, '' ); + } + } +} + +/* + * Recursively find Genericons example files in a given folder. + * + * @ignore + * @since 4.2.2 + * + * @param string $directory Directory path. Expects trailingslashed. + * @return array + / +function _upgrade_422_find_genericons_files_in_folder( $directory ) { + $directory = trailingslashit( $directory ); + $files = array(); + + if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), 'Genericons' ) ) { + $files[] = "{$directory}example.html"; + } + + $dirs = glob( $directory . '', GLOB_ONLYDIR ); + if ( $dirs ) { + foreach ( $dirs as $dir ) { + $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) ); + } + } + + return $files; +} +\|\|\|\|\|\|\| .r11156 +add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' ); +======= add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' ); / @@ -1258,3 +1401,4 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) { return $files; } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/includes/update.php b/pavillonmadeleine.fr/wp-admin/includes/update.php index ba03453d..4a97875d 100644 --- a/pavillonmadeleine.fr/wp-admin/includes/update.php +++ b/pavillonmadeleine.fr/wp-admin/includes/update.php @@ -9,7 +9,7 @@ / * Selects the first update version from the update_core option. * - * @return bool\|object The response from the API on success, false on failure. + * @return object\|array\|false The response from the API on success, false on failure. / function get_preferred_from_update_core() { $updates = get_core_updates(); @@ -24,8 +24,8 @@ function get_preferred_from_update_core() { Get available core updates. * * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, - * set $options['available'] to false to skip not-dismissed updates. - * @return bool\|array Array of the update objects on success, false on failure. + * set $options['available'] to false to skip not-dismissed updates. + * @return array\|false Array of the update objects on success, false on failure. / function get_core_updates( $options = array() ) { $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options ); @@ -67,7 +67,7 @@ function get_core_updates( $options = array() ) { * @since 3.7.0 * - * @return bool\|array False on failure, otherwise the core update offering. + * @return array\|false False on failure, otherwise the core update offering. / function find_core_auto_update() { $updates = get_site_transient( 'update_core' ); @@ -128,12 +128,23 @@ function get_core_checksums( $version, $locale ) { return $body['checksums']; } +/* + * + * @param object $update + * @return bool + / function dismiss_core_update( $update ) { $dismissed = get_site_option( 'dismissed_update_core' ); $dismissed[ $update->current . '\|' . $update->locale ] = true; return update_site_option( 'dismissed_update_core', $dismissed ); } +/* + * + * @param string $version + * @param string $locale + * @return bool + / function undismiss_core_update( $version, $locale ) { $dismissed = get_site_option( 'dismissed_update_core' ); $key = $version . '\|' . $locale; @@ -145,6 +156,12 @@ function undismiss_core_update( $version, $locale ) { return update_site_option( 'dismissed_update_core', $dismissed ); } +/* + * + * @param string $version + * @param string $locale + * @return object\|false + / function find_core_update( $version, $locale ) { $from_api = get_site_transient( 'update_core' ); @@ -159,6 +176,11 @@ function find_core_update( $version, $locale ) { return false; } +/* + * + * @param string $msg + * @return string + / function core_update_footer( $msg = '' ) { if ( !current_user_can('update_core') ) return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); @@ -188,8 +210,12 @@ function core_update_footer( $msg = '' ) { return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); } } -add_filter( 'update_footer', 'core_update_footer' ); +/* + * + * @global string $pagenow + * @return false\|void + / function update_nag() { if ( is_multisite() && !current_user_can('update_core') ) return false; @@ -211,8 +237,6 @@ function update_nag() { } echo " $msg "; } -add_action( 'admin_notices', 'update_nag', 3 ); -add_action( 'network_admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { @@ -235,6 +259,11 @@ function update_right_now_message() { echo " $msg "; } +/* + * @since 2.9.0 + * + * @return array + / function get_plugin_updates() { $all_plugins = get_plugins(); $upgrade_plugins = array(); @@ -249,6 +278,9 @@ function get_plugin_updates() { return $upgrade_plugins; } +/* + * @since 2.9.0 + / function wp_plugin_update_rows() { if ( !current_user_can('update_plugins' ) ) return; @@ -261,8 +293,13 @@ function wp_plugin_update_rows() { } } } -add_action( 'admin_init', 'wp_plugin_update_rows' ); +/* + * + * @param string $file + * @param array $plugin_data + * @return false\|void + */ function wp_plugin_update_row( $file, $plugin_data ) { $current = get_site_transient( 'update_plugins' ); if ( !isset( $current->response[ $file ] ) ) @@ -278,10 +315,28 @@ function wp_plugin_update_row( $file, $plugin_data ) { $wp_list_table = _get_list_table('WP_Plugins_List_Table'); if ( is_network_admin() \|\| !is_multisite() ) { +<<<<<<< .mine + if ( is_network_admin() ) { + $active_class = is_plugin_active_for_network( $file ) ? ' active': ''; + } else { + $active_class = is_plugin_active( $file ) ? ' active' : ''; + } +\|\|\|\|\|\|\| .r11156 + echo '
'; +======= $active_class = ( is_plugin_active( $plugin_data['plugin'] ) ) ? ' active' : ''; echo '
'; +>>>>>>> .r12027 +<<<<<<< .mine + echo '
'; + + if ( ! current_user_can( 'update_plugins' ) ) { +\|\|\|\|\|\|\| .r11156 + if ( ! current_user_can('update_plugins') ) +======= if ( ! current_user_can( 'update_plugins' ) ) { +>>>>>>> .r12027 printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); } elseif ( empty($r->package) ) { printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); @@ -329,6 +384,10 @@ function wp_plugin_update_row( $file, $plugin_data ) { } } +/** + * + * @return array + / function get_theme_updates() { $current = get_site_transient('update_themes'); @@ -344,6 +403,9 @@ function get_theme_updates() { return $update_themes; } +/* + * @since 3.1.0 + / function wp_theme_update_rows() { if ( !current_user_can('update_themes' ) ) return; @@ -357,8 +419,13 @@ function wp_theme_update_rows() { } } } -add_action( 'admin_init', 'wp_theme_update_rows' ); +/* + * + * @param string $theme_key + * @param WP_Theme $theme + * @return false\|void + */ function wp_theme_update_row( $theme_key, $theme ) { $current = get_site_transient( 'update_themes' ); if ( !isset( $current->response[ $theme_key ] ) ) @@ -400,6 +467,11 @@ function wp_theme_update_row( $theme_key, $theme ) { echo '
- - + + +	+<<<<<<< .mine + + + + + + + + + + +\|\|\|\|\|\|\| .r11156 + + + + +======= +>>>>>>> .r12027 +
+ + + +	+ +
	+ + + +
	/>	/>	/>

'submit' ) ); ?>

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __( 'Log In' ) . '

' ); } +<<<<<<< .mine +/** + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * @global wpdb $wpdb + */ +global $wp_version, $required_php_version, $required_mysql_version; + +||||||| .r11156 +======= global $wp_version, $required_php_version, $required_mysql_version; +>>>>>>> .r12027 $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $php_compat = version_compare( $php_version, $required_php_version, '>=' ); @@ -183,6 +249,16 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { die( '

' . __( 'Configuration Error' ) . '

' . __( 'Your wp-config.php file has an empty database table prefix, which is not supported.' ) . '

' ); } +// Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install. +if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + display_header(); + die( '

' . __( 'Configuration Error' ) . '

' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '

' ); +} + +/** + * @global string $wp_local_package + * @global WP_Locale $wp_locale + */ $language = ''; if ( ! empty( $_REQUEST['language'] ) ) { $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); @@ -303,5 +379,10 @@ if ( !wp_is_mobile() ) { + diff --git a/pavillonmadeleine.fr/wp-admin/js/accordion.js b/pavillonmadeleine.fr/wp-admin/js/accordion.js index 1769d27d..6e32c089 100644 --- a/pavillonmadeleine.fr/wp-admin/js/accordion.js +++ b/pavillonmadeleine.fr/wp-admin/js/accordion.js @@ -53,23 +53,110 @@ */ function accordionSwitch ( el ) { var section = el.closest( '.accordion-section' ), +<<<<<<< .mine + sectionToggleControl = section.find( '[aria-expanded]' ).first(), + container = section.closest( '.accordion-container' ), + siblings = container.find( '.open' ), + siblingsToggleControl = siblings.find( '[aria-expanded]' ).first(), + content = section.find( '.accordion-section-content' ); +||||||| .r11156 + siblings = section.closest( '.accordion-container' ).find( '.open' ), + content = section.find( sectionContent ); +======= siblings = section.closest( '.accordion-container' ).find( '.open' ), content = section.find( '.accordion-section-content' ); +>>>>>>> .r12027 // This section has no content and cannot be expanded. if ( section.hasClass( 'cannot-expand' ) ) { return; } +<<<<<<< .mine + // Add a class to the container to let us know something is happening inside. + // This helps in cases such as hiding a scrollbar while animations are executing. + container.addClass( 'opening' ); + +||||||| .r11156 + // Slide into a sub-panel instead of accordioning (Customizer-specific). + if ( section.hasClass( 'control-panel' ) ) { + panelSwitch( section ); + return; + } + +======= +>>>>>>> .r12027 if ( section.hasClass( 'open' ) ) { section.toggleClass( 'open' ); content.toggle( true ).slideToggle( 150 ); } else { + siblingsToggleControl.attr( 'aria-expanded', 'false' ); siblings.removeClass( 'open' ); siblings.find( '.accordion-section-content' ).show().slideUp( 150 ); content.toggle( false ).slideToggle( 150 ); section.toggleClass( 'open' ); } + +<<<<<<< .mine + // We have to wait for the animations to finish + setTimeout(function(){ + container.removeClass( 'opening' ); + }, 150); + + // If there's an element with an aria-expanded attribute, assume it's a toggle control and toggle the aria-expanded value. + if ( sectionToggleControl ) { + sectionToggleControl.attr( 'aria-expanded', String( sectionToggleControl.attr( 'aria-expanded' ) === 'false' ) ); + } + } + +||||||| .r11156 + /** + * Slide into an accordion sub-panel. + * + * For the Customizer-specific panel functionality + * + * @param {Object} panel Title element or back button of the accordion panel to toggle. + * @since 4.0.0 + */ + function panelSwitch( panel ) { + var position, scroll, + section = panel.closest( '.accordion-section' ), + overlay = section.closest( '.wp-full-overlay' ), + container = section.closest( '.accordion-container' ), + siblings = container.find( '.open' ), + topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ), + backBtn = overlay.find( '.control-panel-back' ), + panelTitle = section.find( '.accordion-section-title' ).first(), + content = section.find( '.control-panel-content' ); + + if ( section.hasClass( 'current-panel' ) ) { + section.toggleClass( 'current-panel' ); + overlay.toggleClass( 'in-sub-panel' ); + content.delay( 180 ).hide( 0, function() { + content.css( 'margin-top', 'inherit' ); // Reset + } ); + topPanel.attr( 'tabindex', '0' ); + backBtn.attr( 'tabindex', '-1' ); + panelTitle.focus(); + container.scrollTop( 0 ); + } else { + // Close all open sections in any accordion level. + siblings.removeClass( 'open' ); + siblings.find( sectionContent ).show().slideUp( 0 ); + content.show( 0, function() { + position = content.offset().top; + scroll = container.scrollTop(); + content.css( 'margin-top', ( 45 - position - scroll ) ); + section.toggleClass( 'current-panel' ); + overlay.toggleClass( 'in-sub-panel' ); + container.scrollTop( 0 ); + } ); + topPanel.attr( 'tabindex', '-1' ); + backBtn.attr( 'tabindex', '0' ); + backBtn.focus(); + } } +======= +>>>>>>> .r12027 })(jQuery); diff --git a/pavillonmadeleine.fr/wp-admin/js/accordion.min.js b/pavillonmadeleine.fr/wp-admin/js/accordion.min.js index bcdf3aad..b79034bf 100644 --- a/pavillonmadeleine.fr/wp-admin/js/accordion.min.js +++ b/pavillonmadeleine.fr/wp-admin/js/accordion.min.js @@ -1 +1,4 @@ -!function(a){function b(a){var b=a.closest(".accordion-section"),c=b.closest(".accordion-container").find(".open"),d=b.find(".accordion-section-content");b.hasClass("cannot-expand")||(b.hasClass("open")?(b.toggleClass("open"),d.toggle(!0).slideToggle(150)):(c.removeClass("open"),c.find(".accordion-section-content").show().slideUp(150),d.toggle(!1).slideToggle(150),b.toggleClass("open")))}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(c){("keydown"!==c.type||13===c.which)&&(c.preventDefault(),b(a(this)))})})}(jQuery); \ No newline at end of file +<<<<<<< .mine +!function(a){function b(a){var b=a.closest(".accordion-section"),c=b.find("[aria-expanded]").first(),d=b.closest(".accordion-container"),e=d.find(".open"),f=e.find("[aria-expanded]").first(),g=b.find(".accordion-section-content");b.hasClass("cannot-expand")||(d.addClass("opening"),b.hasClass("open")?(b.toggleClass("open"),g.toggle(!0).slideToggle(150)):(f.attr("aria-expanded","false"),e.removeClass("open"),e.find(".accordion-section-content").show().slideUp(150),g.toggle(!1).slideToggle(150),b.toggleClass("open")),setTimeout(function(){d.removeClass("opening")},150),c&&c.attr("aria-expanded",String("false"===c.attr("aria-expanded"))))}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(c){("keydown"!==c.type||13===c.which)&&(c.preventDefault(),b(a(this)))})})}(jQuery);||||||| .r11156 +!function(a){function b(a){var b=a.closest(".accordion-section"),e=b.closest(".accordion-container").find(".open"),f=b.find(d);if(!b.hasClass("cannot-expand"))return b.hasClass("control-panel")?void c(b):void(b.hasClass("open")?(b.toggleClass("open"),f.toggle(!0).slideToggle(150)):(e.removeClass("open"),e.find(d).show().slideUp(150),f.toggle(!1).slideToggle(150),b.toggleClass("open")))}function c(a){var b,c,e=a.closest(".accordion-section"),f=e.closest(".wp-full-overlay"),g=e.closest(".accordion-container"),h=g.find(".open"),i=f.find("#customize-theme-controls > ul > .accordion-section > .accordion-section-title").add("#customize-info > .accordion-section-title"),j=f.find(".control-panel-back"),k=e.find(".accordion-section-title").first(),l=e.find(".control-panel-content");e.hasClass("current-panel")?(e.toggleClass("current-panel"),f.toggleClass("in-sub-panel"),l.delay(180).hide(0,function(){l.css("margin-top","inherit")}),i.attr("tabindex","0"),j.attr("tabindex","-1"),k.focus(),g.scrollTop(0)):(h.removeClass("open"),h.find(d).show().slideUp(0),l.show(0,function(){b=l.offset().top,c=g.scrollTop(),l.css("margin-top",45-b-c),e.toggleClass("current-panel"),f.toggleClass("in-sub-panel"),g.scrollTop(0)}),i.attr("tabindex","-1"),j.attr("tabindex","0"),j.focus())}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(c){("keydown"!==c.type||13===c.which)&&(c.preventDefault(),b(a(this)))}),a("#customize-header-actions").on("click keydown",".control-panel-back",function(b){("keydown"!==b.type||13===b.which)&&(b.preventDefault(),c(a(".current-panel")))})});var d=a(".accordion-section-content")}(jQuery);======= +!function(a){function b(a){var b=a.closest(".accordion-section"),c=b.closest(".accordion-container").find(".open"),d=b.find(".accordion-section-content");b.hasClass("cannot-expand")||(b.hasClass("open")?(b.toggleClass("open"),d.toggle(!0).slideToggle(150)):(c.removeClass("open"),c.find(".accordion-section-content").show().slideUp(150),d.toggle(!1).slideToggle(150),b.toggleClass("open")))}a(document).ready(function(){a(".accordion-container").on("click keydown",".accordion-section-title",function(c){("keydown"!==c.type||13===c.which)&&(c.preventDefault(),b(a(this)))})})}(jQuery);>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/js/bookmarklet.js b/pavillonmadeleine.fr/wp-admin/js/bookmarklet.js index a1ac930f..fc53dcdf 100755 --- a/pavillonmadeleine.fr/wp-admin/js/bookmarklet.js +++ b/pavillonmadeleine.fr/wp-admin/js/bookmarklet.js @@ -1,3 +1,162 @@ +<<<<<<< .mine +( function( window, document, href, pt_url ) { + var encURI = window.encodeURIComponent, + form = document.createElement( 'form' ), + head = document.getElementsByTagName( 'head' )[0], + target = '_press_this_app', + canPost = true, + windowWidth, windowHeight, selection, + metas, links, content, images, iframes, img; + + if ( ! pt_url ) { + return; + } + + if ( href.match( /^https?:/ ) ) { + pt_url += '&u=' + encURI( href ); + if ( href.match( /^https:/ ) && pt_url.match( /^http:/ ) ) { + canPost = false; + } + } else { + top.location.href = pt_url; + return; + } + + if ( window.getSelection ) { + selection = window.getSelection() + ''; + } else if ( document.getSelection ) { + selection = document.getSelection() + ''; + } else if ( document.selection ) { + selection = document.selection.createRange().text || ''; + } + + pt_url += '&buster=' + ( new Date().getTime() ); + + if ( ! canPost ) { + if ( document.title ) { + pt_url += '&t=' + encURI( document.title.substr( 0, 256 ) ); + } + + if ( selection ) { + pt_url += '&s=' + encURI( selection.substr( 0, 512 ) ); + } + } + + windowWidth = window.outerWidth || document.documentElement.clientWidth || 600; + windowHeight = window.outerHeight || document.documentElement.clientHeight || 700; + + windowWidth = ( windowWidth < 800 || windowWidth > 5000 ) ? 600 : ( windowWidth * 0.7 ); + windowHeight = ( windowHeight < 800 || windowHeight > 3000 ) ? 700 : ( windowHeight * 0.9 ); + + if ( ! canPost ) { + window.open( pt_url, target, 'location,resizable,scrollbars,width=' + windowWidth + ',height=' + windowHeight ); + return; + } + + function add( name, value ) { + if ( typeof value === 'undefined' ) { + return; + } + + var input = document.createElement( 'input' ); + + input.name = name; + input.value = value; + input.type = 'hidden'; + + form.appendChild( input ); + } + + metas = head.getElementsByTagName( 'meta' ) || []; + + for ( var m = 0; m < metas.length; m++ ) { + if ( m > 200 ) { + break; + } + + var q = metas[ m ], + q_name = q.getAttribute( 'name' ), + q_prop = q.getAttribute( 'property' ), + q_cont = q.getAttribute( 'content' ); + + if ( q_cont ) { + if ( q_name ) { + add( '_meta[' + q_name + ']', q_cont ); + } else if ( q_prop ) { + add( '_meta[' + q_prop + ']', q_cont ); + } + } + } + + links = head.getElementsByTagName( 'link' ) || []; + + for ( var y = 0; y < links.length; y++ ) { + if ( y >= 50 ) { + break; + } + + var g = links[ y ], + g_rel = g.getAttribute( 'rel' ); + + if ( g_rel === 'canonical' || g_rel === 'icon' || g_rel === 'shortlink' ) { + add( '_links[' + g_rel + ']', g.getAttribute( 'href' ) ); + } + } + + if ( document.body.getElementsByClassName ) { + content = document.body.getElementsByClassName( 'hfeed' )[0]; + } + + content = document.getElementById( 'content' ) || content || document.body; + images = content.getElementsByTagName( 'img' ) || []; + + for ( var n = 0; n < images.length; n++ ) { + if ( n >= 100 ) { + break; + } + + img = images[ n ]; + + // If we know the image width and/or height, check them now and drop the "uninteresting" images. + if ( img.src.indexOf( 'avatar' ) > -1 || img.className.indexOf( 'avatar' ) > -1 || + ( img.width && img.width < 256 ) || ( img.height && img.height < 128 ) ) { + + continue; + } + + add( '_images[]', img.src ); + } + + iframes = document.body.getElementsByTagName( 'iframe' ) || []; + + for ( var p = 0; p < iframes.length; p++ ) { + if ( p >= 50 ) { + break; + } + + add( '_embeds[]', iframes[ p ].src ); + } + + if ( document.title ) { + add( 't', document.title ); + } + + if ( selection ) { + add( 's', selection ); + } + + form.setAttribute( 'method', 'POST' ); + form.setAttribute( 'action', pt_url ); + form.setAttribute( 'target', target ); + form.setAttribute( 'style', 'display: none;' ); + + window.open( 'about:blank', target, 'location,resizable,scrollbars,width=' + windowWidth + ',height=' + windowHeight ); + + document.body.appendChild( form ); + form.submit(); +} )( window, document, top.location.href, window.pt_url ); +||||||| .r0 +======= ( function( window, document, href, pt_url ) { var encURI = window.encodeURIComponent, form = document.createElement( 'form' ), @@ -164,3 +323,4 @@ document.body.appendChild( form ); form.submit(); } )( window, document, top.location.href, window.pt_url ); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/js/bookmarklet.min.js b/pavillonmadeleine.fr/wp-admin/js/bookmarklet.min.js index 4e9d0a7c..0f6fb13c 100755 --- a/pavillonmadeleine.fr/wp-admin/js/bookmarklet.min.js +++ b/pavillonmadeleine.fr/wp-admin/js/bookmarklet.min.js @@ -1 +1,4 @@ -(function(a,b,c,d){function e(a,c){if("undefined"!=typeof c){var d=b.createElement("input");d.name=a,d.value=c,d.type="hidden",p.appendChild(d)}}var f,g,h,i,j,k,l,m,n,o=a.encodeURIComponent,p=b.createElement("form"),q=b.getElementsByTagName("head")[0],r="_press_this_app",s=!0;if(d){if(!c.match(/^https?:/))return void(top.location.href=d);if(d+="&u="+o(c),c.match(/^https:/)&&d.match(/^http:/)&&(s=!1),a.getSelection?h=a.getSelection()+"":b.getSelection?h=b.getSelection()+"":b.selection&&(h=b.selection.createRange().text||""),d+="&buster="+(new Date).getTime(),s||(b.title&&(d+="&t="+o(b.title.substr(0,256))),h&&(d+="&s="+o(h.substr(0,512)))),f=a.outerWidth||b.documentElement.clientWidth||600,g=a.outerHeight||b.documentElement.clientHeight||700,f=800>f||f>5e3?600:.7*f,g=800>g||g>3e3?700:.9*g,!s)return void a.open(d,r,"location,resizable,scrollbars,width="+f+",height="+g);(c.match(/\/\/(www|m)\.youtube\.com\/watch/)||c.match(/\/\/vimeo\.com\/(.+\/)?([\d]+)$/)||c.match(/\/\/(www\.)?dailymotion\.com\/video\/.+$/)||c.match(/\/\/soundcloud\.com\/.+$/)||c.match(/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/)||c.match(/\/\/vine\.co\/v\/[^\/]+/))&&e("_embeds[]",c),i=q.getElementsByTagName("meta")||[];for(var t=0;t200);t++){var u=i[t],v=u.getAttribute("name"),w=u.getAttribute("property"),x=u.getAttribute("content");x&&(v?e("_meta["+v+"]",x):w&&e("_meta["+w+"]",x))}j=q.getElementsByTagName("link")||[];for(var y=0;y=50);y++){var z=j[y],A=z.getAttribute("rel");("canonical"===A||"icon"===A||"shortlink"===A)&&e("_links["+A+"]",z.getAttribute("href"))}b.body.getElementsByClassName&&(k=b.body.getElementsByClassName("hfeed")[0]),k=b.getElementById("content")||k||b.body,l=k.getElementsByTagName("img")||[];for(var B=0;B=100);B++)n=l[B],n.src.indexOf("avatar")>-1||n.className.indexOf("avatar")>-1||n.width&&n.width<256||n.height&&n.height<128||e("_images[]",n.src);m=b.body.getElementsByTagName("iframe")||[];for(var C=0;C=50);C++)e("_embeds[]",m[C].src);b.title&&e("t",b.title),h&&e("s",h),p.setAttribute("method","POST"),p.setAttribute("action",d),p.setAttribute("target",r),p.setAttribute("style","display: none;"),a.open("about:blank",r,"location,resizable,scrollbars,width="+f+",height="+g),b.body.appendChild(p),p.submit()}})(window,document,top.location.href,window.pt_url); \ No newline at end of file +<<<<<<< .mine +(function(a,b,c,d){function e(a,c){if("undefined"!=typeof c){var d=b.createElement("input");d.name=a,d.value=c,d.type="hidden",p.appendChild(d)}}var f,g,h,i,j,k,l,m,n,o=a.encodeURIComponent,p=b.createElement("form"),q=b.getElementsByTagName("head")[0],r="_press_this_app",s=!0;if(d){if(!c.match(/^https?:/))return void(top.location.href=d);if(d+="&u="+o(c),c.match(/^https:/)&&d.match(/^http:/)&&(s=!1),a.getSelection?h=a.getSelection()+"":b.getSelection?h=b.getSelection()+"":b.selection&&(h=b.selection.createRange().text||""),d+="&buster="+(new Date).getTime(),s||(b.title&&(d+="&t="+o(b.title.substr(0,256))),h&&(d+="&s="+o(h.substr(0,512)))),f=a.outerWidth||b.documentElement.clientWidth||600,g=a.outerHeight||b.documentElement.clientHeight||700,f=800>f||f>5e3?600:.7*f,g=800>g||g>3e3?700:.9*g,!s)return void a.open(d,r,"location,resizable,scrollbars,width="+f+",height="+g);i=q.getElementsByTagName("meta")||[];for(var t=0;t200);t++){var u=i[t],v=u.getAttribute("name"),w=u.getAttribute("property"),x=u.getAttribute("content");x&&(v?e("_meta["+v+"]",x):w&&e("_meta["+w+"]",x))}j=q.getElementsByTagName("link")||[];for(var y=0;y=50);y++){var z=j[y],A=z.getAttribute("rel");("canonical"===A||"icon"===A||"shortlink"===A)&&e("_links["+A+"]",z.getAttribute("href"))}b.body.getElementsByClassName&&(k=b.body.getElementsByClassName("hfeed")[0]),k=b.getElementById("content")||k||b.body,l=k.getElementsByTagName("img")||[];for(var B=0;B=100);B++)n=l[B],n.src.indexOf("avatar")>-1||n.className.indexOf("avatar")>-1||n.width&&n.width<256||n.height&&n.height<128||e("_images[]",n.src);m=b.body.getElementsByTagName("iframe")||[];for(var C=0;C=50);C++)e("_embeds[]",m[C].src);b.title&&e("t",b.title),h&&e("s",h),p.setAttribute("method","POST"),p.setAttribute("action",d),p.setAttribute("target",r),p.setAttribute("style","display: none;"),a.open("about:blank",r,"location,resizable,scrollbars,width="+f+",height="+g),b.body.appendChild(p),p.submit()}})(window,document,top.location.href,window.pt_url);||||||| .r0 +======= +(function(a,b,c,d){function e(a,c){if("undefined"!=typeof c){var d=b.createElement("input");d.name=a,d.value=c,d.type="hidden",p.appendChild(d)}}var f,g,h,i,j,k,l,m,n,o=a.encodeURIComponent,p=b.createElement("form"),q=b.getElementsByTagName("head")[0],r="_press_this_app",s=!0;if(d){if(!c.match(/^https?:/))return void(top.location.href=d);if(d+="&u="+o(c),c.match(/^https:/)&&d.match(/^http:/)&&(s=!1),a.getSelection?h=a.getSelection()+"":b.getSelection?h=b.getSelection()+"":b.selection&&(h=b.selection.createRange().text||""),d+="&buster="+(new Date).getTime(),s||(b.title&&(d+="&t="+o(b.title.substr(0,256))),h&&(d+="&s="+o(h.substr(0,512)))),f=a.outerWidth||b.documentElement.clientWidth||600,g=a.outerHeight||b.documentElement.clientHeight||700,f=800>f||f>5e3?600:.7*f,g=800>g||g>3e3?700:.9*g,!s)return void a.open(d,r,"location,resizable,scrollbars,width="+f+",height="+g);(c.match(/\/\/(www|m)\.youtube\.com\/watch/)||c.match(/\/\/vimeo\.com\/(.+\/)?([\d]+)$/)||c.match(/\/\/(www\.)?dailymotion\.com\/video\/.+$/)||c.match(/\/\/soundcloud\.com\/.+$/)||c.match(/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/)||c.match(/\/\/vine\.co\/v\/[^\/]+/))&&e("_embeds[]",c),i=q.getElementsByTagName("meta")||[];for(var t=0;t200);t++){var u=i[t],v=u.getAttribute("name"),w=u.getAttribute("property"),x=u.getAttribute("content");x&&(v?e("_meta["+v+"]",x):w&&e("_meta["+w+"]",x))}j=q.getElementsByTagName("link")||[];for(var y=0;y=50);y++){var z=j[y],A=z.getAttribute("rel");("canonical"===A||"icon"===A||"shortlink"===A)&&e("_links["+A+"]",z.getAttribute("href"))}b.body.getElementsByClassName&&(k=b.body.getElementsByClassName("hfeed")[0]),k=b.getElementById("content")||k||b.body,l=k.getElementsByTagName("img")||[];for(var B=0;B=100);B++)n=l[B],n.src.indexOf("avatar")>-1||n.className.indexOf("avatar")>-1||n.width&&n.width<256||n.height&&n.height<128||e("_images[]",n.src);m=b.body.getElementsByTagName("iframe")||[];for(var C=0;C=50);C++)e("_embeds[]",m[C].src);b.title&&e("t",b.title),h&&e("s",h),p.setAttribute("method","POST"),p.setAttribute("action",d),p.setAttribute("target",r),p.setAttribute("style","display: none;"),a.open("about:blank",r,"location,resizable,scrollbars,width="+f+",height="+g),b.body.appendChild(p),p.submit()}})(window,document,top.location.href,window.pt_url);>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/js/comment.js b/pavillonmadeleine.fr/wp-admin/js/comment.js index b5506ea8..d194148f 100644 --- a/pavillonmadeleine.fr/wp-admin/js/comment.js +++ b/pavillonmadeleine.fr/wp-admin/js/comment.js @@ -1,50 +1,63 @@ -/* global postboxes:true, commentL10n:true */ +/* global postboxes, commentL10n */ jQuery(document).ready( function($) { postboxes.add_postbox_toggles('comment'); - var stamp = $('#timestamp').html(); - $('.edit-timestamp').click(function () { - if ($('#timestampdiv').is(':hidden')) { - $('#timestampdiv').slideDown('normal'); - $('.edit-timestamp').hide(); + var $timestampdiv = $('#timestampdiv'), + $timestamp = $( '#timestamp' ), + stamp = $timestamp.html(), + $timestampwrap = $timestampdiv.find( '.timestamp-wrap' ), + $edittimestamp = $timestampdiv.siblings( 'a.edit-timestamp' ); + + $edittimestamp.click( function( event ) { + if ( $timestampdiv.is( ':hidden' ) ) { + $timestampdiv.slideDown( 'fast', function() { + $( 'input, select', $timestampwrap ).first().focus(); + } ); + $(this).hide(); } - return false; + event.preventDefault(); }); - $('.cancel-timestamp').click(function() { - $('#timestampdiv').slideUp('normal'); + $timestampdiv.find('.cancel-timestamp').click( function( event ) { + // Move focus back to the Edit link. + $edittimestamp.show().focus(); + $timestampdiv.slideUp( 'fast' ); $('#mm').val($('#hidden_mm').val()); $('#jj').val($('#hidden_jj').val()); $('#aa').val($('#hidden_aa').val()); $('#hh').val($('#hidden_hh').val()); $('#mn').val($('#hidden_mn').val()); - $('#timestamp').html(stamp); - $('.edit-timestamp').show(); - return false; + $timestamp.html( stamp ); + event.preventDefault(); }); - $('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels + $timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(), newD = new Date( aa, mm - 1, jj, hh, mn ); + event.preventDefault(); + if ( newD.getFullYear() != aa || (1 + newD.getMonth()) != mm || newD.getDate() != jj || newD.getMinutes() != mn ) { - $('.timestamp-wrap', '#timestampdiv').addClass('form-invalid'); - return false; + $timestampwrap.addClass( 'form-invalid' ); + return; } else { - $('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid'); + $timestampwrap.removeClass( 'form-invalid' ); } - $('#timestampdiv').slideUp('normal'); - $('.edit-timestamp').show(); - $('#timestamp').html( + $timestamp.html( commentL10n.submittedOn + ' ' + - $( '#mm option[value="' + mm + '"]' ).text() + ' ' + - jj + ', ' + - aa + ' @ ' + - hh + ':' + - mn + ' ' + commentL10n.dateFormat + .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) ) + .replace( '%2$s', parseInt( jj, 10 ) ) + .replace( '%3$s', aa ) + .replace( '%4$s', ( '00' + hh ).slice( -2 ) ) + .replace( '%5$s', ( '00' + mn ).slice( -2 ) ) + + ' ' ); - return false; + + // Move focus back to the Edit link. + $edittimestamp.show().focus(); + $timestampdiv.slideUp( 'fast' ); }); }); diff --git a/pavillonmadeleine.fr/wp-admin/js/comment.min.js b/pavillonmadeleine.fr/wp-admin/js/comment.min.js index fbfa877a..08512640 100644 --- a/pavillonmadeleine.fr/wp-admin/js/comment.min.js +++ b/pavillonmadeleine.fr/wp-admin/js/comment.min.js @@ -1 +1 @@ -jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestamp").html();a(".edit-timestamp").click(function(){return a("#timestampdiv").is(":hidden")&&(a("#timestampdiv").slideDown("normal"),a(".edit-timestamp").hide()),!1}),a(".cancel-timestamp").click(function(){return a("#timestampdiv").slideUp("normal"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestamp").html(b),a(".edit-timestamp").show(),!1}),a(".save-timestamp").click(function(){var b=a("#aa").val(),c=a("#mm").val(),d=a("#jj").val(),e=a("#hh").val(),f=a("#mn").val(),g=new Date(b,c-1,d,e,f);return g.getFullYear()!=b||1+g.getMonth()!=c||g.getDate()!=d||g.getMinutes()!=f?(a(".timestamp-wrap","#timestampdiv").addClass("form-invalid"),!1):(a(".timestamp-wrap","#timestampdiv").removeClass("form-invalid"),a("#timestampdiv").slideUp("normal"),a(".edit-timestamp").show(),a("#timestamp").html(commentL10n.submittedOn+" "+a('#mm option[value="'+c+'"]').text()+" "+d+", "+b+" @ "+e+":"+f+" "),!1)})}); \ No newline at end of file +jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestampdiv"),c=a("#timestamp"),d=c.html(),e=b.find(".timestamp-wrap"),f=b.siblings("a.edit-timestamp");f.click(function(c){b.is(":hidden")&&(b.slideDown("fast",function(){a("input, select",e).first().focus()}),a(this).hide()),c.preventDefault()}),b.find(".cancel-timestamp").click(function(e){f.show().focus(),b.slideUp("fast"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),c.html(d),e.preventDefault()}),b.find(".save-timestamp").click(function(d){var g=a("#aa").val(),h=a("#mm").val(),i=a("#jj").val(),j=a("#hh").val(),k=a("#mn").val(),l=new Date(g,h-1,i,j,k);return d.preventDefault(),l.getFullYear()!=g||1+l.getMonth()!=h||l.getDate()!=i||l.getMinutes()!=k?void e.addClass("form-invalid"):(e.removeClass("form-invalid"),c.html(commentL10n.submittedOn+" "+commentL10n.dateFormat.replace("%1$s",a('option[value="'+h+'"]',"#mm").attr("data-text")).replace("%2$s",parseInt(i,10)).replace("%3$s",g).replace("%4$s",("00"+j).slice(-2)).replace("%5$s",("00"+k).slice(-2))+" "),f.show().focus(),void b.slideUp("fast"))})}); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-admin/js/common.js b/pavillonmadeleine.fr/wp-admin/js/common.js index 574ec094..b2291411 100644 --- a/pavillonmadeleine.fr/wp-admin/js/common.js +++ b/pavillonmadeleine.fr/wp-admin/js/common.js @@ -37,17 +37,19 @@ columns = { }, checked : function(column) { - $('.column-' + column).show(); + $('.column-' + column).removeClass( 'hidden' ); this.colSpanChange(+1); }, unchecked : function(column) { - $('.column-' + column).hide(); + $('.column-' + column).addClass( 'hidden' ); this.colSpanChange(-1); }, hidden : function() { - return $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(','); + return $( '.manage-column[id]' ).filter( ':hidden' ).map(function() { + return this.id; + }).get().join( ',' ); }, useCheckboxesForHidden : function() { @@ -103,15 +105,14 @@ screenMeta = { init: function() { this.element = $('#screen-meta'); - this.toggles = $('.screen-meta-toggle a'); + this.toggles = $( '#screen-meta-links' ).find( '.show-settings' ); this.page = $('#wpcontent'); this.toggles.click( this.toggleEvent ); }, - toggleEvent: function( e ) { - var panel = $( this.href.replace(/.+#/, '#') ); - e.preventDefault(); + toggleEvent: function() { + var panel = $( '#' + $( this ).attr( 'aria-controls' ) ); if ( !panel.length ) return; @@ -122,22 +123,22 @@ screenMeta = { screenMeta.open( panel, $(this) ); }, - open: function( panel, link ) { + open: function( panel, button ) { - $('.screen-meta-toggle').not( link.parent() ).css('visibility', 'hidden'); + $( '#screen-meta-links' ).find( '.screen-meta-toggle' ).not( button.parent() ).css( 'visibility', 'hidden' ); panel.parent().show(); panel.slideDown( 'fast', function() { panel.focus(); - link.addClass('screen-meta-active').attr('aria-expanded', true); + button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', true ); }); $( document ).trigger( 'screen:options:open' ); }, - close: function( panel, link ) { + close: function( panel, button ) { panel.slideUp( 'fast', function() { - link.removeClass('screen-meta-active').attr('aria-expanded', false); + button.removeClass( 'screen-meta-active' ).attr( 'aria-expanded', false ); $('.screen-meta-toggle').css('visibility', ''); panel.parent().hide(); }); @@ -368,22 +369,88 @@ $(document).ready( function() { }); } +<<<<<<< .mine + // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline. + $firstHeading = $( '.wrap > h1:first' ); +||||||| .r11156 + b = menutop + m.height() + 1; // Bottom offset of the menu + h = $('#wpwrap').height(); // Height of the entire page + o = 60 + b - h; + f = $(window).height() + wintop - 15; // The fold +======= // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline. $firstHeading = $( 'div.wrap h2:first' ); $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' ); $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading ); +>>>>>>> .r12027 + +<<<<<<< .mine + // Back compatibility: if there is no H1, apply to first H2. + if ( ! $firstHeading.length ) { + $firstHeading = $( '.wrap h2:first' ); + } +||||||| .r11156 + if ( f < (b - o) ) { + o = b - f; + } +======= + // Make notices dismissible + $( '.notice.is-dismissible' ).each( function() { + var $this = $( this ), + $button = $( '' ), + btnText = commonL10n.dismiss || ''; +>>>>>>> .r12027 + +<<<<<<< .mine + $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' ); + $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading ); +||||||| .r11156 + if ( o > maxtop ) { + o = maxtop; + } +======= + // Ensure plain text + $button.find( '.screen-reader-text' ).text( btnText ); +>>>>>>> .r12027 +<<<<<<< .mine // Make notices dismissible $( '.notice.is-dismissible' ).each( function() { var $this = $( this ), $button = $( '' ), btnText = commonL10n.dismiss || ''; +||||||| .r11156 + if ( o > 1 ) { + m.css('margin-top', '-'+o+'px'); + } else { + m.css('margin-top', ''); + } +======= + $this.append( $button ); +>>>>>>> .r12027 +<<<<<<< .mine // Ensure plain text $button.find( '.screen-reader-text' ).text( btnText ); $this.append( $button ); +||||||| .r11156 + menu.find('li.menu-top').removeClass('opensub'); + $(this).addClass('opensub'); + }, + out: function(){ + if ( menu.data('wp-responsive') ) { + // The menu is in responsive mode, bail + return; + } + $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', ''); + }, + timeout: 200, + sensitivity: 7, + interval: 90 + }); +======= $button.on( 'click.wp-dismiss-notice', function( event ) { event.preventDefault(); $this.fadeTo( 100 , 0, function() { @@ -393,7 +460,42 @@ $(document).ready( function() { }); }); }); +>>>>>>> .r12027 +<<<<<<< .mine + $button.on( 'click.wp-dismiss-notice', function( event ) { + event.preventDefault(); + $this.fadeTo( 100 , 0, function() { + $(this).slideUp( 100, function() { + $(this).remove(); + }); + }); + }); + }); + +||||||| .r11156 + menu.on('focus.adminmenu', '.wp-submenu a', function(e){ + if ( menu.data('wp-responsive') ) { + // The menu is in responsive mode, bail + return; + } + + $(e.target).closest('li.menu-top').addClass('opensub'); + }).on('blur.adminmenu', '.wp-submenu a', function(e){ + if ( menu.data('wp-responsive') ) { + // The menu is in responsive mode, bail + return; + } + + $(e.target).closest('li.menu-top').removeClass('opensub'); + }); + + // Move .updated and .error alert boxes. Don't move boxes designed to be inline. + $('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2'); + $('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') ); + +======= +>>>>>>> .r12027 // Init screen meta screenMeta.init(); @@ -463,6 +565,41 @@ $(document).ready( function() { }); // Show row actions on keyboard focus of its parent container element or any other elements contained within +<<<<<<< .mine + $( '#wpbody-content' ).on({ + focusin: function() { + clearTimeout( transitionTimeout ); + focusedRowActions = $( this ).find( '.row-actions' ); + // transitionTimeout is necessary for Firefox, but Chrome won't remove the CSS class without a little help. + $( '.row-actions' ).not( this ).removeClass( 'visible' ); + focusedRowActions.addClass( 'visible' ); + }, + focusout: function() { + // Tabbing between post title and .row-actions links needs a brief pause, otherwise + // the .row-actions div gets hidden in transit in some browsers (ahem, Firefox). + transitionTimeout = setTimeout( function() { + focusedRowActions.removeClass( 'visible' ); + }, 30 ); + } + }, '.has-row-actions' ); + + // Toggle list table rows on small screens + $( 'tbody' ).on( 'click', '.toggle-row', function() { + $( this ).closest( 'tr' ).toggleClass( 'is-expanded' ); + }); +||||||| .r11156 + $( 'td.post-title, td.title, td.comment, .bookmarks td.column-name, td.blogname, td.username, .dashboard-comment-wrap' ).focusin(function(){ + clearTimeout( transitionTimeout ); + focusedRowActions = $(this).find( '.row-actions' ); + focusedRowActions.addClass( 'visible' ); + }).focusout(function(){ + // Tabbing between post title and .row-actions links needs a brief pause, otherwise + // the .row-actions div gets hidden in transit in some browsers (ahem, Firefox). + transitionTimeout = setTimeout(function(){ + focusedRowActions.removeClass( 'visible' ); + }, 30); + }); +======= $( '#wpbody-content' ).on({ focusin: function() { clearTimeout( transitionTimeout ); @@ -479,6 +616,7 @@ $(document).ready( function() { }, 30 ); } }, 'td.post-title, td.title, td.comment, .tags td.column-name, .bookmarks td.column-name, td.blogname, .users-network td.column-blogs, td.username, .dashboard-comment-wrap' ); +>>>>>>> .r12027 $('#default-password-nag-no').click( function() { setUserSetting('default_password_nag', 'hide'); @@ -740,6 +878,10 @@ $(document).ready( function() { // Toggle sidebar when toggle is clicked $( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) { event.preventDefault(); + + // close any open toolbar submenus + $adminbar.find( '.hover' ).removeClass( 'hover' ); + $wpwrap.toggleClass( 'wp-responsive-open' ); if ( $wpwrap.hasClass( 'wp-responsive-open' ) ) { $(this).find('a').attr( 'aria-expanded', 'true' ); diff --git a/pavillonmadeleine.fr/wp-admin/js/common.min.js b/pavillonmadeleine.fr/wp-admin/js/common.min.js index 25fb82bc..9b76feff 100644 --- a/pavillonmadeleine.fr/wp-admin/js/common.min.js +++ b/pavillonmadeleine.fr/wp-admin/js/common.min.js @@ -1 +1,4 @@ -var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show(),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).hide(),this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a(".screen-meta-toggle a"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(b){var c=a(this.href.replace(/.+#/,"#"));b.preventDefault(),c.length&&(c.is(":visible")?screenMeta.close(c,a(this)):screenMeta.open(c,a(this)))},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){function c(a){var b,c,d,e,f,g,h,i=a.find(".wp-submenu");f=a.offset().top,g=x.scrollTop(),h=f-g-30,b=f+i.height()+1,c=A.height(),d=60+b-c,e=x.height()+g-50,b-d>e&&(d=b-e),d>h&&(d=h),d>1?i.css("margin-top","-"+d+"px"):i.css("margin-top","")}function d(a){var b=x.scrollTop(),c=!a||"scroll"!==a.type;if(!(t||v||B.data("wp-responsive"))){if(N.menu+N.adminbarN.wpwrap)return void f();if(M=!0,N.menu+N.adminbar>N.window){if(0>b)return void(J||(J=!0,K=!1,z.css({position:"fixed",top:"",bottom:""})));if(b+N.window>w.height()-1)return void(K||(K=!0,J=!1,z.css({position:"fixed",top:"",bottom:0})));b>I?J?(J=!1,L=z.offset().top-N.adminbar-(b-I),L+N.menu+N.adminbarb?K?(K=!1,L=z.offset().top-N.adminbar+(I-b),L+N.menu>b+N.window&&(L=b),z.css({position:"absolute",top:L,bottom:""})):!J&&z.offset().top>=b+N.adminbar&&(J=!0,z.css({position:"fixed",top:"",bottom:""})):c&&(J=K=!1,L=b+N.window-N.menu-N.adminbar-1,L>0?z.css({position:"absolute",top:L,bottom:""}):f())}I=b}}function e(){N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()}}function f(){!t&&M&&(J=K=M=!1,z.css({position:"",top:"",bottom:""}))}function g(){e(),B.data("wp-responsive")?(y.removeClass("sticky-menu"),f()):N.menu+N.adminbar>N.window?(d(),y.removeClass("sticky-menu")):(y.addClass("sticky-menu"),f())}var h,i,j,k,l,m,n,o,p,q=!1,r=a("input.current-page"),s=r.val(),t=/iPhone|iPad|iPod/.test(navigator.userAgent),u=-1!==navigator.userAgent.indexOf("Android"),v=a(document.documentElement).hasClass("ie8"),w=a(document),x=a(b),y=a(document.body),z=a("#adminmenuwrap"),A=a("#wpwrap"),B=a("#adminmenu"),C=a("#wp-responsive-overlay"),D=a("#wp-toolbar"),E=D.find('a[aria-haspopup="true"]'),F=a(".meta-box-sortables"),G=!1,H=a("#wpadminbar"),I=0,J=!1,K=!1,L=0,M=!1,N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()};B.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(m=t?"touchstart":"click",a(document.body).on(m+".wp-mobile-hover",function(b){B.data("wp-responsive")||a(b.target).closest("#adminmenu").length||B.find("li.opensub").removeClass("opensub")}),B.find("a.wp-has-submenu").on(m+".wp-mobile-hover",function(b){var d=a(this).parent();B.data("wp-responsive")||d.hasClass("opensub")||d.hasClass("wp-menu-open")&&!(d.width()<40)||(b.preventDefault(),c(d),B.find("li.opensub").removeClass("opensub"),d.addClass("opensub"))})),t||u||(B.find("li.wp-has-submenu").hoverIntent({over:function(){var b=a(this),d=b.find(".wp-submenu"),e=parseInt(d.css("top"),10);isNaN(e)||e>-5||B.data("wp-responsive")||(c(b),B.find("li.opensub").removeClass("opensub"),b.addClass("opensub"))},out:function(){B.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),B.on("focus.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}).find("li.wp-has-submenu.wp-not-current-submenu").on("focusin.adminmenu",function(){c(a(this))})),p=a("div.wrap h2:first"),p.nextAll("div.updated, div.error, div.notice").addClass("below-h2"),a("div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(p),a(".notice.is-dismissible").each(function(){var b=a(this),c=a(''),d=commonL10n.dismiss||"";c.find(".screen-reader-text").text(d),b.append(c),c.on("click.wp-dismiss-notice",function(c){c.preventDefault(),b.fadeTo(100,0,function(){a(this).slideUp(100,function(){a(this).remove()})})})}),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!q)return!0;h=a(q).closest("form").find(":checkbox"),i=h.index(q),j=h.index(this),k=a(this).prop("checked"),i>0&&j>0&&i!=j&&(l=j>i?h.slice(i,j):h.slice(j,i),l.prop("checked",function(){return a(this).closest("tr").is(":visible")?k:!1}))}q=this;var c=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===c.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("#wpbody-content").on({focusin:function(){clearTimeout(n),o=a(this).find(".row-actions"),a(".row-actions").not(this).removeClass("visible"),o.addClass("visible")},focusout:function(){n=setTimeout(function(){o.removeClass("visible")},30)}},"td.post-title, td.title, td.comment, .tags td.column-name, .bookmarks td.column-name, td.blogname, .users-network td.column-blogs, td.username, .dashboard-comment-wrap"),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return b.preventDefault(),void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value,document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),r.length&&r.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&r.val()==s&&r.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}(),t||(x.on("scroll.pin-menu",d),w.on("tinymce-editor-init.pin-menu",function(a,b){b.on("wp-autoresize",e)})),b.wpResponsive={init:function(){var c=this;w.on("wp-responsive-activate.wp-responsive",function(){c.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){c.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),A.toggleClass("wp-responsive-open"),A.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),B.on("click.wp-responsive","li.wp-has-submenu > a",function(b){B.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),c.trigger(),w.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),x.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?x.width():b.innerWidth;782>=a&&c.disableSortables()})},activate:function(){g(),y.hasClass("auto-fold")||y.addClass("auto-fold"),B.data("wp-responsive",1),this.disableSortables()},deactivate:function(){g(),B.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?G||(w.trigger("wp-responsive-activate"),G=!0):G&&(w.trigger("wp-responsive-deactivate"),G=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===C.length&&(C=a('

').insertAfter("#wpcontent").hide().on("click.wp-responsive",function(){D.find(".menupop.hover").removeClass("hover"),a(this).hide()})),E.on("click.wp-responsive",function(){C.show()})},disableOverlay:function(){E.off("click.wp-responsive"),C.hide()},disableSortables:function(){if(F.length)try{F.sortable("disable")}catch(a){}},enableSortables:function(){if(F.length)try{F.sortable("enable")}catch(a){}}},b.wpResponsive.init(),g(),w.on("wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu",g)}),function(){function c(){a(document).trigger("wp-window-resized")}function d(){b.clearTimeout(e),e=b.setTimeout(c,200)}var e;a(b).on("resize.wp-fire-once",d)}(),function(){if("-ms-user-select"in document.documentElement.style&&navigator.userAgent.match(/IEMobile\/10\.0/)){var a=document.createElement("style");a.appendChild(document.createTextNode("@-ms-viewport{width:auto!important}")),document.getElementsByTagName("head")[0].appendChild(a)}}()}(jQuery,window); \ No newline at end of file +<<<<<<< .mine +var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b,c){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).removeClass("hidden"),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).addClass("hidden"),this.colSpanChange(-1)},hidden:function(){return a(".manage-column[id]").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a("#screen-meta-links").find(".show-settings"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(){var b=a("#"+a(this).attr("aria-controls"));b.length&&(b.is(":visible")?screenMeta.close(b,a(this)):screenMeta.open(b,a(this)))},open:function(b,c){a("#screen-meta-links").find(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){function c(a){var b,c,d,e,f,g,h,i=a.find(".wp-submenu");f=a.offset().top,g=x.scrollTop(),h=f-g-30,b=f+i.height()+1,c=A.height(),d=60+b-c,e=x.height()+g-50,b-d>e&&(d=b-e),d>h&&(d=h),d>1?i.css("margin-top","-"+d+"px"):i.css("margin-top","")}function d(a){var b=x.scrollTop(),c=!a||"scroll"!==a.type;if(!(t||v||B.data("wp-responsive"))){if(N.menu+N.adminbarN.wpwrap)return void f();if(M=!0,N.menu+N.adminbar>N.window){if(0>b)return void(J||(J=!0,K=!1,z.css({position:"fixed",top:"",bottom:""})));if(b+N.window>w.height()-1)return void(K||(K=!0,J=!1,z.css({position:"fixed",top:"",bottom:0})));b>I?J?(J=!1,L=z.offset().top-N.adminbar-(b-I),L+N.menu+N.adminbarb?K?(K=!1,L=z.offset().top-N.adminbar+(I-b),L+N.menu>b+N.window&&(L=b),z.css({position:"absolute",top:L,bottom:""})):!J&&z.offset().top>=b+N.adminbar&&(J=!0,z.css({position:"fixed",top:"",bottom:""})):c&&(J=K=!1,L=b+N.window-N.menu-N.adminbar-1,L>0?z.css({position:"absolute",top:L,bottom:""}):f())}I=b}}function e(){N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()}}function f(){!t&&M&&(J=K=M=!1,z.css({position:"",top:"",bottom:""}))}function g(){e(),B.data("wp-responsive")?(y.removeClass("sticky-menu"),f()):N.menu+N.adminbar>N.window?(d(),y.removeClass("sticky-menu")):(y.addClass("sticky-menu"),f())}var h,i,j,k,l,m,n,o,p,q=!1,r=a("input.current-page"),s=r.val(),t=/iPhone|iPad|iPod/.test(navigator.userAgent),u=-1!==navigator.userAgent.indexOf("Android"),v=a(document.documentElement).hasClass("ie8"),w=a(document),x=a(b),y=a(document.body),z=a("#adminmenuwrap"),A=a("#wpwrap"),B=a("#adminmenu"),C=a("#wp-responsive-overlay"),D=a("#wp-toolbar"),E=D.find('a[aria-haspopup="true"]'),F=a(".meta-box-sortables"),G=!1,H=a("#wpadminbar"),I=0,J=!1,K=!1,L=0,M=!1,N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()};B.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(m=t?"touchstart":"click",a(document.body).on(m+".wp-mobile-hover",function(b){B.data("wp-responsive")||a(b.target).closest("#adminmenu").length||B.find("li.opensub").removeClass("opensub")}),B.find("a.wp-has-submenu").on(m+".wp-mobile-hover",function(b){var d=a(this).parent();B.data("wp-responsive")||d.hasClass("opensub")||d.hasClass("wp-menu-open")&&!(d.width()<40)||(b.preventDefault(),c(d),B.find("li.opensub").removeClass("opensub"),d.addClass("opensub"))})),t||u||(B.find("li.wp-has-submenu").hoverIntent({over:function(){var b=a(this),d=b.find(".wp-submenu"),e=parseInt(d.css("top"),10);isNaN(e)||e>-5||B.data("wp-responsive")||(c(b),B.find("li.opensub").removeClass("opensub"),b.addClass("opensub"))},out:function(){B.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),B.on("focus.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}).find("li.wp-has-submenu.wp-not-current-submenu").on("focusin.adminmenu",function(){c(a(this))})),p=a(".wrap > h1:first"),p.length||(p=a(".wrap h2:first")),p.nextAll("div.updated, div.error, div.notice").addClass("below-h2"),a("div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(p),a(".notice.is-dismissible").each(function(){var b=a(this),c=a(''),d=commonL10n.dismiss||"";c.find(".screen-reader-text").text(d),b.append(c),c.on("click.wp-dismiss-notice",function(c){c.preventDefault(),b.fadeTo(100,0,function(){a(this).slideUp(100,function(){a(this).remove()})})})}),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!q)return!0;h=a(q).closest("form").find(":checkbox"),i=h.index(q),j=h.index(this),k=a(this).prop("checked"),i>0&&j>0&&i!=j&&(l=j>i?h.slice(i,j):h.slice(j,i),l.prop("checked",function(){return a(this).closest("tr").is(":visible")?k:!1}))}q=this;var c=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===c.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("#wpbody-content").on({focusin:function(){clearTimeout(n),o=a(this).find(".row-actions"),a(".row-actions").not(this).removeClass("visible"),o.addClass("visible")},focusout:function(){n=setTimeout(function(){o.removeClass("visible")},30)}},".has-row-actions"),a("tbody").on("click",".toggle-row",function(){a(this).closest("tr").toggleClass("is-expanded")}),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return b.preventDefault(),void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value,document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),r.length&&r.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&r.val()==s&&r.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}(),t||(x.on("scroll.pin-menu",d),w.on("tinymce-editor-init.pin-menu",function(a,b){b.on("wp-autoresize",e)})),b.wpResponsive={init:function(){var c=this;w.on("wp-responsive-activate.wp-responsive",function(){c.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){c.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),H.find(".hover").removeClass("hover"),A.toggleClass("wp-responsive-open"),A.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),B.on("click.wp-responsive","li.wp-has-submenu > a",function(b){B.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),c.trigger(),w.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),x.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?x.width():b.innerWidth;782>=a&&c.disableSortables()})},activate:function(){g(),y.hasClass("auto-fold")||y.addClass("auto-fold"),B.data("wp-responsive",1),this.disableSortables()},deactivate:function(){g(),B.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?G||(w.trigger("wp-responsive-activate"),G=!0):G&&(w.trigger("wp-responsive-deactivate"),G=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===C.length&&(C=a('

').insertAfter("#wpcontent").hide().on("click.wp-responsive",function(){D.find(".menupop.hover").removeClass("hover"),a(this).hide()})),E.on("click.wp-responsive",function(){C.show()})},disableOverlay:function(){E.off("click.wp-responsive"),C.hide()},disableSortables:function(){if(F.length)try{F.sortable("disable")}catch(a){}},enableSortables:function(){if(F.length)try{F.sortable("enable")}catch(a){}}},b.wpResponsive.init(),g(),w.on("wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu",g)}),function(){function c(){a(document).trigger("wp-window-resized")}function d(){b.clearTimeout(e),e=b.setTimeout(c,200)}var e;a(b).on("resize.wp-fire-once",d)}(),function(){if("-ms-user-select"in document.documentElement.style&&navigator.userAgent.match(/IEMobile\/10\.0/)){var a=document.createElement("style");a.appendChild(document.createTextNode("@-ms-viewport{width:auto!important}")),document.getElementsByTagName("head")[0].appendChild(a)}}()}(jQuery,window);||||||| .r11156 +var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show(),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).hide(),this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a(".screen-meta-toggle a"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(b){var c=a(this.href.replace(/.+#/,"#"));b.preventDefault(),c.length&&(c.is(":visible")?screenMeta.close(c,a(this)):screenMeta.open(c,a(this)))},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){var c,d,e,f,g,h,i,j,k=!1,l=a("#adminmenu"),m=a("input.current-page"),n=m.val();l.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(h=/Mobile\/.+Safari/.test(navigator.userAgent)?"touchstart":"click",a(document.body).on(h+".wp-mobile-hover",function(b){l.data("wp-responsive")||a(b.target).closest("#adminmenu").length||l.find("li.wp-has-submenu.opensub").removeClass("opensub")}),l.find("a.wp-has-submenu").on(h+".wp-mobile-hover",function(c){var d,e,f,g,h,i,j,k=a(this),m=k.parent(),n=m.find(".wp-submenu");l.data("wp-responsive")||m.hasClass("opensub")||m.hasClass("wp-menu-open")&&!(m.width()<40)||(c.preventDefault(),h=m.offset().top,i=a(b).scrollTop(),j=h-i-30,d=h+n.height()+1,e=a("#wpwrap").height(),f=60+d-e,g=a(b).height()+i-50,d-f>g&&(f=d-g),f>j&&(f=j),f>1?n.css("margin-top","-"+f+"px"):n.css("margin-top",""),l.find("li.opensub").removeClass("opensub"),m.addClass("opensub"))})),l.find("li.wp-has-submenu").hoverIntent({over:function(){var c,d,e,f,g,h,i,j=a(this).find(".wp-submenu"),k=parseInt(j.css("top"),10);isNaN(k)||k>-5||l.data("wp-responsive")||(g=a(this).offset().top,h=a(b).scrollTop(),i=g-h-30,c=g+j.height()+1,d=a("#wpwrap").height(),e=60+c-d,f=a(b).height()+h-15,c-e>f&&(e=c-f),e>i&&(e=i),e>1?j.css("margin-top","-"+e+"px"):j.css("margin-top",""),l.find("li.menu-top").removeClass("opensub"),a(this).addClass("opensub"))},out:function(){l.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),l.on("focus.adminmenu",".wp-submenu a",function(b){l.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){l.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}),a("div.wrap h2:first").nextAll("div.updated, div.error").addClass("below-h2"),a("div.updated, div.error").not(".below-h2, .inline").insertAfter(a("div.wrap h2:first")),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!k)return!0;c=a(k).closest("form").find(":checkbox"),d=c.index(k),e=c.index(this),f=a(this).prop("checked"),d>0&&e>0&&d!=e&&(g=e>d?c.slice(d,e):c.slice(e,d),g.prop("checked",function(){return a(this).closest("tr").is(":visible")?f:!1}))}k=this;var h=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===h.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("td.post-title, td.title, td.comment, .bookmarks td.column-name, td.blogname, td.username, .dashboard-comment-wrap").focusin(function(){clearTimeout(i),j=a(this).find(".row-actions"),j.addClass("visible")}).focusout(function(){i=setTimeout(function(){j.removeClass("visible")},30)}),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value;try{this.lastKey=9}catch(i){}document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),a("#newcontent").bind("blur.wpevent_InsertTab",function(){this.lastKey&&9==this.lastKey&&this.focus()}),m.length&&m.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&m.val()==n&&m.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}()}),function(){function c(){a(document).trigger("wp-window-resized")}function d(){b.clearTimeout(e),e=b.setTimeout(c,200)}var e;a(b).on("resize.wp-fire-once",d)}(),a(document).ready(function(){var c=a(document),d=a(b),e=a(document.body),f=a("#adminmenuwrap"),g=a("#collapse-menu"),h=a("#wpwrap"),i=a("#adminmenu"),j=a("#wp-responsive-overlay"),k=a("#wp-toolbar"),l=k.find('a[aria-haspopup="true"]'),m=a(".meta-box-sortables"),n=!1,o=!1;b.stickyMenu={enable:function(){n||(c.on("wp-window-resized.sticky-menu",a.proxy(this.update,this)),g.on("click.sticky-menu",a.proxy(this.update,this)),this.update(),n=!0)},disable:function(){n&&(d.off("resize.sticky-menu"),g.off("click.sticky-menu"),e.removeClass("sticky-menu"),n=!1)},update:function(){d.height()>f.height()+32?e.hasClass("sticky-menu")||e.addClass("sticky-menu"):e.hasClass("sticky-menu")&&e.removeClass("sticky-menu")}},b.wpResponsive={init:function(){var e=this;c.on("wp-responsive-activate.wp-responsive",function(){e.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){e.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),h.toggleClass("wp-responsive-open"),h.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),i.on("click.wp-responsive","li.wp-has-submenu > a",function(b){i.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),e.trigger(),c.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),d.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?d.width():b.innerWidth;782>=a&&e.disableSortables()})},activate:function(){b.stickyMenu.disable(),e.hasClass("auto-fold")||e.addClass("auto-fold"),i.data("wp-responsive",1),this.disableSortables()},deactivate:function(){b.stickyMenu.enable(),i.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?o||(c.trigger("wp-responsive-activate"),o=!0):o&&(c.trigger("wp-responsive-deactivate"),o=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===j.length&&(j=a('

').insertAfter("#wpcontent").hide().on("click.wp-responsive",function(){k.find(".menupop.hover").removeClass("hover"),a(this).hide()})),l.on("click.wp-responsive",function(){j.show()})},disableOverlay:function(){l.off("click.wp-responsive"),j.hide()},disableSortables:function(){if(m.length)try{m.sortable("disable")}catch(a){}},enableSortables:function(){if(m.length)try{m.sortable("enable")}catch(a){}}},b.stickyMenu.enable(),b.wpResponsive.init()}),function(){if("-ms-user-select"in document.documentElement.style&&navigator.userAgent.match(/IEMobile\/10\.0/)){var a=document.createElement("style");a.appendChild(document.createTextNode("@-ms-viewport{width:auto!important}")),document.getElementsByTagName("head")[0].appendChild(a)}}()}(jQuery,window);======= +var showNotice,adminMenu,columns,validateForm,screenMeta;!function(a,b){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}},columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var c=a(this),d=c.val();c.prop("checked")?b.checked(d):b.unchecked(d),columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show(),this.colSpanChange(1)},unchecked:function(b){a(".column-"+b).hide(),this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var a=this.id;return a.substring(a,a.length-5)}).get().join(",")}},colSpanChange:function(b){var c,d=a("table").find(".colspanchange");d.length&&(c=parseInt(d.attr("colspan"),10)+b,d.attr("colspan",c.toString()))}},a(document).ready(function(){columns.init()}),validateForm=function(b){return!a(b).find(".form-required").filter(function(){return""===a("input:visible",this).val()}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()},showNotice={warn:function(){var a=commonL10n.warnDelete||"";return confirm(a)?!0:!1},note:function(a){alert(a)}},screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta"),this.toggles=a(".screen-meta-toggle a"),this.page=a("#wpcontent"),this.toggles.click(this.toggleEvent)},toggleEvent:function(b){var c=a(this.href.replace(/.+#/,"#"));b.preventDefault(),c.length&&(c.is(":visible")?screenMeta.close(c,a(this)):screenMeta.open(c,a(this)))},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden"),b.parent().show(),b.slideDown("fast",function(){b.focus(),c.addClass("screen-meta-active").attr("aria-expanded",!0)}),a(document).trigger("screen:options:open")},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active").attr("aria-expanded",!1),a(".screen-meta-toggle").css("visibility",""),b.parent().hide()}),a(document).trigger("screen:options:close")}},a(".contextual-help-tabs").delegate("a","click",function(b){var c,d=a(this);return b.preventDefault(),d.is(".active a")?!1:(a(".contextual-help-tabs .active").removeClass("active"),d.parent("li").addClass("active"),c=a(d.attr("href")),a(".help-tab-content").not(c).removeClass("active").hide(),void c.addClass("active").show())}),a(document).ready(function(){function c(a){var b,c,d,e,f,g,h,i=a.find(".wp-submenu");f=a.offset().top,g=x.scrollTop(),h=f-g-30,b=f+i.height()+1,c=A.height(),d=60+b-c,e=x.height()+g-50,b-d>e&&(d=b-e),d>h&&(d=h),d>1?i.css("margin-top","-"+d+"px"):i.css("margin-top","")}function d(a){var b=x.scrollTop(),c=!a||"scroll"!==a.type;if(!(t||v||B.data("wp-responsive"))){if(N.menu+N.adminbarN.wpwrap)return void f();if(M=!0,N.menu+N.adminbar>N.window){if(0>b)return void(J||(J=!0,K=!1,z.css({position:"fixed",top:"",bottom:""})));if(b+N.window>w.height()-1)return void(K||(K=!0,J=!1,z.css({position:"fixed",top:"",bottom:0})));b>I?J?(J=!1,L=z.offset().top-N.adminbar-(b-I),L+N.menu+N.adminbarb?K?(K=!1,L=z.offset().top-N.adminbar+(I-b),L+N.menu>b+N.window&&(L=b),z.css({position:"absolute",top:L,bottom:""})):!J&&z.offset().top>=b+N.adminbar&&(J=!0,z.css({position:"fixed",top:"",bottom:""})):c&&(J=K=!1,L=b+N.window-N.menu-N.adminbar-1,L>0?z.css({position:"absolute",top:L,bottom:""}):f())}I=b}}function e(){N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()}}function f(){!t&&M&&(J=K=M=!1,z.css({position:"",top:"",bottom:""}))}function g(){e(),B.data("wp-responsive")?(y.removeClass("sticky-menu"),f()):N.menu+N.adminbar>N.window?(d(),y.removeClass("sticky-menu")):(y.addClass("sticky-menu"),f())}var h,i,j,k,l,m,n,o,p,q=!1,r=a("input.current-page"),s=r.val(),t=/iPhone|iPad|iPod/.test(navigator.userAgent),u=-1!==navigator.userAgent.indexOf("Android"),v=a(document.documentElement).hasClass("ie8"),w=a(document),x=a(b),y=a(document.body),z=a("#adminmenuwrap"),A=a("#wpwrap"),B=a("#adminmenu"),C=a("#wp-responsive-overlay"),D=a("#wp-toolbar"),E=D.find('a[aria-haspopup="true"]'),F=a(".meta-box-sortables"),G=!1,H=a("#wpadminbar"),I=0,J=!1,K=!1,L=0,M=!1,N={window:x.height(),wpwrap:A.height(),adminbar:H.height(),menu:z.height()};B.on("click.wp-submenu-head",".wp-submenu-head",function(b){a(b.target).parent().siblings("a").get(0).click()}),a("#collapse-menu").on("click.collapse-menu",function(){var c,d,e=a(document.body);a("#adminmenu div.wp-submenu").css("margin-top",""),c=b.innerWidth?Math.max(b.innerWidth,document.documentElement.clientWidth):961,c&&960>c?e.hasClass("auto-fold")?(e.removeClass("auto-fold").removeClass("folded"),setUserSetting("unfold",1),setUserSetting("mfold","o"),d="open"):(e.addClass("auto-fold"),setUserSetting("unfold",0),d="folded"):e.hasClass("folded")?(e.removeClass("folded"),setUserSetting("mfold","o"),d="open"):(e.addClass("folded"),setUserSetting("mfold","f"),d="folded"),a(document).trigger("wp-collapse-menu",{state:d})}),("ontouchstart"in b||/IEMobile\/[1-9]/.test(navigator.userAgent))&&(m=t?"touchstart":"click",a(document.body).on(m+".wp-mobile-hover",function(b){B.data("wp-responsive")||a(b.target).closest("#adminmenu").length||B.find("li.opensub").removeClass("opensub")}),B.find("a.wp-has-submenu").on(m+".wp-mobile-hover",function(b){var d=a(this).parent();B.data("wp-responsive")||d.hasClass("opensub")||d.hasClass("wp-menu-open")&&!(d.width()<40)||(b.preventDefault(),c(d),B.find("li.opensub").removeClass("opensub"),d.addClass("opensub"))})),t||u||(B.find("li.wp-has-submenu").hoverIntent({over:function(){var b=a(this),d=b.find(".wp-submenu"),e=parseInt(d.css("top"),10);isNaN(e)||e>-5||B.data("wp-responsive")||(c(b),B.find("li.opensub").removeClass("opensub"),b.addClass("opensub"))},out:function(){B.data("wp-responsive")||a(this).removeClass("opensub").find(".wp-submenu").css("margin-top","")},timeout:200,sensitivity:7,interval:90}),B.on("focus.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").addClass("opensub")}).on("blur.adminmenu",".wp-submenu a",function(b){B.data("wp-responsive")||a(b.target).closest("li.menu-top").removeClass("opensub")}).find("li.wp-has-submenu.wp-not-current-submenu").on("focusin.adminmenu",function(){c(a(this))})),p=a("div.wrap h2:first"),p.nextAll("div.updated, div.error, div.notice").addClass("below-h2"),a("div.updated, div.error, div.notice").not(".below-h2, .inline").insertAfter(p),a(".notice.is-dismissible").each(function(){var b=a(this),c=a(''),d=commonL10n.dismiss||"";c.find(".screen-reader-text").text(d),b.append(c),c.on("click.wp-dismiss-notice",function(c){c.preventDefault(),b.fadeTo(100,0,function(){a(this).slideUp(100,function(){a(this).remove()})})})}),screenMeta.init(),a("tbody").children().children(".check-column").find(":checkbox").click(function(b){if("undefined"==b.shiftKey)return!0;if(b.shiftKey){if(!q)return!0;h=a(q).closest("form").find(":checkbox"),i=h.index(q),j=h.index(this),k=a(this).prop("checked"),i>0&&j>0&&i!=j&&(l=j>i?h.slice(i,j):h.slice(j,i),l.prop("checked",function(){return a(this).closest("tr").is(":visible")?k:!1}))}q=this;var c=a(this).closest("tbody").find(":checkbox").filter(":visible").not(":checked");return a(this).closest("table").children("thead, tfoot").find(":checkbox").prop("checked",function(){return 0===c.length}),!0}),a("thead, tfoot").find(".check-column :checkbox").on("click.wp-toggle-checkboxes",function(b){var c=a(this),d=c.closest("table"),e=c.prop("checked"),f=b.shiftKey||c.data("wp-toggle");d.children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return a(this).is(":hidden")?!1:f?!a(this).prop("checked"):e?!0:!1}),d.children("thead, tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){return f?!1:e?!0:!1})}),a("#wpbody-content").on({focusin:function(){clearTimeout(n),o=a(this).find(".row-actions"),a(".row-actions").not(this).removeClass("visible"),o.addClass("visible")},focusout:function(){n=setTimeout(function(){o.removeClass("visible")},30)}},"td.post-title, td.title, td.comment, .tags td.column-name, .bookmarks td.column-name, td.blogname, .users-network td.column-blogs, td.username, .dashboard-comment-wrap"),a("#default-password-nag-no").click(function(){return setUserSetting("default_password_nag","hide"),a("div.default-password-nag").hide(),!1}),a("#newcontent").bind("keydown.wpevent_InsertTab",function(b){var c,d,e,f,g,h=b.target;if(27==b.keyCode)return b.preventDefault(),void a(h).data("tab-out",!0);if(!(9!=b.keyCode||b.ctrlKey||b.altKey||b.shiftKey)){if(a(h).data("tab-out"))return void a(h).data("tab-out",!1);c=h.selectionStart,d=h.selectionEnd,e=h.value,document.selection?(h.focus(),g=document.selection.createRange(),g.text=" "):c>=0&&(f=this.scrollTop,h.value=e.substring(0,c).concat(" ",e.substring(d)),h.selectionStart=h.selectionEnd=c+1,this.scrollTop=f),b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault()}}),r.length&&r.closest("form").submit(function(){-1==a('select[name="action"]').val()&&-1==a('select[name="action2"]').val()&&r.val()==s&&r.val("1")}),a('.search-box input[type="search"], .search-box input[type="submit"]').mousedown(function(){a('select[name^="action"]').val("-1")}),a("#contextual-help-link, #show-settings-link").on("focus.scroll-into-view",function(a){a.target.scrollIntoView&&a.target.scrollIntoView(!1)}),function(){function b(){c.prop("disabled",""===d.map(function(){return a(this).val()}).get().join(""))}var c,d,e=a("form.wp-upload-form");e.length&&(c=e.find('input[type="submit"]'),d=e.find('input[type="file"]'),b(),d.on("change",b))}(),t||(x.on("scroll.pin-menu",d),w.on("tinymce-editor-init.pin-menu",function(a,b){b.on("wp-autoresize",e)})),b.wpResponsive={init:function(){var c=this;w.on("wp-responsive-activate.wp-responsive",function(){c.activate()}).on("wp-responsive-deactivate.wp-responsive",function(){c.deactivate()}),a("#wp-admin-bar-menu-toggle a").attr("aria-expanded","false"),a("#wp-admin-bar-menu-toggle").on("click.wp-responsive",function(b){b.preventDefault(),A.toggleClass("wp-responsive-open"),A.hasClass("wp-responsive-open")?(a(this).find("a").attr("aria-expanded","true"),a("#adminmenu a:first").focus()):a(this).find("a").attr("aria-expanded","false")}),B.on("click.wp-responsive","li.wp-has-submenu > a",function(b){B.data("wp-responsive")&&(a(this).parent("li").toggleClass("selected"),b.preventDefault())}),c.trigger(),w.on("wp-window-resized.wp-responsive",a.proxy(this.trigger,this)),x.on("load.wp-responsive",function(){var a=navigator.userAgent.indexOf("AppleWebKit/")>-1?x.width():b.innerWidth;782>=a&&c.disableSortables()})},activate:function(){g(),y.hasClass("auto-fold")||y.addClass("auto-fold"),B.data("wp-responsive",1),this.disableSortables()},deactivate:function(){g(),B.removeData("wp-responsive"),this.enableSortables()},trigger:function(){var a;b.innerWidth&&(a=Math.max(b.innerWidth,document.documentElement.clientWidth),782>=a?G||(w.trigger("wp-responsive-activate"),G=!0):G&&(w.trigger("wp-responsive-deactivate"),G=!1),480>=a?this.enableOverlay():this.disableOverlay())},enableOverlay:function(){0===C.length&&(C=a('

'; + } }); /** @@ -376,12 +453,33 @@ * @augments wp.customize.Class */ api.Section = Container.extend({ + containerType: 'section', + defaults: { + title: '', + description: '', + priority: 100, + type: 'default', + content: null, + active: true, + instanceNumber: null, + panel: null, + customizeAction: '' + }, /** * @since 4.1.0 * - * @param {String} id - * @param {Array} options + * @param {string} id - The ID for the section. + * @param {object} options - Object containing one property: params. + * @param {object} options.params - Object containing the following properties. + * @param {string} options.params.title - Title shown when section is collapsed and expanded. + * @param {string=} [options.params.description] - Description shown at the top of the section. + * @param {number=100} [options.params.priority] - The sort priority for the section. + * @param {string=default} [options.params.type] - The type of the section. See wp.customize.sectionConstructor. + * @param {string=} [options.params.content] - The markup to be used for the section container. If empty, a JS template is used. + * @param {boolean=true} [options.params.active] - Whether the section is active or not. + * @param {string} options.params.panel - The ID for the panel this section is associated with. + * @param {string=} [options.params.customizeAction] - Additional context information shown before the section title when expanded. */ initialize: function ( id, options ) { var section = this; @@ -446,7 +544,7 @@ var section = this; // Expand/Collapse accordion sections on click. - section.container.find( '.accordion-section-title' ).on( 'click keydown', function( event ) { + section.container.find( '.accordion-section-title, .customize-section-back' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; } @@ -500,17 +598,55 @@ */ onChangeExpanded: function ( expanded, args ) { var section = this, + container = section.container.closest( '.wp-full-overlay-sidebar-content' ), content = section.container.find( '.accordion-section-content' ), - expand; + overlay = section.container.closest( '.wp-full-overlay' ), + backBtn = section.container.find( '.customize-section-back' ), + sectionTitle = section.container.find( '.accordion-section-title' ).first(), + headerActionsHeight = $( '#customize-header-actions' ).height(), + resizeContentHeight, expand, position, scroll; - if ( expanded ) { + if ( expanded && ! section.container.hasClass( 'open' ) ) { if ( args.unchanged ) { expand = args.completeCallback; } else { - expand = function () { - content.stop().slideDown( args.duration, args.completeCallback ); + container.scrollTop( 0 ); + resizeContentHeight = function() { + var matchMedia, offset; + matchMedia = window.matchMedia || window.msMatchMedia; + offset = 90; // 45px for customize header actions + 45px for footer actions. + + // No footer on small screens. + if ( matchMedia && matchMedia( '(max-width: 640px)' ).matches ) { + offset = 45; + } + content.css( 'height', ( window.innerHeight - offset ) ); + }; + expand = function() { section.container.addClass( 'open' ); + overlay.addClass( 'section-open' ); + position = content.offset().top; + scroll = container.scrollTop(); + content.css( 'margin-top', ( headerActionsHeight - position - scroll ) ); + resizeContentHeight(); + sectionTitle.attr( 'tabindex', '-1' ); + backBtn.attr( 'tabindex', '0' ); + backBtn.focus(); + if ( args.completeCallback ) { + args.completeCallback(); + } + + // Fix the height after browser resize. + $( window ).on( 'resize.customizer-section', _.debounce( resizeContentHeight, 100 ) ); + + // Fix the top margin after reflow. + api.bind( 'pane-contents-reflowed', _.debounce( function() { + var offset = ( content.offset().top - headerActionsHeight ); + if ( 0 < offset ) { + content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - offset ) ); + } + }, 100 ) ); }; } @@ -528,12 +664,28 @@ completeCallback: expand }); } else { + api.panel.each( function( panel ) { + panel.collapse(); + }); expand(); } - } else { + } else if ( ! expanded && section.container.hasClass( 'open' ) ) { section.container.removeClass( 'open' ); - content.slideUp( args.duration, args.completeCallback ); + overlay.removeClass( 'section-open' ); + content.css( 'margin-top', '' ); + container.scrollTop( 0 ); + backBtn.attr( 'tabindex', '-1' ); + sectionTitle.attr( 'tabindex', '0' ); + sectionTitle.focus(); + if ( args.completeCallback ) { + args.completeCallback(); + } + $( window ).off( 'resize.customizer-section' ); + } else { + if ( args.completeCallback ) { + args.completeCallback(); + } } } }); @@ -544,77 +696,1007 @@ * Custom section for themes that functions similarly to a backwards panel, * and also handles the theme-details view rendering and navigation. * - * @constructor - * @augments wp.customize.Section - * @augments wp.customize.Container +||||||| .r11156 +======= + * Utility function namespace */ - api.ThemesSection = api.Section.extend({ - currentTheme: '', - overlay: '', - template: '', - screenshotQueue: null, - $window: $( window ), - - /** - * @since 4.2.0 - */ - initialize: function () { - this.$customizeSidebar = $( '.wp-full-overlay-sidebar-content:first' ); - return api.Section.prototype.initialize.apply( this, arguments ); - }, - - /** - * @since 4.2.0 - */ - ready: function () { - var section = this; - section.overlay = section.container.find( '.theme-overlay' ); - section.template = wp.template( 'customize-themes-details-view' ); + api.utils = {}; - // Bind global keyboard events. - $( 'body' ).on( 'keyup', function( event ) { - if ( ! section.overlay.find( '.theme-wrap' ).is( ':visible' ) ) { - return; + /** + * Watch all changes to Value properties, and bubble changes to parent Values instance + * + * @since 4.1.0 + * + * @param {wp.customize.Class} instance + * @param {Array} properties The names of the Value instances to watch. + */ + api.utils.bubbleChildValueChanges = function ( instance, properties ) { + $.each( properties, function ( i, key ) { + instance[ key ].bind( function ( to, from ) { + if ( instance.parent && to !== from ) { + instance.parent.trigger( 'change', instance ); } + } ); + } ); + }; - // Pressing the right arrow key fires a theme:next event - if ( 39 === event.keyCode ) { - section.nextTheme(); - } + /** + * Expand a panel, section, or control and focus on the first focusable element. + * + * @since 4.1.0 + * + * @param {Object} [params] + * @param {Callback} [params.completeCallback] + */ + focus = function ( params ) { + var construct, completeCallback, focus; + construct = this; + params = params || {}; + focus = function () { + var focusContainer; + if ( construct.extended( api.Panel ) && construct.expanded() ) { + focusContainer = construct.container.find( '.control-panel-content:first' ); + } else { + focusContainer = construct.container; + } + focusContainer.find( ':focusable:first' ).focus(); + focusContainer[0].scrollIntoView( true ); + }; + if ( params.completeCallback ) { + completeCallback = params.completeCallback; + params.completeCallback = function () { + focus(); + completeCallback(); + }; + } else { + params.completeCallback = focus; + } + if ( construct.expand ) { + construct.expand( params ); + } else { + params.completeCallback(); + } + }; - // Pressing the left arrow key fires a theme:previous event - if ( 37 === event.keyCode ) { - section.previousTheme(); - } + /** + * Stable sort for Panels, Sections, and Controls. + * + * If a.priority() === b.priority(), then sort by their respective params.instanceNumber. + * + * @since 4.1.0 + * + * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} a + * @param {(wp.customize.Panel|wp.customize.Section|wp.customize.Control)} b + * @returns {Number} + */ + api.utils.prioritySort = function ( a, b ) { + if ( a.priority() === b.priority() && typeof a.params.instanceNumber === 'number' && typeof b.params.instanceNumber === 'number' ) { + return a.params.instanceNumber - b.params.instanceNumber; + } else { + return a.priority() - b.priority(); + } + }; - // Pressing the escape key fires a theme:collapse event - if ( 27 === event.keyCode ) { - section.closeDetails(); + /** + * Return whether the supplied Event object is for a keydown event but not the Enter key. + * + * @since 4.1.0 + * + * @param {jQuery.Event} event + * @returns {boolean} + */ + api.utils.isKeydownButNotEnterEvent = function ( event ) { + return ( 'keydown' === event.type && 13 !== event.which ); + }; + + /** + * Return whether the two lists of elements are the same and are in the same order. + * + * @since 4.1.0 + * + * @param {Array|jQuery} listA + * @param {Array|jQuery} listB + * @returns {boolean} + */ + api.utils.areElementListsEqual = function ( listA, listB ) { + var equal = ( + listA.length === listB.length && // if lists are different lengths, then naturally they are not equal + -1 === _.indexOf( _.map( // are there any false values in the list returned by map? + _.zip( listA, listB ), // pair up each element between the two lists + function ( pair ) { + return $( pair[0] ).is( pair[1] ); // compare to see if each pair are equal } - }); + ), false ) // check for presence of false in map's return value + ); + return equal; + }; - _.bindAll( this, 'renderScreenshots' ); - }, + /** + * Base class for Panel and Section. + * + * @since 4.1.0 + * + * @class + * @augments wp.customize.Class + */ + Container = api.Class.extend({ + defaultActiveArguments: { duration: 'fast', completeCallback: $.noop }, + defaultExpandedArguments: { duration: 'fast', completeCallback: $.noop }, /** - * Override Section.isContextuallyActive method. - * - * Ignore the active states' of the contained theme controls, and just - * use the section's own active state instead. This ensures empty search - * results for themes to cause the section to become inactive. - * - * @since 4.2.0 + * @since 4.1.0 * - * @returns {Boolean} + * @param {String} id + * @param {Object} options */ - isContextuallyActive: function () { - return this.active(); - }, + initialize: function ( id, options ) { + var container = this; + container.id = id; + container.params = {}; + $.extend( container, options || {} ); + container.container = $( container.params.content ); - /** - * @since 4.2.0 - */ - attachEvents: function () { + container.deferred = { + embedded: new $.Deferred() + }; + container.priority = new api.Value(); + container.active = new api.Value(); + container.activeArgumentsQueue = []; + container.expanded = new api.Value(); + container.expandedArgumentsQueue = []; + + container.active.bind( function ( active ) { + var args = container.activeArgumentsQueue.shift(); + args = $.extend( {}, container.defaultActiveArguments, args ); + active = ( active && container.isContextuallyActive() ); + container.onChangeActive( active, args ); + }); + container.expanded.bind( function ( expanded ) { + var args = container.expandedArgumentsQueue.shift(); + args = $.extend( {}, container.defaultExpandedArguments, args ); + container.onChangeExpanded( expanded, args ); + }); + + container.attachEvents(); + + api.utils.bubbleChildValueChanges( container, [ 'priority', 'active' ] ); + + container.priority.set( isNaN( container.params.priority ) ? 100 : container.params.priority ); + container.active.set( container.params.active ); + container.expanded.set( false ); + }, + + /** + * @since 4.1.0 + * + * @abstract + */ + ready: function() {}, + + /** + * Get the child models associated with this parent, sorting them by their priority Value. + * + * @since 4.1.0 + * + * @param {String} parentType + * @param {String} childType + * @returns {Array} + */ + _children: function ( parentType, childType ) { + var parent = this, + children = []; + api[ childType ].each( function ( child ) { + if ( child[ parentType ].get() === parent.id ) { + children.push( child ); + } + } ); + children.sort( api.utils.prioritySort ); + return children; + }, + + /** + * To override by subclass, to return whether the container has active children. + * + * @since 4.1.0 + * + * @abstract + */ + isContextuallyActive: function () { + throw new Error( 'Container.isContextuallyActive() must be overridden in a subclass.' ); + }, + + /** + * Handle changes to the active state. + * + * This does not change the active state, it merely handles the behavior + * for when it does change. + * + * To override by subclass, update the container's UI to reflect the provided active state. + * + * @since 4.1.0 + * + * @param {Boolean} active + * @param {Object} args + * @param {Object} args.duration + * @param {Object} args.completeCallback + */ + onChangeActive: function ( active, args ) { + var duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 ); + if ( ! $.contains( document, this.container ) ) { + // jQuery.fn.slideUp is not hiding an element if it is not in the DOM + this.container.toggle( active ); + if ( args.completeCallback ) { + args.completeCallback(); + } + } else if ( active ) { + this.container.stop( true, true ).slideDown( duration, args.completeCallback ); + } else { + this.container.stop( true, true ).slideUp( duration, args.completeCallback ); + } + }, + + /** + * @since 4.1.0 + * + * @params {Boolean} active + * @param {Object} [params] + * @returns {Boolean} false if state already applied + */ + _toggleActive: function ( active, params ) { + var self = this; + params = params || {}; + if ( ( active && this.active.get() ) || ( ! active && ! this.active.get() ) ) { + params.unchanged = true; + self.onChangeActive( self.active.get(), params ); + return false; + } else { + params.unchanged = false; + this.activeArgumentsQueue.push( params ); + this.active.set( active ); + return true; + } + }, + + /** + * @param {Object} [params] + * @returns {Boolean} false if already active + */ + activate: function ( params ) { + return this._toggleActive( true, params ); + }, + + /** + * @param {Object} [params] + * @returns {Boolean} false if already inactive + */ + deactivate: function ( params ) { + return this._toggleActive( false, params ); + }, + + /** + * To override by subclass, update the container's UI to reflect the provided active state. + * @abstract + */ + onChangeExpanded: function () { + throw new Error( 'Must override with subclass.' ); + }, + + /** + * @param {Boolean} expanded + * @param {Object} [params] + * @returns {Boolean} false if state already applied + */ + _toggleExpanded: function ( expanded, params ) { + var self = this; + params = params || {}; + var section = this, previousCompleteCallback = params.completeCallback; + params.completeCallback = function () { + if ( previousCompleteCallback ) { + previousCompleteCallback.apply( section, arguments ); + } + if ( expanded ) { + section.container.trigger( 'expanded' ); + } else { + section.container.trigger( 'collapsed' ); + } + }; + if ( ( expanded && this.expanded.get() ) || ( ! expanded && ! this.expanded.get() ) ) { + params.unchanged = true; + self.onChangeExpanded( self.expanded.get(), params ); + return false; + } else { + params.unchanged = false; + this.expandedArgumentsQueue.push( params ); + this.expanded.set( expanded ); + return true; + } + }, + + /** + * @param {Object} [params] + * @returns {Boolean} false if already expanded + */ + expand: function ( params ) { + return this._toggleExpanded( true, params ); + }, + + /** + * @param {Object} [params] + * @returns {Boolean} false if already collapsed + */ + collapse: function ( params ) { + return this._toggleExpanded( false, params ); + }, + + /** + * Bring the container into view and then expand this and bring it into view + * @param {Object} [params] + */ + focus: focus + }); + + /** + * @since 4.1.0 + * + * @class + * @augments wp.customize.Class + */ + api.Section = Container.extend({ + + /** + * @since 4.1.0 + * + * @param {String} id + * @param {Array} options + */ + initialize: function ( id, options ) { + var section = this; + Container.prototype.initialize.call( section, id, options ); + + section.id = id; + section.panel = new api.Value(); + section.panel.bind( function ( id ) { + $( section.container ).toggleClass( 'control-subsection', !! id ); + }); + section.panel.set( section.params.panel || '' ); + api.utils.bubbleChildValueChanges( section, [ 'panel' ] ); + + section.embed(); + section.deferred.embedded.done( function () { + section.ready(); + }); + }, + + /** + * Embed the container in the DOM when any parent panel is ready. + * + * @since 4.1.0 + */ + embed: function () { + var section = this, inject; + + // Watch for changes to the panel state + inject = function ( panelId ) { + var parentContainer; + if ( panelId ) { + // The panel has been supplied, so wait until the panel object is registered + api.panel( panelId, function ( panel ) { + // The panel has been registered, wait for it to become ready/initialized + panel.deferred.embedded.done( function () { + parentContainer = panel.container.find( 'ul:first' ); + if ( ! section.container.parent().is( parentContainer ) ) { + parentContainer.append( section.container ); + } + section.deferred.embedded.resolve(); + }); + } ); + } else { + // There is no panel, so embed the section in the root of the customizer + parentContainer = $( '#customize-theme-controls' ).children( 'ul' ); // @todo This should be defined elsewhere, and to be configurable + if ( ! section.container.parent().is( parentContainer ) ) { + parentContainer.append( section.container ); + } + section.deferred.embedded.resolve(); + } + }; + section.panel.bind( inject ); + inject( section.panel.get() ); // Since a section may never get a panel, assume that it won't ever get one + }, + + /** + * Add behaviors for the accordion section. + * + * @since 4.1.0 + */ + attachEvents: function () { + var section = this; + + // Expand/Collapse accordion sections on click. + section.container.find( '.accordion-section-title' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above + + if ( section.expanded() ) { + section.collapse(); + } else { + section.expand(); + } + }); + }, + + /** + * Return whether this section has any active controls. + * + * @since 4.1.0 + * + * @returns {Boolean} + */ + isContextuallyActive: function () { + var section = this, + controls = section.controls(), + activeCount = 0; + _( controls ).each( function ( control ) { + if ( control.active() ) { + activeCount += 1; + } + } ); + return ( activeCount !== 0 ); + }, + + /** + * Get the controls that are associated with this section, sorted by their priority Value. + * + * @since 4.1.0 + * + * @returns {Array} + */ + controls: function () { + return this._children( 'section', 'control' ); + }, + + /** + * Update UI to reflect expanded state. + * + * @since 4.1.0 + * + * @param {Boolean} expanded + * @param {Object} args + */ + onChangeExpanded: function ( expanded, args ) { + var section = this, + content = section.container.find( '.accordion-section-content' ), + expand; + + if ( expanded ) { + + if ( args.unchanged ) { + expand = args.completeCallback; + } else { + expand = function () { + content.stop().slideDown( args.duration, args.completeCallback ); + section.container.addClass( 'open' ); + }; + } + + if ( ! args.allowMultiple ) { + api.section.each( function ( otherSection ) { + if ( otherSection !== section ) { + otherSection.collapse( { duration: args.duration } ); + } + }); + } + + if ( section.panel() ) { + api.panel( section.panel() ).expand({ + duration: args.duration, + completeCallback: expand + }); + } else { + expand(); + } + + } else { + section.container.removeClass( 'open' ); + content.slideUp( args.duration, args.completeCallback ); + } + } + }); + + /** + * wp.customize.ThemesSection + * + * Custom section for themes that functions similarly to a backwards panel, + * and also handles the theme-details view rendering and navigation. + * +>>>>>>> .r12027 + * @constructor +<<<<<<< .mine + * @augments wp.customize.Section + * @augments wp.customize.Container + */ + api.ThemesSection = api.Section.extend({ + currentTheme: '', + overlay: '', + template: '', + screenshotQueue: null, + $window: $( window ), + + /** + * @since 4.2.0 + */ + initialize: function () { + this.$customizeSidebar = $( '.wp-full-overlay-sidebar-content:first' ); + return api.Section.prototype.initialize.apply( this, arguments ); + }, + + /** + * @since 4.2.0 + */ + ready: function () { + var section = this; + section.overlay = section.container.find( '.theme-overlay' ); + section.template = wp.template( 'customize-themes-details-view' ); + + // Bind global keyboard events. + $( 'body' ).on( 'keyup', function( event ) { + if ( ! section.overlay.find( '.theme-wrap' ).is( ':visible' ) ) { + return; + } + + // Pressing the right arrow key fires a theme:next event + if ( 39 === event.keyCode ) { + section.nextTheme(); + } + + // Pressing the left arrow key fires a theme:previous event + if ( 37 === event.keyCode ) { + section.previousTheme(); + } + + // Pressing the escape key fires a theme:collapse event + if ( 27 === event.keyCode ) { + section.closeDetails(); + } + }); + + _.bindAll( this, 'renderScreenshots' ); + }, + + /** + * Override Section.isContextuallyActive method. + * + * Ignore the active states' of the contained theme controls, and just + * use the section's own active state instead. This ensures empty search + * results for themes to cause the section to become inactive. + * + * @since 4.2.0 + * + * @returns {Boolean} + */ + isContextuallyActive: function () { + return this.active(); + }, + + /** + * @since 4.2.0 + */ + attachEvents: function () { + var section = this; + + // Expand/Collapse section/panel. + section.container.find( '.change-theme, .customize-theme' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above + + if ( section.expanded() ) { + section.collapse(); + } else { + section.expand(); + } + }); + + // Theme navigation in details view. + section.container.on( 'click keydown', '.left', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + event.preventDefault(); // Keep this AFTER the key filter above + + section.previousTheme(); + }); + + section.container.on( 'click keydown', '.right', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + event.preventDefault(); // Keep this AFTER the key filter above + + section.nextTheme(); + }); + + section.container.on( 'click keydown', '.theme-backdrop, .close', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + event.preventDefault(); // Keep this AFTER the key filter above + + section.closeDetails(); + }); + + var renderScreenshots = _.throttle( _.bind( section.renderScreenshots, this ), 100 ); + section.container.on( 'input', '#themes-filter', function( event ) { + var count, + term = event.currentTarget.value.toLowerCase().trim().replace( '-', ' ' ), + controls = section.controls(); + + _.each( controls, function( control ) { + control.filter( term ); + }); + + renderScreenshots(); + + // Update theme count. + count = section.container.find( 'li.customize-control:visible' ).length; + section.container.find( '.theme-count' ).text( count ); + }); + + // Pre-load the first 3 theme screenshots. + api.bind( 'ready', function () { + _.each( section.controls().slice( 0, 3 ), function ( control ) { + var img, src = control.params.theme.screenshot[0]; + if ( src ) { + img = new Image(); + img.src = src; + } + }); + }); + }, + + /** + * Update UI to reflect expanded state + * + * @since 4.2.0 + * + * @param {Boolean} expanded + * @param {Object} args + * @param {Boolean} args.unchanged + * @param {Callback} args.completeCallback + */ + onChangeExpanded: function ( expanded, args ) { + + // Immediately call the complete callback if there were no changes + if ( args.unchanged ) { + if ( args.completeCallback ) { + args.completeCallback(); + } + return; + } + + // Note: there is a second argument 'args' passed + var position, scroll, + panel = this, + section = panel.container.closest( '.accordion-section' ), + overlay = section.closest( '.wp-full-overlay' ), + container = section.closest( '.wp-full-overlay-sidebar-content' ), + siblings = container.find( '.open' ), + customizeBtn = section.find( '.customize-theme' ), + changeBtn = section.find( '.change-theme' ), + content = section.find( '.control-panel-content' ); + + if ( expanded ) { + + // Collapse any sibling sections/panels + api.section.each( function ( otherSection ) { + if ( otherSection !== panel ) { + otherSection.collapse( { duration: args.duration } ); + } + }); + api.panel.each( function ( otherPanel ) { + otherPanel.collapse( { duration: 0 } ); + }); + + content.show( 0, function() { + position = content.offset().top; + scroll = container.scrollTop(); + content.css( 'margin-top', ( $( '#customize-header-actions' ).height() - position - scroll ) ); + section.addClass( 'current-panel' ); + overlay.addClass( 'in-themes-panel' ); + container.scrollTop( 0 ); + _.delay( panel.renderScreenshots, 10 ); // Wait for the controls + panel.$customizeSidebar.on( 'scroll.customize-themes-section', _.throttle( panel.renderScreenshots, 300 ) ); + if ( args.completeCallback ) { + args.completeCallback(); + } + } ); + customizeBtn.focus(); + } else { + siblings.removeClass( 'open' ); + section.removeClass( 'current-panel' ); + overlay.removeClass( 'in-themes-panel' ); + panel.$customizeSidebar.off( 'scroll.customize-themes-section' ); + content.delay( 180 ).hide( 0, function() { + content.css( 'margin-top', 'inherit' ); // Reset + if ( args.completeCallback ) { + args.completeCallback(); + } + } ); + customizeBtn.attr( 'tabindex', '0' ); + changeBtn.focus(); + container.scrollTop( 0 ); + } + }, + + /** + * Render control's screenshot if the control comes into view. + * + * @since 4.2.0 + */ + renderScreenshots: function( ) { + var section = this; + + // Fill queue initially. + if ( section.screenshotQueue === null ) { + section.screenshotQueue = section.controls(); + } + + // Are all screenshots rendered? + if ( ! section.screenshotQueue.length ) { + return; + } + + section.screenshotQueue = _.filter( section.screenshotQueue, function( control ) { + var $imageWrapper = control.container.find( '.theme-screenshot' ), + $image = $imageWrapper.find( 'img' ); + + if ( ! $image.length ) { + return false; + } + + if ( $image.is( ':hidden' ) ) { + return true; + } + + // Based on unveil.js. + var wt = section.$window.scrollTop(), + wb = wt + section.$window.height(), + et = $image.offset().top, + ih = $imageWrapper.height(), + eb = et + ih, + threshold = ih * 3, + inView = eb >= wt - threshold && et <= wb + threshold; + + if ( inView ) { + control.container.trigger( 'render-screenshot' ); + } + + // If the image is in view return false so it's cleared from the queue. + return ! inView; + } ); + }, + + /** + * Advance the modal to the next theme. + * + * @since 4.2.0 + */ + nextTheme: function () { + var section = this; + if ( section.getNextTheme() ) { + section.showDetails( section.getNextTheme(), function() { + section.overlay.find( '.right' ).focus(); + } ); + } + }, + + /** + * Get the next theme model. + * + * @since 4.2.0 + */ + getNextTheme: function () { + var control, next; + control = api.control( 'theme_' + this.currentTheme ); + next = control.container.next( 'li.customize-control-theme' ); + if ( ! next.length ) { + return false; + } + next = next[0].id.replace( 'customize-control-', '' ); + control = api.control( next ); + + return control.params.theme; + }, + + /** + * Advance the modal to the previous theme. + * + * @since 4.2.0 + */ + previousTheme: function () { + var section = this; + if ( section.getPreviousTheme() ) { + section.showDetails( section.getPreviousTheme(), function() { + section.overlay.find( '.left' ).focus(); + } ); + } + }, + + /** + * Get the previous theme model. + * + * @since 4.2.0 + */ + getPreviousTheme: function () { + var control, previous; + control = api.control( 'theme_' + this.currentTheme ); + previous = control.container.prev( 'li.customize-control-theme' ); + if ( ! previous.length ) { + return false; + } + previous = previous[0].id.replace( 'customize-control-', '' ); + control = api.control( previous ); + + return control.params.theme; + }, + + /** + * Disable buttons when we're viewing the first or last theme. + * + * @since 4.2.0 + */ + updateLimits: function () { + if ( ! this.getNextTheme() ) { + this.overlay.find( '.right' ).addClass( 'disabled' ); + } + if ( ! this.getPreviousTheme() ) { + this.overlay.find( '.left' ).addClass( 'disabled' ); + } + }, + + /** + * Render & show the theme details for a given theme model. + * + * @since 4.2.0 + * + * @param {Object} theme + */ + showDetails: function ( theme, callback ) { + var section = this; + callback = callback || function(){}; + section.currentTheme = theme.id; + section.overlay.html( section.template( theme ) ) + .fadeIn( 'fast' ) + .focus(); + $( 'body' ).addClass( 'modal-open' ); + section.containFocus( section.overlay ); + section.updateLimits(); + callback(); + }, + + /** + * Close the theme details modal. + * + * @since 4.2.0 + */ + closeDetails: function () { + $( 'body' ).removeClass( 'modal-open' ); + this.overlay.fadeOut( 'fast' ); + api.control( 'theme_' + this.currentTheme ).focus(); + }, + + /** + * Keep tab focus within the theme details modal. + * + * @since 4.2.0 + */ + containFocus: function( el ) { + var tabbables; + + el.on( 'keydown', function( event ) { + + // Return if it's not the tab key + // When navigating with prev/next focus is already handled + if ( 9 !== event.keyCode ) { + return; + } + + // uses jQuery UI to get the tabbable elements + tabbables = $( ':tabbable', el ); + + // Keep focus within the overlay + if ( tabbables.last()[0] === event.target && ! event.shiftKey ) { + tabbables.first().focus(); + return false; + } else if ( tabbables.first()[0] === event.target && event.shiftKey ) { + tabbables.last().focus(); + return false; + } + }); + } + }); + + /** + * @since 4.1.0 + * + * @class +||||||| .r11156 +======= + * @augments wp.customize.Section + * @augments wp.customize.Container + */ + api.ThemesSection = api.Section.extend({ + currentTheme: '', + overlay: '', + template: '', + screenshotQueue: null, + $window: $( window ), + + /** + * @since 4.2.0 + */ + initialize: function () { + this.$customizeSidebar = $( '.wp-full-overlay-sidebar-content:first' ); + return api.Section.prototype.initialize.apply( this, arguments ); + }, + + /** + * @since 4.2.0 + */ + ready: function () { + var section = this; + section.overlay = section.container.find( '.theme-overlay' ); + section.template = wp.template( 'customize-themes-details-view' ); + + // Bind global keyboard events. + $( 'body' ).on( 'keyup', function( event ) { + if ( ! section.overlay.find( '.theme-wrap' ).is( ':visible' ) ) { + return; + } + + // Pressing the right arrow key fires a theme:next event + if ( 39 === event.keyCode ) { + section.nextTheme(); + } + + // Pressing the left arrow key fires a theme:previous event + if ( 37 === event.keyCode ) { + section.previousTheme(); + } + + // Pressing the escape key fires a theme:collapse event + if ( 27 === event.keyCode ) { + section.closeDetails(); + } + }); + + _.bindAll( this, 'renderScreenshots' ); + }, + + /** + * Override Section.isContextuallyActive method. + * + * Ignore the active states' of the contained theme controls, and just + * use the section's own active state instead. This ensures empty search + * results for themes to cause the section to become inactive. + * + * @since 4.2.0 + * + * @returns {Boolean} + */ + isContextuallyActive: function () { + return this.active(); + }, + + /** + * @since 4.2.0 + */ + attachEvents: function () { var section = this; // Expand/Collapse section/panel. @@ -961,8 +2043,18 @@ * @since 4.1.0 * * @class +>>>>>>> .r12027 * @augments wp.customize.Class */ +<<<<<<< .mine + api.Panel = Container.extend({ + containerType: 'panel', +||||||| .r11156 + api.Control = api.Class.extend({ + initialize: function( id, options ) { + var control = this, + nodes, radios, settings; +======= api.Panel = Container.extend({ /** * @since 4.1.0 @@ -978,7 +2070,45 @@ panel.ready(); }); }, +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * @since 4.1.0 + * + * @param {string} id - The ID for the panel. + * @param {object} options - Object containing one property: params. + * @param {object} options.params - Object containing the following properties. + * @param {string} options.params.title - Title shown when panel is collapsed and expanded. + * @param {string=} [options.params.description] - Description shown at the top of the panel. + * @param {number=100} [options.params.priority] - The sort priority for the panel. + * @param {string=default} [options.params.type] - The type of the panel. See wp.customize.panelConstructor. + * @param {string=} [options.params.content] - The markup to be used for the panel container. If empty, a JS template is used. + * @param {boolean=true} [options.params.active] - Whether the panel is active or not. + */ + initialize: function ( id, options ) { + var panel = this; + Container.prototype.initialize.call( panel, id, options ); + panel.embed(); + panel.deferred.embedded.done( function () { + panel.ready(); + }); + }, +||||||| .r11156 + this.params = {}; + $.extend( this, options || {} ); +======= + /** + * Embed the container in the DOM when any parent panel is ready. + * + * @since 4.1.0 + */ + embed: function () { + var panel = this, + parentContainer = $( '#customize-theme-controls > ul' ); // @todo This should be defined elsewhere, and to be configurable +>>>>>>> .r12027 +<<<<<<< .mine /** * Embed the container in the DOM when any parent panel is ready. * @@ -987,9 +2117,23 @@ embed: function () { var panel = this, parentContainer = $( '#customize-theme-controls > ul' ); // @todo This should be defined elsewhere, and to be configurable +||||||| .r11156 + this.id = id; + this.selector = '#customize-control-' + id.replace( /\]/g, '' ).replace( /\[/g, '-' ); + this.container = $( this.selector ); + this.active = new api.Value( this.params.active ); +======= + if ( ! panel.container.parent().is( parentContainer ) ) { + parentContainer.append( panel.container ); + } + panel.deferred.embedded.resolve(); + }, +>>>>>>> .r12027 +<<<<<<< .mine if ( ! panel.container.parent().is( parentContainer ) ) { parentContainer.append( panel.container ); + panel.renderContent(); } panel.deferred.embedded.resolve(); }, @@ -1010,20 +2154,284 @@ if ( ! panel.expanded() ) { panel.expand(); } +||||||| .r11156 + settings = $.map( this.params.settings, function( value ) { + return value; +======= + /** + * @since 4.1.0 + */ + attachEvents: function () { + var meta, panel = this; + + // Expand/Collapse accordion sections on click. + panel.container.find( '.accordion-section-title' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above + + if ( ! panel.expanded() ) { + panel.expand(); + } +>>>>>>> .r12027 }); +<<<<<<< .mine + // Close panel. + panel.container.find( '.customize-panel-back' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above +||||||| .r11156 + api.apply( api, settings.concat( function() { + var key; +======= meta = panel.container.find( '.panel-meta:first' ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( panel.expanded() ) { + panel.collapse(); +||||||| .r11156 + control.settings = {}; + for ( key in control.params.settings ) { + control.settings[ key ] = api( control.params.settings[ key ] ); +======= meta.find( '> .accordion-section-title' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { return; +>>>>>>> .r12027 + } +<<<<<<< .mine + }); +||||||| .r11156 +======= + event.preventDefault(); // Keep this AFTER the key filter above +>>>>>>> .r12027 + +<<<<<<< .mine + meta = panel.container.find( '.panel-meta:first' ); +||||||| .r11156 + control.setting = control.settings['default'] || null; + control.ready(); + }) ); +======= + if ( meta.hasClass( 'cannot-expand' ) ) { + return; + } +>>>>>>> .r12027 + +<<<<<<< .mine + meta.find( '> .accordion-section-title .customize-help-toggle' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; } event.preventDefault(); // Keep this AFTER the key filter above + meta = panel.container.find( '.panel-meta' ); if ( meta.hasClass( 'cannot-expand' ) ) { return; } + var content = meta.find( '.customize-panel-description:first' ); + if ( meta.hasClass( 'open' ) ) { + meta.toggleClass( 'open' ); + content.slideUp( panel.defaultExpandedArguments.duration ); + $( this ).attr( 'aria-expanded', false ); + } else { + content.slideDown( panel.defaultExpandedArguments.duration ); + meta.toggleClass( 'open' ); + $( this ).attr( 'aria-expanded', true ); + } + }); + + }, + + /** + * Get the sections that are associated with this panel, sorted by their priority Value. + * + * @since 4.1.0 + * + * @returns {Array} + */ + sections: function () { + return this._children( 'panel', 'section' ); + }, + + /** + * Return whether this panel has any active sections. + * + * @since 4.1.0 + * + * @returns {boolean} + */ + isContextuallyActive: function () { + var panel = this, + sections = panel.sections(), + activeCount = 0; + _( sections ).each( function ( section ) { + if ( section.active() && section.isContextuallyActive() ) { + activeCount += 1; + } + } ); + return ( activeCount !== 0 ); + }, + + /** + * Update UI to reflect expanded state + * + * @since 4.1.0 + * + * @param {Boolean} expanded + * @param {Object} args + * @param {Boolean} args.unchanged + * @param {Callback} args.completeCallback + */ + onChangeExpanded: function ( expanded, args ) { + + // Immediately call the complete callback if there were no changes + if ( args.unchanged ) { + if ( args.completeCallback ) { + args.completeCallback(); + } + return; + } + + // Note: there is a second argument 'args' passed + var position, scroll, + panel = this, + section = panel.container.closest( '.accordion-section' ), // This is actually the panel. + overlay = section.closest( '.wp-full-overlay' ), + container = section.closest( '.wp-full-overlay-sidebar-content' ), + siblings = container.find( '.open' ), + topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ), + backBtn = section.find( '.customize-panel-back' ), + panelTitle = section.find( '.accordion-section-title' ).first(), + content = section.find( '.control-panel-content' ), + headerActionsHeight = $( '#customize-header-actions' ).height(); + + if ( expanded ) { + + // Collapse any sibling sections/panels + api.section.each( function ( section ) { + if ( panel.id !== section.panel() ) { + section.collapse( { duration: 0 } ); + } + }); + api.panel.each( function ( otherPanel ) { + if ( panel !== otherPanel ) { + otherPanel.collapse( { duration: 0 } ); + } + }); + + content.show( 0, function() { + content.parent().show(); + position = content.offset().top; + scroll = container.scrollTop(); + content.css( 'margin-top', ( headerActionsHeight - position - scroll ) ); + section.addClass( 'current-panel' ); + overlay.addClass( 'in-sub-panel' ); + container.scrollTop( 0 ); + if ( args.completeCallback ) { + args.completeCallback(); + } + } ); + topPanel.attr( 'tabindex', '-1' ); + backBtn.attr( 'tabindex', '0' ); + backBtn.focus(); + + // Fix the top margin after reflow. + api.bind( 'pane-contents-reflowed', _.debounce( function() { + content.css( 'margin-top', ( parseInt( content.css( 'margin-top' ), 10 ) - ( content.offset().top - headerActionsHeight ) ) ); + }, 100 ) ); + } else { + siblings.removeClass( 'open' ); + section.removeClass( 'current-panel' ); + overlay.removeClass( 'in-sub-panel' ); + content.delay( 180 ).hide( 0, function() { + content.css( 'margin-top', 'inherit' ); // Reset + if ( args.completeCallback ) { + args.completeCallback(); + } + } ); + topPanel.attr( 'tabindex', '0' ); + backBtn.attr( 'tabindex', '-1' ); + panelTitle.focus(); + container.scrollTop( 0 ); + } + }, + + /** + * Render the panel from its JS template, if it exists. + * + * The panel's container must already exist in the DOM. + * + * @since 4.3.0 + */ + renderContent: function () { + var template, + panel = this; + + // Add the content to the container. + if ( 0 !== $( '#tmpl-' + panel.templateSelector + '-content' ).length ) { + template = wp.template( panel.templateSelector + '-content' ); + } else { + template = wp.template( 'customize-panel-default-content' ); + } + if ( template && panel.container ) { + panel.container.find( '.accordion-sub-container' ).html( template( panel.params ) ); + } + } + }); + + /** + * A Customizer Control. + * + * A control provides a UI element that allows a user to modify a Customizer Setting. + * + * @see PHP class WP_Customize_Control. + * + * @class + * @augments wp.customize.Class + * + * @param {string} id Unique identifier for the control instance. + * @param {object} options Options hash for the control instance. + * @param {object} options.params + * @param {object} options.params.type Type of control (e.g. text, radio, dropdown-pages, etc.) + * @param {string} options.params.content The HTML content for the control. + * @param {string} options.params.priority Order of priority to show the control within the section. + * @param {string} options.params.active + * @param {string} options.params.section + * @param {string} options.params.label + * @param {string} options.params.description + * @param {string} options.params.instanceNumber Order in which this instance was created in relation to other instances. + */ + api.Control = api.Class.extend({ + defaultActiveArguments: { duration: 'fast', completeCallback: $.noop }, + + initialize: function( id, options ) { + var control = this, + nodes, radios, settings; + + control.params = {}; + $.extend( control, options || {} ); + control.id = id; + control.selector = '#customize-control-' + id.replace( /\]/g, '' ).replace( /\[/g, '-' ); + control.templateSelector = 'customize-control-' + control.params.type + '-content'; + control.container = control.params.content ? $( control.params.content ) : $( control.selector ); + + control.deferred = { + embedded: new $.Deferred() + }; + control.section = new api.Value(); + control.priority = new api.Value(); + control.active = new api.Value(); + control.activeArgumentsQueue = []; + +||||||| .r11156 +======= var content = meta.find( '.accordion-section-content:first' ); if ( meta.hasClass( 'open' ) ) { meta.toggleClass( 'open' ); @@ -1189,6 +2597,7 @@ control.active = new api.Value(); control.activeArgumentsQueue = []; +>>>>>>> .r12027 control.elements = []; nodes = control.container.find('[data-customize-setting-link]'); @@ -1314,6 +2723,28 @@ * @param {Number} args.duration * @param {Callback} args.completeCallback */ +<<<<<<< .mine + onChangeActive: function ( active, args ) { + if ( args.unchanged ) { + if ( args.completeCallback ) { + args.completeCallback(); + } + return; + } + + if ( ! $.contains( document, this.container ) ) { + // jQuery.fn.slideUp is not hiding an element if it is not in the DOM + this.container.toggle( active ); + if ( args.completeCallback ) { + args.completeCallback(); + } + } else if ( active ) { + this.container.slideDown( args.duration, args.completeCallback ); +||||||| .r11156 + toggle: function ( active ) { + if ( active ) { + this.container.slideDown(); +======= onChangeActive: function ( active, args ) { if ( ! $.contains( document, this.container ) ) { // jQuery.fn.slideUp is not hiding an element if it is not in the DOM @@ -1323,6 +2754,7 @@ } } else if ( active ) { this.container.slideDown( args.duration, args.completeCallback ); +>>>>>>> .r12027 } else { this.container.slideUp( args.duration, args.completeCallback ); } @@ -1536,7 +2968,161 @@ // When a file is selected, run a callback. this.frame.on( 'select', this.select ); }, +<<<<<<< .mine + + /** + * Callback handler for when an attachment is selected in the media modal. + * Gets the selected image information, and sets it within the control. + */ + select: function() { + // Get the attachment from the modal frame. + var node, + attachment = this.frame.state().get( 'selection' ).first().toJSON(), + mejsSettings = window._wpmejsSettings || {}; + + this.params.attachment = attachment; + + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.id ); + node = this.container.find( 'audio, video' ).get(0); + + // Initialize audio/video previews. + if ( node ) { + this.player = new MediaElementPlayer( node, mejsSettings ); + } else { + this.cleanupPlayer(); + } + }, + + /** + * Reset the setting to the default value. + */ + restoreDefault: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); + + this.params.attachment = this.params.defaultAttachment; + this.setting( this.params.defaultAttachment.url ); + }, + + /** + * Called when the "Remove" link is clicked. Empties the setting. + * + * @param {object} event jQuery Event object + */ + removeFile: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); + + this.params.attachment = {}; + this.setting( '' ); + this.renderContent(); // Not bound to setting change when emptying. + } + }); +||||||| .r11156 + success: function( attachment ) { + this.setting.set( attachment.get('url') ); + }, + removerVisibility: function( to ) { + this.remover.toggle( to != this.params.removed ); + } + }); +======= +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * An upload control, which utilizes the media modal. + * + * @class + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.UploadControl = api.MediaControl.extend({ + + /** + * Callback handler for when an attachment is selected in the media modal. + * Gets the selected image information, and sets it within the control. + */ + select: function() { + // Get the attachment from the modal frame. + var node, + attachment = this.frame.state().get( 'selection' ).first().toJSON(), + mejsSettings = window._wpmejsSettings || {}; + + this.params.attachment = attachment; + + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.url ); + node = this.container.find( 'audio, video' ).get(0); + + // Initialize audio/video previews. + if ( node ) { + this.player = new MediaElementPlayer( node, mejsSettings ); + } else { + this.cleanupPlayer(); + } + }, + + // @deprecated + success: function() {}, + + // @deprecated + removerVisibility: function() {} + }); + + /** + * A control for uploading images. + * + * This control no longer needs to do anything more + * than what the upload control does in JS. + * + * @class + * @augments wp.customize.UploadControl + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.ImageControl = api.UploadControl.extend({ + // @deprecated + thumbnailSrc: function() {} + }); + + /** + * A control for uploading background images. + * + * @class + * @augments wp.customize.UploadControl + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.BackgroundControl = api.UploadControl.extend({ + /** + * When the control's DOM structure is ready, + * set up internal event bindings. + */ + ready: function() { + api.UploadControl.prototype.ready.apply( this, arguments ); + }, +||||||| .r11156 + /** + * @constructor + * @augments wp.customize.UploadControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.ImageControl = api.UploadControl.extend({ + ready: function() { + var control = this, + panels; +======= /** * Callback handler for when an attachment is selected in the media modal. * Gets the selected image information, and sets it within the control. @@ -1546,13 +3132,56 @@ var node, attachment = this.frame.state().get( 'selection' ).first().toJSON(), mejsSettings = window._wpmejsSettings || {}; +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Callback handler for when an attachment is selected in the media modal. + * Does an additional AJAX request for setting the background context. + */ + select: function() { + api.UploadControl.prototype.select.apply( this, arguments ); +||||||| .r11156 + this.uploader = { + init: function() { + var fallback, button; +======= this.params.attachment = attachment; +>>>>>>> .r12027 +<<<<<<< .mine + wp.ajax.post( 'custom-background-add', { + nonce: _wpCustomizeBackground.nonces.add, + wp_customize: 'on', + theme: api.settings.theme.stylesheet, + attachment_id: this.params.attachment.id + } ); + } + }); +||||||| .r11156 + if ( this.supports.dragdrop ) + return; +======= // Set the Customizer setting; the callback takes care of rendering. this.setting( attachment.id ); node = this.container.find( 'audio, video' ).get(0); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * A control for selecting and cropping an image. + * + * @class + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.CroppedImageControl = api.MediaControl.extend({ +||||||| .r11156 + // Maintain references while wrapping the fallback button. + fallback = control.container.find( '.upload-fallback' ); + button = fallback.children().detach(); +======= // Initialize audio/video previews. if ( node ) { this.player = new MediaElementPlayer( node, mejsSettings ); @@ -1560,7 +3189,131 @@ this.cleanupPlayer(); } }, +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * Open the media modal to the library state. + */ + openFrame: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + + this.initFrame(); + this.frame.setState( 'library' ).open(); + }, + + /** + * Create a media modal select frame, and store it so the instance can be reused when needed. + */ + initFrame: function() { + var l10n = _wpMediaViewsL10n; + + this.frame = wp.media({ + button: { + text: l10n.select, + close: false + }, + states: [ + new wp.media.controller.Library({ + title: this.params.button_labels.frame_title, + library: wp.media.query({ type: 'image' }), + multiple: false, + date: false, + priority: 20, + suggestedWidth: this.params.width, + suggestedHeight: this.params.height + }), + new wp.media.controller.CustomizeImageCropper({ + imgSelectOptions: this.calculateImageSelectOptions, + control: this + }) + ] + }); + + this.frame.on( 'select', this.onSelect, this ); + this.frame.on( 'cropped', this.onCropped, this ); + this.frame.on( 'skippedcrop', this.onSkippedCrop, this ); + }, + + /** + * After an image is selected in the media modal, switch to the cropper + * state if the image isn't the right size. + */ + onSelect: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(); + + if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) { + this.setImageFromAttachment( attachment ); + this.frame.close(); + } else { + this.frame.setState( 'cropper' ); + } + }, + + /** + * After the image has been cropped, apply the cropped image data to the setting. + * + * @param {object} croppedImage Cropped attachment data. + */ + onCropped: function( croppedImage ) { + this.setImageFromAttachment( croppedImage ); + }, + + /** + * Returns a set of options, computed from the attached image data and + * control-specific data, to be fed to the imgAreaSelect plugin in + * wp.media.view.Cropper. + * + * @param {wp.media.model.Attachment} attachment + * @param {wp.media.controller.Cropper} controller + * @returns {Object} Options + */ + calculateImageSelectOptions: function( attachment, controller ) { + var control = controller.get( 'control' ), + flexWidth = !! parseInt( control.params.flex_width, 10 ), + flexHeight = !! parseInt( control.params.flex_height, 10 ), + realWidth = attachment.get( 'width' ), + realHeight = attachment.get( 'height' ), + xInit = parseInt( control.params.width, 10 ), + yInit = parseInt( control.params.height, 10 ), + ratio = xInit / yInit, + xImg = realWidth, + yImg = realHeight, + x1, y1, imgSelectOptions; + + controller.set( 'canSkipCrop', ! control.mustBeCropped( flexWidth, flexHeight, xInit, yInit, realWidth, realHeight ) ); + + if ( xImg / yImg > ratio ) { + yInit = yImg; + xInit = yInit * ratio; + } else { + xInit = xImg; + yInit = xInit / ratio; + } + + x1 = ( xImg - xInit ) / 2; + y1 = ( yImg - yInit ) / 2; + imgSelectOptions = { + handles: true, + keys: true, + instance: true, + persistent: true, + imageWidth: realWidth, + imageHeight: realHeight, + x1: x1, + y1: y1, + x2: xInit + x1, + y2: yInit + y1 + }; +||||||| .r11156 + this.browser.detach().empty().append( button ); + fallback.append( this.browser ).show(); + } + }; +======= /** * Reset the setting to the default value. */ @@ -1569,11 +3322,34 @@ return; } event.preventDefault(); +>>>>>>> .r12027 +<<<<<<< .mine + if ( flexHeight === false && flexWidth === false ) { + imgSelectOptions.aspectRatio = xInit + ':' + yInit; + } + if ( flexHeight === false ) { + imgSelectOptions.maxHeight = yInit; + } + if ( flexWidth === false ) { + imgSelectOptions.maxWidth = xInit; + } +||||||| .r11156 + api.UploadControl.prototype.ready.call( this ); +======= this.params.attachment = this.params.defaultAttachment; this.setting( this.params.defaultAttachment.url ); }, +>>>>>>> .r12027 +<<<<<<< .mine + return imgSelectOptions; + }, +||||||| .r11156 + this.thumbnail = this.container.find('.preview-thumbnail img'); + this.thumbnailSrc = $.proxy( this.thumbnailSrc, this ); + this.setting.bind( this.thumbnailSrc ); +======= /** * Called when the "Remove" link is clicked. Empties the setting. * @@ -1584,13 +3360,43 @@ return; } event.preventDefault(); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Return whether the image must be cropped, based on required dimensions. + * + * @param {bool} flexW + * @param {bool} flexH + * @param {int} dstW + * @param {int} dstH + * @param {int} imgW + * @param {int} imgH + * @return {bool} + */ + mustBeCropped: function( flexW, flexH, dstW, dstH, imgW, imgH ) { + if ( true === flexW && true === flexH ) { + return false; + } +||||||| .r11156 + this.library = this.container.find('.library'); +======= this.params.attachment = {}; this.setting( '' ); this.renderContent(); // Not bound to setting change when emptying. } }); +>>>>>>> .r12027 +<<<<<<< .mine + if ( true === flexW && dstH === imgH ) { + return false; + } +||||||| .r11156 + // Generate tab objects + this.tabs = {}; + panels = this.library.find('.library-content'); +======= /** * An upload control, which utilizes the media modal. * @@ -1600,7 +3406,18 @@ * @augments wp.customize.Class */ api.UploadControl = api.MediaControl.extend({ +>>>>>>> .r12027 +<<<<<<< .mine + if ( true === flexH && dstW === imgW ) { + return false; + } +||||||| .r11156 + this.library.children('ul').children('li').each( function() { + var link = $(this), + id = link.data('customizeTab'), + panel = panels.filter('[data-customize-tab="' + id + '"]'); +======= /** * Callback handler for when an attachment is selected in the media modal. * Gets the selected image information, and sets it within the control. @@ -1610,13 +3427,45 @@ var node, attachment = this.frame.state().get( 'selection' ).first().toJSON(), mejsSettings = window._wpmejsSettings || {}; +>>>>>>> .r12027 +<<<<<<< .mine + if ( dstW === imgW && dstH === imgH ) { + return false; + } +||||||| .r11156 + control.tabs[ id ] = { + both: link.add( panel ), + link: link, + panel: panel + }; + }); +======= this.params.attachment = attachment; +>>>>>>> .r12027 +<<<<<<< .mine + if ( imgW <= dstW ) { + return false; + } +||||||| .r11156 + // Bind tab switch events + this.library.children('ul').on( 'click keydown', 'li', function( event ) { + if ( event.type === 'keydown' && 13 !== event.which ) // enter + return; +======= // Set the Customizer setting; the callback takes care of rendering. this.setting( attachment.url ); node = this.container.find( 'audio, video' ).get(0); +>>>>>>> .r12027 +<<<<<<< .mine + return true; + }, +||||||| .r11156 + var id = $(this).data('customizeTab'), + tab = control.tabs[ id ]; +======= // Initialize audio/video previews. if ( node ) { this.player = new MediaElementPlayer( node, mejsSettings ); @@ -1624,14 +3473,51 @@ this.cleanupPlayer(); } }, +>>>>>>> .r12027 +<<<<<<< .mine + /** + * If cropping was skipped, apply the image data directly to the setting. + */ + onSkippedCrop: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(); + this.setImageFromAttachment( attachment ); + }, +||||||| .r11156 + event.preventDefault(); +======= // @deprecated success: function() {}, +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Updates the setting and re-renders the control UI. + * + * @param {object} attachment + */ + setImageFromAttachment: function( attachment ) { + this.params.attachment = attachment; +||||||| .r11156 + if ( tab.link.hasClass('library-selected') ) + return; +======= // @deprecated removerVisibility: function() {} }); +>>>>>>> .r12027 +<<<<<<< .mine + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.id ); + } + }); +||||||| .r11156 + control.selected.both.removeClass('library-selected'); + control.selected = tab; + control.selected.both.addClass('library-selected'); + }); +======= /** * A control for uploading images. * @@ -1648,7 +3534,25 @@ // @deprecated thumbnailSrc: function() {} }); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * A control for selecting and cropping Site Icons. + * + * @class + * @augments wp.customize.CroppedImageControl + * @augments wp.customize.MediaControl + * @augments wp.customize.Control + * @augments wp.customize.Class + */ + api.SiteIconControl = api.CroppedImageControl.extend({ +||||||| .r11156 + // Bind events to switch image urls. + this.library.on( 'click keydown', 'a', function( event ) { + if ( event.type === 'keydown' && 13 !== event.which ) // enter + return; +======= /** * A control for uploading background images. * @@ -1659,28 +3563,184 @@ * @augments wp.customize.Class */ api.BackgroundControl = api.UploadControl.extend({ +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * Create a media modal select frame, and store it so the instance can be reused when needed. + */ + initFrame: function() { + var l10n = _wpMediaViewsL10n; + + this.frame = wp.media({ + button: { + text: l10n.select, + close: false + }, + states: [ + new wp.media.controller.Library({ + title: this.params.button_labels.frame_title, + library: wp.media.query({ type: 'image' }), + multiple: false, + date: false, + priority: 20, + suggestedWidth: this.params.width, + suggestedHeight: this.params.height + }), + new wp.media.controller.SiteIconCropper({ + imgSelectOptions: this.calculateImageSelectOptions, + control: this + }) + ] + }); + + this.frame.on( 'select', this.onSelect, this ); + this.frame.on( 'cropped', this.onCropped, this ); + this.frame.on( 'skippedcrop', this.onSkippedCrop, this ); + }, + + /** + * After an image is selected in the media modal, switch to the cropper + * state if the image isn't the right size. + */ + onSelect: function() { + var attachment = this.frame.state().get( 'selection' ).first().toJSON(), + controller = this; + + if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) { + wp.ajax.post( 'crop-image', { + nonce: attachment.nonces.edit, + id: attachment.id, + context: 'site-icon', + cropDetails: { + x1: 0, + y1: 0, + width: this.params.width, + height: this.params.height, + dst_width: this.params.width, + dst_height: this.params.height + } + } ).done( function( croppedImage ) { + controller.setImageFromAttachment( croppedImage ); + controller.frame.close(); + } ).fail( function() { + controller.trigger('content:error:crop'); + } ); + } else { + this.frame.setState( 'cropper' ); + } + }, + /** + * Updates the setting and re-renders the control UI. + * + * @param {object} attachment + */ + setImageFromAttachment: function( attachment ) { + var sizes = [ 'site_icon-32', 'thumbnail', 'full' ], + icon; + + _.each( sizes, function( size ) { + if ( ! icon && ! _.isUndefined ( attachment.sizes[ size ] ) ) { + icon = attachment.sizes[ size ]; + } + } ); + + this.params.attachment = attachment; + + // Set the Customizer setting; the callback takes care of rendering. + this.setting( attachment.id ); + + // Update the icon in-browser. + $( 'link[sizes="32x32"]' ).attr( 'href', icon.url ); +||||||| .r11156 + var value = $(this).data('customizeImageValue'); + + if ( value ) { + control.setting.set( value ); + event.preventDefault(); + } + }); + + if ( this.tabs.uploaded ) { + this.tabs.uploaded.target = this.library.find('.uploaded-target'); + if ( ! this.tabs.uploaded.panel.find('.thumbnail').length ) + this.tabs.uploaded.both.addClass('hidden'); + } + + // Select a tab + panels.each( function() { + var tab = control.tabs[ $(this).data('customizeTab') ]; + + // Select the first visible tab. + if ( ! tab.link.hasClass('hidden') ) { + control.selected = tab; + tab.both.addClass('library-selected'); + return false; + } + }); + + this.dropdownInit(); +======= /** * When the control's DOM structure is ready, * set up internal event bindings. */ ready: function() { api.UploadControl.prototype.ready.apply( this, arguments ); +>>>>>>> .r12027 }, +<<<<<<< .mine + /** + * Called when the "Remove" link is clicked. Empties the setting. + * + * @param {object} event jQuery Event object + */ + removeFile: function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); +||||||| .r11156 + // Add the uploaded image to the uploaded tab. + if ( this.tabs.uploaded && this.tabs.uploaded.target.length ) { + this.tabs.uploaded.both.removeClass('hidden'); +======= /** * Callback handler for when an attachment is selected in the media modal. * Does an additional AJAX request for setting the background context. */ select: function() { api.UploadControl.prototype.select.apply( this, arguments ); +>>>>>>> .r12027 +<<<<<<< .mine + this.params.attachment = {}; + this.setting( '' ); + this.renderContent(); // Not bound to setting change when emptying. + $( 'link[rel="icon"]' ).attr( 'href', '' ); +||||||| .r11156 + // @todo: Do NOT store this on the attachment model. That is bad. + attachment.element = $( '' ) + .data( 'customizeImageValue', attachment.get('url') ) + .append( '

' ) + .appendTo( this.tabs.uploaded.target ); + } + }, + thumbnailSrc: function( to ) { + if ( /^(https?:)?\/\//.test( to ) ) + this.thumbnail.prop( 'src', to ).show(); + else + this.thumbnail.hide(); +======= wp.ajax.post( 'custom-background-add', { nonce: _wpCustomizeBackground.nonces.add, wp_customize: 'on', theme: api.settings.theme.stylesheet, attachment_id: this.params.attachment.id } ); +>>>>>>> .r12027 } }); @@ -2121,6 +4181,33 @@ return; } +<<<<<<< .mine + /* + * Walk over all panels, sections, and controls and set their + * respective active states to true if the preview explicitly + * indicates as such. + */ + var constructs = { + panel: data.activePanels, + section: data.activeSections, + control: data.activeControls + }; + _( constructs ).each( function ( activeConstructs, type ) { + api[ type ].each( function ( construct, id ) { + var active = !! ( activeConstructs && activeConstructs[ id ] ); + if ( active ) { + construct.activate(); + } else { + construct.deactivate(); + } + } ); +||||||| .r11156 + $.each( data.activeControls, function ( id, active ) { + var control = api.control( id ); + if ( control ) { + control.active( active ); + } +======= /* * Walk over all panels, sections, and controls and set their * respective active states to true if the preview explicitly @@ -2136,6 +4223,7 @@ var active = !! ( activeConstructs && activeConstructs[ id ] ); construct.active( active ); } ); +>>>>>>> .r12027 } ); } ); @@ -2544,6 +4632,22 @@ }); api.controlConstructor = { +<<<<<<< .mine + color: api.ColorControl, + media: api.MediaControl, + upload: api.UploadControl, + image: api.ImageControl, + cropped_image: api.CroppedImageControl, + site_icon: api.SiteIconControl, + header: api.HeaderControl, + background: api.BackgroundControl, + theme: api.ThemeControl +||||||| .r11156 + color: api.ColorControl, + upload: api.UploadControl, + image: api.ImageControl, + header: api.HeaderControl +======= color: api.ColorControl, media: api.MediaControl, upload: api.UploadControl, @@ -2551,6 +4655,7 @@ header: api.HeaderControl, background: api.BackgroundControl, theme: api.ThemeControl +>>>>>>> .r12027 }; api.panelConstructor = {}; api.sectionConstructor = { @@ -2566,14 +4671,15 @@ return; } - // Redirect to the fallback preview if any incompatibilities are found. - if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) ) - return window.location = api.settings.url.fallback; + // Bail if any incompatibilities are found. + if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) ) { + return; + } var parent, topFocus, body = $( document.body ), overlay = body.children( '.wp-full-overlay' ), - title = $( '#customize-info .theme-name.site-title' ), + title = $( '#customize-info .panel-title.site-title' ), closeBtn = $( '.customize-controls-close' ), saveBtn = $( '#save' ); @@ -2587,6 +4693,34 @@ } }); +<<<<<<< .mine + // Expand/Collapse the main customizer customize info. + $( '.customize-info' ).find( '> .accordion-section-title .customize-help-toggle' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { + return; + } + event.preventDefault(); // Keep this AFTER the key filter above + + var section = $( this ).closest( '.accordion-section' ), + content = section.find( '.customize-panel-description:first' ); + + if ( section.hasClass( 'cannot-expand' ) ) { + return; + } + + if ( section.hasClass( 'open' ) ) { + section.toggleClass( 'open' ); + content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration ); + $( this ).attr( 'aria-expanded', false ); + } else { + content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration ); + section.toggleClass( 'open' ); + $( this ).attr( 'aria-expanded', true ); + } + }); + +||||||| .r11156 +======= // Expand/Collapse the main customizer customize info. $( '#customize-info' ).find( '> .accordion-section-title' ).on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { @@ -2610,6 +4744,7 @@ } }); +>>>>>>> .r12027 // Initialize Previewer api.previewer = new api.Previewer({ container: '#customize-preview', @@ -2757,6 +4892,102 @@ api.control.add( id, control ); }); +<<<<<<< .mine + // Focus the autofocused element + _.each( [ 'panel', 'section', 'control' ], function ( type ) { + var instance, id = api.settings.autofocus[ type ]; + if ( id && api[ type ]( id ) ) { + instance = api[ type ]( id ); + // Wait until the element is embedded in the DOM + instance.deferred.embedded.done( function () { + // Wait until the preview has activated and so active panels, sections, controls have been set + api.previewer.deferred.active.done( function () { + instance.focus(); + }); + }); + } + }); + + /** + * Sort panels, sections, controls by priorities. Hide empty sections and panels. + * + * @since 4.1.0 + */ + api.reflowPaneContents = _.bind( function () { + + var appendContainer, activeElement, rootContainers, rootNodes = [], wasReflowed = false; + + if ( document.activeElement ) { + activeElement = $( document.activeElement ); + } + + // Sort the sections within each panel + api.panel.each( function ( panel ) { + var sections = panel.sections(), + sectionContainers = _.pluck( sections, 'container' ); + rootNodes.push( panel ); + appendContainer = panel.container.find( 'ul:first' ); + if ( ! api.utils.areElementListsEqual( sectionContainers, appendContainer.children( '[id]' ) ) ) { + _( sections ).each( function ( section ) { + appendContainer.append( section.container ); + } ); + wasReflowed = true; + } + } ); + + // Sort the controls within each section + api.section.each( function ( section ) { + var controls = section.controls(), + controlContainers = _.pluck( controls, 'container' ); + if ( ! section.panel() ) { + rootNodes.push( section ); + } + appendContainer = section.container.find( 'ul:first' ); + if ( ! api.utils.areElementListsEqual( controlContainers, appendContainer.children( '[id]' ) ) ) { + _( controls ).each( function ( control ) { + appendContainer.append( control.container ); + } ); + wasReflowed = true; + } + } ); + + // Sort the root panels and sections + rootNodes.sort( api.utils.prioritySort ); + rootContainers = _.pluck( rootNodes, 'container' ); + appendContainer = $( '#customize-theme-controls' ).children( 'ul' ); // @todo This should be defined elsewhere, and to be configurable + if ( ! api.utils.areElementListsEqual( rootContainers, appendContainer.children() ) ) { + _( rootNodes ).each( function ( rootNode ) { + appendContainer.append( rootNode.container ); + } ); + wasReflowed = true; + } + + // Now re-trigger the active Value callbacks to that the panels and sections can decide whether they can be rendered + api.panel.each( function ( panel ) { + var value = panel.active(); + panel.active.callbacks.fireWith( panel.active, [ value, value ] ); + } ); + api.section.each( function ( section ) { + var value = section.active(); + section.active.callbacks.fireWith( section.active, [ value, value ] ); + } ); + + // Restore focus if there was a reflow and there was an active (focused) element + if ( wasReflowed && activeElement ) { + activeElement.focus(); + } + api.trigger( 'pane-contents-reflowed' ); + }, api ); + api.bind( 'ready', api.reflowPaneContents ); + api.reflowPaneContents = _.debounce( api.reflowPaneContents, 100 ); + $( [ api.panel, api.section, api.control ] ).each( function ( i, values ) { + values.bind( 'add', api.reflowPaneContents ); + values.bind( 'change', api.reflowPaneContents ); + values.bind( 'remove', api.reflowPaneContents ); + } ); + +||||||| .r11156 +======= // Focus the autofocused element _.each( [ 'panel', 'section', 'control' ], function ( type ) { var instance, id = api.settings.autofocus[ type ]; @@ -2849,6 +5080,7 @@ values.bind( 'remove', api.reflowPaneContents ); } ); +>>>>>>> .r12027 // Check if preview url is valid and load the preview frame. if ( api.previewer.previewUrl() ) { api.previewer.refresh(); @@ -2933,12 +5165,39 @@ event.preventDefault(); }); +<<<<<<< .mine + $( '.collapse-sidebar' ).on( 'click', function() { + if ( 'true' === $( this ).attr( 'aria-expanded' ) ) { + $( this ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar }); + } else { + $( this ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar }); + } + + overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' ); + }); + +||||||| .r11156 + $('.upload-dropzone a.upload').keydown( function( event ) { + if ( 13 === event.which ) // enter + this.click(); + }); + +======= +>>>>>>> .r12027 +<<<<<<< .mine + $( '.customize-controls-preview-toggle' ).on( 'click keydown', function( event ) { + if ( api.utils.isKeydownButNotEnterEvent( event ) ) { +||||||| .r11156 + $('.collapse-sidebar').on( 'click keydown', function( event ) { + if ( event.type === 'keydown' && 13 !== event.which ) // enter +======= $('.collapse-sidebar').on( 'click keydown', function( event ) { if ( api.utils.isKeydownButNotEnterEvent( event ) ) { +>>>>>>> .r12027 return; } - overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' ); + overlay.toggleClass( 'preview-only' ); event.preventDefault(); }); @@ -3057,6 +5316,27 @@ }); }); + // Change previewed URL to the homepage when changing the page_on_front. + api( 'show_on_front', 'page_on_front', function( showOnFront, pageOnFront ) { + var updatePreviewUrl = function() { + if ( showOnFront() === 'page' && parseInt( pageOnFront(), 10 ) > 0 ) { + api.previewer.previewUrl.set( api.settings.url.home ); + } + }; + showOnFront.bind( updatePreviewUrl ); + pageOnFront.bind( updatePreviewUrl ); + }); + + // Change the previewed URL to the selected page when changing the page_for_posts. + api( 'page_for_posts', function( setting ) { + setting.bind(function( pageId ) { + pageId = parseInt( pageId, 10 ); + if ( pageId > 0 ) { + api.previewer.previewUrl.set( api.settings.url.home + '?page_id=' + pageId ); + } + }); + }); + api.trigger( 'ready' ); // Make sure left column gets focus diff --git a/pavillonmadeleine.fr/wp-admin/js/customize-controls.min.js b/pavillonmadeleine.fr/wp-admin/js/customize-controls.min.js index 2e8a4665..d05afae9 100644 --- a/pavillonmadeleine.fr/wp-admin/js/customize-controls.min.js +++ b/pavillonmadeleine.fr/wp-admin/js/customize-controls.min.js @@ -1,2 +1,6 @@ +<<<<<<< .mine +!function(a,b){var c,d,e=wp.customize;e.Setting=e.Value.extend({initialize:function(a,b,c){e.Value.prototype.initialize.call(this,b,c),this.id=a,this.transport=this.transport||"refresh",this._dirty=c.dirty||!1,this.bind(this.preview)},preview:function(){switch(this.transport){case"refresh":return this.previewer.refresh();case"postMessage":return this.previewer.send("setting",[this.id,this()])}}}),e.utils={},e.utils.bubbleChildValueChanges=function(a,c){b.each(c,function(b,c){a[c].bind(function(b,c){a.parent&&b!==c&&a.parent.trigger("change",a)})})},d=function(a){var b,c,d;b=this,a=a||{},d=function(){var a;a=b.extended(e.Panel)&&b.expanded&&b.expanded()?b.container.find("ul.control-panel-content"):b.extended(e.Section)&&b.expanded&&b.expanded()?b.container.find("ul.accordion-section-content"):b.container,a.find("input, select, textarea, button, object, a[href], [tabindex]").filter(":visible").first().focus()},a.completeCallback?(c=a.completeCallback,a.completeCallback=function(){d(),c()}):a.completeCallback=d,b.expand?b.expand(a):a.completeCallback()},e.utils.prioritySort=function(a,b){return a.priority()===b.priority()&&"number"==typeof a.params.instanceNumber&&"number"==typeof b.params.instanceNumber?a.params.instanceNumber-b.params.instanceNumber:a.priority()-b.priority()},e.utils.isKeydownButNotEnterEvent=function(a){return"keydown"===a.type&&13!==a.which},e.utils.areElementListsEqual=function(a,c){var d=a.length===c.length&&-1===_.indexOf(_.map(_.zip(a,c),function(a){return b(a[0]).is(a[1])}),!1);return d},c=e.Class.extend({defaultActiveArguments:{duration:"fast",completeCallback:b.noop},defaultExpandedArguments:{duration:"fast",completeCallback:b.noop},containerType:"container",defaults:{title:"",description:"",priority:100,type:"default",content:null,active:!0,instanceNumber:null},initialize:function(a,c){var d=this;d.id=a,c=c||{},c.params=_.defaults(c.params||{},d.defaults),b.extend(d,c),d.templateSelector="customize-"+d.containerType+"-"+d.params.type,d.container=b(d.params.content),0===d.container.length&&(d.container=b(d.getContainer())),d.deferred={embedded:new b.Deferred},d.priority=new e.Value,d.active=new e.Value,d.activeArgumentsQueue=[],d.expanded=new e.Value,d.expandedArgumentsQueue=[],d.active.bind(function(a){var c=d.activeArgumentsQueue.shift();c=b.extend({},d.defaultActiveArguments,c),a=a&&d.isContextuallyActive(),d.onChangeActive(a,c)}),d.expanded.bind(function(a){var c=d.expandedArgumentsQueue.shift();c=b.extend({},d.defaultExpandedArguments,c),d.onChangeExpanded(a,c)}),d.deferred.embedded.done(function(){d.attachEvents()}),e.utils.bubbleChildValueChanges(d,["priority","active"]),d.priority.set(d.params.priority),d.active.set(d.params.active),d.expanded.set(!1)},ready:function(){},_children:function(a,b){var c=this,d=[];return e[b].each(function(b){b[a].get()===c.id&&d.push(b)}),d.sort(e.utils.prioritySort),d},isContextuallyActive:function(){throw new Error("Container.isContextuallyActive() must be overridden in a subclass.")},onChangeActive:function(a,c){var d,f=this;return c.unchanged?void(c.completeCallback&&c.completeCallback()):(d="resolved"===e.previewer.deferred.active.state()?c.duration:0,void(b.contains(document,f.container[0])?a?f.container.stop(!0,!0).slideDown(d,c.completeCallback):f.expanded()?f.collapse({duration:d,completeCallback:function(){f.container.stop(!0,!0).slideUp(d,c.completeCallback)}}):f.container.stop(!0,!0).slideUp(d,c.completeCallback):(f.container.toggle(a),c.completeCallback&&c.completeCallback())))},_toggleActive:function(a,b){var c=this;return b=b||{},a&&this.active.get()||!a&&!this.active.get()?(b.unchanged=!0,c.onChangeActive(c.active.get(),b),!1):(b.unchanged=!1,this.activeArgumentsQueue.push(b),this.active.set(a),!0)},activate:function(a){return this._toggleActive(!0,a)},deactivate:function(a){return this._toggleActive(!1,a)},onChangeExpanded:function(){throw new Error("Must override with subclass.")},_toggleExpanded:function(a,b){var c=this;b=b||{};var d=this,e=b.completeCallback;return b.completeCallback=function(){e&&e.apply(d,arguments),a?d.container.trigger("expanded"):d.container.trigger("collapsed")},a&&this.expanded.get()||!a&&!this.expanded.get()?(b.unchanged=!0,c.onChangeExpanded(c.expanded.get(),b),!1):(b.unchanged=!1,this.expandedArgumentsQueue.push(b),this.expanded.set(a),!0)},expand:function(a){return this._toggleExpanded(!0,a)},collapse:function(a){return this._toggleExpanded(!1,a)},focus:d,getContainer:function(){var a,c=this;return a=0!==b("#tmpl-"+c.templateSelector).length?wp.template(c.templateSelector):wp.template("customize-"+c.containerType+"-default"),a&&c.container?b.trim(a(c.params)):"

"}}),e.Section=c.extend({containerType:"section",defaults:{title:"",description:"",priority:100,type:"default",content:null,active:!0,instanceNumber:null,panel:null,customizeAction:""},initialize:function(a,d){var f=this;c.prototype.initialize.call(f,a,d),f.id=a,f.panel=new e.Value,f.panel.bind(function(a){b(f.container).toggleClass("control-subsection",!!a)}),f.panel.set(f.params.panel||""),e.utils.bubbleChildValueChanges(f,["panel"]),f.embed(),f.deferred.embedded.done(function(){f.ready()})},embed:function(){var a,c=this;a=function(a){var d;a?e.panel(a,function(a){a.deferred.embedded.done(function(){d=a.container.find("ul:first"),c.container.parent().is(d)||d.append(c.container),c.deferred.embedded.resolve()})}):(d=b("#customize-theme-controls").children("ul"),c.container.parent().is(d)||d.append(c.container),c.deferred.embedded.resolve())},c.panel.bind(a),a(c.panel.get())},attachEvents:function(){var a=this;a.container.find(".accordion-section-title, .customize-section-back").on("click keydown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.expanded()?a.collapse():a.expand())})},isContextuallyActive:function(){var a=this,b=a.controls(),c=0;return _(b).each(function(a){a.active()&&(c+=1)}),0!==c},controls:function(){return this._children("section","control")},onChangeExpanded:function(a,c){var d,f,g,h,i=this,j=i.container.closest(".wp-full-overlay-sidebar-content"),k=i.container.find(".accordion-section-content"),l=i.container.closest(".wp-full-overlay"),m=i.container.find(".customize-section-back"),n=i.container.find(".accordion-section-title").first(),o=b("#customize-header-actions").height();a&&!i.container.hasClass("open")?(c.unchanged?f=c.completeCallback:(j.scrollTop(0),d=function(){var a,b;a=window.matchMedia||window.msMatchMedia,b=90,a&&a("(max-width: 640px)").matches&&(b=45),k.css("height",window.innerHeight-b)},f=function(){i.container.addClass("open"),l.addClass("section-open"),g=k.offset().top,h=j.scrollTop(),k.css("margin-top",o-g-h),d(),n.attr("tabindex","-1"),m.attr("tabindex","0"),m.focus(),c.completeCallback&&c.completeCallback(),b(window).on("resize.customizer-section",_.debounce(d,100)),e.bind("pane-contents-reflowed",_.debounce(function(){var a=k.offset().top-o;a>0&&k.css("margin-top",parseInt(k.css("margin-top"),10)-a)},100))}),c.allowMultiple||e.section.each(function(a){a!==i&&a.collapse({duration:c.duration})}),i.panel()?e.panel(i.panel()).expand({duration:c.duration,completeCallback:f}):(e.panel.each(function(a){a.collapse()}),f())):!a&&i.container.hasClass("open")?(i.container.removeClass("open"),l.removeClass("section-open"),k.css("margin-top",""),j.scrollTop(0),m.attr("tabindex","-1"),n.attr("tabindex","0"),n.focus(),c.completeCallback&&c.completeCallback(),b(window).off("resize.customizer-section")):c.completeCallback&&c.completeCallback()}}),e.ThemesSection=e.Section.extend({currentTheme:"",overlay:"",template:"",screenshotQueue:null,$window:b(window),initialize:function(){return this.$customizeSidebar=b(".wp-full-overlay-sidebar-content:first"),e.Section.prototype.initialize.apply(this,arguments)},ready:function(){var a=this;a.overlay=a.container.find(".theme-overlay"),a.template=wp.template("customize-themes-details-view"),b("body").on("keyup",function(b){a.overlay.find(".theme-wrap").is(":visible")&&(39===b.keyCode&&a.nextTheme(),37===b.keyCode&&a.previousTheme(),27===b.keyCode&&a.closeDetails())}),_.bindAll(this,"renderScreenshots")},isContextuallyActive:function(){return this.active()},attachEvents:function(){var a=this;a.container.find(".change-theme, .customize-theme").on("click keydown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.expanded()?a.collapse():a.expand())}),a.container.on("click keydown",".left",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.previousTheme())}),a.container.on("click keydown",".right",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.nextTheme())}),a.container.on("click keydown",".theme-backdrop, .close",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),a.closeDetails())});var b=_.throttle(_.bind(a.renderScreenshots,this),100);a.container.on("input","#themes-filter",function(c){var d,e=c.currentTarget.value.toLowerCase().trim().replace("-"," "),f=a.controls();_.each(f,function(a){a.filter(e)}),b(),d=a.container.find("li.customize-control:visible").length,a.container.find(".theme-count").text(d)}),e.bind("ready",function(){_.each(a.controls().slice(0,3),function(a){var b,c=a.params.theme.screenshot[0];c&&(b=new Image,b.src=c)})})},onChangeExpanded:function(a,c){if(c.unchanged)return void(c.completeCallback&&c.completeCallback());var d,f,g=this,h=g.container.closest(".accordion-section"),i=h.closest(".wp-full-overlay"),j=h.closest(".wp-full-overlay-sidebar-content"),k=j.find(".open"),l=h.find(".customize-theme"),m=h.find(".change-theme"),n=h.find(".control-panel-content");a?(e.section.each(function(a){a!==g&&a.collapse({duration:c.duration})}),e.panel.each(function(a){a.collapse({duration:0})}),n.show(0,function(){d=n.offset().top,f=j.scrollTop(),n.css("margin-top",b("#customize-header-actions").height()-d-f),h.addClass("current-panel"),i.addClass("in-themes-panel"),j.scrollTop(0),_.delay(g.renderScreenshots,10),g.$customizeSidebar.on("scroll.customize-themes-section",_.throttle(g.renderScreenshots,300)),c.completeCallback&&c.completeCallback()}),l.focus()):(k.removeClass("open"),h.removeClass("current-panel"),i.removeClass("in-themes-panel"),g.$customizeSidebar.off("scroll.customize-themes-section"),n.delay(180).hide(0,function(){n.css("margin-top","inherit"),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","0"),m.focus(),j.scrollTop(0))},renderScreenshots:function(){var a=this;null===a.screenshotQueue&&(a.screenshotQueue=a.controls()),a.screenshotQueue.length&&(a.screenshotQueue=_.filter(a.screenshotQueue,function(b){var c=b.container.find(".theme-screenshot"),d=c.find("img");if(!d.length)return!1;if(d.is(":hidden"))return!0;var e=a.$window.scrollTop(),f=e+a.$window.height(),g=d.offset().top,h=c.height(),i=g+h,j=3*h,k=i>=e-j&&f+j>=g;return k&&b.container.trigger("render-screenshot"),!k}))},nextTheme:function(){var a=this;a.getNextTheme()&&a.showDetails(a.getNextTheme(),function(){a.overlay.find(".right").focus()})},getNextTheme:function(){var a,b;return a=e.control("theme_"+this.currentTheme),b=a.container.next("li.customize-control-theme"),b.length?(b=b[0].id.replace("customize-control-",""),a=e.control(b),a.params.theme):!1},previousTheme:function(){var a=this;a.getPreviousTheme()&&a.showDetails(a.getPreviousTheme(),function(){a.overlay.find(".left").focus()})},getPreviousTheme:function(){var a,b;return a=e.control("theme_"+this.currentTheme),b=a.container.prev("li.customize-control-theme"),b.length?(b=b[0].id.replace("customize-control-",""),a=e.control(b),a.params.theme):!1},updateLimits:function(){this.getNextTheme()||this.overlay.find(".right").addClass("disabled"),this.getPreviousTheme()||this.overlay.find(".left").addClass("disabled")},showDetails:function(a,c){var d=this;c=c||function(){},d.currentTheme=a.id,d.overlay.html(d.template(a)).fadeIn("fast").focus(),b("body").addClass("modal-open"),d.containFocus(d.overlay),d.updateLimits(),c()},closeDetails:function(){b("body").removeClass("modal-open"),this.overlay.fadeOut("fast"),e.control("theme_"+this.currentTheme).focus()},containFocus:function(a){var c;a.on("keydown",function(d){return 9===d.keyCode?(c=b(":tabbable",a),c.last()[0]!==d.target||d.shiftKey?c.first()[0]===d.target&&d.shiftKey?(c.last().focus(),!1):void 0:(c.first().focus(),!1)):void 0})}}),e.Panel=c.extend({containerType:"panel",initialize:function(a,b){var d=this;c.prototype.initialize.call(d,a,b),d.embed(),d.deferred.embedded.done(function(){d.ready()})},embed:function(){var a=this,c=b("#customize-theme-controls > ul");a.container.parent().is(c)||(c.append(a.container),a.renderContent()),a.deferred.embedded.resolve()},attachEvents:function(){var a,c=this;c.container.find(".accordion-section-title").on("click keydown",function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),c.expanded()||c.expand())}),c.container.find(".customize-panel-back").on("click keydown",function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),c.expanded()&&c.collapse())}),a=c.container.find(".panel-meta:first"),a.find("> .accordion-section-title .customize-help-toggle").on("click keydown",function(d){if(!e.utils.isKeydownButNotEnterEvent(d)&&(d.preventDefault(),a=c.container.find(".panel-meta"),!a.hasClass("cannot-expand"))){var f=a.find(".customize-panel-description:first");a.hasClass("open")?(a.toggleClass("open"),f.slideUp(c.defaultExpandedArguments.duration),b(this).attr("aria-expanded",!1)):(f.slideDown(c.defaultExpandedArguments.duration),a.toggleClass("open"),b(this).attr("aria-expanded",!0))}})},sections:function(){return this._children("panel","section")},isContextuallyActive:function(){var a=this,b=a.sections(),c=0;return _(b).each(function(a){a.active()&&a.isContextuallyActive()&&(c+=1)}),0!==c},onChangeExpanded:function(a,c){if(c.unchanged)return void(c.completeCallback&&c.completeCallback());var d,f,g=this,h=g.container.closest(".accordion-section"),i=h.closest(".wp-full-overlay"),j=h.closest(".wp-full-overlay-sidebar-content"),k=j.find(".open"),l=i.find("#customize-theme-controls > ul > .accordion-section > .accordion-section-title"),m=h.find(".customize-panel-back"),n=h.find(".accordion-section-title").first(),o=h.find(".control-panel-content"),p=b("#customize-header-actions").height();a?(e.section.each(function(a){g.id!==a.panel()&&a.collapse({duration:0})}),e.panel.each(function(a){g!==a&&a.collapse({duration:0})}),o.show(0,function(){o.parent().show(),d=o.offset().top,f=j.scrollTop(),o.css("margin-top",p-d-f),h.addClass("current-panel"),i.addClass("in-sub-panel"),j.scrollTop(0),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","-1"),m.attr("tabindex","0"),m.focus(),e.bind("pane-contents-reflowed",_.debounce(function(){o.css("margin-top",parseInt(o.css("margin-top"),10)-(o.offset().top-p))},100))):(k.removeClass("open"),h.removeClass("current-panel"),i.removeClass("in-sub-panel"),o.delay(180).hide(0,function(){o.css("margin-top","inherit"),c.completeCallback&&c.completeCallback()}),l.attr("tabindex","0"),m.attr("tabindex","-1"),n.focus(),j.scrollTop(0))},renderContent:function(){var a,c=this;a=0!==b("#tmpl-"+c.templateSelector+"-content").length?wp.template(c.templateSelector+"-content"):wp.template("customize-panel-default-content"),a&&c.container&&c.container.find(".accordion-sub-container").html(a(c.params))}}),e.Control=e.Class.extend({defaultActiveArguments:{duration:"fast",completeCallback:b.noop},initialize:function(a,c){var d,f,g,h=this;h.params={},b.extend(h,c||{}),h.id=a,h.selector="#customize-control-"+a.replace(/\]/g,"").replace(/\[/g,"-"),h.templateSelector="customize-control-"+h.params.type+"-content",h.container=b(h.params.content?h.params.content:h.selector),h.deferred={embedded:new b.Deferred},h.section=new e.Value,h.priority=new e.Value,h.active=new e.Value,h.activeArgumentsQueue=[],h.elements=[],d=h.container.find("[data-customize-setting-link]"),f={},d.each(function(){var a,c=b(this);if(c.is(":radio")){if(a=c.prop("name"),f[a])return;f[a]=!0,c=d.filter('[name="'+a+'"]')}e(c.data("customizeSettingLink"),function(a){var b=new e.Element(c);h.elements.push(b),b.sync(a),b.set(a())})}),h.active.bind(function(a){var c=h.activeArgumentsQueue.shift();c=b.extend({},h.defaultActiveArguments,c),h.onChangeActive(a,c)}),h.section.set(h.params.section),h.priority.set(isNaN(h.params.priority)?10:h.params.priority),h.active.set(h.params.active),e.utils.bubbleChildValueChanges(h,["section","priority","active"]),g=b.map(h.params.settings,function(a){return a}),e.apply(e,g.concat(function(){var a;h.settings={};for(a in h.params.settings)h.settings[a]=e(h.params.settings[a]);h.setting=h.settings["default"]||null,h.embed()})),h.deferred.embedded.done(function(){h.ready()})},embed:function(){var a,b=this;a=function(a){var c;a&&e.section(a,function(a){a.deferred.embedded.done(function(){c=a.container.find("ul:first"),b.container.parent().is(c)||(c.append(b.container),b.renderContent()),b.deferred.embedded.resolve()})})},b.section.bind(a),a(b.section.get())},ready:function(){},expand:function(a){e.section(this.section()).expand(a)},focus:d,onChangeActive:function(a,c){return c.unchanged?void(c.completeCallback&&c.completeCallback()):void(b.contains(document,this.container)?a?this.container.slideDown(c.duration,c.completeCallback):this.container.slideUp(c.duration,c.completeCallback):(this.container.toggle(a),c.completeCallback&&c.completeCallback()))},toggle:function(a){return this.onChangeActive(a,this.defaultActiveArguments)},activate:c.prototype.activate,deactivate:c.prototype.deactivate,_toggleActive:c.prototype._toggleActive,dropdownInit:function(){var a=this,b=this.container.find(".dropdown-status"),c=this.params,d=!1,f=function(a){"string"==typeof a&&c.statuses&&c.statuses[a]?b.html(c.statuses[a]).show():b.hide()};this.container.on("click keydown",".dropdown",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),d||a.container.toggleClass("open"),a.container.hasClass("open")&&a.container.parent().parent().find("li.library-selected").focus(),d=!0,setTimeout(function(){d=!1},400))}),this.setting.bind(f),f(this.setting())},renderContent:function(){var a,c=this;0!==b("#tmpl-"+c.templateSelector).length&&(a=wp.template(c.templateSelector),a&&c.container&&c.container.html(a(c.params)))}}),e.ColorControl=e.Control.extend({ready:function(){var a=this,b=this.container.find(".color-picker-hex");b.val(a.setting()).wpColorPicker({change:function(){a.setting.set(b.wpColorPicker("color"))},clear:function(){a.setting.set(!1)}}),this.setting.bind(function(a){b.val(a),b.wpColorPicker("color",a)})}}),e.MediaControl=e.Control.extend({ready:function(){var a=this;_.bindAll(a,"restoreDefault","removeFile","openFrame","select","pausePlayer"),a.container.on("click keydown",".upload-button",a.openFrame),a.container.on("click keydown",".upload-button",a.pausePlayer),a.container.on("click keydown",".thumbnail-image img",a.openFrame),a.container.on("click keydown",".default-button",a.restoreDefault),a.container.on("click keydown",".remove-button",a.pausePlayer),a.container.on("click keydown",".remove-button",a.removeFile),a.container.on("click keydown",".remove-button",a.cleanupPlayer),e.section(a.section()).container.on("expanded",function(){a.player&&a.player.setControlsSize()}).on("collapsed",function(){a.pausePlayer()}),a.setting.bind(function(){a.renderContent()})},pausePlayer:function(){this.player&&this.player.pause()},cleanupPlayer:function(){this.player&&wp.media.mixin.removePlayer(this.player)},openFrame:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.frame||this.initFrame(),this.frame.open())},initFrame:function(){this.frame=wp.media({button:{text:this.params.button_labels.frame_button},states:[new wp.media.controller.Library({title:this.params.button_labels.frame_title,library:wp.media.query({type:this.params.mime_type}),multiple:!1,date:!1})]}),this.frame.on("select",this.select)},select:function(){var a,b=this.frame.state().get("selection").first().toJSON(),c=window._wpmejsSettings||{};this.params.attachment=b,this.setting(b.id),a=this.container.find("audio, video").get(0),a?this.player=new MediaElementPlayer(a,c):this.cleanupPlayer()},restoreDefault:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.params.attachment=this.params.defaultAttachment,this.setting(this.params.defaultAttachment.url))},removeFile:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.params.attachment={},this.setting(""),this.renderContent())}}),e.UploadControl=e.MediaControl.extend({select:function(){var a,b=this.frame.state().get("selection").first().toJSON(),c=window._wpmejsSettings||{};this.params.attachment=b,this.setting(b.url),a=this.container.find("audio, video").get(0),a?this.player=new MediaElementPlayer(a,c):this.cleanupPlayer()},success:function(){},removerVisibility:function(){}}),e.ImageControl=e.UploadControl.extend({thumbnailSrc:function(){}}),e.BackgroundControl=e.UploadControl.extend({ready:function(){e.UploadControl.prototype.ready.apply(this,arguments)},select:function(){e.UploadControl.prototype.select.apply(this,arguments),wp.ajax.post("custom-background-add",{nonce:_wpCustomizeBackground.nonces.add,wp_customize:"on",theme:e.settings.theme.stylesheet,attachment_id:this.params.attachment.id})}}),e.CroppedImageControl=e.MediaControl.extend({openFrame:function(a){e.utils.isKeydownButNotEnterEvent(a)||(this.initFrame(),this.frame.setState("library").open())},initFrame:function(){var a=_wpMediaViewsL10n;this.frame=wp.media({button:{text:a.select,close:!1},states:[new wp.media.controller.Library({title:this.params.button_labels.frame_title,library:wp.media.query({type:"image"}),multiple:!1,date:!1,priority:20,suggestedWidth:this.params.width,suggestedHeight:this.params.height}),new wp.media.controller.CustomizeImageCropper({imgSelectOptions:this.calculateImageSelectOptions,control:this})]}),this.frame.on("select",this.onSelect,this),this.frame.on("cropped",this.onCropped,this),this.frame.on("skippedcrop",this.onSkippedCrop,this)},onSelect:function(){var a=this.frame.state().get("selection").first().toJSON();this.params.width!==a.width||this.params.height!==a.height||this.params.flex_width||this.params.flex_height?this.frame.setState("cropper"):(this.setImageFromAttachment(a),this.frame.close())},onCropped:function(a){this.setImageFromAttachment(a)},calculateImageSelectOptions:function(a,b){var c,d,e,f=b.get("control"),g=!!parseInt(f.params.flex_width,10),h=!!parseInt(f.params.flex_height,10),i=a.get("width"),j=a.get("height"),k=parseInt(f.params.width,10),l=parseInt(f.params.height,10),m=k/l,n=i,o=j;return b.set("canSkipCrop",!f.mustBeCropped(g,h,k,l,i,j)),n/o>m?(l=o,k=l*m):(k=n,l=k/m),c=(n-k)/2,d=(o-l)/2,e={handles:!0,keys:!0,instance:!0,persistent:!0,imageWidth:i,imageHeight:j,x1:c,y1:d,x2:k+c,y2:l+d},h===!1&&g===!1&&(e.aspectRatio=k+":"+l),h===!1&&(e.maxHeight=l),g===!1&&(e.maxWidth=k),e},mustBeCropped:function(a,b,c,d,e,f){return!0===a&&!0===b?!1:!0===a&&d===f?!1:!0===b&&c===e?!1:c===e&&d===f?!1:c>=e?!1:!0},onSkippedCrop:function(){var a=this.frame.state().get("selection").first().toJSON();this.setImageFromAttachment(a)},setImageFromAttachment:function(a){this.params.attachment=a,this.setting(a.id)}}),e.SiteIconControl=e.CroppedImageControl.extend({initFrame:function(){var a=_wpMediaViewsL10n;this.frame=wp.media({button:{text:a.select,close:!1},states:[new wp.media.controller.Library({title:this.params.button_labels.frame_title,library:wp.media.query({type:"image"}),multiple:!1,date:!1,priority:20,suggestedWidth:this.params.width,suggestedHeight:this.params.height}),new wp.media.controller.SiteIconCropper({imgSelectOptions:this.calculateImageSelectOptions,control:this})]}),this.frame.on("select",this.onSelect,this),this.frame.on("cropped",this.onCropped,this),this.frame.on("skippedcrop",this.onSkippedCrop,this)},onSelect:function(){var a=this.frame.state().get("selection").first().toJSON(),b=this;this.params.width!==a.width||this.params.height!==a.height||this.params.flex_width||this.params.flex_height?this.frame.setState("cropper"):wp.ajax.post("crop-image",{nonce:a.nonces.edit,id:a.id,context:"site-icon",cropDetails:{x1:0,y1:0,width:this.params.width,height:this.params.height,dst_width:this.params.width,dst_height:this.params.height}}).done(function(a){b.setImageFromAttachment(a),b.frame.close()}).fail(function(){b.trigger("content:error:crop")})},setImageFromAttachment:function(a){var c,d=["site_icon-32","thumbnail","full"];_.each(d,function(b){c||_.isUndefined(a.sizes[b])||(c=a.sizes[b])}),this.params.attachment=a,this.setting(a.id),b('link[sizes="32x32"]').attr("href",c.url)},removeFile:function(a){e.utils.isKeydownButNotEnterEvent(a)||(a.preventDefault(),this.params.attachment={},this.setting(""),this.renderContent(),b('link[rel="icon"]').attr("href",""))}}),e.HeaderControl=e.Control.extend({ready:function(){this.btnRemove=b("#customize-control-header_image .actions .remove"),this.btnNew=b("#customize-control-header_image .actions .new"),_.bindAll(this,"openMedia","removeImage"),this.btnNew.on("click",this.openMedia),this.btnRemove.on("click",this.removeImage),e.HeaderTool.currentHeader=this.getInitialHeaderImage(),new e.HeaderTool.CurrentView({model:e.HeaderTool.currentHeader,el:"#customize-control-header_image .current .container"}),new e.HeaderTool.ChoiceListView({collection:e.HeaderTool.UploadsList=new e.HeaderTool.ChoiceList,el:"#customize-control-header_image .choices .uploaded .list"}),new e.HeaderTool.ChoiceListView({collection:e.HeaderTool.DefaultsList=new e.HeaderTool.DefaultsList,el:"#customize-control-header_image .choices .default .list"}),e.HeaderTool.combinedList=e.HeaderTool.CombinedList=new e.HeaderTool.CombinedList([e.HeaderTool.UploadsList,e.HeaderTool.DefaultsList])},getInitialHeaderImage:function(){if(!e.get().header_image||!e.get().header_image_data||_.contains(["remove-header","random-default-image","random-uploaded-image"],e.get().header_image))return new e.HeaderTool.ImageModel;var a=_.find(_wpCustomizeHeader.uploads,function(a){return a.attachment_id===e.get().header_image_data.attachment_id});return a||(a={url:e.get().header_image,thumbnail_url:e.get().header_image,attachment_id:e.get().header_image_data.attachment_id}),new e.HeaderTool.ImageModel({header:a,choice:a.url.split("/").pop()})},calculateImageSelectOptions:function(a,b){var c,d,f,g,h,i,j=parseInt(_wpCustomizeHeader.data.width,10),k=parseInt(_wpCustomizeHeader.data.height,10),l=!!parseInt(_wpCustomizeHeader.data["flex-width"],10),m=!!parseInt(_wpCustomizeHeader.data["flex-height"],10);return h=a.get("width"),g=a.get("height"),this.headerImage=new e.HeaderTool.ImageModel,this.headerImage.set({themeWidth:j,themeHeight:k,themeFlexWidth:l,themeFlexHeight:m,imageWidth:h,imageHeight:g}),b.set("canSkipCrop",!this.headerImage.shouldBeCropped()),c=j/k,d=h,f=g,d/f>c?(k=f,j=k*c):(j=d,k=j/c),i={handles:!0,keys:!0,instance:!0,persistent:!0,imageWidth:h,imageHeight:g,x1:0,y1:0,x2:j,y2:k},m===!1&&l===!1&&(i.aspectRatio=j+":"+k),m===!1&&(i.maxHeight=k),l===!1&&(i.maxWidth=j),i},openMedia:function(a){var b=_wpMediaViewsL10n;a.preventDefault(),this.frame=wp.media({button:{text:b.selectAndCrop,close:!1},states:[new wp.media.controller.Library({title:b.chooseImage,library:wp.media.query({type:"image"}),multiple:!1,date:!1,priority:20,suggestedWidth:_wpCustomizeHeader.data.width,suggestedHeight:_wpCustomizeHeader.data.height}),new wp.media.controller.Cropper({imgSelectOptions:this.calculateImageSelectOptions})]}),this.frame.on("select",this.onSelect,this),this.frame.on("cropped",this.onCropped,this),this.frame.on("skippedcrop",this.onSkippedCrop,this),this.frame.open()},onSelect:function(){this.frame.setState("cropper")},onCropped:function(a){var b=a.post_content,c=a.attachment_id,d=a.width,e=a.height;this.setImageFromURL(b,c,d,e)},onSkippedCrop:function(a){var b=a.get("url"),c=a.get("width"),d=a.get("height");this.setImageFromURL(b,a.id,c,d)},setImageFromURL:function(a,b,c,d){var f,g={};g.url=a,g.thumbnail_url=a,g.timestamp=_.now(),b&&(g.attachment_id=b),c&&(g.width=c),d&&(g.height=d),f=new e.HeaderTool.ImageModel({header:g,choice:a.split("/").pop()}),e.HeaderTool.UploadsList.add(f),e.HeaderTool.currentHeader.set(f.toJSON()),f.save(),f.importImage()},removeImage:function(){e.HeaderTool.currentHeader.trigger("hide"),e.HeaderTool.CombinedList.trigger("control:removeImage")}}),e.ThemeControl=e.Control.extend({touchDrag:!1,isRendered:!1,renderContent:function(){var a=this,b=arguments;e.section(a.section(),function(c){c.expanded()?(e.Control.prototype.renderContent.apply(a,b),a.isRendered=!0):c.expanded.bind(function(c){c&&!a.isRendered&&(e.Control.prototype.renderContent.apply(a,b),a.isRendered=!0)})})},ready:function(){var a=this;a.container.on("touchmove",".theme",function(){a.touchDrag=!0}),a.container.on("click keydown touchend",".theme",function(c){if(!e.utils.isKeydownButNotEnterEvent(c)){if(a.touchDrag===!0)return a.touchDrag=!1;if(!b(c.target).is(".theme-actions .button")){var d=b(this).data("previewUrl");b(".wp-full-overlay").addClass("customize-loading"),window.parent.location=d}}}),a.container.on("click keydown",".theme-actions .theme-details",function(b){e.utils.isKeydownButNotEnterEvent(b)||(b.preventDefault(),e.section(a.section()).showDetails(a.params.theme))}),a.container.on("render-screenshot",function(){var a=b(this).find("img"),c=a.data("src");c&&a.attr("src",c)})},filter:function(a){var b=this,c=b.params.theme.name+" "+b.params.theme.description+" "+b.params.theme.tags+" "+b.params.theme.author;c=c.toLowerCase().replace("-"," "),-1!==c.search(a)?b.activate():b.deactivate()}}),e.defaultConstructor=e.Setting,e.control=new e.Values({defaultConstructor:e.Control}),e.section=new e.Values({defaultConstructor:e.Section}),e.panel=new e.Values({defaultConstructor:e.Panel}),e.PreviewFrame=e.Messenger.extend({sensitivity:2e3,initialize:function(a,c){var d=b.Deferred();d.promise(this),this.container=a.container,this.signature=a.signature,b.extend(a,{channel:e.PreviewFrame.uuid()}),e.Messenger.prototype.initialize.call(this,a,c),this.add("previewUrl",a.previewUrl),this.query=b.extend(a.query||{},{customize_messenger_channel:this.channel()}),this.run(d)},run:function(a){var c=this,d=!1,f=!1;this._ready&&this.unbind("ready",this._ready),this._ready=function(){f=!0,d&&a.resolveWith(c)},this.bind("ready",this._ready),this.bind("ready",function(a){if(this.container.addClass("iframe-ready"),a){var b={panel:a.activePanels,section:a.activeSections,control:a.activeControls};_(b).each(function(a,b){e[b].each(function(b,c){var d=!(!a||!a[c]);d?b.activate():b.deactivate()})})}}),this.request=b.ajax(this.previewUrl(),{type:"POST",data:this.query,xhrFields:{withCredentials:!0}}),this.request.fail(function(){a.rejectWith(c,["request failure"])}),this.request.done(function(g){var h,i=c.request.getResponseHeader("Location"),j=c.signature;return i&&i!==c.previewUrl()?void a.rejectWith(c,["redirect",i]):"0"===g?void c.login(a):"-1"===g?void a.rejectWith(c,["cheatin"]):(h=g.lastIndexOf(j),-1===h||h")?void a.rejectWith(c,["unsigned"]):(g=g.slice(0,h)+g.slice(h+j.length),c.iframe=b("'; echo ''; include(ABSPATH . 'wp-admin/admin-footer.php'); @@ -621,7 +683,7 @@ if ( 'upgrade-core' == $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); ?>

>>>>>> .r12027 $step = (int) $step; $php_version = phpversion(); diff --git a/pavillonmadeleine.fr/wp-admin/upload.php b/pavillonmadeleine.fr/wp-admin/upload.php index 39fa165f..f8b43eec 100644 --- a/pavillonmadeleine.fr/wp-admin/upload.php +++ b/pavillonmadeleine.fr/wp-admin/upload.php @@ -70,15 +70,23 @@ if ( 'grid' === $mode ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> +<<<<<<< .mine

+||||||| .r11156 +

+======= +
+
+>>>>>>> .r12027 - -
+

Switch to the list view.' ); ?>

@@ -129,7 +137,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post to the trash.' ) ); if ( !wp_trash_post( $post_id ) ) - wp_die( __( 'Error in moving to trash.' ) ); + wp_die( __( 'Error in moving to Trash.' ) ); } $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location ); break; @@ -141,7 +149,7 @@ if ( $doaction ) { wp_die( __( 'You are not allowed to move this post out of the trash.' ) ); if ( !wp_untrash_post( $post_id ) ) - wp_die( __( 'Error in restoring from trash.' ) ); + wp_die( __( 'Error in restoring from Trash.' ) ); } $location = add_query_arg( 'untrashed', count( $post_ids ), $location ); break; @@ -206,15 +214,15 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-
+
- ' . __('Search results for “%s”') . '', get_search_query() ); ?> -
+

' . __('Undo') . ''; -$messages[5] = __('Media restored from the trash.'); +$messages[1] = __( 'Media attachment updated.' ); +$messages[2] = __( 'Media attachment permanently deleted.' ); +$messages[3] = __( 'Error saving media attachment.' ); +$messages[4] = __( 'Media attachment moved to the trash.' ) . ' ' . __( 'Undo' ) . ''; +$messages[5] = __( 'Media attachment restored from the trash.' ); if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { $message = $messages[ $_GET['message'] ]; diff --git a/pavillonmadeleine.fr/wp-admin/user-edit.php b/pavillonmadeleine.fr/wp-admin/user-edit.php index 29af2431..cc3261b9 100644 --- a/pavillonmadeleine.fr/wp-admin/user-edit.php +++ b/pavillonmadeleine.fr/wp-admin/user-edit.php @@ -39,7 +39,12 @@ else $profile_help = '

' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '

' . '

' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '

' . '

' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '

' . +<<<<<<< .mine + '

' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '

' . +||||||| .r11156 +======= '

' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out of All Other Sessions button.' ) . '

' . +>>>>>>> .r12027 '

' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '

' . '

' . __('Remember to click the Update Profile button when you are finished.') . '

'; @@ -202,16 +207,37 @@ include(ABSPATH . 'wp-admin/admin-header.php');

+

- + - + +<<<<<<< .mine +

+ +

+ +||||||| .r11156 + +======= + +>>>>>>> .r12027 +<<<<<<< .mine + +||||||| .r11156 + +======= +>>>>>>> .r12027 + + + + +<<<<<<< .mine + +get_all() ) === 1 ) : ?> + + + + +get_all() ) > 1 ) : ?> + + + + +get_all() ) : ?> + + + + + + +||||||| .r11156 +======= get_all() ) === 1 ) : ?> @@ -509,6 +637,7 @@ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?> +>>>>>>> .r12027

	+<<<<<<< .mine + + + + + + + + + +\|\|\|\|\|\|\| .r11156 + + +======= +>>>>>>> .r12027
	+<<<<<<< .mine + + +\|\|\|\|\|\|\| .r11156 + + + + + +======= +>>>>>>> .r12027 +
	+ + + +
	+ + + + +
	+ + + + +
	+ + + display_name ); + ?> + +

set_help_sidebar( ); wp_enqueue_script('wp-ajax-response'); -wp_enqueue_script('user-profile'); +wp_enqueue_script( 'user-profile' ); /** * Filter whether to enable user auto-complete for non-super admins in Multisite. @@ -232,13 +237,13 @@ if ( isset($_GET['update']) ) { } ?>

-

@@ -350,14 +355,14 @@ $new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_P $new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : ''; $new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : ''; $new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : ''; -$new_user_send_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : ''; +$new_user_send_password = $creating && isset( $_POST['send_password'] ) ? wp_unslash( $_POST['send_password'] ) : true; $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : ''; ?> - + @@ -385,25 +390,67 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl * @param bool $show Whether to show the password fields. Default true. */ if ( apply_filters( 'show_password_fields', true ) ) : ?> - - + + - - + + +<<<<<<< .mine + + + +||||||| .r11156 + + + +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-admin/users.php b/pavillonmadeleine.fr/wp-admin/users.php index 27e264ca..df7648b7 100644 --- a/pavillonmadeleine.fr/wp-admin/users.php +++ b/pavillonmadeleine.fr/wp-admin/users.php @@ -214,7 +214,7 @@ case 'delete':

@@ -336,8 +336,14 @@ case 'remove':

+ + +

+ +

+

- + - + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> -

+ views(); ?> diff --git a/pavillonmadeleine.fr/wp-admin/widgets.php b/pavillonmadeleine.fr/wp-admin/widgets.php index 1e34d81b..fdf659b8 100644 --- a/pavillonmadeleine.fr/wp-admin/widgets.php +++ b/pavillonmadeleine.fr/wp-admin/widgets.php @@ -21,6 +21,11 @@ if ( isset($_GET['widgets-access']) ) { set_user_setting( 'widgets_access', $widgets_access ); } +/** + * + * @param string $classes + * @return string + */ function wp_widgets_access_body_class($classes) { return "$classes widgets_access "; } @@ -230,7 +235,7 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

@@ -310,6 +315,28 @@ $errors = array( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>

+<<<<<<< .mine +

+%2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'widgets' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } +?> +

+||||||| .r11156 +

+=======

} ?>

+>>>>>>> .r12027

diff --git a/pavillonmadeleine.fr/wp-config-sample.php b/pavillonmadeleine.fr/wp-config-sample.php index 7ca228ee..64d80dbf 100644 --- a/pavillonmadeleine.fr/wp-config-sample.php +++ b/pavillonmadeleine.fr/wp-config-sample.php @@ -1,15 +1,50 @@ >>>>>> .r12027 * +<<<<<<< .mine + * The wp-config.php creation script uses this file during the + * installation. You don't have to use the web site, you can + * copy this file to "wp-config.php" and fill in the values. +||||||| .r11156 + * Ce fichier contient les rÃ©glages de configuration suivants : rÃ©glages MySQL, + * prÃ©fixe de table, clefs secrÃ¨tes, langue utilisÃ©e, et ABSPATH. + * Vous pouvez en savoir plus Ã leur sujet en allant sur + * {@link http://codex.wordpress.org/fr:Modifier_wp-config.php Modifier + * wp-config.php}. C'est votre hÃ©bergeur qui doit vous donner vos + * codes MySQL. +======= * This file has the following configurations: MySQL settings, Table Prefix, * Secret Keys, and ABSPATH. You can find more information by visiting * {@link https://codex.wordpress.org/Editing_wp-config.php Editing wp-config.php} * Codex page. You can get the MySQL settings from your web host. +>>>>>>> .r12027 * +<<<<<<< .mine + * This file contains the following configurations: +||||||| .r11156 + * Ce fichier est utilisÃ© par le script de crÃ©ation de wp-config.php pendant + * le processus d'installation. Vous n'avez pas Ã utiliser le site web, vous + * pouvez simplement renommer ce fichier en "wp-config.php" et remplir les + * valeurs. +======= * This file is used by the wp-config.php creation script during the * installation. You don't have to use the web site, you can just copy this file * to "wp-config.php" and fill in the values. +>>>>>>> .r12027 + * + * * MySQL settings + * * Secret keys + * * Database table prefix + * * ABSPATH + * + * @link https://codex.wordpress.org/Editing_wp-config.php * * @package WordPress */ @@ -56,11 +91,46 @@ define('NONCE_SALT', 'put your unique phrase here'); /** * WordPress Database Table prefix. * +<<<<<<< .mine + * You can have multiple installations in one database if you give each + * a unique prefix. Only numbers, letters, and underscores please! +||||||| .r11156 + * Vous pouvez installer plusieurs WordPress sur une seule base de donnÃ©es + * si vous leur donnez chacune un prÃ©fixe unique. + * N'utilisez que des chiffres, des lettres non-accentuÃ©es, et des caractÃ¨res soulignÃ©s! +======= * You can have multiple installations in one database if you give each a unique * prefix. Only numbers, letters, and underscores please! +>>>>>>> .r12027 */ $table_prefix = 'wp_'; +<<<<<<< .mine +/** + * For developers: WordPress debugging mode. + * + * Change this to true to enable the display of notices during development. + * It is strongly recommended that plugin and theme developers use WP_DEBUG + * in their development environments. + * + * For information on other constants that can be used for debugging, + * visit the Codex. + * + * @link https://codex.wordpress.org/Debugging_in_WordPress + */ +define('WP_DEBUG', false); +||||||| .r11156 +/** + * Pour les dÃ©veloppeurs : le mode deboguage de WordPress. + * + * En passant la valeur suivante Ã "true", vous activez l'affichage des + * notifications d'erreurs pendant votre essais. + * Il est fortemment recommandÃ© que les dÃ©veloppeurs d'extensions et + * de thÃ¨mes se servent de WP_DEBUG dans leur environnement de + * dÃ©veloppement. + */ +define('WP_DEBUG', false); +======= /** * For developers: WordPress debugging mode. * @@ -69,6 +139,7 @@ $table_prefix = 'wp_'; * in their development environments. */ define('WP_DEBUG', false); +>>>>>>> .r12027 /* That's all, stop editing! Happy blogging. */ diff --git a/pavillonmadeleine.fr/wp-config.php b/pavillonmadeleine.fr/wp-config.php index 8536d3df..0d49cf9e 100644 --- a/pavillonmadeleine.fr/wp-config.php +++ b/pavillonmadeleine.fr/wp-config.php @@ -8,6 +8,24 @@ if (file_exists(dirname(__FILE__) . '/local-config.php')) { include(dirname(__FILE__) . '/local-config.php'); } +<<<<<<< .mine +// Global DB config +if (!defined('DB_NAME')) { + define('DB_NAME', 'mdryvescpm'); +} +if (!defined('DB_USER')) { + define('DB_USER', 'mdryvescpm'); +} +if (!defined('DB_PASSWORD')) { + define('DB_PASSWORD', 'FCnQfB82db7i'); +} +if (!defined('DB_HOST')) { + define('DB_HOST', 'mdryvescpm.mysql.db'); +} +||||||| .r11156 +/** Mot de passe de la base de donnÃ©es MySQL. */ +define('DB_PASSWORD', 'TtY&7],67Txb'); +======= // Global DB config if (!defined('DB_NAME')) { define('DB_NAME', 'pavillonmadeleine'); @@ -21,6 +39,7 @@ if (!defined('DB_PASSWORD')) { if (!defined('DB_HOST')) { define('DB_HOST', 'localhost'); } +>>>>>>> .r12027 /** Database Charset to use in creating database tables. */ if (!defined('DB_CHARSET')) { diff --git a/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.mo b/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.mo index d083c20d..5069d3b8 100644 Binary files a/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.mo and b/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.po b/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.po index 5cc15cd8..f477a018 100644 --- a/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.po +++ b/pavillonmadeleine.fr/wp-content/languages/admin-fr_FR.po @@ -2,7 +2,13 @@ # This file is distributed under the same license as the Administration package. msgid "" msgstr "" +<<<<<<< .mine +"PO-Revision-Date: 2015-09-07 12:55:52+0000\n" +||||||| .r11156 +"PO-Revision-Date: 2014-10-04 17:49:48+0000\n" +======= "PO-Revision-Date: 2015-07-10 14:16:27+0000\n" +>>>>>>> .r12027 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,452 +16,1714 @@ msgstr "" "X-Generator: GlotPress/1.0-alpha-1100\n" "Project-Id-Version: Administration\n" +<<<<<<< .mine +#: wp-admin/user-new.php:313 wp-admin/user-new.php:450 +msgid "Skip Confirmation Email" +msgstr "Passer la confirmation par e-mail" +||||||| .r11156 +#: wp-admin/credits.php:182 +msgid "Release Lead" +msgstr "Responsable de cette version" +======= #. Author URI of the plugin/theme msgid "http://ma.tt/" msgstr "http://ma.tt/" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:104 wp-admin/users.php:121 +msgid "You can’t edit that user." +msgstr "Vous ne pouvez pas modifier cet utilisateur." +||||||| .r11156 +#: wp-admin/upload.php:45 +msgid "Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly." +msgstr "Utilisez les boutons flÃ©chÃ©es au-dessus de la fenÃªtre ou les flÃ¨ches gauche et droite du clavier pour passer rapidement d’un mÃ©dia Ã l’autre." +======= #. Author of the plugin/theme msgid "Matt Mullenweg" msgstr "Matt Mullenweg" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:161 wp-admin/users.php:201 +msgid "You can’t delete users." +msgstr "Vous ne pouvez pas supprimer d’utilisateurs." +||||||| .r11156 +#: wp-admin/upload.php:36 wp-admin/upload.php:202 +msgid "You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media." +msgstr "Vous pouvez voir vos mÃ©dias dans une grille ou dans une liste avec des colonnes. Passez de l’un Ã l’autre en utilisant les icÃ´nes en haut Ã gauche des mÃ©dias." +======= #. Description of the plugin/theme msgid "This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page." msgstr "Ceci n'est pas qu'une extension. Il symbolise l'espoir et l'enthousiasme de toute une gÃ©nÃ©ration, rÃ©sumÃ© en deux mots, qu'a notamment chantÃ© Louis Armstrong : Hello, Dolly. Une fois activÃ©, il affichera une ligne au hasard des paroles de la chanson Hello, Dolly, en haut Ã droite de toutes les pages de l'administration." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:217 +msgid "Delete Users" +msgstr "Supprimer des utilisateurs" +||||||| .r11156 +#: wp-admin/upload.php:37 +msgid "To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media." +msgstr "Pour supprimer des Ã©lÃ©ments de la liste des mÃ©dias, cliquez sur le bouton de SÃ©lection multiple en haut de l’Ã©cran. SÃ©lectionnez tous les Ã©lÃ©ments Ã supprimer, puis cliquez sur le bouton Supprimer la sÃ©lection. En cliquant sur le bouton Annuler la sÃ©lection vous reviendrez sur la vue normale des mÃ©dias." +======= #. Plugin URI of the plugin/theme msgid "http://wordpress.org/plugins/hello-dolly/" msgstr "http://wordpress.org/plugins/hello-dolly/" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:270 +msgid "There are no valid users selected for deletion." +msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +||||||| .r11156 +#: wp-admin/upload.php:44 +msgid "Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved." +msgstr "Cliquer sur un Ã©lÃ©ment affichera une fenÃªtre avec les dÃ©tails du fichier, ce qui vous permettra de prÃ©visualiser le mÃ©dia et rÃ©aliser de rapides modifications. Tous les changements que vous ferez dans les dÃ©tails du mÃ©dia seront automatiquement sauvegardÃ©s." +======= #. Plugin Name of the plugin/theme msgid "Hello Dolly" msgstr "Hello Dolly" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:411 +msgid "New user created." +msgstr "Le nouvel utilisateur a Ã©tÃ© crÃ©Ã©." +||||||| .r11156 +#: wp-admin/upload.php:46 +msgid "You can also delete individual items and access the extended edit screen from the details dialog." +msgstr "Vous pouvez aussi supprimer les Ã©lÃ©ments individuellement et accÃ©der Ã l’Ã©cran de modifications Ã©tendues par la fenÃªtre des dÃ©tails." +======= #: wp-admin/widgets.php:447 msgid "Add Widget" msgstr "Ajouter le widget" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:418 +msgid "The current user’s role must have user editing capabilities." +msgstr "L’utilisateur courant doit avoir un niveau lui permettant de modifier les utilisateurs." +||||||| .r11156 +#: wp-admin/about.php:30 wp-admin/credits.php:85 wp-admin/freedoms.php:22 +msgid "Thank you for updating! WordPress %s brings you a smoother writing and management experience." +msgstr "Merci d’avoir mis Ã jour ! WordPress %s vous donne une Ã©criture plus fluide et une meilleure gestion des contenus." +======= #: wp-admin/widgets.php:356 msgid "To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back." msgstr "Pour activer un widget, glissez-le dans la barre latÃ©rale ou cliquez dessus. Pour dÃ©sactiver un widget et supprimer ses rÃ©glages, enlevez-le de la barre latÃ©rale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:419 +msgid "Other user roles have been changed." +msgstr "Les rÃ´les des autres utilisateurs ont Ã©tÃ© modifiÃ©s." +||||||| .r11156 +#: wp-admin/about.php:57 +msgid "Manage your media with style" +msgstr "GÃ©rez vos mÃ©dias avec style" +======= #: wp-admin/widgets.php:352 msgctxt "removing-widget" msgid "Deactivate" msgstr "DÃ©sactiver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:422 +msgid "You can’t delete the current user." +msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +||||||| .r11156 +#: wp-admin/about.php:58 +msgid "Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap." +msgstr "Explorez vos mÃ©dias dans une superbe grille infinie. Une nouvelle prÃ©visualisation dÃ©taillÃ©e vous permet de voir et de modifier vos fichiers mÃ©dia en un clin d’œil." +======= #: wp-admin/widgets.php:352 msgid "Available Widgets" msgstr "Widgets disponibles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:423 +msgid "Other users have been deleted." +msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +||||||| .r11156 +#: wp-admin/about.php:84 +msgid "Working with embeds has never been easier" +msgstr "Travailler avec les mÃ©dias intÃ©grÃ©s n’a jamais Ã©tÃ© aussi simple" +======= #: wp-admin/widgets.php:326 msgid "Manage in Customizer" msgstr "GÃ©rer dans l'outil de personnalisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:116 +msgid "Inactive Widgets" +msgstr "Widgets dÃ©sactivÃ©s" +||||||| .r11156 +#: wp-admin/about.php:85 +msgid "Paste in a YouTube URL on a new line, and watch it magically become an embedded video. Now try it with a tweet. Oh yeah — embedding has become a visual experience. The editor shows a true preview of your embedded content, saving you time and giving you confidence." +msgstr "Collez une adresse YouTube sur une nouvelle ligne et voyez une vidÃ©o intÃ©grÃ©e apparaÃ®tre comme par magie. Maintenant, essayez avec un tweet. GÃ©nial ! L’intÃ©gration de mÃ©dias est devenue plus visuelle que jamais. L’Ã©diteur prÃ©sente un vÃ©ritable aperÃ§u de votre contenu intÃ©grÃ©, vous faisant ainsi gagner du temps et vous redonnant confiance en ce que vous faites." +======= #: wp-admin/widgets.php:307 msgid "Error in displaying the widget settings form." msgstr "Une erreur est survenue durant l’affichage du formulaire de paramÃ©trage du widget." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:240 +msgid "Widget %s" +msgstr "Widget %s" +||||||| .r11156 +#: wp-admin/about.php:86 +msgid "We’ve expanded the services supported by default, too — you can embed videos from CollegeHumor, playlists from YouTube, and talks from TED. Check out all of the embeds that WordPress supports." +msgstr "Nous avons aussi allongÃ© la liste de sites reconnus par dÃ©faut — vous pouvez intÃ©grer des vidÃ©os de CollegeHumor, des listes de lecture YouTube ou des confÃ©rences TED. Consultez la liste complÃ¨te des sites que WordPress reconnaÃ®t." +======= #: wp-admin/widgets.php:302 msgid "Changes saved." msgstr "Modifications enregistrÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:251 +msgid "Select both the sidebar for this widget and the position of the widget in that sidebar." +msgstr "SÃ©lectionnez Ã la fois la colonne latÃ©rale pour ce widget, et la position du widget dans cette colonne latÃ©rale." +||||||| .r11156 +#: wp-admin/about.php:94 +msgid "Focus on your content" +msgstr "Concentrez-vous sur votre contenu" +======= #: wp-admin/widgets.php:286 msgid "Save Widget" msgstr "Enregistrer le widget" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:291 +msgid "Save Widget" +msgstr "Enregistrer le widget" +||||||| .r11156 +#: wp-admin/about.php:95 +msgid "Writing and editing is smoother and more immersive with an editor that expands to fit your content as you write, and keeps the formatting tools available at all times." +msgstr "L’Ã©criture et la modification de contenus devient plus agrÃ©able et immersive avec un Ã©diteur dont la taille s’adapte Ã votre contenu tandis que vous l’Ã©crivez, et maintien les outils de formatage Ã portÃ©e de souris." +======= #: wp-admin/widgets.php:246 msgid "Select both the sidebar for this widget and the position of the widget in that sidebar." msgstr "SÃ©lectionnez Ã la fois la colonne latÃ©rale pour ce widget, et la position du widget dans cette colonne latÃ©rale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:307 +msgid "Changes saved." +msgstr "Modifications enregistrÃ©es." +||||||| .r11156 +#: wp-admin/about.php:121 +msgid "Finding the right plugin" +msgstr "Trouver la bonne extension" +======= #: wp-admin/widgets.php:235 msgid "Widget %s" msgstr "Widget %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:312 +msgid "Error in displaying the widget settings form." +msgstr "Une erreur est survenue durant l’affichage du formulaire de paramÃ©trage du widget." +||||||| .r11156 +#: wp-admin/about.php:122 +msgid "There are more than 30,000 free and open source plugins in the WordPress plugin directory. WordPress 4.0 makes it easier to find the right one for your needs, with new metrics, improved search, and a more visual browsing experience." +msgstr "Il y a plus de 30 000 extensions libres et open source dans le dÃ©pÃ´t d’extensions de WordPress. WordPress 4.0 vous facilite la dÃ©couverte de celle qui vous correspond, avec de nouveaux indicateurs, une recherche amÃ©liorÃ©e et navigation plus visuelle." +======= #: wp-admin/widgets.php:114 msgid "Drag widgets here to remove them from the sidebar but keep their settings." msgstr "Glissez ici les widgets que vous voulez retirer de la colonne latÃ©rale, tout en conservant leurs rÃ©glages actuels." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:357 +msgid "Available Widgets" +msgstr "Widgets disponibles" +||||||| .r11156 +#: wp-admin/about.php:123 +msgid "Browse plugins" +msgstr "Parcourir les extensions" +======= #: wp-admin/widgets.php:111 msgid "Inactive Widgets" msgstr "Widgets dÃ©sactivÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:119 +msgid "Drag widgets here to remove them from the sidebar but keep their settings." +msgstr "Glissez ici les widgets que vous voulez retirer de la colonne latÃ©rale, tout en conservant leurs rÃ©glages actuels." +||||||| .r11156 +#: wp-admin/about.php:135 +msgid "Customizer API" +msgstr "API de personnalisation de thÃ¨me" +======= #: wp-admin/widgets.php:97 msgid "This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar." msgstr "Cette barre latÃ©rale n’est plus disponible, et ne s’affiche nulle part sur le site. Vous pouvez en retirer les widgets ci-dessous afin de la supprimer totalement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:33 +msgid "You can customize the display of this screen in a number of ways:" +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" +||||||| .r11156 +#: wp-admin/about.php:136 +msgid "Contexts, panels, and a wider array of controls are now supported in the customizer." +msgstr "Les contextes, les panneaux et un plus grand choix de contrÃ´les sont maintenant reconnus par le personnalisateur de thÃ¨me." +======= #: wp-admin/widgets.php:94 msgid "Inactive Sidebar (not used)" msgstr "Barre latÃ©rale inactive (inutilisÃ©e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:221 +msgid "User has been added to your site." +msgstr "L’utilisateur a Ã©tÃ© ajoutÃ© Ã votre site." +||||||| .r11156 +#: wp-admin/about.php:139 +msgid "Query Ordering" +msgstr "Tri de requÃªte" +======= #: wp-admin/widgets.php:78 msgid "The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please follow these instructions." msgstr "Le thÃ¨me que vous utilisez n’est pas conÃ§u pour les widgets, ce qui signifie qu’il ne dispose pas d’une colonne latÃ©rale que vous pouvez modifier. Pour obtenir des informations sur la maniÃ¨re de rendre votre thÃ¨me compatible avec les widgets, lisez ces instructions." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:224 +msgid "That user is already a member of this site." +msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +||||||| .r11156 +#: wp-admin/about.php:142 +msgid "Developers have more flexibility creating %1$s clauses through %2$s." +msgstr "Les dÃ©veloppeurs ont plus de flexibilitÃ© lors de la crÃ©ation de clauses %1$s par le biais de %2$s." +======= #: wp-admin/widgets.php:73 msgid "Documentation on Widgets" msgstr "Documentation sur les widgets" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:142 wp-admin/users.php:191 +msgid "User deletion is not allowed from this screen." +msgstr "La suppression d’un utilisateur n’est pas autorisÃ©e depuis cet Ã©cran." +||||||| .r11156 +#: wp-admin/about.php:147 +msgid "Updated libraries: TinyMCE 4.1.3, jQuery 1.11.1, MediaElement 2.15." +msgstr "BibliothÃ¨que mises Ã jour : TinyMCE 4.1.3, jQuery 1.11.1, MediaElement 2.15." +======= #: wp-admin/widgets.php:68 msgid "When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved." msgstr "En changeant de thÃ¨mes, il y a souvent des variations sur le nombre et l’agencement des zones de widgets et des barres latÃ©rales, et parfois tout cela entre en conflit, rendant la transition moins aisÃ©e. Si vous avec changÃ© de thÃ¨me et que certains widgets semblent manquer, faites dÃ©filer cet Ã©cran jusqu’en bas pour les retrouver dans la zone des widgets inactifs, oÃ¹ ils ont Ã©tÃ© conservÃ©s avec leurs derniers rÃ©glages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:339 +msgid "Remove Users from Site" +msgstr "Supprimer des utilisateurs de ce site" +||||||| .r11156 +#: wp-admin/plugin-install.php:59 +msgid "If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly." +msgstr "Si vous voulez juste vous faire une idÃ©e de ce qui est disponible, vous pouvez parcourir les rubriques Mises en avant et Populaires en utilisant les liens en haut Ã gauche de l’Ã©cran. Ces sections sont rÃ©guliÃ¨rement renouvelÃ©es." +======= #: wp-admin/widgets.php:67 msgid "Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area." msgstr "De nombreux thÃ¨mes affichent par dÃ©faut quelques widgets dans la barre latÃ©rale, jusqu’Ã ce que vous la modifiez vous-mÃªmes. Ces widgets par dÃ©faut ne sont pas automatiquement affichÃ©s dans le gestionnaire de barre latÃ©rale. AprÃ¨s avoir fait vos propres modifications de widgets, vous pouvez rajouter les widgets par dÃ©faut depuis la section « Widgets Disponibles »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:344 +msgid "You have specified these users for removal:" +msgstr "Vous avez choisi de supprimer ces utilisateurs :" +||||||| .r11156 +#: wp-admin/upload.php:35 +msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first." +msgstr "Tous les fichiers que vous mettez en ligne sont listÃ©s dans la bibliothÃ¨que de mÃ©dias, avec le dernier mis en ligne qui apparaÃ®t en premier." +======= #: wp-admin/widgets.php:65 msgid "Missing Widgets" msgstr "Widgets manquants" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:366 +msgid "Confirm Removal" +msgstr "Confirmer la suppression" +||||||| .r11156 +#: wp-admin/plugin-install.php:29 +msgid "Add Plugins" +msgstr "Ajouter des extensions" +======= #: wp-admin/widgets.php:61 msgid "Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop." msgstr "En activant le mode « AccessibilitÃ© », via les options d’Ã©crans, vous autorisez l’utilisation des boutons « Ajouter » et « Modifier » Ã la place du glisser/dÃ©poser." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:368 +msgid "There are no valid users selected for removal." +msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +||||||| .r11156 +#: wp-admin/plugin-install.php:82 +msgctxt "plugins" +msgid "Browse" +msgstr "Parcourir" +======= #: wp-admin/widgets.php:60 msgid "Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required." msgstr "Les widgets peuvent Ãªtre utilisÃ©s Ã plusieurs reprises. Vous pouvez donner un titre pour chaque widget, afin de l’afficher sur votre site, mais ce n’est pas obligatoire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:429 +msgid "You can't remove the current user." +msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +||||||| .r11156 +#: wp-admin/includes/translation-install.php:23 +msgid "Invalid translation type." +msgstr "Type de traduction invalide." +======= #: wp-admin/widgets.php:59 msgid "If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas." msgstr "Si vous voulez enlever le widget, mais conserver ses rÃ©glages pour un possible usage futur, glissez-le simplement dans la zone « Widgets dÃ©sactivÃ©s ». De lÃ , vous pouvez les rajouter n’importe quand. C’est particuliÃ¨rement utile quand vous passez Ã un thÃ¨me avec moins de zones Ã widgets, ou des zones diffÃ©rentes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:430 +msgid "Other users have been removed." +msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +||||||| .r11156 +#: wp-admin/options-general.php:334 +msgid "Note:" +msgstr "Note :" +======= #: wp-admin/widgets.php:57 msgid "Removing and Reusing" msgstr "Retirer et rÃ©utiliser" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:65 +msgid "Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required." +msgstr "Les widgets peuvent Ãªtre utilisÃ©s Ã plusieurs reprises. Vous pouvez donner un titre pour chaque widget, afin de l’afficher sur votre site, mais ce n’est pas obligatoire." +||||||| .r11156 +#: wp-admin/options-general.php:334 wp-admin/options-general.php:338 +msgid "The %s constant in your %s file is no longer needed." +msgstr "La constante %s de votre fichier %s n’est plus nÃ©cessaire." +======= #: wp-admin/widgets.php:53 msgid "The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget." msgstr "La section « Widgets disponibles » contient tous les widgets que vous pouvez utiliser. Une fois le widget glissÃ© dans la barre latÃ©rale, il s’ouvrira pour vous permettre d’en modifier les rÃ©glages. Quand vous Ãªtes satisfait de vos rÃ©glages, cliquez sur le bouton « Enregistrer » et le widget sera lancÃ© sur votre site. Si vous cliquez sur « Supprimer », le widget sera enlevÃ© du site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:168 +msgid "You can’t delete that user." +msgstr "Vous ne pouvez pas supprimer cet utilisateur." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:64 +msgctxt "uploaded files" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tout (%s)" +msgstr[1] "Tous (%s)" +======= #: wp-admin/widgets.php:52 msgid "Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them." msgstr "Les widgets sont des conteneurs de contenu indÃ©pendants, qui peuvent Ãªtre placÃ©s dans n’importe quelle zone Ã widgets de votre thÃ¨me (le plus souvent, la barre latÃ©rale). Pour remplir les zones Ã widgets de votre barre latÃ©rale, glissez/dÃ©posez les barres de titre dans la zone dÃ©sirÃ©e. Par dÃ©faut, seule la premiÃ¨re zone de widgets sera ouverte. Pour remplir les autres zones Ã widgets, cliquez sur leur barre de titre afin de les ouvrir." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:218 +msgid "Invitation email sent to user. A confirmation link must be clicked for them to be added to your site." +msgstr "L’invitation a Ã©tÃ© envoyÃ©e Ã l’utilisateur sur son adresse de messagerie. Il devra cliquer sur un lien de confirmation pour Ãªtre ajoutÃ© Ã votre site." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:75 +msgctxt "detached files" +msgid "Unattached (%s)" +msgid_plural "Unattached (%s)" +msgstr[0] "Non attachÃ© (%s)" +msgstr[1] "Non attachÃ©s (%s)" +======= #: wp-admin/users.php:424 msgid "Other users have been removed." msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:242 +msgctxt "user" +msgid "Add New User" +msgstr "Ajouter un utilisateur" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:78 +msgctxt "uploaded files" +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeilles (%s)" +======= #: wp-admin/users.php:423 msgid "You can't remove the current user." msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:244 +msgctxt "user" +msgid "Add Existing User" +msgstr "Ajouter un utilisateur existant" +||||||| .r11156 +#: wp-admin/install.php:216 +msgid "Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world." +msgstr "Bienvenue dans la trÃ¨s cÃ©lÃ¨bre installation en 5 minutes de WordPress ! Vous n’avez qu’Ã remplir les informations demandÃ©es ci-dessous et vous serez prÃªt Ã utiliser la plus extensible et puissante plateforme de publication de contenu au monde." +======= #: wp-admin/users.php:420 msgid "User removed from this site." msgstr "Utilisateur supprimÃ© de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:284 +msgid "E-mail or Username" +msgstr "E-mail ou identifiant" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:470 +msgid "Untested with your version of WordPress" +msgstr "Non testÃ© avec votre version de WordPress" +======= #: wp-admin/users.php:417 msgid "Other users have been deleted." msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:27 +msgid "To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section." +msgstr "Pour ajouter un nouvel utilisateur Ã votre site, cliquez sur le bouton « Ajouter » en haut de l’Ã©cran, ou l’option « Ajouter » du menu « Utilisateurs »." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:472 +msgid "Incompatible with your version of WordPress" +msgstr "Incompatible avec votre version de WordPress" +======= #: wp-admin/users.php:416 msgid "You can’t delete the current user." msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:58 +msgid "The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget." +msgstr "La section « Widgets disponibles » contient tous les widgets que vous pouvez utiliser. Une fois le widget glissÃ© dans la barre latÃ©rale, il s’ouvrira pour vous permettre d’en modifier les rÃ©glages. Quand vous Ãªtes satisfait de vos rÃ©glages, cliquez sur le bouton « Enregistrer » et le widget sera lancÃ© sur votre site. Si vous cliquez sur « Supprimer », le widget sera enlevÃ© du site." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:474 +msgid "Compatible with your version of WordPress" +msgstr "Compatible avec votre version de WordPress" +======= #: wp-admin/users.php:413 msgid "Other user roles have been changed." msgstr "Les rÃ´les des autres utilisateurs ont Ã©tÃ© modifiÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:235 +msgid "User added." +msgstr "Utilisateur ajoutÃ©." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:459 +msgid "%d star" +msgid_plural "%d stars" +msgstr[0] "%d Ã©toile" +msgstr[1] "%d Ã©toiles" +======= #: wp-admin/users.php:412 msgid "The current user’s role must have user editing capabilities." msgstr "L’utilisateur courant doit avoir un niveau lui permettant de modifier les utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:277 wp-admin/user-new.php:332 +msgid "Add Existing User" +msgstr "Ajouter un utilisateur existant" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:396 +msgid "Select bulk action" +msgstr "SÃ©lectionnez l’action groupÃ©e" +======= #: wp-admin/users.php:409 msgid "Changed roles." msgstr "RÃ´les modifiÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:279 +msgid "Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." +msgstr "Saisissez l’adresse de contact d’un utilisateur existant sur votre rÃ©seau, afin de l’inviter sur ce site. Cette personne recevra un message lui demandant de confirmer l’invitation." +||||||| .r11156 +#: wp-admin/includes/screen.php:977 +msgid "Expand the editor to match the window height." +msgstr "Ouvrir l’Ã©diteur pour faire correspondre la hauteur de la fenÃªtre." +======= #: wp-admin/users.php:405 msgid "New user created." msgstr "Le nouvel utilisateur a Ã©tÃ© crÃ©Ã©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:283 +msgid "Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." +msgstr "Pour inviter un utilisateur de ce rÃ©seau sur ce site, saisissez son adresse de messagerie ou son identifiant. Cette personne recevra alors un message lui proposant de confirmer son ajout." +||||||| .r11156 +#: wp-admin/includes/template.php:737 +msgid "Month" +msgstr "Mois" +======= #: wp-admin/users.php:401 msgid "New user created. Edit user" msgstr "Nouvel utilisateur crÃ©Ã©. Modifier l'utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:32 +msgid "Screen Display" +msgstr "Ãcran affichÃ©" +||||||| .r11156 +#: wp-admin/includes/template.php:746 +msgid "Day" +msgstr "Jour" +======= #: wp-admin/users.php:395 msgid "%s user deleted." msgid_plural "%s users deleted." msgstr[0] "%s utilisateur supprimÃ©." msgstr[1] "%s utilisateurs supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:35 +msgid "You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab." +msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran »." +||||||| .r11156 +#: wp-admin/includes/template.php:748 +msgid "Hour" +msgstr "Heure" +======= #: wp-admin/users.php:393 msgid "User deleted." msgstr "Utilisateur supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:36 +msgid "You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed." +msgstr "Vous pouvez filtrer la liste des utilisateurs par rÃ´le, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les utilisateurs, ou seulement les administrateurs, les Ã©diteurs, les auteurs ou les contributeurs. Par dÃ©faut, tous les utilisateurs sont affichÃ©s. Les rÃ´les sans utilisateurs ne sont pas listÃ©s." +||||||| .r11156 +#: wp-admin/includes/template.php:749 +msgid "Minute" +msgstr "Minute" +======= #: wp-admin/users.php:362 msgid "There are no valid users selected for removal." msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:41 +msgid "Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:" +msgstr "Passer la souris au-dessus d’une ligne de la liste des utilisateurs, fera s’afficher des liens vous permettant de gÃ©rer l’utilisateur. Vous pouvez lancer les actions suivantes :" +||||||| .r11156 +#: wp-admin/setup-config.php:137 +msgid "We’re going to use this information to create a wp-config.php file." +msgstr "Nous allons utiliser cette information pour crÃ©er le fichier wp-config.php." +======= #: wp-admin/users.php:360 msgid "Confirm Removal" msgstr "Confirmer la suppression" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:43 +msgid "Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username." +msgstr "« Modifier » vous envoie sur l’Ã©cran de modification de cet utilisateur. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le nom de l’utilisateur ;" +||||||| .r11156 +#: wp-admin/theme-install.php:82 +msgid "You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it." +msgstr "Vous pouvez chercher un thÃ¨me par mot, par auteur ou par mot-clÃ©. Vous pouvez Ã©galement donner plus de dÃ©tails en sÃ©lectionnant les critÃ¨res que vous souhaitez. Autrement, vous pouvez parcourir les thÃ¨mes mis en avant, les plus rÃ©cents, ou rÃ©cemment mis Ã jour. Quand vous aurez trouvÃ© le thÃ¨me qu’il vous faut, vous pourrez le prÃ©visualiser ou l’installer." +======= #: wp-admin/users.php:350 msgid "ID #%1$s: %2$s You don't have permission to remove this user." msgstr "ID nÂ°%1$s : %2$s vous n’avez pas l’autorisation de supprimer cet utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:268 +msgid "Confirm Deletion" +msgstr "Confirmer la suppression" +||||||| .r11156 +#: wp-admin/theme-install.php:224 +msgctxt "theme" +msgid "Already Installed" +msgstr "DÃ©jÃ installÃ©" +======= #: wp-admin/users.php:348 msgid "ID #%1$s: %2$s The current user will not be removed." msgstr "ID nÂ°%1$s : %2$s l’utilisateur actuel ne sera pas supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:282 wp-admin/users.php:290 wp-admin/users.php:317 +#: wp-admin/users.php:325 +msgid "You can’t remove users." +msgstr "Vous ne pouvez pas supprimer ces utilisateurs." +||||||| .r11156 +#: wp-admin/theme-install.php:232 +msgctxt "Button label for a theme" +msgid "Previous" +msgstr "PrÃ©cÃ©dent" +======= #: wp-admin/users.php:340 msgid "You have specified these users for removal:" msgstr "Vous avez choisi de supprimer ces utilisateurs :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:415 +msgid "Changed roles." +msgstr "RÃ´les modifiÃ©s." +||||||| .r11156 +#: wp-admin/theme-install.php:233 +msgctxt "Button label for a theme" +msgid "Next" +msgstr "Suivant" +======= #: wp-admin/users.php:339 msgid "Remove Users from Site" msgstr "Supprimer des utilisateurs de ce site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:426 +msgid "User removed from this site." +msgstr "Utilisateur supprimÃ© de ce site." +||||||| .r11156 +#: wp-admin/update-core.php:179 +msgid "BETA TESTERS:" +msgstr "TESTEURS DE PHASE BETA :" +======= #: wp-admin/users.php:282 wp-admin/users.php:290 wp-admin/users.php:317 #: wp-admin/users.php:325 msgid "You can’t remove users." msgstr "Vous ne pouvez pas supprimer ces utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:57 +msgid "Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them." +msgstr "Les widgets sont des conteneurs de contenu indÃ©pendants, qui peuvent Ãªtre placÃ©s dans n’importe quelle zone Ã widgets de votre thÃ¨me (le plus souvent, la barre latÃ©rale). Pour remplir les zones Ã widgets de votre barre latÃ©rale, glissez/dÃ©posez les barres de titre dans la zone dÃ©sirÃ©e. Par dÃ©faut, seule la premiÃ¨re zone de widgets sera ouverte. Pour remplir les autres zones Ã widgets, cliquez sur leur barre de titre afin de les ouvrir." +||||||| .r11156 +#: wp-admin/update-core.php:179 +msgid "This site is set up to install updates of future beta versions automatically." +msgstr "Ce site est configurÃ© pour installer automatiquement les mises Ã jour des prochaines versions bÃªtas." +======= #: wp-admin/users.php:270 msgid "There are no valid users selected for deletion." msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:62 +msgid "Removing and Reusing" +msgstr "Retirer et rÃ©utiliser" +||||||| .r11156 +#: wp-admin/upload.php:70 +msgid "The grid view for the Media Library requires JavaScript. Switch to the list view." +msgstr "La vue en grille de la BilbiothÃ¨que de MÃ©dias nÃ©cessite JavaScript. Passer Ã la vue en liste." +======= #: wp-admin/users.php:268 msgid "Confirm Deletion" msgstr "Confirmer la suppression" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:70 +msgid "Missing Widgets" +msgstr "Widgets manquants" +||||||| .r11156 +#: wp-admin/user-new.php:310 wp-admin/user-new.php:423 +msgid "Add the user without sending an email that requires their confirmation." +msgstr "Ajouter l’utilisateur sans envoyer de message lui demandant leur confirmation." +======= #: wp-admin/users.php:254 msgid "Attribute all content to:" msgstr "Attribuer tout le contenu Ã :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:99 +msgid "Inactive Sidebar (not used)" +msgstr "Barre latÃ©rale inactive (inutilisÃ©e)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2444 +msgid "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." +msgstr "L’Ã©quipe de WordPress est prÃªte Ã vous aider. TransfÃ©rez ce message Ã %s et l’Ã©quipe vous aidera Ã faire en sorte que vous site fonctionne." +======= #: wp-admin/users.php:252 msgid "Delete all content." msgstr "Supprimer tout le contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:102 +msgid "This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar." +msgstr "Cette barre latÃ©rale n’est plus disponible, et ne s’affiche nulle part sur le site. Vous pouvez en retirer les widgets ci-dessous afin de la supprimer totalement." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:2674 +msgid "%s failed to embed." +msgstr "%s n’a pas pu Ãªtre intÃ©grÃ©." +======= #: wp-admin/users.php:248 msgid "What should be done with content owned by these users?" msgstr "Que doit-il arriver aux contenus appartenant Ã ces utilisateurs ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:357 +msgctxt "removing-widget" +msgid "Deactivate" +msgstr "DÃ©sactiver" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:2704 +msgid "Preview not available. %s cannot be embedded securely." +msgstr "PrÃ©visualisation indisponible. %s n’a pas pu Ãªtre insÃ©rÃ© en toute sÃ©curitÃ©." +======= #: wp-admin/users.php:246 msgid "What should be done with content owned by this user?" msgstr "Que faire du contenu ayant cet utilisateur pour propriÃ©taire ?" +>>>>>>> .r12027 +<<<<<<< .mine +#. Plugin Name of the plugin/theme +msgid "Hello Dolly" +msgstr "Hello Dolly" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:668 +msgid "Select Page" +msgstr "SÃ©lectionnez une page" +======= #: wp-admin/users.php:238 wp-admin/users.php:352 msgid "ID #%1$s: %2$s" msgstr "ID nÂ°%1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. Author of the plugin/theme +msgid "Matt Mullenweg" +msgstr "Matt Mullenweg" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:69 +msgctxt "Plugin Installer" +msgid "Beta Testing" +msgstr "Test de phase beta" +======= #: wp-admin/users.php:236 msgid "ID #%1$s: %2$s The current user will not be deleted." msgstr "ID nÂ°%1$s : %2$s L’utilisateur actuel ne sera pas supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. Author URI of the plugin/theme +msgid "http://ma.tt/" +msgstr "http://ma.tt/" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:336 +msgctxt "Plugin installer group title" +msgid "Performance" +msgstr "Performance" +======= #: wp-admin/users.php:227 msgid "You have specified these users for deletion:" msgstr "Vous avez indiquÃ© que vous voulez supprimer ces utilisateurs :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:64 +msgid "If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas." +msgstr "Si vous voulez enlever le widget, mais conserver ses rÃ©glages pour un possible usage futur, glissez-le simplement dans la zone « Widgets dÃ©sactivÃ©s ». De lÃ , vous pouvez les rajouter n’importe quand. C’est particuliÃ¨rement utile quand vous passez Ã un thÃ¨me avec moins de zones Ã widgets, ou des zones diffÃ©rentes." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:337 +msgctxt "Plugin installer group title" +msgid "Social" +msgstr "Social" +======= #: wp-admin/users.php:225 msgid "You have specified this user for deletion:" msgstr "Vous avez choisi de supprimer cet utilisateur :" +>>>>>>> .r12027 -#: wp-admin/users.php:220 +<<<<<<< .mine +#: wp-admin/users.php:26 +msgid "This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role." +msgstr "Cet Ã©cran liste tous les utilisateurs actuels de votre site. Chaque utilisateur a l’un des 5 rÃ´les prÃ©dÃ©finis, tel qu’assignÃ© par l’administrateur du site : Administrateur, Ãditeur, Auteur, Contributeur ou AbonnÃ©. Les utilisateurs avec un rÃ´le autre qu’Administrateur verront moins d’options quand ils seront connectÃ©s, en fonction de leur rÃ´le." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:338 +msgctxt "Plugin installer group title" +msgid "Tools" +msgstr "Outils" +======= +#: wp-admin/users.php:220 msgid "Please select an option." msgstr "Veuillez choisir une option." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:37 +msgid "You can view all posts made by a user by clicking on the number under the Posts column." +msgstr "Vous pouvez afficher tous les articles faits par un mÃªme utilisateur en cliquant sur le nombre sous la colonne « Articles »." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:392 +msgid "Install %s now" +msgstr "Installer %s maintenant" +======= #: wp-admin/users.php:217 msgid "Delete Users" msgstr "Supprimer des utilisateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:220 +msgid "Please select an option." +msgstr "Veuillez choisir une option." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:399 +msgid "Update %s now" +msgstr "Mettre Ã jour %s maintenant" +======= #: wp-admin/users.php:168 msgid "You can’t delete that user." msgstr "Vous ne pouvez pas supprimer cet utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:236 +msgid "ID #%1$s: %2$s The current user will not be deleted." +msgstr "ID nÂ°%1$s : %2$s L’utilisateur actuel ne sera pas supprimÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:414 +msgid "More Details" +msgstr "Plus de dÃ©tails" +======= #: wp-admin/users.php:161 wp-admin/users.php:201 msgid "You can’t delete users." msgstr "Vous ne pouvez pas supprimer d’utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:238 wp-admin/users.php:358 +msgid "ID #%1$s: %2$s" +msgstr "ID nÂ°%1$s : %2$s" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:465 +msgid "%s download" +msgid_plural "%s downloads" +msgstr[0] "%s tÃ©lÃ©chargement" +msgstr[1] "%s tÃ©lÃ©chargements" +======= #: wp-admin/users.php:142 wp-admin/users.php:191 msgid "User deletion is not allowed from this screen." msgstr "La suppression d’un utilisateur n’est pas autorisÃ©e depuis cet Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:354 +msgid "ID #%1$s: %2$s The current user will not be removed." +msgstr "ID nÂ°%1$s : %2$s l’utilisateur actuel ne sera pas supprimÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:529 +msgid "View details" +msgstr "Afficher les dÃ©tails" +======= #: wp-admin/users.php:104 wp-admin/users.php:121 msgid "You can’t edit that user." msgstr "Vous ne pouvez pas modifier cet utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:356 +msgid "ID #%1$s: %2$s You don't have permission to remove this user." +msgstr "ID nÂ°%1$s : %2$s vous n’avez pas l’autorisation de supprimer cet utilisateur." +||||||| .r11156 +#: wp-admin/includes/class-wp-terms-list-table.php:140 +msgctxt "Number/count of items" +msgid "Count" +msgstr "Compte" +======= #: wp-admin/users.php:62 msgid "Descriptions of Roles and Capabilities" msgstr "Descriptions des rÃ´les et permissions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:407 +msgid "New user created. Edit user" +msgstr "Nouvel utilisateur crÃ©Ã©. Modifier l’utilisateur" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:47 +msgctxt "themes" +msgid "Recently Updated" +msgstr "Mis Ã jour rÃ©cemment" +======= #: wp-admin/users.php:61 msgid "Documentation on Managing Users" msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:66 +msgid "Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop." +msgstr "En activant le mode « AccessibilitÃ© », via les options d’Ã©crans, vous autorisez l’utilisation des boutons « Ajouter » et « Modifier » Ã la place du glisser/dÃ©poser." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2609 +msgid "" +"\n" +"UPDATE LOG\n" +"==========" +msgstr "" +"\n" +"JOURNAL DE MISE A JOUR\n" +"======================" +======= #: wp-admin/users.php:48 msgid "Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions." msgstr "Â« Supprimer Â» vous amÃ¨ne Ã l’Ã©cran de suppression des utilisateurs pour confirmer votre action, d’oÃ¹ vous pouvez retirer un utilisateur de maniÃ¨re permanente et supprimer son contenu. Vous pouvez Ã©galement supprimer plusieurs utilisateurs Ã la fois avec les Actions GroupÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#. Plugin URI of the plugin/theme +msgid "http://wordpress.org/plugins/hello-dolly/" +msgstr "http://wordpress.org/plugins/hello-dolly/" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:350 +msgctxt "Plugin installer section title" +msgid "Reviews" +msgstr "Avis" +======= #: wp-admin/users.php:46 msgid "Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions." msgstr "Â« Retirer Â» vous permet de retirer un utilisateur de votre site. Cela ne supprime pas son contenu. Vous pouvez Ã©galement retirer plus utilisateurs Ã la fois avec les Actions GroupÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:341 +msgid "Create a brand new user and add them to this site." +msgstr "CrÃ©er un nouvel utilisateur et l’ajouter Ã ce site." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:442 +#: wp-admin/includes/plugin-install.php:490 +msgid "Donate to this plugin »" +msgstr "Faites Ã un don Ã cette extension »" +======= #: wp-admin/users.php:43 msgid "Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username." msgstr "« Modifier » vous envoie sur l’Ã©cran de modification de cet utilisateur. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le nom de l’utilisateur ;" +>>>>>>> .r12027 +<<<<<<< .mine +#. Description of the plugin/theme +msgid "This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page." +msgstr "Ce n'est pas qu'une extension. Elle symbolise l'espoir et l'enthousiasme de toute une gÃ©nÃ©ration, rÃ©sumÃ© en deux mots, qu'a notamment chantÃ© Louis Armstrong : Hello, Dolly. Une fois activÃ©, elle affichera une ligne alÃ©atoirement des paroles de la chanson Hello, Dolly, en haut Ã droite de toutes les pages de l'administration." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:458 +msgid "Click to see reviews that provided a rating of %d star" +msgid_plural "Click to see reviews that provided a rating of %d stars" +msgstr[0] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toile" +msgstr[1] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toiles" +======= #: wp-admin/users.php:41 msgid "Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:" msgstr "Passer la souris au-dessus d’une ligne de la liste des utilisateurs, fera s’afficher des liens vous permettant de gÃ©rer l’utilisateur. Vous pouvez lancer les actions suivantes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:361 +msgid "To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back." +msgstr "Pour activer un widget, glissez-le dans la barre latÃ©rale ou cliquez dessus. Pour dÃ©sactiver un widget et supprimer ses rÃ©glages, enlevez-le de la barre latÃ©rale." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:470 +msgid "Contributors" +msgstr "Contributeurs" +======= #: wp-admin/users.php:37 msgid "You can view all posts made by a user by clicking on the number under the Posts column." msgstr "Vous pouvez afficher tous les articles faits par un mÃªme utilisateur en cliquant sur le nombre sous la colonne « Articles »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:452 +msgid "Add Widget" +msgstr "Ajouter le widget" +||||||| .r11156 +#: wp-admin/customize.php:157 +msgid "The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them." +msgstr "Le Personnalisateur vous permet de prÃ©visualiser les modifications Ã votre site avant de les publier. Vous pouvez parcourir diffÃ©rentes pages de votre site pour mieux apprÃ©cier vos modifications." +======= #: wp-admin/users.php:36 msgid "You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed." msgstr "Vous pouvez filtrer la liste des utilisateurs par rÃ´le, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les utilisateurs, ou seulement les administrateurs, les Ã©diteurs, les auteurs ou les contributeurs. Par dÃ©faut, tous les utilisateurs sont affichÃ©s. Les rÃ´les sans utilisateurs ne sont pas listÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:72 +msgid "Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area." +msgstr "De nombreux thÃ¨mes affichent par dÃ©faut quelques widgets dans la barre latÃ©rale, jusqu’Ã ce que vous la modifiez vous-mÃªmes. Ces widgets par dÃ©faut ne sont pas automatiquement affichÃ©s dans le gestionnaire de barre latÃ©rale. AprÃ¨s avoir fait vos propres modifications de widgets, vous pouvez rajouter les widgets par dÃ©faut depuis la section « Widgets Disponibles »." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2457 +msgid "If you reach out to us, we'll also ensure you'll never have this problem again." +msgstr "Si vous nous contactez, nous ferons Ã©galement en sorte que vous ne rencontriez plus jamais ce problÃ¨me." +======= #: wp-admin/users.php:35 msgid "You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab." msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:73 +msgid "When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved." +msgstr "En changeant de thÃ¨mes, il y a souvent des variations sur le nombre et l’agencement des zones de widgets et des barres latÃ©rales, et parfois tout cela entre en conflit, rendant la transition moins aisÃ©e. Si vous avec changÃ© de thÃ¨me et que certains widgets semblent manquer, faites dÃ©filer cet Ã©cran jusqu’en bas pour les retrouver dans la zone des widgets inactifs, oÃ¹ ils ont Ã©tÃ© conservÃ©s avec leurs derniers rÃ©glages." +||||||| .r11156 +#: wp-admin/includes/template.php:2031 +msgid "New Feature: Live Widget Previews" +msgstr "Nouvelle fonctionnalitÃ© : la prÃ©visualisation en direct des widgets" +======= #: wp-admin/users.php:33 msgid "You can customize the display of this screen in a number of ways:" msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:252 +msgid "Delete all content." +msgstr "Supprimer tout le contenu." +||||||| .r11156 +#: wp-admin/includes/template.php:2032 +msgid "Add, edit, and play around with your widgets from the theme customizer." +msgstr "Ajoutez, modifiez et expÃ©rimentez avec vos widgets grÃ¢ce Ã l’outil de personnalisation de thÃ¨me." +======= #: wp-admin/users.php:32 msgid "Screen Display" msgstr "Ãcran affichÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:46 +msgid "Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions." +msgstr "Â« Retirer Â» vous permet de retirer un utilisateur de votre site. Cela ne supprime pas son contenu. Vous pouvez Ã©galement retirer plus utilisateurs Ã la fois avec les Actions GroupÃ©es." +||||||| .r11156 +#: wp-admin/includes/template.php:2032 +msgid "Preview your changes in real-time and only save them when you’re ready." +msgstr "PrÃ©visualisez vos modifications en temps rÃ©el, et enregistrez-les uniquement quand vous Ãªtes prÃªt." +======= #: wp-admin/users.php:27 msgid "To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section." msgstr "Pour ajouter un nouvel utilisateur Ã votre site, cliquez sur le bouton « Ajouter » en haut de l’Ã©cran, ou l’option « Ajouter » du menu « Utilisateurs »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:48 +msgid "Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions." +msgstr "Â« Supprimer Â» vous amÃ¨ne Ã l’Ã©cran de suppression des utilisateurs pour confirmer votre action, d’oÃ¹ vous pouvez retirer un utilisateur de maniÃ¨re permanente et supprimer son contenu. Vous pouvez Ã©galement supprimer plusieurs utilisateurs Ã la fois avec les Actions GroupÃ©es." +||||||| .r11156 +#: wp-admin/theme-install.php:257 +msgid "No ratings." +msgstr "Pas de note." +======= #: wp-admin/users.php:26 msgid "This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role." msgstr "Cet Ã©cran liste tous les utilisateurs actuels de votre site. Chaque utilisateur a l’un des 5 rÃ´les prÃ©dÃ©finis, tel qu’assignÃ© par l’administrateur du site : Administrateur, Ãditeur, Auteur, Contributeur ou AbonnÃ©. Les utilisateurs avec un rÃ´le autre qu’Administrateur verront moins d’options quand ils seront connectÃ©s, en fonction de leur rÃ´le." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:254 +msgid "Attribute all content to:" +msgstr "Attribuer tout le contenu Ã :" +||||||| .r11156 +#: wp-admin/theme-install.php:175 +msgid "Filtering by:" +msgstr "Trier par :" +======= #: wp-admin/user-new.php:406 msgid "Send this password to the new user by email." msgstr "Envoyer ce mot de passe au nouvel utilisateur sur son adresse de messagerie." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/user-new.php:417 +msgid "A password reset link will be sent to the user via email." +msgstr "Un lien de rÃ©initialisation de mot de passe sera envoyÃ© Ã l’utilisateur par e-mail." +||||||| .r11156 +#: wp-admin/theme-install.php:184 wp-admin/themes.php:238 +msgid "No themes found. Try a different search." +msgstr "Aucun thÃ¨me trouvÃ©. Essayez une autre recherche." +======= #: wp-admin/user-new.php:405 msgid "Send Password?" msgstr "Envoyer le mot de passe ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:225 +msgid "You have specified this user for deletion:" +msgstr "Vous avez choisi de supprimer cet utilisateur :" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:83 +msgid "To crop the image, click on it and drag to make your selection." +msgstr "Pour couper l’image, cliquez dessus et dÃ©placez la souris pour crÃ©er la sÃ©lection." +======= #: wp-admin/user-new.php:396 msgid "Repeat Password" msgstr "RÃ©pÃ©tez le mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:399 +msgid "User deleted." +msgstr "Utilisateur supprimÃ©." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:44 +msgid "You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up." +msgstr "Vous pouvez redimensionner l’image originale de maniÃ¨re proportionnelle. Pour obtenir de meilleurs rÃ©sultats, le redimensionnement doit Ãªtre fait avant tout recadrage, retournement ou rotation. La taille des image ne peut Ãªtre que rÃ©duite, pas augmentÃ©e." +======= #: wp-admin/user-new.php:336 msgid "Create a brand new user and add them to this site." msgstr "CrÃ©er un nouvel utilisateur et l’ajouter Ã ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:246 +msgid "What should be done with content owned by this user?" +msgstr "Que faire du contenu ayant cet utilisateur pour propriÃ©taire ?" +||||||| .r11156 +#: wp-admin/edit-comments.php:124 +msgid "A red bar on the left means the comment is waiting for you to moderate it." +msgstr "Une barre rouge sur la gauche signifie que le commentaire attention votre validation." +======= #: wp-admin/user-new.php:309 wp-admin/user-new.php:424 msgid "Add the user without sending an email that requires their confirmation." msgstr "Ajouter l’utilisateur sans envoyer de message lui demandant leur confirmation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:248 +msgid "What should be done with content owned by these users?" +msgstr "Que doit-il arriver aux contenus appartenant Ã ces utilisateurs ?" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:282 +msgid "Keyboard users: When you’re working in the visual editor, you can use Alt + F10 to access the toolbar." +msgstr "Utilisateurs du clavier : lorsque vous travaillez dans l’Ã©diteur visuel, vous pouvez utiliser Alt + F10 pour accÃ©der Ã la barre d’outils." +======= #: wp-admin/user-new.php:308 wp-admin/user-new.php:423 msgid "Skip Confirmation Email" msgstr "Passer la confirmation par e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:401 +msgid "%s user deleted." +msgid_plural "%s users deleted." +msgstr[0] "%s utilisateur supprimÃ©." +msgstr[1] "%s utilisateurs supprimÃ©s." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:86 +msgid "The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc." +msgstr "Les proportions d’une image sont le rapport entre sa largeur et sa hauteur. Vous pouvez prÃ©server les proportions en maintenant appuyÃ©e la touche Shift tandis que vous redimensionnez votre sÃ©lection. Utilisez le champ de saisie pour prÃ©ciser la proportion Ã respecter, par exemple 1:1 (carrÃ©), 4:3, 16:9, etc." +======= #: wp-admin/user-new.php:279 msgid "E-mail or Username" msgstr "E-mail ou identifiant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:227 +msgid "You have specified these users for deletion:" +msgstr "Vous avez indiquÃ© que vous voulez supprimer ces utilisateurs :" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:89 +msgid "Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings." +msgstr "Une fois que votre sÃ©lection est faite, vous pouvez l’ajuster en saisissant une taille en pixels. La taille minimale de la sÃ©lection est celle des miniatures, tel que dÃ©fini dans les rÃ©glages des MÃ©dia." +======= #: wp-admin/user-new.php:278 msgid "Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." msgstr "Pour inviter un utilisateur de ce rÃ©seau sur ce site, saisissez son adresse de messagerie ou son identifiant. Cette personne recevra alors un message lui proposant de confirmer son ajout." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:78 +msgid "Documentation on Widgets" +msgstr "Documentation sur les widgets" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:119 +msgid "You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image." +msgstr "Vous pouvez modifier l’image tout en prÃ©servant sa miniature. Par exemple, vous pourriez vouloir avoir une miniature carrÃ©e qui n’afficherait qu’une partie de l’image." +======= #: wp-admin/user-new.php:274 msgid "Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." msgstr "Saisissez l’adresse de contact d’un utilisateur existant sur votre rÃ©seau, afin de l’inviter sur ce site. Cette personne recevra un message lui demandant de confirmer l’invitation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:61 +msgid "Documentation on Managing Users" +msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +||||||| .r11156 +#: wp-admin/includes/media.php:2691 +msgid "Displayed on attachment pages." +msgstr "AffichÃ© sur les pages des fichiers joints." +======= #: wp-admin/user-new.php:272 wp-admin/user-new.php:327 msgid "Add Existing User" msgstr "Ajouter un utilisateur existant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:62 +msgid "Descriptions of Roles and Capabilities" +msgstr "Descriptions des rÃ´les et permissions (en)" +||||||| .r11156 +#: wp-admin/theme-install.php:126 +msgctxt "themes" +msgid "Browse" +msgstr "Parcourir" +======= #: wp-admin/user-new.php:239 msgctxt "user" msgid "Add Existing User" msgstr "Ajouter un utilisateur existant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/widgets.php:83 +msgid "The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please follow these instructions." +msgstr "Le thÃ¨me que vous utilisez n’est pas conÃ§u pour les widgets, ce qui signifie qu’il ne dispose pas d’une colonne latÃ©rale que vous pouvez modifier. Pour obtenir des informations sur la maniÃ¨re de rendre votre thÃ¨me compatible avec les widgets, lisez ces instructions." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:246 +msgid "All comment types" +msgstr "Tous les types de commentaire" +======= #: wp-admin/user-new.php:237 msgctxt "user" msgid "Add New User" msgstr "Ajouter un utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:314 wp-admin/user-new.php:451 +msgid "Add the user without sending an email that requires their confirmation." +msgstr "Ajouter l’utilisateur sans envoyer de message lui demandant leur confirmation." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:724 +msgid "%1$s, %2$s %3$s" +msgstr "%1$s, Ã %2$s %3$s" +======= #: wp-admin/user-new.php:230 msgid "User added." msgstr "Utilisateur ajoutÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/users.php:342 +msgid "You have specified this user for removal:" +msgstr "Vous avez indiquÃ© que cet utilisateur devait Ãªtre supprimÃ© :" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:44 +#: wp-admin/theme-install.php:140 +msgctxt "themes" +msgid "Featured" +msgstr "Mis en avant" +======= #: wp-admin/user-new.php:219 msgid "That user is already a member of this site." msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:214 +msgid "Install Themes" +msgstr "Installer des thÃ¨mes" +||||||| .r11156 +#: wp-admin/theme-install.php:141 +msgctxt "themes" +msgid "Popular" +msgstr "Populaires" +======= #: wp-admin/user-new.php:216 msgid "User has been added to your site." msgstr "L’utilisateur a Ã©tÃ© ajoutÃ© Ã votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:40 +msgid "Manage Themes" +msgstr "GÃ©rer les thÃ¨mes" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:46 +#: wp-admin/theme-install.php:142 +msgctxt "themes" +msgid "Latest" +msgstr "Derniers en date" +======= #: wp-admin/user-new.php:213 msgid "Invitation email sent to user. A confirmation link must be clicked for them to be added to your site." msgstr "L’invitation a Ã©tÃ© envoyÃ©e Ã l’utilisateur sur son adresse de messagerie. Il devra cliquer sur un lien de confirmation pour Ãªtre ajoutÃ© Ã votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:166 +msgid "User Name" +msgstr "Identifiant" +||||||| .r11156 +#: wp-admin/users.php:46 +msgid "Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions." +msgstr "Â« Retirer Â» vous permet de retirer un utilisateur de votre site. Cela ne supprime pas son contenu. Vous pouvez Ã©galement retirer plus utilisateurs Ã la fois avec les Actions GroupÃ©es." +======= #: wp-admin/user-new.php:210 msgid "Invitation email sent to new user. A confirmation link must be clicked before their account is created." msgstr "Envoi d’un message d’invitation au nouvel utilisateur. Un lien de confirmation devra d’abord Ãªtre cliquÃ© avant la crÃ©ation du compte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:329 wp-admin/update-core.php:357 +#: wp-admin/update-core.php:651 wp-admin/update-core.php:656 +msgid "Update Themes" +msgstr "Mettre Ã jour les thÃ¨mes" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:280 +msgid "" +"Your new WordPress site has been successfully set up at:\n" +"\n" +"%1$s\n" +"\n" +"You can log in to the administrator account with the following information:\n" +"\n" +"Username: %2$s\n" +"Password: %3$s\n" +"\n" +"We hope you enjoy your new site. Thanks!\n" +"\n" +"--The WordPress Team\n" +"https://wordpress.org/\n" +msgstr "" +"Votre nouveau site WordPress a bien Ã©tÃ© installÃ© Ã l'adresse :\n" +"\n" +"%1$s\n" +"\n" +"Vous pouvez vous y connecter en tant qu'administrateur avec les informations suivantes :\n" +"\n" +"Identifiant : %2$s\n" +"Mot de passe : %3$s\n" +"\n" +"Nous espÃ©rons que vous aimerez votre nouveau site ! Merci Ã vous !\n" +"\n" +"-- L'Ã©quipe WordPress\n" +"https://wordpress.org/\n" +======= #: wp-admin/user-new.php:183 msgid "Documentation on Adding New Users" msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:20 +msgid "Edit Themes" +msgstr "Modifier les thÃ¨mes" +||||||| .r11156 +#: wp-admin/index.php:57 +msgid "Box Controls - Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it." +msgstr "ContrÃ´les des blocs - Cliquez sur la barre de titre d’un bloc pour l’ouvrir ou le fermer. Certains blocs ajoutÃ©s par des extensions peuvent avoir un contenu configurable, et afficheront donc un lien \"Configurer\" dans la barre de titre lors du survol de la souris." +======= #: wp-admin/user-new.php:177 msgid "Administrators have access to all the administration features." msgstr "Les administrateurs peuvent accÃ©der Ã toutes les fonctionnalitÃ©s de l’administration ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:56 wp-admin/theme-editor.php:59 +msgid "The requested theme does not exist." +msgstr "Le thÃ¨me demandÃ© n’existe pas." +||||||| .r11156 +#: wp-admin/index.php:67 +msgid "At A Glance - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using." +msgstr "D’un coup dâÅil - Affiche un rÃ©sumÃ© du contenu de votre site, et indique le thÃ¨me et la version de WordPress que vous utilisez." +======= #: wp-admin/user-new.php:176 msgid "Editors can publish posts, manage posts as well as manage other people’s posts, etc." msgstr "Les Ã©diteurs peuvent publier et gÃ©rer leurs propres articles, ainsi que ceux des autres membres ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:142 +msgid "Select theme to edit:" +msgstr "SÃ©lectionnez le thÃ¨me Ã modifier :" +||||||| .r11156 +#: wp-admin/maint/repair.php:103 +msgid "https://wordpress.org/support/forum/how-to-and-troubleshooting" +msgstr "http://www.wordpress-fr.net/support/forum-26-support-wordpress" +======= #: wp-admin/user-new.php:175 msgid "Authors can publish and manage their own posts, and are able to upload files." msgstr "Les auteurs peuvent publier et gÃ©rer leurs propres articles, ils peuvent Ã©galement envoyer des fichiers ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:168 +msgid "Templates" +msgstr "ModÃ¨les" +||||||| .r11156 +#: wp-admin/revision.php:78 +msgid "← Return to post editor" +msgstr "← Retourner Ã l’Ã©diteur d’article" +======= #: wp-admin/user-new.php:174 msgid "Contributors can write and manage their posts but not publish posts or upload media files." msgstr "Les contributeurs peuvent Ã©crire et gÃ©rer leurs articles, mais ils ne peuvent pas publier les articles ou envoyer des fichiers mÃ©dia ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:195 +msgid "Oops, no such file exists! Double check the name and try again, merci." +msgstr "Oops, ce fichier n’existe pas ! VÃ©rifiez son nom et rÃ©essayez, merci." +||||||| .r11156 +#: wp-admin/theme-install.php:23 +msgid "Add Themes" +msgstr "Ajouter des thÃ¨mes" +======= #: wp-admin/user-new.php:173 msgid "Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content." msgstr "Les abonnÃ©s peuvent lire les commentaires/commenter/recevoir les newsletters, etc. Mais ils ne peuvent pas crÃ©er du contenu sur le site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:140 +msgid "New theme activated. Visit site" +msgstr "Nouveau thÃ¨me activÃ©. Voir le site" +||||||| .r11156 +#: wp-admin/theme-install.php:31 +msgid "Featured Themes" +msgstr "ThÃ¨mes mis en avant" +======= #: wp-admin/user-new.php:171 msgid "Here is a basic overview of the different user roles and the permissions associated with each one:" msgstr "Voici un rapide survol des diffÃ©rents rÃ´les assignables aux utilisateurs, et des permissions qui leurs sont associÃ©es :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:143 +msgid "Theme deleted." +msgstr "ThÃ¨me supprimÃ©." +||||||| .r11156 +#: wp-admin/theme-install.php:32 +msgid "Popular Themes" +msgstr "ThÃ¨mes populaires" +======= #: wp-admin/user-new.php:170 msgid "User Roles" msgstr "RÃ´les utilisateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:271 +msgid "Broken Themes" +msgstr "ThÃ¨mes endommagÃ©s" +||||||| .r11156 +#: wp-admin/theme-install.php:33 +msgid "Newest Themes" +msgstr "ThÃ¨mes les plus rÃ©cents" +======= #: wp-admin/user-new.php:160 msgid "Remember to click the Add New User button at the bottom of this screen when you are finished." msgstr "N’oubliez pas de cliquer sur le bouton « Ajouter un utilisateur », en bas de cet Ã©cran, quand vous aurez terminÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:57 +msgid "Download nightly build" +msgstr "TÃ©lÃ©charger la derniÃ¨re version de dÃ©veloppement" +||||||| .r11156 +#: wp-admin/theme-install.php:53 +msgid "Search Themes" +msgstr "Chercher parmi les thÃ¨mes" +======= #: wp-admin/user-new.php:157 msgid "New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email." msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de ce site. Par dÃ©faut, ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que le mot de passe y soit inclus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:81 +msgid "Download %s" +msgstr "TÃ©lÃ©charger la version %s" +||||||| .r11156 +#: wp-admin/theme-install.php:54 +msgid "Search themes..." +msgstr "Recherche parmi les thÃ¨mes..." +======= #: wp-admin/user-new.php:156 msgid "You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed." msgstr "Vous devez assigner un mot de passe au nouvel utilisateur, qu’il pourra changer aprÃ¨s s’Ãªtre connectÃ©. L’identifiant, en revanche, ne peut Ãªtre changÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:103 +msgid "Hide this update" +msgstr "Masquer cette mise Ã jour" +||||||| .r11156 +#: wp-admin/theme-install.php:214 +msgctxt "theme" +msgid "Details & Preview" +msgstr "DÃ©tails et prÃ©visualisation" +======= #: wp-admin/user-new.php:154 msgid "New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email." msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de votre site. Ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que l’utilisateur reÃ§oive ce message de bienvenue." +>>>>>>> .r12027 -#: wp-admin/user-new.php:153 -msgid "Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users." -msgstr "Parce qu’il s’agit d’une installation multisite, vous pouvez ajouter des comptes qui existent dÃ©jÃ sur le RÃ©seau, en indiquant un nom d’utilisateur ou une adresse de messagerie, et en assignant un rÃ´le. Pour avoir plus d’options, telle que le choix du mot de passe, vous devez Ãªtre Administrateur du RÃ©seau, et utiliser les liens qui apparaissent au survol sous le nom de l’utilisateur pour modifier son profil utilisateur, depuis l’Ã©cran « Tous les utilisateurs »." +<<<<<<< .mine +#: wp-admin/update-core.php:105 +msgid "Bring back this update" +msgstr "RÃ©afficher cette mise Ã jour" +||||||| .r11156 +#: wp-admin/users.php:48 +msgid "Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions." +msgstr "Â« Supprimer Â» vous amÃ¨ne Ã l’Ã©cran de suppression des utilisateurs pour confirmer votre action, d’oÃ¹ vous pouvez retirer un utilisateur de maniÃ¨re permanente et supprimer son contenu. Vous pouvez Ã©galement supprimer plusieurs utilisateurs Ã la fois avec les Actions GroupÃ©es." +======= +#: wp-admin/user-new.php:153 +msgid "Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users." +msgstr "Parce qu’il s’agit d’une installation multisite, vous pouvez ajouter des comptes qui existent dÃ©jÃ sur le RÃ©seau, en indiquant un nom d’utilisateur ou une adresse de messagerie, et en assignant un rÃ´le. Pour avoir plus d’options, telle que le choix du mot de passe, vous devez Ãªtre Administrateur du RÃ©seau, et utiliser les liens qui apparaissent au survol sous le nom de l’utilisateur pour modifier son profil utilisateur, depuis l’Ã©cran « Tous les utilisateurs »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:108 +msgid "This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation." +msgstr "Cette version localisÃ©e contient Ã la fois la traduction et divers correctifs liÃ©s Ã la localisation. Si vous souhaitez conserver votre traduction actuelle, vous pouvez ne pas utiliser cette version." +||||||| .r11156 +#: wp-admin/users.php:239 +msgid "What should be done with content owned by this user?" +msgid_plural "What should be done with content owned by these users?" +msgstr[0] "Que faire du contenu ayant cet utilisateur pour propriÃ©taire ?" +msgstr[1] "Que faire du contenu ayant ces utilisateurs pour propriÃ©taires ?" +======= #: wp-admin/user-new.php:150 msgid "To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom." msgstr "Pour ajouter un nouvel utilisateur Ã votre site, remplissez le formulaire de cet Ã©cran et cliquez sur le bouton « Ajouter un nouvel utilisateur » en bas de l’Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:124 wp-admin/update-core.php:136 +msgid "Show hidden updates" +msgstr "Afficher les mises Ã jour cachÃ©es" +||||||| .r11156 +#: wp-admin/users.php:242 +msgid "Delete all content." +msgstr "Supprimer tout le contenu." +======= #: wp-admin/user-new.php:85 msgid "[%s] Joining confirmation" msgstr "[%s] Confirmation d'inscription" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/update-core.php:125 +msgid "Hide hidden updates" +msgstr "Masquer les mises Ã jour cachÃ©es" + +#: wp-admin/update-core.php:263 +msgid "Compatibility with WordPress %1$s: 100%% (according to its author)" +msgstr "CompatibilitÃ© avec WordPress %1$s : 100%% (selon l’auteur)" + +#: wp-admin/update-core.php:268 wp-admin/update-core.php:276 +msgid "Compatibility with WordPress %1$s: Unknown" +msgstr "CompatibilitÃ© avec WordPress %1$s : inconnue" + +#: wp-admin/update.php:80 +msgid "Plugin Reactivation" +msgstr "RÃ©activation d’extension" + +#: wp-admin/update.php:85 +msgid "Plugin failed to reactivate due to a fatal error." +msgstr "L’extension n’a pu Ãªtre rÃ©activÃ©e suite Ã une erreur fatale." +#: wp-admin/update.php:111 +msgid "Installing Plugin: %s" +msgstr "Extension en cours d’installation : %s" +||||||| .r11156 +#: wp-admin/users.php:244 +msgid "Attribute all content to:" +msgstr "Attribuer tout le contenu Ã :" + +#: wp-admin/includes/ajax-actions.php:1644 +msgid "Type" +msgstr "Type" + +#: wp-admin/admin-footer.php:29 +msgid "Thank you for creating with WordPress." +msgstr "Merci de faire de WordPress votre outil de crÃ©ation." + +#: wp-admin/comment.php:59 wp-admin/custom-background.php:151 +#: wp-admin/custom-header.php:192 wp-admin/edit-comments.php:136 +#: wp-admin/edit-form-advanced.php:294 wp-admin/edit-form-advanced.php:310 +#: wp-admin/edit-form-advanced.php:326 wp-admin/edit-link-form.php:66 +#: wp-admin/edit-tags.php:237 wp-admin/edit.php:206 wp-admin/edit.php:227 +#: wp-admin/export.php:56 wp-admin/import.php:29 wp-admin/index.php:89 +#: wp-admin/link-manager.php:61 wp-admin/media-new.php:57 wp-admin/media.php:84 +#: wp-admin/my-sites.php:49 wp-admin/nav-menus.php:545 +#: wp-admin/options-discussion.php:27 wp-admin/options-general.php:80 +#: wp-admin/options-media.php:35 wp-admin/options-permalink.php:46 +#: wp-admin/options-reading.php:72 wp-admin/options-writing.php:52 +#: wp-admin/plugin-editor.php:142 wp-admin/plugin-install.php:67 +#: wp-admin/plugins.php:360 wp-admin/revision.php:120 +#: wp-admin/theme-editor.php:43 wp-admin/theme-install.php:104 +#: wp-admin/themes.php:86 wp-admin/tools.php:29 wp-admin/update-core.php:490 +#: wp-admin/upload.php:52 wp-admin/upload.php:220 wp-admin/user-edit.php:54 +#: wp-admin/user-new.php:185 wp-admin/users.php:63 wp-admin/widgets.php:74 +msgid "Support Forums" +msgstr "Forums d’entraide" + +#: wp-admin/credits.php:164 +msgid "https://make.wordpress.org/" +msgstr "https://make.wordpress.org/" + +#: wp-admin/includes/class-wp-upgrader.php:2591 +msgid "" +"\n" +"BETA TESTING?\n" +"=============\n" +"\n" +"This debugging email is sent when you are using a development version of WordPress.\n" +"\n" +"If you think these failures might be due to a bug in WordPress, could you report it?\n" +" * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta\n" +" * Or, if you're comfortable writing a bug report: http://core.trac.wordpress.org/\n" +"\n" +"Thanks! -- The WordPress Team" +msgstr "" +"\n" +"BETA TESTEUR ?\n" +"==============\n" +"\n" +"Ce message de dÃ©bogage est envoyÃ© lorsque vous utilisez une version de dÃ©veloppement de WordPress.\n" +"\n" +"Si vous pensez que ces erreurs puissent Ãªtre dues Ã un problÃ¨me au sein de WordPress, pourriez-vous nous le signaler ?\n" +"* Ouvrez une discussion sur le forum de support en anglais : https://wordpress.org/support/forum/alphabeta\n" +"* Ou, si rÃ©diger un rapport de bogue ne vous fait pas peur : http://core.trac.wordpress.org/\n" +"\n" +"Merci ! -- L'Ã©quipe WordPress" +======= #. translators: 1: Site name, 2: site URL, 3: role, 4: activation URL #: wp-admin/user-new.php:78 msgid "" @@ -494,746 +1762,2679 @@ msgstr "" "\n" "Veuillez cliquer sur le lien suivant pour activer votre compte utilisateur :\n" "%%s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:139 +msgid "Installing Plugin from uploaded file: %s" +msgstr "Installation de l’extension Ã partir du fichier : %s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1318 +msgid "Manage widgets" +msgstr "GÃ©rer les widgets" +======= #: wp-admin/user-edit.php:578 msgid "Update User" msgstr "Mettre Ã jour l’utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:219 +msgid "Installing Theme: %s" +msgstr "Installation du thÃ¨me : %s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1320 +msgid "Manage menus" +msgstr "GÃ©rer les menus" +======= #: wp-admin/user-edit.php:578 msgid "Update Profile" msgstr "Mettre Ã jour le profil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:49 wp-admin/theme-install.php:120 +#: wp-admin/theme-install.php:122 wp-admin/update.php:241 +msgid "Upload Theme" +msgstr "Mettre un thÃ¨me en ligne" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:92 +msgid "Edit status" +msgstr "Modifier l’Ã©tat" +======= #: wp-admin/user-edit.php:565 msgid "Denied: %s" msgstr "RefusÃ© : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:247 +msgid "Installing Theme from uploaded file: %s" +msgstr "Installation du thÃ¨me Ã partir du fichier : %s" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:138 +msgid "Edit visibility" +msgstr "Modifier la visibilitÃ©" +======= #: wp-admin/user-edit.php:557 msgid "Capabilities" msgstr "CapacitÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:75 +msgid "Your WordPress database is already up-to-date!" +msgstr "Votre base de donnÃ©es WordPress est dÃ©jÃ Ã jour !" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:198 +msgid "Browse revisions" +msgstr "Parcourir les rÃ©visions" +======= #: wp-admin/user-edit.php:554 msgid "Additional Capabilities" msgstr "FonctionnalitÃ©s complÃ©mentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:114 +msgid "%s queries" +msgstr "%s requÃªtes" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:206 +msgid "Edit date and time" +msgstr "Modifier la date et l’heure" +======= #. translators: 1: User's display name. #: wp-admin/user-edit.php:505 msgid "Log %s out of all sessions" msgstr "DÃ©connecter %s de toutes les sessions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:116 +msgid "%s seconds" +msgstr "%s secondes" +||||||| .r11156 +#: wp-admin/themes.php:107 +msgid "Search installed themes..." +msgstr "Chercher parmi les thÃ¨mes installÃ©s..." +======= #: wp-admin/user-edit.php:501 msgid "Log Out of All Sessions" msgstr "DÃ©connecter de toutes les sessions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:153 +msgid "You are not allowed to delete this post." +msgstr "Vous n’avez pas l’autorisation de supprimer cet article." +||||||| .r11156 +#: wp-admin/update-core.php:466 +msgid "If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu." +msgstr "Si une mise Ã jour est disponible, vous verrez une notification apparaÃ®tre dans la barre d’outils" +======= #: wp-admin/user-edit.php:493 msgid "Left your account logged in at a public computer? Lost your phone? This will log you out everywhere except your current browser." msgstr "Avez-vous laissÃ© votre compte ouvert sur un ordinateur public ? Perdu votre tÃ©lÃ©phone ? Cette fonction vous dÃ©connectera de partout sauf du navigateur que vous utilisez maintenant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:28 +msgid "Edit User" +msgstr "Modifier l’utilisateur" +||||||| .r11156 +#: wp-admin/update-core.php:474 +msgid "WordPress — Updating your WordPress installation is a simple one-click procedure: just click on the “Update Now” button when you are notified that a new version is available." +msgstr "WordPress — La mise Ã jour de votre installation WordPress tient en une simple procÃ©dure : cliquez sur le bouton \"Mettre Ã jour\" quand vous Ãªtes notifiÃ©(e) qu’une nouvelle version est disponible." +======= #: wp-admin/user-edit.php:483 msgid "You are only logged in at this location." msgstr "Vous n'Ãªtes connectÃ© qu'Ã cet endroit." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:72 +msgid "Use https" +msgstr "Utiliser https" +||||||| .r11156 +#: wp-admin/update-core.php:474 +msgid "In most cases, WordPress will automatically apply maintenance and security updates in the background for you." +msgstr "Dans la plupart des cas, WordPress appliquera automatiquement les mises Ã jour de maintenance et de sÃ©curitÃ© en arriÃ¨re-plan." +======= #: wp-admin/user-edit.php:481 wp-admin/user-edit.php:491 msgid "Log Out of All Other Sessions" msgstr "Me dÃ©connecter de toutes les autres sessions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:73 +msgid "Always use https when visiting the admin" +msgstr "Toujours utiliser https lors de l’utilisation de l’administration" +||||||| .r11156 +#: wp-admin/update-core.php:478 +msgid "Translations — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can click the “Update Translations” button." +msgstr "Traductions — Les fichiers qui traduisent WordPress dans votre langue sont mis Ã jour dÃ¨s qu’une modification est faite. Mais si ces fichiers ne sont plus Ã jour, vous pouvez cliquer sur le bouton \"Mettre Ã jour les traductions\"." +======= #: wp-admin/user-edit.php:468 msgid "Type your new password again." msgstr "Veuillez saisir une deuxiÃ¨me fois votre mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:96 wp-admin/user-edit.php:125 +#: wp-admin/user-edit.php:178 +msgid "You do not have permission to edit this user." +msgstr "Vous n’avez pas l’autorisation de modifier cet utilisateur." +||||||| .r11156 +#: wp-admin/update-core.php:465 +msgid "On this screen, you can update to the latest version of WordPress, as well as update your themes and plugins from the WordPress.org repositories." +msgstr "Sur cet Ã©cran, vous pouvez faire la mise Ã jour vers la derniÃ¨re version de WordPres, et mettre Ã jour les thÃ¨mes et extensions depuis les dÃ©pÃ´ts de WordPress.org." +======= #: wp-admin/user-edit.php:465 msgid "Repeat New Password" msgstr "RÃ©pÃ©tez le mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:193 +msgid "User updated." +msgstr "Utilisateur mis Ã jour." +||||||| .r11156 +#: wp-admin/update-core.php:475 +msgid "Themes and Plugins — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then click on the appropriate “Update” button. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button." +msgstr "ThÃ¨mes et extensions — Pour mettre Ã jour les thÃ¨mes et extensions individuellement depuis cet Ã©cran, utilisez les cases Ã jour pour faire votre sÃ©lection, puis cliquez sur le bouton \"Mettre Ã jour\" appropriÃ©. Pour mettre Ã jour tous les thÃ¨mes et toutes les extensions d’un coup, vous pouvez cocher la case en haut de la section pour tout sÃ©lectionner avant de cliquer sur le boutons de mise Ã jour." +======= #: wp-admin/user-edit.php:461 msgid "If you would like to change the password type a new one. Otherwise leave this blank." msgstr "Si vous voulez changer le mot de passe, entrez en un nouveau. Sinon, laissez ce champ vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:233 +msgid "Personal Options" +msgstr "Options personnelles" +||||||| .r11156 +#: wp-admin/about.php:28 +msgid "Welcome to WordPress %s" +msgstr "Bienvenue dans WordPress %s" +======= #: wp-admin/user-edit.php:457 msgid "New Password" msgstr "Nouveau mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:238 +msgid "Visual Editor" +msgstr "Ãditeur visuel" +||||||| .r11156 +#: wp-admin/themes.php:59 +msgid "If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!" +msgstr "Si vous souhaitez choisir parmi plus de thÃ¨mes, cliquez sur le bouton \"Ajouter\" et vous pourrez parcourir le rÃ©pertoire de thÃ¨me de WordPress.org et y chercher des thÃ¨mes supplÃ©mentaires. Les thÃ¨mes du rÃ©pertoire de thÃ¨mes de WordPress.org sont conÃ§us et dÃ©veloppÃ©s par des tiers, et sont compatibles avec la licence de WordPress. Oh, et ils sont libres et gratuits !" +======= #: wp-admin/user-edit.php:448 msgid "Share a little biographical information to fill out your profile. This may be shown publicly." msgstr "Donnez quelques informations biographiques pour remplir votre profil. Ceci peut Ãªtre affichÃ© publiquement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:239 +msgid "Disable the visual editor when writing" +msgstr "DÃ©sactiver l’Ã©diteur visuel pour Ã©crire" +||||||| .r11156 +#: wp-admin/includes/theme.php:196 +msgid "Fixed Layout" +msgstr "Mise en page fixe" +======= #: wp-admin/user-edit.php:446 msgid "Biographical Info" msgstr "Renseignements biographiques" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:265 +msgid "Enable keyboard shortcuts for comment moderation." +msgstr "Activer les raccourcis clavier pour la modÃ©ration de commentaires." +||||||| .r11156 +#: wp-admin/includes/theme.php:197 +msgid "Fluid Layout" +msgstr "Mise en page fluide" +======= #: wp-admin/user-edit.php:442 msgid "About the user" msgstr "Ã propos de l’utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:344 wp-admin/user-new.php:373 +msgid "First Name" +msgstr "PrÃ©nom" +||||||| .r11156 +#: wp-admin/includes/theme.php:198 +msgid "Responsive Layout" +msgstr "Mise en page adaptable" +======= #: wp-admin/user-edit.php:442 msgid "About Yourself" msgstr "Ã propos de vous" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:349 wp-admin/user-new.php:377 +msgid "Last Name" +msgstr "Nom" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:222 +msgid "%s Post" +msgid_plural "%s Posts" +msgstr[0] "%s articles" +msgstr[1] "%s articles" +======= #: wp-admin/user-edit.php:405 msgid "There is a pending change of your e-mail to %1$s. Cancel" msgstr "Il y a une modification de votre adresse de contact en cours, en faveur de %1$s. Annuler" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:354 +msgid "Nickname" +msgstr "Pseudonyme" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:224 +msgid "%s Page" +msgid_plural "%s Pages" +msgstr[0] "%s page" +msgstr[1] "%s pages" +======= #: wp-admin/user-edit.php:395 msgid "Contact Info" msgstr "Informations de contact" +>>>>>>> .r12027 #: wp-admin/user-edit.php:359 msgid "Display name publicly as" msgstr "Nom Ã afficher publiquement" +<<<<<<< .mine +#: wp-admin/user-edit.php:395 +msgid "Contact Info" +msgstr "Informations de contact" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:245 +msgctxt "comments" +msgid "%s in moderation" +msgid_plural "%s in moderation" +msgstr[0] "%s en attente de validation" +msgstr[1] "%s en attente de validation" +======= #: wp-admin/user-edit.php:354 msgid "Nickname" msgstr "Pseudonyme" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:447 +msgid "About Yourself" +msgstr "Ã propos de vous" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:715 +msgid "M jS" +msgstr "j M" +======= #: wp-admin/user-edit.php:349 wp-admin/user-new.php:372 msgid "Last Name" msgstr "Nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:447 +msgid "About the user" +msgstr "Ã propos de l’utilisateur" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:720 +msgid "%1$s, %2$s %4$s" +msgstr "%1$s, %2$s %4$s" +======= #: wp-admin/user-edit.php:344 wp-admin/user-new.php:368 msgid "First Name" msgstr "PrÃ©nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:451 +msgid "Biographical Info" +msgstr "Renseignements biographiques" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1138 +msgid "%s MB Space Allowed" +msgstr "%s Mo d’espace autorisÃ©s" +======= #: wp-admin/user-edit.php:338 msgid "Super admin privileges cannot be removed because this user has the network admin email." msgstr "Les privilÃ¨ges de super-admin ne peuvent pas Ãªtre enlevÃ©s, car cet utilisateur est celui avec l’adresse de contact administratif du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:453 +msgid "Share a little biographical information to fill out your profile. This may be shown publicly." +msgstr "Donnez quelques informations biographiques pour remplir votre profil. Ceci peut Ãªtre affichÃ© publiquement." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1150 +msgid "%1$s MB (%2$s%%) Space Used" +msgstr "%1$s Mo (%2$s%%) d’espace utilisÃ©s" +======= #: wp-admin/user-edit.php:336 msgid "Grant this user super admin privileges for the Network." msgstr "Donner les privilÃ¨ges de super-admin Ã cet utilisateur pour le rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:466 +msgid "New Password" +msgstr "Nouveau mot de passe" +||||||| .r11156 +#: wp-admin/themes.php:203 wp-admin/themes.php:284 +msgid "Theme Details" +msgstr "DÃ©tails du thÃ¨me" +======= #: wp-admin/user-edit.php:325 wp-admin/user-edit.php:327 msgid "— No role for this site —" msgstr "— Pas de rÃ´le sur ce site —" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:489 +msgid "Type your new password again." +msgstr "Veuillez saisir une deuxiÃ¨me fois votre mot de passe." +||||||| .r11156 +#: wp-admin/options-reading.php:66 +msgid "When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, “Search Engines Discouraged,” to remind you that your site is not being crawled." +msgstr "Lorsque ce rÃ©glage est actif, un rappel est affichÃ© dans le bloc \"D’un coup d’Åil\" du Tableau de bord, indiquant que \"Moteurs de recherche refusÃ©s\" pour que vous n’oubliez pas que votre site n’est pas parcouru." +======= #: wp-admin/user-edit.php:309 msgid "Usernames cannot be changed." msgstr "Les identifiants ne peuvent Ãªtre modifiÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:581 +msgid "Additional Capabilities" +msgstr "FonctionnalitÃ©s complÃ©mentaires" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:35 +msgid "At a Glance" +msgstr "D’un coup d’Åil" +======= #: wp-admin/user-edit.php:273 msgid "Show Toolbar when viewing site" msgstr "Afficher la barre d’outils lorsque vous visitez le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:605 +msgid "Update Profile" +msgstr "Mettre Ã jour le profil" +||||||| .r11156 +#: wp-admin/themes.php:207 wp-admin/themes.php:288 +msgctxt "theme" +msgid "Active:" +msgstr "ActivÃ© :" +======= #: wp-admin/user-edit.php:265 msgid "More information" msgstr "Plus d’informations" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:605 +msgid "Update User" +msgstr "Mettre Ã jour l’utilisateur" +||||||| .r11156 +#: wp-admin/includes/theme.php:208 +msgid "Accessibility Ready" +msgstr "DÃ©jÃ accessible" +======= #: wp-admin/user-edit.php:265 msgid "Enable keyboard shortcuts for comment moderation." msgstr "Activer les raccourcis clavier pour la modÃ©ration de commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:90 +msgid "[%s] Joining confirmation" +msgstr "[%s] Confirmation d'inscription" +||||||| .r11156 +#: wp-admin/themes.php:345 +msgid "This is a child theme of %s." +msgstr "Ceci est un thÃ¨me enfant de %s." +======= #: wp-admin/user-edit.php:239 msgid "Disable the visual editor when writing" msgstr "DÃ©sactiver l’Ã©diteur visuel pour Ã©crire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:506 wp-admin/update-core.php:545 +msgid "WordPress Updates" +msgstr "Mises Ã jour de WordPress" +||||||| .r11156 +#: wp-admin/themes.php:40 +msgid "This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos thÃ¨mes installÃ©s. En dehors des thÃ¨mes par dÃ©faut inclus dans votre installation de WordPress, les thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des tiers." +======= #: wp-admin/user-edit.php:238 msgid "Visual Editor" msgstr "Ãditeur visuel" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:266 wp-admin/update-core.php:274 +msgid "Compatibility with WordPress %1$s: %2$d%% (%3$d \"works\" votes out of %4$d total)" +msgstr "CompatibilitÃ© avec WordPress %1$s : %2$d%% (%3$d votes « Ã§a marche » sur un total de %4$d)" +||||||| .r11156 +#: wp-admin/themes.php:42 +msgid "Hover or tap to see Activate and Live Preview buttons" +msgstr "Survolez out touchez pour voir les boutons Activer et PrÃ©visualisation" +======= #: wp-admin/user-edit.php:233 msgid "Personal Options" msgstr "Options personnelles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:418 +msgid "Update WordPress" +msgstr "Mettre Ã jour WordPress" +||||||| .r11156 +#: wp-admin/themes.php:43 +msgid "Click on the theme to see the theme name, version, author, description, tags, and the Delete link" +msgstr "Cliquez sur le thÃ¨me pour voir le nom du thÃ¨me, sa version, son auteur, sa description, ses mots-clÃ©s et le bouton Supprimer." +======= #: wp-admin/user-edit.php:212 wp-admin/users.php:452 msgctxt "user" msgid "Add Existing" msgstr "Ajouter un utilisateur existant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:42 +msgid "Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site." +msgstr "Utilisez-le pour rÃ©cupÃ©rer du texte, des images et des vidÃ©os depuis n’importe quelle page Web. Puis modifiez l’article et ajoutez vos propres textes directement dans le bookmarklet, avant d’enregistrer le tout ou de le publier dans un article sur votre site." +||||||| .r11156 +#: wp-admin/themes.php:44 +msgid "Click Customize for the current theme or Live Preview for any other theme to see a live preview" +msgstr "Cliquez sur Personnaliser pour le thÃ¨me actuel ou PrÃ©visualisation pour n’importe quel autre thÃ¨me pour voir la prÃ©visualisation" +======= #: wp-admin/user-edit.php:196 msgid "← Back to Users" msgstr "← Retour aux utilisateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:18 +msgid "You do not have sufficient permissions to edit templates for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les modÃ¨les de ce site." +||||||| .r11156 +#: wp-admin/themes.php:45 +msgid "The current theme is displayed highlighted as the first theme." +msgstr "Le thÃ¨me actuel est affichÃ© en Ã©tant mis en avant en tant que premier thÃ¨me." +======= #: wp-admin/user-edit.php:193 msgid "User updated." msgstr "Utilisateur mis Ã jour." +>>>>>>> .r12027 -#: wp-admin/user-edit.php:191 -msgid "Profile updated." -msgstr "Profil mis Ã jour." - -#: wp-admin/user-edit.php:186 +<<<<<<< .mine +#: wp-admin/theme-install.php:16 wp-admin/update.php:202 +#: wp-admin/update.php:232 +msgid "You do not have sufficient permissions to install themes on this site." +msgstr "Vous n’avez pas les droits suffisants pour installer des thÃ¨mes sur ce site." +||||||| .r11156 +#: wp-admin/themes.php:72 +msgid "Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way." +msgstr "Touchez ou survolez n’importe quel thÃ¨me puis cliquez sur le bouton PrÃ©visualisation pour voir une prÃ©visualisation de ce thÃ¨me et changer les options du thÃ¨me dans un vie sÃ©parÃ©e et plein Ã©cran. Vous pouvez Ã©galement trouver un bouton PrÃ©visualisation au bas de l’Ã©cran de dÃ©tails du thÃ¨me. Tout thÃ¨me installÃ© peut Ãªtre prÃ©visualisÃ© et personnalisÃ© de cette maniÃ¨re." +======= +#: wp-admin/user-edit.php:191 +msgid "Profile updated." +msgstr "Profil mis Ã jour." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/theme-install.php:79 +msgid "You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory." +msgstr "Si vous disposez d’un thÃ¨me sous forme d’archive Zip sur votre ordinateur, vous pouvez mettre en ligne ce fichier avec le lien Envoyer. Assurez-vous bien que ce fichier provient d’une source de confiance. Vous pouvez Ã©galement le faire Ã l’ancienne, c’est-Ã -dire passer par un client FTP pour dÃ©poser les fichiers dans le dossier /wp-content/themes." +||||||| .r11156 +#: wp-admin/themes.php:73 +msgid "The theme being previewed is fully interactive — navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save & Activate button above the menu." +msgstr "Le thÃ¨me en cours de prÃ©visualisation est totalement interactif — naviguez sur les diffÃ©rentes pages pour voir comment le thÃ¨me affiche vos articles, archives et autres pages. Les rÃ©glages peuvent diffÃ©rer selon les fonctionnalitÃ©s pour lesquelles le thÃ¨me a Ã©tÃ© conÃ§u. Pour valider les nouveaux rÃ©glages et activer le thÃ¨me en un seul coup, cliquez sur le bouton \"Enregistrer et activer\" en haut du menu." +======= +#: wp-admin/user-edit.php:186 msgid "This user has super admin privileges." msgstr "Cet utilisateur possÃ¨de les privilÃ¨ges de super-admin." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:272 +msgid "The following themes are installed but incomplete. Themes must have a stylesheet and a template." +msgstr "Les thÃ¨mes suivants sont installÃ©s, mais incomplets. Les thÃ¨mes doivent avoir au moins une feuille de style et un modÃ¨le." +||||||| .r11156 +#: wp-admin/themes.php:74 +msgid "When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again." +msgstr "Lors de la prÃ©visualisation sur de petits Ã©crans, vous pouvez utiliser l’icÃ´ne de rÃ©duction en bas Ã gauche du panneau. Cela cachera le panneau, vous donnant ainsi plus de place pour prÃ©visualiser le site avec le nouveau thÃ¨me. Pour ramener le panneau, cliquez Ã nouveau sur l’icÃ´ne de rÃ©duction." +======= #: wp-admin/user-edit.php:186 msgid "Important:" msgstr "Important :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:163 +msgid "You have the latest version of WordPress." +msgstr "Vous avez la derniÃ¨re version de WordPress." +||||||| .r11156 +#: wp-admin/widgets.php:339 +msgid "To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back." +msgstr "Pour activer un widget, glissez-le dans la barre latÃ©rale ou cliquez dessus. Pour dÃ©sactiver un widget et supprimer ses rÃ©glages, enlevez-le de la barre latÃ©rale." +======= #: wp-admin/user-edit.php:96 wp-admin/user-edit.php:125 #: wp-admin/user-edit.php:178 msgid "You do not have permission to edit this user." msgstr "Vous n’avez pas l’autorisation de modifier cet utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:185 +msgid "An updated version of WordPress is available." +msgstr "Une nouvelle version de WordPress est disponible." +||||||| .r11156 +#: wp-admin/includes/template.php:2144 +msgid "%1$s rating based on %2$s rating" +msgid_plural "%1$s rating based on %2$s ratings" +msgstr[0] "Une note de %1$s basÃ©e sur %2$s vote" +msgstr[1] "Une note de %1$s basÃ©e sur %2$s votes" +======= #: wp-admin/user-edit.php:73 msgid "Always use https when visiting the admin" msgstr "Toujours utiliser https lors de l’utilisation de l’administration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:208 +msgid "While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal." +msgstr "Durant le processus de mise Ã jour, votre site sera en mode de maintenance. DÃ¨s que le processus sera achevÃ©, votre site sera Ã nouveau accessible." +||||||| .r11156 +#: wp-admin/includes/template.php:2148 +msgid "%s rating" +msgstr "Note : %s" +======= #: wp-admin/user-edit.php:72 msgid "Use https" msgstr "Utiliser https" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:241 +msgid "The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”." +msgstr "Les extensions suivantes disposent d’une nouvelle version. Cochez celles que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les extensions »." +||||||| .r11156 +#: wp-admin/my-sites.php:42 +msgid "This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site." +msgstr "Cet Ã©cran affiche Ã un utilisateur individuel tous ses sites sur ce rÃ©seau, et permet Ã©galement Ã cet utilisateur de rÃ©gler son site principal. Il peut utiliser les liens sous chaque site pour se rendre soit sur son interface publique, soit sur son administration." +======= #: wp-admin/user-edit.php:54 msgid "Documentation on User Profiles" msgstr "Documentation sur le Profil utilisateur (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:293 wp-admin/update-core.php:344 +msgid "You have version %1$s installed. Update to %2$s." +msgstr "Vous utilisez la version %1$s. Mettez Ã jour vers la version %2$s." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2633 +msgid "Rollback Error: [%1$s] %2$s" +msgstr "Erreur de restauration : [%1$s] %2$s" +======= #: wp-admin/user-edit.php:44 msgid "Remember to click the Update Profile button when you are finished." msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le profil » quand vous aurez terminÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:318 +msgid "Your themes are all up to date." +msgstr "Vos thÃ¨mes sont tous Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2636 +msgid "Error: [%1$s] %2$s" +msgstr "Erreur : [%1$s] %2$s" +======= #: wp-admin/user-edit.php:43 msgid "Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so." msgstr "Les champs obligatoires sont indiquÃ©s, les autres sont facultatifs. Les informations du profil ne sont affichÃ©es que si votre thÃ¨me a Ã©tÃ© conÃ§u pour les exploiter." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:325 +msgid "The following themes have new versions available. Check the ones you want to update and then click “Update Themes”." +msgstr "Les thÃ¨mes suivants disposent d’une nouvelle version. Cochez ceux que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les thÃ¨mes »." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2560 +msgid "The following plugins were successfully updated:" +msgstr "Les extensions suivantes ont bien Ã©tÃ© mises Ã jour :" +======= #: wp-admin/user-edit.php:42 msgid "You can log out of other devices, such as your phone or a public computer, by clicking the Log Out of All Other Sessions button." msgstr "Vous pouvez vous dÃ©connecter dâautres appareils, tels que votre tÃ©lÃ©phone ou un ordinateur public, en cliquant sur « Me dÃ©connecter de toutes les autres sessions »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:155 wp-admin/update.php:176 +msgid "You do not have sufficient permissions to update themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les thÃ¨mes de ce site." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2561 +msgid "The following themes were successfully updated:" +msgstr "Les thÃ¨mes suivants ont bien Ã©tÃ© mis Ã jour :" +======= #: wp-admin/user-edit.php:41 msgid "Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts." msgstr "Votre identifiant ne peut Ãªtre modifiÃ©, mais vous pouvez utiliser les autres champs pour saisir votre nom complet ou un pseudonyme, et changer ensuite le nom Ã afficher dans vos articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:183 +msgid "You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table." +msgstr "Vous pouvez limiter cette liste par type de fichier ou par Ã©tat Ã l’aide des filtres en haut de l’Ã©cran. Vous pouvez Ã©galement affiner la liste par dÃ©faut Ã l’aide du menu dÃ©roulant au dessus du tableau." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2562 +msgid "The following translations were successfully updated:" +msgstr "Les traductions suivantes ont bien Ã©tÃ© mises Ã jour :" +======= #: wp-admin/user-edit.php:40 msgid "You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens." msgstr "Vous pouvez modifier votre mot de passe, activer les raccourcis clavier, modifier la combinaison de couleurs des Ã©crans de l’administration, et dÃ©sactiver l’Ã©diteur visuel (WYSIWYG), entre autres choses. Vous pouvez Ã©galement cacher la barre d’outils (anciennement « barre d’administration ») sur la partie publique de votre site, mais elle ne peut pas Ãªtre enlevÃ©e des Ã©crans d’administration." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:269 +msgid "Error saving media attachment." +msgstr "Erreur lors de la sauvegarde du fichier attachÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2573 +msgid "The following plugins failed to update:" +msgstr "Les extensions suivantes n’ont pas pu Ãªtre mises Ã jour :" +======= #: wp-admin/user-edit.php:39 msgid "Your profile contains information about you (your “account”) as well as some personal options related to using WordPress." msgstr "Votre profil contient les informations Ã votre propos (votre « compte »), ainsi que quelques options liÃ©es Ã votre utilisation personnelle de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:39 +msgid "Your profile contains information about you (your “account”) as well as some personal options related to using WordPress." +msgstr "Votre profil contient les informations Ã votre propos (votre « compte »), ainsi que quelques options liÃ©es Ã votre utilisation personnelle de WordPress." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2574 +msgid "The following themes failed to update:" +msgstr "Les thÃ¨mes suivants n’ont pas pu Ãªtre mis Ã jour :" +======= #: wp-admin/user-edit.php:28 msgid "Edit User" msgstr "Modifier l’utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:43 +msgid "Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so." +msgstr "Les champs obligatoires sont indiquÃ©s, les autres sont facultatifs. Les informations du profil ne sont affichÃ©es que si votre thÃ¨me a Ã©tÃ© conÃ§u pour les exploiter." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2575 +msgid "The following translations failed to update:" +msgstr "Les traductions suivantes n’ont pas pu Ãªtre mises Ã jour :" +======= #: wp-admin/upload.php:271 msgid "Media restored from the trash." msgstr "Fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:309 +msgid "Usernames cannot be changed." +msgstr "Les identifiants ne peuvent Ãªtre modifiÃ©s." +||||||| .r11156 +#: wp-admin/post.php:114 +msgid "Unable to submit this form, please refresh and try again." +msgstr "Impossible d’envoyer ce formulaire ; veuillez recharger la page et rÃ©essayer." +======= #: wp-admin/upload.php:270 msgid "Media moved to the trash." msgstr "Fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:325 wp-admin/user-edit.php:327 +msgid "— No role for this site —" +msgstr "— Pas de rÃ´le sur ce site —" +||||||| .r11156 +#: wp-admin/index.php:55 +msgid "Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show." +msgstr "Options de l’Ã©cran - Utilisez l’onglet Options de l’Ã©cran pour choisir les blocs Ã afficher dans le Tableau de bord." +======= #: wp-admin/upload.php:269 msgid "Error saving media attachment." msgstr "Erreur lors de la sauvegarde du fichier attachÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:215 +msgid "Invitation email sent to new user. A confirmation link must be clicked before their account is created." +msgstr "Envoi d’un message d’invitation au nouvel utilisateur. Un lien de confirmation devra d’abord Ãªtre cliquÃ© avant la crÃ©ation du compte." +||||||| .r11156 +#: wp-admin/index.php:68 +msgid "Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them." +msgstr "ActivitÃ© - Affiche les articles programmÃ©s, ceux rÃ©cemment publiÃ©s, et les commentaires rÃ©cents sur vos articles, que vous pouvez valider ou non." +======= #: wp-admin/upload.php:268 msgid "Media permanently deleted." msgstr "MÃ©dia dÃ©finitivement supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:182 +msgid "Administrators have access to all the administration features." +msgstr "Les administrateurs peuvent accÃ©der Ã toutes les fonctionnalitÃ©s de l’administration ;" +||||||| .r11156 +#: wp-admin/index.php:70 +msgid "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." +msgstr "Brouillon rapide - Vous permet de crÃ©er un nouvel article et de l’enregistrer en tant que brouillon. Affiche Ã©galement des liens vers les 5 derniers brouillons que vous avez crÃ©Ã©s." +======= #: wp-admin/upload.php:261 msgid "%d media attachment restored from the trash." msgid_plural "%d media attachments restored from the trash." msgstr[0] "%d fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." msgstr[1] "%d fichiers mÃ©dias rÃ©cupÃ©rÃ©s depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:181 +msgid "Editors can publish posts, manage posts as well as manage other people’s posts, etc." +msgstr "Les Ã©diteurs peuvent publier et gÃ©rer leurs propres articles, ainsi que ceux des autres membres ;" +||||||| .r11156 +#: wp-admin/index.php:72 +msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins." +msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress, du Planet de WordPress-Francophone, et les extensions populaires et rÃ©centes." +======= #: wp-admin/upload.php:259 msgid "Media attachment restored from the trash." msgstr "Fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:179 +msgid "Contributors can write and manage their posts but not publish posts or upload media files." +msgstr "Les contributeurs peuvent Ã©crire et gÃ©rer leurs articles, mais ils ne peuvent pas publier les articles ou envoyer des fichiers mÃ©dia ;" +||||||| .r11156 +#: wp-admin/index.php:74 +msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet." +msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress et du Planet de WordPress-Francophone." +======= #: wp-admin/upload.php:250 msgid "%d media attachment moved to the trash." msgid_plural "%d media attachments moved to the trash." msgstr[0] "%d fichier mÃ©dia dÃ©placÃ© dans la Corbeille." msgstr[1] "%d fichiers mÃ©dias dÃ©placÃ©s dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:162 +msgid "New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email." +msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de ce site. Par dÃ©faut, ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que le mot de passe y soit inclus." +||||||| .r11156 +#: wp-admin/post.php:117 +msgid "Oops, you don’t have access to add new drafts." +msgstr "Oups, vous n’avez pas les droits pour ajouter de nouveaux brouillons." +======= #: wp-admin/upload.php:248 msgid "Media attachment moved to the trash." msgstr "Fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:148 +msgid "Apply Filters" +msgstr "Appliquer les filtres" +||||||| .r11156 +#: wp-admin/themes.php:101 +msgid "" +"Are you sure you want to delete this theme?\n" +"\n" +"Click 'Cancel' to go back, 'OK' to confirm the delete." +msgstr "" +"Ãtes-vous sÃ»r(e) de vouloir supprimer ce thÃ¨me.\n" +"\n" +"Â« Annuler Â» pour abandonner, Â« OK Â» pour confirmer la suppression." +======= #: wp-admin/upload.php:240 msgid "%d media attachment permanently deleted." msgid_plural "%d media attachments permanently deleted." msgstr[0] "%d fichier mÃ©dia supprimÃ© dÃ©finitivement." msgstr[1] "%d fichiers mÃ©dia supprimÃ©s dÃ©finitivement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:27 +msgid "You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme." +msgstr "Vous pouvez utiliser l’Ã©diteur de thÃ¨me pour modifier les fichiers CSS et PHP qui composent votre thÃ¨me." +||||||| .r11156 +#: wp-admin/theme-install.php:52 wp-admin/themes.php:105 +msgid "Add New Theme" +msgstr "Ajouter un thÃ¨me" +======= #: wp-admin/upload.php:238 msgid "Media attachment permanently deleted." msgstr "MÃ©dia dÃ©finitivement supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:28 +msgid "Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box." +msgstr "Commencez par choisir un thÃ¨me Ã modifier via le menu dÃ©roulant, et cliquez sur « SÃ©lectionner ». Une liste apparaÃ®tra ensuite avec tous les fichiers modÃ¨les. En cliquant sur n’importe quel de ces fichiers, vous verrez son contenu apparaÃ®tre dans l’Ã©diteur." +||||||| .r11156 +#: wp-admin/themes.php:122 +msgctxt "Add new theme" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/upload.php:232 msgid "Detached %d attachment." msgid_plural "Detached %d attachments." msgstr[0] "%d fichier a Ã©tÃ© dÃ©tachÃ©." msgstr[1] "%d fichiers ont Ã©tÃ© dÃ©tachÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:31 +msgid "After typing in your edits, click Update File." +msgstr "AprÃ¨s avoir fait vos modifications, cliquez sur « Mettre Ã jour le fichier »." +||||||| .r11156 +#: wp-admin/themes.php:229 wp-admin/themes.php:308 wp-admin/themes.php:338 +msgid "Update Available" +msgstr "Mise Ã jour disponible" +======= #: wp-admin/upload.php:227 msgid "Reattached %d attachment." msgid_plural "Reattached %d attachments." msgstr[0] "Rattachement de %d fichier attachÃ©." msgstr[1] "Rattachement de %d fichiers attachÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:32 +msgid "Advice: think very carefully about your site crashing if you are live-editing the theme currently in use." +msgstr "Conseil : gardez bien en tÃªte que si vous modifiez le thÃ¨me actuellement utilisÃ©, vos visiteurs pourraient avoir une vision dÃ©routante de votre site..." +||||||| .r11156 +#: wp-admin/themes.php:318 +msgid "Close overlay" +msgstr "Fermer la fenÃªtre" +======= #: wp-admin/upload.php:196 msgid "If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file." msgstr "Si un fichier mÃ©dia n’est liÃ© Ã aucun article, cela vous sera indiquÃ© dans la colonne « AttachÃ© Ã », et vous pourrez cliquer sur le lien « Joindre » pour afficher une petite fenÃªtre vous permettant de trouver un article auquel attacher le fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:170 +msgid "This child theme inherits templates from a parent theme, %s." +msgstr "Ce thÃ¨me enfant hÃ©rite de certains modÃ¨les de son thÃ¨me parent, %s." +||||||| .r11156 +#: wp-admin/themes.php:316 +msgid "Show previous theme" +msgstr "Affichier le thÃ¨me prÃ©cÃ©dent" +======= #: wp-admin/upload.php:194 msgid "Attaching Files" msgstr "Fichiers des extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:178 +msgctxt "Theme stylesheets in theme editor" +msgid "Styles" +msgstr "Styles" +||||||| .r11156 +#: wp-admin/themes.php:317 +msgid "Show next theme" +msgstr "Afficher le thÃ¨me suivant" +======= #: wp-admin/upload.php:190 msgid "Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file." msgstr "Le survol par la souris des lignes du tableau rÃ©vÃ¨le des liens : « Modifier », « Supprimer dÃ©finitivement » et « Afficher ». En cliquant sur « Modifier » ou sur le nom d’un fichier mÃ©dia, vous obtiendrez un Ã©cran oÃ¹ vous pourrez modifier les mÃ©tadonnÃ©es du fichier. En cliquant sur « Supprimer dÃ©finitivement », vous supprimerez le fichier de la bibliothÃ¨que (ainsi que de tous les articles auxquels il Ã©tait liÃ©). « Afficher » vous enverra sur la page d’affichage de ce fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:216 +msgid "This is a file in your current parent theme." +msgstr "Ceci est un fichier de votre thÃ¨me parent actuel." +||||||| .r11156 +#: wp-admin/widgets.php:430 +msgid "Add Widget" +msgstr "Ajouter le widget" +======= #: wp-admin/upload.php:183 msgid "You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table." msgstr "Vous pouvez limiter cette liste par type de fichier ou par Ã©tat Ã l’aide des filtres en haut de l’Ã©cran. Vous pouvez Ã©galement affiner la liste par dÃ©faut Ã l’aide du menu dÃ©roulant au dessus du tableau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:129 +msgid "You are not allowed to move this post to the trash." +msgstr "Vous n’avez pas l’autorisation de dÃ©placer cet article dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:42 +msgid "Activity" +msgstr "ActivitÃ©" +======= #: wp-admin/upload.php:182 msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen." msgstr "Tous les fichiers que vous avez mis en ligne sont listÃ©s dans la BibliothÃ¨que de MÃ©dias, les plus rÃ©cents en premier. Vous pouvez utiliser l’onglet « Options de l’Ã©cran » pour personnaliser l’affichage de cet Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:141 +msgid "You are not allowed to move this post out of the trash." +msgstr "Vous n’avez pas l’autorisation de sortir cet article de la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2539 +msgid "WordPress site: %s" +msgstr "Site WordPress : %s" +======= #: wp-admin/upload.php:153 msgid "You are not allowed to delete this post." msgstr "Vous n’avez pas l’autorisation de supprimer cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:212 wp-admin/users.php:458 +msgctxt "user" +msgid "Add Existing" +msgstr "Ajouter un utilisateur existant" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2545 +msgid "SUCCESS: WordPress was successfully updated to %s" +msgstr "SUCCÃS : WordPress a bien Ã©tÃ© mis Ã jour vers %s" +======= #: wp-admin/upload.php:144 msgid "Error in restoring from trash." msgstr "Erreur pendant la rÃ©cupÃ©ration depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:63 +msgid "WordPress › Update" +msgstr "WordPress › Mise Ã jour" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2547 +msgid "FAILED: WordPress failed to update to %s" +msgstr "ÃCHEC : WordPress n'a pas pu Ãªtre mis Ã jour vers %s" +======= #: wp-admin/upload.php:141 msgid "You are not allowed to move this post out of the trash." msgstr "Vous n’avez pas l’autorisation de sortir cet article de la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:74 +msgid "No Update Required" +msgstr "Pas de mise Ã jour requise" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2567 +msgid "SUCCESS: %s" +msgstr "SUCCÃS : %s" +======= #: wp-admin/upload.php:132 msgid "Error in moving to trash." msgstr "Erreur lors du dÃ©placement dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:95 +msgid "Database Update Required" +msgstr "Mise Ã jour de la base de donnÃ©es requise" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2581 +msgid "FAILED: %s" +msgstr "ÃCHEC : %s" +======= #: wp-admin/upload.php:129 msgid "You are not allowed to move this post to the trash." msgstr "Vous n’avez pas l’autorisation de dÃ©placer cet article dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:96 +msgid "WordPress has been updated! Before we send you on your way, we have to update your database to the newest version." +msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour la base de donnÃ©es." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2604 +msgid "[%s] There were failures during background updates" +msgstr "[%s] Il y a eu des problÃ¨mes lors des mises Ã jour en arriÃ¨re-plan" +======= #: wp-admin/upload.php:83 msgid "The grid view for the Media Library requires JavaScript. Switch to the list view." msgstr "La vue en grille de la BilbiothÃ¨que de MÃ©dias nÃ©cessite JavaScript. Passer Ã la vue en liste." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:97 +msgid "The update process may take a little while, so please be patient." +msgstr "Le processus de mise Ã jour peut prendre un certain temps, merci donc pour votre patience." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2606 +msgid "[%s] Background updates have finished" +msgstr "[%s] Les mises Ã jour en arriÃ¨re-plan sont terminÃ©es" +======= #: wp-admin/upload.php:64 wp-admin/upload.php:201 msgid "Documentation on Media Library" msgstr "Documentation sur la bibliothÃ¨que des mÃ©dias (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:98 +msgid "Update WordPress Database" +msgstr "Mettre Ã jour la base de donnÃ©es de WordPress" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:47 +msgid "Quick Draft" +msgstr "Brouillon rapide" +======= #: wp-admin/upload.php:59 msgid "You can also delete individual items and access the extended edit screen from the details dialog." msgstr "Vous pouvez aussi supprimer les Ã©lÃ©ments individuellement et accÃ©der Ã l’Ã©cran de modifications Ã©tendues par la fenÃªtre des dÃ©tails." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:108 +msgid "Update Complete" +msgstr "Mise Ã jour terminÃ©e" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:52 +msgid "WordPress News" +msgstr "Nouvelles de WordPress" +======= #: wp-admin/upload.php:58 msgid "Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly." msgstr "Utilisez les boutons flÃ©chÃ©es au-dessus de la fenÃªtre ou les flÃ¨ches gauche et droite du clavier pour passer rapidement d’un mÃ©dia Ã l’autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upgrade.php:109 +msgid "Your WordPress database has been successfully updated!" +msgstr "La base de donnÃ©es de WordPress a bien Ã©tÃ© mise Ã jour !" +||||||| .r11156 +#: wp-admin/includes/update.php:224 +msgid "WordPress %1$s running %2$s theme." +msgstr "WordPress %1$s avec le thÃ¨me %2$s." +======= #: wp-admin/upload.php:57 msgid "Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved." msgstr "Cliquer sur un Ã©lÃ©ment affichera une fenÃªtre avec les dÃ©tails du fichier, ce qui vous permettra de prÃ©visualiser le mÃ©dia et rÃ©aliser de rapides modifications. Tous les changements que vous ferez dans les dÃ©tails du mÃ©dia seront automatiquement sauvegardÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:23 wp-admin/update-core.php:583 +#: wp-admin/update-core.php:607 wp-admin/update-core.php:635 +#: wp-admin/update-core.php:665 +msgid "You do not have sufficient permissions to update this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour ce site." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:458 +msgid "What’s on your mind?" +msgstr "Qu’avez-vous en tÃªte ?" +======= #: wp-admin/upload.php:50 msgid "To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media." msgstr "Pour supprimer des Ã©lÃ©ments de la liste des mÃ©dias, cliquez sur le bouton de SÃ©lection multiple en haut de l’Ã©cran. SÃ©lectionnez tous les Ã©lÃ©ments Ã supprimer, puis cliquez sur le bouton Supprimer la sÃ©lection. En cliquant sur le bouton Annuler la sÃ©lection vous reviendrez sur la vue normale des mÃ©dias." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:111 +msgid "You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released." +msgstr "Vous Ãªtes sur le point d’installer WordPress %s en anglais (US). Il se peut que cette mise Ã jour ne fonctionne pas avec la traduction de WordPress dont vous disposez. Vous devriez sans doute patienter, le temps que la mise Ã jour soit officiellement traduite dans votre langue." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:499 +msgctxt "drafts" +msgid "View all" +msgstr "Afficher tout" +======= #: wp-admin/upload.php:49 wp-admin/upload.php:184 msgid "You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media." msgstr "Vous pouvez voir vos mÃ©dias dans une grille ou dans une liste avec des colonnes. Passez de l’un Ã l’autre en utilisant les icÃ´nes en haut Ã gauche des mÃ©dias." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %1 date, %2 time. +#: wp-admin/update-core.php:558 +msgid "Last checked on %1$s at %2$s." +msgstr "DerniÃ¨re vÃ©rification le %1$s Ã %2$s." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:47 wp-admin/includes/dashboard.php:501 +msgid "Drafts" +msgstr "Brouillons" +======= #: wp-admin/upload.php:48 msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first." msgstr "Tous les fichiers que vous mettez en ligne sont listÃ©s dans la bibliothÃ¨que de mÃ©dias, avec le dernier mis en ligne qui apparaÃ®t en premier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:559 +msgid "Check Again" +msgstr "VÃ©rifier Ã nouveau" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:642 +msgid "Publishing Soon" +msgstr "BientÃ´t publiÃ©" +======= #: wp-admin/upgrade.php:110 msgid "%s seconds" msgstr "%s secondes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:44 +msgid "Remember to click the Update Profile button when you are finished." +msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le profil » quand vous aurez terminÃ©." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:649 +msgid "Recently Published" +msgstr "PubliÃ© rÃ©cemment" +======= #: wp-admin/upgrade.php:108 msgid "%s queries" msgstr "%s requÃªtes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update.php:82 +msgid "Plugin reactivated successfully." +msgstr "L’extension a bien Ã©tÃ© rÃ©activÃ©e." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:658 +msgid "No activity yet!" +msgstr "Aucune activitÃ© pour le moment !" +======= #: wp-admin/upgrade.php:103 msgid "Your WordPress database has been successfully updated!" msgstr "La base de donnÃ©es de WordPress a bien Ã©tÃ© mise Ã jour !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:112 +msgid "Search Installed Themes" +msgstr "Chercher parmi les thÃ¨mes installÃ©s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:710 +msgid "Today" +msgstr "Aujourd’hui" +======= #: wp-admin/upgrade.php:102 msgid "Update Complete" msgstr "Mise Ã jour terminÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:163 +msgid "The name of the database you want to run WP in." +msgstr "Le nom de la base de donnÃ©es dans laquelle vous souhaitez installer WordPress." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:712 +msgid "Tomorrow" +msgstr "Demain" +======= #: wp-admin/upgrade.php:92 msgid "Update WordPress Database" msgstr "Mettre Ã jour la base de donnÃ©es de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:167 +msgctxt "example username" +msgid "username" +msgstr "utilisateur" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1098 +msgid "Popular Plugin" +msgstr "Extensions populaires" +======= #: wp-admin/upgrade.php:91 msgid "The update process may take a little while, so please be patient." msgstr "Le processus de mise Ã jour peut prendre un certain temps, merci donc pour votre patience." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:168 +msgid "Your MySQL username" +msgstr "Votre identifiant MySQL" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1144 wp-admin/includes/dashboard.php:1157 +msgid "Manage Uploads" +msgstr "GÃ©rer les mises en ligne" +======= #: wp-admin/upgrade.php:90 msgid "WordPress has been updated! Before we send you on your way, we have to update your database to the newest version." msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour la base de donnÃ©es." +>>>>>>> .r12027 -#: wp-admin/upgrade.php:89 -msgid "Database Update Required" -msgstr "Mise Ã jour de la base de donnÃ©es requise" - -#: wp-admin/upgrade.php:69 +<<<<<<< .mine +#: wp-admin/setup-config.php:172 +msgctxt "example password" +msgid "password" +msgstr "mot de passe" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1509 +#: wp-admin/includes/update-core.php:781 wp-admin/includes/update-core.php:856 +#: wp-admin/includes/update-core.php:879 +msgid "The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions." +msgstr "La mise Ã jour ne peut pas Ãªtre installÃ©e parce que nous n’allons pas pouvoir copier certains fichiers. Ce problÃ¨me est gÃ©nÃ©ralement dÃ» Ã des incohÃ©rences dans les permissions de fichiers." +======= +#: wp-admin/upgrade.php:89 +msgid "Database Update Required" +msgstr "Mise Ã jour de la base de donnÃ©es requise" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/setup-config.php:178 +msgid "You should be able to get this info from your web host, if localhost does not work." +msgstr "Si localhost ne fonctionne pas, votre hÃ©bergeur doit pouvoir vous donner la bonne information." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2406 +msgid "WordPress %s is also now available." +msgstr "WordPress %s est disponible." +======= +#: wp-admin/upgrade.php:69 msgid "Your WordPress database is already up-to-date!" msgstr "Votre base de donnÃ©es WordPress est dÃ©jÃ Ã jour !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:181 +msgid "Table Prefix" +msgstr "PrÃ©fixe des tables" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2430 +msgid "Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s." +msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour de WordPress vers la version %2$s." +======= #: wp-admin/upgrade.php:68 msgid "No Update Required" msgstr "Pas de mise Ã jour requise" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:310 +msgid "You can create the wp-config.php manually and paste the following text into it." +msgstr "Vous pouvez crÃ©er le fichier wp-config.php Ã la main, en y copiant/collant le texte suivant." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2470 +msgid "Your site was running version %s." +msgstr "Votre site utilise la version %s." +======= #: wp-admin/upgrade.php:57 msgid "WordPress › Update" msgstr "WordPress › Mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:161 +msgid "This theme is broken." +msgstr "Le thÃ¨me est cassÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:641 +#: wp-admin/update-core.php:351 wp-admin/update-core.php:630 +msgid "Update Translations" +msgstr "Mise Ã jour des traductions" +======= #: wp-admin/update.php:247 msgid "Installing Theme from uploaded file: %s" msgstr "Installation du thÃ¨me Ã partir du fichier : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:76 +msgid "You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses." +msgstr "Vous pouvez trouver plus de thÃ¨mes pour votre site en utilisant le Navigateur/Installeur de thÃ¨me sur cet Ã©cran, qui affiche les thÃ¨mes en provenance du dÃ©pÃ´t de thÃ¨mes de WordPress.org. Ces thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des designers tiers, sont gratuits et utilisent une licence compatible avec celle de WordPress." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:656 +#: wp-admin/includes/class-wp-upgrader.php:2069 +msgid "Updating translations for %1$s (%2$s)…" +msgstr "Mise Ã jour de la traduction de %1$s (%2$s)…" +======= #: wp-admin/update.php:219 msgid "Installing Theme: %s" msgstr "Installation du thÃ¨me : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:70 +msgid "Adding Themes" +msgstr "Ajout de thÃ¨mes" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2068 +msgid "Translations for %s" +msgstr "Traductions pour %s" +======= #: wp-admin/update.php:214 msgid "Install Themes" msgstr "Installer des thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:135 +msgid "The active theme is broken. Reverting to the default theme." +msgstr "Le thÃ¨me courant est endommagÃ©. Retour au thÃ¨me par dÃ©faut." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2369 +msgid "[%1$s] Your site has updated to WordPress %2$s" +msgstr "[%1$s] Votre site a Ã©tÃ© mis Ã jour vers WordPress %2$s" +======= #: wp-admin/update.php:155 wp-admin/update.php:176 msgid "You do not have sufficient permissions to update themes for this site." msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les thÃ¨mes de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:279 +msgctxt "theme name" +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2375 +msgid "[%1$s] WordPress %2$s is available. Please update!" +msgstr "[%1$s] WordPress %2$s est disponible. Veuillez faire une mise Ã jour !" +======= #: wp-admin/update.php:139 msgid "Installing Plugin from uploaded file: %s" msgstr "Installation de l’extension Ã partir du fichier : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:61 +msgid "Re-install Now" +msgstr "RÃ©-installer maintenant" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2380 +msgid "[%1$s] URGENT: Your site may be down due to a failed update" +msgstr "[%1$s] URGENT : suite Ã une mise Ã jour qui a Ã©chouÃ©, votre site est peut-Ãªtre inaccessible." +======= #: wp-admin/update.php:111 msgid "Installing Plugin: %s" msgstr "Extension en cours d’installation : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:211 +msgid "Learn more about WordPress %s." +msgstr "Ã propos de WordPress %s." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2395 +msgid "Howdy! Your site at %1$s has been updated automatically to WordPress %2$s." +msgstr "Salutations ! Votre site Ã l'adresse %1$s a Ã©tÃ© automatiquement mis Ã jour vers WordPress %2$s." +======= #: wp-admin/update.php:85 msgid "Plugin failed to reactivate due to a fatal error." msgstr "L’extension n’a pu Ãªtre rÃ©activÃ©e suite Ã une erreur fatale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:229 +msgid "Your plugins are all up to date." +msgstr "Vos extensions sont toutes Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2398 +msgid "No further action is needed on your part." +msgstr "Vous n'avez rien de plus Ã faire." +======= #: wp-admin/update.php:82 msgid "Plugin reactivated successfully." msgstr "L’extension a bien Ã©tÃ© rÃ©activÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:287 +msgid "View version %1$s details" +msgstr "Voir les dÃ©tails de la version %1$s" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2402 +msgid "For more on version %s, see the About WordPress screen:" +msgstr "Pour en savoir plus sur la version %s, lisez l'Ã©cran Ã Propos de WordPress : " +======= #: wp-admin/update.php:80 msgid "Plugin Reactivation" msgstr "RÃ©activation d’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:326 +msgid "Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications." +msgstr "Notez bien : toutes les personnalisations que vous pourriez avoir apportÃ©es aux fichiers des thÃ¨mes seront perdues. Pensez Ã utiliser des thÃ¨mes enfants pour vos modifications." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2415 +msgid "Please update your site at %1$s to WordPress %2$s." +msgstr "Veuillez mettre Ã jour votre site Ã l'adresse %1$s pour le passer Ã WordPress %2$s." +======= #: wp-admin/update.php:24 wp-admin/update.php:50 wp-admin/update.php:71 msgid "You do not have sufficient permissions to update plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:527 +msgid "How to Update" +msgstr "Comment faire la mise Ã jour" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2422 +msgid "We tried but were unable to update your site automatically." +msgstr "MalgrÃ© nos tentatives, nous n'avons pas pu mettre votre site Ã jour automatiquement." +======= #: wp-admin/update-core.php:527 msgid "Check Again" msgstr "VÃ©rifier Ã nouveau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:182 +msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen." +msgstr "Tous les fichiers que vous avez mis en ligne sont listÃ©s dans la BibliothÃ¨que de MÃ©dias, les plus rÃ©cents en premier. Vous pouvez utiliser l’onglet « Options de l’Ã©cran » pour personnaliser l’affichage de cet Ã©cran." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2407 +#: wp-admin/includes/class-wp-upgrader.php:2424 +msgid "Updating is easy and only takes a few moments:" +msgstr "La mise Ã jour est facile et ne prend que quelques secondes :" +======= #. translators: %1 date, %2 time. #: wp-admin/update-core.php:526 msgid "Last checked on %1$s at %2$s." msgstr "DerniÃ¨re vÃ©rification le %1$s Ã %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:190 +msgid "Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file." +msgstr "Le survol par la souris des lignes du tableau rÃ©vÃ¨le des liens : « Modifier », « Supprimer dÃ©finitivement » et « Afficher ». En cliquant sur « Modifier » ou sur le nom d’un fichier mÃ©dia, vous obtiendrez un Ã©cran oÃ¹ vous pourrez modifier les mÃ©tadonnÃ©es du fichier. En cliquant sur « Supprimer dÃ©finitivement », vous supprimerez le fichier de la bibliothÃ¨que (ainsi que de tous les articles auxquels il Ã©tait liÃ©). « Afficher » vous enverra sur la page d’affichage de ce fichier." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2432 +msgid "Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s." +msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour vers la derniÃ¨re version de WordPress, la %2$s." +======= #: wp-admin/update-core.php:520 msgid "Please select one or more plugins to update." msgstr "Veuillez sÃ©lectionner une ou plusieurs extensions Ã mettre Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:194 +msgid "Attaching Files" +msgstr "Fichiers des extensions" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2434 +msgid "This means your site may be offline or broken. Don't panic; this can be fixed." +msgstr "Cela signifie que votre site est peut-Ãªtre hors ligne ou cassÃ©. Ne paniquez pas, cela peut Ãªtre rÃ©parÃ©." +======= #: wp-admin/update-core.php:518 msgid "Please select one or more themes to update." msgstr "Veuillez sÃ©lectionner un ou plusieurs thÃ¨mes Ã mettre Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:196 +msgid "If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file." +msgstr "Si un fichier mÃ©dia n’est liÃ© Ã aucun article, cela vous sera indiquÃ© dans la colonne « AttachÃ© Ã », et vous pourrez cliquer sur le lien « Joindre » pour afficher une petite fenÃªtre vous permettant de trouver un article auquel attacher le fichier." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2436 +msgid "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" +msgstr "Veuillez vÃ©rifier votre site immÃ©diatelement. Il se peut que tout fonctionne. S'il affiche que vous devez faire une mise Ã jour, vous devriez suivre son conseil :" +======= #: wp-admin/update-core.php:501 msgid "Documentation on Updating WordPress" msgstr "Documentation sur la mise Ã jour de WordPress (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:41 +msgid "Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts." +msgstr "Votre identifiant ne peut Ãªtre modifiÃ©, mais vous pouvez utiliser les autres champs pour saisir votre nom complet ou un pseudonyme, et changer ensuite le nom Ã afficher dans vos articles." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2453 wp-admin/update-core.php:466 +msgid "Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers." +msgstr "Pour des questions de sÃ©curitÃ©, il est important de garder votre site Ã jour. Par ailleurs, cela rend le Web plus sÃ»r pour vous et vos lecteurs." +======= #: wp-admin/update-core.php:495 msgid "How to Update" msgstr "Comment faire la mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:191 +msgid "Profile updated." +msgstr "Profil mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2447 +msgid "If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help." +msgstr "Si vous rencontrez des problÃ¨mes ou avez besoin d'assistance, les volontaires du forum d'entraide de WordPress-fr.net devraient pouvoir vous aider." +======= #: wp-admin/update-core.php:490 msgid "Translations — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can click the “Update Translations” button." msgstr "Traductions — Les fichiers qui traduisent WordPress dans votre langue sont mis Ã jour dÃ¨s qu’une modification est faite. Mais si ces fichiers ne sont plus Ã jour, vous pouvez cliquer sur le bouton \"Mettre Ã jour les traductions\"." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:196 +msgid "← Back to Users" +msgstr "← Retour aux utilisateurs" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2462 +msgid "You also have some plugins or themes with updates available. Update them now:" +msgstr "Certains de vos thÃ¨mes et extensions ont Ã©galement des mises Ã jour disponibles. Veuillez les mettre Ã jour dÃ¨s maintenant :" +======= #: wp-admin/update-core.php:487 msgid "Themes and Plugins — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then click on the appropriate “Update” button. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button." msgstr "ThÃ¨mes et extensions — Pour mettre Ã jour les thÃ¨mes et extensions individuellement depuis cet Ã©cran, utilisez les cases Ã jour pour faire votre sÃ©lection, puis cliquez sur le bouton « Mettre Ã jour » appropriÃ©. Pour mettre Ã jour tous les thÃ¨mes et toutes les extensions d’un coup, vous pouvez cocher la case en haut de la section pour tout sÃ©lectionner avant de cliquer sur le boutons de mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:273 +msgid "Show Toolbar when viewing site" +msgstr "Afficher la barre d’outils lorsque vous visitez le site" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2466 +msgid "The WordPress Team" +msgstr "L'Ã©quipe WordPress" +======= #: wp-admin/update-core.php:486 msgid "In most cases, WordPress will automatically apply maintenance and security updates in the background for you." msgstr "Dans la plupart des cas, WordPress appliquera automatiquement les mises Ã jour de maintenance et de sÃ©curitÃ© en arriÃ¨re-plan." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Site name, 2: site URL, 3: role, 4: activation URL +#: wp-admin/user-new.php:83 +msgid "" +"Hi,\n" +"\n" +"You've been invited to join '%1$s' at\n" +"%2$s with the role of %3$s.\n" +"\n" +"Please click the following link to confirm the invite:\n" +"%4$s" +msgstr "" +"Bonjour,\n" +"\n" +"Vous avez Ã©tÃ© invitÃ©(e) Ã rejoindre Â« %1$s Â» sur\n" +"%2$s en tant que %3$s. \n" +"Veuillez cliquer sur le lien suivant pour confirmer l'invitation :\n" +"%4$s" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2471 +msgid "We have some data that describes the error your site encountered." +msgstr "Nous avons quelques donnÃ©es qui dÃ©crivent l'erreur que votre site a rencontrÃ©." +======= #: wp-admin/update-core.php:486 msgid "WordPress — Updating your WordPress installation is a simple one-click procedure: just click on the “Update Now” button when you are notified that a new version is available." msgstr "WordPress — La mise Ã jour de votre installation WordPress tient en une simple procÃ©dure : cliquez sur le bouton « Mettre Ã jour » quand vous Ãªtes notifiÃ©(e) qu’une nouvelle version est disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:155 +msgid "To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom." +msgstr "Pour ajouter un nouvel utilisateur Ã votre site, remplissez le formulaire de cet Ã©cran et cliquez sur le bouton « Ajouter un nouvel utilisateur » en bas de l’Ã©cran." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2472 +msgid "Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:" +msgstr "Votre hÃ©bergeur, les volontaires du forum d'entraide ou un ami dÃ©veloppeur devraient pouvoir vous aider Ã comprendre cette information pour vous aider :" +======= #: wp-admin/update-core.php:478 msgid "If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu." msgstr "Si une mise Ã jour est disponible, vous verrez une notification apparaÃ®tre dans la barre d’outils" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:158 +msgid "Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users." +msgstr "Parce qu’il s’agit d’une installation multisite, vous pouvez ajouter des comptes qui existent dÃ©jÃ sur le RÃ©seau, en indiquant un nom d’utilisateur ou une adresse de messagerie, et en assignant un rÃ´le. Pour avoir plus d’options, telle que le choix du mot de passe, vous devez Ãªtre Administrateur du RÃ©seau, et utiliser les liens qui apparaissent au survol sous le nom de l’utilisateur pour modifier son profil utilisateur, depuis l’Ã©cran « Tous les utilisateurs »." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2485 +msgid "Error code: %s" +msgstr "Code d'erreur : %s" +======= #: wp-admin/update-core.php:477 msgid "On this screen, you can update to the latest version of WordPress, as well as update your themes and plugins from the WordPress.org repositories." msgstr "Sur cet Ã©cran, vous pouvez faire la mise Ã jour vers la derniÃ¨re version de WordPres, et mettre Ã jour les thÃ¨mes et extensions depuis les dÃ©pÃ´ts de WordPress.org." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:161 +msgid "You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed." +msgstr "Vous devez assigner un mot de passe au nouvel utilisateur, qu’il pourra changer aprÃ¨s s’Ãªtre connectÃ©. L’identifiant, en revanche, ne peut Ãªtre changÃ©." +||||||| .r11156 +#: wp-admin/themes.php:142 +msgid "ERROR: %s" +msgstr "ERREUR : %s" +======= #: wp-admin/update-core.php:474 wp-admin/update-core.php:513 msgid "WordPress Updates" msgstr "Mises Ã jour de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:165 +msgid "Remember to click the Add New User button at the bottom of this screen when you are finished." +msgstr "N’oubliez pas de cliquer sur le bouton « Ajouter un utilisateur », en bas de cet Ã©cran, quand vous aurez terminÃ©." +||||||| .r11156 +#: wp-admin/includes/post.php:1436 +msgid "This content is currently locked." +msgstr "Ce contenu est actuellement vÃ©rouillÃ©." +======= #: wp-admin/update-core.php:392 msgid "Update WordPress" msgstr "Mettre Ã jour WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:178 +msgid "Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content." +msgstr "Les abonnÃ©s peuvent lire les commentaires/commenter/recevoir les newsletters, etc. Mais ils ne peuvent pas crÃ©er du contenu sur le site." +||||||| .r11156 +#: wp-admin/includes/post.php:1438 +msgid "If you take over, %s will be blocked from continuing to edit." +msgstr "Si vous souhaitez vous en occuper, %s sera bloquÃ© et ne pourra pas terminer sa modification." +======= #: wp-admin/update-core.php:355 msgid "New translations are available." msgstr "De nouvelles traductions sont disponibles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:161 +msgid "Database Name" +msgstr "Nom de la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/update-core.php:50 +msgid "If you need to re-install version %s, you can do so here or download the package and re-install manually:" +msgstr "Si vous souhaitez rÃ©installer la version %s, vous pouvez le faire ici, ou tÃ©lÃ©charger l’archive pour la rÃ©installer vous-mÃªme :" +======= #: wp-admin/update-core.php:346 msgid "Your translations are all up to date." msgstr "Vos traductions sont toutes Ã jour." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/themes.php:84 +msgid "Previewing and Customizing" +msgstr "AperÃ§u et personnalisation" + +#: wp-admin/upload.php:227 +msgid "Reattached %d attachment." +msgid_plural "Reattached %d attachments." +msgstr[0] "Rattachement de %d fichier attachÃ©." +msgstr[1] "Rattachement de %d fichiers attachÃ©s." +||||||| .r11156 +#: wp-admin/update-core.php:161 +msgid "Future security updates will be applied automatically." +msgstr "Les prochaines mises Ã jour de sÃ©curitÃ© seront appliquÃ©es automatiquement." +#: wp-admin/update-core.php:339 wp-admin/update-core.php:347 +msgid "Translations" +msgstr "Traductions" +======= #: wp-admin/update-core.php:345 wp-admin/update-core.php:353 msgid "Translations" msgstr "Traductions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:40 +msgid "You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens." +msgstr "Vous pouvez modifier votre mot de passe, activer les raccourcis clavier, modifier la combinaison de couleurs des Ã©crans de l’administration, et dÃ©sactiver l’Ã©diteur visuel (WYSIWYG), entre autres choses. Vous pouvez Ã©galement cacher la barre d’outils (anciennement « barre d’administration ») sur la partie publique de votre site, mais elle ne peut pas Ãªtre enlevÃ©e des Ã©crans d’administration." +||||||| .r11156 +#: wp-admin/update-core.php:340 +msgid "Your translations are all up to date." +msgstr "Vos traductions sont toutes Ã jour." +======= #: wp-admin/update-core.php:308 wp-admin/update-core.php:336 #: wp-admin/update-core.php:619 wp-admin/update-core.php:624 msgid "Update Themes" msgstr "Mettre Ã jour les thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:158 +msgid "Below you should enter your database connection details. If you’re not sure about these, contact your host." +msgstr "Vous devez saisir ci-dessous les dÃ©tails de connexion Ã votre base de donnÃ©es. Si vous ne les connaissez pas, contactez votre hÃ©bergeur." +||||||| .r11156 +#: wp-admin/update-core.php:349 +msgid "Some of your translations are out of date." +msgstr "Certaines de vos traductions ne sont pas Ã jour." +======= #: wp-admin/update-core.php:305 msgid "Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications." msgstr "Notez bien : toutes les personnalisations que vous pourriez avoir apportÃ©es aux fichiers des thÃ¨mes seront perdues. Pensez Ã utiliser des thÃ¨mes enfants pour vos modifications." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:309 +msgid "Sorry, but I can’t write the wp-config.php file." +msgstr "DÃ©solÃ©, mais je ne peux Ã©crire dans le fichier wp-config.php." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1247 +msgid "Some of your translations need updating. Sit tight for a few more seconds while we update them as well." +msgstr "Certaines de vos traductions ont besoin d’Ãªtre mises Ã jour. Patientez encore quelques secondes, le temps que nous les mettions Ã©galement Ã jour." +======= #: wp-admin/update-core.php:304 msgid "The following themes have new versions available. Check the ones you want to update and then click “Update Themes”." msgstr "Les thÃ¨mes suivants disposent d’une nouvelle version. Cochez ceux que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les thÃ¨mes »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:316 +msgid "After you’ve done that, click “Run the install.”" +msgstr "AprÃ¨s cela, cliquez sur « Lancer l’installation »." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1248 +msgid "The translation is up to date." +msgstr "La traduction est Ã jour." +======= #: wp-admin/update-core.php:296 msgid "Your themes are all up to date." msgstr "Vos thÃ¨mes sont tous Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:317 wp-admin/setup-config.php:348 +msgid "Run the install" +msgstr "Lancer l’installation" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1250 +msgid "Downloading translation from %s…" +msgstr "TÃ©lÃ©chargement de la traduction depuis %s…" +======= #: wp-admin/update-core.php:274 wp-admin/update-core.php:323 msgid "You have version %1$s installed. Update to %2$s." msgstr "Vous utilisez la version %1$s. Mettez Ã jour vers la version %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:88 +msgid "Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you’re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look." +msgstr "Une fois que vous avez gÃ©nÃ©rÃ© une liste de thÃ¨mes, vous pouvez les prÃ©visualiser et les installer. Cliquez sur la miniature du thÃ¨me que vous souhaitez prÃ©visualiser. Cela ouvrira une page de prÃ©visualisation en plein Ã©cran, afin de vous donner une meilleure idÃ©e de l’aspect de ce thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1252 +msgid "Translation update failed." +msgstr "La mise Ã jour de la traduction a Ã©chouÃ©." +======= #: wp-admin/update-core.php:268 msgid "View version %1$s details" msgstr "Voir les dÃ©tails de la version %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:93 +msgid "Previewing and Installing" +msgstr "Voir l’aperÃ§u et installer" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1253 +msgid "Translation updated successfully." +msgstr "La traduction a bien Ã©tÃ© mise Ã jour." +======= #: wp-admin/update-core.php:249 wp-admin/update-core.php:257 msgid "Compatibility with WordPress %1$s: Unknown" msgstr "CompatibilitÃ© avec WordPress %1$s : inconnue" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:138 +msgid "Settings saved and theme activated. Visit site" +msgstr "RÃ©glages enregistrÃ©s et thÃ¨me activÃ©. Voir le site" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2058 +msgid "Updating theme: %s" +msgstr "Mise Ã jour du thÃ¨me : %s" +======= #: wp-admin/update-core.php:247 wp-admin/update-core.php:255 msgid "Compatibility with WordPress %1$s: %2$d%% (%3$d \"works\" votes out of %4$d total)" msgstr "CompatibilitÃ© avec WordPress %1$s : %2$d%% (%3$d votes « Ã§a marche » sur un total de %4$d)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:56 +msgid "You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:" +msgstr "Vous utilisez une version de dÃ©veloppement de WordPress. Vous pouvez faire une mise Ã jour automatique vers la toute derniÃ¨re version quotidienne (« nightly build »), ou tÃ©lÃ©charger cette version quotidienne et l’installer vous-mÃªme :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2064 +msgid "Updating plugin: %s" +msgstr "Mise Ã jour de l’extension : %s" +======= #: wp-admin/update-core.php:244 msgid "Compatibility with WordPress %1$s: 100%% (according to its author)" msgstr "CompatibilitÃ© avec WordPress %1$s : 100%% (selon l’auteur)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:550 +msgid "Please select one or more themes to update." +msgstr "Veuillez sÃ©lectionner un ou plusieurs thÃ¨mes Ã mettre Ã jour." +||||||| .r11156 +#: wp-admin/includes/update-core.php:912 +msgid "There is not enough free disk space to complete the update." +msgstr "Il n’y a pas assez d’espace sur le disque pour terminer la mise Ã jour." +======= #: wp-admin/update-core.php:222 msgid "The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”." msgstr "Les extensions suivantes disposent d’une nouvelle version. Cochez celles que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les extensions »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:552 +msgid "Please select one or more plugins to update." +msgstr "Veuillez sÃ©lectionner une ou plusieurs extensions Ã mettre Ã jour." +||||||| .r11156 +#: wp-admin/options-discussion.php:143 +msgid "Comment must be manually approved" +msgstr "Le commentaire doit Ãªtre approuvÃ© manuellement" +======= #: wp-admin/update-core.php:210 msgid "Your plugins are all up to date." msgstr "Vos extensions sont toutes Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:186 +msgid "This user has super admin privileges." +msgstr "Cet utilisateur possÃ¨de les privilÃ¨ges de super-admin." +||||||| .r11156 +#: wp-admin/options-media.php:49 +msgid "The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library." +msgstr "Les tailles prÃ©cisÃ©es ci-dessous dÃ©terminent les dimensions maximales (en pixels) Ã utiliser lors de l’insertion d’une image dans la bibliothÃ¨que de mÃ©dias." +======= #: wp-admin/update-core.php:196 msgid "Learn more about WordPress %s." msgstr "Ã propos de WordPress %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:336 +msgid "Grant this user super admin privileges for the Network." +msgstr "Donner les privilÃ¨ges de super-admin Ã cet utilisateur pour le rÃ©seau." +||||||| .r11156 +#: wp-admin/options-permalink.php:184 +msgid "By default WordPress uses web URLs which have question marks and lots of numbers in them; however, WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started." +msgstr "Par dÃ©faut, WordPress utilise des adresses web (URL) ayant un point d’interrogation et une suite de chiffres. Cependant, WordPress vous offre la possibilitÃ© de crÃ©er une structure personnalisÃ©e d’adresses web pour vos permaliens et archives. Ceci peut amÃ©liorer l’esthÃ©tique, l’utilisation et la pÃ©rennitÃ© de vos liens. De nombreux marqueurs sont disponibles (en), et nous vous donnons quelques exemples pour commencer." +======= #: wp-admin/update-core.php:193 msgid "While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal." msgstr "Durant le processus de mise Ã jour, votre site sera en mode de maintenance. DÃ¨s que le processus sera achevÃ©, votre site sera Ã nouveau accessible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:338 +msgid "Super admin privileges cannot be removed because this user has the network admin email." +msgstr "Les privilÃ¨ges de super-admin ne peuvent pas Ãªtre enlevÃ©s, car cet utilisateur est celui avec l’adresse de contact administratif du rÃ©seau." +||||||| .r11156 +#: wp-admin/theme-editor.php:33 +msgid "Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead." +msgstr "La mise Ã jour vers une nouvelle version du thÃ¨me supprimera les modifications que vous aurez faites. Pour Ã©viter cela, nous vous conseillons de passer plutÃ´t par un ThÃ¨me Enfant." +======= #: wp-admin/update-core.php:179 msgid "This site is set up to install updates of future beta versions automatically." msgstr "Ce site est configurÃ© pour installer automatiquement les mises Ã jour des prochaines versions bÃªtas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:159 +msgid "New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email." +msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de votre site. Ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que l’utilisateur reÃ§oive ce message de bienvenue." +||||||| .r11156 +#: wp-admin/user-new.php:337 +msgid "Create a brand new user and add them to this site." +msgstr "CrÃ©er un nouvel utilisateur et l’ajouter Ã ce site." +======= #: wp-admin/update-core.php:179 msgid "BETA TESTERS:" msgstr "TESTEURS DE PHASE BETA :" +>>>>>>> .r12027 -#: wp-admin/update-core.php:170 -msgid "An updated version of WordPress is available." -msgstr "Une nouvelle version de WordPress est disponible." - -#: wp-admin/update-core.php:166 -msgid "Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page." -msgstr "Important : avant de faire une mise Ã jour, veillez Ã faire une sauvegarde de votre base de donnÃ©es et de vos fichiers. Pour obtenir de l’aide sur les mises Ã jour, lisez la page Mettre Ã jour WordPress." - -#: wp-admin/update-core.php:161 -msgid "Future security updates will be applied automatically." -msgstr "Les prochaines mises Ã jour de sÃ©curitÃ© seront appliquÃ©es automatiquement." - -#: wp-admin/update-core.php:148 -msgid "You have the latest version of WordPress." -msgstr "Vous avez la derniÃ¨re version de WordPress." - -#: wp-admin/update-core.php:112 -msgid "Hide hidden updates" -msgstr "Masquer les mises Ã jour cachÃ©es" - -#: wp-admin/update-core.php:111 wp-admin/update-core.php:123 -msgid "Show hidden updates" -msgstr "Afficher les mises Ã jour cachÃ©es" - -#: wp-admin/update-core.php:101 -msgid "You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released." -msgstr "Vous Ãªtes sur le point d’installer WordPress %s en anglais (US). Il se peut que cette mise Ã jour ne fonctionne pas avec la traduction de WordPress dont vous disposez. Vous devriez sans doute patienter, le temps que la mise Ã jour soit officiellement traduite dans votre langue." +<<<<<<< .mine +#: wp-admin/user-new.php:175 +msgid "User Roles" +msgstr "RÃ´les utilisateurs" +||||||| .r11156 +#: wp-admin/includes/ms.php:224 +msgid "" +"Dear user,\n" +"\n" +"You recently requested to have the administration email address on\n" +"your site changed.\n" +"If this is correct, please click on the following link to change it:\n" +"###ADMIN_URL###\n" +"\n" +"You can safely ignore and delete this email if you do not want to\n" +"take this action.\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Cher utilisateur,\n" +"\n" +"Vous avez rÃ©cemment demandÃ© Ã modifier l'adresse de messagerie d'administration de votre site.\n" +"Si c'est bien le cas, veuillez cliquer sur le lien suivant pour valider la modification :\n" +"###ADMIN_URL###\n" +"\n" +"Vous pouvez ignorer et supprimer ce message si vous ne souhaitez pas lancer cette action.\n" +"\n" +"Ce message a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"\n" +"L'Ã©quipe de ###SITENAME###\n" +"###SITEURL###" +======= +#: wp-admin/update-core.php:170 +msgid "An updated version of WordPress is available." +msgstr "Une nouvelle version de WordPress est disponible." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/user-new.php:176 +msgid "Here is a basic overview of the different user roles and the permissions associated with each one:" +msgstr "Voici un rapide survol des diffÃ©rents rÃ´les assignables aux utilisateurs, et des permissions qui leurs sont associÃ©es :" +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-base.php:298 +msgid "Looking for %1$s in %2$s" +msgstr "Recherche %1$s dans %2$s" +======= +#: wp-admin/update-core.php:166 +msgid "Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page." +msgstr "Important : avant de faire une mise Ã jour, veillez Ã faire une sauvegarde de votre base de donnÃ©es et de vos fichiers. Pour obtenir de l’aide sur les mises Ã jour, lisez la page Mettre Ã jour WordPress." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/user-new.php:180 +msgid "Authors can publish and manage their own posts, and are able to upload files." +msgstr "Les auteurs peuvent publier et gÃ©rer leurs propres articles, ils peuvent Ã©galement envoyer des fichiers ;" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1399 +msgid "The language pack is missing either the .po or .mo files." +msgstr "Il manque les fichiers .po et/ou .mo du pack de langue." +======= +#: wp-admin/update-core.php:161 +msgid "Future security updates will be applied automatically." +msgstr "Les prochaines mises Ã jour de sÃ©curitÃ© seront appliquÃ©es automatiquement." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/theme-install.php:89 +msgid "To install the theme so you can preview it with your site’s content and customize its theme options, click the \"Install\" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the \"Activate\" link, or by navigating to your Manage Themes screen and clicking the \"Live Preview\" link under any installed theme’s thumbnail image." +msgstr "Pour installer un thÃ¨me dans le but de le prÃ©visualiser avec le contenu de votre site et d’en personnaliser les options, cliquez sur le bouton « Installer » en haut du panneau de gauche. Les fichiers du thÃ¨me seront automatiquement tÃ©lÃ©chargÃ©s vers votre site. Ceci fait, le thÃ¨me sera disponible, et vous pourrez l’activer en cliquant sur le lien « Activer », ou en vous rendant sur l’Ã©cran « GÃ©rer les thÃ¨mes » et en cliquant sur le lien « PrÃ©visualisation » situÃ© sous la miniature de chaque thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1442 +msgid "Attempting to roll back to previous version." +msgstr "Tentative de retour Ã la version prÃ©cÃ©dente." +======= +#: wp-admin/update-core.php:148 +msgid "You have the latest version of WordPress." +msgstr "Vous avez la derniÃ¨re version de WordPress." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/setup-config.php:173 +msgid "…and your MySQL password." +msgstr "…et son mot de passe MySQL." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1443 +msgid "Due to an error during updating, WordPress has rolled back to your previous version." +msgstr "Suite Ã une erreur pendant la mise Ã jour, WordPress vous a ramenÃ© Ã votre version prÃ©cÃ©dente." +======= +#: wp-admin/update-core.php:112 +msgid "Hide hidden updates" +msgstr "Masquer les mises Ã jour cachÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:176 +msgid "Database Host" +msgstr "Adresse de la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2051 +msgid "Updating to WordPress %s" +msgstr "Mise Ã jour vers WordPress %s" +======= +#: wp-admin/update-core.php:111 wp-admin/update-core.php:123 +msgid "Show hidden updates" +msgstr "Afficher les mises Ã jour cachÃ©es" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/setup-config.php:183 +msgid "If you want to run multiple WordPress installations in a single database, change this." +msgstr "Si vous souhaitez faire tourner plusieurs installations de WordPress sur une mÃªme base de donnÃ©es, modifiez ce rÃ©glage." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2052 +msgid "WordPress %s" +msgstr "WordPress %s" +======= +#: wp-admin/update-core.php:101 +msgid "You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released." +msgstr "Vous Ãªtes sur le point d’installer WordPress %s en anglais (US). Il se peut que cette mise Ã jour ne fonctionne pas avec la traduction de WordPress dont vous disposez. Vous devriez sans doute patienter, le temps que la mise Ã jour soit officiellement traduite dans votre langue." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/setup-config.php:346 +msgid "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" +msgstr "C’est parfait ! Vous avez passÃ© la premiÃ¨re partie de l’installation. WordPress peut dÃ©sormais communiquer avec votre base de donnÃ©es. Si vous Ãªtes prÃªt(e), il est maintenant temps de…" +||||||| .r11156 +#: wp-admin/includes/file.php:500 +msgid "The checksum of the file (%1$s) does not match the expected checksum value (%2$s)." +msgstr "L’empreinte de contrÃ´le (ou checksum) de votre fichier (%1$s) ne correspond pas Ã la valeur de l’empreinte attendue (%2$s)." +======= #: wp-admin/update-core.php:98 msgid "This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation." msgstr "Cette version localisÃ©e contient Ã la fois la traduction et divers correctifs liÃ©s Ã la localisation. Si vous souhaitez conserver votre traduction actuelle, vous pouvez ne pas utiliser cette version." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:29 +msgid "For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function." +msgstr "Pour les fichiers PHP, vous pouvez utiliser le menu dÃ©roulant « Documentation » pour en apprendre plus sur les fonctions trouvÃ©es dans le ce fichier. Le bouton « Consulter » vous enverra sur la page dÃ©diÃ©e de cette fonction." +||||||| .r11156 +#: wp-admin/includes/file.php:1106 +msgid "This password will not be stored on the server." +msgstr "Le mot de passe ne sera pas stockÃ© sur le serveur." +======= #: wp-admin/update-core.php:95 msgid "Bring back this update" msgstr "RÃ©afficher cette mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:63 +msgid "Installing themes on Multisite can only be done from the Network Admin section." +msgstr "En mode Multisite, vous pouvez installer des thÃ¨mes depuis la section Admin du RÃ©seau." +||||||| .r11156 +#: wp-admin/includes/update-core.php:809 +msgid "Preparing to install the latest version…" +msgstr "PrÃ©paration de l'installation de la derniÃ¨re version…" +======= #: wp-admin/update-core.php:93 msgid "Hide this update" msgstr "Masquer cette mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:584 +msgid "Capabilities" +msgstr "CapacitÃ©s" +||||||| .r11156 +#: wp-admin/includes/update-core.php:869 +msgid "Copying the required files…" +msgstr "Copie des fichiers requis…" +======= #: wp-admin/update-core.php:71 msgid "Download %s" msgstr "TÃ©lÃ©charger la version %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:592 +msgid "Denied: %s" +msgstr "RefusÃ© : %s" +||||||| .r11156 +#: wp-admin/install.php:248 +msgid "Please provide a valid username." +msgstr "Veuillez saisir un identifiant valide." +======= #: wp-admin/update-core.php:67 msgid "You can update to WordPress %2$s automatically or download the package and install it manually:" msgstr "Vous pouvez faire la mise Ã jour vers WordPress %2$s automatiquement ou tÃ©lÃ©charger l’archive complÃ¨te et l’installer vous-mÃªme :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:486 +msgid "Repeat New Password" +msgstr "RÃ©pÃ©tez le nouveau mot de passe" +||||||| .r11156 +#: wp-admin/install.php:251 +msgid "The username you provided has invalid characters." +msgstr "L’identifiant que vous avez fourni contient des caractÃ¨res invalides." +======= #: wp-admin/update-core.php:65 wp-admin/upgrade.php:78 msgid "You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:152 +msgid "ERROR: %s" +msgstr "ERREUR : %s" +||||||| .r11156 +#: wp-admin/install.php:255 +msgid "Your passwords do not match. Please try again." +msgstr "Vos mots de passe ne correspondent pas. Veuillez rÃ©essayer." +======= #: wp-admin/update-core.php:63 wp-admin/upgrade.php:76 msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:176 +msgid "Future security updates will be applied automatically." +msgstr "Les prochaines mises Ã jour de sÃ©curitÃ© seront appliquÃ©es automatiquement." +||||||| .r11156 +#: wp-admin/install.php:259 +msgid "You must provide an email address." +msgstr "Vous devez saisir une adresse de messagerie." +======= #: wp-admin/update-core.php:61 wp-admin/upgrade.php:74 msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:369 wp-admin/update-core.php:377 +msgid "Translations" +msgstr "Traductions" +||||||| .r11156 +#: wp-admin/install.php:263 +msgid "Sorry, that isn’t a valid email address. Email addresses look like username@example.com." +msgstr "DÃ©solÃ©, ce n’est pas une adresse de messagerie valide. Les adresses de messagerie ressemblent Ã cela : utilisateur@exemple.com." +======= #: wp-admin/update-core.php:51 msgid "Re-install Now" msgstr "RÃ©-installer maintenant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:370 +msgid "Your translations are all up to date." +msgstr "Vos traductions sont toutes Ã jour." +||||||| .r11156 +#: wp-admin/nav-menus.php:491 +msgid "Your theme does not natively support menus, but you can use them in sidebars by adding a “Custom Menu” widget on the Widgets screen." +msgstr "Votre thÃ¨me ne peut pas utiliser les menus nativement, mais vous pouvez les utiliser dans la barre latÃ©rale en ajoutant le widget “Menu personnalisÃ©” depuis l’Ã©cran Widgets." +======= #: wp-admin/update-core.php:50 msgid "If you need to re-install version %s, you can do so here or download the package and re-install manually:" msgstr "Si vous souhaitez rÃ©installer la version %s, vous pouvez le faire ici, ou tÃ©lÃ©charger l’archive pour la rÃ©installer vous-mÃªme :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Site name, 2: site URL, 3: role +#: wp-admin/user-new.php:29 +msgid "" +"Hi,\n" +"You've been invited to join '%1$s' at\n" +"%2$s with the role of %3$s.\n" +"If you do not want to join this site please ignore\n" +"this email. This invitation will expire in a few days.\n" +"\n" +"Please click the following link to activate your user account:\n" +"%%s" +msgstr "" +"Bonjour,\n" +"Vous avez Ã©tÃ© invitÃ©(e) Ã rejoindre Â« %1$s Â» sur\n" +"%2$s en tant que %3$s. \n" +"Si vous ne souhaitez pas rejoindre ce site, veuillez ignorer\n" +"ce message. L'invitation expirera dans quelques jours.\n" +"\n" +"Veuillez cliquer sur le lien suivant pour activer votre compte utilisateur :\n" +"%%s" +||||||| .r11156 +#: wp-admin/nav-menus.php:495 +msgid "Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the Widgets screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side." +msgstr "Les menus peuvent Ãªtre affichÃ©s Ã des emplacements dÃ©finis par votre thÃ¨me, et mÃªme dans les barres latÃ©rales grÃ¢ce au widget « Menus personnalisÃ©s » de l’Ã©cran Widgets. Si votre thÃ¨me ne reconnaÃ®t pas encore cette fonctionnalitÃ© (les thÃ¨mes par dÃ©faut, %2$s and %3$s, les intÃ¨grent trÃ¨s bien), vous pouvez apprendre Ã ajouter cette reconnaissance vous-mÃªme en suivant le lien de documentation situÃ© sur le cÃ´tÃ©." +======= #: wp-admin/update-core.php:47 msgid "Download nightly build" msgstr "TÃ©lÃ©charger la derniÃ¨re version de dÃ©veloppement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:45 +msgid "This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos thÃ¨mes installÃ©s. En dehors des thÃ¨mes par dÃ©faut inclus dans votre installation de WordPress, les thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des tiers." +||||||| .r11156 +#: wp-admin/nav-menus.php:518 +msgid "Clicking the arrow to the right of any menu item in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab." +msgstr "En cliquant sur le titre de n’importe Ã©lÃ©ment du menu dans l’Ã©diteur, un ensemble de rÃ©glages standards s’ouvrira. D’autres rÃ©glages, tels que la cible du lien, les classes CSS, les relations du lien et la description du lien, peuvent Ãªtre activÃ©s et dÃ©sactivÃ©s dans l’onglet « Options de l’Ã©cran »." +======= #: wp-admin/update-core.php:46 msgid "You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:" msgstr "Vous utilisez une version de dÃ©veloppement de WordPress. Vous pouvez faire une mise Ã jour automatique vers la toute derniÃ¨re version quotidienne (« nightly build »), ou tÃ©lÃ©charger cette version quotidienne et l’installer vous-mÃªme :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:47 +msgid "Hover or tap to see Activate and Live Preview buttons" +msgstr "Survolez out touchez pour voir les boutons Activer et PrÃ©visualisation" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:96 +msgid "IP address:" +msgstr "Adresse IP :" +======= #: wp-admin/update-core.php:23 wp-admin/update-core.php:551 #: wp-admin/update-core.php:575 wp-admin/update-core.php:603 #: wp-admin/update-core.php:633 msgid "You do not have sufficient permissions to update this site." msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:50 +msgid "The current theme is displayed highlighted as the first theme." +msgstr "Le thÃ¨me actuel est affichÃ© en Ã©tant mis en avant en tant que premier thÃ¨me." +||||||| .r11156 +#: wp-admin/edit-tags.php:261 +msgid "Category added." +msgstr "CatÃ©gorie ajoutÃ©e." +======= #: wp-admin/tools.php:104 msgid "If you want to convert your categories to tags (or vice versa), use the Categories and Tags Converter available from the Import screen." msgstr "Si vous souhaitez convertir vos catÃ©gories en Ã©tiquettes (et vice versa), utilisez le Convertisseur de catÃ©gories-Ã©tiquettes, disponible depuis l’Ã©cran des importateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:509 +msgid "On this screen, you can update to the latest version of WordPress, as well as update your themes and plugins from the WordPress.org repositories." +msgstr "Sur cet Ã©cran, vous pouvez faire la mise Ã jour vers la derniÃ¨re version de WordPres, et mettre Ã jour les thÃ¨mes et extensions depuis les dÃ©pÃ´ts de WordPress.org." +||||||| .r11156 +#: wp-admin/edit-tags.php:262 +msgid "Category deleted." +msgstr "CatÃ©gorie effacÃ©e." +======= #: wp-admin/tools.php:71 msgid "Open Press This" msgstr "Ouvrir Press This" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:79 +msgid "The theme being previewed is fully interactive — navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save & Activate button above the menu." +msgstr "Le thÃ¨me en cours de prÃ©visualisation est totalement interactif — naviguez sur les diffÃ©rentes pages pour voir comment le thÃ¨me affiche vos articles, archives et autres pages. Les rÃ©glages peuvent diffÃ©rer selon les fonctionnalitÃ©s pour lesquelles le thÃ¨me a Ã©tÃ© conÃ§u. Pour valider les nouveaux rÃ©glages et activer le thÃ¨me en un seul coup, cliquez sur le bouton \"Enregistrer et activer\" en haut du menu." +||||||| .r11156 +#: wp-admin/edit-tags.php:263 +msgid "Category updated." +msgstr "CatÃ©gorie mise Ã jour." +======= #: wp-admin/tools.php:68 msgid "Follow the link to open Press This. Then add it to your device’s bookmarks or home screen." msgstr "Cliquez sur le lien pour ouvrir Press This. Ensuite, ajoutez-le aux favoris ou Ã la page dâaccueil de votre appareil." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:107 +msgid "" +"Are you sure you want to delete this theme?\n" +"\n" +"Click 'Cancel' to go back, 'OK' to confirm the delete." +msgstr "" +"Ãtes-vous sÃ»r(e) de vouloir supprimer ce thÃ¨me.\n" +"\n" +"Â« Annuler Â» pour abandonner, Â« OK Â» pour confirmer la suppression." +||||||| .r11156 +#: wp-admin/edit-tags.php:264 +msgid "Category not added." +msgstr "CatÃ©gorie non ajoutÃ©e." +======= #: wp-admin/tools.php:67 msgid "Direct link (best for mobile)" msgstr "Lien direct (meilleur sur mobile)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:46 wp-admin/themes.php:111 +msgid "Add New Theme" +msgstr "Ajouter un thÃ¨me" +||||||| .r11156 +#: wp-admin/edit-tags.php:265 +msgid "Category not updated." +msgstr "CatÃ©gorie non mise Ã jour." +======= #: wp-admin/tools.php:60 msgid "If you can’t drag the bookmarklet to your bookmarks, copy the following code and create a new bookmark. Paste the code into the new bookmark’s URL field." msgstr "Si vous ne pouvez pas glisser le bookmarklet dans vos favoris/bookmarks, copiez le code suivant et crÃ©ez un nouveau favori : vous collerez le code dans le champ Â« Adresse web Â» de ce nouveau favori." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:130 +msgctxt "Add new theme" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/edit-tags.php:266 +msgid "Categories deleted." +msgstr "CatÃ©gories supprimÃ©es." +======= #: wp-admin/tools.php:54 msgid "Copy “Press This” bookmarklet code" msgstr "Copier le code du bookmarklet Press This" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:254 wp-admin/themes.php:354 wp-admin/themes.php:384 +msgid "Update Available" +msgstr "Mise Ã jour disponible" +||||||| .r11156 +#: wp-admin/edit-tags.php:270 +msgid "Tag added." +msgstr "Mot-clÃ© ajoutÃ©." +======= #: wp-admin/tools.php:47 msgid "Bookmarklet" msgstr "Bookmarklet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:510 +msgid "If an update is available, you᾿ll see a notification appear in the Toolbar and navigation menu." +msgstr "Si une mise Ã jour est disponible, vous verrez une notification apparaÃ®tre dans la barre d’outils" +||||||| .r11156 +#: wp-admin/edit-tags.php:271 +msgid "Tag deleted." +msgstr "Mot-clÃ© supprimÃ©." +======= #: wp-admin/tools.php:46 msgid "Install Press This" msgstr "Installer Press This" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:522 +msgid "Translations — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can click the “Update Translations” button." +msgstr "Traductions — Les fichiers qui traduisent WordPress dans votre langue sont mis Ã jour dÃ¨s qu’une modification est faite. Mais si ces fichiers ne sont plus Ã jour, vous pouvez cliquer sur le bouton \"Mettre Ã jour les traductions\"." +||||||| .r11156 +#: wp-admin/edit-tags.php:272 +msgid "Tag updated." +msgstr "Mot-clÃ© mis Ã jour." +======= #: wp-admin/tools.php:42 msgid "Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site." msgstr "Utilisez-le pour rÃ©cupÃ©rer du texte, des images et des vidÃ©os depuis n’importe quelle page Web. Puis modifiez l’article et ajoutez vos propres textes directement dans le bookmarklet, avant d’enregistrer le tout ou de le publier dans un article sur votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:49 +msgid "Click Customize for the current theme or Live Preview for any other theme to see a live preview" +msgstr "Cliquez sur Personnaliser pour le thÃ¨me actuel ou PrÃ©visualisation pour n’importe quel autre thÃ¨me pour voir la prÃ©visualisation" +||||||| .r11156 +#: wp-admin/edit-tags.php:273 +msgid "Tag not added." +msgstr "Mot-clÃ© non ajoutÃ©." +======= #: wp-admin/tools.php:41 msgid "Press This is a little tool that lets you grab bits of the web and create new posts with ease." msgstr "Press This est un petit outil que vous permet de sÃ©lectionner des Ã©lÃ©ments dâune page web et dâen faire rapidement un article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:78 +msgid "Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way." +msgstr "Touchez ou survolez n’importe quel thÃ¨me puis cliquez sur le bouton PrÃ©visualisation pour voir une prÃ©visualisation de ce thÃ¨me et changer les options du thÃ¨me dans un vie sÃ©parÃ©e et plein Ã©cran. Vous pouvez Ã©galement trouver un bouton PrÃ©visualisation au bas de l’Ã©cran de dÃ©tails du thÃ¨me. Tout thÃ¨me installÃ© peut Ãªtre prÃ©visualisÃ© et personnalisÃ© de cette maniÃ¨re." +||||||| .r11156 +#: wp-admin/edit-tags.php:274 +msgid "Tag not updated." +msgstr "Mot-clÃ© non mis Ã jour." +======= #: wp-admin/tools.php:28 msgid "Documentation on Tools" msgstr "Documentation sur les outils (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:80 +msgid "When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again." +msgstr "Lors de la prÃ©visualisation sur de petits Ã©crans, vous pouvez utiliser l’icÃ´ne de rÃ©duction en bas Ã gauche du panneau. Cela cachera le panneau, vous donnant ainsi plus de place pour prÃ©visualiser le site avec le nouveau thÃ¨me. Pour ramener le panneau, cliquez Ã nouveau sur l’icÃ´ne de rÃ©duction." +||||||| .r11156 +#: wp-admin/edit-tags.php:275 +msgid "Tags deleted." +msgstr "Mot-clÃ© supprimÃ©." +======= #: wp-admin/tools.php:23 msgid "The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin & Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa." msgstr "Le lien « convertisseur de catÃ©gories et mots-clefs » vous mÃ¨nera Ã la page d’import, oÃ¹ ledit convertisseur est l’une des extensions que vous pouvez installer. Une fois installÃ©e, le lien \"Activer l'extension & lancer l'importateur\" vous mÃ¨nera Ã l’Ã©cran d’oÃ¹ vous pourrez choisir de lancer une conversion dans un sens ou dans l’autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:60 +msgid "If you need to re-install version %s, you can do so here or download the package and re-install manually:" +msgstr "Si vous souhaitez rÃ©installer la version %s, vous pouvez le faire ici, ou tÃ©lÃ©charger l’archive pour la rÃ©installer vous-mÃªme :" +||||||| .r11156 +#: wp-admin/edit.php:244 +msgid "%s post not updated, somebody is editing it." +msgid_plural "%s posts not updated, somebody is editing them." +msgstr[0] "%s article n’a pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." +msgstr[1] "%s articles n’ont pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." +======= #: wp-admin/tools.php:22 msgid "Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content." msgstr "Les catÃ©gories disposent d’une hiÃ©rarchie, ce qui signifie que vous pouvez leur donner des sous-catÃ©gories. Les mots-clefs n’ont pas de hiÃ©rarchie et ne peuvent Ãªtre imbriquÃ©s. Parfois, des auteurs commencent par utiliser une sorte de caractÃ©risation, pour se rendre compte par la suite qu’ils prÃ©fÃ¨rent l’autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:138 +msgctxt "themes" +msgid "Popular" +msgstr "Populaires" +||||||| .r11156 +#: wp-admin/edit.php:245 +msgid "%s post permanently deleted." +msgid_plural "%s posts permanently deleted." +msgstr[0] "%s article supprimÃ© dÃ©finitivement." +msgstr[1] "%s articles supprimÃ©s dÃ©finitivement." +======= #: wp-admin/tools.php:17 msgid "Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options." msgstr "« Press This » est un bookmarklet qui vous facilite la publication sur votre site quand vous voyez une page intÃ©ressante sur Internet. Vous pouvez l’utiliser simplement pour publier un lien, ou pour en publier un extrait. « Press This » vous permet mÃªme de choisir parmi les images incluses dans la page, et de les utiliser dans votre article. Glissez simplement le lien « Press This » dans la barre de liens de votre navigateur, et Ã vous la publication facile ! En cliquant dessus lors de la visite d’un site, une fenÃªtre s’ouvrira avec toutes les options utiles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:23 +msgid "Add Themes" +msgstr "Ajouter des thÃ¨mes" +||||||| .r11156 +#: wp-admin/edit.php:246 +msgid "%s post moved to the Trash." +msgid_plural "%s posts moved to the Trash." +msgstr[0] "%s article dÃ©placÃ© dans la Corbeille." +msgstr[1] "%s articles dÃ©placÃ©s dans la Corbeille." +======= #: wp-admin/themes.php:280 msgctxt "theme name" msgid "Name" msgstr "Nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:47 +msgid "Search Themes" +msgstr "Chercher parmi les thÃ¨mes" +||||||| .r11156 +#: wp-admin/edit.php:247 +msgid "%s post restored from the Trash." +msgid_plural "%s posts restored from the Trash." +msgstr[0] "%s article rÃ©cupÃ©rÃ© depuis la Corbeille." +msgstr[1] "%s articles rÃ©cupÃ©rÃ©s depuis la Corbeille." +======= #: wp-admin/themes.php:273 msgid "The following themes are installed but incomplete. Themes must have a stylesheet and a template." msgstr "Les thÃ¨mes suivants sont installÃ©s, mais incomplets. Les thÃ¨mes doivent avoir au moins une feuille de style et un modÃ¨le." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:48 +msgid "Search themes..." +msgstr "Recherche parmi les thÃ¨mes..." +||||||| .r11156 +#: wp-admin/edit.php:250 +msgid "%s page updated." +msgid_plural "%s pages updated." +msgstr[0] "%s page mise Ã jour." +msgstr[1] "%s pages mises Ã jour." +======= #: wp-admin/themes.php:272 msgid "Broken Themes" msgstr "ThÃ¨mes endommagÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:207 +msgctxt "theme" +msgid "Details & Preview" +msgstr "DÃ©tails et prÃ©visualisation" +||||||| .r11156 +#: wp-admin/edit.php:251 +msgid "%s page not updated, somebody is editing it." +msgid_plural "%s pages not updated, somebody is editing them." +msgstr[0] "%s page n’a pas Ã©tÃ© mise Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." +msgstr[1] "%s pages n’ont pas Ã©tÃ© mises Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." +======= #: wp-admin/themes.php:255 wp-admin/themes.php:356 wp-admin/themes.php:386 msgid "Update Available" msgstr "Mise Ã jour disponible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:123 +msgctxt "themes" +msgid "Browse" +msgstr "Parcourir" +||||||| .r11156 +#: wp-admin/edit.php:252 +msgid "%s page permanently deleted." +msgid_plural "%s pages permanently deleted." +msgstr[0] "%s page dÃ©finitivement supprimÃ©e." +msgstr[1] "%s pages dÃ©finitivement supprimÃ©es." +======= #: wp-admin/themes.php:152 msgid "ERROR: %s" msgstr "ERREUR : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:53 wp-admin/theme-install.php:177 +#: wp-admin/themes.php:115 wp-admin/themes.php:263 +msgid "No themes found. Try a different search." +msgstr "Aucun thÃ¨me trouvÃ©. Essayez une autre recherche." +||||||| .r11156 +#: wp-admin/edit.php:253 +msgid "%s page moved to the Trash." +msgid_plural "%s pages moved to the Trash." +msgstr[0] "%s page dÃ©placÃ©e dans la Corbeille." +msgstr[1] "%s pages dÃ©placÃ©es dans la Corbeille." +======= #: wp-admin/themes.php:145 msgid "You cannot delete a theme while it has an active child theme." msgstr "Vous ne pouvez pas supprimer un thÃ¨me qui est actuellement utilisÃ© par l'un de ses thÃ¨mes-enfant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:168 +msgid "Filtering by:" +msgstr "Trier par :" +||||||| .r11156 +#: wp-admin/edit.php:254 +msgid "%s page restored from the Trash." +msgid_plural "%s pages restored from the Trash." +msgstr[0] "%s page rÃ©cupÃ©rÃ©e depuis la Corbeille." +msgstr[1] "%s pages rÃ©cupÃ©rÃ©es depuis la Corbeille." +======= #: wp-admin/themes.php:143 msgid "Theme deleted." msgstr "ThÃ¨me supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:518 +msgid "In most cases, WordPress will automatically apply maintenance and security updates in the background for you." +msgstr "Dans la plupart des cas, WordPress appliquera automatiquement les mises Ã jour de maintenance et de sÃ©curitÃ© en arriÃ¨re-plan." +||||||| .r11156 +#: wp-admin/revision.php:109 +msgid "Compare two different revisions by selecting the “Compare any two revisions” box to the side." +msgstr "Comparez deux rÃ©visions diffÃ©rentes en cochant la case « Comparer n’importe quelles rÃ©visions » sur le cÃ´tÃ©." +======= #: wp-admin/themes.php:140 msgid "New theme activated. Visit site" msgstr "Nouveau thÃ¨me activÃ©. Voir le site" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/user-edit.php:407 +msgid "There is a pending change of your e-mail to %1$s. Cancel" +msgstr "Il y a une modification en cours de votre adresse de contact, en faveur de %1$s. Annuler" +||||||| .r11156 +#: wp-admin/includes/template.php:2003 +msgid "Compare Revisions" +msgstr "Comparer des rÃ©visions" +======= #: wp-admin/themes.php:138 msgid "Settings saved and theme activated. Visit site" msgstr "RÃ©glages enregistrÃ©s et thÃ¨me activÃ©. Voir le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:16 wp-admin/tools.php:40 wp-admin/tools.php:51 +msgid "Press This" +msgstr "Press This" +||||||| .r11156 +#: wp-admin/includes/template.php:2004 +msgid "View, compare, and restore other versions of this content on the improved revisions screen." +msgstr "Affichez, comparez et rÃ©tablissez les autres versions de ce contenu Ã l’aide de l’Ã©cran de rÃ©visions amÃ©liorÃ©." +======= #: wp-admin/themes.php:135 msgid "The active theme is broken. Reverting to the default theme." msgstr "Le thÃ¨me courant est endommagÃ©. Retour au thÃ¨me par dÃ©faut." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:248 wp-admin/upload.php:270 +msgid "Media attachment moved to the trash." +msgstr "Fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/template.php:2017 +msgid "Edit Lock" +msgstr "Modifier le verrouillage" +======= #: wp-admin/themes.php:130 msgctxt "Add new theme" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:259 wp-admin/upload.php:271 +msgid "Media attachment restored from the trash." +msgstr "Fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +||||||| .r11156 +#: wp-admin/includes/template.php:2018 +msgid "Someone else is editing this. No need to refresh; the lock will disappear when they’re done." +msgstr "Quelqu’un est dÃ©jÃ en train de modifier ce contenu. Inutile de recharger le page : le verrouillage disparaÃ®tra une fois la modification validÃ©e." +======= #: wp-admin/themes.php:112 msgid "Search Installed Themes" msgstr "Chercher parmi les thÃ¨mes installÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:238 wp-admin/upload.php:268 +msgid "Media attachment permanently deleted." +msgstr "MÃ©dia dÃ©finitivement supprimÃ©." +||||||| .r11156 +#: wp-admin/revision.php:158 +msgid "Compare any two revisions" +msgstr "Comparer n’importe quelles rÃ©visions" +======= #: wp-admin/themes.php:107 msgid "" "Are you sure you want to delete this theme?\n" @@ -1243,427 +4444,1492 @@ msgstr "" "Ãtes-vous sÃ»r(e) de vouloir supprimer ce thÃ¨me.\n" "\n" "Â« Annuler Â» pour abandonner, Â« OK Â» pour confirmer la suppression." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:104 +msgid "If you want to convert your categories to tags (or vice versa), use the Categories and Tags Converter available from the Import screen." +msgstr "Si vous souhaitez convertir vos catÃ©gories en Ã©tiquettes (et vice versa), utilisez le Convertisseur de catÃ©gories-Ã©tiquettes, disponible depuis l’Ã©cran des importateurs." +||||||| .r11156 +#: wp-admin/includes/media.php:281 +msgid "\"%1$s\" from %2$s by %3$s." +msgstr "%1$s tirÃ© de %2$s par %3$s." +======= #: wp-admin/themes.php:84 msgid "Previewing and Customizing" msgstr "AperÃ§u et personnalisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:23 +msgid "The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin & Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa." +msgstr "Le lien « convertisseur de catÃ©gories et Ã©tiquettes » vous mÃ¨nera Ã la page d’import, oÃ¹ ledit convertisseur est l’une des extensions que vous pouvez installer. Une fois installÃ©e, le lien « Activer l’extension & lancer l’importateur » vous mÃ¨nera Ã l’Ã©cran d’oÃ¹ vous pourrez choisir de lancer une conversion dans un sens ou dans l’autre." +||||||| .r11156 +#: wp-admin/includes/media.php:284 +msgid "\"%1$s\" from %2$s." +msgstr "%1$s tirÃ© de %2$s" +======= #: wp-admin/themes.php:80 msgid "When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again." msgstr "Lors de la prÃ©visualisation sur de petits Ã©crans, vous pouvez utiliser l’icÃ´ne de rÃ©duction en bas Ã gauche du panneau. Cela cachera le panneau, vous donnant ainsi plus de place pour prÃ©visualiser le site avec le nouveau thÃ¨me. Pour ramener le panneau, cliquez Ã nouveau sur l’icÃ´ne de rÃ©duction." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:22 +msgid "Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content." +msgstr "Les catÃ©gories disposent d’une hiÃ©rarchie, ce qui signifie que vous pouvez leur donner des sous-catÃ©gories. Les Ã©tiquettes n’ont pas de hiÃ©rarchie et ne peuvent Ãªtre imbriquÃ©s. Parfois, des auteurs commencent par utiliser une sorte de caractÃ©risation, pour se rendre compte par la suite qu’ils prÃ©fÃ¨rent l’autre." +||||||| .r11156 +#: wp-admin/includes/media.php:287 +msgid "\"%1$s\" by %2$s." +msgstr "%1$s par %2$s." +======= #: wp-admin/themes.php:79 msgid "The theme being previewed is fully interactive — navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save & Activate button above the menu." msgstr "Le thÃ¨me en cours de prÃ©visualisation est totalement interactif — naviguez sur les diffÃ©rentes pages pour voir comment le thÃ¨me affiche vos articles, archives et autres pages. Les rÃ©glages peuvent diffÃ©rer selon les fonctionnalitÃ©s pour lesquelles le thÃ¨me a Ã©tÃ© conÃ§u. Pour valider les nouveaux rÃ©glages et activer le thÃ¨me en un seul coup, cliquez sur le bouton \"Enregistrer et activer\" en haut du menu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:51 +msgid "The search for installed themes will search for terms in their name, description, author, or tag." +msgstr "La recherche parmi les thÃ¨mes installÃ©s se fait sur leurs noms, leurs descriptions, leurs auteurs et leurs Ã©tiquettes." +||||||| .r11156 +#: wp-admin/includes/media.php:289 +msgid "\"%s\"." +msgstr "%s." +======= #: wp-admin/themes.php:78 msgid "Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way." msgstr "Touchez ou survolez n’importe quel thÃ¨me puis cliquez sur le bouton PrÃ©visualisation pour voir une prÃ©visualisation de ce thÃ¨me et changer les options du thÃ¨me dans un vie sÃ©parÃ©e et plein Ã©cran. Vous pouvez Ã©galement trouver un bouton PrÃ©visualisation au bas de l’Ã©cran de dÃ©tails du thÃ¨me. Tout thÃ¨me installÃ© peut Ãªtre prÃ©visualisÃ© et personnalisÃ© de cette maniÃ¨re." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:48 +msgid "Click on the theme to see the theme name, version, author, description, tags, and the Delete link" +msgstr "Cliquez sur le thÃ¨me pour voir le nom du thÃ¨me, sa version, son auteur, sa description, ses Ã©tiquettes et le bouton Supprimer." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:190 +msgid "Your site is configured to keep only the last %s revisions." +msgstr "Votre site est configurÃ© pour conserver seulement les %s derniÃ¨res rÃ©visions." +======= #: wp-admin/themes.php:70 msgid "Adding Themes" msgstr "Ajout de thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:68 +msgid "Follow the link to open Press This. Then add it to your device’s bookmarks or home screen." +msgstr "Cliquez sur le lien pour ouvrir Press This. Ensuite, ajoutez-le aux favoris ou Ã la page dâaccueil de votre appareil." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:192 wp-admin/includes/meta-boxes.php:195 +msgid "Revisions: %s" +msgstr "RÃ©visions : %s" +======= #: wp-admin/themes.php:65 msgid "If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!" msgstr "Si vous souhaitez choisir parmi plus de thÃ¨mes, cliquez sur le bouton \"Ajouter\" et vous pourrez parcourir le rÃ©pertoire de thÃ¨me de WordPress.org et y chercher des thÃ¨mes supplÃ©mentaires. Les thÃ¨mes du rÃ©pertoire de thÃ¨mes de WordPress.org sont conÃ§us et dÃ©veloppÃ©s par des tiers, et sont compatibles avec la licence de WordPress. Oh, et ils sont gratuits !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:17 +msgid "Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options." +msgstr "« Press This » est un bookmarklet qui vous facilite la publication sur votre site quand vous voyez une page intÃ©ressante sur Internet. Vous pouvez l’utiliser simplement pour publier un lien, ou pour en publier un extrait. « Press This » vous permet mÃªme de choisir parmi les images incluses dans la page, et de les utiliser dans votre article. Glissez simplement le lien « Press This » dans la barre de liens de votre navigateur, et Ã vous la publication facile ! En cliquant dessus lors de la visite d’un site, une fenÃªtre s’ouvrira avec toutes les options utiles." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:198 +msgctxt "revisions" +msgid "Browse" +msgstr "Parcourir" +======= #: wp-admin/themes.php:63 msgid "Installing themes on Multisite can only be done from the Network Admin section." msgstr "En mode Multisite, vous pouvez installer des thÃ¨mes depuis la section Admin du RÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:46 +msgid "Install Press This" +msgstr "Installer Press This" +||||||| .r11156 +#: wp-admin/revision.php:175 +msgid "Autosave by %s" +msgstr "Sauvegarde automatique par %s" +======= #: wp-admin/themes.php:51 msgid "The search for installed themes will search for terms in their name, description, author, or tag." msgstr "La recherche parmi les thÃ¨mes installÃ©s se fait sur leurs noms, leurs descriptions, leurs auteurs et leurs Ã©tiquettes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:54 +msgid "Copy “Press This” bookmarklet code" +msgstr "Copier le code du bookmarklet Press This" +||||||| .r11156 +#: wp-admin/revision.php:178 +msgid "Current Revision by %s" +msgstr "RÃ©vision actuelle par %s" +======= #: wp-admin/themes.php:50 msgid "The current theme is displayed highlighted as the first theme." msgstr "Le thÃ¨me actuel est affichÃ© en Ã©tant mis en avant en tant que premier thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:41 +msgid "Press This is a little tool that lets you grab bits of the web and create new posts with ease." +msgstr "Press This est un petit outil que vous permet de sÃ©lectionner des Ã©lÃ©ments dâune page web et dâen faire rapidement un article." +||||||| .r11156 +#: wp-admin/revision.php:196 +msgid "Restore This Autosave" +msgstr "RÃ©tablir cette sauvegarde automatique" +======= #: wp-admin/themes.php:49 msgid "Click Customize for the current theme or Live Preview for any other theme to see a live preview" msgstr "Cliquez sur Personnaliser pour le thÃ¨me actuel ou PrÃ©visualisation pour n’importe quel autre thÃ¨me pour voir la prÃ©visualisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:71 +msgid "Open Press This" +msgstr "Ouvrir Press This" +||||||| .r11156 +#: wp-admin/revision.php:181 +msgid "Revision by %s" +msgstr "RÃ©vision par %s" +======= #: wp-admin/themes.php:48 msgid "Click on the theme to see the theme name, version, author, description, tags, and the Delete link" msgstr "Cliquez sur le thÃ¨me pour voir le nom du thÃ¨me, sa version, son auteur, sa description, ses Ã©tiquettes et le bouton Supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:60 +msgid "If you can’t drag the bookmarklet to your bookmarks, copy the following code and create a new bookmark. Paste the code into the new bookmark’s URL field." +msgstr "Si vous ne pouvez pas glisser le bookmarklet dans vos favoris/bookmarks, copiez le code suivant et crÃ©ez un nouveau favori : vous collerez le code dans le champ Â« Adresse web Â» de ce nouveau favori." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:397 +msgid "Connection lost. Saving has been disabled until you’re reconnected." +msgstr "Connexion perdue. L’enregistrement a Ã©tÃ© dÃ©sactivÃ© jusqu’Ã ce que vous soyez reconnectÃ©." +======= #: wp-admin/themes.php:47 msgid "Hover or tap to see Activate and Live Preview buttons" msgstr "Survolez out touchez pour voir les boutons Activer et PrÃ©visualisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:48 +msgid "Drag the bookmarklet below to your bookmarks bar. Then, when you’re on a page you want to share, simply “press” it." +msgstr "Glissez le bookmarklet ci-dessous dans votre barre de favoris/bookmarks. Ensuite, une fois la page que vous souhaitez partager, il vous suffira de cliquer dessus." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:398 +msgid "We’re backing up this post in your browser, just in case." +msgstr "Nous sauvegardons cet article dans votre navigateur, par sÃ©curitÃ©." +======= #: wp-admin/themes.php:45 msgid "This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties." msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos thÃ¨mes installÃ©s. En dehors des thÃ¨mes par dÃ©faut inclus dans votre installation de WordPress, les thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des tiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:232 +msgid "Detached %d attachment." +msgid_plural "Detached %d attachments." +msgstr[0] "%d fichier a Ã©tÃ© dÃ©tachÃ©." +msgstr[1] "%d fichiers ont Ã©tÃ© dÃ©tachÃ©s." +||||||| .r11156 +#: wp-admin/revision.php:210 +msgid "Sorry, something went wrong. The requested comparison could not be loaded." +msgstr "DÃ©solÃ©, quelque chose s’est mal dÃ©roulÃ©. La comparaison demandÃ©e n’a pas pu Ãªtre chargÃ©e." +======= #: wp-admin/themes.php:40 msgid "Manage Themes" msgstr "GÃ©rer les thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:248 +msgid "This theme has not been rated yet." +msgstr "Ce thÃ¨me nâa pas encore reÃ§u de note." +||||||| .r11156 +#: wp-admin/custom-background.php:359 +msgctxt "Background Attachment" +msgid "Attachment" +msgstr "Attachement" +======= #: wp-admin/theme-install.php:250 msgid "This theme has not been rated yet." msgstr "Ce thÃ¨me nâa pas encore reÃ§u de note." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:77 +msgid "You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter." +msgstr "Vous pouvez chercher un thÃ¨me par mot-clÃ©, auteur ou Ã©tiquette, ou faire une recherche plus prÃ©cise en utilisant les critÃ¨res listÃ©s dans le filtre de fonctionnalitÃ©s." +||||||| .r11156 +#: wp-admin/user-edit.php:467 +msgid "Repeat New Password" +msgstr "RÃ©pÃ©tez le nouveau mot de passe" +======= #: wp-admin/theme-install.php:224 msgctxt "Button label for a theme" msgid "Next" msgstr "Suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:47 +msgid "Bookmarklet" +msgstr "Bookmarklet" +||||||| .r11156 +#: wp-admin/user-new.php:395 +msgid "Repeat Password" +msgstr "RÃ©pÃ©tez le mot de passe" +======= #: wp-admin/theme-install.php:223 msgctxt "Button label for a theme" msgid "Previous" msgstr "PrÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:379 +msgid "New translations are available." +msgstr "De nouvelles traductions sont disponibles." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1163 +msgid "Add menu items from the column on the left." +msgstr "Ajouter des Ã©lÃ©ments de menu depuis la colonne de gauche." +======= #: wp-admin/theme-install.php:215 msgctxt "theme" msgid "Already Installed" msgstr "DÃ©jÃ installÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:67 +msgid "Direct link (best for mobile)" +msgstr "Lien direct (meilleur sur mobile)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:129 +msgid "Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the WordPress Plugin Directory or upload a plugin in .zip format via this page." +msgstr "Les extensions Ã©tendent les fonctionnalitÃ©s de WordPress, et en ajoutent de nouvelles. Vous pouvez installer des extensions automatiquement en provenance du rÃ©pertoire des extensions WordPress, ou mettre en ligne une extension au format .zip, via cette page." +======= #: wp-admin/theme-install.php:205 msgctxt "theme" msgid "Details & Preview" msgstr "DÃ©tails et prÃ©visualisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:250 +msgid "%d media attachment moved to the trash." +msgid_plural "%d media attachments moved to the trash." +msgstr[0] "%d fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +msgstr[1] "%d fichiers mÃ©dias dÃ©placÃ©s dans la Corbeille." +||||||| .r11156 +msgid "http://wordpress.org/plugins/hello-dolly/" +msgstr "http://wordpress.org/plugins/hello-dolly/" +======= #: wp-admin/theme-install.php:166 msgid "Filtering by:" msgstr "Trier par :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:261 +msgid "%d media attachment restored from the trash." +msgid_plural "%d media attachments restored from the trash." +msgstr[0] "%d fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +msgstr[1] "%d fichiers mÃ©dias rÃ©cupÃ©rÃ©s depuis la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:53 +msgid "The package contains no files." +msgstr "Ce paquet ne contient aucun fichier." +======= #: wp-admin/theme-install.php:146 msgid "Apply Filters" msgstr "Appliquer les filtres" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:240 +msgid "%d media attachment permanently deleted." +msgid_plural "%d media attachments permanently deleted." +msgstr[0] "%d fichier mÃ©dia supprimÃ© dÃ©finitivement." +msgstr[1] "%d fichiers mÃ©dia supprimÃ©s dÃ©finitivement." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:819 +msgid "The theme contains no files." +msgstr "Ce thÃ¨me ne contient aucun fichier." +======= #: wp-admin/theme-install.php:136 msgctxt "themes" msgid "Popular" msgstr "Populaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:78 +msgid "Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it." +msgstr "Autrement, vous pouvez parcourir les thÃ¨mes mis en avant, populaires, ou les derniers en date. Lorsque vous avez trouvÃ© un thÃ¨me qui vous plaÃ®t, vous pouvez le prÃ©visualiser ou l’installer." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:206 +msgid "An error occurred while updating %1$s: %2$s" +msgstr "Une erreur est survenue pendant la mise Ã jour de %1$s : %2$s" +======= #: wp-admin/theme-install.php:121 msgctxt "themes" msgid "Browse" msgstr "Parcourir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-new.php:188 +msgid "Documentation on Adding New Users" +msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +||||||| .r11156 +#: wp-admin/revision.php:108 +msgid "To navigate between revisions, drag the slider handle left or right or use the Previous or Next buttons." +msgstr "Pour naviguer entre les rÃ©visions, faites glisser le curseur vers la gauche ou vers la droite ou utilisez les boutons PrÃ©cÃ©dente ou Suivante." +======= #: wp-admin/theme-install.php:97 msgid "Documentation on Adding New Themes" msgstr "Documentation sur l’ajout de thÃ¨mes (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:54 +msgid "Documentation on User Profiles" +msgstr "Documentation sur le Profil utilisateur (en)" +||||||| .r11156 +#: wp-admin/press-this.php:624 +msgid "Loading…" +msgstr "Chargement…" +======= #: wp-admin/theme-install.php:91 msgid "Previewing and Installing" msgstr "Voir l'aperÃ§u et installer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:533 +msgid "Documentation on Updating WordPress" +msgstr "Documentation sur la mise Ã jour de WordPress (en)" +||||||| .r11156 +#: wp-admin/upload.php:150 +msgid "Error in moving to trash." +msgstr "Erreur lors du dÃ©placement dans la Corbeille." +======= #: wp-admin/theme-install.php:87 msgid "To install the theme so you can preview it with your site’s content and customize its theme options, click the \"Install\" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the \"Activate\" link, or by navigating to your Manage Themes screen and clicking the \"Live Preview\" link under any installed theme’s thumbnail image." msgstr "Pour installer un thÃ¨me dans le but de le prÃ©visualiser avec le contenu de votre site et d’en personnaliser les options, cliquez sur le bouton « Installer » en haut du panneau de gauche. Les fichiers du thÃ¨me seront automatiquement tÃ©lÃ©chargÃ©s vers votre site. Ceci fait, le thÃ¨me sera disponible, et vous pourrez l’activer en cliquant sur le lien « Activer », ou en vous rendant sur l’Ã©cran « GÃ©rer les thÃ¨mes » et en cliquant sur le lien « PrÃ©visualisation » situÃ© sous la miniature de chaque thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/tools.php:28 +msgid "Documentation on Tools" +msgstr "Documentation sur les outils (en)" +||||||| .r11156 +#: wp-admin/upload.php:162 +msgid "Error in restoring from trash." +msgstr "Erreur pendant la rÃ©cupÃ©ration depuis la Corbeille." +======= #: wp-admin/theme-install.php:86 msgid "Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you’re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look." msgstr "Une fois que vous avez gÃ©nÃ©rÃ© une liste de thÃ¨mes, vous pouvez les prÃ©visualiser et les installer. Cliquez sur la miniature du thÃ¨me que vous souhaitez prÃ©visualiser. Cela ouvrira une page de prÃ©visualisation en plein Ã©cran, afin de vous donner une meilleure idÃ©e de l'aspect de ce thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:64 wp-admin/upload.php:201 +msgid "Documentation on Media Library" +msgstr "Documentation sur la bibliothÃ¨que des mÃ©dias (en)" +||||||| .r11156 +#: wp-admin/post.php:244 +msgid "The item you are trying to move to the Trash no longer exists." +msgstr "L’Ã©lÃ©ment que vous essayez de placer dans la Corbeille n’existe plus." +======= #: wp-admin/theme-install.php:77 msgid "You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory." msgstr "Si vous disposez d’un thÃ¨me sous forme d’archive Zip sur votre ordinateur, vous pouvez mettre en ligne ce fichier avec le lien Envoyer. Assurez-vous bien que ce fichier provient d’une source de confiance. Vous pouvez Ã©galement le faire Ã l’ancienne, c’est-Ã -dire passer par un client FTP pour dÃ©poser les fichiers dans le dossier /wp-content/themes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:265 +msgid "More information" +msgstr "Plus d’informations" +||||||| .r11156 +#: wp-admin/post.php:267 +msgid "The item you are trying to restore from the Trash no longer exists." +msgstr "L’Ã©lÃ©ment que vous essayez de sortir de la Corbeille n’existe plus." +======= #: wp-admin/theme-install.php:76 msgid "Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it." msgstr "Autrement, vous pouvez parcourir les thÃ¨mes mis en avant, populaires, ou les derniers en date. Lorsque vous avez trouvÃ© un thÃ¨me qui vous plaÃ®t, vous pouvez le prÃ©visualiser ou l’installer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:77 +msgid "You can update to WordPress %2$s automatically or download the package and install it manually:" +msgstr "Vous pouvez faire la mise Ã jour vers WordPress %2$s automatiquement ou tÃ©lÃ©charger l’archive complÃ¨te et l’installer vous-mÃªme :" +||||||| .r11156 +#: wp-admin/post.php:285 +msgid "This item has already been deleted." +msgstr "Cet Ã©lÃ©ment a dÃ©jÃ Ã©tÃ© supprimÃ©." +======= #: wp-admin/theme-install.php:75 wp-admin/themes.php:51 msgid "The search results will be updated as you type." msgstr "Les rÃ©sultats de la recherche seront mis Ã jour au fur et Ã mesure de votre saisie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:181 +msgid "Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page." +msgstr "Important : avant de faire une mise Ã jour, veillez Ã faire une sauvegarde de votre base de donnÃ©es et de vos fichiers. Pour obtenir de l’aide sur les mises Ã jour, lisez la page Mettre Ã jour WordPress." +||||||| .r11156 +#: wp-admin/nav-menus.php:724 +msgid "Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options." +msgstr "Glissez chaque Ã©lÃ©ment pour les placer dans l’ordre que vous prÃ©fÃ©rez. Cliquez sur la flÃ¨che Ã droite de l’Ã©lÃ©ment pour afficher d’autres options de configuration." +======= #: wp-admin/theme-install.php:75 msgid "You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter." msgstr "Vous pouvez chercher un thÃ¨me par mot-clÃ©, auteur ou Ã©tiquette, ou faire une recherche plus prÃ©cise en utilisant les critÃ¨res listÃ©s dans le filtre de fonctionnalitÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:99 +msgid "Documentation on Adding New Themes" +msgstr "Documentation sur l’ajout de thÃ¨mes (en)" +||||||| .r11156 +#: wp-admin/nav-menus.php:508 +msgid "If you haven’t yet created any menus, click the ’create a new menu’ link to get started" +msgstr "Si vous n’avez pas encore crÃ©Ã© de menu, cliquez sur le lien « CrÃ©er un nouveau menu » pour vous lancer" +======= #: wp-admin/theme-install.php:74 msgid "You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses." msgstr "Vous pouvez trouver plus de thÃ¨mes pour votre site en utilisant le Navigateur/Installeur de thÃ¨me sur cet Ã©cran, qui affiche les thÃ¨mes en provenance du dÃ©pÃ´t de thÃ¨mes de WordPress.org. Ces thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des designers tiers, sont gratuits et utilisent une licence compatible avec celle de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:39 +msgid "Documentation on Theme Development" +msgstr "Documentation sur le dÃ©veloppement de thÃ¨me (en)" +||||||| .r11156 +#: wp-admin/revision.php:105 +msgid "This screen is used for managing your content revisions." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer les rÃ©visions de vos contenus." +======= #: wp-admin/theme-install.php:53 wp-admin/theme-install.php:175 #: wp-admin/themes.php:115 wp-admin/themes.php:264 msgid "No themes found. Try a different search." msgstr "Aucun thÃ¨me trouvÃ©. Essayez une autre recherche." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:40 wp-admin/themes.php:91 +msgid "Documentation on Using Themes" +msgstr "Documentation sur l’utilisation des thÃ¨mes (en)" +||||||| .r11156 +#: wp-admin/revision.php:106 +msgid "Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added." +msgstr "Les rÃ©visions sont des copies de votre article ou votre page, pÃ©riodiquement crÃ©Ã©es tandis que vous modifiez votre contenu. Sur la gauche, le texte en rouge indique le contenu qui a Ã©tÃ© enlevÃ©. Sur la droite, le texte en vert indique le contenu qui a Ã©tÃ© ajoutÃ©." +======= #: wp-admin/theme-install.php:52 wp-admin/themes.php:114 msgid "Number of Themes found: %d" msgstr "Nombre de thÃ¨mes trouvÃ©s : %d" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:41 +msgid "Documentation on Editing Files" +msgstr "Documentation sur l’Ã©dition des fichiers" +||||||| .r11156 +#: wp-admin/revision.php:107 +msgid "From this screen you can review, compare, and restore revisions:" +msgstr "Depuis cet Ã©cran, vous pouvez visualiser, comparer et rÃ©tablir les rÃ©visions :" +======= #: wp-admin/theme-install.php:49 wp-admin/theme-install.php:118 #: wp-admin/theme-install.php:120 wp-admin/update.php:241 msgid "Upload Theme" msgstr "Mettre un thÃ¨me en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-editor.php:42 +msgid "Documentation on Template Tags" +msgstr "Documentation sur les marqueurs des modÃ¨les (en)" +||||||| .r11156 +#: wp-admin/revision.php:110 +msgid "To restore a revision, click Restore This Revision." +msgstr "Pour rÃ©tablir cette rÃ©vision, cliquez sur « RÃ©tablir cette rÃ©vision »." +======= #: wp-admin/theme-install.php:48 msgid "Search themes..." msgstr "Recherche parmi les thÃ¨mes..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:71 wp-admin/upgrade.php:80 +msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +||||||| .r11156 +#: wp-admin/revision.php:119 +msgid "Revisions Management" +msgstr "Gestion des rÃ©visions (en)" +======= #: wp-admin/theme-install.php:47 msgid "Search Themes" msgstr "Chercher parmi les thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:73 wp-admin/upgrade.php:82 +msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +||||||| .r11156 +#: wp-admin/revision.php:169 +msgctxt "Followed by post revision info" +msgid "To:" +msgstr "Vers :" +======= #: wp-admin/theme-install.php:46 wp-admin/themes.php:111 msgid "Add New Theme" msgstr "Ajouter un thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:75 wp-admin/upgrade.php:84 +msgid "You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +||||||| .r11156 +#: wp-admin/revision.php:167 +msgctxt "Followed by post revision info" +msgid "From:" +msgstr "Depuis :" +======= #: wp-admin/theme-install.php:23 msgid "Add Themes" msgstr "Ajouter des thÃ¨mes" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/theme-install.php:52 wp-admin/themes.php:114 +msgid "Number of Themes found: %d" +msgstr "Nombre de thÃ¨mes trouvÃ©s : %d" + +#: wp-admin/theme-editor.php:33 +msgid "Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead." +msgstr "La mise Ã jour vers une nouvelle version du thÃ¨me supprimera les modifications que vous aurez faites. Pour Ã©viter cela, nous vous conseillons de passer plutÃ´t par un ThÃ¨me-Enfant." + +#: wp-admin/theme-install.php:217 +msgctxt "theme" +msgid "Already Installed" +msgstr "DÃ©jÃ installÃ©" +#: wp-admin/theme-install.php:225 +msgctxt "Button label for a theme" +msgid "Previous" +msgstr "PrÃ©cÃ©dent" +||||||| .r11156 +#: wp-admin/revision.php:140 +msgctxt "Button label for a previous revision" +msgid "Previous" +msgstr "PrÃ©cÃ©dente" +======= #: wp-admin/theme-install.php:16 wp-admin/update.php:202 #: wp-admin/update.php:232 msgid "You do not have sufficient permissions to install themes on this site." msgstr "Vous n’avez pas les droits suffisants pour installer des thÃ¨mes sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/theme-install.php:226 +msgctxt "Button label for a theme" +msgid "Next" +msgstr "Suivant" +||||||| .r11156 +#: wp-admin/revision.php:144 +msgctxt "Button label for a next revision" +msgid "Next" +msgstr "Suivante" +======= #: wp-admin/theme-editor.php:216 msgid "This is a file in your current parent theme." msgstr "Ceci est un fichier de votre thÃ¨me parent actuel." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:194 +msgid "BETA TESTERS:" +msgstr "TESTEURS DE PHASE BETA :" +||||||| .r11156 +#: wp-admin/nav-menus.php:377 +msgid "Menu locations updated." +msgstr "Les emplacements de menu ont Ã©tÃ© mis Ã jour." +======= #: wp-admin/theme-editor.php:195 msgid "Oops, no such file exists! Double check the name and try again, merci." msgstr "Oops, ce fichier n’existe pas ! VÃ©rifiez son nom et rÃ©essayez, merci." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:194 +msgid "This site is set up to install updates of future beta versions automatically." +msgstr "Ce site est configurÃ© pour installer automatiquement les mises Ã jour des prochaines versions bÃªtas." +||||||| .r11156 +#: wp-admin/includes/revision.php:172 +msgctxt "revision date short format" +msgid "j M @ G:i" +msgstr "j M \\Ã G \\h i \\m\\i\\n" +======= #: wp-admin/theme-editor.php:178 msgctxt "Theme stylesheets in theme editor" msgid "Styles" msgstr "Styles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:83 +msgid "The grid view for the Media Library requires JavaScript. Switch to the list view." +msgstr "La vue en grille de la BilbiothÃ¨que de MÃ©dias nÃ©cessite JavaScript. Passer Ã la vue en liste." +||||||| .r11156 +#: wp-admin/includes/media.php:296 +msgid "%1$s by %2$s." +msgstr "%1$s par %2$s." +======= #: wp-admin/theme-editor.php:170 msgid "This child theme inherits templates from a parent theme, %s." msgstr "Ce thÃ¨me enfant hÃ©rite de certains modÃ¨les de son thÃ¨me parent, %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:50 +msgid "To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media." +msgstr "Pour supprimer des Ã©lÃ©ments de la liste des mÃ©dias, cliquez sur le bouton de SÃ©lection multiple en haut de l’Ã©cran. SÃ©lectionnez tous les Ã©lÃ©ments Ã supprimer, puis cliquez sur le bouton Supprimer la sÃ©lection. En cliquant sur le bouton Annuler la sÃ©lection vous reviendrez sur la vue normale des mÃ©dias." +||||||| .r11156 +#: wp-admin/includes/media.php:308 +msgid "Released: %d." +msgstr "Date de sortie : %d." +======= #: wp-admin/theme-editor.php:168 msgid "Templates" msgstr "ModÃ¨les" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:57 +msgid "Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved." +msgstr "Cliquer sur un Ã©lÃ©ment affichera une fenÃªtre avec les dÃ©tails du fichier, ce qui vous permettra de prÃ©visualiser le mÃ©dia et rÃ©aliser de rapides modifications. Tous les changements que vous ferez dans les dÃ©tails du mÃ©dia seront automatiquement sauvegardÃ©s." +||||||| .r11156 +#: wp-admin/includes/media.php:313 +msgid "Track %1$s of %2$s." +msgstr "Piste %1$s sur %2$s." +======= #: wp-admin/theme-editor.php:161 msgid "This theme is broken." msgstr "Le thÃ¨me est cassÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:59 +msgid "You can also delete individual items and access the extended edit screen from the details dialog." +msgstr "Vous pouvez aussi supprimer les Ã©lÃ©ments individuellement et accÃ©der Ã l’Ã©cran de modifications Ã©tendues par la fenÃªtre des dÃ©tails." +||||||| .r11156 +#: wp-admin/includes/media.php:315 +msgid "Track %1$s." +msgstr "Piste %1$s." +======= #: wp-admin/theme-editor.php:142 msgid "Select theme to edit:" msgstr "SÃ©lectionnez le thÃ¨me Ã modifier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:48 +msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first." +msgstr "Tous les fichiers que vous mettez en ligne sont listÃ©s dans la bibliothÃ¨que de mÃ©dias, avec le dernier mis en ligne qui apparaÃ®t en premier." +||||||| .r11156 +#: wp-admin/includes/media.php:319 +msgid "Genre: %s." +msgstr "Genre : %s" +======= #: wp-admin/theme-editor.php:56 wp-admin/theme-editor.php:59 msgid "The requested theme does not exist." msgstr "Le thÃ¨me demandÃ© n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:58 +msgid "Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly." +msgstr "Utilisez les boutons flÃ©chÃ©es au-dessus de la fenÃªtre ou les flÃ¨ches gauche et droite du clavier pour passer rapidement d’un mÃ©dia Ã l’autre." +||||||| .r11156 +#: wp-admin/includes/media.php:2811 +msgid "Audio Format:" +msgstr "Format audio :" +======= #: wp-admin/theme-editor.php:42 msgid "Documentation on Template Tags" msgstr "Documentation sur les marqueurs des modÃ¨les (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/upload.php:49 wp-admin/upload.php:184 +msgid "You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media." +msgstr "Vous pouvez voir vos mÃ©dias dans une grille ou dans une liste avec des colonnes. Passez de l’un Ã l’autre en utilisant les icÃ´nes en haut Ã gauche des mÃ©dias." +||||||| .r11156 +#: wp-admin/includes/media.php:2812 +msgid "Audio Codec:" +msgstr "Codex audio :" +======= #: wp-admin/theme-editor.php:41 msgid "Documentation on Editing Files" msgstr "Documentation sur l’Ã©dition des fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:65 +msgid "If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!" +msgstr "Si vous souhaitez choisir parmi plus de thÃ¨mes, cliquez sur le bouton \"Ajouter\" et vous pourrez parcourir le rÃ©pertoire de thÃ¨me de WordPress.org et y chercher des thÃ¨mes supplÃ©mentaires. Les thÃ¨mes du rÃ©pertoire de thÃ¨mes de WordPress.org sont conÃ§us et dÃ©veloppÃ©s par des tiers, et sont compatibles avec la licence de WordPress. Oh, et ils sont gratuits !" +||||||| .r11156 +#: wp-admin/includes/post.php:1475 +msgid "Saving revision..." +msgstr "Enregistrement des rÃ©visions" +======= #: wp-admin/theme-editor.php:40 wp-admin/themes.php:91 msgid "Documentation on Using Themes" msgstr "Documentation sur l’utilisation des thÃ¨mes (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/themes.php:145 +msgid "You cannot delete a theme while it has an active child theme." +msgstr "Vous ne pouvez pas supprimer un thÃ¨me qui est actuellement utilisÃ© par l'un de ses thÃ¨mes-enfant." +||||||| .r11156 +#: wp-admin/includes/post.php:1476 +msgid "Your latest changes were saved as a revision." +msgstr "Vos derniÃ¨res modifications ont Ã©tÃ© enregistrÃ©es dans une rÃ©vision." +======= #: wp-admin/theme-editor.php:39 msgid "Documentation on Theme Development" msgstr "Documentation sur le dÃ©veloppement de thÃ¨me (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:528 +msgid "Log Out Everywhere" +msgstr "DÃ©connexion globale" +||||||| .r11156 +#: wp-admin/nav-menus.php:494 +msgid "This screen is used for managing your custom navigation menus." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos menus de navigations personnalisÃ©s." +======= #: wp-admin/theme-editor.php:33 msgid "Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead." msgstr "La mise Ã jour vers une nouvelle version du thÃ¨me supprimera les modifications que vous aurez faites. Pour Ã©viter cela, nous vous conseillons de passer plutÃ´t par un ThÃ¨me-Enfant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:510 +msgid "You are only logged in at this location." +msgstr "Vous n'Ãªtes connectÃ© qu'Ã cet endroit." +||||||| .r11156 +#: wp-admin/nav-menus.php:496 wp-admin/themes.php:41 +msgid "From this screen you can:" +msgstr "Depuis cet Ã©cran, vous pouvez :" +======= #: wp-admin/theme-editor.php:32 msgid "Advice: think very carefully about your site crashing if you are live-editing the theme currently in use." msgstr "Conseil : gardez bien en tÃªte que si vous modifiez le thÃ¨me actuellement utilisÃ©, vos visiteurs pourraient avoir une vision dÃ©routante de votre site..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:518 +msgid "WordPress — Updating your WordPress installation is a simple one-click procedure: just click on the “Update Now” button when you are notified that a new version is available." +msgstr "WordPress — La mise Ã jour de votre installation WordPress tient en une simple procÃ©dure : cliquez sur le bouton « Mettre Ã jour » quand vous Ãªtes notifiÃ©(e) qu’une nouvelle version est disponible." +||||||| .r11156 +#: wp-admin/nav-menus.php:497 +msgid "Create, edit, and delete menus" +msgstr "CrÃ©er, modifier et supprimer des menus" +======= #: wp-admin/theme-editor.php:31 msgid "After typing in your edits, click Update File." msgstr "AprÃ¨s avoir fait vos modifications, cliquez sur « Mettre Ã jour le fichier »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/update-core.php:519 +msgid "Themes and Plugins — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then click on the appropriate “Update” button. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button." +msgstr "ThÃ¨mes et extensions — Pour mettre Ã jour les thÃ¨mes et extensions individuellement depuis cet Ã©cran, utilisez les cases Ã jour pour faire votre sÃ©lection, puis cliquez sur le bouton « Mettre Ã jour » appropriÃ©. Pour mettre Ã jour tous les thÃ¨mes et toutes les extensions d’un coup, vous pouvez cocher la case en haut de la section pour tout sÃ©lectionner avant de cliquer sur le boutons de mise Ã jour." +||||||| .r11156 +#: wp-admin/nav-menus.php:498 +msgid "Add, organize, and modify individual menu items" +msgstr "Ajouter, organiser et modifier des Ã©lÃ©ments de menu individuels" +======= #: wp-admin/theme-editor.php:29 msgid "For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function." msgstr "Pour les fichiers PHP, vous pouvez utiliser le menu dÃ©roulant « Documentation » pour en apprendre plus sur les fonctions trouvÃ©es dans le ce fichier. Le bouton « Consulter » vous enverra sur la page dÃ©diÃ©e de cette fonction." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: User's display name. +#: wp-admin/user-edit.php:532 +msgid "Log %s out of all locations." +msgstr "DÃ©connecter %s de tous les supports/appareils." +||||||| .r11156 +#: wp-admin/nav-menus.php:506 +msgid "The menu management box at the top of the screen is used to control which menu is opened in the editor below." +msgstr "Le bloc de gestion des menus, en haut de l’Ã©cran, est utilisÃ© pour contrÃ´ler le menu qui est ouvert dans l’Ã©diteur ci-dessous." +======= #: wp-admin/theme-editor.php:28 msgid "Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box." msgstr "Commencez par choisir un thÃ¨me Ã modifier via le menu dÃ©roulant, et cliquez sur « SÃ©lectionner ». Une liste apparaÃ®tra ensuite avec tous les fichiers modÃ¨les. En cliquant sur n’importe quel de ces fichiers, vous verrez son contenu apparaÃ®tre dans l’Ã©diteur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:520 +msgid "Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here." +msgstr "Avez-vous perdu votre tÃ©lÃ©phone ou laissÃ© votre compte ouvert sur un ordinateur public ? Vous pouvez rester connectÃ© ici tout en vous dÃ©connectant partout ailleurs." +||||||| .r11156 +#: wp-admin/nav-menus.php:507 +msgid "To edit an existing menu, choose a menu from the drop down and click Select" +msgstr "Pour modifier un menu existant, choisissez un menu depuis la liste dÃ©roulant et cliquez sur SÃ©lectionner" +======= #: wp-admin/theme-editor.php:27 msgid "You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme." msgstr "Vous pouvez utiliser l’Ã©diteur de thÃ¨me pour modifier les fichiers CSS et PHP qui composent votre thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:508 wp-admin/user-edit.php:518 +msgid "Log Out Everywhere Else" +msgstr "Me dÃ©connecter partout ailleurs" +||||||| .r11156 +#: wp-admin/nav-menus.php:509 +msgid "You can assign theme locations to individual menus by selecting the desired settings at the bottom of the menu editor. To assign menus to all theme locations at once, visit the Manage Locations tab at the top of the screen." +msgstr "Vous pouvez assigner un emplacement du thÃ¨me Ã chaque menu en sÃ©lectionnant les rÃ©glages souhaitÃ©s en bas de l’Ã©diteur de menu. Pour assigner un menu Ã tous les emplacements d’un coup, rendez-vous dans l’onglet GÃ©rer les emplacements en haut de l’Ã©cran." +======= #: wp-admin/theme-editor.php:20 msgid "Edit Themes" msgstr "Modifier les thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:478 wp-admin/user-new.php:412 +msgid "Cancel password change" +msgstr "Annuler la modification du mot de passe" +||||||| .r11156 +#: wp-admin/nav-menus.php:513 +msgid "Menu Management" +msgstr "Gestion des menus" +======= #: wp-admin/theme-editor.php:18 msgid "You do not have sufficient permissions to edit templates for this site." msgstr "Vous n’avez pas les droits suffisants pour modifier les modÃ¨les de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:463 +msgid "Account Management" +msgstr "Gestion de compte" +||||||| .r11156 +#: wp-admin/nav-menus.php:517 +msgid "Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below." +msgstr "Chaque menu personnalisÃ© peut contenir un mÃ©lange de liens vers des pages, des catÃ©gories, des adresses web personnalisÃ©es ou d’autres types de contenu. Pour ajouter un lien dans un menu, sÃ©lectionnez un Ã©lÃ©ment dans l’un des blocs situÃ©s dans le colonne de gauche ci-dessous." +======= #: wp-admin/setup-config.php:342 msgid "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" msgstr "C’est parfait ! Vous avez passÃ© la premiÃ¨re partie de l’installation. WordPress peut dÃ©sormais communiquer avec votre base de donnÃ©es. Si vous Ãªtes prÃªt(e), il est maintenant temps de…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:469 +msgid "Generate Password" +msgstr "GÃ©nÃ©rer un mot de passe" +||||||| .r11156 +#: wp-admin/nav-menus.php:519 +msgid "Add one or several items at once by selecting the checkbox next to each item and clicking Add to Menu" +msgstr "Ajoutez un ou plusieurs Ã©lÃ©ments Ã la fois en cochant la case Ã cÃ´tÃ© de chaque Ã©lÃ©ment puis en cliquant sur « Ajouter au menu »" +======= #: wp-admin/setup-config.php:313 wp-admin/setup-config.php:344 msgid "Run the install" msgstr "Lancer l’installation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/user-edit.php:42 +msgid "You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button." +msgstr "Vous pouvez vous dÃ©connecter dâautres appareils, tels que votre tÃ©lÃ©phone ou un ordinateur public, en cliquant sur « Me dÃ©connecter partout ailleurs »" +||||||| .r11156 +#: wp-admin/nav-menus.php:520 +msgid "To add a custom link, expand the Links section, enter a URL and link text, and click Add to Menu" +msgstr "Pour ajouter un lien personnalisÃ©, ouvrez la section Liens, saisissez une adresse web et un texte pour le lien, et cliquez sur Ajouter au menu" +======= #: wp-admin/setup-config.php:312 msgid "After you’ve done that, click “Run the install.”" msgstr "AprÃ¨s cela, cliquez sur « Lancer l’installation »." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/user-edit.php:506 wp-admin/user-edit.php:516 +#: wp-admin/user-edit.php:526 +msgid "Sessions" +msgstr "Sessions" +||||||| .r11156 +#: wp-admin/nav-menus.php:521 +msgid "To reorganize menu items, drag and drop items with your mouse or use your keyboard. Drag or move a menu item a little to the right to make it a submenu" +msgstr "Pour rÃ©organiser les Ã©lÃ©ments du menu, glissez/dÃ©posez les Ã©lÃ©ments avec la souris ou utilisez votre clavier. Glissez ou dÃ©placez lÃ©gÃ¨rement un Ã©lement du menu pour en faire un sous-menu" +======= #: wp-admin/setup-config.php:306 msgid "You can create the wp-config.php manually and paste the following text into it." msgstr "Vous pouvez crÃ©er le fichier wp-config.php Ã la main, en y copiant/collant le texte suivant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:106 +msgid "Store uploads in this folder" +msgstr "Stocker les fichiers envoyÃ©s dans ce dossier" +||||||| .r11156 +#: wp-admin/nav-menus.php:522 +msgid "Delete a menu item by expanding it and clicking the Remove link" +msgstr "Supprimez un Ã©lÃ©ment du menu en l’ouvrant et en cliquant sur le bouton Supprimer" +======= #: wp-admin/setup-config.php:305 msgid "Sorry, but I can’t write the wp-config.php file." msgstr "DÃ©solÃ©, mais je ne peux Ã©crire dans le fichier wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:108 +msgid "Default is wp-content/uploads" +msgstr "Par dÃ©faut, wp-content/uploads" +||||||| .r11156 +#: wp-admin/nav-menus.php:526 +msgid "Editing Menus" +msgstr "Modification des menus" +======= #: wp-admin/setup-config.php:179 msgid "If you want to run multiple WordPress installations in a single database, change this." msgstr "Si vous souhaitez faire tourner plusieurs installations de WordPress sur une mÃªme base de donnÃ©es, modifiez ce rÃ©glage." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:113 +msgid "Full URL path to files" +msgstr "Adresse web complÃ¨te pour les fichiers" +||||||| .r11156 +#: wp-admin/nav-menus.php:530 +msgid "This screen is used for globally assigning menus to locations defined by your theme." +msgstr "Cet Ã©cran est utilisÃ© pour assigner de maniÃ¨re globale vos menus Ã des emplacements dÃ©finis par votre thÃ¨me." +======= #: wp-admin/setup-config.php:177 msgid "Table Prefix" msgstr "PrÃ©fixe des tables" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:115 +msgid "Configuring this is optional. By default, it should be blank." +msgstr "Ce rÃ©glage est facultatif. Par dÃ©faut, ce champ devrait Ãªtre vide." +||||||| .r11156 +#: wp-admin/nav-menus.php:531 +msgid "To assign menus to one or more theme locations, select a menu from each location’s drop down. When you’re finished, click Save Changes" +msgstr "Pour assigner des menus Ã un ou plusieurs emplacements, sÃ©lectionnez le menu depuis la liste dÃ©roulante de chaque emplacement. Lorsque vous avez terminÃ©, cliquez sur Enregistrer les modifications" +======= #: wp-admin/setup-config.php:174 msgid "You should be able to get this info from your web host, if localhost does not work." msgstr "Si localhost ne fonctionne pas, votre hÃ©bergeur doit pouvoir vous donner la bonne information." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:123 +msgid "Organize my uploads into month- and year-based folders" +msgstr "Organiser mes fichiers envoyÃ©s dans des dossiers mensuels et annuels" +||||||| .r11156 +#: wp-admin/nav-menus.php:532 +msgid "To edit a menu currently assigned to a theme location, click the adjacent ’Edit’ link" +msgstr "Pour modifier un menu actuellement assignÃ© Ã un emplacement du thÃ¨me, cliquez sur le lien « Modifier » adjacent" +======= #: wp-admin/setup-config.php:172 msgid "Database Host" msgstr "Adresse de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:15 +msgid "Permalink Settings" +msgstr "Options des permaliens" +||||||| .r11156 +#: wp-admin/nav-menus.php:533 +msgid "To add a new menu instead of assigning an existing one, click the ’Use new menu’ link. Your new menu will be automatically assigned to that theme location" +msgstr "Pour ajouter un nouveau menu au lieu d’en assigner un qui existe dÃ©jÃ , cliquez sur le lien « Utiliser un nouveau menu ». Votre nouveau menu sera automatiquement ajoutÃ© Ã cet emplacement du thÃ¨me" +======= #: wp-admin/setup-config.php:169 msgid "…and your MySQL password." msgstr "…et son mot de passe MySQL." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:157 +msgid "Permalink structure updated. Remove write access on web.config file now!" +msgstr "La structure des permaliens a Ã©tÃ© mise Ã jour. Pensez Ã retirer les droits d’accÃ¨s au fichier web.config dÃ¨s maintenant !" +||||||| .r11156 +#: wp-admin/nav-menus.php:553 +msgid "Edit Menus" +msgstr "Modifier les menus" +======= #: wp-admin/setup-config.php:168 msgctxt "example password" msgid "password" msgstr "mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:165 +msgid "You should update your .htaccess now." +msgstr "Vous devriez mettre Ã jour votre fichier .htaccess maintenant." +||||||| .r11156 +#: wp-admin/nav-menus.php:555 +msgid "Manage Locations" +msgstr "GÃ©rer les emplacements" +======= #: wp-admin/setup-config.php:164 msgid "Your MySQL username" msgstr "Votre identifiant MySQL" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:159 wp-admin/options-permalink.php:162 +#: wp-admin/options-permalink.php:167 wp-admin/options-permalink.php:171 +msgid "Permalink structure updated." +msgstr "Structure des permaliens enregistrÃ©e." +||||||| .r11156 +#: wp-admin/nav-menus.php:572 wp-admin/nav-menus.php:578 +msgid "Theme Location" +msgstr "Emplacement du thÃ¨me" +======= #: wp-admin/setup-config.php:163 msgctxt "example username" msgid "username" msgstr "utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:207 +msgid "Day and name" +msgstr "Date et titre" +||||||| .r11156 +#: wp-admin/nav-menus.php:573 wp-admin/nav-menus.php:579 +msgid "Assigned Menu" +msgstr "Menu assignÃ©" +======= #: wp-admin/setup-config.php:162 msgid "User Name" msgstr "Identifiant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:211 +msgid "Month and name" +msgstr "Mois et titre" +||||||| .r11156 +#: wp-admin/nav-menus.php:588 +msgid "Select a Menu" +msgstr "Choisir un menu" +======= #: wp-admin/setup-config.php:159 msgid "The name of the database you want to run WP in." msgstr "Le nom de la base de donnÃ©es dans laquelle vous souhaitez installer WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:215 +msgid "Numeric" +msgstr "NumÃ©rique" +||||||| .r11156 +#: wp-admin/nav-menus.php:600 +msgctxt "menu" +msgid "Edit" +msgstr "Modifier" +======= #: wp-admin/setup-config.php:157 msgid "Database Name" msgstr "Nom de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:225 +msgid "Custom Structure" +msgstr "Structure personnalisÃ©e" +||||||| .r11156 +#: wp-admin/nav-menus.php:606 +msgctxt "menu" +msgid "Use new menu" +msgstr "Utiliser le nouveau menu" +======= #: wp-admin/setup-config.php:154 msgid "Below you should enter your database connection details. If you’re not sure about these, contact your host." msgstr "Vous devez saisir ci-dessous les dÃ©tails de connexion Ã votre base de donnÃ©es. Si vous ne les connaissez pas, contactez votre hÃ©bergeur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:235 +msgid "Optional" +msgstr "Facultatif" +||||||| .r11156 +#: wp-admin/revision.php:198 +msgid "Restore This Revision" +msgstr "RÃ©tablir cette rÃ©vision" +======= #: wp-admin/setup-config.php:143 msgid "Let’s go!" msgstr "C’est parti !" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: prefix for category permalinks +#: wp-admin/options-permalink.php:242 +msgid "Category base" +msgstr "PrÃ©fixe des catÃ©gories" +||||||| .r11156 +#: wp-admin/nav-menus.php:400 +msgid "Move up one" +msgstr "Monter d’un cran" +======= #: wp-admin/setup-config.php:141 msgid "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…" msgstr "Vous devriez normalement avoir reÃ§u ces informations de la part de votre hÃ©bergeur. Si vous ne les avez pas, il vous faudra contacter votre hÃ©bergeur afin de continuer. Si vous Ãªtes prÃªt…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:272 +msgid "If you temporarily make your site’s root directory writable for us to generate the web.config file automatically, do not forget to revert the permissions after the file has been created." +msgstr "Si vous rendez temporairement le dossier racine accessible en Ã©criture afin que nous y gÃ©nÃ©rions directement le fichier web.config,n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +||||||| .r11156 +#: wp-admin/nav-menus.php:401 +msgid "Move down one" +msgstr "Descendre d’un cran" +======= #: wp-admin/setup-config.php:138 msgid "If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php." msgstr "Si, pour quelque raison que ce soit, la crÃ©ation automatique du fichier ne fonctionne pas, pas de panique. Tout ce qu’elle fait, c’est de complÃ©ter le fichier de configuration avec les informations de connexion Ã la base de donnÃ©es. Vous pouvez tout aussi bien ouvrir le fichier wp-config-sample.php dans un Ã©diteur de texte, y saisir les informations en question, et enregistrer le fichier sous le nom wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:15 +msgid "Reading Settings" +msgstr "Options de lecture" +||||||| .r11156 +#: wp-admin/nav-menus.php:402 +msgid "Move to the top" +msgstr "DÃ©placer tout en haut" +======= #: wp-admin/setup-config.php:137 msgid "We’re going to use this information to create a wp-config.php file." msgstr "Nous allons utiliser cette information pour crÃ©er le fichier wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:110 +msgid "A static page (select below)" +msgstr "Une page statique (choisir ci-dessous)" +||||||| .r11156 +#: wp-admin/nav-menus.php:404 +msgid "Move under %s" +msgstr "Placer sous %s" +======= #: wp-admin/setup-config.php:134 msgid "Table prefix (if you want to run more than one WordPress in a single database)" msgstr "PrÃ©fixe de table (si vous souhaitez avoir plusieurs WordPress sur une mÃªme base de donnÃ©es)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:114 +msgid "Front page: %s" +msgstr "Page d’accueil : %s" +||||||| .r11156 +#: wp-admin/nav-menus.php:406 +msgid "Move out from under %s" +msgstr "Sortir de sous %s" +======= #: wp-admin/setup-config.php:133 msgid "Database host" msgstr "Adresse de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:115 +msgid "Posts page: %s" +msgstr "Page des articles : %s" +||||||| .r11156 +#: wp-admin/nav-menus.php:408 +msgid "Under %s" +msgstr "Sous %s" +======= #: wp-admin/setup-config.php:132 msgid "Database password" msgstr "Mot de passe de l’utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:126 +msgid "posts" +msgstr "articles" +||||||| .r11156 +#: wp-admin/nav-menus.php:410 +msgid "Out from under %s" +msgstr "Sortir de sous %s" +======= #: wp-admin/setup-config.php:131 msgid "Database username" msgstr "Nom d’utilisateur MySQL" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:130 +msgid "Syndication feeds show the most recent" +msgstr "Les flux de syndication affichent les derniers" +||||||| .r11156 +#: wp-admin/nav-menus.php:412 +msgid "%1$s. Menu item %2$d of %3$d." +msgstr "%1$s. ÃlÃ©ment de menu %2$d sur %3$d." +======= #: wp-admin/setup-config.php:130 msgid "Database name" msgstr "Nom de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:136 +msgid "Full text" +msgstr "Le texte complet" +||||||| .r11156 +#: wp-admin/nav-menus.php:414 +msgid "%1$s. Sub item number %2$d under %3$s." +msgstr "%1$s. Sous-Ã©lÃ©ment numÃ©ro %2$d sous %3$s." +======= #: wp-admin/setup-config.php:128 msgid "Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding." msgstr "Bienvenue dans WordPress. Avant de nous lancer, nous avons besoin de certaines informations sur votre base de donnÃ©es. Il va vous falloir rÃ©unir les informations suivantes pour continuer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:137 +msgid "Summary" +msgstr "L’extrait" +||||||| .r11156 +#: wp-admin/user-edit.php:522 +msgid "Capabilities" +msgstr "CapacitÃ©s" +======= #: wp-admin/setup-config.php:82 msgid "WordPress › Setup Configuration File" msgstr "WordPress › Fichier de configuration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:15 +msgid "Writing Settings" +msgstr "Options d’Ã©criture" +||||||| .r11156 +#: wp-admin/user-edit.php:530 +msgid "Denied: %s" +msgstr "RefusÃ© : %s" +======= #: wp-admin/setup-config.php:57 msgid "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." msgstr "Le fichier wp-config.php existe dÃ©jÃ , un niveau au-dessus de votre installation WordPress. Si vous devez mettre Ã zÃ©ro vos Ã©lÃ©ments de configuration, veuillez d’abord effacer ce fichier. Vous pouvez essayer de lancer l’installation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:61 wp-admin/options-writing.php:62 +msgid "Formatting" +msgstr "Mise en forme" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:188 +msgid "Move" +msgstr "DÃ©placer" +======= #: wp-admin/setup-config.php:53 msgid "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." msgstr "Le fichier wp-config.php existe dÃ©jÃ . Si vous devez mettre Ã zÃ©ro n’importe quelle valeur de configuration dans ce fichier, veuillez commencer par le supprimer. Vous pouvez essayer l’installation maintenant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:65 +msgid "Convert emoticons like :-) and :-P to graphics on display" +msgstr "Convertir les Ã©moticÃ´nes, comme :-) et :-P, en images lors de l’affichage" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:189 +msgid "Up one" +msgstr "Un cran vers le haut" +======= #: wp-admin/setup-config.php:49 msgid "Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation." msgstr "DÃ©solÃ©, j’ai besoin d’un fichier wp-config-sample.php Ã partir duquel travailler. Veuillez remettre ce fichier en ligne au sein de votre installation WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:66 +msgid "WordPress should correct invalidly nested XHTML automatically" +msgstr "WordPress doit automatiquement corriger les balises XHTML non valides" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:190 +msgid "Down one" +msgstr "Descendre d’un cran" +======= #: wp-admin/revision.php:119 msgid "Revisions Management" msgstr "Gestion des rÃ©visions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:71 +msgid "Default Post Category" +msgstr "CatÃ©gorie par dÃ©faut des articles" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:193 +msgid "To the top" +msgstr "Tout en haut" +======= #: wp-admin/revision.php:110 msgid "To restore a revision, click Restore This Revision." msgstr "Pour rÃ©tablir cette rÃ©vision, cliquez sur « RÃ©tablir cette rÃ©vision »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:97 +msgid "Default Link Category" +msgstr "CatÃ©gorie par dÃ©faut des liens" +||||||| .r11156 +#: wp-admin/nav-menus.php:723 +msgid "Menu Structure" +msgstr "Structure du menu" +======= #: wp-admin/revision.php:109 msgid "Compare two different revisions by selecting the “Compare any two revisions” box to the side." msgstr "Comparez deux rÃ©visions diffÃ©rentes en cochant la case « Comparer n’importe quelles rÃ©visions » sur le cÃ´tÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:116 +msgid "Post via e-mail" +msgstr "Envoi d’article par e-mail" +||||||| .r11156 +#: wp-admin/nav-menus.php:743 +msgid "Menu Settings" +msgstr "RÃ©glages du menu" +======= #: wp-admin/revision.php:108 msgid "To navigate between revisions, drag the slider handle left or right or use the Previous or Next buttons." msgstr "Pour naviguer entre les rÃ©visions, faites glisser le curseur vers la gauche ou vers la droite ou utilisez les boutons PrÃ©cÃ©dente ou Suivante." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:117 +msgid "To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: %s, %s, %s." +msgstr "Pour publier dans WordPress par e-mail, vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout e-mail reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. Voici trois chaÃ®nes alÃ©atoires que vous pourriez utiliser : %s, %s, %s." +||||||| .r11156 +#: wp-admin/includes/template.php:2092 +msgid "The backup of this post in your browser is different from the version below." +msgstr "La sauvegarde de cet article dans votre navigateur est diffÃ©rente de la version ci-dessous." +======= #: wp-admin/revision.php:107 msgid "From this screen you can review, compare, and restore revisions:" msgstr "Depuis cet Ã©cran, vous pouvez visualiser, comparer et rÃ©tablir les rÃ©visions :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:123 +msgid "Port" +msgstr "Port" +||||||| .r11156 +#: wp-admin/includes/template.php:2093 +msgid "Restore the backup." +msgstr "RÃ©tablir la sauvegarde." +======= #: wp-admin/revision.php:106 msgid "Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added." msgstr "Les rÃ©visions sont des copies de votre article ou votre page, pÃ©riodiquement crÃ©Ã©es tandis que vous modifiez votre contenu. Sur la gauche, le texte en rouge indique le contenu qui a Ã©tÃ© enlevÃ©. Sur la droite, le texte en vert indique le contenu qui a Ã©tÃ© ajoutÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:128 +msgid "Login Name" +msgstr "Identifiant" +||||||| .r11156 +#: wp-admin/includes/template.php:2096 +msgid "Post restored successfully." +msgstr "L’article a bien Ã©tÃ© rÃ©tabli." +======= #: wp-admin/revision.php:105 msgid "This screen is used for managing your content revisions." msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer les rÃ©visions de vos contenus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:138 +msgid "Default Mail Category" +msgstr "CatÃ©gorie par dÃ©faut des articles envoyÃ©s par e-mail" +||||||| .r11156 +#: wp-admin/includes/template.php:2097 +msgid "Undo." +msgstr "Annuler." +======= #: wp-admin/revision.php:78 msgid "← Return to post editor" msgstr "← Retourner Ã l’Ã©diteur d’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:38 wp-admin/options-writing.php:159 +msgid "Update Services" +msgstr "Services de mise Ã jour" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1152 +msgid "Draft created on %1$s at %2$s" +msgstr "Brouillon crÃ©Ã© le %1$s Ã %2$s" +======= #: wp-admin/revision.php:77 msgid "Compare Revisions of “%1$s”" msgstr "Comparer les versions de « %1$s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options.php:229 +msgid "All Settings" +msgstr "Toutes les options" +||||||| .r11156 +#: wp-admin/includes/misc.php:730 +msgid "%s has taken over and is currently editing." +msgstr "%s a pris la main et modifie actuellement ce contenu." +======= #: wp-admin/post.php:289 msgid "This item has already been deleted." msgstr "Cet Ã©lÃ©ment a dÃ©jÃ Ã©tÃ© supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:20 +msgid "Edit Plugins" +msgstr "Modifier les extensions" +||||||| .r11156 +#: wp-admin/includes/post.php:1461 +msgid "Take over" +msgstr "Prendre la main" +======= #: wp-admin/post.php:277 msgid "You are not allowed to move this item out of the Trash." msgstr "Vous n’avez pas l’autorisation de dÃ©placer ce contenu en dehors de la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:115 +msgid "No such file exists! Double check the name and try again." +msgstr "Ce fichier n’existe pas ! Veuillez vÃ©rifier son nom et rÃ©essayer." +||||||| .r11156 +#: wp-admin/post.php:254 +msgid "You cannot move this item to the Trash. %s is currently editing." +msgstr "Vous ne pouvez pas dÃ©placer ce contenu dans la Corbeille. %s est en train de le modifier." +======= #: wp-admin/post.php:271 msgid "The item you are trying to restore from the Trash no longer exists." msgstr "L’Ã©lÃ©ment que vous essayez de sortir de la Corbeille n’existe plus." @@ -1671,361 +5937,1265 @@ msgstr "L’Ã©lÃ©ment que vous essayez de sortir de la Corbeille n’exi #: wp-admin/post.php:258 msgid "You cannot move this item to the Trash. %s is currently editing." msgstr "Vous ne pouvez pas dÃ©placer ce contenu dans la Corbeille. %s est en train de le modifier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:122 +msgid "Files of this type are not editable." +msgstr "Les fichiers de ce type ne sont pas Ã©ditables." +||||||| .r11156 +#: wp-admin/nav-menus.php:631 +msgid "Edit your menu below, or create a new menu." +msgstr "Modifiez votre menu ci-dessous, ou crÃ©ez un nouveau menu." +======= #: wp-admin/post.php:248 msgid "The item you are trying to move to the Trash no longer exists." msgstr "L’Ã©lÃ©ment que vous essayez de placer dans la Corbeille n’existe plus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:184 +msgid "Editing %s (active)" +msgstr "Modification de %s (activÃ©)" +||||||| .r11156 +#: wp-admin/nav-menus.php:636 +msgid "Select a menu to edit:" +msgstr "SÃ©lectionnez le menu Ã modifier :" +======= #: wp-admin/post.php:160 msgid "You can’t edit this item because it is in the Trash. Please restore it and try again." msgstr "Vous ne pouvez pas modifier ce contenu, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:186 +msgid "Browsing %s (active)" +msgstr "Contenu de %s (activÃ©)" +||||||| .r11156 +#: wp-admin/nav-menus.php:677 +msgid "or create a new menu." +msgstr "ou crÃ©ez un nouveau menu." +======= #: wp-admin/post.php:116 msgid "Unable to submit this form, please refresh and try again." msgstr "Impossible d’envoyer ce formulaire ; veuillez recharger la page et rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:189 +msgid "Editing %s (inactive)" +msgstr "Modification de %s (dÃ©sactivÃ©)" +||||||| .r11156 +#: wp-admin/includes/ms.php:604 +msgid "Thank you for Updating! Please visit the Upgrade Network page to update all your sites." +msgstr "Merci d’avoir fait cette mise Ã jour ! Rendez-vous sur la page de mise Ã jour du rÃ©seau afin de mettre Ã jour tous vos sites." +======= #: wp-admin/plugins.php:473 msgid "Search Installed Plugins" msgstr "Chercher parmi les extensions installÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:197 +msgid "Select plugin to edit:" +msgstr "SÃ©lectionnez l’extension Ã modifier :" +||||||| .r11156 +#: wp-admin/setup-config.php:335 +msgid "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" +msgstr "C’est parfait ! Vous avez passÃ© la premiÃ¨re partie de l’installation. WordPress peut dÃ©sormais communiquer avec votre base de donnÃ©es. Si vous Ãªtes prÃªt(e), il est maintenant temps de…" +======= #: wp-admin/plugins.php:442 msgid "No out of date plugins were selected." msgstr "Aucune extension pÃ©rimÃ©e n’a Ã©tÃ© sÃ©lectionnÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:207 +msgid "Documentation:" +msgstr "Documentation :" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:102 +msgid "sub item" +msgstr "sous-Ã©lÃ©ment" +======= #: wp-admin/plugins.php:440 msgid "Selected plugins deactivated." msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© dÃ©sactivÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:258 +msgid "Update File and Attempt to Reactivate" +msgstr "Mettre Ã jour le fichier et tenter de rÃ©activer l’extension" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:589 +msgid "Link Text" +msgstr "Cible du lien" +======= #: wp-admin/plugins.php:438 msgid "Plugin deactivated." msgstr "Extension dÃ©sactivÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:260 wp-admin/theme-editor.php:220 +msgid "Update File" +msgstr "Mettre Ã jour le fichier" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1324 +msgid "%1$s has been updated." +msgstr "%s a bien Ã©tÃ© mis Ã jour." +======= #: wp-admin/plugins.php:436 msgid "Selected plugins activated." msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© activÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:333 +msgid "Yes, delete these files" +msgstr "Oui, supprimer ces fichiers" +||||||| .r11156 +#: wp-admin/nav-menus.php:270 +msgid "Selected menus have been successfully deleted." +msgstr "Les menus sÃ©lectionnÃ©s ont bien Ã©tÃ© supprimÃ©s." +======= #: wp-admin/plugins.php:434 msgid "Plugin activated." msgstr "Extension activÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:381 +msgid "Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here." +msgstr "Les extensions Ã©tendent les fonctionnalitÃ©s de WordPress. Une fois une extension installÃ©e, vous pouvez l’activer ou la dÃ©sactiver ici." +||||||| .r11156 +#: wp-admin/nav-menus.php:713 +msgid "Menu 1" +msgstr "Menu 1" +======= #: wp-admin/plugins.php:431 msgid "The selected plugins have been deleted." msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© supprimÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:389 +msgid "If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated." +msgstr "Si une extension ne fonctionne pas correctement et que vous ne pouvez plus utiliser WordPress, supprimez ou renommez son fichier dans le rÃ©pertoire %s et elle sera automatiquement dÃ©sactivÃ©e." +||||||| .r11156 +#: wp-admin/nav-menus.php:724 +msgid "Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes." +msgstr "Modifiez votre menu par dÃ©faut en ajoutant ou en enlevant des Ã©lÃ©ments. Faites glissez chaque Ã©lÃ©ment pour les mettre dans l’ordre que vous souhaitez. Cliquez sur « CrÃ©er le menu » pour enregistrer vos modifications." +======= #: wp-admin/plugins.php:429 msgid "Plugin could not be deleted due to an error: %s" msgstr "L’extension n’a pu Ãªtre supprimÃ©e suite Ã une erreur fatale : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:432 +msgid "Plugin could not be deleted due to an error: %s" +msgstr "L’extension n’a pu Ãªtre supprimÃ©e suite Ã une erreur fatale : %s" +||||||| .r11156 +#: wp-admin/nav-menus.php:737 +msgid "Give your menu a name above, then click Create Menu." +msgstr "Donnez Ã votre un menu un nom ci-dessus, puis cliquez sur « CrÃ©er le menu »." +======= #: wp-admin/plugins.php:413 msgid "Plugin could not be activated because it triggered a fatal error." msgstr "L’extension n’a pu Ãªtre activÃ©e, car elle a dÃ©clenchÃ© une erreur fatale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:434 +msgid "The selected plugins have been deleted." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© supprimÃ©es." +||||||| .r11156 +#: wp-admin/nav-menus.php:756 +msgid "Auto add pages" +msgstr "Ajoutez automatiquement des pages" +======= #: wp-admin/plugins.php:411 msgid "The plugin generated %d characters of unexpected output during activation. If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin." msgstr "L’extension a gÃ©nÃ©rÃ© %d caractÃ¨res d’affichage inattendu lors de l’activation. Si vous voyez un message « headers already sent » (Les en-tÃªtes ont dÃ©jÃ Ã©tÃ© envoyÃ©s), des problÃ¨mes avec les flux de syndication ou d’autres erreurs, essayez de dÃ©sactiver ou enlever cette extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:437 +msgid "Plugin activated." +msgstr "Extension activÃ©e" +||||||| .r11156 +#: wp-admin/nav-menus.php:757 +msgid "Automatically add new top-level pages to this menu" +msgstr "Ajouter automatiquement les nouvelles pages principales de haut niveau Ã ce menu" +======= #: wp-admin/plugins.php:409 msgid "You cannot delete a plugin while it is active on the main site." msgstr "Vous ne pouvez pas effacer une extension tant qu’elle est activÃ©e sur le site principal." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:439 +msgid "Selected plugins activated." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© activÃ©es." +||||||| .r11156 +#: wp-admin/nav-menus.php:763 +msgid "Theme locations" +msgstr "Emplacements du thÃ¨me" +======= #: wp-admin/plugins.php:403 msgid "The plugin %s has been deactivated due to an error: %s" msgstr "L’extension %s a Ã©tÃ© dÃ©sactivÃ©e suite Ã l’erreur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:441 +msgid "Plugin deactivated." +msgstr "Extension dÃ©sactivÃ©e" +||||||| .r11156 +#: wp-admin/nav-menus.php:768 +msgid "(Currently set to: %s)" +msgstr "(Actuellement rÃ©glÃ© sur : %s)" +======= #: wp-admin/plugins.php:391 msgid "Documentation on Managing Plugins" msgstr "Documentation sur la gestion des extensions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:443 +msgid "Selected plugins deactivated." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© dÃ©sactivÃ©es." +||||||| .r11156 +#: wp-admin/plugin-editor.php:132 +msgid "The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function." +msgstr "Le menu « Documentation », situÃ© sous l’Ã©diteur, liste les fonctions PHP reconnues dans le fichier de l’extension. En cliquant sur « Consulter », vous serez envoyÃ© sur une page web documentant cette fonction." +======= #: wp-admin/plugins.php:386 msgid "If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated." msgstr "Si une extension ne fonctionne pas correctement et que vous ne pouvez plus utiliser WordPress, supprimez ou renommez son fichier dans le rÃ©pertoire %s et elle sera automatiquement dÃ©sactivÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:77 +msgid "Compare Revisions of “%1$s”" +msgstr "Comparer les versions de « %1$s »" +||||||| .r11156 +#: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:209 +msgid "Look Up" +msgstr "Consulter" +======= #: wp-admin/plugins.php:385 msgid "Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue." msgstr "La plupart du temps, les extensions fonctionnent comme il le faut, tant avec WordPress qu’entre elles. Mais parfois, les ajouts d’une extension peuvent empiÃ©ter sur celles d’une autre, ce qui provoque une incompatibilitÃ©. Si votre site rÃ©agit bizarrement, le problÃ¨me vient peut-Ãªtre de lÃ . Essayez de dÃ©sactiver toutes les extensions, puis de les rÃ©activer une Ã une pour trouver celle(s) en cause." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:124 +msgid "Blog pages show at most" +msgstr "Les pages du site doivent afficher au plus" +||||||| .r11156 +#: wp-admin/theme-editor.php:29 +msgid "For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function." +msgstr "Pour les fichiers PHP, vous pouvez utiliser le menu dÃ©roulant « Documentation » pour en apprendre plus sur les fonctions trouvÃ©es dans le ce fichier. Le bouton « Consulter » vous enverra sur la page dÃ©diÃ©e de cette fonction." +======= #: wp-admin/plugins.php:383 msgid "Troubleshooting" msgstr "Diagnostic" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options.php:153 +msgid "You do not have sufficient permissions to modify unregistered settings for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les rÃ©glages non enregistrÃ©s de ce site." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:647 +#: wp-admin/includes/misc.php:695 +msgid "%s is currently editing" +msgstr "%s modifie actuellement ce contenu" +======= #: wp-admin/plugins.php:379 msgid "You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here." msgstr "Vous pouvez trouver d’autres extensions pour votre site au moyen de la fonctionnalitÃ© de dÃ©couverte/installation d’extensions, ou en vous rendant sur le rÃ©pertoire des extensions WordPress et en les installant manuellement. Pour installer une extension manuellement, il vous suffit gÃ©nÃ©ralement de mettre ses fichiers en ligne dans le dossier /wp-content/plugins. Ceci fait, vous pourrez activer cette extension depuis la prÃ©sente page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:169 +msgid "This plugin has been deactivated because your changes resulted in a fatal error." +msgstr "Cette extension a Ã©tÃ© dÃ©sactivÃ©e, car vos modifications ont abouti Ã une erreur fatale" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1327 +msgid "http://codex.wordpress.org/First_Steps_With_WordPress" +msgstr "http://codex.wordpress.org/fr:Premiers_pas_avec_WordPress" +======= #: wp-admin/plugins.php:378 msgid "Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here." msgstr "Les extensions Ã©tendent les fonctionnalitÃ©s de WordPress. Une fois une extension installÃ©e, vous pouvez l’activer ou la dÃ©sactiver ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:416 +msgid "Plugin could not be activated because it triggered a fatal error." +msgstr "L’extension n’a pu Ãªtre activÃ©e, car elle a dÃ©clenchÃ© une erreur fatale." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:331 +msgid "You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button." +msgstr "Vous pouvez mettre en ligne et insÃ©rer des fichiers mÃ©dia (images, sons, documents, etc.) en cliquant sur le bouton » Ajouter un mÃ©dia «. Vous pouvez sÃ©lectionner vos images et fichiers parmi ceux dÃ©jÃ prÃ©sents dans la bibliothÃ¨que de mÃ©dias, ou en mettre en ligne de nouveaux Ã ajouter Ã votre article/page. Pour crÃ©er une galerie d’image, sÃ©lectionnez les images Ã ajouter et cliquez sur le bouton » CrÃ©er une nouvelle galerie «." +======= #: wp-admin/plugins.php:339 msgid "Click to view entire list of files which will be deleted" msgstr "Cliquez pour voir la liste des fichiers qui seront supprimÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:445 +msgid "No out of date plugins were selected." +msgstr "Aucune extension pÃ©rimÃ©e n’a Ã©tÃ© sÃ©lectionnÃ©e." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:332 +msgid "You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to learn more about embeds." +msgstr "Vous pouvez Ã©galement insÃ©rer des contenus en provenance de nombreux sites populaires, comme Twitter, YouTube, Flickr et d’autres, simplement en collant l’adresse web du contenu dans sa propre ligne dans le texte de votre article/page. RÃ©fÃ©rez-vous au Codex pour en apprendre plus sur les contenus insÃ©rÃ©s." +======= #: wp-admin/plugins.php:336 msgid "No, Return me to the plugin list" msgstr "Non, retourner Ã la liste des extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:118 wp-admin/update-core.php:244 +#: wp-admin/update-core.php:306 wp-admin/update-core.php:623 +#: wp-admin/update-core.php:627 +msgid "Update Plugins" +msgstr "Mettre Ã jour les extensions" +||||||| .r11156 +#: wp-admin/includes/template.php:1993 +msgid "New Media Manager" +msgstr "Nouveau gestionnaire de mÃ©dias" +======= #: wp-admin/plugins.php:330 msgid "Yes, Delete these files" msgstr "Oui, supprimer ces fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:62 wp-admin/options-reading.php:142 +#: wp-admin/options-reading.php:143 +msgid "Site Visibility" +msgstr "VisibilitÃ© du site" +||||||| .r11156 +#: wp-admin/includes/template.php:1994 +msgid "Uploading files and creating image galleries has a whole new look. Check it out!" +msgstr "La mise en ligne de fichiers et la crÃ©ation de galeries d’images dispose d’un tout nouveau style. Jetez-y un oeil !" +======= #: wp-admin/plugins.php:330 msgid "Yes, Delete these files and data" msgstr "Oui, supprimer ces fichiers et les donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:13 +msgid "You do not have sufficient permissions to manage plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les extensions de ce site." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:158 +msgid "Image rotation is not supported by your web host." +msgstr "La rotation d’image n’est pas disponible avec cet hÃ©bergeur." +======= #: wp-admin/plugins.php:319 msgid "Are you sure you wish to delete these files?" msgstr "Voulez-vous vraiment supprimer ces fichiers ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:54 +msgid "This screen contains the settings that affect the display of your content." +msgstr "Cet Ã©cran prÃ©sente les rÃ©glages qui influent sur l’affichage de votre contenu." +||||||| .r11156 +#: wp-admin/includes/bookmark.php:300 +msgid "If you are looking to use the link manager, please install the Link Manager plugin." +msgstr "Si vous souhaitez utiliser le gestionnaire de liens, veuillez installer l’extension Link Manager." +======= #: wp-admin/plugins.php:317 msgid "Are you sure you wish to delete these files and data?" msgstr "Vouslez-vous vraiment supprimer ces fichiers et donnÃ©es ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:55 +msgid "You can choose what’s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two Pages. One will become the front page, and the other will be where your posts are displayed." +msgstr "Vous pouvez choisir ce qui est affichÃ© en page d’accueil de votre site. Au choix, le mode « blog » classique (les articles dans l’ordre chronologique inverse) ou une page statique. Pour mettre en place une page statique, vous devez d’abord crÃ©er deux pages : la premiÃ¨re servira de page d’accueil, la seconde affichera vos articles." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1315 +msgid "Manage widgets or menus" +msgstr "GÃ©rez vos widgets ou vos menus" +======= #. translators: 1: plugin name, 2: plugin author #: wp-admin/plugins.php:310 msgid "%1$s by %2$s" msgstr "%1$s par %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:131 +msgid "items" +msgstr "Ã©lÃ©ments" +||||||| .r11156 +#: wp-admin/custom-background.php:143 +msgid "To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site." +msgstr "Pour utiliser une image de fond, mettez-la simplement en ligne ou choisissez une image dÃ©jÃ mise en ligne dans votre BibliothÃ¨que de MÃ©dias en cliquant sur le bouton « Choisir l’image ». Vous pouvez n’afficher qu’une occurrence de l’image, ou la rÃ©pÃ©ter afin de remplir l’Ã©cran. Vous pouvez choisir de garder le fond en place quand vous faites dÃ©filer le contenu, ou au contraire faire que le fond dÃ©file en mÃªme temps." +======= #. translators: 1: plugin name, 2: plugin author #: wp-admin/plugins.php:306 msgid "%1$s by %2$s (will also delete its data)" msgstr "%1$s par %2$s (attention : supprimera Ã©galement les donnÃ©es liÃ©es)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:121 +msgid "Mail Server" +msgstr "Serveur de messagerie" +||||||| .r11156 +#: wp-admin/custom-header.php:186 +msgid "Don’t forget to click “Save Changes” when you’re done!" +msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ© !" +======= #: wp-admin/plugins.php:298 msgid "You are about to remove the following plugins:" msgstr "Vous Ãªtes sur le point de supprimer les extensions suivantes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:18 +msgid "You do not have sufficient permissions to edit plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les extensions de ce site." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:272 +msgid "The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen." +msgstr "Le champ du titre et la zone d’Ã©dition de l’article sont inamovibles, mais vous pouvez dÃ©placer toutes les autres blocs par simple glisser/dÃ©poser. Vous pouvez Ã©galement les fermer/ouvrir en cliquant sur la barre de titre de chaque boite. Utilisez l’onglet « Options de l’Ã©cran » pour cacher d’autres boites (Extrait, Envoyer des rÃ©troliens, Champs personnalisÃ©s, Discussion, Identifiant, Auteur) ou pour choisir un affichage sur une ou deux colonnes pour cet Ã©cran." +======= #: wp-admin/plugins.php:296 msgid "These plugins may be active on other sites in the network." msgstr "Ces extensions peuvent Ãªtre actives sur d’autres sites du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:130 +msgid "You can use the editor to make changes to any of your plugins’ individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations." +msgstr "Vous pouvez utiliser l’Ã©diteur pour modifier n’importe quel fichier de vos extensions. Soyez cependant conscient que si vous modifiez les fichiers, les mises Ã jour les annuleront..." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:336 +msgid "Inserting Media" +msgstr "Insertion du mÃ©dia" +======= #: wp-admin/plugins.php:294 msgid "Delete Plugins" msgstr "Supprimer les extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:156 wp-admin/theme-editor.php:114 +msgid "Function Name…" +msgstr "Nom de fonction…" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:342 +msgid "Several boxes on this screen contain settings for how your content will be published, including:" +msgstr "Plusieurs sections de cet Ã©cran vous permettez de rÃ©gler la maniÃ¨re dont votre contenu sera publiÃ©, notamment :" +======= #: wp-admin/plugins.php:292 msgid "You are about to remove the following plugin:" msgstr "Vous Ãªtes sur le point de supprimer l’extension suivante :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:167 wp-admin/theme-editor.php:125 +msgid "File edited successfully." +msgstr "Le fichier a bien Ã©tÃ© modifiÃ©." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:346 +msgid "Format - Post Formats designate how your theme will display a specific post. For example, you could have a standard blog post with a title and paragraphs, or a short aside that omits the title and contains a short text blurb. Please refer to the Codex for descriptions of each post format. Your theme could enable all or some of 10 possible formats." +msgstr "Format d’article - DÃ©signe la maniÃ¨re dont votre thÃ¨me doit afficher un article donnÃ©. Par exemple, vous pourriez vouloir utiliser le format par dÃ©faut pour afficher titre et contenu, ou le format En passant pour ne pas utiliser le titre et n’afficher qu’un court texte. Lisez la documentation du Codex pour obtenir une description de chaque format d’article (en). Il est possible que votre thÃ¨me ne reconnaisse qu’une partie des 10 formats possibles." +======= #: wp-admin/plugins.php:290 msgid "This plugin may be active on other sites in the network." msgstr "Cette extension peut uniquement Ãªtre activÃ©e sur l’ensemble des sites du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:18 wp-admin/update.php:96 +#: wp-admin/update.php:127 +msgid "You do not have sufficient permissions to install plugins on this site." +msgstr "Vous n’avez pas les droits suffisants pour installer des extensions sur ce site." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:357 +msgid "Publish Settings" +msgstr "RÃ©glages de publication" +======= #: wp-admin/plugins.php:288 msgid "Delete Plugin" msgstr "Supprimer l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:33 wp-admin/plugins.php:68 wp-admin/plugins.php:137 +msgid "You do not have sufficient permissions to activate plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour activer les extensions de ce site." +||||||| .r11156 +#: wp-admin/edit-tags.php:215 +msgid "Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown." +msgstr "Parent - Les catÃ©gories, contrairement aux mots-clÃ©s, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e « Jazz », et Ã l’intÃ©rieur, plusieurs catÃ©gories comme « Bebop » et « Big Band ». Le fait d’avoir une hiÃ©rarchie est totalement facultatif. Pour crÃ©er une sous-catÃ©gorie, choisissez juste une autre catÃ©gorie depuis la liste dÃ©roulante « Parent » ." +======= #: wp-admin/plugins.php:213 msgid "You do not have sufficient permissions to delete plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour supprimer les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:165 wp-admin/plugins.php:185 +msgid "You do not have sufficient permissions to deactivate plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour dÃ©sactiver les extensions de ce site." +||||||| .r11156 +#: wp-admin/widgets.php:68 +msgid "When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved." +msgstr "En changeant de thÃ¨mes, il y a souvent des variations sur le nombre et l’agencement des zones de widgets et des barres latÃ©rales, et parfois tout cela entre en conflit, rendant la transition moins aisÃ©e. Si vous avec changÃ© de thÃ¨me et que certains widgets semblent manquer, faites dÃ©filer cet Ã©cran jusqu’en bas pour les retrouver dans la zone des widgets inactifs, oÃ¹ ils ont Ã©tÃ© conservÃ©s avec leurs derniers rÃ©glages." +======= #: wp-admin/plugins.php:162 wp-admin/plugins.php:182 msgid "You do not have sufficient permissions to deactivate plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour dÃ©sactiver les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:216 +msgid "You do not have sufficient permissions to delete plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour supprimer les extensions de ce site." +||||||| .r11156 +#: wp-admin/includes/media.php:2535 +msgid "You are using the multi-file uploader. Problems? Try the browser uploader instead." +msgstr "Vous utilisez l’outil de mise en ligne multi-fichiers. Si vous rencontrez des problÃ¨mes, essayez la mÃ©thode du navigateur Ã la place." +======= #: wp-admin/plugins.php:118 wp-admin/update-core.php:225 #: wp-admin/update-core.php:287 wp-admin/update-core.php:591 #: wp-admin/update-core.php:595 msgid "Update Plugins" msgstr "Mettre Ã jour les extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: plugin name, 2: plugin author +#: wp-admin/plugins.php:309 +msgid "%1$s by %2$s (will also delete its data)" +msgstr "%1$s par %2$s (attention : supprimera Ã©galement les donnÃ©es liÃ©es)" +||||||| .r11156 +#: wp-admin/async-upload.php:62 +msgctxt "media item" +msgid "Edit" +msgstr "Modifier" +======= #: wp-admin/plugins.php:33 wp-admin/plugins.php:68 wp-admin/plugins.php:137 msgid "You do not have sufficient permissions to activate plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour activer les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:382 +msgid "You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here." +msgstr "Vous pouvez trouver d’autres extensions pour votre site au moyen de la fonctionnalitÃ© de dÃ©couverte/installation d’extensions, ou en vous rendant sur le rÃ©pertoire des extensions WordPress et en les installant manuellement. Pour installer une extension manuellement, il vous suffit gÃ©nÃ©ralement de mettre ses fichiers en ligne dans le dossier /wp-content/plugins. Ceci fait, vous pourrez activer cette extension depuis la prÃ©sente page." +||||||| .r11156 +#: wp-admin/custom-header.php:706 +msgctxt "color" +msgid "Default: %s" +msgstr "Par dÃ©faut : %s" +======= #: wp-admin/plugins.php:13 msgid "You do not have sufficient permissions to manage plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:476 +msgid "Search Installed Plugins" +msgstr "Chercher parmi les extensions installÃ©es" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:251 +msgctxt "column name" +msgid "Uploaded to" +msgstr "Mis en ligne sur " +======= #: wp-admin/plugin-install.php:103 msgctxt "plugins" msgid "Browse" msgstr "Parcourir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:131 +msgid "Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don’t forget to save your changes (Update File) when you’re finished." +msgstr "Choisissez une extension Ã modifier dans le menu en haut Ã droite, et cliquez sur le bouton « SÃ©lectionner »." +||||||| .r11156 +#: wp-admin/custom-background.php:410 wp-admin/custom-header.php:856 +#: wp-admin/includes/ajax-actions.php:1845 +msgid "The uploaded file is not a valid image. Please try again." +msgstr "Le fichier mis en ligne n’est pas une image valide. Veuillez rÃ©essayer." +======= #: wp-admin/plugin-install.php:87 msgid "Documentation on Installing Plugins" msgstr "Documentation sur l’installation des extensions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:134 +msgid "If you want to make changes but don’t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below." +msgstr "Si vous voulez faire des modifications et ne pas les perdre Ã la prochaine mise Ã jour, cela signifie que vous Ãªtes prÃªt Ã Ã©crire votre propre extension. Pour obtenir des informations sur la maniÃ¨re de modifier une extension ou d’en crÃ©er une, ou simplement pour comprendre leur fonctionnement, suivez les liens ci-dessous." +||||||| .r11156 +#: wp-admin/custom-background.php:316 +msgid "Choose a Background Image" +msgstr "Choisir une image d’arriÃ¨re-plan" +======= #: wp-admin/plugin-install.php:82 msgid "If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin." msgstr "Si vous voulez installer une extension que vous avez tÃ©lÃ©chargÃ©e depuis un site tiers, cliquez sur le lien « Envoyer ». Il vous sera demandÃ© d’indiquer le fichier .zip Ã mettre en ligne, et ceci fait, vous pourrez activer l’extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:135 wp-admin/theme-editor.php:34 +msgid "Any edits to files from this screen will be reflected on all sites in the network." +msgstr "Toute modification aux fichiers de cet Ã©cran affectera l’ensemble des sites du rÃ©seau." +||||||| .r11156 +#: wp-admin/custom-header.php:607 +msgid "Choose a Custom Header" +msgstr "Choisir un en-tÃªte personnalisÃ©" +======= #: wp-admin/plugin-install.php:81 msgid "You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username." msgstr "Vous pouvez voir les extensions prÃ©fÃ©rÃ©es d’un utililsateur en utilisant le lien PrÃ©fÃ©rÃ©es situÃ© en haut Ã gauche de l’Ã©cran, et en renseignant leur identifiant WordPress.org" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:83 +msgid "Default Post Format" +msgstr "Format par dÃ©faut des articles" +||||||| .r11156 +#: wp-admin/custom-background.php:144 +msgid "You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." +msgstr "Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +======= #: wp-admin/plugin-install.php:80 msgid "If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly." msgstr "Si vous voulez juste vous faire une idÃ©e de ce qui est disponible, vous pouvez parcourir les rubriques Mises en avant et Populaires en utilisant les liens en haut Ã gauche de l’Ã©cran. Ces sections sont rÃ©guliÃ¨rement renouvelÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:30 +msgid "If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there." +msgstr "Si vous choisissez une option autre que « Valeur par dÃ©faut », la structure de vos permaliens, avec les marqueurs utilisÃ©s (encadrÃ©s par %), apparaÃ®tra dans le champ de « Structure personnalisÃ©e », d’oÃ¹ vous pourrez la modifier au plus proche de vos besoins." +||||||| .r11156 +#: wp-admin/custom-header.php:185 +msgid "In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." +msgstr "Dans la section « Texte d’en-tÃªte » de cette page, vous pouvez choisir d’afficher ce texte ou de le cacher. Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +======= #: wp-admin/plugin-install.php:79 msgid "If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag." msgstr "Si vous savez ce que vous voulez, commencez par le champ « Recherche » : il vous permet de lancer une recherche sur le dÃ©pÃ´t d’extensions de WordPress.org, pour un terme, un auteur, ou une Ã©tiquette en particulier. Vous pouvez Ã©galement lancer une recherche en cliquant sur une des Ã©tiquettes populaires. Plus une Ã©tiquette est grande, plus elle fait rÃ©fÃ©rence Ã un grand nombre d’extensions." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:320 +msgid "Are you sure you wish to delete these files and data?" +msgstr "Vouslez-vous vraiment supprimer ces fichiers et donnÃ©es ?" +||||||| .r11156 +#: wp-admin/customize.php:135 +msgid "Theme Customizer Options" +msgstr "Options de personnalisation du thÃ¨me" +======= #: wp-admin/plugin-install.php:77 msgid "Adding Plugins" msgstr "Ajout d’extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:322 +msgid "Are you sure you wish to delete these files?" +msgstr "Voulez-vous vraiment supprimer ces fichiers ?" +||||||| .r11156 +#: wp-admin/options-reading.php:65 +msgid "You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to “Discourage search engines from indexing this site” and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web." +msgstr "Vous pouvez choisir si votre site est parcouru par les robots et autres logiciels automatisÃ©s, ou non. Si vous prÃ©fÃ©rez que ces services ignorent votre site, cliquez sur le bouton radio marquÃ© « Demander aux moteurs de recherche de ne pas indexer ce site » et cliquez sur le bouton « Enregistrer les modifications » en bas de l’Ã©cran. Notez bien que votre vie privÃ©e n’est pas assurÃ©e : votre site reste visible de tous sur le Web." +======= #: wp-admin/plugin-install.php:73 msgid "Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section." msgstr "Les extensions s’ajoutent Ã WordPress afin d’ Ã©tendre ses fonctionnalitÃ©s par le biais de fonctions personnalisÃ©es. Les extensions sont dÃ©veloppÃ©es indÃ©pendamment du code de WordPress, par des milliers de dÃ©veloppeurs Ã travers le monde. Toutes les extensions prÃ©sentes dans le dÃ©pÃ´t officiel d’extensions de WordPress.org utilisent une licence compatible avec celle de WordPress. Vous pouvez trouver de nouvelles extensions Ã installer en lanÃ§ant une recherche ou en parcourant le dÃ©pÃ´t directement depuis la prÃ©sente page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:388 +msgid "Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue." +msgstr "La plupart du temps, les extensions fonctionnent comme il le faut, tant avec WordPress qu’entre elles. Mais parfois, les ajouts d’une extension peuvent empiÃ©ter sur celles d’une autre, ce qui provoque une incompatibilitÃ©. Si votre site rÃ©agit bizarrement, le problÃ¨me vient peut-Ãªtre de lÃ . Essayez de dÃ©sactiver toutes les extensions, puis de les rÃ©activer une Ã une pour trouver celle(s) en cause." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1310 +msgid "More Actions" +msgstr "Plus d’actions" +======= #: wp-admin/plugin-install.php:48 msgid "Add Plugins" msgstr "Ajouter des extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:412 +msgid "You cannot delete a plugin while it is active on the main site." +msgstr "Vous ne pouvez pas effacer une extension tant qu’elle est activÃ©e sur le site principal." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1325 +msgid "Turn comments on or off" +msgstr "Activez ou dÃ©sactivez les commentaires" +======= #: wp-admin/plugin-install.php:18 wp-admin/update.php:96 #: wp-admin/update.php:127 msgid "You do not have sufficient permissions to install plugins on this site." msgstr "Vous n’avez pas les droits suffisants pour installer des extensions sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:28 wp-admin/options-permalink.php:200 +msgid "Common Settings" +msgstr "RÃ©glages les plus courants" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1327 +msgid "Learn more about getting started" +msgstr "Plus d’informations pour bien dÃ©marrer" +======= #: wp-admin/plugin-editor.php:265 wp-admin/theme-editor.php:222 msgid "You need to make this file writable before you can save your changes. See the Codex for more information." msgstr "Vous devez rendre ce fichier accessible en Ã©criture avant de pouvoir enregistrer vos modifications. Lire la documentation CHMOD pour plus d’informations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:29 +msgid "Many people choose to use “pretty permalinks,” URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure." +msgstr "De nombreuses personnes prÃ©fÃ¨rent utiliser les liens simplifiÃ©s (\"pretty permalinks\"), qui contiennent des informations utiles, telles que le titre de l’article, plutÃ´t qu’un numÃ©ro d’article gÃ©nÃ©rique. Vous pouvez choisir n’importe quel type de format de permalien parmi les rÃ©glages les plus courants, ou concevoir votre propre structure personnalisÃ©e." +||||||| .r11156 +#: wp-admin/includes/media.php:2722 +msgid "File URL:" +msgstr "Adresse web du fichier :" +======= #: wp-admin/plugin-editor.php:260 wp-admin/theme-editor.php:220 msgid "Update File" msgstr "Mettre Ã jour le fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:37 +msgid "Custom Structures" +msgstr "Structure personnalisÃ©e" +||||||| .r11156 +#: wp-admin/edit-comments.php:127 +msgid "In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post." +msgstr "Dans la colonne « En rÃ©ponse Ã » se trouvent trois Ã©lÃ©ments. Le texte correspond au titre de l’article qui a inspirÃ© ce commentaire, et un clic sur ce lien vous permettra de modifier cet article. Le lien « Afficher l’article » mÃ¨ne Ã l’article sur le site. La petite bulle avec un nombre vous indique le nombre de commentaires que l’article a reÃ§us. Si la bulle est grise, vous avez modÃ©rÃ© tous les commentaires de cet article. Si elle est bleue, il y a des commentaires en attente de modÃ©ration. Un clic sur la bulle filtrera la liste des commentaires pour ne plus afficher que ceux liÃ©s Ã cet article." +======= #: wp-admin/plugin-editor.php:258 msgid "Update File and Attempt to Reactivate" msgstr "Mettre Ã jour le fichier et tenter de rÃ©activer l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:155 +msgid "You should update your web.config now." +msgstr "Vous devriez mettre Ã jour votre fichier web.config maintenant." +||||||| .r11156 +#: wp-admin/includes/ms.php:390 +msgid "Used: %1$s%% of %2$s" +msgstr "Taux d’utilisation : %1$s%% sur %2$s" +======= #: wp-admin/plugin-editor.php:252 msgid "Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated." msgstr "Attention : il n’est pas recommandÃ© de modifier des extensions activÃ©es. Si vos modifications amÃ¨nent une erreur fatale, l’extension sera automatiquement dÃ©sactivÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:196 wp-admin/options-permalink.php:216 +msgctxt "sample permalink base" +msgid "archives" +msgstr "archives" +||||||| .r11156 +#: wp-admin/users.php:230 +msgid "ID #%1$s: %2$s The current user will not be deleted." +msgstr "ID nÂ°%1$s : %2$s L’utilisateur actuel ne sera pas supprimÃ©." +======= #: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:209 msgid "Look Up" msgstr "Consulter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:208 wp-admin/options-permalink.php:212 +#: wp-admin/options-permalink.php:220 +msgctxt "sample permalink structure" +msgid "sample-post" +msgstr "exemple-article" +||||||| .r11156 +#: wp-admin/users.php:232 wp-admin/users.php:342 +msgid "ID #%1$s: %2$s" +msgstr "ID nÂ°%1$s : %2$s" +======= #: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:207 msgid "Documentation:" msgstr "Documentation :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:219 +msgid "Post name" +msgstr "Nom de l’article" +||||||| .r11156 +#: wp-admin/users.php:338 +msgid "ID #%1$s: %2$s The current user will not be removed." +msgstr "ID nÂ°%1$s : %2$s l’utilisateur actuel ne sera pas supprimÃ©." +======= #: wp-admin/plugin-editor.php:219 msgid "Plugin Files" msgstr "Fichiers de l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:265 +msgid "If you temporarily make your web.config file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved." +msgstr "Si vous rendez le fichier web.config accessible en Ã©criture afin de gÃ©nÃ©rer automatiquement les rÃ¨gles de rÃ©Ã©criture, n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +||||||| .r11156 +#: wp-admin/users.php:340 +msgid "ID #%1$s: %2$s You don't have permission to remove this user." +msgstr "ID nÂ°%1$s : %2$s vous n’avez pas l’autorisation de supprimer cet utilisateur." +======= #: wp-admin/plugin-editor.php:197 msgid "Select plugin to edit:" msgstr "SÃ©lectionnez l’extension Ã modifier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:149 +msgid "Note: Neither of these options blocks access to your site — it is up to search engines to honor your request." +msgstr "Note : Aucune de ses options ne bloque l’accÃ¨s Ã votre site — c’est au moteur de recherche de respecter votre demande." +||||||| .r11156 +#: wp-admin/users.php:220 +msgid "Please select an option." +msgstr "Veuillez choisir une option." +======= #: wp-admin/plugin-editor.php:191 msgid "Browsing %s (inactive)" msgstr "Contenu de %s (dÃ©sactivÃ©e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:134 wp-admin/options-reading.php:135 +msgid "For each article in a feed, show" +msgstr "Pour chaque article d’un flux, fournir" +||||||| .r11156 +#: wp-admin/includes/ms.php:282 +msgid "ERROR: The email address is already used." +msgstr "ERREUR : l’adresse de messagerie est dÃ©jÃ utilisÃ©e." +======= #: wp-admin/plugin-editor.php:189 msgid "Editing %s (inactive)" msgstr "Modification de %s (dÃ©sactivÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:29 +msgid "Post Via Email" +msgstr "Envoi d’article par e-mail" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:224 wp-admin/includes/image-edit.php:289 +#: wp-admin/includes/image-edit.php:408 +msgid "$image needs to be an WP_Image_Editor object" +msgstr "$image doit Ãªtre un objet WP_Image_Editor" +======= #: wp-admin/plugin-editor.php:186 msgid "Browsing %s (active)" msgstr "Contenu de %s (activÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:39 +msgid "If desired, WordPress will automatically alert various services of your new posts." +msgstr "Si vous le souhaitez, WordPress peut automatiquement informer diffÃ©rents services en ligne de vos nouvelles publications." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:336 +msgid "Use WP_Image_Editor::rotate" +msgstr "Utilisez WP_Image_Editor::rotate" +======= #: wp-admin/plugin-editor.php:184 msgid "Editing %s (active)" msgstr "Modification de %s (activÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:73 +msgid "Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section." +msgstr "Les extensions s’ajoutent Ã WordPress afin d’ Ã©tendre ses fonctionnalitÃ©s par le biais de fonctions personnalisÃ©es. Les extensions sont dÃ©veloppÃ©es indÃ©pendamment du code de WordPress, par des milliers de dÃ©veloppeurs Ã travers le monde. Toutes les extensions prÃ©sentes dans le dÃ©pÃ´t officiel d’extensions de WordPress.org utilisent une licence compatible avec celle de WordPress. Vous pouvez trouver de nouvelles extensions Ã installer en lanÃ§ant une recherche ou en parcourant le dÃ©pÃ´t directement depuis la prÃ©sente page." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:358 +msgid "Use WP_Image_Editor::flip" +msgstr "Utilisez WP_Image_Editor::flip" +======= #: wp-admin/plugin-editor.php:169 msgid "This plugin has been deactivated because your changes resulted in a fatal error." msgstr "Cette extension a Ã©tÃ© dÃ©sactivÃ©e, car vos modifications ont abouti Ã une erreur fatale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:77 +msgid "Adding Plugins" +msgstr "Ajout d’extensions" +||||||| .r11156 +#: wp-admin/includes/template.php:1222 +msgid "The privacy options group has been removed. Use another settings group." +msgstr "Le groupement d’options « Vie privÃ©e » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +======= #: wp-admin/plugin-editor.php:167 wp-admin/theme-editor.php:125 msgid "File edited successfully." msgstr "Le fichier a bien Ã©tÃ© modifiÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: plugin name, 2: plugin author +#: wp-admin/plugins.php:313 +msgid "%1$s by %2$s" +msgstr "%1$s par %2$s" +||||||| .r11156 +#: wp-admin/options-writing.php:183 +msgid "WordPress is not notifying any Update Services because of your site’s visibility settings." +msgstr "WordPress ne notifie aucun des services de notification (en), du fait des rÃ©glages de vie privÃ©e de votre site." +======= #: wp-admin/plugin-editor.php:156 wp-admin/theme-editor.php:114 msgid "Function Name…" msgstr "Nom de fonction…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:339 +msgid "No, return me to the plugin list" +msgstr "Non, retourner Ã la liste des extensions" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:212 +#: wp-admin/theme-editor.php:33 wp-admin/update-core.php:300 +msgid "http://codex.wordpress.org/Child_Themes" +msgstr "http://codex.wordpress.org/fr:ThÃ¨mes_Enfant" +======= #: wp-admin/plugin-editor.php:141 msgid "Documentation on Writing Plugins" msgstr "Documentation sur la crÃ©ation d’extensions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:342 +msgid "Click to view entire list of files which will be deleted" +msgstr "Cliquez pour voir la liste des fichiers qui seront supprimÃ©s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:299 +msgid "Search Engines Discouraged" +msgstr "Moteurs de recherche refusÃ©s" +======= #: wp-admin/plugin-editor.php:140 msgid "Documentation on Editing Plugins" msgstr "Documentation sur l’Ã©dition des extensions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:386 +msgid "Troubleshooting" +msgstr "Diagnostic" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1279 +msgid "Welcome to WordPress!" +msgstr "Bienvenue dans WordPress !" +======= #: wp-admin/plugin-editor.php:135 wp-admin/theme-editor.php:34 msgid "Any edits to files from this screen will be reflected on all sites in the network." msgstr "Toute modification aux fichiers de cet Ã©cran affectera l’ensemble des sites du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:134 +msgid "Database name" +msgstr "Nom de la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1280 +msgid "We’ve assembled some links to get you started:" +msgstr "Voici quelques liens pour vous aider Ã dÃ©marrer :" +======= #: wp-admin/plugin-editor.php:134 msgid "If you want to make changes but don’t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below." msgstr "Si vous voulez faire des modifications et ne pas les perdre Ã la prochaine mise Ã jour, cela signifie que vous Ãªtes prÃªt Ã Ã©crire votre propre extension. Pour obtenir des informations sur la maniÃ¨re de modifier une extension ou d’en crÃ©er une, ou simplement pour comprendre leur fonctionnement, suivez les liens ci-dessous." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:138 +msgid "Table prefix (if you want to run more than one WordPress in a single database)" +msgstr "PrÃ©fixe de table (si vous souhaitez avoir plusieurs WordPress sur une mÃªme base de donnÃ©es)" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1284 +msgid "Get Started" +msgstr "Lancez-vous !" +======= #: wp-admin/plugin-editor.php:133 wp-admin/theme-editor.php:30 msgid "In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue." msgstr "Dans la zone de modification, la touche Tab ajoute un caractÃ¨re de tabulation. Pour vous dÃ©placer en dehors de cette zone en appuyant sur Tab, appuyez sur la touche Ãchap. (Esc.) suivie de la touche Tab. Dans certains cas, la touche Ãchap. devra Ãªtre appuyÃ©e deux fois avant que la touche Tab ne vous permette de continuer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:145 +msgid "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…" +msgstr "Vous devriez normalement avoir reÃ§u ces informations de la part de votre hÃ©bergeur. Si vous ne les avez pas, il vous faudra contacter votre hÃ©bergeur afin de continuer. Si vous Ãªtes prÃªt…" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1289 +msgid "or, change your theme completely" +msgstr "ou alors, changez complÃ¨tement de thÃ¨me" +======= #: wp-admin/plugin-editor.php:132 msgid "The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function." msgstr "Le menu « Documentation », situÃ© sous l’Ã©diteur, liste les fonctions PHP reconnues dans le fichier de l’extension. En cliquant sur « Consulter », vous serez envoyÃ© sur une page web documentant cette fonction." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:252 +msgid "Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated." +msgstr "Attention : il n’est pas recommandÃ© de modifier des extensions activÃ©es. Si vos modifications amÃ¨nent une erreur fatale, l’extension sera automatiquement dÃ©sactivÃ©e." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1293 +msgid "Next Steps" +msgstr "Ãtapes suivantes" +======= #: wp-admin/plugin-editor.php:131 msgid "Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don’t forget to save your changes (Update File) when you’re finished." msgstr "Choisissez une extension Ã modifier dans le menu en haut Ã droite, et cliquez sur le bouton « SÃ©lectionner »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:165 +msgid "You can’t edit this item because it is in the Trash. Please restore it and try again." +msgstr "Vous ne pouvez pas modifier ce contenu, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1296 wp-admin/includes/dashboard.php:1299 +msgid "Edit your front page" +msgstr "Modifiez votre page d’accueil" +======= #: wp-admin/plugin-editor.php:130 msgid "You can use the editor to make changes to any of your plugins’ individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations." msgstr "Vous pouvez utiliser l’Ã©diteur pour modifier n’importe quel fichier de vos extensions. Soyez cependant conscient que si vous modifiez les fichiers, les mises Ã jour les annuleront..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:86 +msgid "WordPress › Setup Configuration File" +msgstr "WordPress › Fichier de configuration" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1297 wp-admin/includes/dashboard.php:1300 +msgid "Add additional pages" +msgstr "Ajoutez de nouvelles pages" +======= #: wp-admin/plugin-editor.php:122 msgid "Files of this type are not editable." msgstr "Les fichiers de ce type ne sont pas Ã©ditables." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:132 +msgid "Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding." +msgstr "Bienvenue dans WordPress. Avant de nous lancer, nous avons besoin de certaines informations sur votre base de donnÃ©es. Il va vous falloir rÃ©unir les informations suivantes pour continuer." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1301 +msgid "Add a blog post" +msgstr "Ãcrivez un article" +======= #: wp-admin/plugin-editor.php:115 msgid "No such file exists! Double check the name and try again." msgstr "Ce fichier n’existe pas ! Veuillez vÃ©rifier son nom et rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:62 wp-admin/options-reading.php:142 +#: wp-admin/options-reading.php:143 +msgid "Search Engine Visibility" +msgstr "VisibilitÃ© pour les moteurs de recherche" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1303 +msgid "Write your first blog post" +msgstr "Ãcrivez votre premier article" +======= #: wp-admin/plugin-editor.php:20 msgid "Edit Plugins" msgstr "Modifier les extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:63 +msgid "You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to “Discourage search engines from indexing this site” and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web." +msgstr "Vous pouvez choisir si votre site est parcouru par les robots et autres logiciels automatisÃ©s, ou non. Si vous prÃ©fÃ©rez que ces services ignorent votre site, cliquez sur le bouton radio marquÃ© « Demander aux moteurs de recherche de ne pas indexer ce site » et cliquez sur le bouton « Enregistrer les modifications » en bas de l’Ã©cran. Notez bien que votre vie privÃ©e n’est pas assurÃ©e : votre site reste visible de tous sur le Web." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1304 +msgid "Add an About page" +msgstr "Ajoutez une page « Ã propos »" +======= #: wp-admin/plugin-editor.php:18 msgid "You do not have sufficient permissions to edit plugins for this site." msgstr "Vous n’avez pas les droits suffisants pour modifier les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:148 wp-admin/options-reading.php:168 +msgid "Discourage search engines from indexing this site" +msgstr "Demander aux moteurs de recherche de ne pas indexer ce site" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1306 +msgid "View your site" +msgstr "Affichez votre site" +======= #: wp-admin/options.php:224 msgid "All Settings" msgstr "Toutes les options" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:30 +msgid "Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret." +msgstr "Les rÃ©glages de publication par e-mail vous permettant d’envoyer Ã votre installation WordPress un e-mail dont le contenu sera publiÃ© dans un article. Vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout message reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. " +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:297 +msgid "Uploaded on: %1$s" +msgstr "Mise en ligne le : %1$s" +======= #: wp-admin/options.php:183 msgid "The %1$s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API" msgstr "L’option %1$s n’est pas enregistrÃ©e. Les options non enregistrÃ©es sont obsolÃ¨tes. Consultez la documentation sur la page https://codex.wordpress.org/Settings_API" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options.php:149 +msgid "ERROR: options page not found." +msgstr "ERREUR : La page d’options est introuvable." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:218 +msgid "If you have marked plugins as favorites on WordPress.org, you can browse them here." +msgstr "Si vous avez mis des extensions en favoris sur WordPress.org, vous pouvez les voir ici." +======= #: wp-admin/options.php:148 msgid "You do not have sufficient permissions to modify unregistered settings for this site." msgstr "Vous n’avez pas les droits suffisants pour modifier les rÃ©glages non enregistrÃ©s de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:82 +msgid "If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin." +msgstr "Si vous voulez installer une extension que vous avez tÃ©lÃ©chargÃ©e depuis un site tiers, cliquez sur le lien « Envoyer ». Il vous sera demandÃ© d’indiquer le fichier .zip Ã mettre en ligne, et ceci fait, vous pourrez activer l’extension." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:222 +msgid "Your WordPress.org username:" +msgstr "Votre identifiant WordPress.org :" +======= #: wp-admin/options.php:144 msgid "ERROR: options page not found." msgstr "ERREUR : La page d’options est introuvable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:414 +msgid "The plugin generated %d characters of unexpected output during activation. If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin." +msgstr "L’extension a gÃ©nÃ©rÃ© %d caractÃ¨res d’affichage inattendu lors de l’activation. Si vous voyez un message « headers already sent » (Les en-tÃªtes ont dÃ©jÃ Ã©tÃ© envoyÃ©s), des problÃ¨mes avec les flux de syndication ou d’autres erreurs, essayez de dÃ©sactiver ou enlever cette extension." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:224 +msgid "Get Favorites" +msgstr "RÃ©cupÃ©rer les extensions favorites." +======= #: wp-admin/options-writing.php:167 msgid "WordPress is not notifying any Update Services because of your site’s visibility settings." msgstr "WordPress ne notifie aucun des services de notification (en), du fait des rÃ©glages de vie privÃ©e de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:49 +msgid "Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation." +msgstr "DÃ©solÃ©, j’ai besoin d’un fichier wp-config-sample.php Ã partir duquel travailler. Veuillez remettre ce fichier en ligne au sein de votre installation WordPress." +||||||| .r11156 +#: wp-admin/includes/plugin.php:1733 wp-admin/includes/plugin.php:1738 +#: wp-admin/includes/plugin.php:1761 wp-admin/includes/plugin.php:1766 +#: wp-admin/includes/template.php:1179 wp-admin/includes/template.php:1184 +msgid "The \"%s\" options group has been removed. Use another settings group." +msgstr "Le groupement d’options « %s » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +======= #: wp-admin/options-writing.php:161 msgid "When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see Update Services on the Codex. Separate multiple service URLs with line breaks." msgstr "Quand vous publiez un nouvel article, WordPress peut notifier un service de mise Ã jour. Une explication se trouve sur la page Update Services du Codex anglophone. SÃ©parez les adresses web par des retours Ã la ligne." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:135 +msgid "Database username" +msgstr "Nom d’utilisateur MySQL" +||||||| .r11156 +#: wp-admin/includes/update-core.php:1138 wp-admin/update-core.php:421 +msgid "Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here." +msgstr "Bienvenue dans WordPress %1$s. Vous allez Ãªtre redirigÃ© vers l’Ã©cran « Ã propos » de WordPress. Si ce n’est pas le cas, cliquez ici." +======= #: wp-admin/options-writing.php:136 msgid "Default Mail Category" msgstr "CatÃ©gorie par dÃ©faut des articles envoyÃ©s par e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:136 +msgid "Database password" +msgstr "Mot de passe de l’utilisateur" +||||||| .r11156 +#: wp-admin/options-reading.php:58 +msgid "You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary." +msgstr "Vous pouvez Ã©galement contrÃ´ler l’affichage de votre contenu dans les flux RSS, comme le nombre maximum d’articles Ã afficher, et s’il faut afficher l’article en entier ou juste un rÃ©sumÃ©." +======= #: wp-admin/options-writing.php:126 msgid "Login Name" msgstr "Identifiant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:142 +msgid "If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php." +msgstr "Si, pour quelque raison que ce soit, la crÃ©ation automatique du fichier ne fonctionne pas, pas de panique. Tout ce qu’elle fait, c’est de complÃ©ter le fichier de configuration avec les informations de connexion Ã la base de donnÃ©es. Vous pouvez tout aussi bien ouvrir le fichier wp-config-sample.php dans un Ã©diteur de texte, y saisir les informations en question, et enregistrer le fichier sous le nom wp-config.php." +||||||| .r11156 +#: wp-admin/options-reading.php:64 wp-admin/options-reading.php:144 +#: wp-admin/options-reading.php:145 +msgid "Search Engine Visibility" +msgstr "VisibilitÃ© pour les moteurs de recherche" +======= #: wp-admin/options-writing.php:121 msgid "Port" msgstr "Port" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:118 +msgid "Warning: these pages should not be the same!" +msgstr "Attention : ces pages ne devraient pas Ãªtre les mÃªmes !" +||||||| .r11156 +#: wp-admin/options-reading.php:148 +msgid "Allow search engines to index this site" +msgstr "Autoriser les moteurs de recherche Ã indexer ce site" +======= #: wp-admin/options-writing.php:119 msgid "Mail Server" msgstr "Serveur de messagerie" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/options-reading.php:169 +msgid "It is up to search engines to honor this request." +msgstr "Certains moteurs de recherche peuvent dÃ©cider de l’indexer malgrÃ© tout." +||||||| .r11156 +#: wp-admin/options-reading.php:150 wp-admin/options-reading.php:170 +msgid "Discourage search engines from indexing this site" +msgstr "Demander aux moteurs de recherche de ne pas indexer ce site" +#: wp-admin/options-reading.php:171 +msgid "It is up to search engines to honor this request." +msgstr "Certains moteurs de recherche peuvent dÃ©cider de l’indexer malgrÃ© tout." +======= #: wp-admin/options-writing.php:115 msgid "To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: %s, %s, %s." msgstr "Pour publier dans WordPress par e-mail, vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout e-mail reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. Voici trois chaÃ®nes alÃ©atoires que vous pourriez utiliser : %s, %s, %s." @@ -2033,1052 +7203,3844 @@ msgstr "Pour publier dans WordPress par e-mail, vous devez dÃ©finir un compte e- #: wp-admin/options-writing.php:114 msgid "Post via e-mail" msgstr "Envoi d’article par e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:21 +msgid "You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links." +msgstr "Vous disposez de plusieurs mÃ©thodes pour envoyer du contenu. Cet Ã©cran vous prÃ©sente les rÃ©glages de chacune. La premiÃ¨re section gÃ¨re l’Ã©diteur de l’administration de WordPress, tandis que les autres gÃ¨rent les mÃ©thodes externes. Pour obtenir plus d’informations sur toutes ces mÃ©thodes, suivez les liens vers la documentation." +||||||| .r11156 +#: wp-admin/plugin-install.php:58 +msgid "If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag." +msgstr "Si vous savez ce que vous voulez, commencez par le champ « Recherche » : il vous permet de lancer une recherche sur le dÃ©pÃ´t d’extensions de WordPress.org, pour un terme, un auteur, ou un mot-clÃ© particulier. Vous pouvez Ã©galement lancer une recherche en cliquant sur un des mots-clÃ©s populaires. Plus un mot-clÃ© est grand, plus il fait rÃ©fÃ©rence Ã un grand nombre d’extensions." +======= #: wp-admin/options-writing.php:95 msgid "Default Link Category" msgstr "CatÃ©gorie par dÃ©faut des liens" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/plugin-editor.php:191 +msgid "Browsing %s (inactive)" +msgstr "Contenu de %s (dÃ©sactivÃ©e)" + +#: wp-admin/plugin-editor.php:219 +msgid "Plugin Files" +msgstr "Fichiers de l’extension" +#: wp-admin/plugin-install.php:81 +msgid "You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username." +msgstr "Vous pouvez voir les extensions prÃ©fÃ©rÃ©es d’un utililsateur en utilisant le lien PrÃ©fÃ©rÃ©es situÃ© en haut Ã gauche de l’Ã©cran, et en renseignant leur identifiant WordPress.org" +||||||| .r11156 +#: wp-admin/plugin-install.php:60 +msgid "You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username." +msgstr "Vous pouvez voir les extensions prÃ©fÃ©rÃ©es d’un utililsateur en utilisant le lien PrÃ©fÃ©rÃ©es situÃ© en haut Ã gauche de l’Ã©cran, et en renseignant leur identifiant WordPress.org" +======= #: wp-admin/options-writing.php:81 msgid "Default Post Format" msgstr "Format par dÃ©faut des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:147 +msgid "Let’s go!" +msgstr "C’est parti !" +||||||| .r11156 +#: wp-admin/plugin-install.php:61 +msgid "If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin." +msgstr "Si vous voulez installer une extension que vous avez tÃ©lÃ©chargÃ©e depuis un site tiers, cliquez sur le lien « Envoyer ». Il vous sera demandÃ© d’indiquer le fichier .zip Ã mettre en ligne, et ceci fait, vous pourrez activer l’extension." +======= #: wp-admin/options-writing.php:69 msgid "Default Post Category" msgstr "CatÃ©gorie par dÃ©faut des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:22 +msgid "This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures." +msgstr "Cet Ã©cran vous permet de choisir la structure de permalien par dÃ©faut. Vous pouvez choisir les rÃ©glages les plus courants, ou crÃ©er la vÃ´tre." +||||||| .r11156 +#: wp-admin/setup-config.php:138 +msgid "If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php." +msgstr "Si, pour quelque raison que ce soit, la crÃ©ation automatique du fichier ne fonctionne pas, pas de panique. Tout ce qu’elle fait, c’est de complÃ©ter le fichier de configuration avec les informations de connexion Ã la base de donnÃ©es. Vous pouvez tout aussi bien ouvrir le fichier wp-config-sample.php dans un Ã©diteur de texte, y saisir les informations en question, et enregistrer le fichier sous le nom wp-config.php." +======= #: wp-admin/options-writing.php:65 msgid "WordPress should correct invalidly nested XHTML automatically" msgstr "WordPress doit automatiquement corriger les balises XHTML non valides" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:137 +msgid "Database host" +msgstr "Adresse de la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/setup-config.php:154 +msgid "Below you should enter your database connection details. If you’re not sure about these, contact your host." +msgstr "Vous devez saisir ci-dessous les dÃ©tails de connexion Ã votre base de donnÃ©es. Si vous ne les connaissez pas, contactez votre hÃ©bergeur." +======= #: wp-admin/options-writing.php:64 msgid "Convert emoticons like :-) and :-P to graphics on display" msgstr "Convertir les Ã©moticÃ´nes, comme :-) et :-P, en images lors de l’affichage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:132 +msgid "The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function." +msgstr "Le menu « Documentation », situÃ© sous l’Ã©diteur, liste les fonctions PHP reconnues dans le fichier de l’extension. En cliquant sur « Consulter », vous serez envoyÃ© sur une page web documentant cette fonction." +||||||| .r11156 +#: wp-admin/setup-config.php:300 +msgid "Sorry, but I can’t write the wp-config.php file." +msgstr "DÃ©solÃ©, mais je ne peux Ã©crire dans le fichier wp-config.php." +======= #: wp-admin/options-writing.php:60 wp-admin/options-writing.php:61 msgid "Formatting" msgstr "Mise en forme" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:209 +msgid "Look Up" +msgstr "Consulter" +||||||| .r11156 +#: wp-admin/setup-config.php:307 +msgid "After you’ve done that, click “Run the install.”" +msgstr "AprÃ¨s cela, cliquez sur « Lancer l’installation »." +======= #: wp-admin/options-writing.php:45 msgid "Documentation on Writing Settings" msgstr "Documentation sur les rÃ©glages de l’Ã©criture (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:263 +msgid "You cannot move this item to the Trash. %s is currently editing." +msgstr "Vous ne pouvez pas dÃ©placer ce contenu dans la Corbeille. %s est en train de le modifier." +||||||| .r11156 +#: wp-admin/themes.php:130 +msgid "Settings saved and theme activated. Visit site" +msgstr "RÃ©glages enregistrÃ©s et thÃ¨me activÃ©. Voir le site" +======= #: wp-admin/options-writing.php:39 msgid "If desired, WordPress will automatically alert various services of your new posts." msgstr "Si vous le souhaitez, WordPress peut automatiquement informer diffÃ©rents services en ligne de vos nouvelles publications." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:105 +msgid "This screen is used for managing your content revisions." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer les rÃ©visions de vos contenus." +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:211 +msgid "This child theme requires its parent theme, %2$s." +msgstr "Ce thÃ¨me enfant nÃ©cessite son thÃ¨me parent, %2$s." +======= #: wp-admin/options-writing.php:38 wp-admin/options-writing.php:157 msgid "Update Services" msgstr "Services de mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:106 +msgid "Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added." +msgstr "Les rÃ©visions sont des copies de votre article ou votre page, pÃ©riodiquement crÃ©Ã©es tandis que vous modifiez votre contenu. Sur la gauche, le texte en rouge indique le contenu qui a Ã©tÃ© enlevÃ©. Sur la droite, le texte en vert indique le contenu qui a Ã©tÃ© ajoutÃ©." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:317 +msgid "This screen allows you to edit four fields for metadata in a file within the media library." +msgstr "Cet Ã©cran vous permet de modifier les quatre champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +======= #: wp-admin/options-writing.php:30 msgid "Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret." msgstr "Les rÃ©glages de publication par e-mail vous permettant d’envoyer Ã votre installation WordPress un e-mail dont le contenu sera publiÃ© dans un article. Vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout message reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:107 +msgid "From this screen you can review, compare, and restore revisions:" +msgstr "Depuis cet Ã©cran, vous pouvez visualiser, comparer et rÃ©tablir les rÃ©visions :" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:67 +msgctxt "Plugin Installer" +msgid "Favorites" +msgstr "Favorites" +======= #: wp-admin/options-writing.php:29 msgid "Post Via Email" msgstr "Envoi d’article par e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:110 +msgid "To restore a revision, click Restore This Revision." +msgstr "Pour rÃ©tablir cette rÃ©vision, cliquez sur « RÃ©tablir cette rÃ©vision »." +||||||| .r11156 +#: wp-admin/includes/theme.php:218 +msgid "Flexible Header" +msgstr "En-tÃªte flexible" +======= #: wp-admin/options-writing.php:21 msgid "You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links." msgstr "Vous disposez de plusieurs mÃ©thodes pour envoyer du contenu. Cet Ã©cran vous prÃ©sente les rÃ©glages de chacune. La premiÃ¨re section gÃ¨re l’Ã©diteur de l’administration de WordPress, tandis que les autres gÃ¨rent les mÃ©thodes externes. Pour obtenir plus d’informations sur toutes ces mÃ©thodes, suivez les liens vers la documentation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:253 +msgid "The item you are trying to move to the Trash no longer exists." +msgstr "L’Ã©lÃ©ment que vous essayez de placer dans la Corbeille n’existe plus." +||||||| .r11156 +#: wp-admin/theme-install.php:93 +msgid "To install the theme so you can preview it with your site’s content and customize its theme options, click the \"Install\" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the \"Activate\" link, or by navigating to your Manage Themes screen and clicking the \"Live Preview\" link under any installed theme’s thumbnail image." +msgstr "Pour installer un thÃ¨me dans le but de le prÃ©visualiser avec le contenu de votre site et d’en personnaliser les options, cliquez sur le bouton « Installer » en haut du panneau de gauche. Les fichiers du thÃ¨me seront automatiquement tÃ©lÃ©chargÃ©s vers votre site. Ceci fait, le thÃ¨me sera disponible, et vous pourrez l’activer en cliquant sur le lien « Activer », ou en vous rendant sur l’Ã©cran « GÃ©rer les thÃ¨mes » et en cliquant sur le lien « PrÃ©visualisation » situÃ© sous la miniature de chaque thÃ¨me." +======= #: wp-admin/options-writing.php:15 msgid "Writing Settings" msgstr "Options d’Ã©criture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:276 +msgid "The item you are trying to restore from the Trash no longer exists." +msgstr "L’Ã©lÃ©ment que vous essayez de sortir de la Corbeille n’existe plus." +||||||| .r11156 +#: wp-admin/options-reading.php:50 +msgid "The character encoding of your site (UTF-8 is recommended)" +msgstr "L’encodage de caractÃ¨res utilisÃ© par votre site (UTF-8 est recommandÃ©)" +======= #: wp-admin/options-reading.php:169 msgid "It is up to search engines to honor this request." msgstr "Certains moteurs de recherche peuvent dÃ©cider de l’indexer malgrÃ© tout." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:294 +msgid "This item has already been deleted." +msgstr "Cet Ã©lÃ©ment a dÃ©jÃ Ã©tÃ© supprimÃ©." +||||||| .r11156 +#: wp-admin/plugin-editor.php:133 wp-admin/theme-editor.php:30 +msgid "In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key." +msgstr "Dans la zone d’Ã©dition, la touche Tab ajouter un caractÃ¨re de tabulation. Pour sortir de cette zone en pressant cette touche, combinez-la avec la touche Esc : Esc-Tab." +======= #: wp-admin/options-reading.php:149 msgid "Note: Neither of these options blocks access to your site — it is up to search engines to honor your request." msgstr "Note : Aucune de ses options ne bloque l’accÃ¨s Ã votre site — c’est au moteur de recherche de respecter votre demande." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:108 +msgid "To navigate between revisions, drag the slider handle left or right or use the Previous or Next buttons." +msgstr "Pour naviguer entre les rÃ©visions, faites glisser le curseur vers la gauche ou vers la droite ou utilisez les boutons PrÃ©cÃ©dente ou Suivante." +||||||| .r11156 +#: wp-admin/includes/widgets.php:200 +msgctxt "widget" +msgid "Add" +msgstr "Ajouter" +======= #: wp-admin/options-reading.php:148 wp-admin/options-reading.php:168 msgid "Discourage search engines from indexing this site" msgstr "Demander aux moteurs de recherche de ne pas indexer ce site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:57 +msgid "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." +msgstr "Le fichier wp-config.php existe dÃ©jÃ , un niveau au-dessus de votre installation WordPress. Si vous devez mettre Ã zÃ©ro vos Ã©lÃ©ments de configuration, veuillez d’abord effacer ce fichier. Vous pouvez essayer de lancer l’installation." +||||||| .r11156 +#: wp-admin/includes/widgets.php:199 +msgctxt "widget" +msgid "Edit" +msgstr "Modifier" +======= #: wp-admin/options-reading.php:146 msgid "Allow search engines to index this site" msgstr "Autoiser les moteurs de recherche Ã indexer ce site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:53 +msgid "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." +msgstr "Le fichier wp-config.php existe dÃ©jÃ . Si vous devez mettre Ã zÃ©ro n’importe quelle valeur de configuration dans ce fichier, veuillez commencer par le supprimer. Vous pouvez essayer l’installation maintenant." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:199 +msgid "" +"This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:\n" +"\n" +"

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

\n" +"\n" +"...or something like this:\n" +"\n" +"

The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.

\n" +"\n" +"As a new WordPress user, you should go to your dashboard to delete this page and create new pages for your content. Have fun!" +msgstr "" +"Voici un exemple de page. Elle est diffÃ©rente d'un article de blog, en cela qu'elle restera Ã la mÃªme place, et s'affichera dans le menu de navigation de votre site (en fonction de votre thÃ¨me). La plupart des gens commencent par Ã©crire une page Â« Ã Propos Â» qui les prÃ©sente aux visiteurs potentiels du site. Vous pourriez y Ã©crire quelque chose de ce tenant :\n" +"\n" +"

Bonjour ! Je suis un mÃ©canicien qui aspire Ã devenir un acteur, et voici mon blog. J'habite Ã Bordeaux, j'ai un super chien baptisÃ© Russell, et j'aime la vodka-ananas (ainsi que regarder la pluie tomber).

\n" +"\n" +"...ou bien quelque chose comme Ã§a :\n" +"\n" +"

La sociÃ©tÃ© 123 Machin Truc a Ã©tÃ© crÃ©Ã©e en 1971, et n'a cessÃ© de proposer au public des machins-trucs de qualitÃ© depuis lors. SituÃ©e Ã Saint-Remy-en-Bouzemont-Saint-Genest-et-Isson, 123 Machin Truc emploie 2 000 personnes, et fabrique toutes sortes de bidules super pour la communautÃ© bouzemontoise.

\n" +"\n" +"Ãtant donnÃ© que vous Ãªtes un nouvel utilisateur de WordPress, vous devriez vous rendre sur votre tableau de bord pour effacer la prÃ©sente page, et crÃ©er de nouvelles pages avec votre propre contenu. Amusez-vous bien !" +======= #: wp-admin/options-reading.php:137 msgid "Summary" msgstr "L’extrait" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/post.php:121 +msgid "Unable to submit this form, please refresh and try again." +msgstr "Impossible d’envoyer ce formulaire ; veuillez recharger la page et rÃ©essayer." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:181 +msgid "" +"Hi, this is a comment.\n" +"To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them." +msgstr "" +"Bonjour, ceci est un commentaire.\n" +"Pour supprimer un commentaire, connectez-vous et affichez les commentaires de cet article. Vous pourrez alors les modifier ou les supprimer." +======= #: wp-admin/options-reading.php:136 msgid "Full text" msgstr "Le texte complet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:64 +msgid "When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, “Search Engines Discouraged,” to remind you that your site is not being crawled." +msgstr "Lorsque ce rÃ©glage est actif, un rappel est affichÃ© dans le bloc \"D’un coup d’Åil\" du Tableau de bord, indiquant que \"Moteurs de recherche refusÃ©s\" pour que vous n’oubliez pas que votre site n’est pas parcouru." +||||||| .r11156 +#: wp-admin/includes/theme-install.php:78 +msgid "Search by tag" +msgstr "Recherche par mot-clÃ© (tag)" +======= #: wp-admin/options-reading.php:134 wp-admin/options-reading.php:135 msgid "For each article in a feed, show" msgstr "Pour chaque article d’un flux, fournir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:56 +msgid "You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary." +msgstr "Vous pouvez Ã©galement contrÃ´ler l’affichage de votre contenu dans les flux RSS, comme le nombre maximum d’articles Ã afficher, et s’il faut afficher l’article en entier ou juste un rÃ©sumÃ©." +||||||| .r11156 +#: wp-admin/includes/theme-install.php:75 +msgid "Search by author" +msgstr "Recherche par auteur" +======= #: wp-admin/options-reading.php:131 msgid "items" msgstr "Ã©lÃ©ments" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:109 +msgid "Compare two different revisions by selecting the “Compare any two revisions” box to the side." +msgstr "Comparez deux rÃ©visions diffÃ©rentes en cochant la case « Comparer n’importe quelles rÃ©visions » sur le cÃ´tÃ©." +||||||| .r11156 +#: wp-admin/includes/theme-install.php:72 +#: wp-admin/includes/theme-install.php:83 +msgid "Search by keyword" +msgstr "Recherche par mot-clÃ© (terme)." +======= #: wp-admin/options-reading.php:130 msgid "Syndication feeds show the most recent" msgstr "Les flux de syndication affichent les derniers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:406 +msgid "The plugin %s has been deactivated due to an error: %s" +msgstr "L’extension %s a Ã©tÃ© dÃ©sactivÃ©e suite Ã l’erreur : %s" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:63 +msgid "Type of search" +msgstr "Type de recherche" +======= #: wp-admin/options-reading.php:126 msgid "posts" msgstr "Articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:78 +msgid "← Return to post editor" +msgstr "← Retourner Ã l’Ã©diteur d’article" +||||||| .r11156 +#: wp-admin/includes/screen.php:1026 +msgid "Screen Options Tab" +msgstr "Onglet des options de l’Ã©cran" +======= #: wp-admin/options-reading.php:124 msgid "Blog pages show at most" msgstr "Les pages du site doivent afficher au plus" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/plugins.php:333 +msgid "Yes, delete these files and data" +msgstr "Oui, supprimer ces fichiers et donnÃ©es" +||||||| .r11156 +#: wp-admin/includes/screen.php:854 +msgid "Contextual Help Tab" +msgstr "Onglet d’aide contextuelle" +======= #: wp-admin/options-reading.php:118 msgid "Warning: these pages should not be the same!" msgstr "Attention : ces pages ne devraient pas Ãªtre les mÃªmes !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:84 +msgid "Encoding for pages and feeds" +msgstr "Codage pour les pages et les flux RSS" +||||||| .r11156 +#: wp-admin/includes/ms.php:362 +msgid "Sorry, you have used your space allocation. Please delete some files to upload more files." +msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota alouÃ©. Veuillez supprimer quelques fichiers avant d’en envoyer d’autres." +======= #: wp-admin/options-reading.php:115 msgid "Posts page: %s" msgstr "Page des articles : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:48 +msgid "The character encoding of your site (UTF-8 is recommended)" +msgstr "Le codage de caractÃ¨res utilisÃ© par votre site (UTF-8 est recommandÃ©)" +||||||| .r11156 +#: wp-admin/includes/media.php:2592 +msgid "Sorry, you have used all of your storage quota of %s MB." +msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota de stockage (%s Mo)." +======= #: wp-admin/options-reading.php:114 msgid "Front page: %s" msgstr "Page d’accueil : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:291 +msgid "Delete Plugin" +msgstr "Supprimer l’extension" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:371 +msgid "Select comment" +msgstr "SÃ©lectionnez un commentaire" +======= #: wp-admin/options-reading.php:110 msgid "A static page (select below)" msgstr "Une page statique (choisir ci-dessous)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:246 +msgid "Tag base" +msgstr "Base des Ã©tiquettes" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:144 +#: wp-admin/includes/class-wp-media-list-table.php:317 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:246 +#: wp-admin/includes/class-wp-ms-users-list-table.php:178 +#: wp-admin/includes/class-wp-plugins-list-table.php:477 +#: wp-admin/includes/class-wp-posts-list-table.php:590 +#: wp-admin/includes/class-wp-terms-list-table.php:271 +#: wp-admin/includes/class-wp-users-list-table.php:389 +msgid "Select %s" +msgstr "SÃ©lectionner %s" +======= #: wp-admin/options-reading.php:84 msgid "Encoding for pages and feeds" msgstr "Codage pour les pages et les flux RSS" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:295 +msgid "You are about to remove the following plugin:" +msgstr "Vous Ãªtes sur le point de supprimer l’extension suivante :" +||||||| .r11156 +#: wp-admin/edit-tags.php:345 +msgid "Tags can be selectively converted to categories using the tag to category converter." +msgstr "Les mots-clÃ©s peuvent Ãªtre convertis de maniÃ¨re sÃ©lective en catÃ©gories via le convertisseur mots-clÃ©s vers catÃ©gories" +======= #: wp-admin/options-reading.php:69 msgid "Documentation on Reading Settings" msgstr "Documentation sur les rÃ©glages de la lecture (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:31 +msgid "When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%." +msgstr "Quand vous assignez un article Ã plusieurs catÃ©gories ou Ã©tiquettes, une seule apparaÃ®tra dans le permalien : la catÃ©gorie avec l’identifiant numÃ©rique le plus bas. Idem pour les mots-clÃ©s. Cela s’applique si votre structure comprend %category% ou %tag%." +||||||| .r11156 +#: wp-admin/edit-tags.php:192 +msgid "You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category." +msgstr "Vous pouvez supprimer des catÃ©gories de liens avec la liste dÃ©roulante « Actions groupÃ©es », mais cette action ne supprime pas les liens contenus dans la catÃ©gorie. Au lieu de cela, ils sont dÃ©placÃ©s dans la catÃ©gorie de liens par dÃ©faut." +======= #: wp-admin/options-reading.php:64 msgid "When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, “Search Engines Discouraged,” to remind you that your site is not being crawled." msgstr "Lorsque ce rÃ©glage est actif, un rappel est affichÃ© dans le bloc \"D’un coup d’Åil\" du Tableau de bord, indiquant que \"Moteurs de recherche refusÃ©s\" pour que vous n’oubliez pas que votre site n’est pas parcouru." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:38 +msgid "The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized." +msgstr "Les champs facultatifs, en bas de page, vous permettent de personnaliser les dÃ©nominations utilisÃ©es pour les chemins /category/ et /tag/ lors de l’affichage des archives. Par exemple, la page listant tous les articles de la catÃ©gorie « Non classÃ© » pourrait se lire comme /sujet/non-classe/ plutÃ´t que /category/non-classe/." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:298 +msgid "Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:" +msgstr "Le processus de crÃ©ation d’une page reste trÃ¨s proche de celui d’un article, et les Ã©crans respectifs peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re, par le biais de glisser/dÃ©poser, de l’onglet « Option de l’Ãcran », et en ouvrant/fermant les blocs selon vos besoins. Cet Ã©cran dispose Ã©galement du mode « aucune distraction », tant dans le mode Visuel que dans le mode Texte, via les boutons « Plein Ãcran ». L’Ã©diteur de page fonctionne globalement comme celui des articles, mais dispose de certaines spÃ©cificitÃ©s, disponibles dans le bloc « Attributs de Page » :" +======= #: wp-admin/options-reading.php:63 msgid "You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to “Discourage search engines from indexing this site” and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web." msgstr "Vous pouvez choisir si votre site est parcouru par les robots et autres logiciels automatisÃ©s, ou non. Si vous prÃ©fÃ©rez que ces services ignorent votre site, cliquez sur le bouton radio marquÃ© « Demander aux moteurs de recherche de ne pas indexer ce site » et cliquez sur le bouton « Enregistrer les modifications » en bas de l’Ã©cran. Notez bien que votre vie privÃ©e n’est pas assurÃ©e : votre site reste visible de tous sur le Web." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:293 +msgid "This plugin may be active on other sites in the network." +msgstr "Cette extension peut uniquement Ãªtre activÃ©e sur l’ensemble des sites du rÃ©seau." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:281 +msgid "Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically. You can insert media files by clicking the icons above the post editor and following the directions. You can go to the distraction-free writing screen via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in Text mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor." +msgstr "Ãditeur d’article - Saisissez-y le contenu de votre article. Vous disposez pour ce faire de deux modes : Visuel ou Texte. Choisissez un mode en cliquant sur l’onglet correspondant. Le mode Visuel vous donne accÃ¨s Ã un Ã©diteur WYSIWYG ; cliquez sur la derniÃ¨re icÃ´ne de la rangÃ©e pour afficher une seconde rangÃ©e d’icÃ´nes. Le mode Texte vous permet de saisir directement du code HTML en mÃªme temps que le contenu de votre article. Vous pouvez insÃ©rer des fichiers mÃ©dia en cliquant sur les icÃ´nes situÃ©es au-dessus de l’Ã©diteur, puis en suivant les instructions. Vous pouvez passer en mode « aucune distraction » grÃ¢ce Ã l’icÃ´ne « Plein Ãcran » du mode Visuel (avant-dernier bouton de la premiÃ¨re rangÃ©e), ou le bouton « Plein Ãcran » du mode HTML (dernier bouton de la rangÃ©e). Une fois dans ce mode, vous pouvez rendre les boutons visibles en survolant la zone supÃ©rieure de la page. Quittez le mode Plein Ãcran pour revenir en mode d’Ã©dition normal." +======= #: wp-admin/options-reading.php:62 wp-admin/options-reading.php:142 #: wp-admin/options-reading.php:143 msgid "Search Engine Visibility" msgstr "VisibilitÃ© pour les moteurs de recherche" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:21 +msgid "Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink." +msgstr "Les permaliens sont des adresses Web permanentes vers vos pages individuelles et vos articles, ainsi que vos archives de catÃ©gorie et dâÃ©tiquette. Ils offrent un lien plus comprÃ©hensible vers votre contenu. Les adresses de chaque article devraient Ãªtre permanentes et ne jamais changer, d’oÃ¹ le nom de permalien." +||||||| .r11156 +#: wp-admin/custom-header.php:570 +msgid "You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it." +msgstr "Vous pouvez choisir une image d’en-tÃªte personnalisÃ©e en la mettant en ligne depuis votre ordinateur ou en la choisissant dans votre bibliothÃ¨que de mÃ©dias. AprÃ¨s avoir sÃ©lectionnÃ© l’image, vous pourrez la recadrer." +======= #: wp-admin/options-reading.php:62 wp-admin/options-reading.php:142 #: wp-admin/options-reading.php:143 msgid "Site Visibility" msgstr "VisibilitÃ© du site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:79 +msgid "If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag." +msgstr "Si vous savez ce que vous voulez, commencez par le champ « Recherche » : il vous permet de lancer une recherche sur le dÃ©pÃ´t d’extensions de WordPress.org, pour un terme, un auteur, ou une Ã©tiquette en particulier. Vous pouvez Ã©galement lancer une recherche en cliquant sur une des Ã©tiquettes populaires. Plus une Ã©tiquette est grande, plus elle fait rÃ©fÃ©rence Ã un grand nombre d’extensions." +||||||| .r11156 +#: wp-admin/admin-header.php:207 +msgid "Main content" +msgstr "Contenu principal" +======= #: wp-admin/options-reading.php:56 msgid "You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary." msgstr "Vous pouvez Ã©galement contrÃ´ler l’affichage de votre contenu dans les flux RSS, comme le nombre maximum d’articles Ã afficher, et s’il faut afficher l’article en entier ou juste un rÃ©sumÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s is a placeholder that must come at the start of the URL. +#: wp-admin/options-permalink.php:238 +msgid "If you like, you may enter custom structures for your category and tag URLs here. For example, using topics as your category base would make your category links like %s/topics/uncategorized/. If you leave these blank the defaults will be used." +msgstr "Si vous le souhaitez, vous pouvez spÃ©cifier ici une structure personnalisÃ©e pour les adresses web de vos Ã©tiquettes et de vos catÃ©gories. Par exemple, en utilisant sujets comme prÃ©fixe pour vos catÃ©gories, vous obtiendrez des adresses web comme : %s/sujets/non-classe/. Si vous laissez ce champ vide, la valeur par dÃ©faut sera appliquÃ©e." +||||||| .r11156 +#: wp-admin/admin-header.php:186 +msgid "Skip to main content" +msgstr "Aller au contenu principal" +======= #: wp-admin/options-reading.php:55 msgid "You can choose what’s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two Pages. One will become the front page, and the other will be where your posts are displayed." msgstr "Vous pouvez choisir ce qui est affichÃ© en page d’accueil de votre site. Au choix, le mode « blog » classique (les articles dans l’ordre chronologique inverse) ou une page statique. Pour mettre en place une page statique, vous devez d’abord crÃ©er deux pages : la premiÃ¨re servira de page d’accueil, la seconde affichera vos articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:133 wp-admin/theme-editor.php:30 +msgid "In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue." +msgstr "Dans la zone de modification, la touche Tab ajoute un caractÃ¨re de tabulation. Pour vous dÃ©placer en dehors de cette zone en appuyant sur Tab, appuyez sur la touche Ãchap. (Esc.) suivie de la touche Tab. Dans certains cas, la touche Ãchap. devra Ãªtre appuyÃ©e deux fois avant que la touche Tab ne vous permette de continuer." +||||||| .r11156 +#: wp-admin/custom-header.php:174 +msgid "You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the “Choose Image” button." +msgstr "Vous pouvez utiliser une image d’en-tÃªte personnalisÃ©e pour votre site. Mettez simplement l’image en ligne, recadrez-la, et le nouvel en-tÃªte sera aussitÃ´t en ligne. Autrement, vous pouvez utiliser une image qui a dÃ©jÃ Ã©tÃ© mise en ligne dans votre BibliothÃ¨que de MÃ©dias, en cliquant sur le bouton « Choisissez une image »." +======= #: wp-admin/options-reading.php:54 msgid "This screen contains the settings that affect the display of your content." msgstr "Cet Ã©cran prÃ©sente les rÃ©glages qui influent sur l’affichage de votre contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:299 +msgid "These plugins may be active on other sites in the network." +msgstr "Ces extensions peuvent Ãªtre actives sur d’autres sites du rÃ©seau." +||||||| .r11156 +#: wp-admin/custom-header.php:836 +msgid "Skip Cropping, Publish Image as Is" +msgstr "Pas de recadrage, utiliser l’image telle quelle" +======= #: wp-admin/options-reading.php:48 msgid "The character encoding of your site (UTF-8 is recommended)" msgstr "Le codage de caractÃ¨res utilisÃ© par votre site (UTF-8 est recommandÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:301 +msgid "You are about to remove the following plugins:" +msgstr "Vous Ãªtes sur le point de supprimer les extensions suivantes :" +||||||| .r11156 +#: wp-admin/customize.php:139 +msgid "You are previewing %s" +msgstr "Vous prÃ©visualisez %s" +======= #: wp-admin/options-reading.php:15 msgid "Reading Settings" msgstr "Options de lecture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:297 +msgid "Delete Plugins" +msgstr "Supprimer les extensions" +||||||| .r11156 +#: wp-admin/custom-background.php:304 wp-admin/custom-header.php:568 +msgid "Select Image" +msgstr "SÃ©lectionnez une image" +======= #: wp-admin/options-permalink.php:277 msgid "If your .htaccess file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your .htaccess file. Click in the field and press CTRL + a to select all." msgstr "Si vous aviez les droits en Ã©criture sur le fichier .htaccess, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier .htaccess. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:183 +msgid "By default WordPress uses web URLs which have question marks and lots of numbers in them; however, WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started." +msgstr "Par dÃ©faut, WordPress utilise des adresses web (URL) ayant un point d’interrogation et une suite de chiffres. Cependant, WordPress vous offre la possibilitÃ© de crÃ©er une structure personnalisÃ©e d’adresses web pour vos permaliens et archives. Ceci peut amÃ©liorer l’esthÃ©tique, l’utilisation et la pÃ©rennitÃ© de vos liens. De nombreux marqueurs sont disponibles (en), et nous vous donnons quelques exemples pour commencer." +||||||| .r11156 +#: wp-admin/custom-background.php:314 wp-admin/custom-header.php:604 +msgid "Or choose an image from your media library:" +msgstr "Ou choisissez une image dans votre bibliothÃ¨que de mÃ©dias :" +======= #: wp-admin/options-permalink.php:272 msgid "If you temporarily make your site’s root directory writable for us to generate the web.config file automatically, do not forget to revert the permissions after the file has been created." msgstr "Si vous rendez temporairement le dossier racine accessible en Ã©criture afin que nous y gÃ©nÃ©rions directement le fichier web.config,n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/revision.php:119 +msgid "Revisions Management" +msgstr "Gestion des rÃ©visions (en)" +||||||| .r11156 +#: wp-admin/customize.php:88 +msgid "Customize %s" +msgstr "Personnaliser %s" +======= #: wp-admin/options-permalink.php:267 msgid "If the root directory of your site were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Create a new file, called web.config in the root directory of your site. Click in the field and press CTRL + a to select all. Then insert this code into the web.config file." msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. CrÃ©ez un nouveau fichier texte, nommÃ© web.config, dans le dossier racine de votre site. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite le contenu dans le fichier web.config." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:169 +msgid "WordPress is not notifying any Update Services because of your site’s visibility settings." +msgstr "WordPress ne notifie aucun des services de notification (en), du fait des rÃ©glages de vie privÃ©e de votre site." +||||||| .r11156 +#: wp-admin/customize.php:176 +#: wp-admin/includes/class-wp-theme-install-list-table.php:303 +#: wp-admin/theme-install.php:267 +msgid "Collapse" +msgstr "RÃ©duire" +======= #: wp-admin/options-permalink.php:265 msgid "If you temporarily make your web.config file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved." msgstr "Si vous rendez le fichier web.config accessible en Ã©criture afin de gÃ©nÃ©rer automatiquement les rÃ¨gles de rÃ©Ã©criture, n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:45 +msgid "Documentation on Writing Settings" +msgstr "Documentation sur les rÃ©glages de l’Ã©criture (en)" +||||||| .r11156 +#: wp-admin/custom-header.php:177 +msgid "If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”." +msgstr "Si vous ne souhaitez pas que votre site utilise une image d’en-tÃªte, cliquez sur le bouton « Retirer lâimage d’en-tÃªte » en bas de la section « Image d’en-tÃªte » de cette page. Si vous souhaitez rÃ©activer l’image d’en-tÃªte, il vous suffit de sÃ©lectionner l’une des autres options d’images, et de la valider en cliquant sur « Enregistrer les modifications »." +======= #: wp-admin/options-permalink.php:260 msgid "If your web.config file were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Click in the field and press CTRL + a to select all. Then insert this rule inside of the /<configuration>/<system.webServer>/<rewrite>/<rules> element in web.config file." msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite cette rÃ¨gle dans l’Ã©lÃ©ment /<configuration>/<system.webServer>/<rewrite>/<rules> du fichier web.config." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:140 +msgid "Documentation on Editing Plugins" +msgstr "Documentation sur l’Ã©dition des extensions (en)" +||||||| .r11156 +#: wp-admin/media.php:62 +msgid "You attempted to edit an item that isn’t an attachment. Please go back and try again." +msgstr "Vous avez tentÃ© de modifier un Ã©lÃ©ment qui n’est pas un fichier joint. Veuillez rÃ©essayer." +======= #: wp-admin/options-permalink.php:246 msgid "Tag base" msgstr "Base des Ã©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:87 +msgid "Documentation on Installing Plugins" +msgstr "Documentation sur l’installation des extensions (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:405 +msgctxt "plugin" +msgid "Installed" +msgstr "InstallÃ©e" +======= #. translators: prefix for category permalinks #: wp-admin/options-permalink.php:242 msgid "Category base" msgstr "PrÃ©fixe des catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-reading.php:69 +msgid "Documentation on Reading Settings" +msgstr "Documentation sur les rÃ©glages de la lecture (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:245 +#: wp-admin/includes/class-wp-theme-install-list-table.php:366 +msgid "This theme is already installed and is up to date" +msgstr "Ce thÃ¨me est dÃ©jÃ installÃ© et Ã jour" +======= #. translators: %s is a placeholder that must come at the start of the URL. #: wp-admin/options-permalink.php:238 msgid "If you like, you may enter custom structures for your category and tag URLs here. For example, using topics as your category base would make your category links like %s/topics/uncategorized/. If you leave these blank the defaults will be used." msgstr "Si vous le souhaitez, vous pouvez spÃ©cifier ici une structure personnalisÃ©e pour les adresses web de vos mots-clÃ©s et de vos catÃ©gories. Par exemple, en utilisant sujets comme prÃ©fixe pour vos catÃ©gories, vous obtiendrez des adresses web comme : %s/sujets/non-classe/. Si vous laissez ce champ vide, la valeur par dÃ©faut sera appliquÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:44 +msgid "Documentation on Permalinks Settings" +msgstr "Documentation sur les rÃ©glages des permaliens (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:245 +#: wp-admin/includes/class-wp-theme-install-list-table.php:366 +#: wp-admin/theme-install.php:235 +msgctxt "theme" +msgid "Installed" +msgstr "InstallÃ©s" +======= #: wp-admin/options-permalink.php:235 msgid "Optional" msgstr "Facultatif" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:45 +msgid "Documentation on Using Permalinks" +msgstr "Documentation sur l’utilisation des permaliens (en)" +||||||| .r11156 +#: wp-admin/theme-install.php:92 +msgid "Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you’re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look." +msgstr "Une fois que vous avez gÃ©nÃ©rÃ© une liste de thÃ¨mes, vous pouvez les prÃ©visualiser et les installer. Cliquez sur la miniature du thÃ¨me que vous souhaitez prÃ©visualiser. Cela ouvrira une page de prÃ©visualisation en plein Ã©cran, afin de vous donner une meilleure idÃ©e de l’aspect de ce thÃ¨me." +======= #: wp-admin/options-permalink.php:225 msgid "Custom Structure" msgstr "Structure personnalisÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:141 +msgid "Documentation on Writing Plugins" +msgstr "Documentation sur la crÃ©ation d’extensions (en)" +||||||| .r11156 +#: wp-admin/theme-install.php:97 +msgid "Previewing and Installing" +msgstr "Voir l’aperÃ§u et installer" +======= #: wp-admin/options-permalink.php:219 msgid "Post name" msgstr "Nom de l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugins.php:394 +msgid "Documentation on Managing Plugins" +msgstr "Documentation sur la gestion des extensions (en)" +||||||| .r11156 +#: wp-admin/themes.php:78 +msgid "Previewing and Customizing" +msgstr "AperÃ§u et personnalisation" +======= #: wp-admin/options-permalink.php:215 msgid "Numeric" msgstr "NumÃ©rique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options.php:188 +msgid "The %1$s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API" +msgstr "L’option %1$s n’est pas enregistrÃ©e. Les options non enregistrÃ©es sont obsolÃ¨tes. Consultez la documentation sur la page https://codex.wordpress.org/Settings_API" +||||||| .r11156 +#: wp-admin/includes/media.php:2549 +msgid "You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. Switch to the multi-file uploader." +msgstr "Vous utilisez l’outil de mise en ligne du navigateur. Le nouvel outil de mise en ligne de WordPress inclus la possibilitÃ© de tÃ©lÃ©charger plusieurs fichiers Ã la fois par glisser/dÃ©poser. Passer au nouvel outil de mise en ligne." +======= #: wp-admin/options-permalink.php:211 msgid "Month and name" msgstr "Mois et titre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-editor.php:265 wp-admin/theme-editor.php:222 +msgid "You need to make this file writable before you can save your changes. See the Codex for more information." +msgstr "Vous devez rendre ce fichier accessible en Ã©criture avant de pouvoir enregistrer vos modifications. Lire la documentation CHMOD pour plus d’informations." +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:253 +msgid "Preview %s" +msgstr "AperÃ§u de %s" +======= #: wp-admin/options-permalink.php:208 wp-admin/options-permalink.php:212 #: wp-admin/options-permalink.php:220 msgctxt "sample permalink structure" msgid "sample-post" msgstr "exemple-article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-writing.php:163 +msgid "When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see Update Services on the Codex. Separate multiple service URLs with line breaks." +msgstr "Quand vous publiez un nouvel article, WordPress peut notifier un service de mise Ã jour. Une explication se trouve sur la page Update Services du Codex anglophone. SÃ©parez les adresses web par des retours Ã la ligne." +||||||| .r11156 +#: wp-admin/tools.php:22 +msgid "Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content." +msgstr "Les catÃ©gories disposent d’une hiÃ©rarchie, ce qui signifie que vous pouvez leur donner des sous-catÃ©gories. Les mots-clÃ©s n’ont pas de hiÃ©rarchie et ne peuvent Ãªtre imbriquÃ©s. Parfois, des auteurs commencent par utiliser une sorte de caractÃ©risation, pour se rendre compte par la suite qu’ils prÃ©fÃ¨rent l’autre." +======= #: wp-admin/options-permalink.php:207 msgid "Day and name" msgstr "Date et titre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:277 +msgid "If your .htaccess file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your .htaccess file. Click in the field and press CTRL + a to select all." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier .htaccess, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier .htaccess. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner." +||||||| .r11156 +#: wp-admin/tools.php:23 +msgid "The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin & Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa." +msgstr "Le lien « convertisseur de catÃ©gories et mots-clÃ©s » vous mÃ¨nera Ã la page d’import, oÃ¹ ledit convertisseur est l’une des extensions que vous pouvez installer. Une fois installÃ©e, le lien « Activer l’extension & lancer l’importateur » vous mÃ¨nera Ã l’Ã©cran d’oÃ¹ vous pourrez choisir de lancer une conversion dans un sens ou dans l’autre." +======= #: wp-admin/options-permalink.php:196 wp-admin/options-permalink.php:216 msgctxt "sample permalink base" msgid "archives" msgstr "archives" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:267 +msgid "If the root directory of your site were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Create a new file, called web.config in the root directory of your site. Click in the field and press CTRL + a to select all. Then insert this code into the web.config file." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. CrÃ©ez un nouveau fichier texte, nommÃ© web.config, dans le dossier racine de votre site. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite le contenu dans le fichier web.config." +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:164 +#: wp-admin/includes/class-wp-upgrader-skins.php:522 +#: wp-admin/includes/class-wp-upgrader-skins.php:601 wp-admin/themes.php:221 +#: wp-admin/themes.php:301 wp-admin/themes.php:363 +msgid "Live Preview" +msgstr "PrÃ©visualiser" +======= #: wp-admin/options-permalink.php:183 msgid "By default WordPress uses web URLs which have question marks and lots of numbers in them; however, WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started." msgstr "Par dÃ©faut, WordPress utilise des adresses web (URL) ayant un point d’interrogation et une suite de chiffres. Cependant, WordPress vous offre la possibilitÃ© de crÃ©er une structure personnalisÃ©e d’adresses web pour vos permaliens et archives. Ceci peut amÃ©liorer l’esthÃ©tique, l’utilisation et la pÃ©rennitÃ© de vos liens. De nombreux marqueurs sont disponibles (en), et nous vous donnons quelques exemples pour commencer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-permalink.php:260 +msgid "If your web.config file were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Click in the field and press CTRL + a to select all. Then insert this rule inside of the /<configuration>/<system.webServer>/<rewrite>/<rules> element in web.config file." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite cette rÃ¨gle dans l’Ã©lÃ©ment /<configuration>/<system.webServer>/<rewrite>/<rules> du fichier web.config." +||||||| .r11156 +#: wp-admin/custom-header.php:166 +msgid "This screen is used to customize the header section of your theme." +msgstr "Cet Ã©cran est utilisÃ© pour personnaliser la section d’en-tÃªte de votre thÃ¨me." +======= #: wp-admin/options-permalink.php:165 msgid "You should update your .htaccess now." msgstr "Vous devriez mettre Ã jour votre fichier .htaccess maintenant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/setup-config.php:141 +msgid "We’re going to use this information to create a wp-config.php file." +msgstr "Nous allons utiliser cette information pour crÃ©er le fichier wp-config.php." +||||||| .r11156 +#: wp-admin/custom-header.php:167 +msgid "You can choose from the theme’s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed." +msgstr "Vous pouvez choisir Ã partir des images d’en-tÃªte par dÃ©faut du thÃ¨me, ou utiliser l’une des vÃ´tres. Vous pouvez Ã©galement personnaliser la maniÃ¨re dont s’affichent le titre de votre site et son slogan." +======= #: wp-admin/options-permalink.php:159 wp-admin/options-permalink.php:162 #: wp-admin/options-permalink.php:167 wp-admin/options-permalink.php:171 msgid "Permalink structure updated." msgstr "Structure des permaliens enregistrÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:48 +msgid "Add Plugins" +msgstr "Ajouter des extensions" +||||||| .r11156 +#: wp-admin/custom-header.php:175 +msgid "Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the “Save Changes” button." +msgstr "Certains thÃ¨mes disposent d’une sÃ©rie d’images d’en-tÃªte. Si vous voyez plusieurs images affichÃ©es, sÃ©lectionnez celle que vous aimez et cliquez sur le bouton « Enregistrer les modifications »." +======= #: wp-admin/options-permalink.php:157 msgid "Permalink structure updated. Remove write access on web.config file now!" msgstr "La structure des permaliens a Ã©tÃ© mise Ã jour. Pensez Ã retirer les droits d’accÃ¨s au fichier web.config dÃ¨s maintenant !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:80 +msgid "If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly." +msgstr "Si vous voulez juste vous faire une idÃ©e de ce qui est disponible, vous pouvez parcourir les rubriques Mises en avant et Populaires en utilisant les liens en haut Ã gauche de l’Ã©cran. Ces sections sont rÃ©guliÃ¨rement renouvelÃ©es." +||||||| .r11156 +#: wp-admin/custom-header.php:176 +msgid "If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature." +msgstr "Si votre thÃ¨me a plus d’une image d’en-tÃªte par dÃ©faut, ou si vous avez mis en ligne plus d’une image d’en-tÃªte personnalisÃ©e, vous pouvez faire en sorte que WordPress affiche une image alÃ©atoire diffÃ©rente Ã chaque chargement de votre site. SÃ©lectionnez l’option « Au hasard » dans la section « Images par dÃ©faut » ou « Images mises en ligne » pour activer cette fonctionnalitÃ©." +======= #: wp-admin/options-permalink.php:155 msgid "You should update your web.config now." msgstr "Vous devriez mettre Ã jour votre fichier web.config maintenant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/plugin-install.php:103 +msgctxt "plugins" +msgid "Browse" +msgstr "Parcourir" +||||||| .r11156 +#: wp-admin/custom-header.php:184 +msgid "For most themes, the header text is your Site Title and Tagline, as defined in the General Settings section." +msgstr "Pour la plupart des thÃ¨mes, le texte d’en-tÃªte est le titre de votre site et son slogan, tels que dÃ©finis dans la section RÃ©glages gÃ©nÃ©raux." +======= #: wp-admin/options-permalink.php:45 msgid "Documentation on Using Permalinks" msgstr "Documentation sur l’utilisation des permaliens (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:218 +msgid "Insufficient Requirements" +msgstr "Les conditions requises ne sont pas remplies" +||||||| .r11156 +#: wp-admin/install.php:181 +msgid "Configuration Error" +msgstr "Erreur de configuration" +======= #: wp-admin/options-permalink.php:44 msgid "Documentation on Permalinks Settings" msgstr "Documentation sur les rÃ©glages des permaliens (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:270 +msgid "Information needed" +msgstr "Informations nÃ©cessaires" +||||||| .r11156 +#: wp-admin/install.php:181 +msgid "Your wp-config.php file has an empty database table prefix, which is not supported." +msgstr "Votre fichier wp-config.php ne dÃ©fini pas prÃ©fixe de table de base de donnÃ©es. Il en faut obligatoirement un." +======= #: wp-admin/options-permalink.php:38 msgid "The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized." msgstr "Les champs facultatifs, en bas de page, vous permettent de personnaliser les dÃ©nominations utilisÃ©es pour les chemins /category/ et /tag/ lors de l’affichage des archives. Par exemple, la page listant tous les articles de la catÃ©gorie « Non classÃ© » pourrait se lire comme /sujet/non-classe/ plutÃ´t que /category/non-classe/." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:324 +msgid "Success!" +msgstr "Quel succÃ¨s !" +||||||| .r11156 +#: wp-admin/media-new.php:51 +msgid "Revert to the Browser Uploader by clicking the link below the drag and drop box." +msgstr "Revenez Ã l’outil de mise en ligne du navigateur en cliquant sur le lien sous la zone de glisser-dÃ©poser." +======= #: wp-admin/options-permalink.php:37 msgid "Custom Structures" msgstr "Structure personnalisÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:326 +msgid "WordPress has been installed. Were you expecting more steps? Sorry to disappoint." +msgstr "WordPress est installÃ©. Vous attendiez-vous Ã d’autres Ã©tapes ? DÃ©solÃ© de vous dÃ©cevoir ;-)" +||||||| .r11156 +#: wp-admin/users.php:382 +msgid "User deleted." +msgid_plural "%s users deleted." +msgstr[0] "Utilisateur supprimÃ©." +msgstr[1] "%s utilisateurs supprimÃ©s." +======= #: wp-admin/options-permalink.php:31 msgid "When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%." msgstr "Quand vous assignez un article Ã plusieurs catÃ©gories ou Ã©tiquettes, une seule apparaÃ®tra dans le permalien : la catÃ©gorie avec l’identifiant numÃ©rique le plus bas. Idem pour les mots-clÃ©s. Cela s’applique si votre structure comprend %category% ou %tag%." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-add.php:15 +msgid "Add New Link" +msgstr "Ajouter un lien" +||||||| .r11156 +#: wp-admin/users.php:386 +msgid "New user created. Edit user" +msgstr "Nouvel utilisateur crÃ©Ã©. Modifier l’utilisateur" +======= #: wp-admin/options-permalink.php:30 msgid "If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there." msgstr "Si vous choisissez une option autre que « Valeur par dÃ©faut », la structure de vos permaliens, avec les marqueurs utilisÃ©s (encadrÃ©s par %), apparaÃ®tra dans le champ de « Structure personnalisÃ©e », d’oÃ¹ vous pourrez la modifier au plus proche de vos besoins." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:81 +msgid "%s link deleted." +msgid_plural "%s links deleted" +msgstr[0] "%s lien supprimÃ©" +msgstr[1] "%s liens supprimÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1441 wp-admin/includes/file.php:614 +#: wp-admin/includes/file.php:716 +msgid "Could not copy files. You may have run out of disk space." +msgstr "Impossible de copier les fichiers. Il se pourrait que vous manquiez de place." +======= #: wp-admin/options-permalink.php:29 msgid "Many people choose to use “pretty permalinks,” URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure." msgstr "De nombreuses personnes prÃ©fÃ¨rent utiliser les liens simplifiÃ©s (\"pretty permalinks\"), qui contiennent des informations utiles, telles que le titre de l’article, plutÃ´t qu’un numÃ©ro d’article gÃ©nÃ©rique. Vous pouvez choisir n’importe quel type de format de permalien parmi les rÃ©glages les plus courants, ou concevoir votre propre structure personnalisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link.php:109 +msgid "Link not found." +msgstr "Lien non trouvÃ©." +||||||| .r11156 +#: wp-admin/includes/theme-install.php:58 +msgid "Search for themes by keyword." +msgstr "Chercher un thÃ¨me par mot-clÃ©." +======= #: wp-admin/options-permalink.php:28 wp-admin/options-permalink.php:200 msgid "Common Settings" msgstr "RÃ©glages les plus courants" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:19 +msgid "WordPress › Database Repair" +msgstr "WordPress » RÃ©paration de la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:100 +msgid "Find a theme based on specific features." +msgstr "Trouver un thÃ¨me selon des critÃ¨res prÃ©cis." +======= #: wp-admin/options-permalink.php:22 msgid "This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures." msgstr "Cet Ã©cran vous permet de choisir la structure de permalien par dÃ©faut. Vous pouvez choisir les rÃ©glages les plus courants, ou crÃ©er la vÃ´tre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:131 +msgid "Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance." +msgstr "Certains problÃ¨mes de la base de donnÃ©es n’ont pas pu Ãªtre rÃ©parÃ©s. Veuillez copier/coller la liste d’erreurs suivantes sur le forum de support de WordPress pour recevoir plus d’informations." +||||||| .r11156 +#: wp-admin/setup-config.php:141 +msgid "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…" +msgstr "Vous devriez normalement avoir reÃ§u ces informations de la part de votre hÃ©bergeur. Si vous ne les avez pas, il vous faudra contacter votre hÃ©bergeur afin de continuer. Si vous Ãªtes prÃªt…" +======= #: wp-admin/options-permalink.php:21 msgid "Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink." msgstr "Les permaliens sont des adresses Web permanentes vers vos pages individuelles et vos articles, ainsi que vos archives de catÃ©gorie et dâÃ©tiquette. Ils offrent un lien plus comprÃ©hensible vers votre contenu. Les adresses de chaque article devraient Ãªtre permanentes et ne jamais changer, d’oÃ¹ le nom de permalien." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:145 +msgid "Repair Database" +msgstr "RÃ©parer la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/theme-editor.php:161 +msgid "This theme is broken." +msgstr "Le thÃ¨me est cassÃ©." +======= #: wp-admin/options-permalink.php:15 msgid "Permalink Settings" msgstr "Options des permaliens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:147 +msgid "Repair and Optimize Database" +msgstr "RÃ©parer et optimiser la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:208 +msgid "Version: " +msgstr "VersionÂ :" +======= #: wp-admin/options-media.php:119 msgid "Organize my uploads into month- and year-based folders" msgstr "Organiser mes fichiers envoyÃ©s dans des dossiers mensuels et annuels" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:40 +msgid "Upload New Media" +msgstr "Envoi d’un nouveau mÃ©dia" +||||||| .r11156 +#: wp-admin/custom-background.php:317 +msgid "Set as background" +msgstr "Utiliser comme image de fond" +======= #: wp-admin/options-media.php:111 msgid "Configuring this is optional. By default, it should be blank." msgstr "Ce rÃ©glage est facultatif. Par dÃ©faut, ce champ devrait Ãªtre vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:116 wp-admin/media.php:125 +msgid "Update Media" +msgstr "Mettre Ã jour le fichier" +||||||| .r11156 +#: wp-admin/custom-header.php:608 +msgid "Set as header" +msgstr "Utiliser comme en-tÃªte" +======= #: wp-admin/options-media.php:109 msgid "Full URL path to files" msgstr "Adresse web complÃ¨te pour les fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:62 +msgid "Library" +msgstr "BibliothÃ¨que" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:596 +msgid "Customize “%s”" +msgstr "Personnaliser « %s »" +======= #: wp-admin/options-media.php:104 msgid "Default is wp-content/uploads" msgstr "Par dÃ©faut, wp-content/uploads" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: add new file +#: wp-admin/media.php:110 wp-admin/menu.php:64 wp-admin/upload.php:78 +#: wp-admin/upload.php:213 +msgctxt "file" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/about.php:19 +msgid "About" +msgstr "Ã propos" +======= #: wp-admin/options-media.php:102 msgid "Store uploads in this folder" msgstr "Stocker les fichiers envoyÃ©s dans ce dossier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:94 +msgid "Comments %s" +msgstr "Commentaires %s" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:748 wp-admin/includes/nav-menu.php:1008 +msgid "No results found." +msgstr "Aucun rÃ©sultat trouvÃ©." +======= #: wp-admin/options-media.php:95 msgid "Uploading Files" msgstr "Envoi de fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:148 +msgid "Appearance" +msgstr "Apparence" +||||||| .r11156 +#: wp-admin/edit-comments.php:209 wp-admin/edit-comments.php:215 +#: wp-admin/includes/class-wp-comments-list-table.php:475 +#: wp-admin/includes/dashboard.php:554 +msgid "Edit comment" +msgstr "Modifier le commentaire" +======= #: wp-admin/options-media.php:88 msgid "Embeds" msgstr "Affichages distants" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: add new plugin +#: wp-admin/menu.php:197 wp-admin/plugins.php:451 +msgctxt "plugin" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:461 +msgid "Enter title here" +msgstr "Saisissez votre titre ici" +======= #: wp-admin/options-media.php:75 wp-admin/options-media.php:76 msgid "Large size" msgstr "Grande taille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:206 wp-admin/user/menu.php:14 wp-admin/user-edit.php:28 +msgid "Profile" +msgstr "Profil" +||||||| .r11156 +#: wp-admin/edit-link-form.php:29 wp-admin/includes/meta-boxes.php:883 +msgid "Target" +msgstr "Cible" +======= #: wp-admin/options-media.php:69 wp-admin/options-media.php:79 msgid "Max Height" msgstr "Hauteur maximale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:217 wp-admin/menu.php:220 +msgid "Your Profile" +msgstr "Votre profil" +||||||| .r11156 +#: wp-admin/export.php:163 wp-admin/export.php:169 wp-admin/export.php:186 +#: wp-admin/export.php:201 wp-admin/export.php:218 +msgid "All" +msgstr "Tout" +======= #: wp-admin/options-media.php:67 wp-admin/options-media.php:77 msgid "Max Width" msgstr "Largeur maximale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:228 wp-admin/tools.php:12 +msgid "Tools" +msgstr "Outils" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:226 +#: wp-admin/includes/class-wp-comments-list-table.php:465 +#: wp-admin/includes/class-wp-media-list-table.php:535 +#: wp-admin/includes/class-wp-posts-list-table.php:203 +#: wp-admin/includes/class-wp-posts-list-table.php:665 +msgid "Restore" +msgstr "RÃ©tablir" +======= #: wp-admin/options-media.php:65 wp-admin/options-media.php:66 msgid "Medium size" msgstr "Taille moyenne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:238 +msgctxt "settings screen" +msgid "General" +msgstr "GÃ©nÃ©ral" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:398 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:461 +#: wp-admin/includes/class-wp-posts-list-table.php:734 +#: wp-admin/includes/plugin-install.php:429 wp-admin/includes/revision.php:173 +msgid "%s ago" +msgstr "Il y a %s" +======= #: wp-admin/options-media.php:60 msgid "Crop thumbnail to exact dimensions (normally thumbnails are proportional)" msgstr "Recadrer les images pour parvenir aux dimensions exactes (normalement, les miniatures sont au format carrÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:239 +msgid "Writing" +msgstr "Ãcriture" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:159 +msgid "Path" +msgstr "Chemin" +======= #: wp-admin/options-media.php:53 msgid "Thumbnail size" msgstr "Taille des miniatures" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:240 +msgid "Reading" +msgstr "Lecture" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:169 +#: wp-admin/includes/media.php:2140 wp-admin/users.php:54 +msgid "Actions" +msgstr "Actions" +======= #: wp-admin/options-media.php:49 msgid "The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library." msgstr "Les tailles prÃ©cisÃ©es ci-dessous dÃ©terminent les dimensions maximales (en pixels) Ã utiliser lors de l’insertion d’une image dans la bibliothÃ¨que de mÃ©dias." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:243 +msgid "Permalinks" +msgstr "Permaliens" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:237 +msgid "Plugin" +msgstr "Extension" +======= #: wp-admin/options-media.php:48 msgid "Image sizes" msgstr "Tailles des images" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:61 wp-admin/options-discussion.php:62 +msgid "Default article settings" +msgstr "RÃ©glages par dÃ©faut des articles" +||||||| .r11156 +#: wp-admin/customize.php:174 +#: wp-admin/includes/class-wp-theme-install-list-table.php:302 +#: wp-admin/theme-install.php:266 +msgid "Collapse Sidebar" +msgstr "RÃ©duire la barre latÃ©rale" +======= #: wp-admin/options-media.php:34 msgid "Documentation on Media Settings" msgstr "Documentation sur les rÃ©glages des mÃ©dias (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:79 wp-admin/options-discussion.php:80 +msgid "Other comment settings" +msgstr "Autres rÃ©glages des commentaires" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:381 +#: wp-admin/includes/plugin-install.php:424 +msgid "Version:" +msgstr "Version : " +======= #: wp-admin/options-media.php:21 msgid "Uploading Files allows you to choose the folder and path for storing your uploaded files." msgstr "« Envoi de fichiers » vous permet de choisir le dossier et le chemin de stockage de vos fichiers mis en ligne." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:85 +msgid "Users must be registered and logged in to comment" +msgstr "Un utilisateur doit Ãªtre enregistrÃ© et connectÃ© pour publier des commentaires" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:52 +msgid "Scale" +msgstr "Redimensionner" +======= #: wp-admin/options-media.php:18 msgid "You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size." msgstr "Vous pouvez indiquer une taille maximale pour les images insÃ©rÃ©es dans votre contenu textuel. Vous pourrez insÃ©rer l’image dans sa taille d’origine." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:92 +msgid "Automatically close comments on articles older than %s days" +msgstr "Fermer automatiquement les commentaires pour les articles vieux de plus de %s jours" +||||||| .r11156 +#: wp-admin/includes/media.php:1159 +msgid "Link URL" +msgstr "Adresse du lien" +======= #: wp-admin/options-media.php:15 msgid "Media Settings" msgstr "RÃ©glages des mÃ©dias" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:115 +msgid "Enable threaded (nested) comments %s levels deep" +msgstr "Activer les commentaires imbriquÃ©s jusqu’Ã %s niveaux" +||||||| .r11156 +#: wp-admin/includes/media.php:1162 wp-admin/includes/media.php:2501 +msgid "Enter a link URL or click above for presets." +msgstr "Saisissez une adresse de lien ou cliquez ci-dessus pour les liens prÃ©dÃ©finis." +======= #: wp-admin/options-general.php:366 wp-admin/options-general.php:370 msgid "The %s constant in your %s file is no longer needed." msgstr "La constante %s de votre fichier %s n’est plus nÃ©cessaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:125 +msgid "last" +msgstr "derniÃ¨re" +||||||| .r11156 +#: wp-admin/includes/media.php:2138 wp-admin/menu.php:63 wp-admin/menu.php:226 +msgid "Media" +msgstr "MÃ©dias" +======= #: wp-admin/options-general.php:366 msgid "Note:" msgstr "Note :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:127 +msgid "first" +msgstr "premiÃ¨re" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:423 wp-admin/includes/meta-boxes.php:866 +#: wp-admin/press-this.php:587 +msgid "Add" +msgstr "Ajouter" +======= #: wp-admin/options-general.php:344 msgid "Site Language" msgstr "Langue du site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:129 +msgid "Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default" +msgstr "Diviser les commentaires en pages, avec %1$s commentaires de premier niveau par page et la %2$s page affichÃ©e par dÃ©faut" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:823 +#: wp-admin/includes/nav-menu.php:835 wp-admin/includes/nav-menu.php:1023 +#: wp-admin/update-core.php:230 wp-admin/update-core.php:237 +#: wp-admin/update-core.php:308 wp-admin/update-core.php:315 +msgid "Select All" +msgstr "Tout sÃ©lectionner" +======= #: wp-admin/options-general.php:321 msgid "Week Starts On" msgstr "La semaine dÃ©bute le" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:137 +msgid "older" +msgstr "ancien" +||||||| .r11156 +#: wp-admin/includes/theme.php:178 +msgid "Black" +msgstr "Noir" +======= #: wp-admin/options-general.php:315 msgid "Documentation on date and time formatting." msgstr "Documentation sur le format des dates." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:139 +msgid "newer" +msgstr "rÃ©cent" +||||||| .r11156 +#: wp-admin/includes/theme.php:179 +msgid "Blue" +msgstr "Bleu" +======= #: wp-admin/options-general.php:313 msgid "Custom time format:" msgstr "Format d’heure personnalisÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:141 +msgid "Comments should be displayed with the %s comments at the top of each page" +msgstr "Les commentaires doivent Ãªtre affichÃ©s avec le plus %s en premier" +||||||| .r11156 +#: wp-admin/includes/theme.php:180 +msgid "Brown" +msgstr "Marron" +======= #: wp-admin/options-general.php:312 msgid "enter a custom time format in the following field" msgstr "saisissez un format d’heure personnalisÃ© dans le champ suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:151 +msgid "Anyone posts a comment" +msgstr "Un nouveau commentaire est publiÃ©" +||||||| .r11156 +#: wp-admin/includes/theme.php:181 +msgid "Gray" +msgstr "Gris" +======= #: wp-admin/options-general.php:280 wp-admin/options-general.php:313 msgid "example:" msgstr "exemple :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:155 +msgid "A comment is held for moderation" +msgstr "Un commentaire est en attente de modÃ©ration" +||||||| .r11156 +#: wp-admin/includes/theme.php:182 +msgid "Green" +msgstr "Vert" +======= #: wp-admin/options-general.php:280 msgid "Custom date format:" msgstr "Format de date personnalisÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:159 wp-admin/options-discussion.php:160 +msgid "Before a comment appears" +msgstr "Avant la publication d’un commentaire" +||||||| .r11156 +#: wp-admin/includes/theme.php:183 +msgid "Orange" +msgstr "Orange" +======= #: wp-admin/options-general.php:279 msgid "enter a custom date format in the following field" msgstr "saisissez un format de date personnalisÃ© dans le champ suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:169 wp-admin/options-discussion.php:170 +msgid "Comment Moderation" +msgstr "ModÃ©ration de commentaires" +||||||| .r11156 +#: wp-admin/includes/theme.php:184 +msgid "Pink" +msgstr "Rose" +======= #: wp-admin/options-general.php:279 wp-admin/options-general.php:312 msgid "Custom:" msgstr "PersonnalisÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:180 wp-admin/options-discussion.php:181 +msgid "Comment Blacklist" +msgstr "Liste noire pour les commentaires" +||||||| .r11156 +#: wp-admin/includes/theme.php:185 +msgid "Purple" +msgstr "Violet" +======= #: wp-admin/options-general.php:240 msgid "This timezone does not observe daylight saving time." msgstr "Ce fuseau horaire n’a pas d’heure d’Ã©tÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:191 +msgid "Avatars" +msgstr "Avatars" +||||||| .r11156 +#: wp-admin/includes/theme.php:186 +msgid "Red" +msgstr "Rouge" +======= #: wp-admin/options-general.php:236 msgid "Standard time begins on: %s." msgstr "Le passage Ã l’heure d’hiver se fait le : %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:203 wp-admin/options-discussion.php:204 +msgid "Avatar Display" +msgstr "Affichage des avatars" +||||||| .r11156 +#: wp-admin/includes/theme.php:187 +msgid "Silver" +msgstr "Argent" +======= #: wp-admin/options-general.php:235 msgid "Daylight saving time begins on: %s." msgstr "L’heure d'Ã©tÃ© commence le : %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:207 +msgid "Show Avatars" +msgstr "Afficher les avatars" +||||||| .r11156 +#: wp-admin/includes/theme.php:189 +msgid "White" +msgstr "Blanc" +======= #: wp-admin/options-general.php:214 msgid "This timezone is currently in standard time." msgstr "Ce fuseau horaire est actuellement Ã l’heure d’hiver." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:212 wp-admin/options-discussion.php:213 +msgid "Maximum Rating" +msgstr "Classement maximal" +||||||| .r11156 +#: wp-admin/includes/theme.php:190 +msgid "Yellow" +msgstr "Jaune" +======= #: wp-admin/options-general.php:212 msgid "This timezone is currently in daylight saving time." msgstr "Ce fuseau horaire est actuellement Ã l’heure d’Ã©tÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Content suitability rating: http:bit.ly/89QxZA +#: wp-admin/options-discussion.php:218 +msgid "G — Suitable for all audiences" +msgstr "G — Visibles par tous" +||||||| .r11156 +#: wp-admin/includes/theme.php:209 +msgid "Blavatar" +msgstr "Blavatar" +======= #: wp-admin/options-general.php:203 msgid "Choose a city in the same timezone as you." msgstr "Choisissez une ville dans le mÃªme fuseau horaire que le vÃ´tre." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Content suitability rating: http:bit.ly/89QxZA +#: wp-admin/options-discussion.php:220 +msgid "PG — Possibly offensive, usually for audiences 13 and above" +msgstr "PG — Possiblement offensants, rÃ©servÃ©s normalement aux personnes de 13 ans et plus" +||||||| .r11156 +#: wp-admin/link.php:104 +msgid "Edit Link" +msgstr "Modifier le lien" +======= #: wp-admin/options-general.php:201 msgid "Local time is %1$s" msgstr "L’heure locale actuelle est %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Content suitability rating: http:bit.ly/89QxZA +#: wp-admin/options-discussion.php:222 +msgid "R — Intended for adult audiences above 17" +msgstr "R — RÃ©servÃ©s aux personnes de plus de 17 ans" +||||||| .r11156 +#: wp-admin/menu.php:221 wp-admin/options.php:21 +msgid "Settings" +msgstr "RÃ©glages" +======= #: wp-admin/options-general.php:199 msgid "UTC time is %s" msgstr " L’heure UTC actuelle est %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Content suitability rating: http:bit.ly/89QxZA +#: wp-admin/options-discussion.php:224 +msgid "X — Even more mature than above" +msgstr "X — RÃ©servÃ©s aux adultes" +||||||| .r11156 +#: wp-admin/user-edit.php:274 wp-admin/user-edit.php:275 +msgid "Toolbar" +msgstr "Barre d’outils" +======= #: wp-admin/options-general.php:192 msgid "Timezone" msgstr "Fuseau horaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:235 wp-admin/options-discussion.php:236 +msgid "Default Avatar" +msgstr "Avatar par dÃ©faut" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:177 +#: wp-admin/includes/theme-install.php:65 +msgid "Keyword" +msgstr "Mot-clÃ©" +======= #: wp-admin/options-general.php:164 msgid "There is a pending change of the admin e-mail to %1$s. Cancel" msgstr "Il y a une modification de l’adresse de contact de l’administrateur en cours, en faveur de %1$s. Annuler" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:243 +msgid "Blank" +msgstr "Vide" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:824 +msgid "This theme requires a parent theme. Checking if it is installed…" +msgstr "Ce thÃ¨me nÃ©cessite un thÃ¨me parent. Nous vÃ©rifions s’il est installÃ©…" +======= #: wp-admin/options-general.php:159 msgid "This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. The new address will not become active until confirmed." msgstr "Cette adresse est utilisÃ©e Ã des fins d’administration. Si vous la modifiez, nous enverrons un message Ã la nouvelle adresse afin de la confirmer. La nouvelle adresse ne sera pas active tant que vous ne l’aurez pas confirmÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:244 +msgid "Gravatar Logo" +msgstr "Logo Gravatar" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:826 +msgid "Preparing to install %1$s %2$s…" +msgstr "PrÃ©paration Ã l’installation de %1$s %2$s…" +======= #: wp-admin/options-general.php:150 msgid "New User Default Role" msgstr "RÃ´le par dÃ©faut de tout nouvel utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:143 wp-admin/options-general.php:144 +msgid "Membership" +msgstr "Inscription" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:828 +msgid "The parent theme, %1$s %2$s, is currently installed." +msgstr "Le thÃ¨me parent, %1$s %2$s, est bien installÃ©." +======= #: wp-admin/options-general.php:146 msgid "Anyone can register" msgstr "Tout le monde peut s’enregistrer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:146 +msgid "Anyone can register" +msgstr "Tout le monde peut s’enregistrer" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:830 +msgid "Successfully installed the parent theme, %1$s %2$s." +msgstr "Le thÃ¨me parent, %1$s %2$s, a bien Ã©tÃ© installÃ©." +======= #: wp-admin/options-general.php:143 wp-admin/options-general.php:144 msgid "Membership" msgstr "Inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:150 +msgid "New User Default Role" +msgstr "RÃ´le par dÃ©faut de tout nouvel utilisateur" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:831 +msgid "The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme." +msgstr "Le thÃ¨me parent n’a pas pu Ãªtre trouvÃ©. Vous allez devoir installer le thÃ¨me parent, %s, avant de pouvoir utiliser ce thÃ¨me enfant." +======= #: wp-admin/options-general.php:140 msgid "This address is used for admin purposes, like new user notification." msgstr "Cette adresse n’est utilisÃ©e que pour l’administration du site : par exemple, la notification de l’inscription d’un nouvel utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:192 +msgid "Timezone" +msgstr "Fuseau horaire" +||||||| .r11156 +#: wp-admin/custom-header.php:182 wp-admin/custom-header.php:671 +#: wp-admin/custom-header.php:676 +msgid "Header Text" +msgstr "Texte de l’en-tÃªte" +======= #: wp-admin/options-general.php:138 wp-admin/options-general.php:157 msgid "E-mail Address" msgstr "Adresse de messagerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:199 +msgid "UTC time is %s" +msgstr " L’heure UTC actuelle est %s" +||||||| .r11156 +#: wp-admin/custom-header.php:679 +msgid "Show header text with your image." +msgstr "Afficher le texte d’en-tÃªte avec l’image." +======= #: wp-admin/options-general.php:135 msgid "Enter the address here if you want your site home page to be different from your WordPress installation directory." msgstr "Si vous souhaitez que l’adresse de la page d’accueil de votre site soit diffÃ©rente du rÃ©pertoire oÃ¹ vous avez installÃ© WordPress, saisissez cette adresse ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:201 +msgid "Local time is %1$s" +msgstr "L’heure locale actuelle est %1$s" +||||||| .r11156 +#: wp-admin/includes/theme.php:157 wp-admin/includes/update.php:286 +#: wp-admin/includes/update.php:375 +msgid "There is a new version of %1$s available. View version %4$s details or update now." +msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s ou mettez Ã jour automatiquement." +======= #: wp-admin/options-general.php:125 msgid "In a few words, explain what this site is about." msgstr "En quelques mots, dÃ©crivez la raison d’Ãªtre de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:203 +msgid "Choose a city in the same timezone as you." +msgstr "Choisissez une ville dans le mÃªme fuseau horaire que le vÃ´tre." +||||||| .r11156 +#: wp-admin/includes/plugin.php:171 +msgid "By %s." +msgstr "par %s" +======= #: wp-admin/options-general.php:104 msgid "Documentation on General Settings" msgstr "Documentation sur les rÃ©glages gÃ©nÃ©raux (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:212 +msgid "This timezone is currently in daylight saving time." +msgstr "Ce fuseau horaire est actuellement Ã l’heure d’Ã©tÃ©." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:630 +msgid "Add comment" +msgstr "Ajouter un commentaire" +======= #: wp-admin/options-general.php:93 msgid "UTC means Coordinated Universal Time." msgstr "UTC signifie « Temps universel coordonnÃ© »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:214 +msgid "This timezone is currently in standard time." +msgstr "Ce fuseau horaire est actuellement Ã l’heure d’hiver." +||||||| .r11156 +#: wp-admin/includes/template.php:441 +msgid "Add new Comment" +msgstr "Ajouter un nouveau commentaire" +======= #: wp-admin/options-general.php:92 msgid "You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable)." msgstr "Vous pouvez configurer la langue, et les fichiers de traduction seront automatiquement tÃ©lÃ©chargÃ©s et installÃ©s (disponible uniquement si votre systÃ¨me de fichier est accessible en Ã©criture)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:235 +msgid "Daylight saving time begins on: %s." +msgstr "Le passage Ã l’heure d’Ã©tÃ© se fait le %s." +||||||| .r11156 +#: wp-admin/includes/template.php:469 +msgid "Add Comment" +msgstr "Ajouter un commentaire" +======= #: wp-admin/options-general.php:89 msgid "If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin." msgstr "Si vous voulez que les visiteurs du site puissent s’inscrire eux-mÃªmes plutÃ´t que de devoir Ãªtre inscrits par l’administrateur du site, cochez la case « Inscription ». Un rÃ´le d’utilisateur par dÃ©faut peut Ãªtre assignÃ© pour tout nouveau inscrit, qu’il se soit enregistrÃ© lui-mÃªme ou par le biais de l’administrateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:279 wp-admin/options-general.php:312 +msgid "Custom:" +msgstr "PersonnalisÃ© :" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:376 +msgid "Broken Theme:" +msgstr "ThÃ¨me cassÃ© :" +======= #: wp-admin/options-general.php:88 msgid "The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory." msgstr "L’adresse web de WordPress et celle du site peuvent Ãªtre identiques (exemple.fr) ou diffÃ©rentes. Ainsi, vous pourriez avoir les fichiers de WordPress dans un sous-dossier (exemple.fr/wordpress) plutÃ´t qu’Ã la racine du site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:321 +msgid "Week Starts On" +msgstr "La semaine dÃ©bute le" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:226 +msgid "Broken (%s)" +msgid_plural "Broken (%s)" +msgstr[0] "CassÃ© (%s)" +msgstr[1] "CassÃ© (%s)" +======= #: wp-admin/options-general.php:85 msgid "Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes." msgstr "La plupart des thÃ¨mes affichent le titre du site en haut de chaque page, dans la barre de titre du navigateur, et en tant qu’identifiant pour les flux de syndication, sauf si votre thÃ¨me en dÃ©cide autrement. Le slogan est Ã©galement utilisÃ© par de nombreux thÃ¨mes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:15 +msgid "Media Settings" +msgstr "RÃ©glages des mÃ©dias" +||||||| .r11156 +#: wp-admin/includes/theme.php:192 +msgid "Light" +msgstr "Clair" +======= #: wp-admin/options-general.php:84 msgid "The fields on this screen determine some of the basics of your site setup." msgstr "Les champs de cet Ã©cran dÃ©terminent certains des rÃ©glages de base de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:53 +msgid "Thumbnail size" +msgstr "Taille des miniatures" +||||||| .r11156 +msgid "Hello Dolly" +msgstr "Hello Dolly" +======= #. translators: date and time format for exact current time, mainly about #. timezones, see http:php.net/date #: wp-admin/options-general.php:21 msgctxt "timezone date format" msgid "Y-m-d H:i:s" msgstr "Y-m-d H:i:s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:65 wp-admin/options-media.php:66 +msgid "Medium size" +msgstr "Taille moyenne" +||||||| .r11156 +msgid "This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page." +msgstr "Ce n'est pas qu'une extension. Elle symbolise l'espoir et l'enthousiasme de toute une gÃ©nÃ©ration, rÃ©sumÃ© en deux mots, qu'a notamment chantÃ© Louis Armstrong : Hello, Dolly. Une fois activÃ©, elle affichera une ligne alÃ©atoirement des paroles de la chanson Hello, Dolly, en haut Ã droite de toutes les pages de l'administration." +======= #: wp-admin/options-general.php:18 msgid "General Settings" msgstr "RÃ©glages gÃ©nÃ©raux" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:67 wp-admin/options-media.php:77 +msgid "Max Width" +msgstr "Largeur maximale" +||||||| .r11156 +msgid "Matt Mullenweg" +msgstr "Matt Mullenweg" +======= #: wp-admin/options-discussion.php:248 msgid "Retro (Generated)" msgstr "RÃ©tro (gÃ©nÃ©rÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:69 wp-admin/options-media.php:79 +msgid "Max Height" +msgstr "Hauteur maximale" +||||||| .r11156 +msgid "http://ma.tt/" +msgstr "http://ma.tt/" +======= #: wp-admin/options-discussion.php:247 msgid "MonsterID (Generated)" msgstr "MonsterID (gÃ©nÃ©rÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:75 wp-admin/options-media.php:76 +msgid "Large size" +msgstr "Grande taille" +||||||| .r11156 +#: wp-admin/includes/screen.php:1029 +msgid "Show on screen" +msgstr "Afficher Ã l’Ã©cran" +======= #: wp-admin/options-discussion.php:246 msgid "Wavatar (Generated)" msgstr "Wavatar (gÃ©nÃ©rÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:92 +msgid "Embeds" +msgstr "Affichages distants" +||||||| .r11156 +#: wp-admin/index.php:76 +msgid "Welcome - Shows links for some of the most common tasks when setting up a new site." +msgstr "Bienvenue - Affiche des liens pour certaines des tÃ¢ches les plus courantes lors de l’installation d’un nouveau site." +======= #: wp-admin/options-discussion.php:245 msgid "Identicon (Generated)" msgstr "Identicon (gÃ©nÃ©rÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:99 +msgid "Uploading Files" +msgstr "Envoi de fichiers" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:284 +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" +======= #: wp-admin/options-discussion.php:244 msgid "Gravatar Logo" msgstr "Logo Gravatar" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:746 wp-admin/nav-menus.php:817 +msgid "Save Menu" +msgstr "Enregistrer le menu" +||||||| .r11156 +#: wp-admin/includes/theme.php:154 wp-admin/includes/update.php:373 +msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme." +msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s. Pas de possibilitÃ© de mise Ã jour automatique pour ce thÃ¨me." +======= #: wp-admin/options-discussion.php:243 msgid "Blank" msgstr "Vide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:245 +msgid "Identicon (Generated)" +msgstr "Identicon (gÃ©nÃ©rÃ©)" +||||||| .r11156 +#: wp-admin/includes/schema.php:375 +msgctxt "start of week" +msgid "1" +msgstr "1" +======= #: wp-admin/options-discussion.php:242 msgid "Mystery Person" msgstr "Personne mystÃ¨re" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:246 +msgid "Wavatar (Generated)" +msgstr "Wavatar (gÃ©nÃ©rÃ©)" +||||||| .r11156 +#: wp-admin/includes/screen.php:1049 +msgctxt "Welcome panel" +msgid "Welcome" +msgstr "Bienvenue" +======= #: wp-admin/options-discussion.php:238 msgid "For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address." msgstr "Les utilisateurs n’ayant pas d’avatar peuvent se voir attribuer un logo gÃ©nÃ©rique, ou un avatar gÃ©nÃ©rÃ© Ã partir de leur adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:247 +msgid "MonsterID (Generated)" +msgstr "MonsterID (gÃ©nÃ©rÃ©)" +||||||| .r11156 +#: wp-admin/includes/schema.php:360 +msgctxt "default GMT offset or timezone string" +msgid "0" +msgstr "1" +======= #: wp-admin/options-discussion.php:235 wp-admin/options-discussion.php:236 msgid "Default Avatar" msgstr "Avatar par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:240 +msgid "This timezone does not observe daylight saving time." +msgstr "Ce fuseau horaire n’a pas d’heure d’Ã©tÃ©" +||||||| .r11156 +#: wp-admin/includes/template.php:742 +msgid "%1$s-%2$s" +msgstr "%1$s-%2$s" +======= #. translators: Content suitability rating: http:bit.ly/89QxZA #: wp-admin/options-discussion.php:224 msgid "X — Even more mature than above" msgstr "X — RÃ©servÃ©s aux adultes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:125 +msgid "In a few words, explain what this site is about." +msgstr "En quelques mots, dÃ©crivez la raison d’Ãªtre de ce site." +||||||| .r11156 +#: wp-admin/custom-header.php:576 +msgid "Images should be at least %1$d pixels wide." +msgstr "Les images devraient faire au moins %1$d pixels de large." +======= #. translators: Content suitability rating: http:bit.ly/89QxZA #: wp-admin/options-discussion.php:222 msgid "R — Intended for adult audiences above 17" msgstr "R — RÃ©servÃ©s aux personnes de plus de 17 ans" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:598 +msgid "Your theme supports one menu. Select which menu you would like to use." +msgstr "Votre thÃ¨me peut utiliser %s menu. SÃ©lectionnez le menu que vous voudriez utiliser." +||||||| .r11156 +#: wp-admin/custom-header.php:585 +msgid "Suggested height is %1$d pixels." +msgstr "La hauteur suggÃ©rÃ©e est de %1$d pixels." +======= #. translators: Content suitability rating: http:bit.ly/89QxZA #: wp-admin/options-discussion.php:220 msgid "PG — Possibly offensive, usually for audiences 13 and above" msgstr "PG — Possiblement offensants, rÃ©servÃ©s normalement aux personnes de 13 ans et plus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-add.php:13 +msgid "You do not have sufficient permissions to add links to this site." +msgstr "Vous n’avez pas les droits suffisants pour ajouter les liens Ã ce site." +||||||| .r11156 +#: wp-admin/custom-header.php:579 +msgid "Images should be at least %1$d pixels tall." +msgstr "Les images devraient faire au moins %1$d pixels de haut." +======= #. translators: Content suitability rating: http:bit.ly/89QxZA #: wp-admin/options-discussion.php:218 msgid "G — Suitable for all audiences" msgstr "G — Visibles par tous" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:49 +msgid "You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table." +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran en utilisant les rÃ©glages d’affichage et/ou le filtre dÃ©roulant prÃ©sent au-dessous du tableau de liens." +||||||| .r11156 +#: wp-admin/install.php:215 +msgctxt "Howdy" +msgid "Welcome" +msgstr "Bienvenue" +======= #: wp-admin/options-discussion.php:212 wp-admin/options-discussion.php:213 msgid "Maximum Rating" msgstr "Classement maximal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:89 +msgid "Search Links" +msgstr "Chercher un lien" +||||||| .r11156 +#: wp-admin/custom-header.php:583 +msgid "Suggested width is %1$d pixels." +msgstr "La largeur suggÃ©rÃ©e est de %1$d pixels." +======= #: wp-admin/options-discussion.php:207 msgid "Show Avatars" msgstr "Afficher les avatars" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:23 wp-admin/media.php:57 +msgid "You are not allowed to edit this attachment." +msgstr "Vous n’avez pas l’autorisation de modifier ce fichier attachÃ©." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:84 +msgid "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." +msgstr "Je suis certain de vouloir effacer mon site dÃ©finitivement, et je me rends compte que je ne pourrais jamais le rÃ©cupÃ©rer ni utiliser %s pour un nouveau site." +======= #: wp-admin/options-discussion.php:203 wp-admin/options-discussion.php:204 msgid "Avatar Display" msgstr "Affichage des avatars" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:61 +msgid "You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?" +msgstr "Vous tentez de modifier un fichier attachÃ© qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +||||||| .r11156 +#: wp-admin/ms-delete-site.php:85 +msgid "Delete My Site Permanently" +msgstr "Effacer mon site dÃ©finitivement" +======= #: wp-admin/options-discussion.php:193 msgid "An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site." msgstr "Un avatar est une image qui vous suit de site en site, apparaissant Ã cÃ´tÃ© de votre nom quand vous laissez un commentaire sur un site capable de le reconnaÃ®tre. Vous pouvez ici activer l’affichage des avatars des gens qui laissent un commentaire sur votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:19 +msgid "Your theme does not support navigation menus or widgets." +msgstr "Le thÃ¨me actuel n’accepte pas les menus de navigation ni les widgets." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:71 +msgid "Delete My Site" +msgstr "Supprimer le site" +======= #: wp-admin/options-discussion.php:191 msgid "Avatars" msgstr "Avatars" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:234 +msgid "The menu item has been successfully deleted." +msgstr "L’Ã©lÃ©ment du menu a bien Ã©tÃ© supprimÃ©." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:79 +msgid "Remember, once deleted your site cannot be restored." +msgstr "Rappelez-vous qu’une fois supprimÃ©, votre site ne peut Ãªtre rÃ©tabli." +======= #: wp-admin/options-discussion.php:182 msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so “press” will match “WordPress”." msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, nom, adresse web, adresse de messagerie, ou IP, le marquer comme indÃ©sirable. Un seul mot ou IP par ligne. Il reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:253 +msgid "The menu has been successfully deleted." +msgstr "Le menu a bien Ã©tÃ© supprimÃ©." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:24 +msgid "I'm sorry, the link you clicked is stale. Please select another option." +msgstr "Je suis dÃ©solÃ©, mais le lien que vous avez cliquÃ© ne rÃ©pond pas. Veuillez sÃ©lectionner une autre option." +======= #: wp-admin/options-discussion.php:180 wp-admin/options-discussion.php:181 msgid "Comment Blacklist" msgstr "Liste noire pour les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:743 +msgid "Enter menu name here" +msgstr "Saisissez ici le nom du menu" +||||||| .r11156 +#: wp-admin/ms-delete-site.php:22 +msgid "Thank you for using %s, your site has been deleted. Happy trails to you until we meet again." +msgstr "Merci d’avoir utilisÃ© notre service %s, votre site a Ã©tÃ© effacÃ©. Ce n’est qu’un au revoir..." +======= #: wp-admin/options-discussion.php:173 msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. One word or IP per line. It will match inside words, so “press” will match “WordPress”." msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, son nom, son adresse web, son adresse de messagerie, ou son IP, celui-ci est retenu dans la file de modÃ©ration. Un seul mot ou une seule IP par ligne. Cette fonction reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:813 +msgid "Delete Menu" +msgstr "Supprimer le menu" +||||||| .r11156 +#: wp-admin/ms-delete-site.php:78 +msgid "If you do not want to use your %s site any more, you can delete it using the form below. When you click Delete My Site Permanently you will be sent an email with a link in it. Click on this link to delete your site." +msgstr "Si vous ne souhaitez plus utiliser votre site %s, vous pouvez l’effacer Ã l’aide du formulaire ci-dessous. AprÃ¨s avoir cliquÃ© sur Effacer mon site, vous recevrez un message avec un lien. Cliquez sur ce lien pour effacer votre site." +======= #: wp-admin/options-discussion.php:171 msgid "Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)" msgstr "Garder un commentaire dans la file d’attente s’il contient plus de %s lien(s) (une des caractÃ©ristiques typiques d’un commentaire indÃ©sirable (spam) est son nombre important de liens)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:75 +msgid "These settings may be overridden for individual articles." +msgstr "Ces rÃ©glages peuvent Ãªtre modifiÃ©s pour chaque article." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:17 +msgid "You do not have sufficient permissions to delete this site." +msgstr "Vous n’avez pas les droits suffisants pour effacer ce site." +======= #: wp-admin/options-discussion.php:169 wp-admin/options-discussion.php:170 msgid "Comment Moderation" msgstr "ModÃ©ration de commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:81 +msgid "Comment author must fill out name and e-mail" +msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +||||||| .r11156 +#: wp-admin/ms-delete-site.php:74 +msgid "Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. " +msgstr "Merci. Veuillez consulter le message que nous vous avons envoyÃ© pour confirmer cette action. Votre site ne sera pas effacÃ© tant que vous n’aurez pas cliquÃ© le lien qu’il contient." +======= #: wp-admin/options-discussion.php:165 msgid "Comment author must have a previously approved comment" msgstr "L’auteur d’un commentaire doit avoir dÃ©jÃ au moins un commentaire approuvÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:147 wp-admin/options-discussion.php:148 +msgid "E-mail me whenever" +msgstr "M’envoyer un message lorsque" +||||||| .r11156 +#: wp-admin/ms-delete-site.php:45 +msgid "" +"Dear User,\n" +"You recently clicked the 'Delete Site' link on your site and filled in a\n" +"form on that page.\n" +"If you really want to delete your site, click the link below. You will not\n" +"be asked to confirm again so only click this link if you are absolutely certain:\n" +"###URL_DELETE###\n" +"\n" +"If you delete your site, please consider opening a new site here\n" +"some time in the future! (But remember your current site and username\n" +"are gone forever.)\n" +"\n" +"Thanks for using the site,\n" +"Webmaster\n" +"###SITE_NAME###" +msgstr "" +"Cher utilisateur,\n" +"Vous avez rÃ©cemment cliquÃ© sur le lien \"Effacer mon site\" dans la console d'administration de votre site \n" +"et complÃ©tÃ© le formulaire prÃ©sent sur cette mÃªme page.\n" +"Si vous Ãªtes sÃ»r de vouloir supprimer votre site, cliquez sur le lien ci-dessous. Aucune confirmation ne vous sera demandÃ©e Ã l'avenir, soyez donc totalement certain de ce que vous faites :\n" +"###URL_DELETE###\n" +"\n" +"Si vous effacez votre site, n'hÃ©sitez pas Ã revenir crÃ©er un site Ã l'avenir ! (mais souvenez-vous que votre site actuel et votre identifiant ne seront plus jamais disponibles)\n" +"\n" +"Merci d'avoir utilisÃ© notre site,\n" +"\n" +"Le webmaster\n" +"###SITE_NAME###" +======= #: wp-admin/options-discussion.php:163 msgid "Comment must be manually approved" msgstr "Le commentaire doit Ãªtre approuvÃ© manuellement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:165 +msgid "Comment author must have a previously approved comment" +msgstr "L’auteur d’un commentaire doit avoir dÃ©jÃ au moins un commentaire approuvÃ©" +||||||| .r11156 +#: wp-admin/includes/ms.php:34 +msgid "This file is too big. Files must be less than %1$s KB in size." +msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %1$s Ko." +======= #: wp-admin/options-discussion.php:159 wp-admin/options-discussion.php:160 msgid "Before a comment appears" msgstr "Avant la publication d’un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:171 +msgid "Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)" +msgstr "Garder un commentaire dans la file d’attente s’il contient plus de %s lien(s) (une des caractÃ©ristiques typiques d’un commentaire indÃ©sirable (spam) est son nombre important de liens)" +||||||| .r11156 +#: wp-admin/includes/ms.php:36 +msgid "You have used your space quota. Please delete files before uploading." +msgstr "Vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota. Veuillez supprimer quelques fichiers avant l’envoi." +======= #: wp-admin/options-discussion.php:155 msgid "A comment is held for moderation" msgstr "Un commentaire est en attente de modÃ©ration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:173 +msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. One word or IP per line. It will match inside words, so “press” will match “WordPress”." +msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, son nom, son adresse web, son adresse de messagerie, ou son IP, celui-ci est retenu dans la file de modÃ©ration. Un seul mot ou une seule IP par ligne. Cette fonction reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +||||||| .r11156 +#: wp-admin/includes/ms.php:261 +msgid "[%s] New Admin Email Address" +msgstr "[%s] Nouvelle adresse e-mail d'administration" +======= #: wp-admin/options-discussion.php:151 msgid "Anyone posts a comment" msgstr "Un nouveau commentaire est publiÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:182 +msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so “press” will match “WordPress”." +msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, nom, adresse web, adresse de messagerie, ou IP, le marquer comme indÃ©sirable. Un seul mot ou IP par ligne. Il reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +||||||| .r11156 +#: wp-admin/includes/ms.php:294 +msgid "" +"Dear user,\n" +"\n" +"You recently requested to have the email address on your account changed.\n" +"If this is correct, please click on the following link to change it:\n" +"###ADMIN_URL###\n" +"\n" +"You can safely ignore and delete this email if you do not want to\n" +"take this action.\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Cher utilisateur,\n" +"\n" +"Vous avez rÃ©cemment demandÃ© Ã modifier l'adresse e-mail d'administration de votre compte.\n" +"Si c'est bien le cas, veuillez cliquer sur le lien suivant pour valider la modification:\n" +"###ADMIN_URL###\n" +"\n" +"Vous pouvez ignorer et supprimer ce mail si vous n'avez pas demandÃ© cette action.\n" +"\n" +"Cet email a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"Depuis ###SITENAME###\n" +"###SITEURL###" +======= #: wp-admin/options-discussion.php:147 wp-admin/options-discussion.php:148 msgid "E-mail me whenever" msgstr "M’envoyer un message lorsque" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:238 +msgid "For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address." +msgstr "Les utilisateurs n’ayant pas d’avatar peuvent se voir attribuer un logo gÃ©nÃ©rique, ou un avatar gÃ©nÃ©rÃ© Ã partir de leur adresse de messagerie." +||||||| .r11156 +#: wp-admin/includes/ms.php:338 +msgid "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." +msgstr "Votre adresse e-mail n’a pas encore Ã©tÃ© mise Ã jour. Veuillez vÃ©rifier votre boite de rÃ©ception %s pour consulter l’e-mail de confirmation." +======= #: wp-admin/options-discussion.php:141 msgid "Comments should be displayed with the %s comments at the top of each page" msgstr "Les commentaires doivent Ãªtre affichÃ©s avec le plus %s en premier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:84 +msgid "The fields on this screen determine some of the basics of your site setup." +msgstr "Les champs de cet Ã©cran dÃ©terminent certains des rÃ©glages de base de votre site." +||||||| .r11156 +#: wp-admin/includes/ms.php:383 +msgid "GB" +msgstr "Go" +======= #: wp-admin/options-discussion.php:139 msgid "newer" msgstr "rÃ©cent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:85 +msgid "Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes." +msgstr "La plupart des thÃ¨mes affichent le titre du site en haut de chaque page, dans la barre de titre du navigateur, et en tant qu’identifiant pour les flux de syndication, sauf si votre thÃ¨me en dÃ©cide autrement. Le slogan est Ã©galement utilisÃ© par de nombreux thÃ¨mes." +||||||| .r11156 +#: wp-admin/includes/ms.php:387 +msgid "MB" +msgstr "Mo" +======= #: wp-admin/options-discussion.php:137 msgid "older" msgstr "ancien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:159 +msgid "This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. The new address will not become active until confirmed." +msgstr "Cette adresse est utilisÃ©e Ã des fins d’administration. Si vous la modifiez, nous enverrons un message Ã la nouvelle adresse afin de la confirmer. La nouvelle adresse ne sera pas active tant que vous ne l’aurez pas confirmÃ©e." +||||||| .r11156 +#: wp-admin/includes/ms.php:330 +msgid "[%s] New Email Address" +msgstr "[%s] Nouvelle adresse e-mail" +======= #: wp-admin/options-discussion.php:129 msgid "Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default" msgstr "Diviser les commentaires en pages, avec %1$s commentaires de premier niveau par page et la %2$s page affichÃ©e par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:55 +msgid "If you delete a link, it will be removed permanently, as Links do not have a Trash function yet." +msgstr "Si vous supprimez un lien, il sera supprimÃ© dÃ©finitivement, car les liens n’ont pas accÃ¨s Ã la Corbeille pour le moment." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:254 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:297 +msgid "Network Disable" +msgstr "DÃ©sactiver du rÃ©seau" +======= #: wp-admin/options-discussion.php:127 msgid "first" msgstr "premiÃ¨re" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:141 +msgid "One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient." +msgstr "Une ou plusieurs tables de votre base de donnÃ©es sont indisponibles. Pour autoriser WordPress Ã tenter de rÃ©parer ces tables, cliquez sur le bouton « RÃ©parer la base de donnÃ©es ». La rÃ©paration peut prendre un certain temps, merci donc d’Ãªtre patient." +||||||| .r11156 +#: wp-admin/includes/ms-deprecated.php:30 +msgid "Sorry, you must delete files before you can upload any more." +msgstr "DÃ©solÃ©, vous devez effacer quelques fichiers avant de pouvoir en envoyer d’autres." +======= #: wp-admin/options-discussion.php:125 msgid "last" msgstr "derniÃ¨re" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:88 +msgid "The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory." +msgstr "L’adresse web de WordPress et celle du site peuvent Ãªtre identiques (exemple.fr) ou diffÃ©rentes. Ainsi, vous pourriez avoir les fichiers de WordPress dans un sous-dossier (exemple.fr/wordpress) plutÃ´t qu’Ã la racine du site." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:217 +msgid "Enabled (%s)" +msgid_plural "Enabled (%s)" +msgstr[0] "ActivÃ© (%s)" +msgstr[1] "ActivÃ©s (%s)" +======= #: wp-admin/options-discussion.php:115 msgid "Enable threaded (nested) comments %s levels deep" msgstr "Activer les commentaires imbriquÃ©s jusqu’Ã %s niveaux" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:63 +msgid "You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again." +msgstr "Vous ne pouvez pas modifier ce fichier attachÃ©, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:193 +msgid "Theme" +msgstr "ThÃ¨me" +======= #: wp-admin/options-discussion.php:92 msgid "Automatically close comments on articles older than %s days" msgstr "Fermer automatiquement les commentaires pour les articles vieux de plus de %s jours" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:75 +msgid "This screen allows you to edit five fields for metadata in a file within the media library." +msgstr "Cet Ã©cran vous permet de modifier les 4 champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:185 +msgid "You do not appear to have any themes available at this time." +msgstr "Vous ne semblez pas avoir de thÃ¨me disponible en ce moment." +======= #: wp-admin/options-discussion.php:86 msgid "(Signup has been disabled. Only members of this site can comment.)" msgstr " (L’inscription a Ã©tÃ© dÃ©sactivÃ©e. Seuls les membres de ce site peuvent laisser un commentaire.)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:41 wp-admin/options-general.php:94 +#: wp-admin/options-media.php:24 wp-admin/options-permalink.php:23 +#: wp-admin/options-permalink.php:32 wp-admin/options-permalink.php:39 +#: wp-admin/options-reading.php:57 wp-admin/options-writing.php:22 +msgid "You must click the Save Changes button at the bottom of the screen for new settings to take effect." +msgstr "Vous devez cliquer sur « Enregistrer les modifications » en bas de l’Ã©cran pour que les nouveaux rÃ©glages prennent effet." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:183 +msgid "No themes found." +msgstr "Aucun thÃ¨me trouvÃ©." +======= #: wp-admin/options-discussion.php:85 msgid "Users must be registered and logged in to comment" msgstr "Un utilisateur doit Ãªtre enregistrÃ© et connectÃ© pour publier des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:86 +msgid "(Signup has been disabled. Only members of this site can comment.)" +msgstr " (L’inscription a Ã©tÃ© dÃ©sactivÃ©e. Seuls les membres de ce site peuvent laisser un commentaire.)" +||||||| .r11156 +#: wp-admin/includes/ms.php:540 +msgid "Visit Dashboard" +msgstr "Se rendre sur le Tableau de bord" +======= #: wp-admin/options-discussion.php:81 msgid "Comment author must fill out name and e-mail" msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:248 +msgid "Retro (Generated)" +msgstr "RÃ©tro (gÃ©nÃ©rÃ©)" +||||||| .r11156 +#: wp-admin/includes/ms.php:534 +msgid "Your Sites" +msgstr "Vos sites" +======= #: wp-admin/options-discussion.php:79 wp-admin/options-discussion.php:80 msgid "Other comment settings" msgstr "Autres rÃ©glages des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:18 +msgid "You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size." +msgstr "Vous pouvez indiquer une taille maximale pour les images insÃ©rÃ©es dans votre contenu textuel. Vous pourrez insÃ©rer l’image dans sa taille d’origine." +||||||| .r11156 +#: wp-admin/includes/ms.php:532 +msgid "If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way." +msgstr "Si vous Ãªtes arrivÃ© sur cet Ã©cran par accident, et que vous vouliez en fait vous rendre sur l’un de vos propres sites, voici quelques raccourcis pour vous aider Ã trouver votre chemin." +======= #: wp-admin/options-discussion.php:75 msgid "These settings may be overridden for individual articles." msgstr "Ces rÃ©glages peuvent Ãªtre modifiÃ©s pour chaque article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:267 +msgctxt "Howdy" +msgid "Welcome" +msgstr "Bienvenue" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:80 +msgctxt "user" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +======= #: wp-admin/options-discussion.php:65 msgid "Attempt to notify any blogs linked to from the article" msgstr "Tenter de notifier les sites liÃ©s depuis le contenu des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:47 +msgid "You can add links here to be displayed on your site, usually using Widgets. By default, links to several sites in the WordPress community are included as examples." +msgstr "Vous pouvez ici ajouter les liens que vous voulez voir affichÃ©s sur votre site, gÃ©nÃ©ralement par le biais de widgets. Des liens vers de nombreux sites de la communautÃ© WordPress sont inclus par dÃ©faut." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:220 +msgid "Disabled (%s)" +msgid_plural "Disabled (%s)" +msgstr[0] "DÃ©sactivÃ© (%s)" +msgstr[1] "DÃ©sactivÃ©s (%s)" +======= #: wp-admin/options-discussion.php:61 wp-admin/options-discussion.php:62 msgid "Default article settings" msgstr "RÃ©glages par dÃ©faut des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:48 +msgid "Links may be separated into Link Categories; these are different than the categories used on your posts." +msgstr "Les liens peuvent Ãªtre rangÃ©s dans des catÃ©gories de liens ; ce ne sont pas les mÃªmes catÃ©gories que pour vos articles." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:301 +msgid "Open this theme in the Theme Editor" +msgstr "Ouvrir ce thÃ¨me dans l’Ã©diteur de thÃ¨me" +======= #: wp-admin/options-discussion.php:46 msgid "Documentation on Discussion Settings" msgstr "Documentation sur les rÃ©glages des discussions (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:53 +msgid "Deleting Links" +msgstr "Suppression de liens" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:297 +msgid "Disable this theme" +msgstr "DÃ©sactiver ce thÃ¨me" +======= #: wp-admin/options-discussion.php:41 wp-admin/options-general.php:94 #: wp-admin/options-media.php:24 wp-admin/options-permalink.php:23 #: wp-admin/options-permalink.php:32 wp-admin/options-permalink.php:39 #: wp-admin/options-reading.php:57 wp-admin/options-writing.php:22 msgid "You must click the Save Changes button at the bottom of the screen for new settings to take effect." msgstr "Vous devez cliquer sur « Enregistrer les modifications » en bas de l’Ã©cran pour que les nouveaux rÃ©glages prennent effet." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:30 +msgid "To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page." +msgstr "Pour autoriser cette page Ã rÃ©parer automatiquement les problÃ¨mes de base de donnÃ©es, veuillez ajouter la ligne suivante dans votre fichier wp-config.php. Une fois cette ligne ajoutÃ©e Ã votre configuration, rechargez cette page." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:295 +msgid "Enable this theme" +msgstr "Activer ce thÃ¨me" +======= #: wp-admin/options-discussion.php:40 msgid "This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won’t all fit here! :) Use the documentation links to get information on what each discussion setting does." msgstr "Cet Ã©cran offre plusieurs options pour contrÃ´ler la gestion et l’affichage des commentaires et liens sur vos articles/pages. En fait, il y en a tellement qu’elles ne tiennent pas toutes ici ! :) Utiliser le lien vers la documentation pour obtenir des informations sur ce que fait chaque rÃ©glage de discussion." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: table name +#: wp-admin/maint/repair.php:88 +msgid "The %s table is okay." +msgstr "La table %s est correcte." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:79 +msgctxt "user" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +======= #: wp-admin/options-discussion.php:12 wp-admin/options-general.php:16 #: wp-admin/options-media.php:13 wp-admin/options-permalink.php:13 #: wp-admin/options-reading.php:13 wp-admin/options-writing.php:13 msgid "You do not have sufficient permissions to manage options for this site." msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les options de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: table name +#: wp-admin/maint/repair.php:98 +msgid "Successfully repaired the %s table." +msgstr "La table %s a bien Ã©tÃ© rÃ©parÃ©e." +||||||| .r11156 +#: wp-admin/includes/ms.php:529 wp-admin/includes/ms.php:531 +msgid "You attempted to access the \"%1$s\" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the \"%1$s\" dashboard, please contact your network administrator." +msgstr "Vous avez tentÃ© d’accÃ©der au tableau de bord de « %1$s ». Cependant, vous ne disposez pas pour le moment des droits nÃ©cessaires sur ce site. Si vous pensez que vous devriez pouvoir accÃ©der au tableau de bord de « %1$s », contactez l’administrateur du rÃ©seau." +======= #: wp-admin/nav-menus.php:781 msgid "Delete Menu" msgstr "Supprimer le menu" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: table name +#: wp-admin/maint/repair.php:113 +msgid "The %s table is already optimized." +msgstr "La table %s a dÃ©jÃ Ã©tÃ© optimisÃ©e." +||||||| .r11156 +#: wp-admin/includes/ms.php:425 +msgid "MB (Leave blank for network default)" +msgstr "Mo (Laisser vide pour utiliser la valeur par dÃ©faut du rÃ©seau)" +======= #: wp-admin/nav-menus.php:766 msgid "(Currently set to: %s)" msgstr "(Actuellement rÃ©glÃ© sur : %s)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: table name +#: wp-admin/maint/repair.php:120 +msgid "Successfully optimized the %s table." +msgstr "La table %s a bien Ã©tÃ© optimisÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:390 +msgid "Visit theme homepage" +msgstr "Aller sur la page du thÃ¨me" +======= #: wp-admin/nav-menus.php:761 msgid "Theme locations" msgstr "Emplacements du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:137 +msgid "Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users." +msgstr "RÃ©parations effectuÃ©es. Veuillez retirer la ligne suivante de votre fichier wp-config.php, pour empÃªcher que cette page soit utilisÃ©e par des utilisateurs non autorisÃ©s." +||||||| .r11156 +#: wp-admin/includes/ms.php:572 +msgid "British English" +msgstr "Anglais (UK)" +======= #: wp-admin/nav-menus.php:755 msgid "Automatically add new top-level pages to this menu" msgstr "Ajouter automatiquement les nouvelles pages principales de haut niveau Ã ce menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:143 +msgid "WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient." +msgstr "WordPress peut automatiquement chercher les problÃ¨mes courants des base de donnÃ©es et les rÃ©parer. La rÃ©paration peut prendre un certain temps, merci donc de votre patience." +||||||| .r11156 +#: wp-admin/includes/ms.php:541 +msgid "View Site" +msgstr "Afficher le site" +======= #: wp-admin/nav-menus.php:754 msgid "Auto add pages" msgstr "Ajoutez automatiquement des pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:49 +msgid "Drag and drop your files into the area below. Multiple files are allowed." +msgstr "Glissez/dÃ©posez vos fichiers dans la zone ci-dessous. Vous pouvez en dÃ©poser plusieurs Ã la fois." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:100 +msgid "Super Admin (%s)" +msgid_plural "Super Admins (%s)" +msgstr[0] "Super-admin (%s)" +msgstr[1] "Super-admins (%s)" +======= #: wp-admin/nav-menus.php:741 msgid "Menu Settings" msgstr "RÃ©glages du menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu-header.php:227 +msgid "Collapse menu" +msgstr "RÃ©duire le menu" +||||||| .r11156 +#: wp-admin/includes/ms.php:568 +msgid "American English" +msgstr "Anglais (US)" +======= #: wp-admin/nav-menus.php:735 msgid "Give your menu a name above, then click Create Menu." msgstr "Donnez Ã votre un menu un nom ci-dessus, puis cliquez sur « CrÃ©er le menu »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:41 +msgid "Updates %s" +msgstr "Mises Ã jour %s" +||||||| .r11156 +#: wp-admin/includes/ms.php:637 +msgid "Primary Site" +msgstr "Site principal" +======= #: wp-admin/nav-menus.php:722 msgid "Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options." msgstr "Glissez chaque Ã©lÃ©ment pour les placer dans l’ordre que vous prÃ©fÃ©rez. Cliquez sur la flÃ¨che Ã droite de l’Ã©lÃ©ment pour afficher d’autres options de configuration." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:74 +msgctxt "admin menu" +msgid "All Links" +msgstr "Tous les liens" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:390 +msgid "Visit Theme Site" +msgstr "Aller sur le site du thÃ¨me" +======= #: wp-admin/nav-menus.php:722 msgid "Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes." msgstr "Modifiez votre menu par dÃ©faut en ajoutant ou en enlevant des Ã©lÃ©ments. Faites glissez chaque Ã©lÃ©ment pour les mettre dans l’ordre que vous souhaitez. Cliquez sur « CrÃ©er le menu » pour enregistrer vos modifications." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:97 +msgid "All Comments" +msgstr "Tous les commentaires" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:304 +msgid "Delete this theme" +msgstr "Supprimer ce thÃ¨me" +======= #: wp-admin/nav-menus.php:721 msgid "Menu Structure" msgstr "Structure du menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:191 +msgid "Plugins %s" +msgstr "Extensions %s" +||||||| .r11156 +#: wp-admin/includes/ms.php:424 +msgid "Site Upload Space Quota " +msgstr "Quota de l’espace disque du site" +======= #: wp-admin/nav-menus.php:714 wp-admin/nav-menus.php:785 msgid "Save Menu" msgstr "Enregistrer le menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:193 +msgid "Installed Plugins" +msgstr "Extensions installÃ©es" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:254 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:297 +msgid "Disable" +msgstr "DÃ©sactiver" +======= #: wp-admin/nav-menus.php:714 wp-admin/nav-menus.php:785 msgid "Create Menu" msgstr "CrÃ©er le menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:198 +msgctxt "plugin editor" +msgid "Editor" +msgstr "Ãditeur" +||||||| .r11156 +#: wp-admin/includes/ms.php:32 +msgid "Not enough space to upload. %1$s KB needed." +msgstr "Pas assez d’espace pour l’envoi. %1$s Ko sont nÃ©cessaires." +======= #: wp-admin/nav-menus.php:711 msgid "Menu 1" msgstr "Menu 1" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:210 +msgid "All Users" +msgstr "Tous les utilisateurs" +||||||| .r11156 +#: wp-admin/includes/ms.php:582 +msgid "English" +msgstr "Anglais" +======= #: wp-admin/nav-menus.php:711 msgid "Enter menu name here" msgstr "Saisissez ici le nom du menu" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/menu.php:212 wp-admin/menu.php:214 wp-admin/user-edit.php:210 +#: wp-admin/users.php:456 +msgctxt "user" +msgid "Add New" +msgstr "Ajouter" + +#: wp-admin/menu.php:222 wp-admin/menu.php:224 wp-admin/user-new.php:148 +#: wp-admin/user-new.php:339 wp-admin/user-new.php:461 +msgid "Add New User" +msgstr "Ajouter un utilisateur" + +#: wp-admin/menu.php:229 +msgid "Available Tools" +msgstr "Outils disponibles" + +#: wp-admin/ms-delete-site.php:13 wp-admin/my-sites.php:13 +msgid "Multisite support is not enabled." +msgstr "Le support multisites n’est pas activÃ©." + +#: wp-admin/ms-delete-site.php:75 +msgid "Delete My Site" +msgstr "Supprimer le site" + +#: wp-admin/ms-delete-site.php:78 +msgid "Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked." +msgstr "Merci. Veuillez consulter le message que nous vous avons envoyÃ© pour confirmer cette action. Votre site ne sera pas effacÃ© tant que vous n’aurez pas cliquÃ© le lien qu’il contient." + +#: wp-admin/ms-delete-site.php:82 +msgid "If you do not want to use your %s site any more, you can delete it using the form below. When you click Delete My Site Permanently you will be sent an email with a link in it. Click on this link to delete your site." +msgstr "Si vous ne souhaitez plus utiliser votre site %s, vous pouvez l’effacer Ã l’aide du formulaire ci-dessous. AprÃ¨s avoir cliquÃ© sur Effacer mon site, vous recevrez un message avec un lien. Cliquez sur ce lien pour effacer votre site." + +#: wp-admin/my-sites.php:31 +msgid "The primary site you chose does not exist." +msgstr "Le site principal que vous avez choisi n’existe pas." + +#: wp-admin/my-sites.php:55 wp-admin/options-head.php:15 +#: wp-admin/options.php:215 +msgid "Settings saved." +msgstr "Options enregistrÃ©es." +#: wp-admin/my-sites.php:63 +msgid "You must be a member of at least one site to use this page." +msgstr "Vous devez Ãªtre membre d’au moins un site pour utiliser cette page." +||||||| .r11156 +#: wp-admin/my-sites.php:63 +msgid "You must be a member of at least one site to use this page." +msgstr "Vous devez Ãªtre membre d’au moins un site pour utiliser cette page." +======= #: wp-admin/nav-menus.php:710 msgid "Menu Name" msgstr "Nom du menu" +>>>>>>> .r12027 #: wp-admin/nav-menus.php:675 msgid "or create a new menu." msgstr "ou crÃ©ez un nouveau menu." +<<<<<<< .mine +#: wp-admin/options-discussion.php:12 wp-admin/options-general.php:16 +#: wp-admin/options-media.php:13 wp-admin/options-permalink.php:13 +#: wp-admin/options-reading.php:13 wp-admin/options-writing.php:13 +msgid "You do not have sufficient permissions to manage options for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les options de ce site." +||||||| .r11156 +#: wp-admin/my-sites.php:48 +msgid "Documentation on My Sites" +msgstr "Documentation sur Mes Sites (en)" +======= #: wp-admin/nav-menus.php:634 msgid "Select a menu to edit:" msgstr "SÃ©lectionnez le menu Ã modifier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:40 +msgid "This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won’t all fit here! :) Use the documentation links to get information on what each discussion setting does." +msgstr "Cet Ã©cran offre plusieurs options pour contrÃ´ler la gestion et l’affichage des commentaires et liens sur vos articles/pages. En fait, il y en a tellement qu’elles ne tiennent pas toutes ici ! :) Utiliser le lien vers la documentation pour obtenir des informations sur ce que fait chaque rÃ©glage de discussion." +||||||| .r11156 +#: wp-admin/my-sites.php:16 +msgid "You do not have sufficient permissions to view this page." +msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +======= #: wp-admin/nav-menus.php:629 msgid "Edit your menu below, or create a new menu." msgstr "Modifiez votre menu ci-dessous, ou crÃ©ez un nouveau menu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:193 +msgid "An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site." +msgstr "Un avatar est une image qui vous suit de site en site, apparaissant Ã cÃ´tÃ© de votre nom quand vous laissez un commentaire sur un site capable de le reconnaÃ®tre. Vous pouvez ici activer l’affichage des avatars des gens qui laissent un commentaire sur votre site." +||||||| .r11156 +#: wp-admin/my-sites.php:31 +msgid "The primary site you chose does not exist." +msgstr "Le site principal que vous avez choisi n’existe pas." +======= #: wp-admin/nav-menus.php:604 msgctxt "menu" msgid "Use new menu" msgstr "Utiliser le nouveau menu" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/options-general.php:138 wp-admin/options-general.php:157 +msgid "E-mail Address" +msgstr "Adresse de messagerie" + +#: wp-admin/options-general.php:347 +msgid "Site Language" +msgstr "Langue du site" + +#: wp-admin/options-media.php:21 +msgid "Uploading Files allows you to choose the folder and path for storing your uploaded files." +msgstr "« Envoi de fichiers » vous permet de choisir le dossier et le chemin de stockage de vos fichiers mis en ligne." + +#: wp-admin/install.php:223 wp-admin/install.php:229 +msgid "Configuration Error" +msgstr "Erreur de configuration" +#: wp-admin/install.php:223 +msgid "Your wp-config.php file has an empty database table prefix, which is not supported." +msgstr "Votre fichier wp-config.php ne dÃ©fini pas prÃ©fixe de table de base de donnÃ©es. Il en faut obligatoirement un." + +#: wp-admin/menu.php:235 +msgid "Network Setup" +msgstr "CrÃ©ation du rÃ©seau" + +#: wp-admin/my-sites.php:43 +msgid "Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user)." +msgstr "Avant la versionÂ 3.0 de WordPress, l’Ã©quivalent du rÃ©seau multisite devait Ãªtre installÃ© avec une Ã©dition spÃ©ciale de WordPress, appelÃ©e WordPress MU (pour Multi-Utilisateurs)." +||||||| .r11156 +#: wp-admin/my-sites.php:43 +msgid "Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user)." +msgstr "Avant la versionÂ 3.0 de WordPress, l’Ã©quivalent du rÃ©seau multisite devait Ãªtre installÃ© avec une Ã©dition spÃ©ciale de WordPress, appelÃ©e WordPress MU (pour Multi-Utilisateurs)." +======= #: wp-admin/nav-menus.php:598 msgid "Edit selected menu" msgstr "Modifier le menu sÃ©lectionnÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:18 +msgid "General Settings" +msgstr "RÃ©glages gÃ©nÃ©raux" +||||||| .r11156 +#: wp-admin/setup-config.php:49 +msgid "Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation." +msgstr "DÃ©solÃ©, j’ai besoin d’un fichier wp-config-sample.php Ã partir duquel travailler. Veuillez remettre ce fichier en ligne au sein de votre installation WordPress." +======= #: wp-admin/nav-menus.php:598 msgctxt "menu" msgid "Edit" msgstr "Modifier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:89 +msgid "If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin." +msgstr "Si vous voulez que les visiteurs du site puissent s’inscrire eux-mÃªmes plutÃ´t que de devoir Ãªtre inscrits par l’administrateur du site, cochez la case « Inscription ». Un rÃ´le d’utilisateur par dÃ©faut peut Ãªtre assignÃ© pour tout nouveau inscrit, qu’il se soit enregistrÃ© lui-mÃªme ou par le biais de l’administrateur." +||||||| .r11156 +#: wp-admin/setup-config.php:53 +msgid "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." +msgstr "Le fichier wp-config.php existe dÃ©jÃ . Si vous devez mettre Ã zÃ©ro n’importe quelle valeur de configuration dans ce fichier, veuillez commencer par le supprimer. Vous pouvez essayer l’installation maintenant." +======= #: wp-admin/nav-menus.php:586 msgid "Select a Menu" msgstr "Choisir un menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu-header.php:234 +msgid "Skip to main content" +msgstr "Aller au contenu principal" +||||||| .r11156 +#: wp-admin/setup-config.php:57 +msgid "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now." +msgstr "Le fichier wp-config.php existe dÃ©jÃ , un niveau au-dessus de votre installation WordPress. Si vous devez mettre Ã zÃ©ro vos Ã©lÃ©ments de configuration, veuillez d’abord effacer ce fichier. Vous pouvez essayer de lancer l’installation." +======= #: wp-admin/nav-menus.php:577 msgid "Assigned Menu" msgstr "Menu assignÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:271 +msgid "Please provide the following information. Don’t worry, you can always change these settings later." +msgstr "Veuillez renseigner les informations suivantes. Ne vous inquiÃ©tez pas, vous pourrez les modifier plus tard." +||||||| .r11156 +#: wp-admin/setup-config.php:82 +msgid "WordPress › Setup Configuration File" +msgstr "WordPress › Fichier de configuration" +======= #: wp-admin/nav-menus.php:576 msgid "Theme Location" msgstr "Emplacement du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: table name, 2: error message, +#: wp-admin/maint/repair.php:91 +msgid "The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…" +msgstr "La table %1$s est dans un mauvais Ã©tat. Elle renvoie l’erreur suivante : %2$s. WordPress va tenter de la rÃ©parer…" +||||||| .r11156 +#: wp-admin/setup-config.php:128 +msgid "Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding." +msgstr "Bienvenue dans WordPress. Avant de nous lancer, nous avons besoin de certaines informations sur votre base de donnÃ©es. Il va vous falloir rÃ©unir les informations suivantes pour continuer." +======= #: wp-admin/nav-menus.php:555 msgid "Manage Locations" msgstr "GÃ©rer les emplacements" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: table name, 2: error message, +#: wp-admin/maint/repair.php:101 +msgid "Failed to repair the %1$s table. Error: %2$s" +msgstr "Impossible de rÃ©parer la table %1$s. Erreur : %2$s" +||||||| .r11156 +#: wp-admin/setup-config.php:130 +msgid "Database name" +msgstr "Nom de la base de donnÃ©es" +======= #: wp-admin/nav-menus.php:553 msgid "Edit Menus" msgstr "Modifier les menus" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: table name, 2: error message, +#: wp-admin/maint/repair.php:123 +msgid "Failed to optimize the %1$s table. Error: %2$s" +msgstr "Impossible d’optimiser la table %1$s. Erreur : %2$s" +||||||| .r11156 +#: wp-admin/setup-config.php:131 +msgid "Database username" +msgstr "Nom d’utilisateur MySQL" +======= #: wp-admin/nav-menus.php:544 msgid "Documentation on Menus" msgstr "Documentation sur les menus personnalisÃ©s (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:47 +msgid "You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:" +msgstr "Vous pouvez ici mettre des fichiers en ligne sans devoir crÃ©er un nouvel article avant. Ceci vous permet d’envoyer des fichiers qui seront utilisables par les articles et les pages ultÃ©rieurement et/ou seront utilisÃ©s via un lien internet pour partager un fichier particulier. Il y a 3 mÃ©thodes pour envoyer des fichiers :" +||||||| .r11156 +#: wp-admin/setup-config.php:132 +msgid "Database password" +msgstr "Mot de passe de l’utilisateur" +======= #: wp-admin/nav-menus.php:533 msgid "To add a new menu instead of assigning an existing one, click the ’Use new menu’ link. Your new menu will be automatically assigned to that theme location" msgstr "Pour ajouter un nouveau menu au lieu d’en assigner un qui existe dÃ©jÃ , cliquez sur le lien « Utiliser un nouveau menu ». Votre nouveau menu sera automatiquement ajoutÃ© Ã cet emplacement du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:50 +msgid "Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen." +msgstr "Un clic sur SÃ©lectionner les fichiers ouvre la fenÃªtre de navigation, vous donnant accÃ¨s aux fichiers de votre machine. AprÃ¨s avoir cliquÃ© sur un fichier, cliquez sur Ouvrir pour l’affichage de la barre de tÃ©lÃ©chargement." +||||||| .r11156 +#: wp-admin/setup-config.php:133 +msgid "Database host" +msgstr "Adresse de la base de donnÃ©es" +======= #: wp-admin/nav-menus.php:532 msgid "To edit a menu currently assigned to a theme location, click the adjacent ’Edit’ link" msgstr "Pour modifier un menu actuellement assignÃ© Ã un emplacement du thÃ¨me, cliquez sur le lien « Modifier » adjacent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:51 +msgid "Revert to the Browser Uploader by clicking the link below the drag and drop box." +msgstr "Revenez Ã l’outil de mise en ligne du navigateur en cliquant sur le lien sous la zone de glisser-dÃ©poser." +||||||| .r11156 +#: wp-admin/setup-config.php:134 +msgid "Table prefix (if you want to run more than one WordPress in a single database)" +msgstr "PrÃ©fixe de table (si vous souhaitez avoir plusieurs WordPress sur une mÃªme base de donnÃ©es)" +======= #: wp-admin/nav-menus.php:531 msgid "To assign menus to one or more theme locations, select a menu from each location’s drop down. When you’re finished, click Save Changes" msgstr "Pour assigner des menus Ã un ou plusieurs emplacements, sÃ©lectionnez le menu depuis la liste dÃ©roulante de chaque emplacement. Lorsque vous avez terminÃ©, cliquez sur Enregistrer les modifications" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media.php:62 +msgid "You attempted to edit an item that isn’t an attachment. Please go back and try again." +msgstr "Vous avez tentÃ© de modifier un Ã©lÃ©ment qui n’est pas un fichier joint. Veuillez rÃ©essayer." +||||||| .r11156 +#: wp-admin/setup-config.php:143 +msgid "Let’s go!" +msgstr "C’est parti !" +======= #: wp-admin/nav-menus.php:530 msgid "This screen is used for globally assigning menus to locations defined by your theme." msgstr "Cet Ã©cran est utilisÃ© pour assigner de maniÃ¨re globale vos menus Ã des emplacements dÃ©finis par votre thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:23 +msgid "I'm sorry, the link you clicked is stale. Please select another option." +msgstr "Je suis dÃ©solÃ©, mais le lien que vous avez cliquÃ© ne rÃ©pond pas. Veuillez sÃ©lectionner une autre option." +||||||| .r11156 +#: wp-admin/setup-config.php:157 +msgid "Database Name" +msgstr "Nom de la base de donnÃ©es" +======= #: wp-admin/nav-menus.php:526 msgid "Editing Menus" msgstr "Modification des menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:330 wp-admin/nav-menus.php:340 +msgid "Please enter a valid menu name." +msgstr "Veuillez saisir un nom de menu valide." +||||||| .r11156 +#: wp-admin/setup-config.php:159 +msgid "The name of the database you want to run WP in." +msgstr "Le nom de la base de donnÃ©es dans laquelle vous souhaitez installer WordPress." +======= #: wp-admin/nav-menus.php:522 msgid "Delete a menu item by expanding it and clicking the Remove link" msgstr "Supprimez un Ã©lÃ©ment du menu en l’ouvrant et en cliquant sur le bouton Supprimer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:93 +msgid "UTC means Coordinated Universal Time." +msgstr "UTC signifie « Temps universel coordonnÃ© »." +||||||| .r11156 +#: wp-admin/setup-config.php:163 +msgctxt "example username" +msgid "username" +msgstr "utilisateur" +======= #: wp-admin/nav-menus.php:521 msgid "To reorganize menu items, drag and drop items with your mouse or use your keyboard. Drag or move a menu item a little to the right to make it a submenu" msgstr "Pour rÃ©organiser les Ã©lÃ©ments du menu, glissez/dÃ©posez les Ã©lÃ©ments avec la souris ou utilisez votre clavier. Glissez ou dÃ©placez lÃ©gÃ¨rement un Ã©lement du menu pour en faire un sous-menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:236 +msgid "Standard time begins on: %s." +msgstr "Le passage Ã l’heure d’hiver se fait le : %s." +||||||| .r11156 +#: wp-admin/setup-config.php:164 +msgid "Your MySQL username" +msgstr "Votre identifiant MySQL" +======= #: wp-admin/nav-menus.php:520 msgid "To add a custom link, expand the Custom Links section, enter a URL and link text, and click Add to Menu" msgstr "Pour ajouter un lien personnalisÃ© ouvrez la section « Liens personnalisÃ©s », saisissez une adresse web et un texte pour le lien, et cliquez sur « Ajouter au menu »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:88 +msgid "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." +msgstr "Je suis certain de vouloir effacer mon site dÃ©finitivement, et je me rends compte que je ne pourrais jamais le rÃ©cupÃ©rer ni utiliser %s pour un nouveau site." +||||||| .r11156 +#: wp-admin/setup-config.php:168 +msgctxt "example password" +msgid "password" +msgstr "mot de passe" +======= #: wp-admin/nav-menus.php:519 msgid "Add one or several items at once by selecting the checkbox next to each item and clicking Add to Menu" msgstr "Ajoutez un ou plusieurs Ã©lÃ©ments Ã la fois en cochant la case Ã cÃ´tÃ© de chaque Ã©lÃ©ment puis en cliquant sur « Ajouter au menu »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:89 +msgid "Delete My Site Permanently" +msgstr "Effacer mon site dÃ©finitivement" +||||||| .r11156 +#: wp-admin/setup-config.php:169 +msgid "…and your MySQL password." +msgstr "…et son mot de passe MySQL." +======= #: wp-admin/nav-menus.php:518 msgid "Clicking the arrow to the right of any menu item in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab." msgstr "En cliquant sur le titre de n’importe Ã©lÃ©ment du menu dans l’Ã©diteur, un ensemble de rÃ©glages standards s’ouvrira. D’autres rÃ©glages, tels que la cible du lien, les classes CSS, les relations du lien et la description du lien, peuvent Ãªtre activÃ©s et dÃ©sactivÃ©s dans l’onglet « Options de l’Ã©cran »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:164 +msgid "There is a pending change of the admin e-mail to %1$s. Cancel" +msgstr "Il y a une modification de l’adresse de contact de l’administrateur en cours, en faveur de %1$s. Annuler" +||||||| .r11156 +#: wp-admin/setup-config.php:172 +msgid "Database Host" +msgstr "Adresse de la base de donnÃ©es" +======= #: wp-admin/nav-menus.php:517 msgid "Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below." msgstr "Chaque menu personnalisÃ© peut contenir un mÃ©lange de liens vers des pages, des catÃ©gories, des adresses web personnalisÃ©es ou d’autres types de contenu. Pour ajouter un lien dans un menu, sÃ©lectionnez un Ã©lÃ©ment dans l’un des blocs situÃ©s dans le colonne de gauche ci-dessous." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:16 +msgid "You do not have sufficient permissions to delete this site." +msgstr "Vous n’avez pas les droits suffisants pour effacer ce site." +||||||| .r11156 +#: wp-admin/setup-config.php:174 +msgid "You should be able to get this info from your web host, if localhost does not work." +msgstr "Si localhost ne fonctionne pas, votre hÃ©bergeur doit pouvoir vous donner la bonne information." +======= #: wp-admin/nav-menus.php:513 msgid "Menu Management" msgstr "Gestion des menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:21 +msgid "Thank you for using %s, your site has been deleted. Happy trails to you until we meet again." +msgstr "Merci d’avoir utilisÃ© notre service %s, votre site a Ã©tÃ© effacÃ©. Ce n’est qu’un au revoir..." +||||||| .r11156 +#: wp-admin/setup-config.php:177 +msgid "Table Prefix" +msgstr "PrÃ©fixe des tables" +======= #: wp-admin/nav-menus.php:509 msgid "You can assign theme locations to individual menus by selecting the desired settings at the bottom of the menu editor. To assign menus to all theme locations at once, visit the Manage Locations tab at the top of the screen." msgstr "Vous pouvez assigner un emplacement du thÃ¨me Ã chaque menu en sÃ©lectionnant les rÃ©glages souhaitÃ©s en bas de l’Ã©diteur de menu. Pour assigner un menu Ã tous les emplacements d’un coup, rendez-vous dans l’onglet GÃ©rer les emplacements en haut de l’Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:65 +msgid "Attempt to notify any blogs linked to from the article" +msgstr "Tenter de notifier les sites liÃ©s depuis le contenu des articles" +||||||| .r11156 +#: wp-admin/setup-config.php:179 +msgid "If you want to run multiple WordPress installations in a single database, change this." +msgstr "Si vous souhaitez faire tourner plusieurs installations de WordPress sur une mÃªme base de donnÃ©es, modifiez ce rÃ©glage." +======= #: wp-admin/nav-menus.php:508 msgid "If you haven’t yet created any menus, click the ’create a new menu’ link to get started" msgstr "Si vous n’avez pas encore crÃ©Ã© de menu, cliquez sur le lien « CrÃ©er un nouveau menu » pour vous lancer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:270 +msgid "Selected menus have been successfully deleted." +msgstr "Les menus sÃ©lectionnÃ©s ont bien Ã©tÃ© supprimÃ©s." +||||||| .r11156 +#: wp-admin/setup-config.php:301 +msgid "You can create the wp-config.php manually and paste the following text into it." +msgstr "Vous pouvez crÃ©er le fichier wp-config.php Ã la main, en y copiant/collant le texte suivant." +======= #: wp-admin/nav-menus.php:507 msgid "To edit an existing menu, choose a menu from the drop down and click Select" msgstr "Pour modifier un menu existant, choisissez un menu depuis la liste dÃ©roulant et cliquez sur SÃ©lectionner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:522 +msgid "To edit an existing menu, choose a menu from the drop down and click Select" +msgstr "Pour modifier un menu existant, choisissez un menu depuis la liste dÃ©roulant et cliquez sur SÃ©lectionner" +||||||| .r11156 +#: wp-admin/setup-config.php:308 wp-admin/setup-config.php:337 +msgid "Run the install" +msgstr "Lancer l’installation" +======= #: wp-admin/nav-menus.php:506 msgid "The menu management box at the top of the screen is used to control which menu is opened in the editor below." msgstr "Le bloc de gestion des menus, en haut de l’Ã©cran, est utilisÃ© pour contrÃ´ler le menu qui est ouvert dans l’Ã©diteur ci-dessous." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:528 +msgid "Menu Management" +msgstr "Gestion des menus" +||||||| .r11156 +#: wp-admin/maint/repair.php:30 +msgid "To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page." +msgstr "Pour autoriser cette page Ã rÃ©parer automatiquement les problÃ¨mes de base de donnÃ©es, veuillez ajouter la ligne suivante dans votre fichier wp-config.php. Une fois cette ligne ajoutÃ©e Ã votre configuration, rechargez cette page." +======= #: wp-admin/nav-menus.php:498 msgid "Add, organize, and modify individual menu items" msgstr "Ajouter, organiser et modifier des Ã©lÃ©ments de menu individuels" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:536 +msgid "To reorganize menu items, drag and drop items with your mouse or use your keyboard. Drag or move a menu item a little to the right to make it a submenu" +msgstr "Pour rÃ©organiser les Ã©lÃ©ments du menu, glissez/dÃ©posez les Ã©lÃ©ments avec la souris ou utilisez votre clavier. Glissez ou dÃ©placez lÃ©gÃ¨rement un Ã©lement du menu pour en faire un sous-menu" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:156 +msgid "No comments awaiting moderation." +msgstr "Aucun commentaire en attente de modÃ©ration." +======= #: wp-admin/nav-menus.php:497 msgid "Create, edit, and delete menus" msgstr "CrÃ©er, modifier et supprimer des menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:541 +msgid "Editing Menus" +msgstr "Modification des menus" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:349 +msgctxt "Plugin installer section title" +msgid "Changelog" +msgstr "Liste des modifications" +======= #: wp-admin/nav-menus.php:496 wp-admin/themes.php:46 msgid "From this screen you can:" msgstr "Depuis cet Ã©cran, vous pouvez :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:545 +msgid "This screen is used for globally assigning menus to locations defined by your theme." +msgstr "Cet Ã©cran est utilisÃ© pour assigner de maniÃ¨re globale vos menus Ã des emplacements dÃ©finis par votre thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:351 +msgctxt "Plugin installer section title" +msgid "Other Notes" +msgstr "Autres notes" +======= #: wp-admin/nav-menus.php:495 msgid "Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the Widgets screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side." msgstr "Les menus peuvent Ãªtre affichÃ©s Ã des emplacements dÃ©finis par votre thÃ¨me, et mÃªme dans les barres latÃ©rales grÃ¢ce au widget « Menus personnalisÃ©s » de l’Ã©cran Widgets. Si votre thÃ¨me ne reconnaÃ®t pas encore cette fonctionnalitÃ© (les thÃ¨mes par dÃ©faut, %2$s and %3$s, les intÃ¨grent trÃ¨s bien), vous pouvez apprendre Ã ajouter cette reconnaissance vous-mÃªme en suivant le lien de documentation situÃ© sur le cÃ´tÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:546 +msgid "To assign menus to one or more theme locations, select a menu from each location’s drop down. When you’re finished, click Save Changes" +msgstr "Pour assigner des menus Ã un ou plusieurs emplacements, sÃ©lectionnez le menu depuis la liste dÃ©roulante de chaque emplacement. Lorsque vous avez terminÃ©, cliquez sur Enregistrer les modifications" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:347 +msgctxt "Plugin installer section title" +msgid "FAQ" +msgstr "FAQ" +======= #: wp-admin/nav-menus.php:494 msgid "This screen is used for managing your custom navigation menus." msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos menus de navigations personnalisÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:547 +msgid "To edit a menu currently assigned to a theme location, click the adjacent ’Edit’ link" +msgstr "Pour modifier un menu actuellement assignÃ© Ã un emplacement du thÃ¨me, cliquez sur le lien « Modifier » adjacent" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:346 +msgctxt "Plugin installer section title" +msgid "Installation" +msgstr "Installation" +======= #: wp-admin/nav-menus.php:491 msgid "Your theme does not natively support menus, but you can use them in sidebars by adding a “Custom Menu” widget on the Widgets screen." msgstr "Votre thÃ¨me ne peut pas utiliser les menus nativement, mais vous pouvez les utiliser dans la barre latÃ©rale en ajoutant le widget “Menu personnalisÃ©” depuis l’Ã©cran Widgets." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:583 +msgid "Edit Menus" +msgstr "Modifier les menus" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:345 +msgctxt "Plugin installer section title" +msgid "Description" +msgstr "Description" +======= #. translators: 1: item name, 2: item position, 3: parent item name #: wp-admin/nav-menus.php:414 msgid "%1$s. Sub item number %2$d under %3$s." msgstr "%1$s. Sous-Ã©lÃ©ment numÃ©ro %2$d sous %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:585 +msgid "Manage Locations" +msgstr "GÃ©rer les emplacements" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:348 +msgctxt "Plugin installer section title" +msgid "Screenshots" +msgstr "Captures d’Ã©crans" +======= #. translators: 1: item name, 2: item position, 3: total number of items #: wp-admin/nav-menus.php:412 msgid "%1$s. Menu item %2$d of %3$d." msgstr "%1$s. ÃlÃ©ment de menu %2$d sur %3$d." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:608 +msgid "Theme Location" +msgstr "Emplacement du thÃ¨me" +||||||| .r11156 +#: wp-admin/options-permalink.php:244 +msgid "If you like, you may enter custom structures for your category and tag URLs here. For example, using topics as your category base would make your category links like http://example.org/%stopics/uncategorized/. If you leave these blank the defaults will be used." +msgstr "Si vous le souhaitez, vous pouvez spÃ©cifier une structure personnalisÃ©e pour vos mots-clÃ©s et vos catÃ©gories. Par exemple, en utilisant sujet comme prÃ©fixe pour vos catÃ©gories, vous obtiendrez des adresses web comme : http://exemple.fr/%ssujet/non-classe/. Si vous laissez ce champ vide, la valeur par dÃ©faut sera appliquÃ©e." +======= #. translators: %s: previous item name #: wp-admin/nav-menus.php:410 msgid "Out from under %s" msgstr "Sortir de sous %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:609 +msgid "Assigned Menu" +msgstr "Menu assignÃ©" +||||||| .r11156 +#: wp-admin/options-permalink.php:157 +msgid "You should update your web.config now." +msgstr "Vous devriez mettre Ã jour votre fichier web.config maintenant." +======= #. translators: %s: previous item name #: wp-admin/nav-menus.php:408 msgid "Under %s" msgstr "Sous %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:618 +msgid "Select a Menu" +msgstr "Choisir un menu" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:803 +msgid "" +"You are about to delete this link '%s'\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer le lien Â« %s Â».\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +======= #. translators: %s: previous item name #: wp-admin/nav-menus.php:406 msgid "Move out from under %s" msgstr "Sortir de sous %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:636 +msgctxt "menu" +msgid "Use new menu" +msgstr "Utiliser le nouveau menu" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:440 +msgid "Plugin Homepage »" +msgstr "Site Web de l’extension »" +======= #. translators: %s: previous item name #: wp-admin/nav-menus.php:404 msgid "Move under %s" msgstr "Placer sous %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:661 +msgid "Edit your menu below, or create a new menu." +msgstr "Modifiez votre menu ci-dessous, ou crÃ©ez un nouveau menu." +||||||| .r11156 +#: wp-admin/export.php:49 +msgid "You can export a file of your site’s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status." +msgstr "Vous pouvez exporter le contenu de votre site dans un fichier, afin de l’importer dans une autre installation autonome ou une plate-forme. Le fichier d’export utilise un format de type XML, baptisÃ© WXR. Il peut contenir vos articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et mots-clÃ©s. Vous pouvez utiliser des filtres pour que le fichier WXR ne contienne les articles que d’une certaine plage de dates (par mois), un auteur donnÃ©, une catÃ©gorie prÃ©cise, ou des Ã©tats de publication." +======= #: wp-admin/nav-menus.php:402 msgid "Move to the top" msgstr "DÃ©placer tout en haut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:666 +msgid "Select a menu to edit:" +msgstr "SÃ©lectionnez le menu Ã modifier :" +||||||| .r11156 +#: wp-admin/maint/repair.php:73 +msgid "Failed to repair the %1$s table. Error: %2$s" +msgstr "Impossible de rÃ©parer la table %1$s. Erreur : %2$s" +======= #: wp-admin/nav-menus.php:401 msgid "Move down one" msgstr "Descendre d’un cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:707 +msgid "or create a new menu." +msgstr "ou crÃ©ez un nouveau menu." +||||||| .r11156 +#: wp-admin/options-general.php:211 +msgid "Standard time begins on: %s." +msgstr "Le passage Ã l’heure d’hiver se fait le : %s." +======= #: wp-admin/nav-menus.php:400 msgid "Move up one" msgstr "Monter d’un cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:743 +msgid "Menu 1" +msgstr "Menu 1" +||||||| .r11156 +#: wp-admin/user-new.php:155 +msgid "New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email." +msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de votre site. Ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que l’utilisateur reÃ§oive ce message de bienvenue." +======= #: wp-admin/nav-menus.php:377 msgid "Menu locations updated." msgstr "Les emplacements de menu ont Ã©tÃ© mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:753 +msgid "Menu Structure" +msgstr "Structure du menu" +||||||| .r11156 +#: wp-admin/plugins.php:379 +msgid "The plugin generated %d characters of unexpected output during activation. If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin." +msgstr "L’extension a gÃ©nÃ©rÃ© %d caractÃ¨res d’affichage inattendu lors de l’activation. Si vous voyez un message « headers already sent » (Les en-tÃªtes ont dÃ©jÃ Ã©tÃ© envoyÃ©s), des problÃ¨mes avec les flux de syndication ou d’autres erreurs, essayez de dÃ©sactiver ou enlever cette extension." +======= #: wp-admin/nav-menus.php:330 wp-admin/nav-menus.php:340 msgid "Please enter a valid menu name." msgstr "Veuillez saisir un nom de menu valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:767 +msgid "Give your menu a name above, then click Create Menu." +msgstr "Donnez Ã votre un menu un nom ci-dessus, puis cliquez sur « CrÃ©er le menu »." +||||||| .r11156 +#: wp-admin/includes/theme.php:147 +msgid "Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update." +msgstr "Mettre Ã jour ce thÃ¨me vous fera perdre toutes les modifications personnelles que vous y avez apportÃ©es. Â« Annuler Â» pour arrÃªter, Â« OK Â» pour mettre Ã jour." +======= #: wp-admin/nav-menus.php:270 msgid "Selected menus have been successfully deleted." msgstr "Les menus sÃ©lectionnÃ©s ont bien Ã©tÃ© supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:773 +msgid "Menu Settings" +msgstr "RÃ©glages du menu" +||||||| .r11156 +#: wp-admin/users.php:36 +msgid "You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed." +msgstr "Vous pouvez filtrer la liste des utilisateurs par rÃ´le, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les utilisateurs, ou seulement les administrateurs, les Ã©diteurs, les auteurs ou les contributeurs. Par dÃ©faut, tous les utilisateurs sont affichÃ©s. Les rÃ´les sans utilisateurs ne sont pas listÃ©s." +======= #: wp-admin/nav-menus.php:253 msgid "The menu has been successfully deleted." msgstr "Le menu a bien Ã©tÃ© supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:786 +msgid "Auto add pages" +msgstr "Ajoutez automatiquement des pages" +||||||| .r11156 +#: wp-admin/update-core.php:46 +msgid "You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:" +msgstr "Vous utilisez une version de dÃ©veloppement de WordPress. Vous pouvez faire une mise Ã jour automatique vers la toute derniÃ¨re version quotidienne (« nightly build »), ou tÃ©lÃ©charger cette version quotidienne et l’installer vous-mÃªme :" +======= #: wp-admin/nav-menus.php:234 msgid "The menu item has been successfully deleted." msgstr "L’Ã©lÃ©ment du menu a bien Ã©tÃ© supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:793 +msgid "Theme locations" +msgstr "Emplacements du thÃ¨me" +||||||| .r11156 +#: wp-admin/options-writing.php:36 +msgid "Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret." +msgstr "Les rÃ©glages de publication par e-mail vous permettant d’envoyer Ã votre installation WordPress un e-mail dont le contenu sera publiÃ© dans un article. Vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout message reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. " +======= #: wp-admin/nav-menus.php:19 msgid "Your theme does not support navigation menus or widgets." msgstr "Le thÃ¨me actuel n’accepte pas les menus de navigation ni les widgets." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:383 +msgid "Menu locations updated." +msgstr "Les emplacements de menu ont Ã©tÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:192 +msgid "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." +msgstr "Les modifications qui n'ont pas Ã©tÃ© enregistrÃ©es seront perdues. Â« OK Â» pour continuer, Â« Annuler Â» pour revenir Ã l'Ã©diteur d'images." +======= #: wp-admin/my-sites.php:94 msgid "Global Settings" msgstr "RÃ©glages globaux" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:521 +msgid "The menu management box at the top of the screen is used to control which menu is opened in the editor below." +msgstr "Le bloc de gestion des menus, en haut de l’Ã©cran, est utilisÃ© pour contrÃ´ler le menu qui est ouvert dans l’Ã©diteur ci-dessous." +||||||| .r11156 +#: wp-admin/import.php:23 +msgid "In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently." +msgstr "Dans les versions prÃ©cÃ©dentes de WordPress, tous les importateurs Ã©taient directement inclus . Nous les avons convertis en extensions, car la plupart des gens ne s’en servent que trÃ¨s rarement, voire une seule fois." +======= #: wp-admin/my-sites.php:63 msgid "You must be a member of at least one site to use this page." msgstr "Vous devez Ãªtre membre d’au moins un site pour utiliser cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:523 +msgid "If you haven’t yet created any menus, click the ’create a new menu’ link to get started" +msgstr "Si vous n’avez pas encore crÃ©Ã© de menu, cliquez sur le lien « CrÃ©er un nouveau menu » pour vous lancer" +||||||| .r11156 +#: wp-admin/themes.php:127 +msgid "The active theme is broken. Reverting to the default theme." +msgstr "Le thÃ¨me courant est endommagÃ©. Retour au thÃ¨me par dÃ©faut." +======= #: wp-admin/my-sites.php:55 wp-admin/options-head.php:15 #: wp-admin/options.php:210 msgid "Settings saved." msgstr "Options enregistrÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:524 +msgid "You can assign theme locations to individual menus by selecting the desired settings at the bottom of the menu editor. To assign menus to all theme locations at once, visit the Manage Locations tab at the top of the screen." +msgstr "Vous pouvez assigner un emplacement du thÃ¨me Ã chaque menu en sÃ©lectionnant les rÃ©glages souhaitÃ©s en bas de l’Ã©diteur de menu. Pour assigner un menu Ã tous les emplacements d’un coup, rendez-vous dans l’onglet GÃ©rer les emplacements en haut de l’Ã©cran." +||||||| .r11156 +#: wp-admin/custom-header.php:797 wp-admin/custom-header.php:921 +#: wp-admin/custom-header.php:1233 +msgid "Image could not be processed. Please go back and try again." +msgstr "L’image n’a pas pu Ãªtre traitÃ©e. Veuillez revenir en arriÃ¨re en rÃ©essayer." +======= #: wp-admin/my-sites.php:48 msgid "Documentation on My Sites" msgstr "Documentation sur Mes Sites (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:532 +msgid "Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below." +msgstr "Chaque menu personnalisÃ© peut contenir un mÃ©lange de liens vers des pages, des catÃ©gories, des adresses web personnalisÃ©es ou d’autres types de contenu. Pour ajouter un lien dans un menu, sÃ©lectionnez un Ã©lÃ©ment dans l’un des blocs situÃ©s dans le colonne de gauche ci-dessous." +||||||| .r11156 +#: wp-admin/maint/repair.php:63 +msgid "The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…" +msgstr "La table %1$s est dans un mauvais Ã©tat. Elle renvoie l’erreur suivante : %2$s. WordPress va tenter de la rÃ©parer…" +======= #: wp-admin/my-sites.php:43 msgid "Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user)." msgstr "Avant la versionÂ 3.0 de WordPress, l’Ã©quivalent du rÃ©seau multisite devait Ãªtre installÃ© avec une Ã©dition spÃ©ciale de WordPress, appelÃ©e WordPress MU (pour Multi-Utilisateurs)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:537 +msgid "Delete a menu item by expanding it and clicking the Remove link" +msgstr "Supprimez un Ã©lÃ©ment du menu en l’ouvrant et en cliquant sur le bouton Supprimer" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:132 +msgid "There is an autosave of this post that is more recent than the version below. View the autosave" +msgstr "Une sauvegarde automatique existe pour cet article ; elle est plus rÃ©cente que la version affichÃ©e ci-dessous. Afficher cette sauvegarde automatique." +======= #: wp-admin/my-sites.php:42 msgid "This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site." msgstr "Cet Ã©cran affiche Ã un utilisateur individuel tous ses sites sur ce rÃ©seau, et permet Ã©galement Ã cet utilisateur de rÃ©gler son site principal. Il peut utiliser les liens sous chaque site pour se rendre soit sur son interface publique, soit sur son administration." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:548 +msgid "To add a new menu instead of assigning an existing one, click the ’Use new menu’ link. Your new menu will be automatically assigned to that theme location" +msgstr "Pour ajouter un nouveau menu au lieu d’en assigner un qui existe dÃ©jÃ , cliquez sur le lien « Utiliser un nouveau menu ». Votre nouveau menu sera automatiquement ajoutÃ© Ã cet emplacement du thÃ¨me" +||||||| .r11156 +#: wp-admin/maint/repair.php:109 +msgid "Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users." +msgstr "RÃ©parations effectuÃ©es. Veuillez retirer la ligne suivante de votre fichier wp-config.php, pour empÃªcher que cette page soit utilisÃ©e par des utilisateurs non autorisÃ©s." +======= #: wp-admin/my-sites.php:31 msgid "The primary site you chose does not exist." msgstr "Le site principal que vous avez choisi n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:754 +msgid "Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes." +msgstr "Modifiez votre menu par dÃ©faut en ajoutant ou en enlevant des Ã©lÃ©ments. Faites glissez chaque Ã©lÃ©ment pour les mettre dans l’ordre que vous souhaitez. Cliquez sur « CrÃ©er le menu » pour enregistrer vos modifications." +||||||| .r11156 +#: wp-admin/maint/repair.php:115 +msgid "WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient." +msgstr "WordPress peut automatiquement chercher les problÃ¨mes courants des base de donnÃ©es et les rÃ©parer. La rÃ©paration peut prendre un certain temps, merci donc de votre patience." +======= #: wp-admin/my-sites.php:16 msgid "You do not have sufficient permissions to view this page." msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/nav-menus.php:754 +msgid "Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options." +msgstr "Glissez chaque Ã©lÃ©ment pour les placer dans l’ordre que vous prÃ©fÃ©rez. Cliquez sur la flÃ¨che Ã droite de l’Ã©lÃ©ment pour afficher d’autres options de configuration." +#: wp-admin/maint/repair.php:146 +msgid "WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing." +msgstr "WordPress peut Ã©galement tenter d’optimiser la base de donnÃ©es. Cela peut amÃ©liorer ses performances dans certains cas. La rÃ©paration et l’optimisation peuvent prendre longtemps, et la base de donnÃ©es sera verrouillÃ©e durant l’optimisation." +||||||| .r11156 +#: wp-admin/maint/repair.php:118 +msgid "WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing." +msgstr "WordPress peut Ã©galement tenter d’optimiser la base de donnÃ©es. Cela peut amÃ©liorer ses performances dans certains cas. La rÃ©paration et l’optimisation peuvent prendre longtemps, et la base de donnÃ©es sera verrouillÃ©e durant l’optimisation." +======= #: wp-admin/ms-delete-site.php:88 msgid "Delete My Site Permanently" msgstr "Effacer mon site dÃ©finitivement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/ms-delete-site.php:83 +msgid "Remember, once deleted your site cannot be restored." +msgstr "Rappelez-vous qu’une fois supprimÃ©, votre site ne peut Ãªtre rÃ©tabli." +||||||| .r11156 +#: wp-admin/user-new.php:279 +msgid "Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." +msgstr "Pour inviter un utilisateur de ce rÃ©seau sur ce site, saisissez son adresse de messagerie ou son identifiant. Cette personne recevra alors un message lui proposant de confirmer son ajout." +======= #: wp-admin/ms-delete-site.php:87 msgid "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." msgstr "Je suis certain de vouloir effacer mon site dÃ©finitivement, et je me rends compte que je ne pourrais jamais le rÃ©cupÃ©rer ni utiliser %s pour un nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:630 +msgctxt "menu" +msgid "Edit" +msgstr "Modifier" +||||||| .r11156 +#: wp-admin/options-discussion.php:173 +msgid "An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site." +msgstr "Un avatar est une image qui vous suit de site en site, apparaissant Ã cÃ´tÃ© de votre nom quand vous laissez un commentaire sur un site capable de le reconnaÃ®tre. Vous pouvez ici activer l’affichage des avatars des gens qui laissent un commentaire sur votre site." +======= #: wp-admin/ms-delete-site.php:82 msgid "Remember, once deleted your site cannot be restored." msgstr "Rappelez-vous qu’une fois supprimÃ©, votre site ne peut Ãªtre rÃ©tabli." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:509 +msgid "This screen is used for managing your custom navigation menus." +msgstr "Cet Ã©cran est utilisÃ© pour gÃ©rer vos menus de navigations personnalisÃ©s." +||||||| .r11156 +#: wp-admin/plugin-editor.php:252 +msgid "Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated." +msgstr "Attention : il n’est pas recommandÃ© de modifier des extensions activÃ©es. Si vos modifications amÃ¨nent une erreur fatale, l’extension sera automatiquement dÃ©sactivÃ©e." +======= #: wp-admin/ms-delete-site.php:81 msgid "If you do not want to use your %s site any more, you can delete it using the form below. When you click Delete My Site Permanently you will be sent an email with a link in it. Click on this link to delete your site." msgstr "Si vous ne souhaitez plus utiliser votre site %s, vous pouvez l’effacer Ã l’aide du formulaire ci-dessous. AprÃ¨s avoir cliquÃ© sur Effacer mon site, vous recevrez un message avec un lien. Cliquez sur ce lien pour effacer votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:511 wp-admin/themes.php:46 +msgid "From this screen you can:" +msgstr "Depuis cet Ã©cran, vous pouvez :" +||||||| .r11156 +#: wp-admin/user-new.php:275 +msgid "Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite." +msgstr "Saisissez l’adresse de contact d’un utilisateur existant sur votre rÃ©seau, afin de l’inviter sur ce site. Cette personne recevra un message lui demandant de confirmer l’invitation." +======= #: wp-admin/ms-delete-site.php:77 msgid "Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. " msgstr "Merci. Veuillez consulter le message que nous vous avons envoyÃ© pour confirmer cette action. Votre site ne sera pas effacÃ© tant que vous n’aurez pas cliquÃ© le lien qu’il contient." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:512 +msgid "Create, edit, and delete menus" +msgstr "CrÃ©er, modifier et supprimer des menus" +||||||| .r11156 +#: wp-admin/credits.php:179 +msgid "Contributing Developers" +msgstr "DÃ©veloppeurs ayant contribuÃ©" +======= #: wp-admin/ms-delete-site.php:74 msgid "Delete My Site" msgstr "Supprimer le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:513 +msgid "Add, organize, and modify individual menu items" +msgstr "Ajouter, organiser et modifier des Ã©lÃ©ments de menu individuels" +||||||| .r11156 +#: wp-admin/user-edit.php:278 +msgid "Show Toolbar when viewing site" +msgstr "Afficher la barre d’outils lorsque vous visitez le site" +======= #: wp-admin/ms-delete-site.php:45 msgid "" "Howdy ###USERNAME###,\n" @@ -3116,540 +11078,1901 @@ msgstr "" "\n" "Le webmaster\n" "###SITE_NAME###" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:300 +msgid "Please provide a valid username." +msgstr "Veuillez saisir un identifiant valide." +||||||| .r11156 +#: wp-admin/about.php:186 +msgid "Version %1$s addressed a security issue and fixed %2$s bug." +msgid_plural "Version %1$s addressed a security issue and fixed %2$s bugs." +msgstr[0] "La version %1$s s’occupe d’un problÃ¨me de sÃ©curitÃ© et corrige %2$s bug." +msgstr[1] "Version %1$s s’occupe d’un problÃ¨me de sÃ©curitÃ© et corrige %2$s bugs." +======= #: wp-admin/ms-delete-site.php:23 msgid "I'm sorry, the link you clicked is stale. Please select another option." msgstr "Je suis dÃ©solÃ©, mais le lien que vous avez cliquÃ© ne rÃ©pond pas. Veuillez sÃ©lectionner une autre option." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:303 +msgid "The username you provided has invalid characters." +msgstr "L’identifiant que vous avez fourni contient des caractÃ¨res invalides." +||||||| .r11156 +#: wp-admin/about.php:193 +msgid "For more information, see the release notes." +msgstr "Pour plus d’informations, consultez les notes de publication." +======= #: wp-admin/ms-delete-site.php:21 msgid "Thank you for using %s, your site has been deleted. Happy trails to you until we meet again." msgstr "Merci d’avoir utilisÃ© notre service %s, votre site a Ã©tÃ© effacÃ©. Ce n’est qu’un au revoir..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:307 +msgid "Your passwords do not match. Please try again." +msgstr "Vos mots de passe ne correspondent pas. Veuillez rÃ©essayer." +||||||| .r11156 +#: wp-admin/about.php:190 +msgid "Version %1$s addressed some security issues and fixed %2$s bug." +msgid_plural "Version %1$s addressed some security issues and fixed %2$s bugs." +msgstr[0] "La version %1$s s’occupe de quelques problÃ¨mes de sÃ©curitÃ© et corrige %2$s bug." +msgstr[1] "Version %1$s s’occupe de quelques problÃ¨mes de sÃ©curitÃ© et corrige %2$s bugs." +======= #: wp-admin/ms-delete-site.php:16 msgid "You do not have sufficient permissions to delete this site." msgstr "Vous n’avez pas les droits suffisants pour effacer ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:311 +msgid "You must provide an email address." +msgstr "Vous devez saisir une adresse de messagerie." +||||||| .r11156 +#: wp-admin/about.php:182 +msgid "Version %1$s addressed %2$s bug." +msgid_plural "Version %1$s addressed %2$s bugs." +msgstr[0] "La version %1$s corrige %2$s bug." +msgstr[1] "La version %1$s corrige %2$s bugs." +======= #: wp-admin/ms-delete-site.php:13 wp-admin/my-sites.php:13 msgid "Multisite support is not enabled." msgstr "Le support multisites n’est pas activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:315 +msgid "Sorry, that isn’t a valid email address. Email addresses look like username@example.com." +msgstr "DÃ©solÃ©, ce n’est pas une adresse de messagerie valide. Les adresses de messagerie ressemblent Ã cela : utilisateur@exemple.com." +||||||| .r11156 +#: wp-admin/index.php:32 +msgid "Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner." +msgstr "Bienvenu dans votre tableau de bord WordPress ! Ceci est l’Ã©cran que vous verrez lorsque vous vous connectez Ã votre site, et qui vous donne accÃ¨s Ã l’ensemble des fonctionnalitÃ©s de gestion de WordPress. Vous pouvez obtenir de l’aide dans n’importe quel Ã©cran en cliquant sur l’onglet Â« Aide Â» prÃ©sent en haut Ã droite de votre navigateur." +======= #: wp-admin/menu.php:241 msgid "Permalinks" msgstr "Permaliens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link.php:104 +msgid "Edit Link" +msgstr "Modifier le lien" +||||||| .r11156 +#: wp-admin/about.php:175 +msgid "Maintenance and Security Release" +msgid_plural "Maintenance and Security Releases" +msgstr[0] "Mise Ã jour de maintenance et de sÃ©curitÃ©" +msgstr[1] "Mises Ã jour de maintenance et de sÃ©curitÃ©" +======= #: wp-admin/menu.php:238 msgid "Reading" msgstr "Lecture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:506 +msgid "Your theme does not natively support menus, but you can use them in sidebars by adding a “Custom Menu” widget on the Widgets screen." +msgstr "Votre thÃ¨me ne peut pas utiliser les menus nativement, mais vous pouvez les utiliser dans la barre latÃ©rale en ajoutant le widget “Menu personnalisÃ©” depuis l’Ã©cran Widgets." +||||||| .r11156 +#: wp-admin/about.php:36 wp-admin/credits.php:91 wp-admin/freedoms.php:28 +msgid "What’s New" +msgstr "NouveautÃ©s" +======= #: wp-admin/menu.php:237 msgid "Writing" msgstr "Ãcriture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:510 +msgid "Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Custom Menu” widget on the Widgets screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side." +msgstr "Les menus peuvent Ãªtre affichÃ©s Ã des emplacements dÃ©finis par votre thÃ¨me, et mÃªme dans les barres latÃ©rales grÃ¢ce au widget « Menus personnalisÃ©s » de l’Ã©cran Widgets. Si votre thÃ¨me ne reconnaÃ®t pas encore cette fonctionnalitÃ© (les thÃ¨mes par dÃ©faut, %2$s and %3$s, les intÃ¨grent trÃ¨s bien), vous pouvez apprendre Ã ajouter cette reconnaissance vous-mÃªme en suivant le lien de documentation situÃ© sur le cÃ´tÃ©." +||||||| .r11156 +#: wp-admin/about.php:174 +msgid "Security Release" +msgid_plural "Security Releases" +msgstr[0] "Mise Ã jour de sÃ©curitÃ©" +msgstr[1] "Mises Ã jour de sÃ©curitÃ©" +======= #: wp-admin/menu.php:236 msgctxt "settings screen" msgid "General" msgstr "GÃ©nÃ©ral" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:533 +msgid "Clicking the arrow to the right of any menu item in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab." +msgstr "En cliquant sur le titre de n’importe Ã©lÃ©ment du menu dans l’Ã©diteur, un ensemble de rÃ©glages standards s’ouvrira. D’autres rÃ©glages, tels que la cible du lien, les classes CSS, les relations du lien et la description du lien, peuvent Ãªtre activÃ©s et dÃ©sactivÃ©s dans l’onglet « Options de l’Ã©cran »." +||||||| .r11156 +#: wp-admin/about.php:173 +msgid "Maintenance Release" +msgid_plural "Maintenance Releases" +msgstr[0] "Mise Ã jour de maintenance" +msgstr[1] "Mises Ã jour de maintenance" +======= #: wp-admin/menu.php:235 wp-admin/options.php:21 msgid "Settings" msgstr "RÃ©glages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:163 +msgid "Comment must be manually approved" +msgstr "Le commentaire doit Ãªtre approuvÃ© manuellement" +||||||| .r11156 +#: wp-admin/about.php:178 +msgid "Version %1$s addressed a security issue." +msgid_plural "Version %1$s addressed some security issues." +msgstr[0] "La version %1$s corrige une vulnÃ©rabilitÃ© de sÃ©curitÃ©." +msgstr[1] "La version %1$s corrige plusieurs vulnÃ©rabilitÃ©s de sÃ©curitÃ©." +======= #: wp-admin/menu.php:233 msgid "Network Setup" msgstr "CrÃ©ation du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:49 +msgid "The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library." +msgstr "Les tailles prÃ©cisÃ©es ci-dessous dÃ©terminent les dimensions maximales (en pixels) Ã utiliser lors de l’insertion d’une image dans la bibliothÃ¨que de mÃ©dias." +||||||| .r11156 +#: wp-admin/options-permalink.php:22 +msgid "This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures." +msgstr "Cet Ã©cran vous permet de choisir la structure de permalien par dÃ©faut. Vous pouvez choisir les rÃ©glages les plus courants, ou crÃ©er la vÃ´tre." +======= #: wp-admin/menu.php:231 wp-admin/ms-delete-site.php:30 msgid "Delete Site" msgstr "Supprimer le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/my-sites.php:42 +msgid "This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site." +msgstr "Cet Ã©cran affiche Ã un utilisateur individuel tous ses sites sur ce rÃ©seau, et permet Ã©galement Ã cet utilisateur de rÃ©gler son site principal. Il peut utiliser les liens sous chaque site pour se rendre soit sur son interface publique, soit sur son administration." +||||||| .r11156 +#: wp-admin/about.php:156 +msgid "Return to Updates" +msgstr "Retourner aux mises Ã jour" +======= #: wp-admin/menu.php:227 msgid "Available Tools" msgstr "Outils disponibles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:534 +msgid "Add one or several items at once by selecting the checkbox next to each item and clicking Add to Menu" +msgstr "Ajoutez un ou plusieurs Ã©lÃ©ments Ã la fois en cochant la case Ã cÃ´tÃ© de chaque Ã©lÃ©ment puis en cliquant sur « Ajouter au menu »" +||||||| .r11156 +#: wp-admin/includes/update-core.php:1139 wp-admin/update-core.php:422 +msgid "Welcome to WordPress %1$s. Learn more." +msgstr "Bienvenu dans WordPress %1$s. En savoir plus." +======= #: wp-admin/menu.php:226 wp-admin/tools.php:12 msgid "Tools" msgstr "Outils" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:237 wp-admin/options.php:21 +msgid "Settings" +msgstr "RÃ©glages" +||||||| .r11156 +#: wp-admin/edit-tags.php:223 +msgid "Adding Categories" +msgstr "Ajout de catÃ©gories" +======= #: wp-admin/menu.php:220 wp-admin/menu.php:222 wp-admin/user-new.php:143 #: wp-admin/user-new.php:334 wp-admin/user-new.php:434 msgid "Add New User" msgstr "Ajouter un utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/maint/repair.php:131 +msgid "https://wordpress.org/support/forum/how-to-and-troubleshooting" +msgstr "http://www.wordpress-fr.net/support/forum-26-support-wordpress" +||||||| .r11156 +#: wp-admin/edit-tags.php:223 +msgid "Adding Tags" +msgstr "Ajout de mots-clÃ©s" +======= #: wp-admin/menu.php:215 wp-admin/menu.php:218 msgid "Your Profile" msgstr "Votre profil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:140 +msgid "This address is used for admin purposes, like new user notification." +msgstr "Cette adresse n’est utilisÃ©e que pour l’administration du site : par exemple, la notification de l’inscription d’un nouvel utilisateur." +||||||| .r11156 +#: wp-admin/plugins.php:351 +msgid "Troubleshooting" +msgstr "Diagnostic" +======= #: wp-admin/menu.php:210 wp-admin/menu.php:212 wp-admin/user-edit.php:210 #: wp-admin/users.php:450 msgctxt "user" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:48 +msgid "Image sizes" +msgstr "Tailles des images" +||||||| .r11156 +#: wp-admin/media-new.php:47 +msgid "You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:" +msgstr "Vous pouvez ici mettre des fichiers en ligne sans devoir crÃ©er un nouvel article avant. Ceci vous permet d’envoyer des fichiers qui seront utilisables par les articles et les pages ultÃ©rieurement et/ou seront utilisÃ©s via un lien internet pour partager un fichier particulier. Il y a 3 mÃ©thodes pour envoyer des fichiers :" +======= #: wp-admin/menu.php:208 msgid "All Users" msgstr "Tous les utilisateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:60 +msgid "Crop thumbnail to exact dimensions (normally thumbnails are proportional)" +msgstr "Recadrer les images pour parvenir aux dimensions exactes (normalement, les miniatures sont au format carrÃ©)" +||||||| .r11156 +#: wp-admin/user-new.php:157 +msgid "You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed." +msgstr "Vous devez assigner un mot de passe au nouvel utilisateur, qu’il pourra changer aprÃ¨s s’Ãªtre connectÃ©. L’identifiant, en revanche, ne peut Ãªtre changÃ©." +======= #: wp-admin/menu.php:204 wp-admin/user/menu.php:14 wp-admin/user-edit.php:28 msgid "Profile" msgstr "Profil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:229 +msgid "The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress." +msgstr "La constante DO_NOT_UPGRADE_GLOBAL_TABLES n’a pu Ãªtre dÃ©finie lors de l’installation de WordPress." +||||||| .r11156 +#: wp-admin/tools.php:60 +msgid "If you want to convert your categories to tags (or vice versa), use the Categories and Tags Converter available from the Import screen." +msgstr "Si vous souhaitez convertir vos catÃ©gories en mots-clÃ©s (et vice versa), utilisez le Convertisseur de catÃ©gories mots-clÃ©s, disponible depuis l’Ã©cran des importateurs." +======= #: wp-admin/menu.php:196 msgctxt "plugin editor" msgid "Editor" msgstr "Ãditeur" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/nav-menus.php:600 +msgid "Your theme supports %s menu. Select which menu appears in each location." +msgid_plural "Your theme supports %s menus. Select which menu appears in each location." +msgstr[0] "Votre thÃ¨me peut utiliser %s menu. SÃ©lectionnez le menu qui devra apparaÃ®tre dans l’emplacement." +msgstr[1] "Votre thÃ¨me peut utiliser %s menus. SÃ©lectionnez les menu qui devront apparaÃ®tre dans chaque emplacement." +||||||| .r11156 +#: wp-admin/user-new.php:161 +msgid "Remember to click the Add New User button at the bottom of this screen when you are finished." +msgstr "N’oubliez pas de cliquer sur le bouton « Ajouter un utilisateur », en bas de cet Ã©cran, quand vous aurez terminÃ©." +======= #. translators: add new plugin #: wp-admin/menu.php:195 wp-admin/plugins.php:448 msgctxt "plugin" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:535 +msgid "To add a custom link, expand the Custom Links section, enter a URL and link text, and click Add to Menu" +msgstr "Pour ajouter un lien personnalisÃ© ouvrez la section « Liens personnalisÃ©s », saisissez une adresse web et un texte pour le lien, et cliquez sur « Ajouter au menu »" +||||||| .r11156 +#: wp-admin/export.php:151 +msgid "Once you’ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site." +msgstr "Une fois que le fichier tÃ©lÃ©chargÃ© a Ã©tÃ© enregistrÃ©, vous pouvez utiliser la fonction Importer d’un autre site WordPress pour importer ce fichier dans cet autre site." +======= #: wp-admin/menu.php:191 msgid "Installed Plugins" msgstr "Extensions installÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are +#. placeholders. +#: wp-admin/ms-delete-site.php:46 +msgid "" +"Howdy ###USERNAME###,\n" +"\n" +"You recently clicked the 'Delete Site' link on your site and filled in a\n" +"form on that page.\n" +"\n" +"If you really want to delete your site, click the link below. You will not\n" +"be asked to confirm again so only click this link if you are absolutely certain:\n" +"###URL_DELETE###\n" +"\n" +"If you delete your site, please consider opening a new site here\n" +"some time in the future! (But remember your current site and username\n" +"are gone forever.)\n" +"\n" +"Thanks for using the site,\n" +"Webmaster\n" +"###SITE_NAME###" +msgstr "" +"Cher/chÃ¨re ###USERNAME###,\n" +"\n" +"Vous avez rÃ©cemment cliquÃ© sur le lien Â« Supprimer le site Â» pour votre propre site, \n" +"et avez complÃ©tÃ© le formulaire prÃ©sent sur cette mÃªme page.\n" +"\n" +"Si vous Ãªtes sÃ»r(e) de vouloir supprimer votre site, cliquez sur le lien ci-dessous.\n" +"Aucune confirmation ne vous sera demandÃ©e par la suite, soyez donc totalement \n" +"certain(e) de ce que vous faites :\n" +"###URL_DELETE###\n" +"\n" +"Si vous effacez votre site, n'hÃ©sitez pas Ã revenir crÃ©er un autre site Ã l'avenir ! \n" +"(mais souvenez-vous que votre site actuel et votre identifiant\n" +"ne seront plus jamais disponibles)\n" +"\n" +"Merci d'avoir utilisÃ© notre site,\n" +"\n" +"Le webmaster\n" +"###SITE_NAME###" +||||||| .r11156 +#: wp-admin/users.php:32 +msgid "Screen Display" +msgstr "Ãcran affichÃ©" +======= #: wp-admin/menu.php:189 msgid "Plugins %s" msgstr "Extensions %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:233 wp-admin/ms-delete-site.php:30 +msgid "Delete Site" +msgstr "Supprimer le site" +||||||| .r11156 +#: wp-admin/upload.php:212 +msgid "Attaching Files" +msgstr "Fichiers des extensions" +======= #: wp-admin/menu.php:179 msgctxt "theme editor" msgid "Editor" msgstr "Ãditeur" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: date and time format for exact current time, mainly about +#. timezones, see http:php.net/date +#: wp-admin/options-general.php:21 +msgctxt "timezone date format" +msgid "Y-m-d H:i:s" +msgstr "Y-m-d H:i:s" +||||||| .r11156 +#: wp-admin/user-new.php:172 +msgid "Here is a basic overview of the different user roles and the permissions associated with each one:" +msgstr "Voici un rapide survol des diffÃ©rents rÃ´les assignables aux utilisateurs, et des permissions qui leurs sont associÃ©es :" +======= #: wp-admin/menu.php:150 msgid "Appearance" msgstr "Apparence" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:630 +msgid "Edit selected menu" +msgstr "Modifier le menu sÃ©lectionnÃ©" +||||||| .r11156 +#: wp-admin/user-new.php:171 +msgid "User Roles" +msgstr "RÃ´les utilisateurs" +======= #: wp-admin/menu.php:99 msgid "All Comments" msgstr "Tous les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu-header.php:233 +msgid "Main menu" +msgstr "Menu principal" +||||||| .r11156 +#: wp-admin/user-new.php:151 +msgid "To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom." +msgstr "Pour ajouter un nouvel utilisateur Ã votre site, remplissez le formulaire de cet Ã©cran et cliquez sur le bouton « Ajouter un nouvel utilisateur » en bas de l’Ã©cran." +======= #: wp-admin/menu.php:96 msgid "Comments %s" msgstr "Commentaires %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:135 +msgid "Enter the address here if you want your site home page to be different from your WordPress installation directory." +msgstr "Si vous souhaitez que l’adresse de la page d’accueil de votre site soit diffÃ©rente du rÃ©pertoire oÃ¹ vous avez installÃ© WordPress, saisissez cette adresse ici." +||||||| .r11156 +#: wp-admin/edit-comments.php:122 +msgid "Moderating Comments" +msgstr "ModÃ©ration des commentaires" +======= #: wp-admin/menu.php:76 msgctxt "admin menu" msgid "All Links" msgstr "Tous les liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:559 +msgid "Documentation on Menus" +msgstr "Documentation sur les menus personnalisÃ©s (en)" +||||||| .r11156 +#: wp-admin/user-new.php:174 +msgid "Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content." +msgstr "Les abonnÃ©s peuvent lire les commentaires/commenter/recevoir les newsletters, etc. Mais ils ne peuvent pas crÃ©er du contenu sur le site." +======= #: wp-admin/menu.php:64 msgid "Library" msgstr "BibliothÃ¨que" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:46 +msgid "Documentation on Discussion Settings" +msgstr "Documentation sur les rÃ©glages des discussions (en)" +||||||| .r11156 +#: wp-admin/import.php:125 +msgid "If the importer you need is not listed, search the plugin directory to see if an importer is available." +msgstr "Si l’importateur dont vous avec besoin n’est pas prÃ©sent, lancez une recherche dans le dÃ©pÃ´t d’extensions pour voir s’il s’y trouve." +======= #: wp-admin/menu.php:43 msgid "Updates %s" msgstr "Mises Ã jour %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/media-new.php:56 +msgid "Documentation on Uploading Media Files" +msgstr "Documentation sur la mise en ligne de fichiers mÃ©dia (en)" +||||||| .r11156 +#: wp-admin/edit.php:200 +msgid "When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears." +msgstr "Vous pouvez Ã©galement modifier plusieurs articles en mÃªme temps. Cochez les cases des articles que vous voulez modifier, sÃ©lectionnez l’option « Modifier » du menu « Actions groupÃ©es », et cliquez sur « Appliquer ». Vous pourrez alors d’un coup modifier les mÃ©tadonnÃ©es (catÃ©gories, auteur, etc.) pour tous les articles sÃ©lectionnÃ©s. Pour retirer un article de la sÃ©lection, cliquez simplement sur la croix Ã gauche de son titre dans la zone « Modifications groupÃ©es » qui apparaÃ®t." +======= #: wp-admin/menu-header.php:223 msgid "Skip to main content" msgstr "Aller au contenu principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-media.php:34 +msgid "Documentation on Media Settings" +msgstr "Documentation sur les rÃ©glages des mÃ©dias (en)" +||||||| .r11156 +#: wp-admin/edit.php:185 wp-admin/upload.php:206 +msgid "Available Actions" +msgstr "Actions disponibles" +======= #: wp-admin/menu-header.php:222 msgid "Main menu" msgstr "Menu principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:104 +msgid "Documentation on General Settings" +msgstr "Documentation sur les rÃ©glages gÃ©nÃ©raux (en)" +||||||| .r11156 +#: wp-admin/user-new.php:176 +msgid "Authors can publish and manage their own posts, and are able to upload files." +msgstr "Les auteurs peuvent publier et gÃ©rer leurs propres articles, ils peuvent Ã©galement envoyer des fichiers ;" +======= #: wp-admin/menu-header.php:216 msgid "Collapse menu" msgstr "RÃ©duire le menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/link-manager.php:60 +msgid "Documentation on Managing Links" +msgstr "Documentation sur la gestion des liens (en)" +||||||| .r11156 +#: wp-admin/update-core.php:483 +msgid "How to Update" +msgstr "Comment faire la mise Ã jour" +======= #: wp-admin/media.php:116 wp-admin/media.php:125 msgid "Update Media" msgstr "Mettre Ã jour le fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/my-sites.php:48 +msgid "Documentation on My Sites" +msgstr "Documentation sur Mes Sites (en)" +||||||| .r11156 +#: wp-admin/edit.php:169 +msgid "This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow." +msgstr "Cet Ã©cran vous donne accÃ¨s Ã tous vos articles. Vous pouvez personnaliser son affichage afin qu’il corresponde au mieux Ã vos besoins." +======= #. translators: add new file #: wp-admin/media.php:110 wp-admin/menu.php:66 wp-admin/upload.php:78 #: wp-admin/upload.php:213 msgctxt "file" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:315 +msgid "Documentation on date and time formatting." +msgstr "Documentation sur le format des dates." +||||||| .r11156 +#: wp-admin/edit.php:199 +msgid "You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply." +msgstr "Vous pouvez Ã©galement modifier plusieurs articles Ã la fois, ou les dÃ©placer dans la Corbeille d’un coup. SÃ©lectionnez les articles sur lesquels vous voulez lancer une action, puis sÃ©lectionnez l’action que vous voulez lancer dans le menu « Actions groupÃ©es » et cliquez sur « Appliquer »." +======= #: wp-admin/media.php:75 msgid "This screen allows you to edit five fields for metadata in a file within the media library." msgstr "Cet Ã©cran vous permet de modifier les 4 champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:214 +msgid "You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +||||||| .r11156 +#: wp-admin/plugin-install.php:56 +msgid "Adding Plugins" +msgstr "Ajout d’extensions" +======= #: wp-admin/media.php:63 msgid "You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again." msgstr "Vous ne pouvez pas modifier ce fichier attachÃ©, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:312 +msgid "enter a custom time format in the following field" +msgstr "saisissez un format d’heure personnalisÃ© dans le champ suivant" +||||||| .r11156 +#: wp-admin/edit.php:173 +msgid "Screen Content" +msgstr "Contenu de l’Ã©cran" +======= #: wp-admin/media.php:62 msgid "You attempted to edit an item that isn’t an attachment. Please go back and try again." msgstr "Vous avez tentÃ© de modifier un Ã©lÃ©ment qui n’est pas un fichier joint. Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:279 +msgid "enter a custom date format in the following field" +msgstr "saisissez un format de date personnalisÃ© dans le champ suivant" +||||||| .r11156 +#: wp-admin/edit.php:175 +msgid "You can customize the display of this screen’s contents in a number of ways:" +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" +======= #: wp-admin/media.php:61 msgid "You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?" msgstr "Vous tentez de modifier un fichier attachÃ© qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:313 +msgid "Custom time format:" +msgstr "Format d’heure personnalisÃ© :" +||||||| .r11156 +#: wp-admin/themes.php:64 +msgid "Adding Themes" +msgstr "Ajout de thÃ¨mes" +======= #: wp-admin/media.php:23 wp-admin/media.php:57 msgid "You are not allowed to edit this attachment." msgstr "Vous n’avez pas l’autorisation de modifier ce fichier attachÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:280 +msgid "Custom date format:" +msgstr "Format de date personnalisÃ© :" +||||||| .r11156 +#: wp-admin/plugin-install.php:52 +msgid "Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section." +msgstr "Les extensions s’ajoutent Ã WordPress afin d’ Ã©tendre ses fonctionnalitÃ©s par le biais de fonctions personnalisÃ©es. Les extensions sont dÃ©veloppÃ©es indÃ©pendamment du code de WordPress, par des milliers de dÃ©veloppeurs Ã travers le monde. Toutes les extensions prÃ©sentes dans le dÃ©pÃ´t officiel d’extensions de WordPress.org utilisent une licence compatible avec celle de WordPress. Vous pouvez trouver de nouvelles extensions Ã installer en lanÃ§ant une recherche ou en parcourant le dÃ©pÃ´t directement depuis la prÃ©sente page." +======= #: wp-admin/media-new.php:56 msgid "Documentation on Uploading Media Files" msgstr "Documentation sur la mise en ligne de fichiers mÃ©dia (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:280 wp-admin/options-general.php:313 +msgid "example:" +msgstr "exemple :" +||||||| .r11156 +#: wp-admin/options-permalink.php:21 +msgid "Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink." +msgstr "Les permaliens sont des adresses Web permanentes vers vos pages individuelles et vos articles, ainsi que vos archives de catÃ©gorie et de mot-clÃ©. Ils offrent un lien plus comprÃ©hensible vers votre contenu. Les adresses de chaque article devraient Ãªtre permanentes et ne jamais changer, d’oÃ¹ le nom de permalien." +======= #: wp-admin/media-new.php:51 msgid "Revert to the Browser Uploader by clicking the link below the drag and drop box." msgstr "Revenez Ã l’outil de mise en ligne du navigateur en cliquant sur le lien sous la zone de glisser-dÃ©poser." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:369 +msgid "Note:" +msgstr "Note :" +||||||| .r11156 +#: wp-admin/options-permalink.php:29 +msgid "Many people choose to use “pretty permalinks,” URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure." +msgstr "De nombreuses personnes prÃ©fÃ¨rent utiliser les liens simplifiÃ©s (\"pretty permalinks\"), qui contiennent des informations utiles, telles que le titre de l’article, plutÃ´t qu’un numÃ©ro d’article gÃ©nÃ©rique. Vous pouvez choisir n’importe quel type de format de permalien parmi les rÃ©glages les plus courants, ou concevoir votre propre structure personnalisÃ©e." +======= #: wp-admin/media-new.php:50 msgid "Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen." msgstr "Un clic sur SÃ©lectionner les fichiers ouvre la fenÃªtre de navigation, vous donnant accÃ¨s aux fichiers de votre machine. AprÃ¨s avoir cliquÃ© sur un fichier, cliquez sur Ouvrir pour l’affichage de la barre de tÃ©lÃ©chargement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:369 wp-admin/options-general.php:373 +msgid "The %s constant in your %s file is no longer needed." +msgstr "La constante %s de votre fichier %s n’est plus nÃ©cessaire." +||||||| .r11156 +#: wp-admin/options-permalink.php:28 wp-admin/options-permalink.php:201 +msgid "Common Settings" +msgstr "RÃ©glages les plus courants" +======= #: wp-admin/media-new.php:49 msgid "Drag and drop your files into the area below. Multiple files are allowed." msgstr "Glissez/dÃ©posez vos fichiers dans la zone ci-dessous. Vous pouvez en dÃ©poser plusieurs Ã la fois." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:268 +msgid "Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world." +msgstr "Bienvenue dans la trÃ¨s cÃ©lÃ¨bre installation en 5 minutes de WordPress ! Vous n’avez qu’Ã remplir les informations demandÃ©es ci-dessous et vous serez prÃªt Ã utiliser la plus extensible et puissante plateforme de publication de contenu au monde." +||||||| .r11156 +#: wp-admin/options-permalink.php:37 +msgid "Custom Structures" +msgstr "Structure personnalisÃ©e" +======= #: wp-admin/media-new.php:47 msgid "You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:" msgstr "Vous pouvez ici mettre des fichiers en ligne sans devoir crÃ©er un nouvel article avant. Ceci vous permet d’envoyer des fichiers qui seront utilisables par les articles et les pages ultÃ©rieurement et/ou seront utilisÃ©s via un lien internet pour partager un fichier particulier. Il y a 3 mÃ©thodes pour envoyer des fichiers :" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. Translators: 1: wp-config.php; 2: Secret key service URL. +#: wp-admin/maint/repair.php:56 +msgid "While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the WordPress.org secret key service." +msgstr "Tandis que vous modifiez le fichier %1$s, prenez quelques minutes pour vous assurer que vous avez les 8 clÃ©s, et qu’elles sont bien uniques. Vous pouvez les gÃ©nÃ©rer avec le service de clÃ©s secrÃ¨tes de WordPress.org." +||||||| .r11156 +#: wp-admin/options-media.php:21 +msgid "Uploading Files allows you to choose the folder and path for storing your uploaded files." +msgstr "« Envoi de fichiers » vous permet de choisir le dossier et le chemin de stockage de vos fichiers mis en ligne." +======= #: wp-admin/media-new.php:40 msgid "Upload New Media" msgstr "Envoi d’un nouveau mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/menu.php:181 +msgctxt "theme editor" +msgid "Editor" +msgstr "Ãditeur" +||||||| .r11156 +#: wp-admin/options-writing.php:21 +msgid "You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links." +msgstr "Vous disposez de plusieurs mÃ©thodes pour envoyer du contenu. Cet Ã©cran vous prÃ©sente les rÃ©glages de chacune. La premiÃ¨re section gÃ¨re l’Ã©diteur de l’administration de WordPress, tandis que les autres gÃ¨rent les mÃ©thodes externes. Pour obtenir plus d’informations sur toutes ces mÃ©thodes, suivez les liens vers la documentation." +======= #: wp-admin/maint/repair.php:119 msgid "Repair and Optimize Database" msgstr "RÃ©parer et optimiser la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-discussion.php:242 +msgid "Mystery Person" +msgstr "Personne mystÃ¨re" +||||||| .r11156 +#: wp-admin/themes.php:57 +msgid "Installing themes on Multisite can only be done from the Network Admin section." +msgstr "En mode Multisite, vous pouvez installer des thÃ¨mes depuis la section Admin du RÃ©seau." +======= #: wp-admin/maint/repair.php:118 msgid "WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing." msgstr "WordPress peut Ã©galement tenter d’optimiser la base de donnÃ©es. Cela peut amÃ©liorer ses performances dans certains cas. La rÃ©paration et l’optimisation peuvent prendre longtemps, et la base de donnÃ©es sera verrouillÃ©e durant l’optimisation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/nav-menus.php:577 wp-admin/widgets.php:331 +msgid "Manage in Customizer" +msgstr "GÃ©rer dans l'outil de personnalisation" +||||||| .r11156 +#: wp-admin/options-general.php:65 +msgid "If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin." +msgstr "Si vous voulez que les visiteurs du site puissent s’inscrire eux-mÃªmes plutÃ´t que de devoir Ãªtre inscrits par l’administrateur du site, cochez la case « Inscription ». Un rÃ´le d’utilisateur par dÃ©faut peut Ãªtre assignÃ© pour tout nouveau inscrit, qu’il se soit enregistrÃ© lui-mÃªme ou par le biais de l’administrateur." +======= #: wp-admin/maint/repair.php:117 msgid "Repair Database" msgstr "RÃ©parer la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/options-general.php:92 +msgid "You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable)." +msgstr "Vous pouvez configurer la langue, et les fichiers de traduction seront automatiquement tÃ©lÃ©chargÃ©s et installÃ©s (disponible uniquement si votre systÃ¨me de fichier est accessible en Ã©criture)." +||||||| .r11156 +#: wp-admin/options-writing.php:35 +msgid "Post Via Email" +msgstr "Envoi d’article par e-mail" +======= #: wp-admin/maint/repair.php:115 msgid "WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient." msgstr "WordPress peut automatiquement chercher les problÃ¨mes courants des base de donnÃ©es et les rÃ©parer. La rÃ©paration peut prendre un certain temps, merci donc de votre patience." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:101 wp-admin/theme-install.php:142 +msgid "Feature Filter" +msgstr "Filtre de fonctionnalitÃ©s" +||||||| .r11156 +#: wp-admin/options-writing.php:45 +msgid "If desired, WordPress will automatically alert various services of your new posts." +msgstr "Si vous le souhaitez, WordPress peut automatiquement informer diffÃ©rents services en ligne de vos nouvelles publications." +======= #: wp-admin/maint/repair.php:113 msgid "One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient." msgstr "Une ou plusieurs tables de votre base de donnÃ©es sont indisponibles. Pour autoriser WordPress Ã tenter de rÃ©parer ces tables, cliquez sur le bouton « RÃ©parer la base de donnÃ©es ». La rÃ©paration peut prendre un certain temps, merci donc d’Ãªtre patient." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:207 +msgid "Tan" +msgstr "Ocre" +||||||| .r11156 +#: wp-admin/options-discussion.php:20 +msgid "This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won’t all fit here! :) Use the documentation links to get information on what each discussion setting does." +msgstr "Cet Ã©cran offre plusieurs options pour contrÃ´ler la gestion et l’affichage des commentaires et liens sur vos articles/pages. En fait, il y en a tellement qu’elles ne tiennent pas toutes ici ! :) Utiliser le lien vers la documentation pour obtenir des informations sur ce que fait chaque rÃ©glage de discussion." +======= #: wp-admin/maint/repair.php:109 msgid "Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users." msgstr "RÃ©parations effectuÃ©es. Veuillez retirer la ligne suivante de votre fichier wp-config.php, pour empÃªcher que cette page soit utilisÃ©e par des utilisateurs non autorisÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:210 +msgid "Dark" +msgstr "Sombre" +||||||| .r11156 +#: wp-admin/user-edit.php:40 +msgid "You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens." +msgstr "Vous pouvez modifier votre mot de passe, activer les raccourcis clavier, modifier la combinaison de couleurs des Ã©crans de l’administration, et dÃ©sactiver l’Ã©diteur visuel (WYSIWYG), entre autres choses. Vous pouvez Ã©galement cacher la barre d’outils (anciennement « barre d’administration ») sur la partie publique de votre site, mais elle ne peut pas Ãªtre enlevÃ©e des Ã©crans d’administration." +======= #: wp-admin/maint/repair.php:103 msgid "https://wordpress.org/support/forum/how-to-and-troubleshooting" msgstr "http://www.wordpress-fr.net/support/forum-26-support-wordpress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:218 +msgid "One Column" +msgstr "Une colonne" +||||||| .r11156 +#: wp-admin/widgets.php:94 +msgid "Inactive Sidebar (not used)" +msgstr "Barre latÃ©rale inactive (inutilisÃ©e)" +======= #: wp-admin/maint/repair.php:103 msgid "Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance." msgstr "Certains problÃ¨mes de la base de donnÃ©es n’ont pas pu Ãªtre rÃ©parÃ©s. Veuillez copier/coller la liste d’erreurs suivantes sur le forum de support de WordPress pour recevoir plus d’informations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:219 +msgid "Two Columns" +msgstr "Deux colonnes" +||||||| .r11156 +#: wp-admin/widgets.php:97 +msgid "This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar." +msgstr "Cette barre latÃ©rale n’est plus disponible, et ne s’affiche nulle part sur le site. Vous pouvez en retirer les widgets ci-dessous afin de la supprimer totalement." +======= #. translators: 1: table name, 2: error message, #: wp-admin/maint/repair.php:95 msgid "Failed to optimize the %1$s table. Error: %2$s" msgstr "Impossible d’optimiser la table %1$s. Erreur : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:220 +msgid "Three Columns" +msgstr "Trois colonnes" +||||||| .r11156 +#: wp-admin/media-new.php:49 +msgid "Drag and drop your files into the area below. Multiple files are allowed." +msgstr "Glissez/dÃ©posez vos fichiers dans la zone ci-dessous. Vous pouvez en dÃ©poser plusieurs Ã la fois." +======= #. translators: %s: table name #: wp-admin/maint/repair.php:92 msgid "Successfully optimized the %s table." msgstr "La table %s a bien Ã©tÃ© optimisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:221 +msgid "Four Columns" +msgstr "Quatre colonnes" +||||||| .r11156 +#: wp-admin/media-new.php:50 +msgid "Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen." +msgstr "Un clic sur SÃ©lectionner les fichiers ouvre la fenÃªtre de navigation, vous donnant accÃ¨s aux fichiers de votre machine. AprÃ¨s avoir cliquÃ© sur un fichier, cliquez sur Ouvrir pour l’affichage de la barre de tÃ©lÃ©chargement." +======= #. translators: %s: table name #: wp-admin/maint/repair.php:85 msgid "The %s table is already optimized." msgstr "La table %s a dÃ©jÃ Ã©tÃ© optimisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:222 +msgid "Left Sidebar" +msgstr "Colonne latÃ©rale gauche" +||||||| .r11156 +#: wp-admin/edit-tags.php:187 +msgid "You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts." +msgstr "Vous pouvez crÃ©er des groupes de liens en utilisant les catÃ©gories de liens. Le nom d’une catÃ©gorie de liens doit Ãªtre unique, et les catÃ©gories de liens ne sont pas les mÃªmes que les catÃ©gories de vos articles." +======= #. translators: 1: table name, 2: error message, #: wp-admin/maint/repair.php:73 msgid "Failed to repair the %1$s table. Error: %2$s" msgstr "Impossible de rÃ©parer la table %1$s. Erreur : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:223 +msgid "Right Sidebar" +msgstr "Colonne latÃ©rale droite" +||||||| .r11156 +#: wp-admin/widgets.php:57 +msgid "Removing and Reusing" +msgstr "Retirer et rÃ©utiliser" +======= #. translators: %s: table name #: wp-admin/maint/repair.php:70 msgid "Successfully repaired the %s table." msgstr "La table %s a bien Ã©tÃ© rÃ©parÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:226 wp-admin/includes/theme.php:276 +msgid "Features" +msgstr "FonctionnalitÃ©s" +||||||| .r11156 +#: wp-admin/edit-tags.php:189 +msgid "You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another." +msgstr "Vous pouvez assigner des mots-clÃ©s Ã vos articles via le bloc dÃ©diÃ©. Au contraire des catÃ©gories, les mots-clÃ©s n’ont pas de hiÃ©rarchie, ce qui signifie qu’ils ne peuvent pas Ãªtre liÃ©s entre eux." +======= #. translators: 1: table name, 2: error message, #: wp-admin/maint/repair.php:63 msgid "The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…" msgstr "La table %1$s est dans un mauvais Ã©tat. Elle renvoie l’erreur suivante : %2$s. WordPress va tenter de la rÃ©parer…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:231 +msgid "Custom Colors" +msgstr "Couleurs personnalisÃ©es" +||||||| .r11156 +#: wp-admin/widgets.php:65 +msgid "Missing Widgets" +msgstr "Widgets manquants" +======= #. translators: %s: table name #: wp-admin/maint/repair.php:60 msgid "The %s table is okay." msgstr "La table %s est correcte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:244 +msgid "Theme Options" +msgstr "Options du thÃ¨me" +||||||| .r11156 +#: wp-admin/edit-comments.php:118 +msgid "You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions." +msgstr "Vous pouvez gÃ©rer les commentaires sur votre site de la mÃªme maniÃ¨re que vous gÃ©rez les articles et autres contenus. Cet Ã©cran est personnalisable de la mÃªme maniÃ¨re que les autres Ã©crans de gestion, et vous pouvez agir sur les commentaires par le biais des liens qui apparaissent au survol de la souris, ou via le menu « Actions groupÃ©es »." +======= #: wp-admin/maint/repair.php:30 msgid "To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page." msgstr "Pour autoriser cette page Ã rÃ©parer automatiquement les problÃ¨mes de base de donnÃ©es, veuillez ajouter la ligne suivante dans votre fichier wp-config.php. Une fois cette ligne ajoutÃ©e Ã votre configuration, rechargez cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:245 +msgid "Threaded Comments" +msgstr "Commentaires imbriquÃ©s" +||||||| .r11156 +#: wp-admin/edit-comments.php:125 +msgid "In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address." +msgstr "Dans la colonne « Auteur », en plus de trouver le nom de l’auteur, son adresse de messagerie et celle de son site, vous trouverez son adresse IP. En cliquant dessus, vous obtiendrez une liste de tous les commentaires faits depuis cette adresse IP." +======= #: wp-admin/maint/repair.php:19 msgid "WordPress › Database Repair" msgstr "WordPress » RÃ©paration de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:240 +msgid "Microformats" +msgstr "Microformats" +||||||| .r11156 +#: wp-admin/index.php:46 +msgid "Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information." +msgstr "Les liens contenus dans la barre d’outils placÃ©e en haut de l’Ã©cran relient votre tableau de bord Ã la partie publique de votre site, et fournissent un accÃ¨s rapide Ã votre profil et de prÃ©cieuses informations sur WordPress." +======= #: wp-admin/link.php:109 msgid "Link not found." msgstr "Lien non trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:249 wp-admin/includes/theme.php:277 +msgid "Subject" +msgstr "ThÃ¨me" +||||||| .r11156 +#: wp-admin/link-manager.php:53 +msgid "Deleting Links" +msgstr "Suppression de liens" +======= #: wp-admin/link.php:104 msgid "Edit Link" msgstr "Modifier le lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:250 +msgid "Holiday" +msgstr "Vacances" +||||||| .r11156 +#: wp-admin/upload.php:208 +msgid "Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file." +msgstr "Le survol par la souris des lignes du tableau rÃ©vÃ¨le des liens : « Modifier », « Supprimer dÃ©finitivement » et « Afficher ». En cliquant sur « Modifier » ou sur le nom d’un fichier mÃ©dia, vous obtiendrez un Ã©cran oÃ¹ vous pourrez modifier les mÃ©tadonnÃ©es du fichier. En cliquant sur « Supprimer dÃ©finitivement », vous supprimerez le fichier de la bibliothÃ¨que (ainsi que de tous les articles auxquels il Ã©tait liÃ©). « Afficher » vous enverra sur la page d’affichage de ce fichier." +======= #. translators: 1: error message, 2: line number #: wp-admin/link-parse-opml.php:80 msgid "XML Error: %1$s at line %2$s" msgstr "Erreur XML : %1$s Ã la ligne %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:251 +msgid "Photoblogging" +msgstr "Photoblogging" +||||||| .r11156 +#: wp-admin/edit.php:220 +msgid "Managing pages is very similar to managing posts, and the screens can be customized in the same way." +msgstr "La gestion des pages est trÃ¨s proche de celle des articles, et les Ã©crans peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re." +======= #: wp-admin/link-manager.php:89 msgid "Search Links" msgstr "Chercher un lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:252 +msgid "Seasonal" +msgstr "Saisonnier" +||||||| .r11156 +#: wp-admin/edit.php:221 +msgid "You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once." +msgstr "Vous pouvez Ã©galement rÃ©aliser les mÃªmes sortes d’actions, comme rÃ©duire la liste par le biais des filtres, en passant par les liens qui apparaissent quand la souris passe au-dessus d’une ligne, ou en utilisant le menu « Actions groupÃ©es » pour modifier les mÃ©tadonnÃ©es de plusieurs pages d’un seul coup." +======= #: wp-admin/link-manager.php:81 msgid "%s link deleted." msgid_plural "%s links deleted" msgstr[0] "%s lien supprimÃ©" msgstr[1] "%s liens supprimÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:133 +msgid "Find Themes" +msgstr "Trouver des thÃ¨mes" +||||||| .r11156 +#: wp-admin/upload.php:214 +msgid "If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file." +msgstr "Si un fichier mÃ©dia n’est liÃ© Ã aucun article, cela vous sera indiquÃ© dans la colonne « AttachÃ© Ã », et vous pourrez cliquer sur le lien « Joindre » pour afficher une petite fenÃªtre vous permettant de trouver un article auquel attacher le fichier." +======= #: wp-admin/link-manager.php:60 msgid "Documentation on Managing Links" msgstr "Documentation sur la gestion des liens (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:143 +msgid "If you have a theme in a .zip format, you may install it by uploading it here." +msgstr "Si vous avez un thÃ¨me au format .zip, vous pouvez l’installer en le mettant en ligne ici." +||||||| .r11156 +#: wp-admin/upload.php:200 +msgid "All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen." +msgstr "Tous les fichiers que vous avez mis en ligne sont listÃ©s dans la BibliothÃ¨que de MÃ©dias, les plus rÃ©cents en premier. Vous pouvez utiliser l’onglet « Options de l’Ã©cran » pour personnaliser l’affichage de cet Ã©cran." +======= #: wp-admin/link-manager.php:55 msgid "If you delete a link, it will be removed permanently, as Links do not have a Trash function yet." msgstr "Si vous supprimez un lien, il sera supprimÃ© dÃ©finitivement, car les liens n’ont pas accÃ¨s Ã la Corbeille pour le moment." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:536 wp-admin/theme-install.php:251 +#: wp-admin/themes.php:379 +msgid "Version: %s" +msgstr "Version : %s" +||||||| .r11156 +#: wp-admin/edit.php:214 +msgid "Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages." +msgstr "Les pages sont comme des articles, en cela qu’elles ont un titre, un contenu et des mÃ©tadonnÃ©es associÃ©es ; mais elles diffÃ¨rent en cela qu’elles ne font pas partie du flux chronologique du blog - un peu comme des articles permanents. Les pages ne sont pas catÃ©gorisÃ©es et ne reÃ§oivent pas de mots-clÃ©s, mais peuvent disposer d’une hiÃ©rarchie. En effet, vous pouvez imbriquer des pages sous d’autres pages, faisant de ces derniÃ¨res les « parentes » des premiÃ¨res, crÃ©ant ainsi un groupement de pages." +======= #: wp-admin/link-manager.php:53 msgid "Deleting Links" msgstr "Suppression de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:63 +msgid "Unable to locate WordPress theme directory." +msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +||||||| .r11156 +#: wp-admin/edit-comments.php:128 +msgid "Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more." +msgstr "De nombreux utilisateurs utilisent les raccourcis clavier pour modÃ©rer leurs commentaires plus rapidement. Suivez le lien sur le cÃ´tÃ© pour en savoir plus." +======= #: wp-admin/link-manager.php:49 msgid "You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table." msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran en utilisant les rÃ©glages d’affichage et/ou le filtre dÃ©roulant prÃ©sent au-dessous du tableau de liens." +>>>>>>> .r12027 -#: wp-admin/link-manager.php:48 -msgid "Links may be separated into Link Categories; these are different than the categories used on your posts." -msgstr "Les liens peuvent Ãªtre rangÃ©s dans des catÃ©gories de liens ; ce ne sont pas les mÃªmes catÃ©gories que pour vos articles." +<<<<<<< .mine +#: wp-admin/includes/update-core.php:861 +msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." + +||||||| .r11156 +#: wp-admin/edit-comments.php:126 +msgid "In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment." +msgstr "Dans la colonne « Commentaire », vous trouverez au-dessus de chaque commentaire la date et l’heure de son envoi. En cliquant sur ce lien, vous irez Ã la page de votre site oÃ¹ le commentaire a Ã©tÃ© publiÃ©. En survolant n’importe quel commentaire, des options apparaÃ®tront, vous permettant d’approuver un commentaire, y rÃ©pondre (et l’approuver), modifier ses dÃ©tails, modifier son contenu, le marquer comme indÃ©sirable, ou le jeter Ã la Corbeille." + +======= +>>>>>>> .r12027 +#: wp-admin/includes/update-core.php:863 +msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +<<<<<<< .mine +#: wp-admin/includes/update-core.php:865 +msgid "The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +||||||| .r11156 +#: wp-admin/update-core.php:196 +msgid "Learn more about WordPress %s." +msgstr "Ã propos de WordPress %s." +======= #: wp-admin/link-manager.php:47 msgid "You can add links here to be displayed on your site, usually using Widgets. By default, links to several sites in the WordPress community are included as examples." msgstr "Vous pouvez ici ajouter les liens que vous voulez voir affichÃ©s sur votre site, gÃ©nÃ©ralement par le biais de widgets. Des liens vers de nombreux sites de la communautÃ© WordPress sont inclus par dÃ©faut." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:810 +msgid "Verifying the unpacked files…" +msgstr "VÃ©rification des fichiers dÃ©compressÃ©s…" +||||||| .r11156 +#: wp-admin/edit.php:218 +msgid "Managing Pages" +msgstr "Gestion de pages" +======= #: wp-admin/link-add.php:15 msgid "Add New Link" msgstr "Ajouter un lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:823 +msgid "The update could not be unpacked" +msgstr "La mise Ã jour ne peut pas Ãªtre dÃ©compressÃ©e" +||||||| .r11156 +#: wp-admin/users.php:35 +msgid "You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab." +msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran »." +======= #: wp-admin/link-add.php:13 msgid "You do not have sufficient permissions to add links to this site." msgstr "Vous n’avez pas les droits suffisants pour ajouter les liens Ã ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:1078 +msgid "Upgrading database…" +msgstr "Mise Ã jour de la base de donnÃ©es…" +||||||| .r11156 +#: wp-admin/edit.php:192 +msgid "Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post’s status." +msgstr "AperÃ§u vous donnera une idÃ©e de ce Ã quoi votre brouillon ressemble si vous le publiez tel quel. Afficher vous enverra sur votre site, Ã l’adresse de l’article. L’action disponible dÃ©pend de l’Ã©tat de votre article." +======= #: wp-admin/install.php:276 msgid "WordPress has been installed. Were you expecting more steps? Sorry to disappoint." msgstr "WordPress est installÃ©. Vous attendiez-vous Ã d’autres Ã©tapes ? DÃ©solÃ© de vous dÃ©cevoir ;-)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:203 +msgid "You are using a development version (%1$s). Cool! Please stay updated." +msgstr "Vous utilisez une version de dÃ©veloppement (%1$s). C’est super ! Veillez Ã rester Ã jour." +||||||| .r11156 +#: wp-admin/users.php:41 +msgid "Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:" +msgstr "Passer la souris au-dessus d’une ligne de la liste des utilisateurs, fera s’afficher des liens vous permettant de gÃ©rer l’utilisateur. Vous pouvez lancer les actions suivantes :" +======= #: wp-admin/install.php:274 msgid "Success!" msgstr "Quel succÃ¨s !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:206 +msgid "Get Version %2$s" +msgstr "TÃ©lÃ©chargez la version %2$s" +||||||| .r11156 +#: wp-admin/edit.php:191 +msgid "Trash removes your post from this list and places it in the trash, from which you can permanently delete it." +msgstr "Mettre Ã la Corbeille retire l’article de la liste et le dÃ©placer dans la Corbeille, d’oÃ¹ vous pourrez le supprimer dÃ©finitivement." +======= #: wp-admin/install.php:265 msgid "Sorry, that isn’t a valid email address. Email addresses look like username@example.com." msgstr "DÃ©solÃ©, ce n’est pas une adresse de messagerie valide. Les adresses de messagerie ressemblent Ã cela : utilisateur@exemple.com." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:254 +msgid "Update to %s" +msgstr "Mettre Ã jour vers la version %s" +||||||| .r11156 +#: wp-admin/edit.php:190 +msgid "Quick Edit provides inline access to the metadata of your post, allowing you to update post details without leaving this screen." +msgstr "Modification Rapide vous donne un accÃ¨s rapide aux mÃ©tadonnÃ©es de votre article, vous permettant de mettre Ã jour certains dÃ©tails sans devoir quitter la liste." +======= #: wp-admin/install.php:261 msgid "You must provide an email address." msgstr "Vous devez saisir une adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:254 +msgid "Latest" +msgstr "DerniÃ¨re version" +||||||| .r11156 +#: wp-admin/edit.php:189 +msgid "Edit takes you to the editing screen for that post. You can also reach that screen by clicking on the post title." +msgstr "Modifier vous envoie sur l’Ã©cran de modification de cet article. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le titre de l’article." +======= #: wp-admin/install.php:257 msgid "Your passwords do not match. Please try again." msgstr "Vos mots de passe ne correspondent pas. Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:487 +msgid "An automated WordPress update has failed to complete - please attempt the update again now." +msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ; vous pouvez tenter de la relancer." +||||||| .r11156 +#: wp-admin/users.php:43 +msgid "Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username." +msgstr "« Modifier » vous envoie sur l’Ã©cran de modification de cet utilisateur. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le nom de l’utilisateur ;" +======= #: wp-admin/install.php:253 msgid "The username you provided has invalid characters." msgstr "L’identifiant que vous avez fourni contient des caractÃ¨res invalides." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Default category slug +#: wp-admin/includes/upgrade.php:133 +msgctxt "Default category slug" +msgid "Uncategorized" +msgstr "non-classe" +||||||| .r11156 +#: wp-admin/users.php:37 +msgid "You can view all posts made by a user by clicking on the number under the Posts column." +msgstr "Vous pouvez afficher tous les articles faits par un mÃªme utilisateur en cliquant sur le nombre sous la colonne « Articles »." +======= #: wp-admin/install.php:250 msgid "Please provide a valid username." msgstr "Veuillez saisir un identifiant valide." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Default post slug +#: wp-admin/includes/upgrade.php:175 +msgctxt "Default post slug" +msgid "hello-world" +msgstr "bonjour-tout-le-monde" +||||||| .r11156 +#: wp-admin/user-new.php:154 +msgid "Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users." +msgstr "Parce qu’il s’agit d’une installation multisite, vous pouvez ajouter des comptes qui existent dÃ©jÃ sur le RÃ©seau, en indiquant un nom d’utilisateur ou une adresse de messagerie, et en assignant un rÃ´le. Pour avoir plus d’options, telle que le choix du mot de passe, vous devez Ãªtre Administrateur du RÃ©seau, et utiliser les liens qui apparaissent au survol sous le nom de l’utilisateur pour modifier son profil utilisateur, depuis l’Ã©cran « Tous les utilisateurs »." +======= #: wp-admin/install.php:221 msgid "Please provide the following information. Don’t worry, you can always change these settings later." msgstr "Veuillez renseigner les informations suivantes. Ne vous inquiÃ©tez pas, vous pourrez les modifier plus tard." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:187 +msgid "Mr WordPress" +msgstr "Monsieur WordPress" +||||||| .r11156 +#: wp-admin/includes/template.php:2075 +msgid "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." +msgstr "Il semble y avoir une inclusion directe de wp-admin/includes/template.php afin d’utiliser add_meta_box(). Ce n’est pas comme cela qu’il faut faire. Attachez plutÃ´t le crochet add_meta_box() Ã l’action add_meta_box." +======= #: wp-admin/install.php:220 msgid "Information needed" msgstr "Informations nÃ©cessaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:125 wp-admin/includes/user.php:127 +msgid "ERROR: You entered your new password only once." +msgstr "ERREUR : vous n’avez tapÃ© votre nouveau mot de passe qu’une seule fois." +||||||| .r11156 +#: wp-admin/credits.php:83 wp-admin/freedoms.php:20 +msgid "Welcome to WordPress %s" +msgstr "Bienvenue dans WordPress %s" +======= #: wp-admin/install.php:218 msgid "Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world." msgstr "Bienvenue dans la trÃ¨s cÃ©lÃ¨bre installation en 5 minutes de WordPress ! Vous n’avez qu’Ã remplir les informations demandÃ©es ci-dessous et vous serez prÃªt Ã utiliser la plus extensible et puissante plateforme de publication de contenu au monde." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:137 +msgid "ERROR: Passwords may not contain the character \"\\\"." +msgstr "ERREUR : le mot de passe ne doit pas contenir le caractÃ¨re « \\ »." +||||||| .r11156 +#: wp-admin/about.php:160 +msgid "Go to Dashboard → Home" +msgstr "Aller sur l’accueil" +======= #: wp-admin/install.php:217 msgctxt "Howdy" msgid "Welcome" msgstr "Bienvenue" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:141 +msgid "ERROR: Please enter the same password in the two password fields." +msgstr "ERREUR : les deux mots de passe ne sont pas identiques." +||||||| .r11156 +#: wp-admin/about.php:156 +msgid "Return to Dashboard → Updates" +msgstr "Retourner aux mises Ã jour" +======= #: wp-admin/install.php:183 msgid "Your wp-config.php file has an empty database table prefix, which is not supported." msgstr "Votre fichier wp-config.php ne dÃ©fini pas prÃ©fixe de table de base de donnÃ©es. Il en faut obligatoirement un." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:72 +msgid "WordPress › Installation" +msgstr "WordPress » Installation" +||||||| .r11156 +#: wp-admin/credits.php:112 +msgid "WordPress is created by a worldwide team of passionate individuals." +msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©parties sur toute la planÃ¨te." +======= #: wp-admin/install.php:183 msgid "Configuration Error" msgstr "Erreur de configuration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:122 +msgid "User(s) already exists." +msgstr "L’utilisateur existe dÃ©jÃ ." +||||||| .r11156 +#: wp-admin/credits.php:176 +msgid "Core Developers" +msgstr "DÃ©veloppeurs principaux" +======= #: wp-admin/install.php:178 msgid "Insufficient Requirements" msgstr "Les conditions requises ne sont pas remplies" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:184 +msgid "Install WordPress" +msgstr "Installer WordPress" +||||||| .r11156 +#: wp-admin/about.php:131 +msgid "Under the Hood" +msgstr "Sous le capot" +======= #: wp-admin/install.php:174 msgid "You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:180 +msgid "Privacy" +msgstr "Vie privÃ©e" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1285 wp-admin/includes/dashboard.php:1287 +msgid "Customize Your Site" +msgstr "Personnalisez votre site" +======= #: wp-admin/install.php:172 msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:534 wp-admin/themes.php:377 +msgid "Current Theme" +msgstr "ThÃ¨me actuel" +||||||| .r11156 +#: wp-admin/user-edit.php:199 +msgid "Profile updated." +msgstr "Profil mis Ã jour." +======= #: wp-admin/install.php:170 msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:83 +msgid "User already exists. Password inherited." +msgstr "L’utilisateur existe dÃ©jÃ , et a hÃ©ritÃ© du mot de passe." +||||||| .r11156 +#: wp-admin/user-new.php:81 +msgid "" +"Hi,\n" +"\n" +"You've been invited to join '%1$s' at\n" +"%2$s with the role of %3$s.\n" +"\n" +"Please click the following link to confirm the invite:\n" +"%4$s" +msgstr "" +"Bonjour,\n" +"\n" +"Vous avez Ã©tÃ© invitÃ©(e) Ã rejoindre Â« %1$s Â» sur\n" +"%2$s en tant que %3$s. \n" +"Veuillez cliquer sur le lien suivant pour confirmer l'invitation :\n" +"%4$s" +======= #: wp-admin/install.php:150 msgid "Install WordPress" msgstr "Installer WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:164 +msgid "Welcome to WordPress. This is your first post. Edit or delete it, then start writing!" +msgstr "Bienvenue dans WordPress. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +||||||| .r11156 +#: wp-admin/credits.php:184 +msgid "Core Developer" +msgstr "DÃ©veloppeur cœur" +======= #: wp-admin/install.php:146 msgid "Privacy" msgstr "Vie privÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:173 +msgid "Hello world!" +msgstr "Bonjour tout le monde !" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:56 +msgid "The package could not be installed." +msgstr "L’archive n’a pas pu Ãªtre installÃ©e." +======= #: wp-admin/install.php:143 msgid "Double-check your email address before continuing." msgstr "VÃ©rifiez bien cette adresse de messagerie avant de continuer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:442 +msgid "Notice:" +msgstr "Avertissement :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:495 +msgid "The plugin contains no files." +msgstr "Cette extension ne contient aucun fichier." +======= #: wp-admin/install.php:141 msgid "Your E-mail" msgstr "Votre adresse de messagerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:80 +msgid "Your chosen password." +msgstr "Le mot de passe que vous avez choisi." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:720 +msgid "No valid plugins were found." +msgstr "Aucune extension valide trouvÃ©e." +======= #: wp-admin/install.php:130 msgid "A password will be automatically generated for you if you leave this blank." msgstr "Un mot de passe vous sera automatiquement gÃ©nÃ©rÃ© si vous laissez ce champ vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:381 +msgid "New WordPress Site" +msgstr "Nouveau site WordPress" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1099 +msgid "The theme is missing the style.css stylesheet." +msgstr "Il manque le fichier style.css Ã ce thÃ¨me." +======= #: wp-admin/install.php:129 msgid "Password, twice" msgstr "Mot de passe, deux fois" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:154 +msgid "ERROR: Please enter an e-mail address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1108 +msgid "The theme is missing the index.php file." +msgstr "Il manque le fichier index.php au thÃ¨me." +======= #: wp-admin/install.php:121 msgid "Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol." msgstr "Les identifiants ne peuvent utiliser que des caractÃ¨res alphanumÃ©riques, des espaces, des tirets bas (\"_\"), des traits d'union (\"-\"), des points et le symbole @." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:445 +msgid "Yes, take me to my profile page" +msgstr "Oui, je veux aller sur mon profil maintenant" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1104 +msgid "The style.css stylesheet doesn't contain a valid theme header." +msgstr "Le fichier style.css ne contient pas un en-tÃªte valide de thÃ¨me." +======= #: wp-admin/install.php:117 msgid "User(s) already exists." msgstr "L’utilisateur existe dÃ©jÃ ." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:446 +msgid "No thanks, do not remind me again" +msgstr "Non, ne pas me relancer Ã ce sujet" +||||||| .r11156 +#: wp-admin/includes/media.php:1017 +msgid "Attachment Post URL" +msgstr "Adresse de l’article du fichier joint" +======= #: wp-admin/install.php:70 msgid "WordPress › Installation" msgstr "WordPress » Installation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:175 +msgid "Your E-mail" +msgstr "Votre adresse de messagerie" +||||||| .r11156 +#: wp-admin/menu.php:76 +msgctxt "admin menu" +msgid "All Links" +msgstr "Tous les liens" +======= #: wp-admin/index.php:88 msgid "Documentation on Dashboard" msgstr "Documentation sur le tableau de bord (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:177 +msgid "Double-check your email address before continuing." +msgstr "VÃ©rifiez bien cette adresse de messagerie avant de continuer." +||||||| .r11156 +#: wp-admin/includes/media.php:1819 +msgid "Drop files here" +msgstr "DÃ©posez vos fichiers ici" +======= #: wp-admin/index.php:76 msgid "Welcome - Shows links for some of the most common tasks when setting up a new site." msgstr "Bienvenue - Affiche des liens pour certaines des tÃ¢ches les plus courantes lors de l’installation d’un nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:149 wp-admin/user-edit.php:186 +msgid "Important:" +msgstr "Important :" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:151 +msgid "%s plugins" +msgstr "%s extensions" +======= #: wp-admin/index.php:74 msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet." msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress, du Planet de WordPress-Francophone." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:226 +msgid "Sample Page" +msgstr "Page d’exemple" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:151 +msgid "%s plugin" +msgstr "%s extension" +======= #: wp-admin/index.php:72 msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins." msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress, du Planet de WordPress-Francophone, et les extensions populaires et rÃ©centes." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Default page slug +#: wp-admin/includes/upgrade.php:228 +msgid "sample-page" +msgstr "page-d-exemple" +||||||| .r11156 +#: wp-admin/maint/repair.php:92 +msgid "Successfully optimized the %s table." +msgstr "La table %s a bien Ã©tÃ© optimisÃ©e." +======= #: wp-admin/index.php:70 msgid "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." msgstr "Brouillon rapide - Vous permet de crÃ©er un nouvel article et de l’enregistrer en tant que brouillon. Affiche Ã©galement des liens vers les 5 derniers brouillons que vous avez crÃ©Ã©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:229 +msgid "BuddyPress" +msgstr "BuddyPress" +||||||| .r11156 +#: wp-admin/maint/repair.php:95 +msgid "Failed to optimize the %1$s table. Error: %2$s" +msgstr "Impossible d’optimiser la table %1$s. Erreur : %2$s" +======= #: wp-admin/index.php:68 msgid "Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them." msgstr "ActivitÃ© - Affiche les articles programmÃ©s, ceux rÃ©cemment publiÃ©s, et les commentaires rÃ©cents sur vos articles, que vous pouvez valider ou non." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:238 +msgid "Front Page Posting" +msgstr "Page d’accueil personnalisÃ©e" +||||||| .r11156 +#: wp-admin/maint/repair.php:70 +msgid "Successfully repaired the %s table." +msgstr "La table %s a bien Ã©tÃ© rÃ©parÃ©e." +======= #: wp-admin/index.php:67 msgid "At A Glance - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using." msgstr "D’un coup dâÅil - Affiche un rÃ©sumÃ© du contenu de votre site, et indique le thÃ¨me et la version de WordPress que vous utilisez." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:246 +msgid "Translation Ready" +msgstr "PrÃªt Ã Ãªtre traduit" +||||||| .r11156 +#: wp-admin/maint/repair.php:85 +msgid "The %s table is already optimized." +msgstr "La table %s a dÃ©jÃ Ã©tÃ© optimisÃ©e." +======= #: wp-admin/index.php:65 msgid "The boxes on your Dashboard screen are:" msgstr "Les blocs de l’Ã©cran du tableau de bord sont :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:242 +msgid "RTL Language Support" +msgstr "Support des langues RTL" +||||||| .r11156 +#: wp-admin/maint/repair.php:60 +msgid "The %s table is okay." +msgstr "La table %s est correcte." +======= #: wp-admin/index.php:57 msgid "Box Controls - Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it." msgstr "ContrÃ´les des blocs - Cliquez sur la barre de titre d’un bloc pour l’ouvrir ou le fermer. Certains blocs ajoutÃ©s par des extensions peuvent avoir un contenu configurable, et afficheront donc un lien \"Configurer\" dans la barre de titre lors du survol de la souris." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:170 wp-admin/includes/update.php:327 +#: wp-admin/includes/update.php:428 +msgid "There is a new version of %1$s available. View version %4$s details." +msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s." +||||||| .r11156 +#: wp-admin/update-core.php:270 +msgid "View version %1$s details" +msgstr "Voir les dÃ©tails de la version %1$s" +======= #: wp-admin/index.php:56 msgid "Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box." msgstr "Glisser/dÃ©poser - Pour rÃ©arranger les blocs, glissez/dÃ©posez-les en cliquant sur la barre de titre du bloc sÃ©lectionnÃ©, et relÃ¢chez-la lorsque vous apercevez un rectangle avec une bordure grise Ã l’emplacement oÃ¹ vous souhaitez placer le bloc." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:329 +msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin." +msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s. La mise Ã jour automatique n’est pas possible pour cette extension." +||||||| .r11156 +#: wp-admin/includes/import.php:194 +msgid "Tumblr" +msgstr "Tumblr" +======= #: wp-admin/index.php:55 msgid "Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show." msgstr "Options de l’Ã©cran - Utilisez l’onglet Options de l’Ã©cran pour choisir les blocs Ã afficher dans le Tableau de bord." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/index.php:50 +msgid "Navigation" +msgstr "Navigation" +||||||| .r11156 +#: wp-admin/includes/import.php:195 +msgid "Install the Tumblr importer to import posts & media from Tumblr using their API." +msgstr "Installer l’importateur Tumblr pour importer les articles et fichiers mÃ©dia depuis un Tumblr en utilisant leur API." +======= #: wp-admin/index.php:54 msgid "You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well." msgstr "Vous pouvez utiliser les contrÃ´les suivants pour organiser l’Ã©cran du tableau de bord pour afin de se plier Ã votre maniÃ¨re de l’utiliser. La plupart des Ã©crans de la console d’administration peuvent Ã©galement Ãªtre organisÃ©s de cette maniÃ¨re." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:166 +msgid "Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update." +msgstr "Mettre Ã jour ce thÃ¨me vous fera perdre toutes les modifications personnelles que vous y avez apportÃ©es. Â« Annuler Â» pour arrÃªter, Â« OK Â» pour mettre Ã jour." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1193 +msgid "Update %2$s or learn how to browse happy" +msgstr "Mettez %2$s Ã jour, ou apprenez Ã naviguer sereinement" +======= #: wp-admin/index.php:46 msgid "Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information." msgstr "Les liens contenus dans la barre d’outils placÃ©e en haut de l’Ã©cran relient votre tableau de bord Ã la partie publique de votre site, et fournissent un accÃ¨s rapide Ã votre profil et de prÃ©cieuses informations sur WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:211 +msgid "Light" +msgstr "Clair" +||||||| .r11156 +#: wp-admin/includes/media.php:2580 +msgid "Scale images to match the large size selected in %1$simage options%2$s (%3$d × %4$d)." +msgstr "Redimensionner les images pour correspondre Ã la taille large dÃ©finie dans les %1$srÃ©glages des mÃ©dias%2$s (%3$d × %4$d)." +======= #: wp-admin/index.php:45 msgid "The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom." msgstr "La navigation situÃ©e Ã gauche de l’Ã©cran fournit tous les liens pour accÃ©der Ã la console d’administration de WordPress, avec les sous-menus qui s’affichant au survol. Vous pouvez rÃ©duire ce menu Ã ses seules icÃ´nes en cliquant sur la flÃ¨che de repliement situÃ©e en bas du menu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:234 +msgid "Editor Style" +msgstr "Ãditeur de style" +||||||| .r11156 +#: wp-admin/includes/media.php:2451 +msgid "Audio, Video, or Other File" +msgstr "Audio, vidÃ©o ou un autre format" +======= #: wp-admin/index.php:32 msgid "Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner." msgstr "Bienvenu dans votre tableau de bord WordPress ! Ceci est l’Ã©cran que vous verrez lorsque vous vous connectez Ã votre site, et qui vous donne accÃ¨s Ã l’ensemble des fonctionnalitÃ©s de gestion de WordPress. Vous pouvez obtenir de l’aide dans n’importe quel Ã©cran en cliquant sur l’onglet Â« Aide Â» prÃ©sent en haut Ã droite de votre navigateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:239 +msgid "Full Width Template" +msgstr "ModÃ¨le pleine largeur" +||||||| .r11156 +#: wp-admin/includes/media.php:1975 +msgid "Insert media from another website" +msgstr "InsÃ©rer un mÃ©dia depuis un autre site" +======= #: wp-admin/includes/widgets.php:200 msgctxt "widget" msgid "Add" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:1208 wp-admin/update-core.php:460 +msgid "Welcome to WordPress %1$s. Learn more." +msgstr "Bienvenu dans WordPress %1$s. En savoir plus." +||||||| .r11156 +#: wp-admin/options.php:144 +msgid "ERROR: options page not found." +msgstr "ERREUR : La page d’options est introuvable." +======= #: wp-admin/includes/widgets.php:199 msgctxt "widget" msgid "Edit" msgstr "Modifier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:176 wp-admin/includes/update.php:432 +msgid "There is a new version of %1$s available. View version %4$s details or update now." +msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s ou mettez Ã jour automatiquement." +||||||| .r11156 +#: wp-admin/includes/file.php:1028 +msgid "ERROR: There was an error connecting to the server, Please verify the settings are correct." +msgstr "Erreur : Une erreur s’est produite lors de la connexion au serveur, vÃ©rifiez que vos paramÃ¨tres sont corrects." +======= #: wp-admin/includes/user.php:440 msgid "No thanks, do not remind me again" msgstr "Non, ne pas me relancer Ã ce sujet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:173 wp-admin/includes/update.php:430 +msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme." +msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s. Pas de possibilitÃ© de mise Ã jour automatique pour ce thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:930 +msgid "ERROR: you are replying to a comment on a draft post." +msgstr "ERREUR : vous Ãªtre en train de laisser un commentaire sur un brouillon." +======= #: wp-admin/includes/user.php:439 msgid "Yes, take me to my profile page" msgstr "Oui, je veux aller sur mon profil maintenant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:62 wp-admin/users.php:113 +msgid "You can’t give users that role." +msgstr "Vous ne pouvez pas donner ce rÃ´le aux utilisateurs." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:953 +#: wp-admin/includes/ajax-actions.php:1021 +msgid "ERROR: please type a comment." +msgstr "ERREUR : veuillez saisir un commentaire." +======= #: wp-admin/includes/user.php:437 msgid "You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?" msgstr "Votre compte utilise toujours le mot de passe gÃ©nÃ©rÃ© automatiquement. Souhaitez-vous le changer pour un mot de passe plus facile Ã mÃ©moriser ?" +>>>>>>> .r12027 #: wp-admin/includes/user.php:436 msgid "Notice:" msgstr "Avertissement :" +<<<<<<< .mine +#: wp-admin/index.php:46 +msgid "Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information." +msgstr "Les liens contenus dans la barre d’outils placÃ©e en haut de l’Ã©cran relient votre tableau de bord Ã la partie publique de votre site, et fournissent un accÃ¨s rapide Ã votre profil et de prÃ©cieuses informations sur WordPress." +||||||| .r11156 +#: wp-admin/index.php:56 +msgid "Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box." +msgstr "Glisser/dÃ©poser - Pour rÃ©arranger les blocs, glissez/dÃ©posez-les en cliquant sur la barre de titre du bloc sÃ©lectionnÃ©, et relÃ¢chez-la lorsque vous apercevez un rectangle avec une bordure grise Ã l’emplacement oÃ¹ vous souhaitez placer le bloc." +======= #: wp-admin/includes/user.php:154 msgid "ERROR: Please enter an e-mail address." msgstr "ERREUR : veuillez saisir une adresse de messagerie." +>>>>>>> .r12027 #: wp-admin/includes/user.php:141 msgid "ERROR: Please enter the same password in the two password fields." msgstr "ERREUR : les deux mots de passe ne sont pas identiques." +<<<<<<< .mine +#: wp-admin/includes/theme.php:214 wp-admin/includes/theme.php:275 +#: wp-admin/index.php:61 +msgid "Layout" +msgstr "Arrangement" +||||||| .r11156 +#: wp-admin/comment.php:50 wp-admin/custom-background.php:140 +#: wp-admin/custom-header.php:164 wp-admin/edit-comments.php:116 +#: wp-admin/edit-form-advanced.php:315 wp-admin/edit-link-form.php:56 +#: wp-admin/edit-tags.php:198 wp-admin/edit.php:167 wp-admin/edit.php:212 +#: wp-admin/export.php:48 wp-admin/import.php:21 +#: wp-admin/includes/screen.php:839 wp-admin/index.php:39 +#: wp-admin/link-manager.php:45 wp-admin/media-new.php:45 wp-admin/media.php:73 +#: wp-admin/my-sites.php:40 wp-admin/nav-menus.php:502 +#: wp-admin/nav-menus.php:537 wp-admin/options-discussion.php:19 +#: wp-admin/options-general.php:73 wp-admin/options-media.php:28 +#: wp-admin/options-permalink.php:20 wp-admin/options-reading.php:55 +#: wp-admin/options-writing.php:20 wp-admin/plugin-editor.php:128 +#: wp-admin/plugin-install.php:50 wp-admin/plugins.php:344 +#: wp-admin/revision.php:114 wp-admin/theme-editor.php:25 +#: wp-admin/theme-install.php:87 wp-admin/themes.php:49 +#: wp-admin/update-core.php:470 wp-admin/upload.php:33 wp-admin/upload.php:198 +#: wp-admin/user-edit.php:47 wp-admin/user-new.php:165 wp-admin/users.php:25 +#: wp-admin/widgets.php:50 +msgid "Overview" +msgstr "Vue d’ensemble" +======= #: wp-admin/includes/user.php:137 msgid "ERROR: Passwords may not contain the character \"\\\"." msgstr "ERREUR : le mot de passe ne doit pas contenir le caractÃ¨re « \\ »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:102 +msgid "Find a theme based on specific features." +msgstr "Trouver un thÃ¨me selon des critÃ¨res prÃ©cis." +||||||| .r11156 +#: wp-admin/menu.php:43 +msgid "Updates %s" +msgstr "Mises Ã jour %s" +======= #: wp-admin/includes/user.php:132 msgid "ERROR: Please enter your password twice." msgstr "ERREUR : veuillez renseigner deux fois le mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:204 +msgid "Theme Install" +msgstr "Installation du thÃ¨me" +||||||| .r11156 +#: wp-admin/edit-comments.php:155 wp-admin/edit-tags.php:300 +#: wp-admin/edit.php:279 wp-admin/link-manager.php:74 wp-admin/plugins.php:419 +#: wp-admin/upload.php:234 wp-admin/users.php:441 +msgid "Search results for “%s”" +msgstr "RÃ©sultats de recherche pour « %s »" +======= #: wp-admin/includes/user.php:130 msgid "ERROR: Please enter your password." msgstr "ERREUR : veuillez renseigner votre mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:71 +msgid "Could not fully remove the theme %s." +msgstr "Impossible de supprimer complÃ¨tement le thÃ¨me %s." +||||||| .r11156 +#: wp-admin/includes/user.php:62 wp-admin/users.php:113 +msgid "You can’t give users that role." +msgstr "Vous ne pouvez pas donner ce rÃ´le aux utilisateurs." +======= #: wp-admin/includes/user.php:125 wp-admin/includes/user.php:127 msgid "ERROR: You entered your new password only once." msgstr "ERREUR : vous n’avez tapÃ© votre nouveau mot de passe qu’une seule fois." @@ -3657,11 +12980,34 @@ msgstr "ERREUR : vous n’avez tapÃ© votre nouveau mot #: wp-admin/includes/user.php:62 wp-admin/users.php:113 msgid "You can’t give users that role." msgstr "Vous ne pouvez pas donner ce rÃ´le aux utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:77 +msgid "Search by author" +msgstr "Recherche par auteur" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:223 +#: wp-admin/includes/class-wp-plugins-list-table.php:274 +msgid "Update Available (%s)" +msgid_plural "Update Available (%s)" +msgstr[0] "PrÃªte Ã mettre Ã jour (%s)" +msgstr[1] "PrÃªtes Ã mettre Ã jour (%s)" +======= #: wp-admin/includes/upgrade.php:376 msgid "New WordPress Site" msgstr "Nouveau site WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:228 +msgid "Blavatar" +msgstr "Blavatar" +||||||| .r11156 +#: wp-admin/plugins.php:308 +msgid "Click to view entire list of files which will be deleted" +msgstr "Cliquez pour voir la liste des fichiers qui seront supprimÃ©s" +======= #: wp-admin/includes/upgrade.php:360 msgid "" "Your new WordPress site has been successfully set up at:\n" @@ -3693,16 +13039,48 @@ msgstr "" "\n" "--L'Ã©quipe WordPress\n" "https://wordpress.org/\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:237 +msgid "Flexible Header" +msgstr "En-tÃªte flexible" +||||||| .r11156 +#: wp-admin/plugins.php:283 +msgid "%1$s by %2$s" +msgstr "%1$s par %2$s" +======= #. translators: Default page slug #: wp-admin/includes/upgrade.php:223 msgid "sample-page" msgstr "page-d-exemple" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:1207 wp-admin/update-core.php:459 +msgid "Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here." +msgstr "Bienvenue dans WordPress %1$s. Vous allez Ãªtre redirigÃ© vers l’Ã©cran « Ã propos » de WordPress. Si ce n’est pas le cas, cliquez ici." +||||||| .r11156 +#: wp-admin/comment.php:157 wp-admin/plugins.php:270 +#: wp-admin/theme-editor.php:215 +msgid "Caution:" +msgstr "Attention :" +======= #: wp-admin/includes/upgrade.php:221 msgid "Sample Page" msgstr "Page d’exemple" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:489 +msgid "An automated WordPress update has failed to complete! Please notify the site administrator." +msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ! Veuillez en notifier l’administrateur du site." +||||||| .r11156 +#: wp-admin/menu.php:207 wp-admin/menu.php:209 wp-admin/user-new.php:144 +#: wp-admin/user-new.php:335 +msgid "Add New User" +msgstr "Ajouter un utilisateur" +======= #: wp-admin/includes/upgrade.php:203 msgid "" "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:\n" @@ -3724,7 +13102,22 @@ msgstr "" "

La sociÃ©tÃ© 123 Machin Truc a Ã©tÃ© crÃ©Ã©e en 1971, et n'a cessÃ© de proposer au public des machins-trucs de qualitÃ© depuis cette annÃ©e. SituÃ©e Ã Saint-Remy-en-Bouzemont-Saint-Genest-et-Isson, 123 Machin Truc emploie 2 000 personnes, et fabrique toutes sortes de bidules super pour la communautÃ© bouzemontoise.

\n" "\n" "Etant donnÃ© que vous Ãªtes un nouvel utilisateur de WordPress, vous devriez vous rendre sur votre tableau de bord pour effacer la prÃ©sente page, et crÃ©er de nouvelles pages avec votre propre contenu. Amusez-vous bien !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:189 +msgid "" +"Hi, this is a comment.\n" +"To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them." +msgstr "" +"Bonjour, ceci est un commentaire.\n" +"Pour supprimer un commentaire, connectez-vous et affichez les commentaires de cet article. Vous pourrez alors les modifier ou les supprimer." +||||||| .r11156 +#: wp-admin/users.php:20 +msgctxt "users per page (screen options)" +msgid "Users" +msgstr "Utilisateurs" +======= #: wp-admin/includes/upgrade.php:185 msgid "" "Hi, this is a comment.\n" @@ -3732,176 +13125,688 @@ msgid "" msgstr "" "Bonjour, ceci est un commentaire.\n" "Pour supprimer un commentaire, connectez-vous et affichez les commentaires de cet article. Vous pourrez alors les modifier ou les supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:130 +msgid "ERROR: Please enter your password." +msgstr "ERREUR : veuillez renseigner votre mot de passe." +||||||| .r11156 +#: wp-admin/options-discussion.php:12 wp-admin/options-general.php:13 +#: wp-admin/options-media.php:13 wp-admin/options-permalink.php:13 +#: wp-admin/options-reading.php:13 wp-admin/options-writing.php:13 +msgid "You do not have sufficient permissions to manage options for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les options de ce site." +======= #: wp-admin/includes/upgrade.php:183 msgid "Mr WordPress" msgstr "Monsieur WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/user.php:132 +msgid "ERROR: Please enter your password twice." +msgstr "ERREUR : veuillez renseigner deux fois le mot de passe." +||||||| .r11156 +#: wp-admin/menu.php:184 +msgctxt "plugin editor" +msgid "Editor" +msgstr "Ãditeur" +======= #. translators: Default post slug #: wp-admin/includes/upgrade.php:171 msgctxt "Default post slug" msgid "hello-world" msgstr "bonjour-tout-le-monde" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/widgets.php:219 +msgctxt "widget" +msgid "Edit" +msgstr "Modifier" +||||||| .r11156 +#: wp-admin/menu.php:179 +msgid "Installed Plugins" +msgstr "Extensions installÃ©es" +======= #: wp-admin/includes/upgrade.php:169 msgid "Hello world!" msgstr "Bonjour tout le monde !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/widgets.php:220 +msgctxt "widget" +msgid "Add" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/users.php:258 +msgid "Confirm Deletion" +msgstr "Confirmer la suppression" +======= #: wp-admin/includes/upgrade.php:160 msgid "Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!" msgstr "Bienvenue dans WordPress. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:76 +msgid "Welcome - Shows links for some of the most common tasks when setting up a new site." +msgstr "Bienvenue - Affiche des liens pour certaines des tÃ¢ches les plus courantes lors de l’installation d’un nouveau site." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:286 +#: wp-admin/includes/class-wp-plugins-list-table.php:299 +#: wp-admin/includes/class-wp-plugins-list-table.php:408 +msgid "Deactivate" +msgstr "DÃ©sactiver" +======= #. translators: Default category slug #: wp-admin/includes/upgrade.php:129 msgctxt "Default category slug" msgid "Uncategorized" msgstr "non-classe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:235 +msgid "Featured Image Header" +msgstr "Image d’en-tÃªte Ã la Une" +||||||| .r11156 +#: wp-admin/about.php:32 wp-admin/credits.php:87 wp-admin/freedoms.php:24 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:385 +#: wp-admin/includes/class-wp-plugins-list-table.php:514 +#: wp-admin/includes/update.php:164 wp-admin/includes/update.php:188 +msgid "Version %s" +msgstr "Version %s" +======= #: wp-admin/includes/upgrade.php:95 msgid "The password you chose during the install." msgstr "Le mot de passe que vous avez choisi pendant l'installation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:236 +msgid "Featured Images" +msgstr "Images Ã la Une" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:387 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:380 +#: wp-admin/includes/class-wp-plugins-list-table.php:519 +#: wp-admin/includes/class-wp-theme-install-list-table.php:272 +#: wp-admin/includes/class-wp-theme-install-list-table.php:374 +#: wp-admin/includes/class-wp-themes-list-table.php:194 +#: wp-admin/theme-install.php:215 wp-admin/theme-install.php:243 +#: wp-admin/themes.php:204 wp-admin/themes.php:285 wp-admin/themes.php:334 +msgid "By %s" +msgstr "Par %s" +======= #: wp-admin/includes/upgrade.php:83 msgid "User already exists. Password inherited." msgstr "L’utilisateur existe dÃ©jÃ , et a hÃ©ritÃ© du mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:32 +msgid "Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner." +msgstr "Bienvenu dans votre tableau de bord WordPress ! Ceci est l’Ã©cran que vous verrez lorsque vous vous connectez Ã votre site, et qui vous donne accÃ¨s Ã l’ensemble des fonctionnalitÃ©s de gestion de WordPress. Vous pouvez obtenir de l’aide dans n’importe quel Ã©cran en cliquant sur l’onglet Â« Aide Â» prÃ©sent en haut Ã droite de votre navigateur." +||||||| .r11156 +#: wp-admin/user-new.php:231 +msgid "User added." +msgstr "Utilisateur ajoutÃ©." +======= #: wp-admin/includes/upgrade.php:80 msgid "Your chosen password." msgstr "Le mot de passe que vous avez choisi." +>>>>>>> .r12027 #: wp-admin/includes/upgrade.php:74 msgid "Note that password carefully! It is a random password that was generated just for you." msgstr "Notez bien ce mot de passe sans vous tromper ! Il a Ã©tÃ© crÃ©Ã© alÃ©atoirement et vous est unique." +<<<<<<< .mine +#: wp-admin/index.php:56 +msgid "Drag and Drop - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box." +msgstr "Glisser/dÃ©poser - Pour rÃ©arranger les blocs, glissez/dÃ©posez-les en cliquant sur la barre de titre du bloc sÃ©lectionnÃ©, et relÃ¢chez-la lorsque vous apercevez un rectangle avec une bordure grise Ã l’emplacement oÃ¹ vous souhaitez placer le bloc." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:191 +#: wp-admin/user-edit.php:337 +msgid "Super Admin" +msgstr "Super-admin" +======= #: wp-admin/includes/update.php:430 msgid "An automated WordPress update has failed to complete! Please notify the site administrator." msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ! Veuillez en notifier l’administrateur du site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:65 +msgid "The boxes on your Dashboard screen are:" +msgstr "Les blocs de l’Ã©cran du tableau de bord sont :" +||||||| .r11156 +#: wp-admin/users.php:272 wp-admin/users.php:280 wp-admin/users.php:307 +#: wp-admin/users.php:315 +msgid "You can’t remove users." +msgstr "Vous ne pouvez pas supprimer ces utilisateurs." +======= #: wp-admin/includes/update.php:428 msgid "An automated WordPress update has failed to complete - please attempt the update again now." msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ; vous pouvez tenter de la relancer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:156 wp-admin/user-new.php:421 +msgid "Repeat Password" +msgstr "RÃ©pÃ©tez le mot de passe" +||||||| .r11156 +#: wp-admin/my-sites.php:55 wp-admin/options-head.php:15 +#: wp-admin/options.php:198 +msgid "Settings saved." +msgstr "Options enregistrÃ©es." +======= #: wp-admin/includes/update.php:289 msgid "There is a new version of %1$s available. View version %4$s details or update now." msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s ou mettre Ã jour maintenant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:928 +msgid "Copying the required files…" +msgstr "Copie des fichiers requis…" +||||||| .r11156 +#: wp-admin/users.php:394 +msgid "Changed roles." +msgstr "RÃ´les modifiÃ©s." +======= #: wp-admin/includes/update.php:287 msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin." msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s. La mise Ã jour automatique n’est pas possible pour cette extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:971 +msgid "There is not enough free disk space to complete the update." +msgstr "Il n’y a pas assez d’espace sur le disque pour terminer la mise Ã jour." +||||||| .r11156 +#: wp-admin/users.php:405 +msgid "User removed from this site." +msgstr "Utilisateur supprimÃ© de ce site." +======= #: wp-admin/includes/update.php:233 msgid "WordPress %1$s running %2$s theme." msgstr "WordPress %1$s avec le thÃ¨me %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:207 +msgid "" +"This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:\n" +"\n" +"

Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)

\n" +"\n" +"...or something like this:\n" +"\n" +"

The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.

Bonjour ! Je suis un mÃ©canicien qui aspire Ã devenir un acteur, et voici mon blog. J'habite Ã Bordeaux, j'ai un super chien baptisÃ© Russell, et j'aime la vodka-ananas (ainsi que regarder la pluie tomber).

\n" +"\n" +"...ou bien quelque chose comme Ã§a :\n" +"\n" +"

La sociÃ©tÃ© 123 Machin Truc a Ã©tÃ© crÃ©Ã©e en 1971, et n'a cessÃ© de proposer au public des machins-trucs de qualitÃ© depuis lors. SituÃ©e Ã Saint-Remy-en-Bouzemont-Saint-Genest-et-Isson, 123 Machin Truc emploie 2 000 personnes, et fabrique toutes sortes de bidules super pour la communautÃ© bouzemontoise.

\n" +"\n" +"Ãtant donnÃ© que vous Ãªtes un nouvel utilisateur de WordPress, vous devriez vous rendre sur votre tableau de bord pour effacer la prÃ©sente page, et crÃ©er de nouvelles pages avec votre propre contenu. Amusez-vous bien !" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:383 wp-admin/users.php:448 +msgid "Search Users" +msgstr "Chercher un utilisateur" +======= #: wp-admin/includes/update.php:230 msgid "Latest" msgstr "DerniÃ¨re version" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:541 wp-admin/themes.php:391 +msgid "This is a child theme of %s." +msgstr "Ceci est un thÃ¨me enfant de %s." +||||||| .r11156 +#: wp-admin/user-new.php:273 +msgid "Add Existing User" +msgstr "Ajouter un utilisateur existant" +======= #: wp-admin/includes/update.php:230 msgid "Update to %s" msgstr "Mettre Ã jour vers la version %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:215 +msgid "Fixed Layout" +msgstr "Mise en page fixe" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:265 +#: wp-admin/user-edit.php:317 wp-admin/user-new.php:301 +#: wp-admin/user-new.php:410 +msgid "Role" +msgstr "RÃ´le" +======= #: wp-admin/includes/update.php:210 msgid "WordPress %1$s is available! Please notify the site administrator." msgstr "WordPress %1$s est disponible ! Veuillez en notifier l’administrateur du site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:216 +msgid "Fluid Layout" +msgstr "Mise en page fluide" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:98 +#: wp-admin/includes/class-wp-users-list-table.php:156 +msgctxt "users" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +======= #: wp-admin/includes/update.php:208 msgid "WordPress %1$s is available! Please update now." msgstr "WordPress %1$s est disponible ! Pensez Ã faire la mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:217 +msgid "Responsive Layout" +msgstr "Mise en page adaptable" +||||||| .r11156 +#: wp-admin/comment.php:57 wp-admin/custom-background.php:149 +#: wp-admin/custom-header.php:190 wp-admin/edit-comments.php:132 +#: wp-admin/edit-form-advanced.php:292 wp-admin/edit-form-advanced.php:307 +#: wp-admin/edit-form-advanced.php:324 wp-admin/edit-link-form.php:64 +#: wp-admin/edit-tags.php:228 wp-admin/edit.php:204 wp-admin/edit.php:225 +#: wp-admin/export.php:54 wp-admin/import.php:27 wp-admin/index.php:87 +#: wp-admin/link-manager.php:59 wp-admin/media-new.php:55 wp-admin/media.php:82 +#: wp-admin/my-sites.php:47 wp-admin/nav-menus.php:543 +#: wp-admin/options-discussion.php:25 wp-admin/options-general.php:78 +#: wp-admin/options-media.php:33 wp-admin/options-permalink.php:43 +#: wp-admin/options-reading.php:70 wp-admin/options-writing.php:50 +#: wp-admin/plugin-editor.php:139 wp-admin/plugin-install.php:65 +#: wp-admin/plugins.php:358 wp-admin/revision.php:118 +#: wp-admin/theme-editor.php:38 wp-admin/theme-install.php:102 +#: wp-admin/themes.php:84 wp-admin/tools.php:27 wp-admin/update-core.php:488 +#: wp-admin/upload.php:50 wp-admin/upload.php:218 wp-admin/user-edit.php:52 +#: wp-admin/user-new.php:183 wp-admin/users.php:60 wp-admin/widgets.php:72 +msgid "For more information:" +msgstr "Plus d’informations :" +======= #: wp-admin/includes/update.php:184 msgid "Get Version %2$s" msgstr "TÃ©lÃ©chargez la version %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:68 +msgid "Activity - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them." +msgstr "ActivitÃ© - Affiche les articles programmÃ©s, ceux rÃ©cemment publiÃ©s, et les commentaires rÃ©cents sur vos articles, que vous pouvez valider ou non." +||||||| .r11156 +#: wp-admin/menu.php:198 wp-admin/menu.php:200 wp-admin/user-edit.php:218 +#: wp-admin/users.php:435 +msgctxt "user" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/includes/update.php:181 msgid "You are using a development version (%1$s). Cool! Please stay updated." msgstr "Vous utilisez une version de dÃ©veloppement (%1$s). C’est super ! Veillez Ã rester Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:519 wp-admin/themes.php:362 +msgid "Show previous theme" +msgstr "Affichier le thÃ¨me prÃ©cÃ©dent" +||||||| .r11156 +#: wp-admin/menu.php:167 +msgctxt "theme editor" +msgid "Editor" +msgstr "Ãditeur" +======= #: wp-admin/includes/update-core.php:1181 wp-admin/update-core.php:434 msgid "Welcome to WordPress %1$s. Learn more." msgstr "Bienvenu dans WordPress %1$s. En savoir plus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:520 wp-admin/themes.php:363 +msgid "Show next theme" +msgstr "Afficher le thÃ¨me suivant" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:58 +#: wp-admin/includes/class-wp-links-list-table.php:155 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:142 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:299 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:259 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:304 +#: wp-admin/includes/class-wp-ms-users-list-table.php:78 +#: wp-admin/includes/class-wp-ms-users-list-table.php:199 +#: wp-admin/includes/class-wp-plugins-list-table.php:305 +#: wp-admin/includes/class-wp-plugins-list-table.php:404 +#: wp-admin/includes/class-wp-plugins-list-table.php:413 +#: wp-admin/includes/class-wp-terms-list-table.php:117 +#: wp-admin/includes/class-wp-terms-list-table.php:311 +#: wp-admin/includes/class-wp-themes-list-table.php:170 +#: wp-admin/includes/class-wp-users-list-table.php:192 +#: wp-admin/includes/class-wp-users-list-table.php:371 +#: wp-admin/includes/media.php:1427 wp-admin/includes/meta-boxes.php:803 +#: wp-admin/includes/template.php:605 wp-admin/includes/widgets.php:226 +#: wp-admin/themes.php:368 wp-admin/widgets.php:284 +msgid "Delete" +msgstr "Supprimer " +======= #: wp-admin/includes/update-core.php:1180 wp-admin/update-core.php:433 msgid "Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here." msgstr "Bienvenue dans WordPress %1$s. Vous allez Ãªtre redirigÃ© vers l’Ã©cran « Ã propos » de WordPress. Si ce n’est pas le cas, cliquez ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:55 +msgid "Screen Options - Use the Screen Options tab to choose which Dashboard boxes to show." +msgstr "Options de l’Ã©cran - Utilisez l’onglet Options de l’Ã©cran pour choisir les blocs Ã afficher dans le Tableau de bord." +||||||| .r11156 +#: wp-admin/menu.php:196 +msgid "All Users" +msgstr "Tous les utilisateurs" +======= #: wp-admin/includes/update-core.php:1058 msgid "Upgrading database…" msgstr "Mise Ã jour de la base de donnÃ©es…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:70 +msgid "Quick Draft - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." +msgstr "Brouillon rapide - Vous permet de crÃ©er un nouvel article et de l’enregistrer en tant que brouillon. Affiche Ã©galement des liens vers les 5 derniers brouillons que vous avez crÃ©Ã©s." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:193 +msgid "Attributes" +msgstr "Attributs" +======= #: wp-admin/includes/update-core.php:951 msgid "There is not enough free disk space to complete the update." msgstr "Il n’y a pas assez d’espace sur le disque pour terminer la mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:257 +msgid "WordPress %1$s running %2$s theme." +msgstr "WordPress %1$s avec le thÃ¨me %2$s." +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:370 +#: wp-admin/includes/dashboard.php:1098 wp-admin/theme-install.php:219 +#: wp-admin/theme-install.php:237 +msgid "Install" +msgstr "Installer" +======= #: wp-admin/includes/update-core.php:908 msgid "Copying the required files…" msgstr "Copie des fichiers requis…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:243 +msgid "Sticky Post" +msgstr "Article mis en avant" +||||||| .r11156 +#: wp-admin/menu.php:177 +msgid "Plugins %s" +msgstr "Extensions %s" +======= #: wp-admin/includes/update-core.php:848 msgid "Preparing to install the latest version…" msgstr "PrÃ©paration de lâinstallation de la derniÃ¨re version…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:95 +msgid "The password you chose during the install." +msgstr "Le mot de passe que vous avez choisi pendant l'installation." +||||||| .r11156 +#: wp-admin/menu.php:217 wp-admin/ms-delete-site.php:30 +msgid "Delete Site" +msgstr "Supprimer mon site" +======= #: wp-admin/includes/update-core.php:845 msgid "The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:201 +msgid "Green" +msgstr "Vert" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:302 +msgid "About Pages" +msgstr "Ã propos des pages" +======= #: wp-admin/includes/update-core.php:843 msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:202 +msgid "Orange" +msgstr "Orange" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:276 +msgid "Customizing This Display" +msgstr "Personnaliser cet Ã©cran" +======= #: wp-admin/includes/update-core.php:841 msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:203 +msgid "Pink" +msgstr "Rose" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:286 +msgid "Title and Post Editor" +msgstr "Titre et Ã©diteur d’article" +======= #: wp-admin/includes/update-core.php:810 msgid "The update could not be unpacked" msgstr "La mise Ã jour ne peut pas Ãªtre dÃ©compressÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:204 +msgid "Purple" +msgstr "Violet" +||||||| .r11156 +#: wp-admin/edit-tags.php:235 +msgid "Documentation on Tags" +msgstr "Documentation sur les mots-clÃ©s (en)" +======= #: wp-admin/includes/update-core.php:797 msgid "Verifying the unpacked files…" msgstr "VÃ©rification des fichiers dÃ©compressÃ©s…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:205 +msgid "Red" +msgstr "Rouge" +||||||| .r11156 +#: wp-admin/options-reading.php:151 +msgid "Note: Neither of these options blocks access to your site — it is up to search engines to honor your request." +msgstr "Note : Aucune de ses options ne bloque l’accÃ¨s Ã votre site — c’est au moteur de recherche de respecter votre demande." +======= #: wp-admin/includes/translation-install.php:23 msgid "Invalid translation type." msgstr "Type de traduction invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:206 +msgid "Silver" +msgstr "Argent" +||||||| .r11156 +#: wp-admin/options-permalink.php:220 +msgid "Post name" +msgstr "Nom de l’article" +======= #: wp-admin/includes/theme.php:548 wp-admin/themes.php:397 msgid "Tags:" msgstr "Ãtiquettes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:208 +msgid "White" +msgstr "Blanc" +||||||| .r11156 +#: wp-admin/options-permalink.php:209 wp-admin/options-permalink.php:213 +#: wp-admin/options-permalink.php:221 +msgctxt "sample permalink structure" +msgid "sample-post" +msgstr "exemple-article" +======= #: wp-admin/includes/theme.php:544 wp-admin/themes.php:393 msgid "This is a child theme of %s." msgstr "Ceci est un thÃ¨me enfant de %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:209 +msgid "Yellow" +msgstr "Jaune" +||||||| .r11156 +#: wp-admin/options-permalink.php:197 wp-admin/options-permalink.php:217 +msgctxt "sample permalink base" +msgid "archives" +msgstr "archives" +======= #: wp-admin/includes/theme.php:539 wp-admin/theme-install.php:253 #: wp-admin/themes.php:381 msgid "Version: %s" msgstr "Version : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:197 +msgid "Black" +msgstr "Noir" +||||||| .r11156 +#: wp-admin/import.php:104 +msgid "This importer is not installed. Please install importers from the main site." +msgstr "Cet importateur n’est pas installÃ©. Veuillez installer les importateurs depuis le site principal." +======= #: wp-admin/includes/theme.php:537 wp-admin/themes.php:379 msgid "Current Theme" msgstr "ThÃ¨me actuel" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:198 +msgid "Blue" +msgstr "Bleu" +||||||| .r11156 +#: wp-admin/options-general.php:113 wp-admin/options-general.php:132 +msgid "E-mail Address" +msgstr "Adresse de messagerie" +======= #: wp-admin/includes/theme.php:524 msgid "Close details dialog" msgstr "Fermer la fenÃªtre des dÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:199 +msgid "Brown" +msgstr "Marron" +||||||| .r11156 +#: wp-admin/options-general.php:314 +msgid "Site Language" +msgstr "Langue du site" +======= #: wp-admin/includes/theme.php:523 wp-admin/themes.php:365 msgid "Show next theme" msgstr "Afficher le thÃ¨me suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:200 +msgid "Gray" +msgstr "Gris" +||||||| .r11156 +#: wp-admin/options-discussion.php:45 +msgid "Attempt to notify any blogs linked to from the article" +msgstr "Tenter de notifier les sites liÃ©s depuis le contenu des articles" +======= #: wp-admin/includes/theme.php:522 wp-admin/themes.php:364 msgid "Show previous theme" msgstr "Affichier le thÃ¨me prÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:57 +msgid "Box Controls - Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it." +msgstr "ContrÃ´les des blocs - Cliquez sur la barre de titre d’un bloc pour l’ouvrir ou le fermer. Certains blocs ajoutÃ©s par des extensions peuvent avoir un contenu configurable, et afficheront donc un lien \"Configurer\" dans la barre de titre lors du survol de la souris." +||||||| .r11156 +#: wp-admin/user-new.php:24 +msgid "" +"Hi,\n" +"You've been invited to join '%1$s' at\n" +"%2$s with the role of %3$s.\n" +"If you do not want to join this site please ignore\n" +"this email. This invitation will expire in a few days.\n" +"\n" +"Please click the following link to activate your user account:\n" +"%%s" +msgstr "" +"Bonjour,\n" +"Vous avez Ã©tÃ© invitÃ©(e) Ã rejoindre Â« %1$s Â» sur\n" +"%2$s en tant que %3$s. \n" +"Si vous ne souhaitez pas rejoindre ce site, veuillez ignorer\n" +"ce message. L'invitation expirera dans quelques jours.\n" +"\n" +"Veuillez cliquer sur le lien suivant pour activer votre compte utilisateur :\n" +"%%s" +======= #: wp-admin/includes/theme.php:248 msgid "Seasonal" msgstr "Saisonnier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:67 +msgid "At A Glance - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using." +msgstr "D’un coup dâÅil - Affiche un rÃ©sumÃ© du contenu de votre site, et indique le thÃ¨me et la version de WordPress que vous utilisez." +||||||| .r11156 +#: wp-admin/includes/theme.php:220 +msgid "Full Width Template" +msgstr "ModÃ¨le pleine largeur" +======= #: wp-admin/includes/theme.php:247 msgid "Photoblogging" msgstr "Photoblogging" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:159 +msgid "Welcome to SITE_NAME. This is your first post. Edit or delete it, then start writing!" +msgstr "Bienvenue sur SITE_NAME. C'est votre premier article. Modifiez-le ou supprimez-le, puis commencez Ã Ã©crire !" +||||||| .r11156 +#: wp-admin/includes/theme.php:222 +msgid "Post Formats" +msgstr "Format d’article" +======= #: wp-admin/includes/theme.php:246 msgid "Holiday" msgstr "Vacances" @@ -3933,7 +13838,18 @@ msgstr "Support des langues RTL" #: wp-admin/includes/theme.php:237 msgid "Post Formats" msgstr "Format d’article" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/install.php:169 wp-admin/user-edit.php:497 +#: wp-admin/user-new.php:431 +msgid "Confirm use of weak password" +msgstr "Confirmer l’utilisation d’un mot de passe faible" +||||||| .r11156 +#: wp-admin/includes/theme.php:217 +msgid "Featured Images" +msgstr "Images Ã la Une" +======= #: wp-admin/includes/theme.php:236 msgid "Microformats" msgstr "Microformats" @@ -3953,537 +13869,1884 @@ msgstr "En-tÃªte flexible" #: wp-admin/includes/theme.php:232 msgid "Featured Images" msgstr "Images Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:545 wp-admin/themes.php:395 +msgid "Tags:" +msgstr "Ãtiquettes :" +||||||| .r11156 +#: wp-admin/includes/theme.php:216 +msgid "Featured Image Header" +msgstr "Image d’en-tÃªte Ã la Une" +======= #: wp-admin/includes/theme.php:231 msgid "Featured Image Header" msgstr "Image d’en-tÃªte Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:80 +msgid "Search by tag" +msgstr "Recherche par Ã©tiquette" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1176 +msgid "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." +msgstr "Il semble que vous utilisez une vieille version de %s. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +======= #: wp-admin/includes/theme.php:230 msgid "Editor Style" msgstr "Ãditeur de style" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update-core.php:868 +msgid "Preparing to install the latest version…" +msgstr "PrÃ©paration de lâinstallation de la derniÃ¨re version…" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1174 +msgid "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." +msgstr "Il semble que vous utilisez une version peu sÃ»re de %s. Un navigateur dÃ©passÃ© met votre ordinateur en danger. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +======= #: wp-admin/includes/theme.php:227 msgid "Custom Colors" msgstr "Couleurs personnalisÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:521 wp-admin/themes.php:364 +msgid "Close details dialog" +msgstr "Fermer la fenÃªtre des dÃ©tails" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1196 +msgid "There are some invalid menu items. Please check or delete them." +msgstr "Certains Ã©lÃ©ments du menu ne sont pas valides. Veuillez les vÃ©rifier ou les effacer." +======= #: wp-admin/includes/theme.php:225 msgid "BuddyPress" msgstr "BuddyPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:331 +msgid "There is a new version of %1$s available. View version %4$s details or update now." +msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s ou mettre Ã jour maintenant." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:85 +msgid "%s (Invalid)" +msgstr "%s (non valide)" +======= #: wp-admin/includes/theme.php:224 msgid "Blavatar" msgstr "Blavatar" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:88 +msgid "Documentation on Dashboard" +msgstr "Documentation sur le tableau de bord (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-terms-list-table.php:132 +#: wp-admin/includes/class-wp-terms-list-table.php:426 +msgctxt "term name" +msgid "Name" +msgstr "Nom" +======= #: wp-admin/includes/theme.php:223 msgid "Accessibility Ready" msgstr "OptimisÃ© pour l’accessibilitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:210 +msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +||||||| .r11156 +#: wp-admin/includes/template.php:530 wp-admin/includes/template.php:545 +#: wp-admin/includes/template.php:654 +msgctxt "meta name" +msgid "Name" +msgstr "Nom" +======= #: wp-admin/includes/theme.php:222 wp-admin/includes/theme.php:272 msgid "Features" msgstr "FonctionnalitÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:234 +msgid "WordPress %1$s is available! Please update now." +msgstr "WordPress %1$s est disponible ! Pensez Ã faire la mise Ã jour." +||||||| .r11156 +#: wp-admin/user-new.php:36 +msgid "[%s] Your site invite" +msgstr "[%s] Votre invitation sur le site" +======= #: wp-admin/includes/theme.php:219 msgid "Right Sidebar" msgstr "Colonne latÃ©rale droite" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/update.php:236 +msgid "WordPress %1$s is available! Please notify the site administrator." +msgstr "WordPress %1$s est disponible ! Veuillez en notifier l’administrateur du site." +||||||| .r11156 +#: wp-admin/themes.php:251 +msgctxt "theme name" +msgid "Name" +msgstr "Nom" +======= #: wp-admin/includes/theme.php:218 msgid "Left Sidebar" msgstr "Colonne latÃ©rale gauche" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:212 +msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +||||||| .r11156 +#: wp-admin/edit-link-form.php:94 +#: wp-admin/includes/class-wp-links-list-table.php:91 +msgctxt "link name" +msgid "Name" +msgstr "Nom" +======= #: wp-admin/includes/theme.php:217 msgid "Four Columns" msgstr "Quatre colonnes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme.php:227 +msgid "Accessibility Ready" +msgstr "OptimisÃ© pour l’accessibilitÃ©" +||||||| .r11156 +#: wp-admin/credits.php:192 +msgid "Icon Design" +msgstr "Conception des icÃ´nes" +======= #: wp-admin/includes/theme.php:216 msgid "Three Columns" msgstr "Trois colonnes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/translation-install.php:23 +msgid "Invalid translation type." +msgstr "Type de traduction invalide." +||||||| .r11156 +#: wp-admin/theme-install.php:81 +msgid "You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses." +msgstr "Vous pouvez trouver plus de thÃ¨mes pour votre site en utilisant le Navigateur/Installeur de thÃ¨me sur cet Ã©cran, qui affiche les thÃ¨mes en provenance du dÃ©pÃ´t de thÃ¨mes de WordPress.org. Ces thÃ¨mes sont conÃ§us et dÃ©veloppÃ©s par des designers tiers, sont gratuits et utilisent une licence compatible avec celle de WordPress." +======= #: wp-admin/includes/theme.php:215 msgid "Two Columns" msgstr "Deux colonnes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/upgrade.php:365 +msgid "" +"Your new WordPress site has been successfully set up at:\n" +"\n" +"%1$s\n" +"\n" +"You can log in to the administrator account with the following information:\n" +"\n" +"Username: %2$s\n" +"Password: %3$s\n" +"Log in here: %4$s\n" +"\n" +"We hope you enjoy your new site. Thanks!\n" +"\n" +"--The WordPress Team\n" +"https://wordpress.org/\n" +msgstr "" +"Votre nouveau site WordPress a bien Ã©tÃ© installÃ© Ã l'adresse :\n" +"\n" +"%1$s\n" +"\n" +"Vous pouvez vous y connecter en tant qu'administrateur avec les informations suivantes :\n" +"\n" +"Identifiant : %2$s\n" +"Mot de passe : %3$s\n" +"Connectez-vous ici : %4$s\n" +"\n" +"Nous espÃ©rons que vous aimerez votre nouveau site ! Merci Ã vous !\n" +"\n" +"--L'Ã©quipe WordPress\n" +"https://wordpress.org/\n" +||||||| .r11156 +#: wp-admin/update-core.php:51 +msgid "Re-install Now" +msgstr "RÃ©-installer maintenant" +======= #: wp-admin/includes/theme.php:214 msgid "One Column" msgstr "Une colonne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:126 +msgid "Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol." +msgstr "Les identifiants ne peuvent utiliser que des caractÃ¨res alphanumÃ©riques, des espaces, des tirets bas (\"_\"), des traits d'union (\"-\"), des points et le symbole @." +||||||| .r11156 +#: wp-admin/includes/file.php:253 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive upload_max_filesize, dans php.ini." +======= #: wp-admin/includes/theme.php:213 msgid "Responsive Layout" msgstr "Mise en page adaptable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:74 +msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet." +msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress, du Planet de WordPress-Francophone." +||||||| .r11156 +#: wp-admin/includes/file.php:254 +msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." +msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive MAX_FILE_SIZE du formulaire HTML." +======= #: wp-admin/includes/theme.php:212 msgid "Fluid Layout" msgstr "Mise en page fluide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/index.php:72 +msgid "WordPress News - Latest news from the official WordPress project, the WordPress Planet, and popular and recent plugins." +msgstr "Nouvelles de WordPress - DerniÃ¨re nouvelles en provenance du projet officiel WordPress, du Planet de WordPress-Francophone, et les extensions populaires et rÃ©centes." +||||||| .r11156 +#: wp-admin/options-writing.php:122 wp-admin/tools.php:47 +msgid "If your bookmarks toolbar is hidden: copy the code below, open your Bookmarks manager, create new bookmark, type Press This into the name field and paste the code into the URL field." +msgstr "Si votre barre de favoris est cachÃ©e : copier le code ci-dessous, ouvrez votre gestionnaire de favoris, crÃ©ez-en un nouveau, saisissez « Publier un article » comme nom, et collez le code dans le champ d’adresse Web." +======= #: wp-admin/includes/theme.php:211 msgid "Fixed Layout" msgstr "Mise en page fixe" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: The non-breaking space prevents 1Password from thinking the +#. text "log in" should trigger a password save prompt. +#: wp-admin/install.php:151 +msgid "You will need this password to log in. Please store it in a secure location." +msgstr "Vous aurez besoin de ce mot de passe pour vous connecter. Pensez Ã le stocker dans un lieu sÃ»r." +||||||| .r11156 +#: wp-admin/credits.php:185 +msgid "Core Committer" +msgstr "DÃ©veloppeur principal" +======= #: wp-admin/includes/theme.php:210 wp-admin/includes/theme.php:271 #: wp-admin/index.php:61 msgid "Layout" msgstr "Arrangement" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/install.php:165 wp-admin/user-edit.php:493 +#: wp-admin/user-new.php:427 +msgid "Confirm Password" +msgstr "Confirmation du mot de passe" +||||||| .r11156 +#: wp-admin/credits.php:186 +msgid "Guest Committer" +msgstr "DÃ©veloppeur invitÃ©" +======= #: wp-admin/includes/theme.php:207 msgid "Light" msgstr "Clair" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/install.php:181 wp-admin/options-reading.php:146 +msgid "Allow search engines to index this site" +msgstr "Autoriser les moteurs de recherche Ã indexer ce site" +||||||| .r11156 +#: wp-admin/about.php:146 wp-admin/credits.php:191 +msgid "External Libraries" +msgstr "BibliothÃ¨ques tierces" +======= #: wp-admin/includes/theme.php:206 msgid "Dark" msgstr "Sombre" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/user.php:443 +msgid "You’re using the auto-generated password for your account. Would you like to change it?" +msgstr "Vous utilisez le mot de passe auto-gÃ©nÃ©rÃ© pour votre compte. Voulez-vous le changer ?" +||||||| .r11156 +#: wp-admin/press-this.php:652 +msgid "Add:" +msgstr "Ajouter :" +======= #: wp-admin/includes/theme.php:205 msgid "Yellow" msgstr "Jaune" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/taxonomy.php:116 +msgid "You did not enter a category name." +msgstr "Vous n’avez pas entrÃ© de nom de catÃ©gorie." +||||||| .r11156 +#: wp-admin/press-this.php:288 +msgid "Add Photos" +msgstr "Ajouter des images" +======= #: wp-admin/includes/theme.php:204 msgid "White" msgstr "Blanc" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1934 wp-admin/nav-menus.php:645 +#: wp-admin/options.php:276 +msgid "Save Changes" +msgstr "Enregistrer les modifications" +||||||| .r11156 +#: wp-admin/menu.php:213 +msgid "Available Tools" +msgstr "Outils disponibles" +======= #: wp-admin/includes/theme.php:203 msgid "Tan" msgstr "Ocre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:515 +msgid "Update Comment" +msgstr "Mettre Ã jour le commentaire" +||||||| .r11156 +#: wp-admin/menu.php:219 +msgid "Network Setup" +msgstr "CrÃ©ation du rÃ©seau" +======= #: wp-admin/includes/theme.php:202 msgid "Silver" msgstr "Argent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:413 wp-admin/update.php:106 +msgid "Plugin Install" +msgstr "Installation d’extensions" +||||||| .r11156 +#: wp-admin/credits.php:183 +msgid "User Experience Lead" +msgstr "En charge de l’expÃ©rience utilisateur" +======= #: wp-admin/includes/theme.php:201 msgid "Red" msgstr "Rouge" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:575 +msgid "Install Update Now" +msgstr "Installer la mise Ã jour maintenant" +||||||| .r11156 +#: wp-admin/credits.php:120 +msgctxt "Translate this to be the equivalent of English Translators in your language for the credits page Translators section" +msgid "Translators" +msgstr "Traducteurs" +======= #: wp-admin/includes/theme.php:200 msgid "Purple" msgstr "Violet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:579 +msgid "Newer Version (%s) Installed" +msgstr "Une version plus rÃ©cente (%s) est installÃ©e" +||||||| .r11156 +#: wp-admin/credits.php:107 +msgid "http://codex.wordpress.org/Contributing_to_WordPress" +msgstr "http://codex.wordpress.org/Contributing_to_WordPress" +======= #: wp-admin/includes/theme.php:199 msgid "Pink" msgstr "Rose" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:582 +msgid "Latest Version Installed" +msgstr "DerniÃ¨re version installÃ©e" +||||||| .r11156 +#: wp-admin/freedoms.php:45 +msgid "WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to check out our trademark guidelines first." +msgstr "WordPress croÃ®t Ã chaque fois que vous en parlez Ã vos amis, et cela est Ã©galement vrai pour les milliers de sociÃ©tÃ©s et services dans le monde construits Ã l’aide de ou autour de WordPress. Nous sommes flattÃ©s chaque fois que quelqu’un vante les mÃ©rites de cet outil ; veillez cependant Ã respecter les conseils d’utilisation de notre marque dÃ©posÃ©e." +======= #: wp-admin/includes/theme.php:198 msgid "Orange" msgstr "Orange" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:468 +msgid "Author:" +msgstr "Auteur :" +||||||| .r11156 +#: wp-admin/freedoms.php:52 +msgid "Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them." +msgstr "Tous les thÃ¨mes et extensions disponibles sur le rÃ©pertoire de WordPress.org respectent Ã 100%% la licence GPL, ou une licence libre et compatible. Ainsi, vous pouvez en toute sÃ»retÃ© y chercher des extensions et des thÃ¨mes. Si vous tÃ©lÃ©chargez une extension ou un thÃ¨me en provenance d’une autre source, vÃ©rifiez bien qu’il respecte la licence GPL. Si ce n’est pas le cas, l’Ã©quipe de WordPress ne vous le recommande alors pas." +======= #: wp-admin/includes/theme.php:197 msgid "Green" msgstr "Vert" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:474 +msgid "Requires WordPress Version:" +msgstr "NÃ©cessite WordPress en version :" +||||||| .r11156 +#: wp-admin/freedoms.php:36 +msgid "WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its license, the GPL." +msgstr "WordPress est un logiciel libre et au code ouvert (open-source), conÃ§u par une communautÃ© de dÃ©veloppeurs majoritairement volontaires, partout dans le monde. WordPress est livrÃ© avec des libertÃ©s formidables et qui changent la vision du monde, grÃ¢ce Ã sa licence, la GPL." +======= #: wp-admin/includes/theme.php:196 msgid "Gray" msgstr "Gris" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:474 +msgid "%s or higher" +msgstr "%s ou plus" +||||||| .r11156 +#: wp-admin/credits.php:181 +msgid "Lead Developer" +msgstr "DÃ©veloppeur principal" +======= #: wp-admin/includes/theme.php:195 msgid "Brown" msgstr "Marron" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:476 +msgid "Compatible up to:" +msgstr "Compatible jusqu’Ã la version : " +||||||| .r11156 +#: wp-admin/credits.php:187 +msgid "Developer" +msgstr "DÃ©veloppeur" +======= #: wp-admin/includes/theme.php:194 msgid "Blue" msgstr "Bleu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:486 +msgid "WordPress.org Plugin Page »" +msgstr "Page WordPress.org de l’extension »" +||||||| .r11156 +#: wp-admin/credits.php:175 +msgid "Extended Core Team" +msgstr "Ãquipe principale Ã©tendue" +======= #: wp-admin/includes/theme.php:193 msgid "Black" msgstr "Noir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:494 +msgid "Average Rating" +msgstr "Moyenne des notes" +||||||| .r11156 +#: wp-admin/credits.php:162 +msgid "Want to see your name in lights on this page? Get involved in WordPress." +msgstr "Vous voulez faire partie des noms listÃ©s sur cette page ? Participez au dÃ©veloppement de WordPress !" +======= #: wp-admin/includes/theme.php:172 wp-admin/includes/update.php:378 msgid "There is a new version of %1$s available. View version %4$s details or update now." msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s ou mettez Ã jour automatiquement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:544 +msgid "Warning: This plugin has not been tested with your current version of WordPress." +msgstr "Attention : cette extension n’a pas Ã©tÃ© testÃ©e avec votre version de WordPress." +||||||| .r11156 +#: wp-admin/about.php:38 wp-admin/credits.php:12 wp-admin/credits.php:93 +#: wp-admin/freedoms.php:30 +msgid "Credits" +msgstr "CrÃ©dits" +======= #: wp-admin/includes/theme.php:169 wp-admin/includes/update.php:376 msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme." msgstr "Une nouvelle version de %1$s est disponible. Afficher les dÃ©tails de la version %4$s. Pas de possibilitÃ© de mise Ã jour automatique pour ce thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:546 +msgid "Warning: This plugin has not been marked as compatible with your version of WordPress." +msgstr "Attention : cette extension n’a pas Ã©tÃ© marquÃ©e comme Ã©tant compatible avec votre version de WordPress" +||||||| .r11156 +#: wp-admin/widgets.php:335 +msgctxt "removing-widget" +msgid "Deactivate" +msgstr "DÃ©sactiver" +======= #: wp-admin/includes/theme.php:166 wp-admin/includes/update.php:285 #: wp-admin/includes/update.php:374 msgid "There is a new version of %1$s available. View version %4$s details." msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:411 +msgid "Advanced caching plugin." +msgstr "Extension de cache avancÃ©e." +||||||| .r11156 +#: wp-admin/credits.php:180 +msgid "Cofounder, Project Lead" +msgstr "Cofondateur, chef de projet" +======= #: wp-admin/includes/theme.php:162 msgid "Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update." msgstr "Mettre Ã jour ce thÃ¨me vous fera perdre toutes les modifications personnelles que vous y avez apportÃ©es. Â« Annuler Â» pour arrÃªter, Â« OK Â» pour mettre Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:415 +msgid "Custom maintenance message." +msgstr "Message personnalisÃ© pour la maintenance." +||||||| .r11156 +#: wp-admin/credits.php:190 +msgid "Internationalization" +msgstr "Internationalisation" +======= #: wp-admin/includes/theme.php:69 msgid "Could not fully remove the theme %s." msgstr "Impossible de supprimer complÃ¨tement le thÃ¨me %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:607 +msgid "The plugin generated unexpected output." +msgstr "Cette extension a produit un rÃ©sultat inattendu." +||||||| .r11156 +#: wp-admin/credits.php:178 +msgid "Core Contributors to WordPress %s" +msgstr "Contributeurs au code de WordPress %s" +======= #: wp-admin/includes/theme.php:61 msgid "Unable to locate WordPress theme directory." msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:744 +msgid "One of the plugins is invalid." +msgstr "L’une des extensions n’est pas valide." +||||||| .r11156 +#: wp-admin/credits.php:177 +msgid "Recent Rockstars" +msgstr "Ãtoiles montantes" +======= #: wp-admin/includes/theme-install.php:197 msgid "Theme Install" msgstr "Installation du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:915 +msgid "Invalid plugin path." +msgstr "Chemin d’extension non valide" +||||||| .r11156 +#: wp-admin/menu.php:99 +msgid "All Comments" +msgstr "Tous les commentaires" +======= #: wp-admin/includes/theme-install.php:139 msgid "If you have a theme in a .zip format, you may install it by uploading it here." msgstr "Si vous avez un thÃ¨me au format .zip, vous pouvez l’installer en le mettant en ligne ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:917 +msgid "Plugin file does not exist." +msgstr "Le fichier de l’extension n’existe pas." +||||||| .r11156 +#: wp-admin/credits.php:104 +msgid "WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress." +msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©partie sur toute la planÃ¨te. Participez au dÃ©veloppement de WordPress !" +======= #: wp-admin/includes/theme-install.php:131 msgid "Find Themes" msgstr "Trouver des thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:921 +msgid "The plugin does not have a valid header." +msgstr "Cette extension ne dispose pas d’un en-tÃªte valide." +||||||| .r11156 +#: wp-admin/credits.php:174 +msgid "Project Leaders" +msgstr "Chefs de projet" +======= #: wp-admin/includes/theme-install.php:100 msgid "Find a theme based on specific features." msgstr "Trouver un thÃ¨me selon des critÃ¨res prÃ©cis." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:33 wp-admin/includes/post.php:71 +msgid "You are not allowed to edit pages as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +||||||| .r11156 +#: wp-admin/credits.php:188 +msgid "Designer" +msgstr "Concepteur graphique" +======= #: wp-admin/includes/theme-install.php:99 wp-admin/theme-install.php:140 msgid "Feature Filter" msgstr "Filtre de fonctionnalitÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:35 wp-admin/includes/post.php:73 +msgid "You are not allowed to edit posts as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +||||||| .r11156 +#: wp-admin/freedoms.php:39 +msgid "You have the freedom to run the program, for any purpose." +msgstr "Vous Ãªtes libre de modifier ce programme, dans n’importe quel but." +======= #: wp-admin/includes/theme-install.php:78 msgid "Search by tag" msgstr "Recherche par Ã©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:424 +msgid "You are not allowed to edit pages." +msgstr "Vous n’avez pas l’autorisation de modifier les pages." +||||||| .r11156 +#: wp-admin/freedoms.php:40 +msgid "You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish." +msgstr "Vous avez accÃ¨s au code source, Ãªtes libres d’Ã©tudier la maniÃ¨re dont le programme fonctionne, et libres de le modifier pour en faire ce que vous souhaitez." +======= #: wp-admin/includes/theme-install.php:75 msgid "Search by author" msgstr "Recherche par auteur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:426 +msgid "You are not allowed to edit posts." +msgstr "Vous n’avez pas l’autorisation de modifier les articles." +||||||| .r11156 +#: wp-admin/freedoms.php:41 +msgid "You have the freedom to redistribute copies of the original program so you can help your neighbor." +msgstr "Vous Ãªtes libres de redistribuer des copies du programme original, afin d’aider votre prochain." +======= #: wp-admin/includes/theme-install.php:72 #: wp-admin/includes/theme-install.php:83 msgid "Search by keyword" msgstr "Recherche par mot-clÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:597 +msgid "Auto Draft" +msgstr "Brouillon auto" +||||||| .r11156 +#: wp-admin/freedoms.php:42 +msgid "You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes." +msgstr "Vous Ãªtes libres de distribuer Ã autrui des copies de votre propre version modifiÃ©e de ce programme. Ce faisant, vous offrez Ã la communautÃ© la possibilitÃ© de profiter de vos modifications." +======= #: wp-admin/includes/theme-install.php:67 msgctxt "Theme Installer" msgid "Tag" msgstr "Ãtiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1284 +msgid "Click to edit this part of the permalink" +msgstr "Cliquez pour modifier cette section du permalien" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:28 +msgid "You are using an insecure browser!" +msgstr "Vous utilisez un navigateur peu sÃ»r !" +======= #: wp-admin/includes/theme-install.php:63 msgid "Type of search" msgstr "Type de recherche" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1286 +msgid "Temporary permalink. Click to edit this part." +msgstr "Permalien temporaire. Cliquez pour modifier cette section." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:30 +msgid "Your browser is out of date!" +msgstr "Votre navigateur est obsolÃ¨te !" +======= #: wp-admin/includes/theme-install.php:58 msgid "Search for themes by keyword." msgstr "Chercher un thÃ¨me par mot-clÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1290 wp-admin/includes/post.php:1313 +msgid "Permalink:" +msgstr "Permalien :" +||||||| .r11156 +#: wp-admin/freedoms.php:54 +msgid "Don’t you wish all software came with these freedoms? So do we! For more information, check out the Free Software Foundation." +msgstr "Ne prÃ©fÃ©reriez-vous pas que tous vos logiciels vous donnent autant de libertÃ© ? Nous aussi ! Pour obtenir plus d’informations, rendez-vous sur le site de la Free Software Foundation, ou en franÃ§ais, ceux de l’April et de l’Aful." +======= #: wp-admin/includes/template.php:2247 msgid "You are currently editing the page that shows your latest posts." msgstr "Vous Ãªtes en train de modifier la page qui affiche vos derniers articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1292 +msgid "Change Permalinks" +msgstr "Modifier les permaliens" +||||||| .r11156 +#: wp-admin/about.php:40 wp-admin/credits.php:95 wp-admin/freedoms.php:12 +#: wp-admin/freedoms.php:32 +msgid "Freedoms" +msgstr "LibertÃ©s" +======= #. translators: 1: The rating #: wp-admin/includes/template.php:2229 msgid "%s rating" msgstr "Note : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: blog tagline +#: wp-admin/includes/schema.php:385 +msgid "Just another WordPress site" +msgstr "Un site utilisant WordPress" +||||||| .r11156 +#: wp-admin/custom-header.php:638 +msgid "You can use one of these cool headers or show a random one on each page." +msgstr "Vous pouvez choisir parmi ces en-tÃªtes, ou en afficher un alÃ©atoirement Ã chaque chargement de page." +======= #. translators: 1: The rating, 2: The number of ratings #: wp-admin/includes/template.php:2225 msgid "%1$s rating based on %2$s rating" msgid_plural "%1$s rating based on %2$s ratings" msgstr[0] "Une note de %1$s basÃ©e sur %2$s vote" msgstr[1] "Une note de %1$s basÃ©e sur %2$s votes" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: blog tagline +#: wp-admin/includes/schema.php:513 +msgid "Just another %s site" +msgstr "Un site utilisant %s" +||||||| .r11156 +#: wp-admin/custom-header.php:636 +msgid "If you don‘t want to upload your own image, you can use one of these cool headers, or show a random one." +msgstr "Si vous ne voulez pas mettre en ligne d’image, vous pouvez utiliser l’un de ces en-tÃªtes, ou en afficher un alÃ©atoirement." +======= #: wp-admin/includes/template.php:2178 msgid "Undo." msgstr "Annuler." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user role +#: wp-admin/includes/schema.php:619 +msgctxt "User role" +msgid "Administrator" +msgstr "Administrateur" +||||||| .r11156 +#: wp-admin/custom-header.php:624 +msgid "You can choose one of your previously uploaded headers, or show a random one." +msgstr "Vous pouvez choisir un en-tÃªte parmi ceux que vous avez dÃ©jÃ mis en ligne, ou en afficher un alÃ©atoirement" +======= #: wp-admin/includes/template.php:2177 msgid "Post restored successfully." msgstr "L’article a bien Ã©tÃ© rÃ©tabli." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user role +#: wp-admin/includes/schema.php:621 +msgctxt "User role" +msgid "Editor" +msgstr "Ãditeur" +||||||| .r11156 +#: wp-admin/menu-header.php:205 +msgid "Collapse menu" +msgstr "RÃ©duire le menu" +======= #: wp-admin/includes/template.php:2174 msgid "Restore the backup." msgstr "RÃ©tablir la sauvegarde." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user role +#: wp-admin/includes/schema.php:623 +msgctxt "User role" +msgid "Author" +msgstr "Auteur" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:333 +msgid "Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present." +msgstr "Les « drop-ins » sont des extensions avancÃ©es contenues dans le dossier %s ; elles permettent le remplacement de certaines fonctionnalitÃ©s de WordPress." +======= #: wp-admin/includes/template.php:2173 msgid "The backup of this post in your browser is different from the version below." msgstr "La sauvegarde de cet article dans votre navigateur est diffÃ©rente de la version ci-dessous." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user role +#: wp-admin/includes/schema.php:625 +msgctxt "User role" +msgid "Contributor" +msgstr "Contributeur" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:331 +msgid "Files in the %s directory are executed automatically." +msgstr "Les fichiers contenus dans le dossier %s sont exÃ©cutÃ©s automatiquement." +======= #: wp-admin/includes/template.php:2156 msgid "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." msgstr "Il semble y avoir une inclusion directe de wp-admin/includes/template.php afin d’utiliser add_meta_box(). Ce n’est pas comme cela qu’il faut faire. Attachez plutÃ´t le crochet add_meta_box() Ã l’action add_meta_box." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user role +#: wp-admin/includes/schema.php:627 +msgctxt "User role" +msgid "Subscriber" +msgstr "AbonnÃ©" +||||||| .r11156 +#: wp-admin/custom-header.php:341 +msgid "Random: Show a different image on each page." +msgstr "AlÃ©atoire : affiche une image diffÃ©rente sur chaque page." +======= #: wp-admin/includes/template.php:2117 msgid "Enable distraction-free writing mode, and everything surrounding the editor will fade away when you start typing. Move your mouse out of the editor to reveal everything again." msgstr "Activez le mode d'Ã©criture sans distraction, et tout ce qui entoure l'Ã©diteur disparaÃ®tra quand vous vous mettrez Ã Ã©crire. DÃ©placez la souris en dehors de l'Ã©diteur pour faire tout rÃ©apparaÃ®tre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:485 +msgid "Reply to Comment" +msgstr "RÃ©pondre au commentaire" +||||||| .r11156 +#: wp-admin/custom-header.php:622 +msgid "Uploaded Images" +msgstr "Images mises en ligne" +======= #: wp-admin/includes/template.php:2116 msgid "Distraction-Free Writing" msgstr "Ãcriture sans distraction" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:516 +msgid "Submit Reply" +msgstr "Envoyer la rÃ©ponse" +||||||| .r11156 +#: wp-admin/media-new.php:56 +msgid "Documentation on Uploading Media Files" +msgstr "Documentation sur la mise en ligne de fichiers mÃ©dia (en)" +======= #: wp-admin/includes/template.php:2090 msgid "Preview your changes in real-time and only save them when you’re ready." msgstr "PrÃ©visualisez vos modifications en temps rÃ©el, et enregistrez-les uniquement quand vous Ãªtes prÃªt." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:555 +msgid "Comment by %s marked as spam." +msgstr "Commentaire de %s marquÃ© comme indÃ©sirable." +||||||| .r11156 +#: wp-admin/user-edit.php:53 +msgid "Documentation on User Profiles" +msgstr "Documentation sur le Profil utilisateur (en)" +======= #: wp-admin/includes/template.php:2090 msgid "Add, edit, and play around with your widgets from the Customizer." msgstr "Ajoutez des widgets, modifiez-les et laissez aller votre crÃ©ativitÃ© Ã l'aide de l'outil de personnalisation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:575 wp-admin/includes/template.php:590 +#: wp-admin/includes/template.php:654 wp-admin/includes/template.php:699 +msgid "Value" +msgstr "Valeur" +||||||| .r11156 +#: wp-admin/options-permalink.php:44 +msgid "Documentation on Permalinks Settings" +msgstr "Documentation sur les rÃ©glages des permaliens (en)" +======= #: wp-admin/includes/template.php:2089 msgid "New Feature: Live Widget Previews" msgstr "Nouvelle fonctionnalitÃ© : la prÃ©visualisation en direct des widgets" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:694 +msgid "Add New Custom Field:" +msgstr "Ajouter un nouveau champ personnalisÃ© :" +||||||| .r11156 +#: wp-admin/edit-tags.php:231 +msgid "Documentation on Categories" +msgstr "Documentation sur les catÃ©gories (en)" +======= #: wp-admin/includes/template.php:2076 msgid "Someone else is editing this. No need to refresh; the lock will disappear when they’re done." msgstr "Quelqu’un est dÃ©jÃ en train de modifier ce contenu. Inutile de recharger le page : le verrouillage disparaÃ®tra une fois la modification validÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:720 +msgid "Enter new" +msgstr "Saisissez-en un nouveau" +||||||| .r11156 +#: wp-admin/edit-tags.php:233 +msgid "Documentation on Link Categories" +msgstr "Documentation sur les catÃ©gories de liens (en)" +======= #: wp-admin/includes/template.php:2075 msgid "Edit Lock" msgstr "Modifier le verrouillage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:731 +msgid "Add Custom Field" +msgstr "Ajouter un champ personnalisÃ©" +||||||| .r11156 +#: wp-admin/widgets.php:73 +msgid "Documentation on Widgets" +msgstr "Documentation sur les widgets" +======= #: wp-admin/includes/template.php:1892 wp-admin/nav-menus.php:613 #: wp-admin/options.php:271 msgid "Save Changes" msgstr "Enregistrer les modifications" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:927 +msgid "Before you can upload your import file, you will need to fix the following error:" +msgstr "Avant de mettre en ligne votre fichier d’import, il vous faut corriger l’erreur suivante :" +||||||| .r11156 +#: wp-admin/nav-menus.php:544 +msgid "Documentation on Menus" +msgstr "Documentation sur les menus personnalisÃ©s (en)" +======= #: wp-admin/includes/template.php:1702 msgid "Posts Page" msgstr "Page des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:933 +msgid "Choose a file from your computer:" +msgstr "Choisissez un fichier sur votre ordinateur :" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:325 wp-admin/media.php:83 +msgid "Documentation on Edit Media" +msgstr "Documentation sur la modification des mÃ©dias (en)" +======= #: wp-admin/includes/template.php:1698 msgid "Front Page" msgstr "Page dâaccueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:933 +msgid "Maximum size: %s" +msgstr "Taille maximale : %s" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:309 +msgid "Documentation on Editing Pages" +msgstr "Documentation sur la modification des pages (en)" +======= #. translators: post state #: wp-admin/includes/template.php:1693 msgctxt "post state" msgid "Pending" msgstr "En attente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:938 +msgid "Upload file and import" +msgstr "Envoyer le fichier et l’importer" +||||||| .r11156 +#: wp-admin/upload.php:51 wp-admin/upload.php:219 +msgid "Documentation on Media Library" +msgstr "Documentation sur la bibliothÃ¨que des mÃ©dias (en)" +======= #: wp-admin/includes/template.php:1504 msgid "Find Posts or Pages" msgstr "Chercher parmi les articles et pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1087 +msgid "Click to toggle" +msgstr "Cliquer pour inverser." +||||||| .r11156 +#: wp-admin/tools.php:28 +msgid "Documentation on Tools" +msgstr "Documentation sur les outils (en)" +======= #: wp-admin/includes/template.php:1272 msgid "The privacy options group has been removed. Use another settings group." msgstr "Le groupement d’options « Vie privÃ©e » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1522 +msgid "Find Posts or Pages" +msgstr "Chercher parmi les articles et pages" +||||||| .r11156 +#: wp-admin/custom-header.php:191 +msgid "Documentation on Custom Header" +msgstr "Documentation sur l’en-tÃªte personnalisÃ©" +======= #: wp-admin/includes/template.php:1267 msgid "The miscellaneous options group has been removed. Use another settings group." msgstr "Le groupement d’options « Divers » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: post state +#: wp-admin/includes/template.php:1723 +msgctxt "post state" +msgid "Pending" +msgstr "En attente" +||||||| .r11156 +#: wp-admin/export.php:55 +msgid "Documentation on Export" +msgstr "Documentation sur l’exportation (en)" +======= #: wp-admin/includes/template.php:1071 msgid "Click to toggle" msgstr "Cliquer pour inverser." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1007 +msgid "Disable accessibility mode" +msgstr "DÃ©sactiver le mode AccessibilitÃ©" +||||||| .r11156 +#: wp-admin/options-general.php:79 +msgid "Documentation on General Settings" +msgstr "Documentation sur les rÃ©glages gÃ©nÃ©raux (en)" +======= #: wp-admin/includes/template.php:926 msgid "Upload file and import" msgstr "Envoyer le fichier et l’importer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:982 +msgid "Screen Options" +msgstr "Options de l’Ã©cran" +||||||| .r11156 +#: wp-admin/options-media.php:34 +msgid "Documentation on Media Settings" +msgstr "Documentation sur les rÃ©glages des mÃ©dias" +======= #: wp-admin/includes/template.php:921 msgid "Maximum size: %s" msgstr "Taille maximale : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1143 +msgid "Screen Layout" +msgstr "PrÃ©sentation de l’Ã©cran" +||||||| .r11156 +#: wp-admin/update-core.php:489 +msgid "Documentation on Updating WordPress" +msgstr "Documentation sur la mise Ã jour de WordPress (en)" +======= #: wp-admin/includes/template.php:921 msgid "Choose a file from your computer:" msgstr "Choisissez un fichier sur votre ordinateur :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1145 +msgid "Number of Columns:" +msgstr "Nombre de colonnes :" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:293 +msgid "Documentation on Writing and Editing Posts" +msgstr "Documentation sur l’Ã©criture et la modification des articles (en)" +======= #: wp-admin/includes/template.php:915 msgid "Before you can upload your import file, you will need to fix the following error:" msgstr "Avant de mettre en ligne votre fichier d’import, il vous faut corriger l’erreur suivante :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:92 +msgid "The %1$s plugin header is deprecated. Use %2$s instead." +msgstr "L’en-tÃªte de l’extension %1$s%2$s." +||||||| .r11156 +#: wp-admin/comment.php:58 wp-admin/edit-comments.php:133 +msgid "Documentation on Comments" +msgstr "Documentation sur les commentaires (en)" +======= #: wp-admin/includes/template.php:787 msgid "Minute" msgstr "Minute" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:412 +msgid "Custom database class." +msgstr "Classe personnalisÃ©e de connexion Ã la base de donnÃ©es." +||||||| .r11156 +#: wp-admin/users.php:61 +msgid "Documentation on Managing Users" +msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +======= #: wp-admin/includes/template.php:786 msgid "Hour" msgstr "Heure" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:413 +msgid "Custom database error message." +msgstr "Message personnalisÃ© pour l’erreur de base de donnÃ©es." +||||||| .r11156 +#: wp-admin/options-discussion.php:26 +msgid "Documentation on Discussion Settings" +msgstr "Documentation sur les rÃ©glages des discussions (en)" +======= #: wp-admin/includes/template.php:784 msgid "Day" msgstr "Jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:416 +msgid "External object cache." +msgstr "Cache d’objet externe." +||||||| .r11156 +#: wp-admin/edit-link-form.php:65 +msgid "Documentation on Creating Links" +msgstr "Documentation sur la crÃ©ation de liens (en)" +======= #. translators: 1: month number (01, 02, etc.), 2: month abbreviation #: wp-admin/includes/template.php:780 msgid "%1$s-%2$s" msgstr "%1$s-%2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:420 +msgid "Executed before Multisite is loaded." +msgstr "ExÃ©cutÃ© avant que la fonctionnalitÃ© multisites ne soit chargÃ©e." +||||||| .r11156 +#: wp-admin/options-reading.php:71 +msgid "Documentation on Reading Settings" +msgstr "Documentation sur les rÃ©glages de la lecture (en)" +======= #: wp-admin/includes/template.php:775 msgid "Month" msgstr "Mois" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:888 +msgid "You must provide a domain name." +msgstr "vous devez fournir un nom de domaine." +||||||| .r11156 +#: wp-admin/plugin-install.php:66 +msgid "Documentation on Installing Plugins" +msgstr "Documentation sur l’installation des extensions (en)" +======= #: wp-admin/includes/template.php:725 msgid "Add Custom Field" msgstr "Ajouter un champ personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:890 +msgid "You must provide a name for your network of sites." +msgstr "vous devez fournir un nom pour votre rÃ©seau de sites." +||||||| .r11156 +#: wp-admin/edit.php:205 +msgid "Documentation on Managing Posts" +msgstr "Documentation sur la gestion des articles (en)" +======= #: wp-admin/includes/template.php:714 msgid "Enter new" msgstr "Saisissez-en un nouveau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:894 +msgid "The network already exists." +msgstr "Le rÃ©seau existe dÃ©jÃ ." +||||||| .r11156 +#: wp-admin/index.php:88 +msgid "Documentation on Dashboard" +msgstr "Documentation sur le tableau de bord (en)" +======= #: wp-admin/includes/template.php:688 msgid "Add New Custom Field:" msgstr "Ajouter un nouveau champ personnalisÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:1049 +msgid "Warning! Wildcard DNS may not be configured correctly!" +msgstr "Attention ! L’enregistrement DNS gÃ©nÃ©rique (joker) peut ne pas Ãªtre configurÃ© correctement !" +||||||| .r11156 +#: wp-admin/plugin-editor.php:140 +msgid "Documentation on Editing Plugins" +msgstr "Documentation sur l’Ã©dition des extensions (en)" +======= #: wp-admin/includes/template.php:640 msgid "Key" msgstr "ClÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:1055 +msgid "You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message." +msgstr "Vous pouvez toujours utiliser votre site, mais tout sous-domaine crÃ©Ã© pourrait ne pas Ãªtre accessible. Si vous Ãªtes sÃ»r de votre configuration DNS, ignorez ce message." +||||||| .r11156 +#: wp-admin/custom-background.php:150 +msgid "Documentation on Custom Background" +msgstr "Documentation sur le fond personnalisÃ© (en)" +======= #: wp-admin/includes/template.php:573 wp-admin/includes/template.php:588 #: wp-admin/includes/template.php:650 wp-admin/includes/template.php:693 msgid "Value" msgstr "Valeur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:414 +msgid "Custom install script." +msgstr "Script d’installation personnalisÃ©e." +||||||| .r11156 +#: wp-admin/import.php:28 +msgid "Documentation on Import" +msgstr "Documentation sur l’importation (en)" +======= #: wp-admin/includes/template.php:572 wp-admin/includes/template.php:587 #: wp-admin/includes/template.php:692 msgctxt "meta name" msgid "Name" msgstr "Nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:421 +msgid "Custom site deleted message." +msgstr "Message personnalisÃ© de site supprimÃ©." +||||||| .r11156 +#: wp-admin/edit.php:226 +msgid "Documentation on Managing Pages" +msgstr "Documentation sur la gestion des pages (en)" +======= #: wp-admin/includes/template.php:553 msgid "Comment by %s marked as spam." msgstr "Commentaire de %s marquÃ© comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:422 +msgid "Custom site inactive message." +msgstr "Message personnalisÃ© de site inactif." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:308 +msgid "Documentation on Adding New Pages" +msgstr "Documentation sur l’ajout de nouvelles pages (en)" +======= #: wp-admin/includes/template.php:550 msgid "Comment by %s moved to the trash." msgstr "Commentaire de %s dÃ©placÃ© dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:423 +msgid "Custom site suspended message." +msgstr "Message personnalisÃ© de site suspendu." +||||||| .r11156 +#: wp-admin/options-writing.php:51 +msgid "Documentation on Writing Settings" +msgstr "Documentation sur les rÃ©glages de l’Ã©criture (en)" +======= #: wp-admin/includes/template.php:514 msgid "Submit Reply" msgstr "Envoyer la rÃ©ponse" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1285 +msgid "The miscellaneous options group has been removed. Use another settings group." +msgstr "Le groupement d’options « Divers » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +||||||| .r11156 +#: wp-admin/link-manager.php:60 +msgid "Documentation on Managing Links" +msgstr "Documentation sur la gestion des liens (en)" +======= #: wp-admin/includes/template.php:513 msgid "Update Comment" msgstr "Mettre Ã jour le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:716 +msgid "You are not allowed to create pages on this site." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sur ce site." +||||||| .r11156 +#: wp-admin/user-new.php:184 +msgid "Documentation on Adding New Users" +msgstr "Documentation sur l’ajout de nouveaux utilisateurs (en)" +======= #: wp-admin/includes/template.php:512 msgid "Add Comment" msgstr "Ajouter un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:718 +msgid "You are not allowed to create posts or drafts on this site." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des articles ou des brouillons sur ce site." +||||||| .r11156 +#: wp-admin/includes/theme.php:195 wp-admin/includes/theme.php:256 +#: wp-admin/index.php:61 +msgid "Layout" +msgstr "Arrangement" +======= #: wp-admin/includes/template.php:484 msgid "Add new Comment" msgstr "Ajouter un nouveau commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:383 +msgid "My Site" +msgstr "Mon site" +||||||| .r11156 +#: wp-admin/users.php:223 +msgid "You have specified this user for deletion:" +msgid_plural "You have specified these users for deletion:" +msgstr[0] "Vous avez choisi de supprimer cet utilisateur :" +msgstr[1] "Vous avez choisi de supprimer ces utilisateurs :" +======= #: wp-admin/includes/template.php:483 msgid "Reply to Comment" msgstr "RÃ©pondre au commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:898 +msgid "You must provide a valid e-mail address." +msgstr "Vous devez saisir une adresse de messagerie valide." +||||||| .r11156 +#: wp-admin/user-edit.php:204 +msgid "← Back to Users" +msgstr "← Retour aux utilisateurs" +======= #: wp-admin/includes/taxonomy.php:116 msgid "You did not enter a category name." msgstr "Vous n’avez pas entrÃ© de nom de catÃ©gorie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:977 +msgid "Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!" +msgstr "Bienvenue dans SITE_NAME. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:675 +msgctxt "paging" +msgid "%1$s of %2$s" +msgstr "%1$s sur %2$s" +======= #: wp-admin/includes/screen.php:1136 msgid "Number of items per page:" msgstr "Nombre d'Ã©lÃ©ments par page :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:1054 +msgid "To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool." +msgstr "Pour utiliser la configuration en sous-domaine, il vous faut ajouter un enregistrement gÃ©nÃ©rique (joker) Ã vos enregistrements DNS. Cela signifique ajouter un hÃ´te * pointant vers votre serveur dans votre outil de configuration DNS." +||||||| .r11156 +#: wp-admin/includes/file.php:67 +msgid "%s Page Template" +msgstr "ModÃ¨le de page %s" +======= #: wp-admin/includes/screen.php:1110 msgid "Number of Columns:" msgstr "Nombre de colonnes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:552 +msgid "Comment by %s moved to the trash." +msgstr "Commentaire de %s dÃ©placÃ© dans la Corbeille." +||||||| .r11156 +#: wp-admin/press-this.php:514 +msgid "Post Format:" +msgstr "Format d’article :" +======= #: wp-admin/includes/screen.php:1108 msgid "Screen Layout" msgstr "PrÃ©sentation de l’Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:386 +msgctxt "Plugin installer section title" +msgid "Installation" +msgstr "Installation" +||||||| .r11156 +#: wp-admin/plugins.php:270 +msgid "This plugin may be active on other sites in the network." +msgid_plural "These plugins may be active on other sites in the network." +msgstr[0] "Cette extension peut uniquement Ãªtre activÃ©e sur l’ensemble des sites du rÃ©seau." +msgstr[1] "Ces extensions peuvent uniquement Ãªtre activÃ©es sur l’ensemble des sites du rÃ©seau." +======= #: wp-admin/includes/screen.php:1051 msgctxt "Welcome panel" msgid "Welcome" msgstr "Bienvenue" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:387 +msgctxt "Plugin installer section title" +msgid "FAQ" +msgstr "FAQ" +||||||| .r11156 +#: wp-admin/plugins.php:377 +msgid "You cannot delete a plugin while it is active on the main site." +msgstr "Vous ne pouvez pas effacer une extension tant qu’elle est activÃ©e sur le site principal." +======= #: wp-admin/includes/screen.php:1031 msgid "Show on screen" msgstr "Afficher Ã l’Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:389 +msgctxt "Plugin installer section title" +msgid "Changelog" +msgstr "Liste des modifications" +||||||| .r11156 +#: wp-admin/options-writing.php:87 +msgid "Default Post Format" +msgstr "Format par dÃ©faut des articles" +======= #: wp-admin/includes/screen.php:1028 msgid "Screen Options Tab" msgstr "Onglet des options de l’Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:391 +msgctxt "Plugin installer section title" +msgid "Other Notes" +msgstr "Autres notes" +||||||| .r11156 +#: wp-admin/update-core.php:23 wp-admin/update-core.php:539 +#: wp-admin/update-core.php:563 wp-admin/update-core.php:591 +#: wp-admin/update-core.php:621 +msgid "You do not have sufficient permissions to update this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour ce site." +======= #: wp-admin/includes/screen.php:979 msgid "Enable full-height editor and distraction-free functionality." msgstr "Activer l'Ã©diteur plein-Ã©cran et la fonctionnalitÃ© d'Ã©criture sans distraction." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:488 +msgid "Plugin Homepage »" +msgstr "Site Web de l’extension »" +||||||| .r11156 +#: wp-admin/user-edit.php:220 wp-admin/users.php:437 +msgctxt "user" +msgid "Add Existing" +msgstr "Ajouter un utilisateur existant" +======= #: wp-admin/includes/screen.php:974 msgid "Disable accessibility mode" msgstr "DÃ©sactiver le mode AccessibilitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:171 +msgid "By %s." +msgstr "par %s" +||||||| .r11156 +#: wp-admin/user-new.php:238 +msgctxt "user" +msgid "Add New User" +msgstr "Ajouter un utilisateur" +======= #: wp-admin/includes/screen.php:974 msgid "Enable accessibility mode" msgstr "Activer le mode « AccessibilitÃ© »" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: default GMT offset or timezone string. Must be either a valid +#. offset (-12 to 14) or a valid timezone string (America/New_York). See +#. http:us3.php.net/manual/en/timezones.php for all timezone strings +#. supported by PHP. +#: wp-admin/includes/schema.php:374 +msgctxt "default GMT offset or timezone string" +msgid "0" +msgstr "1" +||||||| .r11156 +#: wp-admin/user-new.php:433 +msgid "Add New User " +msgstr "Ajouter un utilisateur" +======= #: wp-admin/includes/screen.php:955 msgid "Screen Options" msgstr "Options de l’Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: default start of the week. 0 = Sunday, 1 = Monday +#: wp-admin/includes/schema.php:389 +msgctxt "start of week" +msgid "1" +msgstr "1" +||||||| .r11156 +#: wp-admin/user-new.php:328 +msgid "Add Existing User " +msgstr "Ajouter un utilisateur existant" +======= #: wp-admin/includes/screen.php:856 msgid "Contextual Help Tab" msgstr "Onglet d’aide contextuelle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1066 +msgid "Show on screen" +msgstr "Afficher Ã l’Ã©cran" +||||||| .r11156 +#: wp-admin/plugin-editor.php:135 wp-admin/theme-editor.php:34 +msgid "Any edits to files from this screen will be reflected on all sites in the network." +msgstr "Toute modification aux fichiers de cet Ã©cran affectera l’ensemble des sites du rÃ©seau." +======= #: wp-admin/includes/schema.php:1040 msgid "You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message." msgstr "Vous pouvez toujours utiliser votre site, mais tout sous-domaine crÃ©Ã© pourrait ne pas Ãªtre accessible. Si vous Ãªtes sÃ»r de votre configuration DNS, ignorez ce message." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:486 +msgid "Add new Comment" +msgstr "Ajouter un nouveau commentaire" +||||||| .r11156 +#: wp-admin/user-new.php:240 +msgctxt "user" +msgid "Add Existing User" +msgstr "Ajouter un utilisateur existant" +======= #: wp-admin/includes/schema.php:1039 msgid "To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool." msgstr "Pour utiliser la configuration en sous-domaine, il vous faut ajouter un enregistrement gÃ©nÃ©rique (joker) Ã vos enregistrements DNS. Cela signifique ajouter un hÃ´te * pointant vers votre serveur dans votre outil de configuration DNS." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:514 +msgid "Add Comment" +msgstr "Ajouter un commentaire" +||||||| .r11156 +#: wp-admin/options-writing.php:28 wp-admin/tools.php:17 +msgid "Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options." +msgstr "« Publier un article » est un bookmarklet qui vous facilite la publication sur votre site quand vous voyez une page intÃ©ressante sur Internet. Vous pouvez l’utiliser simplement pour publier un lien, ou pour en publier un extrait. « Publier un article » vous permet mÃªme de choisir parmi les images incluses dans la page, et de les utiliser dans votre article. Glissez simplement le lien « Publier un article » dans la barre de liens de votre navigateur, et Ã vous la publication facile ! En cliquant dessus lors de la visite d’un site, une fenÃªtre s’ouvrira avec toutes les options utiles." +======= #: wp-admin/includes/schema.php:1037 msgid "This resulted in an error message: %s" msgstr "Cela a abouti Ã ce message d’erreur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:574 wp-admin/includes/template.php:589 +#: wp-admin/includes/template.php:698 +msgctxt "meta name" +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-admin/plugin-editor.php:141 +msgid "Documentation on Writing Plugins" +msgstr "Documentation sur la crÃ©ation d’extensions (en)" +======= #: wp-admin/includes/schema.php:1035 msgid "The installer attempted to contact a random hostname (%1$s) on your domain." msgstr "L’installateur a tentÃ© de contacter un nom d’hÃ´te alÃ©atoire (%1$s) sur votre domaine." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: month number (01, 02, etc.), 2: month abbreviation +#: wp-admin/includes/template.php:790 +msgid "%1$s-%2$s" +msgstr "%1$s-%2$s" +||||||| .r11156 +#: wp-admin/index.php:65 +msgid "The boxes on your Dashboard screen are:" +msgstr "Les blocs de l’Ã©cran du tableau de bord sont :" +======= #: wp-admin/includes/schema.php:1034 msgid "Warning! Wildcard DNS may not be configured correctly!" msgstr "Attention ! L’enregistrement DNS gÃ©nÃ©rique (joker) peut ne pas Ãªtre configurÃ© correctement !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2164 +msgid "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." +msgstr "Il semble y avoir une inclusion directe de wp-admin/includes/template.php afin d’utiliser add_meta_box(). Ce n’est pas comme cela qu’il faut faire. Attachez plutÃ´t le crochet add_meta_box() Ã l’action add_meta_box." +||||||| .r11156 +#: wp-admin/users.php:26 +msgid "This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role." +msgstr "Cet Ã©cran liste tous les utilisateurs actuels de votre site. Chaque utilisateur a l’un des 5 rÃ´les prÃ©dÃ©finis, tel qu’assignÃ© par l’administrateur du site : Administrateur, Ãditeur, Auteur, Contributeur ou AbonnÃ©. Les utilisateurs avec un rÃ´le autre qu’Administrateur verront moins d’options quand ils seront connectÃ©s, en fonction de leur rÃ´le." +======= #: wp-admin/includes/schema.php:962 wp-admin/includes/upgrade.php:155 msgid "Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!" msgstr "Bienvenue dans SITE_NAME. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:860 +msgid "Could not fully remove the plugin(s) %s." +msgstr "Impossible de supprimer complÃ¨tement la ou les extensions %s." +||||||| .r11156 +#: wp-admin/options-permalink.php:45 +msgid "Documentation on Using Permalinks" +msgstr "Documentation sur l’utilisation des permaliens (en)" +======= #: wp-admin/includes/schema.php:884 msgid "You must provide a valid e-mail address." msgstr "Vous devez saisir une adresse de messagerie valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:1052 +msgid "This resulted in an error message: %s" +msgstr "Cela a abouti Ã ce message d’erreur : %s" +||||||| .r11156 +#: wp-admin/plugin-editor.php:134 +msgid "If you want to make changes but don’t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below." +msgstr "Si vous voulez faire des modifications et ne pas les perdre Ã la prochaine mise Ã jour, cela signifie que vous Ãªtes prÃªt Ã Ã©crire votre propre extension. Pour obtenir des informations sur la maniÃ¨re de modifier une extension ou d’en crÃ©er une, ou simplement pour comprendre leur fonctionnement, suivez les liens ci-dessous." +======= #: wp-admin/includes/schema.php:880 msgid "The network already exists." msgstr "Le rÃ©seau existe dÃ©jÃ ." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:388 +msgctxt "Plugin installer section title" +msgid "Screenshots" +msgstr "Captures d’Ã©crans" +||||||| .r11156 +#: wp-admin/users.php:62 +msgid "Descriptions of Roles and Capabilities" +msgstr "Descriptions des rÃ´les et permissions (en)" +======= #: wp-admin/includes/schema.php:876 msgid "You must provide a name for your network of sites." msgstr "vous devez fournir un nom pour votre rÃ©seau de sites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin.php:1799 wp-admin/includes/plugin.php:1804 +#: wp-admin/includes/plugin.php:1828 wp-admin/includes/plugin.php:1833 +#: wp-admin/includes/template.php:1234 wp-admin/includes/template.php:1239 +msgid "The \"%s\" options group has been removed. Use another settings group." +msgstr "Le groupement d’options « %s » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:219 +msgid "sample-page" +msgstr "page-d-exemple" +======= #: wp-admin/includes/schema.php:874 msgid "You must provide a domain name." msgstr "vous devez fournir un nom de domaine." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1007 +msgid "Enable accessibility mode" +msgstr "Activer le mode « AccessibilitÃ© »" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:217 +msgid "Sample Page" +msgstr "Page d’exemple" +======= #. translators: user role #: wp-admin/includes/schema.php:618 msgctxt "User role" msgid "Subscriber" msgstr "AbonnÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1063 +msgid "Screen Options Tab" +msgstr "Onglet des options de l’Ã©cran" +||||||| .r11156 +#: wp-admin/options-discussion.php:224 +msgid "Retro (Generated)" +msgstr "RÃ©tro (gÃ©nÃ©rÃ©)" +======= #. translators: user role #: wp-admin/includes/schema.php:616 msgctxt "User role" msgid "Contributor" msgstr "Contributeur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1290 +msgid "The privacy options group has been removed. Use another settings group." +msgstr "Le groupement d’options « Vie privÃ©e » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:78 +msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable or install more themes." +msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer ou installer plus de thÃ¨mes." +======= #. translators: user role #: wp-admin/includes/schema.php:614 msgctxt "User role" msgid "Author" msgstr "Auteur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:65 +msgid "Type of search" +msgstr "Type de recherche" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:82 +msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable more themes." +msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer plus de thÃ¨mes." +======= #. translators: user role #: wp-admin/includes/schema.php:612 msgctxt "User role" msgid "Editor" msgstr "Ãditeur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:883 +msgid "Contextual Help Tab" +msgstr "Onglet d’aide contextuelle" +||||||| .r11156 +#: wp-admin/user-edit.php:342 +msgid "Super admin privileges cannot be removed because this user has the network admin email." +msgstr "Les privilÃ¨ges de super-admin ne peuvent pas Ãªtre enlevÃ©s, car cet utilisateur est celui avec l’adresse de contact administratif du rÃ©seau." +======= #. translators: user role #: wp-admin/includes/schema.php:610 msgctxt "User role" msgid "Administrator" msgstr "Administrateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/schema.php:1050 +msgid "The installer attempted to contact a random hostname (%1$s) on your domain." +msgstr "L’installateur a tentÃ© de contacter un nom d’hÃ´te alÃ©atoire (%1$s) sur votre domaine." +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:89 +msgid "You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the Install Themes tab above." +msgstr "Vous n’avez qu’un seul thÃ¨me d’installÃ© pour le moment. Faites vivre votre site ! Vous pouvez quand vous le voulez choisir parmi plus de 1 000 thÃ¨mes sur le dÃ©pÃ´t de thÃ¨mes de WordPress.org : cliquez simplement sur l’onglet « Installer des thÃ¨mes » ci-dessus." +======= #. translators: blog tagline #: wp-admin/includes/schema.php:504 msgid "Just another %s site" msgstr "Un site utilisant %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2181 +msgid "The backup of this post in your browser is different from the version below." +msgstr "La sauvegarde de cet article dans votre navigateur est diffÃ©rente de la version ci-dessous." +||||||| .r11156 +#: wp-admin/maint/repair.php:113 +msgid "One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient." +msgstr "Une ou plusieurs tables de votre base de donnÃ©es sont indisponibles. Pour autoriser WordPress Ã tenter de rÃ©parer ces tables, cliquez sur le bouton « RÃ©parer la base de donnÃ©es ». La rÃ©paration peut prendre un certain temps, merci donc d’Ãªtre patient." +======= #. translators: default start of the week. 0 = Sunday, 1 = Monday #: wp-admin/includes/schema.php:383 msgctxt "start of week" msgid "1" msgstr "1" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2186 +msgid "Undo." +msgstr "Annuler." +||||||| .r11156 +#: wp-admin/includes/file.php:16 +msgid "Visual Editor RTL Stylesheet" +msgstr "Feuille de style de l’Ã©diteur visuel (lecture de droite Ã gauche)" +======= #. translators: blog tagline #: wp-admin/includes/schema.php:379 msgid "Just another WordPress site" msgstr "Un site utilisant WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1571 +msgid "Take over" +msgstr "Prendre la main" +||||||| .r11156 +#: wp-admin/theme-editor.php:170 +msgid "This child theme inherits templates from a parent theme, %s." +msgstr "Ce thÃ¨me enfant hÃ©rite de certains modÃ¨les de son thÃ¨me parent, %s." +======= #: wp-admin/includes/schema.php:377 msgid "My Site" msgstr "Mon site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:327 +msgctxt "Followed by post revision info" +msgid "From:" +msgstr "Depuis :" +||||||| .r11156 +#: wp-admin/theme-editor.php:216 +msgid "This is a file in your current parent theme." +msgstr "Ceci est un fichier de votre thÃ¨me parent actuel." +======= #. translators: default GMT offset or timezone string. Must be either a valid #. offset (-12 to 14) or a valid timezone string (America/New_York). See #. http:us3.php.net/manual/en/timezones.php for all timezone strings @@ -4492,352 +15755,1222 @@ msgstr "Mon site" msgctxt "default GMT offset or timezone string" msgid "0" msgstr "1" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:329 +msgctxt "Followed by post revision info" +msgid "To:" +msgstr "Vers :" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:252 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:295 +#: wp-admin/includes/class-wp-upgrader-skins.php:527 +msgid "Network Enable" +msgstr "Activer sur le rÃ©seau" +======= #: wp-admin/includes/revision.php:370 msgid "Sorry, something went wrong. The requested comparison could not be loaded." msgstr "DÃ©solÃ©, quelque chose s’est mal dÃ©roulÃ©. La comparaison demandÃ©e n’a pas pu Ãªtre chargÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:60 +msgid "Search for themes by keyword." +msgstr "Chercher un thÃ¨me par mot-clÃ©." +||||||| .r11156 +#: wp-admin/upgrade.php:99 +msgid "Your WordPress database has been successfully updated!" +msgstr "La base de donnÃ©es de WordPress a bien Ã©tÃ© mise Ã jour !" +======= #: wp-admin/includes/revision.php:358 msgid "Restore This Revision" msgstr "RÃ©tablir cette rÃ©vision" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:335 +msgid "Autosave by %s" +msgstr "Sauvegarde automatique par %s" +||||||| .r11156 +#: wp-admin/upgrade.php:88 +msgid "Update WordPress Database" +msgstr "Mettre Ã jour la base de donnÃ©es de WordPress" +======= #: wp-admin/includes/revision.php:356 msgid "Restore This Autosave" msgstr "RÃ©tablir cette sauvegarde automatique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:338 +msgid "Current Revision by %s" +msgstr "RÃ©vision actuelle par %s" +||||||| .r11156 +#: wp-admin/update-core.php:101 +msgid "You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released." +msgstr "Vous Ãªtes sur le point d’installer WordPress %s en anglais (US). Il se peut que cette mise Ã jour ne fonctionne pas avec la traduction de WordPress dont vous disposez. Vous devriez sans doute patienter, le temps que la mise Ã jour soit officiellement traduite dans votre langue." +======= #: wp-admin/includes/revision.php:341 msgid "Revision by %s" msgstr "RÃ©vision par %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:341 +msgid "Revision by %s" +msgstr "RÃ©vision par %s" +||||||| .r11156 +#: wp-admin/upgrade.php:87 +msgid "The update process may take a little while, so please be patient." +msgstr "Le processus de mise Ã jour peut prendre un certain temps, merci donc pour votre patience." +======= #: wp-admin/includes/revision.php:338 msgid "Current Revision by %s" msgstr "RÃ©vision actuelle par %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:370 +msgid "Sorry, something went wrong. The requested comparison could not be loaded." +msgstr "DÃ©solÃ©, quelque chose s’est mal dÃ©roulÃ©. La comparaison demandÃ©e n’a pas pu Ãªtre chargÃ©e." +||||||| .r11156 +#: wp-admin/upgrade.php:55 +msgid "WordPress › Update" +msgstr "WordPress › Mise Ã jour" +======= #: wp-admin/includes/revision.php:335 msgid "Autosave by %s" msgstr "Sauvegarde automatique par %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:644 +msgid "Key" +msgstr "ClÃ©" +||||||| .r11156 +#: wp-admin/upgrade.php:98 +msgid "Update Complete" +msgstr "Mise Ã jour terminÃ©e" +======= #: wp-admin/includes/revision.php:329 msgctxt "Followed by post revision info" msgid "To:" msgstr "Vers :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2182 +msgid "Restore the backup." +msgstr "RÃ©tablir la sauvegarde." +||||||| .r11156 +#: wp-admin/upgrade.php:85 +msgid "Database Update Required" +msgstr "Mise Ã jour de la base de donnÃ©es requise" +======= #: wp-admin/includes/revision.php:327 msgctxt "Followed by post revision info" msgid "From:" msgstr "Depuis :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2185 +msgid "Post restored successfully." +msgstr "L’article a bien Ã©tÃ© rÃ©tabli." +||||||| .r11156 +#: wp-admin/upgrade.php:86 +msgid "WordPress has been updated! Before we send you on your way, we have to update your database to the newest version." +msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour la base de donnÃ©es." +======= #: wp-admin/includes/revision.php:318 msgid "Compare any two revisions" msgstr "Comparer n’importe quelles rÃ©visions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:318 +msgid "Compare any two revisions" +msgstr "Comparer n’importe quelles rÃ©visions" +||||||| .r11156 +#: wp-admin/upgrade.php:66 +msgid "No Update Required" +msgstr "Pas de mise Ã jour requise" +======= #: wp-admin/includes/revision.php:304 msgctxt "Button label for a next revision" msgid "Next" msgstr "Suivante" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:356 +msgid "Restore This Autosave" +msgstr "RÃ©tablir cette sauvegarde automatique" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:487 +msgid "Plugin updated successfully." +msgstr "L’extension a bien Ã©tÃ© mise Ã jour." +======= #: wp-admin/includes/revision.php:300 msgctxt "Button label for a previous revision" msgid "Previous" msgstr "PrÃ©cÃ©dente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:358 +msgid "Restore This Revision" +msgstr "RÃ©tablir cette rÃ©vision" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:564 wp-admin/update.php:162 +msgid "Update Theme" +msgstr "Mettre Ã jour le thÃ¨me" +======= #: wp-admin/includes/revision.php:207 wp-admin/includes/revision.php:225 msgctxt "revision date short format" msgid "j M @ H:i" msgstr "j F \\Ã G \\h i \\m\\i\\n " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1585 +msgid "Saving revision..." +msgstr "Enregistrement des rÃ©visions" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:486 +msgid "Plugin update failed." +msgstr "La mise Ã jour de l’extension a Ã©chouÃ©." +======= #: wp-admin/includes/post.php:1560 msgid "Your latest changes were saved as a revision." msgstr "Vos derniÃ¨res modifications ont Ã©tÃ© enregistrÃ©es dans une rÃ©vision." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1586 +msgid "Your latest changes were saved as a revision." +msgstr "Vos derniÃ¨res modifications ont Ã©tÃ© enregistrÃ©es dans une rÃ©vision." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:810 +msgid "Theme update failed." +msgstr "La mise Ã jour du thÃ¨me a Ã©chouÃ©." +======= #: wp-admin/includes/post.php:1559 msgid "Saving revision..." msgstr "Enregistrement des rÃ©visions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:300 +msgctxt "Button label for a previous revision" +msgid "Previous" +msgstr "PrÃ©cÃ©dente" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:811 +msgid "Theme updated successfully." +msgstr "Le thÃ¨me a bien Ã©tÃ© mis Ã jour." +======= #: wp-admin/includes/post.php:1545 msgid "Take over" msgstr "Prendre la main" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:304 +msgctxt "Button label for a next revision" +msgid "Next" +msgstr "Suivante" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:145 wp-admin/update.php:54 +msgid "Update Plugin" +msgstr "Mettre Ã jour l’extension" +======= #: wp-admin/includes/post.php:1522 msgid "If you take over, %s will be blocked from continuing to edit." msgstr "Si vous souhaitez vous en occuper, %s sera bloquÃ© et ne pourra pas terminer sa modification." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1546 +msgid "This content is currently locked." +msgstr "Ce contenu est actuellement vÃ©rouillÃ©." +||||||| .r11156 +#: wp-admin/includes/update.php:284 +msgid "There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin." +msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s. La mise Ã jour automatique n’est pas possible pour cette extension." +======= #: wp-admin/includes/post.php:1520 msgid "This content is currently locked." msgstr "Ce contenu est actuellement vÃ©rouillÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/post.php:1548 +msgid "If you take over, %s will be blocked from continuing to edit." +msgstr "Si vous souhaitez vous en occuper, %s sera bloquÃ© et ne pourra pas terminer sa modification." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:481 +#: wp-admin/includes/class-wp-upgrader.php:805 +#: wp-admin/includes/class-wp-upgrader.php:1249 +#: wp-admin/includes/class-wp-upgrader.php:1437 +msgid "Update package not available." +msgstr "Pas d’archive de mise Ã jour disponible." +======= #: wp-admin/includes/post.php:1364 msgid "Remove featured image" msgstr "Supprimer l’image Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: The rating, 2: The number of ratings +#: wp-admin/includes/template.php:2233 +msgid "%1$s rating based on %2$s rating" +msgid_plural "%1$s rating based on %2$s ratings" +msgstr[0] "Une note de %1$s basÃ©e sur %2$s vote" +msgstr[1] "Une note de %1$s basÃ©e sur %2$s votes" +||||||| .r11156 +#: wp-admin/export.php:173 wp-admin/export.php:205 +msgid "Date range:" +msgstr "Date de crÃ©ation :" +======= #: wp-admin/includes/post.php:1278 msgid "Change Permalinks" msgstr "Modifier les permaliens" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: The rating +#: wp-admin/includes/template.php:2237 +msgid "%s rating" +msgstr "Note : %s" +||||||| .r11156 +#: wp-admin/export.php:157 +msgid "This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts." +msgstr "Il contiendra tous vos articles, pages, commentaires, champs personnalisÃ©s, termes, menus de navigation et types de contenus personnalisÃ©s." +======= #: wp-admin/includes/post.php:1276 wp-admin/includes/post.php:1299 msgid "Permalink:" msgstr "Permalien :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:74 +#: wp-admin/includes/theme-install.php:85 +msgid "Search by keyword" +msgstr "Recherche par mot-clÃ©." +||||||| .r11156 +#: wp-admin/export.php:153 +msgid "Choose what to export" +msgstr "Choisissez ce que vous souhaitez exporter" +======= #: wp-admin/includes/post.php:1272 msgid "Temporary permalink. Click to edit this part." msgstr "Permalien temporaire. Cliquez pour modifier cette section." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/theme-install.php:69 +msgctxt "Theme Installer" +msgid "Tag" +msgstr "Ãtiquette" +||||||| .r11156 +#: wp-admin/export.php:166 wp-admin/export.php:198 +msgid "Authors:" +msgstr "Auteur :" +======= #: wp-admin/includes/post.php:1270 msgid "Click to edit this part of the permalink" msgstr "Cliquez pour modifier cette section du permalien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1171 +msgid "Number of items per page:" +msgstr "Nombre d'Ã©lÃ©ments par page :" +||||||| .r11156 +#: wp-admin/export.php:156 +msgid "All content" +msgstr "Tout le contenu" +======= #: wp-admin/includes/post.php:710 msgid "You are not allowed to create posts or drafts on this site." msgstr "Vous n’avez pas l’autorisation de crÃ©er des articles ou des brouillons sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1736 +msgid "Posts Page" +msgstr "Page des articles" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:214 +msgctxt "themes" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +======= #: wp-admin/includes/post.php:708 msgid "You are not allowed to create pages on this site." msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:2255 +msgid "You are currently editing the page that shows your latest posts." +msgstr "Vous Ãªtes en train de modifier la page qui affiche vos derniers articles." +||||||| .r11156 +#: wp-admin/includes/file.php:312 +msgid "Sorry, this file type is not permitted for security reasons." +msgstr "DÃ©solÃ©, ce type de fichier n’est pas autorisÃ© pour des raisons de sÃ©curitÃ©." +======= #: wp-admin/includes/post.php:593 msgid "Auto Draft" msgstr "Brouillon auto" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/revision.php:207 wp-admin/includes/revision.php:225 +msgctxt "revision date short format" +msgid "j M @ H:i" +msgstr "j F \\Ã G \\h i \\m\\i\\n " +||||||| .r11156 +#: wp-admin/admin-header.php:32 wp-admin/customize.php:88 +msgid "%1$s — WordPress" +msgstr "%1$s — WordPress" +======= #: wp-admin/includes/post.php:422 msgid "You are not allowed to edit posts." msgstr "Vous n’avez pas l’autorisation de modifier les articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1732 +msgid "Front Page" +msgstr "Page dâaccueil" +||||||| .r11156 +#: wp-admin/user-edit.php:270 +msgid "More information" +msgstr "Plus d’informations" +======= #: wp-admin/includes/post.php:420 msgid "You are not allowed to edit pages." msgstr "Vous n’avez pas l’autorisation de modifier les pages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:478 +msgid "Active Installs:" +msgstr "Installations actives :" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:309 +msgctxt "column name" +msgid "In Response To" +msgstr "En rÃ©ponse Ã " +======= #: wp-admin/includes/post.php:35 wp-admin/includes/post.php:73 msgid "You are not allowed to edit posts as this user." msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:784 +msgid "Month" +msgstr "Mois" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:407 +msgid "Submitted on %2$s at %3$s" +msgstr "EnvoyÃ© le %2$s Ã %3$s" +======= #: wp-admin/includes/post.php:33 wp-admin/includes/post.php:71 msgid "You are not allowed to edit pages as this user." msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:794 +msgid "Day" +msgstr "Jour" +||||||| .r11156 +#: wp-admin/edit-comments.php:134 +msgid "Documentation on Comment Spam" +msgstr "Documentation sur les commentaires indÃ©sirables" +======= #: wp-admin/includes/plugin.php:1748 wp-admin/includes/plugin.php:1753 #: wp-admin/includes/plugin.php:1775 wp-admin/includes/plugin.php:1780 #: wp-admin/includes/template.php:1216 wp-admin/includes/template.php:1221 msgid "The \"%s\" options group has been removed. Use another settings group." msgstr "Le groupement d’options « %s » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:796 +msgid "Hour" +msgstr "Heure" +||||||| .r11156 +#: wp-admin/edit-comments.php:135 +msgid "Documentation on Keyboard Shortcuts" +msgstr "Documentation sur les raccourcis clavier" +======= #: wp-admin/includes/plugin.php:917 msgid "The plugin does not have a valid header." msgstr "Cette extension ne dispose pas d’un en-tÃªte valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:797 +msgid "Minute" +msgstr "Minute" +||||||| .r11156 +#: wp-admin/widgets.php:53 +msgid "The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget." +msgstr "La section « Widgets disponibles » contient tous les widgets que vous pouvez utiliser. Une fois le widget glissÃ© dans la barre latÃ©rale, il s’ouvrira pour vous permettre d’en modifier les rÃ©glages. Quand vous Ãªtes satisfait de vos rÃ©glages, cliquez sur le bouton « Enregistrer » et le widget sera lancÃ© sur votre site. Si vous cliquez sur « Supprimer », le widget sera enlevÃ© du site." +======= #: wp-admin/includes/plugin.php:913 msgid "Plugin file does not exist." msgstr "Le fichier de l’extension n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:390 +msgctxt "Plugin installer section title" +msgid "Reviews" +msgstr "Avis" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:320 wp-admin/media.php:78 +msgid "Remember to click Update Media to save metadata entered or changed." +msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le fichier » afin de conserver les mÃ©tadonnÃ©es ajoutÃ©es ou modifiÃ©es." +======= #: wp-admin/includes/plugin.php:911 msgid "Invalid plugin path." msgstr "Chemin d’extension non valide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:490 +#: wp-admin/includes/plugin-install.php:537 +msgid "Donate to this plugin »" +msgstr "Faites Ã un don Ã cette extension »" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:319 wp-admin/media.php:77 +msgid "Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping." +msgstr "Pour recadrer une image, cliquez sur l’icÃ´ne Recadrer puis sÃ©lectionnez la zone Ã conserver en cliquant sur l’image et en faisant glisser le curseur de la souris. Ensuite, cliquez sur Enregistrer pour conserver votre modification." +======= #: wp-admin/includes/plugin.php:856 msgid "Could not fully remove the plugin(s) %s." msgstr "Impossible de supprimer complÃ¨tement la ou les extensions %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:507 +msgid "Click to see reviews that provided a rating of %d star" +msgid_plural "Click to see reviews that provided a rating of %d stars" +msgstr[0] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toile" +msgstr[1] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toiles" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:318 wp-admin/media.php:76 +msgid "For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information." +msgstr "Pour les images (et seulement elles), vous pouvez cliquer sur « Modifier l’Image », sous la miniature, afin de faire apparaÃ®tre un Ã©diteur d’image, vous permettant de recadrer, d’appliquer une rotation ou d’inverser une image, ainsi que de dÃ©faire et refaire vos modifications. Les blocs sur la droite vous donnent accÃ¨s Ã d’autres options pour le changement d’Ã©chelle, le recadrage et mÃªme le recadrage de la miniature, qui peut Ãªtre diffÃ©rent de celui de l’image originale. Cliquez sur le bouton Aide de ces blocs pour obtenir plus d’informations." +======= #: wp-admin/includes/plugin.php:742 msgid "One of the plugins is invalid." msgstr "L’une des extensions n’est pas valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:517 +msgid "Contributors" +msgstr "Contributeurs" +||||||| .r11156 +#: wp-admin/media.php:75 +msgid "This screen allows you to edit five fields for metadata in a file within the media library." +msgstr "Cet Ã©cran vous permet de modifier les 4 champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +======= #: wp-admin/includes/plugin.php:605 msgid "The plugin generated unexpected output." msgstr "Cette extension a produit un rÃ©sultat inattendu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:507 +msgid "%d star" +msgid_plural "%d stars" +msgstr[0] "%d Ã©toile" +msgstr[1] "%d Ã©toiles" +||||||| .r11156 +#: wp-admin/user-new.php:280 +msgid "E-mail or Username" +msgstr "E-mail ou identifiant" +======= #: wp-admin/includes/plugin.php:423 msgid "Custom site suspended message." msgstr "Message personnalisÃ© de site suspendu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/template.php:1190 +msgid "Press return or enter to expand" +msgstr "Appuyez sur la touche Envoi ou EntrÃ©e pour ouvrir" +||||||| .r11156 +#: wp-admin/admin-header.php:34 +msgid "%1$s ‹ %2$s — WordPress" +msgstr "%1$s ‹ %2$s — WordPress" +======= #: wp-admin/includes/plugin.php:422 msgid "Custom site inactive message." msgstr "Message personnalisÃ© de site inactif." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1086 +msgctxt "Welcome panel" +msgid "Welcome" +msgstr "Bienvenue" +||||||| .r11156 +#: wp-admin/themes.php:106 +msgid "Search Installed Themes" +msgstr "Chercher parmi les thÃ¨mes installÃ©s" +======= #: wp-admin/includes/plugin.php:421 msgid "Custom site deleted message." msgstr "Message personnalisÃ© de site supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/screen.php:1012 +msgid "Enable full-height editor and distraction-free functionality." +msgstr "Activer l'Ã©diteur plein-Ã©cran et la fonctionnalitÃ© d'Ã©criture sans distraction." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:527 +msgid "Enable this theme for all sites in this network" +msgstr "Activer ce thÃ¨me sur tous les sites de ce rÃ©seau" +======= #: wp-admin/includes/plugin.php:420 msgid "Executed before Multisite is loaded." msgstr "ExÃ©cutÃ© avant que la fonctionnalitÃ© multisites ne soit chargÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2414 wp-admin/includes/nav-menu.php:672 +#: wp-admin/includes/nav-menu.php:929 +msgid "«" +msgstr "«" +||||||| .r11156 +#: wp-admin/update-core.php:300 +msgid "Please Note: Any customizations you have made to theme files will be lost. Please consider using child themes for modifications." +msgstr "Notez bien : toutes les personnalisations que vous pourriez avoir apportÃ©es aux fichiers des thÃ¨mes seront perdues. Pensez Ã utiliser des thÃ¨mes enfants pour vos modifications." +======= #: wp-admin/includes/plugin.php:416 msgid "External object cache." msgstr "Cache d’objet externe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2415 wp-admin/includes/nav-menu.php:673 +#: wp-admin/includes/nav-menu.php:930 +msgid "»" +msgstr "»" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:189 +msgctxt "posts" +msgid "Sticky (%s)" +msgid_plural "Sticky (%s)" +msgstr[0] "Mis en avant (%s)" +msgstr[1] "Mis en avant (%s)" +======= #: wp-admin/includes/plugin.php:415 msgid "Custom maintenance message." msgstr "Message personnalisÃ© pour la maintenance." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: draft saved date format, see http:php.net/date +#: wp-admin/includes/misc.php:832 +msgid "g:i:s a" +msgstr "G \\h i \\m\\i\\n s \\s" +||||||| .r11156 +#: wp-admin/update-core.php:508 +msgid "Please select one or more plugins to update." +msgstr "Veuillez sÃ©lectionner une ou plusieurs extensions Ã mettre Ã jour." +======= #: wp-admin/includes/plugin.php:414 msgid "Custom install script." msgstr "Script d’installation personnalisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: date and time +#: wp-admin/includes/misc.php:834 +msgid "Draft saved at %s." +msgstr "Brouillon enregistrÃ© Ã %s." +||||||| .r11156 +#: wp-admin/update-core.php:506 +msgid "Please select one or more themes to update." +msgstr "Veuillez sÃ©lectionner un ou plusieurs thÃ¨mes Ã mettre Ã jour." +======= #: wp-admin/includes/plugin.php:413 msgid "Custom database error message." msgstr "Message personnalisÃ© pour l’erreur de base de donnÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1475 wp-admin/upgrade.php:76 +#: wp-admin/upgrade.php:110 +msgid "Continue" +msgstr "Continuer" +||||||| .r11156 +#: wp-admin/update-core.php:514 +msgid "Last checked on %1$s at %2$s." +msgstr "DerniÃ¨re vÃ©rification le %1$s Ã %2$s." +======= #: wp-admin/includes/plugin.php:412 msgid "Custom database class." msgstr "Classe personnalisÃ©e de connexion Ã la base de donnÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:159 +msgid "Blogger" +msgstr "Blogger" +||||||| .r11156 +#: wp-admin/update-core.php:515 +msgid "Check Again" +msgstr "VÃ©rifier Ã nouveau" +======= #: wp-admin/includes/plugin.php:411 msgid "Advanced caching plugin." msgstr "Extension de cache avancÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:171 +msgid "LiveJournal" +msgstr "LiveJournal" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:205 +msgid "The update process is starting. This process may take a while on some hosts, so please be patient." +msgstr "Le processus de mise Ã jour se lance. Il peut prendre un certain temps chez certains hÃ©bergeurs, merci pour votre patience." +======= #: wp-admin/includes/plugin.php:171 msgid "By %s." msgstr "par %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:177 +msgid "Movable Type and TypePad" +msgstr "Movable Type et TypePad" +||||||| .r11156 +#: wp-admin/options-general.php:288 +msgid "Documentation on date and time formatting." +msgstr "Documentation sur le format des dates." +======= #: wp-admin/includes/plugin.php:92 msgid "The %1$s plugin header is deprecated. Use %2$s instead." msgstr "L’en-tÃªte de l’extension %1$s%2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:183 +msgid "Blogroll" +msgstr "Liens" +||||||| .r11156 +#: wp-admin/includes/user.php:437 +msgid "You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?" +msgstr "Votre compte utilise toujours le mot de passe gÃ©nÃ©rÃ© automatiquement. Souhaitez-vous le changer pour un mot de passe plus facile Ã mÃ©moriser ?" +======= #: wp-admin/includes/plugin-install.php:571 msgid "Latest Version Installed" msgstr "DerniÃ¨re version installÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:603 +msgid "Cannot load image metadata." +msgstr "Impossible de charger les mÃ©tadonnÃ©es de l’image." +||||||| .r11156 +#: wp-admin/theme-install.php:151 +msgid "Apply Filters" +msgstr "Appliquer les filtres" +======= #: wp-admin/includes/plugin-install.php:568 msgid "Newer Version (%s) Installed" msgstr "Une version plus rÃ©cente (%s) est installÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:659 +msgid "Cannot save image metadata." +msgstr "Impossible d’enregistrer les mÃ©tadonnÃ©es de l’image." +||||||| .r11156 +#: wp-admin/includes/theme.php:223 +msgid "RTL Language Support" +msgstr "Support des langues RTL" +======= #: wp-admin/includes/plugin-install.php:564 msgid "Install Update Now" msgstr "Installer la mise Ã jour maintenant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:664 +msgid "Image metadata is inconsistent." +msgstr "Les mÃ©tadonnÃ©es de l’image ne sont pas cohÃ©rentes." +||||||| .r11156 +#: wp-admin/includes/theme.php:210 +msgid "BuddyPress" +msgstr "BuddyPress" +======= #: wp-admin/includes/plugin-install.php:535 msgid "Warning: This plugin has not been marked as compatible with your version of WordPress." msgstr "Attention : cette extension n’a pas Ã©tÃ© marquÃ©e comme Ã©tant compatible avec votre version de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:689 +msgid "Unable to create new image." +msgstr "Ãchec lors de la crÃ©ation d’une nouvelle image." +||||||| .r11156 +#: wp-admin/includes/theme.php:215 +msgid "Editor Style" +msgstr "Ãditeur de style" +======= #: wp-admin/includes/plugin-install.php:533 msgid "Warning: This plugin has not been tested with your current version of WordPress." msgstr "Attention : cette extension n’a pas Ã©tÃ© testÃ©e avec votre version de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:720 +msgid "Nothing to save, the image has not changed." +msgstr "Rien Ã enregistrer, l’image n’a pas Ã©tÃ© modifiÃ©e." +||||||| .r11156 +#: wp-admin/includes/theme.php:219 +msgid "Front Page Posting" +msgstr "Page d’accueil personnalisÃ©e" +======= #: wp-admin/includes/plugin-install.php:506 msgid "Contributors" msgstr "Contributeurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:861 +msgid "Image saved" +msgstr "Image enregistrÃ©e" +||||||| .r11156 +#: wp-admin/includes/theme.php:227 +msgid "Translation Ready" +msgstr "PrÃªt Ã Ãªtre traduit" +======= #: wp-admin/includes/plugin-install.php:496 msgid "%d star" msgid_plural "%d stars" msgstr[0] "%d Ã©toile" msgstr[1] "%d Ã©toiles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:18 +msgid "From Computer" +msgstr "Depuis votre ordinateur" +||||||| .r11156 +#: wp-admin/comment.php:71 +msgid "You are not allowed to edit this comment." +msgstr "Vous n’avez pas l’autorisation de modifier ce commentaire." +======= #: wp-admin/includes/plugin-install.php:496 msgid "Click to see reviews that provided a rating of %d star" msgid_plural "Click to see reviews that provided a rating of %d stars" msgstr[0] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toile" msgstr[1] "Cliquez vous pour lire les avis qui donnent une note de %d Ã©toiles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:19 +msgid "From URL" +msgstr "Depuis le Web" +||||||| .r11156 +#: wp-admin/includes/file.php:1076 +msgid "To perform the requested action, WordPress needs to access your web server." +msgstr "Pour lancer la requÃªte demandÃ©e, WordPress a besoin d’accÃ©der Ã votre serveur web." +======= #: wp-admin/includes/plugin-install.php:483 msgid "Average Rating" msgstr "Moyenne des notes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:20 +msgid "Gallery" +msgstr "Galerie" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:669 +msgid "Current page" +msgstr "Page actuelle" +======= #: wp-admin/includes/plugin-install.php:479 #: wp-admin/includes/plugin-install.php:526 msgid "Donate to this plugin »" msgstr "Faites Ã un don Ã cette extension »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:62 +msgid "Gallery (%s)" +msgstr "Galerie (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:659 +msgid "Go to the previous page" +msgstr "Aller Ã la page prÃ©cÃ©dente" +======= #: wp-admin/includes/plugin-install.php:477 msgid "Plugin Homepage »" msgstr "Site Web de l’extension »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:445 +msgid "Uploads" +msgstr "Fichiers envoyÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:679 +msgid "Go to the next page" +msgstr "Aller Ã la page suivante" +======= #: wp-admin/includes/plugin-install.php:475 msgid "WordPress.org Plugin Page »" msgstr "Page WordPress.org de l’extension »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:445 wp-admin/includes/template.php:1614 +#: wp-admin/install.php:79 wp-admin/maint/repair.php:25 +#: wp-admin/setup-config.php:90 wp-admin/upgrade.php:70 +msgid "WordPress" +msgstr "WordPress" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:686 +msgid "Go to the last page" +msgstr "Aller Ã la derniÃ¨re page" +======= #: wp-admin/includes/plugin-install.php:467 msgid "Active Installs:" msgstr "Installations actives :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1054 wp-admin/includes/media.php:1211 +msgid "File URL" +msgstr "Adresse web du fichier" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:379 +#: wp-admin/includes/class-wp-list-table.php:633 +#: wp-admin/includes/class-wp-list-table.php:1052 +msgid "1 item" +msgid_plural "%s items" +msgstr[0] "1 Ã©lÃ©ment" +msgstr[1] "%s Ã©lÃ©ments" +======= #: wp-admin/includes/plugin-install.php:465 msgid "Compatible up to:" msgstr "Compatible jusqu’Ã la version : " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1256 wp-admin/includes/media.php:2553 +msgid "Alt text for the image, e.g. “The Mona Lisa”" +msgstr "Texte alternatif de l’image, exemple : « La Joconde »" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:123 +msgid "No matching users were found." +msgstr "Aucun utilisateur ne correspond." +======= #: wp-admin/includes/plugin-install.php:463 msgid "%s or higher" msgstr "%s ou plus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1133 +msgid "Empty Title filled from filename." +msgstr "Titre absent, il sera rempli Ã partir du nom du fichier." +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:137 +msgid "No themes match your request." +msgstr "Aucun thÃ¨me ne correspond Ã votre requÃªte." +======= #: wp-admin/includes/plugin-install.php:463 msgid "Requires WordPress Version:" msgstr "NÃ©cessite WordPress en version :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1215 +msgid "Location of the uploaded file." +msgstr "Emplacement du fichier envoyÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:652 +msgid "Go to the first page" +msgstr "Aller Ã la premiÃ¨re page" +======= #: wp-admin/includes/plugin-install.php:457 msgid "Author:" msgstr "Auteur :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1445 +msgid "Upload date:" +msgstr "Date de mise en ligne :" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:390 +msgid "Search Sites" +msgstr "Chercher un site" +======= #: wp-admin/includes/plugin-install.php:402 wp-admin/update.php:106 msgid "Plugin Install" msgstr "Installation d’extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1465 wp-admin/includes/media.php:2583 +#: wp-admin/includes/media.php:2589 +msgid "Insert into Post" +msgstr "InsÃ©rer dans l’article" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:344 +msgid "Create a New User" +msgstr "CrÃ©er un nouvel utilisateur" +======= #: wp-admin/includes/plugin-install.php:380 msgctxt "Plugin installer section title" msgid "Other Notes" msgstr "Autres notes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1474 +msgid "You are about to delete %s." +msgstr "Vous Ãªtes sur le point de supprimer %s." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:352 +msgid "You have %1$s and %2$s." +msgstr "Vous avez %1$s et %2$s." +======= #: wp-admin/includes/plugin-install.php:379 msgctxt "Plugin installer section title" msgid "Reviews" msgstr "Avis" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1981 +msgid "Add media files from your computer" +msgstr "Ajouter un fichier mÃ©dia depuis votre ordinateur" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:350 +msgid "%s site" +msgid_plural "%s sites" +msgstr[0] "%s site" +msgstr[1] "%s sites" +======= #: wp-admin/includes/plugin-install.php:378 msgctxt "Plugin installer section title" msgid "Changelog" msgstr "Liste des modifications" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2008 wp-admin/includes/media.php:2219 +#: wp-admin/includes/media.php:2486 +msgid "Save all changes" +msgstr "Enregistrer toutes les modifications" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:349 +msgid "%s user" +msgid_plural "%s users" +msgstr[0] "%s utilisateur" +msgstr[1] "%s utilisateurs" +======= #: wp-admin/includes/plugin-install.php:377 msgctxt "Plugin installer section title" msgid "Screenshots" msgstr "Captures d’Ã©crans" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2194 +msgid "All Tabs:" +msgstr "Tous les onglets :" +||||||| .r11156 +#: wp-admin/update-core.php:166 +msgid "Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page." +msgstr "Important : avant de faire une mise Ã jour, veillez Ã faire une sauvegarde de votre base de donnÃ©es et de vos fichiers. Pour obtenir de l’aide sur les mises Ã jour, lisez la page Mettre Ã jour WordPress." +======= #: wp-admin/includes/plugin-install.php:376 msgctxt "Plugin installer section title" msgid "FAQ" msgstr "FAQ" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2198 +msgid "Sort Order:" +msgstr "Ordre de tri :" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:937 +msgid "http://wordpress.org/news/" +msgstr "http://www.wordpress-fr.net/" +======= #: wp-admin/includes/plugin-install.php:375 msgctxt "Plugin installer section title" msgid "Installation" msgstr "Installation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2199 wp-admin/includes/media.php:2267 +msgid "Ascending" +msgstr "Croissant" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:946 +msgid "http://wordpress.org/news/feed/" +msgstr "http://feeds.feedburner.com/WordpressFrancophone" +======= #: wp-admin/includes/plugin-install.php:374 msgctxt "Plugin installer section title" msgid "Description" msgstr "Description" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2200 wp-admin/includes/media.php:2270 +msgid "Descending" +msgstr "DÃ©croissant" +||||||| .r11156 +#: wp-admin/options-discussion.php:66 +msgid "(Signup has been disabled. Only members of this site can comment.)" +msgstr " (L’inscription a Ã©tÃ© dÃ©sactivÃ©e. Seuls les membres de ce site peuvent laisser un commentaire.)" +======= #: wp-admin/includes/plugin-install.php:249 msgid "These suggestions are based on the plugins you and other users have installed." msgstr "Ces suggestions sont basÃ©es sur les extensions que vous et d'autres utilisateurs ont installÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2231 +msgid "Link thumbnails to:" +msgstr "Lier les miniatures Ã  :" +||||||| .r11156 +#: wp-admin/update-core.php:67 +msgid "You can update to WordPress %2$s automatically or download the package and install it manually:" +msgstr "Vous pouvez faire la mise Ã jour vers WordPress %2$s automatiquement ou tÃ©lÃ©charger l’archive complÃ¨te et l’installer vous-mÃªme :" +======= #: wp-admin/includes/plugin-install.php:228 msgid "Get Favorites" msgstr "RÃ©cupÃ©rer les extensions favorites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2236 +msgid "Image File" +msgstr "Fichier image" +||||||| .r11156 +#: wp-admin/user-new.php:158 +msgid "New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email." +msgstr "Les nouveaux utilisateurs reÃ§oivent un message les informant qu’ils ont Ã©tÃ© ajoutÃ©s aux utilisateurs de ce site. Par dÃ©faut, ce message contient Ã©galement leur mot de passe. DÃ©cochez la case si vous ne voulez pas que le mot de passe y soit inclus." +======= #: wp-admin/includes/plugin-install.php:226 msgid "Your WordPress.org username:" msgstr "Votre identifiant WordPress.org :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2246 +msgid "Order images by:" +msgstr "Ranger les images par :" +||||||| .r11156 +#: wp-admin/includes/theme.php:151 wp-admin/includes/update.php:282 +#: wp-admin/includes/update.php:371 +msgid "There is a new version of %1$s available. View version %4$s details." +msgstr "Il y a une nouvelle version de %1$s disponible. Afficher les dÃ©tails de la version %4$s." +======= #: wp-admin/includes/plugin-install.php:222 msgid "If you have marked plugins as favorites on WordPress.org, you can browse them here." msgstr "Si vous avez mis des extensions en favoris sur WordPress.org, vous pouvez les voir ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2251 +msgid "Menu order" +msgstr "Ordre du menu" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:372 +msgid "Go to themes page" +msgstr "Aller Ã la page des thÃ¨mes" +======= #: wp-admin/includes/plugin-install.php:205 msgid "Plugin zip file" msgstr "Archive Zip de l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2253 +msgid "Date/Time" +msgstr "Horodatage" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:166 +#: wp-admin/includes/class-wp-upgrader-skins.php:327 +msgid "Go to plugins page" +msgstr "Aller sur la page des extensions" +======= #: wp-admin/includes/plugin-install.php:202 msgid "If you have a plugin in a .zip format, you may install it by uploading it here." msgstr "Si vous avez une extension au format .zip, vous pouvez l’installer en la mettant en ligne ici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2262 +msgid "Order:" +msgstr "Ordre :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:328 +#: wp-admin/includes/class-wp-upgrader-skins.php:373 +#: wp-admin/includes/class-wp-upgrader-skins.php:672 +msgid "Go to WordPress Updates page" +msgstr "Aller Ã la page des mises Ã jour de WordPress" +======= #: wp-admin/includes/plugin-install.php:185 msgctxt "Plugin Installer" msgid "Tag" msgstr "Ãtiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2277 +msgid "Gallery columns:" +msgstr "Colonnes de galerie :" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:89 +msgid "%s (Pending)" +msgstr "%s (en attente)" +======= #: wp-admin/includes/plugin-install.php:183 #: wp-admin/includes/theme-install.php:65 msgid "Keyword" msgstr "Mot-clÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2298 +msgid "Update gallery settings" +msgstr "Mettre Ã jour les rÃ©glages de galerie" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1193 +msgid "Click Save Menu to make pending menu items public." +msgstr "Cliquez sur « Enregistrer le menu » pour rendre publics les Ã©lÃ©ments en attente." +======= #: wp-admin/includes/plugin-install.php:176 #: wp-admin/includes/plugin-install.php:188 #: wp-admin/includes/plugin-install.php:191 @@ -4887,183 +17020,636 @@ msgstr "Certains Ã©lÃ©ments du menu ne sont pas valides. Veuillez les vÃ©rifier #: wp-admin/includes/nav-menu.php:1192 msgid "Click Save Menu to make pending menu items public." msgstr "Cliquez sur « Enregistrer le menu » pour rendre publics les Ã©lÃ©ments en attente." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2382 +msgid "All Types" +msgstr "Tous les types" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:1132 +msgid "Storage Space" +msgstr "Espace disque" +======= #: wp-admin/includes/nav-menu.php:1181 msgid "The Walker class named %s does not exist." msgstr "La classe Walker nommÃ©e %s n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2456 +msgid "Filter »" +msgstr "Filtrer »" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:342 wp-admin/includes/ms.php:675 +msgid "Create a New Site" +msgstr "CrÃ©er un nouveau site" +======= #: wp-admin/includes/nav-menu.php:1162 msgid "Add menu items from the column on the left." msgstr "Ajouter des Ã©lÃ©ments de menu depuis la colonne de gauche." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2507 +msgid "Image Caption" +msgstr "LÃ©gende de l’image" +||||||| .r11156 +#: wp-admin/plugins.php:340 +msgctxt "plugins per page (screen options)" +msgid "Plugins" +msgstr "Extensions" +======= #: wp-admin/includes/nav-menu.php:697 wp-admin/includes/nav-menu.php:937 msgid "View All" msgstr "Afficher tout" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2572 +msgid "Link Image To:" +msgstr "Lier l’image Ã  :" +||||||| .r11156 +#: wp-admin/upload.php:194 +msgctxt "items per page (screen options)" +msgid "Media items" +msgstr "Fichiers mÃ©dia" +======= #: wp-admin/includes/nav-menu.php:692 msgid "Most Recent" msgstr "Les plus rÃ©centes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2577 +msgid "Link to image" +msgstr "Lier Ã l’image" +||||||| .r11156 +#: wp-admin/edit-comments.php:112 +msgctxt "comments per page (screen options)" +msgid "Comments" +msgstr "Commentaires" +======= #: wp-admin/includes/nav-menu.php:640 wp-admin/includes/nav-menu.php:880 msgid "No items." msgstr "Aucune entrÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2546 +msgid "Link text, e.g. “Ransom Demands (PDF)”" +msgstr "Texte du lien, par exemple « ThÃ©orie sur le chaos (PDF) »" +||||||| .r11156 +#: wp-admin/custom-header.php:573 +msgid "Images of exactly %1$d × %2$d pixels will be used as-is." +msgstr "Les images ayant pour taille exacte %1$d pixels par %2$d seront utilisÃ©es telles quelles." +======= #: wp-admin/includes/nav-menu.php:595 wp-admin/includes/nav-menu.php:838 #: wp-admin/includes/nav-menu.php:1026 msgid "Add to Menu" msgstr "Ajouter au menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:44 +msgid "Preview Changes" +msgstr "PrÃ©visualiser les modifications" +||||||| .r11156 +#: wp-admin/theme-install.php:103 +msgid "Documentation on Adding New Themes" +msgstr "Documentation sur l’ajout de thÃ¨mes (en)" +======= #: wp-admin/includes/nav-menu.php:589 msgid "Menu Item" msgstr "ÃlÃ©ment du menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:121 +msgid "Visibility:" +msgstr "VisibilitÃ© :" +||||||| .r11156 +#: wp-admin/custom-header.php:833 +msgid "Crop and Publish" +msgstr "Recadrer et publier" +======= #: wp-admin/includes/nav-menu.php:447 msgid "Custom Links" msgstr "Liens personnalisÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:129 wp-admin/includes/meta-boxes.php:152 +#: wp-admin/includes/template.php:1716 +msgid "Password protected" +msgstr "ProtÃ©gÃ© par mot de passe" +||||||| .r11156 +#: wp-admin/plugins.php:347 +msgid "You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here." +msgstr "Vous pouvez trouver d’autres extensions pour votre site au moyen de la fonctionnalitÃ© de dÃ©couverte/installation d’extensions, ou en vous rendant sur le rÃ©pertoire des extensions WordPress et en les installant manuellement. Pour installer une extension manuellement, il vous suffit gÃ©nÃ©ralement de mettre ses fichiers en ligne dans le dossier /wp-content/plugins. Ceci fait, vous pourrez activer cette extension depuis la prÃ©sente page." +======= #: wp-admin/includes/nav-menu.php:313 msgctxt "nav menu front page title" msgid "Home: %s" msgstr "Accueil : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:170 +msgid "Scheduled for: %1$s" +msgstr "PlanifiÃ© pour : %1$s" +||||||| .r11156 +#: wp-admin/edit-link-form.php:60 +msgid "XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking." +msgstr "XFN signifie XHTML Friends Network, c’est-Ã -dire RÃ©seau XHTML d’Amis. Son usage est facultatif. WordPress permet de gÃ©nÃ©rer les attributs XFN de vos liens, afin d’indiquer la maniÃ¨re dont vous Ãªtes liÃ© Ã l’auteur ou le propriÃ©taire de la page liÃ©e." +======= #: wp-admin/includes/nav-menu.php:312 wp-admin/includes/nav-menu.php:783 msgctxt "nav menu home label" msgid "Home" msgstr "Accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:172 +msgid "Published on: %1$s" +msgstr "PubliÃ© le : %1$s" +||||||| .r11156 +#: wp-admin/plugins.php:359 +msgid "Documentation on Managing Plugins" +msgstr "Documentation sur la gestion des extensions (en)" +======= #: wp-admin/includes/nav-menu.php:200 msgid "Original: %s" msgstr "Original : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:174 wp-admin/includes/meta-boxes.php:182 +msgid "Publish immediately" +msgstr "Publier tout de suite" +||||||| .r11156 +#: wp-admin/theme-editor.php:42 +msgid "Documentation on Template Tags" +msgstr "Documentation sur les marqueurs des modÃ¨les (en)" +======= #: wp-admin/includes/nav-menu.php:193 msgid "To the top" msgstr "Tout en haut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:178 +msgid "Publish on: %1$s" +msgstr "Publier le : %1$s" +||||||| .r11156 +#: wp-admin/theme-editor.php:41 +msgid "Documentation on Editing Files" +msgstr "Documentation sur l’Ã©dition des fichiers" +======= #: wp-admin/includes/nav-menu.php:190 msgid "Down one" msgstr "Descendre d’un cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:478 wp-admin/includes/meta-boxes.php:864 +#: wp-admin/includes/nav-menu.php:965 +msgid "Most Used" +msgstr "Les plus utilisÃ©es" +||||||| .r11156 +#: wp-admin/theme-editor.php:40 wp-admin/themes.php:85 +msgid "Documentation on Using Themes" +msgstr "Documentation sur l’utilisation des thÃ¨mes (en)" +======= #: wp-admin/includes/nav-menu.php:189 msgid "Up one" msgstr "Un cran vers le haut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:547 +msgid "Already pinged:" +msgstr "DÃ©jÃ notifiÃ©(s) par ping :" +||||||| .r11156 +#: wp-admin/theme-editor.php:39 +msgid "Documentation on Theme Development" +msgstr "Documentation sur le dÃ©veloppement de thÃ¨me (en)" +======= #: wp-admin/includes/nav-menu.php:188 msgid "Move" msgstr "DÃ©placer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:556 +msgid "Send trackbacks to:" +msgstr "Envoyer un rÃ©trolien vers :" +||||||| .r11156 +#: wp-admin/includes/file.php:1086 +msgid "FTP Password" +msgstr "Mot de passe FTP" +======= #: wp-admin/includes/nav-menu.php:182 msgid "The description will be displayed in the menu if the current theme supports it." msgstr "La description sera affichÃ©e dans le menu si le thÃ¨me actuel l’accepte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:556 +msgid "Separate multiple URLs with spaces" +msgstr "SÃ©parez les adresses web par des espaces" +||||||| .r11156 +#: wp-admin/includes/file.php:1085 +msgid "FTP Username" +msgstr "Identifiant FTP" +======= #: wp-admin/includes/nav-menu.php:168 msgid "CSS Classes (optional)" msgstr "Classes CSS (facultatives)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:804 +msgid "Visit Link" +msgstr "Visiter le lien" +||||||| .r11156 +#: wp-admin/includes/file.php:1082 +msgid "FTP/SSH Password" +msgstr "Mot de passe FTP/SSH" +======= #: wp-admin/includes/nav-menu.php:156 msgid "Title Attribute" msgstr "Attribut de titre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:812 +msgid "Keep this link private" +msgstr "Ce lien est privÃ©" +||||||| .r11156 +#: wp-admin/includes/file.php:1081 +msgid "FTP/SSH Username" +msgstr "Identifiant FTP/SSH" +======= #: wp-admin/includes/nav-menu.php:150 msgid "Navigation Label" msgstr "Titre de la navigation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:885 wp-admin/includes/meta-boxes.php:887 +msgid "+ Add New Category" +msgstr "+ Ajouter une nouvelle catÃ©gorie" +||||||| .r11156 +#: wp-admin/options-reading.php:57 +msgid "You can choose what’s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two Pages. One will become the front page, and the other will be where your posts are displayed." +msgstr "Vous pouvez choisir ce qui est affichÃ© en page d’accueil de votre site. Au choix, le mode « blog » classique (les articles dans l’ordre chronologique inverse) ou une page statique. Pour mettre en place une page statique, vous devez d’abord crÃ©er deux pages : la premiÃ¨re servira de page d’accueil, la seconde affichera vos articles." +======= #: wp-admin/includes/nav-menu.php:132 wp-admin/includes/nav-menu.php:134 msgid "Edit Menu Item" msgstr "Modifier une entrÃ©e du menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:888 +msgid "New category name" +msgstr "Nom de la nouvelle catÃ©gorie" +||||||| .r11156 +#: wp-admin/options-permalink.php:38 +msgid "The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized." +msgstr "Les champs facultatifs, en bas de page, vous permettent de personnaliser les dÃ©nominations utilisÃ©es pour les chemins /category/ et /tags/ lors de l’affichage des archives. Par exemple, la page listant tous les articles de la catÃ©gorie « Non classÃ© » pourrait se lire comme /sujet/non-classe/ plutÃ´t que /category/non-classe/." +======= #: wp-admin/includes/nav-menu.php:102 msgid "sub item" msgstr "sous-Ã©lÃ©ment" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:909 +msgid "_blank — new window or tab." +msgstr "_blank — nouvelle fenÃªtre ou onglet." +||||||| .r11156 +#: wp-admin/themes.php:247 +msgid "The following themes are installed but incomplete. Themes must have a stylesheet and a template." +msgstr "Les thÃ¨mes suivants sont installÃ©s, mais incomplets. Les thÃ¨mes doivent avoir au moins une feuille de style et un modÃ¨le." +======= #. translators: %s: title of menu item in draft status #: wp-admin/includes/nav-menu.php:89 msgid "%s (Pending)" msgstr "%s (en attente)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:912 +msgid "_top — current window or tab, with no frames." +msgstr "_top — fenÃªtre ou onglet en cours, sans frame." +||||||| .r11156 +#: wp-admin/options-permalink.php:31 +msgid "When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%." +msgstr "Quand vous assignez un article Ã plusieurs catÃ©gories, une seule apparaÃ®tra dans le permalien : la catÃ©gorie avec l’identifiant numÃ©rique le plus bas. Idem pour les mots-clÃ©s. Cela s’applique si votre structure comprend %category% ou %tag%." +======= #. translators: %s: title of menu item which is invalid #: wp-admin/includes/nav-menu.php:85 msgid "%s (Invalid)" msgstr "%s (non valide)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:915 +msgid "_none — same window or tab." +msgstr "_none — mÃªme fenÃªtre ou onglet." +||||||| .r11156 +#: wp-admin/options-permalink.php:30 +msgid "If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there." +msgstr "Si vous choisissez une option autre que « Valeur par dÃ©faut », la structure de vos permaliens, avec les marqueurs utilisÃ©s (encadrÃ©s par %), apparaÃ®tra dans le champ de « Structure personnalisÃ©e », d’oÃ¹ vous pourrez la modifier au plus proche de vos besoins." +======= #. translators: My sites label #: wp-admin/includes/ms.php:790 msgid "Primary Site" msgstr "Site principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:917 +msgid "Choose the target frame for your link." +msgstr "Choisir la frame que cible le lien." +||||||| .r11156 +#: wp-admin/widgets.php:67 +msgid "Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area." +msgstr "De nombreux thÃ¨mes affichent par dÃ©faut quelques widgets dans la barre latÃ©rale, jusqu’Ã ce que vous la modifiez vous-mÃªmes. Ces widgets par dÃ©faut ne sont pas automatiquement affichÃ©s dans le gestionnaire de barre latÃ©rale. AprÃ¨s avoir fait vos propres modifications de widgets, vous pouvez rajouter les widgets par dÃ©faut depuis la section « Widgets Disponibles »." +======= #: wp-admin/includes/ms.php:737 msgid "Thank you for Updating! Please visit the Upgrade Network page to update all your sites." msgstr "Merci d’avoir fait cette mise Ã jour ! Rendez-vous sur la page de mise Ã jour du rÃ©seau afin de mettre Ã jour tous vos sites." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:964 +msgid "rel:" +msgstr "rel :" +||||||| .r11156 +#: wp-admin/widgets.php:59 +msgid "If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas." +msgstr "Si vous voulez enlever le widget, mais conserver ses rÃ©glages pour un possible usage futur, glissez-le simplement dans la zone « Widgets dÃ©sactivÃ©s ». De lÃ , vous pouvez les rajouter n’importe quand. C’est particuliÃ¨rement utile quand vous passez Ã un thÃ¨me avec moins de zones Ã widgets, ou des zones diffÃ©rentes." +======= #: wp-admin/includes/ms.php:706 msgid "English" msgstr "Anglais" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:968 wp-admin/includes/meta-boxes.php:969 +msgid "identity" +msgstr "identitÃ©" +||||||| .r11156 +#: wp-admin/users.php:27 +msgid "To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section." +msgstr "Pour ajouter un nouvel utilisateur Ã votre site, cliquez sur le bouton « Ajouter » en haut de l’Ã©cran, ou l’option « Ajouter » du menu « Utilisateurs »." +======= #: wp-admin/includes/ms.php:696 msgid "British English" msgstr "Anglais (UK)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:972 +msgid "another web address of mine" +msgstr "Une autre de mes adresses Web" +||||||| .r11156 +#: wp-admin/options-media.php:18 +msgid "You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size." +msgstr "Vous pouvez indiquer une taille maximale pour les images insÃ©rÃ©es dans votre contenu textuel. Vous pourrez insÃ©rer l’image dans sa taille d’origine." +======= #: wp-admin/includes/ms.php:692 msgid "American English" msgstr "Anglais (US)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:976 wp-admin/includes/meta-boxes.php:977 +msgid "friendship" +msgstr "amitiÃ©" +||||||| .r11156 +#: wp-admin/options-general.php:61 +msgid "Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes." +msgstr "La plupart des thÃ¨mes affichent le titre du site en haut de chaque page, dans la barre de titre du navigateur, et en tant qu’identifiant pour les flux de syndication, sauf si votre thÃ¨me en dÃ©cide autrement. Le slogan est Ã©galement utilisÃ© par de nombreux thÃ¨mes." +======= #: wp-admin/includes/ms.php:649 msgid "View Site" msgstr "Afficher le site" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:979 +msgid "contact" +msgstr "contact" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:372 +msgid "Order - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field." +msgstr "Ordre - Les pages sont gÃ©nÃ©ralement classÃ©es par ordre alphabÃ©tique, mais vous pouvez indiquer un nombre pour modifier l’ordre d’apparition." +======= #: wp-admin/includes/ms.php:648 msgid "Visit Dashboard" msgstr "Se rendre sur le Tableau de bord" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:982 +msgid "acquaintance" +msgstr "connaissance" +||||||| .r11156 +#: wp-admin/includes/file.php:1080 +msgid "Please enter your FTP or SSH credentials to proceed." +msgstr "Veuillez saisir votre identifiant FTP ou SSH pour continuer." +======= #: wp-admin/includes/ms.php:642 msgid "Your Sites" msgstr "Vos sites" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:985 +msgid "friend" +msgstr "ami(e)" +||||||| .r11156 +#: wp-admin/includes/file.php:1084 +msgid "Please enter your FTP credentials to proceed." +msgstr "Veuillez saisir votre identifiant FTP pour continuer." +======= #: wp-admin/includes/ms.php:640 msgid "If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way." msgstr "Si vous Ãªtes arrivÃ© sur cet Ã©cran par accident, et que vous vouliez en fait vous rendre sur l’un de vos propres sites, voici quelques raccourcis pour vous aider Ã trouver votre chemin." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:988 wp-admin/includes/meta-boxes.php:1021 +#: wp-admin/includes/meta-boxes.php:1044 +msgid "none" +msgstr "aucune" +||||||| .r11156 +#: wp-admin/includes/file.php:1090 +msgid "If you do not remember your credentials, you should contact your web host." +msgstr "Si vous ne vous souvenez pas de votre identifiant, vous devriez contacter votre hÃ©bergeur." +======= #: wp-admin/includes/ms.php:637 wp-admin/includes/ms.php:639 msgid "You attempted to access the \"%1$s\" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the \"%1$s\" dashboard, please contact your network administrator." msgstr "Vous avez tentÃ© d’accÃ©der au tableau de bord de « %1$s ». Cependant, vous ne disposez pas pour le moment des droits nÃ©cessaires sur ce site. Si vous pensez que vous devriez pouvoir accÃ©der au tableau de bord de « %1$s », contactez l’administrateur du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:993 wp-admin/includes/meta-boxes.php:994 +msgid "physical" +msgstr "physique" +||||||| .r11156 +#: wp-admin/theme-install.php:83 +msgid "You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory." +msgstr "Si vous disposez d’un thÃ¨me sous forme d’archive Zip sur votre ordinateur, vous pouvez mettre en ligne ce fichier avec le lien Envoyer. Assurez-vous bien que ce fichier provient d’une source de confiance. Vous pouvez Ã©galement le faire Ã l’ancienne, c’est-Ã -dire passer par un client FTP pour dÃ©poser les fichiers dans le dossier /wp-content/themes." +======= #: wp-admin/includes/ms.php:482 msgid "MB (Leave blank for network default)" msgstr "Mo (Laisser vide pour utiliser la valeur par dÃ©faut du rÃ©seau)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:996 +msgid "met" +msgstr "rencontrÃ©(e)" +||||||| .r11156 +#: wp-admin/user-edit.php:39 +msgid "Your profile contains information about you (your “account”) as well as some personal options related to using WordPress." +msgstr "Votre profil contient les informations Ã votre propos (votre « compte »), ainsi que quelques options liÃ©es Ã votre utilisation personnelle de WordPress." +======= #: wp-admin/includes/ms.php:482 msgid "Size in megabytes" msgstr "Taille en mÃ©gaoctets" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1001 wp-admin/includes/meta-boxes.php:1002 +msgid "professional" +msgstr "professionnel" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:297 +msgid "Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the “Parent” of the other, creating a group of Pages." +msgstr "Les pages sont comme des articles, en cela qu’elles ont un titre, un contenu et des mÃ©tadonnÃ©es associÃ©es ; mais elles diffÃ¨rent en cela qu’elles ne font pas partie du flux chronologique du blog - un peu comme des articles permanents. Les pages ne sont pas catÃ©gorisÃ©es et ne reÃ§oivent pas de mots-clÃ©s, mais peuvent disposer d’une hiÃ©rarchie. En effet, vous pouvez imbriquer des pages sous d’autres pages, faisant de ces derniÃ¨res les « parentes » des premiÃ¨res, crÃ©ant ainsi un groupement de pages." +======= #: wp-admin/includes/ms.php:479 msgid "Site Upload Space Quota" msgstr "Quota dâespace de fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1004 +msgid "co-worker" +msgstr "collÃ¨gue de travail" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:361 +msgid "Send Trackbacks - Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they’ll be notified automatically using pingbacks, and this field is unnecessary." +msgstr "Envoyer des rÃ©troliens - Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Saisissez les adresses web que vous voulez notifier. Si dans votre article vous faites des liens vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide de pings, sans devoir passer par un rÃ©trolien explicite." +======= #: wp-admin/includes/ms.php:442 msgid "Used: %1$s%% of %2$s" msgstr "Taux d’utilisation : %1$s%% sur %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1007 +msgid "colleague" +msgstr "confrÃ¨re" +||||||| .r11156 +#: wp-admin/user-new.php:175 +msgid "Contributors can write and manage their posts but not publish posts or upload media files." +msgstr "Les contributeurs peuvent Ã©crire et gÃ©rer leurs articles, mais ils ne peuvent pas publier les articles ou envoyer des fichiers mÃ©dia ;" +======= #. translators: Megabytes #: wp-admin/includes/ms.php:439 msgid "MB" msgstr "Mo" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1012 wp-admin/includes/meta-boxes.php:1013 +msgid "geographical" +msgstr "gÃ©ographique" +||||||| .r11156 +#: wp-admin/user-new.php:178 +msgid "Administrators have access to all the administration features." +msgstr "Les administrateurs peuvent accÃ©der Ã toutes les fonctionnalitÃ©s de l’administration ;" +======= #. translators: Gigabytes #: wp-admin/includes/ms.php:435 msgid "GB" msgstr "Go" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1015 +msgid "co-resident" +msgstr "colocataire" +||||||| .r11156 +#: wp-admin/plugin-editor.php:130 +msgid "You can use the editor to make changes to any of your plugins’ individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations." +msgstr "Vous pouvez utiliser l’Ã©diteur pour modifier n’importe quel fichier de vos extensions. Soyez cependant conscient que si vous modifiez les fichiers, les mises Ã jour les annuleront..." +======= #: wp-admin/includes/ms.php:414 msgid "Sorry, you have used your space allocation. Please delete some files to upload more files." msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota alouÃ©. Veuillez supprimer quelques fichiers avant d’en envoyer d’autres." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1018 +msgid "neighbor" +msgstr "voisin" +||||||| .r11156 +#: wp-admin/link-manager.php:47 +msgid "You can add links here to be displayed on your site, usually using Widgets. By default, links to several sites in the WordPress community are included as examples." +msgstr "Vous pouvez ici ajouter les liens que vous voulez voir affichÃ©s sur votre site, gÃ©nÃ©ralement par le biais de widgets. Des liens vers de nombreux sites de la communautÃ© WordPress sont inclus par dÃ©faut." +======= #: wp-admin/includes/ms.php:390 msgid "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." msgstr "Votre adresse e-mail n’a pas encore Ã©tÃ© mise Ã jour. Veuillez vÃ©rifier votre boite de rÃ©ception %s pour consulter l’e-mail de confirmation." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1026 wp-admin/includes/meta-boxes.php:1027 +msgid "family" +msgstr "famille" +||||||| .r11156 +#: wp-admin/link-manager.php:55 +msgid "If you delete a link, it will be removed permanently, as Links do not have a Trash function yet." +msgstr "Si vous supprimez un lien, il sera supprimÃ© dÃ©finitivement, car les liens n’ont pas accÃ¨s Ã la Corbeille pour le moment." +======= #: wp-admin/includes/ms.php:376 msgid "[%s] New Email Address" msgstr "[%s] Nouvelle adresse e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1029 +msgid "child" +msgstr "enfant" +||||||| .r11156 +#: wp-admin/custom-background.php:145 +msgid "Don’t forget to click on the Save Changes button when you are finished." +msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ©." +======= #: wp-admin/includes/ms.php:337 msgid "" "Howdy ###USERNAME###,\n" @@ -5097,15 +17683,48 @@ msgstr "" "\n" "L'Ã©quipe de ###SITENAME###\n" "###SITEURL###" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1032 +msgid "kin" +msgstr "apparentÃ©" +||||||| .r11156 +#: wp-admin/custom-background.php:142 +msgid "You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color." +msgstr "Vous pouvez personnaliser l’apparence de votre site sans jamais toucher au code de votre thÃ¨me, en utilisant un fond personnalisÃ©. Votre fond peut Ãªtre une image ou juste une couleur." +======= #: wp-admin/includes/ms.php:325 msgid "ERROR: The email address is already used." msgstr "ERREUR : l’adresse de messagerie est dÃ©jÃ utilisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1035 +msgid "parent" +msgstr "parent" +||||||| .r11156 +#: wp-admin/edit-tags.php:212 +msgid "Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." +msgstr "Identifiant - L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union ;" +======= #: wp-admin/includes/ms.php:296 msgid "[%s] New Admin Email Address" msgstr "[%s] Nouvelle adresse e-mail d'administration" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1038 +msgid "sibling" +msgstr "frÃ¨re/sœur" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:291 +msgid "You can also create posts with the Press This bookmarklet." +msgstr "Vous pouvez Ã©galement crÃ©er des articles avec le bookmarklet Publier un article." +======= #: wp-admin/includes/ms.php:256 msgid "" "Howdy ###USERNAME###,\n" @@ -5140,205 +17759,651 @@ msgstr "" "\n" "L'Ã©quipe de ###SITENAME###\n" "###SITEURL###" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1041 +msgid "spouse" +msgstr "conjoint" +||||||| .r11156 +#: wp-admin/user-edit.php:41 +msgid "Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts." +msgstr "Votre identifiant ne peut Ãªtre modifiÃ©, mais vous pouvez utiliser les autres champs pour saisir votre nom complet ou un pseudonyme, et changer ensuite le nom Ã afficher dans vos articles." +======= #: wp-admin/includes/ms.php:36 msgid "You have used your space quota. Please delete files before uploading." msgstr "Vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota. Veuillez supprimer quelques fichiers avant l’envoi." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1049 wp-admin/includes/meta-boxes.php:1050 +msgid "romantic" +msgstr "romantique" +||||||| .r11156 +#: wp-admin/user-edit.php:42 +msgid "Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so." +msgstr "Les champs obligatoires sont indiquÃ©s, les autres sont facultatifs. Les informations du profil ne sont affichÃ©es que si votre thÃ¨me a Ã©tÃ© conÃ§u pour les exploiter." +======= #: wp-admin/includes/ms.php:34 msgid "This file is too big. Files must be less than %1$s KB in size." msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %1$s Ko." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1052 +msgid "muse" +msgstr "muse" +||||||| .r11156 +#: wp-admin/user-edit.php:43 +msgid "Remember to click the Update Profile button when you are finished." +msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le profil » quand vous aurez terminÃ©." +======= #: wp-admin/includes/ms.php:32 msgid "Not enough space to upload. %1$s KB needed." msgstr "Pas assez d’espace pour l’envoi. %1$s Ko sont nÃ©cessaires." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1055 +msgid "crush" +msgstr "coup de foudre" +||||||| .r11156 +#: wp-admin/user-new.php:177 +msgid "Editors can publish posts, manage posts as well as manage other people’s posts, etc." +msgstr "Les Ã©diteurs peuvent publier et gÃ©rer leurs propres articles, ainsi que ceux des autres membres ;" +======= #: wp-admin/includes/ms-deprecated.php:30 msgid "Sorry, you must delete files before you can upload any more." msgstr "DÃ©solÃ©, vous devez effacer quelques fichiers avant de pouvoir en envoyer d’autres." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1058 +msgid "date" +msgstr "petit(e)-ami(e)" +||||||| .r11156 +#: wp-admin/comment.php:53 +msgid "You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment." +msgstr "Vous pouvez Ã©galement modÃ©rer le commentaire depuis cet Ã©cran, Ã l’aide du bloc Ãtat, d’oÃ¹ vous pouvez Ã©galement changer l’horodatage du commentaire." +======= #. translators: %s: date and time #: wp-admin/includes/misc.php:821 msgid "Draft saved at %s." msgstr "Brouillon enregistrÃ© Ã %s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: xfn: http:gmpg.org/xfn/ +#: wp-admin/includes/meta-boxes.php:1061 +msgid "sweetheart" +msgstr "Ãªtre aimÃ©" +||||||| .r11156 +#: wp-admin/comment.php:52 +msgid "You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error." +msgstr "Au besoin, vous pouvez modifier les informations laissÃ©es dans un commentaire. Par exemple, si un commentateur a fait une faute d’orthographe." +======= #. translators: draft saved date format, see http:php.net/date #: wp-admin/includes/misc.php:819 msgid "g:i:s a" msgstr "G \\h i \\m\\i\\n s \\s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:1067 +msgid "If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out XFN." +msgstr "Si le lien pointe sur une personne, vous pouvez prÃ©ciser la relation que vous entretenez avec elle via le formulaire ci-dessus. Si vous souhaitez en apprendre plus sur ce systÃ¨me, consultez le site de XFN." +||||||| .r11156 +#: wp-admin/nav-menus.php:713 +msgid "Enter menu name here" +msgstr "Saisissez ici le nom du menu" +======= #: wp-admin/includes/misc.php:816 wp-admin/includes/post.php:1720 #: wp-admin/widgets.php:306 msgid "Error while saving." msgstr "Erreur lors de la sauvegarde." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:1082 +msgid "Image Address" +msgstr "Adresse de l’image" +||||||| .r11156 +#: wp-admin/options-general.php:68 +msgid "UTC means Coordinated Universal Time." +msgstr "UTC signifie « Temps universel coordonnÃ© »." +======= #: wp-admin/includes/misc.php:730 msgid "%s has taken over and is currently editing." msgstr "%s a pris la main et modifie actuellement ce contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:1086 +msgid "RSS Address" +msgstr "Adresse du flux RSS" +||||||| .r11156 +#: wp-admin/options-general.php:60 +msgid "The fields on this screen determine some of the basics of your site setup." +msgstr "Les champs de cet Ã©cran dÃ©terminent certains des rÃ©glages de base de votre site." +======= #: wp-admin/includes/misc.php:615 wp-admin/user-edit.php:244 msgid "Admin Color Scheme" msgstr "Couleurs de l’interface d’administration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:1090 +msgid "Notes" +msgstr "Commentaires" +||||||| .r11156 +#: wp-admin/options-reading.php:56 +msgid "This screen contains the settings that affect the display of your content." +msgstr "Cet Ã©cran prÃ©sente les rÃ©glages qui influent sur l’affichage de votre contenu." +======= #: wp-admin/includes/meta-boxes.php:1091 msgid "(Leave at 0 for no rating.)" msgstr "(laissez Ã 0 pour ne pas donner de note.)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:1103 +msgid "(Leave at 0 for no rating.)" +msgstr "(laissez Ã 0 pour ne pas donner de note.)" +||||||| .r11156 +#: wp-admin/options-discussion.php:21 wp-admin/options-general.php:69 +#: wp-admin/options-media.php:24 wp-admin/options-permalink.php:23 +#: wp-admin/options-permalink.php:32 wp-admin/options-permalink.php:39 +#: wp-admin/options-reading.php:59 wp-admin/options-writing.php:22 +msgid "You must click the Save Changes button at the bottom of the screen for new settings to take effect." +msgstr "Vous devez cliquer sur « Enregistrer les modifications » en bas de l’Ã©cran pour que les nouveaux rÃ©glages prennent effet." +======= #: wp-admin/includes/meta-boxes.php:1078 msgid "Notes" msgstr "Commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/misc.php:625 wp-admin/user-edit.php:244 +msgid "Admin Color Scheme" +msgstr "Couleurs de l’interface d’administration" +||||||| .r11156 +#: wp-admin/options-general.php:64 +msgid "The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory." +msgstr "L’adresse web de WordPress et celle du site peuvent Ãªtre identiques (exemple.fr) ou diffÃ©rentes. Ainsi, vous pourriez avoir les fichiers de WordPress dans un sous-dossier (exemple.fr/wordpress) plutÃ´t qu’Ã la racine du site." +======= #: wp-admin/includes/meta-boxes.php:1074 msgid "RSS Address" msgstr "Adresse du flux RSS" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/menu.php:338 wp-admin/my-sites.php:16 +msgid "You do not have sufficient permissions to access this page." +msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +||||||| .r11156 +#: wp-admin/edit-link-form.php:59 +msgid "The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box." +msgstr "Les blocs pour le nom, l’adresse web et la description sont fixes, tandis que les autres peuvent Ãªtre repositionnÃ©s par glisser/dÃ©poser. Vous pouvez Ã©galement cacher les blocs que vous n’utilisez pas via l’onglet « Options de l’Ã©cran », et fermer les blocs en cliquant sur leur barre de titre." +======= #: wp-admin/includes/meta-boxes.php:1070 msgid "Image Address" msgstr "Adresse de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:185 +#: wp-admin/includes/plugin-install.php:197 +#: wp-admin/includes/plugin-install.php:200 +msgid "Search Plugins" +msgstr "Chercher parmi les extensions" +||||||| .r11156 +#: wp-admin/update-core.php:193 +msgid "While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal." +msgstr "Durant le processus de mise Ã jour, votre site sera en mode de maintenance. DÃ¨s que le processus sera achevÃ©, votre site sera Ã nouveau accessible." +======= #: wp-admin/includes/meta-boxes.php:1055 msgid "If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out XFN." msgstr "Si le lien pointe sur une personne, vous pouvez prÃ©ciser la relation que vous entretenez avec elle via le formulaire ci-dessus. Si vous souhaitez en apprendre plus sur ce systÃ¨me, consultez le site de XFN." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:211 +msgid "If you have a plugin in a .zip format, you may install it by uploading it here." +msgstr "Si vous avez une extension au format .zip, vous pouvez l’installer en la mettant en ligne ici." +||||||| .r11156 +#: wp-admin/update-core.php:210 +msgid "Your plugins are all up to date." +msgstr "Vos extensions sont toutes Ã jour." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1049 msgid "sweetheart" msgstr "Ãªtre aimÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:214 +msgid "Plugin zip file" +msgstr "Archive Zip de l’extension" +||||||| .r11156 +#: wp-admin/update-core.php:148 +msgid "You have the latest version of WordPress." +msgstr "Vous avez la derniÃ¨re version de WordPress." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1046 msgid "date" msgstr "petit(e)-ami(e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:713 wp-admin/includes/nav-menu.php:970 +msgid "View All" +msgstr "Afficher tout" +||||||| .r11156 +#: wp-admin/update-core.php:291 +msgid "Your themes are all up to date." +msgstr "Vos thÃ¨mes sont tous Ã jour." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1043 msgid "crush" msgstr "coup de foudre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/misc.php:829 wp-admin/includes/post.php:1746 +#: wp-admin/widgets.php:311 +msgid "Error while saving." +msgstr "Erreur lors de la sauvegarde." +||||||| .r11156 +#: wp-admin/update-core.php:170 +msgid "An updated version of WordPress is available." +msgstr "Une nouvelle version de WordPress est disponible." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1040 msgid "muse" msgstr "muse" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:712 +msgid "Error while saving the scaled image. Please reload the page and try again." +msgstr "Une erreur est survenue pendant la modification de l’Ã©chelle de l’image. Veuillez recharger la page pour faire une nouvelle tentative." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:200 +msgid "Original: %s" +msgstr "Original : %s" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1037 wp-admin/includes/meta-boxes.php:1038 msgid "romantic" msgstr "romantique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:763 +msgid "Unable to save the image." +msgstr "Ãchec lors de l’enregistrement de l’image." +||||||| .r11156 +#: wp-admin/plugin-editor.php:156 wp-admin/theme-editor.php:114 +msgid "Function Name…" +msgstr "Nom de fonction…" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1029 msgid "spouse" msgstr "conjoint" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:134 wp-admin/includes/nav-menu.php:136 +msgid "Edit Menu Item" +msgstr "Modifier une entrÃ©e du menu" +||||||| .r11156 +#: wp-admin/import.php:94 +msgid "Activate importer" +msgstr "Activer l’importateur" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1026 msgid "sibling" msgstr "frÃ¨re/sœur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:160 +msgid "Install the Blogger importer to import posts, comments, and users from a Blogger blog." +msgstr "Installer l’importateur Blogger, pour importer les articles, commentaires et utilisateurs d’un blog Blogger." +||||||| .r11156 +#: wp-admin/edit-link-form.php:58 +msgid "You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields." +msgstr "Vous pouvez ajouter ou modifier des liens sur cet Ã©cran, en saisissant dans chacun des blocs. Seuls sont obligatoires les champs « Adresse web » et « Nom » (le texte que vous voulez voir affichÃ© sur votre site pour cette adresse)." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1023 msgid "parent" msgstr "parent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:172 +msgid "Install the LiveJournal importer to import posts from LiveJournal using their API." +msgstr "Installer l’importateur LiveJournal, pour importer les articles depuis un blog LiveJournal en utilisant leur API." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:438 +msgid "Return to Importers" +msgstr "Retour aux importateurs" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1020 msgid "kin" msgstr "apparentÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:178 +msgid "Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog." +msgstr "Installer l’importateur Movable Type, pour importer les articles et commentaires en provenance d’un blog Movable Type ou TypePad." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:428 +msgid "Activate Plugin & Run Importer" +msgstr "Activer l’extension & lancer l’importateur" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1017 msgid "child" msgstr "enfant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:190 +msgid "Install the RSS importer to import posts from an RSS feed." +msgstr "Installer l’importateur RSS, pour importer des articles Ã partir d’un flux RSS." +||||||| .r11156 +#: wp-admin/edit-tags.php:340 +msgid "Categories can be selectively converted to tags using the category to tag converter." +msgstr "Les catÃ©gories peuvent Ãªtre converties de maniÃ¨re sÃ©lective en mots-clÃ©s via le convertisseur catÃ©gories vers mots-clÃ©s." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1014 wp-admin/includes/meta-boxes.php:1015 msgid "family" msgstr "famille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:162 +msgid "Rotate counter-clockwise" +msgstr "Tourner dans le sens inverse des aiguilles d’une montre" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:313 +msgctxt "nav menu front page title" +msgid "Home: %s" +msgstr "Accueil : %s" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1006 msgid "neighbor" msgstr "voisin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:163 +msgid "Rotate clockwise" +msgstr "Tourner dans le sens des aiguilles d’une montre" +||||||| .r11156 +#: wp-admin/import.php:57 wp-admin/users.php:220 +msgid "ERROR:" +msgstr "ERREUR :" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1003 msgid "co-resident" msgstr "colocataire" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: add new taxonomy label +#: wp-admin/includes/meta-boxes.php:502 +msgid "+ %s" +msgstr "+ %s" +||||||| .r11156 +#: wp-admin/import.php:57 +msgid "The %s importer is invalid or is not installed." +msgstr "L’importateur %s est invalide ou n’est pas installÃ©." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:1000 wp-admin/includes/meta-boxes.php:1001 msgid "geographical" msgstr "gÃ©ographique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:598 +msgid "Allow comments." +msgstr "Autoriser les commentaires." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:193 wp-admin/edit-form-advanced.php:376 +msgid "Page Attributes" +msgstr "Attributs de la page" +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:995 msgid "colleague" msgstr "confrÃ¨re" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:655 +msgid "Show comments" +msgstr "Affiche les commentaires" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:754 +msgid "Need help? Use the Help tab in the upper right of your screen." +msgstr "Besoin d’aideÂ ? Utilisez l’onglet Aide prÃ©sent dans le coin supÃ©rieur droit de votre Ã©cran." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:992 msgid "co-worker" msgstr "collÃ¨gue de travail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:726 +msgid "(no parent)" +msgstr "(pas de parent)" +||||||| .r11156 +#: wp-admin/import.php:22 +msgid "This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform." +msgstr "Cet Ã©cran liste les liens vers les extensions servant Ã importer des donnÃ©es en provenance d’autres plates-formes de blogs ou gestionnaires de contenus. Choisissez la plate-forme d’origine, et cliquez sur « Installer maintenant » dans la fenÃªtre qui s’affiche. Si vous ne trouvez pas votre plate-forme, cliquez sur le lien « Recherche » dans le DÃ©pÃ´t d’Extensions et lancez une recherche - peut-Ãªtre qu’une autre extension rÃ©pondra Ã vos attentes." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:989 wp-admin/includes/meta-boxes.php:990 msgid "professional" msgstr "professionnel" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:170 +msgid "CSS Classes (optional)" +msgstr "Classes CSS (facultatives)" +||||||| .r11156 +#: wp-admin/export.php:50 +msgid "Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format." +msgstr "Une fois gÃ©nÃ©rÃ©, le fichier WXR peut Ãªtre importÃ© dans une autre installation WordPress, ou une autre plate-forme de blog capable de lire ce format." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:984 msgid "met" msgstr "rencontrÃ©(e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:602 +msgid "Menu Item" +msgstr "ÃlÃ©ment du menu" +||||||| .r11156 +#: wp-admin/link-manager.php:49 +msgid "You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table." +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran en utilisant les rÃ©glages d’affichage et/ou le filtre dÃ©roulant prÃ©sent au-dessous du tableau de liens." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:981 wp-admin/includes/meta-boxes.php:982 msgid "physical" msgstr "physique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:656 wp-admin/includes/nav-menu.php:913 +msgid "No items." +msgstr "Aucune entrÃ©e." +||||||| .r11156 +#: wp-admin/plugin-editor.php:131 +msgid "Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don’t forget to save your changes (Update File) when you’re finished." +msgstr "Choisissez une extension Ã modifier dans le menu en haut Ã droite, et cliquez sur le bouton « SÃ©lectionner »." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:976 wp-admin/includes/meta-boxes.php:1009 #: wp-admin/includes/meta-boxes.php:1032 msgid "none" msgstr "aucune" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:708 +msgid "Most Recent" +msgstr "Les plus rÃ©centes" +||||||| .r11156 +#: wp-admin/plugins.php:353 +msgid "Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue." +msgstr "La plupart du temps, les extensions fonctionnent comme il le faut, tant avec WordPress qu’entre elles. Mais parfois, les ajouts d’une extension peuvent empiÃ©ter sur celles d’une autre, ce qui provoque une incompatibilitÃ©. Si votre site rÃ©agit bizarrement, le problÃ¨me vient peut-Ãªtre de lÃ . Essayez de dÃ©sactiver toutes les extensions, puis de les rÃ©activer une Ã une pour trouver celle(s) en cause." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:973 msgid "friend" msgstr "ami(e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:321 +msgctxt "nav menu front page title" +msgid "Home: %s" +msgstr "Accueil : %s" +||||||| .r11156 +#: wp-admin/widgets.php:60 +msgid "Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required." +msgstr "Les widgets peuvent Ãªtre utilisÃ©s Ã plusieurs reprises. Vous pouvez donner un titre pour chaque widget, afin de l’afficher sur votre site, mais ce n’est pas obligatoire." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:970 msgid "acquaintance" msgstr "connaissance" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:1214 +msgid "The Walker class named %s does not exist." +msgstr "La classe Walker nommÃ©e %s n’existe pas." +||||||| .r11156 +#: wp-admin/widgets.php:61 +msgid "Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop." +msgstr "En activant le mode « AccessibilitÃ© », via les options d’Ã©crans, vous autorisez l’utilisation des boutons « Ajouter » et « Modifier » Ã la place du glisser/dÃ©poser." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:967 msgid "contact" msgstr "contact" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:184 +msgid "Install the blogroll importer to import links in OPML format." +msgstr "Installer l’importateur de blogoliste, pour importer une liste de liens au format OPML." +||||||| .r11156 +#: wp-admin/theme-editor.php:27 +msgid "You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme." +msgstr "Vous pouvez utiliser l’Ã©diteur de thÃ¨me pour modifier les fichiers CSS et PHP qui composent votre thÃ¨me." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:964 wp-admin/includes/meta-boxes.php:965 msgid "friendship" msgstr "amitiÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2201 +msgctxt "verb" +msgid "Clear" +msgstr "Effacer" +||||||| .r11156 +#: wp-admin/theme-editor.php:28 +msgid "Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box." +msgstr "Commencez par choisir un thÃ¨me Ã modifier via le menu dÃ©roulant, et cliquez sur « SÃ©lectionner ». Une liste apparaÃ®tra ensuite avec tous les fichiers modÃ¨les. En cliquant sur n’importe quel de ces fichiers, vous verrez son contenu apparaÃ®tre dans l’Ã©diteur." +======= #: wp-admin/includes/meta-boxes.php:960 msgid "another web address of mine" msgstr "Une autre de mes adresses Web" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:1225 +msgid "Click Save Menu to make pending menu items public." +msgstr "Cliquez sur « Enregistrer le menu » pour rendre publics les Ã©lÃ©ments en attente." +||||||| .r11156 +#: wp-admin/widgets.php:52 +msgid "Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them." +msgstr "Les widgets sont des conteneurs de contenu indÃ©pendants, qui peuvent Ãªtre placÃ©s dans n’importe quelle zone Ã widgets de votre thÃ¨me (le plus souvent, la barre latÃ©rale). Pour remplir les zones Ã widgets de votre barre latÃ©rale, glissez/dÃ©posez les barres de titre dans la zone dÃ©sirÃ©e. Par dÃ©faut, seule la premiÃ¨re zone de widgets sera ouverte. Pour remplir les autres zones Ã widgets, cliquez sur leur barre de titre afin de les ouvrir." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:956 wp-admin/includes/meta-boxes.php:957 msgid "identity" msgstr "identitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:150 +msgid "Stick this post to the front page" +msgstr "Mettre cet article en avant sur la page d’accueil" +||||||| .r11156 +#: wp-admin/theme-editor.php:32 +msgid "Advice: think very carefully about your site crashing if you are live-editing the theme currently in use." +msgstr "Conseil : gardez bien en tÃªte que si vous modifiez le thÃ¨me actuellement utilisÃ©, vos visiteurs pourraient avoir une vision dÃ©routante de votre site..." +======= #. translators: xfn: http:gmpg.org/xfn/ #: wp-admin/includes/meta-boxes.php:952 msgid "rel:" msgstr "rel :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:599 +msgid "Allow trackbacks and pingbacks on this page." +msgstr "Autoriser les rÃ©troliens et pings sur cette page." +||||||| .r11156 +#: wp-admin/theme-editor.php:31 +msgid "After typing in your edits, click Update File." +msgstr "AprÃ¨s avoir fait vos modifications, cliquez sur « Mettre Ã jour le fichier »." +======= #: wp-admin/includes/meta-boxes.php:907 msgid "Choose the target frame for your link." msgstr "Choisir la frame que cible le lien." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:195 +msgid "Tumblr" +msgstr "Tumblr" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:717 +msgid "(no parent)" +msgstr "(pas de parent)" +======= #: wp-admin/includes/meta-boxes.php:905 msgid "_none — same window or tab." msgstr "_none — mÃªme fenÃªtre ou onglet." @@ -5382,675 +18447,2471 @@ msgstr "Besoin d’aideÂ ? Utilisez l’onglet Aide prÃ©sent dans le coi #: wp-admin/includes/meta-boxes.php:716 msgid "(no parent)" msgstr "(pas de parent)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:196 +msgid "Install the Tumblr importer to import posts & media from Tumblr using their API." +msgstr "Installer l’importateur Tumblr pour importer les articles et fichiers mÃ©dia depuis un Tumblr en utilisant leur API." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:371 +msgid "Template - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu." +msgstr "ModÃ¨le - Certains thÃ¨mes utilisent des modÃ¨les spÃ©ciaux que vous pouvez appliquer Ã certaines pages, avec des fonctionnalitÃ©s supplÃ©mentaires ou une mise en page qui leur est propre. Si c’est le cas, vous les verrez dans ce menu dÃ©roulant." +======= #: wp-admin/includes/meta-boxes.php:647 msgid "Show comments" msgstr "Affiche les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1055 +msgid "Attachment Post URL" +msgstr "Adresse de l’article du fichier joint" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:370 +msgid "Parent - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages." +msgstr "Parent - Vous pouvez arranger vos pages en hiÃ©rarchies. Par exemple, vous pourriez avoir une page « Ã propos », avec comme sous-pages « Ma vie » et « Mon œuvre ». Il n’y a pas de limite Ã la profondeur des sous-pages." +======= #: wp-admin/includes/meta-boxes.php:629 msgid "Add comment" msgstr "Ajouter un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2044 +msgid "Insert media from another website" +msgstr "InsÃ©rer un mÃ©dia depuis un autre site" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:209 +msgid "All updates have been completed." +msgstr "Toutes les mises Ã jour sont terminÃ©es." +======= #: wp-admin/includes/meta-boxes.php:591 msgid "https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" msgstr "https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2528 +msgid "Audio, Video, or Other File" +msgstr "Audio, vidÃ©o ou un autre format" +||||||| .r11156 +#: wp-admin/edit-tags.php:206 +msgid "When adding a new tag on this screen, you’ll fill in the following fields:" +msgstr "Quand vous ajoutez un nouveau mot-clÃ© via cet Ã©cran, vous devez remplir les champs suivants :" +======= #: wp-admin/includes/meta-boxes.php:591 msgid "Allow trackbacks and pingbacks on this page." msgstr "Autoriser les rÃ©troliens et pings sur cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, +#. %4$d is height +#: wp-admin/includes/media.php:2657 +msgid "Scale images to match the large size selected in %1$simage options%2$s (%3$d × %4$d)." +msgstr "Redimensionner les images pour correspondre Ã la taille large dÃ©finie dans les %1$srÃ©glages des mÃ©dias%2$s (%3$d × %4$d)." +||||||| .r11156 +#: wp-admin/edit-tags.php:185 +msgid "You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your writing settings." +msgstr "Vous pouvez utiliser les catÃ©gories pour donner des sections Ã votre site, et grouper les articles connexes. La catÃ©gorie par dÃ©faut est « Non classÃ© » ; vous pouvez la modifier dans vos options d’Ã©criture." +======= #: wp-admin/includes/meta-boxes.php:590 msgid "Allow comments." msgstr "Autoriser les commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:176 +msgid "Schedule for: %1$s" +msgstr "Planifier pour : %1$s" +||||||| .r11156 +#: wp-admin/edit-tags.php:194 +msgid "What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index." +msgstr "Quelle est la diffÃ©rence entre les catÃ©gories et les mots-clÃ©s ? Normalement, les mots-clÃ©s identifient les informations importantes dans votre article (noms, sujets, etc.) qui seraient susceptibles de revenir dans d’autres articles, ou pas. De leur cÃ´tÃ©, les catÃ©gories ont des sections prÃ©dÃ©terminÃ©es. Si vous voyez votre site comme un livre, alors les catÃ©gories sont la table des matiÃ¨res, et les mots-clÃ©s forment l’index." +======= #: wp-admin/includes/meta-boxes.php:575 msgid "Custom fields can be used to add extra metadata to a post that you can use in your theme." msgstr "Les champs personnalisÃ©s peuvent Ãªtre utilisÃ©s afin d’ajouter des donnÃ©es supplÃ©mentaires Ã vos articles. Vous pouvez les utiliser dans votre thÃ¨me (en)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:637 +msgid "Add comment" +msgstr "Ajouter un commentaire" +||||||| .r11156 +#: wp-admin/edit-tags.php:219 +msgid "You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table." +msgstr "Vous pouvez modifier l’affichage de cet Ã©cran via l’onglet « Options de l’Ã©cran », afin de dÃ©finir le nombre d’Ã©lÃ©ments Ã afficher par Ã©cran, et afficher/cacher les colonnes du tableau." +======= #: wp-admin/includes/meta-boxes.php:549 msgid "Trackbacks are a way to notify legacy blog systems that you’ve linked to them. If you link other WordPress sites, they’ll be notified automatically using pingbacks, no other action necessary." msgstr "Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Si vous faites un lien vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide des pings (en), sans que vous n’ayez rien Ã faire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms-deprecated.php:30 +msgid "Sorry, you must delete files before you can upload any more." +msgstr "DÃ©solÃ©, vous devez effacer quelques fichiers avant de pouvoir en envoyer d’autres." +||||||| .r11156 +#: wp-admin/edit-tags.php:217 +msgid "Description - The description is not prominent by default; however, some themes may display it." +msgstr "Description - La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +======= #: wp-admin/includes/meta-boxes.php:548 msgid "Separate multiple URLs with spaces" msgstr "SÃ©parez les adresses web par des espaces" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:32 +msgid "Not enough space to upload. %1$s KB needed." +msgstr "Pas assez d’espace pour l’envoi. %1$s Ko sont nÃ©cessaires." +||||||| .r11156 +#: wp-admin/edit-tags.php:209 +msgid "Name - The name is how it appears on your site." +msgstr "Nom - Ce nom est utilisÃ© un peu partout sur votre site ;" +======= #: wp-admin/includes/meta-boxes.php:548 msgid "Send trackbacks to:" msgstr "Envoyer un rÃ©trolien vers :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:308 +msgid "[%s] New Admin Email Address" +msgstr "[%s] Nouvelle adresse e-mail d'administration" +||||||| .r11156 +#: wp-admin/edit-tags.php:204 +msgid "When adding a new category on this screen, you’ll fill in the following fields:" +msgstr "Quand vous ajoutez une nouvelle catÃ©gorie via cet Ã©cran, vous devez remplir les champs suivants :" +======= #: wp-admin/includes/meta-boxes.php:539 msgid "Already pinged:" msgstr "DÃ©jÃ notifiÃ©(s) par ping :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:387 +msgid "[%s] New Email Address" +msgstr "[%s] Nouvelle adresse e-mail" +||||||| .r11156 +#: wp-admin/upload.php:201 +msgid "You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table." +msgstr "Vous pouvez limiter cette liste par type de fichier ou par Ã©tat Ã l’aide des filtres en haut de l’Ã©cran. Vous pouvez Ã©galement affiner la liste par dÃ©faut Ã l’aide du menu dÃ©roulant au dessus du tableau." +======= #: wp-admin/includes/meta-boxes.php:525 msgid "Excerpts are optional hand-crafted summaries of your content that can be used in your theme. Learn more about manual excerpts." msgstr "Les extraits sont des rÃ©sumÃ©s facultatifs de vos articles, Ã©crits Ã la main. Il se peut que votre thÃ¨me s’en serve. En savoir plus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:646 wp-admin/includes/ms.php:648 +msgid "You attempted to access the \"%1$s\" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the \"%1$s\" dashboard, please contact your network administrator." +msgstr "Vous avez tentÃ© d’accÃ©der au tableau de bord de « %1$s ». Cependant, vous ne disposez pas pour le moment des droits nÃ©cessaires sur ce site. Si vous pensez que vous devriez pouvoir accÃ©der au tableau de bord de « %1$s », contactez l’administrateur du rÃ©seau." +||||||| .r11156 +#: wp-admin/custom-header.php:633 +msgid "Default Images" +msgstr "Images par dÃ©faut" +======= #. translators: %s: add new taxonomy label #: wp-admin/includes/meta-boxes.php:494 msgid "+ %s" msgstr "+ %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:649 +msgid "If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way." +msgstr "Si vous Ãªtes arrivÃ© sur cet Ã©cran par accident, et que vous vouliez en fait vous rendre sur l’un de vos propres sites, voici quelques raccourcis pour vous aider Ã trouver votre chemin." +||||||| .r11156 +#: wp-admin/custom-header.php:811 +msgid "Crop Header Image" +msgstr "Recadrer l’image d’en-tÃªte" +======= #: wp-admin/includes/meta-boxes.php:470 wp-admin/includes/meta-boxes.php:854 #: wp-admin/includes/nav-menu.php:932 msgid "Most Used" msgstr "Les plus utilisÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:651 +msgid "Your Sites" +msgstr "Vos sites" +||||||| .r11156 +#: wp-admin/custom-header.php:650 +msgid "This will remove the header image. You will not be able to restore any customizations." +msgstr "Ceci retirera l’image d’en-tÃªte. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +======= #: wp-admin/includes/meta-boxes.php:297 msgid "Uploaded on: %1$s" msgstr "Mise en ligne le : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:657 +msgid "Visit Dashboard" +msgstr "Se rendre sur le Tableau de bord" +||||||| .r11156 +#: wp-admin/custom-header.php:651 +msgid "Remove Header Image" +msgstr "Retirer l’image d’en-tÃªte" +======= #: wp-admin/includes/meta-boxes.php:206 msgid "Edit date and time" msgstr "Modifier la date et l'heure" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:658 +msgid "View Site" +msgstr "Afficher le site" +||||||| .r11156 +#: wp-admin/custom-header.php:659 +msgid "Reset Image" +msgstr "Remettre l’image d’origine" +======= #: wp-admin/includes/meta-boxes.php:198 msgid "Browse revisions" msgstr "Parcourir les rÃ©visions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:699 +msgid "American English" +msgstr "Anglais (US)" +||||||| .r11156 +#: wp-admin/custom-header.php:661 +msgid "This will restore the original header image. You will not be able to restore any customizations." +msgstr "Ceci remettra en place l’image d’en-tÃªte d’origine. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +======= #: wp-admin/includes/meta-boxes.php:198 msgctxt "revisions" msgid "Browse" msgstr "Parcourir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:703 +msgid "British English" +msgstr "Anglais (UK)" +||||||| .r11156 +#: wp-admin/custom-header.php:662 +msgid "Restore Original Header Image" +msgstr "RÃ©tablir l’image d’en-tÃªte d’origine" +======= #: wp-admin/includes/meta-boxes.php:192 wp-admin/includes/meta-boxes.php:195 msgid "Revisions: %s" msgstr "RÃ©visions : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:713 +msgid "English" +msgstr "Anglais" +||||||| .r11156 +#: wp-admin/custom-header.php:685 +msgid "Text Color" +msgstr "Couleur du texte" +======= #: wp-admin/includes/meta-boxes.php:190 msgid "Your site is configured to keep only the last %s revisions." msgstr "Votre site est configurÃ© pour conserver seulement les %s derniÃ¨res rÃ©visions." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: My sites label +#: wp-admin/includes/ms.php:796 +msgid "Primary Site" +msgstr "Site principal" +||||||| .r11156 +#: wp-admin/custom-header.php:861 +msgid "Image Upload Error" +msgstr "Erreur lors de l’envoi de l’image" +======= #: wp-admin/includes/meta-boxes.php:176 msgid "Publish on: %1$s" msgstr "Publier le : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:1228 +msgid "There are some invalid menu items. Please check or delete them." +msgstr "Certains Ã©lÃ©ments du menu ne sont pas valides. Veuillez les vÃ©rifier ou les effacer." +||||||| .r11156 +#: wp-admin/custom-header.php:815 +msgid "You need Javascript to choose a part of the image." +msgstr "Vous avez besoin de la fonctionnalitÃ© JavaScript de votre navigateur internet pour choisir une partie de l’image." +======= #: wp-admin/includes/meta-boxes.php:174 msgid "Schedule for: %1$s" msgstr "Planifier pour : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:165 +msgid "%s plugin" +msgstr "%s extension" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:660 +msgid "Edit this item" +msgstr "Modifier cet Ã©lÃ©ment" +======= #: wp-admin/includes/meta-boxes.php:172 wp-admin/includes/meta-boxes.php:180 msgid "Publish immediately" msgstr "Publier tout de suite" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:165 +msgid "%s plugins" +msgstr "%s extensions" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:661 +msgid "Edit this item inline" +msgstr "Modifier cet Ã©lÃ©ment sur place" +======= #: wp-admin/includes/meta-boxes.php:170 msgid "Published on: %1$s" msgstr "PubliÃ© le : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:385 +msgctxt "Plugin installer section title" +msgid "Description" +msgstr "Description" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:665 +msgid "Restore this item from the Trash" +msgstr "RÃ©cupÃ©rer ce Ã©lÃ©ment depuis la Corbeille" +======= #: wp-admin/includes/meta-boxes.php:168 msgid "Scheduled for: %1$s" msgstr "PlanifiÃ© pour : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2627 +msgid "You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. Switch to the multi-file uploader." +msgstr "Vous utilisez l’outil de mise en ligne du navigateur. Le nouvel outil de mise en ligne de WordPress inclus la possibilitÃ© de tÃ©lÃ©charger plusieurs fichiers Ã la fois par glisser/dÃ©poser. Passer au nouvel outil de mise en ligne." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:667 +msgid "Move this item to the Trash" +msgstr "DÃ©placer cet Ã©lÃ©ment dans la Corbeille" +======= #: wp-admin/includes/meta-boxes.php:148 msgid "Stick this post to the front page" msgstr "Mettre cet article en avant sur la page d’accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:199 +msgid "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." +msgstr "Les modifications qui n'ont pas Ã©tÃ© enregistrÃ©es seront perdues. Â« OK Â» pour continuer, Â« Annuler Â» pour revenir Ã l'Ã©diteur d'images." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:669 +msgid "Delete this item permanently" +msgstr "Supprimer cet Ã©lÃ©ment dÃ©finitivement" +======= #: wp-admin/includes/meta-boxes.php:138 msgid "Edit visibility" msgstr "Modifier la visibilitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:231 wp-admin/includes/image-edit.php:296 +#: wp-admin/includes/image-edit.php:438 +msgid "$image needs to be an WP_Image_Editor object" +msgstr "$image doit Ãªtre un objet WP_Image_Editor" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:591 +msgid "Allow comments." +msgstr "Autoriser les commentaires." +======= #: wp-admin/includes/meta-boxes.php:127 wp-admin/includes/meta-boxes.php:150 #: wp-admin/includes/template.php:1686 msgid "Password protected" msgstr "ProtÃ©gÃ© par mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:362 +msgid "Use WP_Image_Editor::rotate" +msgstr "Utilisez WP_Image_Editor::rotate" +||||||| .r11156 +#: wp-admin/includes/import.php:171 +msgid "Install the LiveJournal importer to import posts from LiveJournal using their API." +msgstr "Installer l’importateur LiveJournal, pour importer les articles depuis un blog LiveJournal en utilisant leur API." +======= #: wp-admin/includes/meta-boxes.php:119 msgid "Visibility:" msgstr "VisibilitÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:385 +msgid "Use WP_Image_Editor::flip" +msgstr "Utilisez WP_Image_Editor::flip" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:328 +#: wp-admin/includes/class-wp-upgrader-skins.php:373 +#: wp-admin/includes/class-wp-upgrader-skins.php:672 +msgid "Return to WordPress Updates" +msgstr "Retourner aux mises Ã jour de WordPress" +======= #: wp-admin/includes/meta-boxes.php:92 msgid "Edit status" msgstr "Modifier l'Ã©tat" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1890 +msgid "Drop files here" +msgstr "DÃ©posez vos fichiers ici" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:343 +msgid "Publish - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post." +msgstr "Publier - Vous pouvez dÃ©finir la maniÃ¨re dont votre article est publiÃ© dans le bloc « Publier ». Pour « Ãtat », « VisibilitÃ© », « Format » et « Publier (immÃ©diatement) », un clic sur le lien « Modifier » affichera plus d’options. « VisibilitÃ© » inclut des options pour protÃ©ger l’article avec un mot de passe ou faire en sorte qu’il reste en tÃªte de page indÃ©finiment. « Publier (immÃ©diatement) » vous permet de programmer la publication de votre article Ã une date prÃ©cise, dans le futur ou le passÃ© ; cela vous permet d’Ã©crire Ã l’avance des articles Ã publier, ou de les antidater." +======= #: wp-admin/includes/meta-boxes.php:42 msgid "Preview Changes" msgstr "PrÃ©visualiser les modifications" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2669 +msgid "Sorry, you have used all of your storage quota of %s MB." +msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota de stockage (%s Mo)." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:350 +msgid "Featured Image - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc." +msgstr "Image Ã la Une - Vous pouvez associer une image Ã votre article, sans pour autant l’y insÃ©rer. Cela ne sert vraiment que si votre thÃ¨me fait usage de cette fonctionnalitÃ©, sous la forme d’une miniature pour la page d’accueil, d’un en-tÃªte personnalisÃ©..." +======= #: wp-admin/includes/menu.php:319 msgid "You do not have sufficient permissions to access this page." msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2799 +msgid "File URL:" +msgstr "Adresse web du fichier :" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:280 +msgid "Title - Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit." +msgstr "Titre - Saisissez un titre pour votre article. AprÃ¨s avoir saisi le titre, un permalien s’affichera en dessous, que vous pourrez modifier Ã loisir." +======= #: wp-admin/includes/media.php:2847 msgid "Audio Codec:" msgstr "Codex audio :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:302 +msgid "Uploaded on: %1$s" +msgstr "Mise en ligne le : %1$s" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:362 +msgid "Discussion - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them." +msgstr "Discussion - Vous pouvez activer ou dÃ©sactiver les commentaires et pings, et si votre article reÃ§oit des commentaires, vous pourrez les voir ici et les modÃ©rer." +======= #: wp-admin/includes/media.php:2846 msgid "Audio Format:" msgstr "Format audio :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:36 +msgid "You have used your space quota. Please delete files before uploading." +msgstr "Vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota. Veuillez supprimer quelques fichiers avant l’envoi." +||||||| .r11156 +#: wp-admin/edit.php:180 +msgid "You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list." +msgstr "Vous pouvez affiner la liste pour qu’elle n’affiche que les articles d’une catÃ©gorie spÃ©cifique ou d’un mois donnÃ©, Ã l’aide du menu dÃ©roulant situÃ© au-dessus de la liste. Cliquez sur le bouton « Filtrer » aprÃ¨s avoir fait votre choix. Vous pouvez Ã©galement affiner la liste en cliquant sur l’auteur d’un article, sa catÃ©gorie ou un mot-clÃ©." +======= #: wp-admin/includes/media.php:2757 msgid "File URL:" msgstr "Adresse web du fichier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:335 +msgid "ERROR: The email address is already used." +msgstr "ERREUR : l’adresse de messagerie est dÃ©jÃ utilisÃ©e." +||||||| .r11156 +#: wp-admin/edit.php:179 +msgid "You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right." +msgstr "Vous pouvez afficher une simple liste de titres, ou une liste avec des extraits. Choisissez l’affichage que vous prÃ©fÃ©rez en cliquant sur les icÃ´nes en haut Ã droite de la liste ;" +======= #: wp-admin/includes/media.php:2726 msgid "Displayed on attachment pages." msgstr "AffichÃ© sur les pages des fichiers joints." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:400 +msgid "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." +msgstr "Votre adresse e-mail n’a pas encore Ã©tÃ© mise Ã jour. Veuillez vÃ©rifier votre boite de rÃ©ception %s pour consulter l’e-mail de confirmation." +||||||| .r11156 +#: wp-admin/edit.php:177 +msgid "You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab." +msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran » ;" +======= #: wp-admin/includes/media.php:2627 msgid "Sorry, you have used all of your storage quota of %s MB." msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota de stockage (%s Mo)." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Gigabytes +#: wp-admin/includes/ms.php:444 +msgid "GB" +msgstr "Go" +||||||| .r11156 +#: wp-admin/edit.php:178 +msgid "You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts." +msgstr "Vous pouvez filtrer la liste des articles par Ã©tat, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les articles, ou seulement les articles publiÃ©s, les brouillons, etc. Par dÃ©faut, tous les articles sont affichÃ©s ;" +======= #. translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, #. %4$d is height #: wp-admin/includes/media.php:2615 msgid "Scale images to match the large size selected in %1$simage options%2$s (%3$d × %4$d)." msgstr "Redimensionner les images pour correspondre Ã la taille large dÃ©finie dans les %1$srÃ©glages des mÃ©dias%2$s (%3$d × %4$d)." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Megabytes +#: wp-admin/includes/ms.php:448 +msgid "MB" +msgstr "Mo" +||||||| .r11156 +#: wp-admin/users.php:33 +msgid "You can customize the display of this screen in a number of ways:" +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" +======= #: wp-admin/includes/media.php:2584 msgid "You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. Switch to the multi-file uploader." msgstr "Vous utilisez l’outil de mise en ligne du navigateur. Le nouvel outil de mise en ligne de WordPress inclus la possibilitÃ© de tÃ©lÃ©charger plusieurs fichiers Ã la fois par glisser/dÃ©poser. Passer au nouvel outil de mise en ligne." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:451 +msgid "Used: %1$s%% of %2$s" +msgstr "Taux d’utilisation : %1$s%% sur %2$s" +||||||| .r11156 +#: wp-admin/edit.php:187 +msgid "Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:" +msgstr "Passer la souris au-dessus d’une ligne de la liste d’articles, fera s’afficher des liens vous permettant de gÃ©rer l’article. Vous pouvez lancer les actions suivantes :" +======= #: wp-admin/includes/media.php:2570 msgid "You are using the multi-file uploader. Problems? Try the browser uploader instead." msgstr "Vous utilisez l’outil de mise en ligne multi-fichiers. Si vous rencontrez des problÃ¨mes, essayez la mÃ©thode du navigateur Ã la place." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:491 +msgid "MB (Leave blank for network default)" +msgstr "Mo (Laisser vide pour utiliser la valeur par dÃ©faut du rÃ©seau)" +||||||| .r11156 +#: wp-admin/plugins.php:441 +msgid "Search Installed Plugins" +msgstr "Chercher parmi les extensions installÃ©es" +======= #: wp-admin/includes/media.php:2535 msgid "Link to image" msgstr "Lier Ã l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:230 +msgid "If you have marked plugins as favorites on WordPress.org, you can browse them here." +msgstr "Si vous avez mis des extensions en favoris sur WordPress.org, vous pouvez les voir ici." +||||||| .r11156 +#: wp-admin/nav-menus.php:19 +msgid "Your theme does not support navigation menus or widgets." +msgstr "Le thÃ¨me actuel n’accepte pas les menus de navigation ni les widgets." +======= #: wp-admin/includes/media.php:2530 msgid "Link Image To:" msgstr "Lier l’image Ã  :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:165 +msgid "Image rotation is not supported by your web host." +msgstr "La rotation d’image n’est pas disponible avec cet hÃ©bergeur." +||||||| .r11156 +#: wp-admin/async-upload.php:91 +msgid "“%s” has failed to upload due to an error" +msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne suite Ã une erreur" +======= #: wp-admin/includes/media.php:2504 msgid "Link text, e.g. “Ransom Demands (PDF)”" msgstr "Texte du lien, par exemple « ThÃ©orie sur le chaos (PDF) »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2208 wp-admin/menu.php:61 wp-admin/menu.php:242 +msgid "Media" +msgstr "MÃ©dias" +||||||| .r11156 +#: wp-admin/includes/import.php:164 wp-admin/tools.php:21 wp-admin/tools.php:59 +msgid "Categories and Tags Converter" +msgstr "Convertisseur de catÃ©gories et mots-clÃ©s" +======= #: wp-admin/includes/media.php:2486 msgid "Audio, Video, or Other File" msgstr "Audio, vidÃ©o ou un autre format" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2614 +msgid "You are using the multi-file uploader. Problems? Try the browser uploader instead." +msgstr "Vous utilisez l’outil de mise en ligne multi-fichiers. Si vous rencontrez des problÃ¨mes, essayez la mÃ©thode du navigateur Ã la place." +||||||| .r11156 +#: wp-admin/includes/import.php:165 +msgid "Install the category/tag converter to convert existing categories to tags or tags to categories, selectively." +msgstr "Installer le convertisseur catÃ©gorie/mot-clÃ©, pour convertir les catÃ©gories en mots-clÃ©s, ou vice-versa." +======= #: wp-admin/includes/media.php:2465 msgid "Image Caption" msgstr "LÃ©gende de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:423 +msgid "Sorry, you have used your space allocation. Please delete some files to upload more files." +msgstr "DÃ©solÃ©, vous avez utilisÃ© l’intÃ©gralitÃ© de votre quota alouÃ©. Veuillez supprimer quelques fichiers avant d’en envoyer d’autres." +||||||| .r11156 +#: wp-admin/user-edit.php:409 +msgid "There is a pending change of your e-mail to %1$s. Cancel" +msgstr "Il y a une modification de votre adresse de contact en cours, en faveur de %1$s. Annuler" +======= #: wp-admin/includes/media.php:2414 msgid "Filter »" msgstr "Filtrer »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:234 +msgid "Your WordPress.org username:" +msgstr "Votre identifiant WordPress.org :" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:693 +msgid "Most Recent" +msgstr "Les plus rÃ©centes" +======= #: wp-admin/includes/media.php:2373 wp-admin/includes/nav-menu.php:657 #: wp-admin/includes/nav-menu.php:897 msgid "»" msgstr "»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:236 +msgid "Get Favorites" +msgstr "RÃ©cupÃ©rer les extensions favorites." +||||||| .r11156 +#: wp-admin/export.php:179 wp-admin/export.php:211 +msgid "End Date" +msgstr "Date de fin" +======= #: wp-admin/includes/media.php:2372 wp-admin/includes/nav-menu.php:656 #: wp-admin/includes/nav-menu.php:896 msgid "«" msgstr "«" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2254 +msgid "Random" +msgstr "AlÃ©atoire" +||||||| .r11156 +#: wp-admin/export.php:175 wp-admin/export.php:207 +msgid "Start Date" +msgstr "Date de dÃ©but" +======= #: wp-admin/includes/media.php:2340 msgid "All Types" msgstr "Tous les types" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:34 +msgid "This file is too big. Files must be less than %1$s KB in size." +msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %1$s Ko." +||||||| .r11156 +#: wp-admin/includes/import.php:201 +msgid "Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file." +msgstr "Installer l’importateur WordPress, pour importer les articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et mots-clÃ©s Ã partir d’un fichier d’export WordPress." +======= #: wp-admin/includes/media.php:2263 msgid "Update gallery settings" msgstr "Mettre Ã jour les rÃ©glages de galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: audio album title, 2: artist name +#: wp-admin/includes/media.php:313 +msgid "%1$s by %2$s." +msgstr "%1$s par %2$s." +||||||| .r11156 +#: wp-admin/includes/import.php:189 +msgid "Install the RSS importer to import posts from an RSS feed." +msgstr "Installer l’importateur RSS, pour importer des articles Ã partir d’un flux RSS." +======= #: wp-admin/includes/media.php:2242 msgid "Gallery columns:" msgstr "Colonnes de galerie :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:325 +msgid "Released: %d." +msgstr "Date de sortie : %d." +||||||| .r11156 +#: wp-admin/includes/import.php:183 +msgid "Install the blogroll importer to import links in OPML format." +msgstr "Installer l’importateur de blogoliste, pour importer une liste de liens au format OPML." +======= #: wp-admin/includes/media.php:2227 msgid "Order:" msgstr "Ordre :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:330 +msgid "Track %1$s of %2$s." +msgstr "Piste %1$s sur %2$s." +||||||| .r11156 +#: wp-admin/includes/import.php:177 +msgid "Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog." +msgstr "Installer l’importateur Movable Type, pour importer les articles et commentaires en provenance d’un blog Movable Type ou TypePad." +======= #: wp-admin/includes/media.php:2219 msgid "Random" msgstr "AlÃ©atoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:332 +msgid "Track %1$s." +msgstr "Piste %1$s." +||||||| .r11156 +#: wp-admin/includes/import.php:159 +msgid "Install the Blogger importer to import posts, comments, and users from a Blogger blog." +msgstr "Installer l’importateur Blogger, pour importer les articles, commentaires et utilisateurs d’un blog Blogger." +======= #: wp-admin/includes/media.php:2218 msgid "Date/Time" msgstr "Horodatage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/misc.php:744 +msgid "%s has taken over and is currently editing." +msgstr "%s a pris la main et modifie actuellement ce contenu." +||||||| .r11156 +#: wp-admin/import.php:101 +msgid "Install importer" +msgstr "Installer l’importateur" +======= #: wp-admin/includes/media.php:2216 msgid "Menu order" msgstr "Ordre du menu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:746 +msgid "Thank you for Updating! Please visit the Upgrade Network page to update all your sites." +msgstr "Merci d’avoir fait cette mise Ã jour ! Rendez-vous sur la page de mise Ã jour du rÃ©seau afin de mettre Ã jour tous vos sites." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:143 +msgctxt "site" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +======= #: wp-admin/includes/media.php:2211 msgid "Order images by:" msgstr "Ranger les images par :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:104 +msgid "sub item" +msgstr "sous-Ã©lÃ©ment" +||||||| .r11156 +#: wp-admin/theme-editor.php:178 +msgctxt "Theme stylesheets in theme editor" +msgid "Styles" +msgstr "Styles" +======= #: wp-admin/includes/media.php:2201 msgid "Image File" msgstr "Fichier image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:190 +msgid "Move" +msgstr "DÃ©placer" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:179 +msgctxt "Plugin Installer" +msgid "Tag" +msgstr "Mot-clÃ©" +======= #: wp-admin/includes/media.php:2196 msgid "Link thumbnails to:" msgstr "Lier les miniatures Ã  :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:191 +msgid "Up one" +msgstr "Un cran vers le haut" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:67 +msgctxt "Theme Installer" +msgid "Tag" +msgstr "Mot-clÃ©" +======= #: wp-admin/includes/media.php:2173 wp-admin/menu.php:63 wp-admin/menu.php:240 msgid "Media" msgstr "MÃ©dias" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:195 +msgid "To the top" +msgstr "Tout en haut" +||||||| .r11156 +#: wp-admin/includes/media.php:2131 +msgctxt "verb" +msgid "Clear" +msgstr "Effacer" +======= #: wp-admin/includes/media.php:2166 msgctxt "verb" msgid "Clear" msgstr "Effacer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:1355 +msgid "%1$s has been updated." +msgstr "%s a bien Ã©tÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/edit-tag-form.php:116 wp-admin/edit-tags.php:502 +msgctxt "Taxonomy Description" +msgid "Description" +msgstr "Description" +======= #: wp-admin/includes/media.php:2165 wp-admin/includes/media.php:2235 msgid "Descending" msgstr "DÃ©croissant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:138 +msgid "Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the WordPress Plugin Directory or upload a plugin in .zip format via this page." +msgstr "Les extensions Ã©tendent les fonctionnalitÃ©s de WordPress, et en ajoutent de nouvelles. Vous pouvez installer des extensions automatiquement en provenance du rÃ©pertoire des extensions WordPress, ou mettre en ligne une extension au format .zip, via cette page." +||||||| .r11156 +#: wp-admin/edit-tag-form.php:90 wp-admin/edit-tags.php:455 +msgctxt "Taxonomy Slug" +msgid "Slug" +msgstr "Identifiant" +======= #: wp-admin/includes/media.php:2164 wp-admin/includes/media.php:2232 msgid "Ascending" msgstr "Croissant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:192 +#: wp-admin/includes/theme-install.php:67 +msgid "Keyword" +msgstr "Mot-clÃ©" +||||||| .r11156 +#: wp-admin/edit-tag-form.php:84 wp-admin/edit-tags.php:449 +msgctxt "Taxonomy Name" +msgid "Name" +msgstr "Nom" +======= #: wp-admin/includes/media.php:2163 msgid "Sort Order:" msgstr "Ordre de tri :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: audio track title, 2: album title, 3: artist name +#: wp-admin/includes/media.php:298 +msgid "\"%1$s\" from %2$s by %3$s." +msgstr "%1$s tirÃ© de %2$s par %3$s." +||||||| .r11156 +#: wp-admin/edit-tag-form.php:106 wp-admin/edit-tags.php:462 +msgctxt "Taxonomy Parent" +msgid "Parent" +msgstr "Parent" +======= #: wp-admin/includes/media.php:2159 msgid "All Tabs:" msgstr "Tous les onglets :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: audio track title, 2: album title +#: wp-admin/includes/media.php:301 +msgid "\"%1$s\" from %2$s." +msgstr "%1$s tirÃ© de %2$s" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:90 +msgctxt "adjective" +msgid "Pending" +msgstr "En attente" +======= #: wp-admin/includes/media.php:2013 msgid "Insert media from another website" msgstr "InsÃ©rer un mÃ©dia depuis un autre site" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: audio track title, 2: artist name +#: wp-admin/includes/media.php:304 +msgid "\"%1$s\" by %2$s." +msgstr "%1$s par %2$s." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:223 +msgctxt "comment" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +======= #: wp-admin/includes/media.php:1977 wp-admin/includes/media.php:2184 #: wp-admin/includes/media.php:2444 msgid "Save all changes" msgstr "Enregistrer toutes les modifications" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:306 +msgid "\"%s\"." +msgstr "%s." +||||||| .r11156 +#: wp-admin/custom-background.php:282 +msgid "Remove Background Image" +msgstr "Supprimer l’image d’arriÃ¨re-plan" +======= #: wp-admin/includes/media.php:1950 msgid "Add media files from your computer" msgstr "Ajouter un fichier mÃ©dia depuis votre ordinateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:192 +msgid "Your site is configured to keep only the last %s revisions." +msgstr "Votre site est configurÃ© pour conserver seulement les %s derniÃ¨res rÃ©visions." +||||||| .r11156 +#: wp-admin/edit-comments.php:108 wp-admin/edit-comments.php:145 +msgid "Comments on “%s”" +msgstr "Commentaires sur « %s »" +======= #: wp-admin/includes/media.php:1859 msgid "Drop files here" msgstr "DÃ©posez vos fichiers ici" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:194 wp-admin/includes/meta-boxes.php:197 +msgid "Revisions: %s" +msgstr "RÃ©visions : %s" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1182 +msgid "The Walker class named %s does not exist." +msgstr "La classe Walker nommÃ©e %s n’existe pas." +======= #: wp-admin/includes/media.php:1461 wp-admin/upgrade.php:70 #: wp-admin/upgrade.php:104 msgid "Continue" msgstr "Continuer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:200 +msgctxt "revisions" +msgid "Browse" +msgstr "Parcourir" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1217 +msgid "Show advanced menu properties" +msgstr "Afficher les propriÃ©tÃ©s avancÃ©es du menu" +======= #: wp-admin/includes/media.php:1460 msgid "You are about to delete %s." msgstr "Vous Ãªtes sur le point de supprimer %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:192 +msgid "Down one" +msgstr "Descendre d’un cran" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:495 wp-admin/press-this.php:557 +msgid "+ %s" +msgstr "+ %s" +======= #: wp-admin/includes/media.php:1451 wp-admin/includes/media.php:2541 #: wp-admin/includes/media.php:2547 msgid "Insert into Post" msgstr "InsÃ©rer dans l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:666 +msgid "Image restored successfully." +msgstr "L’image a bien Ã©tÃ© rÃ©tablie." +||||||| .r11156 +#: wp-admin/update-core.php:276 wp-admin/update-core.php:324 +msgid "You have version %1$s installed. Update to %2$s." +msgstr "Vous utilisez la version %1$s. Mettez Ã jour vers la version %2$s." +======= #: wp-admin/includes/media.php:1431 msgid "Upload date:" msgstr "Date de mise en ligne :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/nav-menu.php:1195 +msgid "Add menu items from the column on the left." +msgstr "Ajouter des Ã©lÃ©ments de menu depuis la colonne de gauche." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:312 wp-admin/includes/nav-menu.php:784 +msgctxt "nav menu home label" +msgid "Home" +msgstr "Accueil" +======= #: wp-admin/includes/media.php:1353 wp-admin/includes/media.php:2161 msgid "Hide" msgstr "Cacher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:336 +msgid "Genre: %s." +msgstr "Genre : %s" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:252 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:295 +msgid "Enable" +msgstr "Activer" +======= #: wp-admin/includes/media.php:1352 wp-admin/includes/media.php:2160 msgid "Show" msgstr "Afficher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2888 +msgid "Audio Format:" +msgstr "Format audio :" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:266 +msgctxt "%1$s: site name. %2$s: site tagline." +msgid "%1$s – %2$s" +msgstr "%1$s – %2$s" +======= #: wp-admin/includes/media.php:1246 wp-admin/includes/media.php:2511 msgid "Alt text for the image, e.g. “The Mona Lisa”" msgstr "Texte alternatif de l’image, exemple : « La Joconde »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2889 +msgid "Audio Codec:" +msgstr "Codex audio :" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:164 +msgctxt "site" +msgid "Registered" +msgstr "Inscription" +======= #: wp-admin/includes/media.php:1205 msgid "Location of the uploaded file." msgstr "Emplacement du fichier envoyÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1201 +msgid "Link URL" +msgstr "Adresse du lien" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:144 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:294 +msgctxt "site" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +======= #: wp-admin/includes/media.php:1194 wp-admin/includes/media.php:2536 msgid "Enter a link URL or click above for presets." msgstr "Saisissez une adresse de lien ou cliquez ci-dessus pour les liens prÃ©dÃ©finis." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:1204 wp-admin/includes/media.php:2578 +msgid "Enter a link URL or click above for presets." +msgstr "Saisissez une adresse de lien ou cliquez ci-dessus pour les liens prÃ©dÃ©finis." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:120 +msgctxt "user" +msgid "Registered" +msgstr "Inscription" +======= #: wp-admin/includes/media.php:1191 msgid "Link URL" msgstr "Adresse du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:140 +msgid "Edit visibility" +msgstr "Modifier la visibilitÃ©" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:291 +msgctxt "verb; site" +msgid "Archive" +msgstr "Archiver" +======= #: wp-admin/includes/media.php:1119 msgid "Empty Title filled from filename." msgstr "Titre absent, il sera rempli Ã partir du nom du fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:200 +msgid "Browse revisions" +msgstr "Parcourir les rÃ©visions" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:197 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:296 +msgctxt "site" +msgid "Spam" +msgstr "IndÃ©sirable" +======= #: wp-admin/includes/media.php:1049 msgid "Attachment Post URL" msgstr "Adresse de l’article du fichier joint" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/media.php:2768 +msgid "Displayed on attachment pages." +msgstr "AffichÃ© sur les pages des fichiers joints." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:228 +#: wp-admin/includes/class-wp-comments-list-table.php:461 +msgctxt "comment" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +======= #: wp-admin/includes/media.php:1048 wp-admin/includes/media.php:1201 msgid "File URL" msgstr "Adresse web du fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:171 +msgid "Flip vertically" +msgstr "Retournement vertical" +||||||| .r11156 +#: wp-admin/custom-background.php:297 +msgid "This will restore the original background image. You will not be able to restore any customizations." +msgstr "Ceci remettra en place l’image d’arriÃ¨re-plan originale. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +======= #: wp-admin/includes/media.php:443 wp-admin/includes/template.php:1592 #: wp-admin/install.php:76 wp-admin/maint/repair.php:25 #: wp-admin/setup-config.php:86 wp-admin/upgrade.php:64 msgid "WordPress" msgstr "WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:172 +msgid "Flip horizontally" +msgstr "Retournement horizontal" +||||||| .r11156 +#: wp-admin/nav-menus.php:716 wp-admin/nav-menus.php:787 +msgid "Create Menu" +msgstr "CrÃ©er le menu" +======= #: wp-admin/includes/media.php:443 msgid "Uploads" msgstr "Fichiers envoyÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:776 +msgid "Need help? Use the Help tab in the upper right of your screen." +msgstr "Besoin d’aideÂ ? Utilisez l’onglet Aide prÃ©sent dans le coin supÃ©rieur droit de votre Ã©cran." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:955 +msgid "WordPress Blog" +msgstr "Blog WordPress" +======= #: wp-admin/includes/media.php:334 msgid "Genre: %s." msgstr "Genre : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:142 +msgid "Popular tags" +msgstr "Ãtiquettes populaires" +||||||| .r11156 +#: wp-admin/user-edit.php:329 wp-admin/user-edit.php:331 +msgid "— No role for this site —" +msgstr "— Pas de rÃ´le sur ce site —" +======= #: wp-admin/includes/media.php:330 msgid "Track %1$s." msgstr "Piste %1$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:143 +msgid "You may also browse based on the most popular tags in the Plugin Directory:" +msgstr "Vous pouvez Ã©galement naviguer en fonction des Ã©tiquettes les plus populaires sur WordPress.org :" +||||||| .r11156 +#: wp-admin/options-writing.php:118 wp-admin/tools.php:43 +msgid "Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site." +msgstr "Utilisez-le pour rÃ©cupÃ©rer du texte, des images et des vidÃ©os depuis n’importe quelle page Web. Puis modifiez l’article et ajoutez vos propres textes directement dans le bookmarklet, avant d’enregistrer le tout ou de le publier dans un article sur votre site." +======= #: wp-admin/includes/media.php:328 msgid "Track %1$s of %2$s." msgstr "Piste %1$s sur %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:194 +msgctxt "Plugin Installer" +msgid "Tag" +msgstr "Ãtiquette" +||||||| .r11156 +#: wp-admin/users.php:329 +msgid "Remove Users from Site" +msgstr "Supprimer des utilisateurs de ce site" +======= #: wp-admin/includes/media.php:323 msgid "Released: %d." msgstr "Date de sortie : %d." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:202 +msgid "Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file." +msgstr "Installer l’importateur WordPress, pour importer les articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et Ã©tiquettes Ã partir d’un fichier d’export WordPress." +||||||| .r11156 +#: wp-admin/includes/post.php:651 +msgid "You are not allowed to create posts or drafts on this site." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des articles ou des brouillons sur ce site." +======= #. translators: 1: audio album title, 2: artist name #: wp-admin/includes/media.php:311 msgid "%1$s by %2$s." msgstr "%1$s par %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:165 wp-admin/tools.php:21 +#: wp-admin/tools.php:103 +msgid "Categories and Tags Converter" +msgstr "Convertisseur de catÃ©gories et Ã©tiquettes" +||||||| .r11156 +#: wp-admin/includes/plugin.php:421 +msgid "Custom site deleted message." +msgstr "Message personnalisÃ© de site supprimÃ©." +======= #: wp-admin/includes/media.php:304 msgid "\"%s\"." msgstr "%s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/import.php:166 +msgid "Install the category/tag converter to convert existing categories to tags or tags to categories, selectively." +msgstr "Installer le convertisseur catÃ©gorie/Ã©tiquette, pour convertir les catÃ©gories en Ã©tiquettes, ou vice-versa." +||||||| .r11156 +#: wp-admin/includes/plugin.php:423 +msgid "Custom site suspended message." +msgstr "Message personnalisÃ© de site suspendu." +======= #. translators: 1: audio track title, 2: artist name #: wp-admin/includes/media.php:302 msgid "\"%1$s\" by %2$s." msgstr "%1$s par %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: +#. those are placeholders. +#: wp-admin/includes/ms.php:267 +msgid "" +"Howdy ###USERNAME###,\n" +"\n" +"You recently requested to have the administration email address on\n" +"your site changed.\n" +"\n" +"If this is correct, please click on the following link to change it:\n" +"###ADMIN_URL###\n" +"\n" +"You can safely ignore and delete this email if you do not want to\n" +"take this action.\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Cher/chÃ¨re ###USERNAME###,\n" +"\n" +"Vous avez rÃ©cemment demandÃ© Ã modifier l'adresse de messagerie de l'administration de votre compte.\n" +"\n" +"Si c'est bien le cas, veuillez cliquer sur le lien suivant pour changer d'adresse de messagerie :\n" +"###ADMIN_URL###\n" +"\n" +"Vous pouvez ignorer ce message et le supprimer si vous ne souhaitez pas lancer cette action.\n" +"\n" +"Ce message a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"\n" +"L'Ã©quipe de ###SITENAME###\n" +"###SITEURL###" +||||||| .r11156 +#: wp-admin/includes/plugin.php:422 +msgid "Custom site inactive message." +msgstr "Message personnalisÃ© de site inactif." +======= #. translators: 1: audio track title, 2: album title #: wp-admin/includes/media.php:299 msgid "\"%1$s\" from %2$s." msgstr "%1$s tirÃ© de %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:491 +msgid "Size in megabytes" +msgstr "Taille en mÃ©gaoctets" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:136 +msgid "No sites found." +msgstr "Aucun site trouvÃ©." +======= #. translators: 1: audio track title, 2: album title, 3: artist name #: wp-admin/includes/media.php:296 msgid "\"%1$s\" from %2$s by %3$s." msgstr "%1$s tirÃ© de %2$s par %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ms.php:488 +msgid "Site Upload Space Quota" +msgstr "Quota dâespace de fichiers" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:550 +msgid "Trackbacks are a way to notify legacy blog systems that you’ve linked to them. If you link other WordPress sites they’ll be notified automatically using pingbacks, no other action necessary." +msgstr "Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Si vous faites un lien vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide des pings (en), sans que vous n’ayez rien Ã faire." +======= #: wp-admin/includes/media.php:60 msgid "Gallery (%s)" msgstr "Galerie (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:557 +msgid "Trackbacks are a way to notify legacy blog systems that you’ve linked to them. If you link other WordPress sites, they’ll be notified automatically using pingbacks, no other action necessary." +msgstr "Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Si vous faites un lien vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide des pings (en), sans que vous n’ayez rien Ã faire." +||||||| .r11156 +#: wp-admin/includes/post.php:649 +msgid "You are not allowed to create pages on this site." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sur ce site." +======= #: wp-admin/includes/media.php:20 msgid "Gallery" msgstr "Galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:599 +msgid "https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" +msgstr "https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" +||||||| .r11156 +#: wp-admin/includes/schema.php:369 +msgid "My Site" +msgstr "Mon site" +======= #: wp-admin/includes/media.php:19 msgid "From URL" msgstr "Depuis le Web" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:583 +msgid "Custom fields can be used to add extra metadata to a post that you can use in your theme." +msgstr "Les champs personnalisÃ©s peuvent Ãªtre utilisÃ©s afin d’ajouter des donnÃ©es supplÃ©mentaires Ã vos articles. Vous pouvez les utiliser dans votre thÃ¨me (en)." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:295 +msgid "New WordPress Site" +msgstr "Nouveau site WordPress" +======= #: wp-admin/includes/media.php:18 msgid "From Computer" msgstr "Depuis votre ordinateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:533 +msgid "Excerpts are optional hand-crafted summaries of your content that can be used in your theme. Learn more about manual excerpts." +msgstr "Les extraits sont des rÃ©sumÃ©s facultatifs de vos articles, Ã©crits Ã la main. Il se peut que votre thÃ¨me s’en serve. En savoir plus." +||||||| .r11156 +#: wp-admin/update.php:155 wp-admin/update.php:176 +msgid "You do not have sufficient permissions to update themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les thÃ¨mes de ce site." +======= #: wp-admin/includes/import.php:199 msgid "Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file." msgstr "Installer l’importateur WordPress, pour importer les articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et Ã©tiquettes Ã partir d’un fichier d’export WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: +#. those are placeholders. +#: wp-admin/includes/ms.php:348 +msgid "" +"Howdy ###USERNAME###,\n" +"\n" +"You recently requested to have the email address on your account changed.\n" +"\n" +"If this is correct, please click on the following link to change it:\n" +"###ADMIN_URL###\n" +"\n" +"You can safely ignore and delete this email if you do not want to\n" +"take this action.\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Cher/chÃ¨re ###USERNAME###,\n" +"\n" +"Vous avez rÃ©cemment demandÃ© Ã modifier l'adresse de messagerie de l'administration de votre compte.\n" +"\n" +"Si c'est bien le cas, veuillez cliquer sur le lien suivant pour changer d'adresse de messagerie :\n" +"###ADMIN_URL###\n" +"\n" +"Vous pouvez ignorer ce message et le supprimer si vous ne souhaitez pas lancer cette action.\n" +"\n" +"Ce message a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"\n" +"L'Ã©quipe de ###SITENAME###\n" +"###SITEURL###" +||||||| .r11156 +#: wp-admin/update.php:24 wp-admin/update.php:50 wp-admin/update.php:71 +msgid "You do not have sufficient permissions to update plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les extensions de ce site." +======= #: wp-admin/includes/import.php:193 msgid "Install the Tumblr importer to import posts & media from Tumblr using their API." msgstr "Installer l’importateur Tumblr pour importer les articles et fichiers mÃ©dia depuis un Tumblr en utilisant leur API." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/meta-boxes.php:94 +msgid "Edit status" +msgstr "Modifier l'Ã©tat" +||||||| .r11156 +#: wp-admin/theme-install.php:16 wp-admin/update.php:202 +#: wp-admin/update.php:232 +msgid "You do not have sufficient permissions to install themes on this site." +msgstr "Vous n’avez pas les droits suffisants pour installer des thÃ¨mes sur ce site." +======= #: wp-admin/includes/import.php:192 msgid "Tumblr" msgstr "Tumblr" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/plugin-install.php:259 +msgid "These suggestions are based on the plugins you and other users have installed." +msgstr "Ces suggestions sont basÃ©es sur les extensions que vous et d'autres utilisateurs ont installÃ©es." +||||||| .r11156 +#: wp-admin/theme-editor.php:18 +msgid "You do not have sufficient permissions to edit templates for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les modÃ¨les de ce site." +======= #: wp-admin/includes/import.php:187 msgid "Install the RSS importer to import posts from an RSS feed." msgstr "Installer l’importateur RSS, pour importer des articles Ã partir d’un flux RSS." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/deprecated.php:602 +msgid "Displaying %s–%s of %s" +msgstr "Affichage de %s Ã %s sur %s" +||||||| .r11156 +#: wp-admin/plugins.php:31 wp-admin/plugins.php:66 wp-admin/plugins.php:135 +msgid "You do not have sufficient permissions to activate plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour activer les extensions de ce site." +======= #: wp-admin/includes/import.php:181 msgid "Install the blogroll importer to import links in OPML format." msgstr "Installer l’importateur de blogoliste, pour importer une liste de liens au format OPML." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:598 wp-admin/includes/file.php:706 +msgid "Incompatible Archive." +msgstr "Archive incompatible." +||||||| .r11156 +#: wp-admin/plugin-install.php:18 wp-admin/update.php:96 +#: wp-admin/update.php:127 +msgid "You do not have sufficient permissions to install plugins on this site." +msgstr "Vous n’avez pas les droits suffisants pour installer des extensions sur ce site." +======= #: wp-admin/includes/import.php:180 msgid "Blogroll" msgstr "Liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:352 +msgid "The uploaded file could not be moved to %s." +msgstr "Le fichier n’ a pas pu Ãªtre dÃ©placÃ© vers %s." +||||||| .r11156 +#: wp-admin/plugins.php:160 wp-admin/plugins.php:180 +msgid "You do not have sufficient permissions to deactivate plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour dÃ©sactiver les extensions de ce site." +======= #: wp-admin/includes/import.php:175 msgid "Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog." msgstr "Installer l’importateur Movable Type, pour importer les articles et commentaires en provenance d’un blog Movable Type ou TypePad." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:42 +msgid "Right Now" +msgstr "Aujourd’hui" +||||||| .r11156 +#: wp-admin/plugins.php:211 +msgid "You do not have sufficient permissions to delete plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour supprimer les extensions de ce site." +======= #: wp-admin/includes/import.php:174 msgid "Movable Type and TypePad" msgstr "Movable Type et TypePad" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1038 +msgid "Other WordPress News" +msgstr "Autres actualitÃ©s de WordPress (en franÃ§ais)" +||||||| .r11156 +#: wp-admin/link-add.php:13 +msgid "You do not have sufficient permissions to add links to this site." +msgstr "Vous n’avez pas les droits suffisants pour ajouter les liens Ã ce site." +======= #: wp-admin/includes/import.php:169 msgid "Install the LiveJournal importer to import posts from LiveJournal using their API." msgstr "Installer l’importateur LiveJournal, pour importer les articles depuis un blog LiveJournal en utilisant leur API." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:112 +msgid "View all" +msgstr "Afficher tout" +||||||| .r11156 +#: wp-admin/includes/bookmark.php:303 wp-admin/link-manager.php:12 +#: wp-admin/link-manager.php:67 +msgid "You do not have sufficient permissions to edit the links for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les liens de ce site." +======= #: wp-admin/includes/import.php:168 msgid "LiveJournal" msgstr "LiveJournal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:154 +msgid "Configure" +msgstr "Configurer" +||||||| .r11156 +#: wp-admin/export.php:13 +msgid "You do not have sufficient permissions to export the content of this site." +msgstr "Vous n’avez pas les droits suffisants pour exporter le contenu de ce site." +======= #: wp-admin/includes/import.php:163 msgid "Install the category/tag converter to convert existing categories to tags or tags to categories, selectively." msgstr "Installer le convertisseur catÃ©gorie/Ã©tiquette, pour convertir les catÃ©gories en Ã©tiquettes, ou vice-versa." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: comment author, 2: post link, 3: notification if the comment +#. is pending +#: wp-admin/includes/dashboard.php:636 +msgid "From %1$s on %2$s%3$s" +msgstr "Par %1$s, sur %2$s%3$s" +||||||| .r11156 +#: wp-admin/import.php:15 +msgid "You do not have sufficient permissions to import content in this site." +msgstr "Vous n’avez pas les droits suffisants pour importer du contenu dans ce site." +======= #: wp-admin/includes/import.php:162 wp-admin/tools.php:21 #: wp-admin/tools.php:103 msgid "Categories and Tags Converter" msgstr "Convertisseur de catÃ©gories et Ã©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:637 +msgid "[Pending]" +msgstr "[En attente]" +||||||| .r11156 +#: wp-admin/import.php:59 +msgid "If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:" +msgstr "Si vous avez des articles ou des commentaires dans un autre systÃ¨me de site, WordPress peut les importer dans votre site actuel. Pour commencer, choisissez un systÃ¨me d’origine ci-dessous :" +======= #: wp-admin/includes/import.php:157 msgid "Install the Blogger importer to import posts, comments, and users from a Blogger blog." msgstr "Installer l’importateur Blogger, pour importer les articles, commentaires et utilisateurs d’un blog Blogger." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %1$s is type of comment, %2$s is link to the post +#: wp-admin/includes/dashboard.php:656 +msgctxt "dashboard" +msgid "%1$s on %2$s" +msgstr "%1$s dans %2$s" +||||||| .r11156 +#: wp-admin/plugin-editor.php:18 +msgid "You do not have sufficient permissions to edit plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les extensions de ce site." +======= #: wp-admin/includes/import.php:156 msgid "Blogger" msgstr "Blogger" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:871 +msgid "Loading…" +msgstr "Chargement…" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:641 wp-admin/includes/nav-menu.php:881 +msgid "No items." +msgstr "Aucune entrÃ©e." +======= #: wp-admin/includes/image-edit.php:859 msgid "Image saved" msgstr "Image enregistrÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:871 +msgid "This widget requires JavaScript." +msgstr "Ce widget requiert JavaScript." +||||||| .r11156 +#: wp-admin/nav-menus.php:712 +msgid "Menu Name" +msgstr "Nom du menu" +======= #: wp-admin/includes/image-edit.php:761 msgid "Unable to save the image." msgstr "Ãchec lors de l’enregistrement de l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:13 +msgid "Main Index Template" +msgstr "ModÃ¨le pour la page d’accueil" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1220 +msgid "CSS Classes" +msgstr "Classes CSS" +======= #: wp-admin/includes/image-edit.php:718 msgid "Nothing to save, the image has not changed." msgstr "Rien Ã enregistrer, l’image n’a pas Ã©tÃ© modifiÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:17 +msgid "RTL Stylesheet" +msgstr "Feuille de style RTL" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:150 +msgid "Navigation Label" +msgstr "Titre de la navigation" +======= #: wp-admin/includes/image-edit.php:710 msgid "Error while saving the scaled image. Please reload the page and try again." msgstr "Une erreur est survenue pendant la modification de l’Ã©chelle de l’image. Veuillez recharger la page pour faire une nouvelle tentative." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:19 +msgid "Popup Comments" +msgstr "Commentaires en popup" +||||||| .r11156 +#: wp-admin/includes/schema.php:1030 +msgid "To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool." +msgstr "Pour utiliser la configuration en sous-domaine, il vous faut ajouter un enregistrement gÃ©nÃ©rique (joker) Ã vos enregistrements DNS. Cela signifique ajouter un hÃ´te * pointant vers votre serveur dans votre outil de configuration DNS." +======= #: wp-admin/includes/image-edit.php:687 msgid "Unable to create new image." msgstr "Ãchec lors de la crÃ©ation d’une nouvelle image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:20 +msgid "Footer" +msgstr "Pied de page" +||||||| .r11156 +#: wp-admin/includes/schema.php:1026 +msgid "The installer attempted to contact a random hostname (%1$s) on your domain." +msgstr "L’installateur a tentÃ© de contacter un nom d’hÃ´te alÃ©atoire (%1$s) sur votre domaine." +======= #: wp-admin/includes/image-edit.php:666 msgid "Image restored successfully." msgstr "L’image a bien Ã©tÃ© rÃ©tablie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:26 +msgid "Category Template" +msgstr "ModÃ¨le pour les catÃ©gories" +||||||| .r11156 +#: wp-admin/install.php:121 +msgid "Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol." +msgstr "Les identifiants doivent contenir uniquement des caractÃ¨res alphanumÃ©riques, espaces, tiret bas, tiret, points et le symbole @." +======= #: wp-admin/includes/image-edit.php:664 msgid "Image metadata is inconsistent." msgstr "Les mÃ©tadonnÃ©es de l’image ne sont pas cohÃ©rentes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:27 wp-admin/includes/meta-boxes.php:755 +msgid "Page Template" +msgstr "ModÃ¨le de page" +||||||| .r11156 +#: wp-admin/nav-menus.php:234 +msgid "The menu item has been successfully deleted." +msgstr "L’Ã©lÃ©ment du menu a bien Ã©tÃ© supprimÃ©." +======= #: wp-admin/includes/image-edit.php:659 msgid "Cannot save image metadata." msgstr "Impossible d’enregistrer les mÃ©tadonnÃ©es de l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:29 +msgid "Search Form" +msgstr "Formulaire de recherche" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:197 +#: wp-admin/includes/class-wp-theme-install-list-table.php:125 +#: wp-admin/setup-config.php:212 +msgid "Try again" +msgstr "Recommencer" +======= #: wp-admin/includes/image-edit.php:603 msgid "Cannot load image metadata." msgstr "Impossible de charger les mÃ©tadonnÃ©es de l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:30 +msgid "Single Post" +msgstr "Article seul" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1187 +msgid "Please provide a custom field name." +msgstr "Veuillez saisir un nom pour le champ personnalisÃ©." +======= #: wp-admin/includes/image-edit.php:385 msgid "Use WP_Image_Editor::flip" msgstr "Utilisez WP_Image_Editor::flip" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:31 +msgid "404 Template" +msgstr "ModÃ¨le pour l’erreur 404" +||||||| .r11156 +#: wp-admin/custom-background.php:325 +msgid "Display Options" +msgstr "Options d’affichage" +======= #: wp-admin/includes/image-edit.php:362 msgid "Use WP_Image_Editor::rotate" msgstr "Utilisez WP_Image_Editor::rotate" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:32 +msgid "Links Template" +msgstr "ModÃ¨le pour les liens" +||||||| .r11156 +#: wp-admin/users.php:330 +msgid "You have specified these users for removal:" +msgstr "Vous avez choisi de supprimer ces utilisateurs :" +======= #: wp-admin/includes/image-edit.php:231 wp-admin/includes/image-edit.php:296 #: wp-admin/includes/image-edit.php:438 msgid "$image needs to be an WP_Image_Editor object" msgstr "$image doit Ãªtre un objet WP_Image_Editor" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:33 +msgid "Theme Functions" +msgstr "Fonctions du thÃ¨me" +||||||| .r11156 +#: wp-admin/users.php:142 wp-admin/users.php:191 +msgid "User deletion is not allowed from this screen." +msgstr "La suppression d’un utilisateur n’est pas autorisÃ©e depuis cet Ã©cran." +======= #: wp-admin/includes/image-edit.php:199 msgid "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." msgstr "Les modifications qui n'ont pas Ã©tÃ© enregistrÃ©es seront perdues. Â« OK Â» pour continuer, Â« Annuler Â» pour revenir Ã l'Ã©diteur d'images." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:39 +msgid "my-hacks.php (legacy hacks support)" +msgstr "my-hacks.php (reconnaissance des hacks existants)" +||||||| .r11156 +#: wp-admin/users.php:168 +msgid "You can’t delete that user." +msgstr "Vous ne pouvez pas supprimer cet utilisateur." +======= #: wp-admin/includes/image-edit.php:172 msgid "Flip horizontally" msgstr "Retournement horizontal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:40 +msgid ".htaccess (for rewrite rules )" +msgstr ".htaccess (pour les rÃ¨gles de rÃ©Ã©criture)" +||||||| .r11156 +#: wp-admin/users.php:350 +msgid "Confirm Removal" +msgstr "Confirmer la suppression" +======= #: wp-admin/includes/image-edit.php:171 msgid "Flip vertically" msgstr "Retournement vertical" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:43 +msgid "Comments Template" +msgstr "ModÃ¨le pour les commentaires" +||||||| .r11156 +#: wp-admin/users.php:352 +msgid "There are no valid users selected for removal." +msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +======= #: wp-admin/includes/image-edit.php:165 msgid "Image rotation is not supported by your web host." msgstr "La rotation d’image n’est pas disponible avec cet hÃ©bergeur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:44 +msgid "Popup Comments Template" +msgstr "ModÃ¨le pour la fenÃªtre de commentaires" +||||||| .r11156 +#: wp-admin/users.php:408 +msgid "You can't remove the current user." +msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +======= #: wp-admin/includes/image-edit.php:163 msgid "Rotate clockwise" msgstr "Tourner dans le sens des aiguilles d’une montre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:264 +msgid "The uploaded file was only partially uploaded." +msgstr "Le fichier n’a Ã©tÃ© que partiellement envoyÃ©." +||||||| .r11156 +#: wp-admin/users.php:409 +msgid "Other users have been removed." +msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +======= #: wp-admin/includes/image-edit.php:162 msgid "Rotate counter-clockwise" msgstr "Tourner dans le sens inverse des aiguilles d’une montre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:265 +msgid "No file was uploaded." +msgstr "Aucun fichier n’a Ã©tÃ© envoyÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:208 +msgid "%1$s updated successfully." +msgstr "%1$s a bien Ã©tÃ© mis Ã jour." +======= #: wp-admin/includes/image-edit.php:158 msgid "Crop" msgstr "Recadrer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:267 +msgid "Missing a temporary folder." +msgstr "Un dossier temporaire est manquant." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:208 +msgid "Show Details" +msgstr "Afficher les dÃ©tails" +======= #: wp-admin/includes/image-edit.php:147 msgid "All sizes except thumbnail" msgstr "Toutes les tailles sauf la miniature" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:268 +msgid "Failed to write file to disk." +msgstr "Ãchec de l’Ã©criture du fichier sur le disque." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:208 +msgid "Hide Details" +msgstr "Cacher les dÃ©tails" +======= #: wp-admin/includes/image-edit.php:139 msgid "All image sizes" msgstr "Toutes les tailles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:269 +msgid "File upload stopped by extension." +msgstr "L’envoi de fichier est arrÃªtÃ© par l’extension." +||||||| .r11156 +#: wp-admin/includes/user.php:439 +msgid "Yes, take me to my profile page" +msgstr "Oui, je veux aller sur mon profil maintenant" +======= #: wp-admin/includes/image-edit.php:135 msgid "Apply changes to:" msgstr "Appliquer les modifications Ã  :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:283 +msgid "Invalid form submission." +msgstr "Envoi non valide du formulaire." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:79 +msgid "Your chosen password." +msgstr "Le mot de passe que vous avez choisi." +======= #: wp-admin/includes/image-edit.php:131 msgid "Current thumbnail" msgstr "Miniature actuelle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:296 wp-admin/includes/import.php:84 +msgid "File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini." +msgstr "Ce fichier est vide. Veuillez envoyer quelque chose de plus substantiel. Cette erreur peut Ã©galement Ãªtre due Ã la dÃ©sactivation de l’envoi de fichier dans le fichier php.ini de votre serveur, ou par une valeur de post_max_size infÃ©rieure Ã celle de upload_max_filesize dans ce mÃªme php.ini." +||||||| .r11156 +#: wp-admin/includes/user.php:440 +msgid "No thanks, do not remind me again" +msgstr "Non, ne pas me relancer Ã ce sujet" +======= #: wp-admin/includes/image-edit.php:126 msgid "You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image." msgstr "Vous pouvez modifier l’image tout en prÃ©servant sa miniature. Par exemple, vous pourriez vouloir avoir une miniature carrÃ©e qui n’afficherait qu’une partie de l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:304 +msgid "Specified file failed upload test." +msgstr "Le test d’envoi du fichier spÃ©cifiÃ© a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/post.php:273 +msgid "You are not allowed to move this item out of the Trash." +msgstr "Vous n’avez pas l’autorisation de dÃ©placer ce contenu en dehors de la Corbeille." +======= #: wp-admin/includes/image-edit.php:125 msgid "Thumbnail Settings" msgstr "RÃ©glages de la miniature" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:459 +msgid "Could not create Temporary file." +msgstr "Impossible de crÃ©er le fichier temporaire." +||||||| .r11156 +#: wp-admin/edit.php:126 wp-admin/edit.php:129 wp-admin/post.php:297 +#: wp-admin/post.php:300 wp-admin/upload.php:174 +msgid "Error in deleting." +msgstr "Erreur pendant la suppression." +======= #: wp-admin/includes/image-edit.php:110 msgid "Selection:" msgstr "SÃ©lection :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:668 wp-admin/includes/file.php:767 +#: wp-admin/includes/file.php:802 wp-admin/includes/update-core.php:1040 +#: wp-admin/includes/update-core.php:1148 +msgid "Could not copy file." +msgstr "Impossible de copier le fichier." +||||||| .r11156 +#: wp-admin/edit.php:110 wp-admin/post.php:276 +msgid "Error in restoring from Trash." +msgstr "Erreur pendant la rÃ©cupÃ©ration depuis la Corbeille." +======= #: wp-admin/includes/image-edit.php:101 msgid "Aspect ratio:" msgstr "Proportion de taille :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:709 +msgid "Empty archive." +msgstr "Archive vide." +||||||| .r11156 +#: wp-admin/edit.php:107 +msgid "You are not allowed to restore this item from the Trash." +msgstr "Vous n’avez pas l’autorisation de rÃ©cupÃ©rer ce contenu depuis la Corbeille." +======= #: wp-admin/includes/image-edit.php:96 msgid "Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings." msgstr "Une fois que votre sÃ©lection est faite, vous pouvez l’ajuster en saisissant une taille en pixels. La taille minimale de la sÃ©lection est celle des miniatures, tel que dÃ©fini dans les rÃ©glages des MÃ©dia." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1103 +msgid "FTP" +msgstr "FTP" +||||||| .r11156 +#: wp-admin/edit.php:96 wp-admin/post.php:258 +msgid "Error in moving to Trash." +msgstr "Erreur lors du dÃ©placement dans la Corbeille." +======= #: wp-admin/includes/image-edit.php:95 msgid "Crop Selection" msgstr "SÃ©lection de recadrage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1105 +msgid "FTPS (SSL)" +msgstr "FTPS (SSL)" +||||||| .r11156 +#: wp-admin/edit-comments.php:201 +msgid "%s comment restored from the Trash" +msgid_plural "%s comments restored from the Trash" +msgstr[0] "%s commentaire rÃ©cupÃ©rÃ© depuis la Corbeille" +msgstr[1] "%s commentaires rÃ©cupÃ©rÃ©s depuis la Corbeille" +======= #: wp-admin/includes/image-edit.php:93 msgid "The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc." msgstr "Les proportions d’une image sont le rapport entre sa largeur et sa hauteur. Vous pouvez prÃ©server les proportions en maintenant appuyÃ©e la touche Shift tandis que vous redimensionnez votre sÃ©lection. Utilisez le champ de saisie pour prÃ©ciser la proportion Ã respecter, par exemple 1:1 (carrÃ©), 4:3, 16:9, etc." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1107 +msgid "SSH2" +msgstr "SSH2" +||||||| .r11156 +#: wp-admin/edit-comments.php:197 +msgid "%s comment moved to the Trash." +msgid_plural "%s comments moved to the Trash." +msgstr[0] "%s commentaire dÃ©placÃ© dans la Corbeille." +msgstr[1] "%s commentaires dÃ©placÃ©s dans la Corbeille." +======= #: wp-admin/includes/image-edit.php:92 msgid "Crop Aspect Ratio" msgstr "Proportion de taille du recadrage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1139 +msgid "Connection Information" +msgstr "Informations sur connexion" +||||||| .r11156 +#: wp-admin/edit.php:88 wp-admin/post.php:250 +msgid "You are not allowed to move this item to the Trash." +msgstr "Vous n’avez pas l’autorisation de dÃ©placer ce contenu dans la Corbeille." +======= #: wp-admin/includes/image-edit.php:90 msgid "To crop the image, click on it and drag to make your selection." msgstr "Pour couper l’image, cliquez dessus et dÃ©placez la souris pour crÃ©er la sÃ©lection." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1160 +msgid "Hostname" +msgstr "Nom de l’Hôte :" +||||||| .r11156 +#: wp-admin/update-core.php:299 +msgid "The following themes have new versions available. Check the ones you want to update and then click “Update Themes”." +msgstr "Les thÃ¨mes suivants disposent d’une nouvelle version. Cochez ceux que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les thÃ¨mes »." +======= #: wp-admin/includes/image-edit.php:87 msgid "Image Crop" msgstr "Recadrage de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1188 wp-admin/includes/file.php:1189 +msgid "Connection Type" +msgstr "Type de connexion" +||||||| .r11156 +#: wp-admin/user-new.php:217 +msgid "User has been added to your site." +msgstr "L’utilisateur a Ã©tÃ© ajoutÃ© Ã votre site." +======= #: wp-admin/includes/image-edit.php:77 msgid "Restore image" msgstr "RÃ©tablir l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1207 +msgid "Proceed" +msgstr "Continuer" +||||||| .r11156 +#: wp-admin/user-new.php:220 +msgid "That user is already a member of this site." +msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +======= #: wp-admin/includes/image-edit.php:73 msgid "Previously edited copies of the image will not be deleted." msgstr "Les copies de l’image prÃ©cÃ©demment modifiÃ©es ne seront pas effacÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:158 +msgid "Crop" +msgstr "Recadrer" +||||||| .r11156 +#: wp-admin/user-new.php:214 +msgid "Invitation email sent to user. A confirmation link must be clicked for them to be added to your site." +msgstr "L’invitation a Ã©tÃ© envoyÃ©e Ã l’utilisateur sur son adresse de messagerie. Il devra cliquer sur un lien de confirmation pour Ãªtre ajoutÃ© Ã votre site." +======= #: wp-admin/includes/image-edit.php:70 msgid "Discard any changes and restore the original image." msgstr "Abandonner tout changement et rÃ©tablir l’image originale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:54 +msgid "Original dimensions %s" +msgstr "Taille originale : %s" +||||||| .r11156 +#: wp-admin/update-core.php:222 +msgid "The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”." +msgstr "Les extensions suivantes disposent d’une nouvelle version. Cochez celles que vous voulez mettre Ã jour, puis cliquez sur « Mettre Ã jour les extensions »." +======= #: wp-admin/includes/image-edit.php:59 msgid "Scale" msgstr "Redimensionner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:73 +msgid "Previously edited copies of the image will not be deleted." +msgstr "Les copies de l’image prÃ©cÃ©demment modifiÃ©es ne seront pas effacÃ©es." +||||||| .r11156 +#: wp-admin/options.php:171 +msgid "The %1$s setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API" +msgstr "L’option %1$s n’est pas enregistrÃ©e. Les options non enregistrÃ©es sont obsolÃ¨tes. Consultez la documentation sur la page http://codex.wordpress.org/Settings_API" +======= #: wp-admin/includes/image-edit.php:54 msgid "Original dimensions %s" msgstr "Taille originale : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:87 +msgid "Image Crop" +msgstr "Recadrage de l’image" +||||||| .r11156 +#: wp-admin/custom-background.php:283 +msgid "This will remove the background image. You will not be able to restore any customizations." +msgstr "Ceci supprimera l’image d’arriÃ¨re-plan. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +======= #: wp-admin/includes/image-edit.php:51 msgid "You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up." msgstr "Vous pouvez redimensionner l’image originale de maniÃ¨re proportionnelle. Pour obtenir de meilleurs rÃ©sultats, le redimensionnement doit Ãªtre fait avant tout recadrage, retournement ou rotation. La taille des image ne peut Ãªtre que rÃ©duite, pas augmentÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:92 +msgid "Crop Aspect Ratio" +msgstr "Proportion de taille du recadrage" +||||||| .r11156 +#: wp-admin/edit-tag-form.php:14 +msgid "You did not select an item for editing." +msgstr "Un contenu n’a pas Ã©tÃ© sÃ©lectionnÃ© pour l’Ã©dition. " +======= #: wp-admin/includes/image-edit.php:49 msgid "Scale Image" msgstr "Redimensionnement de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:95 +msgid "Crop Selection" +msgstr "SÃ©lection de recadrage" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:95 +msgid "Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes." +msgstr "Vous n’avez accÃ¨s qu’au thÃ¨me dÃ©jÃ en place. Contactez l’administrateur de %s pour obtenir des informations sur l’accÃ¨s Ã d’autres thÃ¨mes." +======= #: wp-admin/includes/image-edit.php:26 wp-admin/includes/image-edit.php:726 msgid "Image data does not exist. Please re-upload the image." msgstr "Il n’y a pas de donnÃ©es d’image. Veuillez envoyer l’image Ã nouveau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:101 +msgid "Aspect ratio:" +msgstr "Proportion de taille :" +||||||| .r11156 +#: wp-admin/includes/file.php:24 +msgid "Author Template" +msgstr "ModÃ¨le pour un auteur" +======= #: wp-admin/includes/file.php:1197 msgid "Proceed" msgstr "Continuer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:110 +msgid "Selection:" +msgstr "SÃ©lection :" +||||||| .r11156 +#: wp-admin/includes/file.php:15 +msgid "Visual Editor Stylesheet" +msgstr "Feuille de style de l’Ã©diteur visuel" +======= #: wp-admin/includes/file.php:1178 wp-admin/includes/file.php:1179 msgid "Connection Type" msgstr "Type de connexion" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:131 +msgid "Current thumbnail" +msgstr "Miniature actuelle" +||||||| .r11156 +#: wp-admin/includes/file.php:25 +msgid "Tag Template" +msgstr "ModÃ¨le pour mot-clÃ©" +======= #: wp-admin/includes/file.php:1176 msgid "Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above." msgstr "Saisissez l’emplacement sur le serveur oÃ¹ se trouvent les clÃ©s publiques et privÃ©es. S’il vous faut une passphrase, saisissez-la dans le champ de mot de passe ci-dessus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:135 +msgid "Apply changes to:" +msgstr "Appliquer les modifications Ã  :" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:88 +msgid "Page saved." +msgstr "Page enregistrÃ©e." +======= #: wp-admin/includes/file.php:1173 msgid "Private Key:" msgstr "ClÃ© privÃ©e :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:139 +msgid "All image sizes" +msgstr "Toutes les tailles" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:405 +msgid "This plugin is already installed and is up to date" +msgstr "Cette extension est dÃ©jÃ installÃ©e et Ã jour" +======= #: wp-admin/includes/file.php:1169 msgid "Public Key:" msgstr "ClÃ© publique :" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:147 +msgid "All sizes except thumbnail" +msgstr "Toutes les tailles sauf la miniature" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:414 +#: wp-admin/includes/class-wp-plugins-list-table.php:527 +msgid "More information about %s" +msgstr "Plus d’informations Ã propos de %s" +======= +#: wp-admin/includes/file.php:1167 +msgid "Authentication Keys" +msgstr "ClÃ©s d’authentification" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: User role name with count +#: wp-admin/includes/class-wp-users-list-table.php:178 +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:399 +#: wp-admin/update-core.php:40 +msgid "Update Now" +msgstr "Mettre Ã jour" +======= +#: wp-admin/includes/file.php:1163 +msgid "This password will not be stored on the server." +msgstr "Le mot de passe ne sera pas stockÃ© sur le serveur." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-users-list-table.php:222 +#: wp-admin/includes/class-wp-users-list-table.php:224 +msgid "Change role to…" +msgstr "Changer de rÃ´le pour…" +||||||| .r11156 +#: wp-admin/user-edit.php:340 +msgid "Grant this user super admin privileges for the Network." +msgstr "Donner les privilÃ¨ges de super-admin Ã cet utilisateur pour le rÃ©seau." +======= +#: wp-admin/includes/file.php:1151 +msgid "example: www.wordpress.org" +msgstr "exemple : www.wordpress.org" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-users-list-table.php:228 +msgid "Change" +msgstr "Changer" +||||||| .r11156 +#: wp-admin/user-edit.php:194 +msgid "Important:" +msgstr "Important :" +======= +#: wp-admin/includes/file.php:1150 +msgid "Hostname" +msgstr "Nom de l’Hôte :" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/file.php:455 +msgid "Invalid URL Provided." +msgstr "L’URL fournie est invalide" +||||||| .r11156 +#: wp-admin/user-edit.php:194 +msgid "This user has super admin privileges." +msgstr "Cet utilisateur possÃ¨de les privilÃ¨ges de super-admin." +======= +#: wp-admin/includes/file.php:1147 +msgid "If you do not remember your credentials, you should contact your web host." +msgstr "Si vous ne vous souvenez pas de votre identifiant, vous devriez contacter votre hÃ©bergeur." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/file.php:604 wp-admin/includes/file.php:655 +msgid "Could not retrieve file from archive." +msgstr "Impossible de rÃ©cupÃ©rer le fichier depuis l’archive." +||||||| .r11156 +#: wp-admin/includes/post.php:1280 +msgid "Remove featured image" +msgstr "Supprimer l’image Ã la Une" +======= +#: wp-admin/includes/file.php:1143 +msgid "FTP Password" +msgstr "Mot de passe FTP" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/file.php:665 +msgid "Could not extract file from archive." +msgstr "Impossible d’extraire les fichiers depuis l’archive." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:196 +msgid "Featured Image" +msgstr "Image Ã la Une" +======= +#: wp-admin/includes/file.php:1142 +msgid "FTP Username" +msgstr "Identifiant FTP" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:306 +msgid "Your site is asking search engines not to index its content" +msgstr "Votre site indique aux moteurs de recherche de ne pas indexer son contenu" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:241 +#: wp-admin/includes/class-wp-theme-install-list-table.php:362 +msgid "Update to version %s" +msgstr "Mettre Ã jour vers la version %s" + +#: wp-admin/includes/class-wp-ms-sites-list-table.php:291 +msgid "You are about to archive the site %s." +msgstr "Vous Ãªtes sur le point d’archiver le site %s." -#: wp-admin/includes/file.php:1167 -msgid "Authentication Keys" -msgstr "ClÃ©s d’authentification" +#: wp-admin/includes/class-wp-ms-sites-list-table.php:294 +msgid "You are about to unspam the site %s." +msgstr "Vous Ãªtes sur le point de marquer le site %s comme sain." -#: wp-admin/includes/file.php:1163 -msgid "This password will not be stored on the server." -msgstr "Le mot de passe ne sera pas stockÃ© sur le serveur." +#: wp-admin/includes/class-wp-ms-sites-list-table.php:296 +msgid "You are about to mark the site %s as spam." +msgstr "Vous Ãªtes sur le point de marquer le site %s comme indÃ©sirable." -#: wp-admin/includes/file.php:1151 -msgid "example: www.wordpress.org" -msgstr "exemple : www.wordpress.org" +#: wp-admin/includes/class-wp-ms-sites-list-table.php:299 +msgid "You are about to delete the site %s." +msgstr "Vous Ãªtes sur le point de supprimer le site %s." -#: wp-admin/includes/file.php:1150 -msgid "Hostname" -msgstr "Nom de l’Hôte :" +#: wp-admin/includes/class-wp-ms-sites-list-table.php:289 +msgid "You are about to unarchive the site %s." +msgstr "Vous Ãªtes sur le point de dÃ©sarchiver le site %s." -#: wp-admin/includes/file.php:1147 -msgid "If you do not remember your credentials, you should contact your web host." -msgstr "Si vous ne vous souvenez pas de votre identifiant, vous devriez contacter votre hÃ©bergeur." +#: wp-admin/press-this.php:551 +msgid "You cannot modify this Taxonomy." +msgstr "Vous ne pouvez pas modifier cette taxinomie." -#: wp-admin/includes/file.php:1143 -msgid "FTP Password" -msgstr "Mot de passe FTP" +#: wp-admin/options-reading.php:133 +msgid "items" +msgstr "Ã©lÃ©ments" -#: wp-admin/includes/file.php:1142 -msgid "FTP Username" -msgstr "Identifiant FTP" +#: wp-admin/user-edit.php:313 +msgid "Usernames cannot be changed." +msgstr "Les identifiants ne peuvent Ãªtre modifiÃ©s." + +#: wp-admin/nav-menus.php:253 +msgid "The menu has been successfully deleted." +msgstr "Le menu a bien Ã©tÃ© supprimÃ©." +#: wp-admin/includes/dashboard.php:287 +msgid "Your site is asking search engines not to index its content" +msgstr "Votre site indique aux moteurs de recherche de ne pas indexer son contenu" +======= #: wp-admin/includes/file.php:1141 msgid "Please enter your FTP credentials to proceed." msgstr "Veuillez saisir votre identifiant FTP pour continuer." @@ -6094,433 +20955,1509 @@ msgstr "Erreur : Une erreur s’est produite lors de l #: wp-admin/includes/file.php:703 msgid "Empty archive." msgstr "Archive vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1005 +msgid "WordPress Blog" +msgstr "Blog WordPress" +||||||| .r11156 +#: wp-admin/plugins.php:13 +msgid "You do not have sufficient permissions to manage plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les extensions de ce site." +======= #: wp-admin/includes/file.php:664 wp-admin/includes/file.php:761 #: wp-admin/includes/file.php:794 wp-admin/includes/update-core.php:1020 #: wp-admin/includes/update-core.php:1126 msgid "Could not copy file." msgstr "Impossible de copier le fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:15 +msgid "Visual Editor Stylesheet" +msgstr "Feuille de style de l’Ã©diteur visuel" +||||||| .r11156 +#: wp-admin/options-general.php:110 +msgid "Enter the address here if you want your site homepage to be different from the directory you installed WordPress." +msgstr "Si vous souhaitez que l’adresse de la page d’accueil de votre site soit diffÃ©rente du rÃ©pertoire oÃ¹ vous avez installÃ© WordPress, saisissez cette adresse ici." +======= #: wp-admin/includes/file.php:661 msgid "Could not extract file from archive." msgstr "Impossible d’extraire les fichiers depuis l’archive." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:24 +msgid "Author Template" +msgstr "ModÃ¨le pour un auteur" +||||||| .r11156 +#: wp-admin/options-general.php:100 +msgid "In a few words, explain what this site is about." +msgstr "En quelques mots, dÃ©crivez la raison d’Ãªtre de ce site." +======= #: wp-admin/includes/file.php:600 wp-admin/includes/file.php:651 msgid "Could not retrieve file from archive." msgstr "Impossible de rÃ©cupÃ©rer le fichier depuis l’archive." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:34 +msgid "Attachment Template" +msgstr "ModÃ¨le pour les fichiers attachÃ©s" +||||||| .r11156 +#: wp-admin/options-reading.php:64 wp-admin/options-reading.php:144 +#: wp-admin/options-reading.php:145 +msgid "Site Visibility" +msgstr "VisibilitÃ© du site" +======= #: wp-admin/includes/file.php:594 wp-admin/includes/file.php:700 msgid "Incompatible Archive." msgstr "Archive incompatible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:35 +msgid "Image Attachment Template" +msgstr "ModÃ¨le pour les images attachÃ©es" +||||||| .r11156 +#: wp-admin/includes/template.php:1217 +msgid "The miscellaneous options group has been removed. Use another settings group." +msgstr "Le groupement d’options « Divers » a Ã©tÃ© supprimÃ©. Utilisez un autre groupement de rÃ©glages." +======= #: wp-admin/includes/file.php:507 msgid "The checksum of the file (%1$s) does not match the expected checksum value (%2$s)." msgstr "L’empreinte de contrÃ´le (ou checksum) de votre fichier (%1$s) ne correspond pas Ã la valeur de l’empreinte attendue (%2$s)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:36 +msgid "Video Attachment Template" +msgstr "ModÃ¨le pour les vidÃ©os attachÃ©es" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:182 +msgid "The description will be displayed in the menu if the current theme supports it." +msgstr "La description sera affichÃ©e dans le menu si le thÃ¨me actuel l’accepte." +======= #: wp-admin/includes/file.php:459 msgid "Could not create Temporary file." msgstr "Impossible de crÃ©er le fichier temporaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:37 +msgid "Audio Attachment Template" +msgstr "ModÃ¨le pour les fichiers audio attachÃ©s" +||||||| .r11156 +#: wp-admin/options.php:148 +msgid "You do not have sufficient permissions to modify unregistered settings for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les rÃ©glages non enregistrÃ©s de ce site." +======= #: wp-admin/includes/file.php:455 msgid "Invalid URL Provided." msgstr "L’URL fournie est invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:38 +msgid "Application Attachment Template" +msgstr "ModÃ¨le pour les programmes attachÃ©s" +||||||| .r11156 +#: wp-admin/options-general.php:139 +msgid "There is a pending change of the admin e-mail to %1$s. Cancel" +msgstr "Il y a une modification de l’adresse de contact de l’administrateur en cours, en faveur de %1$s. Annuler" +======= #: wp-admin/includes/file.php:352 msgid "The uploaded file could not be moved to %s." msgstr "Le fichier n’ a pas pu Ãªtre dÃ©placÃ© vers %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1147 +msgid "Please enter your FTP or SSH credentials to proceed." +msgstr "Veuillez saisir votre identifiant FTP ou SSH pour continuer." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:156 +msgid "Title Attribute" +msgstr "Attribut de titre" +======= #: wp-admin/includes/file.php:319 msgid "Sorry, this file type is not permitted for security reasons." msgstr "DÃ©solÃ©, ce type de fichier n’est pas autorisÃ© pour des raisons de sÃ©curitÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1148 +msgid "FTP/SSH Username" +msgstr "Identifiant FTP/SSH" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:1219 +msgid "Link Target" +msgstr "Cible du lien" +======= #: wp-admin/includes/file.php:304 msgid "Specified file failed upload test." msgstr "Le test d’envoi du fichier spÃ©cifiÃ© a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1149 +msgid "FTP/SSH Password" +msgstr "Mot de passe FTP/SSH" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:168 +msgid "CSS Classes (optional)" +msgstr "Classes CSS (facultatives)" +======= #: wp-admin/includes/file.php:296 wp-admin/includes/import.php:81 msgid "File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini." msgstr "Ce fichier est vide. Veuillez envoyer quelque chose de plus substantiel. Cette erreur peut Ã©galement Ãªtre due Ã la dÃ©sactivation de l’envoi de fichier dans le fichier php.ini de votre serveur, ou par une valeur de post_max_size infÃ©rieure Ã celle de upload_max_filesize dans ce mÃªme php.ini." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1151 +msgid "Please enter your FTP credentials to proceed." +msgstr "Veuillez saisir votre identifiant FTP pour continuer." +||||||| .r11156 +#: wp-admin/nav-menus.php:716 wp-admin/nav-menus.php:787 +msgid "Save Menu" +msgstr "Enregistrer le menu" +======= #: wp-admin/includes/file.php:294 msgid "File is empty. Please upload something more substantial." msgstr "Le fichier est vide. Merci d’envoyer quelque chose de plus consistant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1152 +msgid "FTP Username" +msgstr "Identifiant FTP" +||||||| .r11156 +#: wp-admin/install.php:130 +msgid "A password will be automatically generated for you if you leave this blank." +msgstr "Un mot de passe vous sera automatiquement gÃ©nÃ©rÃ© si vous laissez ce champ vide." +======= #: wp-admin/includes/file.php:283 msgid "Invalid form submission." msgstr "Envoi non valide du formulaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1153 +msgid "FTP Password" +msgstr "Mot de passe FTP" +||||||| .r11156 +#: wp-admin/install.php:129 +msgid "Password, twice" +msgstr "Mot de passe, deux fois" +======= #: wp-admin/includes/file.php:269 msgid "File upload stopped by extension." msgstr "L’envoi de fichier est arrÃªtÃ© par l’extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1157 +msgid "If you do not remember your credentials, you should contact your web host." +msgstr "Si vous ne vous souvenez pas de votre identifiant, vous devriez contacter votre hÃ©bergeur." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:357 +msgid "Updating Theme %1$s (%2$d/%3$d)" +msgstr "Mise Ã jour du thÃ¨me %1$s (%2$d/%3$d)" +======= #: wp-admin/includes/file.php:268 msgid "Failed to write file to disk." msgstr "Ãchec de l’Ã©criture du fichier sur le disque." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:364 wp-admin/includes/ms.php:834 +msgid "Create a New Site" +msgstr "CrÃ©er un nouveau site" +||||||| .r11156 +#: wp-admin/includes/schema.php:866 +msgid "You must provide a domain name." +msgstr "vous devez fournir un nom de domaine." +======= #: wp-admin/includes/file.php:267 msgid "Missing a temporary folder." msgstr "Un dossier temporaire est manquant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:366 +msgid "Create a New User" +msgstr "CrÃ©er un nouvel utilisateur" +||||||| .r11156 +#: wp-admin/includes/schema.php:868 +msgid "You must provide a name for your network of sites." +msgstr "vous devez fournir un nom pour votre rÃ©seau de sites." +======= #: wp-admin/includes/file.php:265 msgid "No file was uploaded." msgstr "Aucun fichier n’a Ã©tÃ© envoyÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:371 +msgid "%s user" +msgid_plural "%s users" +msgstr[0] "%s utilisateur" +msgstr[1] "%s utilisateurs" +||||||| .r11156 +#: wp-admin/includes/schema.php:872 +msgid "The network already exists." +msgstr "Le rÃ©seau existe dÃ©jÃ ." +======= #: wp-admin/includes/file.php:264 msgid "The uploaded file was only partially uploaded." msgstr "Le fichier n’a Ã©tÃ© que partiellement envoyÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:372 +msgid "%s site" +msgid_plural "%s sites" +msgstr[0] "%s site" +msgstr[1] "%s sites" +||||||| .r11156 +#: wp-admin/includes/schema.php:876 +msgid "You must provide a valid e-mail address." +msgstr "Vous devez saisir une adresse de messagerie valide." +======= #: wp-admin/includes/file.php:263 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive MAX_FILE_SIZE du formulaire HTML." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:412 wp-admin/includes/dashboard.php:414 +msgid "Search Sites" +msgstr "Chercher un site" +||||||| .r11156 +#: wp-admin/includes/schema.php:1028 +msgid "This resulted in an error message: %s" +msgstr "Cela a abouti Ã ce message d’erreur : %s" +======= #: wp-admin/includes/file.php:262 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive upload_max_filesize, dans php.ini." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:16 +msgid "Visual Editor RTL Stylesheet" +msgstr "Feuille de style de l’Ã©diteur visuel (lecture de droite Ã gauche)" +||||||| .r11156 +#: wp-admin/includes/schema.php:1031 +msgid "You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message." +msgstr "Vous pouvez toujours utiliser votre site, mais tout sous-domaine crÃ©Ã© pourrait ne pas Ãªtre accessible. Si vous Ãªtes sÃ»r de votre configuration DNS, ignorez ce message." +======= #: wp-admin/includes/file.php:66 msgid "%s Page Template" msgstr "ModÃ¨le de page %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:66 +msgid "%s Page Template" +msgstr "ModÃ¨le de page %s" +||||||| .r11156 +#: wp-admin/includes/user.php:436 +msgid "Notice:" +msgstr "Avertissement :" +======= #: wp-admin/includes/file.php:44 msgid "Popup Comments Template" msgstr "ModÃ¨le pour la fenÃªtre de commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:319 +msgid "Sorry, this file type is not permitted for security reasons." +msgstr "DÃ©solÃ©, ce type de fichier n’est pas autorisÃ© pour des raisons de sÃ©curitÃ©." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:470 +msgid "Get Shortlink" +msgstr "Obtenir le lien court" +======= #: wp-admin/includes/file.php:43 msgid "Comments Template" msgstr "ModÃ¨le pour les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1143 +msgid "To perform the requested action, WordPress needs to access your web server." +msgstr "Pour lancer la requÃªte demandÃ©e, WordPress a besoin d’accÃ©der Ã votre serveur web." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:313 +msgid "Updating Plugin %1$s (%2$d/%3$d)" +msgstr "Mise Ã jour de l’extension %1$s (%2$d/%3$d)" +======= #: wp-admin/includes/file.php:40 msgid ".htaccess (for rewrite rules )" msgstr ".htaccess (pour les rÃ¨gles de rÃ©Ã©criture)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-users-list-table.php:274 +#: wp-admin/user-edit.php:313 wp-admin/user-new.php:305 +#: wp-admin/user-new.php:438 +msgid "Role" +msgstr "RÃ´le" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:207 +msgid "The update of %1$s failed." +msgstr "La mise Ã jour de %1$s a Ã©chouÃ©." +======= #: wp-admin/includes/file.php:39 msgid "my-hacks.php (legacy hacks support)" msgstr "my-hacks.php (reconnaissance des hacks existants)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:32 +msgid "You are using an insecure browser!" +msgstr "Vous utilisez un navigateur peu sÃ»r !" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:92 +msgid "The password you chose during the install." +msgstr "Le mot de passe que vous avez choisi pendant l'installation." +======= #: wp-admin/includes/file.php:38 msgid "Application Attachment Template" msgstr "ModÃ¨le pour les programmes attachÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:34 +msgid "Your browser is out of date!" +msgstr "Votre navigateur est obsolÃ¨te !" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:82 +msgid "User already exists. Password inherited." +msgstr "L’utilisateur existe dÃ©jÃ , et a hÃ©ritÃ© du mot de passe." +======= #: wp-admin/includes/file.php:37 msgid "Audio Attachment Template" msgstr "ModÃ¨le pour les fichiers audio attachÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:404 wp-admin/includes/dashboard.php:406 +#: wp-admin/users.php:469 +msgid "Search Users" +msgstr "Chercher un utilisateur" +||||||| .r11156 +#: wp-admin/update-core.php:65 wp-admin/upgrade.php:76 +msgid "You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +======= #: wp-admin/includes/file.php:36 msgid "Video Attachment Template" msgstr "ModÃ¨le pour les vidÃ©os attachÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1182 +msgid "Storage Space" +msgstr "Espace disque" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2092 +#: wp-admin/includes/update-core.php:1135 wp-admin/update-core.php:420 +msgid "WordPress updated successfully" +msgstr "WordPress a bien Ã©tÃ© mis Ã jour" +======= #: wp-admin/includes/file.php:35 msgid "Image Attachment Template" msgstr "ModÃ¨le pour les images attachÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1242 +msgid "Update %2$s or learn how to browse happy" +msgstr "Mettez %2$s Ã jour, ou apprenez Ã naviguer sereinement" +||||||| .r11156 +#: wp-admin/update-core.php:382 +msgid "Update WordPress" +msgstr "Mettre Ã jour WordPress" +======= #: wp-admin/includes/file.php:34 msgid "Attachment Template" msgstr "ModÃ¨le pour les fichiers attachÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1342 wp-admin/includes/dashboard.php:1344 +msgid "Customize Your Site" +msgstr "Personnalisez votre site" +||||||| .r11156 +#: wp-admin/plugins.php:116 wp-admin/update-core.php:225 +#: wp-admin/update-core.php:282 wp-admin/update-core.php:579 +#: wp-admin/update-core.php:583 +msgid "Update Plugins" +msgstr "Mettre Ã jour les extensions" +======= #: wp-admin/includes/file.php:33 msgid "Theme Functions" msgstr "Fonctions du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:262 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive upload_max_filesize, dans php.ini." +||||||| .r11156 +#: wp-admin/update-core.php:63 wp-admin/upgrade.php:74 +msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +======= #: wp-admin/includes/file.php:32 msgid "Links Template" msgstr "ModÃ¨le pour les liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:263 +msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." +msgstr "La taille du fichier envoyÃ© excÃ¨de celle indiquÃ©e dans la directive MAX_FILE_SIZE du formulaire HTML." +||||||| .r11156 +#: wp-admin/update-core.php:61 wp-admin/upgrade.php:72 +msgid "You cannot update because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e, car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +======= #: wp-admin/includes/file.php:31 msgid "404 Template" msgstr "ModÃ¨le pour l’erreur 404" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:294 +msgid "File is empty. Please upload something more substantial." +msgstr "Le fichier est vide. Merci d’envoyer quelque chose de plus consistant." +||||||| .r11156 +#: wp-admin/update-core.php:462 wp-admin/update-core.php:501 +msgid "WordPress Updates" +msgstr "Mises Ã jour de WordPress" +======= #: wp-admin/includes/file.php:30 msgid "Single Post" msgstr "Article seul" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1095 +msgid "ERROR: There was an error connecting to the server, Please verify the settings are correct." +msgstr "Erreur : Une erreur s’est produite lors de la connexion au serveur, vÃ©rifiez que vos paramÃ¨tres sont corrects." +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:132 wp-admin/includes/nav-menu.php:134 +msgid "Edit Menu Item" +msgstr "Modifier une entrÃ©e du menu" +======= #: wp-admin/includes/file.php:29 msgid "Search Form" msgstr "Formulaire de recherche" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:26 wp-admin/includes/image-edit.php:728 +msgid "Image data does not exist. Please re-upload the image." +msgstr "Il n’y a pas de donnÃ©es d’image. Veuillez envoyer l’image Ã nouveau." +||||||| .r11156 +#: wp-admin/options-general.php:134 +msgid "This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. The new address will not become active until confirmed." +msgstr "Cette adresse est utilisÃ©e Ã des fins d’administration. Si vous la modifiez, nous enverrons un message Ã la nouvelle adresse afin de la confirmer. La nouvelle adresse ne sera pas active tant que vous ne l’aurez pas confirmÃ©e." +======= #: wp-admin/includes/file.php:27 wp-admin/includes/meta-boxes.php:745 msgid "Page Template" msgstr "ModÃ¨le de page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:318 +msgid "Search Engines Discouraged" +msgstr "Moteurs de recherche refusÃ©s" +||||||| .r11156 +#: wp-admin/options-general.php:210 +msgid "Daylight saving time begins on: %s." +msgstr "Le passage Ã l’heure d’Ã©tÃ© se fait le %s." +======= #: wp-admin/includes/file.php:26 msgid "Category Template" msgstr "ModÃ¨le pour les catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1346 +msgid "or, change your theme completely" +msgstr "ou alors, changez complÃ¨tement de thÃ¨me" +||||||| .r11156 +#: wp-admin/plugins.php:279 +msgid "%1$s by %2$s (will also delete its data)" +msgstr "%1$s par %2$s (attention : supprimera Ã©galement les donnÃ©es liÃ©es)" +======= #: wp-admin/includes/file.php:25 msgid "Tag Template" msgstr "ModÃ¨le pour Ã©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1350 +msgid "Next Steps" +msgstr "Ãtapes suivantes" +||||||| .r11156 +#: wp-admin/plugins.php:272 +msgid "You are about to remove the following plugin:" +msgid_plural "You are about to remove the following plugins:" +msgstr[0] "Vous Ãªtes sur le point de supprimer l’extension suivante :" +msgstr[1] "Vous Ãªtes sur le point de supprimer les extensions suivantes :" +======= #: wp-admin/includes/file.php:24 msgid "Author Template" msgstr "ModÃ¨le pour un auteur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1354 wp-admin/includes/dashboard.php:1357 +msgid "Add additional pages" +msgstr "Ajoutez de nouvelles pages" +||||||| .r11156 +#: wp-admin/plugins.php:267 +msgid "Delete Plugin" +msgid_plural "Delete Plugins" +msgstr[0] "Supprimer l’extension" +msgstr[1] "Supprimer les extensions" +======= #: wp-admin/includes/file.php:20 msgid "Footer" msgstr "Pied de page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1358 +msgid "Add a blog post" +msgstr "Ãcrivez un article" +||||||| .r11156 +#: wp-admin/plugins.php:290 +msgid "Are you sure you wish to delete these files and data?" +msgstr "Vouslez-vous vraiment supprimer ces fichiers et donnÃ©es ?" +======= #: wp-admin/includes/file.php:19 msgid "Popup Comments" msgstr "Commentaires en popup" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1360 +msgid "Write your first blog post" +msgstr "Ãcrivez votre premier article" +||||||| .r11156 +#: wp-admin/plugins.php:302 +msgid "Yes, Delete these files and data" +msgstr "Oui, supprimer ces fichiers et les donnÃ©es" +======= #: wp-admin/includes/file.php:17 msgid "RTL Stylesheet" msgstr "Feuille de style RTL" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1361 +msgid "Add an About page" +msgstr "Ajoutez une page « Ã propos »" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:386 +msgid "Requires %s in wp-config.php." +msgstr "NÃ©cessite %s dans le fichier wp-config.php." +======= #: wp-admin/includes/file.php:16 msgid "Visual Editor RTL Stylesheet" msgstr "Feuille de style de l’Ã©diteur visuel (lecture de droite Ã gauche)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1363 +msgid "View your site" +msgstr "Affichez votre site" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:386 +msgid "Inactive:" +msgstr "Inactif :" +======= #: wp-admin/includes/file.php:15 msgid "Visual Editor Stylesheet" msgstr "Feuille de style de l’Ã©diteur visuel" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1382 +msgid "Turn comments on or off" +msgstr "Activez ou dÃ©sactivez les commentaires" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:268 +msgid "Must-Use (%s)" +msgid_plural "Must-Use (%s)" +msgstr[0] "Automatique (Must-Use) (%s)" +msgstr[1] "Automatiques (Must-Use) (%s)" +======= #: wp-admin/includes/file.php:13 msgid "Main Index Template" msgstr "ModÃ¨le pour la page d’accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1372 +msgid "Manage widgets or menus" +msgstr "GÃ©rez vos widgets ou vos menus" +||||||| .r11156 +#: wp-admin/about.php:160 +msgid "Go to Dashboard" +msgstr "Aller sur le tableau de bord" +======= #: wp-admin/includes/deprecated.php:588 msgid "Displaying %s–%s of %s" msgstr "Affichage de %s Ã %s sur %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1336 +msgid "Welcome to WordPress!" +msgstr "Bienvenue dans WordPress !" +||||||| .r11156 +#: wp-admin/nav-menus.php:330 wp-admin/nav-menus.php:340 +msgid "Please enter a valid menu name." +msgstr "Veuillez saisir un nom de menu valide." +======= #: wp-admin/includes/dashboard.php:1339 msgid "https://codex.wordpress.org/First_Steps_With_WordPress" msgstr "https://codex.wordpress.org/fr:Premiers_pas_avec_WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1337 +msgid "We’ve assembled some links to get you started:" +msgstr "Voici quelques liens pour vous aider Ã dÃ©marrer :" +||||||| .r11156 +#: wp-admin/nav-menus.php:783 +msgid "Delete Menu" +msgstr "Supprimer le menu" +======= #: wp-admin/includes/dashboard.php:1339 msgid "Learn more about getting started" msgstr "Plus d’informations pour bien dÃ©marrer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1341 +msgid "Get Started" +msgstr "Lancez-vous !" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:590 +msgid "Menu Item" +msgstr "ÃlÃ©ment du menu" +======= #: wp-admin/includes/dashboard.php:1337 msgid "Turn comments on or off" msgstr "Activez ou dÃ©sactivez les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1353 wp-admin/includes/dashboard.php:1356 +msgid "Edit your front page" +msgstr "Modifiez votre page d’accueil" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:698 wp-admin/includes/nav-menu.php:938 +msgid "View All" +msgstr "Afficher tout" +======= #: wp-admin/includes/dashboard.php:1332 msgid "Manage menus" msgstr "GÃ©rer les menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1367 +msgid "More Actions" +msgstr "Plus d’actions" +||||||| .r11156 +#: wp-admin/includes/nav-menu.php:596 wp-admin/includes/nav-menu.php:839 +#: wp-admin/includes/nav-menu.php:1027 +msgid "Add to Menu" +msgstr "Ajouter au menu" +======= #: wp-admin/includes/dashboard.php:1330 msgid "Manage widgets" msgstr "GÃ©rer les widgets" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1384 +msgid "Learn more about getting started" +msgstr "Plus d’informations pour bien dÃ©marrer" +||||||| .r11156 +#: wp-admin/options-general.php:187 +msgid "This timezone is currently in daylight saving time." +msgstr "Ce fuseau horaire est actuellement Ã l’heure d’Ã©tÃ©." +======= #: wp-admin/includes/dashboard.php:1327 msgid "Manage widgets or menus" msgstr "GÃ©rez vos widgets ou vos menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:125 +msgid "Thumbnail Settings" +msgstr "RÃ©glages de la miniature" +||||||| .r11156 +#: wp-admin/options-general.php:215 +msgid "This timezone does not observe daylight saving time." +msgstr "Ce fuseau horaire n’a pas d’heure d’Ã©tÃ©" +======= #: wp-admin/includes/dashboard.php:1322 msgid "More Actions" msgstr "Plus d’actions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:987 +msgid "http://wordpress.org/news/" +msgstr "http://www.wordpress-fr.net/" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:271 +msgid "Drop-ins (%s)" +msgid_plural "Drop-ins (%s)" +msgstr[0] "Drop-ins (%s)" +msgstr[1] "Drop-ins (%s)" +======= #: wp-admin/includes/dashboard.php:1318 msgid "View your site" msgstr "Affichez votre site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:996 +msgid "http://wordpress.org/news/feed/" +msgstr "http://feeds.feedburner.com/WordpressFrancophone" +||||||| .r11156 +#: wp-admin/includes/plugin.php:420 +msgid "Executed before Multisite is loaded." +msgstr "ExÃ©cutÃ© avant que la fonctionnalitÃ© multisites ne soit chargÃ©e." +======= #: wp-admin/includes/dashboard.php:1316 msgid "Add an About page" msgstr "Ajoutez une page « Ã propos »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:374 +msgid "You have %1$s and %2$s." +msgstr "Vous avez %1$s et %2$s." +||||||| .r11156 +#: wp-admin/includes/plugin.php:416 +msgid "External object cache." +msgstr "Cache d’objet externe." +======= #: wp-admin/includes/dashboard.php:1315 msgid "Write your first blog post" msgstr "Ãcrivez votre premier article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:49 +msgid "Scale Image" +msgstr "Redimensionnement de l’image" +||||||| .r11156 +#: wp-admin/includes/plugin.php:415 +msgid "Custom maintenance message." +msgstr "Message personnalisÃ© pour la maintenance." +======= #: wp-admin/includes/dashboard.php:1313 msgid "Add a blog post" msgstr "Ãcrivez un article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1177 +msgid "Authentication Keys" +msgstr "ClÃ©s d’authentification" +||||||| .r11156 +#: wp-admin/includes/plugin.php:414 +msgid "Custom install script." +msgstr "Script d’installation personnalisÃ©e." +======= #: wp-admin/includes/dashboard.php:1309 wp-admin/includes/dashboard.php:1312 msgid "Add additional pages" msgstr "Ajoutez de nouvelles pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1179 +msgid "Public Key:" +msgstr "ClÃ© publique :" +||||||| .r11156 +#: wp-admin/includes/plugin.php:413 +msgid "Custom database error message." +msgstr "Message personnalisÃ© pour l’erreur de base de donnÃ©es." +======= #: wp-admin/includes/dashboard.php:1308 wp-admin/includes/dashboard.php:1311 msgid "Edit your front page" msgstr "Modifiez votre page d’accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1183 +msgid "Private Key:" +msgstr "ClÃ© privÃ©e :" +||||||| .r11156 +#: wp-admin/includes/file.php:287 +msgid "File is empty. Please upload something more substantial." +msgstr "Le fichier est vide. Merci d’envoyer quelque chose de plus consistant." +======= #: wp-admin/includes/dashboard.php:1305 msgid "Next Steps" msgstr "Ãtapes suivantes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:70 +msgid "Discard any changes and restore the original image." +msgstr "Abandonner tout changement et rÃ©tablir l’image originale." +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:249 +msgid "Install %s" +msgstr "Installer %s" +======= #: wp-admin/includes/dashboard.php:1301 msgid "or, change your theme completely" msgstr "ou alors, changez complÃ¨tement de thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:77 +msgid "Restore image" +msgstr "RÃ©tablir l’image" +||||||| .r11156 +#: wp-admin/includes/plugin.php:412 +msgid "Custom database class." +msgstr "Classe personnalisÃ©e de connexion Ã la base de donnÃ©es." +======= #: wp-admin/includes/dashboard.php:1297 wp-admin/includes/dashboard.php:1299 msgid "Customize Your Site" msgstr "Personnalisez votre site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1223 +msgid "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." +msgstr "Il semble que vous utilisez une version peu sÃ»re de %s. Un navigateur dÃ©passÃ© met votre ordinateur en danger. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +||||||| .r11156 +#: wp-admin/includes/plugin.php:411 +msgid "Advanced caching plugin." +msgstr "Extension de cache avancÃ©e." +======= #: wp-admin/includes/dashboard.php:1296 msgid "Get Started" msgstr "Lancez-vous !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1225 +msgid "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." +msgstr "Il semble que vous utilisez une vieille version de %s. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +||||||| .r11156 +#: wp-admin/install.php:172 +msgid "You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +======= #: wp-admin/includes/dashboard.php:1292 msgid "We’ve assembled some links to get you started:" msgstr "Voici quelques liens pour vous aider Ã dÃ©marrer :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:507 +msgid "The checksum of the file (%1$s) does not match the expected checksum value (%2$s)." +msgstr "L’empreinte de contrÃ´le (ou checksum) de votre fichier (%1$s) ne correspond pas Ã la valeur de l’empreinte attendue (%2$s)." +||||||| .r11156 +#: wp-admin/install.php:170 +msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +======= #: wp-admin/includes/dashboard.php:1291 msgid "Welcome to WordPress!" msgstr "Bienvenue dans WordPress !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1173 +msgid "This password will not be stored on the server." +msgstr "Le mot de passe ne sera pas stockÃ© sur le serveur." +||||||| .r11156 +#: wp-admin/includes/update.php:210 +msgid "WordPress %1$s is available! Please notify the site administrator." +msgstr "WordPress %1$s est disponible ! Veuillez en notifier l’administrateur du site." +======= #: wp-admin/includes/dashboard.php:1205 msgid "Update %2$s or learn how to browse happy" msgstr "Mettez %2$s Ã jour, ou apprenez Ã naviguer sereinement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:241 +msgid "%s Post" +msgid_plural "%s Posts" +msgstr[0] "%s articles" +msgstr[1] "%s articles" +||||||| .r11156 +#: wp-admin/includes/update.php:208 +msgid "WordPress %1$s is available! Please update now." +msgstr "WordPress %1$s est disponible ! Pensez Ã faire la mise Ã jour." +======= #: wp-admin/includes/dashboard.php:1188 msgid "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." msgstr "Il semble que vous utilisez une vieille version de %s. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:243 +msgid "%s Page" +msgid_plural "%s Pages" +msgstr[0] "%s page" +msgstr[1] "%s pages" +||||||| .r11156 +#: wp-admin/install.php:168 +msgid "You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Vous ne pouvez pas installer WordPress %1$s, car cette version requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +======= #: wp-admin/includes/dashboard.php:1186 msgid "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." msgstr "Il semble que vous utilisez une version peu sÃ»re de %s. Un navigateur dÃ©passÃ© met votre ordinateur en danger. Pour utiliser WordPress dans des conditions optimales, veuillez mettre Ã jour votre navigateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:258 +msgid "%s Comment" +msgid_plural "%s Comments" +msgstr[0] "%s commentaire" +msgstr[1] "%s commentaires" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:284 +msgid "You are about to activate the site %s" +msgstr "Vous Ãªtes sur le point d’activer le site %s" +======= #. translators: 1: number of megabytes, 2: percentage #: wp-admin/includes/dashboard.php:1162 msgid "%1$s MB (%2$s%%) Space Used" msgstr "%1$s Mo (%2$s%%) d’espace utilisÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Number of comments in moderation +#: wp-admin/includes/dashboard.php:264 +msgctxt "comments" +msgid "%s in moderation" +msgid_plural "%s in moderation" +msgstr[0] "%s en attente de validation" +msgstr[1] "%s en attente de validation" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:286 +msgid "You are about to deactivate the site %s" +msgstr "Vous Ãªtes sur le point de dÃ©sactiver le site %s" +======= #: wp-admin/includes/dashboard.php:1156 wp-admin/includes/dashboard.php:1169 msgid "Manage Uploads" msgstr "GÃ©rer les mises en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: date and time format for recent posts on the dashboard, see +#. http:php.net/date +#: wp-admin/includes/dashboard.php:762 +msgid "M jS" +msgstr "j M" +||||||| .r11156 +#: wp-admin/comment.php:147 +msgid "This comment is currently marked as spam." +msgstr "Ce commentaire est actuellement marquÃ© comme indÃ©sirable." +======= #. translators: number of megabytes #: wp-admin/includes/dashboard.php:1150 msgid "%s MB Space Allowed" msgstr "%s Mo d’espace autorisÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: relative date, 2: time, 3: post edit link or permalink, 4: +#. post title +#: wp-admin/includes/dashboard.php:769 +msgid "%1$s, %2$s %4$s" +msgstr "%1$s, %2$s %4$s" +||||||| .r11156 +#: wp-admin/comment.php:87 +msgid "Moderate Comment" +msgstr "ModÃ©rer le commentaire" +======= #: wp-admin/includes/dashboard.php:1144 msgid "Storage Space" msgstr "Espace disque" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Error code, 2: Error message. +#: wp-admin/includes/class-wp-upgrader.php:3359 +msgid "Rollback Error: [%1$s] %2$s" +msgstr "Erreur de restauration : [%1$s] %2$s" +||||||| .r11156 +#: wp-admin/comment.php:144 +msgid "This comment is currently approved." +msgstr "Ce commentaire est actuellement approuvÃ©." +======= #: wp-admin/includes/dashboard.php:1110 msgid "Popular Plugin" msgstr "Extensions populaires" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Error code, 2: Error message. +#: wp-admin/includes/class-wp-upgrader.php:3362 +msgid "Error: [%1$s] %2$s" +msgstr "Erreur : [%1$s] %2$s" +||||||| .r11156 +#: wp-admin/edit-comments.php:209 +msgid "This comment is already approved." +msgstr "Ce commentaire est dÃ©jÃ approuvÃ©." +======= #: wp-admin/includes/dashboard.php:1000 msgid "Other WordPress News" msgstr "Autres actualitÃ©s de WordPress (en franÃ§ais)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:51 +msgid "Quick Draft" +msgstr "Brouillon rapide" +||||||| .r11156 +#: wp-admin/comment.php:150 +msgid "This comment is currently in the Trash." +msgstr "Ce commentaire est actuellement dans la Corbeille." +======= #: wp-admin/includes/dashboard.php:991 msgid "https://planet.wordpress.org/feed/" msgstr "http://feeds.feedburner.com/feedburner/cjgL" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:56 +msgid "WordPress News" +msgstr "Nouvelles de WordPress" +||||||| .r11156 +#: wp-admin/custom-background.php:349 +msgid "Repeat" +msgstr "RÃ©pÃ©tition" +======= #: wp-admin/includes/dashboard.php:982 msgid "https://planet.wordpress.org/" msgstr "http://www.wordpress-fr.net/planet/" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:531 +msgctxt "drafts" +msgid "View all" +msgstr "Afficher tout" +||||||| .r11156 +#: wp-admin/edit-comments.php:212 +msgid "This comment is already in the Trash." +msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +======= #: wp-admin/includes/dashboard.php:967 msgid "WordPress Blog" msgstr "Blog WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:51 wp-admin/includes/dashboard.php:533 +msgid "Drafts" +msgstr "Brouillons" +||||||| .r11156 +#: wp-admin/edit-comments.php:212 +msgid "View Trash" +msgstr "Voir la Corbeille" +======= #: wp-admin/includes/dashboard.php:958 msgid "http://wordpress.org/news/feed/" msgstr "http://feeds.feedburner.com/WordpressFrancophone" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:680 +msgid "Publishing Soon" +msgstr "BientÃ´t publiÃ©" +||||||| .r11156 +#: wp-admin/edit-comments.php:215 +msgid "This comment is already marked as spam." +msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +======= #: wp-admin/includes/dashboard.php:949 msgid "http://wordpress.org/news/" msgstr "http://www.wordpress-fr.net/" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:687 +msgid "Recently Published" +msgstr "PubliÃ© rÃ©cemment" +||||||| .r11156 +#: wp-admin/includes/screen.php:953 +msgid "Screen Options" +msgstr "Options de l’Ã©cran" +======= #: wp-admin/includes/dashboard.php:836 msgid "This widget requires JavaScript." msgstr "Ce widget requiert JavaScript." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:759 +msgid "Tomorrow" +msgstr "Demain" +||||||| .r11156 +#: wp-admin/includes/screen.php:1106 +msgid "Screen Layout" +msgstr "PrÃ©sentation de l’Ã©cran" +======= #: wp-admin/includes/dashboard.php:836 msgid "Loading…" msgstr "Chargement…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1148 +msgid "Popular Plugin" +msgstr "Extensions populaires" +||||||| .r11156 +#: wp-admin/includes/screen.php:1108 +msgid "Number of Columns:" +msgstr "Nombre de colonnes :" +======= #. translators: 1: relative date, 2: time, 3: post edit link or permalink, 4: #. post title #: wp-admin/includes/dashboard.php:737 msgid "%1$s, %2$s %4$s" msgstr "%1$s, %2$s %4$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1194 wp-admin/includes/dashboard.php:1207 +msgid "Manage Uploads" +msgstr "GÃ©rer les mises en ligne" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:99 wp-admin/theme-install.php:145 +msgid "Feature Filter" +msgstr "Filtre de fonctionnalitÃ©s" +======= #. translators: date and time format for recent posts on the dashboard, see #. http:php.net/date #: wp-admin/includes/dashboard.php:730 msgid "M jS" msgstr "j M" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: number of megabytes +#: wp-admin/includes/dashboard.php:1188 +msgid "%s MB Space Allowed" +msgstr "%s Mo d’espace autorisÃ©s" +||||||| .r11156 +#: wp-admin/includes/theme.php:188 +msgid "Tan" +msgstr "Ocre" +======= #: wp-admin/includes/dashboard.php:727 msgid "Tomorrow" msgstr "Demain" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: number of megabytes, 2: percentage +#: wp-admin/includes/dashboard.php:1200 +msgid "%1$s MB (%2$s%%) Space Used" +msgstr "%1$s Mo (%2$s%%) d’espace utilisÃ©s" +||||||| .r11156 +#: wp-admin/includes/theme.php:191 +msgid "Dark" +msgstr "Sombre" +======= #: wp-admin/includes/dashboard.php:725 msgid "Today" msgstr "Aujourd’hui" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:39 +msgid "At a Glance" +msgstr "D’un coup d’Åil" +||||||| .r11156 +#: wp-admin/includes/theme.php:199 +msgid "One Column" +msgstr "Une colonne" +======= #: wp-admin/includes/dashboard.php:664 msgid "No activity yet!" msgstr "Aucune activitÃ© pour le moment !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:488 +msgid "What’s on your mind?" +msgstr "Qu’avez-vous en tÃªte ?" +||||||| .r11156 +#: wp-admin/includes/theme.php:200 +msgid "Two Columns" +msgstr "Deux colonnes" +======= #: wp-admin/includes/dashboard.php:655 msgid "Recently Published" msgstr "PubliÃ© rÃ©cemment" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:757 +msgid "Today" +msgstr "Aujourd’hui" +||||||| .r11156 +#: wp-admin/includes/theme.php:201 +msgid "Three Columns" +msgstr "Trois colonnes" +======= #: wp-admin/includes/dashboard.php:648 msgid "Publishing Soon" msgstr "BientÃ´t publiÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:46 +msgid "Activity" +msgstr "ActivitÃ©" +||||||| .r11156 +#: wp-admin/includes/theme.php:202 +msgid "Four Columns" +msgstr "Quatre colonnes" +======= #. translators: %1$s is type of comment, %2$s is link to the post #: wp-admin/includes/dashboard.php:624 msgctxt "dashboard" msgid "%1$s on %2$s" msgstr "%1$s dans %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1375 +msgid "Manage widgets" +msgstr "GÃ©rer les widgets" +||||||| .r11156 +#: wp-admin/includes/theme.php:203 +msgid "Left Sidebar" +msgstr "Colonne latÃ©rale gauche" +======= #: wp-admin/includes/dashboard.php:605 msgid "[Pending]" msgstr "[En attente]" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1377 +msgid "Manage menus" +msgstr "GÃ©rer les menus" +||||||| .r11156 +#: wp-admin/includes/theme.php:204 +msgid "Right Sidebar" +msgstr "Colonne latÃ©rale droite" +======= #. translators: 1: comment author, 2: post link, 3: notification if the comment #. is pending #: wp-admin/includes/dashboard.php:604 msgid "From %1$s on %2$s%3$s" msgstr "Par %1$s, sur %2$s%3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:696 +msgid "No activity yet!" +msgstr "Aucune activitÃ© pour le moment !" +||||||| .r11156 +#: wp-admin/includes/theme.php:207 wp-admin/includes/theme.php:257 +#: wp-admin/theme-install.php:157 +msgid "Features" +msgstr "FonctionnalitÃ©s" +======= #: wp-admin/includes/dashboard.php:505 msgctxt "drafts" msgid "View all" msgstr "Afficher tout" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:51 +msgid "You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up." +msgstr "Vous pouvez redimensionner l’image originale de maniÃ¨re proportionnelle. Pour obtenir de meilleurs rÃ©sultats, le redimensionnement doit Ãªtre fait avant tout recadrage, retournement ou rotation. La taille des image ne peut Ãªtre que rÃ©duite, pas augmentÃ©e." +||||||| .r11156 +#: wp-admin/includes/theme.php:212 +msgid "Custom Colors" +msgstr "Couleurs personnalisÃ©es" +======= #: wp-admin/includes/dashboard.php:464 msgid "What’s on your mind?" msgstr "Qu’avez-vous en tÃªte ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:59 +msgid "Scale" +msgstr "Redimensionner" +||||||| .r11156 +#: wp-admin/includes/theme.php:225 +msgid "Theme Options" +msgstr "Options du thÃ¨me" +======= #: wp-admin/includes/dashboard.php:390 wp-admin/includes/dashboard.php:392 msgid "Search Sites" msgstr "Chercher un site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:90 +msgid "To crop the image, click on it and drag to make your selection." +msgstr "Pour couper l’image, cliquez dessus et dÃ©placez la souris pour crÃ©er la sÃ©lection." +||||||| .r11156 +#: wp-admin/includes/theme.php:226 +msgid "Threaded Comments" +msgstr "Commentaires imbriquÃ©s" +======= #: wp-admin/includes/dashboard.php:382 wp-admin/includes/dashboard.php:384 #: wp-admin/users.php:463 msgid "Search Users" msgstr "Chercher un utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:93 +msgid "The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc." +msgstr "Les proportions d’une image sont le rapport entre sa largeur et sa hauteur. Vous pouvez prÃ©server les proportions en maintenant appuyÃ©e la touche Shift tandis que vous redimensionnez votre sÃ©lection. Utilisez le champ de saisie pour prÃ©ciser la proportion Ã respecter, par exemple 1:1 (carrÃ©), 4:3, 16:9, etc." +||||||| .r11156 +#: wp-admin/includes/theme.php:224 +msgid "Sticky Post" +msgstr "Article mis en avant" +======= #: wp-admin/includes/dashboard.php:352 msgid "You have %1$s and %2$s." msgstr "Vous avez %1$s et %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:96 +msgid "Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings." +msgstr "Une fois que votre sÃ©lection est faite, vous pouvez l’ajuster en saisissant une taille en pixels. La taille minimale de la sÃ©lection est celle des miniatures, tel que dÃ©fini dans les rÃ©glages des MÃ©dia." +||||||| .r11156 +#: wp-admin/includes/theme.php:221 +msgid "Microformats" +msgstr "Microformats" +======= #: wp-admin/includes/dashboard.php:350 msgid "%s site" msgid_plural "%s sites" msgstr[0] "%s site" msgstr[1] "%s sites" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/image-edit.php:126 +msgid "You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image." +msgstr "Vous pouvez modifier l’image tout en prÃ©servant sa miniature. Par exemple, vous pourriez vouloir avoir une miniature carrÃ©e qui n’afficherait qu’une partie de l’image." +||||||| .r11156 +#: wp-admin/includes/theme.php:230 wp-admin/includes/theme.php:258 +msgid "Subject" +msgstr "ThÃ¨me" +======= #: wp-admin/includes/dashboard.php:349 msgid "%s user" msgid_plural "%s users" msgstr[0] "%s utilisateur" msgstr[1] "%s utilisateurs" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-users-list-table.php:447 +msgid "%s post by this author" +msgid_plural "%s posts by this author" +msgstr[0] "%s article par cet auteur" +msgstr[1] "%s articles par cet auteur" +||||||| .r11156 +#: wp-admin/includes/theme.php:231 +msgid "Holiday" +msgstr "Vacances" +======= #: wp-admin/includes/dashboard.php:344 msgid "Create a New User" msgstr "CrÃ©er un nouvel utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1029 +msgid "https://planet.wordpress.org/feed/" +msgstr "http://feeds.feedburner.com/feedburner/cjgL" +||||||| .r11156 +#: wp-admin/includes/theme.php:232 +msgid "Photoblogging" +msgstr "Photoblogging" +======= #: wp-admin/includes/dashboard.php:342 wp-admin/includes/ms.php:828 msgid "Create a New Site" msgstr "CrÃ©er un nouveau site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:25 +msgid "Tag Template" +msgstr "ModÃ¨le pour Ã©tiquette" +||||||| .r11156 +#: wp-admin/includes/theme.php:233 +msgid "Seasonal" +msgstr "Saisonnier" +======= #: wp-admin/includes/dashboard.php:299 msgid "Search Engines Discouraged" msgstr "Moteurs de recherche refusÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3335 +msgid "" +"UPDATE LOG\n" +"==========" +msgstr "" +"JOURNAL DE LA MISE Ã JOUR\n" +"==========" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:131 +msgid "Find Themes" +msgstr "Trouver des thÃ¨mes" +======= #: wp-admin/includes/dashboard.php:287 msgid "Your site is asking search engines not to index its content" msgstr "Votre site indique aux moteurs de recherche de ne pas indexer son contenu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1186 +msgid "Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above." +msgstr "Saisissez l’emplacement sur le serveur oÃ¹ se trouvent les clÃ©s publiques et privÃ©es. S’il vous faut une passphrase, saisissez-la dans le champ de mot de passe ci-dessus." +||||||| .r11156 +#: wp-admin/includes/theme-install.php:139 +msgid "If you have a theme in a .zip format, you may install it by uploading it here." +msgstr "Si vous avez un thÃ¨me au format .zip, vous pouvez l’installer en le mettant en ligne ici." +======= #. translators: Number of comments in moderation #: wp-admin/includes/dashboard.php:245 msgctxt "comments" @@ -6528,99 +22465,324 @@ msgid "%s in moderation" msgid_plural "%s in moderation" msgstr[0] "%s en attente de validation" msgstr[1] "%s en attente de validation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1384 +msgid "https://codex.wordpress.org/First_Steps_With_WordPress" +msgstr "https://codex.wordpress.org/fr:Premiers_pas_avec_WordPress" +||||||| .r11156 +#: wp-admin/includes/class-wp-theme-install-list-table.php:279 +#: wp-admin/includes/class-wp-themes-list-table.php:200 +msgid "Details" +msgstr "DÃ©tails" +======= #: wp-admin/includes/dashboard.php:239 msgid "%s Comment" msgid_plural "%s Comments" msgstr[0] "%s commentaire" msgstr[1] "%s commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/file.php:1161 +msgid "example: www.wordpress.org" +msgstr "exemple : www.wordpress.org" +||||||| .r11156 +#: wp-admin/includes/theme-install.php:197 +msgid "Theme Install" +msgstr "Installation du thÃ¨me" +======= #: wp-admin/includes/dashboard.php:224 msgid "%s Page" msgid_plural "%s Pages" msgstr[0] "%s page" msgstr[1] "%s pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/dashboard.php:1020 +msgid "https://planet.wordpress.org/" +msgstr "http://www.wordpress-fr.net/planet/" +||||||| .r11156 +#: wp-admin/theme-install.php:260 wp-admin/themes.php:333 +msgid "Version: %s" +msgstr "Version : %s" +======= #: wp-admin/includes/dashboard.php:222 msgid "%s Post" msgid_plural "%s Posts" msgstr[0] "%s articles" msgstr[1] "%s articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:119 +msgid "Invalid Data provided." +msgstr "Les donnÃ©es fournies ne sont pas valides." +||||||| .r11156 +#: wp-admin/includes/theme.php:61 +msgid "Unable to locate WordPress theme directory." +msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +======= #: wp-admin/includes/dashboard.php:140 msgid "Configure" msgstr "Configurer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:120 +#: wp-admin/includes/class-wp-upgrader.php:2805 wp-admin/includes/file.php:529 +#: wp-admin/includes/plugin.php:799 wp-admin/includes/theme.php:55 +msgid "Could not access filesystem." +msgstr "Impossible d’accÃ©der au systÃ¨me de fichier." +||||||| .r11156 +#: wp-admin/includes/theme.php:68 +msgid "Could not fully remove the theme %s." +msgstr "Impossible de supprimer complÃ¨tement le thÃ¨me %s." +======= #: wp-admin/includes/dashboard.php:108 msgid "View all" msgstr "Afficher tout" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:121 wp-admin/includes/plugin.php:802 +#: wp-admin/includes/theme.php:58 +msgid "Filesystem error." +msgstr "Erreur du systÃ¨me de fichier." +||||||| .r11156 +#: wp-admin/includes/update-core.php:802 +msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s, et une version de MySQL Ã©gale ou supÃ©rieure Ã la %3$s. Votre hÃ©bergement utilise PHP version %4$s et MySQL version %5$s." +======= #: wp-admin/includes/dashboard.php:52 msgid "WordPress News" msgstr "Nouvelles de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:122 +msgid "Unable to locate WordPress Root directory." +msgstr "Impossible de localiser le dossier racine de WordPress." +||||||| .r11156 +#: wp-admin/includes/update-core.php:804 +msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de PHP Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise PHP version %3$s." +======= #: wp-admin/includes/dashboard.php:47 wp-admin/includes/dashboard.php:507 msgid "Drafts" msgstr "Brouillons" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:123 +msgid "Unable to locate WordPress Content directory (wp-content)." +msgstr "Impossible de localiser le dossier de contenu de WordPress (wp-content)." +||||||| .r11156 +#: wp-admin/includes/update-core.php:806 +msgid "The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." +msgstr "Cette mise Ã jour ne peut Ãªtre installÃ©e car WordPress %1$s requiert une version de MySQL Ã©gale ou supÃ©rieure Ã la %2$s. Votre hÃ©bergement utilise MySQL version %3$s." +======= #: wp-admin/includes/dashboard.php:47 msgid "Quick Draft" msgstr "Brouillon rapide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:124 wp-admin/includes/plugin.php:807 +msgid "Unable to locate WordPress Plugin directory." +msgstr "Impossible de localiser le dossier d’extension de WordPress." +||||||| .r11156 +#: wp-admin/includes/update-core.php:760 +msgid "Verifying the unpacked files…" +msgstr "VÃ©rification des fichiers dÃ©compressÃ©s…" +======= #: wp-admin/includes/dashboard.php:42 msgid "Activity" msgstr "ActivitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:125 +msgid "Unable to locate WordPress Theme directory." +msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +||||||| .r11156 +#: wp-admin/includes/update-core.php:773 +msgid "The update could not be unpacked" +msgstr "La mise Ã jour ne peut pas Ãªtre dÃ©compressÃ©e" +======= #: wp-admin/includes/dashboard.php:38 msgid "Right Now" msgstr "Aujourd’hui" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: directory name +#: wp-admin/includes/class-wp-upgrader.php:127 +msgid "Unable to locate needed folder (%s)." +msgstr "Impossible de localiser le dossier nÃ©cessaire (%s)." +||||||| .r11156 +#: wp-admin/includes/update-core.php:1016 +msgid "Upgrading database…" +msgstr "Mise Ã jour de la base de donnÃ©es…" +======= #: wp-admin/includes/dashboard.php:35 msgid "At a Glance" msgstr "D’un coup d’Åil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:129 +msgid "Download failed." +msgstr "Le tÃ©lÃ©chargement a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/includes/update.php:181 +msgid "You are using a development version (%1$s). Cool! Please stay updated." +msgstr "Vous utilisez une version de dÃ©veloppement (%1$s). C’est super ! Veillez Ã rester Ã jour." +======= #: wp-admin/includes/dashboard.php:30 msgid "Your browser is out of date!" msgstr "Votre navigateur est obsolÃ¨te !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:130 +msgid "Installing the latest version…" +msgstr "Installation de la derniÃ¨re version…" +||||||| .r11156 +#: wp-admin/includes/update.php:184 +msgid "Get Version %2$s" +msgstr "TÃ©lÃ©chargez la version %2$s" +======= #: wp-admin/includes/dashboard.php:28 msgid "You are using an insecure browser!" msgstr "Vous utilisez un navigateur peu sÃ»r !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:132 +msgid "Destination folder already exists." +msgstr "Le dossier de destination existe dÃ©jÃ ." +||||||| .r11156 +#: wp-admin/includes/update.php:230 +msgid "Update to %s" +msgstr "Mettre Ã jour vers la version %s" +======= #: wp-admin/includes/class-wp-users-list-table.php:432 msgid "View posts by this author" msgstr "Afficher les articles de cet auteur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:133 wp-admin/includes/file.php:648 +#: wp-admin/includes/file.php:754 wp-admin/includes/file.php:807 +#: wp-admin/includes/update-core.php:1153 +msgid "Could not create directory." +msgstr "Impossible de crÃ©er le dossier." +||||||| .r11156 +#: wp-admin/includes/update.php:230 +msgid "Latest" +msgstr "DerniÃ¨re version" +======= #: wp-admin/includes/class-wp-users-list-table.php:265 #: wp-admin/user-edit.php:313 wp-admin/user-new.php:300 #: wp-admin/user-new.php:411 msgid "Role" msgstr "RÃ´le" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:137 +#: wp-admin/includes/update-core.php:920 +msgid "Enabling Maintenance mode…" +msgstr "Activation du mode maintenance…" +||||||| .r11156 +#: wp-admin/includes/update.php:425 +msgid "An automated WordPress update has failed to complete - please attempt the update again now." +msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ; vous pouvez tenter de la relancer." +======= #: wp-admin/includes/class-wp-users-list-table.php:219 msgid "Change" msgstr "Changer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:138 +#: wp-admin/includes/update-core.php:1003 +msgid "Disabling Maintenance mode…" +msgstr "DÃ©sactivation du mode maintenance…" +||||||| .r11156 +#: wp-admin/includes/update.php:427 +msgid "An automated WordPress update has failed to complete! Please notify the site administrator." +msgstr "Une mise Ã jour automatique de WordPress a Ã©chouÃ© en cours de route ! Veuillez en notifier l’administrateur du site." +======= #: wp-admin/includes/class-wp-users-list-table.php:213 #: wp-admin/includes/class-wp-users-list-table.php:215 msgid "Change role to…" msgstr "Changer de rÃ´le pour…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:764 +msgid "The plugin is at the latest version." +msgstr "Vous avez la derniÃ¨re version de cette extension." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:73 +msgid "Note that password carefully! It is a random password that was generated just for you." +msgstr "Notez bien ce mot de passe sans vous tromper ! Il a Ã©tÃ© crÃ©Ã© alÃ©atoirement et vous est unique." +======= #. translators: User role name with count #: wp-admin/includes/class-wp-users-list-table.php:169 msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:766 +#: wp-admin/includes/class-wp-upgrader.php:1214 +#: wp-admin/includes/class-wp-upgrader.php:2064 +msgid "Downloading update from %s…" +msgstr "TÃ©lÃ©chargement de la mise Ã jour depuis %s…" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:125 +msgctxt "Default category slug" +msgid "Uncategorized" +msgstr "non-classe" +======= #. translators: 1: Error code, 2: Error message. #: wp-admin/includes/class-wp-upgrader.php:3217 msgid "Error: [%1$s] %2$s" msgstr "Erreur : [%1$s] %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:767 +#: wp-admin/includes/class-wp-upgrader.php:1215 +#: wp-admin/includes/class-wp-upgrader.php:1826 +#: wp-admin/includes/class-wp-upgrader.php:2065 +msgid "Unpacking the update…" +msgstr "DÃ©compression de la mise Ã jour…" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:156 +msgid "Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!" +msgstr "Bienvenue dans WordPress. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +======= #. translators: 1: Error code, 2: Error message. #: wp-admin/includes/class-wp-upgrader.php:3214 msgid "Rollback Error: [%1$s] %2$s" msgstr "Erreur de restauration : [%1$s] %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:768 +msgid "Removing the old version of the plugin…" +msgstr "Retrait de l’ancienne version de l’extension…" +||||||| .r11156 +#: wp-admin/includes/upgrade.php:165 +msgid "Hello world!" +msgstr "Bonjour tout le monde !" +======= #: wp-admin/includes/class-wp-upgrader.php:3190 msgid "" "UPDATE LOG\n" @@ -6628,15 +22790,48 @@ msgid "" msgstr "" "JOURNAL DE LA MISE Ã JOUR\n" "==========" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:769 +msgid "Could not remove the old plugin." +msgstr "Impossible de supprimer l’ancienne extension." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:167 +msgctxt "Default post slug" +msgid "hello-world" +msgstr "bonjour-tout-le-monde" +======= #: wp-admin/includes/class-wp-upgrader.php:3187 msgid "[%s] Background updates have finished" msgstr "[%s] Les mises Ã jour en arriÃ¨re-plan sont terminÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:781 +#: wp-admin/includes/class-wp-upgrader.php:1228 +msgid "Install package not available." +msgstr "L’archive d’installation n’est pas disponible." +||||||| .r11156 +#: wp-admin/includes/upgrade.php:179 +msgid "Mr WordPress" +msgstr "Monsieur WordPress" +======= #: wp-admin/includes/class-wp-upgrader.php:3185 msgid "[%s] There were failures during background updates" msgstr "[%s] Il y a eu des problÃ¨mes lors des mises Ã jour en arriÃ¨re-plan" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:782 +#: wp-admin/includes/class-wp-upgrader.php:1229 +msgid "Downloading install package from %s…" +msgstr "TÃ©lÃ©chargement de l’archive d’installation depuis %s…" +||||||| .r11156 +#: wp-admin/includes/user.php:125 wp-admin/includes/user.php:127 +msgid "ERROR: You entered your new password only once." +msgstr "ERREUR : vous n’avez tapÃ© votre nouveau mot de passe qu’une seule fois." +======= #: wp-admin/includes/class-wp-upgrader.php:3172 msgid "" "BETA TESTING?\n" @@ -6660,596 +22855,2066 @@ msgstr "" "* Ou, si rÃ©diger un rapport de bogue ne vous fait pas peur : http://core.trac.wordpress.org/\n" "\n" "Merci ! -- L'Ã©quipe WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:783 +#: wp-admin/includes/class-wp-upgrader.php:1230 +msgid "Unpacking the package…" +msgstr "DÃ©compression de l’archive de l’extension…" +||||||| .r11156 +#: wp-admin/includes/user.php:130 +msgid "ERROR: Please enter your password." +msgstr "ERREUR : veuillez renseigner votre mot de passe." +======= #: wp-admin/includes/class-wp-upgrader.php:3162 msgid "FAILED: %s" msgstr "ÃCHEC : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:784 +msgid "Installing the plugin…" +msgstr "Installation de l’extension…" +||||||| .r11156 +#: wp-admin/includes/user.php:132 +msgid "ERROR: Please enter your password twice." +msgstr "ERREUR : veuillez renseigner deux fois le mot de passe." +======= #: wp-admin/includes/class-wp-upgrader.php:3156 msgid "The following translations failed to update:" msgstr "Les traductions suivantes n’ont pas pu Ãªtre mises Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:787 +msgid "Plugin installed successfully." +msgstr "L’extension a bien Ã©tÃ© installÃ©e." +||||||| .r11156 +#: wp-admin/includes/user.php:137 +msgid "ERROR: Passwords may not contain the character \"\\\"." +msgstr "ERREUR : le mot de passe ne doit pas contenir le caractÃ¨re « \\ »." +======= #: wp-admin/includes/class-wp-upgrader.php:3155 msgid "The following themes failed to update:" msgstr "Les thÃ¨mes suivants n’ont pas pu Ãªtre mis Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1212 +msgid "The theme is at the latest version." +msgstr "Vous avez la derniÃ¨re version de ce thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/user.php:141 +msgid "ERROR: Please enter the same password in the two password fields." +msgstr "ERREUR : les deux mots de passe ne sont pas identiques." +======= #: wp-admin/includes/class-wp-upgrader.php:3154 msgid "The following plugins failed to update:" msgstr "Les extensions suivantes n’ont pas pu Ãªtre mises Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1216 +msgid "Removing the old version of the theme…" +msgstr "Retrait de l’ancienne version du thÃ¨me…" +||||||| .r11156 +#: wp-admin/includes/user.php:154 +msgid "ERROR: Please enter an e-mail address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie." +======= #: wp-admin/includes/class-wp-upgrader.php:3148 msgid "SUCCESS: %s" msgstr "SUCCÃS : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1217 +msgid "Could not remove the old theme." +msgstr "Impossible de supprimer l’ancien thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/deprecated.php:557 +msgid "No matching users were found!" +msgstr "Aucun utilisateur ne correspond !" +======= #: wp-admin/includes/class-wp-upgrader.php:3143 msgid "The following translations were successfully updated:" msgstr "Les traductions suivantes ont bien Ã©tÃ© mises Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1231 +msgid "Installing the theme…" +msgstr "Installation du thÃ¨me…" +||||||| .r11156 +#: wp-admin/install.php:70 +msgid "WordPress › Installation" +msgstr "WordPress » Installation" +======= #: wp-admin/includes/class-wp-upgrader.php:3142 msgid "The following themes were successfully updated:" msgstr "Les thÃ¨mes suivants ont bien Ã©tÃ© mis Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2062 +msgid "WordPress is at the latest version." +msgstr "Vous avez la derniÃ¨re version de WordPress." +||||||| .r11156 +#: wp-admin/setup-config.php:162 +msgid "User Name" +msgstr "Identifiant" +======= #: wp-admin/includes/class-wp-upgrader.php:3141 msgid "The following plugins were successfully updated:" msgstr "Les extensions suivantes ont bien Ã©tÃ© mises Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2066 +msgid "Could not copy files." +msgstr "Impossible de copier les fichiers." +||||||| .r11156 +#: wp-admin/install.php:117 +msgid "User(s) already exists." +msgstr "L’utilisateur existe dÃ©jÃ ." +======= #: wp-admin/includes/class-wp-upgrader.php:3128 msgid "FAILED: WordPress failed to update to %s" msgstr "ÃCHEC : WordPress n’a pas pu Ãªtre mis Ã jour vers %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:233 +#: wp-admin/includes/class-wp-upgrader-skins.php:566 +msgid "Activate Plugin" +msgstr "Activer l’extension" +||||||| .r11156 +#: wp-admin/install.php:141 +msgid "Your E-mail" +msgstr "Votre adresse de messagerie" +======= #: wp-admin/includes/class-wp-upgrader.php:3126 msgid "SUCCESS: WordPress was successfully updated to %s" msgstr "SUCCÃS : WordPress a bien Ã©tÃ© mis Ã jour vers %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:234 +#: wp-admin/includes/class-wp-upgrader-skins.php:447 +#: wp-admin/includes/class-wp-upgrader-skins.php:578 +msgid "Return to Plugins page" +msgstr "Retourner sur la page des extensions" +||||||| .r11156 +#: wp-admin/install.php:143 +msgid "Double-check your email address before continuing." +msgstr "VÃ©rifiez bien cette adresse de messagerie avant de continuer." +======= #: wp-admin/includes/class-wp-upgrader.php:3120 msgid "WordPress site: %s" msgstr "Site WordPress : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:576 +msgid "Return to Plugin Installer" +msgstr "Retourner Ã l’installeur d’extensions" +||||||| .r11156 +#: wp-admin/install.php:150 +msgid "Install WordPress" +msgstr "Installer WordPress" +======= #: wp-admin/includes/class-wp-upgrader.php:3066 msgid "Error code: %s" msgstr "Code d'erreur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: theme name, 2: version +#: wp-admin/includes/class-wp-upgrader.php:1236 +msgid "Successfully installed the theme %1$s %2$s." +msgstr "Le thÃ¨me %1$s %2$s a bien Ã©tÃ© installÃ©." +||||||| .r11156 +#: wp-admin/install.php:176 +msgid "Insufficient Requirements" +msgstr "Les conditions requises ne sont pas remplies" +======= #: wp-admin/includes/class-wp-upgrader.php:3053 msgid "Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:" msgstr "Votre hÃ©bergeur, les volontaires du forum d'entraide ou un ami dÃ©veloppeur devraient pouvoir vous aider Ã comprendre cette information pour vous aider :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:671 +msgid "Return to Theme Installer" +msgstr "Retourner Ã l’installeur de thÃ¨mes" +||||||| .r11156 +#: wp-admin/install.php:218 +msgid "Information needed" +msgstr "Informations nÃ©cessaires" +======= #: wp-admin/includes/class-wp-upgrader.php:3052 msgid "We have some data that describes the error your site encountered." msgstr "Nous avons quelques donnÃ©es qui dÃ©crivent l'erreur que votre site a rencontrÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:499 +#: wp-admin/includes/class-wp-upgrader-skins.php:673 +#: wp-admin/includes/class-wp-upgrader-skins.php:751 +msgid "Return to Themes page" +msgstr "Retourner sur la page des thÃ¨mes" +||||||| .r11156 +#: wp-admin/install.php:219 +msgid "Please provide the following information. Don’t worry, you can always change these settings later." +msgstr "Veuillez renseigner les informations suivantes. Ne vous inquiÃ©tez pas, vous pourrez les modifier plus tard." +======= #: wp-admin/includes/class-wp-upgrader.php:3051 msgid "Your site was running version %s." msgstr "Votre site utilise la version %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2424 +#: wp-admin/includes/class-wp-upgrader.php:2458 +msgid "Please select a file" +msgstr "Veuillez choisir un fichier" +||||||| .r11156 +#: wp-admin/install.php:272 +msgid "Success!" +msgstr "Quel succÃ¨s !" +======= #: wp-admin/includes/class-wp-upgrader.php:3047 msgid "The WordPress Team" msgstr "L'Ã©quipe WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:188 +msgid "" +"You are about to delete this theme '%s'\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer le thÃ¨me Â« %s Â».\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +||||||| .r11156 +#: wp-admin/install.php:274 +msgid "WordPress has been installed. Were you expecting more steps? Sorry to disappoint." +msgstr "WordPress est installÃ©. Vous attendiez-vous Ã d’autres Ã©tapes ? DÃ©solÃ© de vous dÃ©cevoir ;-)" +======= #: wp-admin/includes/class-wp-upgrader.php:3043 msgid "You also have some plugins or themes with updates available. Update them now:" msgstr "Certains de vos thÃ¨mes et extensions ont Ã©galement des mises Ã jour disponibles. Veuillez les mettre Ã jour dÃ¨s maintenant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:786 +msgid "Plugin install failed." +msgstr "L’installation de l’extension a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/link-add.php:15 +msgid "Add New Link" +msgstr "Ajouter un lien" +======= #: wp-admin/includes/class-wp-upgrader.php:3038 msgid "If you reach out to us, we'll also ensure you'll never have this problem again." msgstr "Si vous nous contactez, nous ferons Ã©galement en sorte que vous ne rencontriez plus jamais ce problÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1233 +msgid "Theme install failed." +msgstr "L’installation du thÃ¨me a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/edit-link-form.php:73 wp-admin/link-manager.php:72 +#: wp-admin/menu.php:78 +msgctxt "link" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/includes/class-wp-upgrader.php:3034 wp-admin/update-core.php:478 msgid "Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers." msgstr "Pour des questions de sÃ©curitÃ©, il est important de garder votre site Ã jour. Par ailleurs, cela rend le Web plus sÃ»r pour vous et vos lecteurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:285 +msgid "The update of %1$s failed." +msgstr "La mise Ã jour de %1$s a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/link-manager.php:81 +msgid "%s link deleted." +msgid_plural "%s links deleted" +msgstr[0] "%s lien supprimÃ©" +msgstr[1] "%s liens supprimÃ©s" +======= #: wp-admin/includes/class-wp-upgrader.php:3028 msgid "If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help." msgstr "Si vous rencontrez des problÃ¨mes ou avez besoin d'assistance, les volontaires du forum d'entraide de WordPress-fr.net devraient pouvoir vous aider." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:421 +msgid "Updating Plugin %1$s (%2$d/%3$d)" +msgstr "Mise Ã jour de l’extension %1$s (%2$d/%3$d)" +||||||| .r11156 +#: wp-admin/link-manager.php:89 +msgid "Search Links" +msgstr "Chercher un lien" +======= #: wp-admin/includes/class-wp-upgrader.php:3025 msgid "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." msgstr "L’Ã©quipe de WordPress est prÃªte Ã vous aider. TransfÃ©rez ce message Ã %s et l’Ã©quipe vous aidera Ã faire en sorte que vous site fonctionne." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:473 +msgid "Updating Theme %1$s (%2$d/%3$d)" +msgstr "Mise Ã jour du thÃ¨me %1$s (%2$d/%3$d)" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:161 +msgid "Visit %s" +msgstr "Aller sur %s" +======= #: wp-admin/includes/class-wp-upgrader.php:3017 msgid "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" msgstr "Veuillez vÃ©rifier votre site immÃ©diatelement. Il se peut que tout fonctionne. S'il affiche que vous devez faire une mise Ã jour, vous devriez suivre son conseil :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:179 +#: wp-admin/includes/class-wp-upgrader-skins.php:665 +#: wp-admin/includes/class-wp-upgrader-skins.php:744 +msgid "Activate “%s”" +msgstr "Activer « %s »" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:53 +msgid "No links found." +msgstr "Aucun lien trouvÃ©." +======= #: wp-admin/includes/class-wp-upgrader.php:3015 msgid "This means your site may be offline or broken. Don't panic; this can be fixed." msgstr "Cela signifie que votre site est peut-Ãªtre hors ligne ou cassÃ©. Ne paniquez pas, cela peut Ãªtre rÃ©parÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:286 +msgid "%1$s updated successfully." +msgstr "%1$s a bien Ã©tÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/link-parse-opml.php:78 +msgid "XML error: %1$s at line %2$s" +msgstr "Erreur XML : %1$s Ã la ligne %2$s" +======= #: wp-admin/includes/class-wp-upgrader.php:3013 msgid "Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s." msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour vers la derniÃ¨re version de WordPress, la %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:286 +msgid "Show Details" +msgstr "Afficher les dÃ©tails" +||||||| .r11156 +#: wp-admin/link.php:109 +msgid "Link not found." +msgstr "Lien non trouvÃ©." +======= #: wp-admin/includes/class-wp-upgrader.php:3011 msgid "Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s." msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour de WordPress vers la version %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:286 +msgid "Hide Details" +msgstr "Cacher les dÃ©tails" +||||||| .r11156 +#: wp-admin/maint/repair.php:19 +msgid "WordPress › Database Repair" +msgstr "WordPress » RÃ©paration de la base de donnÃ©es" +======= #: wp-admin/includes/class-wp-upgrader.php:3003 msgid "We tried but were unable to update your site automatically." msgstr "MalgrÃ© nos tentatives, nous n'avons pas pu mettre votre site Ã jour automatiquement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:287 +msgid "All updates have been completed." +msgstr "Toutes les mises Ã jour sont terminÃ©es." +||||||| .r11156 +#: wp-admin/maint/repair.php:103 +msgid "Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance." +msgstr "Certains problÃ¨mes de la base de donnÃ©es n’ont pas pu Ãªtre rÃ©parÃ©s. Veuillez copier/coller la liste d’erreurs suivantes sur le forum de support de WordPress pour recevoir plus d’informations." +======= #: wp-admin/includes/class-wp-upgrader.php:2996 msgid "Please update your site at %1$s to WordPress %2$s." msgstr "Veuillez mettre Ã jour votre site Ã l'adresse %1$s pour le passer Ã WordPress %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:448 +#: wp-admin/includes/class-wp-upgrader-skins.php:500 +#: wp-admin/includes/class-wp-upgrader-skins.php:830 +msgid "Return to WordPress Updates page" +msgstr "Retourner aux mises Ã jour de WordPress" +||||||| .r11156 +#: wp-admin/maint/repair.php:117 +msgid "Repair Database" +msgstr "RÃ©parer la base de donnÃ©es" +======= #: wp-admin/includes/class-wp-upgrader.php:2988 #: wp-admin/includes/class-wp-upgrader.php:3005 msgid "Updating is easy and only takes a few moments:" msgstr "La mise Ã jour est facile et ne requiert que quelques secondes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:550 +msgid "Successfully installed the plugin %s %s." +msgstr "L’extension %s %s a bien Ã©tÃ© installÃ©e." +||||||| .r11156 +#: wp-admin/maint/repair.php:119 +msgid "Repair and Optimize Database" +msgstr "RÃ©parer et optimiser la base de donnÃ©es" +======= #: wp-admin/includes/class-wp-upgrader.php:2987 msgid "WordPress %s is also now available." msgstr "WordPress %s est disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:564 +msgid "Activate Plugin & Run Importer" +msgstr "Activer l’extension & lancer l’importateur" +||||||| .r11156 +#: wp-admin/media-new.php:40 +msgid "Upload New Media" +msgstr "Envoi d’un nouveau mÃ©dia" +======= #: wp-admin/includes/class-wp-upgrader.php:2983 msgid "For more on version %s, see the About WordPress screen:" msgstr "Pour en savoir plus sur la version %s, lisez l'Ã©cran Ã Propos de WordPress : " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:574 +msgid "Return to Importers" +msgstr "Retour aux importateurs" +||||||| .r11156 +#: wp-admin/media.php:23 wp-admin/media.php:57 +msgid "You are not allowed to edit this attachment." +msgstr "Vous n’avez pas l’autorisation de modifier ce fichier attachÃ©." +======= #: wp-admin/includes/class-wp-upgrader.php:2979 msgid "No further action is needed on your part." msgstr "Vous n'avez rien de plus Ã faire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:105 +msgid "Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes." +msgstr "Vous n’avez accÃ¨s qu’au thÃ¨me dÃ©jÃ en place. Contactez l’administrateur de %s pour obtenir des informations sur l’accÃ¨s Ã d’autres thÃ¨mes." +||||||| .r11156 +#: wp-admin/media.php:61 +msgid "You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?" +msgstr "Vous tentez de modifier un fichier attachÃ© qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +======= #: wp-admin/includes/class-wp-upgrader.php:2976 msgid "Howdy! Your site at %1$s has been updated automatically to WordPress %2$s." msgstr "Salutations ! Votre site Ã l'adresse %1$s a Ã©tÃ© automatiquement mis Ã jour vers WordPress %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2813 +#: wp-admin/includes/update-core.php:1204 wp-admin/update-core.php:458 +msgid "WordPress updated successfully" +msgstr "WordPress a bien Ã©tÃ© mis Ã jour" +||||||| .r11156 +#: wp-admin/media.php:63 +msgid "You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again." +msgstr "Vous ne pouvez pas modifier ce fichier attachÃ©, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +======= #. translators: 1: Site name. #: wp-admin/includes/class-wp-upgrader.php:2961 msgid "[%1$s] URGENT: Your site may be down due to a failed update" msgstr "[%1$s] URGENT : suite Ã une mise Ã jour Ã©chouÃ©e, votre site est peut-Ãªtre inaccessible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:88 +msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable or install more themes." +msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer ou installer plus de thÃ¨mes." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:93 wp-admin/media.php:95 +#: wp-admin/upload.php:240 wp-admin/upload.php:265 +msgid "Media attachment updated." +msgstr "Fichier attachÃ© mis Ã jour." +======= #. translators: 1: Site name, 2: WordPress version number. #: wp-admin/includes/class-wp-upgrader.php:2956 msgid "[%1$s] WordPress %2$s is available. Please update!" msgstr "[%1$s] WordPress %2$s est disponible. Veuillez faire une mise Ã jour !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:92 +msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable more themes." +msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer plus de thÃ¨mes." +||||||| .r11156 +#: wp-admin/media.php:116 wp-admin/media.php:125 +msgid "Update Media" +msgstr "Mettre Ã jour le fichier" +======= #. translators: 1: Site name, 2: WordPress version number. #: wp-admin/includes/class-wp-upgrader.php:2950 msgid "[%1$s] Your site has updated to WordPress %2$s" msgstr "[%1$s] Votre site a Ã©tÃ© mis Ã jour vers WordPress %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:99 +msgid "You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the Install Themes tab above." +msgstr "Vous n’avez qu’un seul thÃ¨me d’installÃ© pour le moment. Faites vivre votre site ! Vous pouvez quand vous le voulez choisir parmi plus de 1 000 thÃ¨mes sur le dÃ©pÃ´t de thÃ¨mes de WordPress.org : cliquez simplement sur l’onglet « Installer des thÃ¨mes » ci-dessus." +||||||| .r11156 +#: wp-admin/menu.php:64 +msgid "Library" +msgstr "BibliothÃ¨que" +======= #: wp-admin/includes/class-wp-upgrader.php:2675 #: wp-admin/includes/update-core.php:1177 wp-admin/update-core.php:432 msgid "WordPress updated successfully" msgstr "WordPress a bien Ã©tÃ© mis Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:765 +#: wp-admin/includes/class-wp-upgrader.php:1213 +#: wp-admin/includes/class-wp-upgrader.php:1824 +#: wp-admin/includes/class-wp-upgrader.php:2063 +msgid "Update package not available." +msgstr "Pas d’archive de mise Ã jour disponible." +||||||| .r11156 +#: wp-admin/media.php:110 wp-admin/menu.php:66 wp-admin/upload.php:65 +#: wp-admin/upload.php:231 +msgctxt "file" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/includes/class-wp-upgrader.php:2673 wp-admin/update-core.php:427 msgid "Installation Failed" msgstr "Ãchec de l’installation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:770 +msgid "Plugin update failed." +msgstr "La mise Ã jour de l’extension a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/menu.php:96 +msgid "Comments %s" +msgstr "Commentaires %s" +======= #: wp-admin/includes/class-wp-upgrader.php:2644 msgid "Translations for %s" msgstr "Traductions pour %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:771 +msgid "Plugin updated successfully." +msgstr "L’extension a bien Ã©tÃ© mise Ã jour." +||||||| .r11156 +#: wp-admin/menu.php:150 +msgid "Appearance" +msgstr "Apparence" +======= #: wp-admin/includes/class-wp-upgrader.php:2640 msgid "Updating plugin: %s" msgstr "Mise Ã jour de l’extension : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1218 +msgid "Theme update failed." +msgstr "La mise Ã jour du thÃ¨me a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/menu.php:183 wp-admin/plugins.php:416 +msgctxt "plugin" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/includes/class-wp-upgrader.php:2634 msgid "Updating theme: %s" msgstr "Mise Ã jour du thÃ¨me : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1219 +msgid "Theme updated successfully." +msgstr "Le thÃ¨me a bien Ã©tÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/menu.php:192 wp-admin/user/menu.php:14 wp-admin/user-edit.php:28 +msgid "Profile" +msgstr "Profil" +======= #: wp-admin/includes/class-wp-upgrader.php:2628 msgid "WordPress %s" msgstr "WordPress %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1234 +msgid "Theme installed successfully." +msgstr "Le thÃ¨me a bien Ã©tÃ© installÃ©." +||||||| .r11156 +#: wp-admin/menu.php:202 wp-admin/menu.php:205 +msgid "Your Profile" +msgstr "Votre profil" +======= #: wp-admin/includes/class-wp-upgrader.php:2627 msgid "Updating to WordPress %s" msgstr "Mise Ã jour vers WordPress %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:210 wp-admin/update.php:54 +msgid "Update Plugin" +msgstr "Mettre Ã jour l’extension" +||||||| .r11156 +#: wp-admin/menu.php:212 wp-admin/tools.php:12 +msgid "Tools" +msgstr "Outils" +======= #: wp-admin/includes/class-wp-upgrader.php:2290 #: wp-admin/includes/class-wp-upgrader.php:2324 msgid "Please select a file" msgstr "Veuillez choisir un fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:283 +msgid "The update process is starting. This process may take a while on some hosts, so please be patient." +msgstr "Le processus de mise Ã jour se lance. Il peut prendre un certain temps chez certains hÃ©bergeurs, merci pour votre patience." +||||||| .r11156 +#: wp-admin/menu.php:222 +msgctxt "settings screen" +msgid "General" +msgstr "GÃ©nÃ©ral" +======= #: wp-admin/includes/class-wp-upgrader.php:2028 #: wp-admin/includes/update-core.php:820 wp-admin/includes/update-core.php:895 #: wp-admin/includes/update-core.php:918 msgid "The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions." msgstr "La mise Ã jour ne peut pas Ãªtre installÃ©e parce que nous n’allons pas pouvoir copier certains fichiers. Ce problÃ¨me est gÃ©nÃ©ralement dÃ» Ã des incohÃ©rences dans les permissions de fichiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:709 wp-admin/update.php:162 +msgid "Update Theme" +msgstr "Mettre Ã jour le thÃ¨me" +||||||| .r11156 +#: wp-admin/menu.php:223 +msgid "Writing" +msgstr "Ãcriture" +======= #: wp-admin/includes/class-wp-upgrader.php:1943 msgid "Due to an error during updating, WordPress has rolled back to your previous version." msgstr "Suite Ã une erreur pendant la mise Ã jour, WordPress vous a ramenÃ© Ã votre version prÃ©cÃ©dente." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:401 +#: wp-admin/includes/dashboard.php:1148 wp-admin/theme-install.php:212 +#: wp-admin/theme-install.php:230 +msgid "Install" +msgstr "Installer" +||||||| .r11156 +#: wp-admin/menu.php:224 +msgid "Reading" +msgstr "Lecture" +======= #: wp-admin/includes/class-wp-upgrader.php:1942 msgid "Attempting to roll back to previous version." msgstr "Tentative de retour Ã la version prÃ©cÃ©dente." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:134 +msgid "The package could not be installed." +msgstr "L’archive n’a pas pu Ãªtre installÃ©e." +||||||| .r11156 +#: wp-admin/install.php:146 +msgid "Privacy" +msgstr "Vie privÃ©e" +======= #: wp-admin/includes/class-wp-upgrader.php:1941 wp-admin/includes/file.php:621 #: wp-admin/includes/file.php:725 msgid "Could not copy files. You may have run out of disk space." msgstr "Impossible de copier les fichiers. Il se pourrait que vous manquiez de place." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:785 +msgid "The plugin contains no files." +msgstr "Cette extension ne contient aucun fichier." +||||||| .r11156 +#: wp-admin/menu.php:227 +msgid "Permalinks" +msgstr "Permaliens" +======= #: wp-admin/includes/class-wp-upgrader.php:1940 msgid "Could not copy files." msgstr "Impossible de copier les fichiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1073 +msgid "No valid plugins were found." +msgstr "Aucune extension valide trouvÃ©e." +||||||| .r11156 +#: wp-admin/ms-delete-site.php:13 wp-admin/my-sites.php:13 +msgid "Multisite support is not enabled." +msgstr "Le support multisites n’est pas activÃ©." +======= #: wp-admin/includes/class-wp-upgrader.php:1936 msgid "WordPress is at the latest version." msgstr "Vous avez la derniÃ¨re version de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: theme name, 2: version +#: wp-admin/includes/class-wp-upgrader.php:1241 +msgid "The parent theme, %1$s %2$s, is currently installed." +msgstr "Le thÃ¨me parent, %1$s %2$s, est bien installÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:159 +msgid "Domain" +msgstr "Domaine" +======= #: wp-admin/includes/class-wp-upgrader.php:1886 msgid "The language pack is missing either the .po or .mo files." msgstr "Il manque les fichiers .po et/ou .mo du pack de langue." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: theme name, 2: version +#: wp-admin/includes/class-wp-upgrader.php:1243 +msgid "Successfully installed the parent theme, %1$s %2$s." +msgstr "Le thÃ¨me parent, %1$s %2$s, a bien Ã©tÃ© installÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:163 +msgid "Last Updated" +msgstr "DerniÃ¨re mise Ã jour" +======= #: wp-admin/includes/class-wp-upgrader.php:1709 msgid "Translation updated successfully." msgstr "La traduction a bien Ã©tÃ© mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1596 +msgid "The theme is missing the style.css stylesheet." +msgstr "Il manque le fichier style.css Ã ce thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:196 +msgid "Archived" +msgstr "ArchivÃ©" +======= #: wp-admin/includes/class-wp-upgrader.php:1708 msgid "Translation update failed." msgstr "La mise Ã jour de la traduction a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1601 +msgid "The style.css stylesheet doesn't contain a valid theme header." +msgstr "Le fichier style.css ne contient pas un en-tÃªte valide de thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:199 +msgid "Mature" +msgstr "Adulte" +======= #: wp-admin/includes/class-wp-upgrader.php:1706 msgid "Downloading translation from %s…" msgstr "TÃ©lÃ©chargement de la traduction depuis %s…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1605 +msgid "The theme is missing the index.php file." +msgstr "Il manque le fichier index.php au thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:198 +msgid "Deleted" +msgstr "SupprimÃ©" +======= #: wp-admin/includes/class-wp-upgrader.php:1704 msgid "The translation is up to date." msgstr "La traduction est Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:738 +msgid "Customize “%s”" +msgstr "Personnaliser « %s »" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:289 +msgid "Unarchive" +msgstr "DÃ©sarchiver" +======= #: wp-admin/includes/class-wp-upgrader.php:1703 msgid "Some of your translations need updating. Sit tight for a few more seconds while we update them as well." msgstr "Certaines de vos traductions ont besoin d’Ãªtre mises Ã jour. Patientez encore quelques secondes, le temps que nous les mettions Ã©galement Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2067 wp-admin/includes/file.php:625 +#: wp-admin/includes/file.php:731 +msgid "Could not copy files. You may have run out of disk space." +msgstr "Impossible de copier les fichiers. Il se pourrait que vous manquiez de place." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:302 +#: wp-admin/my-sites.php:129 +msgid "Visit" +msgstr "Visiter" +======= #: wp-admin/includes/class-wp-upgrader.php:1503 msgid "The theme is missing the index.php file." msgstr "Il manque le fichier index.php au thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:230 +msgid "This child theme requires its parent theme, %2$s." +msgstr "Ce thÃ¨me enfant nÃ©cessite son thÃ¨me parent, %2$s." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:328 +msgid "Never" +msgstr "Jamais" +======= #: wp-admin/includes/class-wp-upgrader.php:1499 msgid "The style.css stylesheet doesn't contain a valid theme header." msgstr "Le fichier style.css ne contient pas un en-tÃªte valide de thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1237 +msgid "This theme requires a parent theme. Checking if it is installed…" +msgstr "Ce thÃ¨me nÃ©cessite un thÃ¨me parent. Nous vÃ©rifions s’il est installÃ©…" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:349 +msgid "Only showing first 5 users." +msgstr "Affiche seulement les 5 premiers utilisateurs." +======= #: wp-admin/includes/class-wp-upgrader.php:1494 msgid "The theme is missing the style.css stylesheet." msgstr "Il manque le fichier style.css Ã ce thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: theme name, 2: version +#: wp-admin/includes/class-wp-upgrader.php:1239 +msgid "Preparing to install %1$s %2$s…" +msgstr "PrÃ©paration Ã l’installation de %1$s %2$s…" +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:349 +msgid "More" +msgstr "Plus" +======= #: wp-admin/includes/class-wp-upgrader.php:1150 msgid "The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme." msgstr "Le thÃ¨me parent n’a pas pu Ãªtre trouvÃ©. Vous allez devoir installer le thÃ¨me parent, %s, avant de pouvoir utiliser ce thÃ¨me enfant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1244 +msgid "The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme." +msgstr "Le thÃ¨me parent n’a pas pu Ãªtre trouvÃ©. Vous allez devoir installer le thÃ¨me parent, %s, avant de pouvoir utiliser ce thÃ¨me enfant." +||||||| .r11156 +#: wp-admin/update-core.php:303 wp-admin/update-core.php:330 +#: wp-admin/update-core.php:607 wp-admin/update-core.php:612 +msgid "Update Themes" +msgstr "Mettre Ã jour les thÃ¨mes" +======= #. translators: 1: theme name, 2: version #: wp-admin/includes/class-wp-upgrader.php:1149 msgid "Successfully installed the parent theme, %1$s %2$s." msgstr "Le thÃ¨me parent, %1$s %2$s, a bien Ã©tÃ© installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:131 +msgid "The package contains no files." +msgstr "Ce paquet ne contient aucun fichier." +||||||| .r11156 +#: wp-admin/includes/class-wp-ms-users-list-table.php:86 +msgid "No users found." +msgstr "Aucun utilisateur trouvÃ©." +======= #. translators: 1: theme name, 2: version #: wp-admin/includes/class-wp-upgrader.php:1147 msgid "The parent theme, %1$s %2$s, is currently installed." msgstr "Le thÃ¨me parent, %1$s %2$s, est bien installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1232 +msgid "The theme contains no files." +msgstr "Ce thÃ¨me ne contient aucun fichier." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:366 wp-admin/options-discussion.php:14 +msgid "Discussion Settings" +msgstr "Options de discussion" +======= #. translators: 1: theme name, 2: version #: wp-admin/includes/class-wp-upgrader.php:1145 msgid "Preparing to install %1$s %2$s…" msgstr "PrÃ©paration Ã l’installation de %1$s %2$s…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:284 +msgid "An error occurred while updating %1$s: %2$s" +msgstr "Une erreur est survenue pendant la mise Ã jour de %1$s : %2$s" +||||||| .r11156 +#: wp-admin/options-discussion.php:41 wp-admin/options-discussion.php:42 +msgid "Default article settings" +msgstr "RÃ©glages par dÃ©faut des articles" +======= #: wp-admin/includes/class-wp-upgrader.php:1143 msgid "This theme requires a parent theme. Checking if it is installed…" msgstr "Ce thÃ¨me nÃ©cessite un thÃ¨me parent. Nous vÃ©rifions s’il est installÃ©…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:786 +#: wp-admin/update-core.php:381 wp-admin/update-core.php:674 +msgid "Update Translations" +msgstr "Mise Ã jour des traductions" +||||||| .r11156 +#: wp-admin/options-discussion.php:55 +msgid "These settings may be overridden for individual articles." +msgstr "Ces rÃ©glages peuvent Ãªtre modifiÃ©s pour chaque article." +======= #. translators: 1: theme name, 2: version #: wp-admin/includes/class-wp-upgrader.php:1142 msgid "Successfully installed the theme %1$s %2$s." msgstr "Le thÃ¨me %1$s %2$s a bien Ã©tÃ© installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1822 +msgid "Some of your translations need updating. Sit tight for a few more seconds while we update them as well." +msgstr "Certaines de vos traductions ont besoin d’Ãªtre mises Ã jour. Patientez encore quelques secondes, le temps que nous les mettions Ã©galement Ã jour." +||||||| .r11156 +#: wp-admin/options-discussion.php:59 wp-admin/options-discussion.php:60 +msgid "Other comment settings" +msgstr "Autres rÃ©glages des commentaires" +======= #: wp-admin/includes/class-wp-upgrader.php:1140 msgid "Theme installed successfully." msgstr "Le thÃ¨me a bien Ã©tÃ© installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1823 +msgid "The translation is up to date." +msgstr "La traduction est Ã jour." +||||||| .r11156 +#: wp-admin/options-discussion.php:61 +msgid "Comment author must fill out name and e-mail" +msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +======= #: wp-admin/includes/class-wp-upgrader.php:1139 msgid "Theme install failed." msgstr "L’installation du thÃ¨me a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1825 +msgid "Downloading translation from %s…" +msgstr "TÃ©lÃ©chargement de la traduction depuis %s…" +||||||| .r11156 +#: wp-admin/options-discussion.php:65 +msgid "Users must be registered and logged in to comment" +msgstr "Un utilisateur doit Ãªtre enregistrÃ© et connectÃ© pour publier des commentaires" +======= #: wp-admin/includes/class-wp-upgrader.php:1138 msgid "The theme contains no files." msgstr "Ce thÃ¨me ne contient aucun fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1827 +msgid "Translation update failed." +msgstr "La mise Ã jour de la traduction a Ã©chouÃ©." +||||||| .r11156 +#: wp-admin/options-discussion.php:72 +msgid "Automatically close comments on articles older than %s days" +msgstr "Fermer automatiquement les commentaires pour les articles vieux de plus de %s jours" +======= #: wp-admin/includes/class-wp-upgrader.php:1137 msgid "Installing the theme…" msgstr "Installation du thÃ¨me…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:1828 +msgid "Translation updated successfully." +msgstr "La traduction a bien Ã©tÃ© mise Ã jour." +||||||| .r11156 +#: wp-admin/options-discussion.php:95 +msgid "Enable threaded (nested) comments %s levels deep" +msgstr "Activer les commentaires imbriquÃ©s jusqu’Ã %s niveaux" +======= #: wp-admin/includes/class-wp-upgrader.php:1125 msgid "Theme updated successfully." msgstr "Le thÃ¨me a bien Ã©tÃ© mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2012 +msgid "The language pack is missing either the .po or .mo files." +msgstr "Il manque les fichiers .po et/ou .mo du pack de langue." +||||||| .r11156 +#: wp-admin/options-discussion.php:105 +msgid "last" +msgstr "derniÃ¨re" +======= #: wp-admin/includes/class-wp-upgrader.php:1124 msgid "Theme update failed." msgstr "La mise Ã jour du thÃ¨me a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2068 +msgid "Attempting to roll back to previous version." +msgstr "Tentative de retour Ã la version prÃ©cÃ©dente." +||||||| .r11156 +#: wp-admin/options-discussion.php:107 +msgid "first" +msgstr "premiÃ¨re" +======= #: wp-admin/includes/class-wp-upgrader.php:1123 msgid "Could not remove the old theme." msgstr "Impossible de supprimer l’ancien thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2069 +msgid "Due to an error during updating, WordPress has rolled back to your previous version." +msgstr "Suite Ã une erreur pendant la mise Ã jour, WordPress vous a ramenÃ© Ã votre version prÃ©cÃ©dente." +||||||| .r11156 +#: wp-admin/options-discussion.php:109 +msgid "Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default" +msgstr "Diviser les commentaires en pages, avec %1$s commentaires de premier niveau par page et la %2$s page affichÃ©e par dÃ©faut" +======= #: wp-admin/includes/class-wp-upgrader.php:1122 msgid "Removing the old version of the theme…" msgstr "Retrait de l’ancienne version du thÃ¨me…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2765 +msgid "Updating to WordPress %s" +msgstr "Mise Ã jour vers WordPress %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:117 +msgid "older" +msgstr "ancien" +======= #: wp-admin/includes/class-wp-upgrader.php:1118 msgid "The theme is at the latest version." msgstr "Vous avez la derniÃ¨re version de ce thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2766 +msgid "WordPress %s" +msgstr "WordPress %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:119 +msgid "newer" +msgstr "rÃ©cent" +======= #: wp-admin/includes/class-wp-upgrader.php:987 msgid "No valid plugins were found." msgstr "Aucune extension valide trouvÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2772 +msgid "Updating theme: %s" +msgstr "Mise Ã jour du thÃ¨me : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:121 +msgid "Comments should be displayed with the %s comments at the top of each page" +msgstr "Les commentaires doivent Ãªtre affichÃ©s avec le plus %s en premier" +======= #: wp-admin/includes/class-wp-upgrader.php:703 msgid "Plugin installed successfully." msgstr "L’extension a bien Ã©tÃ© installÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2778 +msgid "Updating plugin: %s" +msgstr "Mise Ã jour de l’extension : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:127 wp-admin/options-discussion.php:128 +msgid "E-mail me whenever" +msgstr "M’envoyer un message lorsque" +======= #: wp-admin/includes/class-wp-upgrader.php:702 msgid "Plugin install failed." msgstr "L’installation de l’extension a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2782 +msgid "Translations for %s" +msgstr "Traductions pour %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:131 +msgid "Anyone posts a comment" +msgstr "Un nouveau commentaire est publiÃ©" +======= #: wp-admin/includes/class-wp-upgrader.php:701 msgid "The plugin contains no files." msgstr "Cette extension ne contient aucun fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Site name, 2: WordPress version number. +#: wp-admin/includes/class-wp-upgrader.php:3095 +msgid "[%1$s] Your site has updated to WordPress %2$s" +msgstr "[%1$s] Votre site a Ã©tÃ© mis Ã jour vers WordPress %2$s" +||||||| .r11156 +#: wp-admin/options-discussion.php:135 +msgid "A comment is held for moderation" +msgstr "Un commentaire est en attente de modÃ©ration" +======= #: wp-admin/includes/class-wp-upgrader.php:700 msgid "Installing the plugin…" msgstr "Installation de l’extension…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3124 +msgid "No further action is needed on your part." +msgstr "Vous n'avez rien de plus Ã faire." +||||||| .r11156 +#: wp-admin/options-discussion.php:139 wp-admin/options-discussion.php:140 +msgid "Before a comment appears" +msgstr "Avant la publication d’un commentaire" +======= #: wp-admin/includes/class-wp-upgrader.php:699 #: wp-admin/includes/class-wp-upgrader.php:1136 msgid "Unpacking the package…" msgstr "DÃ©compression de l’archive de l’extension…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3148 +msgid "We tried but were unable to update your site automatically." +msgstr "MalgrÃ© nos tentatives, nous n'avons pas pu mettre votre site Ã jour automatiquement." +||||||| .r11156 +#: wp-admin/options-discussion.php:145 +msgid "Comment author must have a previously approved comment" +msgstr "L’auteur d’un commentaire doit avoir dÃ©jÃ au moins un commentaire approuvÃ©" +======= #: wp-admin/includes/class-wp-upgrader.php:698 #: wp-admin/includes/class-wp-upgrader.php:1135 msgid "Downloading install package from %s…" msgstr "TÃ©lÃ©chargement de l’archive d’installation depuis %s…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3158 +msgid "Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s." +msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour vers la derniÃ¨re version de WordPress, la %2$s." +||||||| .r11156 +#: wp-admin/options-discussion.php:149 wp-admin/options-discussion.php:150 +msgid "Comment Moderation" +msgstr "ModÃ©ration de commentaires" +======= #: wp-admin/includes/class-wp-upgrader.php:697 #: wp-admin/includes/class-wp-upgrader.php:1134 msgid "Install package not available." msgstr "L’archive d’installation n’est pas disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3160 +msgid "This means your site may be offline or broken. Don't panic; this can be fixed." +msgstr "Cela signifie que votre site est peut-Ãªtre hors ligne ou cassÃ©. Ne paniquez pas, cela peut Ãªtre rÃ©parÃ©." +||||||| .r11156 +#: wp-admin/options-discussion.php:151 +msgid "Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)" +msgstr "Garder un commentaire dans la file d’attente s’il contient plus de %s lien(s) (une des caractÃ©ristiques typiques d’un commentaire indÃ©sirable (spam) est son nombre important de liens)" +======= #: wp-admin/includes/class-wp-upgrader.php:688 msgid "Plugins updated successfully." msgstr "Les extensions ont bien Ã©tÃ© mises Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3162 +msgid "Please check out your site now. It's possible that everything is working. If it says you need to update, you should do so:" +msgstr "Veuillez vÃ©rifier votre site immÃ©diatelement. Il se peut que tout fonctionne. S'il affiche que vous devez faire une mise Ã jour, vous devriez suivre son conseil :" +||||||| .r11156 +#: wp-admin/options-discussion.php:153 +msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. One word or IP per line. It will match inside words, so “press” will match “WordPress”." +msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, son nom, son adresse web, son adresse de messagerie, ou son IP, celui-ci est retenu dans la file de modÃ©ration. Un seul mot ou une seule IP par ligne. Cette fonction reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +======= #: wp-admin/includes/class-wp-upgrader.php:687 msgid "Plugin updated successfully." msgstr "L’extension a bien Ã©tÃ© mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3179 wp-admin/update-core.php:510 +msgid "Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers." +msgstr "Pour des questions de sÃ©curitÃ©, il est important de garder votre site Ã jour. Par ailleurs, cela rend le Web plus sÃ»r pour vous et vos lecteurs." +||||||| .r11156 +#: wp-admin/options-discussion.php:160 wp-admin/options-discussion.php:161 +msgid "Comment Blacklist" +msgstr "Liste noire pour les commentaires" +======= #: wp-admin/includes/class-wp-upgrader.php:686 msgid "Plugin update failed." msgstr "La mise Ã jour de l’extension a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3188 +msgid "You also have some plugins or themes with updates available. Update them now:" +msgstr "Certains de vos thÃ¨mes et extensions ont Ã©galement des mises Ã jour disponibles. Veuillez les mettre Ã jour dÃ¨s maintenant :" +||||||| .r11156 +#: wp-admin/options-discussion.php:162 +msgid "When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so “press” will match “WordPress”." +msgstr "Lorsqu’un commentaire contient l’un de ces mots dans son contenu, nom, adresse web, adresse de messagerie, ou IP, le marquer comme indÃ©sirable. Un seul mot ou IP par ligne. Il reconnaÃ®t l’intÃ©rieur des mots, donc « press » suffira pour reconnaÃ®tre « WordPress »." +======= #: wp-admin/includes/class-wp-upgrader.php:685 msgid "Could not remove the old plugin." msgstr "Impossible de supprimer l’ancienne extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3192 +msgid "The WordPress Team" +msgstr "L'Ã©quipe WordPress" +||||||| .r11156 +#: wp-admin/options-discussion.php:171 +msgid "Avatars" +msgstr "Avatars" +======= #: wp-admin/includes/class-wp-upgrader.php:684 msgid "Removing the old version of the plugin…" msgstr "Retrait de l’ancienne version de l’extension…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3197 +msgid "We have some data that describes the error your site encountered." +msgstr "Nous avons quelques donnÃ©es qui dÃ©crivent l'erreur que votre site a rencontrÃ©." +||||||| .r11156 +#: wp-admin/options-discussion.php:179 wp-admin/options-discussion.php:180 +msgid "Avatar Display" +msgstr "Affichage des avatars" +======= #: wp-admin/includes/class-wp-upgrader.php:683 #: wp-admin/includes/class-wp-upgrader.php:1121 #: wp-admin/includes/class-wp-upgrader.php:1707 #: wp-admin/includes/class-wp-upgrader.php:1939 msgid "Unpacking the update…" msgstr "DÃ©compression de la mise Ã jour…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3198 +msgid "Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:" +msgstr "Votre hÃ©bergeur, les volontaires du forum d'entraide ou un ami dÃ©veloppeur devraient pouvoir vous aider Ã comprendre cette information pour vous aider :" +||||||| .r11156 +#: wp-admin/options-discussion.php:183 +msgid "Show Avatars" +msgstr "Afficher les avatars" +======= #: wp-admin/includes/class-wp-upgrader.php:682 #: wp-admin/includes/class-wp-upgrader.php:1120 #: wp-admin/includes/class-wp-upgrader.php:1938 msgid "Downloading update from %s…" msgstr "TÃ©lÃ©chargement de la mise Ã jour depuis %s…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3211 +msgid "Error code: %s" +msgstr "Code d'erreur : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:188 wp-admin/options-discussion.php:189 +msgid "Maximum Rating" +msgstr "Classement maximal" +======= #: wp-admin/includes/class-wp-upgrader.php:681 #: wp-admin/includes/class-wp-upgrader.php:1119 #: wp-admin/includes/class-wp-upgrader.php:1705 #: wp-admin/includes/class-wp-upgrader.php:1937 msgid "Update package not available." msgstr "Pas d’archive de mise Ã jour disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Site name, 2: WordPress version number. +#: wp-admin/includes/class-wp-upgrader.php:3101 +msgid "[%1$s] WordPress %2$s is available. Please update!" +msgstr "[%1$s] WordPress %2$s est disponible. Veuillez faire une mise Ã jour !" +||||||| .r11156 +#: wp-admin/options-discussion.php:194 +msgid "G — Suitable for all audiences" +msgstr "G — Visibles par tous" +======= #: wp-admin/includes/class-wp-upgrader.php:680 msgid "The plugin is at the latest version." msgstr "Vous avez la derniÃ¨re version de cette extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3128 +msgid "For more on version %s, see the About WordPress screen:" +msgstr "Pour en savoir plus sur la version %s, lisez l'Ã©cran Ã Propos de WordPress : " +||||||| .r11156 +#: wp-admin/options-discussion.php:196 +msgid "PG — Possibly offensive, usually for audiences 13 and above" +msgstr "PG — Possiblement offensants, rÃ©servÃ©s normalement aux personnes de 13 ans et plus" +======= #: wp-admin/includes/class-wp-upgrader.php:137 #: wp-admin/includes/update-core.php:983 msgid "Disabling Maintenance mode…" msgstr "DÃ©sactivation du mode maintenance…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3132 +msgid "WordPress %s is also now available." +msgstr "WordPress %s est disponible." +||||||| .r11156 +#: wp-admin/options-discussion.php:198 +msgid "R — Intended for adult audiences above 17" +msgstr "R — RÃ©servÃ©s aux personnes de plus de 17 ans" +======= #: wp-admin/includes/class-wp-upgrader.php:136 #: wp-admin/includes/update-core.php:900 msgid "Enabling Maintenance mode…" msgstr "Activation du mode maintenance…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3173 +msgid "If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help." +msgstr "Si vous rencontrez des problÃ¨mes ou avez besoin d'assistance, les volontaires du forum d'entraide de WordPress-fr.net devraient pouvoir vous aider." +||||||| .r11156 +#: wp-admin/options-discussion.php:200 +msgid "X — Even more mature than above" +msgstr "X — RÃ©servÃ©s aux adultes" +======= #: wp-admin/includes/class-wp-upgrader.php:134 msgid "The package could not be installed." msgstr "L’archive n’a pas pu Ãªtre installÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3196 +msgid "Your site was running version %s." +msgstr "Votre site utilise la version %s." +||||||| .r11156 +#: wp-admin/options-discussion.php:211 wp-admin/options-discussion.php:212 +msgid "Default Avatar" +msgstr "Avatar par dÃ©faut" +======= #: wp-admin/includes/class-wp-upgrader.php:133 wp-admin/includes/file.php:644 #: wp-admin/includes/file.php:748 wp-admin/includes/file.php:799 #: wp-admin/includes/update-core.php:1131 msgid "Could not create directory." msgstr "Impossible de crÃ©er le dossier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3286 +msgid "The following plugins were successfully updated:" +msgstr "Les extensions suivantes ont bien Ã©tÃ© mises Ã jour :" +||||||| .r11156 +#: wp-admin/options-discussion.php:214 +msgid "For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address." +msgstr "Les utilisateurs n’ayant pas d’avatar peuvent se voir attribuer un logo gÃ©nÃ©rique, ou un avatar gÃ©nÃ©rÃ© Ã partir de leur adresse de messagerie." +======= #: wp-admin/includes/class-wp-upgrader.php:132 msgid "Destination folder already exists." msgstr "Le dossier de destination existe dÃ©jÃ ." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3287 +msgid "The following themes were successfully updated:" +msgstr "Les thÃ¨mes suivants ont bien Ã©tÃ© mis Ã jour :" +||||||| .r11156 +#: wp-admin/options-discussion.php:218 +msgid "Mystery Man" +msgstr "Homme mystÃ¨re" +======= #: wp-admin/includes/class-wp-upgrader.php:131 msgid "The package contains no files." msgstr "Ce paquet ne contient aucun fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3288 +msgid "The following translations were successfully updated:" +msgstr "Les traductions suivantes ont bien Ã©tÃ© mises Ã jour :" +||||||| .r11156 +#: wp-admin/options-discussion.php:219 +msgid "Blank" +msgstr "Vide" +======= #: wp-admin/includes/class-wp-upgrader.php:130 msgid "Installing the latest version…" msgstr "Installation de la derniÃ¨re version…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:804 +#: wp-admin/includes/class-wp-upgrader.php:2783 +msgid "Updating translations for %1$s (%2$s)…" +msgstr "Mise Ã jour de la traduction de %1$s (%2$s)…" +||||||| .r11156 +#: wp-admin/options-discussion.php:220 +msgid "Gravatar Logo" +msgstr "Logo Gravatar" +======= #: wp-admin/includes/class-wp-upgrader.php:129 msgid "Download failed." msgstr "Le tÃ©lÃ©chargement a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3265 +msgid "WordPress site: %s" +msgstr "Site WordPress : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:221 +msgid "Identicon (Generated)" +msgstr "Identicon (gÃ©nÃ©rÃ©)" +======= #. translators: %s: directory name #: wp-admin/includes/class-wp-upgrader.php:127 msgid "Unable to locate needed folder (%s)." msgstr "Impossible de localiser le dossier nÃ©cessaire (%s)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3293 +msgid "SUCCESS: %s" +msgstr "SUCCÃS : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:222 +msgid "Wavatar (Generated)" +msgstr "Wavatar (gÃ©nÃ©rÃ©)" +======= #: wp-admin/includes/class-wp-upgrader.php:125 msgid "Unable to locate WordPress Theme directory." msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3307 +msgid "FAILED: %s" +msgstr "ÃCHEC : %s" +||||||| .r11156 +#: wp-admin/options-discussion.php:223 +msgid "MonsterID (Generated)" +msgstr "MonsterID (gÃ©nÃ©rÃ©)" +======= #: wp-admin/includes/class-wp-upgrader.php:124 wp-admin/includes/plugin.php:803 msgid "Unable to locate WordPress Plugin directory." msgstr "Impossible de localiser le dossier d’extension de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:135 +#: wp-admin/includes/class-wp-upgrader.php:2157 +#: wp-admin/includes/update-core.php:840 wp-admin/includes/update-core.php:915 +#: wp-admin/includes/update-core.php:938 +msgid "The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions." +msgstr "La mise Ã jour ne peut pas Ãªtre installÃ©e parce que nous n’allons pas pouvoir copier certains fichiers. Ce problÃ¨me est gÃ©nÃ©ralement dÃ» Ã des incohÃ©rences dans les permissions de fichiers." +||||||| .r11156 +#: wp-admin/options-general.php:15 +msgid "General Settings" +msgstr "RÃ©glages gÃ©nÃ©raux" +======= #: wp-admin/includes/class-wp-upgrader.php:123 msgid "Unable to locate WordPress Content directory (wp-content)." msgstr "Impossible de localiser le dossier de contenu de WordPress (wp-content)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3121 +msgid "Howdy! Your site at %1$s has been updated automatically to WordPress %2$s." +msgstr "Salutations ! Votre site Ã l'adresse %1$s a Ã©tÃ© automatiquement mis Ã jour vers WordPress %2$s." +||||||| .r11156 +#: wp-admin/options-general.php:18 +msgctxt "timezone date format" +msgid "Y-m-d G:i:s" +msgstr "Y-m-d G:i:s" +======= #: wp-admin/includes/class-wp-upgrader.php:122 msgid "Unable to locate WordPress Root directory." msgstr "Impossible de localiser le dossier racine de WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3156 +msgid "Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s." +msgstr "Votre site Ã l'adresse %1$s a fait face Ã un Ã©chec critique en essayant de faire une mise Ã jour de WordPress vers la version %2$s." +||||||| .r11156 +#: wp-admin/options-general.php:115 +msgid "This address is used for admin purposes, like new user notification." +msgstr "Cette adresse n’est utilisÃ©e que pour l’administration du site : par exemple, la notification de l’inscription d’un nouvel utilisateur." +======= #: wp-admin/includes/class-wp-upgrader.php:121 wp-admin/includes/plugin.php:798 #: wp-admin/includes/theme.php:56 msgid "Filesystem error." msgstr "Erreur du systÃ¨me de fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3141 +msgid "Please update your site at %1$s to WordPress %2$s." +msgstr "Veuillez mettre Ã jour votre site Ã l'adresse %1$s pour le passer Ã WordPress %2$s." +||||||| .r11156 +#: wp-admin/options-general.php:118 wp-admin/options-general.php:119 +msgid "Membership" +msgstr "Inscription" +======= #: wp-admin/includes/class-wp-upgrader.php:120 #: wp-admin/includes/class-wp-upgrader.php:2667 wp-admin/includes/file.php:527 #: wp-admin/includes/plugin.php:795 wp-admin/includes/theme.php:53 msgid "Could not access filesystem." msgstr "Impossible d’accÃ©der au systÃ¨me de fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3183 +msgid "If you reach out to us, we'll also ensure you'll never have this problem again." +msgstr "Si vous nous contactez, nous ferons Ã©galement en sorte que vous ne rencontriez plus jamais ce problÃ¨me." +||||||| .r11156 +#: wp-admin/options-general.php:121 +msgid "Anyone can register" +msgstr "Tout le monde peut s’enregistrer" +======= #: wp-admin/includes/class-wp-upgrader.php:119 msgid "Invalid Data provided." msgstr "Les donnÃ©es fournies ne sont pas valides." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:412 +#: wp-admin/includes/class-wp-themes-list-table.php:227 +#: wp-admin/includes/plugin-install.php:466 +msgid "Version:" +msgstr "Version : " +||||||| .r11156 +#: wp-admin/options-general.php:125 +msgid "New User Default Role" +msgstr "RÃ´le par dÃ©faut de tout nouvel utilisateur" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:668 #: wp-admin/includes/class-wp-upgrader.php:2645 msgid "Updating translations for %1$s (%2$s)…" msgstr "Mise Ã jour de la traduction de %1$s (%2$s)…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3271 +msgid "SUCCESS: WordPress was successfully updated to %s" +msgstr "SUCCÃS : WordPress a bien Ã©tÃ© mis Ã jour vers %s" +||||||| .r11156 +#: wp-admin/options-general.php:167 +msgid "Timezone" +msgstr "Fuseau horaire" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:653 #: wp-admin/update-core.php:357 wp-admin/update-core.php:642 msgid "Update Translations" msgstr "Mise Ã jour des traductions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3299 +msgid "The following plugins failed to update:" +msgstr "Les extensions suivantes n’ont pas pu Ãªtre mises Ã jour :" +||||||| .r11156 +#: wp-admin/options-general.php:174 +msgid "UTC time is %s" +msgstr " L’heure UTC actuelle est %s" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:608 msgid "Customize “%s”" msgstr "Personnaliser « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3300 +msgid "The following themes failed to update:" +msgstr "Les thÃ¨mes suivants n’ont pas pu Ãªtre mis Ã jour :" +||||||| .r11156 +#: wp-admin/options-general.php:176 +msgid "Local time is %1$s" +msgstr "L’heure locale actuelle est %1$s" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:576 wp-admin/update.php:162 msgid "Update Theme" msgstr "Mettre Ã jour le thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3301 +msgid "The following translations failed to update:" +msgstr "Les traductions suivantes n’ont pas pu Ãªtre mises Ã jour :" +||||||| .r11156 +#: wp-admin/options-general.php:178 +msgid "Choose a city in the same timezone as you." +msgstr "Choisissez une ville dans le mÃªme fuseau horaire que le vÃ´tre." +======= #: wp-admin/includes/class-wp-upgrader-skins.php:544 msgid "Themes page" msgstr "Page des thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3330 +msgid "[%s] There were failures during background updates" +msgstr "[%s] Il y a eu des problÃ¨mes lors des mises Ã jour en arriÃ¨re-plan" +||||||| .r11156 +#: wp-admin/options-general.php:189 +msgid "This timezone is currently in standard time." +msgstr "Ce fuseau horaire est actuellement Ã l’heure d’hiver." +======= #: wp-admin/includes/class-wp-upgrader-skins.php:542 msgid "Return to Theme Installer" msgstr "Retourner Ã l’installeur de thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3332 +msgid "[%s] Background updates have finished" +msgstr "[%s] Les mises Ã jour en arriÃ¨re-plan sont terminÃ©es" +||||||| .r11156 +#: wp-admin/options-general.php:254 wp-admin/options-general.php:286 +msgid "Custom:" +msgstr "PersonnalisÃ© :" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:539 msgid "Enable this theme for all sites in this network" msgstr "Activer ce thÃ¨me sur tous les sites de ce rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3317 +msgid "" +"BETA TESTING?\n" +"=============\n" +"\n" +"This debugging email is sent when you are using a development version of WordPress.\n" +"\n" +"If you think these failures might be due to a bug in WordPress, could you report it?\n" +" * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta\n" +" * Or, if you're comfortable writing a bug report: https://core.trac.wordpress.org/\n" +"\n" +"Thanks! -- The WordPress Team" +msgstr "" +"BETA TESTEUR ?\n" +"==============\n" +"\n" +"Ce message de dÃ©bogage est envoyÃ© lorsque vous utilisez une version de dÃ©veloppement de WordPress.\n" +"\n" +"Si vous pensez que ces erreurs puissent Ãªtre dues Ã un problÃ¨me du cÃ´tÃ© de WordPress, pourriez-vous nous les signaler ?\n" +"* Ouvrez une discussion sur le forum de support en anglais : https://wordpress.org/support/forum/alphabeta\n" +"* Ou, si rÃ©diger un rapport de bogue ne vous fait pas peur : http://core.trac.wordpress.org/\n" +"\n" +"Merci ! -- L'Ã©quipe WordPress" +||||||| .r11156 +#: wp-admin/options-general.php:294 +msgid "Week Starts On" +msgstr "La semaine dÃ©bute le" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:451 msgid "Return to Plugin Installer" msgstr "Retourner Ã l’installeur d’extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-themes-list-table.php:231 +#: wp-admin/theme-editor.php:33 wp-admin/update-core.php:326 +msgid "https://codex.wordpress.org/Child_Themes" +msgstr "https://codex.wordpress.org/fr:ThÃ¨mes_Enfant" +||||||| .r11156 +#: wp-admin/options-media.php:15 +msgid "Media Settings" +msgstr "RÃ©glages des mÃ©dias" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:449 msgid "Return to Importers" msgstr "Retour aux importateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:772 +msgid "Plugins updated successfully." +msgstr "Les extensions ont bien Ã©tÃ© mises Ã jour." +||||||| .r11156 +#: wp-admin/options-media.php:48 +msgid "Image sizes" +msgstr "Tailles des images" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:439 msgid "Activate Plugin & Run Importer" msgstr "Activer l’extension & lancer l’importateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3170 +msgid "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." +msgstr "L’Ã©quipe de WordPress est prÃªte Ã vous aider. TransfÃ©rez ce message Ã %s et l’Ã©quipe vous aidera Ã faire en sorte que vous site fonctionne." +||||||| .r11156 +#: wp-admin/options-media.php:53 +msgid "Thumbnail size" +msgstr "Taille des miniatures" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:427 msgid "Successfully installed the plugin %s %s." msgstr "L’extension %s %s a bien Ã©tÃ© installÃ©e." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader-skins.php:663 +#: wp-admin/includes/class-wp-upgrader-skins.php:742 +msgid "Live Preview “%s”" +msgstr "PrÃ©visualisation de « %s »" +||||||| .r11156 +#: wp-admin/options-media.php:60 +msgid "Crop thumbnail to exact dimensions (normally thumbnails are proportional)" +msgstr "Recadrer les images pour parvenir aux dimensions exactes (normalement, les miniatures sont au format carrÃ©)" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:383 #: wp-admin/includes/class-wp-upgrader-skins.php:544 #: wp-admin/includes/class-wp-upgrader-skins.php:622 msgid "Return to Themes page" msgstr "Retourner sur la page des thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:2811 wp-admin/update-core.php:453 +msgid "Installation Failed" +msgstr "Ãchec de l’installation" +||||||| .r11156 +#: wp-admin/options-media.php:65 wp-admin/options-media.php:66 +msgid "Medium size" +msgstr "Taille moyenne" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:383 msgid "Go to themes page" msgstr "Aller Ã la page des thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Site name. +#: wp-admin/includes/class-wp-upgrader.php:3106 +msgid "[%1$s] URGENT: Your site may be down due to a failed update" +msgstr "[%1$s] URGENT : suite Ã une mise Ã jour Ã©chouÃ©e, votre site est peut-Ãªtre inaccessible." +||||||| .r11156 +#: wp-admin/options-media.php:67 wp-admin/options-media.php:77 +msgid "Max Width" +msgstr "Largeur maximale" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:368 msgid "Updating Theme %1$s (%2$d/%3$d)" msgstr "Mise Ã jour du thÃ¨me %1$s (%2$d/%3$d)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3133 +#: wp-admin/includes/class-wp-upgrader.php:3150 +msgid "Updating is easy and only takes a few moments:" +msgstr "La mise Ã jour est facile et ne requiert que quelques secondes :" +||||||| .r11156 +#: wp-admin/options-media.php:69 wp-admin/options-media.php:79 +msgid "Max Height" +msgstr "Hauteur maximale" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:343 #: wp-admin/includes/class-wp-upgrader-skins.php:384 #: wp-admin/includes/class-wp-upgrader-skins.php:684 msgid "Return to WordPress Updates" msgstr "Retourner aux mises Ã jour de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-upgrader.php:3273 +msgid "FAILED: WordPress failed to update to %s" +msgstr "ÃCHEC : WordPress n’a pas pu Ãªtre mis Ã jour vers %s" +||||||| .r11156 +#: wp-admin/options-media.php:75 wp-admin/options-media.php:76 +msgid "Large size" +msgstr "Grande taille" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:343 #: wp-admin/includes/class-wp-upgrader-skins.php:384 #: wp-admin/includes/class-wp-upgrader-skins.php:684 msgid "Go to WordPress Updates page" msgstr "Aller Ã la page des mises Ã jour de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:236 +msgctxt "posts" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +||||||| .r11156 +#: wp-admin/options-media.php:88 +msgid "Embeds" +msgstr "Affichages distants" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:328 msgid "Updating Plugin %1$s (%2$d/%3$d)" msgstr "Mise Ã jour de l’extension %1$s (%2$d/%3$d)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1497 +#: wp-admin/includes/meta-boxes.php:262 wp-admin/includes/meta-boxes.php:263 +msgid "Submit for Review" +msgstr "Soumettre Ã relecture" +||||||| .r11156 +#: wp-admin/options-media.php:95 +msgid "Uploading Files" +msgstr "Envoi de fichiers" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:225 msgid "All updates have been completed." msgstr "Toutes les mises Ã jour sont terminÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:81 +#: wp-admin/includes/class-wp-theme-install-list-table.php:54 +#: wp-admin/includes/file.php:28 +msgid "Search Results" +msgstr "RÃ©sultats de recherche" +||||||| .r11156 +#: wp-admin/options-media.php:102 +msgid "Store uploads in this folder" +msgstr "Stocker les fichiers envoyÃ©s dans ce dossier" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:224 msgid "Hide Details" msgstr "Cacher les dÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1330 +#: wp-admin/includes/media.php:1207 wp-admin/includes/media.php:2209 +#: wp-admin/includes/meta-boxes.php:773 wp-admin/includes/meta-boxes.php:774 +msgid "Order" +msgstr "Ordre" +||||||| .r11156 +#: wp-admin/options-media.php:104 +msgid "Default is wp-content/uploads" +msgstr "Par dÃ©faut, wp-content/uploads" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:224 msgid "Show Details" msgstr "Afficher les dÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1295 +#: wp-admin/includes/meta-boxes.php:745 wp-admin/includes/meta-boxes.php:746 +msgid "Parent" +msgstr "Parent" +||||||| .r11156 +#: wp-admin/options-media.php:109 +msgid "Full URL path to files" +msgstr "Adresse web complÃ¨te pour les fichiers" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:224 msgid "%1$s updated successfully." msgstr "%1$s a bien Ã©tÃ© mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1347 +#: wp-admin/includes/meta-boxes.php:766 +msgid "Default Template" +msgstr "ModÃ¨le par dÃ©faut" +||||||| .r11156 +#: wp-admin/options-media.php:111 +msgid "Configuring this is optional. By default, it should be blank." +msgstr "Ce rÃ©glage est facultatif. Par dÃ©faut, ce champ devrait Ãªtre vide." +======= #: wp-admin/includes/class-wp-upgrader-skins.php:223 msgid "The update of %1$s failed." msgstr "La mise Ã jour de %1$s a Ã©chouÃ©." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:445 +#: wp-admin/includes/class-wp-theme-install-list-table.php:278 +#: wp-admin/includes/plugin-install.php:216 +#: wp-admin/includes/plugin-install.php:570 +#: wp-admin/includes/theme-install.php:147 +msgid "Install Now" +msgstr "Installer maintenant" +||||||| .r11156 +#: wp-admin/options-media.php:119 +msgid "Organize my uploads into month- and year-based folders" +msgstr "Organiser mes fichiers envoyÃ©s dans des dossiers mensuels et annuels" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:222 msgid "An error occurred while updating %1$s: %2$s" msgstr "Une erreur est survenue pendant la mise Ã jour de %1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:224 +msgid "No plugins match your request." +msgstr "Aucune extension ne correspond Ã votre requÃªte." +||||||| .r11156 +#: wp-admin/options-permalink.php:15 +msgid "Permalink Settings" +msgstr "Options des permaliens" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:221 msgid "The update process is starting. This process may take a while on some hosts, so please be patient." msgstr "Le processus de mise Ã jour se lance. Il peut prendre un certain temps chez certains hÃ©bergeurs, merci pour votre patience." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:278 +msgid "Install %s" +msgstr "Installer %s" +||||||| .r11156 +#: wp-admin/options-permalink.php:159 +msgid "Permalink structure updated. Remove write access on web.config file now!" +msgstr "La structure des permaliens a Ã©tÃ© mise Ã jour. Pensez Ã retirer les droits d’accÃ¨s au fichier web.config dÃ¨s maintenant !" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:179 #: wp-admin/includes/class-wp-upgrader-skins.php:342 #: wp-admin/includes/class-wp-upgrader-skins.php:453 msgid "Return to Plugins page" msgstr "Retourner sur la page des extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:516 +#: wp-admin/includes/plugin-install.php:470 +msgid "Last Updated:" +msgstr "DerniÃ¨re mise Ã jour :" +||||||| .r11156 +#: wp-admin/options-permalink.php:166 +msgid "You should update your .htaccess now." +msgstr "Vous devriez mettre Ã jour votre fichier .htaccess maintenant." +======= #: wp-admin/includes/class-wp-upgrader-skins.php:179 #: wp-admin/includes/class-wp-upgrader-skins.php:342 msgid "Go to plugins page" msgstr "Aller sur la page des extensions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1182 +#: wp-admin/includes/class-wp-terms-list-table.php:540 +msgid "Quick Edit" +msgstr "Modification rapide" +||||||| .r11156 +#: wp-admin/options-permalink.php:161 wp-admin/options-permalink.php:163 +#: wp-admin/options-permalink.php:168 wp-admin/options-permalink.php:172 +msgid "Permalink structure updated." +msgstr "Structure des permaliens enregistrÃ©e." +======= #: wp-admin/includes/class-wp-upgrader-skins.php:178 #: wp-admin/includes/class-wp-upgrader-skins.php:441 msgid "Activate Plugin" msgstr "Activer l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: manage posts column name +#: wp-admin/includes/class-wp-posts-list-table.php:394 +msgctxt "column name" +msgid "Title" +msgstr "Titre" +||||||| .r11156 +#: wp-admin/options-permalink.php:208 +msgid "Day and name" +msgstr "Date et titre" +======= #: wp-admin/includes/class-wp-upgrader-skins.php:158 wp-admin/update.php:54 msgid "Update Plugin" msgstr "Mettre Ã jour l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1227 +#: wp-admin/includes/class-wp-posts-list-table.php:1307 +#: wp-admin/includes/class-wp-posts-list-table.php:1343 +#: wp-admin/includes/class-wp-posts-list-table.php:1381 +#: wp-admin/includes/class-wp-posts-list-table.php:1390 +#: wp-admin/includes/class-wp-posts-list-table.php:1422 +#: wp-admin/includes/class-wp-posts-list-table.php:1443 +#: wp-admin/includes/class-wp-posts-list-table.php:1471 +msgid "— No Change —" +msgstr "— Aucun changement —" +||||||| .r11156 +#: wp-admin/options-permalink.php:212 +msgid "Month and name" +msgstr "Mois et titre" +======= #: wp-admin/includes/class-wp-themes-list-table.php:216 #: wp-admin/theme-editor.php:33 wp-admin/update-core.php:305 msgid "https://codex.wordpress.org/Child_Themes" msgstr "https://codex.wordpress.org/fr:ThÃ¨mes_Enfant" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Between password field and private checkbox on post quick edit +#. interface +#: wp-admin/includes/class-wp-posts-list-table.php:1253 +msgid "–OR–" +msgstr "— OU —" +||||||| .r11156 +#: wp-admin/options-permalink.php:216 +msgid "Numeric" +msgstr "NumÃ©rique" +======= #: wp-admin/includes/class-wp-themes-list-table.php:215 msgid "This child theme requires its parent theme, %2$s." msgstr "Ce thÃ¨me enfant nÃ©cessite son thÃ¨me parent, %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1382 +#: wp-admin/includes/class-wp-posts-list-table.php:1391 +msgid "Allow" +msgstr "Autoriser" +||||||| .r11156 +#: wp-admin/options-permalink.php:226 +msgid "Custom Structure" +msgstr "Structure personnalisÃ©e" +======= #: wp-admin/includes/class-wp-themes-list-table.php:173 msgid "" "You are about to delete this theme '%s'\n" @@ -7257,263 +24922,876 @@ msgid "" msgstr "" "Vous Ãªtes sur le point de supprimer le thÃ¨me Â« %s Â».\n" " Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1383 +#: wp-admin/includes/class-wp-posts-list-table.php:1392 +msgid "Do not allow" +msgstr "Refuser" +||||||| .r11156 +#: wp-admin/options-permalink.php:236 +msgid "Optional" +msgstr "Facultatif" +======= #: wp-admin/includes/class-wp-themes-list-table.php:161 #: wp-admin/includes/class-wp-upgrader-skins.php:536 #: wp-admin/includes/class-wp-upgrader-skins.php:615 msgid "Activate “%s”" msgstr "Activer « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1404 +msgid "Allow Comments" +msgstr "Autoriser les commentaires" +||||||| .r11156 +#: wp-admin/options-permalink.php:248 +msgid "Category base" +msgstr "PrÃ©fixe des catÃ©gories" +======= #: wp-admin/includes/class-wp-themes-list-table.php:95 msgid "Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes." msgstr "Vous n’avez accÃ¨s qu’au thÃ¨me dÃ©jÃ en place. Contactez l’administrateur de %s pour obtenir des informations sur l’accÃ¨s Ã d’autres thÃ¨mes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1409 +msgid "Allow Pings" +msgstr "Autoriser les notifications par ping" +||||||| .r11156 +#: wp-admin/options-permalink.php:252 +msgid "Tag base" +msgstr "Base des mots-clÃ©s" +======= #: wp-admin/includes/class-wp-themes-list-table.php:89 msgid "You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the Install Themes tab above." msgstr "Vous n’avez qu’un seul thÃ¨me d’installÃ© pour le moment. Faites vivre votre site ! Vous pouvez quand vous le voulez choisir parmi plus de 1 000 thÃ¨mes sur le dÃ©pÃ´t de thÃ¨mes de WordPress.org : cliquez simplement sur l’onglet « Installer des thÃ¨mes » ci-dessus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:855 +msgid "Missed schedule" +msgstr "Planification manquÃ©e" +||||||| .r11156 +#: wp-admin/options-permalink.php:266 +msgid "If your web.config file were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Click in the field and press CTRL + a to select all. Then insert this rule inside of the /<configuration>/<system.webServer>/<rewrite>/<rules> element in web.config file." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite cette rÃ¨gle dans l’Ã©lÃ©ment /<configuration>/<system.webServer>/<rewrite>/<rules> du fichier web.config." +======= #: wp-admin/includes/class-wp-themes-list-table.php:82 msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable more themes." msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer plus de thÃ¨mes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:860 +msgid "Last Modified" +msgstr "DerniÃ¨re modification" +||||||| .r11156 +#: wp-admin/options-permalink.php:271 +msgid "If you temporarily make your web.config file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved." +msgstr "Si vous rendez le fichier web.config accessible en Ã©criture afin de gÃ©nÃ©rer automatiquement les rÃ¨gles de rÃ©Ã©criture, n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +======= #: wp-admin/includes/class-wp-themes-list-table.php:78 msgid "You only have one theme enabled for this site right now. Visit the Network Admin to enable or install more themes." msgstr "Vous n’avez qu’un thÃ¨me activÃ© sur ce site actuellement. Veuillez vous rendre sur la page d’administration du rÃ©seau pour activer ou installer plus de thÃ¨mes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:308 +#: wp-admin/includes/class-wp-themes-list-table.php:219 +msgid "Details" +msgstr "DÃ©tails" +||||||| .r11156 +#: wp-admin/options-permalink.php:273 +msgid "If the root directory of your site were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Create a new file, called web.config in the root directory of your site. Click in the field and press CTRL + a to select all. Then insert this code into the web.config file." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier web.config, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier web.config. CrÃ©ez un nouveau fichier texte, nommÃ© web.config, dans le dossier racine de votre site. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner. InsÃ©rez ensuite le contenu dans le fichier web.config." +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:381 #: wp-admin/includes/class-wp-themes-list-table.php:212 #: wp-admin/includes/plugin-install.php:455 msgid "Version:" msgstr "Version : " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:204 +msgid "Last Updated" +msgstr "DerniÃ¨re mise Ã jour" +||||||| .r11156 +#: wp-admin/options-permalink.php:278 +msgid "If you temporarily make your site’s root directory writable for us to generate the web.config file automatically, do not forget to revert the permissions after the file has been created." +msgstr "Si vous rendez temporairement le dossier racine accessible en Ã©criture afin que nous y gÃ©nÃ©rions directement le fichier web.config,n’oubliez surtout pas de remettre les droits originaux en place une fois que les rÃ¨gles ont Ã©tÃ© enregistrÃ©es." +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:370 #: wp-admin/includes/dashboard.php:1110 wp-admin/theme-install.php:210 #: wp-admin/theme-install.php:228 msgid "Install" msgstr "Installer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:484 +msgid "Unarchive" +msgstr "DÃ©sarchiver" +||||||| .r11156 +#: wp-admin/options-permalink.php:283 +msgid "If your .htaccess file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your .htaccess file. Click in the field and press CTRL + a to select all." +msgstr "Si vous aviez les droits en Ã©criture sur le fichier .htaccess, nous pourrions faire cela automatiquement. Ce n’est pas le cas, donc voici les rÃ¨gles de rÃ©Ã©criture que vous devrez mettre dans votre fichier .htaccess. Cliquez sur le champ et appuyez sur Ctrl-a pour tout sÃ©lectionner." +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:279 #: wp-admin/includes/class-wp-themes-list-table.php:204 msgid "Details" msgstr "DÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:316 +msgid "Never" +msgstr "Jamais" +||||||| .r11156 +#: wp-admin/options-reading.php:15 +msgid "Reading Settings" +msgstr "Options de lecture" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:253 msgid "Preview %s" msgstr "AperÃ§u de %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:103 +#: wp-admin/includes/class-wp-users-list-table.php:128 +#: wp-admin/includes/deprecated.php:565 +msgid "No users found." +msgstr "Aucun utilisateur trouvÃ©." +||||||| .r11156 +#: wp-admin/options-reading.php:112 +msgid "A static page (select below)" +msgstr "Une page statique (choisir ci-dessous)" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:249 msgid "Install %s" msgstr "Installer %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:82 +msgctxt "Plugin Installer" +msgid "Featured" +msgstr "Mises en avant" +||||||| .r11156 +#: wp-admin/options-reading.php:116 +msgid "Front page: %s" +msgstr "Page d’accueil : %s" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:245 #: wp-admin/includes/class-wp-theme-install-list-table.php:366 #: wp-admin/theme-install.php:226 msgctxt "theme" msgid "Installed" msgstr "InstallÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:83 +msgctxt "Plugin Installer" +msgid "Popular" +msgstr "Populaires" +||||||| .r11156 +#: wp-admin/options-reading.php:117 +msgid "Posts page: %s" +msgstr "Page des articles : %s" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:245 #: wp-admin/includes/class-wp-theme-install-list-table.php:366 msgid "This theme is already installed and is up to date" msgstr "Ce thÃ¨me est dÃ©jÃ installÃ© et Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:476 +msgid "Inactive:" +msgstr "Inactif :" +||||||| .r11156 +#: wp-admin/options-reading.php:120 +msgid "Warning: these pages should not be the same!" +msgstr "Attention : ces pages ne devraient pas Ãªtre les mÃªmes !" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:241 #: wp-admin/includes/class-wp-theme-install-list-table.php:362 msgid "Update to version %s" msgstr "Mettre Ã jour vers la version %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:644 +msgid "Visit plugin site" +msgstr "Aller sur le site de l’extension" +||||||| .r11156 +#: wp-admin/options-reading.php:126 +msgid "Blog pages show at most" +msgstr "Les pages du site doivent afficher au plus" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:137 msgid "No themes match your request." msgstr "Aucun thÃ¨me ne correspond Ã votre requÃªte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:404 +msgid "Clear List" +msgstr "Vider la liste" +||||||| .r11156 +#: wp-admin/options-reading.php:128 +msgid "posts" +msgstr "articles" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:47 msgctxt "themes" msgid "Recently Updated" msgstr "Mis Ã jour rÃ©cemment" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:321 +msgid "Active (%s)" +msgid_plural "Active (%s)" +msgstr[0] "ActivÃ©e (%s)" +msgstr[1] "ActivÃ©es (%s)" +||||||| .r11156 +#: wp-admin/options-reading.php:132 +msgid "Syndication feeds show the most recent" +msgstr "Les flux de syndication affichent les derniers" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:46 #: wp-admin/theme-install.php:137 msgctxt "themes" msgid "Latest" msgstr "Derniers en date" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:324 +msgid "Recently Active (%s)" +msgid_plural "Recently Active (%s)" +msgstr[0] "RÃ©cemment dÃ©sactivÃ©e (%s)" +msgstr[1] "RÃ©cemment dÃ©sactivÃ©es (%s)" +||||||| .r11156 +#: wp-admin/options-reading.php:136 wp-admin/options-reading.php:137 +msgid "For each article in a feed, show" +msgstr "Pour chaque article d’un flux, fournir" +======= #: wp-admin/includes/class-wp-theme-install-list-table.php:44 #: wp-admin/theme-install.php:135 msgctxt "themes" msgid "Featured" msgstr "Mis en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:327 +msgid "Inactive (%s)" +msgid_plural "Inactive (%s)" +msgstr[0] "DÃ©sactivÃ©e (%s)" +msgstr[1] "DÃ©sactivÃ©es (%s)" +||||||| .r11156 +#: wp-admin/options-reading.php:138 +msgid "Full text" +msgstr "Le texte complet" +======= #: wp-admin/includes/class-wp-terms-list-table.php:146 msgctxt "Number/count of items" msgid "Count" msgstr "Compte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:333 +msgid "Drop-ins (%s)" +msgid_plural "Drop-ins (%s)" +msgstr[0] "Drop-ins (%s)" +msgstr[1] "Drop-ins (%s)" +||||||| .r11156 +#: wp-admin/options-reading.php:139 +msgid "Summary" +msgstr "L’extrait" +======= #: wp-admin/includes/class-wp-press-this.php:1444 #: wp-admin/includes/meta-boxes.php:257 wp-admin/includes/meta-boxes.php:258 msgid "Submit for Review" msgstr "Soumettre Ã relecture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:275 +msgid "No plugins found." +msgstr "Aucune extension trouvÃ©e." +||||||| .r11156 +#: wp-admin/options-reading.php:86 +msgid "Encoding for pages and feeds" +msgstr "Encodage pour les pages et les flux RSS" +======= #: wp-admin/includes/class-wp-press-this.php:1442 msgid "Standard Editor" msgstr "Ãditeur standard" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:277 +#: wp-admin/plugin-editor.php:32 +msgid "You do not appear to have any plugins available at this time." +msgstr "Vous ne semblez pas avoir d’extension disponible en ce moment." +||||||| .r11156 +#: wp-admin/options-writing.php:15 +msgid "Writing Settings" +msgstr "Options d’Ã©criture" +======= #: wp-admin/includes/class-wp-press-this.php:1403 #: wp-admin/includes/class-wp-press-this.php:1413 #: wp-admin/includes/class-wp-press-this.php:1422 msgid "Back to post options" msgstr "Retour aux options de lâarticle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:220 +msgctxt "posts" +msgid "Mine (%s)" +msgid_plural "Mine (%s)" +msgstr[0] "Le mien (%s)" +msgstr[1] "Les miens (%s)" +||||||| .r11156 +#: wp-admin/options-writing.php:66 wp-admin/options-writing.php:67 +msgid "Formatting" +msgstr "Mise en forme" +======= #: wp-admin/includes/class-wp-press-this.php:1342 msgid "Suggested media" msgstr "Fichier mÃ©dia suggÃ©rÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1080 +#: wp-admin/includes/class-wp-theme-install-list-table.php:248 +msgid "Preview “%s”" +msgstr "PrÃ©visualiser « %s »" +||||||| .r11156 +#: wp-admin/options-writing.php:70 +msgid "Convert emoticons like :-) and :-P to graphics on display" +msgstr "Convertir les Ã©moticÃ´nes, comme :-) et :-P, en images lors de l’affichage" +======= #: wp-admin/includes/class-wp-press-this.php:1337 #: wp-admin/includes/class-wp-press-this.php:1338 msgid "Post title" msgstr "Titre de lâarticle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:222 +#: wp-admin/includes/class-wp-theme-install-list-table.php:137 +#: wp-admin/setup-config.php:216 +msgid "Try again" +msgstr "Recommencer" +||||||| .r11156 +#: wp-admin/options-writing.php:71 +msgid "WordPress should correct invalidly nested XHTML automatically" +msgstr "WordPress doit automatiquement corriger les balises XHTML non valides" +======= #: wp-admin/includes/class-wp-press-this.php:1328 msgid "You should upgrade your bookmarklet to the latest version!" msgstr "Vous devriez passer votre bookmarklet Ã la derniÃ¨re version !" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Plugin name and version. +#: wp-admin/includes/class-wp-plugin-install-list-table.php:467 +#: wp-admin/includes/class-wp-plugins-list-table.php:637 +msgid "More information about %s" +msgstr "Plus d’informations Ã propos de %s" +||||||| .r11156 +#: wp-admin/options-writing.php:75 +msgid "Default Post Category" +msgstr "CatÃ©gorie par dÃ©faut des articles" +======= #: wp-admin/includes/class-wp-press-this.php:1303 msgid "Scan" msgstr "Parcourir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:270 +#: wp-admin/includes/class-wp-theme-install-list-table.php:393 +msgid "Update to version %s" +msgstr "Mettre Ã jour vers la version %s" +||||||| .r11156 +#: wp-admin/options-writing.php:101 +msgid "Default Link Category" +msgstr "CatÃ©gorie par dÃ©faut des liens" +======= #: wp-admin/includes/class-wp-press-this.php:1302 msgid "Enter a URL to scan" msgstr "Saisissez une adresse web Ã parcourir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:452 +#: wp-admin/update-core.php:50 +msgid "Update Now" +msgstr "Mettre Ã jour" +||||||| .r11156 +#: wp-admin/credits.php:189 +msgid "XML-RPC" +msgstr "XML-RPC" +======= #: wp-admin/includes/class-wp-press-this.php:1301 msgid "Scan site for content" msgstr "Parcourir un site en quÃªte de contenu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:458 +msgid "This plugin is already installed and is up to date" +msgstr "Cette extension est dÃ©jÃ installÃ©e et Ã jour" +||||||| .r11156 +#: wp-admin/options-writing.php:130 +msgid "Post via e-mail" +msgstr "Envoi d’article par e-mail" +======= #: wp-admin/includes/class-wp-press-this.php:1295 msgid "Hide post options" msgstr "Masquer les options de lâarticle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:476 +msgid "Requires %s in wp-config.php." +msgstr "NÃ©cessite %s dans le fichier wp-config.php." +||||||| .r11156 +#: wp-admin/options-writing.php:131 +msgid "To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: %s, %s, %s." +msgstr "Pour publier dans WordPress par e-mail, vous devez dÃ©finir un compte e-mail secret avec une adresse POP3. Tout e-mail reÃ§u Ã cette adresse sera publiÃ©. Il vaut donc mieux garder cette adresse Ã l’abri des regards. Voici trois chaÃ®nes alÃ©atoires que vous pourriez utiliser : %s, %s, %s." +======= #: wp-admin/includes/class-wp-press-this.php:1293 msgid "Show post options" msgstr "Afficher les options de lâarticle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:330 +msgid "Must-Use (%s)" +msgid_plural "Must-Use (%s)" +msgstr[0] "Automatique (Must-Use) (%s)" +msgstr[1] "Automatiques (Must-Use) (%s)" +||||||| .r11156 +#: wp-admin/options-writing.php:135 +msgid "Mail Server" +msgstr "Serveur de messagerie" +======= #: wp-admin/includes/class-wp-press-this.php:1206 msgid "Press This!" msgstr "Press This!" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:486 +msgctxt "verb; site" +msgid "Archive" +msgstr "Archiver" +||||||| .r11156 +#: wp-admin/options-writing.php:137 +msgid "Port" +msgstr "Port" +======= #: wp-admin/includes/class-wp-press-this.php:1106 msgctxt "Used in Press This to indicate where the content comes from." msgid "Source:" msgstr "Source :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:318 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:392 +msgid "Enable" +msgstr "Activer" +||||||| .r11156 +#: wp-admin/options-writing.php:142 +msgid "Login Name" +msgstr "Identifiant" +======= #: wp-admin/includes/class-wp-press-this.php:856 msgid "Search categories" msgstr "Chercher dans les catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:267 +msgctxt "posts" +msgid "Sticky (%s)" +msgid_plural "Sticky (%s)" +msgstr[0] "Mis en avant (%s)" +msgstr[1] "Mis en avant (%s)" +||||||| .r11156 +#: wp-admin/options-writing.php:152 +msgid "Default Mail Category" +msgstr "CatÃ©gorie par dÃ©faut des articles envoyÃ©s par e-mail" +======= #: wp-admin/includes/class-wp-press-this.php:854 msgid "Search categories by name" msgstr "Chercher dans les catÃ©gories par nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1301 +msgid "Main Page (no parent)" +msgstr "Page principale (pas de page parente)" +||||||| .r11156 +#: wp-admin/options-writing.php:44 wp-admin/options-writing.php:173 +msgid "Update Services" +msgstr "Services de mise Ã jour" +======= #: wp-admin/includes/class-wp-press-this.php:847 #: wp-admin/includes/class-wp-press-this.php:896 #: wp-admin/includes/meta-boxes.php:422 wp-admin/includes/meta-boxes.php:879 msgid "Add" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1453 +msgid "Make this post sticky" +msgstr "Mettre ce contenu en avant" +||||||| .r11156 +#: wp-admin/options-writing.php:177 +msgid "When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see Update Services on the Codex. Separate multiple service URLs with line breaks." +msgstr "Quand vous publiez un nouvel article, WordPress peut notifier un service de mise Ã jour. Une explication se trouve sur la page Update Services du Codex anglophone. SÃ©parez les adresses web par des retours Ã la ligne." +======= #: wp-admin/includes/class-wp-press-this.php:829 msgid "Toggle add category" msgstr "Ajouter ou non la catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:152 +msgid "No themes match your request." +msgstr "Aucun thÃ¨me ne correspond Ã votre requÃªte." +||||||| .r11156 +#: wp-admin/options.php:212 +msgid "All Settings" +msgstr "Toutes les options" +======= #: wp-admin/includes/class-wp-press-this.php:793 msgid "Post formats" msgstr "Formats dâarticle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:275 +msgctxt "themes" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +||||||| .r11156 +#: wp-admin/plugin-editor.php:20 +msgid "Edit Plugins" +msgstr "Modifier les extensions" +======= #: wp-admin/includes/class-wp-press-this.php:285 msgid "Could not save or locate the temporary download file for the source URL." msgstr "Impossible dâenregistrer ou de localiser le fichier temporaire de tÃ©lÃ©chargement depuis lâadresse web source." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:205 +msgctxt "site" +msgid "Registered" +msgstr "Inscription" +||||||| .r11156 +#: wp-admin/plugin-editor.php:115 +msgid "No such file exists! Double check the name and try again." +msgstr "Ce fichier n’existe pas ! Veuillez vÃ©rifier son nom et rÃ©essayer." +======= #: wp-admin/includes/class-wp-press-this.php:283 msgid "Could not download the source URL (native error: %s)." msgstr "Impossible de tÃ©lÃ©charger depuis lâadresse web source (erreur native : %s)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:480 +#: wp-admin/includes/class-wp-plugins-list-table.php:366 +#: wp-admin/includes/class-wp-plugins-list-table.php:505 +msgid "Deactivate" +msgstr "DÃ©sactiver" +||||||| .r11156 +#: wp-admin/plugin-editor.php:122 +msgid "Files of this type are not editable." +msgstr "Les fichiers de ce type ne sont pas Ã©ditables." +======= #: wp-admin/includes/class-wp-press-this.php:283 #: wp-admin/includes/class-wp-press-this.php:285 msgid "Error: %s" msgstr "Erreur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:500 +#: wp-admin/my-sites.php:110 +msgid "Visit" +msgstr "Visiter" +||||||| .r11156 +#: wp-admin/plugin-editor.php:167 wp-admin/theme-editor.php:125 +msgid "File edited successfully." +msgstr "Le fichier a bien Ã©tÃ© modifiÃ©." +======= #: wp-admin/includes/class-wp-press-this.php:226 msgid "Error while adding the category. Please try again later." msgstr "Erreur lors de lâajout de la catÃ©gorie. Veuillez rÃ©essayer plus tard." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:220 +msgid "No themes found." +msgstr "Aucun thÃ¨me trouvÃ©." +||||||| .r11156 +#: wp-admin/plugin-editor.php:169 +msgid "This plugin has been deactivated because your changes resulted in a fatal error." +msgstr "Cette extension a Ã©tÃ© dÃ©sactivÃ©e, car vos modifications ont abouti Ã une erreur fatale" +======= #: wp-admin/includes/class-wp-press-this.php:219 msgid "This category cannot be added. Please change the name and try again." msgstr "Cette catÃ©gorie ne peut pas Ãªtre ajoutÃ©e. Veuillez changer son nom et rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:222 +msgid "You do not appear to have any themes available at this time." +msgstr "Vous ne semblez pas avoir de thÃ¨me disponible en ce moment." +||||||| .r11156 +#: wp-admin/plugin-editor.php:184 +msgid "Editing %s (active)" +msgstr "Modification de %s (activÃ©)" +======= #: wp-admin/includes/class-wp-press-this.php:112 msgid "Invalid post." msgstr "Post non valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:232 +msgid "Theme" +msgstr "ThÃ¨me" +||||||| .r11156 +#: wp-admin/plugin-editor.php:186 +msgid "Browsing %s (active)" +msgstr "Contenu de %s (activÃ©)" +======= #: wp-admin/includes/class-wp-press-this.php:106 msgid "Missing post ID." msgstr "ID de lâarticle manquant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:278 +msgid "Enabled (%s)" +msgid_plural "Enabled (%s)" +msgstr[0] "ActivÃ© (%s)" +msgstr[1] "ActivÃ©s (%s)" +||||||| .r11156 +#: wp-admin/plugin-editor.php:189 +msgid "Editing %s (inactive)" +msgstr "Modification de %s (dÃ©sactivÃ©)" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1319 msgid "Make this post sticky" msgstr "Mettre ce contenu en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:281 +msgid "Disabled (%s)" +msgid_plural "Disabled (%s)" +msgstr[0] "DÃ©sactivÃ© (%s)" +msgstr[1] "DÃ©sactivÃ©s (%s)" +||||||| .r11156 +#: wp-admin/plugin-editor.php:191 +msgid "Browsing %s (inactive)" +msgstr "Contenu de %s (dÃ©sactivÃ©e)" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1311 msgid "Not Sticky" msgstr "Pas mis en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:284 +#: wp-admin/includes/class-wp-plugins-list-table.php:336 +msgid "Update Available (%s)" +msgid_plural "Update Available (%s)" +msgstr[0] "PrÃªte Ã mettre Ã jour (%s)" +msgstr[1] "PrÃªtes Ã mettre Ã jour (%s)" +||||||| .r11156 +#: wp-admin/plugin-editor.php:197 +msgid "Select plugin to edit:" +msgstr "SÃ©lectionnez l’extension Ã modifier :" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1307 #: wp-admin/includes/class-wp-posts-list-table.php:1310 #: wp-admin/includes/template.php:1695 msgid "Sticky" msgstr "Mis en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:287 +msgid "Broken (%s)" +msgid_plural "Broken (%s)" +msgstr[0] "CassÃ© (%s)" +msgstr[1] "CassÃ© (%s)" +||||||| .r11156 +#: wp-admin/plugin-editor.php:219 +msgid "Plugin Files" +msgstr "Fichiers de l’extension" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1275 msgid "Allow Pings" msgstr "Autoriser les notifications par ping" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:320 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:395 +msgid "Disable" +msgstr "DÃ©sactiver" +||||||| .r11156 +#: wp-admin/plugin-editor.php:248 wp-admin/theme-editor.php:207 +msgid "Documentation:" +msgstr "Documentation :" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1270 msgid "Allow Comments" msgstr "Autoriser les commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:392 +msgid "Enable this theme" +msgstr "Activer ce thÃ¨me" +||||||| .r11156 +#: wp-admin/plugin-editor.php:258 +msgid "Update File and Attempt to Reactivate" +msgstr "Mettre Ã jour le fichier et tenter de rÃ©activer l’extension" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1249 #: wp-admin/includes/class-wp-posts-list-table.php:1258 msgid "Do not allow" msgstr "Refuser" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:395 +msgid "Disable this theme" +msgstr "DÃ©sactiver ce thÃ¨me" +||||||| .r11156 +#: wp-admin/plugin-editor.php:260 wp-admin/theme-editor.php:220 +msgid "Update File" +msgstr "Mettre Ã jour le fichier" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1248 #: wp-admin/includes/class-wp-posts-list-table.php:1257 msgid "Allow" msgstr "Autoriser" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:399 +msgid "Open this theme in the Theme Editor" +msgstr "Ouvrir ce thÃ¨me dans l’Ã©diteur de thÃ¨me" +||||||| .r11156 +#: wp-admin/plugin-editor.php:265 wp-admin/theme-editor.php:222 +msgid "You need to make this file writable before you can save your changes. See the Codex for more information." +msgstr "Vous devez rendre ce fichier accessible en Ã©criture avant de pouvoir enregistrer vos modifications. Lire la documentation CHMOD pour plus d’informations." +======= #: wp-admin/includes/class-wp-posts-list-table.php:1213 #: wp-admin/includes/meta-boxes.php:756 msgid "Default Template" msgstr "ModÃ¨le par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:403 +msgid "Delete this theme" +msgstr "Supprimer ce thÃ¨me" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:65 +msgctxt "Plugin Installer" +msgid "Featured" +msgstr "Mises en avant" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1196 #: wp-admin/includes/media.php:1197 wp-admin/includes/media.php:2174 #: wp-admin/includes/meta-boxes.php:763 wp-admin/includes/meta-boxes.php:764 msgid "Order" msgstr "Ordre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:488 +msgid "Visit theme homepage" +msgstr "Aller sur la page du thÃ¨me" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:66 +msgctxt "Plugin Installer" +msgid "Popular" +msgstr "Populaires" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1167 msgid "Main Page (no parent)" msgstr "Page principale (pas de page parente)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:488 +msgid "Visit Theme Site" +msgstr "Aller sur le site du thÃ¨me" +||||||| .r11156 +#: wp-admin/plugins.php:292 +msgid "Are you sure you wish to delete these files?" +msgstr "Voulez-vous vraiment supprimer ces fichiers ?" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1161 #: wp-admin/includes/meta-boxes.php:735 wp-admin/includes/meta-boxes.php:736 msgid "Parent" msgstr "Parent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:93 +msgctxt "user" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +||||||| .r11156 +#: wp-admin/plugins.php:302 +msgid "Yes, Delete these files" +msgstr "Oui, supprimer ces fichiers" +======= #. translators: Between password field and private checkbox on post quick edit #. interface #: wp-admin/includes/class-wp-posts-list-table.php:1119 msgid "–OR–" msgstr "— OU —" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:94 +msgctxt "user" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +||||||| .r11156 +#: wp-admin/plugins.php:305 +msgid "No, Return me to the plugin list" +msgstr "Non, retourner Ã la liste des extensions" +======= #: wp-admin/includes/class-wp-posts-list-table.php:1093 #: wp-admin/includes/class-wp-posts-list-table.php:1173 #: wp-admin/includes/class-wp-posts-list-table.php:1209 @@ -7524,24 +25802,77 @@ msgstr "— OU —" #: wp-admin/includes/class-wp-posts-list-table.php:1337 msgid "— No Change —" msgstr "— Aucun changement —" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:150 +msgctxt "user" +msgid "Registered" +msgstr "Inscription" +||||||| .r11156 +#: wp-admin/plugins.php:346 +msgid "Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here." +msgstr "Les extensions Ã©tendent les fonctionnalitÃ©s de WordPress. Une fois une extension installÃ©e, vous pouvez l’activer ou la dÃ©sactiver ici." +======= #: wp-admin/includes/class-wp-posts-list-table.php:1048 #: wp-admin/includes/class-wp-terms-list-table.php:470 msgid "Quick Edit" msgstr "Modification rapide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:363 +#: wp-admin/includes/class-wp-plugins-list-table.php:495 +#: wp-admin/includes/class-wp-upgrader-skins.php:569 +msgid "Network Activate" +msgstr "Activer sur le rÃ©seau" +||||||| .r11156 +#: wp-admin/plugins.php:354 +msgid "If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated." +msgstr "Si une extension ne fonctionne pas correctement et que vous ne pouvez plus utiliser WordPress, supprimez ou renommez son fichier dans le rÃ©pertoire %s et elle sera automatiquement dÃ©sactivÃ©e." +======= #: wp-admin/includes/class-wp-posts-list-table.php:1048 msgid "Bulk Edit" msgstr "Modifications groupÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:406 +msgid "Files in the %s directory are executed automatically." +msgstr "Les fichiers contenus dans le dossier %s sont exÃ©cutÃ©s automatiquement." +||||||| .r11156 +#: wp-admin/plugins.php:371 +msgid "The plugin %s has been deactivated due to an error: %s" +msgstr "L’extension %s a Ã©tÃ© dÃ©sactivÃ©e suite Ã l’erreur : %s" +======= #: wp-admin/includes/class-wp-posts-list-table.php:869 msgid "Last Modified" msgstr "DerniÃ¨re modification" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:408 +msgid "Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present." +msgstr "Les « drop-ins » sont des extensions avancÃ©es contenues dans le dossier %s ; elles permettent le remplacement de certaines fonctionnalitÃ©s de WordPress." +||||||| .r11156 +#: wp-admin/plugins.php:381 +msgid "Plugin could not be activated because it triggered a fatal error." +msgstr "L’extension n’a pu Ãªtre activÃ©e, car elle a dÃ©clenchÃ© une erreur fatale." +======= #: wp-admin/includes/class-wp-posts-list-table.php:865 msgid "Missed schedule" msgstr "Planification manquÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1182 +msgid "Bulk Edit" +msgstr "Modifications groupÃ©es" +||||||| .r11156 +#: wp-admin/plugins.php:397 +msgid "Plugin could not be deleted due to an error: %s" +msgstr "L’extension n’a pu Ãªtre supprimÃ©e suite Ã une erreur fatale : %s" +======= #: wp-admin/includes/class-wp-posts-list-table.php:775 #: wp-admin/includes/class-wp-theme-install-list-table.php:219 #: wp-admin/includes/class-wp-themes-list-table.php:164 @@ -7551,15 +25882,71 @@ msgstr "Planification manquÃ©e" #: wp-admin/includes/class-wp-upgrader-skins.php:613 msgid "Preview “%s”" msgstr "PrÃ©visualiser « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:844 +#: wp-admin/includes/meta-boxes.php:377 wp-admin/includes/theme.php:241 +msgid "Post Formats" +msgstr "Format d’article" +||||||| .r11156 +#: wp-admin/plugins.php:399 +msgid "The selected plugins have been deleted." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© supprimÃ©es." +======= #: wp-admin/includes/class-wp-posts-list-table.php:767 msgid "Delete this item permanently" msgstr "Supprimer cet Ã©lÃ©ment dÃ©finitivement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:318 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:392 +#: wp-admin/includes/class-wp-upgrader-skins.php:668 +msgid "Network Enable" +msgstr "Activer sur le rÃ©seau" +||||||| .r11156 +#: wp-admin/plugins.php:402 +msgid "Plugin activated." +msgstr "Extension activÃ©e" +======= #: wp-admin/includes/class-wp-posts-list-table.php:765 msgid "Move this item to the Trash" msgstr "DÃ©placer cet Ã©lÃ©ment dans la Corbeille" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:366 +#: wp-admin/includes/class-wp-plugins-list-table.php:490 +msgid "Network Deactivate" +msgstr "DÃ©sactiver du rÃ©seau" +||||||| .r11156 +#: wp-admin/plugins.php:404 +msgid "Selected plugins activated." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© activÃ©es." + +#: wp-admin/plugins.php:406 +msgid "Plugin deactivated." +msgstr "Extension dÃ©sactivÃ©e" + +#: wp-admin/plugins.php:408 +msgid "Selected plugins deactivated." +msgstr "Les extensions sÃ©lectionnÃ©es ont Ã©tÃ© dÃ©sactivÃ©es." + +#: wp-admin/plugins.php:410 +msgid "No out of date plugins were selected." +msgstr "Aucune extension pÃ©rimÃ©e n’a Ã©tÃ© sÃ©lectionnÃ©e." + +#: wp-admin/includes/class-wp-plugins-list-table.php:399 +#: wp-admin/includes/class-wp-plugins-list-table.php:408 +msgid "Deactivate this plugin" +msgstr "DÃ©sactiver cette extension" +#: wp-admin/includes/class-wp-plugins-list-table.php:299 +#: wp-admin/includes/class-wp-plugins-list-table.php:399 +msgid "Network Deactivate" +msgstr "DÃ©sactiver du rÃ©seau" +======= #: wp-admin/includes/class-wp-posts-list-table.php:763 msgid "Restore this item from the Trash" msgstr "RÃ©cupÃ©rer ce Ã©lÃ©ment depuis la Corbeille" @@ -7592,18 +25979,54 @@ msgid "All (%s)" msgid_plural "All (%s)" msgstr[0] "Tous (%s)" msgstr[1] "Tous (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:274 +#: wp-admin/includes/class-wp-theme-install-list-table.php:397 +#: wp-admin/theme-install.php:228 +msgctxt "theme" +msgid "Installed" +msgstr "InstallÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:402 +#: wp-admin/includes/class-wp-upgrader-skins.php:433 +msgid "Activate this plugin for all sites in this network" +msgstr "Activer cette extension sur tous les sites de ce rÃ©seau" +======= #: wp-admin/includes/class-wp-posts-list-table.php:184 msgctxt "posts" msgid "Mine (%s)" msgid_plural "Mine (%s)" msgstr[0] "Le mien (%s)" msgstr[1] "Les miens (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:282 +msgid "Preview %s" +msgstr "AperÃ§u de %s" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:296 +#: wp-admin/includes/class-wp-plugins-list-table.php:402 +#: wp-admin/includes/class-wp-upgrader-skins.php:433 +msgid "Network Activate" +msgstr "Activer sur le rÃ©seau" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:577 msgid "Visit plugin site" msgstr "Aller sur le site de l’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:462 +msgid "Broken Theme:" +msgstr "ThÃ¨me cassÃ© :" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:419 +msgid "Open this file in the Plugin Editor" +msgstr "Ouvrir ce fichier dans l’Ã©diteur d’extension" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:572 msgid "View details" msgstr "Afficher les dÃ©tails" @@ -7611,7 +26034,20 @@ msgstr "Afficher les dÃ©tails" #: wp-admin/includes/class-wp-plugins-list-table.php:457 msgid "Open this file in the Plugin Editor" msgstr "Ouvrir ce fichier dans l’Ã©diteur d’extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:122 +msgid "Super Admin (%s)" +msgid_plural "Super Admins (%s)" +msgstr[0] "Super-admin (%s)" +msgstr[1] "Super-admins (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:404 +#: wp-admin/includes/class-wp-plugins-list-table.php:413 +msgid "Delete this plugin" +msgstr "Supprimer cette extension" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:448 #: wp-admin/includes/class-wp-upgrader-skins.php:178 #: wp-admin/includes/class-wp-upgrader-skins.php:439 @@ -7623,12 +26059,34 @@ msgstr "Activer cette extension" #: wp-admin/includes/class-wp-plugins-list-table.php:451 msgid "Delete this plugin" msgstr "Supprimer cette extension" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:209 +#: wp-admin/user-edit.php:333 +msgid "Super Admin" +msgstr "Super-admin" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:534 +msgid "Visit plugin site" +msgstr "Aller sur le site de l’extension" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:440 #: wp-admin/includes/class-wp-upgrader-skins.php:444 msgid "Activate this plugin for all sites in this network" msgstr "Activer cette extension sur tous les sites de ce rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:85 +msgctxt "Plugin Installer" +msgid "Favorites" +msgstr "Favorites" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:329 +msgid "Clear List" +msgstr "Vider la liste" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:437 #: wp-admin/includes/class-wp-plugins-list-table.php:446 msgid "Deactivate this plugin" @@ -7653,24 +26111,79 @@ msgstr "Les fichiers contenus dans le dossier %s sont exÃ©cutÃ©s au #: wp-admin/includes/class-wp-plugins-list-table.php:360 msgid "Clear List" msgstr "Vider la liste" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:318 +msgctxt "plugins" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Toutes (%s)" +msgstr[1] "Toutes (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:256 +msgctxt "plugins" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Toutes (%s)" +msgstr[1] "Toutes (%s)" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:320 #: wp-admin/includes/class-wp-plugins-list-table.php:437 msgid "Network Deactivate" msgstr "DÃ©sactiver du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-themes-list-table.php:320 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:395 +msgid "Network Disable" +msgstr "DÃ©sactiver du rÃ©seau" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:259 +msgid "Active (%s)" +msgid_plural "Active (%s)" +msgstr[0] "ActivÃ©e (%s)" +msgstr[1] "ActivÃ©es (%s)" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:317 #: wp-admin/includes/class-wp-plugins-list-table.php:440 #: wp-admin/includes/class-wp-upgrader-skins.php:444 msgid "Network Activate" msgstr "Activer sur le rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:210 +#: wp-admin/includes/media.php:2210 wp-admin/users.php:54 +msgid "Actions" +msgstr "Actions" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:262 +msgid "Recently Active (%s)" +msgid_plural "Recently Active (%s)" +msgstr[0] "RÃ©cemment dÃ©sactivÃ©e (%s)" +msgstr[1] "RÃ©cemment dÃ©sactivÃ©es (%s)" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:292 msgid "Drop-ins (%s)" msgid_plural "Drop-ins (%s)" msgstr[0] "Drop-ins (%s)" msgstr[1] "Drop-ins (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:784 +#: wp-admin/includes/misc.php:710 +msgid "%s is currently editing" +msgstr "%s modifie actuellement ce contenu" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:265 +msgid "Inactive (%s)" +msgid_plural "Inactive (%s)" +msgstr[0] "DÃ©sactivÃ©e (%s)" +msgstr[1] "DÃ©sactivÃ©es (%s)" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:289 msgid "Must-Use (%s)" msgid_plural "Must-Use (%s)" @@ -7682,13 +26195,35 @@ msgid "Inactive (%s)" msgid_plural "Inactive (%s)" msgstr[0] "DÃ©sactivÃ©e (%s)" msgstr[1] "DÃ©sactivÃ©es (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:274 +#: wp-admin/includes/class-wp-theme-install-list-table.php:397 +msgid "This theme is already installed and is up to date" +msgstr "Ce thÃ¨me est dÃ©jÃ installÃ© et Ã jour" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:227 +msgid "No plugins found." +msgstr "Aucune extension trouvÃ©e." +======= #: wp-admin/includes/class-wp-plugins-list-table.php:283 msgid "Recently Active (%s)" msgid_plural "Recently Active (%s)" msgstr[0] "RÃ©cemment dÃ©sactivÃ©e (%s)" msgstr[1] "RÃ©cemment dÃ©sactivÃ©es (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1066 +msgid "Restore this item from the Trash" +msgstr "RÃ©cupÃ©rer ce Ã©lÃ©ment depuis la Corbeille" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:229 +#: wp-admin/plugin-editor.php:32 +msgid "You do not appear to have any plugins available at this time." +msgstr "Vous ne semblez pas avoir d’extension disponible en ce moment." +======= #: wp-admin/includes/class-wp-plugins-list-table.php:280 msgid "Active (%s)" msgid_plural "Active (%s)" @@ -7710,67 +26245,220 @@ msgstr "Extension" #: wp-admin/plugin-editor.php:32 msgid "You do not appear to have any plugins available at this time." msgstr "Vous ne semblez pas avoir d’extension disponible en ce moment." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:458 +msgctxt "plugin" +msgid "Installed" +msgstr "InstallÃ©e" +||||||| .r11156 +#: wp-admin/edit-tags.php:123 wp-admin/edit-tags.php:138 wp-admin/post.php:148 +msgid "You attempted to edit an item that doesn’t exist. Perhaps it was deleted?" +msgstr "Vous tentez de modifier un contenu qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +======= #: wp-admin/includes/class-wp-plugins-list-table.php:248 msgid "No plugins found." msgstr "Aucune extension trouvÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:898 +#: wp-admin/includes/class-wp-press-this.php:947 +#: wp-admin/includes/meta-boxes.php:430 wp-admin/includes/meta-boxes.php:889 +msgid "Add" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/async-upload.php:56 wp-admin/edit-tags.php:247 +#: wp-admin/includes/post.php:1645 wp-admin/post.php:154 +msgid "You are not allowed to edit this item." +msgstr "Vous n’avez pas l’autorisation de modifier ce contenu." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:501 msgid "Compatible with your version of WordPress" msgstr "Compatible avec votre version de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1060 +msgid "Edit this item" +msgstr "Modifier cet Ã©lÃ©ment" +||||||| .r11156 +#: wp-admin/post.php:157 +msgid "You can’t edit this item because it is in the Trash. Please restore it and try again." +msgstr "Vous ne pouvez pas modifier ce contenu, car il est dans la Corbeille. Sortez-l’en, puis rÃ©essayez." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:499 msgid "Incompatible with your version of WordPress" msgstr "Incompatible avec votre version de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1068 +msgid "Move this item to the Trash" +msgstr "DÃ©placer cet Ã©lÃ©ment dans la Corbeille" +||||||| .r11156 +#: wp-admin/async-upload.php:54 wp-admin/post.php:151 wp-admin/post.php:247 +#: wp-admin/post.php:270 wp-admin/post.php:288 +msgid "Unknown post type." +msgstr "Type de contenu inconnu." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:497 msgid "Untested with your version of WordPress" msgstr "Non-testÃ© avec votre version de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1070 +msgid "Delete this item permanently" +msgstr "Supprimer cet Ã©lÃ©ment dÃ©finitivement" +||||||| .r11156 +#: wp-admin/press-this.php:125 +msgid "Embed Code" +msgstr "Code d'intÃ©gration" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:491 msgid "%s Active Installs" msgstr "%s installations actives" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1441 +#: wp-admin/includes/class-wp-posts-list-table.php:1444 +#: wp-admin/includes/template.php:1725 +msgid "Sticky" +msgstr "Mis en avant" +||||||| .r11156 +#: wp-admin/press-this.php:128 +msgid "Insert Video" +msgstr "InsÃ©rer la vidÃ©o" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:487 #: wp-admin/includes/plugin-install.php:469 msgctxt "Active plugin installs" msgid "1+ Million" msgstr "Plus de 1 million" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-posts-list-table.php:1445 +msgid "Not Sticky" +msgstr "Pas mis en avant" +||||||| .r11156 +#: wp-admin/press-this.php:154 +msgid "Click to insert." +msgstr "Cliquez pour insÃ©rer." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:480 #: wp-admin/includes/plugin-install.php:459 msgid "Last Updated:" msgstr "DerniÃ¨re mise Ã jour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:56 +#: wp-admin/theme-install.php:137 +msgctxt "themes" +msgid "Featured" +msgstr "Mis en avant" +||||||| .r11156 +#: wp-admin/press-this.php:227 +msgid "Unable to retrieve images or no images on page." +msgstr "Impossible de rÃ©cupÃ©rer d’image ou il n’y a pas d’image dans cette page." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:431 msgid "More Details" msgstr "Plus de dÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:58 +#: wp-admin/theme-install.php:139 +msgctxt "themes" +msgid "Latest" +msgstr "Derniers en date" +||||||| .r11156 +#: wp-admin/press-this.php:288 +msgid "click images to select" +msgstr "cliquez sur les images pour les sÃ©lectionner" +======= #. translators: 1: Plugin name and version. #: wp-admin/includes/class-wp-plugin-install-list-table.php:431 #: wp-admin/includes/class-wp-plugins-list-table.php:570 msgid "More information about %s" msgstr "Plus d’informations Ã propos de %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:290 +msgid "Plugin" +msgstr "Extension" +||||||| .r11156 +#: wp-admin/press-this.php:288 +msgid "Add from URL" +msgstr "Ajouter depuis une adresse web" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:422 msgctxt "plugin" msgid "Installed" msgstr "InstallÃ©e" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:495 +msgid "Network Activate %s" +msgstr "Activer %s sur le rÃ©seau" +||||||| .r11156 +#: wp-admin/press-this.php:611 +msgid "Your post has been saved." +msgstr "Votre article a Ã©tÃ© enregistrÃ©." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:422 msgid "This plugin is already installed and is up to date" msgstr "Cette extension est dÃ©jÃ installÃ©e et Ã jour" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:490 +msgid "Network deactivate %s" +msgstr "DÃ©sactiver %s sur le rÃ©seau" +||||||| .r11156 +#: wp-admin/press-this.php:612 +msgid "View post" +msgstr "Afficher l’article" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:416 #: wp-admin/update-core.php:40 msgid "Update Now" msgstr "Mettre Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1501 +msgid "More actions" +msgstr "Plus d’actions" +||||||| .r11156 +#: wp-admin/press-this.php:614 +msgid "Close Window" +msgstr "Fermer la fenÃªtre" +======= #. translators: 1: Plugin name and version #: wp-admin/includes/class-wp-plugin-install-list-table.php:416 msgid "Update %s now" msgstr "Mettre Ã jour %s maintenant" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:212 +msgid "This category already exists." +msgstr "Cette catÃ©gorie existe dÃ©jÃ ." +||||||| .r11156 +#: wp-admin/press-this.php:656 wp-admin/press-this.php:657 +msgid "Insert an Image" +msgstr "InsÃ©rer une image" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:409 #: wp-admin/includes/class-wp-theme-install-list-table.php:249 #: wp-admin/includes/plugin-install.php:207 @@ -7778,89 +26466,271 @@ msgstr "Mettre Ã jour %s maintenant" #: wp-admin/includes/theme-install.php:143 msgid "Install Now" msgstr "Installer maintenant" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: site name, 2: site tagline. +#: wp-admin/includes/class-wp-ms-sites-list-table.php:294 +msgid "%1$s – %2$s" +msgstr "%1$s – %2$s" +||||||| .r11156 +#: wp-admin/press-this.php:661 +msgid "Embed a Video" +msgstr "Ajouter un vidÃ©o" +======= #. translators: 1: Plugin name and version. #: wp-admin/includes/class-wp-plugin-install-list-table.php:409 msgid "Install %s now" msgstr "Installer %s maintenant" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:520 +msgid "Edit %s" +msgstr "Modifier %s" +||||||| .r11156 +#: wp-admin/press-this.php:644 +msgid "via " +msgstr "via" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:355 msgctxt "Plugin installer group title" msgid "Tools" msgstr "Outils" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:499 +#: wp-admin/includes/class-wp-plugins-list-table.php:512 +msgid "Delete %s" +msgstr "Supprimer %s" +||||||| .r11156 +#: wp-admin/revision.php:77 +msgid "Compare Revisions of “%1$s”" +msgstr "Comparer les versions de « %1$s »" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:354 msgctxt "Plugin installer group title" msgid "Social" msgstr "Social" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:505 +msgid "Deactivate %s" +msgstr "DÃ©sactiver %s" +||||||| .r11156 +#: wp-admin/themes.php:349 +msgid "Tags:" +msgstr "Mots-clÃ©s :" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:353 msgctxt "Plugin installer group title" msgid "Performance" msgstr "Performance" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: plugin name +#: wp-admin/includes/class-wp-plugins-list-table.php:508 +msgid "Activate %s" +msgstr "Activer %s" +||||||| .r11156 +#: wp-admin/theme-editor.php:20 +msgid "Edit Themes" +msgstr "Modifier les thÃ¨mes" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:206 msgid "No plugins match your request." msgstr "Aucune extension ne correspond Ã votre requÃªte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1259 +msgid "Press This!" +msgstr "Press This!" +||||||| .r11156 +#: wp-admin/theme-editor.php:56 wp-admin/theme-editor.php:59 +msgid "The requested theme does not exist." +msgstr "Le thÃ¨me demandÃ© n’existe pas." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:204 #: wp-admin/includes/class-wp-theme-install-list-table.php:125 #: wp-admin/setup-config.php:212 msgid "Try again" msgstr "Recommencer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:905 +msgid "Search categories by name" +msgstr "Chercher dans les catÃ©gories par nom" +||||||| .r11156 +#: wp-admin/theme-editor.php:142 +msgid "Select theme to edit:" +msgstr "SÃ©lectionnez le thÃ¨me Ã modifier :" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:77 #: wp-admin/plugin-install.php:106 wp-admin/update.php:134 msgid "Upload Plugin" msgstr "Mettre une extension en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:907 +msgid "Search categories" +msgstr "Chercher dans les catÃ©gories" +||||||| .r11156 +#: wp-admin/theme-editor.php:168 +msgid "Templates" +msgstr "ModÃ¨les" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:72 msgctxt "Plugin Installer" msgid "Beta Testing" msgstr "Test de phase beta" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:106 +msgid "Missing post ID." +msgstr "ID de lâarticle manquant." +||||||| .r11156 +#: wp-admin/theme-editor.php:195 +msgid "Oops, no such file exists! Double check the name and try again, merci." +msgstr "Oops, ce fichier n’existe pas ! VÃ©rifiez son nom et rÃ©essayez, merci." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:70 msgctxt "Plugin Installer" msgid "Favorites" msgstr "Favorites" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1354 +msgid "Scan site for content" +msgstr "Parcourir un site en quÃªte de contenu" +||||||| .r11156 +#: wp-admin/themes.php:132 +msgid "New theme activated. Visit site" +msgstr "Nouveau thÃ¨me activÃ©. Voir le site" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:69 msgctxt "Plugin Installer" msgid "Recommended" msgstr "RecommandÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1356 +msgid "Scan" +msgstr "Parcourir" +||||||| .r11156 +#: wp-admin/themes.php:135 +msgid "Theme deleted." +msgstr "ThÃ¨me supprimÃ©." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:68 msgctxt "Plugin Installer" msgid "Popular" msgstr "Populaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1355 +msgid "Enter a URL to scan" +msgstr "Saisissez une adresse web Ã parcourir" +||||||| .r11156 +#: wp-admin/themes.php:331 +msgid "Current Theme" +msgstr "ThÃ¨me actuel" +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:67 msgctxt "Plugin Installer" msgid "Featured" msgstr "Mises en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1382 +msgid "You should upgrade your bookmarklet to the latest version!" +msgstr "Vous devriez passer votre bookmarklet Ã la derniÃ¨re version !" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:169 +msgid "" +"You are about to delete this theme '%s'\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer le thÃ¨me Â« %s Â».\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +======= #: wp-admin/includes/class-wp-plugin-install-list-table.php:66 #: wp-admin/includes/class-wp-theme-install-list-table.php:42 #: wp-admin/includes/file.php:28 msgid "Search Results" msgstr "RÃ©sultats de recherche" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1159 +msgctxt "Used in Press This to indicate where the content comes from." +msgid "Source:" +msgstr "Source :" +||||||| .r11156 +#: wp-admin/themes.php:246 +msgid "Broken Themes" +msgstr "ThÃ¨mes endommagÃ©s" +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:194 #: wp-admin/user-edit.php:333 msgid "Super Admin" msgstr "Super-admin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1391 +#: wp-admin/includes/class-wp-press-this.php:1392 +msgid "Post title" +msgstr "Titre de lâarticle" +||||||| .r11156 +#: wp-admin/options-writing.php:117 wp-admin/tools.php:41 +msgid "Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web." +msgstr "Ceci est un bookmarklet : une petite application qui se lance dans votre navigateur, et vous permet de rÃ©cupÃ©rer des portions du Web pour les bloguer." +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:124 msgctxt "user" msgid "Registered" msgstr "Inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1346 +msgid "Show post options" +msgstr "Afficher les options de lâarticle" +||||||| .r11156 +#: wp-admin/options-writing.php:119 wp-admin/tools.php:44 +msgid "Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut." +msgstr "Glissez le lien suivant dans votre barre de favoris, ou faites un clic-droit et ajoutez-le Ã vos favoris pour obtenir un raccourci de publication." +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:100 msgid "Super Admin (%s)" msgid_plural "Super Admins (%s)" msgstr[0] "Super-admin (%s)" msgstr[1] "Super-admins (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1396 +msgid "Suggested media" +msgstr "Fichier mÃ©dia suggÃ©rÃ©" +||||||| .r11156 +#: wp-admin/update-core.php:47 +msgid "Download nightly build" +msgstr "TÃ©lÃ©charger la derniÃ¨re version de dÃ©veloppement" +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:98 #: wp-admin/includes/class-wp-users-list-table.php:156 msgctxt "users" @@ -7868,242 +26738,810 @@ msgid "All (%s)" msgid_plural "All (%s)" msgstr[0] "Tous (%s)" msgstr[1] "Tous (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1459 +#: wp-admin/includes/class-wp-press-this.php:1469 +#: wp-admin/includes/class-wp-press-this.php:1478 +msgid "Back to post options" +msgstr "Retour aux options de lâarticle" +||||||| .r11156 +#: wp-admin/update-core.php:71 +msgid "Download %s" +msgstr "TÃ©lÃ©charger la version %s" +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:86 #: wp-admin/includes/class-wp-users-list-table.php:123 #: wp-admin/includes/deprecated.php:551 msgid "No users found." msgstr "Aucun utilisateur trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:313 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:333 +#: wp-admin/includes/class-wp-ms-users-list-table.php:254 +#: wp-admin/includes/class-wp-posts-list-table.php:816 +msgid "Y/m/d g:i:s a" +msgstr "d/m/Y G \\h i \\m\\i\\n s \\s" +||||||| .r11156 +#: wp-admin/update-core.php:93 +msgid "Hide this update" +msgstr "Masquer cette mise Ã jour" +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:80 msgctxt "user" msgid "Not Spam" msgstr "N’est pas un indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:237 +msgid "Error while adding the category. Please try again later." +msgstr "Erreur lors de lâajout de la catÃ©gorie. Veuillez rÃ©essayer plus tard." +||||||| .r11156 +#: wp-admin/update-core.php:95 +msgid "Bring back this update" +msgstr "RÃ©afficher cette mise Ã jour" +======= #: wp-admin/includes/class-wp-ms-users-list-table.php:79 msgctxt "user" msgid "Mark as Spam" msgstr "Marquer comme indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:230 +msgid "This category cannot be added. Please change the name and try again." +msgstr "Cette catÃ©gorie ne peut pas Ãªtre ajoutÃ©e. Veuillez changer son nom et rÃ©essayer." +||||||| .r11156 +#: wp-admin/update-core.php:98 +msgid "This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation." +msgstr "Cette version localisÃ©e contient Ã la fois la traduction et divers correctifs liÃ©s Ã la localisation. Si vous souhaitez conserver votre traduction actuelle, vous pouvez ne pas utiliser cette version." +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:411 msgid "Visit Theme Site" msgstr "Aller sur le site du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:880 +msgid "Toggle add category" +msgstr "Ajouter ou non la catÃ©gorie" +||||||| .r11156 +#: wp-admin/update-core.php:111 wp-admin/update-core.php:123 +msgid "Show hidden updates" +msgstr "Afficher les mises Ã jour cachÃ©es" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:411 msgid "Visit theme homepage" msgstr "Aller sur la page du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1348 +msgid "Hide post options" +msgstr "Masquer les options de lâarticle" +||||||| .r11156 +#: wp-admin/update-core.php:112 +msgid "Hide hidden updates" +msgstr "Masquer les mises Ã jour cachÃ©es" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:397 msgid "Broken Theme:" msgstr "ThÃ¨me cassÃ© :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-press-this.php:1506 +msgid "Standard Editor" +msgstr "Ãditeur standard" +||||||| .r11156 +#: wp-admin/update-core.php:246 +msgid "Compatibility with WordPress %1$s: 100%% (according to its author)" +msgstr "CompatibilitÃ© avec WordPress %1$s : 100%% (selon l’auteur)" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:325 msgid "Delete this theme" msgstr "Supprimer ce thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:523 +#: wp-admin/includes/plugin-install.php:480 +msgctxt "Active plugin installs" +msgid "1+ Million" +msgstr "Plus de 1 million" +||||||| .r11156 +#: wp-admin/update-core.php:249 wp-admin/update-core.php:257 +msgid "Compatibility with WordPress %1$s: %2$d%% (%3$d \"works\" votes out of %4$d total)" +msgstr "CompatibilitÃ© avec WordPress %1$s : %2$d%% (%3$d votes « Ã§a marche » sur un total de %4$d)" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:322 msgid "Open this theme in the Theme Editor" msgstr "Ouvrir ce thÃ¨me dans l’Ã©diteur de thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:527 +msgid "%s Active Installs" +msgstr "%s installations actives" +||||||| .r11156 +#: wp-admin/update-core.php:251 wp-admin/update-core.php:259 +msgid "Compatibility with WordPress %1$s: Unknown" +msgstr "CompatibilitÃ© avec WordPress %1$s : inconnue" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:318 msgid "Disable this theme" msgstr "DÃ©sactiver ce thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:87 +msgctxt "Plugin Installer" +msgid "Beta Testing" +msgstr "Test de phase beta" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:2090 wp-admin/update-core.php:415 +msgid "Installation Failed" +msgstr "Ãchec de l'installation" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:316 msgid "Enable this theme" msgstr "Activer ce thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:389 +msgctxt "Plugin installer group title" +msgid "Performance" +msgstr "Performance" +||||||| .r11156 +#: wp-admin/update.php:80 +msgid "Plugin Reactivation" +msgstr "RÃ©activation d’extension" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:268 #: wp-admin/includes/class-wp-ms-themes-list-table.php:318 msgid "Network Disable" msgstr "DÃ©sactiver du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:390 +msgctxt "Plugin installer group title" +msgid "Social" +msgstr "Social" +||||||| .r11156 +#: wp-admin/update.php:82 +msgid "Plugin reactivated successfully." +msgstr "L’extension a bien Ã©tÃ© rÃ©activÃ©e." +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:268 #: wp-admin/includes/class-wp-ms-themes-list-table.php:318 msgid "Disable" msgstr "DÃ©sactiver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:391 +msgctxt "Plugin installer group title" +msgid "Tools" +msgstr "Outils" +||||||| .r11156 +#: wp-admin/update.php:85 +msgid "Plugin failed to reactivate due to a fatal error." +msgstr "L’extension n’a pu Ãªtre rÃ©activÃ©e suite Ã une erreur fatale." +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:266 #: wp-admin/includes/class-wp-ms-themes-list-table.php:316 #: wp-admin/includes/class-wp-upgrader-skins.php:539 msgid "Network Enable" msgstr "Activer sur le rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Plugin name and version. +#: wp-admin/includes/class-wp-plugin-install-list-table.php:445 +msgid "Install %s now" +msgstr "Installer %s maintenant" +||||||| .r11156 +#: wp-admin/update.php:111 +msgid "Installing Plugin: %s" +msgstr "Extension en cours d’installation : %s" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:266 #: wp-admin/includes/class-wp-ms-themes-list-table.php:316 msgid "Enable" msgstr "Activer" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Plugin name and version +#: wp-admin/includes/class-wp-plugin-install-list-table.php:452 +msgid "Update %s now" +msgstr "Mettre Ã jour %s maintenant" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:74 +#: wp-admin/plugin-install.php:85 wp-admin/update.php:134 +msgid "Upload Plugin" +msgstr "Ajouter une extension" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:240 msgid "Broken (%s)" msgid_plural "Broken (%s)" msgstr[0] "CassÃ© (%s)" msgstr[1] "CassÃ© (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:467 +msgid "More Details" +msgstr "Plus de dÃ©tails" +||||||| .r11156 +#: wp-admin/update.php:139 +msgid "Installing Plugin from uploaded file: %s" +msgstr "Installation de l’extension Ã partir du fichier : %s" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:237 #: wp-admin/includes/class-wp-plugins-list-table.php:295 msgid "Update Available (%s)" msgid_plural "Update Available (%s)" msgstr[0] "PrÃªte Ã mettre Ã jour (%s)" msgstr[1] "PrÃªtes Ã mettre Ã jour (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugins-list-table.php:639 +msgid "View details" +msgstr "Afficher les dÃ©tails" +||||||| .r11156 +#: wp-admin/update.php:219 +msgid "Installing Theme: %s" +msgstr "Installation du thÃ¨me : %s" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:234 msgid "Disabled (%s)" msgid_plural "Disabled (%s)" msgstr[0] "DÃ©sactivÃ© (%s)" msgstr[1] "DÃ©sactivÃ©s (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-terms-list-table.php:177 +msgctxt "Number/count of items" +msgid "Count" +msgstr "Compte" +||||||| .r11156 +#: wp-admin/theme-install.php:55 wp-admin/theme-install.php:123 +#: wp-admin/theme-install.php:125 wp-admin/update.php:241 +msgid "Upload Theme" +msgstr "Mettre un thÃ¨me en ligne" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:231 msgid "Enabled (%s)" msgid_plural "Enabled (%s)" msgstr[0] "ActivÃ© (%s)" msgstr[1] "ActivÃ©s (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-theme-install-list-table.php:59 +msgctxt "themes" +msgid "Recently Updated" +msgstr "Mis Ã jour rÃ©cemment" +||||||| .r11156 +#: wp-admin/update.php:247 +msgid "Installing Theme from uploaded file: %s" +msgstr "Installation du thÃ¨me Ã partir du fichier : %s" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:228 msgctxt "themes" msgid "All (%s)" msgid_plural "All (%s)" msgstr[0] "Tous (%s)" msgstr[1] "Tous (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:535 +msgid "Incompatible with your version of WordPress" +msgstr "Incompatible avec votre version de WordPress" +||||||| .r11156 +#: wp-admin/upgrade.php:67 +msgid "Your WordPress database is already up-to-date!" +msgstr "Votre base de donnÃ©es WordPress est dÃ©jÃ Ã jour !" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:207 msgid "Theme" msgstr "ThÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:537 +msgid "Compatible with your version of WordPress" +msgstr "Compatible avec votre version de WordPress" +||||||| .r11156 +#: wp-admin/upgrade.php:104 +msgid "%s queries" +msgstr "%s requÃªtes" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:199 msgid "You do not appear to have any themes available at this time." msgstr "Vous ne semblez pas avoir de thÃ¨me disponible en ce moment." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-users-list-table.php:120 +#: wp-admin/includes/class-wp-users-list-table.php:165 +msgctxt "users" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +||||||| .r11156 +#: wp-admin/upgrade.php:106 +msgid "%s seconds" +msgstr "%s secondes" +======= #: wp-admin/includes/class-wp-ms-themes-list-table.php:197 msgid "No themes found." msgstr "Aucun thÃ¨me trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:92 +#: wp-admin/plugin-install.php:106 wp-admin/update.php:134 +msgid "Upload Plugin" +msgstr "Mettre une extension en ligne" +||||||| .r11156 +#: wp-admin/upload.php:147 +msgid "You are not allowed to move this post to the trash." +msgstr "Vous n’avez pas l’autorisation de dÃ©placer cet article dans la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:351 msgid "More" msgstr "Plus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:533 +msgid "Untested with your version of WordPress" +msgstr "Non-testÃ© avec votre version de WordPress" +||||||| .r11156 +#: wp-admin/upload.php:159 +msgid "You are not allowed to move this post out of the trash." +msgstr "Vous n’avez pas l’autorisation de sortir cet article de la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:351 msgid "Only showing first 5 users." msgstr "Affiche seulement les 5 premiers utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-plugin-install-list-table.php:84 +msgctxt "Plugin Installer" +msgid "Recommended" +msgstr "RecommandÃ©es" +||||||| .r11156 +#: wp-admin/upload.php:171 +msgid "You are not allowed to delete this post." +msgstr "Vous n’avez pas l’autorisation de supprimer cet article." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:330 msgid "Never" msgstr "Jamais" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:708 +msgid "Comment %d does not exist" +msgstr "Le commentaire %d n’existe pas." +||||||| .r11156 +#: wp-admin/upload.php:245 +msgid "Reattached %d attachment." +msgid_plural "Reattached %d attachments." +msgstr[0] "Rattachement de %d fichier attachÃ©." +msgstr[1] "Rattachement de %d fichiers attachÃ©s." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:304 #: wp-admin/my-sites.php:127 msgid "Visit" msgstr "Visiter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:980 +msgid "Sorry, you must be logged in to reply to a comment." +msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©pondre Ã un commentaire." +||||||| .r11156 +#: wp-admin/upload.php:250 +msgid "Media attachment permanently deleted." +msgid_plural "%d media attachments permanently deleted." +msgstr[0] "MÃ©dia dÃ©finitivement supprimÃ©." +msgstr[1] "%d mÃ©dias dÃ©finitivement supprimÃ©s." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:301 msgid "You are about to delete the site %s." msgstr "Vous Ãªtes sur le point de supprimer le site %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1199 +#: wp-admin/includes/ajax-actions.php:1204 +#: wp-admin/includes/ajax-actions.php:1224 +msgid "Please provide a custom field value." +msgstr "Veuillez saisir une valeur pour le champ personnalisÃ©." +||||||| .r11156 +#: wp-admin/upload.php:255 +msgid "Media attachment moved to the trash." +msgid_plural "%d media attachments moved to the trash." +msgstr[0] "Fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +msgstr[1] "%d fichiers mÃ©dias dÃ©placÃ©s dans la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:298 msgid "You are about to mark the site %s as spam." msgstr "Vous Ãªtes sur le point de marquer le site %s comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1288 +msgid "User %s added" +msgstr "Utilisateur %s ajoutÃ©" +||||||| .r11156 +#: wp-admin/upload.php:261 +msgid "Media attachment restored from the trash." +msgid_plural "%d media attachments restored from the trash." +msgstr[0] "Fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +msgstr[1] "%d fichiers mÃ©dias rÃ©cupÃ©rÃ©s depuis la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:296 msgid "You are about to unspam the site %s." msgstr "Vous Ãªtes sur le point de marquer le site %s comme sain." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1548 +msgid "Someone" +msgstr "Quelqu’un" +||||||| .r11156 +#: wp-admin/upload.php:266 +msgid "Media permanently deleted." +msgstr "MÃ©dia dÃ©finitivement supprimÃ©." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:293 msgctxt "verb; site" msgid "Archive" msgstr "Archiver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1540 wp-admin/includes/post.php:206 +msgid "You are not allowed to edit this page." +msgstr "Vous n’avez pas l’autorisation de modifier cette page." +||||||| .r11156 +#: wp-admin/upload.php:267 +msgid "Error saving media attachment." +msgstr "Erreur lors de la sauvegarde du fichier attachÃ©." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:293 msgid "You are about to archive the site %s." msgstr "Vous Ãªtes sur le point d’archiver le site %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1543 wp-admin/includes/media.php:3071 +#: wp-admin/includes/post.php:208 wp-admin/includes/post.php:1687 +#: wp-admin/includes/post.php:1691 +msgid "You are not allowed to edit this post." +msgstr "Vous n’avez pas l’autorisation de modifier cet article." +||||||| .r11156 +#: wp-admin/upload.php:268 +msgid "Media moved to the trash." +msgstr "Fichier mÃ©dia dÃ©placÃ© dans la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:291 msgid "Unarchive" msgstr "DÃ©sarchiver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1549 +msgid "Saving is disabled: %s is currently editing this page." +msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cette page." +||||||| .r11156 +#: wp-admin/upload.php:269 +msgid "Media restored from the trash." +msgstr "Fichier mÃ©dia rÃ©cupÃ©rÃ© depuis la Corbeille." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:291 msgid "You are about to unarchive the site %s." msgstr "Vous Ãªtes sur le point de dÃ©sarchiver le site %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1549 +msgid "Saving is disabled: %s is currently editing this post." +msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cet article." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:87 +msgid "Attach to a post" +msgstr "Joindre Ã un article" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:288 #: wp-admin/includes/class-wp-plugins-list-table.php:320 #: wp-admin/includes/class-wp-plugins-list-table.php:446 msgid "Deactivate" msgstr "DÃ©sactiver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1699 +#: wp-admin/includes/class-wp-posts-list-table.php:432 +#: wp-admin/includes/class-wp-posts-list-table.php:1208 +msgid "Date" +msgstr "Date" +||||||| .r11156 +#: wp-admin/user-edit.php:28 +msgid "Edit User" +msgstr "Modifier l’utilisateur" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:288 msgid "You are about to deactivate the site %s" msgstr "Vous Ãªtes sur le point de dÃ©sactiver le site %s" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1711 +#: wp-admin/includes/class-wp-posts-list-table.php:857 +#: wp-admin/includes/class-wp-posts-list-table.php:1426 +#: wp-admin/includes/meta-boxes.php:81 wp-admin/includes/meta-boxes.php:104 +#: wp-admin/includes/template.php:1728 +msgid "Scheduled" +msgstr "PlanifiÃ©" +||||||| .r11156 +#: wp-admin/user-edit.php:71 +msgid "Use https" +msgstr "Utiliser https" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:286 msgid "You are about to activate the site %s" msgstr "Vous Ãªtes sur le point d’activer le site %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:405 +#: wp-admin/includes/class-wp-posts-list-table.php:813 +msgid "Unpublished" +msgstr "Non publiÃ©" +||||||| .r11156 +#: wp-admin/user-edit.php:72 +msgid "Always use https when visiting the admin" +msgstr "Toujours utiliser https lors de l’utilisation de l’administration" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:268 msgctxt "%1$s: site name. %2$s: site tagline." msgid "%1$s – %2$s" msgstr "%1$s – %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:411 +msgid "%s from now" +msgstr "%s Ã partir de maintenant" +||||||| .r11156 +#: wp-admin/user-edit.php:95 wp-admin/user-edit.php:124 +#: wp-admin/user-edit.php:188 +msgid "You do not have permission to edit this user." +msgstr "Vous n’avez pas l’autorisation de modifier cet utilisateur." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:208 #: wp-admin/includes/class-wp-ms-users-list-table.php:234 #: wp-admin/includes/class-wp-posts-list-table.php:825 msgid "Y/m/d g:i:s a" msgstr "d/m/Y G \\h i \\m\\i\\n s \\s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:467 +#: wp-admin/includes/class-wp-media-list-table.php:603 +msgid "Attach" +msgstr "Joindre" +||||||| .r11156 +#: wp-admin/user-edit.php:201 +msgid "User updated." +msgstr "Utilisateur mis Ã jour." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:202 msgid "Mature" msgstr "Adulte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:201 +msgid "Approved" +msgid_plural "Approved" +msgstr[0] "ApprouvÃ©" +msgstr[1] "ApprouvÃ©s" +||||||| .r11156 +#: wp-admin/user-edit.php:241 +msgid "Personal Options" +msgstr "Options personnelles" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:201 msgid "Deleted" msgstr "SupprimÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:254 +#: wp-admin/includes/class-wp-comments-list-table.php:505 +#: wp-admin/includes/class-wp-comments-list-table.php:511 +#: wp-admin/includes/dashboard.php:591 +msgid "Unapprove" +msgstr "DÃ©sapprouver" +||||||| .r11156 +#: wp-admin/user-edit.php:246 +msgid "Visual Editor" +msgstr "Ãditeur visuel" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:200 #: wp-admin/includes/class-wp-ms-sites-list-table.php:298 msgctxt "site" msgid "Spam" msgstr "IndÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:256 +#: wp-admin/includes/class-wp-comments-list-table.php:507 +#: wp-admin/includes/class-wp-comments-list-table.php:510 +#: wp-admin/includes/dashboard.php:590 +msgid "Approve" +msgstr "Approuver" +||||||| .r11156 +#: wp-admin/user-edit.php:247 +msgid "Disable the visual editor when writing" +msgstr "DÃ©sactiver l’Ã©diteur visuel pour Ã©crire" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:199 msgid "Archived" msgstr "ArchivÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:300 +#: wp-admin/includes/class-wp-posts-list-table.php:1388 +msgid "Pings" +msgstr "Pings" +||||||| .r11156 +#: wp-admin/includes/misc.php:615 wp-admin/user-edit.php:252 +msgid "Admin Color Scheme" +msgstr "Couleurs de l’interface d’administration" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:172 #: wp-admin/includes/media.php:2175 wp-admin/users.php:54 msgid "Actions" msgstr "Actions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:314 +#: wp-admin/includes/class-wp-links-list-table.php:107 +#: wp-admin/includes/class-wp-media-list-table.php:152 +#: wp-admin/includes/class-wp-posts-list-table.php:339 +msgid "Filter" +msgstr "Filtrer" +||||||| .r11156 +#: wp-admin/user-edit.php:270 +msgid "Enable keyboard shortcuts for comment moderation." +msgstr "Activer les raccourcis clavier pour la modÃ©ration de commentaires." +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:167 msgctxt "site" msgid "Registered" msgstr "Inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:319 +msgid "Empty Spam" +msgstr "Supprimer tous les indÃ©sirables" +||||||| .r11156 +#: wp-admin/user-edit.php:348 wp-admin/user-new.php:367 +msgid "First Name" +msgstr "PrÃ©nom" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:166 msgid "Last Updated" msgstr "DerniÃ¨re mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:182 +msgid "No comments found." +msgstr "Aucun commentaire trouvÃ©." +||||||| .r11156 +#: wp-admin/user-edit.php:353 wp-admin/user-new.php:371 +msgid "Last Name" +msgstr "Nom" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:162 msgid "Path" msgstr "Chemin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:353 +msgid "Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s." +msgstr "Ã savoir : supprimer une catÃ©gorie ne supprime pas les articles qu’elle contient. Les articles affectÃ©s uniquement Ã la catÃ©gorie supprimÃ©e seront affectÃ©s Ã celle par dÃ©faut  : %s." +||||||| .r11156 +#: wp-admin/user-edit.php:358 +msgid "Nickname" +msgstr "Pseudonyme" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:162 msgid "Domain" msgstr "Domaine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:253 +msgid "%s post updated." +msgid_plural "%s posts updated." +msgstr[0] "%s article mis Ã jour." +msgstr[1] "%s articles mis Ã jour." +||||||| .r11156 +#: wp-admin/user-edit.php:363 +msgid "Display name publicly as" +msgstr "Nom Ã afficher publiquement" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:144 #: wp-admin/includes/class-wp-ms-sites-list-table.php:296 msgctxt "site" msgid "Not Spam" msgstr "N’est pas un indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:143 +msgid "Excerpt View" +msgstr "Liste avec extraits" +||||||| .r11156 +#: wp-admin/user-edit.php:399 +msgid "Contact Info" +msgstr "Informations de contact" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:143 msgctxt "site" msgid "Mark as Spam" msgstr "Marquer comme indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:17 wp-admin/menu.php:231 +msgid "Export" +msgstr "Exporter" +||||||| .r11156 +#: wp-admin/user-edit.php:444 +msgid "About Yourself" +msgstr "Ã propos de vous" +======= #: wp-admin/includes/class-wp-ms-sites-list-table.php:136 msgid "No sites found." msgstr "Aucun site trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:148 +msgid "When you click the button below WordPress will create an XML file for you to save to your computer." +msgstr "Cliquez sur ce bouton pour que WordPress crÃ©e un fichier XML que vous pourrez enregistrer sur votre ordinateur." +||||||| .r11156 +#: wp-admin/user-edit.php:444 +msgid "About the user" +msgstr "Ã propos de l’utilisateur" +======= #: wp-admin/includes/class-wp-media-list-table.php:518 #: wp-admin/includes/class-wp-media-list-table.php:537 #: wp-admin/includes/class-wp-ms-users-list-table.php:264 @@ -8111,26 +27549,77 @@ msgstr "Aucun site trouvÃ©." #: wp-admin/includes/class-wp-terms-list-table.php:339 msgid "View" msgstr "Afficher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:158 wp-admin/includes/class-wp-users-list-table.php:275 +#: wp-admin/menu.php:47 +msgid "Posts" +msgstr "Articles" +||||||| .r11156 +#: wp-admin/user-edit.php:448 +msgid "Biographical Info" +msgstr "Renseignements biographiques" +======= #: wp-admin/includes/class-wp-media-list-table.php:518 #: wp-admin/includes/class-wp-media-list-table.php:537 #: wp-admin/includes/class-wp-posts-list-table.php:778 msgid "View “%s”" msgstr "Afficher « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:238 +msgid "Download Export File" +msgstr "TÃ©lÃ©charger le fichier d’export" +||||||| .r11156 +#: wp-admin/user-edit.php:450 +msgid "Share a little biographical information to fill out your profile. This may be shown publicly." +msgstr "Donnez quelques informations biographiques pour remplir votre profil. Ceci peut Ãªtre affichÃ© publiquement." +======= #: wp-admin/includes/class-wp-media-list-table.php:425 #: wp-admin/includes/class-wp-media-list-table.php:520 msgid "Attach" msgstr "Joindre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:75 +msgid "No importers are available." +msgstr "Aucun outil d’importation n’est disponible." +||||||| .r11156 +#: wp-admin/user-edit.php:459 +msgid "New Password" +msgstr "Nouveau mot de passe" +======= #: wp-admin/includes/class-wp-media-list-table.php:420 msgid "(Unattached)" msgstr "(Non attachÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/bookmark.php:194 +msgid "Could not update link in the database" +msgstr "Impossible de mettre Ã jour le lien dans la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/user-edit.php:463 +msgid "If you would like to change the password type a new one. Otherwise leave this blank." +msgstr "Si vous souhaitez changer le mot de passe de l’utilisateur, tapez en un nouveau deux fois de suite ci-dessous. Sinon, laissez les champs vides." +======= #: wp-admin/includes/class-wp-media-list-table.php:414 msgid "Detach" msgstr "DÃ©tacher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/bookmark.php:202 +msgid "Could not insert link into the database" +msgstr "Impossible d’insÃ©rer le lien dans la base de donnÃ©es" +||||||| .r11156 +#: wp-admin/user-edit.php:470 +msgid "Type your new password again." +msgstr "Veuillez saisir une deuxiÃ¨me fois votre mot de passe." +======= #: wp-admin/includes/class-wp-media-list-table.php:379 #: wp-admin/includes/class-wp-plugin-install-list-table.php:481 #: wp-admin/includes/class-wp-posts-list-table.php:832 @@ -8138,38 +27627,113 @@ msgstr "DÃ©tacher" #: wp-admin/includes/revision.php:226 msgid "%s ago" msgstr "Il y a %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-base.php:272 +msgid "Changing to %s" +msgstr "Modifier Ã %s" +||||||| .r11156 +#: wp-admin/user-edit.php:519 +msgid "Additional Capabilities" +msgstr "FonctionnalitÃ©s complÃ©mentaires" +======= #: wp-admin/includes/class-wp-media-list-table.php:377 msgid "%s from now" msgstr "%s Ã partir de maintenant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-base.php:284 +msgid "Found %s" +msgstr "TrouvÃ© %s" +||||||| .r11156 +#: wp-admin/user-edit.php:543 +msgid "Update Profile" +msgstr "Mettre Ã jour le profil" +======= #: wp-admin/includes/class-wp-media-list-table.php:371 #: wp-admin/includes/class-wp-posts-list-table.php:822 msgid "Unpublished" msgstr "Non publiÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:30 +msgid "The ftp PHP extension is not available" +msgstr "L’extension ftp de PHP n’est pas disponible" +||||||| .r11156 +#: wp-admin/user-edit.php:543 +msgid "Update User" +msgstr "Mettre Ã jour l’utilisateur" +======= #. translators: column name #: wp-admin/includes/class-wp-media-list-table.php:246 msgctxt "column name" msgid "Date" msgstr "Date" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:45 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:43 +msgid "FTP hostname is required" +msgstr "L’hÃ´te du FTP est obligatoire" +||||||| .r11156 +#: wp-admin/user-new.php:88 +msgid "[%s] Joining confirmation" +msgstr "[%s] Confirmation d'inscription" +======= #. translators: column name #: wp-admin/includes/class-wp-media-list-table.php:241 msgctxt "column name" msgid "Uploaded to" msgstr "Mis en ligne sur " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:51 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:49 +msgid "FTP username is required" +msgstr "L’identifiant FTP est obligatoire" +||||||| .r11156 +#: wp-admin/user-new.php:211 +msgid "Invitation email sent to new user. A confirmation link must be clicked before their account is created." +msgstr "Envoi d’un message d’invitation au nouvel utilisateur. Un lien de confirmation devra d’abord Ãªtre cliquÃ© avant la crÃ©ation du compte." +======= #. translators: column name #: wp-admin/includes/class-wp-media-list-table.php:211 msgctxt "column name" msgid "File" msgstr "Fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:56 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:54 +msgid "FTP password is required" +msgstr "Le mot de passe FTP est obligatoire" +||||||| .r11156 +#: wp-admin/user-new.php:404 +msgid "Send Password?" +msgstr "Envoyer le mot de passe ?" +======= #: wp-admin/includes/class-wp-media-list-table.php:106 msgid "Attach to a post" msgstr "Joindre Ã un article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:76 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:70 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:75 +msgid "Failed to connect to FTP Server %1$s:%2$s" +msgstr "Impossible de me connecter au serveur FTP %1$s : %2$s" +||||||| .r11156 +#: wp-admin/user-new.php:405 +msgid "Send this password to the new user by email." +msgstr "Envoyer ce mot de passe au nouvel utilisateur sur son adresse de messagerie." +======= #: wp-admin/includes/class-wp-media-list-table.php:99 #: wp-admin/includes/class-wp-media-list-table.php:513 #: wp-admin/includes/class-wp-media-list-table.php:529 @@ -8177,87 +27741,278 @@ msgstr "Joindre Ã un article" #: wp-admin/includes/meta-boxes.php:322 msgid "Trash" msgstr "Mettre Ã la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ftpext.php:81 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:80 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:116 +msgid "Username/Password incorrect for %s" +msgstr "Le couple identifiant / mot de passe est incorrect pour %s" +||||||| .r11156 +#: wp-admin/user-new.php:309 wp-admin/user-new.php:422 +msgid "Skip Confirmation Email" +msgstr "Passer la confirmation par e-mail" +======= #: wp-admin/includes/class-wp-media-list-table.php:87 msgctxt "uploaded files" msgid "Trash (%s)" msgid_plural "Trash (%s)" msgstr[0] "Corbeille (%s)" msgstr[1] "Corbeilles (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:55 +msgid "The ssh2 PHP extension is not available" +msgstr "L’extension ssh2 de PHP n’est pas disponible" +||||||| .r11156 +#: wp-admin/users.php:104 wp-admin/users.php:121 +msgid "You can’t edit that user." +msgstr "Vous ne pouvez pas modifier cet utilisateur." +======= #: wp-admin/includes/class-wp-media-list-table.php:84 msgctxt "detached files" msgid "Unattached (%s)" msgid_plural "Unattached (%s)" msgstr[0] "Non attachÃ© (%s)" msgstr[1] "Non attachÃ©s (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:59 +msgid "The ssh2 PHP extension is available, however, we require the PHP5 function stream_get_contents()" +msgstr "L’extension ssh2 de PHP est disponible, mais nÃ©cessite la fonction PHP5 stream_get_contents()" +||||||| .r11156 +#: wp-admin/users.php:161 wp-admin/users.php:201 +msgid "You can’t delete users." +msgstr "Vous ne pouvez pas supprimer d’utilisateurs." +======= #: wp-admin/includes/class-wp-media-list-table.php:73 msgctxt "uploaded files" msgid "All (%s)" msgid_plural "All (%s)" msgstr[0] "Tout (%s)" msgstr[1] "Tous (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:70 +msgid "SSH2 hostname is required" +msgstr "Le nom de l’hÃ´te SSH2 est obligatoire" +||||||| .r11156 +#: wp-admin/users.php:217 +msgid "Delete Users" +msgstr "Supprimer des utilisateurs" +======= #: wp-admin/includes/class-wp-list-table.php:879 #: wp-admin/includes/nav-menu.php:834 wp-admin/includes/nav-menu.php:1022 #: wp-admin/update-core.php:230 wp-admin/update-core.php:283 #: wp-admin/update-core.php:313 wp-admin/update-core.php:332 msgid "Select All" msgstr "Tout sÃ©lectionner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:83 +msgid "SSH2 username is required" +msgstr "L’identifiant SSH2 est obligatoire" +||||||| .r11156 +#: wp-admin/users.php:260 +msgid "There are no valid users selected for deletion." +msgstr "Aucun utilisateur valide n’est sÃ©lectionnÃ© pour la suppression." +======= #: wp-admin/includes/class-wp-list-table.php:742 msgid "Go to the last page" msgstr "Aller Ã la derniÃ¨re page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:92 +msgid "SSH2 password is required" +msgstr "Le mot de passe SSH2 est obligatoire" +||||||| .r11156 +#: wp-admin/users.php:390 +msgid "New user created." +msgstr "Le nouvel utilisateur a Ã©tÃ© crÃ©Ã©." +======= #: wp-admin/includes/class-wp-list-table.php:735 msgid "Go to the next page" msgstr "Aller Ã la page suivante" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:110 +msgid "Failed to connect to SSH2 Server %1$s:%2$s" +msgstr "Impossible de me connecter au serveur SSH2 %1$s : %2$s" +||||||| .r11156 +#: wp-admin/users.php:397 +msgid "The current user’s role must have user editing capabilities." +msgstr "L’utilisateur courant doit avoir un niveau lui permettant de modifier les utilisateurs." +======= #: wp-admin/includes/class-wp-list-table.php:731 msgctxt "paging" msgid "%1$s of %2$s" msgstr "%1$s sur %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:141 +msgid "Unable to perform command: %s" +msgstr "Impossible de lancer la commande : %s" +||||||| .r11156 +#: wp-admin/users.php:398 +msgid "Other user roles have been changed." +msgstr "Les rÃ´les des autres utilisateurs ont Ã©tÃ© modifiÃ©s." +======= #: wp-admin/includes/class-wp-list-table.php:725 msgid "Current page" msgstr "Page actuelle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:507 +#: wp-admin/includes/class-wp-comments-list-table.php:510 +#: wp-admin/includes/dashboard.php:590 +msgid "Approve this comment" +msgstr "Approuver ce commentaire" +||||||| .r11156 +#: wp-admin/users.php:401 +msgid "You can’t delete the current user." +msgstr "Vous ne pouvez pas supprimer l’utilisateur courant." +======= #: wp-admin/includes/class-wp-list-table.php:724 msgid "Select Page" msgstr "SÃ©lectionnez une page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:505 +#: wp-admin/includes/class-wp-comments-list-table.php:511 +#: wp-admin/includes/dashboard.php:591 +msgid "Unapprove this comment" +msgstr "DÃ©sapprouver ce commentaire" +||||||| .r11156 +#: wp-admin/users.php:402 +msgid "Other users have been deleted." +msgstr "Les autres utilisateurs ont Ã©tÃ© supprimÃ©s." +======= #: wp-admin/includes/class-wp-list-table.php:715 msgid "Go to the previous page" msgstr "Aller Ã la page prÃ©cÃ©dente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:537 +#: wp-admin/includes/dashboard.php:593 +msgid "Reply to this comment" +msgstr "RÃ©pondre Ã ce commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:169 +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" +======= #: wp-admin/includes/class-wp-list-table.php:708 msgid "Go to the first page" msgstr "Aller Ã la premiÃ¨re page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:515 +#: wp-admin/includes/dashboard.php:594 +msgid "Mark this comment as spam" +msgstr "Marquer ce commentaire comme indÃ©sirable" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:213 +#: wp-admin/includes/class-wp-users-list-table.php:215 +msgid "Change role to…" +msgstr "Changer de rÃ´le pour…" +======= #: wp-admin/includes/class-wp-list-table.php:689 #: wp-admin/includes/class-wp-list-table.php:1113 msgid "1 item" msgid_plural "%s items" msgstr[0] "1 Ã©lÃ©ment" msgstr[1] "%s Ã©lÃ©ments" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: mark as spam link +#: wp-admin/includes/class-wp-comments-list-table.php:515 +#: wp-admin/includes/dashboard.php:594 +msgctxt "verb" +msgid "Spam" +msgstr "IndÃ©sirable" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:219 +msgid "Change" +msgstr "Changer" +======= #: wp-admin/includes/class-wp-list-table.php:610 msgid "%s pending" msgstr "%s en attente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:183 wp-admin/export.php:215 +#: wp-admin/includes/meta-boxes.php:70 +msgid "Status:" +msgstr "Ãtat :" +||||||| .r11156 +#: wp-admin/widgets.php:111 +msgid "Inactive Widgets" +msgstr "Widgets dÃ©sactivÃ©s" +======= #: wp-admin/includes/class-wp-list-table.php:436 msgid "Select bulk action" msgstr "SÃ©lectionnez l’action groupÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:321 +#: wp-admin/includes/meta-boxes.php:826 +msgid "" +"You are about to delete this link '%s'\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer le lien Â« %s Â».\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +||||||| .r11156 +#: wp-admin/widgets.php:78 +msgid "The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please follow these instructions." +msgstr "Le thÃ¨me que vous utilisez n’est pas conÃ§u pour les widgets, ce qui signifie qu’il ne dispose pas d’une colonne latÃ©rale que vous pouvez modifier. Pour obtenir des informations sur la maniÃ¨re de rendre votre thÃ¨me compatible avec les widgets, lisez ces instructions." +======= #: wp-admin/includes/class-wp-list-table.php:143 msgid "Excerpt View" msgstr "Liste avec extraits" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:125 +#: wp-admin/includes/meta-boxes.php:1094 +msgid "Rating" +msgstr "Note" +||||||| .r11156 +#: wp-admin/widgets.php:235 +msgid "Widget %s" +msgstr "Widget %s" +======= #: wp-admin/includes/class-wp-links-list-table.php:160 msgid "Visit %s" msgstr "Aller sur %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:535 +#: wp-admin/includes/class-wp-posts-list-table.php:1061 +#: wp-admin/includes/class-wp-terms-list-table.php:412 +msgid "Quick Edit" +msgstr "Modification rapide" +||||||| .r11156 +#: wp-admin/widgets.php:246 +msgid "Select both the sidebar for this widget and the position of the widget in that sidebar." +msgstr "SÃ©lectionnez Ã la fois la colonne latÃ©rale pour ce widget, et la position du widget dans cette colonne latÃ©rale." +======= #: wp-admin/includes/class-wp-links-list-table.php:154 msgid "" "You are about to delete this link '%s'\n" @@ -8265,7 +28020,19 @@ msgid "" msgstr "" "Vous Ãªtes sur le point de supprimer le lien Â« %s Â».\n" " Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: column name +#: wp-admin/includes/class-wp-media-list-table.php:251 +msgctxt "column name" +msgid "File" +msgstr "Fichier" +||||||| .r11156 +#: wp-admin/custom-background.php:331 wp-admin/widgets.php:248 +msgid "Position" +msgstr "Position" +======= #: wp-admin/includes/class-wp-links-list-table.php:150 #: wp-admin/includes/class-wp-media-list-table.php:322 #: wp-admin/includes/class-wp-media-list-table.php:340 @@ -8274,7 +28041,19 @@ msgstr "" #: wp-admin/includes/dashboard.php:514 msgid "Edit “%s”" msgstr "Modifier avec « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: column name +#: wp-admin/includes/class-wp-media-list-table.php:286 +msgctxt "column name" +msgid "Date" +msgstr "Date" +||||||| .r11156 +#: wp-admin/widgets.php:286 +msgid "Save Widget" +msgstr "Enregistrer le widget" +======= #: wp-admin/includes/class-wp-links-list-table.php:143 #: wp-admin/includes/class-wp-media-list-table.php:305 #: wp-admin/includes/class-wp-ms-sites-list-table.php:248 @@ -8285,30 +28064,93 @@ msgstr "Modifier avec « %s »" #: wp-admin/includes/class-wp-users-list-table.php:390 msgid "Select %s" msgstr "SÃ©lectionner %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:358 +#: wp-admin/includes/class-wp-comments-list-table.php:742 +msgctxt "column name" +msgid "Comment" +msgstr "Commentaire" +||||||| .r11156 +#: wp-admin/widgets.php:302 +msgid "Changes saved." +msgstr "Modifications enregistrÃ©es." +======= #: wp-admin/includes/class-wp-links-list-table.php:98 #: wp-admin/includes/meta-boxes.php:1082 msgid "Rating" msgstr "Note" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:123 +msgid "Relationship" +msgstr "Relation" +||||||| .r11156 +#: wp-admin/includes/misc.php:816 wp-admin/includes/post.php:1639 +#: wp-admin/widgets.php:306 +msgid "Error while saving." +msgstr "Erreur lors de la sauvegarde." +======= #: wp-admin/includes/class-wp-links-list-table.php:97 msgid "Visible" msgstr "Visible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:124 +msgid "Visible" +msgstr "Visible" +||||||| .r11156 +#: wp-admin/widgets.php:307 +msgid "Error in displaying the widget settings form." +msgstr "Une erreur est survenue durant l’affichage du formulaire de paramÃ©trage du widget." +======= #: wp-admin/includes/class-wp-links-list-table.php:96 msgid "Relationship" msgstr "Relation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:196 +msgid "Visit %s" +msgstr "Aller sur %s" +||||||| .r11156 +#: wp-admin/widgets.php:335 +msgid "Available Widgets" +msgstr "Widgets disponibles" +======= #: wp-admin/includes/class-wp-links-list-table.php:82 #: wp-admin/includes/class-wp-posts-list-table.php:285 msgid "Filter by category" msgstr "Filtrer par catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:67 +msgid "No links found." +msgstr "Aucun lien trouvÃ©." +||||||| .r11156 +#: wp-admin/widgets.php:114 +msgid "Drag widgets here to remove them from the sidebar but keep their settings." +msgstr "Glissez ici les widgets que vous voulez retirer de la colonne latÃ©rale, tout en conservant leurs rÃ©glages actuels." +======= #: wp-admin/includes/class-wp-links-list-table.php:75 #: wp-admin/includes/class-wp-posts-list-table.php:277 msgid "All categories" msgstr "Toutes les catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:33 +msgid "Archived" +msgstr "ArchivÃ©" +||||||| .r11156 +#: wp-admin/export.php:162 +msgid "Categories:" +msgstr "CatÃ©gories :" +======= #: wp-admin/includes/class-wp-links-list-table.php:58 #: wp-admin/includes/class-wp-links-list-table.php:154 #: wp-admin/includes/class-wp-ms-sites-list-table.php:142 @@ -8330,78 +28172,261 @@ msgstr "Toutes les catÃ©gories" #: wp-admin/themes.php:300 wp-admin/themes.php:416 wp-admin/widgets.php:284 msgid "Delete" msgstr "Supprimer " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:36 +msgid "Mature" +msgstr "Adulte" +||||||| .r11156 +#: wp-admin/comment.php:132 +msgid "Permanently Delete Comment" +msgstr "Supprimer dÃ©finitivement le commentaire" +======= #: wp-admin/includes/class-wp-links-list-table.php:53 msgid "No links found." msgstr "Aucun lien trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:35 +msgid "Deleted" +msgstr "SupprimÃ©" +||||||| .r11156 +#: wp-admin/comment.php:135 +msgid "You are about to approve the following comment:" +msgstr "Vous Ãªtes sur le point d’approuver le commentaire suivant :" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:135 msgid "Unable to perform command: %s" msgstr "Impossible de lancer la commande : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:130 +msgid "Attach to a post" +msgstr "Joindre Ã un article" +||||||| .r11156 +#: wp-admin/comment.php:136 +msgid "Approve Comment" +msgstr "Approuver le commentaire" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:114 msgid "Public and Private keys incorrect for %s" msgstr "Les clÃ©s publiques et privÃ©es de %s ne sont pas correctes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:161 +msgid "Categories:" +msgstr "CatÃ©gories :" +||||||| .r11156 +#: wp-admin/comment.php:295 +msgid "Unknown action." +msgstr "Action inconnue." +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:103 msgid "Failed to connect to SSH2 Server %1$s:%2$s" msgstr "Impossible de me connecter au serveur SSH2 %1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:601 +#: wp-admin/includes/class-wp-media-list-table.php:620 +#: wp-admin/includes/class-wp-posts-list-table.php:1083 +msgid "View “%s”" +msgstr "Afficher « %s »" +||||||| .r11156 +#: wp-admin/custom-background.php:234 wp-admin/includes/theme.php:211 +msgid "Custom Background" +msgstr "ArriÃ¨re-plan personnalisÃ©" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:88 msgid "SSH2 password is required" msgstr "Le mot de passe SSH2 est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1222 +msgid "Please provide a custom field name." +msgstr "Veuillez saisir un nom pour le champ personnalisÃ©." +||||||| .r11156 +#: wp-admin/custom-background.php:238 +msgid "Background updated. Visit your site to see how it looks." +msgstr "L’arriÃ¨re-plan a Ã©tÃ© mis Ã jour. Afficher votre site pour voir le rendu." +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:79 msgid "SSH2 username is required" msgstr "L’identifiant SSH2 est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:462 +msgid "(Unattached)" +msgstr "(Non attachÃ©)" +||||||| .r11156 +#: wp-admin/custom-background.php:307 wp-admin/custom-header.php:590 +msgid "Choose an image from your computer:" +msgstr "Choisissez une image sur votre ordinateur :" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:66 msgid "SSH2 hostname is required" msgstr "Le nom de l’hÃ´te SSH2 est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:207 wp-admin/includes/class-wp-list-table.php:440 +msgid "Bulk Actions" +msgstr "Actions groupÃ©es" +||||||| .r11156 +#: wp-admin/includes/template.php:1823 wp-admin/nav-menus.php:615 +#: wp-admin/options.php:259 +msgid "Save Changes" +msgstr "Enregistrer les modifications" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:55 msgid "The ssh2 PHP extension is available, however, we require the PHP5 function stream_get_contents()" msgstr "L’extension ssh2 de PHP est disponible, mais nÃ©cessite la fonction PHP5 stream_get_contents()" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:263 +#: wp-admin/includes/class-wp-comments-list-table.php:517 +msgctxt "comment" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +||||||| .r11156 +#: wp-admin/custom-header.php:523 wp-admin/includes/theme.php:213 +msgid "Custom Header" +msgstr "Personnalisation de l’en-tÃªte" +======= #: wp-admin/includes/class-wp-filesystem-ssh2.php:51 msgid "The ssh2 PHP extension is not available" msgstr "L’extension ssh2 de PHP n’est pas disponible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:131 wp-admin/post.php:300 +msgid "You are not allowed to delete this item." +msgstr "Vous n’avez pas l’autorisation de supprimer ce contenu." +||||||| .r11156 +#: wp-admin/custom-header.php:527 +msgid "Header updated. Visit your site to see how it looks." +msgstr "L’en-tÃªte a Ã©tÃ© mis Ã jour. Visiter le site pour voir son nouvel aspect." +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:73 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:72 #: wp-admin/includes/class-wp-filesystem-ssh2.php:109 msgid "Username/Password incorrect for %s" msgstr "Le couple identifiant / mot de passe est incorrect pour %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:197 +msgid "Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:" +msgstr "Passer la souris au-dessus d’une ligne de la liste d’articles, fera s’afficher des liens vous permettant de gÃ©rer l’article. Vous pouvez lancer les actions suivantes :" +||||||| .r11156 +#: wp-admin/custom-header.php:797 wp-admin/custom-header.php:921 +msgid "Image Processing Error" +msgstr "Erreur lors du traitement de l’image" +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:68 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:62 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:67 msgid "Failed to connect to FTP Server %1$s:%2$s" msgstr "Impossible de me connecter au serveur FTP %1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:13 +msgid "You do not have sufficient permissions to export the content of this site." +msgstr "Vous n’avez pas les droits suffisants pour exporter le contenu de ce site." +||||||| .r11156 +#: wp-admin/custom-header.php:814 +msgid "Choose the part of the image you want to use as your header." +msgstr "Choisissez la partie de l’image que vous voulez utiliser comme en-tÃªte." +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:52 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:50 msgid "FTP password is required" msgstr "Le mot de passe FTP est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:48 +msgid "Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format." +msgstr "Une fois gÃ©nÃ©rÃ©, le fichier WXR peut Ãªtre importÃ© dans une autre installation WordPress, ou une autre plate-forme de blog capable de lire ce format." +||||||| .r11156 +#: wp-admin/custom-header.php:975 +msgid "You do not have permission to customize headers." +msgstr "Vous n’avez pas l’autorisation de personnaliser les en-tÃªtes." +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:47 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:45 msgid "FTP username is required" msgstr "L’identifiant FTP est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:174 wp-admin/export.php:206 +msgid "Start Date" +msgstr "Date de dÃ©but" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:151 +#: wp-admin/includes/class-wp-media-list-table.php:334 +#: wp-admin/includes/class-wp-media-list-table.php:352 +#: wp-admin/includes/class-wp-posts-list-table.php:633 +#: wp-admin/includes/class-wp-terms-list-table.php:303 +#: wp-admin/includes/dashboard.php:508 +msgid "Edit “%s”" +msgstr "Modifier avec « %s »" +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:41 #: wp-admin/includes/class-wp-filesystem-ftpsockets.php:39 msgid "FTP hostname is required" msgstr "L’hÃ´te du FTP est obligatoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:178 wp-admin/export.php:210 +msgid "End Date" +msgstr "Date de fin" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:526 +#: wp-admin/includes/class-wp-media-list-table.php:545 +#: wp-admin/includes/class-wp-posts-list-table.php:680 +msgid "View “%s”" +msgstr "Afficher « %s »" +======= #: wp-admin/includes/class-wp-filesystem-ftpext.php:26 msgid "The ftp PHP extension is not available" msgstr "L’extension ftp de PHP n’est pas disponible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:15 +msgid "You do not have sufficient permissions to import content in this site." +msgstr "Vous n’avez pas les droits suffisants pour importer du contenu dans ce site." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:390 +#: wp-admin/includes/class-wp-posts-list-table.php:724 +msgid "Unpublished" +msgstr "Non publiÃ©" +======= #: wp-admin/includes/class-wp-filesystem-base.php:285 msgid "Found %s" msgstr "TrouvÃ© %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:57 wp-admin/users.php:220 +msgid "ERROR:" +msgstr "ERREUR :" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:727 +msgid "Y/m/d g:i:s A" +msgstr "d/m/Y \\Ã G \\h i \\m\\i\\n s \\s" +======= #: wp-admin/includes/class-wp-filesystem-base.php:273 msgid "Changing to %s" msgstr "Modifier Ã %s" @@ -8413,98 +28438,312 @@ msgstr "Recherche %1$s dans %2$s" #: wp-admin/includes/class-wp-comments-list-table.php:549 msgid "Y/m/d \\a\\t g:i a" msgstr "d/m/Y \\Ã G \\h i \\m\\i\\n s \\s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:57 +msgid "The %s importer is invalid or is not installed." +msgstr "L’importateur %s est invalide ou n’est pas installÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:396 +msgid "%s from now" +msgstr "%s Ã partir de maintenant" +======= #: wp-admin/includes/class-wp-comments-list-table.php:489 #: wp-admin/includes/dashboard.php:561 msgid "Reply to this comment" msgstr "RÃ©pondre Ã ce commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:59 +msgid "If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:" +msgstr "Si vous avez des articles ou des commentaires dans un autre systÃ¨me de site, WordPress peut les importer dans votre site actuel. Pour commencer, choisissez un systÃ¨me d’origine ci-dessous :" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:430 +msgid "(Unattached)" +msgstr "(Non attachÃ©)" +======= #: wp-admin/includes/class-wp-comments-list-table.php:487 #: wp-admin/includes/class-wp-posts-list-table.php:759 #: wp-admin/includes/class-wp-terms-list-table.php:334 msgid "Quick Edit" msgstr "Modification rapide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:93 +msgid "Activate importer" +msgstr "Activer l’importateur" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:435 +#: wp-admin/includes/class-wp-media-list-table.php:528 +msgid "Attach" +msgstr "Joindre" +======= #: wp-admin/includes/class-wp-comments-list-table.php:487 #: wp-admin/includes/class-wp-posts-list-table.php:759 msgid "Edit this item inline" msgstr "Modifier cet Ã©lÃ©ment sur place" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:100 +msgid "Install importer" +msgstr "Installer l’importateur" +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:559 +msgid "%s pending" +msgstr "%s en attente" +======= #: wp-admin/includes/class-wp-comments-list-table.php:479 #: wp-admin/includes/dashboard.php:566 msgid "Move this comment to the trash" msgstr "DÃ©placer ce commentaire dans la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/bookmark.php:307 wp-admin/link-manager.php:12 +#: wp-admin/link-manager.php:67 +msgid "You do not have sufficient permissions to edit the links for this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier les liens de ce site." +||||||| .r11156 +#: wp-admin/edit-comments.php:185 +msgid "%s comment approved" +msgid_plural "%s comments approved" +msgstr[0] "%s commentaire approuvÃ©" +msgstr[1] "%s commentaires approuvÃ©s" +======= #. translators: mark as spam link #: wp-admin/includes/class-wp-comments-list-table.php:467 #: wp-admin/includes/dashboard.php:562 msgctxt "verb" msgid "Spam" msgstr "IndÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:135 wp-admin/edit.php:138 wp-admin/post.php:306 +#: wp-admin/post.php:309 wp-admin/upload.php:156 +msgid "Error in deleting." +msgstr "Erreur pendant la suppression." +||||||| .r11156 +#: wp-admin/edit-comments.php:189 +msgid "%s comment marked as spam." +msgid_plural "%s comments marked as spam." +msgstr[0] "%s commentaire marquÃ© comme indÃ©sirable." +msgstr[1] "%s commentaires marquÃ©s comme indÃ©sirables." +======= #: wp-admin/includes/class-wp-comments-list-table.php:467 #: wp-admin/includes/dashboard.php:562 msgid "Mark this comment as spam" msgstr "Marquer ce commentaire comme indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2975 wp-admin/update.php:24 +#: wp-admin/update.php:50 wp-admin/update.php:71 +msgid "You do not have sufficient permissions to update plugins for this site." +msgstr "Vous n’avez pas les droits suffisants pour mettre Ã jour les extensions de ce site." +||||||| .r11156 +#: wp-admin/edit-comments.php:193 +msgid "%s comment restored from the spam" +msgid_plural "%s comments restored from the spam" +msgstr[0] "%s commentaire rÃ©tabli depuis les commentaires indÃ©sirables" +msgstr[1] "%s commentaires rÃ©tablis depuis les commentaires indÃ©sirables" +======= #: wp-admin/includes/class-wp-comments-list-table.php:459 #: wp-admin/includes/class-wp-comments-list-table.php:462 #: wp-admin/includes/dashboard.php:558 msgid "Approve this comment" msgstr "Approuver ce commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:34 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:492 +msgctxt "site" +msgid "Spam" +msgstr "IndÃ©sirable" +||||||| .r11156 +#: wp-admin/edit-comments.php:204 +msgid "%s comment permanently deleted" +msgid_plural "%s comments permanently deleted" +msgstr[0] "%s commentaire supprimÃ© dÃ©finitivement" +msgstr[1] "%s commentaires supprimÃ©s dÃ©finitivement" +======= #: wp-admin/includes/class-wp-comments-list-table.php:457 #: wp-admin/includes/class-wp-comments-list-table.php:463 #: wp-admin/includes/dashboard.php:559 msgid "Unapprove this comment" msgstr "DÃ©sapprouver ce commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:177 +msgctxt "site" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:169 +msgctxt "comments" +msgid "All" +msgid_plural "All" +msgstr[0] "Tout" +msgstr[1] "Tout" +======= #. translators: 2: comment date, 3: comment time #: wp-admin/includes/class-wp-comments-list-table.php:414 msgid "Submitted on %2$s at %3$s" msgstr "EnvoyÃ© le %2$s Ã %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:178 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:490 +msgctxt "site" +msgid "Not Spam" +msgstr "N’est pas un indÃ©sirable" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:170 +msgid "Pending (%s)" +msgid_plural "Pending (%s)" +msgstr[0] "En attente (%s)" +msgstr[1] "En attente (%s)" +======= #: wp-admin/includes/class-wp-comments-list-table.php:380 msgid "Select comment" msgstr "SÃ©lectionnez un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-ms-sites-list-table.php:166 +msgid "No sites found." +msgstr "Aucun site trouvÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:171 +msgid "Approved" +msgid_plural "Approved" +msgstr[0] "ApprouvÃ©" +msgstr[1] "ApprouvÃ©s" +======= #: wp-admin/includes/class-wp-comments-list-table.php:314 msgctxt "column name" msgid "In Response To" msgstr "En rÃ©ponse Ã " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:97 wp-admin/post.php:259 +msgid "You are not allowed to move this item to the Trash." +msgstr "Vous n’avez pas l’autorisation de dÃ©placer ce contenu dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:172 +msgid "Spam (%s)" +msgid_plural "Spam (%s)" +msgstr[0] "IndÃ©sirable (%s)" +msgstr[1] "IndÃ©sirables (%s)" +======= #: wp-admin/includes/class-wp-comments-list-table.php:311 #: wp-admin/includes/class-wp-comments-list-table.php:609 msgctxt "column name" msgid "Comment" msgstr "Commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:105 wp-admin/post.php:267 wp-admin/upload.php:132 +msgid "Error in moving to Trash." +msgstr "Erreur lors du dÃ©placement dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:173 +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeille (%s)" +======= #: wp-admin/includes/class-wp-comments-list-table.php:281 #: wp-admin/includes/class-wp-media-list-table.php:132 #: wp-admin/includes/class-wp-posts-list-table.php:303 msgid "Empty Trash" msgstr "Vider la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:116 wp-admin/post.php:282 +msgid "You are not allowed to restore this item from the Trash." +msgstr "Vous n’avez pas l’autorisation de rÃ©cupÃ©rer ce contenu depuis la Corbeille." +||||||| .r11156 +#: wp-admin/edit-comments.php:229 +msgid "Search Comments" +msgstr "Chercher un commentaire" +======= #: wp-admin/includes/class-wp-comments-list-table.php:281 msgid "Empty Spam" msgstr "Supprimer tous les indÃ©sirables" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:119 wp-admin/post.php:285 wp-admin/upload.php:144 +msgid "Error in restoring from Trash." +msgstr "Erreur pendant la rÃ©cupÃ©ration depuis la Corbeille." +||||||| .r11156 +#: wp-admin/includes/deprecated.php:594 +msgid "Displaying %s–%s of %s" +msgstr "Affichage de %s Ã %s sur %s" +======= #: wp-admin/includes/class-wp-comments-list-table.php:276 #: wp-admin/includes/class-wp-links-list-table.php:84 #: wp-admin/includes/class-wp-media-list-table.php:128 #: wp-admin/includes/class-wp-posts-list-table.php:299 msgid "Filter" msgstr "Filtrer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:188 +msgid "You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts." +msgstr "Vous pouvez filtrer la liste des articles par Ã©tat, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les articles, ou seulement les articles publiÃ©s, les brouillons, etc. Par dÃ©faut, tous les articles sont affichÃ©s ;" +||||||| .r11156 +#: wp-admin/edit.php:197 wp-admin/includes/class-wp-list-table.php:398 +msgid "Bulk Actions" +msgstr "Actions groupÃ©es" +======= #: wp-admin/includes/class-wp-comments-list-table.php:262 #: wp-admin/includes/class-wp-posts-list-table.php:1254 msgid "Pings" msgstr "Pings" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:189 +msgid "You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right." +msgstr "Vous pouvez afficher une simple liste de titres, ou une liste avec des extraits. Choisissez l’affichage que vous prÃ©fÃ©rez en cliquant sur les icÃ´nes en haut Ã droite de la liste ;" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:219 +#: wp-admin/includes/class-wp-comments-list-table.php:450 +#: wp-admin/includes/class-wp-comments-list-table.php:455 +#: wp-admin/includes/dashboard.php:553 +msgid "Unapprove" +msgstr "DÃ©sapprouver" +======= #: wp-admin/includes/class-wp-comments-list-table.php:251 msgid "All comment types" msgstr "Tous les types de commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:152 +msgid "Choose what to export" +msgstr "Choisissez ce que vous souhaitez exporter" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:221 +#: wp-admin/includes/class-wp-comments-list-table.php:452 +#: wp-admin/includes/class-wp-comments-list-table.php:454 +#: wp-admin/includes/dashboard.php:552 +msgid "Approve" +msgstr "Approuver" +======= #: wp-admin/includes/class-wp-comments-list-table.php:249 msgid "Filter by comment type" msgstr "Filtrer par type de commentaire" @@ -8535,38 +28774,118 @@ msgstr "Marquer comme indÃ©sirable" #: wp-admin/includes/dashboard.php:558 msgid "Approve" msgstr "Approuver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:155 +msgid "All content" +msgstr "Tout le contenu" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:116 +#: wp-admin/includes/class-wp-comments-list-table.php:233 +#: wp-admin/includes/class-wp-posts-list-table.php:210 +#: wp-admin/includes/media.php:1433 wp-admin/includes/meta-boxes.php:238 +msgid "Move to Trash" +msgstr "DÃ©placer dans la Corbeille" +======= #: wp-admin/includes/class-wp-comments-list-table.php:223 #: wp-admin/includes/class-wp-comments-list-table.php:457 #: wp-admin/includes/class-wp-comments-list-table.php:463 #: wp-admin/includes/dashboard.php:559 msgid "Unapprove" msgstr "DÃ©sapprouver" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:156 +msgid "This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts." +msgstr "Il contiendra tous vos articles, pages, commentaires, champs personnalisÃ©s, termes, menus de navigation et types de contenus personnalisÃ©s." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:257 +#: wp-admin/includes/class-wp-posts-list-table.php:1139 +msgid "Pings" +msgstr "Pings" +======= #: wp-admin/includes/class-wp-comments-list-table.php:177 msgid "Trash (%s)" msgid_plural "Trash (%s)" msgstr[0] "Corbeille (%s)" msgstr[1] "Corbeille (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:165 wp-admin/export.php:197 +msgid "Authors:" +msgstr "Auteur :" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:271 +#: wp-admin/includes/class-wp-links-list-table.php:82 +#: wp-admin/includes/class-wp-media-list-table.php:106 +#: wp-admin/includes/class-wp-posts-list-table.php:246 +msgid "Filter" +msgstr "Filtrer" +======= #: wp-admin/includes/class-wp-comments-list-table.php:176 msgid "Spam (%s)" msgid_plural "Spam (%s)" msgstr[0] "IndÃ©sirable (%s)" msgstr[1] "IndÃ©sirables (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:172 wp-admin/export.php:204 +msgid "Date range:" +msgstr "Date de crÃ©ation :" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:276 +msgid "Empty Spam" +msgstr "Supprimer tous les indÃ©sirables" +======= #: wp-admin/includes/class-wp-comments-list-table.php:175 msgid "Approved" msgid_plural "Approved" msgstr[0] "ApprouvÃ©" msgstr[1] "ApprouvÃ©s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:527 +#: wp-admin/includes/dashboard.php:598 +msgid "Move this comment to the trash" +msgstr "DÃ©placer ce commentaire dans la Corbeille" +#: wp-admin/includes/class-wp-comments-list-table.php:319 +#: wp-admin/includes/class-wp-media-list-table.php:156 +#: wp-admin/includes/class-wp-posts-list-table.php:343 +msgid "Empty Trash" +msgstr "Vider la Corbeille" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:276 +#: wp-admin/includes/class-wp-media-list-table.php:110 +#: wp-admin/includes/class-wp-posts-list-table.php:250 +msgid "Empty Trash" +msgstr "Vider la Corbeille" +======= #: wp-admin/includes/class-wp-comments-list-table.php:174 msgid "Pending (%s)" msgid_plural "Pending (%s)" msgstr[0] "En attente (%s)" msgstr[1] "En attente (%s)" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:123 +#: wp-admin/includes/class-wp-media-list-table.php:596 +#: wp-admin/includes/class-wp-media-list-table.php:612 +#: wp-admin/includes/class-wp-posts-list-table.php:1068 +#: wp-admin/includes/meta-boxes.php:327 +msgid "Trash" +msgstr "Mettre Ã la Corbeille" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:158 +msgid "No comments found." +msgstr "Aucun commentaire trouvÃ©." +======= #: wp-admin/includes/class-wp-comments-list-table.php:173 msgctxt "comments" msgid "All" @@ -8577,267 +28896,965 @@ msgstr[1] "Tout" #: wp-admin/includes/class-wp-comments-list-table.php:162 msgid "No comments found." msgstr "Aucun commentaire trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2745 +#: wp-admin/includes/plugin-install.php:496 +msgid "(based on %s rating)" +msgid_plural "(based on %s ratings)" +msgstr[0] "(basÃ©e sur %s vote)" +msgstr[1] "(basÃ©e sur %s votes)" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:66 +msgid "Post updated. View post" +msgstr "Article mis Ã jour. Afficher l’article" +======= #: wp-admin/includes/class-wp-comments-list-table.php:160 msgid "No comments awaiting moderation." msgstr "Aucun commentaire en attente de modÃ©ration." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 2: comment date, 3: comment time +#: wp-admin/includes/class-wp-comments-list-table.php:592 +msgid "Submitted on %2$s at %3$s" +msgstr "EnvoyÃ© le %2$s Ã %3$s" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:67 wp-admin/edit-form-advanced.php:83 +msgid "Custom field updated." +msgstr "Champ personnalisÃ© mis Ã jour." +======= #: wp-admin/includes/bookmark.php:303 wp-admin/link-manager.php:12 #: wp-admin/link-manager.php:67 msgid "You do not have sufficient permissions to edit the links for this site." msgstr "Vous n’avez pas les droits suffisants pour modifier les liens de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:774 +#: wp-admin/includes/class-wp-list-table.php:777 +msgid "Current Page" +msgstr "Page actuelle" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:68 wp-admin/edit-form-advanced.php:84 +msgid "Custom field deleted." +msgstr "Champ personnalisÃ© supprimÃ©." +======= #: wp-admin/includes/bookmark.php:300 msgid "If you are looking to use the link manager, please install the Link Manager plugin." msgstr "Si vous souhaitez utiliser le gestionnaire de liens, veuillez installer l’extension Link Manager." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:783 +msgctxt "paging" +msgid "%1$s of %2$s" +msgstr "%1$s sur %2$s" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:69 +msgid "Post updated." +msgstr "Article mis Ã jour." +======= #: wp-admin/includes/bookmark.php:200 msgid "Could not insert link into the database" msgstr "Impossible d’insÃ©rer le lien dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:179 +msgid "This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow." +msgstr "Cet Ã©cran vous donne accÃ¨s Ã tous vos articles. Vous pouvez personnaliser son affichage afin qu’il corresponde au mieux Ã vos besoins." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:71 +msgid "Post restored to revision from %s" +msgstr "Article rÃ©tabli Ã partir de la rÃ©vision du %s" +======= #: wp-admin/includes/bookmark.php:192 msgid "Could not update link in the database" msgstr "Impossible de mettre Ã jour le lien dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:183 +msgid "Screen Content" +msgstr "Contenu de l’Ã©cran" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:72 +msgid "Post published. View post" +msgstr "Article publiÃ©. Afficher l’article" +======= #: wp-admin/includes/ajax-actions.php:2951 msgid "Unable to connect to the filesystem. Please confirm your credentials." msgstr "Impossible de se connecter au systÃ¨me de fichier. Veuillez confirmer vos informations dâidentification." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:185 +msgid "You can customize the display of this screen’s contents in a number of ways:" +msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:73 +msgid "Post saved." +msgstr "Article enregistrÃ©." +======= #: wp-admin/includes/ajax-actions.php:2904 msgid "You do not have sufficient permissions to update plugins on this site." msgstr "Vous nâavez pas les permissions suffisantes pour mettre Ã jour les extensions de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:195 wp-admin/upload.php:188 +msgid "Available Actions" +msgstr "Actions disponibles" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:74 +msgid "Post submitted. Preview post" +msgstr "Article proposÃ©. PrÃ©visualiser l’article" +======= #. translators: 1: User's display name. #: wp-admin/includes/ajax-actions.php:2871 msgid "%s has been logged out." msgstr "%s a Ã©tÃ© dÃ©connectÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:199 +msgid "Edit takes you to the editing screen for that post. You can also reach that screen by clicking on the post title." +msgstr "Modifier vous envoie sur l’Ã©cran de modification de cet article. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le titre de l’article." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:75 +msgid "Post scheduled for: %1$s. Preview post" +msgstr "Article prÃ©vu pour le : %1$s. PrÃ©visualiser l’article" +======= #: wp-admin/includes/ajax-actions.php:2867 msgid "You are now logged out everywhere else." msgstr "Vous Ãªtes dÃ©sormais dÃ©connectÃ© partout ailleurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:200 +msgid "Quick Edit provides inline access to the metadata of your post, allowing you to update post details without leaving this screen." +msgstr "Modification Rapide vous donne un accÃ¨s rapide aux mÃ©tadonnÃ©es de votre article, vous permettant de mettre Ã jour certains dÃ©tails sans devoir quitter la liste." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:77 wp-admin/edit-form-advanced.php:90 +#: wp-admin/edit-form-comment.php:103 wp-admin/includes/meta-boxes.php:165 +#: wp-admin/includes/meta-boxes.php:296 wp-admin/includes/revision.php:171 +msgid "M j, Y @ G:i" +msgstr "j F Y \\Ã G \\h i \\m\\i\\n" +======= #: wp-admin/includes/ajax-actions.php:2859 msgid "Could not log out user sessions. Please try again." msgstr "Impossible de dÃ©connecter les sessions utilisateur. Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:201 +msgid "Trash removes your post from this list and places it in the trash, from which you can permanently delete it." +msgstr "Mettre Ã la Corbeille retire l’article de la liste et le dÃ©placer dans la Corbeille, d’oÃ¹ vous pourrez le supprimer dÃ©finitivement." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:78 +msgid "Post draft updated. Preview post" +msgstr "Brouillon d’article mis Ã jour. PrÃ©visualiser l’article" +======= #: wp-admin/includes/ajax-actions.php:2772 msgid "This preview is unavailable in the editor." msgstr "Cette prÃ©visualisation n'est pas disponible dans l'Ã©diteur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:202 +msgid "Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post’s status." +msgstr "AperÃ§u vous donnera une idÃ©e de ce Ã quoi votre brouillon ressemble si vous le publiez tel quel. Afficher vous enverra sur votre site, Ã l’adresse de l’article. L’action disponible dÃ©pend de l’Ã©tat de votre article." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:82 +msgid "Page updated. View page" +msgstr "Page mise Ã jour. Afficher la page" +======= #: wp-admin/includes/ajax-actions.php:2742 msgid "%s failed to embed." msgstr "%s n’a pas pu Ãªtre intÃ©grÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:228 +msgid "Managing Pages" +msgstr "Gestion de pages" +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:85 +msgid "Page updated." +msgstr "Page mise Ã jour." +======= #: wp-admin/includes/ajax-actions.php:2690 #: wp-admin/includes/plugin-install.php:485 msgid "(based on %s rating)" msgid_plural "(based on %s ratings)" msgstr[0] "(basÃ©e sur %s vote)" msgstr[1] "(basÃ©e sur %s votes)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:230 +msgid "Managing pages is very similar to managing posts, and the screens can be customized in the same way." +msgstr "La gestion des pages est trÃ¨s proche de celle des articles, et les Ã©crans peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:86 +msgid "Page restored to revision from %s" +msgstr "Page rÃ©tablie Ã partir de la rÃ©vision du %s" +======= #: wp-admin/includes/ajax-actions.php:1872 msgid "You don't have permission to attach files to this post." msgstr "Vous n’avez pas l’autorisation d'attacher des fichiers Ã cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:150 +msgid "Once you’ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site." +msgstr "Une fois que le fichier tÃ©lÃ©chargÃ© a Ã©tÃ© enregistrÃ©, vous pouvez utiliser la fonction Importer d’un autre site WordPress pour importer ce fichier dans cet autre site." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:87 +msgid "Page published. View page" +msgstr "Page publiÃ©e. Afficher la page" +======= #: wp-admin/includes/ajax-actions.php:1858 msgid "You don't have permission to upload files." msgstr "Vous n’avez pas l’autorisation de mettre en ligne des fichiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:36 +msgid "WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its license, the GPL." +msgstr "WordPress est un logiciel libre et au code ouvert (open-source), conÃ§u par une communautÃ© de dÃ©veloppeurs majoritairement volontaires, partout dans le monde. WordPress est livrÃ© avec des libertÃ©s formidables et qui changent la vision du monde, grÃ¢ce Ã sa licence, la GPL." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:89 +msgid "Page submitted. Preview page" +msgstr "Page proposÃ©e. PrÃ©visualiser la page" +======= #: wp-admin/includes/ajax-actions.php:1680 #: wp-admin/includes/class-wp-posts-list-table.php:867 #: wp-admin/includes/class-wp-posts-list-table.php:1292 #: wp-admin/includes/meta-boxes.php:79 wp-admin/includes/meta-boxes.php:102 msgid "Scheduled" msgstr "PlanifiÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:39 +msgid "You have the freedom to run the program, for any purpose." +msgstr "Vous Ãªtes libre de modifier ce programme, dans n’importe quel but." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:90 +msgid "Page scheduled for: %1$s. Preview page" +msgstr "Page prÃ©vue pour le : %1$s. Afficher la page" +======= #: wp-admin/includes/ajax-actions.php:1668 #: wp-admin/includes/class-wp-posts-list-table.php:380 #: wp-admin/includes/class-wp-posts-list-table.php:1073 msgid "Date" msgstr "Date" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:40 +msgid "You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish." +msgstr "Vous avez accÃ¨s au code source, Ãªtes libres d’Ã©tudier la maniÃ¨re dont le programme fonctionne, et libres de le modifier pour en faire ce que vous souhaitez." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:91 +msgid "Page draft updated. Preview page" +msgstr "Brouillon de page mis Ã jour. PrÃ©visualiser la page" +======= #: wp-admin/includes/ajax-actions.php:1668 msgid "Type" msgstr "Type" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:41 +msgid "You have the freedom to redistribute copies of the original program so you can help your neighbor." +msgstr "Vous Ãªtes libres de redistribuer des copies du programme original, afin d’aider votre prochain." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:202 +msgid "Send Trackbacks" +msgstr "Envoyer des rÃ©troliens" +======= #: wp-admin/includes/ajax-actions.php:1522 msgid "Saving is disabled: %s is currently editing this post." msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:42 +msgid "You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes." +msgstr "Vous Ãªtes libres de distribuer Ã autrui des copies de votre propre version modifiÃ©e de ce programme. Ce faisant, vous offrez Ã la communautÃ© la possibilitÃ© de profiter de vos modifications." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:205 +msgid "Custom Fields" +msgstr "Champs personnalisÃ©s" +======= #: wp-admin/includes/ajax-actions.php:1522 msgid "Saving is disabled: %s is currently editing this page." msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:52 +msgid "Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them." +msgstr "Tous les thÃ¨mes et extensions disponibles sur le rÃ©pertoire de WordPress.org respectent Ã 100%% la licence GPL, ou une licence libre et compatible. Ainsi, vous pouvez en toute sÃ»retÃ© y chercher des extensions et des thÃ¨mes. Si vous tÃ©lÃ©chargez une extension ou un thÃ¨me en provenance d’une autre source, vÃ©rifiez bien qu’il respecte la licence GPL. Si ce n’est pas le cas, l’Ã©quipe de WordPress ne vous le recommande alors pas." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:218 wp-admin/menu.php:225 +msgid "Discussion" +msgstr "Discussion" +======= #: wp-admin/includes/ajax-actions.php:1521 msgid "Someone" msgstr "Quelqu’un" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:22 +msgid "This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform." +msgstr "Cet Ã©cran liste les liens vers les extensions servant Ã importer des donnÃ©es en provenance d’autres plates-formes de blogs ou gestionnaires de contenus. Choisissez la plate-forme d’origine, et cliquez sur « Installer maintenant » dans la fenÃªtre qui s’affiche. Si vous ne trouvez pas votre plate-forme, cliquez sur le lien « Recherche » dans le DÃ©pÃ´t d’Extensions et lancez une recherche - peut-Ãªtre qu’une autre extension rÃ©pondra Ã vos attentes." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:224 +#: wp-admin/includes/class-wp-posts-list-table.php:954 +#: wp-admin/includes/class-wp-terms-list-table.php:134 +#: wp-admin/includes/class-wp-terms-list-table.php:431 +#: wp-admin/includes/meta-boxes.php:665 +msgid "Slug" +msgstr "Identifiant" +======= #: wp-admin/includes/ajax-actions.php:1516 wp-admin/includes/media.php:3044 #: wp-admin/includes/post.php:206 wp-admin/includes/post.php:1661 #: wp-admin/includes/post.php:1665 msgid "You are not allowed to edit this post." msgstr "Vous n’avez pas l’autorisation de modifier cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:23 +msgid "In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently." +msgstr "Dans les versions prÃ©cÃ©dentes de WordPress, tous les importateurs Ã©taient directement inclus . Nous les avons convertis en extensions, car la plupart des gens ne s’en servent que trÃ¨s rarement, voire une seule fois." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:523 wp-admin/includes/ajax-actions.php:2055 +msgid "Last edited by %1$s on %2$s at %3$s" +msgstr "DerniÃ¨re modification par %1$s, le %2$s Ã %3$s" +======= #: wp-admin/includes/ajax-actions.php:1513 wp-admin/includes/post.php:204 msgid "You are not allowed to edit this page." msgstr "Vous n’avez pas l’autorisation de modifier cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:103 +msgid "This importer is not installed. Please install importers from the main site." +msgstr "Cet importateur n’est pas installÃ©. Veuillez installer les importateurs depuis le site principal." +||||||| .r11156 +#: wp-admin/edit-form-advanced.php:525 wp-admin/includes/ajax-actions.php:2057 +msgid "Last edited on %1$s at %2$s" +msgstr "DerniÃ¨re modification le %1$s Ã %2$s" +======= #: wp-admin/includes/ajax-actions.php:1262 msgid "User %s added" msgstr "Utilisateur %s ajoutÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: user_login, 2: user_email +#: wp-admin/includes/ajax-actions.php:291 +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:81 +msgid "View Comment" +msgstr "Afficher le commentaire" +======= #: wp-admin/includes/ajax-actions.php:1198 msgid "Please provide a custom field name." msgstr "Veuillez saisir un nom pour le champ personnalisÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:960 +msgid "ERROR: you are replying to a comment on a draft post." +msgstr "ERREUR : vous Ãªtre en train de laisser un commentaire sur un brouillon." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:104 +msgid "Submitted on: %1$s" +msgstr "EnvoyÃ© le : %1$s" +======= #: wp-admin/includes/ajax-actions.php:1175 #: wp-admin/includes/ajax-actions.php:1180 #: wp-admin/includes/ajax-actions.php:1200 msgid "Please provide a custom field value." msgstr "Veuillez saisir une valeur pour le champ personnalisÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:984 +#: wp-admin/includes/ajax-actions.php:1054 +msgid "ERROR: please type a comment." +msgstr "ERREUR : veuillez saisir un commentaire." +||||||| .r11156 +#: wp-admin/includes/template.php:470 +msgid "Update Comment" +msgstr "Mettre Ã jour le commentaire" +======= #: wp-admin/includes/ajax-actions.php:1163 msgid "Draft created on %1$s at %2$s" msgstr "Brouillon crÃ©Ã© le %1$s Ã %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:180 +msgid "No comments awaiting moderation." +msgstr "Aucun commentaire en attente de modÃ©ration." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:32 +msgid "Name:" +msgstr "Nom :" +======= #: wp-admin/includes/ajax-actions.php:962 #: wp-admin/includes/ajax-actions.php:1030 msgid "ERROR: please type a comment." msgstr "ERREUR : veuillez saisir un commentaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:76 +#: wp-admin/includes/class-wp-links-list-table.php:321 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:176 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:496 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:325 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:403 +#: wp-admin/includes/class-wp-ms-users-list-table.php:92 +#: wp-admin/includes/class-wp-ms-users-list-table.php:409 +#: wp-admin/includes/class-wp-plugins-list-table.php:372 +#: wp-admin/includes/class-wp-plugins-list-table.php:499 +#: wp-admin/includes/class-wp-plugins-list-table.php:512 +#: wp-admin/includes/class-wp-terms-list-table.php:146 +#: wp-admin/includes/class-wp-terms-list-table.php:415 +#: wp-admin/includes/class-wp-themes-list-table.php:189 +#: wp-admin/includes/class-wp-users-list-table.php:201 +#: wp-admin/includes/class-wp-users-list-table.php:379 +#: wp-admin/includes/media.php:1473 wp-admin/includes/meta-boxes.php:826 +#: wp-admin/includes/template.php:647 wp-admin/includes/widgets.php:246 +#: wp-admin/themes.php:299 wp-admin/themes.php:413 wp-admin/widgets.php:289 +msgid "Delete" +msgstr "Supprimer " +||||||| .r11156 +#: wp-admin/edit-form-comment.php:39 +msgid "E-mail (%s):" +msgstr "E-mail (%s) : " +======= #: wp-admin/includes/ajax-actions.php:958 msgid "Sorry, you must be logged in to reply to a comment." msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©pondre Ã un commentaire." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:601 +#: wp-admin/includes/class-wp-media-list-table.php:620 +#: wp-admin/includes/class-wp-ms-users-list-table.php:315 +#: wp-admin/includes/class-wp-posts-list-table.php:1083 +#: wp-admin/includes/class-wp-terms-list-table.php:417 +msgid "View" +msgstr "Afficher" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:39 +msgid "send e-mail" +msgstr "envoyer l’e-mail" +======= #: wp-admin/includes/ajax-actions.php:938 msgid "ERROR: you are replying to a comment on a draft post." msgstr "ERREUR : vous Ãªtre en train de laisser un commentaire sur un brouillon." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:210 +msgid "When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears." +msgstr "Vous pouvez Ã©galement modifier plusieurs articles en mÃªme temps. Cochez les cases des articles que vous voulez modifier, sÃ©lectionnez l’option « Modifier » du menu « Actions groupÃ©es », et cliquez sur « Appliquer ». Vous pourrez alors d’un coup modifier les mÃ©tadonnÃ©es (catÃ©gories, auteur, etc.) pour tous les articles sÃ©lectionnÃ©s. Pour retirer un article de la sÃ©lection, cliquez simplement sur la croix Ã gauche de son titre dans la zone « Modifications groupÃ©es » qui apparaÃ®t." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:41 +msgid "E-mail:" +msgstr "E-mail :" +======= #: wp-admin/includes/ajax-actions.php:692 msgid "Comment %d does not exist" msgstr "Le commentaire %d n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:231 +msgid "You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once." +msgstr "Vous pouvez Ã©galement rÃ©aliser les mÃªmes sortes d’actions, comme rÃ©duire la liste par le biais des filtres, en passant par les liens qui apparaissent quand la souris passe au-dessus d’une ligne, ou en utilisant le menu « Actions groupÃ©es » pour modifier les mÃ©tadonnÃ©es de plusieurs pages d’un seul coup." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:50 +msgid "visit site" +msgstr "aller sur le site" +======= #: wp-admin/includes/ajax-actions.php:382 msgid "%s item" msgid_plural "%s items" msgstr[0] "%s Ã©lÃ©ment" msgstr[1] "%s Ã©lÃ©ments" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:123 +msgid "If the importer you need is not listed, search the plugin directory to see if an importer is available." +msgstr "Si l’importateur dont vous avec besoin n’est pas prÃ©sent, lancez une recherche dans le dÃ©pÃ´t d’extensions pour voir s’il s’y trouve." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:52 +msgid "URL (%s):" +msgstr "Adresse web (%s) :" +======= #. translators: 1: user_login, 2: user_email #: wp-admin/includes/ajax-actions.php:287 msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:209 +msgid "You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply." +msgstr "Vous pouvez Ã©galement modifier plusieurs articles Ã la fois, ou les dÃ©placer dans la Corbeille d’un coup. SÃ©lectionnez les articles sur lesquels vous voulez lancer une action, puis sÃ©lectionnez l’action que vous voulez lancer dans le menu « Actions groupÃ©es » et cliquez sur « Appliquer »." +||||||| .r11156 +#: wp-admin/edit-form-comment.php:54 +msgid "URL:" +msgstr "Adresse web :" +======= #: wp-admin/import.php:123 msgid "If the importer you need is not listed, search the plugin directory to see if an importer is available." msgstr "Si l’importateur dont vous avec besoin n’est pas prÃ©sent, lancez une recherche dans le dÃ©pÃ´t d’extensions pour voir s’il s’y trouve." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:45 +msgid "WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to check out our trademark guidelines first." +msgstr "WordPress croÃ®t Ã chaque fois que vous en parlez Ã vos amis, et cela est Ã©galement vrai pour les milliers de sociÃ©tÃ©s et services dans le monde construits Ã l’aide de ou autour de WordPress. Nous sommes flattÃ©s chaque fois que quelqu’un vante les mÃ©rites de cet outil ; veillez cependant Ã respecter les conseils d’utilisation de notre marque dÃ©posÃ©e." +||||||| .r11156 +#: wp-admin/edit-tag-form.php:101 wp-admin/edit-tags.php:457 +msgid "The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." +msgstr "L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union." +======= #: wp-admin/import.php:103 msgid "This importer is not installed. Please install importers from the main site." msgstr "Cet importateur n’est pas installÃ©. Veuillez installer les importateurs depuis le site principal." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:574 +msgid "Select comment" +msgstr "SÃ©lectionnez un commentaire" +||||||| .r11156 +#: wp-admin/edit-tag-form.php:118 wp-admin/edit-tags.php:504 +msgid "The description is not prominent by default; however, some themes may show it." +msgstr "La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +======= #: wp-admin/import.php:100 msgid "Install importer" msgstr "Installer l’importateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:164 +#: wp-admin/includes/class-wp-media-list-table.php:324 +#: wp-admin/includes/class-wp-ms-sites-list-table.php:248 +#: wp-admin/includes/class-wp-ms-users-list-table.php:187 +#: wp-admin/includes/class-wp-plugins-list-table.php:579 +#: wp-admin/includes/class-wp-posts-list-table.php:693 +#: wp-admin/includes/class-wp-terms-list-table.php:330 +#: wp-admin/includes/class-wp-users-list-table.php:396 +msgid "Select %s" +msgstr "SÃ©lectionner %s" +||||||| .r11156 +#: wp-admin/edit-link-form.php:14 +msgid "Links / Edit Link" +msgstr "Liens / Modifier le lien" +======= #: wp-admin/import.php:93 msgid "Activate importer" msgstr "Activer l’importateur" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: column name +#: wp-admin/includes/class-wp-media-list-table.php:281 +msgctxt "column name" +msgid "Uploaded to" +msgstr "Mis en ligne sur " +||||||| .r11156 +#: wp-admin/edit-link-form.php:15 wp-admin/includes/meta-boxes.php:809 +msgid "Update Link" +msgstr "Mettre Ã jour le lien" +======= #: wp-admin/import.php:75 msgid "No importers are available." msgstr "Aucun outil d’importation n’est disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/freedoms.php:54 +msgid "Don’t you wish all software came with these freedoms? So do we! For more information, check out the Free Software Foundation." +msgstr "Ne prÃ©fÃ©reriez-vous pas que tous vos logiciels vous donnent autant de libertÃ© ? Nous aussi ! Pour obtenir plus d’informations, rendez-vous sur le site de la Free Software Foundation, ou en franÃ§ais, ceux de l’April et de l’Aful." +||||||| .r11156 +#: wp-admin/edit-link-form.php:19 +msgid "Links / Add New Link" +msgstr "Liens / Ajouter un nouveau lien" +======= #: wp-admin/import.php:59 msgid "If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:" msgstr "Si vous avez des articles ou des commentaires dans un autre systÃ¨me de site, WordPress peut les importer dans votre site actuel. Pour commencer, choisissez un systÃ¨me d’origine ci-dessous :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/bookmark.php:304 +msgid "If you are looking to use the link manager, please install the Link Manager plugin." +msgstr "Si vous souhaitez utiliser le gestionnaire de liens, veuillez installer l’extension Link Manager." +||||||| .r11156 +#: wp-admin/edit-link-form.php:30 wp-admin/includes/nav-menu.php:174 +#: wp-admin/includes/nav-menu.php:1221 +msgid "Link Relationship (XFN)" +msgstr "Relation avec le propriÃ©taire du site liÃ© (XFN)" +======= #: wp-admin/import.php:57 msgid "The %s importer is invalid or is not installed." msgstr "L’importateur %s est invalide ou n’est pas installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:199 +msgctxt "comments" +msgid "All" +msgid_plural "All" +msgstr[0] "Tout" +msgstr[1] "Tout" +||||||| .r11156 +#: wp-admin/edit-link-form.php:76 +msgid "Link added." +msgstr "Lien ajoutÃ©." +======= #: wp-admin/import.php:57 wp-admin/users.php:220 msgid "ERROR:" msgstr "ERREUR :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:200 +msgid "Pending (%s)" +msgid_plural "Pending (%s)" +msgstr[0] "En attente (%s)" +msgstr[1] "En attente (%s)" +||||||| .r11156 +#: wp-admin/edit-link-form.php:97 +msgid "Example: Nifty blogging software" +msgstr "Exemple : Logiciel de crÃ©ation de sites rapide, puissant et efficace" +======= #: wp-admin/import.php:28 msgid "Documentation on Import" msgstr "Documentation sur l’importation (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:202 +msgid "Spam (%s)" +msgid_plural "Spam (%s)" +msgstr[0] "IndÃ©sirable (%s)" +msgstr[1] "IndÃ©sirables (%s)" +||||||| .r11156 +#: wp-admin/edit-link-form.php:102 +msgid "Web Address" +msgstr "Adresse web" +======= #: wp-admin/import.php:23 msgid "In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently." msgstr "Dans les versions prÃ©cÃ©dentes de WordPress, tous les importateurs Ã©taient directement inclus . Nous les avons convertis en extensions, car la plupart des gens ne s’en servent que trÃ¨s rarement, voire une seule fois." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:203 +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeille (%s)" +||||||| .r11156 +#: wp-admin/edit-link-form.php:105 +msgid "Example: http://wordpress.org/ — don’t forget the http://" +msgstr "Exemple : http://www.wordpress-fr.net/ — Et n’oubliez pas le http:// !" +======= #: wp-admin/import.php:22 msgid "This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform." msgstr "Cet Ã©cran liste les liens vers les extensions servant Ã importer des donnÃ©es en provenance d’autres plates-formes de blogs ou gestionnaires de contenus. Choisissez la plate-forme d’origine, et cliquez sur « Installer maintenant » dans la fenÃªtre qui s’affiche. Si vous ne trouvez pas votre plate-forme, cliquez sur le lien « Recherche » dans le DÃ©pÃ´t d’Extensions et lancez une recherche - peut-Ãªtre qu’une autre extension rÃ©pondra Ã vos attentes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1187 +msgid "Draft created on %1$s at %2$s" +msgstr "Brouillon crÃ©Ã© le %1$s Ã %2$s" +||||||| .r11156 +#: wp-admin/edit-link-form.php:113 +msgid "This will be shown when someone hovers over the link in the blogroll, or optionally below the link." +msgstr "Cette description sera affichÃ©e lors du survol du lien dans la liste de liens ; elle pourra Ã©galement apparaÃ®tre sous le lien si votre thÃ¨me le prÃ©voit." +======= #: wp-admin/import.php:15 msgid "You do not have sufficient permissions to import content in this site." msgstr "Vous n’avez pas les droits suffisants pour importer du contenu dans ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-ssh2.php:121 +msgid "Public and Private keys incorrect for %s" +msgstr "Les clÃ©s publiques et privÃ©es de %s ne sont pas correctes" +||||||| .r11156 +#: wp-admin/edit-tag-form.php:86 wp-admin/edit-tags.php:451 +msgid "The name is how it appears on your site." +msgstr "Ce nom est utilisÃ© un peu partout sur votre site." +======= #: wp-admin/freedoms.php:54 msgid "Don’t you wish all software came with these freedoms? So do we! For more information, check out the Free Software Foundation." msgstr "Ne prÃ©fÃ©reriez-vous pas que tous vos logiciels vous donnent autant de libertÃ© ? Nous aussi ! Pour obtenir plus d’informations, rendez-vous sur le site de la Free Software Foundation, ou en franÃ§ais, ceux de l’April et de l’Aful." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:261 +#: wp-admin/includes/class-wp-comments-list-table.php:521 +#: wp-admin/includes/class-wp-media-list-table.php:120 +#: wp-admin/includes/class-wp-media-list-table.php:610 +#: wp-admin/includes/class-wp-posts-list-table.php:286 +#: wp-admin/includes/class-wp-posts-list-table.php:1066 +msgid "Restore" +msgstr "RÃ©tablir" +||||||| .r11156 +#: wp-admin/edit-tag-form.php:110 wp-admin/edit-tags.php:497 +msgid "Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional." +msgstr "Les catÃ©gories, contrairement aux mots-clÃ©s, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e Jazz, et Ã l’intÃ©rieur, plusieurs catÃ©gories comme Bebop et Big Band. Ceci est totalement facultatif." +======= #: wp-admin/freedoms.php:52 msgid "Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them." msgstr "Tous les thÃ¨mes et extensions disponibles sur le rÃ©pertoire de WordPress.org respectent Ã 100%% la licence GPL, ou une licence libre et compatible. Ainsi, vous pouvez en toute sÃ»retÃ© y chercher des extensions et des thÃ¨mes. Si vous tÃ©lÃ©chargez une extension ou un thÃ¨me en provenance d’une autre source, vÃ©rifiez bien qu’il respecte la licence GPL. Si ce n’est pas le cas, l’Ã©quipe de WordPress ne vous le recommande alors pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:273 +msgid "Category not added." +msgstr "CatÃ©gorie non ajoutÃ©e." +||||||| .r11156 +#: wp-admin/edit-tags.php:252 +msgid "Item added." +msgstr "Contenu ajoutÃ©." +======= #: wp-admin/freedoms.php:45 msgid "WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to check out our trademark guidelines first." msgstr "WordPress croÃ®t Ã chaque fois que vous en parlez Ã vos amis, et cela est Ã©galement vrai pour les milliers de sociÃ©tÃ©s et services dans le monde construits Ã l’aide de ou autour de WordPress. Nous sommes flattÃ©s chaque fois que quelqu’un vante les mÃ©rites de cet outil ; veillez cependant Ã respecter les conseils d’utilisation de notre marque dÃ©posÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:274 +msgid "Category not updated." +msgstr "CatÃ©gorie non mise Ã jour." +||||||| .r11156 +#: wp-admin/edit-tags.php:253 +msgid "Item deleted." +msgstr "Contenu supprimÃ©." +======= #: wp-admin/freedoms.php:42 msgid "You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes." msgstr "Vous Ãªtes libres de distribuer Ã autrui des copies de votre propre version modifiÃ©e de ce programme. Ce faisant, vous offrez Ã la communautÃ© la possibilitÃ© de profiter de vos modifications." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:275 +msgid "Categories deleted." +msgstr "CatÃ©gories supprimÃ©es." +||||||| .r11156 +#: wp-admin/edit-tags.php:254 +msgid "Item updated." +msgstr "Contenu mis Ã jour." +======= #: wp-admin/freedoms.php:41 msgid "You have the freedom to redistribute copies of the original program so you can help your neighbor." msgstr "Vous Ãªtes libres de redistribuer des copies du programme original, afin d’aider votre prochain." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:261 +msgid "%s page updated." +msgid_plural "%s pages updated." +msgstr[0] "%s page mise Ã jour." +msgstr[1] "%s pages mises Ã jour." +||||||| .r11156 +#: wp-admin/edit-tags.php:255 +msgid "Item not added." +msgstr "Contenu non ajoutÃ©." +======= #: wp-admin/freedoms.php:40 msgid "You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish." msgstr "Vous avez accÃ¨s au code source, Ãªtes libres d’Ã©tudier la maniÃ¨re dont le programme fonctionne, et libres de le modifier pour en faire ce que vous souhaitez." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:264 +msgid "%s page permanently deleted." +msgid_plural "%s pages permanently deleted." +msgstr[0] "%s page dÃ©finitivement supprimÃ©e." +msgstr[1] "%s pages dÃ©finitivement supprimÃ©es." +||||||| .r11156 +#: wp-admin/edit-tags.php:257 +msgid "Items deleted." +msgstr "Ãlements supprimÃ©s." +======= #: wp-admin/freedoms.php:39 msgid "You have the freedom to run the program, for any purpose." msgstr "Vous Ãªtes libre de modifier ce programme, dans n’importe quel but." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:265 +msgid "%s page moved to the Trash." +msgid_plural "%s pages moved to the Trash." +msgstr[0] "%s page dÃ©placÃ©e dans la Corbeille." +msgstr[1] "%s pages dÃ©placÃ©es dans la Corbeille." +||||||| .r11156 +#: wp-admin/edit-tags.php:336 +msgid "Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s." +msgstr "Ã savoir : supprimer une catÃ©gorie ne supprime pas les articles qu’elle contient. Les articles affectÃ©s uniquement Ã la catÃ©gorie supprimÃ©e seront affectÃ©s Ã celle par dÃ©faut  : %s." +======= #: wp-admin/freedoms.php:36 msgid "WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its license, the GPL." msgstr "WordPress est un logiciel libre et au code ouvert (open-source), conÃ§u par une communautÃ© de dÃ©veloppeurs majoritairement volontaires, partout dans le monde. WordPress est livrÃ© avec des libertÃ©s formidables et qui changent la vision du monde, grÃ¢ce Ã sa licence, la GPL." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:266 +msgid "%s page restored from the Trash." +msgid_plural "%s pages restored from the Trash." +msgstr[0] "%s page rÃ©cupÃ©rÃ©e depuis la Corbeille." +msgstr[1] "%s pages rÃ©cupÃ©rÃ©es depuis la Corbeille." +||||||| .r11156 +#: wp-admin/edit.php:122 wp-admin/post.php:291 +msgid "You are not allowed to delete this item." +msgstr "Vous n’avez pas l’autorisation de supprimer ce contenu." +======= #: wp-admin/export.php:238 msgid "Download Export File" msgstr "TÃ©lÃ©charger le fichier d’export" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-filesystem-base.php:247 +msgid "Looking for %1$s in %2$s" +msgstr "Recherche %1$s dans %2$s" +||||||| .r11156 +#: wp-admin/edit.php:243 +msgid "%s post updated." +msgid_plural "%s posts updated." +msgstr[0] "%s article mis Ã jour." +msgstr[1] "%s articles mis Ã jour." +======= #: wp-admin/export.php:183 wp-admin/export.php:215 #: wp-admin/includes/meta-boxes.php:68 msgid "Status:" msgstr "Ãtat :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:255 +msgid "%s post not updated, somebody is editing it." +msgid_plural "%s posts not updated, somebody is editing them." +msgstr[0] "%s article n’a pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." +msgstr[1] "%s articles n’ont pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:156 +msgctxt "posts" +msgid "Mine (%s)" +msgid_plural "Mine (%s)" +msgstr[0] "Le mien (%s)" +msgstr[1] "Les miens (%s)" +======= #: wp-admin/export.php:178 wp-admin/export.php:210 msgid "End Date" msgstr "Date de fin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:256 +msgid "%s post permanently deleted." +msgid_plural "%s posts permanently deleted." +msgstr[0] "%s article supprimÃ© dÃ©finitivement." +msgstr[1] "%s articles supprimÃ©s dÃ©finitivement." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:167 +msgctxt "posts" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tous (%s)" +msgstr[1] "Tous (%s)" +======= #: wp-admin/export.php:174 wp-admin/export.php:206 msgid "Start Date" msgstr "Date de dÃ©but" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:257 +msgid "%s post moved to the Trash." +msgid_plural "%s posts moved to the Trash." +msgstr[0] "%s article dÃ©placÃ© dans la Corbeille." +msgstr[1] "%s articles dÃ©placÃ©s dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:75 +#: wp-admin/includes/class-wp-posts-list-table.php:226 +msgid "View all categories" +msgstr "Voir toutes les catÃ©gories" +======= #: wp-admin/export.php:172 wp-admin/export.php:204 msgid "Date range:" msgstr "Date de crÃ©ation :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:258 +msgid "%s post restored from the Trash." +msgid_plural "%s posts restored from the Trash." +msgstr[0] "%s article rÃ©cupÃ©rÃ© depuis la Corbeille." +msgstr[1] "%s articles rÃ©cupÃ©rÃ©s depuis la Corbeille." +||||||| .r11156 +#: wp-admin/includes/class-wp-list-table.php:526 +msgid "Excerpt View" +msgstr "Liste avec extraits" +======= #: wp-admin/export.php:165 wp-admin/export.php:197 msgid "Authors:" msgstr "Auteur :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:263 +msgid "%s page not updated, somebody is editing it." +msgid_plural "%s pages not updated, somebody is editing them." +msgstr[0] "%s page n’a pas Ã©tÃ© mise Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." +msgstr[1] "%s pages n’ont pas Ã©tÃ© mises Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." +||||||| .r11156 +#: wp-admin/export.php:17 wp-admin/menu.php:215 +msgid "Export" +msgstr "Exporter" +======= #: wp-admin/export.php:162 wp-admin/export.php:168 wp-admin/export.php:185 #: wp-admin/export.php:200 wp-admin/export.php:217 msgid "All" msgstr "Tout" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:535 +#: wp-admin/includes/class-wp-posts-list-table.php:1061 +msgid "Edit this item inline" +msgstr "Modifier cet Ã©lÃ©ment sur place" +||||||| .r11156 +#: wp-admin/export.php:149 +msgid "When you click the button below WordPress will create an XML file for you to save to your computer." +msgstr "Cliquez sur ce bouton pour que WordPress crÃ©e un fichier XML que vous pourrez enregistrer sur votre ordinateur." +======= #: wp-admin/export.php:161 msgid "Categories:" msgstr "CatÃ©gories :" @@ -8870,694 +29887,2461 @@ msgstr "Ce format, que nous appelons WordPress eXtended RSS (ou WXR), contient t #: wp-admin/export.php:148 msgid "When you click the button below WordPress will create an XML file for you to save to your computer." msgstr "Cliquez sur ce bouton pour que WordPress crÃ©e un fichier XML que vous pourrez enregistrer sur votre ordinateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:187 +msgid "You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab." +msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran » ;" +||||||| .r11156 +#: wp-admin/export.php:150 +msgid "This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags." +msgstr "Ce format, que nous appelons WordPress eXtended RSS (ou WXR), contient tous vos articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et mots-clÃ©s." +======= #: wp-admin/export.php:53 msgid "Documentation on Export" msgstr "Documentation sur l’exportation (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:162 wp-admin/export.php:168 wp-admin/export.php:185 +#: wp-admin/export.php:200 wp-admin/export.php:217 +msgid "All" +msgstr "Tout" +||||||| .r11156 +#: wp-admin/export.php:239 +msgid "Download Export File" +msgstr "TÃ©lÃ©charger le fichier d’export" +======= #: wp-admin/export.php:48 msgid "Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format." msgstr "Une fois gÃ©nÃ©rÃ©, le fichier WXR peut Ãªtre importÃ© dans une autre installation WordPress, ou une autre plate-forme de blog capable de lire ce format." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:1010 +#: wp-admin/includes/nav-menu.php:865 wp-admin/includes/nav-menu.php:1055 +#: wp-admin/update-core.php:249 wp-admin/update-core.php:302 +#: wp-admin/update-core.php:334 wp-admin/update-core.php:353 +msgid "Select All" +msgstr "Tout sÃ©lectionner" +||||||| .r11156 +#: wp-admin/import.php:75 +msgid "No importers are available." +msgstr "Aucun outil d’importation n’est disponible." +======= #: wp-admin/export.php:47 msgid "You can export a file of your site’s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status." msgstr "Vous pouvez exporter le contenu de votre site dans un fichier, afin de l’importer dans une autre installation autonome ou une plate-forme. Le fichier d’export utilise un format de type XML, baptisÃ© WXR. Il peut contenir vos articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et Ã©tiquettes. Vous pouvez utiliser des filtres pour que le fichier WXR ne contienne les articles que d’une certaine plage de dates (par mois), un auteur donnÃ©, une catÃ©gorie prÃ©cise, ou des Ã©tats de publication." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1699 +msgid "Type" +msgstr "Type" +||||||| .r11156 +#: wp-admin/includes/media.php:1429 wp-admin/upgrade.php:68 +#: wp-admin/upgrade.php:100 +msgid "Continue" +msgstr "Continuer" +======= #: wp-admin/export.php:17 wp-admin/menu.php:229 msgid "Export" msgstr "Exporter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:289 +msgid "All comment types" +msgstr "Tous les types de commentaire" +||||||| .r11156 +#: wp-admin/export.php:159 wp-admin/includes/class-wp-users-list-table.php:266 +#: wp-admin/menu.php:49 +msgid "Posts" +msgstr "Articles" +======= #: wp-admin/export.php:13 msgid "You do not have sufficient permissions to export the content of this site." msgstr "Vous n’avez pas les droits suffisants pour exporter le contenu de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:413 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:517 +#: wp-admin/includes/class-wp-posts-list-table.php:823 +#: wp-admin/includes/plugin-install.php:471 wp-admin/includes/revision.php:208 +#: wp-admin/includes/revision.php:226 +msgid "%s ago" +msgstr "Il y a %s" +||||||| .r11156 +#: wp-admin/includes/import.php:158 +msgid "Blogger" +msgstr "Blogger" +======= #: wp-admin/edit.php:262 msgid "%s page restored from the Trash." msgid_plural "%s pages restored from the Trash." msgstr[0] "%s page rÃ©cupÃ©rÃ©e depuis la Corbeille." msgstr[1] "%s pages rÃ©cupÃ©rÃ©es depuis la Corbeille." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:629 +#: wp-admin/includes/class-wp-list-table.php:641 +msgid "No comments" +msgstr "Pas de commentaire" +||||||| .r11156 +#: wp-admin/includes/import.php:170 +msgid "LiveJournal" +msgstr "LiveJournal" +======= #: wp-admin/edit.php:261 msgid "%s page moved to the Trash." msgid_plural "%s pages moved to the Trash." msgstr[0] "%s page dÃ©placÃ©e dans la Corbeille." msgstr[1] "%s pages dÃ©placÃ©es dans la Corbeille." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:622 +msgid "%s comment" +msgid_plural "%s comments" +msgstr[0] "(%s commentaire)" +msgstr[1] "(%s commentaires)" +||||||| .r11156 +#: wp-admin/includes/import.php:176 +msgid "Movable Type and TypePad" +msgstr "Movable Type et TypePad" +======= #: wp-admin/edit.php:260 msgid "%s page permanently deleted." msgid_plural "%s pages permanently deleted." msgstr[0] "%s page dÃ©finitivement supprimÃ©e." msgstr[1] "%s pages dÃ©finitivement supprimÃ©es." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:800 +msgid "Last page" +msgstr "DerniÃ¨re page" +||||||| .r11156 +#: wp-admin/includes/import.php:182 +msgid "Blogroll" +msgstr "Liens" +======= #: wp-admin/edit.php:259 msgid "%s page not updated, somebody is editing it." msgid_plural "%s pages not updated, somebody is editing them." msgstr[0] "%s page n’a pas Ã©tÃ© mise Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." msgstr[1] "%s pages n’ont pas Ã©tÃ© mises Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:563 +#: wp-admin/includes/class-wp-list-table.php:500 +#: wp-admin/includes/class-wp-list-table.php:1261 +msgid "Show more details" +msgstr "Afficher plus de dÃ©tails" +||||||| .r11156 +#: wp-admin/includes/bookmark.php:192 +msgid "Could not update link in the database" +msgstr "Impossible de mettre Ã jour le lien dans la base de donnÃ©es" +======= #: wp-admin/edit.php:258 msgid "1 page not updated, somebody is editing it." msgstr "Une page nâa pas Ã©tÃ© mise Ã jour, car quelquâun est en train de la modifier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:757 +msgid "First page" +msgstr "PremiÃ¨re page" +||||||| .r11156 +#: wp-admin/includes/bookmark.php:200 +msgid "Could not insert link into the database" +msgstr "Impossible d’insÃ©rer le lien dans la base de donnÃ©es" +======= #: wp-admin/edit.php:257 msgid "%s page updated." msgid_plural "%s pages updated." msgstr[0] "%s page mise Ã jour." msgstr[1] "%s pages mises Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:149 +msgid "This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags." +msgstr "Ce format, que nous appelons WordPress eXtended RSS (ou WXR), contient tous vos articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et Ã©tiquettes." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-base.php:323 +msgid "Changing to %s" +msgstr "Modifier Ã %s" +======= #: wp-admin/edit.php:254 msgid "%s post restored from the Trash." msgid_plural "%s posts restored from the Trash." msgstr[0] "%s article rÃ©cupÃ©rÃ© depuis la Corbeille." msgstr[1] "%s articles rÃ©cupÃ©rÃ©s depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:190 +msgid "You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list." +msgstr "Vous pouvez affiner la liste pour qu’elle n’affiche que les articles d’une catÃ©gorie spÃ©cifique ou d’un mois donnÃ©, Ã l’aide du menu dÃ©roulant situÃ© au-dessus de la liste. Cliquez sur le bouton « Filtrer » aprÃ¨s avoir fait votre choix. Vous pouvez Ã©galement affiner la liste en cliquant sur l’auteur d’un article, sa catÃ©gorie ou une Ã©tiquette." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-base.php:335 +msgid "Found %s" +msgstr "TrouvÃ© %s" +======= #: wp-admin/edit.php:253 msgid "%s post moved to the Trash." msgid_plural "%s posts moved to the Trash." msgstr[0] "%s article dÃ©placÃ© dans la Corbeille." msgstr[1] "%s articles dÃ©placÃ©s dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:357 +msgid "Categories can be selectively converted to tags using the category to tag converter." +msgstr "Les catÃ©gories peuvent Ãªtre converties de maniÃ¨re sÃ©lective en Ã©tiquettes via le convertisseur catÃ©gories vers Ã©tiquettes." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:28 +msgid "The ftp PHP extension is not available" +msgstr "L’extension ftp de PHP n’est pas disponible" +======= #: wp-admin/edit.php:252 msgid "%s post permanently deleted." msgid_plural "%s posts permanently deleted." msgstr[0] "%s article supprimÃ© dÃ©finitivement." msgstr[1] "%s articles supprimÃ©s dÃ©finitivement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:47 +msgid "You can export a file of your site’s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status." +msgstr "Vous pouvez exporter le contenu de votre site dans un fichier, afin de l’importer dans une autre installation autonome ou une plate-forme. Le fichier d’export utilise un format de type XML, baptisÃ© WXR. Il peut contenir vos articles, pages, commentaires, champs personnalisÃ©s, catÃ©gories et Ã©tiquettes. Vous pouvez utiliser des filtres pour que le fichier WXR ne contienne les articles que d’une certaine plage de dates (par mois), un auteur donnÃ©, une catÃ©gorie prÃ©cise, ou des Ã©tats de publication." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:43 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:38 +msgid "FTP hostname is required" +msgstr "L’hÃ´te du FTP est obligatoire" +======= #: wp-admin/edit.php:251 msgid "%s post not updated, somebody is editing it." msgid_plural "%s posts not updated, somebody is editing them." msgstr[0] "%s article n’a pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de la modifier." msgstr[1] "%s articles n’ont pas Ã©tÃ© mis Ã jour : quelqu’un est dÃ©jÃ en train de les modifier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:362 +msgid "Tags can be selectively converted to categories using the tag to category converter." +msgstr "Les Ã©tiquettes peuvent Ãªtre converties de maniÃ¨re sÃ©lective en catÃ©gories via le convertisseur Ã©tiquettes vers catÃ©gories" +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:52 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:47 +msgid "FTP username is required" +msgstr "L’identifiant FTP est obligatoire" +======= #: wp-admin/edit.php:250 msgid "1 post not updated, somebody is editing it." msgstr "Un article nâa pas Ã©tÃ© mis Ã jour, car quelquâun est en train de le modifier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:281 +msgid "Tag updated." +msgstr "Ãtiquette mise Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:57 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:52 +msgid "FTP password is required" +msgstr "Le mot de passe FTP est obligatoire" +======= #: wp-admin/edit.php:249 msgid "%s post updated." msgid_plural "%s posts updated." msgstr[0] "%s article mis Ã jour." msgstr[1] "%s articles mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:282 +msgid "Tag not added." +msgstr "Ãtiquette non ajoutÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:73 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:64 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:69 +msgid "Failed to connect to FTP Server %1$s:%2$s" +msgstr "Impossible de me connecter au serveur FTP %1$s : %2$s" +======= #: wp-admin/edit.php:232 msgid "Documentation on Managing Pages" msgstr "Documentation sur la gestion des pages (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:283 +msgid "Tag not updated." +msgstr "Ãtiquette non mise Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ftpext.php:78 +#: wp-admin/includes/class-wp-filesystem-ftpsockets.php:74 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:111 +msgid "Username/Password incorrect for %s" +msgstr "Le couple identifiant / mot de passe est incorrect pour %s" +======= #: wp-admin/edit.php:227 msgid "You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once." msgstr "Vous pouvez Ã©galement rÃ©aliser les mÃªmes sortes d’actions, comme rÃ©duire la liste par le biais des filtres, en passant par les liens qui apparaissent quand la souris passe au-dessus d’une ligne, ou en utilisant le menu « Actions groupÃ©es » pour modifier les mÃ©tadonnÃ©es de plusieurs pages d’un seul coup." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:284 +msgid "Tags deleted." +msgstr "Ãtiquette supprimÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:50 +msgid "The ssh2 PHP extension is not available" +msgstr "L’extension ssh2 de PHP n’est pas disponible" +======= #: wp-admin/edit.php:226 msgid "Managing pages is very similar to managing posts, and the screens can be customized in the same way." msgstr "La gestion des pages est trÃ¨s proche de celle des articles, et les Ã©crans peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:280 +msgid "Tag deleted." +msgstr "Ãtiquette supprimÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:54 +msgid "The ssh2 PHP extension is available, however, we require the PHP5 function stream_get_contents()" +msgstr "L’extension ssh2 de PHP est disponible, mais nÃ©cessite la fonction PHP5 stream_get_contents()" +======= #: wp-admin/edit.php:224 msgid "Managing Pages" msgstr "Gestion de pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:279 +msgid "Tag added." +msgstr "Ãtiquette ajoutÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:65 +msgid "SSH2 hostname is required" +msgstr "Le nom de l’hÃ´te SSH2 est obligatoire" +======= #: wp-admin/edit.php:220 msgid "Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages." msgstr "Les pages sont comme des articles, en cela qu’elles ont un titre, un contenu et des mÃ©tadonnÃ©es associÃ©es ; mais elles diffÃ¨rent en cela qu’elles ne font pas partie du flux chronologique du blog - un peu comme des articles permanents. Les pages ne sont pas catÃ©gorisÃ©es et ne reÃ§oivent pas dâÃ©tiquettes, mais peuvent disposer d’une hiÃ©rarchie. En effet, vous pouvez imbriquer des pages sous d’autres pages, faisant de ces derniÃ¨res les « parentes » des premiÃ¨res, crÃ©ant ainsi un groupement de pages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:3022 +msgid "Unable to connect to the filesystem. Please confirm your credentials." +msgstr "Impossible de se connecter au systÃ¨me de fichier. Veuillez confirmer vos informations dâidentification." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:81 +msgid "SSH2 username is required" +msgstr "L’identifiant SSH2 est obligatoire" +======= #: wp-admin/edit.php:211 msgid "Documentation on Managing Posts" msgstr "Documentation sur la gestion des articles (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:664 +msgid "Y/m/d \\a\\t g:i a" +msgstr "d/m/Y \\Ã G \\h i \\m\\i\\n s \\s" +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:90 +msgid "SSH2 password is required" +msgstr "Le mot de passe SSH2 est obligatoire" +======= #: wp-admin/edit.php:206 msgid "When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears." msgstr "Vous pouvez Ã©galement modifier plusieurs articles en mÃªme temps. Cochez les cases des articles que vous voulez modifier, sÃ©lectionnez l’option « Modifier » du menu « Actions groupÃ©es », et cliquez sur « Appliquer ». Vous pourrez alors d’un coup modifier les mÃ©tadonnÃ©es (catÃ©gories, auteur, etc.) pour tous les articles sÃ©lectionnÃ©s. Pour retirer un article de la sÃ©lection, cliquez simplement sur la croix Ã gauche de son titre dans la zone « Modifications groupÃ©es » qui apparaÃ®t." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:262 +msgid "1 page not updated, somebody is editing it." +msgstr "Une page nâa pas Ã©tÃ© mise Ã jour, car quelquâun est en train de la modifier." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:105 +msgid "Failed to connect to SSH2 Server %1$s:%2$s" +msgstr "Impossible de me connecter au serveur SSH2 %1$s : %2$s" +======= #: wp-admin/edit.php:205 msgid "You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply." msgstr "Vous pouvez Ã©galement modifier plusieurs articles Ã la fois, ou les dÃ©placer dans la Corbeille d’un coup. SÃ©lectionnez les articles sur lesquels vous voulez lancer une action, puis sÃ©lectionnez l’action que vous voulez lancer dans le menu « Actions groupÃ©es » et cliquez sur « Appliquer »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:254 +msgid "1 post not updated, somebody is editing it." +msgstr "Un article nâa pas Ã©tÃ© mis Ã jour, car quelquâun est en train de le modifier." +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:116 +msgid "Public and Private keys incorrect for %s" +msgstr "Les clÃ©s publiques et privÃ©es de %s ne sont pas correctes" +======= #: wp-admin/edit.php:203 wp-admin/includes/class-wp-list-table.php:438 msgid "Bulk Actions" msgstr "Actions groupÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:459 +msgid "Detach" +msgstr "DÃ©tacher" +||||||| .r11156 +#: wp-admin/includes/class-wp-filesystem-ssh2.php:132 +msgid "Unable to perform command: %s" +msgstr "Impossible de lancer la commande : %s" +======= #: wp-admin/edit.php:198 msgid "Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post’s status." msgstr "AperÃ§u vous donnera une idÃ©e de ce Ã quoi votre brouillon ressemble si vous le publiez tel quel. Afficher vous enverra sur votre site, Ã l’adresse de l’article. L’action disponible dÃ©pend de l’Ã©tat de votre article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:386 +#: wp-admin/includes/class-wp-list-table.php:722 +#: wp-admin/includes/class-wp-list-table.php:1286 +msgid "%s item" +msgid_plural "%s items" +msgstr[0] "%s Ã©lÃ©ment" +msgstr[1] "%s Ã©lÃ©ments" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:41 +msgid "Invalid Data provided." +msgstr "Les donnÃ©es fournies ne sont pas valides." +======= #: wp-admin/edit.php:197 msgid "Trash removes your post from this list and places it in the trash, from which you can permanently delete it." msgstr "Mettre Ã la Corbeille retire l’article de la liste et le dÃ©placer dans la Corbeille, d’oÃ¹ vous pourrez le supprimer dÃ©finitivement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:236 +msgid "Documentation on Managing Pages" +msgstr "Documentation sur la gestion des pages (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:42 +#: wp-admin/includes/class-wp-upgrader.php:2084 wp-admin/includes/file.php:520 +#: wp-admin/includes/plugin.php:795 wp-admin/includes/theme.php:53 +msgid "Could not access filesystem." +msgstr "Impossible d’accÃ©der au systÃ¨me de fichier." +======= #: wp-admin/edit.php:196 msgid "Quick Edit provides inline access to the metadata of your post, allowing you to update post details without leaving this screen." msgstr "Modification Rapide vous donne un accÃ¨s rapide aux mÃ©tadonnÃ©es de votre article, vous permettant de mettre Ã jour certains dÃ©tails sans devoir quitter la liste." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/import.php:28 +msgid "Documentation on Import" +msgstr "Documentation sur l’importation (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:43 wp-admin/includes/plugin.php:798 +#: wp-admin/includes/theme.php:56 +msgid "Filesystem error." +msgstr "Erreur du systÃ¨me de fichier." +======= #: wp-admin/edit.php:195 msgid "Edit takes you to the editing screen for that post. You can also reach that screen by clicking on the post title." msgstr "Modifier vous envoie sur l’Ã©cran de modification de cet article. Vous pouvez Ã©galement vous rendre sur cet Ã©cran en cliquant sur le titre de l’article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit.php:215 +msgid "Documentation on Managing Posts" +msgstr "Documentation sur la gestion des articles (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:44 +msgid "Unable to locate WordPress Root directory." +msgstr "Impossible de localiser le dossier racine de WordPress." +======= #: wp-admin/edit.php:193 msgid "Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:" msgstr "Passer la souris au-dessus d’une ligne de la liste d’articles, fera s’afficher des liens vous permettant de gÃ©rer l’article. Vous pouvez lancer les actions suivantes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/export.php:53 +msgid "Documentation on Export" +msgstr "Documentation sur l’exportation (en)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:45 +msgid "Unable to locate WordPress Content directory (wp-content)." +msgstr "Impossible de localiser le dossier de contenu de WordPress (wp-content)." +======= #: wp-admin/edit.php:191 wp-admin/upload.php:188 msgid "Available Actions" msgstr "Actions disponibles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:93 +msgctxt "uploaded files" +msgid "All (%s)" +msgid_plural "All (%s)" +msgstr[0] "Tout (%s)" +msgstr[1] "Tous (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:46 wp-admin/includes/plugin.php:803 +msgid "Unable to locate WordPress Plugin directory." +msgstr "Impossible de localiser le dossier d’extension de WordPress." +======= #: wp-admin/edit.php:186 msgid "You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list." msgstr "Vous pouvez affiner la liste pour qu’elle n’affiche que les articles d’une catÃ©gorie spÃ©cifique ou d’un mois donnÃ©, Ã l’aide du menu dÃ©roulant situÃ© au-dessus de la liste. Cliquez sur le bouton « Filtrer » aprÃ¨s avoir fait votre choix. Vous pouvez Ã©galement affiner la liste en cliquant sur l’auteur d’un article, sa catÃ©gorie ou une Ã©tiquette." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:104 +msgctxt "detached files" +msgid "Unattached (%s)" +msgid_plural "Unattached (%s)" +msgstr[0] "Non attachÃ© (%s)" +msgstr[1] "Non attachÃ©s (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:47 +msgid "Unable to locate WordPress Theme directory." +msgstr "Impossible de localiser le dossier des thÃ¨mes de WordPress." +======= #: wp-admin/edit.php:185 msgid "You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right." msgstr "Vous pouvez afficher une simple liste de titres, ou une liste avec des extraits. Choisissez l’affichage que vous prÃ©fÃ©rez en cliquant sur les icÃ´nes en haut Ã droite de la liste ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-media-list-table.php:107 +msgctxt "uploaded files" +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeilles (%s)" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:49 +msgid "Unable to locate needed folder (%s)." +msgstr "Impossible de localiser le dossier nÃ©cessaire (%s)." +======= #: wp-admin/edit.php:184 msgid "You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts." msgstr "Vous pouvez filtrer la liste des articles par Ã©tat, Ã l’aide des liens textuels en haut Ã gauche, afin d’afficher tous les articles, ou seulement les articles publiÃ©s, les brouillons, etc. Par dÃ©faut, tous les articles sont affichÃ©s ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:438 +msgid "Select bulk action" +msgstr "SÃ©lectionnez l’action groupÃ©e" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:51 +msgid "Download failed." +msgstr "Le tÃ©lÃ©chargement a Ã©chouÃ©." +======= #: wp-admin/edit.php:183 msgid "You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab." msgstr "Vous pouvez cacher/afficher les colonnes en fonction de vos besoins, et dÃ©cider du nombre d’articles Ã afficher par Ã©cran Ã l’aide de l’onglet « Options de l’Ã©cran » ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2807 +msgid "%s failed to embed." +msgstr "%s n’a pas pu Ãªtre intÃ©grÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:52 +msgid "Installing the latest version…" +msgstr "Installation de la derniÃ¨re version…" +======= #: wp-admin/edit.php:181 msgid "You can customize the display of this screen’s contents in a number of ways:" msgstr "Vous pouvez personnaliser l’affichage de cet Ã©cran de plusieurs maniÃ¨res :" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:3084 +msgid "Image could not be processed." +msgstr "L’image n’a pas pu Ãªtre traitÃ©e." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:54 +msgid "Destination folder already exists." +msgstr "Le dossier de destination existe dÃ©jÃ ." +======= #: wp-admin/edit.php:179 msgid "Screen Content" msgstr "Contenu de l’Ã©cran" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:624 +msgid "%s pending comment" +msgid_plural "%s pending comments" +msgstr[0] "%s commentaire en attente" +msgstr[1] "%s commentaires en attente" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:55 wp-admin/includes/file.php:636 +#: wp-admin/includes/file.php:739 wp-admin/includes/file.php:790 +#: wp-admin/includes/update-core.php:1089 +msgid "Could not create directory." +msgstr "Impossible de crÃ©er le dossier." +======= #: wp-admin/edit.php:175 msgid "This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow." msgstr "Cet Ã©cran vous donne accÃ¨s Ã tous vos articles. Vous pouvez personnaliser son affichage afin qu’il corresponde au mieux Ã vos besoins." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:623 +msgid "%s approved comment" +msgid_plural "%s approved comments" +msgstr[0] "%s commentaire approuvÃ©" +msgstr[1] "%s commentaires approuvÃ©s" +||||||| .r11156 +#: wp-admin/includes/file.php:587 wp-admin/includes/file.php:691 +msgid "Incompatible Archive." +msgstr "Archive incompatible." +======= #: wp-admin/edit.php:131 wp-admin/edit.php:134 wp-admin/post.php:301 #: wp-admin/post.php:304 wp-admin/upload.php:156 msgid "Error in deleting." msgstr "Erreur pendant la suppression." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-list-table.php:641 +msgid "No approved comments" +msgstr "Aucun commentaire approuvÃ©" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:58 +#: wp-admin/includes/update-core.php:861 +msgid "Enabling Maintenance mode…" +msgstr "Activation du mode maintenance…" +======= #: wp-admin/edit.php:127 wp-admin/post.php:295 msgid "You are not allowed to delete this item." msgstr "Vous n’avez pas l’autorisation de supprimer ce contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:98 +#: wp-admin/includes/class-wp-posts-list-table.php:317 +msgid "All categories" +msgstr "Toutes les catÃ©gories" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:59 +#: wp-admin/includes/update-core.php:944 +msgid "Disabling Maintenance mode…" +msgstr "DÃ©sactivation du mode maintenance…" +======= #: wp-admin/edit.php:115 wp-admin/post.php:280 msgid "Error in restoring from Trash." msgstr "Erreur pendant la rÃ©cupÃ©ration depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: User's display name. +#: wp-admin/includes/ajax-actions.php:2942 +msgid "%s has been logged out." +msgstr "%s a Ã©tÃ© dÃ©connectÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:480 +msgid "The plugin is at the latest version." +msgstr "Vous avez la derniÃ¨re version de cette extension." +======= #: wp-admin/edit.php:112 msgid "You are not allowed to restore this item from the Trash." msgstr "Vous n’avez pas l’autorisation de rÃ©cupÃ©rer ce contenu depuis la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:105 +#: wp-admin/includes/class-wp-posts-list-table.php:325 +msgid "Filter by category" +msgstr "Filtrer par catÃ©gorie" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:482 +#: wp-admin/includes/class-wp-upgrader.php:806 +#: wp-admin/includes/class-wp-upgrader.php:1438 +msgid "Downloading update from %s…" +msgstr "TÃ©lÃ©chargement de la mise Ã jour depuis %s…" +======= #: wp-admin/edit.php:101 wp-admin/post.php:262 msgid "Error in moving to Trash." msgstr "Erreur lors du dÃ©placement dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/class-wp-comments-list-table.php:287 +msgid "Filter by comment type" +msgstr "Filtrer par type de commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:483 +#: wp-admin/includes/class-wp-upgrader.php:807 +#: wp-admin/includes/class-wp-upgrader.php:1251 +#: wp-admin/includes/class-wp-upgrader.php:1439 +msgid "Unpacking the update…" +msgstr "DÃ©compression de la mise Ã jour…" +======= #: wp-admin/edit.php:93 wp-admin/post.php:254 msgid "You are not allowed to move this item to the Trash." msgstr "Vous n’avez pas l’autorisation de dÃ©placer ce contenu dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2938 +msgid "You are now logged out everywhere else." +msgstr "Vous Ãªtes dÃ©sormais dÃ©connectÃ© partout ailleurs." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:484 +msgid "Removing the old version of the plugin…" +msgstr "Retrait de l’ancienne version de l’extension…" +======= #: wp-admin/edit-tags.php:351 msgid "Tags can be selectively converted to categories using the tag to category converter." msgstr "Les Ã©tiquettes peuvent Ãªtre converties de maniÃ¨re sÃ©lective en catÃ©gories via le convertisseur Ã©tiquettes vers catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2930 +msgid "Could not log out user sessions. Please try again." +msgstr "Impossible de dÃ©connecter les sessions utilisateur. Veuillez rÃ©essayer." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:485 +msgid "Could not remove the old plugin." +msgstr "Impossible de supprimer l’ancienne extension." +======= #: wp-admin/edit-tags.php:346 msgid "Categories can be selectively converted to tags using the category to tag converter." msgstr "Les catÃ©gories peuvent Ãªtre converties de maniÃ¨re sÃ©lective en Ã©tiquettes via le convertisseur catÃ©gories vers Ã©tiquettes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:2837 +msgid "This preview is unavailable in the editor." +msgstr "Cette prÃ©visualisation n'est pas disponible dans l'Ã©diteur." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:491 +#: wp-admin/includes/class-wp-upgrader.php:815 +msgid "Install package not available." +msgstr "L’archive d’installation n’est pas disponible." +======= #: wp-admin/edit-tags.php:342 msgid "Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s." msgstr "Ã savoir : supprimer une catÃ©gorie ne supprime pas les articles qu’elle contient. Les articles affectÃ©s uniquement Ã la catÃ©gorie supprimÃ©e seront affectÃ©s Ã celle par dÃ©faut  : %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1909 +msgid "You don't have permission to attach files to this post." +msgstr "Vous n’avez pas l’autorisation d'attacher des fichiers Ã cet article." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:492 +#: wp-admin/includes/class-wp-upgrader.php:816 +msgid "Downloading install package from %s…" +msgstr "TÃ©lÃ©chargement de l’archive d’installation depuis %s…" +======= #: wp-admin/edit-tags.php:280 msgid "Tags deleted." msgstr "Ãtiquette supprimÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/ajax-actions.php:1895 +msgid "You don't have permission to upload files." +msgstr "Vous n’avez pas l’autorisation de mettre en ligne des fichiers." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:493 +#: wp-admin/includes/class-wp-upgrader.php:817 +msgid "Unpacking the package…" +msgstr "DÃ©compression de l’archive de l’extension…" +======= #: wp-admin/edit-tags.php:279 msgid "Tag not updated." msgstr "Ãtiquette non mise Ã jour." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/class-wp-links-list-table.php:181 +#: wp-admin/includes/class-wp-media-list-table.php:360 +#: wp-admin/includes/class-wp-posts-list-table.php:766 +#: wp-admin/includes/class-wp-terms-list-table.php:363 +#: wp-admin/includes/dashboard.php:540 +msgid "Edit “%s”" +msgstr "Modifier « %s »" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:494 +msgid "Installing the plugin…" +msgstr "Installation de l’extension…" +======= #: wp-admin/edit-tags.php:278 msgid "Tag not added." msgstr "Ãtiquette non ajoutÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:65 wp-admin/includes/ajax-actions.php:1699 +#: wp-admin/includes/class-wp-posts-list-table.php:1419 +msgid "Status" +msgstr "Ãtat" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:496 +msgid "Plugin install failed." +msgstr "L’installation de l’extension a Ã©chouÃ©." +======= #: wp-admin/edit-tags.php:277 msgid "Tag updated." msgstr "Ãtiquette mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:257 wp-admin/edit-comments.php:167 +#: wp-admin/includes/comment.php:37 +msgid "You are not allowed to edit comments on this post." +msgstr "Vous n’avez pas l’autorisation de modifier les commentaires de cet article." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:497 +msgid "Plugin installed successfully." +msgstr "L’extension a bien Ã©tÃ© installÃ©e." +======= #: wp-admin/edit-tags.php:276 msgid "Tag deleted." msgstr "Ãtiquette supprimÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:133 +msgid "You are about to delete the following comment:" +msgstr "Vous Ãªtes sur le point de supprimer le commentaire suivant :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:804 +msgid "The theme is at the latest version." +msgstr "Vous avez la derniÃ¨re version de ce thÃ¨me." +======= #: wp-admin/edit-tags.php:275 msgid "Tag added." msgstr "Ãtiquette ajoutÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:134 +msgid "Permanently Delete Comment" +msgstr "Supprimer dÃ©finitivement le commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:808 +msgid "Removing the old version of the theme…" +msgstr "Retrait de l’ancienne version du thÃ¨me…" +======= #: wp-admin/edit-tags.php:271 msgid "Categories deleted." msgstr "CatÃ©gories supprimÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:137 +msgid "You are about to approve the following comment:" +msgstr "Vous Ãªtes sur le point d’approuver le commentaire suivant :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:809 +msgid "Could not remove the old theme." +msgstr "Impossible de supprimer l’ancien thÃ¨me." +======= #: wp-admin/edit-tags.php:270 msgid "Category not updated." msgstr "CatÃ©gorie non mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:138 +msgid "Approve Comment" +msgstr "Approuver le commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:818 +msgid "Installing the theme…" +msgstr "Installation du thÃ¨me…" +======= #: wp-admin/edit-tags.php:269 msgid "Category not added." msgstr "CatÃ©gorie non ajoutÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:146 +msgid "This comment is currently approved." +msgstr "Ce commentaire est actuellement approuvÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:820 +msgid "Theme install failed." +msgstr "L’installation du thÃ¨me a Ã©chouÃ©." +======= #: wp-admin/edit-tags.php:268 msgid "Category updated." msgstr "CatÃ©gorie mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:149 +msgid "This comment is currently marked as spam." +msgstr "Ce commentaire est actuellement marquÃ© comme indÃ©sirable." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:821 +msgid "Theme installed successfully." +msgstr "Le thÃ¨me a bien Ã©tÃ© installÃ©." +======= #: wp-admin/edit-tags.php:267 msgid "Category deleted." msgstr "CatÃ©gorie effacÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:329 +msgid "Unknown action." +msgstr "Action inconnue." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1436 +msgid "WordPress is at the latest version." +msgstr "Vous avez la derniÃ¨re version de WordPress." +======= #: wp-admin/edit-tags.php:266 msgid "Category added." msgstr "CatÃ©gorie ajoutÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:179 wp-admin/includes/theme.php:230 +msgid "Custom Background" +msgstr "ArriÃ¨re-plan personnalisÃ©" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1440 +msgid "Could not copy files." +msgstr "Impossible de copier les fichiers." +======= #: wp-admin/edit-tags.php:262 msgid "Items deleted." msgstr "Ãlements supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:292 wp-admin/widgets.php:253 +msgid "Position" +msgstr "Position" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugins-list-table.php:410 +#: wp-admin/includes/class-wp-upgrader-skins.php:165 +#: wp-admin/includes/class-wp-upgrader-skins.php:428 +#: wp-admin/includes/class-wp-upgrader-skins.php:430 +msgid "Activate this plugin" +msgstr "Activer cette extension" +======= #: wp-admin/edit-tags.php:261 wp-admin/includes/ajax-actions.php:1622 #: wp-admin/includes/ajax-actions.php:1627 msgid "Item not updated." msgstr "L’Ã©lÃ©ment n’a pas Ã©tÃ© mis Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:310 +msgid "Repeat" +msgstr "RÃ©pÃ©tition" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:165 +#: wp-admin/includes/class-wp-upgrader-skins.php:430 +msgid "Activate Plugin" +msgstr "Activer l’extension" +======= #: wp-admin/edit-tags.php:260 msgid "Item not added." msgstr "Contenu non ajoutÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:267 wp-admin/custom-header.php:537 +msgid "Choose an image from your computer:" +msgstr "Choisissez une image sur votre ordinateur :" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:166 +#: wp-admin/includes/class-wp-upgrader-skins.php:327 +#: wp-admin/includes/class-wp-upgrader-skins.php:442 +msgid "Return to Plugins page" +msgstr "Retourner sur la page des extensions" +======= #: wp-admin/edit-tags.php:259 msgid "Item updated." msgstr "Contenu mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:271 wp-admin/custom-header.php:541 +#: wp-admin/includes/class-wp-theme-install-list-table.php:55 +#: wp-admin/includes/media.php:1915 wp-admin/includes/media.php:1917 +msgid "Upload" +msgstr "Envoyer" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:416 +msgid "Successfully installed the plugin %s %s." +msgstr "L’extension %s %s a bien Ã©tÃ© installÃ©e." +======= #: wp-admin/edit-tags.php:258 msgid "Item deleted." msgstr "Contenu supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:761 +msgid "Choose the part of the image you want to use as your header." +msgstr "Choisissez la partie de l’image que vous voulez utiliser comme en-tÃªte." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:440 +msgid "Return to Plugin Installer" +msgstr "Retourner Ã l’installeur d’extensions" +======= #: wp-admin/edit-tags.php:257 msgid "Item added." msgstr "Contenu ajoutÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:185 +msgid "%s comment approved" +msgid_plural "%s comments approved" +msgstr[0] "%s commentaire approuvÃ©" +msgstr[1] "%s commentaires approuvÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:823 +msgid "Successfully installed the theme %1$s %2$s." +msgstr "Le thÃ¨me %1$s %2$s a bien Ã©tÃ© installÃ©." +======= #: wp-admin/edit-tags.php:240 msgid "Documentation on Tags" msgstr "Documentation sur les Ã©tiquettes (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:189 +msgid "%s comment marked as spam." +msgid_plural "%s comments marked as spam." +msgstr[0] "%s commentaire marquÃ© comme indÃ©sirable." +msgstr[1] "%s commentaires marquÃ©s comme indÃ©sirables." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:677 +#: wp-admin/includes/class-wp-theme-install-list-table.php:219 +#: wp-admin/includes/class-wp-themes-list-table.php:160 +#: wp-admin/includes/class-wp-upgrader-skins.php:520 +#: wp-admin/includes/class-wp-upgrader-skins.php:522 +#: wp-admin/includes/class-wp-upgrader-skins.php:599 +#: wp-admin/includes/class-wp-upgrader-skins.php:601 +msgid "Preview “%s”" +msgstr "PrÃ©visualiser « %s »" +======= #: wp-admin/edit-tags.php:238 msgid "Documentation on Link Categories" msgstr "Documentation sur les catÃ©gories de liens (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:204 +msgid "%s comment permanently deleted" +msgid_plural "%s comments permanently deleted" +msgstr[0] "%s commentaire supprimÃ© dÃ©finitivement" +msgstr[1] "%s commentaires supprimÃ©s dÃ©finitivement" +||||||| .r11156 +#: wp-admin/includes/class-wp-themes-list-table.php:157 +#: wp-admin/includes/class-wp-upgrader-skins.php:524 +#: wp-admin/includes/class-wp-upgrader-skins.php:603 +msgid "Activate “%s”" +msgstr "Activer « %s »" +======= #: wp-admin/edit-tags.php:236 msgid "Documentation on Categories" msgstr "Documentation sur les catÃ©gories (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:209 +msgid "This comment is already approved." +msgstr "Ce commentaire est dÃ©jÃ approuvÃ©." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:530 +msgid "Return to Theme Installer" +msgstr "Retourner Ã l’installeur de thÃ¨mes" +======= #: wp-admin/edit-tags.php:228 msgid "Adding Tags" msgstr "Ajout dâÃ©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:212 +msgid "This comment is already in the Trash." +msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:532 +msgid "Themes page" +msgstr "Page des thÃ¨mes" +======= #: wp-admin/edit-tags.php:228 msgid "Adding Categories" msgstr "Ajout de catÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:215 +msgid "This comment is already marked as spam." +msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader-skins.php:372 +#: wp-admin/includes/class-wp-upgrader-skins.php:532 +#: wp-admin/includes/class-wp-upgrader-skins.php:610 +msgid "Return to Themes page" +msgstr "Retourner sur la page des thÃ¨mes" +======= #: wp-admin/edit-tags.php:224 msgid "You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table." msgstr "Vous pouvez modifier l’affichage de cet Ã©cran via l’onglet « Options de l’Ã©cran », afin de dÃ©finir le nombre d’Ã©lÃ©ments Ã afficher par Ã©cran, et afficher/cacher les colonnes du tableau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:89 +msgid "Post updated. View post" +msgstr "Article mis Ã jour. Afficher l’article" +||||||| .r11156 +#: wp-admin/includes/class-wp-upgrader.php:1727 +#: wp-admin/includes/class-wp-upgrader.php:1761 +msgid "Please select a file" +msgstr "Veuillez choisir un fichier" +======= #: wp-admin/edit-tags.php:222 msgid "Description - The description is not prominent by default; however, some themes may display it." msgstr "Description - La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:90 wp-admin/edit-form-advanced.php:110 +msgid "Custom field updated." +msgstr "Champ personnalisÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/file.php:345 +msgid "The uploaded file could not be moved to %s." +msgstr "Le fichier n’ a pas pu Ãªtre dÃ©placÃ© vers %s." +======= #: wp-admin/edit-tags.php:220 msgid "Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown." msgstr "Parent - Les catÃ©gories, contrairement aux Ã©tiquettes, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e « Jazz », et Ã l’intÃ©rieur, plusieurs catÃ©gories comme « Bebop » et « Big Band ». Le fait d’avoir une hiÃ©rarchie est totalement facultatif. Pour crÃ©er une sous-catÃ©gorie, choisissez juste une autre catÃ©gorie depuis la liste dÃ©roulante « Parent » ." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:91 wp-admin/edit-form-advanced.php:111 +msgid "Custom field deleted." +msgstr "Champ personnalisÃ© supprimÃ©." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:38 +msgid "Right Now" +msgstr "Aujourd’hui" +======= #: wp-admin/edit-tags.php:217 msgid "Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." msgstr "Identifiant - L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:92 +msgid "Post updated." +msgstr "Article mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:970 +msgid "http://planet.wordpress.org/" +msgstr "http://www.wordpress-fr.net/planet/" +======= #: wp-admin/edit-tags.php:214 msgid "Name - The name is how it appears on your site." msgstr "Nom - Ce nom est utilisÃ© un peu partout sur votre site ;" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:95 +msgid "Post published. View post" +msgstr "Article publiÃ©. Afficher l’article" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:979 +msgid "http://planet.wordpress.org/feed/" +msgstr "http://feeds2.feedburner.com/WordpressFrancophonePlanet" +======= #: wp-admin/edit-tags.php:211 msgid "When adding a new tag on this screen, you’ll fill in the following fields:" msgstr "Quand vous ajoutez une nouvelle Ã©tiquette via cet Ã©cran, vous devez remplir les champs suivants :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:96 +msgid "Post saved." +msgstr "Article enregistrÃ©." +||||||| .r11156 +#: wp-admin/includes/dashboard.php:988 +msgid "Other WordPress News" +msgstr "Autres actualitÃ©s de WordPress (en franÃ§ais)" +======= #: wp-admin/edit-tags.php:209 msgid "When adding a new category on this screen, you’ll fill in the following fields:" msgstr "Quand vous ajoutez une nouvelle catÃ©gorie via cet Ã©cran, vous devez remplir les champs suivants :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:97 +msgid "Post submitted. Preview post" +msgstr "Article proposÃ©. PrÃ©visualiser l’article" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:108 +msgid "View all" +msgstr "Afficher tout" +======= #: wp-admin/edit-tags.php:199 msgid "What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index." msgstr "Quelle est la diffÃ©rence entre les catÃ©gories et les Ã©tiquettes ? Normalement, les Ã©tiquettes identifient les informations importantes dans votre article (noms, sujets, etc.) qui seraient susceptibles de revenir dans d’autres articles, ou pas. De leur cÃ´tÃ©, les catÃ©gories ont des sections prÃ©dÃ©terminÃ©es. Si vous voyez votre site comme un livre, alors les catÃ©gories sont la table des matiÃ¨res, et les Ã©tiquettes forment l’index." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:98 +msgid "Post scheduled for: %1$s. Preview post" +msgstr "Article prÃ©vu pour le : %1$s. PrÃ©visualiser l’article" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:140 +msgid "Configure" +msgstr "Configurer" +======= #: wp-admin/edit-tags.php:197 msgid "You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category." msgstr "Vous pouvez supprimer des catÃ©gories de liens avec la liste dÃ©roulante « Actions groupÃ©es », mais cette action ne supprime pas les liens contenus dans la catÃ©gorie. Au lieu de cela, ils sont dÃ©placÃ©s dans la catÃ©gorie de liens par dÃ©faut." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:101 +msgid "Post draft updated. Preview post" +msgstr "Brouillon d’article mis Ã jour. PrÃ©visualiser l’article" +||||||| .r11156 +#: wp-admin/options-writing.php:27 wp-admin/options-writing.php:116 +#: wp-admin/options-writing.php:120 wp-admin/press-this.php:300 +#: wp-admin/press-this.php:495 wp-admin/tools.php:16 wp-admin/tools.php:40 +#: wp-admin/tools.php:45 +msgid "Press This" +msgstr "Publier un article" +======= #: wp-admin/edit-tags.php:194 msgid "You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another." msgstr "Vous pouvez assigner des Ã©tiquettes Ã vos articles via le bloc dÃ©diÃ©. Au contraire des catÃ©gories, les Ã©tiquettes n’ont pas de hiÃ©rarchie, ce qui signifie qu’elles ne peuvent pas Ãªtre liÃ©s entre elles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:109 +msgid "Page updated. View page" +msgstr "Page mise Ã jour. Afficher la page" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:257 wp-admin/includes/meta-boxes.php:258 +#: wp-admin/press-this.php:504 +msgid "Submit for Review" +msgstr "Soumettre Ã relecture" +======= #: wp-admin/edit-tags.php:192 msgid "You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts." msgstr "Vous pouvez crÃ©er des groupes de liens en utilisant les catÃ©gories de liens. Le nom d’une catÃ©gorie de liens doit Ãªtre unique, et les catÃ©gories de liens ne sont pas les mÃªmes que les catÃ©gories de vos articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:112 +msgid "Page updated." +msgstr "Page mise Ã jour." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:452 +#: wp-admin/includes/class-wp-comments-list-table.php:454 +#: wp-admin/includes/dashboard.php:552 +msgid "Approve this comment" +msgstr "Approuver ce commentaire" +======= #: wp-admin/edit-tags.php:190 msgid "You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your writing settings." msgstr "Vous pouvez utiliser les catÃ©gories pour donner des sections Ã votre site, et grouper les articles connexes. La catÃ©gorie par dÃ©faut est « Non classÃ© » ; vous pouvez la modifier dans vos options d’Ã©criture." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:114 +msgid "Page published. View page" +msgstr "Page publiÃ©e. Afficher la page" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:450 +#: wp-admin/includes/class-wp-comments-list-table.php:455 +#: wp-admin/includes/dashboard.php:553 +msgid "Unapprove this comment" +msgstr "DÃ©sapprouver ce commentaire" +======= #: wp-admin/edit-tags.php:127 wp-admin/edit-tags.php:143 wp-admin/post.php:151 msgid "You attempted to edit an item that doesn’t exist. Perhaps it was deleted?" msgstr "Vous tentez de modifier un contenu qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:116 +msgid "Page submitted. Preview page" +msgstr "Page proposÃ©e. PrÃ©visualiser la page" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:481 +#: wp-admin/includes/dashboard.php:555 +msgid "Reply to this comment" +msgstr "RÃ©pondre Ã ce commentaire" +======= #: wp-admin/edit-tag-form.php:139 wp-admin/edit-tags.php:514 msgid "The description is not prominent by default; however, some themes may show it." msgstr "La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:117 +msgid "Page scheduled for: %1$s. Preview page" +msgstr "Page prÃ©vue pour le : %1$s. Afficher la page" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:459 +#: wp-admin/includes/dashboard.php:556 +msgid "Mark this comment as spam" +msgstr "Marquer ce commentaire comme indÃ©sirable" +======= #: wp-admin/edit-tag-form.php:131 wp-admin/edit-tags.php:507 msgid "Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional." msgstr "Les catÃ©gories, contrairement aux Ã©tiquettes, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e Jazz, et Ã l’intÃ©rieur, plusieurs catÃ©gories comme Bebop et Big Band. Ceci est totalement facultatif." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:118 +msgid "Page draft updated. Preview page" +msgstr "Brouillon de page mis Ã jour. PrÃ©visualiser la page" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:459 +#: wp-admin/includes/dashboard.php:556 +msgctxt "verb" +msgid "Spam" +msgstr "IndÃ©sirable" +======= #: wp-admin/edit-tag-form.php:112 wp-admin/edit-tags.php:469 msgctxt "term parent" msgid "Parent" msgstr "Parent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:229 +msgid "Send Trackbacks" +msgstr "Envoyer des rÃ©troliens" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:471 +#: wp-admin/includes/dashboard.php:560 +msgid "Move this comment to the trash" +msgstr "DÃ©placer ce commentaire dans la Corbeille" +======= #: wp-admin/edit-tag-form.php:107 wp-admin/edit-tags.php:464 msgid "The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." msgstr "L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:232 +msgid "Custom Fields" +msgstr "Champs personnalisÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:471 +#: wp-admin/includes/dashboard.php:560 +msgctxt "verb" +msgid "Trash" +msgstr "Corbeille" +======= #: wp-admin/edit-tag-form.php:87 wp-admin/edit-tags.php:458 msgid "The name is how it appears on your site." msgstr "Ce nom est utilisÃ© un peu partout sur votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:245 wp-admin/menu.php:241 +msgid "Discussion" +msgstr "Discussion" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:598 +msgid "From %1$s on %2$s%3$s" +msgstr "Par %1$s, sur %2$s%3$s" +======= #: wp-admin/edit-tag-form.php:85 wp-admin/edit-tags.php:456 #: wp-admin/includes/class-wp-terms-list-table.php:138 #: wp-admin/includes/class-wp-terms-list-table.php:473 msgctxt "term name" msgid "Name" msgstr "Nom" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:251 wp-admin/edit-tag-form.php:91 +#: wp-admin/edit-tags.php:473 +#: wp-admin/includes/class-wp-posts-list-table.php:1199 +#: wp-admin/includes/class-wp-terms-list-table.php:171 +#: wp-admin/includes/class-wp-terms-list-table.php:548 +#: wp-admin/includes/meta-boxes.php:672 +msgid "Slug" +msgstr "Identifiant" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:599 +msgid "[Pending]" +msgstr "[En attente]" +======= #: wp-admin/edit-tag-form.php:14 msgid "You did not select an item for editing." msgstr "Un contenu n’a pas Ã©tÃ© sÃ©lectionnÃ© pour l’Ã©dition. " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:568 wp-admin/includes/ajax-actions.php:2140 +msgid "Last edited by %1$s on %2$s at %3$s" +msgstr "DerniÃ¨re modification par %1$s, le %2$s Ã %3$s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:618 +msgctxt "dashboard" +msgid "%1$s on %2$s" +msgstr "%1$s dans %2$s" +======= #: wp-admin/edit-link-form.php:113 msgid "This will be shown when someone hovers over the link in the blogroll, or optionally below the link." msgstr "Cette description sera affichÃ©e lors du survol du lien dans la liste de liens ; elle pourra Ã©galement apparaÃ®tre sous le lien si votre thÃ¨me le prÃ©voit." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:570 wp-admin/includes/ajax-actions.php:2142 +msgid "Last edited on %1$s at %2$s" +msgstr "DerniÃ¨re modification le %1$s Ã %2$s" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:824 +msgid "Loading…" +msgstr "Chargement…" +======= #: wp-admin/edit-link-form.php:105 msgid "Example: http://wordpress.org/ — don’t forget the http://" msgstr "Exemple : http://www.wordpress-fr.net/ — Et n’oubliez pas le http:// !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:72 +msgid "View Comment" +msgstr "Afficher le commentaire" +||||||| .r11156 +#: wp-admin/includes/dashboard.php:824 +msgid "This widget requires JavaScript." +msgstr "Ce widget requiert JavaScript." +======= #: wp-admin/edit-link-form.php:102 msgid "Web Address" msgstr "Adresse web" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:90 +msgid "Submitted on: %1$s" +msgstr "EnvoyÃ© le : %1$s" +||||||| .r11156 +#: wp-admin/includes/file.php:13 +msgid "Main Index Template" +msgstr "ModÃ¨le pour la page d’accueil" +======= #: wp-admin/edit-link-form.php:97 msgid "Example: Nifty blogging software" msgstr "Exemple : Logiciel de crÃ©ation de sites rapide, puissant et efficace" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:32 +msgid "Name:" +msgstr "Nom :" +||||||| .r11156 +#: wp-admin/includes/file.php:17 +msgid "RTL Stylesheet" +msgstr "Feuille de style RTL" +======= #: wp-admin/edit-link-form.php:94 #: wp-admin/includes/class-wp-links-list-table.php:93 msgctxt "link name" msgid "Name" msgstr "Nom" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:36 +msgid "E-mail:" +msgstr "E-mail :" +||||||| .r11156 +#: wp-admin/includes/file.php:19 +msgid "Popup Comments" +msgstr "Commentaires en popup" +======= #: wp-admin/edit-link-form.php:76 msgid "Link added." msgstr "Lien ajoutÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:42 +msgid "URL:" +msgstr "Adresse web :" +||||||| .r11156 +#: wp-admin/includes/file.php:20 +msgid "Footer" +msgstr "Pied de page" +======= #. translators: add new links #: wp-admin/edit-link-form.php:73 wp-admin/link-manager.php:72 #: wp-admin/menu.php:78 msgctxt "link" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:139 wp-admin/edit-tags.php:525 +msgid "The description is not prominent by default; however, some themes may show it." +msgstr "La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +||||||| .r11156 +#: wp-admin/includes/file.php:26 +msgid "Category Template" +msgstr "ModÃ¨le pour les catÃ©gories" +======= #: wp-admin/edit-link-form.php:65 msgid "Documentation on Creating Links" msgstr "Documentation sur la crÃ©ation de liens (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:14 +msgid "Links / Edit Link" +msgstr "Liens / Modifier le lien" +||||||| .r11156 +#: wp-admin/includes/file.php:27 wp-admin/includes/meta-boxes.php:746 +msgid "Page Template" +msgstr "ModÃ¨le de page" +======= #: wp-admin/edit-link-form.php:60 msgid "XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking." msgstr "XFN signifie XHTML Friends Network, c’est-Ã -dire RÃ©seau XHTML d’Amis. Son usage est facultatif. WordPress permet de gÃ©nÃ©rer les attributs XFN de vos liens, afin d’indiquer la maniÃ¨re dont vous Ãªtes liÃ© Ã l’auteur ou le propriÃ©taire de la page liÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:15 wp-admin/includes/meta-boxes.php:832 +msgid "Update Link" +msgstr "Mettre Ã jour le lien" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:64 +#: wp-admin/includes/class-wp-theme-install-list-table.php:42 +#: wp-admin/includes/file.php:28 +msgid "Search Results" +msgstr "RÃ©sultats de recherche" +======= #: wp-admin/edit-link-form.php:59 msgid "The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box." msgstr "Les blocs pour le nom, l’adresse web et la description sont fixes, tandis que les autres peuvent Ãªtre repositionnÃ©s par glisser/dÃ©poser. Vous pouvez Ã©galement cacher les blocs que vous n’utilisez pas via l’onglet « Options de l’Ã©cran », et fermer les blocs en cliquant sur leur barre de titre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:19 +msgid "Links / Add New Link" +msgstr "Liens / Ajouter un nouveau lien" +||||||| .r11156 +#: wp-admin/includes/file.php:29 +msgid "Search Form" +msgstr "Formulaire de recherche" +======= #: wp-admin/edit-link-form.php:58 msgid "You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields." msgstr "Vous pouvez ajouter ou modifier des liens sur cet Ã©cran, en saisissant dans chacun des blocs. Seuls sont obligatoires les champs « Adresse web » et « Nom » (le texte que vous voulez voir affichÃ© sur votre site pour cette adresse)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:76 +msgid "Link added." +msgstr "Lien ajoutÃ©." +||||||| .r11156 +#: wp-admin/includes/file.php:30 +msgid "Single Post" +msgstr "Article seul" +======= #: wp-admin/edit-link-form.php:30 wp-admin/includes/nav-menu.php:174 #: wp-admin/includes/nav-menu.php:1220 msgid "Link Relationship (XFN)" msgstr "Relation avec le propriÃ©taire du site liÃ© (XFN)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:113 +msgid "This will be shown when someone hovers over the link in the blogroll, or optionally below the link." +msgstr "Cette description sera affichÃ©e lors du survol du lien dans la liste de liens ; elle pourra Ã©galement apparaÃ®tre sous le lien si votre thÃ¨me le prÃ©voit." +||||||| .r11156 +#: wp-admin/includes/file.php:31 +msgid "404 Template" +msgstr "ModÃ¨le pour l’erreur 404" +======= #: wp-admin/edit-link-form.php:29 wp-admin/includes/meta-boxes.php:896 msgid "Target" msgstr "Cible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:87 wp-admin/edit-tags.php:469 +msgid "The name is how it appears on your site." +msgstr "Ce nom est utilisÃ© un peu partout sur votre site." +||||||| .r11156 +#: wp-admin/includes/file.php:32 +msgid "Links Template" +msgstr "ModÃ¨le pour les liens" +======= #: wp-admin/edit-link-form.php:19 msgid "Links / Add New Link" msgstr "Liens / Ajouter un nouveau lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:261 +msgid "Item added." +msgstr "Contenu ajoutÃ©." +||||||| .r11156 +#: wp-admin/includes/file.php:33 +msgid "Theme Functions" +msgstr "Fonctions du thÃ¨me" +======= #: wp-admin/edit-link-form.php:15 wp-admin/includes/meta-boxes.php:822 msgid "Update Link" msgstr "Mettre Ã jour le lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:262 +msgid "Item deleted." +msgstr "Contenu supprimÃ©." +||||||| .r11156 +#: wp-admin/includes/file.php:34 +msgid "Attachment Template" +msgstr "ModÃ¨le pour les fichiers attachÃ©s" +======= #: wp-admin/edit-link-form.php:14 msgid "Links / Edit Link" msgstr "Liens / Modifier le lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:264 +msgid "Item not added." +msgstr "Contenu non ajoutÃ©." +||||||| .r11156 +#: wp-admin/includes/file.php:35 +msgid "Image Attachment Template" +msgstr "ModÃ¨le pour les images attachÃ©es" +======= #: wp-admin/edit-form-comment.php:132 msgid "In reply to: %2$s" msgstr "En rÃ©ponse Ã  : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:56 +msgid "Comment" +msgstr "Commentaire" +||||||| .r11156 +#: wp-admin/includes/file.php:36 +msgid "Video Attachment Template" +msgstr "ModÃ¨le pour les vidÃ©os attachÃ©es" +======= #: wp-admin/edit-form-comment.php:122 msgid "In response to: %s" msgstr "En rÃ©ponse Ã  : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:196 +#: wp-admin/includes/class-wp-comments-list-table.php:602 +msgid "In reply to %2$s." +msgstr "En rÃ©ponse Ã %2$s." +||||||| .r11156 +#: wp-admin/includes/file.php:37 +msgid "Audio Attachment Template" +msgstr "ModÃ¨le pour les fichiers audio attachÃ©s" +======= #: wp-admin/edit-form-comment.php:104 msgid "Submitted on: %1$s" msgstr "EnvoyÃ© le : %1$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:450 wp-admin/includes/theme.php:232 +msgid "Custom Header" +msgstr "Personnalisation de l’en-tÃªte" +||||||| .r11156 +#: wp-admin/includes/file.php:38 +msgid "Application Attachment Template" +msgstr "ModÃ¨le pour les programmes attachÃ©s" +======= #: wp-admin/edit-form-comment.php:96 msgid "IP address:" msgstr "Adresse IP :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: add new links +#: wp-admin/edit-link-form.php:73 wp-admin/link-manager.php:72 +#: wp-admin/menu.php:76 +msgctxt "link" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/includes/file.php:39 +msgid "my-hacks.php (legacy hacks support)" +msgstr "my-hacks.php (reconnaissance des hacks existants)" +======= #. translators: comment type radio button #: wp-admin/edit-form-comment.php:90 msgctxt "adjective" msgid "Pending" msgstr "En attente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:398 wp-admin/options-discussion.php:14 +msgid "Discussion Settings" +msgstr "Options de discussion" +||||||| .r11156 +#: wp-admin/includes/file.php:40 +msgid ".htaccess (for rewrite rules )" +msgstr ".htaccess (pour les rÃ¨gles de rÃ©Ã©criture)" +======= #: wp-admin/edit-form-comment.php:81 msgid "View Comment" msgstr "Afficher le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:188 +msgid "XML-RPC" +msgstr "XML-RPC" +||||||| .r11156 +#: wp-admin/includes/file.php:43 +msgid "Comments Template" +msgstr "ModÃ¨le pour les commentaires" +======= #: wp-admin/edit-form-comment.php:74 wp-admin/includes/ajax-actions.php:1668 #: wp-admin/includes/class-wp-posts-list-table.php:1285 msgid "Status" msgstr "Ãtat" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:131 wp-admin/edit-tags.php:147 wp-admin/post.php:156 +msgid "You attempted to edit an item that doesn’t exist. Perhaps it was deleted?" +msgstr "Vous tentez de modifier un contenu qui n’existe pas. Peut-Ãªtre a-t-il Ã©tÃ© supprimÃ© ?" +||||||| .r11156 +#: wp-admin/includes/file.php:44 +msgid "Popup Comments Template" +msgstr "ModÃ¨le pour la fenÃªtre de commentaires" +======= #: wp-admin/edit-form-comment.php:54 msgid "URL:" msgstr "Adresse web :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:196 +msgid "Background updated. Visit your site to see how it looks." +msgstr "L’arriÃ¨re-plan a Ã©tÃ© mis Ã jour. Afficher votre site pour voir le rendu." +||||||| .r11156 +#: wp-admin/includes/file.php:255 +msgid "The uploaded file was only partially uploaded." +msgstr "Le fichier n’a Ã©tÃ© que partiellement envoyÃ©." +======= #: wp-admin/edit-form-comment.php:52 msgid "URL (%s):" msgstr "Adresse web (%s) :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:467 +msgid "Header updated. Visit your site to see how it looks." +msgstr "L’en-tÃªte a Ã©tÃ© mis Ã jour. Visiter le site pour voir son nouvel aspect." +||||||| .r11156 +#: wp-admin/includes/file.php:256 +msgid "No file was uploaded." +msgstr "Aucun fichier n’a Ã©tÃ© envoyÃ©." +======= #: wp-admin/edit-form-comment.php:49 msgid "visit site" msgstr "aller sur le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:744 wp-admin/custom-header.php:868 +msgid "Image Processing Error" +msgstr "Erreur lors du traitement de l’image" +||||||| .r11156 +#: wp-admin/includes/file.php:258 +msgid "Missing a temporary folder." +msgstr "Un dossier temporaire est manquant." +======= #: wp-admin/edit-form-comment.php:40 msgid "E-mail:" msgstr "E-mail :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:515 +msgid "Get Shortlink" +msgstr "Obtenir le lien court" +||||||| .r11156 +#: wp-admin/includes/file.php:259 +msgid "Failed to write file to disk." +msgstr "Ãchec de l’Ã©criture du fichier sur le disque." +======= #: wp-admin/edit-form-comment.php:38 msgid "send e-mail" msgstr "envoyer l’e-mail" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:263 +msgid "Item updated." +msgstr "Contenu mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/file.php:260 +msgid "File upload stopped by extension." +msgstr "L’envoi de fichier est arrÃªtÃ© par l’extension." +======= #: wp-admin/edit-form-comment.php:38 msgid "E-mail (%s):" msgstr "E-mail (%s) : " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:88 +msgid "You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color." +msgstr "Vous pouvez personnaliser l’apparence de votre site sans jamais toucher au code de votre thÃ¨me, en utilisant un fond personnalisÃ©. Votre fond peut Ãªtre une image ou juste une couleur." +||||||| .r11156 +#: wp-admin/includes/file.php:276 +msgid "Invalid form submission." +msgstr "Envoi non valide du formulaire." +======= #: wp-admin/edit-form-comment.php:31 msgid "Name:" msgstr "Nom :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:237 wp-admin/custom-header.php:596 +msgid "Remove Image" +msgstr "Retirer l’image" +||||||| .r11156 +#: wp-admin/includes/file.php:289 wp-admin/includes/import.php:80 +msgid "File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini." +msgstr "Ce fichier est vide. Veuillez envoyer quelque chose de plus substantiel. Cette erreur peut Ã©galement Ãªtre due Ã la dÃ©sactivation de l’envoi de fichier dans le fichier php.ini de votre serveur, ou par une valeur de post_max_size infÃ©rieure Ã celle de upload_max_filesize dans ce mÃªme php.ini." +======= #: wp-admin/edit-form-advanced.php:557 wp-admin/includes/ajax-actions.php:2104 msgid "Last edited on %1$s at %2$s" msgstr "DerniÃ¨re modification le %1$s Ã %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:256 +msgid "This will restore the original background image. You will not be able to restore any customizations." +msgstr "Ceci remettra en place l’image d’arriÃ¨re-plan originale. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +||||||| .r11156 +#: wp-admin/includes/file.php:297 +msgid "Specified file failed upload test." +msgstr "Le test d’envoi du fichier spÃ©cifiÃ© a Ã©chouÃ©." +======= #: wp-admin/edit-form-advanced.php:555 wp-admin/includes/ajax-actions.php:2102 msgid "Last edited by %1$s on %2$s at %3$s" msgstr "DerniÃ¨re modification par %1$s, le %2$s Ã %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:286 +msgid "Display Options" +msgstr "Options d’affichage" +||||||| .r11156 +#: wp-admin/includes/file.php:448 +msgid "Invalid URL Provided." +msgstr "L’URL fournie est invalide" +======= #: wp-admin/edit-form-advanced.php:502 msgid "Get Shortlink" msgstr "Obtenir le lien court" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:581 +msgid "Default Images" +msgstr "Images par dÃ©faut" +||||||| .r11156 +#: wp-admin/includes/file.php:452 +msgid "Could not create Temporary file." +msgstr "Impossible de crÃ©er le fichier temporaire." +======= #: wp-admin/edit-form-advanced.php:481 msgid "Enter title here" msgstr "Saisissez votre titre ici" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:607 +msgid "Reset Image" +msgstr "Remettre l’image d’origine" +||||||| .r11156 +#: wp-admin/includes/file.php:593 wp-admin/includes/file.php:642 +msgid "Could not retrieve file from archive." +msgstr "Impossible de rÃ©cupÃ©rer le fichier depuis l’archive." +======= #: wp-admin/edit-form-advanced.php:417 msgid "We’re backing up this post in your browser, just in case." msgstr "Nous sauvegardons cet article dans votre navigateur, par sÃ©curitÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:609 +msgid "This will restore the original header image. You will not be able to restore any customizations." +msgstr "Ceci remettra en place l’image d’en-tÃªte d’origine. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +||||||| .r11156 +#: wp-admin/includes/file.php:652 +msgid "Could not extract file from archive." +msgstr "Impossible d’extraire les fichiers depuis l’archive." +======= #: wp-admin/edit-form-advanced.php:416 msgid "Connection lost. Saving has been disabled until you’re reconnected." msgstr "Connexion perdue. L’enregistrement a Ã©tÃ© dÃ©sactivÃ© jusqu’Ã ce que vous soyez reconnectÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:633 +msgid "Text Color" +msgstr "Couleur du texte" +||||||| .r11156 +#: wp-admin/includes/file.php:655 wp-admin/includes/file.php:752 +#: wp-admin/includes/file.php:785 wp-admin/includes/update-core.php:981 +#: wp-admin/includes/update-core.php:1084 +msgid "Could not copy file." +msgstr "Impossible de copier le fichier." +======= #: wp-admin/edit-form-advanced.php:391 msgid "Order - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field." msgstr "Ordre - Les pages sont gÃ©nÃ©ralement classÃ©es par ordre alphabÃ©tique, mais vous pouvez indiquer un nombre pour modifier l’ordre d’apparition." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:808 +msgid "Image Upload Error" +msgstr "Erreur lors de l’envoi de l’image" +||||||| .r11156 +#: wp-admin/includes/file.php:694 +msgid "Empty archive." +msgstr "Archive vide." +======= #: wp-admin/edit-form-advanced.php:390 msgid "Template - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu." msgstr "ModÃ¨le - Certains thÃ¨mes utilisent des modÃ¨les spÃ©ciaux que vous pouvez appliquer Ã certaines pages, avec des fonctionnalitÃ©s supplÃ©mentaires ou une mise en page qui leur est propre. Si c’est le cas, vous les verrez dans ce menu dÃ©roulant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:758 +msgid "Crop Header Image" +msgstr "Recadrer l’image d’en-tÃªte" +||||||| .r11156 +#: wp-admin/includes/file.php:1036 +msgid "FTP" +msgstr "FTP" +======= #: wp-admin/edit-form-advanced.php:389 msgid "Parent - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages." msgstr "Parent - Vous pouvez arranger vos pages en hiÃ©rarchies. Par exemple, vous pourriez avoir une page « Ã propos », avec comme sous-pages « Ma vie » et « Mon œuvre ». Il n’y a pas de limite Ã la profondeur des sous-pages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:914 +msgid "You do not have permission to customize headers." +msgstr "Vous n’avez pas l’autorisation de personnaliser les en-tÃªtes." +||||||| .r11156 +#: wp-admin/includes/file.php:1038 +msgid "FTPS (SSL)" +msgstr "FTPS (SSL)" +======= #: wp-admin/edit-form-advanced.php:385 wp-admin/options-discussion.php:14 msgid "Discussion Settings" msgstr "Options de discussion" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:108 wp-admin/edit-comments.php:145 +msgid "Comments on “%s”" +msgstr "Commentaires sur « %s »" +||||||| .r11156 +#: wp-admin/includes/file.php:1040 +msgid "SSH2" +msgstr "SSH2" +======= #: wp-admin/edit-form-advanced.php:381 msgid "Discussion - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them." msgstr "Discussion - Vous pouvez activer ou dÃ©sactiver les commentaires et pings, et si votre article reÃ§oit des commentaires, vous pourrez les voir ici et les modÃ©rer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:229 +msgid "Search Comments" +msgstr "Chercher un commentaire" +||||||| .r11156 +#: wp-admin/includes/file.php:1072 +msgid "Connection Information" +msgstr "Informations sur connexion" +======= #: wp-admin/edit-form-advanced.php:380 msgid "Send Trackbacks - Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they’ll be notified automatically using pingbacks, and this field is unnecessary." msgstr "Envoyer des rÃ©troliens - Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Saisissez les adresses web que vous voulez notifier. Si dans votre article vous faites des liens vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide de pings, sans devoir passer par un rÃ©trolien explicite." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:115 +msgid "Page saved." +msgstr "Page enregistrÃ©e." +||||||| .r11156 +#: wp-admin/includes/file.php:1094 +msgid "Hostname" +msgstr "Nom de l’Hôte :" +======= #: wp-admin/edit-form-advanced.php:376 msgid "Publish Settings" msgstr "RÃ©glages de publication" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:307 +msgid "Title - Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit." +msgstr "Titre - Saisissez un titre pour votre article. AprÃ¨s avoir saisi le titre, un permalien s’affichera en dessous, que vous pourrez modifier Ã loisir." +||||||| .r11156 +#: wp-admin/includes/file.php:1111 +msgid "Authentication Keys" +msgstr "ClÃ©s d’authentification" +======= #: wp-admin/edit-form-advanced.php:369 msgid "Featured Image - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc." msgstr "Image Ã la Une - Vous pouvez associer une image Ã votre article, sans pour autant l’y insÃ©rer. Cela ne sert vraiment que si votre thÃ¨me fait usage de cette fonctionnalitÃ©, sous la forme d’une miniature pour la page d’accueil, d’un en-tÃªte personnalisÃ©..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:393 +msgid "Send Trackbacks - Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they’ll be notified automatically using pingbacks, and this field is unnecessary." +msgstr "Envoyer des rÃ©troliens - Un rÃ©trolien est une maniÃ¨re explicite de notifier les anciens systÃ¨mes de blog que vous avez fait un lien vers eux. Saisissez les adresses web que vous voulez notifier. Si dans votre article vous faites des liens vers des sites WordPress, ils seront notifiÃ©s automatiquement Ã l’aide de pings, sans devoir passer par un rÃ©trolien explicite." +||||||| .r11156 +#: wp-admin/includes/file.php:1113 +msgid "Public Key:" +msgstr "ClÃ© publique :" +======= #: wp-admin/edit-form-advanced.php:365 msgid "Format - Post Formats designate how your theme will display a specific post. For example, you could have a standard blog post with a title and paragraphs, or a short aside that omits the title and contains a short text blurb. Please refer to the Codex for descriptions of each post format. Your theme could enable all or some of 10 possible formats." msgstr "Format d’article - DÃ©signe la maniÃ¨re dont votre thÃ¨me doit afficher un article donnÃ©. Par exemple, vous pourriez vouloir utiliser le format par dÃ©faut pour afficher titre et contenu, ou le format En passant pour ne pas utiliser le titre et n’afficher qu’un court texte. Lisez la documentation du Codex pour obtenir une description de chaque format d’article (en). Il est possible que votre thÃ¨me ne reconnaisse qu’une partie des 10 formats possibles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:403 +msgid "Template - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them in this dropdown menu." +msgstr "ModÃ¨le - Certains thÃ¨mes utilisent des modÃ¨les spÃ©ciaux que vous pouvez appliquer Ã certaines pages, avec des fonctionnalitÃ©s supplÃ©mentaires ou une mise en page qui leur est propre. Si c’est le cas, vous les verrez dans ce menu dÃ©roulant." +||||||| .r11156 +#: wp-admin/includes/file.php:1114 +msgid "Private Key:" +msgstr "ClÃ© privÃ©e :" +======= #: wp-admin/edit-form-advanced.php:362 msgid "Publish - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post." msgstr "Publier - Vous pouvez dÃ©finir la maniÃ¨re dont votre article est publiÃ© dans le bloc « Publier ». Pour « Ãtat », « VisibilitÃ© », « Format » et « Publier (immÃ©diatement) », un clic sur le lien « Modifier » affichera plus d’options. « VisibilitÃ© » inclut des options pour protÃ©ger l’article avec un mot de passe ou faire en sorte qu’il reste en tÃªte de page indÃ©finiment. « Publier (immÃ©diatement) » vous permet de programmer la publication de votre article Ã une date prÃ©cise, dans le futur ou le passÃ© ; cela vous permet d’Ã©crire Ã l’avance des articles Ã publier, ou de les antidater." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:404 +msgid "Order - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field." +msgstr "Ordre - Les pages sont gÃ©nÃ©ralement classÃ©es par ordre alphabÃ©tique, mais vous pouvez indiquer un nombre pour modifier l’ordre d’apparition." +||||||| .r11156 +#: wp-admin/includes/file.php:1118 +msgid "Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above." +msgstr "Saisissez l’adresse du serveur oÃ¹ se trouvent les clÃ©s. Si un mot de passe est nÃ©cessaire, saisissez-le dans le champ ci-dessus." +======= #: wp-admin/edit-form-advanced.php:361 msgid "Several boxes on this screen contain settings for how your content will be published, including:" msgstr "Plusieurs sections de cet Ã©cran vous permettez de rÃ©gler la maniÃ¨re dont votre contenu sera publiÃ©, notamment :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:107 wp-admin/edit-tags.php:475 +msgid "The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." +msgstr "L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union." +||||||| .r11156 +#: wp-admin/includes/file.php:1123 wp-admin/includes/file.php:1125 +msgid "Connection Type" +msgstr "Type de connexion" +======= #: wp-admin/edit-form-advanced.php:355 msgid "Inserting Media" msgstr "Insertion du mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:102 +msgid "Web Address" +msgstr "Adresse web" +||||||| .r11156 +#: wp-admin/includes/file.php:1144 +msgid "Proceed" +msgstr "Continuer" +======= #: wp-admin/edit-form-advanced.php:351 msgid "You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to learn more about embeds." msgstr "Vous pouvez Ã©galement insÃ©rer des contenus en provenance de nombreux sites populaires, comme Twitter, YouTube, Flickr et d’autres, simplement en collant l’adresse web du contenu dans sa propre ligne dans le texte de votre article/page. RÃ©fÃ©rez-vous au Codex pour a href=\"https://codex.wordpress.org/Embeds\">en apprendre plus sur les contenu insÃ©rÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:14 +msgid "You did not select an item for editing." +msgstr "Un contenu n’a pas Ã©tÃ© sÃ©lectionnÃ© pour l’Ã©dition. " +||||||| .r11156 +#: wp-admin/includes/image-edit.php:19 wp-admin/includes/image-edit.php:690 +msgid "Image data does not exist. Please re-upload the image." +msgstr "Il n’y a pas de donnÃ©es d’image. Veuillez envoyer l’image Ã nouveau." +======= #: wp-admin/edit-form-advanced.php:350 msgid "You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button." msgstr "Vous pouvez mettre en ligne et insÃ©rer des fichiers mÃ©dia (images, sons, documents, etc.) en cliquant sur le bouton » Ajouter un mÃ©dia «. Vous pouvez sÃ©lectionner vos images et fichiers parmi ceux dÃ©jÃ prÃ©sents dans la bibliothÃ¨que de mÃ©dias, ou en mettre en ligne de nouveaux Ã ajouter Ã votre article/page. Pour crÃ©er une galerie d’image, sÃ©lectionnez les images Ã ajouter et cliquez sur le bouton » CrÃ©er une nouvelle galerie «." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:213 +msgid "When adding a new category on this screen, you’ll fill in the following fields:" +msgstr "Quand vous ajoutez une nouvelle catÃ©gorie via cet Ã©cran, vous devez remplir les champs suivants :" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:151 +msgid "Crop" +msgstr "Recadrer" +======= #: wp-admin/edit-form-advanced.php:344 wp-admin/media.php:83 msgid "Documentation on Edit Media" msgstr "Documentation sur la modification des mÃ©dias (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:226 +msgid "Description - The description is not prominent by default; however, some themes may display it." +msgstr "Description - La description n’est pas trÃ¨s utilisÃ©e par dÃ©faut, cependant de plus en plus de thÃ¨mes l’affichent." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:155 +msgid "Rotate counter-clockwise" +msgstr "Tourner dans le sens inverse des aiguilles d’une montre" +======= #: wp-admin/edit-form-advanced.php:339 wp-admin/media.php:78 msgid "Remember to click Update Media to save metadata entered or changed." msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le fichier » afin de conserver les mÃ©tadonnÃ©es ajoutÃ©es ou modifiÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:120 wp-admin/media.php:95 +#: wp-admin/upload.php:222 wp-admin/upload.php:267 +msgid "Media attachment updated." +msgstr "Fichier attachÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:156 +msgid "Rotate clockwise" +msgstr "Tourner dans le sens des aiguilles d’une montre" +======= #: wp-admin/edit-form-advanced.php:338 wp-admin/media.php:77 msgid "Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping." msgstr "Pour recadrer une image, cliquez sur l’icÃ´ne Recadrer puis sÃ©lectionnez la zone Ã conserver en cliquant sur l’image et en faisant glisser le curseur de la souris. Ensuite, cliquez sur Enregistrer pour conserver votre modification." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:105 +msgid "Example: http://wordpress.org/ — don’t forget the http://" +msgstr "Exemple : http://www.wordpress-fr.net/ — Et n’oubliez pas le http:// !" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:164 +msgid "Flip vertically" +msgstr "Retournement vertical" +======= #: wp-admin/edit-form-advanced.php:337 wp-admin/media.php:76 msgid "For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information." msgstr "Pour les images (et seulement elles), vous pouvez cliquer sur « Modifier l’Image », sous la miniature, afin de faire apparaÃ®tre un Ã©diteur d’image, vous permettant de recadrer, d’appliquer une rotation ou d’inverser une image, ainsi que de dÃ©faire et refaire vos modifications. Les blocs sur la droite vous donnent accÃ¨s Ã d’autres options pour le changement d’Ã©chelle, le recadrage et mÃªme le recadrage de la miniature, qui peut Ãªtre diffÃ©rent de celui de l’image originale. Cliquez sur le bouton Aide de ces blocs pour obtenir plus d’informations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:350 wp-admin/media.php:77 +msgid "Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping." +msgstr "Pour recadrer une image, cliquez sur l’icÃ´ne Recadrer puis sÃ©lectionnez la zone Ã conserver en cliquant sur l’image et en faisant glisser le curseur de la souris. Ensuite, cliquez sur Enregistrer pour conserver votre modification." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:165 +msgid "Flip horizontally" +msgstr "Retournement horizontal" +======= #: wp-admin/edit-form-advanced.php:336 msgid "This screen allows you to edit four fields for metadata in a file within the media library." msgstr "Cet Ã©cran vous permet de modifier les quatre champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:351 wp-admin/media.php:78 +msgid "Remember to click Update Media to save metadata entered or changed." +msgstr "Pensez bien Ã cliquer sur le bouton « Mettre Ã jour le fichier » afin de conserver les mÃ©tadonnÃ©es ajoutÃ©es ou modifiÃ©es." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:42 +msgid "Scale Image" +msgstr "Redimensionnement de l’image" +======= #: wp-admin/edit-form-advanced.php:328 msgid "Documentation on Editing Pages" msgstr "Documentation sur la modification des pages (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:520 +msgid "Images of exactly %1$d × %2$d pixels will be used as-is." +msgstr "Les images ayant pour taille exacte %1$d pixels par %2$d seront utilisÃ©es telles quelles." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:47 +msgid "Original dimensions %s" +msgstr "Taille originale : %s" +======= #: wp-admin/edit-form-advanced.php:327 msgid "Documentation on Adding New Pages" msgstr "Documentation sur l’ajout de nouvelles pages (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:780 +msgid "Crop and Publish" +msgstr "Recadrer et publier" +||||||| .r11156 +#: wp-admin/custom-background.php:292 wp-admin/custom-background.php:296 +#: wp-admin/includes/image-edit.php:61 +msgid "Restore Original Image" +msgstr "RÃ©tablir l’image originale" +======= #: wp-admin/edit-form-advanced.php:321 msgid "About Pages" msgstr "Ã propos des pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:220 wp-admin/edit-form-advanced.php:408 +msgid "Page Attributes" +msgstr "Attributs de la page" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:63 +msgid "Discard any changes and restore the original image." +msgstr "Abandonner tout changement et rÃ©tablir l’image originale." +======= #: wp-admin/edit-form-advanced.php:317 msgid "Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:" msgstr "Le processus de crÃ©ation d’une page reste trÃ¨s proche de celui d’un article, et les Ã©crans respectifs peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re, par le biais de glisser/dÃ©poser, de l’onglet « Option de l’Ãcran », et en ouvrant/fermant les blocs selon vos besoins. Cet Ã©cran dispose Ã©galement du mode « aucune distraction », tant dans le mode Visuel que dans le mode Texte, via les boutons « Plein Ãcran ». L’Ã©diteur de page fonctionne globalement comme celui des articles, mais dispose de certaines spÃ©cificitÃ©s, disponibles dans le bloc « Attributs de Page » :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:129 +msgid "You are about to move the following comment to the Trash:" +msgstr "Vous Ãªtes sur le point de dÃ©placer le commentaire suivant dans la Corbeille :" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:66 +msgid "Previously edited copies of the image will not be deleted." +msgstr "Les copies de l’image prÃ©cÃ©demment modifiÃ©es ne seront pas effacÃ©es." +======= #: wp-admin/edit-form-advanced.php:316 msgid "Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the “Parent” of the other, creating a group of Pages." msgstr "Les pages sont comme des articles, en cela qu’elles ont un titre, un contenu et des mÃ©tadonnÃ©es associÃ©es ; mais elles diffÃ¨rent en cela qu’elles ne font pas partie du flux chronologique du blog - un peu comme des articles permanents. Les pages ne sont pas catÃ©gorisÃ©es et ne reÃ§oivent pas dâÃ©tiquettes, mais peuvent disposer d’une hiÃ©rarchie. En effet, vous pouvez imbriquer des pages sous d’autres pages, faisant de ces derniÃ¨res les « parentes » des premiÃ¨res, crÃ©ant ainsi un groupement de pages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:152 +msgid "This comment is currently in the Trash." +msgstr "Ce commentaire est actuellement dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:70 +msgid "Restore image" +msgstr "RÃ©tablir l’image" +======= #: wp-admin/edit-form-advanced.php:312 msgid "Documentation on Writing and Editing Posts" msgstr "Documentation sur l’Ã©criture et la modification des articles (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:197 +msgid "%s comment moved to the Trash." +msgid_plural "%s comments moved to the Trash." +msgstr[0] "%s commentaire dÃ©placÃ© dans la Corbeille." +msgstr[1] "%s commentaires dÃ©placÃ©s dans la Corbeille." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:80 +msgid "Image Crop" +msgstr "Recadrage de l’image" +======= #: wp-admin/edit-form-advanced.php:310 msgid "You can also create posts with the Press This bookmarklet." msgstr "Vous pouvez Ã©galement crÃ©er des articles avec le bookmarklet Press This." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:201 +msgid "%s comment restored from the Trash" +msgid_plural "%s comments restored from the Trash" +msgstr[0] "%s commentaire rÃ©cupÃ©rÃ© depuis la Corbeille" +msgstr[1] "%s commentaires rÃ©cupÃ©rÃ©s depuis la Corbeille" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:85 +msgid "Crop Aspect Ratio" +msgstr "Proportion de taille du recadrage" +======= #: wp-admin/edit-form-advanced.php:305 msgid "Title and Post Editor" msgstr "Titre et Ã©diteur d’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:212 +msgid "View Trash" +msgstr "Voir la Corbeille" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:88 +msgid "Crop Selection" +msgstr "SÃ©lection de recadrage" +======= #: wp-admin/edit-form-advanced.php:301 msgid "Keyboard users: When you’re working in the visual editor, you can use Alt + F10 to access the toolbar." msgstr "Utilisateurs du clavier : lorsque vous travaillez dans l’Ã©diteur visuel, vous pouvez utiliser Alt + F10 pour accÃ©der Ã la barre d'outils." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:91 +msgid "Don’t forget to click on the Save Changes button when you are finished." +msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ©." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:94 +msgid "Aspect ratio:" +msgstr "Proportion de taille :" +======= #: wp-admin/edit-form-advanced.php:300 msgid "You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options." msgstr "Vous pouvez activer le mode d'Ã©criture sans distraction en cliquant sur l'icÃ´ne Ã droite. Cette fonctionnalitÃ© n'est pas disponible pour les anciens navigateurs ou les appareils Ã petits Ã©crans, et requiert l'activation l'Ã©diteur plein-Ã©cran dans les options de l'Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:241 +msgid "Remove Background Image" +msgstr "Supprimer l’image d’arriÃ¨re-plan" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:103 +msgid "Selection:" +msgstr "SÃ©lection :" +======= #: wp-admin/edit-form-advanced.php:299 msgid "You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode." msgstr "Vous pouvez insÃ©rer des fichiers mÃ©dia en cliquant sur les icÃ´nes situÃ©es au-dessus de l’Ã©diteur, puis en suivant les instructions. Vous pouvez aligner ou modifier les images Ã l'aide de la barre de mise en page disponible dans le mode Visuel." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:130 wp-admin/edit-form-comment.php:152 +#: wp-admin/includes/class-wp-comments-list-table.php:268 +#: wp-admin/includes/class-wp-posts-list-table.php:295 +#: wp-admin/includes/media.php:1479 wp-admin/includes/meta-boxes.php:243 +msgid "Move to Trash" +msgstr "DÃ©placer dans la Corbeille" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:118 +msgid "Thumbnail Settings" +msgstr "RÃ©glages de la miniature" +======= #: wp-admin/edit-form-advanced.php:298 msgid "The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically." msgstr "Le mode Texte vous permet de saisir directement du code HTML en mÃªme temps que le contenu de votre article. Les retours Ã la ligne seront automatiquement convertis en paragraphes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:221 +msgid "Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens." +msgstr "Identifiant - L’identifiant est la version normalisÃ©e du nom. Il ne contient gÃ©nÃ©ralement que des lettres minuscules non accentuÃ©es, des chiffres et des traits d’union ;" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:124 +msgid "Current thumbnail" +msgstr "Miniature actuelle" +======= #: wp-admin/edit-form-advanced.php:297 msgid "Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. " msgstr "Le mode Visuel vous donne accÃ¨s Ã un Ã©diteur WYSIWYG ; cliquez sur la derniÃ¨re icÃ´ne de la rangÃ©e pour afficher une seconde rangÃ©e d’icÃ´nes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:228 +msgid "You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table." +msgstr "Vous pouvez modifier l’affichage de cet Ã©cran via l’onglet « Options de l’Ã©cran », afin de dÃ©finir le nombre d’Ã©lÃ©ments Ã afficher par Ã©cran, et afficher/cacher les colonnes du tableau." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:128 +msgid "Apply changes to:" +msgstr "Appliquer les modifications Ã  :" +======= #: wp-admin/edit-form-advanced.php:296 msgid "Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab." msgstr "Ãditeur d’article - Saisissez-y le contenu de votre article. Vous disposez pour ce faire de deux modes : Visuel ou Texte. Choisissez un mode en cliquant sur l’onglet correspondant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:81 wp-admin/freedoms.php:20 +msgid "Welcome to WordPress %s" +msgstr "Bienvenue dans WordPress %s" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:132 +msgid "All image sizes" +msgstr "Toutes les tailles" +======= #: wp-admin/edit-form-advanced.php:295 msgid "Title - Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit." msgstr "Titre - Saisissez un titre pour votre article. AprÃ¨s avoir saisi le titre, un permalien s’affichera en dessous, que vous pourrez modifier Ã loisir." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:160 wp-admin/plugins.php:293 wp-admin/plugins.php:299 +#: wp-admin/theme-editor.php:215 +msgid "Caution:" +msgstr "Attention :" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:140 +msgid "All sizes except thumbnail" +msgstr "Toutes les tailles sauf la miniature" +======= #: wp-admin/edit-form-advanced.php:291 msgid "Customizing This Display" msgstr "Personnaliser cet Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:102 +msgid "WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress." +msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©partie sur toute la planÃ¨te. Participez au dÃ©veloppement de WordPress !" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:565 +msgid "Cannot load image metadata." +msgstr "Impossible de charger les mÃ©tadonnÃ©es de l’image." +======= #: wp-admin/edit-form-advanced.php:287 msgid "The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen." msgstr "Le champ du titre et la zone d’Ã©dition de l’article sont inamovibles, mais vous pouvez dÃ©placer toutes les autres blocs par simple glisser/dÃ©poser. Vous pouvez Ã©galement les fermer/ouvrir en cliquant sur la barre de titre de chaque boite. Utilisez l’onglet « Options de l’Ã©cran » pour cacher d’autres boites (Extrait, Envoyer des rÃ©troliens, Champs personnalisÃ©s, Discussion, Identifiant, Auteur) ou pour choisir un affichage sur une ou deux colonnes pour cet Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:110 +msgid "WordPress is created by a worldwide team of passionate individuals." +msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©parties sur toute la planÃ¨te." +||||||| .r11156 +#: wp-admin/includes/image-edit.php:623 +msgid "Cannot save image metadata." +msgstr "Impossible d’enregistrer les mÃ©tadonnÃ©es de l’image." +======= #: wp-admin/edit-form-advanced.php:239 wp-admin/edit-tag-form.php:91 #: wp-admin/edit-tags.php:462 #: wp-admin/includes/class-wp-posts-list-table.php:1065 @@ -9566,76 +32350,261 @@ msgstr "Le champ du titre et la zone d’Ã©dition de l’article sont in #: wp-admin/includes/meta-boxes.php:664 msgid "Slug" msgstr "Identifiant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:116 +msgctxt "Translate this to be the equivalent of English Translators in your language for the credits page Translators section" +msgid "Translators" +msgstr "Traducteurs" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:628 +msgid "Image metadata is inconsistent." +msgstr "Les mÃ©tadonnÃ©es de l’image ne sont pas cohÃ©rentes." +======= #: wp-admin/edit-form-advanced.php:233 wp-admin/menu.php:239 msgid "Discussion" msgstr "Discussion" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:161 +msgid "Want to see your name in lights on this page? Get involved in WordPress." +msgstr "Vous voulez faire partie des noms listÃ©s sur cette page ? Participez au dÃ©veloppement de WordPress !" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:630 +msgid "Image restored successfully." +msgstr "L’image a bien Ã©tÃ© rÃ©tablie." +======= #: wp-admin/edit-form-advanced.php:220 msgid "Custom Fields" msgstr "Champs personnalisÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:173 +msgid "Project Leaders" +msgstr "Chefs de projet" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:651 +msgid "Unable to create new image." +msgstr "Ãchec lors de la crÃ©ation d’une nouvelle image." +======= #: wp-admin/edit-form-advanced.php:217 msgid "Send Trackbacks" msgstr "Envoyer des rÃ©troliens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:174 +msgid "Extended Core Team" +msgstr "Ãquipe principale Ã©tendue" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:674 +msgid "Error while saving the scaled image. Please reload the page and try again." +msgstr "Une erreur est survenue pendant la modification de l’Ã©chelle de l’image. Veuillez recharger la page pour faire une nouvelle tentative." +======= #: wp-admin/edit-form-advanced.php:211 msgid "Featured Image" msgstr "Image Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:175 +msgid "Core Developers" +msgstr "DÃ©veloppeurs principaux" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:682 +msgid "Nothing to save, the image has not changed." +msgstr "Rien Ã enregistrer, l’image n’a pas Ã©tÃ© modifiÃ©e." +======= #: wp-admin/edit-form-advanced.php:208 msgid "Attributes" msgstr "Attributs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:176 +msgid "Recent Rockstars" +msgstr "Ãtoiles montantes" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:725 +msgid "Unable to save the image." +msgstr "Ãchec lors de l’enregistrement de l’image." +======= #: wp-admin/edit-form-advanced.php:208 wp-admin/edit-form-advanced.php:395 msgid "Page Attributes" msgstr "Attributs de la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:177 +msgid "Core Contributors to WordPress %s" +msgstr "Contributeurs au code de WordPress %s" +||||||| .r11156 +#: wp-admin/includes/image-edit.php:826 +msgid "Image saved" +msgstr "Image enregistrÃ©e" +======= #: wp-admin/edit-form-advanced.php:147 msgid "There is an autosave of this post that is more recent than the version below. View the autosave" msgstr "Une sauvegarde automatique existe pour cet article ; elle est plus rÃ©cente que la version affichÃ©e ci-dessous. Afficher cette sauvegarde automatique." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:178 +msgid "Contributing Developers" +msgstr "DÃ©veloppeurs ayant contribuÃ©" +||||||| .r11156 +#: wp-admin/includes/media.php:18 +msgid "From Computer" +msgstr "Depuis votre ordinateur" +======= #: wp-admin/edit-form-advanced.php:108 wp-admin/media.php:95 #: wp-admin/upload.php:222 wp-admin/upload.php:267 msgid "Media attachment updated." msgstr "Fichier attachÃ© mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:180 +msgid "Lead Developer" +msgstr "DÃ©veloppeur principal" +||||||| .r11156 +#: wp-admin/includes/media.php:19 +msgid "From URL" +msgstr "Depuis le Web" +======= #: wp-admin/edit-form-advanced.php:106 msgid "Page draft updated. Preview page" msgstr "Brouillon de page mis Ã jour. PrÃ©visualiser la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:182 +msgid "User Experience Lead" +msgstr "En charge de l’expÃ©rience utilisateur" +||||||| .r11156 +#: wp-admin/includes/media.php:20 +msgid "Gallery" +msgstr "Galerie" +======= #: wp-admin/edit-form-advanced.php:105 msgid "Page scheduled for: %1$s. Preview page" msgstr "Page prÃ©vue pour le : %1$s. Afficher la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:183 +msgid "Core Developer" +msgstr "DÃ©veloppeur cœur" +||||||| .r11156 +#: wp-admin/includes/media.php:60 +msgid "Gallery (%s)" +msgstr "Galerie (%s)" +======= #: wp-admin/edit-form-advanced.php:104 msgid "Page submitted. Preview page" msgstr "Page proposÃ©e. PrÃ©visualiser la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:184 +msgid "Core Committer" +msgstr "DÃ©veloppeur principal" +||||||| .r11156 +#: wp-admin/includes/media.php:424 +msgid "Uploads" +msgstr "Fichiers envoyÃ©s" +======= #: wp-admin/edit-form-advanced.php:103 msgid "Page saved." msgstr "Page enregistrÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:185 +msgid "Guest Committer" +msgstr "DÃ©veloppeur invitÃ©" +||||||| .r11156 +#: wp-admin/includes/media.php:424 wp-admin/includes/template.php:1530 +#: wp-admin/install.php:76 wp-admin/maint/repair.php:25 +#: wp-admin/setup-config.php:86 wp-admin/upgrade.php:62 +msgid "WordPress" +msgstr "WordPress" +======= #: wp-admin/edit-form-advanced.php:102 msgid "Page published. View page" msgstr "Page publiÃ©e. Afficher la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:186 +msgid "Developer" +msgstr "DÃ©veloppeur" +||||||| .r11156 +#: wp-admin/includes/media.php:1016 wp-admin/includes/media.php:1169 +msgid "File URL" +msgstr "Adresse web du fichier" +======= #: wp-admin/edit-form-advanced.php:101 msgid "Page restored to revision from %s" msgstr "Page rÃ©tablie Ã partir de la rÃ©vision du %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:187 +msgid "Designer" +msgstr "Concepteur graphique" +||||||| .r11156 +#: wp-admin/includes/media.php:1214 wp-admin/includes/media.php:2476 +msgid "Alt text for the image, e.g. “The Mona Lisa”" +msgstr "Texte alternatif de l’image, exemple : « La Joconde »" +======= #: wp-admin/edit-form-advanced.php:100 msgid "Page updated." msgstr "Page mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:189 +msgid "Internationalization" +msgstr "Internationalisation" +||||||| .r11156 +#: wp-admin/includes/media.php:1087 +msgid "Empty Title filled from filename." +msgstr "Titre absent, il sera rempli Ã partir du nom du fichier." +======= #: wp-admin/edit-form-advanced.php:97 msgid "Page updated. View page" msgstr "Page mise Ã jour. Afficher la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:190 +msgid "External Libraries" +msgstr "BibliothÃ¨ques tierces" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1085 +#: wp-admin/includes/media.php:1165 wp-admin/includes/media.php:2139 +#: wp-admin/includes/meta-boxes.php:752 wp-admin/includes/meta-boxes.php:753 +msgid "Order" +msgstr "Ordre" +======= #: wp-admin/edit-form-advanced.php:93 msgid "Post draft updated. Preview post" msgstr "Brouillon d’article mis Ã jour. PrÃ©visualiser l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:191 +msgid "Icon Design" +msgstr "Conception des icÃ´nes" +||||||| .r11156 +#: wp-admin/includes/media.php:1173 +msgid "Location of the uploaded file." +msgstr "Emplacement du fichier envoyÃ©." +======= #. translators: Publish box date format, see http:php.net/date #: wp-admin/edit-form-advanced.php:92 wp-admin/edit-form-advanced.php:105 #: wp-admin/edit-form-comment.php:103 @@ -9645,680 +32614,2356 @@ msgstr "Brouillon d’article mis Ã jour. #: wp-admin/includes/revision.php:224 msgid "M j, Y @ H:i" msgstr "j F Y \\Ã G \\h i \\m\\i\\n " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:277 +msgid "Set as background" +msgstr "Utiliser comme image de fond" +||||||| .r11156 +#: wp-admin/includes/media.php:1320 wp-admin/includes/media.php:2125 +msgid "Show" +msgstr "Afficher" +======= #: wp-admin/edit-form-advanced.php:90 msgid "Post scheduled for: %1$s. Preview post" msgstr "Article prÃ©vu pour le : %1$s. PrÃ©visualiser l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:523 +msgid "Images should be at least %1$d pixels wide." +msgstr "Les images devraient faire au moins %1$d pixels de large." +||||||| .r11156 +#: wp-admin/includes/media.php:1321 wp-admin/includes/media.php:2126 +msgid "Hide" +msgstr "Cacher" +======= #: wp-admin/edit-form-advanced.php:89 msgid "Post submitted. Preview post" msgstr "Article proposÃ©. PrÃ©visualiser l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:526 +msgid "Images should be at least %1$d pixels tall." +msgstr "Les images devraient faire au moins %1$d pixels de haut." +||||||| .r11156 +#: wp-admin/includes/media.php:1399 +msgid "Upload date:" +msgstr "Date de mise en ligne :" +======= #: wp-admin/edit-form-advanced.php:88 msgid "Post saved." msgstr "Article enregistrÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:530 +msgid "Suggested width is %1$d pixels." +msgstr "La largeur suggÃ©rÃ©e est de %1$d pixels." +||||||| .r11156 +#: wp-admin/includes/media.php:1419 wp-admin/includes/media.php:2506 +#: wp-admin/includes/media.php:2512 +msgid "Insert into Post" +msgstr "InsÃ©rer dans l’article" +======= #: wp-admin/edit-form-advanced.php:87 msgid "Post published. View post" msgstr "Article publiÃ©. Afficher l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:532 +msgid "Suggested height is %1$d pixels." +msgstr "La hauteur suggÃ©rÃ©e est de %1$d pixels." +||||||| .r11156 +#: wp-admin/includes/media.php:1428 +msgid "You are about to delete %s." +msgstr "Vous Ãªtes sur le point de supprimer %s." +======= #. translators: %s: date and time of the revision #: wp-admin/edit-form-advanced.php:86 msgid "Post restored to revision from %s" msgstr "Article rÃ©tabli Ã partir de la rÃ©vision du %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:570 +msgid "Uploaded Images" +msgstr "Images mises en ligne" +||||||| .r11156 +#: wp-admin/includes/media.php:1910 +msgid "Add media files from your computer" +msgstr "Ajouter un fichier mÃ©dia depuis votre ordinateur" +======= #: wp-admin/edit-form-advanced.php:84 msgid "Post updated." msgstr "Article mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:599 +msgid "Remove Header Image" +msgstr "Retirer l’image d’en-tÃªte" +||||||| .r11156 +#: wp-admin/includes/media.php:1939 wp-admin/includes/media.php:2149 +#: wp-admin/includes/media.php:2409 +msgid "Save all changes" +msgstr "Enregistrer toutes les modifications" +======= #: wp-admin/edit-form-advanced.php:83 wp-admin/edit-form-advanced.php:99 msgid "Custom field deleted." msgstr "Champ personnalisÃ© supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:744 wp-admin/custom-header.php:868 +#: wp-admin/custom-header.php:1182 +msgid "Image could not be processed. Please go back and try again." +msgstr "L’image n’a pas pu Ãªtre traitÃ©e. Veuillez revenir en arriÃ¨re en rÃ©essayer." +||||||| .r11156 +#: wp-admin/includes/media.php:2124 +msgid "All Tabs:" +msgstr "Tous les onglets :" +======= #: wp-admin/edit-form-advanced.php:82 wp-admin/edit-form-advanced.php:98 msgid "Custom field updated." msgstr "Champ personnalisÃ© mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:555 +msgid "Set as header" +msgstr "Utiliser comme en-tÃªte" +||||||| .r11156 +#: wp-admin/includes/media.php:2128 +msgid "Sort Order:" +msgstr "Ordre de tri :" +======= #: wp-admin/edit-form-advanced.php:81 msgid "Post updated. View post" msgstr "Article mis Ã jour. Afficher l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:122 +msgid "Moderating Comments" +msgstr "ModÃ©ration des commentaires" +||||||| .r11156 +#: wp-admin/includes/media.php:2129 wp-admin/includes/media.php:2197 +msgid "Ascending" +msgstr "Croissant" +======= #: wp-admin/edit-comments.php:229 msgid "Search Comments" msgstr "Chercher un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:128 +msgid "Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more." +msgstr "De nombreux utilisateurs utilisent les raccourcis clavier pour modÃ©rer leurs commentaires plus rapidement. Suivez le lien sur le cÃ´tÃ© pour en savoir plus." +||||||| .r11156 +#: wp-admin/includes/media.php:2130 wp-admin/includes/media.php:2200 +msgid "Descending" +msgstr "DÃ©croissant" +======= #: wp-admin/edit-comments.php:215 msgid "This comment is already marked as spam." msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:155 wp-admin/edit-tags.php:317 +#: wp-admin/edit.php:291 wp-admin/link-manager.php:74 wp-admin/plugins.php:454 +#: wp-admin/upload.php:216 wp-admin/users.php:462 +msgid "Search results for “%s”" +msgstr "RÃ©sultats de recherche pour « %s »" +||||||| .r11156 +#: wp-admin/includes/media.php:2161 +msgid "Link thumbnails to:" +msgstr "Lier les miniatures Ã  :" +======= #: wp-admin/edit-comments.php:212 msgid "View Trash" msgstr "Voir la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:220 +msgid "Attributes" +msgstr "Attributs" +||||||| .r11156 +#: wp-admin/includes/media.php:2166 +msgid "Image File" +msgstr "Fichier image" +======= #: wp-admin/edit-comments.php:212 msgid "This comment is already in the Trash." msgstr "Ce commentaire est dÃ©jÃ marquÃ© comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:303 +msgid "Customizing This Display" +msgstr "Personnaliser cet Ã©cran" +||||||| .r11156 +#: wp-admin/includes/media.php:2176 +msgid "Order images by:" +msgstr "Ranger les images par :" +======= #: wp-admin/edit-comments.php:209 wp-admin/edit-comments.php:215 #: wp-admin/includes/class-wp-comments-list-table.php:483 #: wp-admin/includes/dashboard.php:560 msgid "Edit comment" msgstr "Modifier le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:317 +msgid "Title and Post Editor" +msgstr "Titre et Ã©diteur d’article" +||||||| .r11156 +#: wp-admin/includes/media.php:2181 +msgid "Menu order" +msgstr "Ordre du menu" +======= #: wp-admin/edit-comments.php:209 msgid "This comment is already approved." msgstr "Ce commentaire est dÃ©jÃ approuvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:394 +msgid "Discussion - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them." +msgstr "Discussion - Vous pouvez activer ou dÃ©sactiver les commentaires et pings, et si votre article reÃ§oit des commentaires, vous pourrez les voir ici et les modÃ©rer." +||||||| .r11156 +#: wp-admin/includes/media.php:2183 +msgid "Date/Time" +msgstr "Horodatage" +======= #: wp-admin/edit-comments.php:204 msgid "%s comment permanently deleted" msgid_plural "%s comments permanently deleted" msgstr[0] "%s commentaire supprimÃ© dÃ©finitivement" msgstr[1] "%s commentaires supprimÃ©s dÃ©finitivement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:333 +msgid "About Pages" +msgstr "Ã propos des pages" +||||||| .r11156 +#: wp-admin/includes/media.php:2184 +msgid "Random" +msgstr "AlÃ©atoire" +======= #: wp-admin/edit-comments.php:201 msgid "%s comment restored from the Trash" msgid_plural "%s comments restored from the Trash" msgstr[0] "%s commentaire rÃ©cupÃ©rÃ© depuis la Corbeille" msgstr[1] "%s commentaires rÃ©cupÃ©rÃ©s depuis la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:60 +msgid "XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking." +msgstr "XFN signifie XHTML Friends Network, c’est-Ã -dire RÃ©seau XHTML d’Amis. Son usage est facultatif. WordPress permet de gÃ©nÃ©rer les attributs XFN de vos liens, afin d’indiquer la maniÃ¨re dont vous Ãªtes liÃ© Ã l’auteur ou le propriÃ©taire de la page liÃ©e." +||||||| .r11156 +#: wp-admin/includes/media.php:2192 +msgid "Order:" +msgstr "Ordre :" +======= #: wp-admin/edit-comments.php:197 msgid "%s comment moved to the Trash." msgid_plural "%s comments moved to the Trash." msgstr[0] "%s commentaire dÃ©placÃ© dans la Corbeille." msgstr[1] "%s commentaires dÃ©placÃ©s dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:196 +msgid "You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts." +msgstr "Vous pouvez crÃ©er des groupes de liens en utilisant les catÃ©gories de liens. Le nom d’une catÃ©gorie de liens doit Ãªtre unique, et les catÃ©gories de liens ne sont pas les mÃªmes que les catÃ©gories de vos articles." +||||||| .r11156 +#: wp-admin/includes/media.php:2207 +msgid "Gallery columns:" +msgstr "Colonnes de galerie :" +======= #: wp-admin/edit-comments.php:193 msgid "%s comment restored from the spam" msgid_plural "%s comments restored from the spam" msgstr[0] "%s commentaire rÃ©tabli depuis les commentaires indÃ©sirables" msgstr[1] "%s commentaires rÃ©tablis depuis les commentaires indÃ©sirables" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:232 +msgid "Adding Categories" +msgstr "Ajout de catÃ©gories" +||||||| .r11156 +#: wp-admin/includes/media.php:2228 +msgid "Update gallery settings" +msgstr "Mettre Ã jour les rÃ©glages de galerie" +======= #: wp-admin/edit-comments.php:189 msgid "%s comment marked as spam." msgid_plural "%s comments marked as spam." msgstr[0] "%s commentaire marquÃ© comme indÃ©sirable." msgstr[1] "%s commentaires marquÃ©s comme indÃ©sirables." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:85 wp-admin/edit-tags.php:467 +#: wp-admin/includes/class-wp-terms-list-table.php:169 +#: wp-admin/includes/class-wp-terms-list-table.php:543 +msgctxt "term name" +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-admin/includes/media.php:2305 +msgid "All Types" +msgstr "Tous les types" +======= #: wp-admin/edit-comments.php:185 msgid "%s comment approved" msgid_plural "%s comments approved" msgstr[0] "%s commentaire approuvÃ©" msgstr[1] "%s commentaires approuvÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:179 +msgid "Cofounder, Project Lead" +msgstr "Cofondateur, chef de projet" +||||||| .r11156 +#: wp-admin/includes/media.php:2379 +msgid "Filter »" +msgstr "Filtrer »" +======= #: wp-admin/edit-comments.php:155 wp-admin/edit-tags.php:306 #: wp-admin/edit.php:287 wp-admin/link-manager.php:74 wp-admin/plugins.php:451 #: wp-admin/upload.php:216 wp-admin/users.php:456 msgid "Search results for “%s”" msgstr "RÃ©sultats de recherche pour « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:107 +msgid "Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the “Save Changes” button." +msgstr "Certains thÃ¨mes disposent d’une sÃ©rie d’images d’en-tÃªte. Si vous voyez plusieurs images affichÃ©es, sÃ©lectionnez celle que vous aimez et cliquez sur le bouton « Enregistrer les modifications »." +||||||| .r11156 +#: wp-admin/includes/media.php:2430 +msgid "Image Caption" +msgstr "LÃ©gende de l’image" +======= #: wp-admin/edit-comments.php:135 msgid "Documentation on Keyboard Shortcuts" msgstr "Documentation sur les raccourcis clavier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:114 wp-admin/custom-header.php:619 +#: wp-admin/custom-header.php:624 +msgid "Header Text" +msgstr "Texte de l’en-tÃªte" +||||||| .r11156 +#: wp-admin/includes/media.php:2495 +msgid "Link Image To:" +msgstr "Lier l’image Ã  :" +======= #: wp-admin/edit-comments.php:134 msgid "Documentation on Comment Spam" msgstr "Documentation sur les commentaires indÃ©sirables" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:163 +#: wp-admin/includes/class-wp-theme-install-list-table.php:333 +#: wp-admin/theme-install.php:259 +msgid "Collapse" +msgstr "RÃ©duire" +||||||| .r11156 +#: wp-admin/includes/media.php:2500 +msgid "Link to image" +msgstr "Lier Ã l’image" +======= #: wp-admin/edit-comments.php:128 msgid "Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more." msgstr "De nombreux utilisateurs utilisent les raccourcis clavier pour modÃ©rer leurs commentaires plus rapidement. Suivez le lien sur le cÃ´tÃ© pour en savoir plus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:118 +msgid "You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions." +msgstr "Vous pouvez gÃ©rer les commentaires sur votre site de la mÃªme maniÃ¨re que vous gÃ©rez les articles et autres contenus. Cet Ã©cran est personnalisable de la mÃªme maniÃ¨re que les autres Ã©crans de gestion, et vous pouvez agir sur les commentaires par le biais des liens qui apparaissent au survol de la souris, ou via le menu « Actions groupÃ©es »." +||||||| .r11156 +#: wp-admin/includes/media.php:2469 +msgid "Link text, e.g. “Ransom Demands (PDF)”" +msgstr "Texte du lien, par exemple « ThÃ©orie sur le chaos (PDF) »" +======= #: wp-admin/edit-comments.php:127 msgid "In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post." msgstr "Dans la colonne « En rÃ©ponse Ã  » se trouvent trois Ã©lÃ©ments. Le texte correspond au titre de l’article qui a inspirÃ© ce commentaire, et un clic sur ce lien vous permettra de modifier cet article. Le lien « Afficher l’article » mÃ¨ne Ã l’article sur le site. La petite bulle avec un nombre vous indique le nombre de commentaires que l’article a reÃ§us. Si la bulle est grise, vous avez modÃ©rÃ© tous les commentaires de cet article. Si elle est bleue, il y a des commentaires en attente de modÃ©ration. Un clic sur la bulle filtrera la liste des commentaires pour ne plus afficher que ceux liÃ©s Ã cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:97 +msgid "Example: Nifty blogging software" +msgstr "Exemple : Logiciel de crÃ©ation de sites rapide, puissant et efficace" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:42 +msgid "Preview Changes" +msgstr "PrÃ©visualiser les modifications" +======= #: wp-admin/edit-comments.php:126 msgid "In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment." msgstr "Dans la colonne « Commentaire », vous trouverez au-dessus de chaque commentaire la date et l’heure de son envoi. En cliquant sur ce lien, vous irez Ã la page de votre site oÃ¹ le commentaire a Ã©tÃ© publiÃ©. En survolant n’importe quel commentaire, des options apparaÃ®tront, vous permettant d’approuver un commentaire, y rÃ©pondre (et l’approuver), modifier ses dÃ©tails, modifier son contenu, le marquer comme indÃ©sirable, ou le jeter Ã la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:194 +msgid "You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your writing settings." +msgstr "Vous pouvez utiliser les catÃ©gories pour donner des sections Ã votre site, et grouper les articles connexes. La catÃ©gorie par dÃ©faut est « Non classÃ© » ; vous pouvez la modifier dans vos options d’Ã©criture." +||||||| .r11156 +#: wp-admin/export.php:184 wp-admin/export.php:216 +#: wp-admin/includes/meta-boxes.php:68 +msgid "Status:" +msgstr "Ãtat :" +======= #: wp-admin/edit-comments.php:125 msgid "In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address." msgstr "Dans la colonne « Auteur », en plus de trouver le nom de l’auteur, son adresse de messagerie et celle de son site, vous trouverez son adresse IP. En cliquant dessus, vous obtiendrez une liste de tous les commentaires faits depuis cette adresse IP." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:218 +msgid "Name - The name is how it appears on your site." +msgstr "Nom - Ce nom est utilisÃ© un peu partout sur votre site ;" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:119 +msgid "Visibility:" +msgstr "VisibilitÃ© :" +======= #: wp-admin/edit-comments.php:124 msgid "A red bar on the left means the comment is waiting for you to moderate it." msgstr "Une barre rouge sur la gauche signifie que le commentaire attention votre validation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:90 +msgid "You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." +msgstr "Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:127 wp-admin/includes/meta-boxes.php:150 +#: wp-admin/includes/template.php:1626 +msgid "Password protected" +msgstr "ProtÃ©gÃ© par mot de passe" +======= #: wp-admin/edit-comments.php:122 msgid "Moderating Comments" msgstr "ModÃ©ration des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:276 +msgid "Choose a Background Image" +msgstr "Choisir une image d’arriÃ¨re-plan" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:148 +msgid "Stick this post to the front page" +msgstr "Mettre cet article en avant sur la page d’accueil" +======= #: wp-admin/edit-comments.php:118 msgid "You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions." msgstr "Vous pouvez gÃ©rer les commentaires sur votre site de la mÃªme maniÃ¨re que vous gÃ©rez les articles et autres contenus. Cet Ã©cran est personnalisable de la mÃªme maniÃ¨re que les autres Ã©crans de gestion, et vous pouvez agir sur les commentaires par le biais des liens qui apparaissent au survol de la souris, ou via le menu « Actions groupÃ©es »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:98 +msgid "This screen is used to customize the header section of your theme." +msgstr "Cet Ã©cran est utilisÃ© pour personnaliser la section d’en-tÃªte de votre thÃ¨me." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:168 +msgid "Scheduled for: %1$s" +msgstr "PlanifiÃ© pour : %1$s" +======= #: wp-admin/edit-comments.php:108 wp-admin/edit-comments.php:145 msgid "Comments on “%s”" msgstr "Commentaires sur « %s »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:99 +msgid "You can choose from the theme’s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed." +msgstr "Vous pouvez choisir Ã partir des images d’en-tÃªte par dÃ©faut du thÃ¨me, ou utiliser l’une des vÃ´tres. Vous pouvez Ã©galement personnaliser la maniÃ¨re dont s’affichent le titre de votre site et son slogan." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:170 +msgid "Published on: %1$s" +msgstr "PubliÃ© le : %1$s" +======= #: wp-admin/customize.php:166 #: wp-admin/includes/class-wp-theme-install-list-table.php:303 #: wp-admin/theme-install.php:260 msgid "Collapse" msgstr "RÃ©duire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:109 +msgid "If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”." +msgstr "Si vous ne souhaitez pas que votre site utilise une image d’en-tÃªte, cliquez sur le bouton « Retirer lâimage d’en-tÃªte » en bas de la section « Image d’en-tÃªte » de cette page. Si vous souhaitez rÃ©activer l’image d’en-tÃªte, il vous suffit de sÃ©lectionner l’une des autres options d’images, et de la valider en cliquant sur « Enregistrer les modifications »." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:172 wp-admin/includes/meta-boxes.php:180 +msgid "Publish immediately" +msgstr "Publier tout de suite" +======= #: wp-admin/customize.php:164 #: wp-admin/includes/class-wp-theme-install-list-table.php:302 #: wp-admin/theme-install.php:259 msgid "Collapse Sidebar" msgstr "RÃ©duire la barre latÃ©rale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:116 +msgid "For most themes, the header text is your Site Title and Tagline, as defined in the General Settings section." +msgstr "Pour la plupart des thÃ¨mes, le texte d’en-tÃªte est le titre de votre site et son slogan, tels que dÃ©finis dans la section RÃ©glages gÃ©nÃ©raux." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:174 +msgid "Schedule for: %1$s" +msgstr "Planifier pour : %1$s" +======= #: wp-admin/customize.php:153 msgid "The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them." msgstr "L’outil de personnalisation vous permet de prÃ©visualiser les modifications faites Ã votre site avant de les publier. Vous pouvez Ã©galement parcourir les pages de votre site pour mieux apprÃ©cier vos modifications en contexte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:117 +msgid "In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." +msgstr "Dans la section « Texte d’en-tÃªte » de cette page, vous pouvez choisir d’afficher ce texte ou de le cacher. Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:176 +msgid "Publish on: %1$s" +msgstr "Publier le : %1$s" +======= #: wp-admin/customize.php:147 msgid "Customizer Options" msgstr "Options de personnalisation du thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:118 +msgid "Don’t forget to click “Save Changes” when you’re done!" +msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ© !" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:471 wp-admin/includes/meta-boxes.php:841 +#: wp-admin/includes/nav-menu.php:933 wp-admin/press-this.php:535 +msgid "Most Used" +msgstr "Les plus utilisÃ©es" +======= #: wp-admin/customize.php:139 wp-admin/themes.php:366 msgid "Close overlay" msgstr "Fermer la fenÃªtre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:554 +msgid "Choose a Custom Header" +msgstr "Choisir un en-tÃªte personnalisÃ©" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:862 wp-admin/includes/meta-boxes.php:864 +msgid "+ Add New Category" +msgstr "+ Ajouter une nouvelle catÃ©gorie" +======= #: wp-admin/customize.php:94 msgid "Loading…" msgstr "Chargement…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:627 +msgid "Show header text with your image." +msgstr "Afficher le texte d’en-tÃªte avec l’image." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:865 +msgid "New category name" +msgstr "Nom de la nouvelle catÃ©gorie" +======= #: wp-admin/customize.php:91 msgctxt "Placeholder is the document title from the preview" msgid "Live Preview: %s" msgstr "PrÃ©visualisation : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:654 +msgctxt "color" +msgid "Default: %s" +msgstr "Par dÃ©faut : %s" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:526 +msgid "Excerpts are optional hand-crafted summaries of your content that can be used in your theme. Learn more about manual excerpts." +msgstr "Les extraits sont des rÃ©sumÃ©s facultatifs de vos articles, Ã©crits Ã la main. Il se peut que votre thÃ¨me s’en serve. En savoir plus." +======= #: wp-admin/customize.php:89 msgctxt "Placeholder is the document title from the preview" msgid "Customize: %s" msgstr "Personnalisation : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:783 +msgid "Skip Cropping, Publish Image as Is" +msgstr "Pas de recadrage, utiliser l’image telle quelle" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:540 +msgid "Already pinged:" +msgstr "DÃ©jÃ notifiÃ©(s) par ping :" +======= #: wp-admin/custom-header.php:912 msgid "You do not have permission to customize headers." msgstr "Vous n’avez pas l’autorisation de personnaliser les en-tÃªtes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:125 +msgid "In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address." +msgstr "Dans la colonne « Auteur », en plus de trouver le nom de l’auteur, son adresse de messagerie et celle de son site, vous trouverez son adresse IP. En cliquant dessus, vous obtiendrez une liste de tous les commentaires faits depuis cette adresse IP." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:549 +msgid "Send trackbacks to:" +msgstr "Envoyer un rÃ©trolien vers :" +======= #: wp-admin/custom-header.php:806 msgid "Image Upload Error" msgstr "Erreur lors de l’envoi de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:126 +msgid "In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment." +msgstr "Dans la colonne « Commentaire », vous trouverez au-dessus de chaque commentaire la date et l’heure de son envoi. En cliquant sur ce lien, vous irez Ã la page de votre site oÃ¹ le commentaire a Ã©tÃ© publiÃ©. En survolant n’importe quel commentaire, des options apparaÃ®tront, vous permettant d’approuver un commentaire, y rÃ©pondre (et l’approuver), modifier ses dÃ©tails, modifier son contenu, le marquer comme indÃ©sirable, ou le jeter Ã la Corbeille." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:549 +msgid "Separate multiple URLs with spaces" +msgstr "SÃ©parez les adresses web par des espaces" +======= #: wp-admin/custom-header.php:781 msgid "Skip Cropping, Publish Image as Is" msgstr "Pas de recadrage, utiliser l’image telle quelle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:348 +msgid "This screen allows you to edit four fields for metadata in a file within the media library." +msgstr "Cet Ã©cran vous permet de modifier les quatre champs des mÃ©tadonnÃ©es des fichiers dans la bibliothÃ¨que des mÃ©dias." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:576 +msgid "Custom fields can be used to add extra metadata to a post that you can use in your theme." +msgstr "Les champs personnalisÃ©s peuvent Ãªtre utilisÃ©s afin d’ajouter des donnÃ©es supplÃ©mentaires Ã vos articles. Vous pouvez les utiliser dans votre thÃ¨me (en)." +======= #: wp-admin/custom-header.php:778 msgid "Crop and Publish" msgstr "Recadrer et publier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:367 +msgid "Inserting Media" +msgstr "Insertion du mÃ©dia" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:592 +msgid "Allow trackbacks and pingbacks on this page." +msgstr "Autoriser les rÃ©troliens et pings sur cette page." +======= #: wp-admin/custom-header.php:760 msgid "You need Javascript to choose a part of the image." msgstr "Vous avez besoin de la fonctionnalitÃ© JavaScript de votre navigateur internet pour choisir une partie de l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:373 +msgid "Several boxes on this screen contain settings for how your content will be published, including:" +msgstr "Plusieurs sections de cet Ã©cran vous permettez de rÃ©gler la maniÃ¨re dont votre contenu sera publiÃ©, notamment :" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:592 +msgid "http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" +msgstr "http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" +======= #: wp-admin/custom-header.php:759 msgid "Choose the part of the image you want to use as your header." msgstr "Choisissez la partie de l’image que vous voulez utiliser comme en-tÃªte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:389 +msgid "Publish Settings" +msgstr "RÃ©glages de publication" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:648 +msgid "Show comments" +msgstr "Affiche les commentaires" +======= #: wp-admin/custom-header.php:756 msgid "Crop Header Image" msgstr "Recadrer l’image d’en-tÃªte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:402 +msgid "Parent - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages." +msgstr "Parent - Vous pouvez arranger vos pages en hiÃ©rarchies. Par exemple, vous pourriez avoir une page « Ã propos », avec comme sous-pages « Ma vie » et « Mon œuvre ». Il n’y a pas de limite Ã la profondeur des sous-pages." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1050 +#: wp-admin/includes/meta-boxes.php:736 wp-admin/includes/meta-boxes.php:737 +msgid "Parent" +msgstr "Parent" +======= #: wp-admin/custom-header.php:742 wp-admin/custom-header.php:866 msgid "Image Processing Error" msgstr "Erreur lors du traitement de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:201 +msgid "You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category." +msgstr "Vous pouvez supprimer des catÃ©gories de liens avec la liste dÃ©roulante « Actions groupÃ©es », mais cette action ne supprime pas les liens contenus dans la catÃ©gorie. Au lieu de cela, ils sont dÃ©placÃ©s dans la catÃ©gorie de liens par dÃ©faut." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1056 +msgid "Main Page (no parent)" +msgstr "Page principale (pas de page parente)" +======= #: wp-admin/custom-header.php:742 wp-admin/custom-header.php:866 #: wp-admin/custom-header.php:1170 msgid "Image could not be processed. Please go back and try again." msgstr "L’image n’a pas pu Ãªtre traitÃ©e. Veuillez revenir en arriÃ¨re en rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:89 +msgid "To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site." +msgstr "Pour utiliser une image de fond, mettez-la simplement en ligne ou choisissez une image dÃ©jÃ mise en ligne dans votre BibliothÃ¨que de MÃ©dias en cliquant sur le bouton « Choisir l’image ». Vous pouvez n’afficher qu’une occurrence de l’image, ou la rÃ©pÃ©ter afin de remplir l’Ã©cran. Vous pouvez choisir de garder le fond en place quand vous faites dÃ©filer le contenu, ou au contraire faire que le fond dÃ©file en mÃªme temps." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1100 +#: wp-admin/includes/meta-boxes.php:747 +msgid "Default Template" +msgstr "ModÃ¨le par dÃ©faut" +======= #: wp-admin/custom-header.php:652 msgctxt "color" msgid "Default: %s" msgstr "Par dÃ©faut : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:370 wp-admin/custom-header.php:803 +#: wp-admin/includes/ajax-actions.php:1929 +msgid "The uploaded file is not a valid image. Please try again." +msgstr "Le fichier mis en ligne n’est pas une image valide. Veuillez rÃ©essayer." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:781 +msgid "Visit Link" +msgstr "Visiter le lien" +======= #: wp-admin/custom-header.php:631 msgid "Text Color" msgstr "Couleur du texte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:106 +msgid "You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the “Choose Image” button." +msgstr "Vous pouvez utiliser une image d’en-tÃªte personnalisÃ©e pour votre site. Mettez simplement l’image en ligne, recadrez-la, et le nouvel en-tÃªte sera aussitÃ´t en ligne. Autrement, vous pouvez utiliser une image qui a dÃ©jÃ Ã©tÃ© mise en ligne dans votre BibliothÃ¨que de MÃ©dias, en cliquant sur le bouton « Choisissez une image »." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:789 +msgid "Keep this link private" +msgstr "Ce lien est privÃ©" +======= #: wp-admin/custom-header.php:625 msgid "Show header text with your image." msgstr "Afficher le texte d’en-tÃªte avec l’image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:517 +msgid "You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it." +msgstr "Vous pouvez choisir une image d’en-tÃªte personnalisÃ©e en la mettant en ligne depuis votre ordinateur ou en la choisissant dans votre bibliothÃ¨que de mÃ©dias. AprÃ¨s avoir sÃ©lectionnÃ© l’image, vous pourrez la recadrer." +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:155 +msgid "" +"You are about to delete this link '%s'\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer le lien Â« %s Â».\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +======= #: wp-admin/custom-header.php:608 msgid "Restore Original Header Image" msgstr "RÃ©tablir l’image d’en-tÃªte d’origine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:108 +msgid "If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature." +msgstr "Si votre thÃ¨me a plus d’une image d’en-tÃªte par dÃ©faut, ou si vous avez mis en ligne plus d’une image d’en-tÃªte personnalisÃ©e, vous pouvez faire en sorte que WordPress affiche une image alÃ©atoire diffÃ©rente Ã chaque chargement de votre site. SÃ©lectionnez l’option « Au hasard » dans la section « Images par dÃ©faut » ou « Images mises en ligne » pour activer cette fonctionnalitÃ©." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:886 +msgid "_blank — new window or tab." +msgstr "_blank — nouvelle fenÃªtre ou onglet." +======= #: wp-admin/custom-header.php:607 msgid "This will restore the original header image. You will not be able to restore any customizations." msgstr "Ceci remettra en place l’image d’en-tÃªte d’origine. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:272 +msgid "Random: Show a different image on each page." +msgstr "AlÃ©atoire : affiche une image diffÃ©rente sur chaque page." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:889 +msgid "_top — current window or tab, with no frames." +msgstr "_top — fenÃªtre ou onglet en cours, sans frame." +======= #: wp-admin/custom-header.php:605 msgid "Reset Image" msgstr "Remettre l’image d’origine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:572 +msgid "You can choose one of your previously uploaded headers, or show a random one." +msgstr "Vous pouvez choisir un en-tÃªte parmi ceux que vous avez dÃ©jÃ mis en ligne, ou en afficher un alÃ©atoirement" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:892 +msgid "_none — same window or tab." +msgstr "_none — mÃªme fenÃªtre ou onglet." +======= #: wp-admin/custom-header.php:597 msgid "Remove Header Image" msgstr "Retirer l’image d’en-tÃªte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:584 +msgid "If you don‘t want to upload your own image, you can use one of these cool headers, or show a random one." +msgstr "Si vous ne voulez pas mettre en ligne d’image, vous pouvez utiliser l’un de ces en-tÃªtes, ou en afficher un alÃ©atoirement." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:894 +msgid "Choose the target frame for your link." +msgstr "Choisir la frame que cible le lien." +======= #: wp-admin/custom-header.php:596 msgid "This will remove the header image. You will not be able to restore any customizations." msgstr "Ceci retirera l’image d’en-tÃªte. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:586 +msgid "You can use one of these cool headers or show a random one on each page." +msgstr "Vous pouvez choisir parmi ces en-tÃªtes, ou en afficher un alÃ©atoirement Ã chaque chargement de page." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:939 +msgid "rel:" +msgstr "rel :" +======= #: wp-admin/custom-header.php:584 msgid "You can use one of these cool headers or show a random one on each page." msgstr "Vous pouvez choisir parmi ces en-tÃªtes, ou en afficher un alÃ©atoirement Ã chaque chargement de page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:299 +msgid "The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen." +msgstr "Le champ du titre et la zone d’Ã©dition de l’article sont inamovibles, mais vous pouvez dÃ©placer toutes les autres blocs par simple glisser/dÃ©poser. Vous pouvez Ã©galement les fermer/ouvrir en cliquant sur la barre de titre de chaque boite. Utilisez l’onglet « Options de l’Ã©cran » pour cacher d’autres boites (Extrait, Envoyer des rÃ©troliens, Champs personnalisÃ©s, Discussion, Identifiant, Auteur) ou pour choisir un affichage sur une ou deux colonnes pour cet Ã©cran." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:943 wp-admin/includes/meta-boxes.php:944 +msgid "identity" +msgstr "identitÃ©" +======= #: wp-admin/custom-header.php:582 msgid "If you don‘t want to upload your own image, you can use one of these cool headers, or show a random one." msgstr "Si vous ne voulez pas mettre en ligne d’image, vous pouvez utiliser l’un de ces en-tÃªtes, ou en afficher un alÃ©atoirement." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:329 +msgid "Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:" +msgstr "Le processus de crÃ©ation d’une page reste trÃ¨s proche de celui d’un article, et les Ã©crans respectifs peuvent Ãªtre personnalisÃ©s de la mÃªme maniÃ¨re, par le biais de glisser/dÃ©poser, de l’onglet « Option de l’Ãcran », et en ouvrant/fermant les blocs selon vos besoins. Cet Ã©cran dispose Ã©galement du mode « aucune distraction », tant dans le mode Visuel que dans le mode Texte, via les boutons « Plein Ãcran ». L’Ã©diteur de page fonctionne globalement comme celui des articles, mais dispose de certaines spÃ©cificitÃ©s, disponibles dans le bloc « Attributs de Page » :" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:947 +msgid "another web address of mine" +msgstr "Une autre de mes adresses Web" +======= #: wp-admin/custom-header.php:579 msgid "Default Images" msgstr "Images par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:349 wp-admin/media.php:76 +msgid "For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information." +msgstr "Pour les images (et seulement elles), vous pouvez cliquer sur « Modifier l’Image », sous la miniature, afin de faire apparaÃ®tre un Ã©diteur d’image, vous permettant de recadrer, d’appliquer une rotation ou d’inverser une image, ainsi que de dÃ©faire et refaire vos modifications. Les blocs sur la droite vous donnent accÃ¨s Ã d’autres options pour le changement d’Ã©chelle, le recadrage et mÃªme le recadrage de la miniature, qui peut Ãªtre diffÃ©rent de celui de l’image originale. Cliquez sur le bouton Aide de ces blocs pour obtenir plus d’informations." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:951 wp-admin/includes/meta-boxes.php:952 +msgid "friendship" +msgstr "amitiÃ©" +======= #: wp-admin/custom-header.php:570 msgid "You can choose one of your previously uploaded headers, or show a random one." msgstr "Vous pouvez choisir un en-tÃªte parmi ceux que vous avez dÃ©jÃ mis en ligne, ou en afficher un alÃ©atoirement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:59 +msgid "The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box." +msgstr "Les blocs pour le nom, l’adresse web et la description sont fixes, tandis que les autres peuvent Ãªtre repositionnÃ©s par glisser/dÃ©poser. Vous pouvez Ã©galement cacher les blocs que vous n’utilisez pas via l’onglet « Options de l’Ã©cran », et fermer les blocs en cliquant sur leur barre de titre." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:954 +msgid "contact" +msgstr "contact" +======= #: wp-admin/custom-header.php:568 msgid "Uploaded Images" msgstr "Images mises en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:362 +msgid "You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the “Create a new gallery” button." +msgstr "Vous pouvez mettre en ligne et insÃ©rer des fichiers mÃ©dia (images, sons, documents, etc.) en cliquant sur le bouton » Ajouter un mÃ©dia «. Vous pouvez sÃ©lectionner vos images et fichiers parmi ceux dÃ©jÃ prÃ©sents dans la bibliothÃ¨que de mÃ©dias, ou en mettre en ligne de nouveaux Ã ajouter Ã votre article/page. Pour crÃ©er une galerie d’image, sÃ©lectionnez les images Ã ajouter et cliquez sur le bouton » CrÃ©er une nouvelle galerie «." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:957 +msgid "acquaintance" +msgstr "connaissance" +======= #: wp-admin/custom-header.php:553 msgid "Set as header" msgstr "Utiliser comme en-tÃªte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:58 +msgid "You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields." +msgstr "Vous pouvez ajouter ou modifier des liens sur cet Ã©cran, en saisissant dans chacun des blocs. Seuls sont obligatoires les champs « Adresse web » et « Nom » (le texte que vous voulez voir affichÃ© sur votre site pour cette adresse)." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:960 +msgid "friend" +msgstr "ami(e)" +======= #: wp-admin/custom-header.php:552 msgid "Choose a Custom Header" msgstr "Choisir un en-tÃªte personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:320 +msgctxt "Background Attachment" +msgid "Attachment" +msgstr "Attachement" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:963 wp-admin/includes/meta-boxes.php:996 +#: wp-admin/includes/meta-boxes.php:1019 +msgid "none" +msgstr "aucune" +======= #: wp-admin/custom-header.php:530 msgid "Suggested height is %1$d pixels." msgstr "La hauteur suggÃ©rÃ©e est de %1$d pixels." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:430 +msgid "We’re backing up this post in your browser, just in case." +msgstr "Nous sauvegardons cet article dans votre navigateur, par sÃ©curitÃ©." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:968 wp-admin/includes/meta-boxes.php:969 +msgid "physical" +msgstr "physique" +======= #: wp-admin/custom-header.php:528 msgid "Suggested width is %1$d pixels." msgstr "La largeur suggÃ©rÃ©e est de %1$d pixels." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:159 +msgid "There is an autosave of this post that is more recent than the version below. View the autosave" +msgstr "Une sauvegarde automatique existe pour cet article ; elle est plus rÃ©cente que la version affichÃ©e ci-dessous. Afficher cette sauvegarde automatique." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:971 +msgid "met" +msgstr "rencontrÃ©(e)" +======= #: wp-admin/custom-header.php:524 msgid "Images should be at least %1$d pixels tall." msgstr "Les images devraient faire au moins %1$d pixels de haut." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:429 +msgid "Connection lost. Saving has been disabled until you’re reconnected." +msgstr "Connexion perdue. L’enregistrement a Ã©tÃ© dÃ©sactivÃ© jusqu’Ã ce que vous soyez reconnectÃ©." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:976 wp-admin/includes/meta-boxes.php:977 +msgid "professional" +msgstr "professionnel" +======= #: wp-admin/custom-header.php:521 msgid "Images should be at least %1$d pixels wide." msgstr "Les images devraient faire au moins %1$d pixels de large." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:242 +msgid "This will remove the background image. You will not be able to restore any customizations." +msgstr "Ceci supprimera l’image d’arriÃ¨re-plan. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:979 +msgid "co-worker" +msgstr "collÃ¨gue de travail" +======= #: wp-admin/custom-header.php:518 msgid "Images of exactly %1$d × %2$d pixels will be used as-is." msgstr "Les images ayant pour taille exacte %1$d pixels par %2$d seront utilisÃ©es telles quelles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:251 wp-admin/custom-background.php:255 +#: wp-admin/includes/image-edit.php:68 +msgid "Restore Original Image" +msgstr "RÃ©tablir l’image originale" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:982 +msgid "colleague" +msgstr "confrÃ¨re" +======= #: wp-admin/custom-header.php:515 msgid "You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it." msgstr "Vous pouvez choisir une image d’en-tÃªte personnalisÃ©e en la mettant en ligne depuis votre ordinateur ou en la choisissant dans votre bibliothÃ¨que de mÃ©dias. AprÃ¨s avoir sÃ©lectionnÃ© l’image, vous pourrez la recadrer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:598 +msgid "This will remove the header image. You will not be able to restore any customizations." +msgstr "Ceci retirera l’image d’en-tÃªte. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:987 wp-admin/includes/meta-boxes.php:988 +msgid "geographical" +msgstr "gÃ©ographique" +======= #: wp-admin/custom-header.php:465 msgid "Header updated. Visit your site to see how it looks." msgstr "L’en-tÃªte a Ã©tÃ© mis Ã jour. Visiter le site pour voir son nouvel aspect." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:610 +msgid "Restore Original Header Image" +msgstr "RÃ©tablir l’image d’en-tÃªte d’origine" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:990 +msgid "co-resident" +msgstr "colocataire" +======= #: wp-admin/custom-header.php:455 msgid "You can now manage and live-preview Custom Header in the Customizer." msgstr "Vous pouvez gÃ©rer et prÃ©visualiser l'en-tÃªte personnalisÃ©e dans l'outil de personnalisation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:193 +msgid "%s comment restored from the spam" +msgid_plural "%s comments restored from the spam" +msgstr[0] "%s commentaire rÃ©tabli depuis les commentaires indÃ©sirables" +msgstr[1] "%s commentaires rÃ©tablis depuis les commentaires indÃ©sirables" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:993 +msgid "neighbor" +msgstr "voisin" +======= #: wp-admin/custom-header.php:448 wp-admin/includes/theme.php:228 msgid "Custom Header" msgstr "Personnalisation de l’en-tÃªte" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: date and time of the revision +#: wp-admin/edit-form-advanced.php:94 +msgid "Post restored to revision from %s" +msgstr "Article rÃ©tabli Ã partir de la rÃ©vision du %s" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1001 wp-admin/includes/meta-boxes.php:1002 +msgid "family" +msgstr "famille" +======= #: wp-admin/custom-header.php:270 msgid "Random: Show a different image on each page." msgstr "AlÃ©atoire : affiche une image diffÃ©rente sur chaque page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:113 +msgid "Page restored to revision from %s" +msgstr "Page rÃ©tablie Ã partir de la rÃ©vision du %s" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1004 +msgid "child" +msgstr "enfant" +======= #: wp-admin/custom-header.php:123 msgid "Documentation on Custom Header" msgstr "Documentation sur l’en-tÃªte personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:98 +msgid "Loading…" +msgstr "Chargement…" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1007 +msgid "kin" +msgstr "apparentÃ©" +======= #: wp-admin/custom-header.php:118 msgid "Don’t forget to click “Save Changes” when you’re done!" msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ© !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:274 wp-admin/custom-header.php:551 +msgid "Or choose an image from your media library:" +msgstr "Ou choisissez une image dans votre bibliothÃ¨que de mÃ©dias :" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1010 +msgid "parent" +msgstr "parent" +======= #: wp-admin/custom-header.php:117 msgid "In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." msgstr "Dans la section « Texte d’en-tÃªte » de cette page, vous pouvez choisir d’afficher ce texte ou de le cacher. Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:209 wp-admin/edit-comments.php:215 +#: wp-admin/includes/class-wp-comments-list-table.php:531 +#: wp-admin/includes/dashboard.php:592 +msgid "Edit comment" +msgstr "Modifier le commentaire" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1013 +msgid "sibling" +msgstr "frÃ¨re/sœur" +======= #: wp-admin/custom-header.php:116 msgid "For most themes, the header text is your Site Title and Tagline, as defined in the General Settings section." msgstr "Pour la plupart des thÃ¨mes, le texte d’en-tÃªte est le titre de votre site et son slogan, tels que dÃ©finis dans la section RÃ©glages gÃ©nÃ©raux." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:270 +msgid "Category added." +msgstr "CatÃ©gorie ajoutÃ©e." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1016 +msgid "spouse" +msgstr "conjoint" +======= #: wp-admin/custom-header.php:114 wp-admin/custom-header.php:617 #: wp-admin/custom-header.php:622 msgid "Header Text" msgstr "Texte de l’en-tÃªte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:271 +msgid "Category deleted." +msgstr "CatÃ©gorie effacÃ©e." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1024 wp-admin/includes/meta-boxes.php:1025 +msgid "romantic" +msgstr "romantique" +======= #: wp-admin/custom-header.php:109 msgid "If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”." msgstr "Si vous ne souhaitez pas que votre site utilise une image d’en-tÃªte, cliquez sur le bouton « Retirer lâimage d’en-tÃªte » en bas de la section « Image d’en-tÃªte » de cette page. Si vous souhaitez rÃ©activer l’image d’en-tÃªte, il vous suffit de sÃ©lectionner l’une des autres options d’images, et de la valider en cliquant sur « Enregistrer les modifications »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:272 +msgid "Category updated." +msgstr "CatÃ©gorie mise Ã jour." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1027 +msgid "muse" +msgstr "muse" +======= #: wp-admin/custom-header.php:108 msgid "If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature." msgstr "Si votre thÃ¨me a plus d’une image d’en-tÃªte par dÃ©faut, ou si vous avez mis en ligne plus d’une image d’en-tÃªte personnalisÃ©e, vous pouvez faire en sorte que WordPress affiche une image alÃ©atoire diffÃ©rente Ã chaque chargement de votre site. SÃ©lectionnez l’option « Au hasard » dans la section « Images par dÃ©faut » ou « Images mises en ligne » pour activer cette fonctionnalitÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:265 wp-admin/includes/ajax-actions.php:1653 +#: wp-admin/includes/ajax-actions.php:1658 +msgid "Item not updated." +msgstr "L’Ã©lÃ©ment n’a pas Ã©tÃ© mis Ã jour" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1030 +msgid "crush" +msgstr "coup de foudre" +======= #: wp-admin/custom-header.php:107 msgid "Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the “Save Changes” button." msgstr "Certains thÃ¨mes disposent d’une sÃ©rie d’images d’en-tÃªte. Si vous voyez plusieurs images affichÃ©es, sÃ©lectionnez celle que vous aimez et cliquez sur le bouton « Enregistrer les modifications »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:266 +msgid "Items deleted." +msgstr "Ãlements supprimÃ©s." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1033 +msgid "date" +msgstr "petit(e)-ami(e)" +======= #: wp-admin/custom-header.php:106 msgid "You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the “Choose Image” button." msgstr "Vous pouvez utiliser une image d’en-tÃªte personnalisÃ©e pour votre site. Mettez simplement l’image en ligne, recadrez-la, et le nouvel en-tÃªte sera aussitÃ´t en ligne. Autrement, vous pouvez utiliser une image qui a dÃ©jÃ Ã©tÃ© mise en ligne dans votre BibliothÃ¨que de MÃ©dias, en cliquant sur le bouton « Choisissez une image »." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:374 +msgid "Publish - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post." +msgstr "Publier - Vous pouvez dÃ©finir la maniÃ¨re dont votre article est publiÃ© dans le bloc « Publier ». Pour « Ãtat », « VisibilitÃ© », « Format » et « Publier (immÃ©diatement) », un clic sur le lien « Modifier » affichera plus d’options. « VisibilitÃ© » inclut des options pour protÃ©ger l’article avec un mot de passe ou faire en sorte qu’il reste en tÃªte de page indÃ©finiment. « Publier (immÃ©diatement) » vous permet de programmer la publication de votre article Ã une date prÃ©cise, dans le futur ou le passÃ© ; cela vous permet d’Ã©crire Ã l’avance des articles Ã publier, ou de les antidater." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1036 +msgid "sweetheart" +msgstr "Ãªtre aimÃ©" +======= #: wp-admin/custom-header.php:99 msgid "You can choose from the theme’s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed." msgstr "Vous pouvez choisir Ã partir des images d’en-tÃªte par dÃ©faut du thÃ¨me, ou utiliser l’une des vÃ´tres. Vous pouvez Ã©galement personnaliser la maniÃ¨re dont s’affichent le titre de votre site et son slogan." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:494 +msgid "Enter title here" +msgstr "Saisissez votre titre ici" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1042 +msgid "If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out XFN." +msgstr "Si le lien pointe sur une personne, vous pouvez prÃ©ciser la relation que vous entretenez avec elle via le formulaire ci-dessus. Si vous souhaitez en apprendre plus sur ce systÃ¨me, consultez le site de XFN." +======= #: wp-admin/custom-header.php:98 msgid "This screen is used to customize the header section of your theme." msgstr "Cet Ã©cran est utilisÃ© pour personnaliser la section d’en-tÃªte de votre thÃ¨me." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:29 wp-admin/includes/meta-boxes.php:906 +msgid "Target" +msgstr "Cible" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1057 +msgid "Image Address" +msgstr "Adresse de l’image" +======= #: wp-admin/custom-background.php:370 wp-admin/custom-header.php:801 #: wp-admin/includes/ajax-actions.php:1892 msgid "The uploaded file is not a valid image. Please try again." msgstr "Le fichier mis en ligne n’est pas une image valide. Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: URL to the Make WordPress 'Get Involved' landing page used on +#. the credits page +#: wp-admin/credits.php:163 +msgid "https://make.wordpress.org/" +msgstr "https://make.wordpress.org/" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1061 +msgid "RSS Address" +msgstr "Adresse du flux RSS" +======= #: wp-admin/custom-background.php:319 msgctxt "Background Attachment" msgid "Attachment" msgstr "Attachement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:124 +msgid "A red bar on the left means the comment is waiting for you to moderate it." +msgstr "Une barre rouge sur la gauche signifie que le commentaire attention votre validation." +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1065 +msgid "Notes" +msgstr "Commentaires" +======= #: wp-admin/custom-background.php:309 msgid "Repeat" msgstr "RÃ©pÃ©tition" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: post link +#: wp-admin/edit-form-comment.php:114 +msgid "In response to: %s" +msgstr "En rÃ©ponse Ã  : %s" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:96 +#: wp-admin/includes/meta-boxes.php:1069 +msgid "Rating" +msgstr "Note" +======= #: wp-admin/custom-background.php:291 wp-admin/widgets.php:248 msgid "Position" msgstr "Position" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: comment link +#: wp-admin/edit-form-comment.php:128 +msgid "In reply to: %s" +msgstr "En rÃ©ponse Ã  : %s" +||||||| .r11156 +#: wp-admin/includes/meta-boxes.php:1078 +msgid "(Leave at 0 for no rating.)" +msgstr "(laissez Ã 0 pour ne pas donner de note.)" +======= #: wp-admin/custom-background.php:285 msgid "Display Options" msgstr "Options d’affichage" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: Featured Image +#: wp-admin/edit-form-advanced.php:382 +msgid "%s - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc." +msgstr "%s - Vous pouvez associer une image Ã votre article, sans pour autant l’y insÃ©rer. Cela ne sert vraiment que si votre thÃ¨me fait usage de cette fonctionnalitÃ©, sous la forme d’une miniature pour la page d’accueil, d’un en-tÃªte personnalisÃ©, etc." +||||||| .r11156 +#: wp-admin/includes/menu.php:319 +msgid "You do not have sufficient permissions to access this page." +msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +======= #: wp-admin/custom-background.php:277 msgid "Set as background" msgstr "Utiliser comme image de fond" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:561 +msgid "Word count: %s" +msgstr "Nombre de mots : %s" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:133 +msgid "Popular tags" +msgstr "Mots-clÃ©s populaires" +======= #: wp-admin/custom-background.php:276 msgid "Choose a Background Image" msgstr "Choisir une image d’arriÃ¨re-plan" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:96 wp-admin/includes/meta-boxes.php:210 +msgid "Date and time" +msgstr "Date et heure" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:134 +msgid "You may also browse based on the most popular tags in the Plugin Directory:" +msgstr "Vous pouvez Ã©galement naviguer en fonction des mots-clÃ©s les plus populaires sur WordPress.org :" +======= #: wp-admin/custom-background.php:274 wp-admin/custom-header.php:549 msgid "Or choose an image from your media library:" msgstr "Ou choisissez une image dans votre bibliothÃ¨que de mÃ©dias :" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:80 +msgid "Comment status" +msgstr "Ãtat du commentaire" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:170 +#: wp-admin/includes/plugin-install.php:182 +#: wp-admin/includes/plugin-install.php:185 +msgid "Search Plugins" +msgstr "Chercher parmi les extensions" +======= #: wp-admin/custom-background.php:271 wp-admin/custom-header.php:539 #: wp-admin/includes/class-wp-theme-install-list-table.php:43 #: wp-admin/includes/media.php:1884 wp-admin/includes/media.php:1886 msgid "Upload" msgstr "Envoyer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:131 wp-admin/edit-tags.php:518 +msgid "Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional." +msgstr "Les catÃ©gories, contrairement aux Ã©tiquettes, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e Jazz, et Ã l’intÃ©rieur, plusieurs catÃ©gories comme Bebop et Big Band. Ceci est totalement facultatif." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:198 +msgid "If you have a plugin in a .zip format, you may install it by uploading it here." +msgstr "Si vous avez une extension au format .zip, vous pouvez l’installer en la mettant en ligne ici." +======= #: wp-admin/custom-background.php:267 wp-admin/custom-header.php:535 msgid "Choose an image from your computer:" msgstr "Choisissez une image sur votre ordinateur :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:215 +msgid "When adding a new tag on this screen, you’ll fill in the following fields:" +msgstr "Quand vous ajoutez une nouvelle Ã©tiquette via cet Ã©cran, vous devez remplir les champs suivants :" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:201 +msgid "Plugin zip file" +msgstr "Archive Zip de l’extension" +======= #: wp-admin/custom-background.php:257 msgid "This will restore the original background image. You will not be able to restore any customizations." msgstr "Ceci remettra en place l’image d’arriÃ¨re-plan originale. Il ne vous sera pas possible de rÃ©cupÃ©rer vos personnalisations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:203 +msgid "What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index." +msgstr "Quelle est la diffÃ©rence entre les catÃ©gories et les Ã©tiquettes ? Normalement, les Ã©tiquettes identifient les informations importantes dans votre article (noms, sujets, etc.) qui seraient susceptibles de revenir dans d’autres articles, ou pas. De leur cÃ´tÃ©, les catÃ©gories ont des sections prÃ©dÃ©terminÃ©es. Si vous voyez votre site comme un livre, alors les catÃ©gories sont la table des matiÃ¨res, et les Ã©tiquettes forment l’index." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:392 +#: wp-admin/includes/class-wp-theme-install-list-table.php:249 +#: wp-admin/includes/plugin-install.php:203 +#: wp-admin/includes/plugin-install.php:523 +#: wp-admin/includes/theme-install.php:143 +msgid "Install Now" +msgstr "Installer maintenant" +======= #: wp-admin/custom-background.php:252 wp-admin/custom-background.php:256 #: wp-admin/includes/image-edit.php:68 msgid "Restore Original Image" msgstr "RÃ©tablir l’image originale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:328 wp-admin/edit.php:224 +msgid "Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages." +msgstr "Les pages sont comme des articles, en cela qu’elles ont un titre, un contenu et des mÃ©tadonnÃ©es associÃ©es ; mais elles diffÃ¨rent en cela qu’elles ne font pas partie du flux chronologique du blog - un peu comme des articles permanents. Les pages ne sont pas catÃ©gorisÃ©es et ne reÃ§oivent pas dâÃ©tiquettes, mais peuvent disposer d’une hiÃ©rarchie. En effet, vous pouvez imbriquer des pages sous d’autres pages, faisant de ces derniÃ¨res les « parentes » des premiÃ¨res, crÃ©ant ainsi un groupement de pages." +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:199 +msgid "No plugins match your request." +msgstr "Aucune extension ne correspond Ã votre requÃªte." +======= #: wp-admin/custom-background.php:243 msgid "This will remove the background image. You will not be able to restore any customizations." msgstr "Ceci supprimera l’image d’arriÃ¨re-plan. Il ne vous sera pas possible de rÃ©tablir vos personnalisations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:198 +msgid "You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another." +msgstr "Vous pouvez assigner des Ã©tiquettes Ã vos articles via le bloc dÃ©diÃ©. Au contraire des catÃ©gories, les Ã©tiquettes n’ont pas de hiÃ©rarchie, ce qui signifie qu’elles ne peuvent pas Ãªtre liÃ©s entre elles." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:2623 +#: wp-admin/includes/plugin-install.php:448 +msgid "(based on %s rating)" +msgid_plural "(based on %s ratings)" +msgstr[0] "(basÃ©e sur %s vote)" +msgstr[1] "(basÃ©e sur %s votes)" +======= #: wp-admin/custom-background.php:242 msgid "Remove Background Image" msgstr "Supprimer l’image d’arriÃ¨re-plan" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:232 +msgid "Adding Tags" +msgstr "Ajout dâÃ©tiquettes" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:373 wp-admin/update.php:106 +msgid "Plugin Install" +msgstr "Installation d’extensions" +======= #: wp-admin/custom-background.php:238 wp-admin/custom-header.php:594 msgid "Remove Image" msgstr "Retirer l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:224 +msgid "Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown." +msgstr "Parent - Les catÃ©gories, contrairement aux Ã©tiquettes, peuvent avoir une hiÃ©rarchie. Vous pouvez avoir une catÃ©gorie nommÃ©e « Jazz », et Ã l’intÃ©rieur, plusieurs catÃ©gories comme « Bebop » et « Big Band ». Le fait d’avoir une hiÃ©rarchie est totalement facultatif. Pour crÃ©er une sous-catÃ©gorie, choisissez juste une autre catÃ©gorie depuis la liste dÃ©roulante « Parent » ." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:528 +msgid "Install Update Now" +msgstr "Installer la mise Ã jour maintenant" +======= #: wp-admin/custom-background.php:197 msgid "Background updated. Visit your site to see how it looks." msgstr "L’arriÃ¨re-plan a Ã©tÃ© mis Ã jour. Afficher votre site pour voir le rendu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:244 +msgid "Documentation on Tags" +msgstr "Documentation sur les Ã©tiquettes (en)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:532 +msgid "Newer Version (%s) Installed" +msgstr "Une version plus rÃ©cente (%s) est installÃ©e" +======= #: wp-admin/custom-background.php:187 msgid "You can now manage and live-preview Custom Backgrounds in the Customizer." msgstr "Vous pouvez gÃ©rer et prÃ©visualiser les fonds personnalisÃ©s dans l'outil de personnalisation. " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:322 +msgid "You can also create posts with the Press This bookmarklet." +msgstr "Vous pouvez Ã©galement crÃ©er des articles avec le bookmarklet Press This." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:535 +msgid "Latest Version Installed" +msgstr "DerniÃ¨re version installÃ©e" +======= #: wp-admin/custom-background.php:180 wp-admin/includes/theme.php:226 msgid "Custom Background" msgstr "ArriÃ¨re-plan personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: column name or table row header +#: wp-admin/comment.php:180 +#: wp-admin/includes/class-wp-comments-list-table.php:362 +msgid "In Response To" +msgstr "En rÃ©ponse Ã " +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:426 +msgid "Author:" +msgstr "Auteur :" +======= #: wp-admin/custom-background.php:96 msgid "Documentation on Custom Background" msgstr "Documentation sur le fond personnalisÃ© (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 2: comment date, 3: comment time +#: wp-admin/comment.php:206 +msgid "%2$s at %3$s" +msgstr "%2$s Ã %3$s" +||||||| .r11156 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:460 +#: wp-admin/includes/plugin-install.php:428 +msgid "Last Updated:" +msgstr "DerniÃ¨re mise Ã jour :" +======= #: wp-admin/custom-background.php:91 msgid "Don’t forget to click on the Save Changes button when you are finished." msgstr "N’oubliez pas de cliquer sur « Enregistrer les modifications » quand vous avez terminÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:202 +msgid "Submitted on" +msgstr "EnvoyÃ© le" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:432 +msgid "Requires WordPress Version:" +msgstr "NÃ©cessite WordPress en version :" +======= #: wp-admin/custom-background.php:90 msgid "You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker." msgstr "Vous pouvez Ã©galement choisir une couleur pour ce texte en cliquant sur le bouton « SÃ©lecteur de couleur » et soit en saisissant une valeur HTML valide (ex. : #ff0000 pour du rouge) ou en cliquant sur le sÃ©lecteur de couleur." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Publish box date format, see http:php.net/date +#: wp-admin/edit-form-advanced.php:100 wp-admin/edit-form-advanced.php:117 +#: wp-admin/edit-form-comment.php:89 +#: wp-admin/includes/class-wp-plugin-install-list-table.php:489 +#: wp-admin/includes/meta-boxes.php:167 wp-admin/includes/meta-boxes.php:301 +#: wp-admin/includes/plugin-install.php:459 wp-admin/includes/revision.php:206 +#: wp-admin/includes/revision.php:224 +msgid "M j, Y @ H:i" +msgstr "j F Y \\Ã G \\h i \\m\\i\\n " +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:432 +msgid "%s or higher" +msgstr "%s ou plus" +======= #: wp-admin/custom-background.php:89 msgid "To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site." msgstr "Pour utiliser une image de fond, mettez-la simplement en ligne ou choisissez une image dÃ©jÃ mise en ligne dans votre BibliothÃ¨que de MÃ©dias en cliquant sur le bouton « Choisir l’image ». Vous pouvez n’afficher qu’une occurrence de l’image, ou la rÃ©pÃ©ter afin de remplir l’Ã©cran. Vous pouvez choisir de garder le fond en place quand vous faites dÃ©filer le contenu, ou au contraire faire que le fond dÃ©file en mÃªme temps." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:363 +msgid "You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to learn more about embeds." +msgstr "Vous pouvez Ã©galement insÃ©rer des contenus en provenance de nombreux sites populaires, comme Twitter, YouTube, Flickr et d’autres, simplement en collant l’adresse web du contenu dans sa propre ligne dans le texte de votre article/page. RÃ©fÃ©rez-vous au Codex pour a href=\"https://codex.wordpress.org/Embeds\">en apprendre plus sur les contenu insÃ©rÃ©s." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:434 +msgid "Compatible up to:" +msgstr "Compatible jusqu’Ã la version : " +======= #: wp-admin/custom-background.php:88 msgid "You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color." msgstr "Vous pouvez personnaliser l’apparence de votre site sans jamais toucher au code de votre thÃ¨me, en utilisant un fond personnalisÃ©. Votre fond peut Ãªtre une image ou juste une couleur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:377 +msgid "Format - Post Formats designate how your theme will display a specific post. For example, you could have a standard blog post with a title and paragraphs, or a short aside that omits the title and contains a short text blurb. Please refer to the Codex for descriptions of each post format. Your theme could enable all or some of 10 possible formats." +msgstr "Format d’article - DÃ©signe la maniÃ¨re dont votre thÃ¨me doit afficher un article donnÃ©. Par exemple, vous pourriez vouloir utiliser le format par dÃ©faut pour afficher titre et contenu, ou le format En passant pour ne pas utiliser le titre et n’afficher qu’un court texte. Lisez la documentation du Codex pour obtenir une description de chaque format d’article (en). Il est possible que votre thÃ¨me ne reconnaisse qu’une partie des 10 formats possibles." +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:436 +msgid "Downloaded:" +msgstr "TÃ©lÃ©chargÃ© :" +======= #: wp-admin/credits.php:192 msgid "Icon Design" msgstr "Conception des icÃ´nes" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Url to the codex documentation on contributing to WordPress +#. used on the credits page +#: wp-admin/credits.php:105 +msgid "https://codex.wordpress.org/Contributing_to_WordPress" +msgstr "https://codex.wordpress.org/Contributing_to_WordPress" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:436 +msgid "%s time" +msgid_plural "%s times" +msgstr[0] "%s fois" +msgstr[1] "%s fois" +======= #: wp-admin/credits.php:191 msgid "External Libraries" msgstr "BibliothÃ¨ques tierces" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:339 +msgid "Documentation on Adding New Pages" +msgstr "Documentation sur l’ajout de nouvelles pages (en)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:438 +msgid "WordPress.org Plugin Page »" +msgstr "Page WordPress.org de l’extension »" +======= #: wp-admin/credits.php:190 msgid "Internationalization" msgstr "Internationalisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:96 +msgid "Documentation on Custom Background" +msgstr "Documentation sur le fond personnalisÃ© (en)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:446 +msgid "Average Rating" +msgstr "Moyenne des notes" +======= #: wp-admin/credits.php:189 msgid "XML-RPC" msgstr "XML-RPC" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:242 +msgid "Documentation on Link Categories" +msgstr "Documentation sur les catÃ©gories de liens (en)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:497 +msgid "Warning: This plugin has not been tested with your current version of WordPress." +msgstr "Attention : cette extension n’a pas Ã©tÃ© testÃ©e avec votre version de WordPress." +======= #: wp-admin/credits.php:188 msgid "Designer" msgstr "Concepteur graphique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tags.php:240 +msgid "Documentation on Categories" +msgstr "Documentation sur les catÃ©gories (en)" +||||||| .r11156 +#: wp-admin/includes/plugin-install.php:499 +msgid "Warning: This plugin has not been marked as compatible with your version of WordPress." +msgstr "Attention : cette extension n’a pas Ã©tÃ© marquÃ©e comme Ã©tant compatible avec votre version de WordPress" +======= #: wp-admin/credits.php:187 msgid "Developer" msgstr "DÃ©veloppeur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:65 +msgid "Documentation on Creating Links" +msgstr "Documentation sur la crÃ©ation de liens (en)" +||||||| .r11156 +#: wp-admin/includes/plugin.php:92 +msgid "The %1$s plugin header is deprecated. Use %2$s instead." +msgstr "L’en-tÃªte de l’extension %1$s%2$s." +======= #: wp-admin/credits.php:186 msgid "Guest Committer" msgstr "DÃ©veloppeur invitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:324 +msgid "Documentation on Writing and Editing Posts" +msgstr "Documentation sur l’Ã©criture et la modification des articles (en)" +||||||| .r11156 +#: wp-admin/includes/plugin.php:605 +msgid "The plugin generated unexpected output." +msgstr "Cette extension a produit un rÃ©sultat inattendu." +======= #: wp-admin/credits.php:185 msgid "Core Committer" msgstr "DÃ©veloppeur principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:123 +msgid "Documentation on Custom Header" +msgstr "Documentation sur l’en-tÃªte personnalisÃ©" +||||||| .r11156 +#: wp-admin/includes/plugin.php:742 +msgid "One of the plugins is invalid." +msgstr "L’une des extensions n’est pas valide." +======= #: wp-admin/credits.php:184 msgid "Core Developer" msgstr "DÃ©veloppeur cœur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:340 +msgid "Documentation on Editing Pages" +msgstr "Documentation sur la modification des pages (en)" +||||||| .r11156 +#: wp-admin/includes/plugin.php:838 +msgid "Could not fully remove the plugin(s) %s." +msgstr "Impossible de supprimer complÃ¨tement la ou les extensions %s." +======= #: wp-admin/credits.php:183 msgid "User Experience Lead" msgstr "En charge de l’expÃ©rience utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:356 wp-admin/media.php:83 +msgid "Documentation on Edit Media" +msgstr "Documentation sur la modification des mÃ©dias (en)" +||||||| .r11156 +#: wp-admin/includes/plugin.php:893 +msgid "Invalid plugin path." +msgstr "Chemin d’extension non valide" +======= #: wp-admin/credits.php:182 msgid "Release Lead" msgstr "Responsable de cette version" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:135 +msgid "Documentation on Keyboard Shortcuts" +msgstr "Documentation sur les raccourcis clavier" +||||||| .r11156 +#: wp-admin/includes/plugin.php:895 +msgid "Plugin file does not exist." +msgstr "Le fichier de l’extension n’existe pas." +======= #: wp-admin/credits.php:181 msgid "Lead Developer" msgstr "DÃ©veloppeur principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:134 +msgid "Documentation on Comment Spam" +msgstr "Documentation sur les commentaires indÃ©sirables" +||||||| .r11156 +#: wp-admin/includes/plugin.php:899 +msgid "The plugin does not have a valid header." +msgstr "Cette extension ne dispose pas d’un en-tÃªte valide." +======= #: wp-admin/credits.php:180 msgid "Cofounder, Project Lead" msgstr "Cofondateur, chef de projet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:150 +msgid "The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them." +msgstr "L’outil de personnalisation vous permet de prÃ©visualiser les modifications faites Ã votre site avant de les publier. Vous pouvez Ã©galement parcourir les pages de votre site pour mieux apprÃ©cier vos modifications en contexte." +||||||| .r11156 +#: wp-admin/includes/post.php:33 wp-admin/includes/post.php:71 +msgid "You are not allowed to edit pages as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +======= #: wp-admin/credits.php:179 msgid "Contributing Developers" msgstr "DÃ©veloppeurs ayant contribuÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/credits.php:181 +msgid "Release Lead" +msgstr "Responsable de cette version" +||||||| .r11156 +#: wp-admin/includes/post.php:35 wp-admin/includes/post.php:73 +msgid "You are not allowed to edit posts as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +======= #: wp-admin/credits.php:178 msgid "Core Contributors to WordPress %s" msgstr "Contributeurs au code de WordPress %s" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/custom-header.php:762 +msgid "You need JavaScript to choose a part of the image." +msgstr "Vous avez besoin de la fonctionnalitÃ© JavaScript de votre navigateur web pour choisir une partie de l’image." +||||||| .r11156 +#: wp-admin/includes/post.php:361 +msgid "You are not allowed to edit pages." +msgstr "Vous n’avez pas l’autorisation de modifier les pages." +======= #: wp-admin/credits.php:177 msgid "Recent Rockstars" msgstr "Ãtoiles montantes" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: comment type radio button +#: wp-admin/edit-form-comment.php:82 +msgctxt "adjective" +msgid "Pending" +msgstr "En attente" +||||||| .r11156 +#: wp-admin/includes/post.php:363 +msgid "You are not allowed to edit posts." +msgstr "Vous n’avez pas l’autorisation de modifier les articles." +======= #: wp-admin/credits.php:176 msgid "Core Developers" msgstr "DÃ©veloppeurs principaux" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-link-form.php:94 +#: wp-admin/includes/class-wp-links-list-table.php:120 +msgctxt "link name" +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-admin/includes/post.php:534 +msgid "Auto Draft" +msgstr "Brouillon auto" +======= #: wp-admin/credits.php:175 msgid "Extended Core Team" msgstr "Ãquipe principale Ã©tendue" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-header.php:457 +msgid "You can now manage and live-preview Custom Header in the Customizer." +msgstr "Vous pouvez gÃ©rer et prÃ©visualiser l'en-tÃªte personnalisÃ©e dans l'outil de personnalisation." +||||||| .r11156 +#: wp-admin/includes/post.php:1197 +msgid "Click to edit this part of the permalink" +msgstr "Cliquez pour modifier cette section du permalien" +======= #: wp-admin/credits.php:174 msgid "Project Leaders" msgstr "Chefs de projet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/custom-background.php:186 +msgid "You can now manage and live-preview Custom Backgrounds in the Customizer." +msgstr "Vous pouvez gÃ©rer et prÃ©visualiser les fonds personnalisÃ©s dans l'outil de personnalisation. " +||||||| .r11156 +#: wp-admin/includes/post.php:1199 +msgid "Temporary permalink. Click to edit this part." +msgstr "Permalien temporaire. Cliquez pour modifier cette section." +======= #. translators: URL to the Make WordPress 'Get Involved' landing page used on #. the credits page #: wp-admin/credits.php:164 msgid "https://make.wordpress.org/" msgstr "https://make.wordpress.org/" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:143 +msgid "Customizer Options" +msgstr "Options de personnalisation du thÃ¨me" +||||||| .r11156 +#: wp-admin/includes/post.php:1203 wp-admin/includes/post.php:1219 +msgid "Permalink:" +msgstr "Permalien :" +======= #: wp-admin/credits.php:162 msgid "Want to see your name in lights on this page? Get involved in WordPress." msgstr "Vous voulez faire partie des noms listÃ©s sur cette page ? Participez au dÃ©veloppement de WordPress !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:313 +msgid "Keyboard users: When you’re working in the visual editor, you can use Alt + F10 to access the toolbar." +msgstr "Utilisateurs du clavier : lorsque vous travaillez dans l’Ã©diteur visuel, vous pouvez utiliser Alt + F10 pour accÃ©der Ã la barre d'outils." +||||||| .r11156 +#: wp-admin/includes/post.php:1205 +msgid "Change Permalinks" +msgstr "Modifier les permaliens" +======= #: wp-admin/credits.php:120 msgctxt "Translate this to be the equivalent of English Translators in your language for the credits page Translators section" msgid "Translators" msgstr "Traducteurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-comment.php:94 wp-admin/includes/meta-boxes.php:208 +msgid "Edit date and time" +msgstr "Modifier la date et l'heure" +||||||| .r11156 +#: wp-admin/includes/schema.php:371 +msgid "Just another WordPress site" +msgstr "Un site utilisant WordPress" +======= #: wp-admin/credits.php:112 msgid "WordPress is created by a worldwide team of passionate individuals." msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©parties sur toute la planÃ¨te." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-tag-form.php:112 wp-admin/edit-tags.php:480 +msgctxt "term parent" +msgid "Parent" +msgstr "Parent" +||||||| .r11156 +#: wp-admin/includes/schema.php:496 +msgid "Just another %s site" +msgstr "Un site utilisant %s" +======= #. translators: Url to the codex documentation on contributing to WordPress #. used on the credits page #: wp-admin/credits.php:107 msgid "https://codex.wordpress.org/Contributing_to_WordPress" msgstr "https://codex.wordpress.org/Contributing_to_WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:310 +msgid "The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically." +msgstr "Le mode Texte vous permet de saisir directement du code HTML en mÃªme temps que le contenu de votre article. Les retours Ã la ligne seront automatiquement convertis en paragraphes." +||||||| .r11156 +#: wp-admin/includes/schema.php:602 +msgctxt "User role" +msgid "Administrator" +msgstr "Administrateur" +======= #: wp-admin/credits.php:104 msgid "WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress." msgstr "WordPress est crÃ©Ã© par une Ã©quipe de personnes passionnÃ©es, rÃ©partie sur toute la planÃ¨te. Participez au dÃ©veloppement de WordPress !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:309 +msgid "Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. " +msgstr "Le mode Visuel vous donne accÃ¨s Ã un Ã©diteur WYSIWYG ; cliquez sur la derniÃ¨re icÃ´ne de la rangÃ©e pour afficher une seconde rangÃ©e d’icÃ´nes." +||||||| .r11156 +#: wp-admin/includes/schema.php:604 +msgctxt "User role" +msgid "Editor" +msgstr "Ãditeur" +======= #: wp-admin/credits.php:83 wp-admin/freedoms.php:20 msgid "Welcome to WordPress %s" msgstr "Bienvenue dans WordPress %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:308 +msgid "Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab." +msgstr "Ãditeur d’article - Saisissez-y le contenu de votre article. Vous disposez pour ce faire de deux modes : Visuel ou Texte. Choisissez un mode en cliquant sur l’onglet correspondant." +||||||| .r11156 +#: wp-admin/includes/schema.php:606 +msgctxt "User role" +msgid "Author" +msgstr "Auteur" +======= #: wp-admin/comment.php:326 msgid "Unknown action." msgstr "Action inconnue." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:311 +msgid "You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode." +msgstr "Vous pouvez insÃ©rer des fichiers mÃ©dia en cliquant sur les icÃ´nes situÃ©es au-dessus de l’Ã©diteur, puis en suivant les instructions. Vous pouvez aligner ou modifier les images Ã l'aide de la barre de mise en page disponible dans le mode Visuel." +||||||| .r11156 +#: wp-admin/includes/schema.php:608 +msgctxt "User role" +msgid "Contributor" +msgstr "Contributeur" +======= #: wp-admin/comment.php:254 wp-admin/edit-comments.php:167 #: wp-admin/includes/comment.php:38 msgid "You are not allowed to edit comments on this post." msgstr "Vous n’avez pas l’autorisation de modifier les commentaires de cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:93 +msgctxt "Placeholder is the document title from the preview" +msgid "Customize: %s" +msgstr "Personnalisation : %s" +||||||| .r11156 +#: wp-admin/includes/schema.php:610 +msgctxt "User role" +msgid "Subscriber" +msgstr "AbonnÃ©" +======= #. translators: 2: comment date, 3: comment time #: wp-admin/comment.php:203 msgid "%2$s at %3$s" msgstr "%2$s Ã %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/customize.php:95 +msgctxt "Placeholder is the document title from the preview" +msgid "Live Preview: %s" +msgstr "PrÃ©visualisation : %s" +||||||| .r11156 +#: wp-admin/includes/schema.php:953 wp-admin/includes/upgrade.php:151 +msgid "Welcome to SITE_NAME. This is your first post. Edit or delete it, then start blogging!" +msgstr "Bienvenue dans SITE_NAME. Ceci est votre premier article. Modifiez-le ou supprimez-le, puis lancez-vous !" +======= #: wp-admin/comment.php:199 msgid "Submitted on" msgstr "EnvoyÃ© le" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-form-advanced.php:312 +msgid "You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options." +msgstr "Vous pouvez activer le mode d'Ã©criture sans distraction en cliquant sur l'icÃ´ne Ã droite. Cette fonctionnalitÃ© n'est pas disponible pour les anciens navigateurs ou les appareils Ã petits Ã©crans, et requiert l'activation l'Ã©diteur plein-Ã©cran dans les options de l'Ã©cran." +||||||| .r11156 +#: wp-admin/includes/schema.php:1025 +msgid "Warning! Wildcard DNS may not be configured correctly!" +msgstr "Attention ! L’enregistrement DNS gÃ©nÃ©rique (joker) peut ne pas Ãªtre configurÃ© correctement !" +======= #: wp-admin/comment.php:193 #: wp-admin/includes/class-wp-comments-list-table.php:424 msgid "In reply to %2$s." msgstr "En rÃ©ponse Ã %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/edit-comments.php:127 +msgid "In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post." +msgstr "Dans la colonne En rÃ©ponse Ã se trouvent trois Ã©lÃ©ments. Le texte correspond au titre de l’article qui a inspirÃ© ce commentaire, et un clic sur ce lien vous permettra de modifier cet article. Le lien « Afficher l’article » mÃ¨ne Ã l’article sur le site. La petite bulle avec un nombre vous indique le nombre de commentaires approuvÃ©s que l’article a reÃ§u. S’il y a des commentaires en attente de validation, un cercle de notification rouge contenant le nombre de commentaires en attente sera affichÃ©. Un clic sur ce cercle de notification filtrera la liste des commentaires pour ne plus afficher que ceux en attente qui sont liÃ©s Ã cet article." +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:479 +#: wp-admin/includes/class-wp-posts-list-table.php:937 +#: wp-admin/includes/class-wp-terms-list-table.php:423 +msgid "Quick Edit" +msgstr "Modification rapide" +======= #: wp-admin/comment.php:177 msgid "In Response To" msgstr "En rÃ©ponse Ã " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin.php:239 +msgid "Invalid plugin page" +msgstr "Page d’extension non valide" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:661 +#: wp-admin/includes/class-wp-terms-list-table.php:308 +msgid "Quick Edit" +msgstr "Modification rapide" +======= #: wp-admin/comment.php:157 wp-admin/plugins.php:290 wp-admin/plugins.php:296 #: wp-admin/theme-editor.php:215 msgid "Caution:" msgstr "Attention :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin.php:242 +msgid "Cannot load %s." +msgstr "Impossible de charger %s." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:285 +msgctxt "column name" +msgid "Title" +msgstr "Titre" +======= #: wp-admin/comment.php:149 msgid "This comment is currently in the Trash." msgstr "Ce commentaire est actuellement dans la Corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin.php:275 +msgid "You are not allowed to import." +msgstr "Vous n’avez pas l’autorisation d’importer." +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:221 +msgctxt "column name" +msgid "File" +msgstr "Fichier" +======= #: wp-admin/comment.php:146 msgid "This comment is currently marked as spam." msgstr "Ce commentaire est actuellement marquÃ© comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin.php:298 wp-admin/import.php:17 wp-admin/menu.php:230 +msgid "Import" +msgstr "Importer" +||||||| .r11156 +#: wp-admin/includes/class-wp-media-list-table.php:256 +msgctxt "column name" +msgid "Date" +msgstr "Date" +======= #: wp-admin/comment.php:143 msgid "This comment is currently approved." msgstr "Ce commentaire est actuellement approuvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:50 wp-admin/edit-form-comment.php:16 +msgid "Edit Comment" +msgstr "Modifier le commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:306 +#: wp-admin/includes/class-wp-comments-list-table.php:600 +msgctxt "column name" +msgid "Comment" +msgstr "Commentaire" +======= #: wp-admin/comment.php:135 msgid "Approve Comment" msgstr "Approuver le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:72 wp-admin/comment.php:255 +#: wp-admin/includes/post.php:1492 +msgid "Go back" +msgstr "Retour" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:94 +msgid "Relationship" +msgstr "Relation" +======= #: wp-admin/comment.php:134 msgid "You are about to approve the following comment:" msgstr "Vous Ãªtes sur le point d’approuver le commentaire suivant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:91 +msgid "Moderate Comment" +msgstr "ModÃ©rer le commentaire" +||||||| .r11156 +#: wp-admin/includes/class-wp-links-list-table.php:95 +msgid "Visible" +msgstr "Visible" +======= #: wp-admin/comment.php:131 msgid "Permanently Delete Comment" msgstr "Supprimer dÃ©finitivement le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:125 +msgid "You are about to mark the following comment as spam:" +msgstr "Vous Ãªtes sur le point de marquer le commentaire suivant comme indÃ©sirable :" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:937 +msgid "Bulk Edit" +msgstr "Modifications groupÃ©es" +======= #: wp-admin/comment.php:130 msgid "You are about to delete the following comment:" msgstr "Vous Ãªtes sur le point de supprimer le commentaire suivant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/async-upload.php:57 wp-admin/edit-tags.php:256 +#: wp-admin/includes/post.php:1752 wp-admin/post.php:162 +msgid "You are not allowed to edit this item." +msgstr "Vous n’avez pas l’autorisation de modifier ce contenu." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:982 +#: wp-admin/includes/class-wp-posts-list-table.php:1062 +#: wp-admin/includes/class-wp-posts-list-table.php:1098 +#: wp-admin/includes/class-wp-posts-list-table.php:1132 +#: wp-admin/includes/class-wp-posts-list-table.php:1141 +#: wp-admin/includes/class-wp-posts-list-table.php:1173 +#: wp-admin/includes/class-wp-posts-list-table.php:1194 +#: wp-admin/includes/class-wp-posts-list-table.php:1222 +msgid "— No Change —" +msgstr "— Aucun changement —" +======= #: wp-admin/comment.php:127 wp-admin/edit-form-comment.php:142 #: wp-admin/includes/class-wp-comments-list-table.php:237 #: wp-admin/includes/class-wp-posts-list-table.php:255 #: wp-admin/includes/media.php:1465 wp-admin/includes/meta-boxes.php:238 msgid "Move to Trash" msgstr "DÃ©placer dans la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:184 +msgid "Go to Dashboard" +msgstr "Aller sur le tableau de bord" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1008 +msgid "–OR–" +msgstr "— OU —" +======= #: wp-admin/comment.php:126 msgid "You are about to move the following comment to the Trash:" msgstr "Vous Ãªtes sur le point de dÃ©placer le commentaire suivant dans la Corbeille :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:56 +msgid "You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error." +msgstr "Au besoin, vous pouvez modifier les informations laissÃ©es dans un commentaire. Par exemple, si un commentateur a fait une faute d’orthographe." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1133 +#: wp-admin/includes/class-wp-posts-list-table.php:1142 +msgid "Allow" +msgstr "Autoriser" +======= #: wp-admin/comment.php:123 msgid "Mark as Spam" msgstr "Marquer comme indÃ©sirable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/async-upload.php:92 +msgid "“%s” has failed to upload due to an error" +msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne suite Ã une erreur" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1134 +#: wp-admin/includes/class-wp-posts-list-table.php:1143 +msgid "Do not allow" +msgstr "Refuser" +======= #: wp-admin/comment.php:122 msgid "You are about to mark the following comment as spam:" msgstr "Vous Ãªtes sur le point de marquer le commentaire suivant comme indÃ©sirable :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:75 +msgid "You are not allowed to edit this comment." +msgstr "Vous n’avez pas l’autorisation de modifier ce commentaire." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1155 +msgid "Allow Comments" +msgstr "Autoriser les commentaires" +======= #: wp-admin/comment.php:88 msgid "Moderate Comment" msgstr "ModÃ©rer le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:78 +msgid "This comment is in the Trash. Please move it out of the Trash if you want to edit it." +msgstr "Ce commentaire est dans la Corbeille. Veuillez l’en sortir avant de le modifier." +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1160 +msgid "Allow Pings" +msgstr "Autoriser les notifications par ping" +======= #: wp-admin/comment.php:75 msgid "This comment is in the Trash. Please move it out of the Trash if you want to edit it." msgstr "Ce commentaire est dans la Corbeille. Veuillez l’en sortir avant de le modifier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:126 +#: wp-admin/includes/class-wp-comments-list-table.php:258 +msgctxt "comment" +msgid "Mark as Spam" +msgstr "Marquer comme indÃ©sirable" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1192 +#: wp-admin/includes/class-wp-posts-list-table.php:1195 +#: wp-admin/includes/template.php:1635 +msgid "Sticky" +msgstr "Mis en avant" +======= #: wp-admin/comment.php:72 msgid "You are not allowed to edit this comment." msgstr "Vous n’avez pas l’autorisation de modifier ce commentaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin-header.php:44 +msgid "%1$s — WordPress" +msgstr "%1$s — WordPress" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1196 +msgid "Not Sticky" +msgstr "Pas mis en avant" +======= #: wp-admin/comment.php:69 wp-admin/comment.php:252 #: wp-admin/includes/post.php:1466 msgid "Go back" msgstr "Retour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin-header.php:46 +msgid "%1$s ‹ %2$s — WordPress" +msgstr "%1$s ‹ %2$s — WordPress" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:1204 +msgid "Make this post sticky" +msgstr "Mettre ce contenu en avant" +======= #: wp-admin/comment.php:69 wp-admin/comment.php:252 #: wp-admin/edit-comments.php:164 msgid "Oops, no comment with this ID." msgstr "Oups, aucun commentaire avec cet ID." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:106 wp-admin/credits.php:12 wp-admin/credits.php:91 +#: wp-admin/freedoms.php:30 +msgid "Credits" +msgstr "CrÃ©dits" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:767 +msgid "Missed schedule" +msgstr "Planification manquÃ©e" +======= #: wp-admin/comment.php:60 wp-admin/custom-background.php:97 #: wp-admin/custom-header.php:124 wp-admin/edit-comments.php:136 #: wp-admin/edit-form-advanced.php:313 wp-admin/edit-form-advanced.php:329 @@ -10338,11 +34983,32 @@ msgstr "Oups, aucun commentaire avec cet ID." #: wp-admin/user-new.php:184 wp-admin/users.php:63 wp-admin/widgets.php:74 msgid "Support Forums" msgstr "Forums d’entraide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:107 wp-admin/credits.php:93 wp-admin/freedoms.php:12 +#: wp-admin/freedoms.php:32 +msgid "Freedoms" +msgstr "LibertÃ©s" +||||||| .r11156 +#: wp-admin/includes/class-wp-posts-list-table.php:771 +msgid "Last Modified" +msgstr "DerniÃ¨re modification" +======= #: wp-admin/comment.php:59 wp-admin/edit-comments.php:133 msgid "Documentation on Comments" msgstr "Documentation sur les commentaires (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:167 +msgid "Under the Hood" +msgstr "Sous le capot" +||||||| .r11156 +#: wp-admin/includes/class-wp-users-list-table.php:431 +msgid "View posts by this author" +msgstr "Afficher les articles de cet auteur" +======= #: wp-admin/comment.php:58 wp-admin/custom-background.php:95 #: wp-admin/custom-header.php:122 wp-admin/edit-comments.php:132 #: wp-admin/edit-form-advanced.php:311 wp-admin/edit-form-advanced.php:326 @@ -10362,15 +35028,45 @@ msgstr ">>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:181 +msgid "Return to Updates" +msgstr "Retourner aux mises Ã jour" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:417 +msgid "In reply to %2$s." +msgstr "En rÃ©ponse Ã %2$s." +======= #: wp-admin/comment.php:54 msgid "You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment." msgstr "Vous pouvez Ã©galement modÃ©rer le commentaire depuis cet Ã©cran, Ã l’aide du bloc Ãtat, d’oÃ¹ vous pouvez Ã©galement changer l’horodatage du commentaire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:181 +msgid "Return to Dashboard → Updates" +msgstr "Retourner aux mises Ã jour" +||||||| .r11156 +#: wp-admin/includes/class-wp-comments-list-table.php:540 +msgid "Y/m/d \\a\\t g:ia" +msgstr "d/m/Y \\Ã \\ G \\h i \\m\\i\\n" +======= #: wp-admin/comment.php:53 msgid "You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error." msgstr "Au besoin, vous pouvez modifier les informations laissÃ©es dans un commentaire. Par exemple, si un commentateur a fait une faute d’orthographe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:184 +msgid "Go to Dashboard → Home" +msgstr "Aller sur l’accueil" +||||||| .r11156 +#: wp-admin/includes/template.php:440 +msgid "Reply to Comment" +msgstr "RÃ©pondre au commentaire" +======= #: wp-admin/comment.php:51 wp-admin/custom-background.php:86 #: wp-admin/custom-header.php:96 wp-admin/edit-comments.php:116 #: wp-admin/edit-form-advanced.php:334 wp-admin/edit-link-form.php:56 @@ -10391,62 +35087,253 @@ msgstr "Au besoin, vous pouvez modifier les informations laissÃ©es dans un comme #: wp-admin/widgets.php:50 msgid "Overview" msgstr "Vue d’ensemble" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:196 +msgid "Maintenance Release" +msgid_plural "Maintenance Releases" +msgstr[0] "Mise Ã jour de maintenance" +msgstr[1] "Mises Ã jour de maintenance" +||||||| .r11156 +#: wp-admin/includes/template.php:471 +msgid "Submit Reply" +msgstr "Envoyer la rÃ©ponse" +======= #: wp-admin/comment.php:47 wp-admin/edit-form-comment.php:16 msgid "Edit Comment" msgstr "Modifier le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:197 +msgid "Security Release" +msgid_plural "Security Releases" +msgstr[0] "Mise Ã jour de sÃ©curitÃ©" +msgstr[1] "Mises Ã jour de sÃ©curitÃ©" +||||||| .r11156 +#: wp-admin/includes/template.php:508 +msgid "Comment by %s moved to the trash." +msgstr "Commentaire de %s dÃ©placÃ© dans la Corbeille." +======= #: wp-admin/async-upload.php:92 msgid "“%s” has failed to upload due to an error" msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne suite Ã une erreur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:111 wp-admin/about.php:198 +msgid "Maintenance and Security Release" +msgid_plural "Maintenance and Security Releases" +msgstr[0] "Mise Ã jour de maintenance et de sÃ©curitÃ©" +msgstr[1] "Mises Ã jour de maintenance et de sÃ©curitÃ©" +||||||| .r11156 +#: wp-admin/includes/template.php:511 +msgid "Comment by %s marked as spam." +msgstr "Commentaire de %s marquÃ© comme indÃ©sirable." +======= #: wp-admin/async-upload.php:63 msgctxt "media item" msgid "Edit" msgstr "Modifier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:54 wp-admin/custom-background.php:86 +#: wp-admin/custom-header.php:96 wp-admin/edit-comments.php:116 +#: wp-admin/edit-form-advanced.php:346 wp-admin/edit-link-form.php:56 +#: wp-admin/edit-tags.php:207 wp-admin/edit.php:177 wp-admin/edit.php:222 +#: wp-admin/export.php:46 wp-admin/import.php:21 +#: wp-admin/includes/screen.php:868 wp-admin/index.php:39 +#: wp-admin/link-manager.php:45 wp-admin/media-new.php:45 wp-admin/media.php:73 +#: wp-admin/my-sites.php:40 wp-admin/nav-menus.php:517 +#: wp-admin/nav-menus.php:552 wp-admin/options-discussion.php:39 +#: wp-admin/options-general.php:98 wp-admin/options-media.php:28 +#: wp-admin/options-permalink.php:20 wp-admin/options-reading.php:53 +#: wp-admin/options-writing.php:20 wp-admin/plugin-editor.php:128 +#: wp-admin/plugin-install.php:71 wp-admin/plugins.php:379 +#: wp-admin/revision.php:114 wp-admin/theme-editor.php:25 +#: wp-admin/theme-install.php:83 wp-admin/themes.php:55 +#: wp-admin/update-core.php:514 wp-admin/upload.php:46 wp-admin/upload.php:180 +#: wp-admin/user-edit.php:48 wp-admin/user-new.php:169 wp-admin/users.php:25 +#: wp-admin/widgets.php:55 +msgid "Overview" +msgstr "Vue d’ensemble" +||||||| .r11156 +#: wp-admin/includes/template.php:531 wp-admin/includes/template.php:546 +#: wp-admin/includes/template.php:612 wp-admin/includes/template.php:655 +msgid "Value" +msgstr "Valeur" +======= #: wp-admin/async-upload.php:57 wp-admin/edit-tags.php:252 #: wp-admin/includes/post.php:1726 wp-admin/post.php:157 msgid "You are not allowed to edit this item." msgstr "Vous n’avez pas l’autorisation de modifier ce contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:61 wp-admin/custom-background.php:95 +#: wp-admin/custom-header.php:122 wp-admin/edit-comments.php:132 +#: wp-admin/edit-form-advanced.php:323 wp-admin/edit-form-advanced.php:338 +#: wp-admin/edit-form-advanced.php:355 wp-admin/edit-link-form.php:64 +#: wp-admin/edit-tags.php:237 wp-admin/edit.php:214 wp-admin/edit.php:235 +#: wp-admin/export.php:52 wp-admin/import.php:27 wp-admin/index.php:87 +#: wp-admin/link-manager.php:59 wp-admin/media-new.php:55 wp-admin/media.php:82 +#: wp-admin/my-sites.php:47 wp-admin/nav-menus.php:558 +#: wp-admin/options-discussion.php:45 wp-admin/options-general.php:103 +#: wp-admin/options-media.php:33 wp-admin/options-permalink.php:43 +#: wp-admin/options-reading.php:68 wp-admin/options-writing.php:44 +#: wp-admin/plugin-editor.php:139 wp-admin/plugin-install.php:86 +#: wp-admin/plugins.php:393 wp-admin/revision.php:118 +#: wp-admin/theme-editor.php:38 wp-admin/theme-install.php:98 +#: wp-admin/themes.php:90 wp-admin/tools.php:27 wp-admin/update-core.php:532 +#: wp-admin/upload.php:63 wp-admin/upload.php:200 wp-admin/user-edit.php:53 +#: wp-admin/user-new.php:187 wp-admin/users.php:60 wp-admin/widgets.php:77 +msgid "For more information:" +msgstr "Plus d’informations :" +||||||| .r11156 +#: wp-admin/includes/template.php:602 +msgid "Key" +msgstr "ClÃ©" +======= #: wp-admin/async-upload.php:55 wp-admin/post.php:154 wp-admin/post.php:251 #: wp-admin/post.php:274 wp-admin/post.php:292 msgid "Unknown post type." msgstr "Type de contenu inconnu." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: WordPress version number, 2: plural number of bugs. +#: wp-admin/about.php:205 +msgid "Version %1$s addressed %2$s bug." +msgid_plural "Version %1$s addressed %2$s bugs." +msgstr[0] "La version %1$s corrige %2$s bug." +msgstr[1] "La version %1$s corrige %2$s bugs." +||||||| .r11156 +#: wp-admin/includes/template.php:650 +msgid "Add New Custom Field:" +msgstr "Ajouter un nouveau champ personnalisÃ© :" +======= #: wp-admin/admin.php:288 wp-admin/import.php:17 wp-admin/menu.php:228 msgid "Import" msgstr "Importer" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:102 wp-admin/credits.php:85 wp-admin/freedoms.php:24 +#: wp-admin/includes/ajax-actions.php:2971 +#: wp-admin/includes/ajax-actions.php:3012 +#: wp-admin/includes/class-wp-ms-themes-list-table.php:483 +#: wp-admin/includes/class-wp-plugins-list-table.php:624 +#: wp-admin/includes/update.php:186 wp-admin/includes/update.php:210 +msgid "Version %s" +msgstr "Version %s" +||||||| .r11156 +#: wp-admin/includes/template.php:676 +msgid "Enter new" +msgstr "Saisissez-en un nouveau" +======= #: wp-admin/admin.php:265 msgid "You are not allowed to import." msgstr "Vous n’avez pas l’autorisation d’importer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin-header.php:225 +msgid "Main content" +msgstr "Contenu principal" +||||||| .r11156 +#: wp-admin/includes/template.php:687 +msgid "Add Custom Field" +msgstr "Ajouter un champ personnalisÃ©" +======= #: wp-admin/admin.php:232 msgid "Cannot load %s." msgstr "Impossible de charger %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/async-upload.php:63 +msgctxt "media item" +msgid "Edit" +msgstr "Modifier" +||||||| .r11156 +#: wp-admin/includes/template.php:877 +msgid "Before you can upload your import file, you will need to fix the following error:" +msgstr "Avant de mettre en ligne votre fichier d’import, il vous faut corriger l’erreur suivante :" +======= #: wp-admin/admin.php:229 msgid "Invalid plugin page" msgstr "Page d’extension non valide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:114 wp-admin/about.php:216 +msgid "For more information, see the release notes." +msgstr "Pour plus d’informations, consultez les notes de publication." +||||||| .r11156 +#: wp-admin/includes/template.php:883 +msgid "Choose a file from your computer:" +msgstr "Choisissez un fichier sur votre ordinateur :" +======= #: wp-admin/admin-header.php:213 msgid "Main content" msgstr "Contenu principal" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:57 +msgid "You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment." +msgstr "Vous pouvez Ã©galement modÃ©rer le commentaire depuis cet Ã©cran, Ã l’aide du bloc Ãtat, d’oÃ¹ vous pouvez Ã©galement changer l’horodatage du commentaire." +||||||| .r11156 +#: wp-admin/includes/template.php:883 +msgid "Maximum size: %s" +msgstr "Taille maximale : %s" +======= #: wp-admin/admin-header.php:34 msgid "%1$s ‹ %2$s — WordPress" msgstr "%1$s ‹ %2$s — WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:105 wp-admin/credits.php:89 wp-admin/freedoms.php:28 +msgid "What’s New" +msgstr "NouveautÃ©s" +||||||| .r11156 +#: wp-admin/includes/template.php:888 +msgid "Upload file and import" +msgstr "Envoyer le fichier et l’importer" +======= #: wp-admin/admin-header.php:32 msgid "%1$s — WordPress" msgstr "%1$s — WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/async-upload.php:55 wp-admin/post.php:159 wp-admin/post.php:256 +#: wp-admin/post.php:279 wp-admin/post.php:297 +msgid "Unknown post type." +msgstr "Type de contenu inconnu." +||||||| .r11156 +#: wp-admin/includes/template.php:1032 wp-admin/press-this.php:494 +#: wp-admin/press-this.php:528 wp-admin/press-this.php:578 +msgid "Click to toggle" +msgstr "Cliquer pour inverser." +======= #: wp-admin/admin-footer.php:29 msgid "Thank you for creating with WordPress." msgstr "Merci de faire de WordPress votre outil de crÃ©ation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:99 +msgid "Welcome to WordPress %s" +msgstr "Bienvenue dans WordPress %s" +||||||| .r11156 +#: wp-admin/includes/template.php:1439 +msgid "Find Posts or Pages" +msgstr "Chercher parmi les articles et pages" +======= #. translators: 1: WordPress version number, 2: plural number of bugs. Singular #. security issue. #: wp-admin/about.php:179 @@ -10454,125 +35341,481 @@ msgid "Version %1$s addressed a security issue and fixed %2$s b msgid_plural "Version %1$s addressed a security issue and fixed %2$s bugs." msgstr[0] "La version %1$s s’occupe d’un problÃ¨me de sÃ©curitÃ© et corrige %2$s bug." msgstr[1] "Version %1$s s’occupe d’un problÃ¨me de sÃ©curitÃ© et corrige %2$s bugs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/admin-footer.php:29 +msgid "Thank you for creating with WordPress." +msgstr "Merci de faire de WordPress votre outil de crÃ©ation." +||||||| .r11156 +#: wp-admin/update.php:214 +msgid "Install Themes" +msgstr "Installer des thÃ¨mes" +======= #. translators: 1: WordPress version number, 2: plural number of bugs. #: wp-admin/about.php:175 msgid "Version %1$s addressed %2$s bug." msgid_plural "Version %1$s addressed %2$s bugs." msgstr[0] "La version %1$s corrige %2$s bug." msgstr[1] "La version %1$s corrige %2$s bugs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:19 +msgid "About" +msgstr "Ã propos" +||||||| .r11156 +#: wp-admin/themes.php:35 +msgid "Manage Themes" +msgstr "GÃ©rer les thÃ¨mes" +======= #: wp-admin/about.php:167 msgid "Security Release" msgid_plural "Security Releases" msgstr[0] "Mise Ã jour de sÃ©curitÃ©" msgstr[1] "Mises Ã jour de sÃ©curitÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:63 wp-admin/custom-background.php:97 +#: wp-admin/custom-header.php:124 wp-admin/edit-comments.php:136 +#: wp-admin/edit-form-advanced.php:325 wp-admin/edit-form-advanced.php:341 +#: wp-admin/edit-form-advanced.php:357 wp-admin/edit-link-form.php:66 +#: wp-admin/edit-tags.php:246 wp-admin/edit.php:216 wp-admin/edit.php:237 +#: wp-admin/export.php:54 wp-admin/import.php:29 wp-admin/index.php:89 +#: wp-admin/link-manager.php:61 wp-admin/media-new.php:57 wp-admin/media.php:84 +#: wp-admin/my-sites.php:49 wp-admin/nav-menus.php:560 +#: wp-admin/options-discussion.php:47 wp-admin/options-general.php:105 +#: wp-admin/options-media.php:35 wp-admin/options-permalink.php:46 +#: wp-admin/options-reading.php:70 wp-admin/options-writing.php:46 +#: wp-admin/plugin-editor.php:142 wp-admin/plugin-install.php:88 +#: wp-admin/plugins.php:395 wp-admin/revision.php:120 +#: wp-admin/theme-editor.php:43 wp-admin/theme-install.php:100 +#: wp-admin/themes.php:92 wp-admin/tools.php:29 wp-admin/update-core.php:534 +#: wp-admin/upload.php:65 wp-admin/upload.php:202 wp-admin/user-edit.php:55 +#: wp-admin/user-new.php:189 wp-admin/users.php:63 wp-admin/widgets.php:79 +msgid "Support Forums" +msgstr "Forums d’entraide" +||||||| .r11156 +#: wp-admin/includes/template.php:1633 +msgctxt "post state" +msgid "Pending" +msgstr "En attente" +======= #: wp-admin/about.php:166 msgid "Maintenance Release" msgid_plural "Maintenance Releases" msgstr[0] "Mise Ã jour de maintenance" msgstr[1] "Mises Ã jour de maintenance" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/comment.php:62 wp-admin/edit-comments.php:133 +msgid "Documentation on Comments" +msgstr "Documentation sur les commentaires (en)" +||||||| .r11156 +#: wp-admin/includes/screen.php:972 +msgid "Enable accessibility mode" +msgstr "Activer le mode « AccessibilitÃ© »" +======= #: wp-admin/about.php:154 msgid "Go to Dashboard" msgstr "Aller sur le tableau de bord" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: WordPress version number. +#: wp-admin/about.php:201 +msgid "Version %1$s addressed a security issue." +msgid_plural "Version %1$s addressed some security issues." +msgstr[0] "La version %1$s corrige un problÃ¨me de sÃ©curitÃ©." +msgstr[1] "La version %1$s corrige plusieurs problÃ¨mes de sÃ©curitÃ©." +||||||| .r11156 +#: wp-admin/includes/screen.php:972 +msgid "Disable accessibility mode" +msgstr "DÃ©sactiver le mode AccessibilitÃ©" +======= #: wp-admin/about.php:154 msgid "Go to Dashboard → Home" msgstr "Aller sur l’accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: WordPress version number, 2: plural number of bugs. Singular +#. security issue. +#: wp-admin/about.php:209 +msgid "Version %1$s addressed a security issue and fixed %2$s bug." +msgid_plural "Version %1$s addressed a security issue and fixed %2$s bugs." +msgstr[0] "La version %1$s corrige un problÃ¨me de sÃ©curitÃ© et %2$s bug." +msgstr[1] "La version %1$s corrige un problÃ¨me de sÃ©curitÃ© et %2$s bugs." +||||||| .r11156 +#: wp-admin/includes/media.php:2337 wp-admin/includes/nav-menu.php:657 +#: wp-admin/includes/nav-menu.php:897 +msgid "«" +msgstr "«" +======= #: wp-admin/about.php:150 msgid "Return to Dashboard → Updates" msgstr "Retourner aux mises Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: WordPress version number, 2: plural number of bugs. More +#. than one security issue. +#: wp-admin/about.php:112 wp-admin/about.php:213 +msgid "Version %1$s addressed some security issues and fixed %2$s bug." +msgid_plural "Version %1$s addressed some security issues and fixed %2$s bugs." +msgstr[0] "La version %1$s corrige quelques problÃ¨mes de sÃ©curitÃ© et %2$s bug." +msgstr[1] "La version %1$s corrige quelques problÃ¨mes de sÃ©curitÃ© et %2$s bugs." +||||||| .r11156 +#: wp-admin/includes/media.php:2338 wp-admin/includes/nav-menu.php:658 +#: wp-admin/includes/nav-menu.php:898 +msgid "»" +msgstr "»" +======= #: wp-admin/about.php:150 msgid "Return to Updates" msgstr "Retourner aux mises Ã jour" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:101 wp-admin/credits.php:83 wp-admin/freedoms.php:22 +msgid "Thank you for updating! WordPress %s makes it even easier to format your content and customize your site." +msgstr "Merci d’avoir fait la mise Ã jour ! WordPress %s simplifie grandement la mise en forme de votre contenu et la personnalisation de votre site." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:688 +msgid "Comment %d does not exist" +msgstr "Le commentaire %d n’existe pas." +======= #. translators: 1: WP_Query, 2: WP_Comment_Query, 3: WP_User_Query #: wp-admin/about.php:141 msgid "%1$s, %2$s, and %3$s now support complex ordering with named meta query clauses." msgstr "%1$s, %2$s et %3$s peuvent maintenant utiliser un ordre complexe avec les clauses nommÃ©es des requÃªtes mÃ©ta." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:93 +msgid "List tables can and should designate a primary column." +msgstr "Les tableaux de listes peuvent et doivent dÃ©signer une colonne principale." +||||||| .r11156 +#: wp-admin/includes/taxonomy.php:113 +msgid "You did not enter a category name." +msgstr "Vous n’avez pas entrÃ© de nom de catÃ©gorie." +======= #: wp-admin/about.php:138 msgid "Complex query ordering" msgstr "Ordonnancement complexe des requÃªtes" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:87 +msgid "Template Hierarchy" +msgstr "HiÃ©rarchie des fichiers du thÃ¨me" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:949 +msgid "Sorry, you must be logged in to reply to a comment." +msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©pondre Ã un commentaire." +======= #. translators: 1: Term splitting guide link #: wp-admin/about.php:135 msgid "Terms shared across multiple taxonomies will be split when one of them is updated. Find out more in the Plugin Developer Handbook." msgstr "Les termes partagÃ©s entre plusieurs taxinomies seront dissociÃ©s les uns des autres lorsque lâun dâentre eux est mis Ã jour. Pour en savoir plus, rendez-vous sur la page du Manuel du dÃ©veloppeur dâextensions (en anglais)." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:84 +msgid "Terms shared across multiple taxonomies are now split into separate terms." +msgstr "Les termes partagÃ©s par plusieurs taxinomies sont maintenant sÃ©parÃ©s en plusieurs termes distincts." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1164 +#: wp-admin/includes/ajax-actions.php:1169 +#: wp-admin/includes/ajax-actions.php:1189 +msgid "Please provide a custom field value." +msgstr "Veuillez saisir une valeur pour le champ personnalisÃ©." +======= #: wp-admin/about.php:132 msgid "Shared term splitting" msgstr "SÃ©paration des termes partagÃ©s" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:83 +msgid "Taxonomy Roadmap" +msgstr "Feuille de route de la taxinomie" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1251 +msgid "User %s added" +msgstr "Utilisateur %s ajoutÃ©" +======= #. translators: %s wp.a11y.speak() #: wp-admin/about.php:128 msgid "You can now send audible notifications to screen readers in JavaScript with %s. Pass it a string, and an update will be sent to a dedicated ARIA live notifications area." msgstr "" "Vous pouvez maintenant envoyer des notifications sonores aux lecteurs d'Ã©cran avec JavaScript grÃ¢ce Ã %s. Passez une chaÃ®ne en argument, et une mise Ã jour sera envoyÃ©e Ã une zone de notification ARIA en temps rÃ©el.\n" "Un systÃ¨me de lecture de chaine est utilisÃ©, et en envoie une mise Ã jour Ã un espace dÃ©diÃ© de notifications ARIA live." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:77 +msgid "Wherever you are on the front-end, you can click the customize link in the toolbar to swiftly make changes to your site." +msgstr "OÃ¹ que vous soyez sur l’interface du site, vous pouvez cliquer sur le lien de personnalisation dans la barre d’outils pour apporter une modification rapide Ã votre site." +||||||| .r11156 +#: wp-admin/includes/misc.php:819 +msgid "g:i:s a" +msgstr "G \\h i \\m\\i\\n s \\s" +======= #: wp-admin/about.php:125 msgid "JavaScript accessibility" msgstr "AccessibilitÃ© de JavaScript" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:72 +msgid "All new pages that you create will have comments turned off. Keep discussions to your blog, right where they’re supposed to happen." +msgstr "Toutes les nouvelles pages que vous crÃ©erez auront les commentaires dÃ©sactivÃ©s par dÃ©faut. Cela permet de limiter les conversations Ã votre blog, lÃ oÃ¹ elle sont censÃ©es se dÃ©rouler." +||||||| .r11156 +#: wp-admin/includes/misc.php:821 +msgid "Draft saved at %s." +msgstr "Brouillon enregistrÃ© Ã %s." +======= #: wp-admin/about.php:123 msgid "Database character encoding has changed from utf8 to utf8mb4, which adds support for a whole range of new 4-byte characters." msgstr "Le codage de caractÃ¨res de la base de donnÃ©es est passÃ© de utf8 Ã utf8mb4, ce qui ajoute la possibilitÃ© d’utiliser tout un jeu de nouveaux caractÃ¨res encodÃ©s sur 4 octets." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:67 +msgid "Refinements to the list view across the admin make your WordPress more accessible and easier to work with on any device." +msgstr "Des amÃ©liorations Ã l’affichage des listes sur l’ensemble des pages d’administration rendent WordPress plus accessible et plus facile Ã utiliser sur n’importe quel appareil." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1510 +msgid "Someone" +msgstr "Quelqu’un" +======= #: wp-admin/about.php:122 msgid "utf8mb4 support" msgstr "Prise en charge du codage utf8mb4" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:66 +msgid "A smoother admin experience" +msgstr "Une utilisation de l’administration plus agrÃ©able" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1502 wp-admin/includes/post.php:203 +msgid "You are not allowed to edit this page." +msgstr "Vous n’avez pas l’autorisation de modifier cette page." +======= #: wp-admin/about.php:118 msgid "Under the Hood" msgstr "Sous le capot" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:53 +msgid "Keep your site more secure with WordPress’ improved approach to passwords. Instead of receiving passwords via email, you’ll get a password reset link. When you add new users to your site or edit a user profile, WordPress will automatically generate a secure password." +msgstr "AmÃ©liorez la sÃ©curitÃ© de votre site grÃ¢ce Ã la nouvelle gestion des mots de passe de WordPress. Au lieu de recevoir un mot de passe dans votre messagerie, vous recevrez un lien de rÃ©initialisation. Et lorsque vous ajouterez de nouveaux utilisateurs Ã votre site, ou que vous modifierez le profil d’un utilisateur, WordPress gÃ©nÃ¨rera automatiquement un mot de passe sÃ©curisÃ©." +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1505 wp-admin/includes/post.php:205 +#: wp-admin/includes/post.php:1580 wp-admin/includes/post.php:1584 +#: wp-admin/press-this.php:33 wp-admin/upload.php:110 +msgid "You are not allowed to edit this post." +msgstr "Vous n’avez pas l’autorisation de modifier cet article." +======= #: wp-admin/about.php:113 msgid "Goodbye boring loading screen, hello smooth and simple plugin updates. Click Update Now and watch the magic happen." msgstr "Adieu, triste Ã©cran de chargement ; bienvenue aux mises Ã jour d’extensions simples et sans bavure ! Cliquez sur Mettre Ã jour maintenant et laissez la magie s’opÃ©rer." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:52 +msgid "Better Passwords" +msgstr "De meilleurs mots de passe" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1511 +msgid "Saving is disabled: %s is currently editing this page." +msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cette page." +======= #: wp-admin/about.php:112 msgid "Streamlined plugin updates" msgstr "Mises Ã jour simplifiÃ©e des extensions" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:47 +msgid "Menus in the Customizer" +msgstr "Les menus dans l’outil de personnalisation" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1511 +msgid "Saving is disabled: %s is currently editing this post." +msgstr "Enregistrement automatique dÃ©sactivÃ© : %s modifie actuellement cet article." +======= #: wp-admin/about.php:108 msgid "Paste links from Tumblr.com and Kickstarter and watch them magically appear right in the editor. With every release, your publishing and editing experience get closer together." msgstr "Collez des liens vers Tumblr.com ou Kickstarter, et vous les verrez apparaÃ®tre comme par magie directement dans l’Ã©diteur. Ã chaque nouvelle version, votre approche de la publication et de la rÃ©daction sont de plus en plus proches." - +>>>>>>> .r12027 + +<<<<<<< .mine +#. Translators: 1: asterisks; 2: number sign; +#: wp-admin/about.php:43 +msgid "Your writing flow just got faster with new formatting shortcuts in WordPress 4.3. Use asterisks to create lists and number signs to make a heading. No more breaking your flow; your text looks great with a %1$s and a %2$s." +msgstr "Votre flux d’Ã©criture va s’accÃ©lÃ©rer grÃ¢ce aux nouveaux raccourcis de WordPress 4.3. Utilisez l’astÃ©risque pour crÃ©er des listes, et le croisillon pour mettre en place un titre. Votre flux n’est plus ralenti par le mouvement de souris ; votre texte est plus clair grÃ¢ce aux %1$s et aux %2$s." +||||||| .r11156 +#: wp-admin/edit-tags.php:256 wp-admin/includes/ajax-actions.php:1600 +#: wp-admin/includes/ajax-actions.php:1605 +msgid "Item not updated." +msgstr "L’Ã©lÃ©ment n’a pas Ã©tÃ© mis Ã jour" +======= #: wp-admin/about.php:107 msgid "Even more embeds" msgstr "Encore plus contenus insÃ©rÃ©s" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:41 +msgid "Formatting Shortcuts" +msgstr "Les raccourcis de mise en forme" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1644 +#: wp-admin/includes/class-wp-posts-list-table.php:323 +#: wp-admin/includes/class-wp-posts-list-table.php:962 +msgid "Date" +msgstr "Date" +======= #: wp-admin/about.php:103 msgid "Browse and preview your installed themes from the Customizer. Make sure the theme looks great with your content, before it debuts on your site. " msgstr "Parcourez et prÃ©visualisez vos thÃ¨mes installÃ©s avec lâoutil de personnalisation. Assurez-vous que ce thÃ¨me est adaptÃ© Ã votre contenu avant de lâactiver sur votre site." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:57 +msgid "Site Icons" +msgstr "Des icÃ´nes pour votre site" +||||||| .r11156 +#: wp-admin/edit-form-comment.php:74 wp-admin/includes/ajax-actions.php:1644 +#: wp-admin/includes/class-wp-posts-list-table.php:1170 +msgid "Status" +msgstr "Ãtat" +======= #: wp-admin/about.php:102 msgid "Switch themes in the Customizer" msgstr "Changez de thÃ¨me dans lâoutil de personnalisation" - +>>>>>>> .r12027 + +<<<<<<< .mine +#. Translators: 1: singular.php; 2: single.php; 3:page.php +#: wp-admin/about.php:89 +msgid "Added %1$s as a fallback for %2$s and %3$s" +msgstr "Le fichier %1$s a Ã©tÃ© ajoutÃ© en tant qu’alternative Ã %2$s et %3$s" +||||||| .r11156 +#: wp-admin/includes/ajax-actions.php:1656 +#: wp-admin/includes/class-wp-posts-list-table.php:769 +#: wp-admin/includes/class-wp-posts-list-table.php:1177 +#: wp-admin/includes/meta-boxes.php:79 wp-admin/includes/meta-boxes.php:102 +msgid "Scheduled" +msgstr "PlanifiÃ©" +======= #: wp-admin/about.php:94 msgid "https://codex.wordpress.org/Emoji" msgstr "https://codex.wordpress.org/Emoji" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/about.php:71 +msgid "Comments turned off on pages" +msgstr "Les commentaires sont dÃ©sactivÃ©s sur les pages" +||||||| .r11156 +#: wp-admin/admin.php:215 +msgid "Invalid plugin page" +msgstr "Page d’extension non valide" +======= #. translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza #. emoji, 5: Emoji Codex link #: wp-admin/about.php:94 msgid "Don’t use any of those characters? You can still have fun — emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other emoji." msgstr "Vous nâutilisez aucun de ces caractÃ¨res ? Vous pouvez malgrÃ© tout vous amuser avec — les caractÃ¨res emoji sont maintenant disponibles dans WordPress ! Soyez crÃ©atifs et agrÃ©mentez votre contenu avec %1$s, %2$s, %3$s, %4$s ou nâimporte quel autre emoji !" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:76 +msgid "Customize your site quickly" +msgstr "Une personnalisation rapide de votre site" +||||||| .r11156 +#: wp-admin/admin.php:218 +msgid "Cannot load %s." +msgstr "Impossible de charger %s." +======= #: wp-admin/about.php:91 msgid "Writing in WordPress, whatever your language, just got better. WordPress 4.2 supports a host of new characters out-of-the-box, including native Chinese, Japanese, and Korean characters, musical and mathematical symbols, and hieroglyphs." msgstr "LâÃ©criture dans WordPress a Ã©tÃ© amÃ©liorÃ©e pour toutes les langues. WordPress 4.2 peut utiliser une multitude de nouveaux caractÃ¨res par dÃ©faut, y compris les caractÃ¨res natifs des Ã©critures chinoises, japonaises et corÃ©ennes, ainsi que les symboles musicaux et mathÃ©matiques et les hiÃ©roglyphes." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:48 +msgid "Create your menu, update it, and assign it, all while live-previewing in the customizer. The streamlined customizer design provides a mobile-friendly and accessible interface. With every release, it becomes easier and faster to make your site just the way you want it." +msgstr "CrÃ©ez votre menu, mettez-le Ã jour et placez-le, le tout en mÃªme temps que vous prÃ©visualisez son apparence dans l’outil de personnalisation. Le design Ã©purÃ© de l’outil de personnalisation offre une interface accessible tant pour les appareils mobiles que pour les utilisateurs en situation de handicap. De version en version, il devient de plus en plus facile de donner Ã votre l’apparence que vous souhaitez." +||||||| .r11156 +#: wp-admin/admin.php:251 +msgid "You are not allowed to import." +msgstr "Vous n’avez pas l’autorisation d’importer." +======= #: wp-admin/about.php:90 msgid "Extended character support" msgstr "Reconnaissance des caractÃ¨res Ã©tendus" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/about.php:58 +msgid "Site icons represent your site in browser tabs, bookmark menus, and on the home screen of mobile devices. Add your unique site icon in the customizer; it will even stay in place when you switch themes. Make your whole site reflect your brand." +msgstr "Les icÃ´nes du site reprÃ©sentent votre site dans les onglets des navigateurs, dans les menus de favoris, et dans la page d’accueil des appareils mobiles. Ajoutez votre propre icÃ´ne de site dans l’outil de personnalisation ; il restera mÃªme en place quand vous changerez de thÃ¨me. Faites en sorte que tout votre site soit le reflet de votre marque." +||||||| .r11156 +#: wp-admin/admin.php:274 wp-admin/import.php:17 wp-admin/menu.php:214 +msgid "Import" +msgstr "Importer" + +#: wp-admin/comment.php:46 wp-admin/edit-form-comment.php:16 +msgid "Edit Comment" +msgstr "Modifier le commentaire" + +#: wp-admin/comment.php:68 wp-admin/comment.php:221 +#: wp-admin/edit-comments.php:164 +msgid "Oops, no comment with this ID." +msgstr "Oups, aucun commentaire avec cet ID." + +#: wp-admin/comment.php:68 wp-admin/comment.php:221 +#: wp-admin/includes/post.php:1382 +msgid "Go back" +msgstr "Retour" + +#: wp-admin/comment.php:223 wp-admin/edit-comments.php:167 +#: wp-admin/includes/comment.php:37 +msgid "You are not allowed to edit comments on this post." +msgstr "Vous n’avez pas l’autorisation de modifier les commentaires de cet article." +#: wp-admin/comment.php:74 +msgid "This comment is in the Trash. Please move it out of the Trash if you want to edit it." +msgstr "Ce commentaire est dans la Corbeille. Veuillez l’en sortir avant de le modifier." + +#: wp-admin/comment.php:123 +msgid "You are about to mark the following comment as spam:" +msgstr "Vous Ãªtes sur le point de marquer le commentaire suivant comme indÃ©sirable :" + +#: wp-admin/comment.php:124 +msgid "Spam Comment" +msgstr "Marquer comme indÃ©sirable" + +#: wp-admin/comment.php:127 +msgid "You are about to move the following comment to the Trash:" +msgstr "Vous Ãªtes sur le point de dÃ©placer le commentaire suivant dans la Corbeille :" + +#: wp-admin/comment.php:128 +msgid "Trash Comment" +msgstr "Mettre le commentaire dans la Corbeille" + +#: wp-admin/comment.php:131 +msgid "You are about to delete the following comment:" +msgstr "Vous Ãªtes sur le point de supprimer le commentaire suivant :" +======= #: wp-admin/about.php:76 wp-admin/tools.php:16 wp-admin/tools.php:40 #: wp-admin/tools.php:51 msgid "Press This" @@ -10651,3 +35894,4 @@ msgstr "Bienvenue dans WordPress %s" #: wp-admin/about.php:19 msgid "About" msgstr "Ã propos" +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.mo b/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.mo index 994b760b..6741e7d5 100644 Binary files a/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.mo and b/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.po b/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.po index 18efbff6..9c50b30f 100644 --- a/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.po +++ b/pavillonmadeleine.fr/wp-content/languages/admin-network-fr_FR.po @@ -2,7 +2,13 @@ # This file is distributed under the same license as the Network Admin package. msgid "" msgstr "" +<<<<<<< .mine +"PO-Revision-Date: 2015-07-15 13:29:04+0000\n" +||||||| .r11156 +"PO-Revision-Date: 2014-08-15 15:05:46+0000\n" +======= "PO-Revision-Date: 2015-06-28 13:28:16+0000\n" +>>>>>>> .r12027 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,6 +16,15 @@ msgstr "" "X-Generator: GlotPress/1.0-alpha-1100\n" "Project-Id-Version: Network Admin\n" +<<<<<<< .mine +#: wp-admin/network.php:124 +msgid "The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files." +msgstr "L’Ã©cran suivant vous prÃ©sentera un ensemble de lignes de code gÃ©nÃ©rÃ©es Ã partir de votre configuration, qu’il vous faudra ajouter Ã vos fichiers wp-config.php et .htaccess. Veillez bien Ã ce que votre client FTP soit configurÃ© pour afficher les fichiers commenÃ§ant par un point, afin que vous puissiez trouver le fichier .htaccess. Il est possible que vous ayez Ã crÃ©er ce fichier s’il n’est pas dÃ©jÃ prÃ©sent. Avant toute modification de wp-config.php et .htaccess, faites-en une copie de sauvegarde." +||||||| .r11156 +#: wp-admin/network.php:477 wp-admin/network.php:513 +msgid "Add the following to your %1$s file in %2$s, replacing other WordPress rules:" +msgstr "Ajoutez ce qui suit Ã votre fichier %1$s dans le dossier %2$s, en remplacement des rÃ¨gles WordPress dÃ©jÃ en place :" +======= #: wp-admin/network.php:545 msgid "Once you complete these steps, your network is enabled and configured. You will have to log in again." msgstr "Une fois les Ã©tapes effectuÃ©es, votre rÃ©seau sera activÃ© et configurÃ©. Vous devez maintenant vous reconnecter." @@ -18,679 +33,2461 @@ msgstr "Une fois les Ã©tapes effectuÃ©es, votre rÃ©seau sera activÃ© et configur #: wp-admin/network.php:495 wp-admin/network.php:532 msgid "Add the following to your %1$s file in %2$s, replacing other WordPress rules:" msgstr "Ajoutez ce qui suit Ã votre fichier %1$s dans le dossier %2$s, en remplacement des rÃ¨gles WordPress dÃ©jÃ en place :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:126 +msgid "Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar." +msgstr "Une fois que vous aurez ajoutÃ© ce code et rafraÃ®chi la page dans votre navigateur, le mode multisite devrait Ãªtre activÃ©. Cet Ã©cran, dÃ©sormais placÃ© dans le menu de navigation Admin du RÃ©seau, conservera une archive du code ajoutÃ©. Vous pouvez basculer de l’administration du rÃ©seau Ã l’administration du site en cliquant sur « Admin du rÃ©seau », ou en cliquant sur le nom d’un site individuel dans le menu dÃ©roulant « Mes Sites » de la barre d’outils." +||||||| .r11156 +#: wp-admin/network/users.php:48 +msgid "What should be done with content owned by %s?" +msgstr "Que faire du contenu dont %s est le propriÃ©taire ?" +======= #: wp-admin/network.php:432 msgid "To make your installation more secure, you should also add:" msgstr "Pour mieux sÃ©curiser votre installation, vous devriez Ã©galement ajouter :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:127 +msgid "The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version." +msgstr "Le choix d’avoir des sites en mode sous-rÃ©pertoire est dÃ©sactivÃ© si le rÃ©seau a Ã©tÃ© installÃ© il y a un mois ou plus, afin de pallier les problÃ¨mes de permaliens avec l’ajout de « /blog/ » sur les adresses du site principal. Cette limitation sera corrigÃ©e dans une prochaine version." +||||||| .r11156 +#: wp-admin/network/index.php:54 wp-admin/network/site-info.php:33 +#: wp-admin/network/site-new.php:30 wp-admin/network/site-settings.php:33 +#: wp-admin/network/site-themes.php:33 wp-admin/network/site-users.php:36 +#: wp-admin/network/sites.php:46 wp-admin/network/user-new.php:30 +#: wp-admin/network/users.php:243 +msgid "Support Forums" +msgstr "Forum d’entraide en franÃ§ais" +======= #: wp-admin/network.php:427 msgid "This unique authentication key is also missing from your wp-config.php file." msgstr "Cette clÃ© d’authentification unique ne se trouve pas non plus dans votre fichier wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:134 +msgid "Network" +msgstr "RÃ©seau" +||||||| .r11156 +#: wp-admin/network/sites.php:70 +msgid "Confirm your action" +msgstr "Confirmez cette action" +======= #: wp-admin/network.php:429 msgid "These unique authentication keys are also missing from your wp-config.php file." msgstr "Ces clÃ©s d’authentification uniques manquent Ã©galement Ã votre fichier wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:167 +msgid "The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network." +msgstr "La constante DO_NOT_UPGRADE_GLOBAL_TABLES ne doit pas Ãªtre dÃ©finie lors de la crÃ©ation du rÃ©seau." +||||||| .r11156 +#: wp-admin/network/users.php:25 +msgid "Transfer or delete content before deleting users." +msgstr "TransfÃ©rer ou supprimer le contenu avant de supprimer les utilisateurs." +======= #: wp-admin/network.php:393 msgid "Add the following to your wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:" msgstr "Ajoutez les lignes suivantes Ã votre fichier wp-config.php, dans %s, au-dessus de la ligne /* C'est tout, ne touchez pas Ã ce qui suit ! Bon blogging ! */ :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:175 wp-admin/network.php:381 wp-admin/network.php:513 +#: wp-admin/network.php:550 +msgid "Warning:" +msgstr "Attention :" +||||||| .r11156 +#: wp-admin/network/settings.php:104 +msgid "This email address will receive notifications. Registration and support emails will also come from this address." +msgstr "Cette adresse de messagerie recevra des notifications. Les inscriptions et les messages d’assistance proviendront Ã©galement de cette adresse." +======= #: wp-admin/network.php:387 msgid "Caution: We recommend you back up your existing wp-config.php file." msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de votre fichier wp-config.php actuel." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:175 +msgid "Please deactivate your plugins before enabling the Network feature." +msgstr "Veuillez dÃ©sactiver vos extensions avant la mise en place de votre rÃ©seau de sites." +||||||| .r11156 +#: wp-admin/network/users.php:233 +msgid "Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site." +msgstr "Survolez n’importe quel des utilisateurs de la liste pour faire apparaÃ®tre les liens de modification. Le lien Modifier Ã gauche ouvrira la page de modification du profil de l'utilisateur ; le lien Modifier Ã droite de n'importe quel nom de site ouvrira l'Ã©cran de modification de ce site." +======= #: wp-admin/network.php:383 wp-admin/network.php:385 msgid "Caution: We recommend you back up your existing wp-config.php and %s files." msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de vos fichiers wp-config.php et %s actuels." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:175 +msgid "Once the network is created, you may reactivate your plugins." +msgstr "Une fois le rÃ©seau crÃ©Ã©, vous pourrez rÃ©activer vos extensions." +||||||| .r11156 +#: wp-admin/network/index.php:39 +msgid "To add a new user, click Create a New User." +msgstr "Pour ajouter un nouvel utilisateur, cliquez sur CrÃ©er un nouvel utilisateur." +======= #: wp-admin/network.php:380 msgid "Complete the following steps to enable the features for creating a network of sites." msgstr "Suivez les Ã©tapes ci-aprÃ¨s pour activer les fonctionnalitÃ©s permettant la crÃ©ation d’un rÃ©seau de sites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:184 +msgid "You cannot install a network of sites with your server address." +msgstr "Vous ne pouvez pas installer de rÃ©seau de sites avec cette adresse serveur." +||||||| .r11156 +#: wp-admin/network/index.php:40 +msgid "To add a new site, click Create a New Site." +msgstr "Pour ajouter un nouveau site, cliquez sur CrÃ©er un nouveau site." +======= #: wp-admin/network.php:379 msgid "Enabling the Network" msgstr "Activer le rÃ©seau de sites" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:185 +msgid "You cannot use port numbers such as %s." +msgstr "Vous ne pouvez pas utiliser de numÃ©ros de port tels que %s." +||||||| .r11156 +#: wp-admin/network/index.php:42 +msgid "To search for a user, enter an email address or username. Use a wildcard to search for a partial username, such as user*." +msgstr "Pour chercher un utilisateur, saisissez une adresse de messagerie ou un identifiant. Utilisez le signe Ã©toile (*) pour lancer une recherche sur un identifiant partiel, par exemple utilisa*." +======= #: wp-admin/network.php:368 msgid "Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables." msgstr "Veuillez effectuer les Ã©tapes de configuration. Pour crÃ©er un nouveau rÃ©seau, vous devrez vider ou effacer les tables de la base de donnÃ©es du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:186 +msgid "Return to Dashboard" +msgstr "Revenir au tableau de bord" +||||||| .r11156 +#: wp-admin/network/index.php:43 +msgid "To search for a site, enter the path or domain." +msgstr "Pour chercher un site, saisissez son chemin ou son domaine." +======= #: wp-admin/network.php:367 msgid "An existing WordPress network was detected." msgstr "Un rÃ©seau WordPress existant a Ã©tÃ© dÃ©tectÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:198 +msgid "ERROR: The network could not be created." +msgstr "ERREUR : le rÃ©seau n’a pas pu Ãªtre crÃ©Ã©." +||||||| .r11156 +#: wp-admin/network/upgrade.php:106 +msgid "The database upgrade process may take a little while, so please be patient." +msgstr "Le processus de mise Ã jour peut prendre un long moment. Merci pour votre patience." +======= #: wp-admin/network.php:362 msgid "The original configuration steps are shown here for reference." msgstr "Pour rappel, voici les Ã©tapes de configuration originelles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:223 wp-admin/network.php:256 wp-admin/network.php:282 +#: wp-admin/network.php:292 +msgid "Warning!" +msgstr "Attention !" +||||||| .r11156 +#: wp-admin/network/settings.php:82 +msgid "Options saved." +msgstr "Options enregistrÃ©es." +======= #: wp-admin/network.php:315 msgid "Your email address." msgstr "Votre adresse de contact." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:205 +msgctxt "Default network name" +msgid "%s Sites" +msgstr "RÃ©seau %s" +||||||| .r11156 +#: wp-admin/network/index.php:25 +msgid "Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network." +msgstr "Bienvenue dans l’administration de votre rÃ©seau ! Cette partie des Ã©crans d’administration sert Ã gÃ©rer tous les aspects de votre rÃ©seau multisite." +======= #: wp-admin/network.php:306 msgid "What would you like to call your network?" msgstr "Quel nom voulez-vous donner Ã votre rÃ©seau ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:208 +msgid "Welcome to the Network installation process!" +msgstr "Bienvenue dans le processus d’installation du rÃ©seau !" +||||||| .r11156 +#: wp-admin/network/index.php:26 +msgid "From here you can:" +msgstr "D’ici, vous pouvez :" +======= #: wp-admin/network.php:288 msgid "Because your install is not new, the sites in your WordPress network must use sub-domains." msgstr "Votre installation n’est pas rÃ©cente, donc les sites de votre rÃ©seau WordPress doivent utiliser les sous-domaines." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:209 +msgid "Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step." +msgstr "ComplÃ©tez le formulaire ci-dessous et vous serez prÃªt Ã crÃ©er un rÃ©seau de sites WordPress. Nous crÃ©erons les fichiers de configurations Ã l’Ã©tape suivante." +||||||| .r11156 +#: wp-admin/network/index.php:27 +msgid "Add and manage sites or users" +msgstr "Ajouter et gÃ©rer des sites ou des utilisateurs" +======= #: wp-admin/network.php:287 msgid "Sub-domain Install" msgstr "Installation sous-domaine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:221 +msgid "Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation." +msgstr "VÃ©rifiez bien que le module Apache mod_rewrite est installÃ©, car il sera nÃ©cessaire Ã la fin de cette installation." +||||||| .r11156 +#: wp-admin/network/index.php:28 +msgid "Install and activate themes or plugins" +msgstr "Installer et activer des thÃ¨mes ou des extensions" +======= #: wp-admin/network.php:279 msgid "Because your install is in a directory, the sites in your WordPress network must use sub-directories." msgstr "Votre installation est situÃ©e dans un dossier, donc les sites de votre rÃ©seau WordPress doivent forcÃ©ment utiliser des sous-dossiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:223 +msgid "It looks like the Apache mod_rewrite module is not installed." +msgstr "Il semble que le module Apache mod_rewrite n’est pas installÃ©." +||||||| .r11156 +#: wp-admin/network/index.php:29 +msgid "Update your network" +msgstr "Mettre Ã jour votre rÃ©seau" +======= #: wp-admin/network.php:272 wp-admin/network.php:282 wp-admin/network.php:289 msgid "The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links." msgstr "Le site principal installÃ© dans un sous-dossier aura besoin d’utiliser une structure de permaliens personnalisÃ©s, ce qui pourra potentiellement casser des liens existants." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:225 +msgid "If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up." +msgstr "Si le module mod_rewrite est dÃ©sactivÃ©, contactez votre administrateur pour l’activer, ou lisez la documentation Apache officielle ou non, pour comprendre comment le mettre en place." +||||||| .r11156 +#: wp-admin/network/index.php:30 +msgid "Modify global network settings" +msgstr "Modifier les rÃ©glages globaux du rÃ©seau" +======= #: wp-admin/network.php:269 msgid "Because you are using localhost, the sites in your WordPress network must use sub-directories. Consider using localhost.localdomain if you wish to use sub-domains." msgstr "Vous utilisez localhost, donc les sites de votre rÃ©seau WordPress doivent utiliser des sous-dossiers. Songez Ã utiliser localhost.localdomain si vous prÃ©fÃ©rez utiliser des sous-domaines." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:229 +msgid "Addresses of Sites in your Network" +msgstr "Adresse des sites dans votre rÃ©seau" +||||||| .r11156 +#: wp-admin/network/index.php:38 +msgid "The Right Now widget on this screen provides current user and site counts on your network." +msgstr "Le widget Aujourd’hui de cet Ã©cran vous donne le nombre actuel d’utilisateurs et de sites sur votre rÃ©seau." +======= #: wp-admin/network.php:267 wp-admin/network.php:277 msgid "Sub-directory Install" msgstr "Installation dans un sous-dossier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:230 +msgid "Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. You cannot change this later." +msgstr "Veuillez dÃ©cider si vous voulez que les sites de votre installation WordPress utilisent des sous-domaines ou des sous-dossiers. Ce rÃ©glage est dÃ©finitif, vous ne pourrez pas revenir en arriÃ¨re." +||||||| .r11156 +#: wp-admin/network/index.php:41 +msgid "To search for a user or site, use the search boxes." +msgstr "Pour chercher un utilisateur ou un site, utilisez les champs de recherche." +======= #: wp-admin/network.php:263 msgid "Network Details" msgstr "DÃ©tails du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:231 +msgid "You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality." +msgstr "Vous aurez besoin d’un enregistrement DNS gÃ©nÃ©rique (wildcard) pour permettre l’utilisation de la forme sous-domaine (hÃ´te virtuel)." +||||||| .r11156 +#: wp-admin/network/index.php:47 +msgid "Quick Tasks" +msgstr "TÃ¢ches rapides" +======= #: wp-admin/network.php:257 wp-admin/network.php:297 msgid "The internet address of your network will be %s." msgstr "L’adresse internet de votre rÃ©seau sera %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:235 +msgid "Sub-domains" +msgstr "Sous-domaines" +||||||| .r11156 +#: wp-admin/network/menu.php:59 wp-admin/network/upgrade.php:18 +#: wp-admin/network/upgrade.php:42 wp-admin/network/upgrade.php:107 +msgid "Upgrade Network" +msgstr "Mettre Ã jour le rÃ©seau" +======= #: wp-admin/network.php:252 msgid "We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the www prefix with an address like %2$s but any links will not have the www prefix." msgstr "Nous vous recommandons de modifier votre rÃ©glage « siteurl » pour %1$s avec d’activer la fonctionnalitÃ© de rÃ©seau. Il sera toujours possible de se rendre sur votre site par le biais du prÃ©fixe « www » avec une adresse comme %2$s, mais les liens n’auront pas le prÃ©fixe « www »." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: hostname +#: wp-admin/network.php:238 +msgctxt "subdomain examples" +msgid "like site1.%1$s and site2.%1$s" +msgstr "comme site1.%1$s et site2.%1$s" +||||||| .r11156 +#: wp-admin/network/upgrade.php:25 +msgid "Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied." +msgstr "N’utilisez cet Ã©cran que quand vous avez mis Ã jour cette installation de WordPress (au moyen de la fonction de mise Ã jour automatique ou la barre d’outils). En cliquant sur « Mettre Ã jour le rÃ©seau », WordPress s’occupera de tous les sites du rÃ©seau, par groupes de cinq, et s’assurera que toutes les mises Ã jour de bases de donnÃ©es sont appliquÃ©es." +======= #: wp-admin/network.php:251 wp-admin/network.php:255 wp-admin/network.php:295 msgid "Server Address" msgstr "Adresse du serveur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:243 +msgid "Sub-directories" +msgstr "Sous-dossiers" +||||||| .r11156 +#: wp-admin/network/upgrade.php:32 +msgid "Documentation on Upgrade Network" +msgstr "Documentation sur la mise Ã jour du rÃ©seau (en)" +======= #: wp-admin/network.php:246 wp-admin/network.php:499 wp-admin/network.php:536 msgid "Subdirectory networks may not be fully compatible with custom wp-content directories." msgstr "Les rÃ©seaux dans un sous-dossier peuvent ne pas Ãªtre complÃ¨tement compatibles avec les dossiers /wp-content personnalisÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: hostname +#: wp-admin/network.php:246 +msgctxt "subdirectory examples" +msgid "like %1$s/site1 and %1$s/site2" +msgstr "comme %1$s/site1 et %1$s/site2" +||||||| .r11156 +#: wp-admin/network/upgrade.php:102 +msgid "Database Upgrade Required" +msgstr "Il faut mettre Ã jour la base de donnÃ©es" +======= #. translators: 1: hostname #: wp-admin/network.php:236 msgctxt "subdirectory examples" msgid "like %1$s/site1 and %1$s/site2" msgstr "comme %1$s/site1 et %1$s/site2" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:261 wp-admin/network.php:265 wp-admin/network.php:305 +msgid "Server Address" +msgstr "Adresse du serveur" +||||||| .r11156 +#: wp-admin/network/upgrade.php:103 +msgid "WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network." +msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour chaque site de votre rÃ©seau." +======= #: wp-admin/network.php:233 msgid "Sub-directories" msgstr "Sous-dossiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:262 +msgid "We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the www prefix with an address like %2$s but any links will not have the www prefix." +msgstr "Nous vous recommandons de modifier votre rÃ©glage « siteurl » pour %1$s avec d’activer la fonctionnalitÃ© de rÃ©seau. Il sera toujours possible de se rendre sur votre site par le biais du prÃ©fixe « www » avec une adresse comme %2$s, mais les liens n’auront pas le prÃ©fixe « www »." +||||||| .r11156 +#: wp-admin/network/site-new.php:87 +msgid "" +"New site created by %1$s\n" +"\n" +"Address: %2$s\n" +"Name: %3$s" +msgstr "" +"Nouveau site crÃ©Ã© par %1$s\n" +"\n" +"Adresse : %2$s\n" +"Nom : %3$s" +======= #. translators: 1: hostname #: wp-admin/network.php:228 msgctxt "subdomain examples" msgid "like site1.%1$s and site2.%1$s" msgstr "comme site1.%1$s et site2.%1$s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network.php:267 wp-admin/network.php:307 +msgid "The internet address of your network will be %s." +msgstr "L’adresse internet de votre rÃ©seau sera %s." + +#: wp-admin/network.php:273 +msgid "Network Details" +msgstr "DÃ©tails du rÃ©seau" + +#: wp-admin/network.php:277 wp-admin/network.php:287 +msgid "Sub-directory Install" +msgstr "Installation dans un sous-dossier" + +#: wp-admin/network.php:279 +msgid "Because you are using localhost, the sites in your WordPress network must use sub-directories. Consider using localhost.localdomain if you wish to use sub-domains." +msgstr "Vous utilisez localhost, donc les sites de votre rÃ©seau WordPress doivent utiliser des sous-dossiers. Songez Ã utiliser localhost.localdomain si vous prÃ©fÃ©rez utiliser des sous-domaines." + +#: wp-admin/network.php:282 wp-admin/network.php:292 wp-admin/network.php:299 +msgid "The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links." +msgstr "Le site principal installÃ© dans un sous-dossier aura besoin d’utiliser une structure de permaliens personnalisÃ©s, ce qui pourra potentiellement casser des liens existants." + +#: wp-admin/network.php:289 +msgid "Because your install is in a directory, the sites in your WordPress network must use sub-directories." +msgstr "Votre installation est situÃ©e dans un dossier, donc les sites de votre rÃ©seau WordPress doivent forcÃ©ment utiliser des sous-dossiers." + +#: wp-admin/network.php:297 +msgid "Sub-domain Install" +msgstr "Installation sous-domaine" +#: wp-admin/network.php:298 +msgid "Because your install is not new, the sites in your WordPress network must use sub-domains." +msgstr "Votre installation n’est pas rÃ©cente, donc les sites de votre rÃ©seau WordPress doivent utiliser les sous-domaines." + +#: wp-admin/network.php:316 +msgid "What would you like to call your network?" +msgstr "Quel nom voulez-vous donner Ã votre rÃ©seau ?" + +#: wp-admin/network.php:325 +msgid "Your email address." +msgstr "Votre adresse de contact." + +#: wp-admin/network.php:376 +msgid "The original configuration steps are shown here for reference." +msgstr "Pour rappel, voici les Ã©tapes de configuration originelles." + +#: wp-admin/network.php:381 +msgid "An existing WordPress network was detected." +msgstr "Un rÃ©seau WordPress existant a Ã©tÃ© dÃ©tectÃ©." + +#: wp-admin/network.php:382 +msgid "Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables." +msgstr "Veuillez effectuer les Ã©tapes de configuration. Pour crÃ©er un nouveau rÃ©seau, vous devrez vider ou effacer les tables de la base de donnÃ©es du rÃ©seau." + +#: wp-admin/network.php:393 +msgid "Enabling the Network" +msgstr "Activer le rÃ©seau de sites" + +#: wp-admin/network.php:394 +msgid "Complete the following steps to enable the features for creating a network of sites." +msgstr "Suivez les Ã©tapes ci-aprÃ¨s pour activer les fonctionnalitÃ©s permettant la crÃ©ation d’un rÃ©seau de sites." + +#: wp-admin/network.php:397 wp-admin/network.php:399 +msgid "Caution: We recommend you back up your existing wp-config.php and %s files." +msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de vos fichiers wp-config.php et %s actuels." + +#: wp-admin/network.php:401 +msgid "Caution: We recommend you back up your existing wp-config.php file." +msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de votre fichier wp-config.php actuel." + +#: wp-admin/network.php:446 +msgid "To make your installation more secure, you should also add:" +msgstr "Pour mieux sÃ©curiser votre installation, vous devriez Ã©galement ajouter :" + +#: wp-admin/network.php:559 +msgid "Once you complete these steps, your network is enabled and configured. You will have to log in again." +msgstr "Une fois les Ã©tapes effectuÃ©es, votre rÃ©seau sera activÃ© et configurÃ©. Vous devez maintenant vous reconnecter." + +#: wp-admin/network.php:125 +msgid "Add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules)." +msgstr "Ajoutez les lignes de code dÃ©signÃ©es dans le fichier wp-config.php (juste avant /*...stop editing...*/) et le fichier .htaccess (en remplaÃ§ant les rÃ¨gles existantes de WordPress)." +||||||| .r11156 +#: wp-admin/network.php:119 +msgid "Add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules)." +msgstr "Ajoutez les lignes de code dÃ©signÃ©es dans le fichier wp-config.php (juste avant /*...stop editing...*/) et le fichier .htaccess (en remplaÃ§ant les rÃ¨gles existantes de WordPress)." +======= #: wp-admin/network.php:225 msgid "Sub-domains" msgstr "Sous-domaines" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:256 wp-admin/network.php:513 wp-admin/network.php:550 +msgid "Subdirectory networks may not be fully compatible with custom wp-content directories." +msgstr "Les rÃ©seaux dans un sous-dossier peuvent ne pas Ãªtre complÃ¨tement compatibles avec les dossiers /wp-content personnalisÃ©s." +||||||| .r11156 +#: wp-admin/network.php:238 wp-admin/network.php:481 wp-admin/network.php:517 +msgid "Subdirectory networks may not be fully compatible with custom wp-content directories." +msgstr "Les rÃ©seaux dans un sous-dossier peuvent ne pas Ãªtre complÃ¨tement compatibles avec les dossiers /wp-content personnalisÃ©s." +======= #: wp-admin/network.php:221 msgid "You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality." msgstr "Vous aurez besoin d’un enregistrement DNS gÃ©nÃ©rique (wildcard) pour permettre l’utilisation de la forme sous-domaine (hÃ´te virtuel)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:441 +msgid "This unique authentication key is also missing from your wp-config.php file." +msgstr "Cette clÃ© d’authentification unique ne se trouve pas non plus dans votre fichier wp-config.php." +||||||| .r11156 +#: wp-admin/network/settings.php:37 +msgid "Documentation on Network Settings" +msgstr "Documentation sur les RÃ©glages du rÃ©seau (en)" +======= #: wp-admin/network.php:220 msgid "Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. You cannot change this later." msgstr "Veuillez dÃ©cider si vous voulez que les sites de votre installation WordPress utilisent des sous-domaines ou des sous-dossiers. Ce rÃ©glage est dÃ©finitif, vous ne pourrez pas revenir en arriÃ¨re." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:407 +msgid "Add the following to your wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:" +msgstr "Ajoutez les lignes suivantes Ã votre fichier wp-config.php, dans %s, au-dessus de la ligne /* C'est tout, ne touchez pas Ã ce qui suit ! Bon blogging ! */ :" +||||||| .r11156 +#: wp-admin/network/site-users.php:230 +msgid "Enter the username and email." +msgstr "Saisir l’identifiant et l’adresse de messagerie." +======= #: wp-admin/network.php:219 msgid "Addresses of Sites in your Network" msgstr "Adresse des sites dans votre rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:130 wp-admin/network.php:141 +msgid "Documentation on the Network Screen" +msgstr "Documentation sur l’Ã©cran Outils > RÃ©seau (en)" +||||||| .r11156 +#: wp-admin/network/site-users.php:218 +msgid "Select a user to change role." +msgstr "SÃ©lectionnez un utilisateur dont vous voulez changer le rÃ´le." +======= #: wp-admin/network.php:215 msgid "If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up." msgstr "Si le module mod_rewrite est dÃ©sactivÃ©, contactez votre administrateur pour l’activer, ou lisez la documentation Apache officielle ou non, pour comprendre comment le mettre en place." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:129 wp-admin/network.php:140 +msgid "Documentation on Creating a Network" +msgstr "Documentation sur la crÃ©ation d’un rÃ©seau de sites" +||||||| .r11156 +#: wp-admin/network/site-users.php:224 +msgid "Select a user to remove." +msgstr "SÃ©lectionnez un utilisateur Ã enlever." +======= #: wp-admin/network.php:213 msgid "It looks like the Apache mod_rewrite module is not installed." msgstr "Il semble que le module Apache mod_rewrite n’est pas installÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network.php:443 +msgid "These unique authentication keys are also missing from your wp-config.php file." +msgstr "Ces clÃ©s d’authentification uniques manquent Ã©galement Ã votre fichier wp-config.php." +||||||| .r11156 +#: wp-admin/network/site-users.php:227 +msgid "User created." +msgstr "L’utilisateur a Ã©tÃ© crÃ©Ã©." +======= #: wp-admin/network.php:213 wp-admin/network.php:246 wp-admin/network.php:272 #: wp-admin/network.php:282 msgid "Warning!" msgstr "Attention !" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: a filename like .htaccess. 2: a file path. +#: wp-admin/network.php:509 wp-admin/network.php:546 +msgid "Add the following to your %1$s file in %2$s, replacing other WordPress rules:" +msgstr "Ajoutez ce qui suit Ã votre fichier %1$s dans le dossier %2$s, en remplacement des rÃ¨gles WordPress dÃ©jÃ en place :" +||||||| .r11156 +#: wp-admin/network/users.php:41 +msgid "Warning! User cannot be deleted. The user %s is a network administrator." +msgstr "Attention ! L’utilisateur %s ne peut Ãªtre effacÃ© car c’est un administrateur du rÃ©seau." +======= #: wp-admin/network.php:211 msgid "Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation." msgstr "VÃ©rifiez bien que le module Apache mod_rewrite est installÃ©, car il sera nÃ©cessaire Ã la fin de cette installation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:103 +msgid "[%s] New Site Created" +msgstr "[%s] Nouveau site crÃ©Ã©" +||||||| .r11156 +#: wp-admin/network/users.php:66 +msgid "Site: %s" +msgstr "Site : %s" +======= #: wp-admin/network.php:199 msgid "Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step." msgstr "ComplÃ©tez le formulaire ci-dessous et vous serez prÃªt Ã crÃ©er un rÃ©seau de sites WordPress. Nous crÃ©erons les fichiers de configurations Ã l’Ã©tape suivante." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:105 +msgid "Confirm" +msgstr "Confirmer" +||||||| .r11156 +#: wp-admin/network/site-users.php:278 wp-admin/network/user-new.php:102 +msgid "Add User" +msgstr "Ajouter un utilisateur" +======= #: wp-admin/network.php:198 msgid "Welcome to the Network installation process!" msgstr "Bienvenue dans le processus d’installation du rÃ©seau !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/user-new.php:40 +msgid "Cannot create an empty user." +msgstr "Impossible de crÃ©er un utilisateur vide." +||||||| .r11156 +#: wp-admin/network/user-new.php:51 +msgid "Cannot add user." +msgstr "Impossible d’ajouter l’utilisateur." +======= #: wp-admin/network.php:195 msgctxt "Default network name" msgid "%s Sites" msgstr "RÃ©seau %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:147 +msgid "Allow new registrations" +msgstr "Autoriser les nouvelles inscriptions" +||||||| .r11156 +#: wp-admin/network/sites.php:118 +msgid "You are not allowed to delete the site." +msgstr "Vous n’avez pas l’autorisation d’effacer ce site." +======= #: wp-admin/network.php:188 msgid "ERROR: The network could not be created." msgstr "ERREUR : le rÃ©seau n’a pas pu Ãªtre crÃ©Ã©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:254 +msgid "First Page" +msgstr "PremiÃ¨re page" +||||||| .r11156 +#: wp-admin/network/site-users.php:209 +msgid "User is already a member of this site." +msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +======= #: wp-admin/network.php:176 msgid "Return to Dashboard" msgstr "Revenir au tableau de bord" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:264 +msgid "First Comment" +msgstr "Premier commentaire" +||||||| .r11156 +#: wp-admin/network/site-info.php:85 +msgid "Site info updated." +msgstr "Les infos du site ont Ã©tÃ© mises Ã jour." +======= #: wp-admin/network.php:175 msgid "You cannot use port numbers such as %s." msgstr "Vous ne pouvez pas utiliser de numÃ©ros de port tels que %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:274 +msgid "First Comment Author" +msgstr "Auteur du premier commentaire" +||||||| .r11156 +#: wp-admin/network/users.php:38 +msgid "Warning! User %s cannot be deleted." +msgstr "Attention ! L’utilisateur %s n’a pas pu Ãªtre supprimÃ©." +======= #: wp-admin/network.php:174 msgid "You cannot install a network of sites with your server address." msgstr "Vous ne pouvez pas installer de rÃ©seau de sites avec cette adresse serveur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:283 +msgid "First Comment URL" +msgstr "Adresse du premier commentaire" +||||||| .r11156 +#: wp-admin/network/site-users.php:212 +msgid "Enter the username of an existing user." +msgstr "Saisir l’identifiant d’un utilisateur existant." +======= #: wp-admin/network.php:165 msgid "Once the network is created, you may reactivate your plugins." msgstr "Une fois le rÃ©seau crÃ©Ã©, vous pourrez rÃ©activer vos extensions." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:295 +msgid "Site upload space" +msgstr "Espace de stockage du site" +||||||| .r11156 +#: wp-admin/network/themes.php:240 +msgid "You cannot delete a theme while it is active on the main site." +msgstr "Vous ne pouvez pas effacer un thÃ¨me s’il est activÃ© sur le site principal." +======= #: wp-admin/network.php:165 msgid "Please deactivate your plugins before enabling the Network feature." msgstr "Veuillez dÃ©sactiver vos extensions avant la mise en place de votre rÃ©seau de sites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:315 +msgid "Max upload file size" +msgstr "Taille maximale des fichiers" +||||||| .r11156 +#: wp-admin/network/site-new.php:106 wp-admin/network/site-new.php:116 +msgid "Add New Site" +msgstr "Ajouter un nouveau site" +======= #: wp-admin/network.php:165 wp-admin/network.php:367 wp-admin/network.php:499 #: wp-admin/network.php:536 msgid "Warning:" msgstr "Attention :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:333 +msgid "Default Language" +msgstr "Langue par dÃ©faut" +||||||| .r11156 +#: wp-admin/network/themes.php:236 +msgctxt "network" +msgid "Theme deleted." +msgid_plural "%s themes deleted." +msgstr[0] "ThÃ¨me supprimÃ©." +msgstr[1] "%s thÃ¨mes supprimÃ©s." +======= #: wp-admin/network.php:157 msgid "The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network." msgstr "La constante DO_NOT_UPGRADE_GLOBAL_TABLES ne doit pas Ãªtre dÃ©finie lors de la crÃ©ation du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:166 +msgid "Add Site" +msgstr "Ajouter un site" +||||||| .r11156 +#: wp-admin/network/themes.php:208 +msgid "Documentation on Network Themes" +msgstr "Documentation sur les thÃ¨mes du rÃ©seau" +======= #: wp-admin/network.php:128 msgid "Network" msgstr "RÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:143 +msgid "Site Address" +msgstr "Adresse du site" +||||||| .r11156 +#: wp-admin/network/site-info.php:104 wp-admin/network/site-settings.php:94 +#: wp-admin/network/site-themes.php:146 wp-admin/network/site-users.php:191 +msgid "Info" +msgstr "Infos" +======= #: wp-admin/network.php:124 wp-admin/network.php:135 msgid "Documentation on the Network Screen" msgstr "Documentation sur l’Ã©cran Outils > RÃ©seau (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:55 +msgid "Missing or invalid site address." +msgstr "Adresse de site manquante ou non valide." +||||||| .r11156 +#: wp-admin/network/themes.php:142 +msgid "Are you sure you wish to delete these themes?" +msgstr "Ãtes-vous certain(e) de vouloir supprimer ces thÃ¨mes ?" +======= #: wp-admin/network.php:123 wp-admin/network.php:134 msgid "Documentation on Creating a Network" msgstr "Documentation sur la crÃ©ation d’un rÃ©seau de sites" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:144 +msgid "Registration Settings" +msgstr "RÃ©glages d’inscription" +||||||| .r11156 +#: wp-admin/network/themes.php:151 +msgid "Yes, Delete this theme" +msgid_plural "Yes, Delete these themes" +msgstr[0] "Oui, supprimer ce thÃ¨me" +msgstr[1] "Oui, supprimer ces thÃ¨mes" +======= #: wp-admin/network.php:121 msgid "The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version." msgstr "Le choix d’avoir des sites en mode sous-rÃ©pertoire est dÃ©sactivÃ© si le rÃ©seau a Ã©tÃ© installÃ© il y a un mois ou plus, afin de pallier les problÃ¨mes de permaliens avec l’ajout de « /blog/ » sur les adresses du site principal. Cette limitation sera corrigÃ©e dans une prochaine version." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:156 +msgid "Registration is disabled." +msgstr "Les inscriptions ne sont pas autorisÃ©es pour le moment." +||||||| .r11156 +#: wp-admin/network/themes.php:137 +msgid "You are about to remove the following theme:" +msgid_plural "You are about to remove the following themes:" +msgstr[0] "Vous Ãªtes sur le point de supprimer le thÃ¨me suivant :" +msgstr[1] "Vous Ãªtes sur le point de supprimer les thÃ¨mes suivants :" +======= #: wp-admin/network.php:120 msgid "Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar." msgstr "Une fois que vous aurez ajoutÃ© ce code et rafraÃ®chi la page dans votre navigateur, le mode multisite devrait Ãªtre activÃ©. Cet Ã©cran, dÃ©sormais placÃ© dans le menu de navigation Admin du RÃ©seau, conservera une archive du code ajoutÃ©. Vous pouvez basculer de l’administration du rÃ©seau Ã l’administration du site en cliquant sur « Admin du rÃ©seau », ou en cliquant sur le nom d’un site individuel dans le menu dÃ©roulant « Mes Sites » de la barre d’outils." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:157 +msgid "User accounts may be registered." +msgstr "Seuls les comptes utilisateurs peuvent Ãªtre crÃ©Ã©s." +||||||| .r11156 +#: wp-admin/network/themes.php:136 +msgid "This theme may be active on other sites in the network." +msgid_plural "These themes may be active on other sites in the network." +msgstr[0] "Ce thÃ¨me est peut-Ãªtre activÃ© sur d’autres sites du rÃ©seau" +msgstr[1] "Ces thÃ¨mes sont peut-Ãªtre activÃ©s sur d’autres sites du rÃ©seau" +======= #: wp-admin/network.php:119 msgid "Add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules)." msgstr "Ajoutez les lignes de code dÃ©signÃ©es dans le fichier wp-config.php (juste avant /*...stop editing...*/) et le fichier .htaccess (en remplaÃ§ant les rÃ¨gles existantes de WordPress)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:159 +msgid "Both sites and user accounts can be registered." +msgstr "La crÃ©ation de sites et d’utilisateurs est autorisÃ©e." +||||||| .r11156 +#: wp-admin/network/themes.php:134 +msgid "Delete Theme" +msgid_plural "Delete Themes" +msgstr[0] "Supprimer le thÃ¨me" +msgstr[1] "Supprimer les thÃ¨mes" +======= #: wp-admin/network.php:118 msgid "The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files." msgstr "L’Ã©cran suivant vous prÃ©sentera un ensemble de lignes de code gÃ©nÃ©rÃ©es Ã partir de votre configuration, qu’il vous faudra ajouter Ã vos fichiers wp-config.php et .htaccess. Veillez bien Ã ce que votre client FTP soit configurÃ© pour afficher les fichiers commenÃ§ant par un point, afin que vous puissiez trouver le fichier .htaccess. Il est possible que vous ayez Ã crÃ©er ce fichier s’il n’est pas dÃ©jÃ prÃ©sent. Avant toute modification de wp-config.php et .htaccess, faites-en une copie de sauvegarde." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:168 +msgid "Registration notification" +msgstr "Notification d’inscription" +||||||| .r11156 +#: wp-admin/network/menu.php:46 wp-admin/network/settings.php:19 +msgid "Network Settings" +msgstr "RÃ©glages du rÃ©seau" +======= #: wp-admin/network.php:117 msgid "Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories)." msgstr "Faites le choix entre sous-domaines ou sous-dossiers. Une fois l’installation configurÃ©e, vous ne pourrez pas revenir en arriÃ¨re sans recommencer Ã zÃ©ro. Saisissez tous les dÃ©tails, et cliquez sur « Installer ». Si cela ne marche pas, vous devrez sans doute ajouter une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans vos enregistrements DNS, ou passer Ã un rÃ©glage diffÃ©rent pour vos permaliens (si en mode sous-dossiers)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:360 +msgid "Enable administration menus" +msgstr "Activer les menus d’administration" +||||||| .r11156 +#: wp-admin/network/site-themes.php:168 +msgid "Network enabled themes are not shown on this screen." +msgstr "Les thÃ¨mes activÃ©s pour le rÃ©seau ne sont pas visibles sur cet Ã©cran." +======= #: wp-admin/network.php:116 msgid "This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it." msgstr "Cet Ã©cran vous permet de configurer un rÃ©seau, sous la forme sous-domaines (site1.example.com) ou sous-dossiers (example.com/site1). La forme sous-domaines nÃ©cessite une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans les enregistrements DNS et la configuration Apache, si votre hÃ©bergeur le permet." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:60 +msgid "All done!" +msgstr "TerminÃ© !" +||||||| .r11156 +#: wp-admin/network/themes.php:17 +msgid "You do not have sufficient permissions to manage network themes." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes du rÃ©seau." +======= #: wp-admin/network.php:112 msgid "Create a Network of WordPress Sites" msgstr "CrÃ©er un rÃ©seau de sites WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:37 +msgid "Can’t create an empty site." +msgstr "Impossible de crÃ©er un site vide." +||||||| .r11156 +#: wp-admin/network/menu.php:58 +msgid "Available Updates" +msgstr "Mises Ã jour disponibles" +======= #: wp-admin/network.php:106 msgid "You must define the WP_ALLOW_MULTISITE constant as true in your wp-config.php file to allow creation of a Network." msgstr "Afin d’autoriser la crÃ©ation d’un rÃ©seau, vous devez dÃ©finir la constante WP_ALLOW_MULTISITE comme « true » dans votre fichier wp-config.php." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:58 +msgid "Missing email address." +msgstr "Adresse de messagerie manquante." +||||||| .r11156 +#: wp-admin/network/user-new.php:23 +msgid "Add User will set up a new user account on the network and send that person an email with username and password." +msgstr "« Ajouter un utilisateur » crÃ©era un nouveau compte utilisateur sur le rÃ©seau, et enverra un message contenant son identifiant et son mot de passe au destinataire." +======= #: wp-admin/network.php:27 msgid "The Network creation panel is not for WordPress MU networks." msgstr "Le panneau de crÃ©ation de rÃ©seau n’est pas conÃ§u pour les rÃ©seaux WordPress MU." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:63 +msgid "Invalid email address." +msgstr "Adresse de messagerie invalide." +||||||| .r11156 +#: wp-admin/network/site-info.php:89 wp-admin/network/site-settings.php:79 +#: wp-admin/network/site-themes.php:133 wp-admin/network/site-users.php:161 +msgid "Edit Site: %2$s" +msgstr "Modifier le site : %2$s." +======= #: wp-admin/network/users.php:296 msgid "Users deleted." msgstr "Utilisateurs supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:80 +msgid "There was an error creating the user." +msgstr "Une erreur s’est produite lors de la crÃ©ation d’un utilisateur." +||||||| .r11156 +#: wp-admin/network/themes.php:100 +msgid "You do not have sufficient permissions to delete themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour effacer les thÃ¨mes de ce site." +======= #: wp-admin/network/users.php:293 msgid "Users removed from spam." msgstr "Utilisateurs marquÃ©s comme sains." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:89 wp-admin/network/sites.php:155 +msgid "You are not allowed to change the current site." +msgstr "Vous n’Ãªtes pas autorisÃ© Ã modifier le site actuel." +||||||| .r11156 +#: wp-admin/network/site-themes.php:163 wp-admin/network/themes.php:233 +msgid "Theme disabled." +msgid_plural "%s themes disabled." +msgstr[0] "ThÃ¨me dÃ©sactivÃ©." +msgstr[1] "%s thÃ¨mes dÃ©sactivÃ©s." +======= #: wp-admin/network/users.php:290 msgid "Users marked as spam." msgstr "Utilisateurs marquÃ©s comme indÃ©sirables." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:234 +msgid "Duplicated username or email address." +msgstr "Identifiant ou adresse de messagerie dÃ©jÃ utilisÃ©(e)." +||||||| .r11156 +#: wp-admin/network/site-info.php:39 wp-admin/network/site-settings.php:39 +#: wp-admin/network/site-themes.php:54 wp-admin/network/site-users.php:49 +msgid "Invalid site ID." +msgstr "Identifiant du site invalide." +======= #: wp-admin/network/users.php:270 msgid "You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege." msgstr "Vous pouvez promouvoir un utilisateur existant en super-admin en allant sur leur page de profil, et en cochant la case correspondante." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:53 +msgid "Operational settings has fields for the network’s name and admin email." +msgstr "Les rÃ©glages de fonctionnement permettent de modifier le nom du rÃ©seau, et l’adresse de messagerie de l’administrateur." +||||||| .r11156 +#: wp-admin/network/site-themes.php:160 wp-admin/network/themes.php:230 +msgid "Theme enabled." +msgid_plural "%s themes enabled." +msgstr[0] "ThÃ¨me activÃ©." +msgstr[1] "%s thÃ¨mes activÃ©s." +======= #: wp-admin/network/users.php:269 msgid "The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses." msgstr "Le menu « Actions groupÃ©es » permet d’effacer dÃ©finitivement plusieurs utilisateurs d’un coup, ou de les marquer comme sains ou indÃ©sirables. Les utilisateurs indÃ©sirables verront leurs articles supprimÃ©s, et ne pourront plus se connecter avec leur adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:55 +msgid "New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL." +msgstr "Les rÃ©glages des nouveaux sites sont les rÃ©glages par dÃ©faut appliquÃ©s Ã tout nouveau site crÃ©Ã© sur le rÃ©seau. Cela comprend le message d’accueil quand un nouvel utilisateur ou un nouveau site est enregistrÃ©, ainsi que le contenu du premier article, de la premiÃ¨re page et du premier commentaire (dont le nom et l’adresse web du commentateur)." +||||||| .r11156 +#: wp-admin/network/site-themes.php:165 wp-admin/network/themes.php:238 +msgid "No theme selected." +msgstr "Aucun thÃ¨me sÃ©lectionnÃ©." +======= #: wp-admin/network/users.php:268 msgid "You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right." msgstr "Un clic sur le titre d’une colonne permet de changer le tri du tableau. Les icÃ´nes en haut Ã droit permettent d’afficher des extraits ou non." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:56 +msgid "Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only)." +msgstr "Les rÃ©glages dâenvoi des fichiers permettent de limiter la taille des fichiers mis en ligne et l’espace disponible pour chaque site. Vous pouvez prÃ©ciser la valeur pour chaque site individuellement. Vous pouvez Ã©galement prÃ©ciser les types de fichiers acceptÃ©s (sÃ©parÃ©s par des espaces)." +||||||| .r11156 +#: wp-admin/network/site-info.php:26 wp-admin/network/site-settings.php:26 +#: wp-admin/network/site-themes.php:26 wp-admin/network/site-users.php:29 +msgid "Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen." +msgstr "ThÃ¨mes - Cette zone affiche les thÃ¨mes qui n’ont pas dÃ©jÃ Ã©tÃ© activÃ©s pour l’ensemble du rÃ©seau. En activant un thÃ¨me avec ce menu, vous le rendez disponible pour ce site. Cela ne l’active pas, mais l’affichera dans le menu Apparence du site. Pour activer un thÃ¨me pour l’ensemble du rÃ©seau, rendez-vous sur l’Ã©cran ThÃ¨mes du rÃ©seau." +======= #: wp-admin/network/users.php:267 msgid "You can also go to the user’s profile page by clicking on the individual username." msgstr "Vous pouvez Ã©galement aller sur la page de profil d’un utilisateur en cliquant sur son identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:125 +msgid "Operational Settings" +msgstr "RÃ©glages de fonctionnement" +||||||| .r11156 +#: wp-admin/network/site-info.php:90 wp-admin/network/site-settings.php:80 +#: wp-admin/network/site-themes.php:134 wp-admin/network/site-users.php:162 +msgid "Edit Site: %s" +msgstr "Modifier le site : %s" +======= #: wp-admin/network/users.php:266 msgid "Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site." msgstr "Survolez n’importe quel des utilisateurs de la liste pour faire apparaÃ®tre les liens de modification. Le lien Modifier Ã gauche ouvrira la page de modification du profil de l'utilisateur ; le lien Modifier Ã droite de n'importe quel nom de site ouvrira l'Ã©cran de modification de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:135 wp-admin/network.php:321 +msgid "Network Admin Email" +msgstr "Adresse de contact de l’administrateur du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/themes.php:154 +msgid "No, Return me to the theme list" +msgstr "Non, retourner Ã la liste des thÃ¨mes." +======= #: wp-admin/network/users.php:265 msgid "This table shows all users across the network and the sites to which they are assigned." msgstr "Ce tableau affiche tous les utilisateurs appartenant au rÃ©seau, et les sites auxquels ils sont assignÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:158 +msgid "Logged in users may register new sites." +msgstr "Seuls les utilisateurs connectÃ©s peuvent crÃ©er de nouveaux sites." +||||||| .r11156 +#: wp-admin/network/site-info.php:27 wp-admin/network/site-settings.php:27 +#: wp-admin/network/site-themes.php:27 wp-admin/network/site-users.php:30 +msgid "Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database." +msgstr "RÃ©glages - Cette page affiche la liste de tous les rÃ©glages associÃ©s Ã ce site. Certains sont crÃ©Ã©s par WordPress, d’autres par des extensions que vous activez. Notez que certains champs sont grisÃ©s et indiquent donnÃ©es sÃ©rialisÃ©es (Serialized Data). Vous ne pouvez pas modifier ces valeurs, du fait de la maniÃ¨re dont ils sont stockÃ©s dans la base de donnÃ©es." +======= #: wp-admin/network/users.php:177 msgid "Warning! User cannot be modified. The user %s is a network administrator." msgstr "Attention ! L’utilisateur %s ne peut Ãªtre modifiÃ© car c’est un administrateur du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:161 +msgid "If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a URL you will redirect visitors to if they visit a non-existent site." +msgstr "Si l’enregistrement est dÃ©sactivÃ©, veuillez configurer l’entrÃ©e NOBLOGREDIRECT dans le fichier wp-config.php pour qu’il pointe sur l’adresse internet vers laquelle vous souhaitez que vos visiteurs soient redirigÃ©s s’ils demandent un site qui n’existe pas. " +||||||| .r11156 +#: wp-admin/network/site-themes.php:130 wp-admin/network/themes.php:195 +msgctxt "themes per page (screen options)" +msgid "Themes" +msgstr "ThÃ¨mes" +======= #: wp-admin/network/users.php:113 msgid "Once you hit “Confirm Deletion”, these users will be permanently removed." msgstr "Une fois que vous aurez cliquÃ© sur « Confirmer la suppression », l’utilisateur sera dÃ©finitivement supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:174 +msgid "Send the network admin an email notification every time someone registers a site or user account." +msgstr "Envoyer un message Ã l’administrateur du rÃ©seau Ã chaque inscription de site ou d’utilisateurs." +||||||| .r11156 +#: wp-admin/network/site-info.php:24 wp-admin/network/site-settings.php:24 +#: wp-admin/network/site-themes.php:24 wp-admin/network/site-users.php:27 +msgid "Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable." +msgstr "Infos - Il n’est pas recommandÃ© de modifier le domaine ou le chemin d’accÃ¨s, car cela pourrait rendre le site non fonctionnel. Les dates de crÃ©ation et de derniÃ¨re mise Ã jour sont affichÃ©es. Les administrateurs rÃ©seau peuvent indiquer qu’un site est archivÃ©, indÃ©sirable, pour adulte et effacÃ©, afin de le retirer de la liste publique ou le dÃ©sactiver." +======= #: wp-admin/network/users.php:111 msgid "Once you hit “Confirm Deletion”, the user will be permanently removed." msgstr "Une fois que vous aurez cliquÃ© sur « Confirmer la suppression », l’utilisateur serait dÃ©finitivement supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:196 +msgid "Limited Email Registrations" +msgstr "Enregistrement rÃ©servÃ© aux noms de domaines" +||||||| .r11156 +#: wp-admin/network/site-info.php:25 wp-admin/network/site-settings.php:25 +#: wp-admin/network/site-themes.php:25 wp-admin/network/site-users.php:28 +msgid "Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network." +msgstr "Utilisateurs - Affiche les utilisateurs associÃ©s Ã ce site. Vous pouvez Ã©galement modifier leur rÃ´le, rÃ©initialiser leur mot de passe ou les enlever du site. Enlever un utilisateur d’un site ne l’enlÃ¨ve pas du rÃ©seau." +======= #: wp-admin/network/users.php:97 msgid "User has no sites or content and will be deleted." msgstr "L'utilisateur n'a aucun site ni contenu, et sera supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:220 +msgid "New Site Settings" +msgstr "RÃ©glages des nouveaux sites" +||||||| .r11156 +#: wp-admin/network/site-info.php:23 wp-admin/network/site-settings.php:23 +#: wp-admin/network/site-themes.php:23 wp-admin/network/site-users.php:26 +msgid "The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable." +msgstr "Ce menu sert Ã modifier les informations relatives Ã un site individuel, en particulier si sa zone d’administration est indisponible." +======= #: wp-admin/network/users.php:85 msgid "Site: %s" msgstr "Site : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:224 +msgid "Welcome Email" +msgstr "Message de bienvenue" +||||||| .r11156 +#: wp-admin/network/sites.php:35 +msgid "Dashboard leads to the Dashboard for that site." +msgstr "« Tableau de bord » mÃ¨ne au tableau de bord pour ce site." +======= #: wp-admin/network/users.php:70 msgid "Select a user" msgstr "SÃ©lectionner un utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:229 +msgid "The welcome email sent to new site owners." +msgstr "Ce message de bienvenue sera envoyÃ© aux propriÃ©taires de nouveaux sites." +||||||| .r11156 +#: wp-admin/network/settings.php:145 +msgid "Allow site administrators to add new users to their site via the \"Users → Add New\" page." +msgstr "Autoriser les administrateurs de sites Ã ajouter de nouveaux utilisateurs Ã leurs sites via la page « Utilisateurs → Ajouter »." +======= #. translators: user login #: wp-admin/network/users.php:62 msgid "What should be done with content owned by %s?" msgstr "Que faire du contenu dont %s est le propriÃ©taire ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:234 +msgid "Welcome User Email" +msgstr "Message de bienvenue des utilisateurs" +||||||| .r11156 +#: wp-admin/network/settings.php:280 +msgid "Language Settings" +msgstr "RÃ©glages de langue" +======= #: wp-admin/network/users.php:49 msgid "Warning! User cannot be deleted. The user %s is a network administrator." msgstr "Attention ! L’utilisateur %s ne peut Ãªtre effacÃ© car c’est un administrateur du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:239 +msgid "The welcome email sent to new users." +msgstr "Ce message de bienvenue sera envoyÃ© aux nouveaux utilisateurs." +||||||| .r11156 +#: wp-admin/network/site-settings.php:75 +msgid "Site options updated." +msgstr "Les rÃ©glages du site ont Ã©tÃ© mis Ã jour." +======= #: wp-admin/network/users.php:45 msgid "Warning! User %s cannot be deleted." msgstr "Attention ! L’utilisateur %s n’a pas pu Ãªtre supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:249 +msgid "The first post on a new site." +msgstr "Le premier article sur tout nouveau site." +||||||| .r11156 +#: wp-admin/network/menu.php:31 +msgid "Installed Themes" +msgstr "ThÃ¨mes installÃ©s" +======= #: wp-admin/network/users.php:30 msgid "You have chosen to delete the following users from all networks and sites." msgstr "Vous avez choisi de supprimer les utilisateurs suivants de tous les rÃ©seaux et sites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:259 +msgid "The first page on a new site." +msgstr "La premiÃ¨re page sur tout nouveau site." +||||||| .r11156 +#: wp-admin/network/menu.php:27 +msgid "Themes %s" +msgstr "ThÃ¨mes %s" +======= #: wp-admin/network/users.php:28 msgid "You have chosen to delete the user from all networks and sites." msgstr "Vous avez choisi de supprimer cet utilisateur sur les rÃ©seaux et sites." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:269 +msgid "The first comment on a new site." +msgstr "Le premier commentaire sur tout nouveau site." +||||||| .r11156 +#: wp-admin/network/site-info.php:32 wp-admin/network/site-new.php:29 +#: wp-admin/network/site-settings.php:32 wp-admin/network/site-themes.php:32 +#: wp-admin/network/site-users.php:35 wp-admin/network/sites.php:45 +msgid "Documentation on Site Management" +msgstr "Documentation sur la gestion de site (en)" +======= #: wp-admin/network/user-new.php:52 msgid "Cannot add user." msgstr "Impossible d’ajouter l’utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:278 +msgid "The author of the first comment on a new site." +msgstr "L’auteur du premier commentaire sur tout nouveau site." +||||||| .r11156 +#: wp-admin/network/menu.php:18 wp-admin/network/sites.php:254 +msgctxt "site" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/network/user-new.php:40 msgid "Cannot create an empty user." msgstr "Impossible de crÃ©er un utilisateur vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:287 +msgid "The URL for the first comment on a new site." +msgstr "L’adresse web du premier commentaire sur tout nouveau site." +||||||| .r11156 +#: wp-admin/network/menu.php:17 +msgid "All Sites" +msgstr "Tous les sites" +======= #: wp-admin/network/user-new.php:29 wp-admin/network/users.php:275 msgid "Documentation on Network Users" msgstr "Documentation sur les utilisateurs du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:292 +msgid "Upload Settings" +msgstr "RÃ©glages d’envoi des fichiers" +||||||| .r11156 +#: wp-admin/network/index.php:53 +msgid "Documentation on the Network Admin" +msgstr "Documentation sur l’administration du rÃ©seau (en)" +======= #: wp-admin/network/user-new.php:24 msgid "Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them." msgstr "Les utilisateurs qui se sont inscrits sur le rÃ©seau sans crÃ©er de site deviennent abonnÃ©s du site d’accueil. Celui-ci leur permet d’accÃ©der Ã leur compte. Ces utilisateurs ne voient dans la navigation principale que les options « Tableau de bord » et « Mes sites », jusqu’Ã ce qu’un site leur soit crÃ©Ã©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:297 +msgid "Limit total size of files uploaded to %s MB" +msgstr "La taille totale des fichiers envoyÃ©s est limitÃ©e Ã %s Mo" +||||||| .r11156 +#: wp-admin/network/site-themes.php:17 +msgid "You do not have sufficient permissions to manage themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes de ce site." +======= #: wp-admin/network/user-new.php:23 msgid "Add User will set up a new user account on the network and send that person an email with username and password." msgstr "« Ajouter un utilisateur » crÃ©era un nouveau compte utilisateur sur le rÃ©seau, et enverra un message contenant son identifiant et son mot de passe au destinataire." +>>>>>>> .r12027 -#: wp-admin/network/user-new.php:17 -msgid "You do not have sufficient permissions to add users to this network." -msgstr "Vous n’avez pas les droits suffisants pour ajouter des utilisateurs Ã ce rÃ©seau." +<<<<<<< .mine +#: wp-admin/network/settings.php:305 +msgid "Upload file types" +msgstr "Types de fichiers " + +#: wp-admin/network/settings.php:317 +msgctxt "File size in kilobytes" +msgid "%s KB" +msgstr "%s Ko" +||||||| .r11156 +#: wp-admin/network/site-new.php:103 +msgid "Site added. Visit Dashboard or Edit Site" +msgstr "Site ajoutÃ©. Afficher le tableau de bord | Modifier le site" + +#: wp-admin/network/sites.php:31 +msgid "Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page." +msgstr "Ajouter vous envoie au formulaire en bas de cette page. Vous pouvez chercher un site par le nom, l’identifiant ou l’adresse IP. Les options d’Ã©cran vous permettent de choisir le nombre de sites Ã afficher sur une mÃªme page." + +======= +>>>>>>> .r12027 +#: wp-admin/network/sites.php:32 +msgid "This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table." +msgstr "Voici la liste de tous les sites de ce rÃ©seau. Vous pouvez changer de vue (liste avec ou sans extrait) en utilisant les icÃ´nes prÃ©sentes en haut Ã droite de la liste." + +<<<<<<< .mine +#: wp-admin/network/site-new.php:24 +msgid "If the admin email for the new site does not exist in the database, a new user will also be created." +msgstr "Si l’adresse de contact du nouveau site n’existe pas dans la base de donnÃ©es, un nouvel utilisateur sera crÃ©Ã© pour l’occasion." +||||||| .r11156 +#: wp-admin/network/sites.php:25 +msgctxt "sites per page (screen options)" +msgid "Sites" +msgstr "Sites" +======= #: wp-admin/network/upgrade.php:115 msgid "The database upgrade process may take a little while, so please be patient." msgstr "Le processus de mise Ã jour peut prendre un long moment. Merci pour votre patience." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:219 +msgid "Sites removed from spam." +msgstr "Sites marquÃ©s comme sains." +||||||| .r11156 +#: wp-admin/network/sites.php:206 +msgid "You do not have permission to delete that site." +msgstr "Vous n’avez pas l’autorisation de supprimer ce site." +======= #: wp-admin/network/upgrade.php:112 msgid "WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network." msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour chaque site de votre rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:222 +msgid "Sites marked as spam." +msgstr "Sites marquÃ©s comme indÃ©sirables." +||||||| .r11156 +#: wp-admin/network/site-new.php:17 +msgid "You do not have sufficient permissions to add sites to this network." +msgstr "Vous n’avez pas les droits suffisants pour ajouter des sites Ã ce rÃ©seau." +======= #: wp-admin/network/upgrade.php:111 msgid "Database Upgrade Required" msgstr "Il faut mettre Ã jour la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:225 +msgid "Sites deleted." +msgstr "Sites effacÃ©s." +||||||| .r11156 +#: wp-admin/network/menu.php:32 wp-admin/network/themes.php:222 +msgctxt "theme" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-admin/network/upgrade.php:97 msgid "Next Sites" msgstr "Sites suivants" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:228 +msgid "Site deleted." +msgstr "Site effacÃ©." +||||||| .r11156 +#: wp-admin/network/user-new.php:29 wp-admin/network/users.php:242 +msgid "Documentation on Network Users" +msgstr "Documentation sur les utilisateurs du rÃ©seau" +======= #: wp-admin/network/upgrade.php:97 msgid "If your browser doesn’t start loading the next page automatically, click this link:" msgstr "Si votre navigateur ne lance pas automatiquement la page suivante, cliquez sur ce lien :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:234 +msgid "Site archived." +msgstr "Site archivÃ©." +||||||| .r11156 +#: wp-admin/network/sites.php:40 +msgid "Clicking on bold headings can re-sort this table." +msgstr "Cliquez sur les en-tÃªtes en gras afin de retrier ce tableau." +======= #. translators: 1: site url, 2: server error message #: wp-admin/network/upgrade.php:73 msgid "Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s" msgstr "Attention ! Un problÃ¨me est survenu lors de la mise Ã jour de %1$s. Votre serveur peut ne pas Ãªtre en mesure de se connecter Ã certains sites qui y sont installÃ©s. Message d’erreur : %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:237 +msgid "Site unarchived." +msgstr "Site dÃ©sarchivÃ©." +||||||| .r11156 +#: wp-admin/network/sites.php:37 +msgid "Delete which is a permanent action after the confirmation screens." +msgstr "« Supprimer » est une action irrÃ©versible une fois passÃ© l’Ã©cran de confirmation." +======= #: wp-admin/network/upgrade.php:57 msgid "All done!" msgstr "TerminÃ© !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:240 +msgid "Site activated." +msgstr "Site activÃ©." +||||||| .r11156 +#: wp-admin/network/themes.php:203 +msgid "Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes." +msgstr "Les thÃ¨mes peuvent Ãªtre activÃ©s par l’administrateur du rÃ©seau pour chaque site, individuellement, par le biais de l’Ã©cran de modification d’un site (et de son onglet « ThÃ¨mes »), accessible via le lien « Modifier » de la liste des sites. Seuls les administrateurs du rÃ©seau peuvent installer ou modifier des thÃ¨mes." +======= #: wp-admin/network/upgrade.php:32 msgid "Documentation on Upgrade Network" msgstr "Documentation sur la mise Ã jour du rÃ©seau (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:243 +msgid "Site deactivated." +msgstr "Site dÃ©sactivÃ©." +||||||| .r11156 +#: wp-admin/network/sites.php:34 +msgid "An Edit link to a separate Edit Site screen." +msgstr "Un lien « Modifier » vers un nouvel Ã©cran de modification de site." +======= #: wp-admin/network/upgrade.php:27 msgid "If this process fails for any reason, users logging in to their sites will force the same update." msgstr "Si ce processus Ã©choue pour n’importe quelles raisons, les utilisateurs se connectant Ã leurs sites dÃ©clencheront la mÃªme mise Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:246 +msgid "Site removed from spam." +msgstr "Site marquÃ© comme sain." +||||||| .r11156 +#: wp-admin/network/site-new.php:23 +msgid "This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings." +msgstr "Cet Ã©cran permet aux super-admins d’ajouter de nouveaux sites au rÃ©seau. Il n’est pas limitÃ© par les rÃ©glages d’inscription." +======= #: wp-admin/network/upgrade.php:26 msgid "If a version update to core has not happened, clicking this button won’t affect anything." msgstr "S’il n’y a pas eu de mise Ã jour de l’installation de WordPress rÃ©cemment, cliquer sur ce bouton n’aura aucun effet." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:249 +msgid "Site marked as spam." +msgstr "Site marquÃ© comme indÃ©sirable." +||||||| .r11156 +#: wp-admin/network/menu.php:53 +msgid "Updates" +msgstr "Mises Ã jour" +======= #: wp-admin/network/upgrade.php:25 msgid "Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied." msgstr "N’utilisez cet Ã©cran que quand vous avez mis Ã jour cette installation de WordPress (au moyen de la fonction de mise Ã jour automatique ou la barre d’outils). En cliquant sur « Mettre Ã jour le rÃ©seau », WordPress s’occupera de tous les sites du rÃ©seau, par groupes de cinq, et s’assurera que toutes les mises Ã jour de bases de donnÃ©es sont appliquÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:159 +msgid "Admin Email" +msgstr "Adresse de contact de l’administrateur" +||||||| .r11156 +#: wp-admin/network/settings.php:32 +msgid "Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges." +msgstr "Les super-admins ne peuvent plus Ãªtre ajoutÃ©s via l’Ã©cran des options. Vous devez aller Ã la liste des utilisateurs (option « Utilisateurs » du menu « Admin du rÃ©seau ») et cliquer sur un identifiant ou sur le lien « Modifier » qui s’affiche en dessous. Vous arriverez alors Ã un Ã©cran vous permettant de modifier ce compte utilisateur, oÃ¹ une case Ã cocher donne les droits de super-admin." +======= #: wp-admin/network/themes.php:297 msgid "You cannot delete a theme while it is active on the main site." msgstr "Vous ne pouvez pas effacer un thÃ¨me s’il est activÃ© sur le site principal." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:163 +msgid "A new user will be created if the above email address is not in the database." +msgstr "Un nouvel utilisateur sera crÃ©Ã© si l’adresse de contact n’existe pas dans la base de donnÃ©es." +||||||| .r11156 +#: wp-admin/network.php:230 +msgctxt "subdirectory examples" +msgid "like %1$s/site1 and %1$s/site2" +msgstr "comme %1$s/site1 et %1$s/site2" +======= #: wp-admin/network/themes.php:291 msgid "%s theme deleted." msgid_plural "%s themes deleted." msgstr[0] "%s thÃ¨me supprimÃ©." msgstr[1] "%s thÃ¨mes supprimÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:163 +msgid "The username and password will be mailed to this email address." +msgstr "L’identifiant et le mot de passe seront envoyÃ©s sur l’adresse de contact indiquÃ©e." +||||||| .r11156 +#: wp-admin/network.php:243 wp-admin/network.php:247 wp-admin/network.php:287 +msgid "Server Address" +msgstr "Adresse du serveur" +======= #: wp-admin/network/themes.php:250 msgid "Documentation on Network Themes" msgstr "Documentation sur les thÃ¨mes du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:243 +msgid "This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using." +msgstr "Cet Ã©cran permet d’activer ou dÃ©sactiver la disponibilitÃ© des thÃ¨mes pour tous les sites du rÃ©seau. Il ne permet pas d’activer ou activer le thÃ¨me actuellement utilisÃ© ce site." +||||||| .r11156 +#: wp-admin/network.php:261 +msgid "Because you are using localhost, the sites in your WordPress network must use sub-directories. Consider using localhost.localdomain if you wish to use sub-domains." +msgstr "Vous utilisez localhost, donc les sites de votre rÃ©seau WordPress doivent utiliser des sous-dossiers. Songez Ã utiliser localhost.localdomain si vous prÃ©fÃ©rez utiliser des sous-domaines." +======= #: wp-admin/network/themes.php:245 msgid "Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes." msgstr "Les thÃ¨mes peuvent Ãªtre activÃ©s par l’administrateur du rÃ©seau pour chaque site, individuellement, par le biais de l’Ã©cran de modification d’un site (et de son onglet « ThÃ¨mes »), accessible via le lien « Modifier » de la liste des sites. Seuls les administrateurs du rÃ©seau peuvent installer ou modifier des thÃ¨mes." +>>>>>>> .r12027 #: wp-admin/network/themes.php:244 msgid "If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site’s Appearance > Themes screen." msgstr "Si l’administrateur du rÃ©seau dÃ©sactive un thÃ¨me en cours d’utilisation par un site, ce thÃ¨me restera en place pour ce site. Si le site change de thÃ¨me, le thÃ¨me dÃ©sactivÃ© n’apparaÃ®tra plus dans l’Ã©cran de sÃ©lection des thÃ¨mes de ce site." +<<<<<<< .mine +#: wp-admin/network/upgrade.php:26 +msgid "If a version update to core has not happened, clicking this button won’t affect anything." +msgstr "S’il n’y a pas eu de mise Ã jour de l’installation de WordPress rÃ©cemment, cliquer sur ce bouton n’aura aucun effet." +||||||| .r11156 +#: wp-admin/network.php:271 +msgid "Because your install is in a directory, the sites in your WordPress network must use sub-directories." +msgstr "Votre installation est situÃ©e dans un dossier, donc les sites de votre rÃ©seau WordPress doivent forcÃ©ment utiliser des sous-dossiers." +======= #: wp-admin/network/themes.php:243 msgid "This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using." msgstr "Cet Ã©cran permet d’activer ou dÃ©sactiver la disponibilitÃ© des thÃ¨mes pour tous les sites du rÃ©seau. Il ne permet pas d’activer ou activer le thÃ¨me actuellement utilisÃ© ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:100 +msgid "If your browser doesn’t start loading the next page automatically, click this link:" +msgstr "Si votre navigateur ne lance pas automatiquement la page suivante, cliquez sur ce lien :" +||||||| .r11156 +#: wp-admin/network.php:279 +msgid "Sub-domain Install" +msgstr "Installation sous-domaine" +======= #: wp-admin/network/themes.php:195 msgid "No, Return me to the theme list" msgstr "Non, retourner Ã la liste des thÃ¨mes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:100 +msgid "Next Sites" +msgstr "Sites suivants" +||||||| .r11156 +#: wp-admin/network.php:280 +msgid "Because your install is not new, the sites in your WordPress network must use sub-domains." +msgstr "Votre installation n’est pas rÃ©cente, donc les sites de votre rÃ©seau WordPress doivent utiliser les sous-domaines." +======= #: wp-admin/network/themes.php:187 msgid "Yes, Delete these themes" msgstr "Oui, supprimer ces thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:270 +msgid "This table shows all users across the network and the sites to which they are assigned." +msgstr "Ce tableau affiche tous les utilisateurs appartenant au rÃ©seau, et les sites auxquels ils sont assignÃ©s." +||||||| .r11156 +#: wp-admin/network/settings.php:93 wp-admin/network.php:294 +msgid "Network Title" +msgstr "Nom du rÃ©seau" +======= #: wp-admin/network/themes.php:185 msgid "Yes, Delete this theme" msgstr "Oui, supprimer ce thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:272 +msgid "You can also go to the user’s profile page by clicking on the individual username." +msgstr "Vous pouvez Ã©galement aller sur la page de profil d’un utilisateur en cliquant sur son identifiant." +||||||| .r11156 +#: wp-admin/network.php:298 +msgid "What would you like to call your network?" +msgstr "Quel nom voulez-vous donner Ã votre rÃ©seau ?" +======= #: wp-admin/network/themes.php:172 msgid "Are you sure you wish to delete these themes?" msgstr "Ãtes-vous certain(e) de vouloir supprimer ces thÃ¨mes ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:273 +msgid "You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right." +msgstr "Un clic sur le titre d’une colonne permet de changer le tri du tableau. Les icÃ´nes en haut Ã droit permettent d’afficher des extraits ou non." +||||||| .r11156 +#: wp-admin/network.php:307 +msgid "Your email address." +msgstr "Votre adresse de contact." +======= #: wp-admin/network/themes.php:170 msgid "Are you sure you wish to delete this theme?" msgstr "Ãtes-vous sÃ»r de vouloir supprimer ce thÃ¨me ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:295 +msgid "Users marked as spam." +msgstr "Utilisateurs marquÃ©s comme indÃ©sirables." +||||||| .r11156 +#: wp-admin/network.php:354 +msgid "The original configuration steps are shown here for reference." +msgstr "Pour rappel, voici les Ã©tapes de configuration originelles." +======= #: wp-admin/network/themes.php:159 msgid "You are about to remove the following themes:" msgstr "Vous Ãªtes sur le point d’enlever les thÃ¨mes suivantes :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:298 +msgid "Users removed from spam." +msgstr "Utilisateurs marquÃ©s comme sains." +||||||| .r11156 +#: wp-admin/network.php:359 +msgid "An existing WordPress network was detected." +msgstr "Un rÃ©seau WordPress existant a Ã©tÃ© dÃ©tectÃ©." +======= #: wp-admin/network/themes.php:158 msgid "These themes may be active on other sites in the network." msgstr "Ces thÃ¨mes peuvent Ãªtre actifs sur d’autres site de ce rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:301 +msgid "Users deleted." +msgstr "Utilisateurs supprimÃ©s." +||||||| .r11156 +#: wp-admin/network.php:360 +msgid "Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables." +msgstr "Veuillez effectuer les Ã©tapes de configuration. Pour crÃ©er un nouveau rÃ©seau, vous devrez vider ou effacer les tables de la base de donnÃ©es du rÃ©seau." +======= #: wp-admin/network/themes.php:157 msgid "Delete Themes" msgstr "Supprimer les thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/user-new.php:24 +msgid "Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them." +msgstr "Les utilisateurs qui se sont inscrits sur le rÃ©seau sans crÃ©er de site deviennent abonnÃ©s du site d’accueil. Celui-ci leur permet d’accÃ©der Ã leur compte. Ces utilisateurs ne voient dans la navigation principale que les options « Tableau de bord » et « Mes sites », jusqu’Ã ce qu’un site leur soit crÃ©Ã©." +||||||| .r11156 +#: wp-admin/network.php:371 +msgid "Enabling the Network" +msgstr "Activer le rÃ©seau de sites" +======= #: wp-admin/network/themes.php:154 msgid "This theme may be active on other sites in the network." msgstr "Ce thÃ¨me est peut-Ãªtre activÃ© sur d’autres sites du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:18 wp-admin/network/site-settings.php:17 +#: wp-admin/network/site-users.php:17 +msgid "You do not have sufficient permissions to edit this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier ce site." +||||||| .r11156 +#: wp-admin/network.php:372 +msgid "Complete the following steps to enable the features for creating a network of sites." +msgstr "Suivez les Ã©tapes ci-aprÃ¨s pour activer les fonctionnalitÃ©s permettant la crÃ©ation d’un rÃ©seau de sites." +======= #: wp-admin/network/themes.php:155 msgid "You are about to remove the following theme:" msgstr "Vous Ãªtes sur le point de supprimer le thÃ¨me suivant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:49 +msgid "The following words are reserved for use by WordPress functions and cannot be used as blog names: %s" +msgstr "Les mots suivants sont rÃ©servÃ©s pour l’usage de fonctions WordPress et ne peuvent pas Ãªtre utilisÃ©s comme nom de site : %s" +||||||| .r11156 +#: wp-admin/network.php:375 wp-admin/network.php:377 +msgid "Caution: We recommend you back up your existing wp-config.php and %s files." +msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de vos fichiers wp-config.php et %s actuels." +======= #: wp-admin/network/themes.php:153 msgid "Delete Theme" msgstr "Supprimer le thÃ¨me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:275 +msgid "You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege." +msgstr "Vous pouvez promouvoir un utilisateur existant en super-admin en allant sur leur page de profil, et en cochant la case correspondante." +||||||| .r11156 +#: wp-admin/network.php:379 +msgid "Caution: We recommend you back up your existing wp-config.php file." +msgstr "Attention : nous vous recommandons de faire une copie de sauvegarde de votre fichier wp-config.php actuel." +======= #: wp-admin/network/themes.php:100 msgid "You do not have sufficient permissions to delete themes for this site." msgstr "Vous n’avez pas les droits suffisants pour effacer les thÃ¨mes de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:27 +msgid "If this process fails for any reason, users logging in to their sites will force the same update." +msgstr "Si ce processus Ã©choue pour n’importe quelles raisons, les utilisateurs se connectant Ã leurs sites dÃ©clencheront la mÃªme mise Ã jour." +||||||| .r11156 +#: wp-admin/network.php:385 +msgid "Add the following to your wp-config.php file in %s above the line reading /* That’s all, stop editing! Happy blogging. */:" +msgstr "Ajoutez les lignes suivantes Ã votre fichier wp-config.php, dans %s, au-dessus de la ligne /* C'est tout, ne touchez pas Ã ce qui suit ! Bon blogging ! */ :" +======= #: wp-admin/network/themes.php:17 msgid "You do not have sufficient permissions to manage network themes." msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:38 +msgid "Visit to go to the frontend site live." +msgstr "« Afficher » envoie vers la page d’accueil du site." +||||||| .r11156 +#: wp-admin/network.php:199 +msgid "Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step." +msgstr "ComplÃ©tez le formulaire ci-dessous et vous serez prÃªt Ã crÃ©er un rÃ©seau de sites WordPress. Nous crÃ©erons les fichiers de configurations Ã l’Ã©tape suivante." +======= #: wp-admin/network/sites.php:224 msgid "Site marked as spam." msgstr "Site marquÃ© comme indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:39 +msgid "The site ID is used internally, and is not shown on the front end of the site or to users/viewers." +msgstr "L’identifiant du site est utilisÃ© en interne et nâest pas affichÃ© dans la partie publique du site, ni aux utilisateurs/visiteurs." +||||||| .r11156 +#: wp-admin/network.php:211 +msgid "Please make sure the Apache mod_rewrite module is installed as it will be used at the end of this installation." +msgstr "VÃ©rifiez bien que le module Apache mod_rewrite est installÃ©, car il sera nÃ©cessaire Ã la fin de cette installation." +======= #: wp-admin/network/sites.php:221 msgid "Site removed from spam." msgstr "Site marquÃ© comme sain." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:52 +msgid "This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site’s options." +msgstr "Cet Ã©cran vous donne accÃ¨s aux options rÃ©gissant l’ensemble du rÃ©seau. Le premier site est le site principal du rÃ©seau, et les options du rÃ©seau sont tirÃ©es des options de ce premier site." +||||||| .r11156 +#: wp-admin/network.php:416 +msgid "This unique authentication key is also missing from your wp-config.php file." +msgid_plural "These unique authentication keys are also missing from your wp-config.php file." +msgstr[0] "Cette clÃ© d’authentification unique ne se trouve pas non plus dans votre fichier wp-config.php." +msgstr[1] "Ces clÃ©s d’authentification uniques ne se trouvent pas non plus dans votre fichier wp-config.php." +======= #: wp-admin/network/sites.php:218 msgid "Site deactivated." msgstr "Site dÃ©sactivÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:58 +msgid "Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins." +msgstr "Le rÃ©glage du menu (dÃ©s)active la section « Extensions » du menu pour les utilisateurs normaux, de telle sorte que seuls les super-admins peuvent y accÃ©der pour activer une extension." +||||||| .r11156 +#: wp-admin/network.php:174 +msgid "You cannot install a network of sites with your server address." +msgstr "Vous ne pouvez pas installer de rÃ©seau de sites avec cette adresse serveur." +======= #: wp-admin/network/sites.php:215 msgid "Site activated." msgstr "Site activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:186 +msgid "Banned Names" +msgstr "Noms bannis" +||||||| .r11156 +#: wp-admin/network.php:175 +msgid "You cannot use port numbers such as %s." +msgstr "Vous ne pouvez pas utiliser de numÃ©ros de port tels que %s." +======= #: wp-admin/network/sites.php:212 msgid "Site unarchived." msgstr "Site dÃ©sarchivÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:209 +msgid "Banned Email Domains" +msgstr "Noms de domaines bannis" +||||||| .r11156 +#: wp-admin/network.php:221 +msgid "You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality." +msgstr "Vous aurez besoin d’un enregistrement DNS gÃ©nÃ©rique (wildcard) pour permettre l’utilisation de la forme sous-domaine (hÃ´te virtuel)." +======= #: wp-admin/network/sites.php:209 msgid "Site archived." msgstr "Site archivÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:28 +msgid "All Sites" +msgstr "Tous les sites" +||||||| .r11156 +#: wp-admin/network.php:215 +msgid "If mod_rewrite is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up." +msgstr "Si le module mod_rewrite est dÃ©sactivÃ©, contactez votre administrateur pour l’activer, ou lisez la documentation Apache officielle ou non, pour comprendre comment le mettre en place." +======= #: wp-admin/network/sites.php:206 msgid "You do not have permission to delete that site." msgstr "Vous n’avez pas l’autorisation de supprimer ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:29 wp-admin/network/sites.php:279 +msgctxt "site" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/network.php:195 +msgctxt "Default network name" +msgid "%s Sites" +msgstr "RÃ©seau %s" +======= #: wp-admin/network/sites.php:203 msgid "Site deleted." msgstr "Site effacÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:36 +msgid "Themes %s" +msgstr "ThÃ¨mes %s" +||||||| .r11156 +#: wp-admin/network.php:249 wp-admin/network.php:289 +msgid "The internet address of your network will be %s." +msgstr "L’adresse internet de votre rÃ©seau sera %s." +======= #: wp-admin/network/sites.php:200 msgid "Sites deleted." msgstr "Sites effacÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:40 +msgid "Installed Themes" +msgstr "ThÃ¨mes installÃ©s" +||||||| .r11156 +#: wp-admin/network.php:213 wp-admin/network.php:238 wp-admin/network.php:264 +#: wp-admin/network.php:274 +msgid "Warning!" +msgstr "Attention !" +======= #: wp-admin/network/sites.php:197 msgid "Sites marked as spam." msgstr "Sites marquÃ©s comme indÃ©sirables." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:41 wp-admin/network/themes.php:264 +msgctxt "theme" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-admin/network.php:225 +msgid "Sub-domains" +msgstr "Sous-domaines" +======= #: wp-admin/network/sites.php:194 msgid "Sites removed from spam." msgstr "Sites marquÃ©s comme sains." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:55 wp-admin/network/settings.php:22 +msgid "Network Settings" +msgstr "RÃ©glages du rÃ©seau" +||||||| .r11156 +#: wp-admin/network.php:416 +msgid "To make your installation more secure, you should also add:" +msgstr "Pour mieux sÃ©curiser votre installation, vous devriez Ã©galement ajouter :" +======= #: wp-admin/network/sites.php:118 msgid "You are not allowed to delete the site." msgstr "Vous n’avez pas l’autorisation d’effacer ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:19 +msgid "Updates" +msgstr "Mises Ã jour" +||||||| .r11156 +#: wp-admin/network.php:117 +msgid "Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories)." +msgstr "Faites le choix entre sous-domaines ou sous-dossiers. Une fois l’installation configurÃ©e, vous ne pourrez pas revenir en arriÃ¨re sans recommencer Ã zÃ©ro. Saisissez tous les dÃ©tails, et cliquez sur « Installer ». Si cela ne marche pas, vous devrez sans doute ajouter une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans vos enregistrements DNS, ou passer Ã un rÃ©glage diffÃ©rent pour vos permaliens (si en mode sous-dossiers)." +======= #: wp-admin/network/sites.php:77 msgid "Confirm" msgstr "Confirmer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:54 +msgid "Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network." +msgstr "Les rÃ©glages dâinscription permettent d’ouvrir ou fermer les inscriptions au public. Si vous ouvrez les inscriptions, veillez Ã installer des extensions antispam. Les domaines bannis devraient Ãªtre indiquÃ©s sÃ©parÃ©s d’un espace, non d’une virgule." +||||||| .r11156 +#: wp-admin/network.php:118 +msgid "The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files." +msgstr "L’Ã©cran suivant vous prÃ©sentera un ensemble de lignes de code gÃ©nÃ©rÃ©es Ã partir de votre configuration, qu’il vous faudra ajouter Ã vos fichiers wp-config.php et .htaccess. Veillez bien Ã ce que votre client FTP soit configurÃ© pour afficher les fichiers commenÃ§ant par un point, afin que vous puissiez trouver le fichier .htaccess. Il est possible que vous ayez Ã crÃ©er ce fichier s’il n’est pas dÃ©jÃ prÃ©sent. Avant toute modification de wp-config.php et .htaccess, faites-en une copie de sauvegarde." +======= #: wp-admin/network/sites.php:70 msgid "Confirm your action" msgstr "Confirmez cette action" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:181 +msgid "Allow site administrators to add new users to their site via the \"Users → Add New\" page." +msgstr "Autoriser les administrateurs de sites Ã ajouter de nouveaux utilisateurs Ã leurs sites via la page « Utilisateurs → Ajouter »." +||||||| .r11156 +#: wp-admin/network.php:526 +msgid "Once you complete these steps, your network is enabled and configured. You will have to log in again." +msgstr "Une fois les Ã©tapes effectuÃ©es, votre rÃ©seau sera activÃ© et configurÃ©. Vous devez maintenant vous reconnecter." +======= #: wp-admin/network/sites.php:64 wp-admin/network/sites.php:131 msgid "You are not allowed to change the current site." msgstr "Vous n’Ãªtes pas autorisÃ© Ã modifier le site actuel." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:190 +msgid "Users are not allowed to register these sites. Separate names by spaces." +msgstr "Les utilisateurs ne sont pas autorisÃ©s Ã crÃ©er un site avec l’un de ces noms. SÃ©parez les noms par un espace." +||||||| .r11156 +#: wp-admin/network.php:157 +msgid "The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network." +msgstr "La constante DO_NOT_UPGRADE_GLOBAL_TABLES ne doit pas Ãªtre dÃ©finie lors de la crÃ©ation du rÃ©seau." +======= #: wp-admin/network/sites.php:40 msgid "Clicking on bold headings can re-sort this table." msgstr "Cliquez sur les en-tÃªtes en gras afin de retrier ce tableau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:203 +msgid "If you want to limit site registrations to certain domains. One domain per line." +msgstr "Si vous souhaitez que les seules personnes habilitÃ©es Ã crÃ©er un site soient celles disposant d’une adresse de messagerie liÃ©e Ã certains noms de domaines. Un domaine par ligne." +||||||| .r11156 +#: wp-admin/network.php:255 +msgid "Network Details" +msgstr "DÃ©tails du rÃ©seau" +======= #: wp-admin/network/sites.php:39 msgid "The site ID is used internally, and is not shown on the front end of the site or to users/viewers." msgstr "L’identifiant du site est utilisÃ© en interne et nâest pas affichÃ© dans la partie publique du site, ni aux utilisateurs/visiteurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:25 wp-admin/network/site-settings.php:23 +#: wp-admin/network/site-themes.php:23 wp-admin/network/site-users.php:26 +msgid "The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable." +msgstr "Ce menu sert Ã modifier les informations relatives Ã un site individuel, en particulier si sa zone d’administration est indisponible." +||||||| .r11156 +#: wp-admin/network.php:198 +msgid "Welcome to the Network installation process!" +msgstr "Bienvenue dans le processus d’installation du rÃ©seau !" +======= #: wp-admin/network/sites.php:38 msgid "Visit to go to the frontend site live." msgstr "« Afficher » envoie vers la page d’accueil du site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:27 wp-admin/network/site-settings.php:25 +#: wp-admin/network/site-themes.php:25 wp-admin/network/site-users.php:28 +msgid "Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network." +msgstr "Utilisateurs - Affiche les utilisateurs associÃ©s Ã ce site. Vous pouvez Ã©galement modifier leur rÃ´le, rÃ©initialiser leur mot de passe ou les enlever du site. Enlever un utilisateur d’un site ne l’enlÃ¨ve pas du rÃ©seau." +||||||| .r11156 +#: wp-admin/network.php:213 +msgid "It looks like the Apache mod_rewrite module is not installed." +msgstr "Il semble que le module Apache mod_rewrite n’est pas installÃ©." +======= #: wp-admin/network/sites.php:37 msgid "Delete which is a permanent action after the confirmation screens." msgstr "« Supprimer » est une action irrÃ©versible une fois passÃ© l’Ã©cran de confirmation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:28 wp-admin/network/site-settings.php:26 +#: wp-admin/network/site-themes.php:26 wp-admin/network/site-users.php:29 +msgid "Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen." +msgstr "ThÃ¨mes - Cette zone affiche les thÃ¨mes qui n’ont pas dÃ©jÃ Ã©tÃ© activÃ©s pour l’ensemble du rÃ©seau. En activant un thÃ¨me avec ce menu, vous le rendez disponible pour ce site. Cela ne l’active pas, mais l’affichera dans le menu Apparence du site. Pour activer un thÃ¨me pour l’ensemble du rÃ©seau, rendez-vous sur l’Ã©cran ThÃ¨mes du rÃ©seau." +||||||| .r11156 +#: wp-admin/network.php:123 wp-admin/network.php:134 +msgid "Documentation on Creating a Network" +msgstr "Documentation sur la crÃ©ation d’un rÃ©seau de sites" +======= #: wp-admin/network/sites.php:36 msgid "Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later." msgstr "« DÃ©sactiver », « Archiver » et « IndÃ©sirable » envoient chacun Ã des Ã©crans de confirmation. Ces actions peuvent Ãªtre annulÃ©es par la suite ." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:41 wp-admin/network/site-settings.php:39 +#: wp-admin/network/site-themes.php:54 wp-admin/network/site-users.php:49 +msgid "Invalid site ID." +msgstr "Identifiant du site invalide." +||||||| .r11156 +#: wp-admin/network.php:121 +msgid "The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version." +msgstr "Le choix d’avoir des sites en mode sous-rÃ©pertoire est dÃ©sactivÃ© si le rÃ©seau a Ã©tÃ© installÃ© il y a un mois ou plus, afin de pallier les problÃ¨mes de permaliens avec l’ajout de « /blog/ » sur les adresses du site principal. Cette limitation sera corrigÃ©e dans une prochaine version." +======= #: wp-admin/network/sites.php:35 msgid "Dashboard leads to the Dashboard for that site." msgstr "« Tableau de bord » mÃ¨ne au tableau de bord pour ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:17 +msgid "You do not have sufficient permissions to add sites to this network." +msgstr "Vous n’avez pas les droits suffisants pour ajouter des sites Ã ce rÃ©seau." +||||||| .r11156 +#: wp-admin/network.php:165 +msgid "Once the network is created, you may reactivate your plugins." +msgstr "Une fois le rÃ©seau crÃ©Ã©, vous pourrez rÃ©activer vos extensions." +======= #: wp-admin/network/sites.php:34 msgid "An Edit link to a separate Edit Site screen." msgstr "Un lien « Modifier » vers un nouvel Ã©cran de modification de site." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: dashboard url, 2: network admin edit url +#: wp-admin/network/site-new.php:117 +msgid "Site added. Visit Dashboard or Edit Site" +msgstr "Site ajoutÃ©. Afficher le tableau de bord | Modifier le site" +||||||| .r11156 +#: wp-admin/network.php:165 +msgid "Please deactivate your plugins before enabling the Network feature." +msgstr "Veuillez dÃ©sactiver vos extensions avant la mise en place de votre rÃ©seau de sites." +======= #: wp-admin/network/sites.php:33 msgid "Hovering over each site reveals seven options (three for the primary site):" msgstr "Survoler chaque site avec la souris rÃ©vÃ¨le sept options (trois pour le site principal) :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:123 wp-admin/network/site-new.php:133 +msgid "Add New Site" +msgstr "Ajouter un nouveau site" +||||||| .r11156 +#: wp-admin/network.php:244 +msgid "We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the www prefix with an address like %2$s but any links will not have the www prefix." +msgstr "Nous vous recommandons de modifier votre rÃ©glage « siteurl » pour %1$s avec d’activer la fonctionnalitÃ© de rÃ©seau. Il sera toujours possible de se rendre sur votre site par le biais du prÃ©fixe « www » avec une adresse comme %2$s, mais les liens n’auront pas le prÃ©fixe « www »." +======= #: wp-admin/network/sites.php:32 msgid "This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table." msgstr "Voici la liste de tous les sites de ce rÃ©seau. Vous pouvez changer de vue (liste avec ou sans extrait) en utilisant les icÃ´nes prÃ©sentes en haut Ã droite de la liste." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-settings.php:79 +msgid "Site options updated." +msgstr "Les rÃ©glages du site ont Ã©tÃ© mis Ã jour." +||||||| .r11156 +#: wp-admin/network.php:259 wp-admin/network.php:269 +msgid "Sub-directory Install" +msgstr "Installation dans un sous-dossier" +======= #: wp-admin/network/sites.php:31 msgid "Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page." msgstr "Ajouter vous envoie au formulaire en bas de cette page. Vous pouvez chercher un site par le nom, l’identifiant ou l’adresse IP. Les options d’Ã©cran vous permettent de choisir le nombre de sites Ã afficher sur une mÃªme page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:17 +msgid "You do not have sufficient permissions to manage themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes de ce site." +||||||| .r11156 +#: wp-admin/network.php:116 +msgid "This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it." +msgstr "Cet Ã©cran vous permet de configurer un rÃ©seau, sous la forme sous-domaines (site1.example.com) ou sous-dossiers (example.com/site1). La forme sous-domaines nÃ©cessite une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans les enregistrements DNS et la configuration Apache, si votre hÃ©bergeur le permet." +======= #: wp-admin/network/site-users.php:308 wp-admin/network/user-new.php:99 msgid "Username and password will be mailed to the above email address." msgstr "L’identifiant et le mot de passe seront envoyÃ©s Ã l’adresse de contact prÃ©cisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:164 wp-admin/network/themes.php:273 +msgid "Theme enabled." +msgstr "ThÃ¨me activÃ©." +||||||| .r11156 +#: wp-admin/network.php:112 +msgid "Create a Network of WordPress Sites" +msgstr "CrÃ©er un rÃ©seau de sites WordPress" +======= #: wp-admin/network/site-users.php:276 wp-admin/network/user-new.php:103 msgid "Add User" msgstr "Ajouter un utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:172 wp-admin/network/themes.php:281 +msgid "Theme disabled." +msgstr "ThÃ¨me dÃ©sactivÃ©." +||||||| .r11156 +#: wp-admin/network.php:176 +msgid "Return to Dashboard" +msgstr "Revenir au tableau de bord" +======= #: wp-admin/network/site-users.php:231 msgid "Duplicated username or email address." msgstr "Identifiant ou adresse de messagerie dÃ©jÃ utilisÃ©(e)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:178 wp-admin/network/themes.php:295 +msgid "No theme selected." +msgstr "Aucun thÃ¨me sÃ©lectionnÃ©." +||||||| .r11156 +#: wp-admin/network.php:27 +msgid "The Network creation panel is not for WordPress MU networks." +msgstr "Le panneau de crÃ©ation de rÃ©seau n’est pas conÃ§u pour les rÃ©seaux WordPress MU." +======= #: wp-admin/network/site-users.php:228 msgid "Enter the username and email." msgstr "Saisir l’identifiant et l’adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:181 +msgid "Network enabled themes are not shown on this screen." +msgstr "Les thÃ¨mes activÃ©s pour le rÃ©seau ne sont pas visibles sur cet Ã©cran." +||||||| .r11156 +#: wp-admin/network.php:165 wp-admin/network.php:359 wp-admin/network.php:481 +#: wp-admin/network.php:517 +msgid "Warning:" +msgstr "Attention :" +======= #: wp-admin/network/site-users.php:225 msgid "User created." msgstr "L’utilisateur a Ã©tÃ© crÃ©Ã©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:210 +msgid "User is already a member of this site." +msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +||||||| .r11156 +#: wp-admin/network.php:220 +msgid "Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. You cannot change this later." +msgstr "Veuillez dÃ©cider si vous voulez que les sites de votre installation WordPress utilisent des sous-domaines ou des sous-dossiers. Ce rÃ©glage est dÃ©finitif, vous ne pourrez pas revenir en arriÃ¨re." +======= #: wp-admin/network/site-users.php:222 msgid "Select a user to remove." msgstr "SÃ©lectionnez un utilisateur Ã enlever." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:213 +msgid "Enter the username of an existing user." +msgstr "Saisir l’identifiant d’un utilisateur existant." +||||||| .r11156 +#: wp-admin/network.php:124 wp-admin/network.php:135 +msgid "Documentation on the Network Screen" +msgstr "Documentation sur l’Ã©cran Outils > RÃ©seau (en)" +======= #: wp-admin/network/site-users.php:216 msgid "Select a user to change role." msgstr "SÃ©lectionnez un utilisateur dont vous voulez changer le rÃ´le." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:219 +msgid "Select a user to change role." +msgstr "SÃ©lectionnez un utilisateur dont vous voulez changer le rÃ´le." +||||||| .r11156 +#: wp-admin/network.php:219 +msgid "Addresses of Sites in your Network" +msgstr "Adresse des sites dans votre rÃ©seau" +======= #: wp-admin/network/site-users.php:210 msgid "Enter the username of an existing user." msgstr "Saisir l’identifiant d’un utilisateur existant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:225 +msgid "Select a user to remove." +msgstr "SÃ©lectionnez un utilisateur Ã enlever." +||||||| .r11156 +#: wp-admin/network.php:226 +msgctxt "subdomain examples" +msgid "like site1.%1$s and site2.%1$s" +msgstr "comme site1.%1$s et site2.%1$s" +======= #: wp-admin/network/site-users.php:207 msgid "User is already a member of this site." msgstr "Cet utilisateur est dÃ©jÃ membre de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:228 +msgid "User created." +msgstr "L’utilisateur a Ã©tÃ© crÃ©Ã©." +||||||| .r11156 +#: wp-admin/network.php:128 +msgid "Network" +msgstr "RÃ©seau" +======= #: wp-admin/network/site-themes.php:178 msgid "Network enabled themes are not shown on this screen." msgstr "Les thÃ¨mes activÃ©s pour le rÃ©seau ne sont pas visibles sur cet Ã©cran." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:231 +msgid "Enter the username and email." +msgstr "Saisir l’identifiant et l’adresse de messagerie." +||||||| .r11156 +#: wp-admin/network.php:229 +msgid "Sub-directories" +msgstr "Sous-dossiers" +======= #: wp-admin/network/site-themes.php:175 wp-admin/network/themes.php:295 msgid "No theme selected." msgstr "Aucun thÃ¨me sÃ©lectionnÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-users.php:279 wp-admin/network/user-new.php:103 +msgid "Add User" +msgstr "Ajouter un utilisateur" +||||||| .r11156 +#: wp-admin/network.php:106 +msgid "You must define the WP_ALLOW_MULTISITE constant as true in your wp-config.php file to allow creation of a Network." +msgstr "Afin d’autoriser la crÃ©ation d’un rÃ©seau, vous devez dÃ©finir la constante WP_ALLOW_MULTISITE comme « true » dans votre fichier wp-config.php." +======= #: wp-admin/network/site-themes.php:171 wp-admin/network/themes.php:283 msgid "%s theme disabled." msgid_plural "%s themes disabled." msgstr[0] "%s thÃ¨me dÃ©sactivÃ©." msgstr[1] "%s thÃ¨mes dÃ©sactivÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:31 +msgid "Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page." +msgstr "Ajouter vous envoie au formulaire en bas de cette page. Vous pouvez chercher un site par le nom, l’identifiant ou l’adresse IP. Les options d’Ã©cran vous permettent de choisir le nombre de sites Ã afficher sur une mÃªme page." +||||||| .r11156 +#: wp-admin/network.php:188 +msgid "ERROR: The network could not be created." +msgstr "ERREUR : le rÃ©seau n’a pas pu Ãªtre crÃ©Ã©." +======= #: wp-admin/network/site-themes.php:169 wp-admin/network/themes.php:281 msgid "Theme disabled." msgstr "ThÃ¨me dÃ©sactivÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:33 +msgid "Hovering over each site reveals seven options (three for the primary site):" +msgstr "Survoler chaque site avec la souris rÃ©vÃ¨le sept options (trois pour le site principal) :" +||||||| .r11156 +#: wp-admin/network.php:120 +msgid "Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar." +msgstr "Une fois que vous aurez ajoutÃ© ce code et rafraÃ®chi la page dans votre navigateur, le mode multisite devrait Ãªtre activÃ©. Cet Ã©cran, dÃ©sormais placÃ© dans le menu de navigation Admin du RÃ©seau, conservera une archive du code ajoutÃ©. Vous pouvez basculer de l’administration du rÃ©seau Ã l’administration du site en cliquant sur « Admin du rÃ©seau », ou en cliquant sur le nom d’un site individuel dans le menu dÃ©roulant « Mes Sites » de la barre d’outils." +======= #: wp-admin/network/site-themes.php:163 wp-admin/network/themes.php:275 msgid "%s theme enabled." msgid_plural "%s themes enabled." msgstr[0] "%s thÃ¨me activÃ©." msgstr[1] "%s thÃ¨mes activÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:34 +msgid "An Edit link to a separate Edit Site screen." +msgstr "Un lien « Modifier » vers un nouvel Ã©cran de modification de site." +||||||| .r11156 +#: wp-admin/network/site-info.php:17 wp-admin/network/site-settings.php:17 +#: wp-admin/network/site-users.php:17 +msgid "You do not have sufficient permissions to edit this site." +msgstr "Vous n’avez pas les droits suffisants pour modifier ce site." +======= #: wp-admin/network/site-themes.php:161 wp-admin/network/themes.php:273 msgid "Theme enabled." msgstr "ThÃ¨me activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:35 +msgid "Dashboard leads to the Dashboard for that site." +msgstr "« Tableau de bord » mÃ¨ne au tableau de bord pour ce site." +||||||| .r11156 +#: wp-admin/network/users.php:144 +msgid "Warning! User cannot be modified. The user %s is a network administrator." +msgstr "Attention ! L’utilisateur %s ne peut Ãªtre modifiÃ© car c’est un administrateur du rÃ©seau." +======= #: wp-admin/network/site-themes.php:17 msgid "You do not have sufficient permissions to manage themes for this site." msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes de ce site." +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/network/site-new.php:24 +msgid "If the admin email for the new site does not exist in the database, a new user will also be created." +msgstr "Si l’adresse de contact du nouveau site n’existe pas dans la base de donnÃ©es, un nouvel utilisateur sera crÃ©Ã© pour l’occasion." +======= #: wp-admin/network/site-settings.php:75 msgid "Site options updated." msgstr "Les rÃ©glages du site ont Ã©tÃ© mis Ã jour." +>>>>>>> .r12027 #: wp-admin/network/site-new.php:166 msgid "Add Site" msgstr "Ajouter un site" +<<<<<<< .mine +#: wp-admin/network/sites.php:37 +msgid "Delete which is a permanent action after the confirmation screens." +msgstr "« Supprimer » est une action irrÃ©versible une fois passÃ© l’Ã©cran de confirmation." +||||||| .r11156 +#: wp-admin/network/sites.php:39 +msgid "The site ID is used internally, and is not shown on the front end of the site or to users/viewers." +msgstr "L’identifiant du site est utilisÃ© en interne et nâest pas affichÃ© dans la partie publique du site, ni aux utilisateurs/visiteurs." +======= #: wp-admin/network/site-new.php:163 msgid "The username and password will be mailed to this email address." msgstr "L’identifiant et le mot de passe seront envoyÃ©s sur l’adresse de contact indiquÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:142 +msgid "You are not allowed to delete the site." +msgstr "Vous n’avez pas l’autorisation d’effacer ce site." +||||||| .r11156 +#: wp-admin/network/sites.php:33 +msgid "Hovering over each site reveals seven options (three for the primary site):" +msgstr "Survoler chaque site avec la souris rÃ©vÃ¨le sept options (trois pour le site principal) :" +======= #: wp-admin/network/site-new.php:163 msgid "A new user will be created if the above email address is not in the database." msgstr "Un nouvel utilisateur sera crÃ©Ã© si l’adresse de contact n’existe pas dans la base de donnÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:231 +msgid "You do not have permission to delete that site." +msgstr "Vous n’avez pas l’autorisation de supprimer ce site." +||||||| .r11156 +#: wp-admin/network/settings.php:27 +msgid "Operational settings has fields for the network’s name and admin email." +msgstr "Les rÃ©glages de fonctionnement permettent de modifier le nom du rÃ©seau, et l’adresse de messagerie de l’administrateur." +======= #: wp-admin/network/site-new.php:159 msgid "Admin Email" msgstr "Adresse de contact de l’administrateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:17 +msgid "You do not have sufficient permissions to manage network themes." +msgstr "Vous n’avez pas les droits suffisants pour gÃ©rer les thÃ¨mes du rÃ©seau." +||||||| .r11156 +#: wp-admin/network/users.php:234 +msgid "You can also go to the user’s profile page by clicking on the individual username." +msgstr "Vous pouvez Ã©galement aller sur la page de profil d’un utilisateur en cliquant sur son identifiant." +======= #: wp-admin/network/site-new.php:143 msgid "Site Address" msgstr "Adresse du site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:100 +msgid "You do not have sufficient permissions to delete themes for this site." +msgstr "Vous n’avez pas les droits suffisants pour effacer les thÃ¨mes de ce site." +||||||| .r11156 +#: wp-admin/network/users.php:236 +msgid "The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses." +msgstr "Le menu « Actions groupÃ©es » permet d’effacer dÃ©finitivement plusieurs utilisateurs d’un coup, ou de les marquer comme sains ou indÃ©sirables. Les utilisateurs indÃ©sirables verront leurs articles supprimÃ©s, et ne pourront plus se connecter avec leur adresse de messagerie." +======= #: wp-admin/network/site-new.php:123 wp-admin/network/site-new.php:133 msgid "Add New Site" msgstr "Ajouter un nouveau site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:153 +msgid "Delete Theme" +msgstr "Supprimer le thÃ¨me" +||||||| .r11156 +#: wp-admin/network/settings.php:30 +msgid "Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only)." +msgstr "Les rÃ©glages dâenvoi des fichiers permettent de limiter la taille des fichiers mis en ligne et l’espace disponible pour chaque site. Vous pouvez prÃ©ciser la valeur pour chaque site individuellement. Vous pouvez Ã©galement prÃ©ciser les types de fichiers acceptÃ©s (sÃ©parÃ©s par des espaces)." +======= #. translators: 1: dashboard url, 2: network admin edit url #: wp-admin/network/site-new.php:117 msgid "Site added. Visit Dashboard or Edit Site" msgstr "Site ajoutÃ©. Afficher le tableau de bord | Modifier le site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:154 +msgid "This theme may be active on other sites in the network." +msgstr "Ce thÃ¨me est peut-Ãªtre activÃ© sur d’autres sites du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/sites.php:38 +msgid "Visit to go to the frontend site live." +msgstr "« Afficher » envoie vers la page d’accueil du site." +======= #: wp-admin/network/site-new.php:103 msgid "[%s] New Site Created" msgstr "[%s] Nouveau site crÃ©Ã©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:155 +msgid "You are about to remove the following theme:" +msgstr "Vous Ãªtes sur le point de supprimer le thÃ¨me suivant :" +||||||| .r11156 +#: wp-admin/network/settings.php:29 +msgid "New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL." +msgstr "Les rÃ©glages des nouveaux sites sont les rÃ©glages par dÃ©faut appliquÃ©s Ã tout nouveau site crÃ©Ã© sur le rÃ©seau. Cela comprend le message d’accueil quand un nouvel utilisateur ou un nouveau site est enregistrÃ©, ainsi que le contenu du premier article, de la premiÃ¨re page et du premier commentaire (dont le nom et l’adresse web du commentateur)." +======= #. translators: 1: user login, 2: site url, 3: site name/title #: wp-admin/network/site-new.php:95 msgid "" @@ -703,133 +2500,511 @@ msgstr "" "\n" "Adresse : %2$s\n" "Nom : %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:172 +msgid "Are you sure you wish to delete these themes?" +msgstr "Ãtes-vous certain(e) de vouloir supprimer ces thÃ¨mes ?" +||||||| .r11156 +#: wp-admin/network/themes.php:201 +msgid "This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using." +msgstr "Cet Ã©cran permet d’activer ou dÃ©sactiver la disponibilitÃ© des thÃ¨mes pour tous les sites du rÃ©seau. Il ne permet pas d’activer ou activer le thÃ¨me actuellement utilisÃ© ce site." +======= #: wp-admin/network/site-new.php:80 msgid "There was an error creating the user." msgstr "Une erreur s’est produite lors de la crÃ©ation d’un utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:185 +msgid "Yes, delete this theme" +msgstr "Oui, supprimer ce thÃ¨me" +||||||| .r11156 +#: wp-admin/network/themes.php:202 +msgid "If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site’s Appearance > Themes screen." +msgstr "Si l’administrateur du rÃ©seau dÃ©sactive un thÃ¨me en cours d’utilisation par un site, ce thÃ¨me restera en place pour ce site. Si le site change de thÃ¨me, le thÃ¨me dÃ©sactivÃ© n’apparaÃ®tra plus dans l’Ã©cran de sÃ©lection des thÃ¨mes de ce site." +======= #: wp-admin/network/site-new.php:63 msgid "Invalid email address." msgstr "Adresse de messagerie invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:297 +msgid "You cannot delete a theme while it is active on the main site." +msgstr "Vous ne pouvez pas effacer un thÃ¨me s’il est activÃ© sur le site principal." +||||||| .r11156 +#: wp-admin/network/settings.php:26 +msgid "This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site’s options." +msgstr "Cet Ã©cran vous donne accÃ¨s aux options rÃ©gissant l’ensemble du rÃ©seau. Le premier site est le site principal du rÃ©seau, et les options du rÃ©seau sont tirÃ©es des options de ce premier site." +======= #: wp-admin/network/site-new.php:58 msgid "Missing email address." msgstr "Adresse de messagerie manquante." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/user-new.php:17 +msgid "You do not have sufficient permissions to add users to this network." +msgstr "Vous n’avez pas les droits suffisants pour ajouter des utilisateurs Ã ce rÃ©seau." +||||||| .r11156 +#: wp-admin/network/settings.php:28 +msgid "Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network." +msgstr "Les rÃ©glages dâinscription permettent d’ouvrir ou fermer les inscriptions au public. Si vous ouvrez les inscriptions, veillez Ã installer des extensions antispam. Les domaines bannis devraient Ãªtre indiquÃ©s sÃ©parÃ©s d’un espace, non d’une virgule." +======= #: wp-admin/network/site-new.php:55 msgid "Missing or invalid site address." msgstr "Adresse de site manquante ou non valide." +>>>>>>> .r12027 -#: wp-admin/network/site-new.php:49 -msgid "The following words are reserved for use by WordPress functions and cannot be used as blog names: %s" -msgstr "Les mots suivants sont rÃ©servÃ©s pour l’usage de fonctions WordPress et ne peuvent pas Ãªtre utilisÃ©s comme nom de site : %s" +<<<<<<< .mine +#: wp-admin/network/user-new.php:23 +msgid "Add User will set up a new user account on the network and send that person an email with username and password." +msgstr "« Ajouter un utilisateur » crÃ©era un nouveau compte utilisateur sur le rÃ©seau, et enverra un message contenant son identifiant et son mot de passe au destinataire." + +#: wp-admin/network/user-new.php:52 +msgid "Cannot add user." +msgstr "Impossible d’ajouter l’utilisateur." + +#: wp-admin/network/users.php:49 +msgid "Warning! User %s cannot be deleted." +msgstr "Attention ! L’utilisateur %s n’a pas pu Ãªtre supprimÃ©." + +#: wp-admin/network/users.php:89 +msgid "Site: %s" +msgstr "Site : %s" + +#: wp-admin/network/users.php:274 +msgid "The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses." +msgstr "Le menu « Actions groupÃ©es » permet d’effacer dÃ©finitivement plusieurs utilisateurs d’un coup, ou de les marquer comme sains ou indÃ©sirables. Les utilisateurs indÃ©sirables verront leurs articles supprimÃ©s, et ne pourront plus se connecter avec leur adresse de messagerie." + +#: wp-admin/network.php:27 +msgid "The Network creation panel is not for WordPress MU networks." +msgstr "Le panneau de crÃ©ation de rÃ©seau n’est pas conÃ§u pour les rÃ©seaux WordPress MU." + +#: wp-admin/network.php:112 +msgid "You must define the WP_ALLOW_MULTISITE constant as true in your wp-config.php file to allow creation of a Network." +msgstr "Afin d’autoriser la crÃ©ation d’un rÃ©seau, vous devez dÃ©finir la constante WP_ALLOW_MULTISITE comme « true » dans votre fichier wp-config.php." + +#: wp-admin/network.php:118 +msgid "Create a Network of WordPress Sites" +msgstr "CrÃ©er un rÃ©seau de sites WordPress" + +||||||| .r11156 +#: wp-admin/network/settings.php:31 +msgid "Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins." +msgstr "Le rÃ©glage du menu (dÃ©s)active la section « Extensions » du menu pour les utilisateurs normaux, de telle sorte que seuls les super-admins peuvent y accÃ©der pour activer une extension." + +#: wp-admin/network/sites.php:32 +msgid "This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table." +msgstr "Voici la liste de tous les sites de ce rÃ©seau. Vous pouvez changer de vue (liste avec ou sans extrait) en utilisant les icÃ´nes prÃ©sentes en haut Ã droite de la liste." + +#: wp-admin/network/user-new.php:24 +msgid "Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them." +msgstr "Les utilisateurs qui se sont inscrits sur le rÃ©seau sans crÃ©er de site deviennent abonnÃ©s du site d’accueil. Celui-ci leur permet d’accÃ©der Ã leur compte. Ces utilisateurs ne voient dans la navigation principale que les options « Tableau de bord » et « Mes sites », jusqu’Ã ce qu’un site leur soit crÃ©Ã©." + +#: wp-admin/network/users.php:235 +msgid "You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right." +msgstr "Un clic sur le titre d’une colonne permet de changer le tri du tableau. Les icÃ´nes en haut Ã droit permettent d’afficher des extraits ou non." + +#: wp-admin/network/upgrade.php:27 +msgid "If this process fails for any reason, users logging in to their sites will force the same update." +msgstr "Si ce processus Ã©choue pour n’importe quelles raisons, les utilisateurs se connectant Ã leurs sites dÃ©clencheront la mÃªme mise Ã jour." +#: wp-admin/network/upgrade.php:26 +msgid "If a version update to core has not happened, clicking this button won’t affect anything." +msgstr "S’il n’y a pas eu de mise Ã jour de l’installation de WordPress rÃ©cemment, cliquer sur ce bouton n’aura aucun effet." + +#: wp-admin/network/users.php:232 +msgid "This table shows all users across the network and the sites to which they are assigned." +msgstr "Ce tableau affiche tous les utilisateurs appartenant au rÃ©seau, et les sites auxquels ils sont assignÃ©s." + +#: wp-admin/network/users.php:237 +msgid "You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege." +msgstr "Vous pouvez promouvoir un utilisateur existant en super-admin en allant sur leur page de profil, et en cochant la case correspondante." + +======= +>>>>>>> .r12027 +#: wp-admin/network.php:122 +msgid "This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it." +msgstr "Cet Ã©cran vous permet de configurer un rÃ©seau, sous la forme sous-domaines (site1.example.com) ou sous-dossiers (example.com/site1). La forme sous-domaines nÃ©cessite une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans les enregistrements DNS et la configuration Apache, si votre hÃ©bergeur le permet." + +<<<<<<< .mine +#: wp-admin/network.php:123 +msgid "Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories)." +msgstr "Faites le choix entre sous-domaines ou sous-dossiers. Une fois l’installation configurÃ©e, vous ne pourrez pas revenir en arriÃ¨re sans recommencer Ã zÃ©ro. Saisissez tous les dÃ©tails, et cliquez sur « Installer ». Si cela ne marche pas, vous devrez sans doute ajouter une entrÃ©e de sous-domaine gÃ©nÃ©rique (wildcard) dans vos enregistrements DNS, ou passer Ã un rÃ©glage diffÃ©rent pour vos permaliens (si en mode sous-dossiers)." +||||||| .r11156 +#: wp-admin/network/upgrade.php:69 +msgid "Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s" +msgstr "Attention ! ProblÃ¨me lors de la mise Ã jour de %1$s. Votre serveur peut ne pas Ãªtre capable de se connecter aux sites qu’il gÃ¨re. Message d’erreur : %2$s" +======= #: wp-admin/network/site-new.php:37 msgid "Can’t create an empty site." msgstr "Impossible de crÃ©er un site vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:128 wp-admin/network.php:312 +msgid "Network Title" +msgstr "Nom du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/settings.php:167 +msgid "If you want to limit site registrations to certain domains. One domain per line." +msgstr "Si vous souhaitez que les seules personnes habilitÃ©es Ã crÃ©er un site soient celles disposant d’une adresse de messagerie liÃ©e Ã certains noms de domaines. Un domaine par ligne." +======= #: wp-admin/network/site-new.php:24 msgid "If the admin email for the new site does not exist in the database, a new user will also be created." msgstr "Si l’adresse de contact du nouveau site n’existe pas dans la base de donnÃ©es, un nouvel utilisateur sera crÃ©Ã© pour l’occasion." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:214 +msgid "If you want to ban domains from site registrations. One domain per line." +msgstr "Si vous souhaitez interdire la crÃ©ation de sites aux personnes dont l’adresse de messagerie est liÃ©e Ã certains noms de domaines. Un domaine par ligne." +||||||| .r11156 +#: wp-admin/network/settings.php:178 +msgid "If you want to ban domains from site registrations. One domain per line." +msgstr "Si vous souhaitez interdire la crÃ©ation de sites aux personnes dont l’adresse de messagerie est liÃ©e Ã certains noms de domaines. Un domaine par ligne." +======= #: wp-admin/network/site-new.php:23 msgid "This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings." msgstr "Cet Ã©cran permet aux super-admins d’ajouter de nouveaux sites au rÃ©seau. Il n’est pas limitÃ© par les rÃ©glages d’inscription." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:29 wp-admin/network/site-settings.php:27 +#: wp-admin/network/site-themes.php:27 wp-admin/network/site-users.php:30 +msgid "Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database." +msgstr "RÃ©glages - Cette page affiche la liste de tous les rÃ©glages associÃ©s Ã ce site. Certains sont crÃ©Ã©s par WordPress, d’autres par des extensions que vous activez. Notez que certains champs sont grisÃ©s et indiquent donnÃ©es sÃ©rialisÃ©es (Serialized Data). Vous ne pouvez pas modifier ces valeurs, du fait de la maniÃ¨re dont ils sont stockÃ©s dans la base de donnÃ©es." +||||||| .r11156 +#: wp-admin/network/settings.php:125 +msgid "If registration is disabled, please set NOBLOGREDIRECT in wp-config.php to a URL you will redirect visitors to if they visit a non-existent site." +msgstr "Si l’enregistrement est dÃ©sactivÃ©, veuillez configurer l’entrÃ©e NOBLOGREDIRECT dans le fichier wp-config.php pour qu’il pointe sur l’adresse internet vers laquelle vous souhaitez que vos visiteurs soient redirigÃ©s s’ils demandent un site qui n’existe pas. " +======= #: wp-admin/network/site-new.php:17 msgid "You do not have sufficient permissions to add sites to this network." msgstr "Vous n’avez pas les droits suffisants pour ajouter des sites Ã ce rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:125 +msgid "Site info updated." +msgstr "Les infos du site ont Ã©tÃ© mises Ã jour." +||||||| .r11156 +#: wp-admin/network/site-new.php:37 +msgid "Can’t create an empty site." +msgstr "Impossible de crÃ©er un site vide." +======= #: wp-admin/network/site-info.php:173 msgid "Set site attributes" msgstr "Configurer les attributs du site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:40 +msgid "Clicking on bold headings can re-sort this table." +msgstr "Cliquez sur les en-tÃªtes en gras afin de retrier ce tableau." +||||||| .r11156 +#: wp-admin/network/upgrade.php:88 +msgid "If your browser doesn’t start loading the next page automatically, click this link:" +msgstr "Si votre navigateur ne lance pas automatiquement la page suivante, cliquez sur ce lien :" +======= #: wp-admin/network/site-info.php:146 msgid "Update siteurl and home as well." msgstr "Mettez Ã©galement Ã jour les options siteurl et home." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:59 +msgid "Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges." +msgstr "Les super-admins ne peuvent plus Ãªtre ajoutÃ©s via l’Ã©cran des options. Vous devez aller Ã la liste des utilisateurs (option « Utilisateurs » du menu « Admin du rÃ©seau ») et cliquer sur un identifiant ou sur le lien « Modifier » qui s’affiche en dessous. Vous arriverez alors Ã un Ã©cran vous permettant de modifier ce compte utilisateur, oÃ¹ une case Ã cocher donne les droits de super-admin." +||||||| .r11156 +#: wp-admin/network/sites.php:224 +msgid "Site marked as spam." +msgstr "Site marquÃ© comme indÃ©sirable." +======= #: wp-admin/network/site-info.php:106 wp-admin/network/site-settings.php:94 #: wp-admin/network/site-themes.php:146 wp-admin/network/site-users.php:189 msgid "Info" msgstr "Infos" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-new.php:23 +msgid "This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings." +msgstr "Cet Ã©cran permet aux super-admins d’ajouter de nouveaux sites au rÃ©seau. Il n’est pas limitÃ© par les rÃ©glages d’inscription." +||||||| .r11156 +#: wp-admin/network/sites.php:197 +msgid "Sites marked as spam." +msgstr "Sites marquÃ©s comme indÃ©sirables." +======= #: wp-admin/network/site-info.php:91 wp-admin/network/site-info.php:92 #: wp-admin/network/site-settings.php:79 wp-admin/network/site-settings.php:80 #: wp-admin/network/site-themes.php:133 wp-admin/network/site-themes.php:134 #: wp-admin/network/site-users.php:161 wp-admin/network/site-users.php:162 msgid "Edit Site: %s" msgstr "Modifier le site : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: user login, 2: site url, 3: site name/title +#: wp-admin/network/site-new.php:95 +msgid "" +"New site created by %1$s\n" +"\n" +"Address: %2$s\n" +"Name: %3$s" +msgstr "" +"Nouveau site crÃ©Ã© par %1$s\n" +"\n" +"Adresse : %2$s\n" +"Nom : %3$s" +||||||| .r11156 +#: wp-admin/network/sites.php:194 +msgid "Sites removed from spam." +msgstr "Sites marquÃ©s comme sains." +======= #: wp-admin/network/site-info.php:87 msgid "Site info updated." msgstr "Les infos du site ont Ã©tÃ© mises Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:245 +msgid "Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes." +msgstr "Les thÃ¨mes peuvent Ãªtre activÃ©s par l’administrateur du rÃ©seau pour chaque site, individuellement, par le biais de l’Ã©cran de modification d’un site (et de son onglet « ThÃ¨mes »), accessible via le lien « Modifier » de la liste des sites. Seuls les administrateurs du rÃ©seau peuvent installer ou modifier des thÃ¨mes." +||||||| .r11156 +#: wp-admin/network/users.php:260 +msgid "Users removed from spam." +msgstr "Utilisateurs marquÃ©s comme sains." +======= #: wp-admin/network/site-info.php:39 wp-admin/network/site-settings.php:39 #: wp-admin/network/site-themes.php:54 wp-admin/network/site-users.php:49 msgid "Invalid site ID." msgstr "Identifiant du site invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:129 wp-admin/network/site-settings.php:82 +#: wp-admin/network/site-themes.php:136 wp-admin/network/site-users.php:164 +msgid "Edit Site: %s" +msgstr "Modifier le site : %s" +||||||| .r11156 +#: wp-admin/network/sites.php:221 +msgid "Site removed from spam." +msgstr "Site marquÃ© comme sain." +======= #: wp-admin/network/site-info.php:32 wp-admin/network/site-new.php:29 #: wp-admin/network/site-settings.php:32 wp-admin/network/site-themes.php:32 #: wp-admin/network/site-users.php:35 wp-admin/network/sites.php:45 msgid "Documentation on Site Management" msgstr "Documentation sur la gestion de site (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:27 +msgid "Add and manage sites or users" +msgstr "Ajouter et gÃ©rer des sites ou des utilisateurs" +||||||| .r11156 +#: wp-admin/network/sites.php:200 +msgid "Sites deleted." +msgstr "Sites effacÃ©s." +======= #: wp-admin/network/site-info.php:27 wp-admin/network/site-settings.php:27 #: wp-admin/network/site-themes.php:27 wp-admin/network/site-users.php:30 msgid "Settings - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database." msgstr "RÃ©glages - Cette page affiche la liste de tous les rÃ©glages associÃ©s Ã ce site. Certains sont crÃ©Ã©s par WordPress, d’autres par des extensions que vous activez. Notez que certains champs sont grisÃ©s et indiquent donnÃ©es sÃ©rialisÃ©es (Serialized Data). Vous ne pouvez pas modifier ces valeurs, du fait de la maniÃ¨re dont ils sont stockÃ©s dans la base de donnÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:28 +msgid "Install and activate themes or plugins" +msgstr "Installer et activer des thÃ¨mes ou des extensions" +||||||| .r11156 +#: wp-admin/network/sites.php:203 +msgid "Site deleted." +msgstr "Site effacÃ©." +======= #: wp-admin/network/site-info.php:26 wp-admin/network/site-settings.php:26 #: wp-admin/network/site-themes.php:26 wp-admin/network/site-users.php:29 msgid "Themes - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen." msgstr "ThÃ¨mes - Cette zone affiche les thÃ¨mes qui n’ont pas dÃ©jÃ Ã©tÃ© activÃ©s pour l’ensemble du rÃ©seau. En activant un thÃ¨me avec ce menu, vous le rendez disponible pour ce site. Cela ne l’active pas, mais l’affichera dans le menu Apparence du site. Pour activer un thÃ¨me pour l’ensemble du rÃ©seau, rendez-vous sur l’Ã©cran ThÃ¨mes du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:29 +msgid "Update your network" +msgstr "Mettre Ã jour votre rÃ©seau" +||||||| .r11156 +#: wp-admin/network/users.php:257 +msgid "Users marked as spam." +msgstr "Utilisateurs marquÃ©s comme indÃ©sirables." +======= #: wp-admin/network/site-info.php:25 wp-admin/network/site-settings.php:25 #: wp-admin/network/site-themes.php:25 wp-admin/network/site-users.php:28 msgid "Users - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network." msgstr "Utilisateurs - Affiche les utilisateurs associÃ©s Ã ce site. Vous pouvez Ã©galement modifier leur rÃ´le, rÃ©initialiser leur mot de passe ou les enlever du site. Enlever un utilisateur d’un site ne l’enlÃ¨ve pas du rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:30 +msgid "Modify global network settings" +msgstr "Modifier les rÃ©glages globaux du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/site-info.php:141 +msgid "Update siteurl and home as well." +msgstr "Mettez Ã©galement Ã jour les options siteurl et home." +======= #: wp-admin/network/site-info.php:24 wp-admin/network/site-settings.php:24 #: wp-admin/network/site-themes.php:24 wp-admin/network/site-users.php:27 msgid "Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable." msgstr "Infos - Il n’est pas recommandÃ© de modifier le domaine ou le chemin d’accÃ¨s, car cela pourrait rendre le site non fonctionnel. Les dates de crÃ©ation et de derniÃ¨re mise Ã jour sont affichÃ©es. Les administrateurs rÃ©seau peuvent indiquer qu’un site est archivÃ©, indÃ©sirable, pour adulte et effacÃ©, afin de le retirer de la liste publique ou le dÃ©sactiver." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:41 +msgid "To search for a user or site, use the search boxes." +msgstr "Pour chercher un utilisateur ou un site, utilisez les champs de recherche." +||||||| .r11156 +#: wp-admin/network/sites.php:218 +msgid "Site deactivated." +msgstr "Site dÃ©sactivÃ©." +======= #: wp-admin/network/site-info.php:23 wp-admin/network/site-settings.php:23 #: wp-admin/network/site-themes.php:23 wp-admin/network/site-users.php:26 msgid "The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable." msgstr "Ce menu sert Ã modifier les informations relatives Ã un site individuel, en particulier si sa zone d’administration est indisponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:47 +msgid "Quick Tasks" +msgstr "TÃ¢ches rapides" +||||||| .r11156 +#: wp-admin/network/sites.php:215 +msgid "Site activated." +msgstr "Site activÃ©." +======= #: wp-admin/network/site-info.php:17 wp-admin/network/site-settings.php:17 #: wp-admin/network/site-users.php:17 msgid "You do not have sufficient permissions to edit this site." msgstr "Vous n’avez pas les droits suffisants pour modifier ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/menu.php:22 wp-admin/network/upgrade.php:18 +#: wp-admin/network/upgrade.php:42 wp-admin/network/upgrade.php:119 +msgid "Upgrade Network" +msgstr "Mettre Ã jour le rÃ©seau" +||||||| .r11156 +#: wp-admin/network/sites.php:212 +msgid "Site unarchived." +msgstr "Site dÃ©sarchivÃ©." +======= #: wp-admin/network/settings.php:382 msgid "Enable menus" msgstr "Activer les menus" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:330 +msgid "Language Settings" +msgstr "RÃ©glages de langue" +||||||| .r11156 +#: wp-admin/network/users.php:263 +msgid "Users deleted." +msgstr "Utilisateurs supprimÃ©s." +======= #: wp-admin/network/settings.php:360 msgid "Enable administration menus" msgstr "Activer les menus d’administration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:26 wp-admin/network/site-settings.php:24 +#: wp-admin/network/site-themes.php:24 wp-admin/network/site-users.php:27 +msgid "Info - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable." +msgstr "Infos - Il n’est pas recommandÃ© de modifier le domaine ou le chemin d’accÃ¨s, car cela pourrait rendre le site non fonctionnel. Les dates de crÃ©ation et de derniÃ¨re mise Ã jour sont affichÃ©es. Les administrateurs rÃ©seau peuvent indiquer qu’un site est archivÃ©, indÃ©sirable, pour adulte et effacÃ©, afin de le retirer de la liste publique ou le dÃ©sactiver." +||||||| .r11156 +#: wp-admin/network/sites.php:209 +msgid "Site archived." +msgstr "Site archivÃ©." +======= #: wp-admin/network/settings.php:333 msgid "Default Language" msgstr "Langue par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:144 wp-admin/network/site-settings.php:97 +#: wp-admin/network/site-themes.php:149 wp-admin/network/site-users.php:192 +msgid "Info" +msgstr "Infos" +||||||| .r11156 +#: wp-admin/network/site-new.php:60 +msgid "Invalid email address." +msgstr "Adresse de messagerie invalide." +======= #: wp-admin/network/settings.php:330 msgid "Language Settings" msgstr "RÃ©glages de langue" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:25 +msgid "Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied." +msgstr "N’utilisez cet Ã©cran que quand vous avez mis Ã jour cette installation de WordPress (au moyen de la fonction de mise Ã jour automatique ou la barre d’outils). En cliquant sur « Mettre Ã jour le rÃ©seau », WordPress s’occupera de tous les sites du rÃ©seau, par groupes de cinq, et s’assurera que toutes les mises Ã jour de bases de donnÃ©es sont appliquÃ©es." +||||||| .r11156 +#: wp-admin/network/site-new.php:76 +msgid "There was an error creating the user." +msgstr "Une erreur s’est produite lors de la crÃ©ation d’un utilisateur." +======= #: wp-admin/network/settings.php:319 msgid "Size in kilobytes" msgstr "Taille en kilooctets" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/upgrade.php:114 +msgid "Database Upgrade Required" +msgstr "Il faut mettre Ã jour la base de donnÃ©es" + +#: wp-admin/network/settings.php:117 +msgid "Options saved." +msgstr "Options enregistrÃ©es." +||||||| .r11156 +#: wp-admin/network/sites.php:64 wp-admin/network/sites.php:131 +msgid "You are not allowed to change the current site." +msgstr "Vous n’Ãªtes pas autorisÃ© Ã modifier le site actuel." +#: wp-admin/network/settings.php:272 +msgctxt "File size in kilobytes" +msgid "%s KB" +msgstr "%s Ko" +======= #: wp-admin/network/settings.php:317 msgctxt "File size in kilobytes" msgid "%s KB" msgstr "%s Ko" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:20 wp-admin/network/settings.php:20 +#: wp-admin/network/site-info.php:50 wp-admin/network/site-settings.php:47 +#: wp-admin/network/site-themes.php:64 wp-admin/network/site-users.php:57 +#: wp-admin/network/sites.php:17 wp-admin/network/sites.php:124 +#: wp-admin/network/upgrade.php:39 wp-admin/network/user-new.php:37 +#: wp-admin/network/users.php:17 wp-admin/network/users.php:135 +#: wp-admin/network/users.php:156 wp-admin/network/users.php:169 +#: wp-admin/network/users.php:218 +msgid "You do not have permission to access this page." +msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +||||||| .r11156 +#: wp-admin/network/settings.php:266 +msgid "Upload file types" +msgstr "Types de fichiers " +======= #: wp-admin/network/settings.php:315 msgid "Max upload file size" msgstr "Taille maximale des fichiers" @@ -841,11 +3016,31 @@ msgstr "Types de fichier autorisÃ©s. SÃ©parez les types par une espace." #: wp-admin/network/settings.php:305 msgid "Upload file types" msgstr "Types de fichiers " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:26 +msgid "From here you can:" +msgstr "D’ici, vous pouvez :" +||||||| .r11156 +#: wp-admin/network/settings.php:261 +msgid "Limit total size of files uploaded to %s MB" +msgstr "La taille totale des fichiers envoyÃ©s est limitÃ©e Ã %s Mo" +======= #: wp-admin/network/settings.php:297 msgid "Limit total size of files uploaded to %s MB" msgstr "La taille totale des fichiers envoyÃ©s est limitÃ©e Ã %s Mo" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:179 +msgid "Add New Users" +msgstr "Ajouter de nouveaux utilisateurs" +||||||| .r11156 +#: wp-admin/network/settings.php:242 +msgid "The author of the first comment on a new site." +msgstr "L’auteur du premier commentaire sur tout nouveau site." +======= #: wp-admin/network/settings.php:295 msgid "Site upload space" msgstr "Espace de stockage du site" @@ -865,11 +3060,31 @@ msgstr "Adresse du premier commentaire" #: wp-admin/network/settings.php:278 msgid "The author of the first comment on a new site." msgstr "L’auteur du premier commentaire sur tout nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:115 +msgid "WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network." +msgstr "WordPress a Ã©tÃ© mis Ã jour ! Avant de vous laisser continuer, nous devons mettre Ã jour chaque site de votre rÃ©seau." +||||||| .r11156 +#: wp-admin/network/settings.php:213 +msgid "The first post on a new site." +msgstr "Le premier article sur tout nouveau site." +======= #: wp-admin/network/settings.php:274 msgid "First Comment Author" msgstr "Auteur du premier commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:38 +msgid "The Right Now widget on this screen provides current user and site counts on your network." +msgstr "Le widget Aujourd’hui de cet Ã©cran vous donne le nombre actuel d’utilisateurs et de sites sur votre rÃ©seau." +||||||| .r11156 +#: wp-admin/network/settings.php:223 +msgid "The first page on a new site." +msgstr "La premiÃ¨re page sur tout nouveau site." +======= #: wp-admin/network/settings.php:269 msgid "The first comment on a new site." msgstr "Le premier commentaire sur tout nouveau site." @@ -881,23 +3096,73 @@ msgstr "Premier commentaire" #: wp-admin/network/settings.php:259 msgid "The first page on a new site." msgstr "La premiÃ¨re page sur tout nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:39 +msgid "To add a new user, click Create a New User." +msgstr "Pour ajouter un nouvel utilisateur, cliquez sur CrÃ©er un nouvel utilisateur." +||||||| .r11156 +#: wp-admin/network/settings.php:233 +msgid "The first comment on a new site." +msgstr "Le premier commentaire sur tout nouveau site." +======= #: wp-admin/network/settings.php:254 msgid "First Page" msgstr "PremiÃ¨re page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:40 +msgid "To add a new site, click Create a New Site." +msgstr "Pour ajouter un nouveau site, cliquez sur CrÃ©er un nouveau site." +||||||| .r11156 +#: wp-admin/network/settings.php:251 +msgid "The URL for the first comment on a new site." +msgstr "L’adresse web du premier commentaire sur tout nouveau site." +======= #: wp-admin/network/settings.php:249 msgid "The first post on a new site." msgstr "Le premier article sur tout nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:42 +msgid "To search for a user, enter an email address or username. Use a wildcard to search for a partial username, such as user*." +msgstr "Pour chercher un utilisateur, saisissez une adresse de messagerie ou un identifiant. Utilisez le signe Ã©toile (*) pour lancer une recherche sur un identifiant partiel, par exemple utilisa*." +||||||| .r11156 +#: wp-admin/network/upgrade.php:57 +msgid "All done!" +msgstr "TerminÃ© !" +======= #: wp-admin/network/settings.php:239 msgid "The welcome email sent to new users." msgstr "Ce message de bienvenue sera envoyÃ© aux nouveaux utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:43 +msgid "To search for a site, enter the path or domain." +msgstr "Pour chercher un site, saisissez son chemin ou son domaine." +||||||| .r11156 +#: wp-admin/network/settings.php:121 +msgid "Logged in users may register new sites." +msgstr "Seuls les utilisateurs connectÃ©s peuvent crÃ©er de nouveaux sites." +======= #: wp-admin/network/settings.php:234 msgid "Welcome User Email" msgstr "Message de bienvenue des utilisateurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:118 +msgid "The database upgrade process may take a little while, so please be patient." +msgstr "Le processus de mise Ã jour peut prendre un long moment. Merci pour votre patience." +||||||| .r11156 +#: wp-admin/network/settings.php:122 +msgid "Both sites and user accounts can be registered." +msgstr "La crÃ©ation de sites et d’utilisateurs est autorisÃ©e." +======= #: wp-admin/network/settings.php:229 msgid "The welcome email sent to new site owners." msgstr "Ce message de bienvenue sera envoyÃ© aux propriÃ©taires de nouveaux sites." @@ -957,7 +3222,17 @@ msgstr "Si l’enregistrement est dÃ©sactivÃ©, veuillez configurer l’e #: wp-admin/network/settings.php:159 msgid "Both sites and user accounts can be registered." msgstr "La crÃ©ation de sites et d’utilisateurs est autorisÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/sites.php:98 +msgid "Confirm your action" +msgstr "Confirmez cette action" +||||||| .r11156 +#: wp-admin/network/settings.php:120 +msgid "User accounts may be registered." +msgstr "Seuls les comptes utilisateurs peuvent Ãªtre crÃ©Ã©s." +======= #: wp-admin/network/settings.php:158 msgid "Logged in users may register new sites." msgstr "Seuls les utilisateurs connectÃ©s peuvent crÃ©er de nouveaux sites." @@ -965,114 +3240,430 @@ msgstr "Seuls les utilisateurs connectÃ©s peuvent crÃ©er de nouveaux sites." #: wp-admin/network/settings.php:157 msgid "User accounts may be registered." msgstr "Seuls les comptes utilisateurs peuvent Ãªtre crÃ©Ã©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:54 wp-admin/network/site-info.php:35 +#: wp-admin/network/site-new.php:30 wp-admin/network/site-settings.php:33 +#: wp-admin/network/site-themes.php:33 wp-admin/network/site-users.php:36 +#: wp-admin/network/sites.php:46 wp-admin/network/user-new.php:30 +#: wp-admin/network/users.php:281 +msgid "Support Forums" +msgstr "Forum d’entraide en franÃ§ais" +||||||| .r11156 +#: wp-admin/network/settings.php:119 +msgid "Registration is disabled." +msgstr "Les inscriptions ne sont pas autorisÃ©es pour le moment." +======= #: wp-admin/network/settings.php:156 msgid "Registration is disabled." msgstr "Les inscriptions ne sont pas autorisÃ©es pour le moment." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:139 +msgid "This email address will receive notifications. Registration and support emails will also come from this address." +msgstr "Cette adresse de messagerie recevra des notifications. Les inscriptions et les messages d’assistance proviendront Ã©galement de cette adresse." +||||||| .r11156 +#: wp-admin/network/settings.php:308 +msgid "Enable administration menus" +msgstr "Activer les menus d’administration" +======= #: wp-admin/network/settings.php:155 msgid "New registrations settings" msgstr "RÃ©glages pour les nouvelles inscriptions" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: user login +#: wp-admin/network/users.php:66 +msgid "What should be done with content owned by %s?" +msgstr "Que faire du contenu dont %s est le propriÃ©taire ?" +||||||| .r11156 +#: wp-admin/network/settings.php:90 +msgid "Operational Settings" +msgstr "RÃ©glages de fonctionnement" +======= #: wp-admin/network/settings.php:147 msgid "Allow new registrations" msgstr "Autoriser les nouvelles inscriptions" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/sites.php:63 +msgid "You are about to delete the site %s." +msgstr "Vous Ãªtes sur le point de supprimer le site %s." + +#: wp-admin/network/sites.php:62 +msgid "You are about to mark the site %s as spam." +msgstr "Vous Ãªtes sur le point de marquer le site %s comme indÃ©sirable." + +#: wp-admin/network/sites.php:61 +msgid "You are about to unspam the site %s." +msgstr "Vous Ãªtes sur le point de marquer le site %s comme sain." +||||||| .r11156 +#: wp-admin/network/settings.php:256 +msgid "Upload Settings" +msgstr "RÃ©glages d’envoi des fichiers" + +#: wp-admin/network/settings.php:184 +msgid "New Site Settings" +msgstr "RÃ©glages des nouveaux sites" +#: wp-admin/network/settings.php:109 +msgid "Registration Settings" +msgstr "RÃ©glages d’inscription" +======= #: wp-admin/network/settings.php:144 msgid "Registration Settings" msgstr "RÃ©glages d’inscription" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/sites.php:60 +msgid "You are about to archive the site %s." +msgstr "Vous Ãªtes sur le point d’archiver le site %s." +||||||| .r11156 +#: wp-admin/network/site-new.php:56 +msgid "Missing or invalid site address." +msgstr "Adresse de site manquante ou non valide." +======= #: wp-admin/network/settings.php:139 msgid "This email address will receive notifications. Registration and support emails will also come from this address." msgstr "Cette adresse de messagerie recevra des notifications. Les inscriptions et les messages d’assistance proviendront Ã©galement de cette adresse." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/sites.php:59 +msgid "You are about to unarchive the site %s." +msgstr "Vous Ãªtes sur le point de dÃ©sarchiver le site %s." +#: wp-admin/network/sites.php:58 +msgid "You are about to deactivate the site %s" +msgstr "Vous Ãªtes sur le point de dÃ©sactiver le site %s" +||||||| .r11156 +#: wp-admin/network/site-new.php:58 +msgid "Missing email address." +msgstr "Adresse de messagerie manquante." + +#: wp-admin/network/settings.php:100 wp-admin/network.php:303 +msgid "Network Admin Email" +msgstr "Adresse de contact de l’administrateur du rÃ©seau" +======= #: wp-admin/network/settings.php:135 wp-admin/network.php:311 msgid "Network Admin Email" msgstr "Adresse de contact de l’administrateur du rÃ©seau" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/sites.php:57 +msgid "You are about to activate the site %s" +msgstr "Vous Ãªtes sur le point d’activer le site %s" +||||||| .r11156 +#: wp-admin/network/site-new.php:91 +msgid "[%s] New Site Created" +msgstr "[%s] Nouveau site crÃ©Ã©" +======= #: wp-admin/network/settings.php:128 wp-admin/network.php:302 msgid "Network Title" msgstr "Nom du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:195 +msgid "No, return me to the theme list" +msgstr "Non, je veux revenir Ã la liste des thÃ¨mes." +||||||| .r11156 +#: wp-admin/network/settings.php:193 +msgid "The welcome email sent to new site owners." +msgstr "Ce message de bienvenue sera envoyÃ© aux propriÃ©taires de nouveaux sites." +======= #: wp-admin/network/settings.php:125 msgid "Operational Settings" msgstr "RÃ©glages de fonctionnement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:46 wp-admin/network/site-settings.php:43 +#: wp-admin/network/site-themes.php:60 wp-admin/network/site-users.php:53 +msgid "The requested site does not exist." +msgstr "Le site demandÃ© n’existe pas." +||||||| .r11156 +#: wp-admin/network/settings.php:259 +msgid "Site upload space" +msgstr "Espace de stockage du site" +======= #: wp-admin/network/settings.php:117 msgid "Options saved." msgstr "Options enregistrÃ©es." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/site-info.php:170 wp-admin/network/site-info.php:177 +msgid "Site URL" +msgstr "Adresse web du site" +||||||| .r11156 +#: wp-admin/network/settings.php:138 +msgid "Send the network admin an email notification every time someone registers a site or user account." +msgstr "Envoyer un message Ã l’administrateur du rÃ©seau Ã chaque inscription de site ou d’utilisateurs." +======= #: wp-admin/network/settings.php:64 msgid "Documentation on Network Settings" msgstr "Documentation sur les RÃ©glages du rÃ©seau (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:118 +msgid "Once you hit “Confirm Deletion”, these users will be permanently removed." +msgstr "Une fois que vous aurez cliquÃ© sur « Confirmer la suppression », l’utilisateur sera dÃ©finitivement supprimÃ©." +||||||| .r11156 +#: wp-admin/network/settings.php:154 +msgid "Users are not allowed to register these sites. Separate names by spaces." +msgstr "Les utilisateurs ne sont pas autorisÃ©s Ã crÃ©er un site avec l’un de ces noms. SÃ©parez les noms par un espace." +======= #: wp-admin/network/settings.php:59 msgid "Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges." msgstr "Les super-admins ne peuvent plus Ãªtre ajoutÃ©s via l’Ã©cran des options. Vous devez aller Ã la liste des utilisateurs (option « Utilisateurs » du menu « Admin du rÃ©seau ») et cliquer sur un identifiant ou sur le lien « Modifier » qui s’affiche en dessous. Vous arriverez alors Ã un Ã©cran vous permettant de modifier ce compte utilisateur, oÃ¹ une case Ã cocher donne les droits de super-admin." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/upgrade.php:32 +msgid "Documentation on Upgrade Network" +msgstr "Documentation sur la mise Ã jour du rÃ©seau (en)" +||||||| .r11156 +#: wp-admin/network/upgrade.php:88 +msgid "Next Sites" +msgstr "Sites suivants" +======= #: wp-admin/network/settings.php:58 msgid "Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins." msgstr "Le rÃ©glage du menu (dÃ©s)active la section « Extensions » du menu pour les utilisateurs normaux, de telle sorte que seuls les super-admins peuvent y accÃ©der pour activer une extension." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/user-new.php:29 wp-admin/network/users.php:280 +msgid "Documentation on Network Users" +msgstr "Documentation sur les utilisateurs du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/index.php:20 wp-admin/network/settings.php:17 +#: wp-admin/network/site-info.php:43 wp-admin/network/site-settings.php:43 +#: wp-admin/network/site-themes.php:60 wp-admin/network/site-users.php:53 +#: wp-admin/network/sites.php:17 wp-admin/network/sites.php:100 +#: wp-admin/network/upgrade.php:39 wp-admin/network/user-new.php:36 +#: wp-admin/network/users.php:17 wp-admin/network/users.php:97 +#: wp-admin/network/users.php:118 wp-admin/network/users.php:131 +#: wp-admin/network/users.php:180 +msgid "You do not have permission to access this page." +msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +======= #: wp-admin/network/settings.php:56 msgid "Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only)." msgstr "Les rÃ©glages dâenvoi des fichiers permettent de limiter la taille des fichiers mis en ligne et l’espace disponible pour chaque site. Vous pouvez prÃ©ciser la valeur pour chaque site individuellement. Vous pouvez Ã©galement prÃ©ciser les types de fichiers acceptÃ©s (sÃ©parÃ©s par des espaces)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/index.php:53 +msgid "Documentation on the Network Admin" +msgstr "Documentation sur l’administration du rÃ©seau (en)" +||||||| .r11156 +#: wp-admin/network/sites.php:77 +msgid "Confirm" +msgstr "Confirmer" +======= #: wp-admin/network/settings.php:55 msgid "New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL." msgstr "Les rÃ©glages des nouveaux sites sont les rÃ©glages par dÃ©faut appliquÃ©s Ã tout nouveau site crÃ©Ã© sur le rÃ©seau. Cela comprend le message d’accueil quand un nouvel utilisateur ou un nouveau site est enregistrÃ©, ainsi que le contenu du premier article, de la premiÃ¨re page et du premier commentaire (dont le nom et l’adresse web du commentateur)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:34 wp-admin/network/site-new.php:29 +#: wp-admin/network/site-settings.php:32 wp-admin/network/site-themes.php:32 +#: wp-admin/network/site-users.php:35 wp-admin/network/sites.php:45 +msgid "Documentation on Site Management" +msgstr "Documentation sur la gestion de site (en)" +||||||| .r11156 +#: wp-admin/network/user-new.php:39 +msgid "Cannot create an empty user." +msgstr "Impossible de crÃ©er un utilisateur vide." +======= #: wp-admin/network/settings.php:54 msgid "Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network." msgstr "Les rÃ©glages dâinscription permettent d’ouvrir ou fermer les inscriptions au public. Si vous ouvrez les inscriptions, veillez Ã installer des extensions antispam. Les domaines bannis devraient Ãªtre indiquÃ©s sÃ©parÃ©s d’un espace, non d’une virgule." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:250 +msgid "Documentation on Network Themes" +msgstr "Documentation sur les thÃ¨mes du rÃ©seau" +||||||| .r11156 +#: wp-admin/network/site-users.php:233 +msgid "Duplicated username or email address." +msgstr "Identifiant ou adresse de messagerie dÃ©jÃ utilisÃ©(e)." +======= #: wp-admin/network/settings.php:53 msgid "Operational settings has fields for the network’s name and admin email." msgstr "Les rÃ©glages de fonctionnement permettent de modifier le nom du rÃ©seau, et l’adresse de messagerie de l’administrateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:64 +msgid "Documentation on Network Settings" +msgstr "Documentation sur les RÃ©glages du rÃ©seau (en)" +||||||| .r11156 +#: wp-admin/network/settings.php:112 +msgid "Allow new registrations" +msgstr "Autoriser les nouvelles inscriptions" +======= #: wp-admin/network/settings.php:52 msgid "This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site’s options." msgstr "Cet Ã©cran vous donne accÃ¨s aux options rÃ©gissant l’ensemble du rÃ©seau. Le premier site est le site principal du rÃ©seau, et les options du rÃ©seau sont tirÃ©es des options de ce premier site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:159 +msgid "You are about to remove the following themes:" +msgstr "Vous Ãªtes sur le point d’enlever les thÃ¨mes suivantes :" +||||||| .r11156 +#: wp-admin/network/settings.php:132 +msgid "Registration notification" +msgstr "Notification d’inscription" +======= #: wp-admin/network/menu.php:59 wp-admin/network/upgrade.php:18 #: wp-admin/network/upgrade.php:42 wp-admin/network/upgrade.php:116 msgid "Upgrade Network" msgstr "Mettre Ã jour le rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:158 +msgid "These themes may be active on other sites in the network." +msgstr "Ces thÃ¨mes peuvent Ãªtre actifs sur d’autres site de ce rÃ©seau." +||||||| .r11156 +#: wp-admin/network/settings.php:143 +msgid "Add New Users" +msgstr "Ajouter de nouveaux utilisateurs" +======= #: wp-admin/network/menu.php:58 msgid "Available Updates" msgstr "Mises Ã jour disponibles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:170 +msgid "Are you sure you wish to delete this theme?" +msgstr "Ãtes-vous sÃ»r de vouloir supprimer ce thÃ¨me ?" +||||||| .r11156 +#: wp-admin/network/settings.php:150 +msgid "Banned Names" +msgstr "Noms bannis" +======= #: wp-admin/network/menu.php:53 msgid "Updates" msgstr "Mises Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:174 wp-admin/network/themes.php:283 +msgid "%s theme disabled." +msgid_plural "%s themes disabled." +msgstr[0] "%s thÃ¨me dÃ©sactivÃ©." +msgstr[1] "%s thÃ¨mes dÃ©sactivÃ©s." +||||||| .r11156 +#: wp-admin/network/settings.php:160 +msgid "Limited Email Registrations" +msgstr "Enregistrement rÃ©servÃ© aux noms de domaines" +======= #: wp-admin/network/menu.php:46 wp-admin/network/settings.php:22 msgid "Network Settings" msgstr "RÃ©glages du rÃ©seau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-themes.php:166 wp-admin/network/themes.php:275 +msgid "%s theme enabled." +msgid_plural "%s themes enabled." +msgstr[0] "%s thÃ¨me activÃ©." +msgstr[1] "%s thÃ¨mes activÃ©s." +||||||| .r11156 +#: wp-admin/network/settings.php:173 +msgid "Banned Email Domains" +msgstr "Noms de domaines bannis" +======= #: wp-admin/network/menu.php:32 wp-admin/network/themes.php:264 msgctxt "theme" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:291 +msgid "%s theme deleted." +msgid_plural "%s themes deleted." +msgstr[0] "%s thÃ¨me supprimÃ©." +msgstr[1] "%s thÃ¨mes supprimÃ©s." +||||||| .r11156 +#: wp-admin/network/settings.php:188 +msgid "Welcome Email" +msgstr "Message de bienvenue" +======= #: wp-admin/network/menu.php:31 msgid "Installed Themes" msgstr "ThÃ¨mes installÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:187 +msgid "Yes, delete these themes" +msgstr "Oui, supprimer ces thÃ¨mes" +||||||| .r11156 +#: wp-admin/network/settings.php:198 +msgid "Welcome User Email" +msgstr "Message de bienvenue des utilisateurs" +======= #: wp-admin/network/menu.php:27 msgid "Themes %s" msgstr "ThÃ¨mes %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/themes.php:157 +msgid "Delete Themes" +msgstr "Supprimer les thÃ¨mes" +||||||| .r11156 +#: wp-admin/network/settings.php:203 +msgid "The welcome email sent to new users." +msgstr "Ce message de bienvenue sera envoyÃ© aux nouveaux utilisateurs." +======= #: wp-admin/network/menu.php:18 wp-admin/network/sites.php:254 msgctxt "site" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: site url, 2: server error message +#: wp-admin/network/upgrade.php:76 +msgid "Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s" +msgstr "Attention ! Un problÃ¨me est survenu lors de la mise Ã jour de %1$s. Votre serveur peut ne pas Ãªtre en mesure de se connecter Ã certains sites qui y sont installÃ©s. Message d’erreur : %2$s." +||||||| .r11156 +#: wp-admin/network/settings.php:218 +msgid "First Page" +msgstr "PremiÃ¨re page" +======= #: wp-admin/network/menu.php:17 msgid "All Sites" msgstr "Tous les sites" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:155 +msgid "New registrations settings" +msgstr "RÃ©glages pour les nouvelles inscriptions" +||||||| .r11156 +#: wp-admin/network/settings.php:228 +msgid "First Comment" +msgstr "Premier commentaire" +======= #: wp-admin/network/index.php:54 wp-admin/network/site-info.php:33 #: wp-admin/network/site-new.php:30 wp-admin/network/site-settings.php:33 #: wp-admin/network/site-themes.php:33 wp-admin/network/site-users.php:36 @@ -1080,43 +3671,167 @@ msgstr "Tous les sites" #: wp-admin/network/users.php:276 msgid "Support Forums" msgstr "Forum d’entraide en franÃ§ais" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:319 +msgid "Size in kilobytes" +msgstr "Taille en kilooctets" +||||||| .r11156 +#: wp-admin/network/settings.php:238 +msgid "First Comment Author" +msgstr "Auteur du premier commentaire" +======= #: wp-admin/network/index.php:53 msgid "Documentation on the Network Admin" msgstr "Documentation sur l’administration du rÃ©seau (en)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:309 +msgid "Allowed file types. Separate types by spaces." +msgstr "Types de fichier autorisÃ©s. SÃ©parez les types par une espace." +||||||| .r11156 +#: wp-admin/network/settings.php:247 +msgid "First Comment URL" +msgstr "Adresse du premier commentaire" +======= #: wp-admin/network/index.php:47 msgid "Quick Tasks" msgstr "TÃ¢ches rapides" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:32 +msgid "You have chosen to delete the user from all networks and sites." +msgstr "Vous avez choisi de supprimer cet utilisateur sur les rÃ©seaux et sites." +||||||| .r11156 +#: wp-admin/network/settings.php:271 +msgid "Max upload file size" +msgstr "Taille maximale des fichiers" +======= #: wp-admin/network/index.php:43 msgid "To search for a site, enter the path or domain." msgstr "Pour chercher un site, saisissez son chemin ou son domaine." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:74 +msgid "Select a user" +msgstr "SÃ©lectionner un utilisateur" +||||||| .r11156 +#: wp-admin/network/settings.php:283 +msgid "Default Language" +msgstr "Langue par dÃ©faut" +======= #: wp-admin/network/index.php:42 msgid "To search for a user, enter an email address or username. Use a wildcard to search for a partial username, such as user*." msgstr "Pour chercher un utilisateur, saisissez une adresse de messagerie ou un identifiant. Utilisez le signe Ã©toile (*) pour lancer une recherche sur un identifiant partiel, par exemple utilisa*." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/settings.php:382 +msgid "Enable menus" +msgstr "Activer les menus" +||||||| .r11156 +#: wp-admin/network/site-new.php:149 +msgid "Add Site" +msgstr "Ajouter un site" +======= #: wp-admin/network/index.php:41 msgid "To search for a user or site, use the search boxes." msgstr "Pour chercher un utilisateur ou un site, utilisez les champs de recherche." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/site-info.php:203 +msgid "Set site attributes" +msgstr "Configurer les attributs du site" +||||||| .r11156 +#: wp-admin/network/site-new.php:126 +msgid "Site Address" +msgstr "Adresse du site" +======= #: wp-admin/network/index.php:40 msgid "To add a new site, click Create a New Site." msgstr "Pour ajouter un nouveau site, cliquez sur CrÃ©er un nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:34 +msgid "You have chosen to delete the following users from all networks and sites." +msgstr "Vous avez choisi de supprimer les utilisateurs suivants de tous les rÃ©seaux et sites." +||||||| .r11156 +#: wp-admin/network/site-new.php:142 +msgid "Admin Email" +msgstr "Adresse de contact de l’administrateur" +======= #: wp-admin/network/index.php:39 msgid "To add a new user, click Create a New User." msgstr "Pour ajouter un nouvel utilisateur, cliquez sur CrÃ©er un nouvel utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:116 +msgid "Once you hit “Confirm Deletion”, the user will be permanently removed." +msgstr "Une fois que vous aurez cliquÃ© sur « Confirmer la suppression », l’utilisateur serait dÃ©finitivement supprimÃ©." +||||||| .r11156 +#: wp-admin/network/site-new.php:146 +msgid "A new user will be created if the above email address is not in the database." +msgstr "Un nouvel utilisateur sera crÃ©Ã© si l’adresse de contact n’existe pas dans la base de donnÃ©es." +======= #: wp-admin/network/index.php:38 msgid "The Right Now widget on this screen provides current user and site counts on your network." msgstr "Le widget Aujourd’hui de cet Ã©cran vous donne le nombre actuel d’utilisateurs et de sites sur votre rÃ©seau." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/network/users.php:102 +msgid "User has no sites or content and will be deleted." +msgstr "L'utilisateur n'a aucun site ni contenu, et sera supprimÃ©." +||||||| .r11156 +#: wp-admin/network/site-new.php:146 +msgid "The username and password will be mailed to this email address." +msgstr "L’identifiant et le mot de passe seront envoyÃ©s sur l’adresse de contact indiquÃ©e." +======= #: wp-admin/network/index.php:30 msgid "Modify global network settings" msgstr "Modifier les rÃ©glages globaux du rÃ©seau" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/network/users.php:271 +msgid "Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site." +msgstr "Survolez n’importe quel des utilisateurs de la liste pour faire apparaÃ®tre les liens de modification. Le lien Modifier Ã gauche ouvrira la page de modification du profil de l'utilisateur ; le lien Modifier Ã droite de n'importe quel nom de site ouvrira l'Ã©cran de modification de ce site." + +#: wp-admin/network/users.php:53 +msgid "Warning! User cannot be deleted. The user %s is a network administrator." +msgstr "Attention ! L’utilisateur %s ne peut Ãªtre effacÃ© car c’est un administrateur du rÃ©seau." + +#: wp-admin/network/users.php:182 +msgid "Warning! User cannot be modified. The user %s is a network administrator." +msgstr "Attention ! L’utilisateur %s ne peut Ãªtre modifiÃ© car c’est un administrateur du rÃ©seau." +#: wp-admin/network/index.php:25 +msgid "Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network." +msgstr "Bienvenue dans l’administration de votre rÃ©seau ! Cette partie des Ã©crans d’administration sert Ã gÃ©rer tous les aspects de votre rÃ©seau multisite." + +#: wp-admin/network/sites.php:73 +msgid "The requested action is not valid." +msgstr "L’action demandÃ©e n’est pas valide." + +#: wp-admin/network/sites.php:65 +msgid "You are about to mark the site %s as not mature." +msgstr "Vous Ãªtes sur le point d’indiquer que le site %s n’est pas rÃ©servÃ© aux adultes." + +#: wp-admin/network/sites.php:64 +msgid "You are about to mark the site %s as mature." +msgstr "Vous Ãªtes sur le point d’indiquer que le site %s est rÃ©servÃ© aux adultes." +||||||| .r11156 +#: wp-admin/network/site-users.php:310 wp-admin/network/user-new.php:98 +msgid "Username and password will be mailed to the above email address." +msgstr "L’identifiant et le mot de passe seront envoyÃ©s Ã l’adresse de contact prÃ©cisÃ©e." +======= #: wp-admin/network/index.php:29 msgid "Update your network" msgstr "Mettre Ã jour votre rÃ©seau" @@ -1147,3 +3862,4 @@ msgstr "Bienvenue dans l’administration de votre rÃ©seau ! Cette part #: wp-admin/network/users.php:213 msgid "You do not have permission to access this page." msgstr "Vous n’avez pas les droits suffisants pour accÃ©der Ã cette page." +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.mo b/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.mo index 80c3cd5b..61cf18d2 100644 Binary files a/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.mo and b/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.po b/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.po index f5979aaf..2776ba9e 100644 --- a/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.po +++ b/pavillonmadeleine.fr/wp-content/languages/continents-cities-fr_FR.po @@ -2,7 +2,13 @@ # This file is distributed under the same license as the Continents & Cities package. msgid "" msgstr "" +<<<<<<< .mine +"PO-Revision-Date: 2015-04-22 17:21:32+0000\n" +||||||| .r11156 +"PO-Revision-Date: 2012-12-10 19:36:26+0000\n" +======= "PO-Revision-Date: 2015-06-28 13:27:39+0000\n" +>>>>>>> .r12027 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,177 +16,562 @@ msgstr "" "X-Generator: GlotPress/1.0-alpha-1100\n" "Project-Id-Version: Continents & Cities\n" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:481 +msgid "Pitcairn" +msgstr "Ãles Pitcairn" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:135 +msgid "Vincennes" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:493 msgid "Yap" msgstr "Yap" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:482 +msgid "Ponape" +msgstr "Pohnpei (Ponape)" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:136 +msgid "Winamac" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:492 msgid "Wallis" msgstr "Wallis-et-Futuna" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:490 +msgid "Truk" +msgstr "Chuuk (Truk)" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:137 +msgid "Inuvik" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:491 msgid "Wake" msgstr "Ãle Wake" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:491 +msgid "Wake" +msgstr "Ãle Wake" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:138 +msgid "Iqaluit" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:490 msgid "Truk" msgstr "Chuuk (Truk)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:492 +msgid "Wallis" +msgstr "Wallis-et-Futuna" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:139 +msgid "Jamaica" +msgstr "JamaÃ¯que" +======= #: wp-admin/includes/continents-cities.php:489 msgid "Tongatapu" msgstr "Tongatapu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:483 +msgid "Port Moresby" +msgstr "Port Moresby" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:140 +msgid "Juneau" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:488 msgid "Tarawa" msgstr "Tarawa" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:484 +msgid "Rarotonga" +msgstr "Rarotonga" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:141 +msgid "Kentucky" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:487 msgid "Tahiti" msgstr "Tahiti" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:485 +msgid "Saipan" +msgstr "Saipan" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:142 +msgid "Louisville" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:486 msgid "Samoa" msgstr "Samoa" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:489 +msgid "Tongatapu" +msgstr "Tongatapu" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:143 +msgid "Monticello" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:485 msgid "Saipan" msgstr "Saipan" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:493 +msgid "Yap" +msgstr "Yap" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:144 +msgid "Knox IN" +msgstr "Knox (Indiana)" +======= #: wp-admin/includes/continents-cities.php:484 msgid "Rarotonga" msgstr "Rarotonga" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:487 +msgid "Tahiti" +msgstr "Tahiti" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:145 +msgid "La Paz" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:483 msgid "Port Moresby" msgstr "Port Moresby" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:488 +msgid "Tarawa" +msgstr "Tarawa" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:146 +msgid "Lima" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:482 msgid "Ponape" msgstr "Pohnpei (Ponape)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:486 +msgid "Samoa" +msgstr "Samoa" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:147 +msgid "Los Angeles" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:481 msgid "Pitcairn" msgstr "Ãles Pitcairn" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:480 -msgid "Palau" -msgstr "Palaos" - -#: wp-admin/includes/continents-cities.php:479 -msgid "Pago Pago" -msgstr "Pago Pago" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:148 +msgid "Maceio" +msgstr "MaceiÃ³" -#: wp-admin/includes/continents-cities.php:478 -msgid "Noumea" -msgstr "NoumÃ©a" +#: wp-admin/includes/continents-cities.php:149 +msgid "Managua" +msgstr "" -#: wp-admin/includes/continents-cities.php:477 -msgid "Norfolk" -msgstr "Norfolk" +#: wp-admin/includes/continents-cities.php:150 +msgid "Manaus" +msgstr "" -#: wp-admin/includes/continents-cities.php:476 -msgid "Niue" -msgstr "NiuÃ©" +#: wp-admin/includes/continents-cities.php:151 +msgid "Marigot" +msgstr "" -#: wp-admin/includes/continents-cities.php:475 -msgid "Nauru" -msgstr "Nauru" +#: wp-admin/includes/continents-cities.php:152 +msgid "Martinique" +msgstr "" -#: wp-admin/includes/continents-cities.php:474 -msgid "Midway" -msgstr "Atoll de Midway" +#: wp-admin/includes/continents-cities.php:153 +msgid "Mazatlan" +msgstr "" -#: wp-admin/includes/continents-cities.php:473 -msgid "Marquesas" -msgstr "Ãles Marquises" +#: wp-admin/includes/continents-cities.php:154 +msgid "Menominee" +msgstr "" -#: wp-admin/includes/continents-cities.php:472 -msgid "Majuro" -msgstr "Majuro" +#: wp-admin/includes/continents-cities.php:155 +msgid "Merida" +msgstr "" -#: wp-admin/includes/continents-cities.php:471 -msgid "Kwajalein" -msgstr "Kwajalein" +#: wp-admin/includes/continents-cities.php:156 +msgid "Mexico City" +msgstr "Mexico" -#: wp-admin/includes/continents-cities.php:470 -msgid "Kosrae" -msgstr "Kosrae" +#: wp-admin/includes/continents-cities.php:157 +msgid "Miquelon" +msgstr "" -#: wp-admin/includes/continents-cities.php:469 -msgid "Kiritimati" -msgstr "Ãle Christmas (Kiribati)" +#: wp-admin/includes/continents-cities.php:158 +msgid "Moncton" +msgstr "" -#: wp-admin/includes/continents-cities.php:468 -msgid "Johnston" -msgstr "Atoll de Johnston" +#: wp-admin/includes/continents-cities.php:159 +msgid "Monterrey" +msgstr "" -#: wp-admin/includes/continents-cities.php:467 -msgid "Honolulu" -msgstr "Honolulu" +#: wp-admin/includes/continents-cities.php:160 +msgid "Montevideo" +msgstr "" -#: wp-admin/includes/continents-cities.php:466 -msgid "Guam" -msgstr "Guam" +#: wp-admin/includes/continents-cities.php:161 +msgid "Montreal" +msgstr "MontrÃ©al" -#: wp-admin/includes/continents-cities.php:465 -msgid "Guadalcanal" -msgstr "Guadalcanal" +#: wp-admin/includes/continents-cities.php:162 +msgid "Montserrat" +msgstr "" -#: wp-admin/includes/continents-cities.php:464 -msgid "Gambier" -msgstr "Ãles Gambier" +#: wp-admin/includes/continents-cities.php:163 +msgid "Nassau" +msgstr "" -#: wp-admin/includes/continents-cities.php:463 -msgid "Galapagos" -msgstr "Ãles GalÃ¡pagos" +#: wp-admin/includes/continents-cities.php:164 +msgid "New York" +msgstr "" -#: wp-admin/includes/continents-cities.php:462 -msgid "Funafuti" -msgstr "Funafuti" +#: wp-admin/includes/continents-cities.php:165 +msgid "Nipigon" +msgstr "" -#: wp-admin/includes/continents-cities.php:461 -msgid "Fiji" -msgstr "Fidji" +#: wp-admin/includes/continents-cities.php:166 +msgid "Nome" +msgstr "" -#: wp-admin/includes/continents-cities.php:460 -msgid "Fakaofo" -msgstr "Fakaofo" +#: wp-admin/includes/continents-cities.php:167 +msgid "Noronha" +msgstr "" -#: wp-admin/includes/continents-cities.php:459 -msgid "Enderbury" -msgstr "Enderbury" +#: wp-admin/includes/continents-cities.php:168 +msgid "North Dakota" +msgstr "Dakota du Nord" -#: wp-admin/includes/continents-cities.php:458 -msgid "Efate" -msgstr "ÃfatÃ©" +#: wp-admin/includes/continents-cities.php:169 +msgid "Center" +msgstr "" -#: wp-admin/includes/continents-cities.php:457 -msgid "Easter" -msgstr "Ãle de PÃ¢ques" +#: wp-admin/includes/continents-cities.php:170 +msgid "New Salem" +msgstr "" -#: wp-admin/includes/continents-cities.php:456 -msgid "Chatham" -msgstr "Ãles Chatham" +#: wp-admin/includes/continents-cities.php:171 +msgid "Panama" +msgstr "" -#: wp-admin/includes/continents-cities.php:455 -msgid "Auckland" -msgstr "Auckland" +#: wp-admin/includes/continents-cities.php:172 +msgid "Pangnirtung" +msgstr "" -#: wp-admin/includes/continents-cities.php:454 -msgid "Apia" -msgstr "Apia" +#: wp-admin/includes/continents-cities.php:173 +msgid "Paramaribo" +msgstr "" -#: wp-admin/includes/continents-cities.php:453 -msgid "Pacific" -msgstr "OcÃ©an Pacifique" +#: wp-admin/includes/continents-cities.php:174 +msgid "Phoenix" +msgstr "" -#: wp-admin/includes/continents-cities.php:452 -msgid "Reunion" -msgstr "Ãle de la RÃ©union" +#: wp-admin/includes/continents-cities.php:175 +msgid "Port-au-Prince" +msgstr "" -#: wp-admin/includes/continents-cities.php:451 -msgid "Mayotte" -msgstr "Mayotte" +#: wp-admin/includes/continents-cities.php:176 +msgid "Port of Spain" +msgstr "Port-d'Espagne" + +#: wp-admin/includes/continents-cities.php:177 +msgid "Porto Acre" +msgstr "" + +#: wp-admin/includes/continents-cities.php:178 +msgid "Porto Velho" +msgstr "" + +#: wp-admin/includes/continents-cities.php:179 +msgid "Puerto Rico" +msgstr "Porto Rico" + +#: wp-admin/includes/continents-cities.php:180 +msgid "Rainy River" +msgstr "" + +#: wp-admin/includes/continents-cities.php:181 +msgid "Rankin Inlet" +msgstr "Kangiqtiniq (Rankin Inlet)" + +#: wp-admin/includes/continents-cities.php:182 +msgid "Recife" +msgstr "" + +#: wp-admin/includes/continents-cities.php:183 +msgid "Regina" +msgstr "" + +#: wp-admin/includes/continents-cities.php:184 +msgid "Resolute" +msgstr "" + +#: wp-admin/includes/continents-cities.php:185 +msgid "Rio Branco" +msgstr "" + +#: wp-admin/includes/continents-cities.php:186 +msgid "Rosario" +msgstr "" + +#: wp-admin/includes/continents-cities.php:187 +msgid "Santiago" +msgstr "Santiago du Chili" + +#: wp-admin/includes/continents-cities.php:188 +msgid "Santo Domingo" +msgstr "Saint-Domingue" + +#: wp-admin/includes/continents-cities.php:189 +msgid "Sao Paulo" +msgstr "SÃ£o Paulo" + +#: wp-admin/includes/continents-cities.php:190 +msgid "Scoresbysund" +msgstr "Ittoqqortoormiit (Scoresbysund)" + +#: wp-admin/includes/continents-cities.php:191 +msgid "Shiprock" +msgstr "" + +#: wp-admin/includes/continents-cities.php:192 +msgid "St Barthelemy" +msgstr "Saint-BarthÃ©lemy" + +#: wp-admin/includes/continents-cities.php:193 +msgid "St Johns" +msgstr "Saint John's" + +#: wp-admin/includes/continents-cities.php:194 +msgid "St Kitts" +msgstr "Ãle Saint-Christophe" + +#: wp-admin/includes/continents-cities.php:195 +msgid "St Lucia" +msgstr "Sainte-Lucie" + +#: wp-admin/includes/continents-cities.php:196 +msgid "St Thomas" +msgstr "Saint Thomas" + +#: wp-admin/includes/continents-cities.php:197 +msgid "St Vincent" +msgstr "Saint Vincent" + +#: wp-admin/includes/continents-cities.php:198 +msgid "Swift Current" +msgstr "" + +#: wp-admin/includes/continents-cities.php:199 +msgid "Tegucigalpa" +msgstr "" + +#: wp-admin/includes/continents-cities.php:200 +msgid "Thule" +msgstr "" + +#: wp-admin/includes/continents-cities.php:201 +msgid "Thunder Bay" +msgstr "" + +#: wp-admin/includes/continents-cities.php:202 +msgid "Tijuana" +msgstr "" + +#: wp-admin/includes/continents-cities.php:203 +msgid "Toronto" +msgstr "" + +#: wp-admin/includes/continents-cities.php:204 +msgid "Tortola" +msgstr "" + +#: wp-admin/includes/continents-cities.php:205 +msgid "Vancouver" +msgstr "" + +#: wp-admin/includes/continents-cities.php:206 +msgid "Virgin" +msgstr "" + +#: wp-admin/includes/continents-cities.php:207 +msgid "Whitehorse" +msgstr "" + +#: wp-admin/includes/continents-cities.php:208 +msgid "Winnipeg" +msgstr "" + +#: wp-admin/includes/continents-cities.php:209 +msgid "Yakutat" +msgstr "" + +#: wp-admin/includes/continents-cities.php:210 +msgid "Yellowknife" +msgstr "" + +======= +#: wp-admin/includes/continents-cities.php:480 +msgid "Palau" +msgstr "Palaos" + +#: wp-admin/includes/continents-cities.php:479 +msgid "Pago Pago" +msgstr "Pago Pago" + +#: wp-admin/includes/continents-cities.php:478 +msgid "Noumea" +msgstr "NoumÃ©a" + +#: wp-admin/includes/continents-cities.php:477 +msgid "Norfolk" +msgstr "Norfolk" + +#: wp-admin/includes/continents-cities.php:476 +msgid "Niue" +msgstr "NiuÃ©" + +#: wp-admin/includes/continents-cities.php:475 +msgid "Nauru" +msgstr "Nauru" + +#: wp-admin/includes/continents-cities.php:474 +msgid "Midway" +msgstr "Atoll de Midway" + +#: wp-admin/includes/continents-cities.php:473 +msgid "Marquesas" +msgstr "Ãles Marquises" + +#: wp-admin/includes/continents-cities.php:472 +msgid "Majuro" +msgstr "Majuro" + +#: wp-admin/includes/continents-cities.php:471 +msgid "Kwajalein" +msgstr "Kwajalein" + +#: wp-admin/includes/continents-cities.php:470 +msgid "Kosrae" +msgstr "Kosrae" + +#: wp-admin/includes/continents-cities.php:469 +msgid "Kiritimati" +msgstr "Ãle Christmas (Kiribati)" + +#: wp-admin/includes/continents-cities.php:468 +msgid "Johnston" +msgstr "Atoll de Johnston" + +#: wp-admin/includes/continents-cities.php:467 +msgid "Honolulu" +msgstr "Honolulu" + +#: wp-admin/includes/continents-cities.php:466 +msgid "Guam" +msgstr "Guam" + +#: wp-admin/includes/continents-cities.php:465 +msgid "Guadalcanal" +msgstr "Guadalcanal" + +#: wp-admin/includes/continents-cities.php:464 +msgid "Gambier" +msgstr "Ãles Gambier" + +#: wp-admin/includes/continents-cities.php:463 +msgid "Galapagos" +msgstr "Ãles GalÃ¡pagos" + +#: wp-admin/includes/continents-cities.php:462 +msgid "Funafuti" +msgstr "Funafuti" + +#: wp-admin/includes/continents-cities.php:461 +msgid "Fiji" +msgstr "Fidji" + +#: wp-admin/includes/continents-cities.php:460 +msgid "Fakaofo" +msgstr "Fakaofo" + +#: wp-admin/includes/continents-cities.php:459 +msgid "Enderbury" +msgstr "Enderbury" + +#: wp-admin/includes/continents-cities.php:458 +msgid "Efate" +msgstr "ÃfatÃ©" + +#: wp-admin/includes/continents-cities.php:457 +msgid "Easter" +msgstr "Ãle de PÃ¢ques" + +#: wp-admin/includes/continents-cities.php:456 +msgid "Chatham" +msgstr "Ãles Chatham" + +#: wp-admin/includes/continents-cities.php:455 +msgid "Auckland" +msgstr "Auckland" + +#: wp-admin/includes/continents-cities.php:454 +msgid "Apia" +msgstr "Apia" + +#: wp-admin/includes/continents-cities.php:453 +msgid "Pacific" +msgstr "OcÃ©an Pacifique" + +#: wp-admin/includes/continents-cities.php:452 +msgid "Reunion" +msgstr "Ãle de la RÃ©union" + +#: wp-admin/includes/continents-cities.php:451 +msgid "Mayotte" +msgstr "Mayotte" #: wp-admin/includes/continents-cities.php:450 msgid "Mauritius" @@ -314,10 +705,22 @@ msgstr "Riga" msgid "Prague" msgstr "Prague" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:417 msgid "Podgorica" msgstr "Podgorica" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:212 +msgid "Casey" +msgstr "" + +#: wp-admin/includes/continents-cities.php:213 +msgid "Davis" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:416 msgid "Paris" msgstr "Paris" @@ -326,10 +729,30 @@ msgstr "Paris" msgid "Oslo" msgstr "Oslo" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:414 msgid "Moscow" msgstr "Moscou" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:215 +msgid "Mawson" +msgstr "" + +#: wp-admin/includes/continents-cities.php:216 +msgid "McMurdo" +msgstr "" + +#: wp-admin/includes/continents-cities.php:217 +msgid "Palmer" +msgstr "" + +#: wp-admin/includes/continents-cities.php:218 +msgid "Rothera" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:413 msgid "Monaco" msgstr "Monaco" @@ -346,10 +769,22 @@ msgstr "Mariehamn" msgid "Malta" msgstr "Malte" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:409 msgid "Madrid" msgstr "Madrid" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:220 +msgid "Syowa" +msgstr "" + +#: wp-admin/includes/continents-cities.php:221 +msgid "Vostok" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:408 msgid "Luxembourg" msgstr "Luxembourg" @@ -358,18 +793,46 @@ msgstr "Luxembourg" msgid "London" msgstr "Londres" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:406 msgid "Ljubljana" msgstr "Ljubljana" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:223 +msgid "Longyearbyen" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:405 msgid "Lisbon" msgstr "Lisbonne" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:404 msgid "Kiev" msgstr "Kiev" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:225 +msgid "Aden" +msgstr "" + +#: wp-admin/includes/continents-cities.php:226 +msgid "Almaty" +msgstr "" + +#: wp-admin/includes/continents-cities.php:227 +msgid "Amman" +msgstr "" + +#: wp-admin/includes/continents-cities.php:228 +msgid "Anadyr" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:403 msgid "Kaliningrad" msgstr "Kaliningrad" @@ -386,6 +849,7 @@ msgstr "Ãle de Man" msgid "Helsinki" msgstr "Helsinki" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:399 msgid "Guernsey" msgstr "Guernsey" @@ -414,10 +878,18 @@ msgstr "Budapest" msgid "Bucharest" msgstr "Bucarest" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:236 +msgid "Bangkok" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:392 msgid "Brussels" msgstr "Bruxelles" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:391 msgid "Bratislava" msgstr "Bratislava" @@ -426,6 +898,17 @@ msgstr "Bratislava" msgid "Berlin" msgstr "Berlin" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:239 +msgid "Brunei" +msgstr "" + +#: wp-admin/includes/continents-cities.php:240 +msgid "Calcutta" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:389 msgid "Belgrade" msgstr "Belgrade" @@ -434,10 +917,26 @@ msgstr "Belgrade" msgid "Belfast" msgstr "Belfast" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:387 msgid "Athens" msgstr "AthÃ¨nes" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:242 +msgid "Chongqing" +msgstr "" + +#: wp-admin/includes/continents-cities.php:243 +msgid "Chungking" +msgstr "" + +#: wp-admin/includes/continents-cities.php:244 +msgid "Colombo" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:386 msgid "Andorra" msgstr "Andorre" @@ -450,6 +949,7 @@ msgstr "Amsterdam" msgid "Europe" msgstr "Europe" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:383 msgid "Zulu" msgstr "Zulu" @@ -462,10 +962,18 @@ msgstr "UTC" msgid "Universal" msgstr "Universel" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:248 +msgid "Dili" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:380 msgid "UCT" msgstr "UTC" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:379 msgid "Greenwich" msgstr "Greenwich" @@ -474,6 +982,17 @@ msgstr "Greenwich" msgid "GMT0" msgstr "UTC0" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:251 +msgid "Gaza" +msgstr "" + +#: wp-admin/includes/continents-cities.php:252 +msgid "Harbin" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:377 msgid "GMT-9" msgstr "UTC-9" @@ -482,10 +1001,22 @@ msgstr "UTC-9" msgid "GMT-8" msgstr "UTC-8" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:375 msgid "GMT-7" msgstr "UTC-7" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:254 +msgid "Hong Kong" +msgstr "" + +#: wp-admin/includes/continents-cities.php:255 +msgid "Hovd" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:374 msgid "GMT-6" msgstr "UTC-6" @@ -494,10 +1025,26 @@ msgstr "UTC-6" msgid "GMT-5" msgstr "UTC-5" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:372 msgid "GMT-4" msgstr "UTC-4" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:257 +msgid "Istanbul" +msgstr "" + +#: wp-admin/includes/continents-cities.php:258 +msgid "Jakarta" +msgstr "" + +#: wp-admin/includes/continents-cities.php:259 +msgid "Jayapura" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:371 msgid "GMT-3" msgstr "UTC-3" @@ -510,6 +1057,7 @@ msgstr "UTC-2" msgid "GMT-14" msgstr "UTC-14" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:368 msgid "GMT-13" msgstr "UTC-13" @@ -522,10 +1070,18 @@ msgstr "UTC-12" msgid "GMT-11" msgstr "UTC-11" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:263 +msgid "Karachi" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:365 msgid "GMT-10" msgstr "UTC-10" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:364 msgid "GMT-1" msgstr "UTC-1" @@ -542,6 +1098,17 @@ msgstr "UTC+9" msgid "GMT+8" msgstr "UTC+8" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:268 +msgid "Kuala Lumpur" +msgstr "" + +#: wp-admin/includes/continents-cities.php:269 +msgid "Kuching" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:360 msgid "GMT+7" msgstr "UTC+7" @@ -550,18 +1117,38 @@ msgstr "UTC+7" msgid "GMT+6" msgstr "UTC+6" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:358 msgid "GMT+5" msgstr "UTC+5" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:271 +msgid "Macao" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:357 msgid "GMT+4" msgstr "UTC+4" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:356 msgid "GMT+3" msgstr "UTC+3" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:273 +msgid "Magadan" +msgstr "" + +#: wp-admin/includes/continents-cities.php:274 +msgid "Makassar" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:355 msgid "GMT+2" msgstr "UTC+2" @@ -570,6 +1157,7 @@ msgstr "UTC+2" msgid "GMT+12" msgstr "UTC+12" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:353 msgid "GMT+11" msgstr "UTC+11" @@ -586,14 +1174,41 @@ msgstr "UTC+1" msgid "GMT+0" msgstr "UTC+0" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:279 +msgid "Omsk" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:349 msgid "GMT" msgstr "UTC" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:348 msgid "Etc" msgstr "Etc." +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:281 +msgid "Phnom Penh" +msgstr "" + +#: wp-admin/includes/continents-cities.php:282 +msgid "Pontianak" +msgstr "" + +#: wp-admin/includes/continents-cities.php:283 +msgid "Pyongyang" +msgstr "" + +#: wp-admin/includes/continents-cities.php:284 +msgid "Qatar" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:347 msgid "Yancowinna" msgstr "Yancowinna" @@ -610,14 +1225,23 @@ msgstr "Victoria" msgid "Tasmania" msgstr "Tasmanie" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:343 msgid "Sydney" msgstr "Sydney" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:286 +msgid "Rangoon" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:342 msgid "South" msgstr "Sud" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:341 msgid "Queensland" msgstr "Queensland" @@ -638,18 +1262,34 @@ msgstr "Nord" msgid "Melbourne" msgstr "Melbourne" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:292 +msgid "Shanghai" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:336 msgid "Lord Howe" msgstr "Ãle Lord Howe (LHI)" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:335 msgid "Lindeman" msgstr "Lindeman" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:294 +msgid "Taipei" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:334 msgid "LHI" msgstr "Ãle Lord Howe (LHI)" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:333 msgid "Hobart" msgstr "Hobart" @@ -694,6 +1334,17 @@ msgstr "Australie" msgid "Stanley" msgstr "Stanley" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:306 +msgid "Vientiane" +msgstr "" + +#: wp-admin/includes/continents-cities.php:307 +msgid "Vladivostok" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:322 msgid "St Helena" msgstr "Sainte-HÃ©lÃ¨ne" @@ -702,6 +1353,7 @@ msgstr "Sainte-HÃ©lÃ¨ne" msgid "South Georgia" msgstr "Ãle de GÃ©orgie du Sud" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:320 msgid "Reykjavik" msgstr "ReykjavÃk" @@ -762,10 +1414,18 @@ msgstr "Vladivostok" msgid "Vientiane" msgstr "Vientiane" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:323 +msgid "Stanley" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:305 msgid "Urumqi" msgstr "ÃrÃ¼mqi" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:304 msgid "Ulan Bator" msgstr "Oulan-Bator (Ulaanbaatar)" @@ -778,6 +1438,37 @@ msgstr "Oulan-Bator (Ulaanbaatar)" msgid "Ujung Pandang" msgstr "Makassar (Ujung Pandang)" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:327 +msgid "Brisbane" +msgstr "" + +#: wp-admin/includes/continents-cities.php:328 +msgid "Broken Hill" +msgstr "" + +#: wp-admin/includes/continents-cities.php:329 +msgid "Canberra" +msgstr "" + +#: wp-admin/includes/continents-cities.php:330 +msgid "Currie" +msgstr "" + +#: wp-admin/includes/continents-cities.php:331 +msgid "Darwin" +msgstr "" + +#: wp-admin/includes/continents-cities.php:332 +msgid "Eucla" +msgstr "" + +#: wp-admin/includes/continents-cities.php:333 +msgid "Hobart" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:301 msgid "Tokyo" msgstr "TÅkyÅ" @@ -810,22 +1501,39 @@ msgstr "Tachkent" msgid "Taipei" msgstr "" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:293 msgid "Singapore" msgstr "Singapour" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:335 +msgid "Lindeman" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:292 msgid "Shanghai" msgstr "" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:291 msgid "Seoul" msgstr "SÃ©oul" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:337 +msgid "Melbourne" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:290 msgid "Samarkand" msgstr "Samarcande" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:289 msgid "Sakhalin" msgstr "Sakhaline" @@ -834,6 +1542,17 @@ msgstr "Sakhaline" msgid "Saigon" msgstr "HÃ´-Chi-Minh-Ville (Saigon)" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:340 +msgid "Perth" +msgstr "" + +#: wp-admin/includes/continents-cities.php:341 +msgid "Queensland" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:287 msgid "Riyadh" msgstr "Riyad" @@ -842,30 +1561,55 @@ msgstr "Riyad" msgid "Rangoon" msgstr "Rangoon" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:285 msgid "Qyzylorda" msgstr "Kyzylorda" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:343 +msgid "Sydney" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:284 msgid "Qatar" msgstr "" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:283 msgid "Pyongyang" msgstr "Pyongyang" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:345 +msgid "Victoria" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:282 msgid "Pontianak" msgstr "Pontianak" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:281 msgid "Phnom Penh" msgstr "Phnom Penh" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:347 +msgid "Yancowinna" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:280 msgid "Oral" msgstr "Oural" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:279 msgid "Omsk" msgstr "Omsk" @@ -990,10 +1734,18 @@ msgstr "DouchanbÃ©" msgid "Dubai" msgstr "DubaÃ¯" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:379 +msgid "Greenwich" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:248 msgid "Dili" msgstr "Dili" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:247 msgid "Dhaka" msgstr "DhÃ¢kÃ¢ (Dacca)" @@ -1002,6 +1754,25 @@ msgstr "DhÃ¢kÃ¢ (Dacca)" msgid "Damascus" msgstr "Damas" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:382 +msgid "UTC" +msgstr "" + +#: wp-admin/includes/continents-cities.php:383 +msgid "Zulu" +msgstr "" + +#: wp-admin/includes/continents-cities.php:384 +msgid "Europe" +msgstr "" + +#: wp-admin/includes/continents-cities.php:385 +msgid "Amsterdam" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:245 msgid "Dacca" msgstr "DhÃ¢kÃ¢ (Dacca)" @@ -1018,6 +1789,7 @@ msgstr "Chungking" msgid "Chongqing" msgstr "Chongqing" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:241 msgid "Choibalsan" msgstr "Choybalsan" @@ -1026,10 +1798,29 @@ msgstr "Choybalsan" msgid "Calcutta" msgstr "Calcutta" -#: wp-admin/includes/continents-cities.php:239 -msgid "Brunei" -msgstr "Brunei" - +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:388 +msgid "Belfast" +msgstr "" + +#: wp-admin/includes/continents-cities.php:389 +msgid "Belgrade" +msgstr "" + +#: wp-admin/includes/continents-cities.php:390 +msgid "Berlin" +msgstr "" + +#: wp-admin/includes/continents-cities.php:391 +msgid "Bratislava" +msgstr "" + +======= +#: wp-admin/includes/continents-cities.php:239 +msgid "Brunei" +msgstr "Brunei" + #: wp-admin/includes/continents-cities.php:238 msgid "Bishkek" msgstr "Bichkek" @@ -1042,6 +1833,7 @@ msgstr "Beyrouth" msgid "Bangkok" msgstr "Bangkok" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:235 msgid "Baku" msgstr "Bakou" @@ -1050,10 +1842,18 @@ msgstr "Bakou" msgid "Bahrain" msgstr "BahreÃ¯n" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:394 +msgid "Budapest" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:233 msgid "Baghdad" msgstr "Bagdad" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:232 msgid "Ashkhabad" msgstr "Achgabat" @@ -1062,6 +1862,25 @@ msgstr "Achgabat" msgid "Ashgabat" msgstr "Achgabat" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:397 +msgid "Dublin" +msgstr "" + +#: wp-admin/includes/continents-cities.php:398 +msgid "Gibraltar" +msgstr "" + +#: wp-admin/includes/continents-cities.php:399 +msgid "Guernsey" +msgstr "" + +#: wp-admin/includes/continents-cities.php:400 +msgid "Helsinki" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:230 msgid "Aqtobe" msgstr "AktioubÃ©" @@ -1078,10 +1897,26 @@ msgstr "Anadyr" msgid "Amman" msgstr "Amman" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:226 msgid "Almaty" msgstr "Almaty" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:402 +msgid "Jersey" +msgstr "" + +#: wp-admin/includes/continents-cities.php:403 +msgid "Kaliningrad" +msgstr "" + +#: wp-admin/includes/continents-cities.php:404 +msgid "Kiev" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:225 msgid "Aden" msgstr "Aden" @@ -1094,18 +1929,38 @@ msgstr "Asie" msgid "Longyearbyen" msgstr "Longyearbyen" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:222 msgid "Arctic" msgstr "Arctique" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:406 +msgid "Ljubljana" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:221 msgid "Vostok" msgstr "Vostok" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:220 msgid "Syowa" msgstr "Syowa" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:408 +msgid "Luxembourg" +msgstr "" + +#: wp-admin/includes/continents-cities.php:409 +msgid "Madrid" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:219 msgid "South Pole" msgstr "PÃ´le Sud" @@ -1114,10 +1969,26 @@ msgstr "PÃ´le Sud" msgid "Rothera" msgstr "Rothera" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:217 msgid "Palmer" msgstr "Palmer" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:411 +msgid "Mariehamn" +msgstr "" + +#: wp-admin/includes/continents-cities.php:412 +msgid "Minsk" +msgstr "" + +#: wp-admin/includes/continents-cities.php:413 +msgid "Monaco" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:216 msgid "McMurdo" msgstr "McMurdo" @@ -1130,10 +2001,42 @@ msgstr "Mawson" msgid "DumontDUrville" msgstr "Dumont d'Urville" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:213 msgid "Davis" msgstr "Davis" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:415 +msgid "Oslo" +msgstr "" + +#: wp-admin/includes/continents-cities.php:416 +msgid "Paris" +msgstr "" + +#: wp-admin/includes/continents-cities.php:417 +msgid "Podgorica" +msgstr "" + +#: wp-admin/includes/continents-cities.php:418 +msgid "Prague" +msgstr "" + +#: wp-admin/includes/continents-cities.php:419 +msgid "Riga" +msgstr "" + +#: wp-admin/includes/continents-cities.php:420 +msgid "Rome" +msgstr "" + +#: wp-admin/includes/continents-cities.php:421 +msgid "Samara" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:212 msgid "Casey" msgstr "Casey" @@ -1162,10 +2065,38 @@ msgstr "Whitehorse" msgid "Virgin" msgstr "Virgin" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:205 msgid "Vancouver" msgstr "Vancouver" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:423 +msgid "Sarajevo" +msgstr "" + +#: wp-admin/includes/continents-cities.php:424 +msgid "Simferopol" +msgstr "" + +#: wp-admin/includes/continents-cities.php:425 +msgid "Skopje" +msgstr "" + +#: wp-admin/includes/continents-cities.php:426 +msgid "Sofia" +msgstr "" + +#: wp-admin/includes/continents-cities.php:427 +msgid "Stockholm" +msgstr "" + +#: wp-admin/includes/continents-cities.php:428 +msgid "Tallinn" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:204 msgid "Tortola" msgstr "Tortola" @@ -1190,18 +2121,38 @@ msgstr "Thule" msgid "Tegucigalpa" msgstr "Tegucigalpa" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:198 msgid "Swift Current" msgstr "Swift Current" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:430 +msgid "Tiraspol" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:197 msgid "St Vincent" msgstr "Saint Vincent" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:196 msgid "St Thomas" msgstr "Saint Thomas" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:432 +msgid "Vaduz" +msgstr "" + +#: wp-admin/includes/continents-cities.php:433 +msgid "Vatican" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:195 msgid "St Lucia" msgstr "Sainte-Lucie" @@ -1210,10 +2161,22 @@ msgstr "Sainte-Lucie" msgid "St Kitts" msgstr "Ãle Saint-Christophe" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:193 msgid "St Johns" msgstr "Saint John's" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:435 +msgid "Vilnius" +msgstr "" + +#: wp-admin/includes/continents-cities.php:436 +msgid "Volgograd" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:192 msgid "St Barthelemy" msgstr "Saint-BarthÃ©lemy" @@ -1222,30 +2185,55 @@ msgstr "Saint-BarthÃ©lemy" msgid "Shiprock" msgstr "Shiprock" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:190 msgid "Scoresbysund" msgstr "Ittoqqortoormiit (Scoresbysund)" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:438 +msgid "Zagreb" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:189 msgid "Sao Paulo" msgstr "SÃ£o Paulo" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:188 msgid "Santo Domingo" msgstr "Saint-Domingue" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:440 +msgid "Zurich" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:187 msgid "Santiago" msgstr "Santiago du Chili" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:186 msgid "Rosario" msgstr "Rosario" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:442 +msgid "Antananarivo" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:185 msgid "Rio Branco" msgstr "Rio Branco" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:184 msgid "Resolute" msgstr "Resolute" @@ -1270,10 +2258,18 @@ msgstr "Rainy River" msgid "Puerto Rico" msgstr "Porto Rico" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:449 +msgid "Maldives" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:178 msgid "Porto Velho" msgstr "Porto Velho" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:177 msgid "Porto Acre" msgstr "Porto Acre" @@ -1290,6 +2286,17 @@ msgstr "Port-au-Prince" msgid "Phoenix" msgstr "Phoenix" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:454 +msgid "Apia" +msgstr "" + +#: wp-admin/includes/continents-cities.php:455 +msgid "Auckland" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:173 msgid "Paramaribo" msgstr "Paramaribo" @@ -1298,6 +2305,7 @@ msgstr "Paramaribo" msgid "Pangnirtung" msgstr "Pangnirtung" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:171 msgid "Panama" msgstr "Panama" @@ -1310,6 +2318,17 @@ msgstr "New Salem" msgid "Center" msgstr "Center" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:459 +msgid "Enderbury" +msgstr "" + +#: wp-admin/includes/continents-cities.php:460 +msgid "Fakaofo" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:168 msgid "North Dakota" msgstr "Dakota du Nord" @@ -1318,14 +2337,23 @@ msgstr "Dakota du Nord" msgid "Noronha" msgstr "Noronha" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:166 msgid "Nome" msgstr "Nome" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:462 +msgid "Funafuti" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:165 msgid "Nipigon" msgstr "Nipigon" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:164 msgid "New York" msgstr "New York" @@ -1334,6 +2362,21 @@ msgstr "New York" msgid "Nassau" msgstr "Nassau" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:465 +msgid "Guadalcanal" +msgstr "" + +#: wp-admin/includes/continents-cities.php:466 +msgid "Guam" +msgstr "" + +#: wp-admin/includes/continents-cities.php:467 +msgid "Honolulu" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:162 msgid "Montserrat" msgstr "Montserrat" @@ -1346,6 +2389,7 @@ msgstr "MontrÃ©al" msgid "Montevideo" msgstr "MontÃ©vidÃ©o" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:159 msgid "Monterrey" msgstr "Monterrey" @@ -1354,6 +2398,21 @@ msgstr "Monterrey" msgid "Moncton" msgstr "Moncton" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:470 +msgid "Kosrae" +msgstr "" + +#: wp-admin/includes/continents-cities.php:471 +msgid "Kwajalein" +msgstr "" + +#: wp-admin/includes/continents-cities.php:472 +msgid "Majuro" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:157 msgid "Miquelon" msgstr "Miquelon" @@ -1366,6 +2425,7 @@ msgstr "Mexico" msgid "Merida" msgstr "Merida" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:154 msgid "Menominee" msgstr "Menominee" @@ -1374,30 +2434,71 @@ msgstr "Menominee" msgid "Mazatlan" msgstr "Mazatlan" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:475 +msgid "Nauru" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:152 msgid "Martinique" msgstr "Martinique" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:151 msgid "Marigot" msgstr "Marigot" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:477 +msgid "Norfolk" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:150 msgid "Manaus" msgstr "Manaos" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:149 msgid "Managua" msgstr "Managua" +<<<<<<< .mine +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:479 +msgid "Pago Pago" +msgstr "" + +======= #: wp-admin/includes/continents-cities.php:148 msgid "Maceio" msgstr "MaceiÃ³" +>>>>>>> .r12027 #: wp-admin/includes/continents-cities.php:147 msgid "Los Angeles" msgstr "Los Angeles" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:284 +msgid "Qatar" +msgstr "" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:481 +msgid "Pitcairn" +msgstr "Ãles Pitcairn" + +#: wp-admin/includes/continents-cities.php:482 +msgid "Ponape" +msgstr "Pohnpei (Ponape)" + +#: wp-admin/includes/continents-cities.php:483 +msgid "Port Moresby" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:146 msgid "Lima" msgstr "Lima" @@ -1409,119 +2510,409 @@ msgstr "La Paz" #: wp-admin/includes/continents-cities.php:144 msgid "Knox IN" msgstr "Knox (Indiana)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:292 +msgid "Shanghai" +msgstr "" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:484 +msgid "Rarotonga" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:143 msgid "Monticello" msgstr "Monticello" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:294 +msgid "Taipei" +msgstr "" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:485 +msgid "Saipan" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:142 msgid "Louisville" msgstr "Louisville" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:286 +msgid "Rangoon" +msgstr "Rangoon" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:486 +msgid "Samoa" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:141 msgid "Kentucky" msgstr "Kentucky" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:140 -msgid "Juneau" -msgstr "Juneau" - +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:306 +msgid "Vientiane" +msgstr "Vientiane" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:487 +msgid "Tahiti" +msgstr "" +======= +#: wp-admin/includes/continents-cities.php:140 +msgid "Juneau" +msgstr "Juneau" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:307 +msgid "Vladivostok" +msgstr "Vladivostok" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:488 +msgid "Tarawa" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:139 msgid "Jamaica" msgstr "JamaÃ¯que" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:282 +msgid "Pontianak" +msgstr "Pontianak" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:489 +msgid "Tongatapu" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:138 msgid "Iqaluit" msgstr "Iqaluit" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:283 +msgid "Pyongyang" +msgstr "Pyongyang" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:490 +msgid "Truk" +msgstr "Chuuk (Truk)" +======= #: wp-admin/includes/continents-cities.php:137 msgid "Inuvik" msgstr "Inuvik" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:281 +msgid "Phnom Penh" +msgstr "Phnom Penh" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:491 +msgid "Wake" +msgstr "Ãle Wake" +======= #: wp-admin/includes/continents-cities.php:136 msgid "Winamac" msgstr "Winamac" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:400 +msgid "Helsinki" +msgstr "Helsinki" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:492 +msgid "Wallis" +msgstr "Wallis-et-Futuna" +======= #: wp-admin/includes/continents-cities.php:135 msgid "Vincennes" msgstr "Vincennes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:402 +msgid "Jersey" +msgstr "Jersey" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:493 +msgid "Yap" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:134 msgid "Vevay" msgstr "Vevay" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:258 +msgid "Jakarta" +msgstr "Jakarta" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:36 +msgid "Kigali" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:133 msgid "Tell City" msgstr "Tell City" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:259 +msgid "Jayapura" +msgstr "Jayapura" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:37 +msgid "Kinshasa" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:132 msgid "Petersburg" msgstr "Petersburg" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:263 +msgid "Karachi" +msgstr "Karachi" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:33 +msgid "Johannesburg" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:131 msgid "Marengo" msgstr "Marengo" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:268 +msgid "Kuala Lumpur" +msgstr "Kuala Lumpur" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:34 +msgid "Kampala" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:130 msgid "Knox" msgstr "Knox" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:269 +msgid "Kuching" +msgstr "Kuching" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:42 +msgid "Lubumbashi" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:129 msgid "Indianapolis" msgstr "Indianapolis" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:271 +msgid "Macao" +msgstr "Macao" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:41 +msgid "Luanda" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:128 msgid "Indiana" msgstr "Indiana" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:273 +msgid "Magadan" +msgstr "Magadan" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:40 +msgid "Lome" +msgstr "LomÃ©" +======= #: wp-admin/includes/continents-cities.php:127 msgid "Hermosillo" msgstr "Hermosillo" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:274 +msgid "Makassar" +msgstr "Makassar" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:39 +msgid "Libreville" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:126 msgid "Havana" msgstr "La Havane" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:279 +msgid "Omsk" +msgstr "Omsk" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:38 +msgid "Lagos" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:125 msgid "Halifax" msgstr "Halifax" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:394 +msgid "Budapest" +msgstr "Budapest" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:45 +msgid "Maputo" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:124 msgid "Guyana" msgstr "Guyane" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:397 +msgid "Dublin" +msgstr "Dublin" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:44 +msgid "Malabo" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:123 msgid "Guayaquil" msgstr "Guayaquil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:398 +msgid "Gibraltar" +msgstr "Gibraltar" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:43 +msgid "Lusaka" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:122 msgid "Guatemala" msgstr "Guatemala" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:399 +msgid "Guernsey" +msgstr "Guernsey" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:51 +msgid "Ndjamena" +msgstr "N'Djamena" +======= #: wp-admin/includes/continents-cities.php:121 msgid "Guadeloupe" msgstr "Guadeloupe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:391 +msgid "Bratislava" +msgstr "Bratislava" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:50 +msgid "Nairobi" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:120 msgid "Grenada" msgstr "Grenade" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:389 +msgid "Belgrade" +msgstr "Belgrade" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:46 +msgid "Maseru" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:119 msgid "Grand Turk" msgstr "Grand Turk" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:390 +msgid "Berlin" +msgstr "Berlin" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:47 +msgid "Mbabane" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:118 msgid "Goose Bay" msgstr "Goose Bay" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:388 +msgid "Belfast" +msgstr "Belfast" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:48 +msgid "Mogadishu" +msgstr "Mogadiscio" +======= #: wp-admin/includes/continents-cities.php:117 msgid "Godthab" msgstr "Nuuk (GodthÃ¥b)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:385 +msgid "Amsterdam" +msgstr "Amsterdam" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:49 +msgid "Monrovia" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:116 msgid "Glace Bay" msgstr "Glace Bay" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:382 +msgid "UTC" +msgstr "UTC" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:73 +msgid "La Rioja" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:115 msgid "Fortaleza" msgstr "Fortaleza" @@ -1693,99 +3084,259 @@ msgstr "Mendoza" #: wp-admin/includes/continents-cities.php:73 msgid "La Rioja" msgstr "La Rioja" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:72 -msgid "Jujuy" -msgstr "San Salvador de Jujuy" +#: wp-admin/includes/continents-cities.php:383 +msgid "Zulu" +msgstr "Zulu" -#: wp-admin/includes/continents-cities.php:71 -msgid "Cordoba" -msgstr "CÃ³rdoba" +#: wp-admin/includes/continents-cities.php:384 +msgid "Europe" +msgstr "Europe" -#: wp-admin/includes/continents-cities.php:70 -msgid "ComodRivadavia" -msgstr "Comodoro Rivadavia" +#: wp-admin/includes/continents-cities.php:379 +msgid "Greenwich" +msgstr "Greenwich" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:419 +msgid "Riga" +msgstr "Riga" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:69 +msgid "Catamarca" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:69 msgid "Catamarca" msgstr "Catamarca" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:420 +msgid "Rome" +msgstr "Rome" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:68 +msgid "Buenos Aires" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:68 msgid "Buenos Aires" msgstr "Buenos Aires" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:67 -msgid "Argentina" -msgstr "Argentine" +#: wp-admin/includes/continents-cities.php:421 +msgid "Samara" +msgstr "Samara" -#: wp-admin/includes/continents-cities.php:66 -msgid "Araguaina" -msgstr "AraguaÃna" +#: wp-admin/includes/continents-cities.php:423 +msgid "Sarajevo" +msgstr "Sarajevo" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:424 +msgid "Simferopol" +msgstr "Simferopol" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:65 +msgid "Antigua" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:65 msgid "Antigua" msgstr "Antigua" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:415 +msgid "Oslo" +msgstr "Oslo" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:64 +msgid "Anguilla" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:64 msgid "Anguilla" msgstr "Anguilla" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:416 +msgid "Paris" +msgstr "Paris" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:63 +msgid "Anchorage" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:63 msgid "Anchorage" msgstr "Anchorage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:417 +msgid "Podgorica" +msgstr "Podgorica" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:62 +msgid "Adak" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:62 msgid "Adak" msgstr "Adak" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:61 -msgid "America" -msgstr "AmÃ©riques" +#: wp-admin/includes/continents-cities.php:411 +msgid "Mariehamn" +msgstr "Mariehamn" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:412 +msgid "Minsk" +msgstr "Minsk" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:60 +msgid "Windhoek" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:60 msgid "Windhoek" msgstr "Windhoek" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:413 +msgid "Monaco" +msgstr "Monaco" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:59 +msgid "Tunis" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:59 msgid "Tunis" msgstr "Tunis" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:408 +msgid "Luxembourg" +msgstr "Luxembourg" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:58 +msgid "Tripoli" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:58 msgid "Tripoli" msgstr "Tripoli" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:57 -msgid "Timbuktu" -msgstr "Tombouctou" +#: wp-admin/includes/continents-cities.php:409 +msgid "Madrid" +msgstr "Madrid" -#: wp-admin/includes/continents-cities.php:56 -msgid "Sao Tome" -msgstr "SÃ£o TomÃ©" +#: wp-admin/includes/continents-cities.php:442 +msgid "Antananarivo" +msgstr "Antananarivo" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:449 +msgid "Maldives" +msgstr "Maldives" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:55 +msgid "Porto-Novo" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:55 msgid "Porto-Novo" msgstr "Porto-Novo" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:454 +msgid "Apia" +msgstr "Apia" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:54 +msgid "Ouagadougou" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:54 msgid "Ouagadougou" msgstr "Ouagadougou" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:455 +msgid "Auckland" +msgstr "Auckland" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:53 +msgid "Nouakchott" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:53 msgid "Nouakchott" msgstr "Nouakchott" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:404 +msgid "Kiev" +msgstr "Kiev" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:52 +msgid "Niamey" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:52 msgid "Niamey" msgstr "Niamey" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:406 +msgid "Ljubljana" +msgstr "Ljubljana" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:29 +msgid "El Aaiun" +msgstr "LaÃ¢youne" +======= #: wp-admin/includes/continents-cities.php:51 msgid "Ndjamena" msgstr "N'Djamena" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:436 +msgid "Volgograd" +msgstr "Volgograd" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:28 +msgid "Douala" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:50 msgid "Nairobi" msgstr "Nairobi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:438 +msgid "Zagreb" +msgstr "Zagreb" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:32 +msgid "Harare" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:49 msgid "Monrovia" msgstr "Monrovia" @@ -1857,7 +3408,17 @@ msgstr "Johannesburg" #: wp-admin/includes/continents-cities.php:32 msgid "Harare" msgstr "Harare" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:440 +msgid "Zurich" +msgstr "Zurich" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:30 +msgid "Freetown" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:31 msgid "Gaborone" msgstr "Gaborone" @@ -1865,75 +3426,235 @@ msgstr "Gaborone" #: wp-admin/includes/continents-cities.php:30 msgid "Freetown" msgstr "Freetown" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:435 +msgid "Vilnius" +msgstr "Vilnius" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:31 +msgid "Gaborone" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:29 msgid "El Aaiun" msgstr "LaÃ¢youne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:433 +msgid "Vatican" +msgstr "Vatican" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:35 +msgid "Khartoum" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:28 msgid "Douala" msgstr "Douala" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:428 +msgid "Tallinn" +msgstr "Tallinn" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:27 +msgid "Djibouti" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:27 msgid "Djibouti" msgstr "Djibouti" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:430 +msgid "Tiraspol" +msgstr "Tiraspol" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:26 +msgid "Dar es Salaam" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:26 msgid "Dar es Salaam" msgstr "Dar es Salaam" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:432 +msgid "Vaduz" +msgstr "Vaduz" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:25 +msgid "Dakar" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:25 msgid "Dakar" msgstr "Dakar" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:425 +msgid "Skopje" +msgstr "Skopje" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:24 +msgid "Conakry" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:24 msgid "Conakry" msgstr "Conakry" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:426 +msgid "Sofia" +msgstr "Sofia" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:23 +msgid "Ceuta" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:23 msgid "Ceuta" msgstr "Ceuta" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:427 +msgid "Stockholm" +msgstr "Stockholm" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:22 +msgid "Casablanca" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:22 msgid "Casablanca" msgstr "Casablanca" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:21 -msgid "Cairo" -msgstr "Le Caire" +#: wp-admin/includes/continents-cities.php:477 +msgid "Norfolk" +msgstr "Norfolk" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:479 +msgid "Pago Pago" +msgstr "Pago Pago" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:20 +msgid "Bujumbura" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:20 msgid "Bujumbura" msgstr "Bujumbura" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:471 +msgid "Kwajalein" +msgstr "Kwajalein" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:19 +msgid "Brazzaville" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:19 msgid "Brazzaville" msgstr "Brazzaville" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:472 +msgid "Majuro" +msgstr "Majuro" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:18 +msgid "Blantyre" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:18 msgid "Blantyre" msgstr "Blantyre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:475 +msgid "Nauru" +msgstr "Nauru" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:17 +msgid "Bissau" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:17 msgid "Bissau" msgstr "Bissau" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:466 +msgid "Guam" +msgstr "Guam" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:16 +msgid "Banjul" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:16 msgid "Banjul" msgstr "Banjul" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:467 +msgid "Honolulu" +msgstr "Honolulu" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:15 +msgid "Bangui" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:15 msgid "Bangui" msgstr "Bangui" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:470 +msgid "Kosrae" +msgstr "Kosrae" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:14 +msgid "Bamako" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:14 msgid "Bamako" msgstr "Bamako" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:13 -msgid "Asmera" -msgstr "Asmara" +#: wp-admin/includes/continents-cities.php:460 +msgid "Fakaofo" +msgstr "Fakaofo" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:462 +msgid "Funafuti" +msgstr "Funafuti" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:11 +msgid "Algiers" +msgstr "Alger" +======= #: wp-admin/includes/continents-cities.php:12 msgid "Asmara" msgstr "Asmara" @@ -1941,11 +3662,33 @@ msgstr "Asmara" #: wp-admin/includes/continents-cities.php:11 msgid "Algiers" msgstr "Alger" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:10 -msgid "Addis Ababa" -msgstr "Addis-Abeba" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:465 +msgid "Guadalcanal" +msgstr "Guadalcanal" + +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:12 +msgid "Asmara" +msgstr "" + +======= +>>>>>>> .r12027 +#: wp-admin/includes/continents-cities.php:459 +msgid "Enderbury" +msgstr "Enderbury" +<<<<<<< .mine +#: wp-admin/includes/continents-cities.php:220 +msgid "Syowa" +msgstr "Syowa" +||||||| .r11156 +#: wp-admin/includes/continents-cities.php:8 +msgid "Abidjan" +msgstr "" +======= #: wp-admin/includes/continents-cities.php:9 msgid "Accra" msgstr "Accra" @@ -1953,7 +3696,1236 @@ msgstr "Accra" #: wp-admin/includes/continents-cities.php:8 msgid "Abidjan" msgstr "Abidjan" +>>>>>>> .r12027 -#: wp-admin/includes/continents-cities.php:7 -msgid "Africa" -msgstr "Afrique" +#: wp-admin/includes/continents-cities.php:221 +msgid "Vostok" +msgstr "Vostok" + +#: wp-admin/includes/continents-cities.php:223 +msgid "Longyearbyen" +msgstr "Longyearbyen" + +#: wp-admin/includes/continents-cities.php:225 +msgid "Aden" +msgstr "Aden" + +#: wp-admin/includes/continents-cities.php:216 +msgid "McMurdo" +msgstr "McMurdo" + +#: wp-admin/includes/continents-cities.php:217 +msgid "Palmer" +msgstr "Palmer" + +#: wp-admin/includes/continents-cities.php:218 +msgid "Rothera" +msgstr "Rothera" + +#: wp-admin/includes/continents-cities.php:215 +msgid "Mawson" +msgstr "Mawson" + +#: wp-admin/includes/continents-cities.php:213 +msgid "Davis" +msgstr "Davis" + +#: wp-admin/includes/continents-cities.php:210 +msgid "Yellowknife" +msgstr "Yellowknife" + +#: wp-admin/includes/continents-cities.php:212 +msgid "Casey" +msgstr "Casey" + +#: wp-admin/includes/continents-cities.php:209 +msgid "Yakutat" +msgstr "Yakutat" + +#: wp-admin/includes/continents-cities.php:208 +msgid "Winnipeg" +msgstr "Winnipeg" + +#: wp-admin/includes/continents-cities.php:207 +msgid "Whitehorse" +msgstr "Whitehorse" + +#: wp-admin/includes/continents-cities.php:206 +msgid "Virgin" +msgstr "Virgin" + +#: wp-admin/includes/continents-cities.php:343 +msgid "Sydney" +msgstr "Sydney" + +#: wp-admin/includes/continents-cities.php:345 +msgid "Victoria" +msgstr "Victoria" + +#: wp-admin/includes/continents-cities.php:347 +msgid "Yancowinna" +msgstr "Yancowinna" + +#: wp-admin/includes/continents-cities.php:403 +msgid "Kaliningrad" +msgstr "Kaliningrad" + +#: wp-admin/includes/continents-cities.php:340 +msgid "Perth" +msgstr "Perth" + +#: wp-admin/includes/continents-cities.php:341 +msgid "Queensland" +msgstr "Queensland" + +#: wp-admin/includes/continents-cities.php:333 +msgid "Hobart" +msgstr "Hobart" + +#: wp-admin/includes/continents-cities.php:335 +msgid "Lindeman" +msgstr "Lindeman" + +#: wp-admin/includes/continents-cities.php:337 +msgid "Melbourne" +msgstr "Melbourne" + +#: wp-admin/includes/continents-cities.php:329 +msgid "Canberra" +msgstr "Canberra" + +#: wp-admin/includes/continents-cities.php:330 +msgid "Currie" +msgstr "Currie" + +#: wp-admin/includes/continents-cities.php:331 +msgid "Darwin" +msgstr "Darwin" + +#: wp-admin/includes/continents-cities.php:332 +msgid "Eucla" +msgstr "Eucla" + +#: wp-admin/includes/continents-cities.php:323 +msgid "Stanley" +msgstr "Stanley" + +#: wp-admin/includes/continents-cities.php:327 +msgid "Brisbane" +msgstr "Brisbane" + +#: wp-admin/includes/continents-cities.php:328 +msgid "Broken Hill" +msgstr "Broken Hill" + +#: wp-admin/includes/continents-cities.php:257 +msgid "Istanbul" +msgstr "Istanbul" + +#: wp-admin/includes/continents-cities.php:254 +msgid "Hong Kong" +msgstr "Hong Kong" + +#: wp-admin/includes/continents-cities.php:255 +msgid "Hovd" +msgstr "Hovd" + +#: wp-admin/includes/continents-cities.php:228 +msgid "Anadyr" +msgstr "Anadyr" + +#: wp-admin/includes/continents-cities.php:236 +msgid "Bangkok" +msgstr "Bangkok" + +#: wp-admin/includes/continents-cities.php:239 +msgid "Brunei" +msgstr "Brunei" + +#: wp-admin/includes/continents-cities.php:240 +msgid "Calcutta" +msgstr "Calcutta" + +#: wp-admin/includes/continents-cities.php:242 +msgid "Chongqing" +msgstr "Chongqing" + +#: wp-admin/includes/continents-cities.php:243 +msgid "Chungking" +msgstr "Chungking" + +#: wp-admin/includes/continents-cities.php:244 +msgid "Colombo" +msgstr "Colombo" + +#: wp-admin/includes/continents-cities.php:248 +msgid "Dili" +msgstr "Dili" + +#: wp-admin/includes/continents-cities.php:251 +msgid "Gaza" +msgstr "Gaza" + +#: wp-admin/includes/continents-cities.php:252 +msgid "Harbin" +msgstr "Harbin" + +#: wp-admin/includes/continents-cities.php:200 +msgid "Thule" +msgstr "Thule" + +#: wp-admin/includes/continents-cities.php:201 +msgid "Thunder Bay" +msgstr "Thunder Bay" + +#: wp-admin/includes/continents-cities.php:226 +msgid "Almaty" +msgstr "Almaty" + +#: wp-admin/includes/continents-cities.php:227 +msgid "Amman" +msgstr "Amman" + +#: wp-admin/includes/continents-cities.php:202 +msgid "Tijuana" +msgstr "Tijuana" + +#: wp-admin/includes/continents-cities.php:203 +msgid "Toronto" +msgstr "Toronto" + +#: wp-admin/includes/continents-cities.php:204 +msgid "Tortola" +msgstr "Tortola" + +#: wp-admin/includes/continents-cities.php:205 +msgid "Vancouver" +msgstr "Vancouver" + +#: wp-admin/includes/continents-cities.php:418 +msgid "Prague" +msgstr "Prague" + +#: wp-admin/includes/continents-cities.php:7 +msgid "Africa" +msgstr "Afrique" +<<<<<<< .mine + +#: wp-admin/includes/continents-cities.php:10 +msgid "Addis Ababa" +msgstr "Addis-Abeba" + +#: wp-admin/includes/continents-cities.php:11 +msgid "Algiers" +msgstr "Alger" + +#: wp-admin/includes/continents-cities.php:13 +msgid "Asmera" +msgstr "Asmara" + +#: wp-admin/includes/continents-cities.php:21 +msgid "Cairo" +msgstr "Le Caire" + +#: wp-admin/includes/continents-cities.php:29 +msgid "El Aaiun" +msgstr "LaÃ¢youne" + +#: wp-admin/includes/continents-cities.php:40 +msgid "Lome" +msgstr "LomÃ©" + +#: wp-admin/includes/continents-cities.php:48 +msgid "Mogadishu" +msgstr "Mogadiscio" + +#: wp-admin/includes/continents-cities.php:51 +msgid "Ndjamena" +msgstr "N'Djamena" + +#: wp-admin/includes/continents-cities.php:56 +msgid "Sao Tome" +msgstr "SÃ£o TomÃ©" + +#: wp-admin/includes/continents-cities.php:57 +msgid "Timbuktu" +msgstr "Tombouctou" + +#: wp-admin/includes/continents-cities.php:61 +msgid "America" +msgstr "AmÃ©riques" + +#: wp-admin/includes/continents-cities.php:66 +msgid "Araguaina" +msgstr "AraguaÃna" + +#: wp-admin/includes/continents-cities.php:67 +msgid "Argentina" +msgstr "Argentine" + +#: wp-admin/includes/continents-cities.php:70 +msgid "ComodRivadavia" +msgstr "Comodoro Rivadavia" + +#: wp-admin/includes/continents-cities.php:71 +msgid "Cordoba" +msgstr "CÃ³rdoba" + +#: wp-admin/includes/continents-cities.php:72 +msgid "Jujuy" +msgstr "San Salvador de Jujuy" + +#: wp-admin/includes/continents-cities.php:75 +msgid "Rio Gallegos" +msgstr "Rio Gallegos" + +#: wp-admin/includes/continents-cities.php:78 +msgid "Tucuman" +msgstr "San Miguel de TucumÃ¡n" + +#: wp-admin/includes/continents-cities.php:79 +msgid "Ushuaia" +msgstr "UshuaÃ¯a" + +#: wp-admin/includes/continents-cities.php:81 +msgid "Asuncion" +msgstr "AsunciÃ³n" + +#: wp-admin/includes/continents-cities.php:85 +msgid "Barbados" +msgstr "Barbade" + +#: wp-admin/includes/continents-cities.php:86 +msgid "Belem" +msgstr "BelÃ©m" + +#: wp-admin/includes/continents-cities.php:90 +msgid "Bogota" +msgstr "BogotÃ¡" + +#: wp-admin/includes/continents-cities.php:92 +msgid "Cambridge Bay" +msgstr "Ikaluktutiak" + +#: wp-admin/includes/continents-cities.php:94 +msgid "Cancun" +msgstr "CancÃºn" + +#: wp-admin/includes/continents-cities.php:97 +msgid "Cayman" +msgstr "Ãles CaÃ¯mans" + +#: wp-admin/includes/continents-cities.php:99 +msgid "Chihuahua" +msgstr "Etat de Chihuahua" + +#: wp-admin/includes/continents-cities.php:102 +msgid "Cuiaba" +msgstr "CuiabÃ¡" + +#: wp-admin/includes/continents-cities.php:103 +msgid "Curacao" +msgstr "CuraÃ§ao" + +#: wp-admin/includes/continents-cities.php:109 +msgid "Dominica" +msgstr "Dominique" + +#: wp-admin/includes/continents-cities.php:111 +msgid "Eirunepe" +msgstr "EirunepÃ©" + +#: wp-admin/includes/continents-cities.php:112 +msgid "El Salvador" +msgstr "Salvador" + +#: wp-admin/includes/continents-cities.php:117 +msgid "Godthab" +msgstr "Nuuk (GodthÃ¥b)" + +#: wp-admin/includes/continents-cities.php:120 +msgid "Grenada" +msgstr "Grenade" + +#: wp-admin/includes/continents-cities.php:124 +msgid "Guyana" +msgstr "Guyane" + +#: wp-admin/includes/continents-cities.php:126 +msgid "Havana" +msgstr "La Havane" + +#: wp-admin/includes/continents-cities.php:139 +msgid "Jamaica" +msgstr "JamaÃ¯que" + +#: wp-admin/includes/continents-cities.php:144 +msgid "Knox IN" +msgstr "Knox (Indiana)" + +#: wp-admin/includes/continents-cities.php:148 +msgid "Maceio" +msgstr "MaceiÃ³" + +#: wp-admin/includes/continents-cities.php:156 +msgid "Mexico City" +msgstr "Mexico" + +#: wp-admin/includes/continents-cities.php:161 +msgid "Montreal" +msgstr "MontrÃ©al" + +#: wp-admin/includes/continents-cities.php:168 +msgid "North Dakota" +msgstr "Dakota du Nord" + +#: wp-admin/includes/continents-cities.php:176 +msgid "Port of Spain" +msgstr "Port-d'Espagne" + +#: wp-admin/includes/continents-cities.php:179 +msgid "Puerto Rico" +msgstr "Porto Rico" + +#: wp-admin/includes/continents-cities.php:181 +msgid "Rankin Inlet" +msgstr "Kangiqtiniq (Rankin Inlet)" + +#: wp-admin/includes/continents-cities.php:187 +msgid "Santiago" +msgstr "Santiago du Chili" + +#: wp-admin/includes/continents-cities.php:188 +msgid "Santo Domingo" +msgstr "Saint-Domingue" + +#: wp-admin/includes/continents-cities.php:189 +msgid "Sao Paulo" +msgstr "SÃ£o Paulo" + +#: wp-admin/includes/continents-cities.php:190 +msgid "Scoresbysund" +msgstr "Ittoqqortoormiit (Scoresbysund)" + +#: wp-admin/includes/continents-cities.php:192 +msgid "St Barthelemy" +msgstr "Saint-BarthÃ©lemy" + +#: wp-admin/includes/continents-cities.php:193 +msgid "St Johns" +msgstr "Saint John's" + +#: wp-admin/includes/continents-cities.php:194 +msgid "St Kitts" +msgstr "Ãle Saint-Christophe" + +#: wp-admin/includes/continents-cities.php:195 +msgid "St Lucia" +msgstr "Sainte-Lucie" + +#: wp-admin/includes/continents-cities.php:196 +msgid "St Thomas" +msgstr "Saint Thomas" + +#: wp-admin/includes/continents-cities.php:197 +msgid "St Vincent" +msgstr "Saint Vincent" + +#: wp-admin/includes/continents-cities.php:150 +msgid "Manaus" +msgstr "Manaos" + +#: wp-admin/includes/continents-cities.php:160 +msgid "Montevideo" +msgstr "MontÃ©vidÃ©o" + +#: wp-admin/includes/continents-cities.php:45 +msgid "Maputo" +msgstr "Maputo" + +#: wp-admin/includes/continents-cities.php:44 +msgid "Malabo" +msgstr "Malabo" + +#: wp-admin/includes/continents-cities.php:39 +msgid "Libreville" +msgstr "Libreville" + +#: wp-admin/includes/continents-cities.php:38 +msgid "Lagos" +msgstr "Lagos" + +#: wp-admin/includes/continents-cities.php:34 +msgid "Kampala" +msgstr "Kampala" + +#: wp-admin/includes/continents-cities.php:42 +msgid "Lubumbashi" +msgstr "Lubumbashi" + +#: wp-admin/includes/continents-cities.php:41 +msgid "Luanda" +msgstr "Luanda" + +#: wp-admin/includes/continents-cities.php:37 +msgid "Kinshasa" +msgstr "Kinshasa" + +#: wp-admin/includes/continents-cities.php:33 +msgid "Johannesburg" +msgstr "Johannesburg" + +#: wp-admin/includes/continents-cities.php:36 +msgid "Kigali" +msgstr "Kigali" + +#: wp-admin/includes/continents-cities.php:58 +msgid "Tripoli" +msgstr "Tripoli" + +#: wp-admin/includes/continents-cities.php:62 +msgid "Adak" +msgstr "Adak" + +#: wp-admin/includes/continents-cities.php:60 +msgid "Windhoek" +msgstr "Windhoek" + +#: wp-admin/includes/continents-cities.php:59 +msgid "Tunis" +msgstr "Tunis" + +#: wp-admin/includes/continents-cities.php:64 +msgid "Anguilla" +msgstr "Anguilla" + +#: wp-admin/includes/continents-cities.php:63 +msgid "Anchorage" +msgstr "Anchorage" + +#: wp-admin/includes/continents-cities.php:68 +msgid "Buenos Aires" +msgstr "Buenos Aires" + +#: wp-admin/includes/continents-cities.php:65 +msgid "Antigua" +msgstr "Antigua" + +#: wp-admin/includes/continents-cities.php:69 +msgid "Catamarca" +msgstr "Catamarca" + +#: wp-admin/includes/continents-cities.php:49 +msgid "Monrovia" +msgstr "Monrovia" + +#: wp-admin/includes/continents-cities.php:73 +msgid "La Rioja" +msgstr "La Rioja" + +#: wp-admin/includes/continents-cities.php:50 +msgid "Nairobi" +msgstr "Nairobi" + +#: wp-admin/includes/continents-cities.php:46 +msgid "Maseru" +msgstr "Maseru" + +#: wp-admin/includes/continents-cities.php:47 +msgid "Mbabane" +msgstr "Mbabane" + +#: wp-admin/includes/continents-cities.php:20 +msgid "Bujumbura" +msgstr "Bujumbura" + +#: wp-admin/includes/continents-cities.php:43 +msgid "Lusaka" +msgstr "Lusaka" + +#: wp-admin/includes/continents-cities.php:26 +msgid "Dar es Salaam" +msgstr "Dar es Salaam" + +#: wp-admin/includes/continents-cities.php:25 +msgid "Dakar" +msgstr "Dakar" + +#: wp-admin/includes/continents-cities.php:24 +msgid "Conakry" +msgstr "Conakry" + +#: wp-admin/includes/continents-cities.php:23 +msgid "Ceuta" +msgstr "Ceuta" + +#: wp-admin/includes/continents-cities.php:22 +msgid "Casablanca" +msgstr "Casablanca" + +#: wp-admin/includes/continents-cities.php:31 +msgid "Gaborone" +msgstr "Gaborone" + +#: wp-admin/includes/continents-cities.php:35 +msgid "Khartoum" +msgstr "Khartoum" + +#: wp-admin/includes/continents-cities.php:27 +msgid "Djibouti" +msgstr "Djibouti" + +#: wp-admin/includes/continents-cities.php:28 +msgid "Douala" +msgstr "Douala" + +#: wp-admin/includes/continents-cities.php:32 +msgid "Harare" +msgstr "Harare" + +#: wp-admin/includes/continents-cities.php:54 +msgid "Ouagadougou" +msgstr "Ouagadougou" + +#: wp-admin/includes/continents-cities.php:53 +msgid "Nouakchott" +msgstr "Nouakchott" + +#: wp-admin/includes/continents-cities.php:52 +msgid "Niamey" +msgstr "Niamey" + +#: wp-admin/includes/continents-cities.php:9 +msgid "Accra" +msgstr "Accra" + +#: wp-admin/includes/continents-cities.php:74 +msgid "Mendoza" +msgstr "Mendoza" + +#: wp-admin/includes/continents-cities.php:76 +msgid "San Juan" +msgstr "San Juan" + +#: wp-admin/includes/continents-cities.php:77 +msgid "San Luis" +msgstr "San Luis" + +#: wp-admin/includes/continents-cities.php:80 +msgid "Aruba" +msgstr "Aruba" + +#: wp-admin/includes/continents-cities.php:82 +msgid "Atikokan" +msgstr "Atikokan" + +#: wp-admin/includes/continents-cities.php:83 +msgid "Atka" +msgstr "Atka" + +#: wp-admin/includes/continents-cities.php:55 +msgid "Porto-Novo" +msgstr "Porto-Novo" + +#: wp-admin/includes/continents-cities.php:12 +msgid "Asmara" +msgstr "Asmara" + +#: wp-admin/includes/continents-cities.php:8 +msgid "Abidjan" +msgstr "Abidjan" + +#: wp-admin/includes/continents-cities.php:17 +msgid "Bissau" +msgstr "Bissau" + +#: wp-admin/includes/continents-cities.php:16 +msgid "Banjul" +msgstr "Banjul" + +#: wp-admin/includes/continents-cities.php:15 +msgid "Bangui" +msgstr "Bangui" + +#: wp-admin/includes/continents-cities.php:14 +msgid "Bamako" +msgstr "Bamako" + +#: wp-admin/includes/continents-cities.php:18 +msgid "Blantyre" +msgstr "Blantyre" + +#: wp-admin/includes/continents-cities.php:100 +msgid "Coral Harbour" +msgstr "Coral Harbour" + +#: wp-admin/includes/continents-cities.php:101 +msgid "Costa Rica" +msgstr "Costa Rica" + +#: wp-admin/includes/continents-cities.php:104 +msgid "Danmarkshavn" +msgstr "Danmarkshavn" + +#: wp-admin/includes/continents-cities.php:105 +msgid "Dawson" +msgstr "Dawson" + +#: wp-admin/includes/continents-cities.php:106 +msgid "Dawson Creek" +msgstr "Dawson Creek" + +#: wp-admin/includes/continents-cities.php:107 +msgid "Denver" +msgstr "Denver" + +#: wp-admin/includes/continents-cities.php:19 +msgid "Brazzaville" +msgstr "Brazzaville" + +#: wp-admin/includes/continents-cities.php:93 +msgid "Campo Grande" +msgstr "Campo Grande" + +#: wp-admin/includes/continents-cities.php:95 +msgid "Caracas" +msgstr "Caracas" + +#: wp-admin/includes/continents-cities.php:96 +msgid "Cayenne" +msgstr "Cayenne" + +#: wp-admin/includes/continents-cities.php:98 +msgid "Chicago" +msgstr "Chicago" + +#: wp-admin/includes/continents-cities.php:91 +msgid "Boise" +msgstr "Boise" + +#: wp-admin/includes/continents-cities.php:88 +msgid "Blanc-Sablon" +msgstr "Blanc-Sablon" + +#: wp-admin/includes/continents-cities.php:89 +msgid "Boa Vista" +msgstr "Boa Vista" + +#: wp-admin/includes/continents-cities.php:84 +msgid "Bahia" +msgstr "Bahia" + +#: wp-admin/includes/continents-cities.php:87 +msgid "Belize" +msgstr "Belize" + +#: wp-admin/includes/continents-cities.php:129 +msgid "Indianapolis" +msgstr "Indianapolis" + +#: wp-admin/includes/continents-cities.php:127 +msgid "Hermosillo" +msgstr "Hermosillo" + +#: wp-admin/includes/continents-cities.php:128 +msgid "Indiana" +msgstr "Indiana" + +#: wp-admin/includes/continents-cities.php:125 +msgid "Halifax" +msgstr "Halifax" + +#: wp-admin/includes/continents-cities.php:123 +msgid "Guayaquil" +msgstr "Guayaquil" + +#: wp-admin/includes/continents-cities.php:119 +msgid "Grand Turk" +msgstr "Grand Turk" + +#: wp-admin/includes/continents-cities.php:121 +msgid "Guadeloupe" +msgstr "Guadeloupe" + +#: wp-admin/includes/continents-cities.php:122 +msgid "Guatemala" +msgstr "Guatemala" + +#: wp-admin/includes/continents-cities.php:110 +msgid "Edmonton" +msgstr "Edmonton" + +#: wp-admin/includes/continents-cities.php:113 +msgid "Ensenada" +msgstr "Ensenada" + +#: wp-admin/includes/continents-cities.php:114 +msgid "Fort Wayne" +msgstr "Fort Wayne" + +#: wp-admin/includes/continents-cities.php:115 +msgid "Fortaleza" +msgstr "Fortaleza" + +#: wp-admin/includes/continents-cities.php:116 +msgid "Glace Bay" +msgstr "Glace Bay" + +#: wp-admin/includes/continents-cities.php:118 +msgid "Goose Bay" +msgstr "Goose Bay" + +#: wp-admin/includes/continents-cities.php:133 +msgid "Tell City" +msgstr "Tell City" + +#: wp-admin/includes/continents-cities.php:134 +msgid "Vevay" +msgstr "Vevay" + +#: wp-admin/includes/continents-cities.php:108 +msgid "Detroit" +msgstr "Detroit" + +#: wp-admin/includes/continents-cities.php:131 +msgid "Marengo" +msgstr "Marengo" + +#: wp-admin/includes/continents-cities.php:132 +msgid "Petersburg" +msgstr "Petersburg" + +#: wp-admin/includes/continents-cities.php:130 +msgid "Knox" +msgstr "Knox" + +#: wp-admin/includes/continents-cities.php:199 +msgid "Tegucigalpa" +msgstr "Tegucigalpa" + +#: wp-admin/includes/continents-cities.php:183 +msgid "Regina" +msgstr "Regina" + +#: wp-admin/includes/continents-cities.php:184 +msgid "Resolute" +msgstr "Resolute" + +#: wp-admin/includes/continents-cities.php:185 +msgid "Rio Branco" +msgstr "Rio Branco" + +#: wp-admin/includes/continents-cities.php:186 +msgid "Rosario" +msgstr "Rosario" + +#: wp-admin/includes/continents-cities.php:191 +msgid "Shiprock" +msgstr "Shiprock" + +#: wp-admin/includes/continents-cities.php:198 +msgid "Swift Current" +msgstr "Swift Current" + +#: wp-admin/includes/continents-cities.php:182 +msgid "Recife" +msgstr "Recife" + +#: wp-admin/includes/continents-cities.php:173 +msgid "Paramaribo" +msgstr "Paramaribo" + +#: wp-admin/includes/continents-cities.php:30 +msgid "Freetown" +msgstr "Freetown" + +#: wp-admin/includes/continents-cities.php:174 +msgid "Phoenix" +msgstr "Phoenix" + +#: wp-admin/includes/continents-cities.php:175 +msgid "Port-au-Prince" +msgstr "Port-au-Prince" + +#: wp-admin/includes/continents-cities.php:177 +msgid "Porto Acre" +msgstr "Porto Acre" + +#: wp-admin/includes/continents-cities.php:178 +msgid "Porto Velho" +msgstr "Porto Velho" + +#: wp-admin/includes/continents-cities.php:180 +msgid "Rainy River" +msgstr "Rainy River" + +#: wp-admin/includes/continents-cities.php:159 +msgid "Monterrey" +msgstr "Monterrey" + +#: wp-admin/includes/continents-cities.php:162 +msgid "Montserrat" +msgstr "Montserrat" + +#: wp-admin/includes/continents-cities.php:163 +msgid "Nassau" +msgstr "Nassau" + +#: wp-admin/includes/continents-cities.php:164 +msgid "New York" +msgstr "New York" + +#: wp-admin/includes/continents-cities.php:165 +msgid "Nipigon" +msgstr "Nipigon" + +#: wp-admin/includes/continents-cities.php:166 +msgid "Nome" +msgstr "Nome" + +#: wp-admin/includes/continents-cities.php:167 +msgid "Noronha" +msgstr "Noronha" + +#: wp-admin/includes/continents-cities.php:170 +msgid "New Salem" +msgstr "New Salem" + +#: wp-admin/includes/continents-cities.php:171 +msgid "Panama" +msgstr "Panama" + +#: wp-admin/includes/continents-cities.php:172 +msgid "Pangnirtung" +msgstr "Pangnirtung" + +#: wp-admin/includes/continents-cities.php:143 +msgid "Monticello" +msgstr "Monticello" + +#: wp-admin/includes/continents-cities.php:151 +msgid "Marigot" +msgstr "Marigot" + +#: wp-admin/includes/continents-cities.php:152 +msgid "Martinique" +msgstr "Martinique" + +#: wp-admin/includes/continents-cities.php:153 +msgid "Mazatlan" +msgstr "Mazatlan" + +#: wp-admin/includes/continents-cities.php:154 +msgid "Menominee" +msgstr "Menominee" + +#: wp-admin/includes/continents-cities.php:155 +msgid "Merida" +msgstr "Merida" + +#: wp-admin/includes/continents-cities.php:157 +msgid "Miquelon" +msgstr "Miquelon" + +#: wp-admin/includes/continents-cities.php:158 +msgid "Moncton" +msgstr "Moncton" + +#: wp-admin/includes/continents-cities.php:149 +msgid "Managua" +msgstr "Managua" + +#: wp-admin/includes/continents-cities.php:142 +msgid "Louisville" +msgstr "Louisville" + +#: wp-admin/includes/continents-cities.php:145 +msgid "La Paz" +msgstr "La Paz" + +#: wp-admin/includes/continents-cities.php:146 +msgid "Lima" +msgstr "Lima" + +#: wp-admin/includes/continents-cities.php:147 +msgid "Los Angeles" +msgstr "Los Angeles" + +#: wp-admin/includes/continents-cities.php:141 +msgid "Kentucky" +msgstr "Kentucky" + +#: wp-admin/includes/continents-cities.php:138 +msgid "Iqaluit" +msgstr "Iqaluit" + +#: wp-admin/includes/continents-cities.php:140 +msgid "Juneau" +msgstr "Juneau" + +#: wp-admin/includes/continents-cities.php:137 +msgid "Inuvik" +msgstr "Inuvik" + +#: wp-admin/includes/continents-cities.php:169 +msgid "Center" +msgstr "Center" + +#: wp-admin/includes/continents-cities.php:136 +msgid "Winamac" +msgstr "Winamac" + +#: wp-admin/includes/continents-cities.php:135 +msgid "Vincennes" +msgstr "Vincennes" +||||||| .r11156 + +#: wp-admin/includes/continents-cities.php:9 +msgid "Accra" +msgstr "" + +#: wp-admin/includes/continents-cities.php:74 +msgid "Mendoza" +msgstr "" + +#: wp-admin/includes/continents-cities.php:75 +msgid "Rio Gallegos" +msgstr "Rio Gallegos" + +#: wp-admin/includes/continents-cities.php:76 +msgid "San Juan" +msgstr "" + +#: wp-admin/includes/continents-cities.php:77 +msgid "San Luis" +msgstr "" + +#: wp-admin/includes/continents-cities.php:78 +msgid "Tucuman" +msgstr "San Miguel de TucumÃ¡n" + +#: wp-admin/includes/continents-cities.php:79 +msgid "Ushuaia" +msgstr "UshuaÃ¯a" + +#: wp-admin/includes/continents-cities.php:80 +msgid "Aruba" +msgstr "" + +#: wp-admin/includes/continents-cities.php:81 +msgid "Asuncion" +msgstr "AsunciÃ³n" + +#: wp-admin/includes/continents-cities.php:82 +msgid "Atikokan" +msgstr "" + +#: wp-admin/includes/continents-cities.php:83 +msgid "Atka" +msgstr "" + +#: wp-admin/includes/continents-cities.php:84 +msgid "Bahia" +msgstr "" + +#: wp-admin/includes/continents-cities.php:85 +msgid "Barbados" +msgstr "Barbade" + +#: wp-admin/includes/continents-cities.php:86 +msgid "Belem" +msgstr "BelÃ©m" + +#: wp-admin/includes/continents-cities.php:87 +msgid "Belize" +msgstr "" + +#: wp-admin/includes/continents-cities.php:88 +msgid "Blanc-Sablon" +msgstr "" + +#: wp-admin/includes/continents-cities.php:89 +msgid "Boa Vista" +msgstr "" + +#: wp-admin/includes/continents-cities.php:90 +msgid "Bogota" +msgstr "BogotÃ¡" + +#: wp-admin/includes/continents-cities.php:91 +msgid "Boise" +msgstr "" + +#: wp-admin/includes/continents-cities.php:92 +msgid "Cambridge Bay" +msgstr "Ikaluktutiak" + +#: wp-admin/includes/continents-cities.php:93 +msgid "Campo Grande" +msgstr "" + +#: wp-admin/includes/continents-cities.php:94 +msgid "Cancun" +msgstr "CancÃºn" + +#: wp-admin/includes/continents-cities.php:95 +msgid "Caracas" +msgstr "" + +#: wp-admin/includes/continents-cities.php:96 +msgid "Cayenne" +msgstr "" + +#: wp-admin/includes/continents-cities.php:97 +msgid "Cayman" +msgstr "Ãles CaÃ¯mans" + +#: wp-admin/includes/continents-cities.php:98 +msgid "Chicago" +msgstr "" + +#: wp-admin/includes/continents-cities.php:99 +msgid "Chihuahua" +msgstr "Etat de Chihuahua" + +#: wp-admin/includes/continents-cities.php:100 +msgid "Coral Harbour" +msgstr "" + +#: wp-admin/includes/continents-cities.php:101 +msgid "Costa Rica" +msgstr "" + +#: wp-admin/includes/continents-cities.php:102 +msgid "Cuiaba" +msgstr "CuiabÃ¡" + +#: wp-admin/includes/continents-cities.php:103 +msgid "Curacao" +msgstr "CuraÃ§ao" + +#: wp-admin/includes/continents-cities.php:104 +msgid "Danmarkshavn" +msgstr "" + +#: wp-admin/includes/continents-cities.php:105 +msgid "Dawson" +msgstr "" + +#: wp-admin/includes/continents-cities.php:106 +msgid "Dawson Creek" +msgstr "" + +#: wp-admin/includes/continents-cities.php:107 +msgid "Denver" +msgstr "" + +#: wp-admin/includes/continents-cities.php:108 +msgid "Detroit" +msgstr "" + +#: wp-admin/includes/continents-cities.php:109 +msgid "Dominica" +msgstr "Dominique" + +#: wp-admin/includes/continents-cities.php:110 +msgid "Edmonton" +msgstr "" + +#: wp-admin/includes/continents-cities.php:111 +msgid "Eirunepe" +msgstr "EirunepÃ©" + +#: wp-admin/includes/continents-cities.php:112 +msgid "El Salvador" +msgstr "Salvador" + +#: wp-admin/includes/continents-cities.php:113 +msgid "Ensenada" +msgstr "" + +#: wp-admin/includes/continents-cities.php:114 +msgid "Fort Wayne" +msgstr "" + +#: wp-admin/includes/continents-cities.php:115 +msgid "Fortaleza" +msgstr "" + +#: wp-admin/includes/continents-cities.php:116 +msgid "Glace Bay" +msgstr "" + +#: wp-admin/includes/continents-cities.php:117 +msgid "Godthab" +msgstr "Nuuk (GodthÃ¥b)" + +#: wp-admin/includes/continents-cities.php:118 +msgid "Goose Bay" +msgstr "" + +#: wp-admin/includes/continents-cities.php:119 +msgid "Grand Turk" +msgstr "" + +#: wp-admin/includes/continents-cities.php:120 +msgid "Grenada" +msgstr "Grenade" + +#: wp-admin/includes/continents-cities.php:121 +msgid "Guadeloupe" +msgstr "" + +#: wp-admin/includes/continents-cities.php:122 +msgid "Guatemala" +msgstr "" + +#: wp-admin/includes/continents-cities.php:123 +msgid "Guayaquil" +msgstr "" + +#: wp-admin/includes/continents-cities.php:124 +msgid "Guyana" +msgstr "Guyane" + +#: wp-admin/includes/continents-cities.php:125 +msgid "Halifax" +msgstr "" + +#: wp-admin/includes/continents-cities.php:126 +msgid "Havana" +msgstr "La Havane" + +#: wp-admin/includes/continents-cities.php:127 +msgid "Hermosillo" +msgstr "" + +#: wp-admin/includes/continents-cities.php:128 +msgid "Indiana" +msgstr "" + +#: wp-admin/includes/continents-cities.php:129 +msgid "Indianapolis" +msgstr "" + +#: wp-admin/includes/continents-cities.php:130 +msgid "Knox" +msgstr "" + +#: wp-admin/includes/continents-cities.php:131 +msgid "Marengo" +msgstr "" + +#: wp-admin/includes/continents-cities.php:132 +msgid "Petersburg" +msgstr "" + +#: wp-admin/includes/continents-cities.php:133 +msgid "Tell City" +msgstr "" + +#: wp-admin/includes/continents-cities.php:134 +msgid "Vevay" +msgstr "" +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/languages/fr_FR.mo b/pavillonmadeleine.fr/wp-content/languages/fr_FR.mo index 760eeb03..906c2bc0 100644 Binary files a/pavillonmadeleine.fr/wp-content/languages/fr_FR.mo and b/pavillonmadeleine.fr/wp-content/languages/fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/languages/fr_FR.po b/pavillonmadeleine.fr/wp-content/languages/fr_FR.po index 159a0332..93c9e3ae 100644 --- a/pavillonmadeleine.fr/wp-content/languages/fr_FR.po +++ b/pavillonmadeleine.fr/wp-content/languages/fr_FR.po @@ -1,451 +1,1599 @@ +<<<<<<< .mine +# Translation of 4.3.x in French (France) +# This file is distributed under the same license as the 4.3.x package. +||||||| .r11156 +# Translation of Development in French (France) +# This file is distributed under the same license as the Development package. +======= # Translation of 4.2.x in French (France) # This file is distributed under the same license as the 4.2.x package. +>>>>>>> .r12027 msgid "" msgstr "" +<<<<<<< .mine +"PO-Revision-Date: 2015-11-09 14:35:27+0000\n" +||||||| .r11156 +"PO-Revision-Date: 2014-09-15 09:49:19+0000\n" +======= "PO-Revision-Date: 2015-06-28 13:27:37+0000\n" +>>>>>>> .r12027 "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" +<<<<<<< .mine +"X-Generator: GlotPress/1.0-alpha-1100\n" +"Project-Id-Version: 4.3.x\n" +||||||| .r11156 +"X-Generator: GlotPress/0.1\n" +"Project-Id-Version: Development\n" +======= "X-Generator: GlotPress/1.0-alpha-1100\n" "Project-Id-Version: 4.2.x\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:79 wp-login.php:751 +msgid "E-mail" +msgstr "E-mail" +||||||| .r11156 +#: wp-includes/locale.php:184 +msgctxt "text direction" +msgid "ltr" +msgstr "ltr" +======= #: wp-signup.php:716 msgid "The site you were looking for, %s, does not exist." msgstr "Le site que vous cherchez (%s) n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:135 +msgid "No" +msgstr "Non" +||||||| .r11156 +#: wp-login.php:841 +msgid "You have successfully updated WordPress! Please log back in to see what’s new." +msgstr "WordPress a Ã©tÃ© mis Ã jour avec succÃ¨s ! Veuillez vous reconnecter pour voir les nouveautÃ©s." +======= #: wp-signup.php:714 msgid "The site you were looking for, %s, does not exist, but you can create it now!" msgstr "Le site que vous cherchez (%s) n’existe pas, mais vous pouvez le crÃ©er dÃ¨s Ã prÃ©sent !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:33 +msgid "Comments" +msgstr "Commentaires" +||||||| .r11156 +#: wp-includes/media.php:2942 +msgid "Trash Selected" +msgstr "Mettre la sÃ©lection Ã la Corbeille" +======= #: wp-signup.php:708 msgid "You are logged in already. No need to register again!" msgstr "Vous Ãªtes dÃ©jÃ connectÃ©. Pas besoin de vous rÃ©inscrire !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:61 +msgid "No comments yet." +msgstr "Pas encore de commentaire." +||||||| .r11156 +#: wp-includes/media.php:2943 +msgid "Untrash Selected" +msgstr "Retirer la sÃ©lection de la Corbeille" +======= #: wp-signup.php:706 msgid "Sorry, new registrations are not allowed at this time." msgstr "DÃ©solÃ©, il n’est pas possible de s’enregistrer Ã l’heure actuelle." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/widgets.php:782 +msgid "Sidebar" +msgstr "Colonne latÃ©rale" +||||||| .r11156 +#: wp-includes/media-template.php:416 wp-includes/media-template.php:519 +msgid "Untrash" +msgstr "Sortir de la Corbeille" +======= #: wp-signup.php:687 msgid "Site registration has been disabled." msgstr "Les inscriptions de sites sont dÃ©sactivÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/widgets.php:139 +msgid "There are no options for this widget." +msgstr "Il n’y a pas d’options pour ce widget." +||||||| .r11156 +#: wp-includes/media.php:2939 +msgid "" +"You are about to trash these items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous vous apprÃªtez Ã mettre ces Ã©lÃ©ments Ã la Corbeille.\n" +"'Annuler' pour arrÃªter, 'OK' pour les supprimer" +======= #: wp-signup.php:681 msgid "User registration has been disabled." msgstr "Les inscriptions d’utilisateurs sont dÃ©sactivÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:131 +msgid "Yes" +msgstr "Oui" +||||||| .r11156 +#: wp-includes/class-wp-customize-panel.php:175 +msgid "Press return or enter to open this panel" +msgstr "Appuyer sur EntrÃ©e pour ouvrir ce panneau" +======= #: wp-signup.php:673 msgid "You must first log in, and then you can create a new site." msgstr "Vous devez d’abord vous connecter avant de pouvoir crÃ©er un nouveau site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:87 +#: wp-includes/theme-compat/comments.php:90 +msgid "(required)" +msgstr "(obligatoire)" +||||||| .r11156 +#: wp-includes/media.php:2940 +msgid "Bulk Select" +msgstr "SÃ©lection en masse" +======= #: wp-signup.php:670 msgid "Registration has been disabled." msgstr "Les inscriptions ont Ã©tÃ© dÃ©sactivÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: post title +#: wp-includes/theme-compat/comments.php:30 +msgid "One response to %s" +msgstr "Une rÃ©ponse Ã %s" +||||||| .r11156 +#: wp-includes/media.php:2941 +msgid "Cancel Selection" +msgstr "Annuler la sÃ©lection" +======= #: wp-signup.php:664 msgid "Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your Options page." msgstr "Salutations, cher administrateur du site ! Vous acceptez actuellement les inscriptions de type « %s ». Pour modifier ou dÃ©sactiver les inscriptions, allez sur votre page d’options." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:1894 +msgid "Cannot create a user with an empty login name." +msgstr "Impossible de crÃ©er un utilisateur avec un identifiant vide." +||||||| .r11156 +#: wp-includes/media.php:2944 +msgid "Delete Selected" +msgstr "Supprimer la sÃ©lection" +======= #: wp-signup.php:661 msgctxt "Multisite active signup type" msgid "user" msgstr "utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2381 +msgid "AIM" +msgstr "AIM" +||||||| .r11156 +#: wp-includes/script-loader.php:540 +msgctxt "missing menu item navigation label" +msgid "(no label)" +msgstr "(Aucune information)" +======= #: wp-signup.php:660 msgctxt "Multisite active signup type" msgid "blog" msgstr "site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2382 +msgid "Yahoo IM" +msgstr "Yahoo Messenger" +||||||| .r11156 +#: wp-includes/taxonomy.php:3757 wp-includes/taxonomy.php:3782 +msgid "%s: %l." +msgstr "%s : %l." +======= #: wp-signup.php:659 msgctxt "Multisite active signup type" msgid "none" msgstr "aucune" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2383 +msgid "Jabber / Google Talk" +msgstr "Jabber / Google Talk" +||||||| .r11156 +#: wp-includes/user.php:137 +msgid "ERROR: Invalid username. Lost your password?" +msgstr "ERREUR : Nom d’utilisateur invalide. Vous avez perdu votre mot de passe ?" +======= #: wp-signup.php:658 msgctxt "Multisite active signup type" msgid "all" msgstr "tous" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:3250 +msgid "Invalid Taxonomy" +msgstr "Taxinomie invalide" +||||||| .r11156 +#: wp-includes/user.php:153 +msgid "ERROR: The password you entered for the username %1$s is incorrect. Lost your password?" +msgstr "ERREUR : le mot de passe que vous avez saisi pour le nom d’utilisateur %1$s est incorrect. Avez-vous perdu votre mot de passe ?" +======= #: wp-signup.php:637 msgid "Have you entered your email correctly? You have entered %s, if it’s incorrect, you will not receive your email." msgstr "Avez-vous correctement saisi votre adresse de messagerie ? Vous aviez saisi %s, mais si ce n’est pas correct, vous ne recevrez pas de message." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:1353 wp-includes/taxonomy.php:3457 +#: wp-includes/taxonomy.php:4601 +msgid "Empty Term" +msgstr "Pas de terme" +||||||| .r11156 +#: wp-includes/media.php:1467 +msgid "Bitrate" +msgstr "DÃ©bit" +======= #: wp-signup.php:636 msgid "Check the junk or spam folder of your email client. Sometime emails wind up there by mistake." msgstr "VÃ©rifiez le courrier indÃ©sirable (ou dossier spam) de votre client de messagerie. Parfois, certains messages arrivent lÃ par erreur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:2907 wp-includes/taxonomy.php:3479 +msgid "A name is required for this term" +msgstr "Un nom est requis pour ce terme" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:932 +msgid "Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser’s edit menu instead." +msgstr "Votre navigateur ne supporte pas les accÃ¨s direct au presse-papier. Veuillez utiliser les raccourcis clavier ou le menu Ãdition de votre navigateur." +======= #: wp-signup.php:635 msgid "Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control." msgstr "Veuillez patienter encore quelques instants. Parfois, la livraison des messages peut Ãªtre retardÃ©e par des processus en dehors de notre contrÃ´le." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:2979 +msgid "Could not insert term into the database" +msgstr "Impossible d’insÃ©rer le terme dans la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:947 +msgid "Read more..." +msgstr "Lire la suite..." +======= #: wp-signup.php:633 msgid "If you haven’t received your email yet, there are a number of things you can do:" msgstr "Si vous n’avez encore pas reÃ§u votre e-mail, il existe un certain nombre de choses que vous pouvez faire :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:3539 +msgid "The slug “%s” is already in use by another term" +msgstr "L’identifiant Â« %s Â» est dÃ©jÃ utilisÃ© par un autre terme" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1412 +msgid "Search or use up and down arrow keys to select an item." +msgstr "Chercher ou utiliser les flÃ¨ches haut et bas pour choisir un Ã©lÃ©ment." +======= #: wp-signup.php:631 msgid "Still waiting for your email?" msgstr "Toujours dans l’attente de votre e-mail ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:4804 +msgid "Invalid object ID" +msgstr "Identifiant d’objet non valide." +||||||| .r11156 +#: wp-includes/media-template.php:151 +msgid "Close media panel" +msgstr "Fermer le panneau des mÃ©dias" +======= #: wp-signup.php:630 msgid "If you do not activate your site within two days, you will have to sign up again." msgstr "Si vous n’activez pas votre site dans les deux jours, vous devrez Ã nouveau l’enregistrer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:128 +msgid "ERROR: The username field is empty." +msgstr "ERREUR : le champ de l’identifiant est vide." +||||||| .r11156 +#: wp-includes/media-template.php:172 +msgid "Close uploader" +msgstr "Fermer le panneau de chargement" +======= #: wp-signup.php:628 msgid "But, before you can start using your site, you must activate it." msgstr "Mais, avant d’utiliser votre nouveau site, vous devez l’activer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:131 +msgid "ERROR: The password field is empty." +msgstr "ERREUR : le champ du mot de passe est vide." +||||||| .r11156 +#: wp-includes/media-template.php:218 +msgid "Maximum upload file size: %s." +msgstr "Taille de fichier maximale pour la mise en ligne : %s." +======= #: wp-signup.php:626 msgid "Congratulations! Your new site, %s, is almost ready." msgstr "FÃ©licitations! Votre nouveau site, %s, est presque prÃªt." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:221 +msgid "ERROR: Your account has been marked as a spammer." +msgstr "ERREUR : votre compte a Ã©tÃ© marquÃ© comme Ã©tant indÃ©sirable." +||||||| .r11156 +#: wp-includes/media-template.php:237 +msgid "List View" +msgstr "Vue en liste" +======= #: wp-signup.php:565 msgid "Signup" msgstr "Inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/widgets.php:780 wp-includes/widgets.php:850 +msgid "Sidebar %d" +msgstr "Colonne latÃ©rale %d" +||||||| .r11156 +#: wp-includes/media-template.php:240 +msgid "Grid View" +msgstr "Vue en grille" +======= #: wp-signup.php:501 msgid "If you do not activate your username within two days, you will have to sign up again." msgstr "Si vous n’activez pas votre compte sous deux jours, vous devrez vous rÃ©inscrire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:3017 +msgid "ERROR: WordPress %1$s requires MySQL %2$s or higher" +msgstr "ERREUR : WordPress %1$s requiert MySQL %2$s ou une version supÃ©rieure." +||||||| .r11156 +#: wp-includes/media-template.php:267 +msgid "Edit previous media item" +msgstr "Modifier l’Ã©lÃ©ment mÃ©dia prÃ©cÃ©dent" +======= #: wp-signup.php:500 wp-signup.php:629 msgid "Check your inbox at %s and click the link given." msgstr "Consultez la boite de rÃ©ception de l’adresse %s, et cliquez sur le lien qui vous a Ã©tÃ© envoyÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:102 +msgid "Powered by WordPress" +msgstr "PropulsÃ© par WordPress" +||||||| .r11156 +#: wp-includes/media-template.php:268 +msgid "Edit next media item" +msgstr "Modifier l’Ã©lÃ©ment mÃ©dia suivant" +======= #: wp-signup.php:499 msgid "But, before you can start using your new username, you must activate it." msgstr "Mais, avant d’utiliser votre nouvel identifiant, vous devez l’activer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:343 +msgid "Password reset is not allowed for this user" +msgstr "La rÃ©initialisation du mot de passe n’est pas autorisÃ©e pour cet utilisateur" +||||||| .r11156 +#: wp-includes/media-template.php:327 +msgid "File name:" +msgstr "Nom du fichier :" +======= #: wp-signup.php:498 msgid "%s is your new username" msgstr "Votre nouvel identifiant est %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:385 +msgid "[%s] Password Reset" +msgstr "[%s] Renouvellement du mot de passe" +||||||| .r11156 +#: wp-includes/media-template.php:328 +msgid "File type:" +msgstr "Type du fichier :" +======= #: wp-signup.php:453 msgid "Next" msgstr "Suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:555 +msgid "Lost Password" +msgstr "Mot de passe oubliÃ©" +||||||| .r11156 +#: wp-includes/media-template.php:329 +msgid "Uploaded on:" +msgstr "Mis en ligne le :" +======= #: wp-signup.php:449 msgid "Just a username, please." msgstr "Juste l’identifiant, s’il vous plaÃ®t." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:574 +msgid "Get New Password" +msgstr "GÃ©nÃ©rer un mot de passe" +||||||| .r11156 +#: wp-includes/media-template.php:331 +msgid "File size:" +msgstr "Taille du fichier :" +======= #: wp-signup.php:446 msgid "Gimme a site!" msgstr "Donnez-moi un site !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:219 +msgid "Are you lost?" +msgstr "Ãtes-vous perdu(e) ?" +||||||| .r11156 +#: wp-includes/media-template.php:334 +msgid "Dimensions:" +msgstr "Dimensions :" +======= #: wp-signup.php:430 msgid "Get your own %s account in seconds" msgstr "Obtenez votre propre compte %s en quelques secondes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:219 +msgid "← Back to %s" +msgstr "← Retour sur %s" +||||||| .r11156 +#: wp-includes/media-template.php:344 +msgid "Bitrate:" +msgstr "DÃ©bit binaire" +======= #: wp-signup.php:376 msgid "http://%2$s is your new site. Log in as “%4$s” using your existing password." msgstr "http://%2$s est votre nouveau site. Connectez-vous avec l’identifiant « %4$s », Ã l’aide de votre mot de passe actuel." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:742 +msgid "Registration Form" +msgstr "Formulaire d’inscription" +||||||| .r11156 +#: wp-includes/media-template.php:394 +msgid "Uploaded By" +msgstr "Mise en ligne par" +======= #: wp-signup.php:374 msgid "The site %s is yours." msgstr "Le site %s est Ã vous." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:742 +msgid "Register For This Site" +msgstr "S’inscrire sur ce site" +||||||| .r11156 +#: wp-includes/media-template.php:399 +msgid "Uploaded To" +msgstr "Mis en ligne sur" +======= #: wp-signup.php:292 msgid "Create Site" msgstr "CrÃ©er un site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:770 wp-login.php:953 +msgid "Password Lost and Found" +msgstr "RÃ©cupÃ©ration de mot de passe" +||||||| .r11156 +#: wp-includes/media-template.php:411 +msgid "View attachment page" +msgstr "Afficher la page du fichier" +======= #: wp-signup.php:277 msgid "If you’re not going to use a great site domain, leave it for a new user. Now have at it!" msgstr "Si vous ne comptez pas utiliser ce superbe nom de domaine, laissez-le Ã un autre utilisateur. Et maintenant, lancez-vous !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:770 wp-login.php:953 +msgid "Lost your password?" +msgstr "Mot de passe oubliÃ© ?" +||||||| .r11156 +#: wp-includes/media-template.php:412 +msgid "Edit more details" +msgstr " Indiquer plus de dÃ©tails" +======= #: wp-signup.php:268 msgid "Sites you are already a member of:" msgstr "Les sites que vous possÃ©dez dÃ©jÃ  :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:871 +msgid "You are now logged out." +msgstr "Vous Ãªtes dÃ©sormais dÃ©connectÃ©(e)." +||||||| .r11156 +#: wp-includes/media.php:1468 +msgid "Bitrate Mode" +msgstr "Mode de dÃ©bit" +======= #: wp-signup.php:262 msgid "Welcome back, %s. By filling out the form below, you can add another site to your account. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!" msgstr "Heureux de voir revoir, %s ! En remplissant le formulaire ci-dessous, vous pouvez ajouter un autre site Ã votre compte. Il n’y a pas de limite au nombre de sites dont vous pouvez disposer, donc crÃ©ez-en autant que vous le souhaitez, mais Ã©crivez pondÃ©rÃ©ment." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:873 +msgid "User registration is currently not allowed." +msgstr "Les nouvelles inscriptions ne sont pas autorisÃ©es pour l’instant." +||||||| .r11156 +#: wp-includes/media.php:2930 +msgid "All media types" +msgstr "Tous les types de mÃ©dias" +======= #: wp-signup.php:259 msgid "There was a problem, please correct the form below and try again." msgstr "Il y a eu un problÃ¨me, veuillez remplir le formulaire ci-dessous et rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:879 +msgid "Registration complete. Please check your e-mail." +msgstr "Enregistrement terminÃ©. Veuillez vÃ©rifier vos nouveaux e-mails." +||||||| .r11156 +#: wp-includes/media.php:2931 +msgid "All dates" +msgstr "Toutes les dates" +======= #: wp-signup.php:256 msgid "Get another %s site in seconds" msgstr "Ouvrir un autre site %s en quelques secondes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:122 +msgid "Author is %s" +msgstr "L’auteur est %s" +||||||| .r11156 +#: wp-includes/media.php:2934 +msgid "Unattached" +msgstr "Non-attachÃ©" +======= #: wp-signup.php:189 msgid "We send your registration email to this address. (Double-check your email address before continuing.)" msgstr "Nous enverrons votre confirmation d’inscription Ã cette adresse. VÃ©rifiez donc bien qu’elle est correcte avant de continuer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:247 +msgid "Author: %s" +msgstr "Auteur : %s" +||||||| .r11156 +#: wp-includes/media.php:2938 +msgid "" +"You are about to permanently delete these items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous vous apprÃªtez Ã supprimer dÃ©finitivement ces Ã©lÃ©ments.\n" +"'Annuler' pour arrÃªter, 'OK' pour continuer." +======= #: wp-signup.php:185 msgid "Email Address:" msgstr "Adresse e-mail :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:248 +msgid "Posted title: %s" +msgstr "Titre publiÃ© : %s" +||||||| .r11156 +#: wp-includes/media.php:2947 +msgid "Filter by date" +msgstr "Filtrer par date" +======= #: wp-signup.php:182 msgid "(Must be at least 4 characters, letters and numbers only.)" msgstr "(Doit contenir au moins 4 caractÃ¨res, uniquement des lettres ou des chiffres.)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:251 +msgid "Oops: %s" +msgstr "Oups : %s" +||||||| .r11156 +#: wp-includes/media.php:2948 +msgid "Filter by type" +msgstr "Filtrer par type" +======= #: wp-signup.php:135 msgid "No" msgstr "Non" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:94 +msgid "Site Name:" +msgstr "Nom du site :" +||||||| .r11156 +#: wp-includes/media.php:2949 +msgid "Search Media" +msgstr "Rechercher un mÃ©dia" +======= #: wp-signup.php:131 msgid "Yes" msgstr "Oui" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:96 +msgid "Site Domain:" +msgstr "Domaine du site :" +||||||| .r11156 +#: wp-includes/media.php:3022 +msgid "Edit Metadata" +msgstr "Modifier les mÃ©tadonnÃ©es " +======= #: wp-signup.php:127 msgid "Allow search engines to index this site." msgstr "Demander aux moteurs de recherche d’indexer ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:109 +msgid "sitename" +msgstr "nomdusite" +||||||| .r11156 +#: wp-includes/ms-load.php:95 +msgid "This site is no longer available." +msgstr "Ce site n’est plus disponible." +======= #: wp-signup.php:126 msgid "Privacy:" msgstr "Vie privÃ©e :" +>>>>>>> .r12027 #: wp-signup.php:117 msgid "Site Title:" msgstr "Titre du site :" +<<<<<<< .mine +#: wp-signup.php:126 +msgid "Privacy:" +msgstr "Vie privÃ©e :" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:988 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header size of %s × %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une taille de %s × %s pixels pour l’en-tÃªte." +======= #: wp-signup.php:112 msgid "Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!" msgstr "Doit contenir au moins 4 caractÃ¨res, avec uniquement des lettres et des chiffres. Vous ne pourrez pas en changer, donc choisissez bien !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:182 +msgid "(Must be at least 4 characters, letters and numbers only.)" +msgstr "(Doit contenir au moins 4 caractÃ¨res, uniquement des lettres ou des chiffres.)" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:990 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header width of %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une largeur de %s pixels pour l’en-tÃªte." +======= #: wp-signup.php:112 msgid "Your address will be %s." msgstr "Votre adresse sera %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:256 +msgid "Get another %s site in seconds" +msgstr "Ouvrir un autre site %s en quelques secondes" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:992 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header height of %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une hauteur de %s pixels pour l’en-tÃªte." +======= #: wp-signup.php:111 msgid "domain" msgstr "domaine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:268 +msgid "Sites you are already a member of:" +msgstr "Les sites que vous possÃ©dez dÃ©jÃ  :" +||||||| .r11156 +#: wp-includes/class-wp-customize-section.php:182 +msgid "Press return or enter to expand" +msgstr "Appuyez sur Envoi ou Retour pour ouvrir" +======= #: wp-signup.php:109 msgid "sitename" msgstr "nomdusite" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:292 +msgid "Create Site" +msgstr "CrÃ©er un site" +||||||| .r11156 +#: wp-includes/class-wp-customize-panel.php:182 +msgid "You are customizing %s" +msgstr "Vous personnalisez %s" +======= #: wp-signup.php:96 msgid "Site Domain:" msgstr "Domaine du site :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:374 +msgid "The site %s is yours." +msgstr "Le site %s est Ã vous." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:438 +msgid "Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars)." +msgstr "Les widgets sont des sections de contenu indÃ©pendants qui peuvent Ãªtre placÃ©s dans les zones Ã widgets prÃ©vues dans votre thÃ¨me (gÃ©nÃ©ralement, les barres latÃ©rales)." +======= #: wp-signup.php:94 msgid "Site Name:" msgstr "Nom du site :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:449 +msgid "Just a username, please." +msgstr "Juste l’identifiant, s’il vous plaÃ®t." +||||||| .r11156 +#: wp-includes/update.php:119 wp-includes/update.php:295 +#: wp-includes/update.php:457 +msgid "(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)" +msgstr "(WordPress n’a pas pu Ã©tablir de connexion sÃ©curisÃ©e vers WordPress.org. Veuillez contacter l’administrateur de votre serveur.)" +======= #: wp-mail.php:255 msgid "Mission complete. Message %s deleted." msgstr "Mission terminÃ©e. Message %s supprimÃ©. " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:453 +msgid "Next" +msgstr "Suivant" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:1049 +msgid "Shift-click to edit this widget." +msgstr "Faites Shift+clic pour modifier ce widget." +======= #: wp-mail.php:251 msgid "Oops: %s" msgstr "Oups : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:499 +msgid "But, before you can start using your new username, you must activate it." +msgstr "Mais, avant d’utiliser votre nouvel identifiant, vous devez l’activer." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:757 +msgctxt "HTML tag" +msgid "Address" +msgstr "Adresse" +======= #: wp-mail.php:248 msgid "Posted title: %s" msgstr "Titre publiÃ© : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:501 +msgid "If you do not activate your username within two days, you will have to sign up again." +msgstr "Si vous n’activez pas votre compte sous deux jours, vous devrez vous rÃ©inscrire." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:929 +msgid "If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically." +msgstr "Si vous souhaitez utiliser du contenu riche en provenance de Microsoft Word, essayez de dÃ©sactiver cette option. L’Ã©diteur nettoiera automatiquement les textes en provenance de Word." +======= #: wp-mail.php:247 msgid "Author: %s" msgstr "Auteur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:565 +msgid "Signup" +msgstr "Inscription" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:944 +#: wp-includes/js/tinymce/wp-mce-help.php:16 +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" +======= #: wp-mail.php:122 msgid "Author is %s" msgstr "L’auteur est %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:628 +msgid "But, before you can start using your site, you must activate it." +msgstr "Mais, avant d’utiliser votre nouveau site, vous devez l’activer." +||||||| .r11156 +#: wp-login.php:770 +msgid "ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums." +msgstr "ERREUR : les cookies sont bloquÃ©s en raison d’un retour inattendu. Pour obtenir de l’aide, veuillez lire cette documentation ou essayez les forums d’entraide." +======= #: wp-mail.php:54 msgid "There doesn’t seem to be any new mail." msgstr "Il ne semble pas y avoir de nouveau message." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:687 +msgid "Site registration has been disabled." +msgstr "Les inscriptions de sites sont dÃ©sactivÃ©es." +||||||| .r11156 +#: wp-login.php:771 wp-login.php:775 +msgid "http://codex.wordpress.org/Cookies" +msgstr "http://codex.wordpress.org/Cookies" +======= #: wp-mail.php:34 msgid "Slow down cowboy, no need to check for new mails so often!" msgstr "LÃ¨ve le pied, champion ! Inutile de vÃ©rifier tes e-mails aussi souvent !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:1285 +msgid "WordPress database error %1$s for query %2$s made by %3$s" +msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s faite par %3$s" +||||||| .r11156 +#: wp-login.php:774 +msgid "ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress." +msgstr "ERREUR : les cookies sont bloquÃ©s ou ne sont pas reconnus par votre navigateur. Vous devez activer les cookies pour utiliser WordPress." +======= #: wp-mail.php:15 msgid "This action has been disabled by the administrator." msgstr "Cette action a Ã©tÃ© dÃ©sactivÃ©e par l’administrateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:1287 +msgid "WordPress database error %1$s for query %2$s" +msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:132 +msgid "Add/remove code tag" +msgstr "Ajouter/enlever la balise de code" +======= #: wp-login.php:870 msgid "You have successfully updated WordPress! Please log back in to see what’s new." msgstr "WordPress a Ã©tÃ© mis Ã jour avec succÃ¨s ! Veuillez vous reconnecter pour voir les nouveautÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:557 +msgid "%d WordPress Update" +msgstr "%d mise Ã jour de WordPress" +||||||| .r11156 +#: wp-includes/media-template.php:968 +msgid "Link CSS Class" +msgstr "Classe CSS du lien" +======= #: wp-login.php:868 msgid "Registration complete. Please check your e-mail." msgstr "Enregistrement terminÃ©. Veuillez vÃ©rifier vos nouveaux e-mails." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:559 +msgid "%d Plugin Update" +msgid_plural "%d Plugin Updates" +msgstr[0] "%d mise Ã jour d’extension" +msgstr[1] "%d mises Ã jour d’extensions" +||||||| .r11156 +#: wp-includes/media-template.php:748 +msgid "Show Video List" +msgstr "Afficher la list des vidÃ©os" +======= #: wp-login.php:866 msgid "Check your e-mail for your new password." msgstr "VÃ©rifiez votre messagerie pour y trouver votre nouveau mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:561 +msgid "%d Theme Update" +msgid_plural "%d Theme Updates" +msgstr[0] "%d mise Ã jour de thÃ¨me" +msgstr[1] "%d mises Ã jour de thÃ¨mes" +||||||| .r11156 +#: wp-includes/media-template.php:865 +msgid "Display Settings" +msgstr "RÃ©glages de l’affichage" +======= #: wp-login.php:864 msgid "Check your e-mail for the confirmation link." msgstr "VÃ©rifiez votre messagerie pour y trouver le lien de confirmation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:277 +msgid "If you’re not going to use a great site domain, leave it for a new user. Now have at it!" +msgstr "Si vous ne comptez pas utiliser ce superbe nom de domaine, laissez-le Ã un autre utilisateur. Et maintenant, lancez-vous !" +||||||| .r11156 +#: wp-includes/media-template.php:844 +msgid "Edit Original" +msgstr "Modifier l’original" +======= #: wp-login.php:862 msgid "User registration is currently not allowed." msgstr "Les nouvelles inscriptions ne sont pas autorisÃ©es pour l’instant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:681 +msgid "User registration has been disabled." +msgstr "Les inscriptions d’utilisateurs sont dÃ©sactivÃ©es." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:909 +msgctxt "table cell alignment attribute" +msgid "None" +msgstr "Aucun" +======= #: wp-login.php:860 msgid "You are now logged out." msgstr "Vous Ãªtes dÃ©sormais dÃ©connectÃ©(e)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-links-opml.php:29 +msgid "Links for %s" +msgstr "Liens pour %s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:769 +msgid "Font Family" +msgstr "Famille de polices" +======= #: wp-login.php:856 msgid "Session expired. Please log in again. You will not move away from this page." msgstr "La session a expirÃ©. Veuillez vous reconnecter. Vous reviendrez sur cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2576 +msgid "ERROR: This email is already registered, please choose another one." +msgstr "ERREUR : cette adresse de messagerie est dÃ©jÃ utilisÃ©e. Merci d’en choisir une autre." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:770 +msgid "Font Sizes" +msgstr "Tailles de la police" +======= #: wp-login.php:822 msgid "You have logged in successfully." msgstr "Vous vous Ãªtes bien connectÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:2968 +msgid "A term with the name provided already exists with this parent." +msgstr "Un terme avec ce nom existe dÃ©jÃ pour ce parent." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:900 +msgid "Split table cell" +msgstr "Diviser une cellule du tableau" +======= #: wp-login.php:803 msgid "ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress." msgstr "ERREUR : les cookies sont bloquÃ©s ou ne sont pas reconnus par votre navigateur. Vous devez activer les cookies pour utiliser WordPress." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:10 +#: wp-includes/theme-compat/comments.php:10 +#: wp-includes/theme-compat/footer.php:10 +#: wp-includes/theme-compat/header.php:10 +#: wp-includes/theme-compat/sidebar.php:10 +msgid "Theme without %1$s" +msgstr "ThÃ¨me sans %1$s." +||||||| .r11156 +#: wp-includes/media-template.php:223 wp-includes/media.php:2984 +msgid "Suggested image dimensions:" +msgstr "Dimensions d’image suggÃ©rÃ©es :" +======= #: wp-login.php:800 wp-login.php:804 msgid "https://codex.wordpress.org/Cookies" msgstr "https://codex.wordpress.org/Cookies" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:10 +#: wp-includes/theme-compat/comments.php:10 +#: wp-includes/theme-compat/footer.php:10 +#: wp-includes/theme-compat/header.php:10 +#: wp-includes/theme-compat/sidebar.php:10 +msgid "Please include a %1$s template in your theme." +msgstr "Veuillez inclure un modÃ¨le de type « %1$s » Ã votre thÃ¨me." +||||||| .r11156 +#: wp-includes/media-template.php:912 +msgid "Custom Size" +msgstr "Taille personalisÃ©e" +======= #: wp-login.php:799 msgid "ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums." msgstr "ERREUR : les cookies sont bloquÃ©s en raison d’un retour inattendu. Pour obtenir de l’aide, veuillez lire cette documentation ou essayez les forums d’entraide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:14 +msgid "%1$s - Comments on %2$s" +msgstr "%1$s - Commentaires sur %2$s" +||||||| .r11156 +#: wp-includes/media-template.php:947 +msgid "Advanced Options" +msgstr "Options avancÃ©es" +======= #: wp-login.php:759 wp-login.php:942 msgid "Lost your password?" msgstr "Mot de passe oubliÃ© ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:35 +msgid "RSS feed for comments on this post." +msgstr "Flux RSS des commentaires de cet article." +||||||| .r11156 +#: wp-includes/media-template.php:951 +msgid "Image Title Attribute" +msgstr "Attribut « Title » de l’image" +======= #: wp-login.php:759 wp-login.php:942 msgid "Password Lost and Found" msgstr "RÃ©cupÃ©ration de mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:38 +msgid "The URL to TrackBack this entry is: %s" +msgstr "L’adresse web pour faire un rÃ©trolien sur cet article est : %s" +||||||| .r11156 +#: wp-includes/media-template.php:955 +msgid "Image CSS Class" +msgstr "Classe CSS de l’image" +======= #: wp-login.php:751 msgid "A password will be e-mailed to you." msgstr "Un mot de passe vous sera envoyÃ© sur votre adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:55 +msgid "by %1$s — %2$s @ %4$s" +msgstr "par %1$s — %2$s Ã %4$s" +||||||| .r11156 +#: wp-includes/media-template.php:370 wp-includes/media-template.php:547 +#: wp-includes/media.php:1458 +msgid "Artist" +msgstr "Artiste" +======= #: wp-login.php:731 msgid "Register For This Site" msgstr "S’inscrire sur ce site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:66 +msgid "Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: %s" +msgstr "Les paragraphes et retours Ã la ligne sont automatiques. Les adresses de messagerie ne sont pas affichÃ©es. HTML autorisÃ© : %s" +||||||| .r11156 +#: wp-includes/media-template.php:371 wp-includes/media-template.php:548 +#: wp-includes/media.php:1459 +msgid "Album" +msgstr "Album" +======= #: wp-login.php:731 msgid "Registration Form" msgstr "Formulaire d’inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:70 +msgid "Logged in as %2$s. Log out »" +msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter »" +||||||| .r11156 +#: wp-includes/media.php:1463 +msgid "Genre" +msgstr "Genre" +======= #: wp-login.php:653 msgid "Confirm new password" msgstr "Confirmer le nouveau mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:84 +msgid "URL" +msgstr "Adresse web" +||||||| .r11156 +#: wp-includes/media.php:1464 +msgid "Year" +msgstr "AnnÃ©e" +======= #: wp-login.php:649 msgid "New password" msgstr "Nouveau mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:89 +msgid "Your Comment" +msgstr "Votre commentaire" +||||||| .r11156 +#: wp-includes/media.php:1465 +msgctxt "video or audio" +msgid "Length" +msgstr "DurÃ©e" +======= #: wp-login.php:642 msgid "Enter your new password below." msgstr "Veuillez saisir une deuxiÃ¨me fois votre nouveau mot de passe ci-dessous." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:97 +msgid "Say It!" +msgstr "Dites-le !" +||||||| .r11156 +#: wp-includes/media.php:2985 +msgid "There has been an error cropping your image." +msgstr "Une erreur est survenue lors du recadrage de votre image." +======= #: wp-login.php:642 wp-login.php:672 msgid "Reset Password" msgstr "RÃ©initialiser le mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:105 +msgid "Sorry, the comment form is closed at this time." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour le moment." +||||||| .r11156 +#: wp-includes/media.php:3004 +msgid "Edit Audio Playlist" +msgstr "Modifier la liste de lecture audio" +======= #: wp-login.php:634 msgid "Your password has been reset." msgstr "Votre mot de passe a Ã©tÃ© rÃ©initialisÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:110 +msgid "Close this window." +msgstr "Fermer cette fenÃªtre." +||||||| .r11156 +#: wp-includes/media.php:3005 +msgid "← Cancel Audio Playlist" +msgstr "← Annuler la liste de lecture audio" +======= #: wp-login.php:634 msgid "Password Reset" msgstr "Renouvellement du mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:116 +msgid "Sorry, no posts matched your criteria." +msgstr "DÃ©solÃ©, aucun article ne correspond Ã vos critÃ¨res." +||||||| .r11156 +#: wp-includes/media.php:3006 +msgid "Insert audio playlist" +msgstr "InsÃ©rer une liste de lecture audio" +======= #: wp-login.php:619 msgid "The passwords do not match." msgstr "Vos mots de passe ne correspondent pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:59 +msgid "Comments are closed." +msgstr "Les commentaires sont fermÃ©s." +||||||| .r11156 +#: wp-includes/media.php:3007 +msgid "Update audio playlist" +msgstr "Mettre Ã jour la liste de lecture audio" +======= #: wp-login.php:567 msgid "Get New Password" msgstr "GÃ©nÃ©rer un mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:82 +msgid "Logged in as %2$s." +msgstr "ConnectÃ© en tant que %2$s." +||||||| .r11156 +#: wp-includes/media.php:3008 +msgid "Add to audio playlist" +msgstr "Ajouter Ã la liste de lecture audio" +======= #: wp-login.php:556 msgid "Username or E-mail:" msgstr "Identifiant ou adresse de messagerie :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:82 +msgid "Log out of this account" +msgstr "Se dÃ©connecter" +||||||| .r11156 +#: wp-includes/media.php:3009 +msgid "Add to Audio Playlist" +msgstr "Ajouter Ã la liste de lecture audio" +======= #: wp-login.php:548 msgid "Please enter your username or email address. You will receive a link to create a new password via email." msgstr "Veuillez saisir votre identifiant ou votre adresse de messagerie. Un lien permettant de crÃ©er un nouveau mot de passe vous sera envoyÃ© par e-mail." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:82 +msgid "Log out »" +msgstr "DÃ©connexion »" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:701 +msgctxt "Move widget" +msgid "Move" +msgstr "DÃ©placer" +======= #: wp-login.php:548 msgid "Lost Password" msgstr "Mot de passe oubliÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:90 +msgid "Mail (will not be published)" +msgstr "Adresse de messagerie (ne sera pas publiÃ©e)" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:924 +msgid "Set image" +msgstr "DÃ©finir l’image" +======= #: wp-login.php:528 msgid "Sorry, that key has expired. Please try again." msgstr "DÃ©solÃ©, cette clÃ© a expirÃ©. Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:97 +msgid "XHTML: You can use these tags: %s" +msgstr "XHTML : Vous pouvez utiliser ces balises : %s" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1005 +msgctxt "custom header" +msgid "Hide image" +msgstr "Cacher l’image" +======= #: wp-login.php:526 msgid "Sorry, that key does not appear to be valid." msgstr "DÃ©solÃ©, cette clÃ© ne semble pas Ãªtre valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:101 +msgid "Submit Comment" +msgstr "Soumettre le commentaire" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1007 +msgctxt "header image" +msgid "Add new image" +msgstr "Ajouter une nouvelle image" +======= #: wp-login.php:404 msgid "Possible reason: your host may have disabled the mail() function." msgstr "Raison possible : votre hÃ©bergeur peut avoir dÃ©sactivÃ© la fonction mail()." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/footer.php:17 +msgid "%1$s is proudly powered by %2$s" +msgstr "%1$s est fiÃ¨rement propulsÃ© par %2$s" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1054 +msgctxt "Reorder widgets in Customizer" +msgid "Reorder" +msgstr "RÃ©ordonner" +======= #: wp-login.php:404 msgid "The e-mail could not be sent." msgstr "Le message n’a pas pu Ãªtre envoyÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/footer.php:19 +msgid "%1$s and %2$s." +msgstr "%1$s et %2$s." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1055 +msgctxt "Cancel reordering widgets in Customizer" +msgid "Done" +msgstr "TerminÃ©" +======= #: wp-login.php:379 msgid "[%s] Password Reset" msgstr "[%s] Renouvellement du mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/footer.php:19 +msgid "Entries (RSS)" +msgstr "Articles (RSS)" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:725 +msgid "Save and preview changes before publishing them." +msgstr "Enregistrer les modifications et les prÃ©visualiser avant de les publier" +======= #: wp-login.php:367 msgid "To reset your password, visit the following address:" msgstr "Pour renouveler votre mot de passe, cliquez sur le lien suivant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/footer.php:19 +msgid "Comments (RSS)" +msgstr "Commentaires (RSS)" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:727 +msgid "Trash widget by moving it to the inactive widgets sidebar." +msgstr "Mettez le widget Ã la Corbeille en le dÃ©plaÃ§ant vers la barre latÃ©rale inactive." +======= #: wp-login.php:366 msgid "If this was a mistake, just ignore this email and nothing will happen." msgstr "S'il s'agit d'une erreur, ignorez ce message et la demande ne sera pas prise en compte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/footer.php:20 +msgid "%d queries. %s seconds." +msgstr "%d requÃªtes. %s secondes." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:758 +msgid "Search Widgets" +msgstr "Rechercher des widgets" +======= #: wp-login.php:363 msgid "Someone requested that the password be reset for the following account:" msgstr "Quelqu'un a demandÃ© le renouvellement de son mot de passe pour le compte suivant :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:32 +msgid "You are currently browsing the archives for the %s category." +msgstr "Vous parcourez actuellement les archives de la catÃ©gorie %s." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:759 +msgid "Search widgets…" +msgstr "Rechercher de widgets…" +======= #: wp-login.php:337 msgid "Password reset is not allowed for this user" msgstr "La rÃ©initialisation du mot de passe n’est pas autorisÃ©e pour cet utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:35 +msgid "l, F jS, Y" +msgstr "l j F Y" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:743 +msgctxt "TinyMCE" +msgid "Headings" +msgstr "En-tÃªtes" +======= #: wp-login.php:299 msgid "ERROR: Invalid username or e-mail." msgstr "ERREUR : l’identifiant ou l’adresse de messagerie n’est pas valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:38 +msgid "F, Y" +msgstr "F Y" +||||||| .r11156 +#: wp-includes/media-template.php:1037 wp-includes/media-template.php:1127 +msgctxt "auto preload" +msgid "Auto" +msgstr "Automatique" +======= #: wp-login.php:282 msgid "ERROR: There is no user registered with that email address." msgstr "ERREUR : il n’y aucun utilisateur enregistrÃ© avec cette adresse de messagerie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:73 +msgid "This page validates as XHTML 1.0 Transitional" +msgstr "Cette page est en XHTML 1.0 Transitional valide" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:692 +msgid "Move to another area…" +msgstr "DÃ©placer vers une autre zone…" +======= #: wp-login.php:278 msgid "ERROR: Enter a username or e-mail address." msgstr "ERREUR : veuillez saisir une adresse de messagerie ou un identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:73 +msgid "Valid XHTML" +msgstr "XHTML valide" +||||||| .r11156 +#: wp-includes/media.php:2983 +msgid "Cropping…" +msgstr "Recadrage…" +======= #: wp-login.php:219 msgid "← Back to %s" msgstr "← Retour sur %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:74 +msgid "XHTML Friends Network" +msgstr "XHTML Friends Network" +||||||| .r11156 +#: wp-includes/media-template.php:1144 +msgid "Tracks (subtitles, captions, descriptions, chapters, or metadata)" +msgstr "Pistes (sous-titres, lÃ©gendes, descriptions, chapitres ou mÃ©tadonnÃ©es)" +======= #: wp-login.php:219 msgid "Are you lost?" msgstr "Ãtes-vous perdu(e) ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:74 +msgid "XFN" +msgstr "XFN" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:741 +msgctxt "TinyMCE" +msgid "Formats" +msgstr "Formats" +======= #: wp-login.php:102 msgid "Powered by WordPress" msgstr "PropulsÃ© par WordPress" +>>>>>>> .r12027 -#: wp-load.php:78 -msgid "Create a Configuration File" +<<<<<<< .mine +#: wp-login.php:284 +msgid "ERROR: Enter a username or e-mail address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie ou un identifiant." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:917 +msgctxt "table cell scope attribute" +msgid "Scope" +msgstr "PortÃ©e" +======= +#: wp-load.php:78 +msgid "Create a Configuration File" msgstr "CrÃ©er un fichier de configuration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:288 +msgid "ERROR: There is no user registered with that email address." +msgstr "ERREUR : il n’y aucun utilisateur enregistrÃ© avec cette adresse de messagerie." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:881 +msgctxt "table column" +msgid "Column" +msgstr "Colonne" +======= #: wp-load.php:77 msgid "You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." msgstr "Vous pouvez crÃ©er un fichier wp-config.php par le biais de cette interface, mais cela ne marche pour toutes les configurations de serveur. La maniÃ¨re la plus sÃ»re reste de crÃ©er le fichier Ã la main." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:305 +msgid "ERROR: Invalid username or e-mail." +msgstr "ERREUR : l’identifiant ou l’adresse de messagerie n’est pas valide." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:752 +msgctxt "TinyMCE" +msgid "Blocks" +msgstr "Blocs" +======= #: wp-load.php:76 msgid "Need more help? We got it." msgstr "Besoin d’aide ? En voici." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:410 +msgid "The e-mail could not be sent." +msgstr "Le message n’a pas pu Ãªtre envoyÃ©." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:755 +msgctxt "HTML tag" +msgid "Div" +msgstr "Div" +======= #: wp-load.php:75 msgid "There doesn't seem to be a wp-config.php file. I need this before we can get started." msgstr "Il ne semble pas y avoir de fichier wp-config.php. J’en ai besoin pour lancer le processus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2571 +msgid "ERROR: Please type your e-mail address." +msgstr "ERREUR : l’adresse de messagerie est obligatoire." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:756 +msgctxt "HTML tag" +msgid "Pre" +msgstr "Pre" +======= #: wp-links-opml.php:29 msgid "Links for %s" msgstr "Liens pour %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2573 +msgid "ERROR: The email address isn’t correct." +msgstr "ERREUR : adresse de messagerie incorrecte." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:759 +msgctxt "HTML elements" +msgid "Inline" +msgstr "Inline" +======= #: wp-includes/wp-db.php:2979 msgid "ERROR: WordPress %1$s requires MySQL %2$s or higher" msgstr "ERREUR : WordPress %1$s requiert MySQL %2$s ou une version supÃ©rieure." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:563 +msgid "Username or E-mail:" +msgstr "Identifiant ou adresse de messagerie :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:767 +msgctxt "editor button" +msgid "Code" +msgstr "Code" +======= #: wp-includes/wp-db.php:1488 msgid "" "\n" @@ -467,23 +1615,77 @@ msgstr "" "\t

Ãtes-vous sÃ»r que votre serveur de base de donnÃ©es fonctionne ?

\n" "

Si vous n'Ãªtes pas sÃ»r de comprendre ces questions, vous devriez contacter votre hÃ©bergeur. Si vous avez encore besoin d'aide, vous pouvez visiter les forums de support de WordPress Francophone.

\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:833 +msgid "You have logged in successfully." +msgstr "Vous vous Ãªtes bien connectÃ©." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:791 +msgid "Bulleted list" +msgstr "Liste Ã puces" +======= #: wp-includes/wp-db.php:1286 msgid "WordPress database error %1$s for query %2$s" msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:875 +msgid "Check your e-mail for the confirmation link." +msgstr "VÃ©rifiez votre messagerie pour y trouver le lien de confirmation." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:793 +msgctxt "list style" +msgid "Square" +msgstr "CarrÃ©" +======= #: wp-includes/wp-db.php:1284 msgid "WordPress database error %1$s for query %2$s made by %3$s" msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s faite par %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:877 +msgid "Check your e-mail for your new password." +msgstr "VÃ©rifiez votre messagerie pour y trouver votre nouveau mot de passe." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:794 +msgctxt "list style" +msgid "Default" +msgstr "Par dÃ©faut" +======= #: wp-includes/wp-db.php:1215 msgid "The query argument of %s must have a placeholder." msgstr "L’argument de requÃªte %s doit avoir un paramÃ¨tre fictif." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:15 +msgid "This action has been disabled by the administrator." +msgstr "Cette action a Ã©tÃ© dÃ©sactivÃ©e par l’administrateur." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:795 +msgctxt "list style" +msgid "Circle" +msgstr "Cercle" +======= #: wp-includes/wp-db.php:1099 msgid "%s must set a database connection for use with escaping." msgstr "%s doit mettre en place une connexion Ã la base de donnÃ©es pour l’utiliser avec l’Ã©chappement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:34 +msgid "Slow down cowboy, no need to check for new mails so often!" +msgstr "LÃ¨ve le pied, champion ! Inutile de vÃ©rifier tes e-mails aussi souvent !" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:796 +msgctxt "list style" +msgid "Disc" +msgstr "Rond" +======= #: wp-includes/wp-db.php:1044 msgid "" "

Can’t select database

\n" @@ -503,305 +1705,1048 @@ msgstr "" "

Sur certains systÃ¨mes, le nom de votre base de donnÃ©es est prÃ©fixÃ©e par votre nom d’utilisateur, donc est-ce comme username_%1$s. Est-ce le problÃ¨me ?

\n" " \n" "

Si vous ne savez pas configurer votre base de donÃ©nes, vous devriez contacter votre hÃ©bergeur. Si tout vos essais Ã©chouent recherchez de l’aide sur les forums de support de WordPress Francophone.

" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:112 +msgid "Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!" +msgstr "Doit contenir au moins 4 caractÃ¨res, avec uniquement des lettres et des chiffres. Vous ne pourrez pas en changer, donc choisissez bien !" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:797 +msgctxt "list style" +msgid "Lower Greek" +msgstr "Minuscules grecques" +======= #. translators: 1: the id argument, 2: sidebar name, 3: recommended id value #: wp-includes/widgets.php:823 msgid "No %1$s was set in the arguments array for the \"%2$s\" sidebar. Defaulting to \"%3$s\". Manually set the %1$s to \"%3$s\" to silence this notice and keep existing sidebar content." msgstr "Aucun %1$s n’a Ã©tÃ© configurÃ© dans le tableau d’arguments de la barre latÃ©rale \"%2$s\". \"%3$s\" sera utilisÃ© par dÃ©faut. Configurez manuellement %1$s avec \"%3$s\" pour faire disparaÃ®tre cette notification et conserver le contenu actuel de la barre latÃ©rale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:189 +msgid "We send your registration email to this address. (Double-check your email address before continuing.)" +msgstr "Nous enverrons votre confirmation d’inscription Ã cette adresse. VÃ©rifiez donc bien qu’elle est correcte avant de continuer." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:798 +msgctxt "list style" +msgid "Lower Alpha" +msgstr "Minuscules alphanumÃ©riques" +======= #: wp-includes/widgets.php:741 msgid "Sidebar" msgstr "Colonne latÃ©rale" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:498 +msgid "%s is your new username" +msgstr "Votre nouvel identifiant est %s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:799 +msgctxt "list style" +msgid "Upper Alpha" +msgstr "Majuscules alphanumÃ©riques" +======= #: wp-includes/widgets.php:739 wp-includes/widgets.php:809 msgid "Sidebar %d" msgstr "Colonne latÃ©rale %d" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:500 wp-signup.php:629 +msgid "Check your inbox at %s and click the link given." +msgstr "Consultez la boite de rÃ©ception de l’adresse %s, et cliquez sur le lien qui vous a Ã©tÃ© envoyÃ©." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:800 +msgctxt "list style" +msgid "Upper Roman" +msgstr "Chiffres romains majuscules" +======= #: wp-includes/widgets.php:139 msgid "There are no options for this widget." msgstr "Il n’y a pas d’options pour ce widget." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:658 +msgctxt "Multisite active signup type" +msgid "all" +msgstr "tous" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:801 +msgctxt "list style" +msgid "Lower Roman" +msgstr "Chiffres romains minuscules " +======= #: wp-includes/user.php:2394 msgid "ERROR: Couldn’t register you… please contact the webmaster !" msgstr "ERREUR : inscription impossible… Veuillez prendre contact avec le webmaster !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:659 +msgctxt "Multisite active signup type" +msgid "none" +msgstr "aucune" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:804 +msgctxt "Name of link anchor (TinyMCE)" +msgid "Name" +msgstr "Nom" +======= #: wp-includes/user.php:2354 msgid "ERROR: This email is already registered, please choose another one." msgstr "ERREUR : cette adresse de messagerie est dÃ©jÃ utilisÃ©e. Merci d’en choisir une autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:661 +msgctxt "Multisite active signup type" +msgid "user" +msgstr "utilisateur" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:805 +msgctxt "Link anchor (TinyMCE)" +msgid "Anchor" +msgstr "Ancre" +======= #: wp-includes/user.php:2351 msgid "ERROR: The email address isn’t correct." msgstr "ERREUR : adresse de messagerie incorrecte." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:664 +msgid "Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your Options page." +msgstr "Salutations, cher administrateur du site ! Vous acceptez actuellement les inscriptions de type « %s ». Pour modifier ou dÃ©sactiver les inscriptions, allez sur votre page d’options." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:806 +msgctxt "Link anchors (TinyMCE)" +msgid "Anchors" +msgstr "Ancres" +======= #: wp-includes/user.php:2349 msgid "ERROR: Please type your e-mail address." msgstr "ERREUR : l’adresse de messagerie est obligatoire." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:673 +msgid "You must first log in, and then you can create a new site." +msgstr "Vous devez d’abord vous connecter avant de pouvoir crÃ©er un nouveau site." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:839 +msgctxt "editor button" +msgid "Right to left" +msgstr "Droite Ã gauche (RTL)" +======= #: wp-includes/user.php:2344 msgid "ERROR: This username is already registered. Please choose another one." msgstr "ERREUR : cet identifiant existe dÃ©jÃ . Merci d’en choisir un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:706 +msgid "Sorry, new registrations are not allowed at this time." +msgstr "DÃ©solÃ©, il n’est pas possible de s’enregistrer Ã l’heure actuelle." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:840 +msgctxt "editor button" +msgid "Left to right" +msgstr "Gauche Ã droite" +======= #: wp-includes/user.php:2341 msgid "ERROR: This username is invalid because it uses illegal characters. Please enter a valid username." msgstr "ERREUR : cet identifiant n’est pas valide, car il utilise des caractÃ¨res non autorisÃ©s. Merci d’utiliser un identifiant valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:708 +msgid "You are logged in already. No need to register again!" +msgstr "Vous Ãªtes dÃ©jÃ connectÃ©. Pas besoin de vous rÃ©inscrire !" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:857 +msgctxt "find/replace" +msgid "Replace" +msgstr "Remplacer" +======= #: wp-includes/user.php:2339 msgid "ERROR: Please enter a username." msgstr "ERREUR : veuillez renseigner l’identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:372 +msgid "If this was a mistake, just ignore this email and nothing will happen." +msgstr "S'il s'agit d'une erreur, ignorez ce message et la demande ne sera pas prise en compte." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:858 +msgctxt "find/replace" +msgid "Next" +msgstr "Suivant" +======= #: wp-includes/user.php:2257 wp-includes/user.php:2260 #: wp-includes/user.php:2264 wp-includes/user.php:2275 #: wp-includes/user.php:2291 msgid "Invalid key" msgstr "ClÃ© invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:626 +msgid "The passwords do not match." +msgstr "Vos mots de passe ne correspondent pas." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:860 +msgctxt "find/replace" +msgid "Prev" +msgstr "PrÃ©c." +======= #: wp-includes/user.php:2224 msgid "Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! \" ? $ % ^ & )." msgstr "Astuce : Le mot de passe devrait contenir au moins 7 caractÃ¨res. Pour le rendre plus fort, utilisez des majuscules et des minuscules, des nombres et des symboles tels que ! \" ? $ % ^ & )." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:641 +msgid "Password Reset" +msgstr "Renouvellement du mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:861 +msgctxt "find/replace" +msgid "Whole words" +msgstr "Mots entiers" +======= #: wp-includes/user.php:2191 msgid "Jabber / Google Talk" msgstr "Jabber / Google Talk" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:641 +msgid "Your password has been reset." +msgstr "Votre mot de passe a Ã©tÃ© rÃ©initialisÃ©." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:863 +msgctxt "find/replace" +msgid "Replace with" +msgstr "Remplacer par" +======= #: wp-includes/user.php:2190 msgid "Yahoo IM" msgstr "Yahoo Messenger" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:649 wp-login.php:683 +msgid "Reset Password" +msgstr "RÃ©initialiser le mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:864 +msgctxt "find/replace" +msgid "Find" +msgstr "Chercher" +======= #: wp-includes/user.php:2189 msgid "AIM" msgstr "AIM" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:656 +msgid "New password" +msgstr "Nouveau mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:865 +msgctxt "find/replace" +msgid "Replace all" +msgstr "Tout remplacer" +======= #: wp-includes/user.php:2087 wp-includes/user.php:2093 msgid "Invalid user ID." msgstr "Identifiant utilisateur non valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:665 +msgid "Confirm new password" +msgstr "Confirmer le nouveau mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:868 +msgctxt "spellcheck" +msgid "Finish" +msgstr "Terminer" +======= #. translators: 1: first name, 2: last name #: wp-includes/user.php:1946 msgctxt "Display name based on first name and last name" msgid "%1$s %2$s" msgstr "%1$s %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:111 +msgid "domain" +msgstr "domaine" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:869 +msgctxt "spellcheck" +msgid "Ignore all" +msgstr "Tout ignorer" +======= #: wp-includes/user.php:1847 msgid "Cannot create a user with an empty login name." msgstr "Impossible de crÃ©er un utilisateur avec un identifiant vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:112 +msgid "Your address will be %s." +msgstr "Votre adresse sera %s." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:870 +msgctxt "spellcheck" +msgid "Ignore" +msgstr "Ignorer" +======= #: wp-includes/user.php:217 msgid "ERROR: Your account has been marked as a spammer." msgstr "ERREUR : votre compte a Ã©tÃ© marquÃ© comme Ã©tant indÃ©sirable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:120 +msgid "Powered by WordPress" +msgstr "PropulsÃ© par WordPress." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:882 +msgctxt "table columns" +msgid "Cols" +msgstr "Colonnes" +======= #: wp-includes/user.php:153 msgid "ERROR: The password you entered for the username %1$s is incorrect. Lost your password?" msgstr "ERREUR : le mot de passe que vous avez saisi pour l’utilisateur %1$s n’est pas correct. Mot de passe oubliÃ© ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-load.php:77 +msgid "You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." +msgstr "Vous pouvez crÃ©er un fichier wp-config.php par le biais de cette interface, mais cela ne marche pour toutes les configurations de serveur. La maniÃ¨re la plus sÃ»re reste de crÃ©er le fichier Ã la main." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:883 +msgctxt "table cell" +msgid "Cell" +msgstr "Cellule" +======= #: wp-includes/user.php:137 msgid "ERROR: Invalid username. Lost your password?" msgstr "ERREUR : nom d'utilisateur invalide. Mot de passe oubliÃ© ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-load.php:78 +msgid "Create a Configuration File" +msgstr "CrÃ©er un fichier de configuration" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:885 +msgctxt "table header" +msgid "Header" +msgstr "En-tÃªte" +======= #: wp-includes/user.php:129 msgid "ERROR: The password field is empty." msgstr "ERREUR : le champ du mot de passe est vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:255 +msgid "Mission complete. Message %s deleted." +msgstr "Mission terminÃ©e. Message %s supprimÃ©. " +||||||| .r11156 +#: wp-includes/class-wp-editor.php:886 +msgctxt "table body" +msgid "Body" +msgstr "Corps" +======= #: wp-includes/user.php:126 msgid "ERROR: The username field is empty." msgstr "ERREUR : le champ de l’identifiant est vide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:127 +msgid "Allow search engines to index this site." +msgstr "Demander aux moteurs de recherche d’indexer ce site." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:887 +msgctxt "table footer" +msgid "Footer" +msgstr "Pied de page" +======= #: wp-includes/update.php:553 msgid "Translation Updates" msgstr "Mises Ã jour des traductions" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:185 +msgid "Email Address:" +msgstr "Adresse e-mail :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:919 +msgctxt "TinyMCE" +msgid "Insert template" +msgstr "InsÃ©rer un modÃ¨le" +======= #: wp-includes/update.php:551 msgid "%d Theme Update" msgid_plural "%d Theme Updates" msgstr[0] "%d mise Ã jour de thÃ¨me" msgstr[1] "%d mises Ã jour de thÃ¨mes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:376 +msgid "http://%2$s is your new site. Log in as “%4$s” using your existing password." +msgstr "http://%2$s est votre nouveau site. Connectez-vous avec l’identifiant « %4$s », Ã l’aide de votre mot de passe actuel." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:920 +msgctxt "TinyMCE" +msgid "Templates" +msgstr "ModÃ¨les" +======= #: wp-includes/update.php:549 msgid "%d Plugin Update" msgid_plural "%d Plugin Updates" msgstr[0] "%d mise Ã jour d’extension" msgstr[1] "%d mises Ã jour d’extensions" +>>>>>>> .r12027 -#: wp-includes/update.php:547 -msgid "%d WordPress Update" -msgstr "%d mise Ã jour de WordPress" - -#: wp-includes/update.php:119 wp-includes/update.php:295 +<<<<<<< .mine +#: wp-signup.php:430 +msgid "Get your own %s account in seconds" +msgstr "Obtenez votre propre compte %s en quelques secondes" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:924 +msgctxt "editor button" +msgid "Show blocks" +msgstr "Montrer les blocs" +======= +#: wp-includes/update.php:547 +msgid "%d WordPress Update" +msgstr "%d mise Ã jour de WordPress" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-signup.php:446 +msgid "Gimme a site!" +msgstr "Donnez-moi un site !" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:928 +msgid "Words: %s" +msgstr "Mots : %s" +======= +#: wp-includes/update.php:119 wp-includes/update.php:295 #: wp-includes/update.php:457 msgid "(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)" msgstr "(WordPress n’a pas pu Ã©tablir de connexion sÃ©curisÃ©e vers WordPress.org. Veuillez contacter l’administrateur de votre serveur.)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:626 +msgid "Congratulations! Your new site, %s, is almost ready." +msgstr "FÃ©licitations! Votre nouveau site, %s, est presque prÃªt." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:935 +msgctxt "TinyMCE menu" +msgid "Insert" +msgstr "InsÃ©rer" +======= #: wp-includes/update.php:119 wp-includes/update.php:295 #: wp-includes/update.php:457 msgid "An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums." msgstr "Une erreur inattendue s’est produite. Quelque chose semble ne pas fonctionner avec WordPress.org ou la configuration de ce serveur. Si vous continuez Ã rencontrer des problÃ¨mes, veuillez essayer les forums de support." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:630 +msgid "If you do not activate your site within two days, you will have to sign up again." +msgstr "Si vous n’activez pas votre site dans les deux jours, vous devrez Ã nouveau l’enregistrer." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:936 +msgctxt "TinyMCE menu" +msgid "File" +msgstr "Fichier" +======= #: wp-includes/theme.php:1948 msgid "Customizer" msgstr "Outil de personnalisation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:631 +msgid "Still waiting for your email?" +msgstr "Toujours dans l’attente de votre e-mail ?" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:937 +msgctxt "TinyMCE menu" +msgid "Edit" +msgstr "Modifier" +======= #. translators: 1: Theme support 2: hook name #: wp-includes/theme.php:1614 msgid "Theme support for %1$s should be registered before the %2$s hook." msgstr "La reconnaissance de %1$s par le thÃ¨me doit Ãªtre enregistrÃ©e avec le point d'accroche %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:633 +msgid "If you haven’t received your email yet, there are a number of things you can do:" +msgstr "Si vous n’avez encore pas reÃ§u votre e-mail, il existe un certain nombre de choses que vous pouvez faire :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:938 +msgctxt "TinyMCE menu" +msgid "Tools" +msgstr "Outils" +======= #: wp-includes/theme.php:1483 msgid "You need to pass an array of types." msgstr "Vous devez passer un tableau de types." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:635 +msgid "Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control." +msgstr "Veuillez patienter encore quelques instants. Parfois, la livraison des messages peut Ãªtre retardÃ©e par des processus en dehors de notre contrÃ´le." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:939 +msgctxt "TinyMCE menu" +msgid "View" +msgstr "Voir" +======= #: wp-includes/theme-compat/sidebar.php:74 msgid "XFN" msgstr "XFN" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:636 +msgid "Check the junk or spam folder of your email client. Sometime emails wind up there by mistake." +msgstr "VÃ©rifiez le courrier indÃ©sirable (ou dossier spam) de votre client de messagerie. Parfois, certains messages arrivent lÃ par erreur." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:940 +msgctxt "TinyMCE menu" +msgid "Table" +msgstr "Tableau" +======= #: wp-includes/theme-compat/sidebar.php:74 msgid "XHTML Friends Network" msgstr "XHTML Friends Network" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: first name, 2: last name +#: wp-includes/user.php:1993 +msgctxt "Display name based on first name and last name" +msgid "%1$s %2$s" +msgstr "%1$s %2$s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:941 +msgctxt "TinyMCE menu" +msgid "Format" +msgstr "Formater" +======= #: wp-includes/theme-compat/sidebar.php:73 msgid "Valid XHTML" msgstr "XHTML valide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-load.php:75 +msgid "There doesn't seem to be a wp-config.php file. I need this before we can get started." +msgstr "Il ne semble pas y avoir de fichier wp-config.php. J’en ai besoin pour lancer le processus." +||||||| .r11156 +#: wp-includes/media-template.php:1025 wp-includes/media-template.php:1108 +msgid "Add alternate sources for maximum HTML5 playback:" +msgstr "Ajoutez des sources alternatives pour une lecture optimale avec HTML5 :" +======= #: wp-includes/theme-compat/sidebar.php:73 msgid "This page validates as XHTML 1.0 Transitional" msgstr "Cette page est en XHTML 1.0 Transitional valide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2566 +msgid "ERROR: This username is already registered. Please choose another one." +msgstr "ERREUR : cet identifiant existe dÃ©jÃ . Merci d’en choisir un autre." +||||||| .r11156 +#: wp-includes/media.php:2972 +msgid "Image Details" +msgstr "DÃ©tails de l’image" +======= #: wp-includes/theme-compat/sidebar.php:47 msgid "You are currently browsing the %2$s blog archives." msgstr "Vous parcourez actuellement les archives du site %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2561 +msgid "ERROR: Please enter a username." +msgstr "ERREUR : veuillez renseigner l’identifiant." +||||||| .r11156 +#: wp-includes/update.php:119 wp-includes/update.php:295 +#: wp-includes/update.php:457 +msgid "An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums." +msgstr "Une erreur inattendue s’est produite. Quelque chose semble ne pas fonctionner avec WordPress.org ou la configuration de ce serveur. Si vous continuez Ã rencontrer des problÃ¨mes, veuillez essayer les forums de support." +======= #: wp-includes/theme-compat/sidebar.php:44 msgid "You have searched the %2$s blog archives for ‘%3$s’. If you are unable to find anything in these search results, you can try one of these links." msgstr "Vous avez lancÃ© une recherche dans les archives du site %2$s avec la requÃªte « %3$s ». Si les rÃ©sultats ne vous conviennent pas, vous pouvez essayer l’un de ces liens." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:555 +msgid "Please enter your username or email address. You will receive a link to create a new password via email." +msgstr "Veuillez saisir votre identifiant ou votre adresse de messagerie. Un lien permettant de crÃ©er un nouveau mot de passe vous sera envoyÃ© par e-mail." +||||||| .r11156 +#: wp-includes/media.php:2910 +msgid "Back" +msgstr "Retour" +======= #: wp-includes/theme-compat/sidebar.php:41 msgid "You are currently browsing the %2$s blog archives for the year %3$s." msgstr "Vous parcourez actuellement les archives du site %2$s pour l’annÃ©e %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:259 +msgid "There was a problem, please correct the form below and try again." +msgstr "Il y a eu un problÃ¨me, veuillez remplir le formulaire ci-dessous et rÃ©essayer." +||||||| .r11156 +#: wp-includes/media-template.php:750 +msgid "Show Tracklist" +msgstr "Montrer la la liste des pistes" +======= #: wp-includes/theme-compat/sidebar.php:38 msgid "F, Y" msgstr "F Y" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments.php:17 +msgid "This post is password protected. Enter the password to view comments." +msgstr "Cet article est protÃ©gÃ© par un mot de passe. Saisissez le mot de passe pour voir les commentaires." +||||||| .r11156 +#: wp-includes/media-template.php:418 wp-includes/media-template.php:521 +#: wp-includes/media.php:2935 +msgid "Trash" +msgstr "Corbeille" +======= #: wp-includes/theme-compat/sidebar.php:38 msgid "You are currently browsing the %2$s blog archives for %3$s." msgstr "Vous parcourez actuellement les archives du site %2$s pour %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:35 +msgid "You are currently browsing the %2$s blog archives for the day %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour la journÃ©e du %3$s." +||||||| .r11156 +#: wp-includes/media-template.php:738 +msgid "Playlist Settings" +msgstr "ParamÃ¨tres de liste de lecture" +======= #: wp-includes/theme-compat/sidebar.php:35 msgid "l, F jS, Y" msgstr "l j F Y" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:38 +msgid "You are currently browsing the %2$s blog archives for %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour %3$s." +||||||| .r11156 +#: wp-includes/default-widgets.php:227 +msgctxt "Search widget" +msgid "Search" +msgstr "Chercher" +======= #: wp-includes/theme-compat/sidebar.php:35 msgid "You are currently browsing the %2$s blog archives for the day %3$s." msgstr "Vous parcourez actuellement les archives du site %2$s pour la journÃ©e du %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:41 +msgid "You are currently browsing the %2$s blog archives for the year %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour l’annÃ©e %3$s." +||||||| .r11156 +#: wp-includes/formatting.php:3602 +msgid "%s, %s" +msgstr "%s, %s" +======= #: wp-includes/theme-compat/sidebar.php:32 msgid "You are currently browsing the archives for the %s category." msgstr "Vous parcourez actuellement les archives de la catÃ©gorie %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:44 +msgid "You have searched the %2$s blog archives for ‘%3$s’. If you are unable to find anything in these search results, you can try one of these links." +msgstr "Vous avez lancÃ© une recherche dans les archives du site %2$s avec la requÃªte « %3$s ». Si les rÃ©sultats ne vous conviennent pas, vous pouvez essayer l’un de ces liens." +||||||| .r11156 +#: wp-includes/formatting.php:3604 +msgid "%s, and %s" +msgstr "%s et %s" +======= #: wp-includes/theme-compat/footer.php:20 msgid "%d queries. %s seconds." msgstr "%d requÃªtes. %s secondes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/sidebar.php:47 +msgid "You are currently browsing the %2$s blog archives." +msgstr "Vous parcourez actuellement les archives du site %2$s." +||||||| .r11156 +#: wp-includes/formatting.php:3606 +msgid "%s and %s" +msgstr "%s et %s" +======= #: wp-includes/theme-compat/footer.php:19 msgid "Comments (RSS)" msgstr "Commentaires (RSS)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:660 +msgctxt "Multisite active signup type" +msgid "blog" +msgstr "site" +||||||| .r11156 +#: wp-includes/media-template.php:759 +msgid "Show Artist Name in Tracklist" +msgstr "Afficher le nom de l’artiste dans la liste de lecture" +======= #: wp-includes/theme-compat/footer.php:19 msgid "Entries (RSS)" msgstr "Articles (RSS)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2451 wp-includes/user.php:2454 +#: wp-includes/user.php:2458 wp-includes/user.php:2488 +#: wp-includes/user.php:2492 wp-includes/user.php:2509 +msgid "Invalid key" +msgstr "ClÃ© invalide" +||||||| .r11156 +#: wp-includes/media-template.php:767 +msgid "Show Images" +msgstr "Montrer les images" +======= #: wp-includes/theme-compat/footer.php:19 msgid "%1$s and %2$s." msgstr "%1$s et %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:867 +msgid "Session expired. Please log in again. You will not move away from this page." +msgstr "La session a expirÃ©. Veuillez vous reconnecter. Vous reviendrez sur cette page." +||||||| .r11156 +#: wp-includes/media-template.php:1038 wp-includes/media-template.php:1128 +msgid "Metadata" +msgstr "MÃ©tadonnÃ©es" +======= #: wp-includes/theme-compat/footer.php:17 msgid "%1$s is proudly powered by %2$s" msgstr "%1$s est fiÃ¨rement propulsÃ© par %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:637 +msgid "Have you entered your email correctly? You have entered %s, if it’s incorrect, you will not receive your email." +msgstr "Avez-vous correctement saisi votre adresse de messagerie ? Vous aviez saisi %s, mais si ce n’est pas correct, vous ne recevrez pas de message." +||||||| .r11156 +#: wp-includes/media-template.php:1045 wp-includes/media-template.php:1135 +msgid "Autoplay" +msgstr "Lecture automatique" +======= #: wp-includes/theme-compat/comments.php:101 msgid "Submit Comment" msgstr "Soumettre le commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:714 +msgid "The site you were looking for, %s, does not exist, but you can create it now!" +msgstr "Le site que vous cherchez (%s) n’existe pas, mais vous pouvez le crÃ©er dÃ¨s Ã prÃ©sent !" +||||||| .r11156 +#: wp-includes/media-template.php:1119 +msgid "Poster Image" +msgstr "Image de couverture" +======= #: wp-includes/theme-compat/comments.php:97 msgid "XHTML: You can use these tags: %s" msgstr "XHTML : Vous pouvez utiliser ces balises : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:716 +msgid "The site you were looking for, %s, does not exist." +msgstr "Le site que vous cherchez (%s) n’existe pas." +||||||| .r11156 +#: wp-includes/media-template.php:1157 +msgid "There are no associated subtitles." +msgstr "Il n’y a pas de sous-titres associÃ©s." +======= #: wp-includes/theme-compat/comments.php:90 msgid "Mail (will not be published)" msgstr "Adresse de messagerie (ne sera pas publiÃ©e)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2616 +msgid "ERROR: Couldn’t register you… please contact the webmaster !" +msgstr "ERREUR : inscription impossible… Veuillez prendre contact avec le webmaster !" +||||||| .r11156 +#: wp-includes/media.php:2926 +msgid "Create a new playlist" +msgstr "CrÃ©er une nouvelle liste de lecture" +======= #: wp-includes/theme-compat/comments.php:87 #: wp-includes/theme-compat/comments.php:90 msgid "(required)" msgstr "(obligatoire)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:563 +msgid "Translation Updates" +msgstr "Mises Ã jour des traductions" +||||||| .r11156 +#: wp-includes/media.php:2927 +msgid "Create a new video playlist" +msgstr "CrÃ©er une nouvelle liste de lecture vidÃ©o" +======= #: wp-includes/theme-compat/comments.php:82 msgid "Log out »" msgstr "DÃ©connexion »" +>>>>>>> .r12027 -#: wp-includes/theme-compat/comments.php:82 -msgid "Log out of this account" -msgstr "Se dÃ©connecter" - -#: wp-includes/theme-compat/comments.php:82 -msgid "Logged in as %2$s." -msgstr "ConnectÃ© en tant que %2$s." +<<<<<<< .mine +#: wp-includes/wp-db.php:1046 +msgid "" +"

Can’t select database

\n" +"

We were able to connect to the database server (which means your username and password is okay) but not able to select the %1$s database.

\n" +"

Are you sure it exists?
Does the user %2$s have permission to use the %1$s database?
On some systems the name of your database is prefixed with your username, so it would be like username_%1$s. Could that be the problem?

\n" +"

If you don't know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.

" +msgstr "" +"

Impossible de choisir la base de donnÃ©es

\n" +"

Nous sommes en mesure de nous connecter au serveur de la base de donnÃ©es (ce qui signifie que les identifiants et mot de passe sont bons), mais il est impossible de sÃ©lectionner la base de donnÃ©es %1$s.

\n" +"

Ãtes-vous sÃ»r qu'elle existe ?
L’utilisateur %2$s a-t-il la permission d’utiliser la base de donnÃ©es %1$s ?
Sur certains systÃ¨mes, le nom de votre base de donnÃ©es est prÃ©fixÃ©e par votre nom d’utilisateur, donc est-ce comme username_%1$s. Est-ce le problÃ¨me ?

\n" +"

" +||||||| .r11156 +#: wp-includes/media.php:2973 +msgid "Replace Image" +msgstr "Remplacer l’image" -#: wp-includes/theme-compat/comments.php:59 -msgid "Comments are closed." -msgstr "Les commentaires sont fermÃ©s." +#: wp-includes/media.php:2974 wp-includes/media.php:2991 +#: wp-includes/media.php:2997 +msgid "Cancel Edit" +msgstr "Annuler la modification" -#. translators: 1: number of comments, 2: post title -#: wp-includes/theme-compat/comments.php:33 -msgid "%1$s Response to %2$s" -msgid_plural "%1$s Responses to %2$s" -msgstr[0] "%1$s rÃ©ponse Ã %2$s" -msgstr[1] "%1$s rÃ©ponses Ã %2$s" +#: wp-includes/media.php:2978 +msgid "Choose Image" +msgstr "Choisir une image" -#. translators: %s: post title -#: wp-includes/theme-compat/comments.php:30 -msgid "One Response to %s" -msgstr "Une rÃ©ponse Ã %s" +#: wp-includes/media.php:2979 +msgid "Select and Crop" +msgstr "SÃ©lectionner et rogner" -#: wp-includes/theme-compat/comments.php:17 -msgid "This post is password protected. Enter the password to view comments." -msgstr "Cet article est protÃ©gÃ© par un mot de passe. Saisissez le mot de passe pour voir les commentaires." +#: wp-includes/media.php:2980 +msgid "Skip Cropping" +msgstr "Pas de recadrage" -#: wp-includes/theme-compat/comments-popup.php:120 -msgid "Powered by WordPress" -msgstr "PropulsÃ© par WordPress." +#: wp-includes/media.php:2981 +msgid "Crop Image" +msgstr "Recadrer l’image" -#: wp-includes/theme-compat/comments-popup.php:116 -msgid "Sorry, no posts matched your criteria." -msgstr "DÃ©solÃ©, aucun article ne correspond Ã vos critÃ¨res." +#: wp-includes/media.php:2982 +msgid "Crop your image" +msgstr "Recadrer votre image" -#: wp-includes/theme-compat/comments-popup.php:110 -msgid "Close this window." -msgstr "Fermer cette fenÃªtre." +#: wp-includes/media.php:2988 +msgid "Audio Details" +msgstr "DÃ©tails audio" -#: wp-includes/theme-compat/comments-popup.php:105 -msgid "Sorry, the comment form is closed at this time." -msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour le moment." +#: wp-includes/media.php:2989 +msgid "Replace Audio" +msgstr "Remplacer le son" -#: wp-includes/theme-compat/comments-popup.php:97 -msgid "Say It!" -msgstr "Dites-le !" +#: wp-includes/media.php:2990 +msgid "Add Audio Source" +msgstr "Ajouter une source audio" -#: wp-includes/theme-compat/comments-popup.php:89 -msgid "Your Comment" -msgstr "Votre commentaire" +#: wp-includes/media.php:2994 +msgid "Video Details" +msgstr "DÃ©tails de la vidÃ©o" -#: wp-includes/theme-compat/comments-popup.php:84 -msgid "URL" -msgstr "Adresse web" +#: wp-includes/media.php:2995 +msgid "Replace Video" +msgstr "Remplacer la vidÃ©o" -#: wp-includes/theme-compat/comments-popup.php:79 wp-login.php:740 -msgid "E-mail" -msgstr "E-mail" +#: wp-includes/media.php:2996 +msgid "Add Video Source" +msgstr "Ajouter une source vidÃ©o" -#: wp-includes/theme-compat/comments-popup.php:70 -msgid "Logged in as %2$s. Log out »" -msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter »" +#: wp-includes/media.php:2998 +msgid "Select Poster Image" +msgstr "Choisir une image de couverture" -#: wp-includes/theme-compat/comments-popup.php:66 +#: wp-includes/media.php:2999 +msgid "Add Subtitles" +msgstr "Ajouter des sous-titres" + +#: wp-includes/media.php:3002 +msgid "Drag and drop to reorder tracks." +msgstr "Glisser-dÃ©poser pour rÃ©organiser les pistes." + +#: wp-includes/media.php:3003 +msgid "Create Audio Playlist" +msgstr "CrÃ©er une liste de lecture audio" + +#: wp-includes/media.php:3012 +msgid "Drag and drop to reorder videos." +msgstr "Glisser-dÃ©poser pour rÃ©organiser les vidÃ©os." + +#: wp-includes/media.php:3013 +msgid "Create Video Playlist" +msgstr "CrÃ©er une liste de lecture vidÃ©o" + +#: wp-includes/media.php:3014 +msgid "Edit Video Playlist" +msgstr "Modifier une liste de lecture vidÃ©o" + +#: wp-includes/media.php:3015 +msgid "← Cancel Video Playlist" +msgstr "← Annuler la liste de lecture vidÃ©o" + +#: wp-includes/media.php:3016 +msgid "Insert video playlist" +msgstr "InsÃ©rer une liste de lecture vidÃ©o" + +#: wp-includes/media.php:3017 +msgid "Update video playlist" +msgstr "Mettre Ã jour la liste de lecture vidÃ©o" + +#: wp-includes/media.php:3018 +msgid "Add to video playlist" +msgstr "Ajouter Ã la liste de lecture vidÃ©o" + +#: wp-includes/media.php:3019 +msgid "Add to Video Playlist" +msgstr "Ajouter Ã la liste de lecture vidÃ©o" + +#: wp-includes/nav-menu.php:322 +msgid "Invalid menu ID." +msgstr "Menu ID invalide." + +#: wp-includes/wp-db.php:991 +msgid "" +"

Can’t select database

\n" +"

We were able to connect to the database server (which means your username and password is okay) but not able to select the %1$s database.

\n" +"

Are you sure it exists?
Does the user %2$s have permission to use the %1$s database?
On some systems the name of your database is prefixed with your username, so it would be like username_%1$s. Could that be the problem?

\n" +"

If you don't know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.

" +msgstr "" +"

Impossible de choisir la base de donnÃ©es

\n" +"

Ãtes-vous sÃ»r qu'elle existe ?
L’utilisateur %2$s a-t-il la permission d’utiliser la base de donnÃ©es %1$s ?
Sur certains systÃ¨mes, le nom de votre base de donnÃ©es est prÃ©fixÃ©e par votre nom d’utilisateur, donc est-ce comme username_%1$s. Est-ce le problÃ¨me ?

\n" +"

" +======= +#: wp-includes/theme-compat/comments.php:82 +msgid "Log out of this account" +msgstr "Se dÃ©connecter" + +#: wp-includes/theme-compat/comments.php:82 +msgid "Logged in as %2$s." +msgstr "ConnectÃ© en tant que %2$s." + +#: wp-includes/theme-compat/comments.php:59 +msgid "Comments are closed." +msgstr "Les commentaires sont fermÃ©s." + +#. translators: 1: number of comments, 2: post title +#: wp-includes/theme-compat/comments.php:33 +msgid "%1$s Response to %2$s" +msgid_plural "%1$s Responses to %2$s" +msgstr[0] "%1$s rÃ©ponse Ã %2$s" +msgstr[1] "%1$s rÃ©ponses Ã %2$s" + +#. translators: %s: post title +#: wp-includes/theme-compat/comments.php:30 +msgid "One Response to %s" +msgstr "Une rÃ©ponse Ã %s" + +#: wp-includes/theme-compat/comments.php:17 +msgid "This post is password protected. Enter the password to view comments." +msgstr "Cet article est protÃ©gÃ© par un mot de passe. Saisissez le mot de passe pour voir les commentaires." + +#: wp-includes/theme-compat/comments-popup.php:120 +msgid "Powered by WordPress" +msgstr "PropulsÃ© par WordPress." + +#: wp-includes/theme-compat/comments-popup.php:116 +msgid "Sorry, no posts matched your criteria." +msgstr "DÃ©solÃ©, aucun article ne correspond Ã vos critÃ¨res." + +#: wp-includes/theme-compat/comments-popup.php:110 +msgid "Close this window." +msgstr "Fermer cette fenÃªtre." + +#: wp-includes/theme-compat/comments-popup.php:105 +msgid "Sorry, the comment form is closed at this time." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour le moment." + +#: wp-includes/theme-compat/comments-popup.php:97 +msgid "Say It!" +msgstr "Dites-le !" + +#: wp-includes/theme-compat/comments-popup.php:89 +msgid "Your Comment" +msgstr "Votre commentaire" + +#: wp-includes/theme-compat/comments-popup.php:84 +msgid "URL" +msgstr "Adresse web" + +#: wp-includes/theme-compat/comments-popup.php:79 wp-login.php:740 +msgid "E-mail" +msgstr "E-mail" + +#: wp-includes/theme-compat/comments-popup.php:70 +msgid "Logged in as %2$s. Log out »" +msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter »" + +#: wp-includes/theme-compat/comments-popup.php:66 msgid "Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: %s" msgstr "Les paragraphes et retours Ã la ligne sont automatiques. Les adresses de messagerie ne sont pas affichÃ©es. HTML autorisÃ© : %s" @@ -856,7 +2801,57 @@ msgstr "Identifiant d’objet non valide." #: wp-includes/taxonomy.php:4169 msgid "Could not split shared term." msgstr "Impossible de sÃ©parer les termes partagÃ©s." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/wp-db.php:1497 +msgid "" +"\n" +"

Error establishing a database connection

\n" +"

This either means that the username and password information in your wp-config.php file is incorrect or we can't contact the database server at %s. This could mean your host's database server is down.

\n" +"

Are you sure you have the correct username and password?
Are you sure that you have typed the correct hostname?
Are you sure that the database server is running?

\n" +"

If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.

\n" +msgstr "" +"\n" +"

Erreur de connexion Ã la base de donnÃ©es

\n" +"

Cela signifie que les identifiants et mots de passe dans votre fichier wp-config.php sont incorrects, ou que nous ne pouvons pas contacter le serveur de base de donnÃ©es Ã %s. Cela peut vouloir dire que la base de donnÃ©es de votre hÃ©bergement est indisponible.

\n" +"

Ãtes-vous sÃ»r que vos identifiants sont corrects ?
Ãtes-vous sÃ»r que vous avez saisi la bonne adresse d'hÃ©bergement ?
Ãtes-vous sÃ»r que votre serveur de base de donnÃ©es fonctionne ?

\n" +"

\n" +||||||| .r11156 +#: wp-includes/wp-db.php:1160 +msgid "The query argument of %s must have a placeholder." +msgstr "L’argument de requÃªte %s doit avoir un paramÃ¨tre fictif." +#: wp-includes/wp-db.php:1424 +msgid "" +"\n" +"

Error establishing a database connection

\n" +"

Are you sure you have the correct username and password?
Are you sure that you have typed the correct hostname?
Are you sure that the database server is running?

\n" +"

If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.

\n" +msgstr "" +"\n" +"

Erreur de connexion Ã la base de donnÃ©es

\n" +"

Ãtes-vous sÃ»r que vos identifiants sont corrects ?
Ãtes-vous sÃ»r que vous avez saisi la bonne adresse d'hÃ©bergement ?
Ãtes-vous sÃ»r que votre serveur de base de donnÃ©es fonctionne ?

\n" +"

\n" +======= #. translators: %s: taxonomy label, %l: list of terms formatted as per #. $term_template #: wp-includes/taxonomy.php:4479 @@ -866,193 +2861,718 @@ msgstr "%s : %l." #: wp-includes/taxonomy.php:3464 msgid "The slug “%s” is already in use by another term" msgstr "L’identifiant Â« %s Â» est dÃ©jÃ utilisÃ© par un autre terme" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:122 wp-includes/update.php:302 +#: wp-includes/update.php:466 +msgid "An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums." +msgstr "Une erreur inattendue s’est produite. Quelque chose semble ne pas fonctionner avec WordPress.org ou la configuration de ce serveur. Si vous continuez Ã rencontrer des problÃ¨mes, veuillez essayer les forums de support." +||||||| .r11156 +#: wp-login.php:629 +msgid "Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! \" ? $ % ^ & )." +msgstr "Astuce : Le mot de passe devrait contenir au moins 7 caractÃ¨res. Pour le rendre plus fort, utilisez des majuscules et des minuscules, des nombres et des symboles tels que ! \" ? $ % ^ & )." +======= #: wp-includes/taxonomy.php:3205 msgid "Invalid Taxonomy" msgstr "Taxinomie invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:1216 +msgid "The query argument of %s must have a placeholder." +msgstr "L’argument de requÃªte %s doit avoir un paramÃ¨tre fictif." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:830 +msgid "Insert/edit video" +msgstr "InsÃ©rer/modifier la vidÃ©o" +======= #: wp-includes/taxonomy.php:3152 msgid "Could not insert term relationship into the database" msgstr "Impossible d’insÃ©rer la relation du terme dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/update.php:122 wp-includes/update.php:302 +#: wp-includes/update.php:466 +msgid "(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)" +msgstr "(WordPress n’a pas pu Ã©tablir de connexion sÃ©curisÃ©e vers WordPress.org. Veuillez contacter l’administrateur de votre serveur.)" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:856 +msgid "Could not find the specified string." +msgstr "Impossible de trouver la chaÃ®ne spÃ©cifiÃ©e." +======= #: wp-includes/taxonomy.php:2934 msgid "A term with the name already exists in this taxonomy." msgstr "Un terme avec ce nom existe dÃ©jÃ dans la taxinomie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:373 +msgid "To reset your password, visit the following address:" +msgstr "Pour renouveler votre mot de passe, cliquez sur le lien suivant :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:912 +msgid "Column group" +msgstr "Groupe de colonnes" +======= #: wp-includes/taxonomy.php:2931 msgid "A term with the name already exists with this parent." msgstr "Un terme avec ce nom existe dÃ©jÃ avec ce parent." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/user.php:2272 +msgid "[%s] Notice of Email Change" +msgstr "[%s] Notification d'un changement d'adresse de messagerie" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:945 +msgid "Toolbar Toggle" +msgstr "Ouvrir/fermer la barre d'outils" +======= #: wp-includes/taxonomy.php:2942 msgid "Could not insert term into the database" msgstr "Impossible d’insÃ©rer le terme dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2416 +msgid "Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! \" ? $ % ^ & )." +msgstr "Astuce : le mot de passe devrait contenir au moins 12 caractÃ¨res. Pour le rendre plus sÃ»r, utilisez des lettres en majuscule et minuscule, des nombres, et des symboles tels que ! \" ? $ % ^ & )." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:828 +msgid "Insert image" +msgstr "InsÃ©rer une image" +======= #: wp-includes/taxonomy.php:2870 wp-includes/taxonomy.php:3404 msgid "A name is required for this term" msgstr "Un nom est requis pour ce terme" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:1299 wp-includes/wp-db.php:1316 +msgid "WordPress database error:" +msgstr "Erreur de la base de donnÃ©es WordPress :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:826 +msgid "Style" +msgstr "Style" +======= #: wp-includes/taxonomy.php:1318 wp-includes/taxonomy.php:3382 #: wp-includes/taxonomy.php:4347 msgid "Empty Term" msgstr "Pas de terme" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:532 +msgid "Your password reset link appears to be invalid. Please request a new link below." +msgstr "Votre lien de rÃ©initialisation de mot de passe semble Ãªtre invalide. Veuillez demander un nouveau lien ci-dessous." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:832 +msgid "Alternative source" +msgstr "Source alternative" +======= #: wp-includes/taxonomy.php:496 msgid "No categories found." msgstr "Aucune catÃ©gorie trouvÃ©e." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-login.php:534 +msgid "Your password reset link has expired. Please request a new link below." +msgstr "Votre lien de rÃ©initialisation de mot de passe semble avoir expirÃ©. Veuillez demander un nouveau lien ci-dessous." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1254 +msgid "Save failed." +msgstr "Ãchec de la sauvegarde." +======= #: wp-includes/taxonomy.php:496 msgid "No tags found." msgstr "Aucune Ã©tiquette trouvÃ©e." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/taxonomy.php:513 +msgid "No tags" +msgstr "Aucune Ã©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1214 +msgid "Media library (Alt + Shift + M)" +msgstr "BibliothÃ¨que de mÃ©dias (Alt + Shift + M)" +======= #: wp-includes/taxonomy.php:495 msgid "Choose from the most used tags" msgstr "Choisir parmi les Ã©tiquettes les plus utilisÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2217 +msgid "[%s] Notice of Password Change" +msgstr "[%s] Notification d'un changement de mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:812 +msgid "Keywords" +msgstr "Mots-clÃ©s" +======= #: wp-includes/taxonomy.php:494 msgid "Add or remove tags" msgstr "Ajouter ou retirer des Ã©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-mail.php:54 +msgid "There doesn’t seem to be any new mail." +msgstr "Il ne semble pas y avoir de nouveau message." +||||||| .r11156 +#: wp-includes/admin-bar.php:130 wp-includes/default-widgets.php:399 +#: wp-login.php:100 +msgid "https://wordpress.org/" +msgstr "http://www.wordpress-fr.net/" +======= #: wp-includes/taxonomy.php:493 msgid "Separate tags with commas" msgstr "SÃ©parez les Ã©tiquettes par des virgules" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:670 +msgid "Registration has been disabled." +msgstr "Les inscriptions ont Ã©tÃ© dÃ©sactivÃ©es." +||||||| .r11156 +#: wp-includes/admin-bar.php:146 wp-login.php:771 +msgid "https://wordpress.org/support/" +msgstr "http://www.wordpress-fr.net/support" +======= #: wp-includes/taxonomy.php:492 msgid "New Category Name" msgstr "Nom de la nouvelle catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme-compat/comments-popup.php:65 +msgid "Leave a comment" +msgstr "Ãcrire un commentaire" +||||||| .r11156 +#: wp-includes/admin-bar.php:154 +msgid "https://wordpress.org/support/forum/requests-and-feedback" +msgstr "https://wordpress.org/support/forum/requests-and-feedback" +======= #: wp-includes/taxonomy.php:492 msgid "New Tag Name" msgstr "Nom du nouveau Ã©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:510 +msgid "Add or remove tags" +msgstr "Ajouter ou retirer des Ã©tiquettes" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:909 +msgid "Randomize uploaded headers" +msgstr "En-tÃªtes chargÃ©s alÃ©atoires" +======= #: wp-includes/taxonomy.php:491 msgid "Add New Category" msgstr "Ajouter une nouvelle catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:511 +msgid "Choose from the most used tags" +msgstr "Choisir parmi les Ã©tiquettes les plus utilisÃ©es" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:911 +msgid "Randomize suggested headers" +msgstr "En-tÃªtes suggÃ©rÃ©s alÃ©atoires" +======= #: wp-includes/taxonomy.php:491 msgid "Add New Tag" msgstr "Ajouter une nouvelle Ã©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:512 +msgid "No tags found." +msgstr "Aucune Ã©tiquette trouvÃ©e." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:939 +msgid "Randomizing uploaded headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes chargÃ©s" +======= #: wp-includes/taxonomy.php:490 msgid "Update Category" msgstr "Mettre Ã jour la catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-load.php:76 +msgid "Need more help? We got it." +msgstr "Besoin d’aide ? En voici." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:941 +msgid "Randomizing suggested headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes suggÃ©rÃ©s" +======= #: wp-includes/taxonomy.php:490 msgid "Update Tag" msgstr "Mettre Ã jour lâÃ©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:811 wp-login.php:815 +msgid "https://codex.wordpress.org/Cookies" +msgstr "https://codex.wordpress.org/Cookies" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:957 +msgid "No image set" +msgstr "Pas de jeu d’images" +======= #: wp-includes/taxonomy.php:489 msgid "View Category" msgstr "Afficher la catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:155 +msgid "ERROR: The password you entered for the username %1$s is incorrect. Lost your password?" +msgstr "ERREUR : le mot de passe que vous avez saisi pour l’utilisateur %1$s n’est pas correct. Mot de passe oubliÃ© ?" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:998 +msgid "Current header" +msgstr "En-tÃªte actuel" +======= #: wp-includes/taxonomy.php:489 msgid "View Tag" msgstr "Voir lâÃ©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:4280 +msgid "Could not split shared term." +msgstr "Impossible de sÃ©parer les termes partagÃ©s." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1012 +msgctxt "custom headers" +msgid "Previously uploaded" +msgstr "PrÃ©cÃ©demment chargÃ©" +======= #: wp-includes/taxonomy.php:488 msgid "Edit Category" msgstr "Modifier la catÃ©gorie" +>>>>>>> .r12027 -#: wp-includes/taxonomy.php:488 -msgid "Edit Tag" +<<<<<<< .mine +#: wp-includes/user.php:139 +msgid "ERROR: Invalid username. Lost your password?" +msgstr "ERREUR : nom d'utilisateur invalide. Mot de passe oubliÃ© ?" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1019 +msgctxt "custom headers" +msgid "Suggested" +msgstr "SuggÃ©rÃ©s" +======= +#: wp-includes/taxonomy.php:488 +msgid "Edit Tag" msgstr "Modifier lâÃ©tiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: number of comments, 2: post title +#: wp-includes/theme-compat/comments.php:33 +msgid "%1$s response to %2$s" +msgid_plural "%1$s responses to %2$s" +msgstr[0] "%1$s rÃ©ponse Ã %2$s" +msgstr[1] "%1$s rÃ©ponses Ã %2$s" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:1050 +msgid "Add a Widget" +msgstr "Ajouter un Widget" +======= #: wp-includes/taxonomy.php:487 msgid "Parent Category:" msgstr "CatÃ©gorie parente :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme.php:1926 +msgid "Customizer" +msgstr "Outil de personnalisation" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:693 +msgid "Move down" +msgstr "Descendre" +======= #: wp-includes/taxonomy.php:486 msgid "Parent Category" msgstr "CatÃ©gorie parente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/user.php:2563 +msgid "ERROR: This username is invalid because it uses illegal characters. Please enter a valid username." +msgstr "ERREUR : cet identifiant n’est pas valide, car il utilise des caractÃ¨res non autorisÃ©s. Merci d’utiliser un identifiant valide." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:694 +msgid "Move up" +msgstr "Monter" +======= #: wp-includes/taxonomy.php:485 msgid "All Categories" msgstr "Toutes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:810 +msgid "ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums." +msgstr "ERREUR : les cookies sont bloquÃ©s en raison d’un retour inattendu. Pour obtenir de l’aide, veuillez lire cette documentation ou essayez les forums d’entraide." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:700 +msgid "Select an area to move this widget into:" +msgstr "SÃ©lectionnez une zone vers laquelle dÃ©placeer ce widget :" +======= #: wp-includes/taxonomy.php:485 msgid "All Tags" msgstr "Toutes les Ã©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:814 +msgid "ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress." +msgstr "ERREUR : les cookies sont bloquÃ©s ou ne sont pas reconnus par votre navigateur. Vous devez activer les cookies pour utiliser WordPress." +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:728 +#: wp-includes/script-loader.php:518 +msgid "An error has occurred. Please reload the page and try again." +msgstr "Une erreur est survenue. Veuillez recharger la page et rÃ©essayer." +======= #: wp-includes/taxonomy.php:484 msgid "Popular Tags" msgstr "Ãtiquettes populaires" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: taxonomy label, %l: list of terms formatted as per +#. $term_template +#: wp-includes/taxonomy.php:4733 +msgid "%s: %l." +msgstr "%s : %l." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:773 +msgid "Align right" +msgstr "Aligner Ã droite" +======= #: wp-includes/taxonomy.php:483 msgid "Search Categories" msgstr "Chercher une catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:881 +msgid "You have successfully updated WordPress! Please log back in to see what’s new." +msgstr "WordPress a bien Ã©tÃ© mis Ã jour ! Veuillez vous reconnecter pour voir les nouveautÃ©s." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:792 +msgid "Numbered list" +msgstr "Liste numÃ©rotÃ©e" +======= #: wp-includes/taxonomy.php:483 msgid "Search Tags" msgstr "Chercher dans les Ã©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/theme.php:1444 +msgid "You need to pass an array of types." +msgstr "Vous devez passer un tableau de types." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:776 +msgid "Increase indent" +msgstr "Augmenter l’indentation" +======= #: wp-includes/taxonomy.php:482 msgctxt "taxonomy singular name" msgid "Category" msgstr "CatÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/wp-db.php:1100 +msgid "%s must set a database connection for use with escaping." +msgstr "%s doit mettre en place une connexion Ã la base de donnÃ©es pour l’utiliser avec l’Ã©chappement" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:764 +msgid "Clear formatting" +msgstr "Nettoyer le formatage " +======= #: wp-includes/taxonomy.php:482 msgctxt "taxonomy singular name" msgid "Tag" msgstr "Ãtiquette" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:2971 +msgid "A term with the name provided already exists in this taxonomy." +msgstr "Un terme avec ce nom et cet identifiant existe dÃ©jÃ dans cette taxinomie." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:772 +msgid "Align center" +msgstr "Centrer" +======= #: wp-includes/taxonomy.php:481 msgctxt "taxonomy general name" msgid "Categories" msgstr "CatÃ©gories" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Theme support 2: hook name +#: wp-includes/theme.php:1575 +msgid "Theme support for %1$s should be registered before the %2$s hook." +msgstr "La reconnaissance de %1$s par le thÃ¨me doit Ãªtre enregistrÃ©e avec le point d'accroche %2$s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:777 +msgid "Decrease indent" +msgstr "Diminuer l’indentation" +======= #: wp-includes/taxonomy.php:481 msgctxt "taxonomy general name" msgid "Tags" msgstr "Ãtiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:512 +msgid "No categories found." +msgstr "Aucune catÃ©gorie trouvÃ©e." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:929 +msgid "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off." +msgstr "Coller est maintenant en mode texte. Les contenus seront dorÃ©navant collÃ©s en mode texte jusqu‘Ã ce que cette option soit annulÃ©e." +======= #: wp-includes/taxonomy.php:350 wp-includes/taxonomy.php:351 msgid "Taxonomy names must be between 1 and 32 characters in length." msgstr "Un nom de taxinomie doit comporter entre 1 et 32 caractÃ¨res." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:661 +msgid "Strength indicator" +msgstr "Indicateur de robustesse" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:775 +msgid "Justify" +msgstr "Justifier" +======= #: wp-includes/taxonomy.php:120 wp-includes/taxonomy.php:121 msgctxt "post format" msgid "Format" msgstr "Format" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:509 +msgid "Separate tags with commas" +msgstr "SÃ©parez les Ã©tiquettes par des virgules" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:774 +msgid "Align left" +msgstr "Aligner Ã gauche" +======= #: wp-includes/taxonomy.php:98 msgid "New Link Category Name" msgstr "Nom de la nouvelle catÃ©gorie de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:3197 +msgid "Could not insert term relationship into the database" +msgstr "Impossible d’insÃ©rer le terme associÃ© dans la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:789 +msgid "Visual aids" +msgstr "Aides visuelles" +======= #: wp-includes/taxonomy.php:97 msgid "Add New Link Category" msgstr "Ajouter une catÃ©gorie de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:410 +msgid "Possible reason: your host may have disabled the mail() function." +msgstr "Cause possible : votre hÃ©bergeur a peut-Ãªtre dÃ©sactivÃ© la fonction mail()." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:851 +msgid "Restore last draft" +msgstr "RÃ©tablir le dernier brouillon" +======= #: wp-includes/taxonomy.php:96 msgid "Update Link Category" msgstr "Mettre Ã jour la catÃ©gorie de liens" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-login.php:762 +msgid "Registration confirmation will be e-mailed to you." +msgstr "La confirmation d’inscription vous sera envoyÃ©e par e-mail." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:838 +msgid "Special character" +msgstr "CaractÃ¨re spÃ©cial" +======= #: wp-includes/taxonomy.php:95 msgid "Edit Link Category" msgstr "Modifier la catÃ©gorie de lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:369 +msgid "Someone requested that the password be reset for the following account:" +msgstr "Quelqu’un a demandÃ© le renouvÃ¨lement de son mot de passe pour le compte suivant :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:768 +msgid "Source code" +msgstr "Code source" +======= #: wp-includes/taxonomy.php:94 msgid "All Link Categories" msgstr "Toutes les catÃ©gories de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-signup.php:262 +msgid "Welcome back, %s. By filling out the form below, you can add another site to your account. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!" +msgstr "Heureux de voir revoir, %s ! En remplissant le formulaire ci-dessous, vous pouvez ajouter un autre site Ã votre compte. Il n’y a pas de limite au nombre de sites dont vous pouvez disposer, donc crÃ©ez-en autant que vous le souhaitez, mais Ã©crivez de maniÃ¨re responsable !" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:841 +msgid "Emoticons" +msgstr "ÃmoticÃ´nes" +======= #: wp-includes/taxonomy.php:92 msgid "Search Link Categories" msgstr "Chercher une catÃ©gorie de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: the id argument, 2: sidebar name, 3: recommended id value +#: wp-includes/widgets.php:864 +msgid "No %1$s was set in the arguments array for the \"%2$s\" sidebar. Defaulting to \"%3$s\". Manually set the %1$s to \"%3$s\" to silence this notice and keep existing sidebar content." +msgstr "Aucun %1$s n’a Ã©tÃ© configurÃ© dans le tableau d’arguments de la colonne latÃ©rale \"%2$s\". \"%3$s\" sera utilisÃ© par dÃ©faut. Configurez manuellement %1$s avec \"%3$s\" pour faire disparaÃ®tre cette notification et conserver le contenu actuel de la colonne latÃ©rale." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:810 +msgid "Robots" +msgstr "Robots" +======= #: wp-includes/taxonomy.php:91 msgid "Link Category" msgstr "CatÃ©gorie de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, +#. SITEURL: those are placeholders. +#: wp-includes/user.php:2202 +msgid "" +"Hi ###USERNAME###,\n" +"\n" +"This notice confirms that your password was changed on ###SITENAME###.\n" +"\n" +"If you did not change your password, please contact the Site Administrator at\n" +"###ADMIN_EMAIL###\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Salutations ###USERNAME###,\n" +"\n" +"Ce message vous confirme que votre mot de passe a bien Ã©tÃ© modifiÃ© sur ###SITENAME###.\n" +"\n" +"Si vous n'avez pas modifiÃ© votre mot de passe, veuillez contacter l'administrateur du site Ã cet adresse :\n" +"###ADMIN_EMAIL###\n" +"\n" +"Ce message a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"Toute l'Ã©quipe de ###SITENAME###\n" +"###SITEURL###" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:813 +msgid "Encoding" +msgstr "Encodage" +======= #: wp-includes/taxonomy.php:90 msgid "Link Categories" msgstr "CatÃ©gories de liens" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, +#. SITEURL: those are placeholders. +#: wp-includes/user.php:2257 +msgid "" +"Hi ###USERNAME###,\n" +"\n" +"This notice confirms that your email was changed on ###SITENAME###.\n" +"\n" +"If you did not change your email, please contact the Site Administrator at\n" +"###ADMIN_EMAIL###\n" +"\n" +"This email has been sent to ###EMAIL###\n" +"\n" +"Regards,\n" +"All at ###SITENAME###\n" +"###SITEURL###" +msgstr "" +"Bonjour ###USERNAME###,\n" +"\n" +"Ce message vous confirme que votre adresse de messagerie Ã bien Ã©tÃ© modifiÃ©e sur le site ###SITENAME###.\n" +"\n" +"Si vous n'avez pas effectuÃ© cette action, veuillez contacter rapidement l'administrateur du site Ã cette adresse :\n" +"###ADMIN_EMAIL###\n" +"\n" +"Ce message a Ã©tÃ© envoyÃ© Ã ###EMAIL###\n" +"\n" +"Cordialement,\n" +"L'Ã©quipe du site ###SITENAME###\n" +"###SITEURL###" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:849 +msgid "Horizontal line" +msgstr "Ligne horizontale" +======= #: wp-includes/taxonomy.php:78 msgid "Navigation Menu" msgstr "Menu de navigation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-login.php:649 +msgid "Enter your new password below." +msgstr "Veuillez saisir votre nouveau mot de passe ci-dessous." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:829 +msgid "Insert date/time" +msgstr "InsÃ©rer l’heure/la date" +======= #: wp-includes/taxonomy.php:77 msgid "Navigation Menus" msgstr "Menus de navigation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1655 +msgid "No posts found." +msgstr "Aucun article trouvÃ©." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:833 +msgid "Paste your embed code below:" +msgstr "Collez votre code d’intÃ©gration ci-dessous :" +======= #. translators: To add an additional Open Sans character subset specific to #. your language, translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not #. translate into your own language. @@ -1060,7 +3580,18 @@ msgstr "Menus de navigation" msgctxt "Open Sans font: add new subset (greek, cyrillic, vietnamese)" msgid "no-subset" msgstr "no-subset" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:924 wp-includes/post.php:944 +#: wp-includes/script-loader.php:509 +msgid "Published" +msgstr "PubliÃ©" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:834 +msgid "Insert video" +msgstr "InsÃ©rer une vidÃ©o" +======= #. translators: If there are characters in your language that are not supported #. by Open Sans, translate this to 'off'. Do not translate into your own #. language. @@ -1068,12 +3599,32 @@ msgstr "no-subset" msgctxt "Open Sans font: on or off" msgid "on" msgstr "on" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:922 +msgid "Pending Review" +msgstr "En attente de relecture" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:835 +msgid "Embed" +msgstr "IntÃ©gration" +======= #: wp-includes/script-loader.php:587 msgctxt "missing menu item navigation label" msgid "(no label)" msgstr "(Aucune information)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:921 wp-includes/post.php:942 +msgid "Draft" +msgstr "Brouillon" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:842 +msgid "Nonbreaking space" +msgstr "Espace insÃ©cable" +======= #: wp-includes/script-loader.php:585 msgid "" "You are about to permanently delete this menu. \n" @@ -1081,426 +3632,1507 @@ msgid "" msgstr "" "Vous Ãªtes sur le point de supprimer dÃ©finitivement ce menu.\n" " Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:499 +msgid "Publish" +msgstr "Publier" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:843 +msgid "Page break" +msgstr "Saut de page" +======= #: wp-includes/script-loader.php:578 msgid "Done" msgstr "TerminÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/revision.php:33 +msgid "Excerpt" +msgstr "Extrait" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:844 +msgid "Paste as text" +msgstr "Coller en texte" +======= #: wp-includes/script-loader.php:577 msgid "Could not set that as the thumbnail image. Try a different attachment." msgstr "Impossible de s’en servir comme miniature. Essayez un autre fichier attachÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:82 +msgid "Revisions" +msgstr "RÃ©visions" +||||||| .r11156 +#: wp-includes/media-template.php:845 wp-includes/media.php:2908 +msgid "Replace" +msgstr "Remplacer" +======= #: wp-includes/script-loader.php:576 msgid "Saving..." msgstr "Enregistrement..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:100 +msgid "Edit Link Category" +msgstr "Modifier la catÃ©gorie de lien" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:862 +msgid "Find and replace" +msgstr "Chercher et remplacer" +======= #: wp-includes/script-loader.php:575 msgid "Use as featured image" msgstr "Utiliser comme image Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:506 +msgid "Update Category" +msgstr "Mettre Ã jour la catÃ©gorie" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:866 +msgid "Match case" +msgstr "Respecter la casse" +======= #: wp-includes/script-loader.php:570 msgid "Could not load the preview image. Please reload the page and try again." msgstr "Impossible de charger l’image de prÃ©visualisation. Veuillez recharger la page et rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1649 +msgctxt "post" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:880 +msgid "Rows" +msgstr "Lignes" +======= #: wp-includes/script-loader.php:555 msgid "Current Color" msgstr "Couleur actuelle" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1653 +msgid "View Post" +msgstr "Afficher l’article" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:915 +msgid "Cell padding" +msgstr "Marge intÃ©rieure des cellules" +======= #: wp-includes/script-loader.php:543 msgid "Plugin updates may not complete if you navigate away from this page." msgstr "Les mises Ã jour d’extensions peuvent ne pas se faire totalement si vous quittez cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1651 +msgid "Edit Post" +msgstr "Modifier l’article" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:916 +msgid "Cell spacing" +msgstr "Espacement entre les cellules" +======= #: wp-includes/script-loader.php:554 msgid "Select Color" msgstr "SÃ©lectionner une couleur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:501 +msgid "All Categories" +msgstr "Toutes" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:913 +msgid "Row type" +msgstr "Type de ligne" +======= #. translators: JavaScript accessible string #: wp-includes/script-loader.php:540 msgid "Update completed successfully." msgstr "Mise Ã jour rÃ©ussie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:617 +msgid "Done" +msgstr "TerminÃ©" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:873 +msgid "Insert table" +msgstr "InsÃ©rer un tableau" +======= #. translators: JavaScript accessible string #: wp-includes/script-loader.php:542 msgid "Update canceled." msgstr "Mises Ã jour annulÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1668 +msgid "Submit" +msgstr "Envoyer" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:884 +msgid "Header cell" +msgstr "Cellule d’en-tÃªte" +======= #. translators: Plugin name and version #: wp-includes/script-loader.php:536 msgid "%s update failed" msgstr "La mise Ã jour de %s a Ã©chouÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/revision.php:32 +msgid "Content" +msgstr "Contenu" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:914 +msgid "Cell type" +msgstr "Type de cellule" +======= #. translators: JavaScript accessible string #: wp-includes/script-loader.php:538 msgid "Updating... please wait." msgstr "Mise Ã jour en cours... veuillez patienter." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:503 +msgid "Save Draft" +msgstr "Enregistrer brouillon" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:911 +msgid "Row group" +msgstr "Groupe de lignes" +======= #. translators: Plugin name and version #: wp-includes/script-loader.php:534 msgid "%s updated!" msgstr "%s est Ã jour !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:502 +msgid "Save as Pending" +msgstr "Mettre Ã relire" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:896 +msgid "Delete column" +msgstr "Supprimer la colonne" +======= #: wp-includes/script-loader.php:530 msgid "Update Failed" msgstr "Ãchec de la mise Ã jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:508 +msgid "Privately Published" +msgstr "PubliÃ© en privÃ©" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:922 +msgid "Background color" +msgstr "Couleur d’arriÃ¨re plan" +======= #. translators: Plugin name and version #: wp-includes/script-loader.php:532 msgid "Updating %s..." msgstr "Mise Ã jour de %s..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:923 wp-includes/post.php:943 +#: wp-includes/script-loader.php:504 +msgid "Private" +msgstr "PrivÃ©" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:923 +msgid "Text color" +msgstr "Couleur du texte" +======= #: wp-includes/script-loader.php:529 msgid "Updated!" msgstr "Ã jour !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:506 +msgid "Public, Sticky" +msgstr "Public, mis en avant" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:925 +msgid "Show invisible characters" +msgstr "Voir les caractÃ¨res invisibles" +======= #: wp-includes/script-loader.php:528 msgid "Updating..." msgstr "Mise Ã jour en cours..." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:505 +msgid "Public" +msgstr "Public" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:930 +msgid "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help" +msgstr "Zone de texte enrichi. Appuyer sur ALT-F9 pour accÃ©der au menu. Appuyer sur ALT-F10 pour accÃ©der Ã la barre d’outils. Appuyer sur ALT-0 pour l’aide." +======= #: wp-includes/script-loader.php:521 msgid "Are you sure you want to install this plugin?" msgstr "Voulez-vous vraiment installer cette extension ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:500 +msgid "Schedule" +msgstr "Planifier" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:946 +msgid "Insert Read More tag" +msgstr "InsÃ©rer la balise Â« Lire la suite... Â»" +======= #: wp-includes/script-loader.php:520 msgid "Plugin Information:" msgstr "Informations sur l’extension :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2477 +msgid "Images" +msgstr "Images" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:948 +msgid "Distraction Free Writing" +msgstr "Ãcriture sans distraction" +======= #: wp-includes/script-loader.php:508 msgid "Remove From Bulk Edit" msgstr "Enlever des modifications groupÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:58 +msgid "Edit Media" +msgstr "Modifier un mÃ©dia" +||||||| .r11156 +#: wp-includes/general-template.php:2647 +msgctxt "admin color scheme" +msgid "Sunrise" +msgstr "Lever du soleil" +======= #: wp-includes/script-loader.php:507 wp-includes/script-loader.php:515 msgid "Error while saving the changes." msgstr "Erreur lors de la sauvegarde des modifications." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1652 +msgid "New Page" +msgstr "Nouvelle page" +||||||| .r11156 +#: wp-includes/general-template.php:2653 +msgctxt "admin color scheme" +msgid "Ectoplasm" +msgstr "Ectoplasme" +======= #: wp-includes/script-loader.php:496 msgid "Submitted on:" msgstr "EnvoyÃ© le :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:504 +msgid "Edit Category" +msgstr "Modifier la catÃ©gorie" +||||||| .r11156 +#: wp-includes/general-template.php:2659 +msgctxt "admin color scheme" +msgid "Ocean" +msgstr "OcÃ©an" +======= #. translators: %d: nth embed found in a post #: wp-includes/script-loader.php:484 msgid "Suggested embed #%d" msgstr "Inclusion suggÃ©rÃ©e #%d" +>>>>>>> .r12027 -#. translators: %d: nth image found in a post +<<<<<<< .mine +#: wp-includes/post.php:1649 +msgctxt "page" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-includes/general-template.php:2665 +msgctxt "admin color scheme" +msgid "Coffee" +msgstr "CafÃ©" +======= +#. translators: %d: nth image found in a post #: wp-includes/script-loader.php:486 msgid "Suggested image #%d" msgstr "Image suggÃ©rÃ©e #%d" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:802 +msgid "Pages:" +msgstr "Pages :" +||||||| .r11156 +#: wp-includes/class-wp-image-editor.php:268 +msgid "Attempted to set image quality outside of the range [1,100]." +msgstr "Tentative de mise en place d’une qualitÃ© d’image en dehors de l’intervalle [1100]." +======= #: wp-includes/script-loader.php:481 msgid "Connection lost or the server is busy. Please try again later." msgstr "Connexion perdue ou serveur occupÃ©. Veuillez rÃ©essayer plus tard." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:83 +msgid "Navigation Menu" +msgstr "Menu de navigation" +||||||| .r11156 +#: wp-includes/taxonomy.php:2489 +msgid "A term with the name and slug provided already exists with this parent." +msgstr "Un terme avec le nom et l’identifiant fournis existe dÃ©jÃ avec ce parent." +======= #: wp-includes/script-loader.php:475 msgid "Saving Draft…" msgstr "Enregistrement du brouillon…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/option.php:142 +msgid "%s is a protected WP option and may not be modified" +msgstr "%s est une option protÃ©gÃ©e de WordPress, et ne peut Ãªtre modifiÃ©e" +||||||| .r11156 +#: wp-includes/taxonomy.php:2509 +msgid "A term with the name and slug provided already exists." +msgstr "Un terme avec le nom et l’identifiant fournis existe dÃ©jÃ ." +======= #: wp-includes/script-loader.php:472 msgid "Privately Published" msgstr "PubliÃ© en privÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:118 +msgid "Code" +msgstr "Code" +||||||| .r11156 +#: wp-includes/default-widgets.php:17 +msgid "A list of your site’s Pages." +msgstr "Une liste des pages de votre site." +======= #: wp-includes/script-loader.php:471 msgid "Password Protected" msgstr "ProtÃ©gÃ© par un mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:347 +msgid "Mute" +msgstr "Muet" +||||||| .r11156 +#: wp-includes/default-widgets.php:226 +msgid "A search form for your site." +msgstr "Un formulaire de recherche pour votre site." +======= #: wp-includes/script-loader.php:470 msgid "Public, Sticky" msgstr "Public, mis en avant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:104 +msgid "Insert link" +msgstr "InsÃ©rer un lien" +||||||| .r11156 +#: wp-includes/default-widgets.php:271 +msgid "A monthly archive of your site’s Posts." +msgstr "Une archive mensuelle des articles de votre site." +======= #: wp-includes/script-loader.php:469 msgid "Public" msgstr "Public" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1020 +msgid "Could not create user" +msgstr "Impossible de crÃ©er l’utilisateur." +||||||| .r11156 +#: wp-includes/default-widgets.php:371 +msgid "Login, RSS, & WordPress.org links." +msgstr "Connexion, flux RSS et liens WordPress.org." +======= #: wp-includes/script-loader.php:467 msgid "Save Draft" msgstr "Enregistrer brouillon" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1028 +msgid "That username is already activated." +msgstr "Cet identifiant est dÃ©jÃ activÃ©." +||||||| .r11156 +#: wp-includes/default-widgets.php:435 +msgid "A calendar of your site’s Posts." +msgstr "Un calendrier des articles de votre site." +======= #: wp-includes/script-loader.php:466 msgid "Save as Pending" msgstr "Mettre Ã relire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:414 +msgid "If your site does not display, please contact the owner of this network." +msgstr "Si votre site ne s'affiche pas, veuillez contacter le gestionnaire de ce rÃ©seau de sites." +||||||| .r11156 +#: wp-includes/default-widgets.php:479 +msgid "Arbitrary text or HTML." +msgstr "Texte arbitraire ou HTML." +======= #: wp-includes/script-loader.php:464 msgid "Schedule" msgstr "Planifier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:415 +msgid "If you are the owner of this network please check that MySQL is running properly and all tables are error free." +msgstr "Si vous Ãªtes le gestionnaire de ce rÃ©seau de sites, veuillez vous assurer que MySQL fonctionne correctement et qu'aucune table n'a d'erreur." +||||||| .r11156 +#: wp-includes/default-widgets.php:541 +msgid "A list or dropdown of categories." +msgstr "Une liste ou un menu dÃ©roulant des catÃ©gories." +======= #: wp-includes/script-loader.php:463 msgid "Publish" msgstr "Publier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:432 +msgid "What do I do now?" +msgstr "Que dois-je faire maintenant ?" +||||||| .r11156 +#: wp-includes/default-widgets.php:653 +msgid "Your site’s most recent Posts." +msgstr "Les articles les plus rÃ©cents de votre site." +======= #: wp-includes/script-loader.php:462 msgid "No more comments found." msgstr "Il n’y a pas d’autres commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:572 +msgid "ERROR: Invalid username or incorrect password." +msgstr "ERREUR : l’identifiant ou le mot de passe n’est pas valide." +||||||| .r11156 +#: wp-includes/default-widgets.php:783 +msgid "Your site’s most recent comments." +msgstr "Les commentaires les plus rÃ©cents de votre site." +======= #: wp-includes/script-loader.php:461 msgid "Show more comments" msgstr "Afficher plus de commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1480 wp-includes/pluggable.php:1605 +msgid "Delete it: %s" +msgstr "Le supprimer : %s" +||||||| .r11156 +#: wp-includes/default-widgets.php:928 +msgid "Entries from any RSS or Atom feed." +msgstr "Les entrÃ©es depuis n’importe quel flux RSS ou Atom." +======= #. translators: 1: month, 2: day, 3: year, 4: hour, 5: minute #: wp-includes/script-loader.php:460 msgid "%1$s %2$s, %3$s @ %4$s : %5$s" msgstr "%2$s %1$s %3$s Ã %4$s h %5$s min" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1481 wp-includes/pluggable.php:1606 +msgid "Spam it: %s" +msgstr "Le marquer comme indÃ©sirable : %s" +||||||| .r11156 +#: wp-includes/default-widgets.php:1224 +msgid "A cloud of your most used tags." +msgstr "Un nuage de vos mots-clÃ©s les plus utilisÃ©s." +======= #: wp-includes/script-loader.php:458 msgid "Published on:" msgstr "PubliÃ© le :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1581 +msgid "Trackback excerpt: " +msgstr "Extrait du rÃ©trolien :" +||||||| .r11156 +#: wp-includes/default-widgets.php:1307 +msgid "Add a custom menu to your sidebar." +msgstr "Ajouter un menu personnalisÃ© Ã votre barre latÃ©rale." +======= #: wp-includes/script-loader.php:457 msgid "Schedule for:" msgstr "Planifier pour :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1589 +msgid "Pingback excerpt: " +msgstr "Extrait du ping :" +||||||| .r11156 +#: wp-includes/script-loader.php:586 +msgctxt "Open Sans font: on or off" +msgid "on" +msgstr "on" +======= #: wp-includes/script-loader.php:456 msgid "Publish on:" msgstr "PubliÃ© le :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1601 +msgid "Approve it: %s" +msgstr "L'approuver : %s" +||||||| .r11156 +#: wp-includes/general-template.php:2619 +msgctxt "admin color scheme" +msgid "Default" +msgstr "Par dÃ©faut" +======= #: wp-includes/script-loader.php:439 msgid "Approve and Reply" msgstr "Approuver et rÃ©pondre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1608 +msgid "Currently %s comment is waiting for approval. Please visit the moderation panel:" +msgid_plural "Currently %s comments are waiting for approval. Please visit the moderation panel:" +msgstr[0] "En ce moment, %s commentaire attend votre approbation. Veuillez vous rendre sur le panneau de modÃ©ration :" +msgstr[1] "En ce moment, %s commentaires attendent vos approbations. Veuillez vous rendre sur le panneau de modÃ©ration :" +||||||| .r11156 +#: wp-includes/general-template.php:2629 +msgctxt "admin color scheme" +msgid "Light" +msgstr "Lumineux" +======= #: wp-includes/script-loader.php:404 msgid "Allowed Files" msgstr "Fichiers autorisÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1675 +msgid "Password Lost and Changed for user: %s" +msgstr "Mot de passe oubliÃ© et changÃ© pour l'utilisateur : %s" +||||||| .r11156 +#: wp-includes/general-template.php:2641 +msgctxt "admin color scheme" +msgid "Midnight" +msgstr "Minuit" +======= #: wp-includes/script-loader.php:400 msgid "Site Preview" msgstr "AperÃ§u du site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1679 +msgid "[%s] Password Lost/Changed" +msgstr "[%s] Mot de passe oubliÃ© et changÃ©" +||||||| .r11156 +#: wp-includes/link-template.php:1489 +msgid "Use commas instead of %s to separate excluded terms." +msgstr "Utilisez des virgules au lieu de %s pour sÃ©parer les termes exclus." +======= #: wp-includes/script-loader.php:396 msgid "Saved" msgstr "EnregistrÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1716 wp-includes/pluggable.php:1739 +#: wp-login.php:371 +msgid "Username: %s" +msgstr "Identifiant : %s" +||||||| .r11156 +#: wp-includes/script-loader.php:592 +msgctxt "Open Sans font: add new subset (greek, cyrillic, vietnamese)" +msgid "no-subset" +msgstr "no-subset" +======= #: wp-includes/script-loader.php:394 msgid "Save & Publish" msgstr "Enregistrer & publier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1719 +msgid "[%s] New User Registration" +msgstr "[%s] Inscription d'un nouvel utilisateur" +||||||| .r11156 +#: wp-includes/admin-bar.php:169 +msgid "Menu" +msgstr "Menu" +======= #: wp-includes/script-loader.php:393 msgid "Save & Activate" msgstr "Enregistrer & activer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:130 +msgid "Protected: %s" +msgstr "ProtÃ©gÃ© : %s" +||||||| .r11156 +#: wp-includes/update.php:553 +msgid "Translation Updates" +msgstr "Mises Ã jour des traductions" +======= #: wp-includes/script-loader.php:370 wp-includes/script-loader.php:584 msgid "No results found." msgstr "Aucun rÃ©sultat." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:145 +msgid "Private: %s" +msgstr "PrivÃ© : %s" +||||||| .r11156 +#: wp-login.php:502 +msgid "Sorry, that key has expired. Please try again." +msgstr "DÃ©solÃ©, cette clÃ© a expirÃ©. Veuillez rÃ©essayer." +======= #: wp-includes/script-loader.php:354 msgid "Mismatch" msgstr "IncohÃ©rence" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:363 +msgid "There is no excerpt because this is a protected post." +msgstr "Il n’y pas d’extrait, car cet article est protÃ©gÃ©." +||||||| .r11156 +#: wp-includes/class-wp-theme.php:219 +msgid "The theme directory \"%s\" does not exist." +msgstr "Le rÃ©pertoire du thÃ¨me « %s » n’existe pas." +======= #: wp-includes/script-loader.php:353 msgid "Strong" msgstr "Forte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:808 +msgid "Next page" +msgstr "Page suivante" +||||||| .r11156 +#: wp-includes/query.php:726 +msgid "In %1$s, use the %2$s method, not the %3$s function. See %4$s." +msgstr "Dans %1$s, utilisez la mÃ©thode %2$s, pas la fonction %3$s. Lisez %4$s." +======= #. translators: password strength #: wp-includes/script-loader.php:352 msgctxt "password strength" msgid "Medium" msgstr "Moyenne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:809 +msgid "Previous page" +msgstr "Page prÃ©cÃ©dente" +||||||| .r11156 +#: wp-includes/functions.php:1138 +msgid "ERROR: This is not a valid feed template." +msgstr "ERREUR : ce n’est pas un flux valide." +======= #: wp-includes/script-loader.php:350 msgid "Weak" msgstr "Faible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1225 +msgid "Home" +msgstr "Accueil" +||||||| .r11156 +#: wp-includes/post-template.php:1566 +msgid "This content is password protected. To view it please enter your password below:" +msgstr "Cet article est protÃ©gÃ© par un mot de passe. Pour le lire, veuillez saisir votre mot de passe ci-dessous :" +======= #: wp-includes/script-loader.php:349 msgid "Very weak" msgstr "TrÃ¨s faible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1810 +msgid "%1$s [Autosave]" +msgstr "%1$s [Sauvegarde automatique]" +||||||| .r11156 +#: wp-includes/query.php:727 +msgid "http://codex.wordpress.org/Function_Reference/is_main_query" +msgstr "http://codex.wordpress.org/Function_Reference/is_main_query" +======= #: wp-includes/script-loader.php:348 wp-login.php:657 msgid "Strength indicator" msgstr "Indicateur de sÃ»retÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1811 +msgid "%1$s [Current Revision]" +msgstr "%1$s [Version actuelle]" +||||||| .r11156 +#: wp-includes/query.php:2144 +msgctxt "Comma-separated list of search stopwords in your language" +msgid "about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www" +msgstr "le,la,les,de,des,un,uns,une,unes,et,a,Ã ,il,elle,on,ne,je,tu,nous,vous,ils,elles,son,sa,ses,que,quoi,se,qui,ce,cette,dans,en,du,au,aux,pour,pas,sur,y,ou,oÃ¹,si,ton,ta,te,mon,ma,tout,toute,tous,toutes,Ã§a,ni,www,com,fr,par,sur,par,dans,mais,vos,votre,vÃ´tre,c,d,j,,l,m,n,s,t,sans,toi,moi,lui,leur,leurs" +======= #: wp-includes/script-loader.php:328 msgid "Captions/Subtitles" msgstr "LÃ©gendes/Sous-titres" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:83 +msgid "Revision" +msgstr "RÃ©vision" +||||||| .r11156 +#: wp-includes/class-http.php:1031 wp-includes/class-http.php:1433 +msgid "Failed to write request to temporary file." +msgstr "Impossible d’Ã©crire la requÃªte dans un fichier temporaire." +======= #: wp-includes/script-loader.php:327 msgid "Mute" msgstr "Muet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:112 +msgctxt "post" +msgid "Published" +msgstr "PubliÃ©" +||||||| .r11156 +#: wp-includes/class-http.php:937 wp-includes/class-http.php:945 +msgid "The SSL certificate for the host could not be verified." +msgstr "Le certificat SSL de l’hÃ´te n’a pas pu Ãªtre vÃ©rifiÃ©." +======= #: wp-includes/script-loader.php:326 msgid "Unmute" msgstr "RÃ©activer le son" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:115 +msgid "Published (%s)" +msgid_plural "Published (%s)" +msgstr[0] "PubliÃ© (%s)" +msgstr[1] "PubliÃ©s (%s)" +||||||| .r11156 +#: wp-includes/media-template.php:629 +msgid "Embed Media Player" +msgstr "IntÃ©grer le lecteur de mÃ©dia" +======= #: wp-includes/script-loader.php:325 msgid "Go Fullscreen" msgstr "Passer en plein Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:119 +msgctxt "post" +msgid "Scheduled" +msgstr "PlanifiÃ©" +||||||| .r11156 +#: wp-includes/media-template.php:339 wp-includes/media-template.php:513 +msgid "Length:" +msgstr "DurÃ©e :" +======= #: wp-includes/script-loader.php:324 msgid "Turn off Fullscreen" msgstr "Quitter le plein Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:122 +msgid "Scheduled (%s)" +msgid_plural "Scheduled (%s)" +msgstr[0] "PlanifiÃ© (%s)" +msgstr[1] "PlanifiÃ©s (%s)" +||||||| .r11156 +#: wp-includes/media-template.php:616 +msgid "Embed or Link" +msgstr "IntÃ©grer ou lier" +======= #: wp-includes/script-loader.php:322 msgid "Mute Toggle" msgstr "Couper le son" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:126 +msgctxt "post" +msgid "Draft" +msgstr "Brouillon" +||||||| .r11156 +#: wp-includes/media-template.php:636 +msgid "Link to Media File" +msgstr "Lien vers le fichier mÃ©dia" +======= #: wp-includes/script-loader.php:321 msgid "Play/Pause" msgstr "Lecture/Pause" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:129 +msgid "Draft (%s)" +msgid_plural "Drafts (%s)" +msgstr[0] "Brouillon (%s)" +msgstr[1] "Brouillons (%s)" +||||||| .r11156 +#: wp-includes/media-template.php:643 +msgid "Link to Attachment Page" +msgstr "Lien vers la page du fichier attachÃ©" +======= #: wp-includes/script-loader.php:320 msgid "Download Video" msgstr "TÃ©lÃ©charger la vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:133 +msgctxt "post" +msgid "Pending" +msgstr "En attente" +||||||| .r11156 +#: wp-includes/script-loader.php:311 +msgid "Download File" +msgstr "TÃ©lÃ©charger le fichier" +======= #: wp-includes/script-loader.php:319 msgid "Download File" msgstr "TÃ©lÃ©charger le fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:140 +msgctxt "post" +msgid "Private" +msgstr "PrivÃ©" +||||||| .r11156 +#: wp-includes/script-loader.php:312 +msgid "Download Video" +msgstr "TÃ©lÃ©charger la vidÃ©o" +======= #: wp-includes/script-loader.php:268 msgid "“%s” has failed to upload." msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:143 +msgid "Private (%s)" +msgid_plural "Private (%s)" +msgstr[0] "PrivÃ© (%s)" +msgstr[1] "PrivÃ©s (%s)" +||||||| .r11156 +#: wp-includes/script-loader.php:313 +msgid "Play/Pause" +msgstr "Lecture/Pause" +======= #: wp-includes/script-loader.php:267 msgid "moved to the trash." msgstr "dÃ©placÃ© dans la corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:147 +msgctxt "post" +msgid "Trash" +msgstr "Corbeille" +||||||| .r11156 +#: wp-includes/script-loader.php:314 +msgid "Mute Toggle" +msgstr "Couper le son" +======= #: wp-includes/script-loader.php:266 msgid "Crunching…" msgstr "En cours de traitement…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:150 +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeille (%s)" +||||||| .r11156 +#: wp-includes/script-loader.php:316 +msgid "Turn off Fullscreen" +msgstr "Quitter le plein Ã©cran" +======= #: wp-includes/script-loader.php:264 msgid "Upload stopped." msgstr "L’envoi est stoppÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3216 +msgid "Content, title, and excerpt are empty." +msgstr "Le contenu de l’article, le titre et l’extrait sont vides." +||||||| .r11156 +#: wp-includes/script-loader.php:317 +msgid "Go Fullscreen" +msgstr "Passer en plein Ã©cran" +======= #: wp-includes/script-loader.php:263 msgid "File canceled." msgstr "Fichier annulÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3429 +msgid "Could not update post in the database" +msgstr "Impossible de mettre Ã jour l’article dans la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/script-loader.php:318 +msgid "Unmute" +msgstr "RÃ©activer le son" +======= #: wp-includes/script-loader.php:262 msgid "Security error." msgstr "Erreur de sÃ©curitÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3444 +msgid "Could not insert post into the database" +msgstr "Impossible d’insÃ©rer l’article dans la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/script-loader.php:320 +msgid "Captions/Subtitles" +msgstr "LÃ©gendes/Sous-titres" +======= #: wp-includes/script-loader.php:261 msgid "IO error." msgstr "Erreur I/O (EntrÃ©es-Sorties)." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3509 +msgid "The page template is invalid." +msgstr "Le modÃ¨le de page est invalide." +||||||| .r11156 +#: wp-includes/formatting.php:2487 +msgid "%s week" +msgid_plural "%s weeks" +msgstr[0] "%s semaine" +msgstr[1] "%s semaines" +======= #: wp-includes/script-loader.php:260 msgid "%s exceeds the maximum upload size for the multi-file uploader when used in your browser." msgstr "%s dÃ©passe la limite d’envoi pour l’outil de mise ne ligne multiple utilisÃ© avec votre navigateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/revision.php:268 +msgid "Cannot create a revision of a revision" +msgstr "Impossible de crÃ©er une version d’une version." +||||||| .r11156 +#: wp-includes/formatting.php:2492 +msgid "%s month" +msgid_plural "%s months" +msgstr[0] "%s mois" +msgstr[1] "%s mois" +======= #: wp-includes/script-loader.php:259 msgid "Please try uploading this file with the %1$sbrowser uploader%2$s." msgstr "Veuillez essayer de mettre ce fichier en ligne Ã l’aide de l’%1$soutil du navigateur%2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/revision.php:526 +msgid "You do not have permission to preview drafts." +msgstr "Vous n’avez pas l’autorisation de prÃ©visualiser les brouillons" +||||||| .r11156 +#: wp-includes/formatting.php:2497 +msgid "%s year" +msgid_plural "%s years" +msgstr[0] "%s annÃ©e" +msgstr[1] "%s annÃ©es" +======= #: wp-includes/script-loader.php:258 msgid "Upload failed." msgstr "L’envoi a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:92 +msgid "Close all open tags" +msgstr "Fermer toutes les balises ouvertes" +||||||| .r11156 +#: wp-includes/nav-menu.php:726 wp-includes/post-template.php:1328 +#: wp-includes/post-template.php:1413 +msgid "#%d (no title)" +msgstr "#%d (pas de titre)" +======= #: wp-includes/script-loader.php:257 msgid "HTTP error." msgstr "Erreur HTTP." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:93 +msgid "close tags" +msgstr "fermer les balises" +||||||| .r11156 +#: wp-includes/post-template.php:1761 +msgid "JavaScript must be enabled to use this feature." +msgstr "JavaScript doit Ãªtre activÃ© pour utiliser cette fonctionnalitÃ©." +======= #: wp-includes/script-loader.php:256 msgid "You may only upload 1 file." msgstr "Vous pouvez seulement envoyer 1 fichier." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:95 +msgid "Enter the URL of the image" +msgstr "Saisissez l’adresse de l’image" +||||||| .r11156 +#: wp-includes/locale.php:351 +msgid "F j, Y" +msgstr "j F Y" +======= #: wp-includes/script-loader.php:255 msgid "There was a configuration error. Please contact the server administrator." msgstr "Il y a une erreur de configuration. Veuillez contacter l’administrateur de votre serveur." +>>>>>>> .r12027 -#: wp-includes/script-loader.php:254 -msgid "An error occurred in the upload. Please try again later." +<<<<<<< .mine +#: wp-includes/script-loader.php:96 +msgid "Enter a description of the image" +msgstr "Saisissez une description pour l’image" +||||||| .r11156 +#: wp-includes/locale.php:353 +msgid "g:i a" +msgstr "G \\h i \\m\\i\\n" +======= +#: wp-includes/script-loader.php:254 +msgid "An error occurred in the upload. Please try again later." msgstr "Une erreur est survenue lors de l’envoi. Veuillez rÃ©essayer plus tard." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:132 wp-includes/script-loader.php:466 +msgid "You do not have permission to do that." +msgstr "Vous n’avez pas l’autorisation d’effectuer cela." +||||||| .r11156 +#: wp-includes/locale.php:355 +msgid "F j, Y g:i a" +msgstr "j F Y G \\h i \\m\\i\\n" +======= #: wp-includes/script-loader.php:253 msgid "This is larger than the maximum size. Please try another." msgstr "Ce fichier est plus grand que la taille maximale. Merci d’en envoyer un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:133 wp-includes/script-loader.php:467 +msgid "An unidentified error has occurred." +msgstr "Une erreur non identifiÃ©e est survenue." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:372 +msgid "Login Address (URL)" +msgstr "Adresse de connexion (URL)" +======= #: wp-includes/script-loader.php:252 msgid "Memory exceeded. Please try another smaller file." msgstr "MÃ©moire dÃ©passÃ©e. Veuillez rÃ©essayer avec un fichier plus petit." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:252 +msgid "Next >" +msgstr "Suiv. >" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:377 +msgid "The URL to the admin area" +msgstr "L’adresse web de la zone d’administration" +======= #: wp-includes/script-loader.php:251 msgid "This file is not an image. Please try another." msgstr "Ce fichier n’est pas une image. Merci d’en envoyer un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:253 +msgid "< Prev" +msgstr "< PrÃ©c." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:745 +#: wp-includes/media-template.php:179 +msgid "The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead." +msgstr "Le navigateur web de votre systÃ¨me ne permet pas de mettre des fichiers en ligne. Vous devriez pouvoir le faire en passant par une application native." +======= #: wp-includes/script-loader.php:250 msgid "This file type is not allowed. Please try another." msgstr "Ce type de fichier n’est pas autorisÃ©. Merci d’en essayer un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:254 +msgid "Image" +msgstr "Image" +||||||| .r11156 +#: wp-includes/post-template.php:242 +msgid "(more…)" +msgstr "(suite…)" +======= #: wp-includes/script-loader.php:249 msgid "This file is empty. Please try another." msgstr "Le fichier est vide. Merci d’en essayer un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:255 +msgid "of" +msgstr "sur" +||||||| .r11156 +#: wp-login.php:397 +msgid "Possible reason: your host may have disabled the mail() function." +msgstr "Raison possible : votre hÃ©bergeur peut avoir dÃ©sactivÃ© la fonction mail()." +======= #: wp-includes/script-loader.php:248 msgid "%s exceeds the maximum upload size for this site." msgstr "%s dÃ©passe la limite d’envoi de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:257 +msgid "This feature requires inline frames. You have iframes disabled or your browser does not support them." +msgstr "Cette fonctionnalitÃ© requiert des iframes. Les iframes sont dÃ©sactivÃ©es sur votre navigateur, ou alors il ne les accepte pas." +||||||| .r11156 +#: wp-includes/user.php:2179 +msgid "ERROR: Couldn’t register you… please contact the webmaster !" +msgstr "ERREUR : inscription impossible… Veuillez prendre contact avec le webmaster !" +======= #: wp-includes/script-loader.php:247 msgid "You have attempted to queue too many files." msgstr "Vous essayez d’envoyer trop de fichiers Ã la fois." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:267 +msgid "You have attempted to queue too many files." +msgstr "Vous essayez d’envoyer trop de fichiers Ã la fois." +||||||| .r11156 +#: wp-includes/post-template.php:1655 +msgctxt "post revision title extra" +msgid "%1$s [Autosave]" +msgstr "%1$s [Sauvegarde automatique]" +======= #: wp-includes/script-loader.php:237 msgid "This feature requires inline frames. You have iframes disabled or your browser does not support them." msgstr "Cette fonctionnalitÃ© requiert des iframes. Les iframes sont dÃ©sactivÃ©es sur votre navigateur, ou alors il ne les accepte pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:269 +msgid "This file is empty. Please try another." +msgstr "Le fichier est vide. Merci d’en essayer un autre." +||||||| .r11156 +#: wp-includes/post-template.php:1657 +msgctxt "post revision title extra" +msgid "%1$s [Current Revision]" +msgstr "%1$s [Version actuelle]" +======= #: wp-includes/script-loader.php:235 msgid "of" msgstr "sur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:270 +msgid "This file type is not allowed. Please try another." +msgstr "Ce type de fichier n’est pas autorisÃ©. Merci d’en essayer un autre." +||||||| .r11156 +#: wp-includes/script-loader.php:133 +msgid "Your session has expired. You can log in again from this page or go to the login page." +msgstr "Votre session a expirÃ©. Vous pouvez vous reconnecter depuis cette page ou aller Ã la page de connexion." +======= #: wp-includes/script-loader.php:234 msgid "Image" msgstr "Image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:274 +msgid "An error occurred in the upload. Please try again later." +msgstr "Une erreur est survenue lors de l’envoi. Veuillez rÃ©essayer plus tard." +||||||| .r11156 +#: wp-includes/script-loader.php:444 +msgid "%1$s %2$s, %3$s @ %4$s : %5$s" +msgstr "%2$s %1$s %3$s Ã %4$s h %5$s min" +======= #: wp-includes/script-loader.php:233 msgid "< Prev" msgstr "< PrÃ©c." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:276 +msgid "You may only upload 1 file." +msgstr "Vous pouvez seulement envoyer 1 fichier." +||||||| .r11156 +#: wp-login.php:827 +msgid "Session expired. Please log in again. You will not move away from this page." +msgstr "La session a expirÃ©. Veuillez vous reconnecter. Vous reviendrez sur cette page." +======= #: wp-includes/script-loader.php:232 msgid "Next >" msgstr "Suiv. >" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:277 +msgid "HTTP error." +msgstr "Erreur HTTP." +||||||| .r11156 +#: wp-signup.php:654 +msgid "Have you entered your email correctly? You have entered %s, if it’s incorrect, you will not receive your email." +msgstr "Avez-vous correctement saisi votre adresse de messagerie ? Vous aviez saisi %s, mais si ce n’est pas correct, vous ne recevrez pas de message." +======= #: wp-includes/script-loader.php:137 msgid "Your session has expired. You can log in again from this page or go to the login page." msgstr "Votre session a expirÃ©. Vous pouvez vous reconnecter depuis cette page ou aller Ã la page de connexion." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:278 +msgid "Upload failed." +msgstr "L’envoi a Ã©chouÃ©." +||||||| .r11156 +#: wp-signup.php:731 +msgid "The site you were looking for, %s, does not exist, but you can create it now!" +msgstr "Le site que vous cherchez (%s) n’existe pas, mais vous pouvez le crÃ©er dÃ¨s Ã prÃ©sent !" +======= #: wp-includes/script-loader.php:118 wp-includes/script-loader.php:265 msgid "Dismiss" msgstr "Fermer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:281 +msgid "IO error." +msgstr "Erreur I/O (EntrÃ©es-Sorties)." +||||||| .r11156 +#: wp-signup.php:733 +msgid "The site you were looking for, %s, does not exist." +msgstr "Le site que vous cherchez (%s) n’existe pas." +======= #: wp-includes/script-loader.php:113 wp-includes/script-loader.php:432 msgid "An unidentified error has occurred." msgstr "Une erreur non identifiÃ©e est survenue." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:282 +msgid "Security error." +msgstr "Erreur de sÃ©curitÃ©." +||||||| .r11156 +#: wp-includes/functions.php:4486 +msgid "The login page will open in a new window. After logging in you can close it and return to this page." +msgstr "La page de connexion s’ouvrira dans une nouvelle fenÃªtre. AprÃ¨s vous Ãªtre connectÃ©, vous pourrez la fermer et revenir Ã cette page." +======= #: wp-includes/script-loader.php:112 wp-includes/script-loader.php:431 msgid "You do not have permission to do that." msgstr "Vous n’avez pas l’autorisation d’effectuer cela." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:283 +msgid "File canceled." +msgstr "Fichier annulÃ©." +||||||| .r11156 +#: wp-includes/post-template.php:1701 +msgctxt "post revision title" +msgid "%1$s %2$s, %3$s ago (%4$s)" +msgstr "%1$s %2$s, il y a %3$s (%4$s)" +======= #: wp-includes/script-loader.php:100 msgid "Toggle Editor Text Direction" msgstr "Inverser la direction de l’Ã©diteur de texte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:284 +msgid "Upload stopped." +msgstr "L’envoi est stoppÃ©." +||||||| .r11156 +#: wp-includes/comment-template.php:1851 +msgid "%s says:" +msgstr "%s dit :" +======= #: wp-includes/script-loader.php:99 msgid "text direction" msgstr "direction du texte" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:286 +msgid "Crunching…" +msgstr "En cours de traitement…" +||||||| .r11156 +#: wp-includes/comment-template.php:1857 +msgctxt "1: date, 2: time" +msgid "%1$s at %2$s" +msgstr "%1$s Ã %2$s" +======= #: wp-includes/script-loader.php:98 msgid "Toggle fullscreen mode" msgstr "Mode plein Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:370 +msgctxt "password strength" +msgid "Medium" +msgstr "Moyenne" +||||||| .r11156 +#: wp-includes/general-template.php:237 +msgctxt "placeholder" +msgid "Search …" +msgstr "Recherche…" +======= #: wp-includes/script-loader.php:97 msgid "fullscreen" msgstr "plein Ã©cran" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:494 +msgid "Published on:" +msgstr "PubliÃ© le :" +||||||| .r11156 +#: wp-includes/general-template.php:236 wp-includes/general-template.php:237 +#: wp-includes/general-template.php:244 +msgctxt "label" +msgid "Search for:" +msgstr "Rechercher :" +======= #: wp-includes/script-loader.php:96 msgid "Enter a description of the image" msgstr "Saisissez une description pour l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:497 +msgid "Show more comments" +msgstr "Afficher plus de commentaires" +||||||| .r11156 +#: wp-includes/general-template.php:239 wp-includes/general-template.php:246 +msgctxt "submit button" +msgid "Search" +msgstr "Rechercher" +======= #: wp-includes/script-loader.php:95 msgid "Enter the URL of the image" msgstr "Saisissez l’adresse de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:498 +msgid "No more comments found." +msgstr "Il n’y a pas d’autres commentaires." +||||||| .r11156 +#: wp-includes/post-template.php:1691 +msgctxt "revision date format" +msgid "j F, Y @ G:i:s" +msgstr "j F Y \\Ã G \\h i \\m" +======= #: wp-includes/script-loader.php:94 msgid "Enter the URL" msgstr "Saisissez l’adresse" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:532 +msgid "Submitted on:" +msgstr "EnvoyÃ© le :" +||||||| .r11156 +#: wp-includes/functions.php:4484 +msgid "Session expired" +msgstr "La session a expirÃ©" +======= #: wp-includes/script-loader.php:93 msgid "close tags" msgstr "fermer les balises" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:545 wp-includes/script-loader.php:553 +msgid "Error while saving the changes." +msgstr "Erreur lors de la sauvegarde des modifications." +||||||| .r11156 +#: wp-includes/taxonomy.php:490 +msgid "No tags found." +msgstr "Aucun mot-clÃ© trouvÃ©." +======= #: wp-includes/script-loader.php:92 msgid "Close all open tags" msgstr "Fermer toutes les balises ouvertes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:558 +msgid "Plugin Information:" +msgstr "Informations sur l’extension :" +||||||| .r11156 +#: wp-includes/default-widgets.php:401 +msgctxt "meta widget link text" +msgid "WordPress.org" +msgstr "Site de WordPress-FR" +======= #: wp-includes/script-loader.php:83 msgid "Dismiss this notice." msgstr "Ne pas tenir compte de ce message." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:615 +msgid "Saving..." +msgstr "Enregistrement..." +||||||| .r11156 +#: wp-includes/functions.wp-scripts.php:166 +msgid "Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook." +msgstr "Ne dÃ©senregistrez pas le script %1$s de la zone d’administration. Pour cibler le thÃ¨me public, utilisez le crochet %2$s." +======= #: wp-includes/script-loader.php:82 msgid "" "You are about to permanently delete the selected items.\n" @@ -1508,31 +5140,106 @@ msgid "" msgstr "" "Vous Ãªtes sur le point de supprimer dÃ©finitivement les Ã©lÃ©ments sÃ©lectionnÃ©s.\n" " Â« Annuler Â» pour abandonner, Â« OK Â» pour les supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:511 +msgid "Saving Draft…" +msgstr "Enregistrement du brouillon…" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:362 +msgid "WordPress Address (URL)" +msgstr "Adresse web de WordPress (URL)" +======= #: wp-includes/revision.php:524 msgid "You do not have permission to preview drafts." msgstr "Vous n’avez pas l’autorisation de prÃ©visualiser les brouillons" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:99 +msgid "This site has not been activated yet. If you are having problems activating your site, please contact %1$s." +msgstr "Ce site n’a pas encore Ã©tÃ© activÃ©. Si vous rencontrez des problÃ¨mes durant l’activation de votre site, veuillez contacter %1$s." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:367 +msgid "Site Address (URL)" +msgstr "Adresse web du site (URL)" +======= #: wp-includes/revision.php:266 msgid "Cannot create a revision of a revision" msgstr "Impossible de crÃ©er une version d’une version." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: post title +#: wp-includes/pluggable.php:1459 +msgid "[%1$s] Pingback: \"%2$s\"" +msgstr "[%1$s] Ping : Â« %2$s Â»" +||||||| .r11156 +#: wp-includes/user.php:1900 +msgid "Invalid user ID." +msgstr "Identifiant utilisateur non valide." +======= #: wp-includes/revision.php:31 msgid "Excerpt" msgstr "Extrait" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1576 +msgid "A new trackback on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau rÃ©trolien sur l'article Â« %s Â» attend votre approbation" +||||||| .r11156 +#: wp-includes/media-template.php:732 +msgid "Random Order" +msgstr "Ordre alÃ©atoire" +======= #: wp-includes/revision.php:30 msgid "Content" msgstr "Contenu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1612 +msgid "[%1$s] Please moderate: \"%2$s\"" +msgstr "[%1$s] Demande de modÃ©ration pour Â« %2$s Â»" +||||||| .r11156 +#: wp-includes/media-template.php:463 +msgid "Caption this image…" +msgstr "DÃ©crivez cette image…" +======= #: wp-includes/registration-functions.php:7 wp-includes/registration.php:7 msgid "This file no longer needs to be included." msgstr "Ce fichier n’a plus besoin d’Ãªtre inclus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:82 +msgid "" +"You are about to permanently delete the selected items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement les Ã©lÃ©ments sÃ©lectionnÃ©s.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour les supprimer." +||||||| .r11156 +#: wp-includes/media.php:2915 +msgid "%d selected" +msgstr "%d sÃ©lection(s)" +======= #: wp-includes/query.php:2429 msgid "\"caller_get_posts\" is deprecated. Use \"ignore_sticky_posts\" instead." msgstr "« caller_get_posts » n’est plus recommandÃ©. Utilisez « ignore_sticky_posts » Ã la place." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/nav-menu.php:281 wp-includes/nav-menu.php:288 +msgid "The menu name %s conflicts with another menu name. Please try another." +msgstr "Un menu nommÃ© %s est en conflit avec un autre nom de menu. Veuillez rÃ©essayer avec un notre nom." +||||||| .r11156 +#: wp-includes/media.php:2955 +msgid "Insert from URL" +msgstr "InsÃ©rer Ã partir d’une adresse web" +======= #. translators: This is a comma-separated list of very common words that should #. be excluded from a search, like a, an, and the. These are usually called #. "stopwords". You should not simply translate these individual words into @@ -1542,15 +5249,46 @@ msgstr "« caller_get_posts » n’est plus recommandÃ©. msgctxt "Comma-separated list of search stopwords in your language" msgid "about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www" msgstr "le,la,les,de,des,un,uns,une,unes,et,a,Ã ,il,elle,on,ne,je,tu,nous,vous,ils,elles,son,sa,ses,que,quoi,se,qui,ce,cette,dans,en,du,au,aux,pour,pas,sur,y,ou,oÃ¹,si,ton,ta,te,mon,ma,tout,toute,tous,toutes,Ã§a,ni,www,com,fr,par,sur,par,dans,mais,vos,votre,vÃ´tre,c,d,j,,l,m,n,s,t,sans,toi,moi,lui,leur,leurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/nav-menu.php:348 +msgid "The given object ID is not that of a menu item." +msgstr "L’identifiant donnÃ© pour cet objet n’est pas une entrÃ©e de menu." +||||||| .r11156 +#: wp-includes/media.php:2958 +msgid "Set Featured Image" +msgstr "Mettre une image Ã la Une" +======= #: wp-includes/query.php:725 msgid "https://codex.wordpress.org/Function_Reference/is_main_query" msgstr "https://codex.wordpress.org/Function_Reference/is_main_query" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1462 +msgid "New comment on your post \"%s\"" +msgstr "Nouveau commentaire sur votre article Â« %s Â»" +||||||| .r11156 +#: wp-includes/default-widgets.php:197 +msgctxt "Links widget" +msgid "Random" +msgstr "AlÃ©atoire" +======= #: wp-includes/query.php:724 msgid "In %1$s, use the %2$s method, not the %3$s function. See %4$s." msgstr "Dans %1$s, utilisez la mÃ©thode %2$s, pas la fonction %3$s. Lisez %4$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1442 +msgid "New trackback on your post \"%s\"" +msgstr "Nouveau rÃ©trolien sur votre article Â« %s Â»" +||||||| .r11156 +#: wp-includes/media-template.php:1190 wp-includes/media.php:2932 +msgid "No items found." +msgstr "Aucun Ã©lÃ©ment trouvÃ©." +======= #: wp-includes/query.php:144 wp-includes/query.php:165 #: wp-includes/query.php:186 wp-includes/query.php:210 #: wp-includes/query.php:234 wp-includes/query.php:258 @@ -1566,234 +5304,819 @@ msgstr "Dans %1$s, utilisez la mÃ©thode %2$s, pas la f #: wp-includes/query.php:688 wp-includes/query.php:708 msgid "Conditional query tags do not work before the query is run. Before then, they always return false." msgstr "Les balises de requÃªte conditionnelle ne fonctionnent pas avant le lancement de la requÃªte. Avant cela, elles renvoient toujours le boolÃ©en false." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1452 +msgid "New pingback on your post \"%s\"" +msgstr "Nouveau ping sur votre article Â« %s Â»" +||||||| .r11156 +#: wp-includes/media.php:2968 +msgid "Add to Gallery" +msgstr "Ajouter Ã la galerie" +======= #: wp-includes/post.php:3892 wp-includes/script-loader.php:449 #: wp-includes/script-loader.php:510 msgctxt "tag delimiter" msgid "," msgstr ", " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1584 +msgid "A new pingback on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau ping sur l'article Â« %s Â» attend votre approbation" +||||||| .r11156 +#: wp-includes/media.php:2969 +msgid "Reverse order" +msgstr "Inverser l’ordre" +======= #: wp-includes/post.php:3460 msgid "The page template is invalid." msgstr "Le modÃ¨le de page est invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1592 +msgid "A new comment on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau commentaire sur l'article Â« %s Â» attend votre approbation" +||||||| .r11156 +#: wp-includes/media.php:2959 +msgid "Set featured image" +msgstr "Mettre une image Ã la Une" +======= #: wp-includes/post.php:3396 msgid "Could not insert post into the database" msgstr "Impossible d’insÃ©rer l’article dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:136 +msgid "Pending (%s)" +msgid_plural "Pending (%s)" +msgstr[0] "En attente de relecture (%s)" +msgstr[1] "En attente de relecture (%s)" +||||||| .r11156 +#: wp-includes/media-template.php:456 +msgid "Deselect" +msgstr "DÃ©sÃ©lectionner" +======= #: wp-includes/post.php:3381 msgid "Could not update post in the database" msgstr "Impossible de mettre Ã jour l’article dans la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1647 +msgctxt "post type general name" +msgid "Posts" +msgstr "Articles" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4156 +#: wp-includes/class-wp-xmlrpc-server.php:4166 +msgid "Sorry, that file cannot be edited." +msgstr "DÃ©solÃ©, ce fichier ne peut pas Ãªtre modifiÃ©." +======= #: wp-includes/post.php:3237 msgid "Whoops, the provided date is invalid." msgstr "Oups, la date fournie n’est pas valable." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1647 +msgctxt "post type general name" +msgid "Pages" +msgstr "Pages" +||||||| .r11156 +#: wp-includes/media.php:2937 +msgid "" +"You are about to permanently delete this item.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement cet Ã©lÃ©ment.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +======= #: wp-includes/post.php:3169 msgid "Content, title, and excerpt are empty." msgstr "Le contenu de l’article, le titre et l’extrait sont vides." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1648 +msgctxt "post type singular name" +msgid "Post" +msgstr "Article" +||||||| .r11156 +#: wp-includes/media-template.php:421 wp-includes/media-template.php:524 +#: wp-includes/media.php:2945 +msgid "Delete Permanently" +msgstr "Supprimer dÃ©finitivement" +======= #: wp-includes/post.php:3012 msgid "Passing an integer number of posts is deprecated. Pass an array of arguments instead." msgstr "Il n’est pas recommandÃ© de passer un nombre entier d’articles ; il est prÃ©fÃ©rable de passer un tableau d’arguments." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1648 +msgctxt "post type singular name" +msgid "Page" +msgstr "Page" +||||||| .r11156 +#: wp-includes/media-template.php:181 +msgid "Upload Limit Exceeded" +msgstr "Limite de mise en ligne dÃ©passÃ©e" +======= #: wp-includes/post.php:2449 msgid "Video (%s)" msgid_plural "Video (%s)" msgstr[0] "VidÃ©o (%s)" msgstr[1] "VidÃ©os (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1650 +msgid "Add New Page" +msgstr "Ajouter une nouvelle page" +||||||| .r11156 +#: wp-includes/media-template.php:246 +msgid "Dismiss Errors" +msgstr "Ignorer les erreurs" +======= #: wp-includes/post.php:2449 msgid "Manage Video" msgstr "GÃ©rer les vidÃ©os" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1651 +msgid "Edit Page" +msgstr "Modifier la page" +||||||| .r11156 +#: wp-includes/media-template.php:260 +msgid "Error" +msgstr "Erreur " +======= #: wp-includes/post.php:2449 msgid "Video" msgstr "VidÃ©os" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1657 +msgid "Parent Page:" +msgstr "Page parente :" +||||||| .r11156 +#: wp-includes/media.php:2458 +msgid "No editor could be selected." +msgstr "Aucun Ã©diteur n’a pas pu Ãªtre sÃ©lectionnÃ©." +======= #: wp-includes/post.php:2448 msgid "Audio (%s)" msgid_plural "Audio (%s)" msgstr[0] "Son (%s)" msgstr[1] "Sons (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:616 +msgid "Could not set that as the thumbnail image. Try a different attachment." +msgstr "Impossible de s’en servir comme miniature. Essayez un autre fichier attachÃ©." +||||||| .r11156 +#: wp-includes/media-template.php:245 +msgid "Uploading" +msgstr "Mise en ligne" +======= #: wp-includes/post.php:2448 msgid "Manage Audio" msgstr "GÃ©rer l’audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:82 +msgid "Navigation Menus" +msgstr "Menus de navigation" +||||||| .r11156 +#: wp-includes/post.php:2434 +msgid "Manage Images" +msgstr "GÃ©rer les images" +======= #: wp-includes/post.php:2448 msgid "Audio" msgstr "Sons" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:497 +msgctxt "taxonomy general name" +msgid "Categories" +msgstr "CatÃ©gories" +||||||| .r11156 +#: wp-includes/post.php:2434 +msgid "Image (%s)" +msgid_plural "Images (%s)" +msgstr[0] "Image (%s)" +msgstr[1] "Images (%s)" +======= #: wp-includes/post.php:2447 msgid "Image (%s)" msgid_plural "Images (%s)" msgstr[0] "Image (%s)" msgstr[1] "Images (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:498 +msgctxt "taxonomy singular name" +msgid "Category" +msgstr "CatÃ©gorie" +||||||| .r11156 +#: wp-includes/post.php:2435 +msgid "Manage Audio" +msgstr "GÃ©rer l’audio" +======= #: wp-includes/post.php:2447 msgid "Manage Images" msgstr "GÃ©rer les images" +>>>>>>> .r12027 -#: wp-includes/post.php:2447 -msgid "Images" -msgstr "Images" +<<<<<<< .mine +#: wp-includes/taxonomy.php:502 +msgid "Parent Category" +msgstr "CatÃ©gorie parente" +||||||| .r11156 +#: wp-includes/post.php:2435 +msgid "Audio (%s)" +msgid_plural "Audio (%s)" +msgstr[0] "Son (%s)" +msgstr[1] "Sons (%s)" +======= +#: wp-includes/post.php:2447 +msgid "Images" +msgstr "Images" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:503 +msgid "Parent Category:" +msgstr "CatÃ©gorie parente :" +||||||| .r11156 +#: wp-includes/post.php:2436 +msgid "Video" +msgstr "VidÃ©os" +======= #: wp-includes/post.php:1642 msgid "All Pages" msgstr "Toutes les pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:508 +msgid "New Category Name" +msgstr "Nom de la nouvelle catÃ©gorie" +||||||| .r11156 +#: wp-includes/post.php:2436 +msgid "Manage Video" +msgstr "GÃ©rer les vidÃ©os" +======= #: wp-includes/post.php:1642 msgid "All Posts" msgstr "Tous les articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:693 +msgid "That site is currently reserved but may be available in a couple days." +msgstr "Ce site est rÃ©servÃ© pour le moment, mais pourrait Ãªtre disponible dans quelques jours." +||||||| .r11156 +#: wp-includes/post.php:2436 +msgid "Video (%s)" +msgid_plural "Video (%s)" +msgstr[0] "VidÃ©o (%s)" +msgstr[1] "VidÃ©os (%s)" +======= #: wp-includes/post.php:1641 msgid "Parent Page:" msgstr "Page parente :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1006 +msgid "The site is already active." +msgstr "Ce site est dÃ©jÃ activÃ©." +||||||| .r11156 +#: wp-includes/media.php:2933 +msgid "Insert into page" +msgstr "InsÃ©rer dans la page" +======= #: wp-includes/post.php:1640 msgid "No pages found in Trash." msgstr "Aucune page trouvÃ©e dans la corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1158 +msgid "Could not create site." +msgstr "Impossible de crÃ©er le site." +||||||| .r11156 +#: wp-includes/media.php:2936 +msgid "Uploaded to this page" +msgstr "Mis en ligne sur cette page" +======= #: wp-includes/post.php:1640 msgid "No posts found in Trash." msgstr "Aucun article trouvÃ© dans la corbeille." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1910 +msgid "This file is too big. Files must be less than %d KB in size." +msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %d Ko." +||||||| .r11156 +#: wp-includes/media.php:2929 +msgid "All media items" +msgstr "Tous les Ã©lÃ©ments mÃ©dia" +======= #: wp-includes/post.php:1639 msgid "No pages found." msgstr "Aucune page trouvÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1991 +msgid "An error occurred adding you to this site. Back to the homepage." +msgstr "Une erreur est survenue lors de votre ajout Ã ce site. Retournez Ã l’accueil." +||||||| .r11156 +#: wp-includes/media.php:2936 +msgid "Uploaded to this post" +msgstr "Mis en ligne sur cet article" +======= #: wp-includes/post.php:1639 msgid "No posts found." msgstr "Aucun article trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:106 +msgid "This site has been archived or suspended." +msgstr "Ce site a Ã©tÃ© archivÃ© ou suspendu." +||||||| .r11156 +#: wp-includes/post.php:2435 +msgid "Audio" +msgstr "Sons" +======= #: wp-includes/post.php:1638 msgid "Search Pages" msgstr "Chercher dans les pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:434 +msgid "If you’re still stuck with this message, then check that your database contains the following tables:" +msgstr "Si vous Ãªtes toujours bloquÃ© par ce message, vÃ©rifiez alors que votre base de donnÃ©es contient bien les tables suivantes :" +||||||| .r11156 +#: wp-includes/media.php:2928 +msgid "← Return to library" +msgstr "← Revenir Ã la bibliothÃ¨que" +======= #: wp-includes/post.php:1638 msgid "Search Posts" msgstr "Chercher dans les articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:559 +msgid "Are you sure you want to install this plugin?" +msgstr "Voulez-vous vraiment installer cette extension ?" +||||||| .r11156 +#: wp-includes/media-template.php:650 wp-includes/media-template.php:825 +#: wp-includes/media-template.php:938 +msgid "Custom URL" +msgstr "Lien personnalisÃ©" +======= #: wp-includes/post.php:1637 msgid "View Page" msgstr "Voir la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:95 +msgid "Link Categories" +msgstr "CatÃ©gories de liens" +||||||| .r11156 +#: wp-includes/media-template.php:479 wp-includes/media.php:2952 +msgid "Attachment Details" +msgstr "DÃ©tails du fichier attachÃ©" +======= #: wp-includes/post.php:1637 msgid "View Post" msgstr "Afficher l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:96 +msgid "Link Category" +msgstr "CatÃ©gorie de liens" +||||||| .r11156 +#: wp-includes/media-template.php:385 wp-includes/media-template.php:562 +#: wp-includes/media-template.php:796 +msgid "Alt Text" +msgstr "Texte alternatif" +======= #: wp-includes/post.php:1636 msgid "New Page" msgstr "Nouvelle page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:99 +msgid "All Link Categories" +msgstr "Toutes les catÃ©gories de liens" +||||||| .r11156 +#: wp-includes/media-template.php:718 +msgid "Columns" +msgstr "Colonnes" +======= #: wp-includes/post.php:1635 msgid "Edit Page" msgstr "Modifier la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:101 +msgid "Update Link Category" +msgstr "Mettre Ã jour la catÃ©gorie de liens" +||||||| .r11156 +#: wp-includes/media.php:2916 +msgid "Drag and drop to reorder images." +msgstr "Glissez/dÃ©posez pour rÃ©organiser les images." +======= #: wp-includes/post.php:1635 msgid "Edit Post" msgstr "Modifier l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:102 +msgid "Add New Link Category" +msgstr "Ajouter une catÃ©gorie de liens" +||||||| .r11156 +#: wp-includes/media-template.php:674 wp-includes/media-template.php:898 +#: wp-includes/media.php:2676 +msgid "Large" +msgstr "Grande" +======= #: wp-includes/post.php:1634 msgid "Add New Page" msgstr "Ajouter une nouvelle page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:103 +msgid "New Link Category Name" +msgstr "Nom de la nouvelle catÃ©gorie de liens" +||||||| .r11156 +#: wp-includes/media-template.php:586 +msgid "Attachment Display Settings" +msgstr "RÃ©glages de l’affichage du fichier attachÃ©" +======= #: wp-includes/post.php:1634 msgid "Add New Post" msgstr "Ajouter un nouvel article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:507 +msgid "Add New Category" +msgstr "Ajouter une nouvelle catÃ©gorie" +||||||| .r11156 +#: wp-includes/media-template.php:693 +msgid "Gallery Settings" +msgstr "RÃ©glages de la galerie" +======= #: wp-includes/post.php:1633 msgctxt "page" msgid "Add New" msgstr "Ajouter" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/query.php:145 wp-includes/query.php:166 +#: wp-includes/query.php:187 wp-includes/query.php:211 +#: wp-includes/query.php:235 wp-includes/query.php:259 +#: wp-includes/query.php:288 wp-includes/query.php:308 +#: wp-includes/query.php:328 wp-includes/query.php:348 +#: wp-includes/query.php:369 wp-includes/query.php:389 +#: wp-includes/query.php:418 wp-includes/query.php:447 +#: wp-includes/query.php:467 wp-includes/query.php:494 +#: wp-includes/query.php:514 wp-includes/query.php:534 +#: wp-includes/query.php:554 wp-includes/query.php:574 +#: wp-includes/query.php:603 wp-includes/query.php:630 +#: wp-includes/query.php:650 wp-includes/query.php:670 +#: wp-includes/query.php:690 wp-includes/query.php:710 +msgid "Conditional query tags do not work before the query is run. Before then, they always return false." +msgstr "Les balises de requÃªte conditionnelle ne fonctionnent pas avant le lancement de la requÃªte. Avant cela, elles renvoient toujours le boolÃ©en false." +||||||| .r11156 +#: wp-includes/media.php:2920 +msgid "Upload Images" +msgstr "Envoyer des images" +======= #: wp-includes/post.php:1633 msgctxt "post" msgid "Add New" msgstr "Ajouter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/plugin.php:810 +msgid "Only a static class method or function can be used in an uninstall hook." +msgstr "Seule une mÃ©thode statique de classe ou une fonction peut Ãªtre utilisÃ©e avec un crochet de dÃ©sinstallation." +||||||| .r11156 +#: wp-includes/media.php:2964 +msgid "← Cancel Gallery" +msgstr "← Annuler la galerie" +======= #: wp-includes/post.php:1632 msgctxt "post type singular name" msgid "Page" msgstr "Page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1655 +msgid "No pages found." +msgstr "Aucune page trouvÃ©e." +||||||| .r11156 +#: wp-includes/ms-functions.php:1967 +msgid "WordPress › Success" +msgstr "WordPress » RÃ©ussite" +======= #: wp-includes/post.php:1632 msgctxt "post type singular name" msgid "Post" msgstr "Article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1656 +msgid "No posts found in Trash." +msgstr "Aucun article trouvÃ© dans la corbeille." +||||||| .r11156 +#: wp-includes/media-template.php:188 +msgid "Drop files anywhere to upload" +msgstr "DÃ©posez vos fichiers n’importe oÃ¹ pour les mettre en ligne" +======= #: wp-includes/post.php:1631 msgctxt "post type general name" msgid "Pages" msgstr "Pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1656 +msgid "No pages found in Trash." +msgstr "Aucune page trouvÃ©e dans la corbeille." +||||||| .r11156 +#: wp-includes/media.php:2919 +msgid "Upload Files" +msgstr "Envoyer des fichiers" +======= #: wp-includes/post.php:1631 msgctxt "post type general name" msgid "Posts" msgstr "Articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3045 +msgid "Passing an integer number of posts is deprecated. Pass an array of arguments instead." +msgstr "Il n’est pas recommandÃ© de passer un nombre entier d’articles ; il est prÃ©fÃ©rable de passer un tableau d’arguments." +||||||| .r11156 +#: wp-includes/media.php:2965 +msgid "Insert gallery" +msgstr "InsÃ©rer la galerie" +======= #: wp-includes/post.php:1346 wp-includes/post.php:1347 msgid "Post type names must be between 1 and 20 characters in length." msgstr "Le nom d'un type d'article doit contenir entre 1 et 20 caractÃ¨res." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:90 +msgctxt "Post format" +msgid "Standard" +msgstr "Par dÃ©faut" +||||||| .r11156 +#: wp-includes/media-template.php:159 wp-includes/media-template.php:165 +msgid "Drop files to upload" +msgstr "DÃ©posez vos fichiers pour les mettre en ligne" +======= #: wp-includes/post.php:917 wp-includes/post.php:937 #: wp-includes/script-loader.php:473 msgid "Published" msgstr "PubliÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:91 +msgctxt "Post format" +msgid "Aside" +msgstr "En passant" +||||||| .r11156 +#: wp-includes/media.php:2923 +msgid "Media Library" +msgstr "BibliothÃ¨que de mÃ©dias" +======= #: wp-includes/post.php:916 wp-includes/post.php:936 #: wp-includes/script-loader.php:468 msgid "Private" msgstr "PrivÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:93 +msgctxt "Post format" +msgid "Gallery" +msgstr "Galerie" +||||||| .r11156 +#: wp-includes/media.php:2962 +msgid "Create Gallery" +msgstr "CrÃ©er une galerie" +======= #: wp-includes/post.php:915 msgid "Pending Review" msgstr "En attente de relecture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:94 +msgctxt "Post format" +msgid "Link" +msgstr "Lien" +||||||| .r11156 +#: wp-includes/ms-functions.php:943 +msgid "" +"To activate your user, please click the following link:\n" +"\n" +"%s\n" +"\n" +"After you activate, you will receive *another email* with your login." +msgstr "" +"Pour activer votre utilisateur, veuillez cliquer sur le lien suivant :\n" +"\n" +"%s\n" +"\n" +"AprÃ¨s l'activation, vous recevrez *un autre courrier* contenant votre identifiant." +======= #: wp-includes/post.php:914 wp-includes/post.php:935 msgid "Draft" msgstr "Brouillon" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:95 +msgctxt "Post format" +msgid "Image" +msgstr "Image" +||||||| .r11156 +#: wp-includes/ms-functions.php:1373 +msgid "Already Installed" +msgstr "DÃ©jÃ installÃ©" +======= #: wp-includes/post.php:150 msgid "Trash (%s)" msgid_plural "Trash (%s)" msgstr[0] "Corbeille (%s)" msgstr[1] "Corbeille (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:96 +msgctxt "Post format" +msgid "Quote" +msgstr "Citation" +||||||| .r11156 +#: wp-includes/ms-functions.php:1373 +msgid "You appear to have already installed WordPress. To reinstall please clear your old database tables first." +msgstr "Il semblerait que WordPress soit dÃ©jÃ installÃ©. Pour le rÃ©installer, commencez par supprimer vos anciennes tables de la base de donnÃ©es." +======= #: wp-includes/post.php:147 msgctxt "post" msgid "Trash" msgstr "Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:97 +msgctxt "Post format" +msgid "Status" +msgstr "Ãtat" +||||||| .r11156 +#: wp-includes/taxonomy.php:350 wp-includes/taxonomy.php:351 +msgid "Taxonomies cannot exceed 32 characters in length" +msgstr "Les taxinomies ne peuvent dÃ©passer les 32 caractÃ¨res." +======= #: wp-includes/post.php:143 msgid "Private (%s)" msgid_plural "Private (%s)" msgstr[0] "PrivÃ© (%s)" msgstr[1] "PrivÃ©s (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:98 +msgctxt "Post format" +msgid "Video" +msgstr "VidÃ©o" +||||||| .r11156 +#: wp-includes/ms-functions.php:1225 +msgid "" +"New Site: %1$s\n" +"URL: %2$s\n" +"Remote IP: %3$s\n" +"\n" +"Disable these notifications: %4$s" +msgstr "" +"Nouveau site : %1$s\n" +"URL : %2$s\n" +"Adresse IP : %3$s\n" +"\n" +"DÃ©sactiver ces notifications : %4$s" +======= #: wp-includes/post.php:140 msgctxt "post" msgid "Private" msgstr "PrivÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:99 +msgctxt "Post format" +msgid "Audio" +msgstr "Son" +||||||| .r11156 +#: wp-includes/ms-functions.php:1268 +msgid "" +"New User: %1$s\n" +"Remote IP: %2$s\n" +"\n" +"Disable these notifications: %3$s" +msgstr "" +"Nouvel utilisateur : %1$s\n" +"Adresse IP : %2$s\n" +"\n" +"DÃ©sactiver ces notifications : %3$s" +======= #: wp-includes/post.php:136 msgid "Pending (%s)" msgid_plural "Pending (%s)" msgstr[0] "En attente de relecture (%s)" msgstr[1] "En attente de relecture (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1004 +msgid "The user is already active." +msgstr "Cet utilisateur est dÃ©jÃ activÃ©." +||||||| .r11156 +#: wp-includes/media-template.php:618 wp-includes/media-template.php:696 +#: wp-includes/media-template.php:819 wp-includes/media-template.php:923 +msgid "Link To" +msgstr "Lier Ã " +======= #: wp-includes/post.php:133 msgctxt "post" msgid "Pending" msgstr "En attente" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:433 +msgid "Collapse Sidebar" +msgstr "RÃ©duire la colonne latÃ©rale" +||||||| .r11156 +#: wp-includes/media-template.php:645 wp-includes/media-template.php:706 +#: wp-includes/media-template.php:930 +msgid "Attachment Page" +msgstr "Page du fichier attachÃ©" +======= #: wp-includes/post.php:129 msgid "Draft (%s)" msgid_plural "Drafts (%s)" msgstr[0] "Brouillon (%s)" msgstr[1] "Brouillons (%s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:436 +msgid "Allowed Files" +msgstr "Fichiers autorisÃ©s" +||||||| .r11156 +#: wp-includes/media-template.php:638 wp-includes/media-template.php:709 +#: wp-includes/media-template.php:927 +msgid "Media File" +msgstr "Fichier mÃ©dia" +======= #: wp-includes/post.php:126 msgctxt "post" msgid "Draft" @@ -1854,381 +6177,1365 @@ msgstr "CrÃ©er" msgctxt "add new from admin bar" msgid "Media" msgstr "Fichier mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:884 wp-includes/ms-functions.php:969 +msgid "[%1$s] Activate %2$s" +msgstr "[%1s] Activation de %2s" +||||||| .r11156 +#: wp-includes/media-template.php:467 +msgid "Describe this video…" +msgstr "DÃ©crivez cette vidÃ©o…" +======= #: wp-includes/post.php:55 msgctxt "post type general name" msgid "Media" msgstr "Fichier mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1478 wp-includes/pluggable.php:1603 +msgid "Trash it: %s" +msgstr "Le mettre dans la Corbeille : %s" +||||||| .r11156 +#: wp-includes/media-template.php:469 +msgid "Describe this audio file…" +msgstr "DÃ©crivez ce fichier audio…" +======= #: wp-includes/post.php:38 msgctxt "add new on admin bar" msgid "Page" msgstr "Page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:100 +msgid "Navigation Menu Items" +msgstr "ÃlÃ©ments de menu de navigation" +||||||| .r11156 +#: wp-includes/media-template.php:471 +msgid "Describe this media file…" +msgstr "DÃ©crivez ce fichier mÃ©dia…" +======= #: wp-includes/post.php:22 msgctxt "add new on admin bar" msgid "Post" msgstr "Article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:101 +msgid "Navigation Menu Item" +msgstr "ÃlÃ©ment de menu de navigation" +||||||| .r11156 +#: wp-includes/media.php:2966 +msgid "Update gallery" +msgstr "Mettre Ã jour la galerie" +======= #: wp-includes/post-template.php:1826 msgid "JavaScript must be enabled to use this feature." msgstr "JavaScript doit Ãªtre activÃ© pour utiliser cette fonctionnalitÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1650 +msgid "Add New Post" +msgstr "Ajouter un nouvel article" +||||||| .r11156 +#: wp-includes/ms-functions.php:186 +msgid "The requested user does not exist." +msgstr "Cet utilisateur n’existe pas." +======= #: wp-includes/post-template.php:1779 msgid "%1$s [Current Revision]" msgstr "%1$s [Version actuelle]" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1658 +msgid "All Posts" +msgstr "Tous les articles" +||||||| .r11156 +#: wp-includes/ms-functions.php:506 +msgid "Please enter a valid email address." +msgstr "Veuillez saisir une adresse de messagerie valide." +======= #: wp-includes/post-template.php:1778 msgid "%1$s [Autosave]" msgstr "%1$s [Sauvegarde automatique]" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1658 +msgid "All Pages" +msgstr "Toutes les pages" +||||||| .r11156 +#: wp-includes/user.php:2129 +msgid "ERROR: This username is already registered. Please choose another one." +msgstr "ERREUR : cet identifiant existe dÃ©jÃ . Merci d’en choisir un autre." +======= #. translators: post revision title: 1: author avatar, 2: author name, 3: time #. ago, 4: date #: wp-includes/post-template.php:1771 msgctxt "post revision title" msgid "%1$s %2$s, %3$s ago (%4$s)" msgstr "%1$s %2$s, il y a %3$s (%4$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3961 wp-includes/script-loader.php:485 +#: wp-includes/script-loader.php:548 +msgctxt "tag delimiter" +msgid "," +msgstr ", " +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:87 +#: wp-includes/class-wp-image-editor-imagick.php:120 +msgid "File doesn’t exist?" +msgstr "Le fichier n’existe pas ?" +======= #. translators: 1: date #: wp-includes/post-template.php:1729 msgctxt "post revision title extra" msgid "%1$s [Current Revision]" msgstr "%1$s [Version actuelle]" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/registration-functions.php:7 wp-includes/registration.php:7 +msgid "This file no longer needs to be included." +msgstr "Ce fichier n’a plus besoin d’Ãªtre inclus." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:103 +#: wp-includes/class-wp-image-editor-imagick.php:130 +msgid "File is not an image." +msgstr "Le fichier n’est pas une image." +======= #. translators: 1: date #: wp-includes/post-template.php:1727 msgctxt "post revision title extra" msgid "%1$s [Autosave]" msgstr "%1$s [Sauvegarde automatique]" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:97 +msgid "text direction" +msgstr "direction du texte" +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:107 +msgid "Could not read image size." +msgstr "Impossible de lire la taille de l’image." +======= #. translators: revision date format, see http:php.net/date #: wp-includes/post-template.php:1725 wp-includes/post-template.php:1761 msgctxt "revision date format" msgid "F j, Y @ H:i:s" msgstr "j F Y Ã G \\h i \\m\\i\\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:138 wp-includes/script-loader.php:285 +msgid "Dismiss" +msgstr "Fermer" +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:169 +#: wp-includes/class-wp-image-editor-gd.php:187 +msgid "Image resize failed." +msgstr "Le redimensionnement de l’image a Ã©chouÃ©." +======= #: wp-includes/post-template.php:1633 msgid "Submit" msgstr "Envoyer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:268 +msgid "%s exceeds the maximum upload size for this site." +msgstr "%s dÃ©passe la limite d’envoi de ce site." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:293 +msgid "Image crop failed." +msgstr "Le recadrage de l’image a Ã©chouÃ©." +======= #: wp-includes/post-template.php:1632 msgid "This content is password protected. To view it please enter your password below:" msgstr "Cet article est protÃ©gÃ© par un mot de passe. Pour le lire, veuillez saisir votre mot de passe ci-dessous :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:271 +msgid "This file is not an image. Please try another." +msgstr "Ce fichier n’est pas une image. Merci d’en envoyer un autre." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:317 +msgid "Image rotate failed." +msgstr "La rotation de l’image a Ã©chouÃ©." +======= #: wp-includes/post-template.php:1199 msgid "Home" msgstr "Accueil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:272 +msgid "Memory exceeded. Please try another smaller file." +msgstr "MÃ©moire dÃ©passÃ©e. Veuillez rÃ©essayer avec un fichier plus petit." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:347 +msgid "Image flip failed." +msgstr "Le retournement de l’image a Ã©chouÃ©." +======= #: wp-includes/post-template.php:793 msgid "Previous page" msgstr "Page prÃ©cÃ©dente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:273 +msgid "This is larger than the maximum size. Please try another." +msgstr "Ce fichier est plus grand que la taille maximale. Merci d’en envoyer un autre." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:379 +#: wp-includes/class-wp-image-editor-gd.php:387 +#: wp-includes/class-wp-image-editor-gd.php:391 +#: wp-includes/class-wp-image-editor-gd.php:394 +msgid "Image Editor Save Failed" +msgstr "L’enregistrement de l’Ã©diteur d’images a Ã©chouÃ©." +======= #: wp-includes/post-template.php:792 msgid "Next page" msgstr "Page suivante" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:279 +msgid "Please try uploading this file with the %1$sbrowser uploader%2$s." +msgstr "Veuillez essayer de mettre ce fichier en ligne Ã l’aide de l’%1$soutil du navigateur%2$s." +||||||| .r11156 +#: wp-includes/post.php:55 +msgctxt "post type general name" +msgid "Media" +msgstr "MÃ©dias" +======= #: wp-includes/post-template.php:786 msgid "Pages:" msgstr "Pages :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:280 +msgid "%s exceeds the maximum upload size for the multi-file uploader when used in your browser." +msgstr "%s dÃ©passe la limite d’envoi pour l’outil de mise ne ligne multiple utilisÃ© avec votre navigateur." +||||||| .r11156 +#: wp-includes/post.php:57 +msgctxt "add new media" +msgid "Add New" +msgstr "Ajouter" +======= #: wp-includes/post-template.php:357 msgid "There is no excerpt because this is a protected post." msgstr "Il n’y pas d’extrait, car cet article est protÃ©gÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:288 +msgid "“%s” has failed to upload." +msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne." +||||||| .r11156 +#: wp-includes/post.php:59 +msgid "View Attachment Page" +msgstr "Afficher la page du fichier attachÃ©" +======= #: wp-includes/post-template.php:250 msgid "(more…)" msgstr "(suite…)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:474 +msgid "Approve and Reply" +msgstr "Approuver et rÃ©pondre" +||||||| .r11156 +#: wp-includes/post.php:3210 +msgid "Whoops, the provided date is invalid." +msgstr "Oups, la date fournie n’est pas valable." +======= #: wp-includes/post-template.php:145 msgid "Private: %s" msgstr "PrivÃ© : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:492 +msgid "Publish on:" +msgstr "PubliÃ© le :" +||||||| .r11156 +#: wp-includes/media.php:2924 +msgid "Insert Media" +msgstr "InsÃ©rer un mÃ©dia" +======= #: wp-includes/post-template.php:130 msgid "Protected: %s" msgstr "ProtÃ©gÃ© : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:493 +msgid "Schedule for:" +msgstr "Planifier pour :" +||||||| .r11156 +#: wp-includes/media.php:2925 +msgid "Create a new gallery" +msgstr "CrÃ©er une nouvelle galerie" +======= #: wp-includes/post-formats.php:99 msgctxt "Post format" msgid "Audio" msgstr "Son" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:546 +msgid "Remove From Bulk Edit" +msgstr "Enlever des modifications groupÃ©es" +||||||| .r11156 +#: wp-includes/media.php:2933 +msgid "Insert into post" +msgstr "InsÃ©rer dans l’article" +======= #: wp-includes/post-formats.php:98 msgctxt "Post format" msgid "Video" msgstr "VidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:125 wp-includes/taxonomy.php:126 +msgctxt "post format" +msgid "Format" +msgstr "Format" +||||||| .r11156 +#: wp-includes/media.php:2967 +msgid "Add to gallery" +msgstr "Ajouter Ã la galerie" +======= #: wp-includes/post-formats.php:97 msgctxt "Post format" msgid "Status" msgstr "Ãtat" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:505 +msgid "View Category" +msgstr "Afficher la catÃ©gorie" +||||||| .r11156 +#: wp-includes/media-template.php:579 wp-includes/script-loader.php:505 +msgid "Clear" +msgstr "Effacer" +======= #: wp-includes/post-formats.php:96 msgctxt "Post format" msgid "Quote" msgstr "Citation" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/pluggable.php:1465 wp-includes/pluggable.php:1595 +#: wp-includes/pluggable.php:1717 +msgid "E-mail: %s" +msgstr "E-mail : %s" + +#: wp-includes/script-loader.php:424 +msgid "Save & Activate" +msgstr "Enregistrer & activer" + +#: wp-includes/script-loader.php:425 +msgid "Save & Publish" +msgstr "Enregistrer & publier" + +#: wp-includes/ms-functions.php:1993 +msgid "You have been added to this site. Please visit the homepage or log in using your username and password." +msgstr "Vous avez Ã©tÃ© ajoutÃ© Ã ce site. Vous pouvez vous rendre sur sa page d’accueil ou vous connecter Ã l’aide de votre identifiant et mot de passe." + +#: wp-includes/pluggable.php:1089 +msgid "You should specify a nonce action to be verified by using the first parameter." +msgstr "Vous devriez prÃ©ciser une action de type « nonce », qui sera vÃ©rifiÃ©e par le premier paramÃ¨tre." +#: wp-includes/post.php:59 +msgid "View Attachment Page" +msgstr "Afficher la page du fichier attachÃ©" + +#: wp-includes/query.php:2435 +msgid "\"caller_get_posts\" is deprecated. Use \"ignore_sticky_posts\" instead." +msgstr "« caller_get_posts » n’est plus recommandÃ©. Utilisez « ignore_sticky_posts » Ã la place." + +#: wp-includes/script-loader.php:98 +msgid "Toggle Editor Text Direction" +msgstr "Inverser la direction de l’Ã©diteur de texte" + +#: wp-includes/script-loader.php:593 +msgid "Select Color" +msgstr "SÃ©lectionner une couleur" +||||||| .r11156 +#: wp-includes/script-loader.php:507 +msgid "Select Color" +msgstr "SÃ©lectionner une couleur" +======= #: wp-includes/post-formats.php:95 msgctxt "Post format" msgid "Image" msgstr "Image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:594 +msgid "Current Color" +msgstr "Couleur actuelle" +||||||| .r11156 +#: wp-includes/script-loader.php:508 +msgid "Current Color" +msgstr "Couleur actuelle" +======= #: wp-includes/post-formats.php:94 msgctxt "Post format" msgid "Link" msgstr "Lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:860 +msgid "" +"To activate your blog, please click the following link:\n" +"\n" +"%s\n" +"\n" +"After you activate, you will receive *another email* with your login.\n" +"\n" +"After you activate, you can visit your site here:\n" +"\n" +"%s" +msgstr "" +"Pour activer votre site, veuillez cliquer sur le lien suivant :\n" +"\n" +"%s\n" +"\n" +"AprÃ¨s l'activation, vous recevrez *un autre courrier* contenant votre identifiant.\n" +"\n" +"Vous pourrez alors vous rendre sur votre site ici :\n" +"\n" +"%s" +||||||| .r11156 +#: wp-includes/taxonomy.php:2708 +msgid "Could not insert term relationship into the database" +msgstr "Impossible d’insÃ©rer la relation du terme dans la base de donnÃ©es" +======= #: wp-includes/post-formats.php:93 msgctxt "Post format" msgid "Gallery" msgstr "Galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:950 +msgid "" +"To activate your user, please click the following link:\n" +"\n" +"%s\n" +"\n" +"After you activate, you will receive *another email* with your login." +msgstr "" +"Pour activer votre utilisateur, veuillez cliquer sur le lien suivant :\n" +"\n" +"%s\n" +"\n" +"AprÃ¨s l'activation, vous recevrez *un autre courrier* contenant votre identifiant." +||||||| .r11156 +#: wp-includes/user.php:1760 +msgctxt "Display name based on first name and last name" +msgid "%1$s %2$s" +msgstr "%1$s %2$s" +======= #: wp-includes/post-formats.php:92 msgctxt "Post format" msgid "Chat" msgstr "Discussion" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1265 +msgid "" +"New User: %1$s\n" +"Remote IP: %2$s\n" +"\n" +"Disable these notifications: %3$s" +msgstr "" +"Nouvel utilisateur : %1$s\n" +"Adresse IP : %2$s\n" +"\n" +"DÃ©sactiver ces notifications : %3$s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:226 +msgid "Incorrect username or password." +msgstr "Identifiant ou mot de passe incorrect." +======= #: wp-includes/post-formats.php:91 msgctxt "Post format" msgid "Aside" msgstr "En passant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1375 +msgid "Already Installed" +msgstr "DÃ©jÃ installÃ©" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:219 +msgid "XML-RPC services are disabled on this site." +msgstr "Les services XML-RPC sont dÃ©sactivÃ©s sur ce site." +======= #: wp-includes/post-formats.php:90 msgctxt "Post format" msgid "Standard" msgstr "Par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1375 +msgid "You appear to have already installed WordPress. To reinstall please clear your old database tables first." +msgstr "Il semblerait que WordPress soit dÃ©jÃ installÃ©. Pour le rÃ©installer, commencez par supprimer vos anciennes tables de la base de donnÃ©es." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1428 +msgid "There is a revision of this post that is more recent." +msgstr "Ce contenu a dÃ©jÃ une rÃ©vision plus rÃ©cente." +======= #: wp-includes/post-formats.php:68 msgid "Invalid post" msgstr "Article invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1993 +msgid "WordPress › Success" +msgstr "WordPress » RÃ©ussite" +||||||| .r11156 +#: wp-includes/general-template.php:2130 +msgid "%1$s %2$s %3$s Feed" +msgstr "%1$s %2$s Flux pour %3$s" +======= #: wp-includes/plugin.php:795 msgid "Only a static class method or function can be used in an uninstall hook." msgstr "Seule une mÃ©thode statique de classe ou une fonction peut Ãªtre utilisÃ©e avec un crochet de dÃ©sinstallation." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2477 +msgid "Manage Images" +msgstr "GÃ©rer les images" +||||||| .r11156 +#: wp-includes/default-widgets.php:770 +msgid "Display post date?" +msgstr "Afficher la date du contenu ?" +======= #: wp-includes/pluggable.php:1701 msgid "[%s] Your username and password" msgstr "[%s] Votre identifiant et mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2477 +msgid "Image (%s)" +msgid_plural "Images (%s)" +msgstr[0] "Image (%s)" +msgstr[1] "Images (%s)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4481 +msgid "You are not allowed to create pages as this user." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sous cet identifiant." +======= #: wp-includes/pluggable.php:1698 msgid "Password: %s" msgstr "Mot de passe : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2478 +msgid "Audio" +msgstr "Sons" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3849 +#: wp-includes/class-wp-xmlrpc-server.php:3911 +#: wp-includes/class-wp-xmlrpc-server.php:3914 +#: wp-includes/class-wp-xmlrpc-server.php:3917 wp-includes/revision.php:251 +msgid "Invalid post ID" +msgstr "Identifiant de l’article non valable" +======= #: wp-includes/pluggable.php:1692 msgid "[%s] New User Registration" msgstr "[%s] Inscription d'un nouvel utilisateur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2478 +msgid "Audio (%s)" +msgid_plural "Audio (%s)" +msgstr[0] "Son (%s)" +msgstr[1] "Sons (%s)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2241 +msgid "Sorry, you cannot edit users." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les utilisateurs." +======= #: wp-includes/pluggable.php:1689 wp-includes/pluggable.php:1697 #: wp-login.php:365 msgid "Username: %s" msgstr "Identifiant : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2479 +msgid "Video" +msgstr "VidÃ©os" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2246 +msgid "Invalid user ID" +msgstr "Identifiant utilisateur non valide" +======= #: wp-includes/pluggable.php:1688 msgid "New user registration on your site %s:" msgstr "Inscription d'un nouvel utilisateur sur votre site %s :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2479 +msgid "Manage Video" +msgstr "GÃ©rer les vidÃ©os" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2297 +msgid "Sorry, you cannot list users." +msgstr "DÃ©solÃ©, vous ne pouvez pas lister les utilisateurs." +======= #: wp-includes/pluggable.php:1665 msgid "[%s] Password Lost/Changed" msgstr "[%s] Mot de passe oubliÃ© et changÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2479 +msgid "Video (%s)" +msgid_plural "Video (%s)" +msgstr[0] "VidÃ©o (%s)" +msgstr[1] "VidÃ©os (%s)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2313 +msgid "The role specified is not valid" +msgstr "Le rÃ´le spÃ©cifiÃ© n’est pas valable" +======= #: wp-includes/pluggable.php:1661 msgid "Password Lost and Changed for user: %s" msgstr "Mot de passe oubliÃ© et changÃ© pour l'utilisateur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:275 +msgid "There was a configuration error. Please contact the server administrator." +msgstr "Il y a une erreur de configuration. Veuillez contacter l’administrateur de votre serveur." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2367 +#: wp-includes/class-wp-xmlrpc-server.php:2411 +msgid "Sorry, you cannot edit your profile." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier votre profil." +======= #: wp-includes/pluggable.php:1598 msgid "[%1$s] Please moderate: \"%2$s\"" msgstr "[%1$s] Demande de modÃ©ration pour Â« %2$s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:682 +msgid "Sorry, that site is reserved!" +msgstr "DÃ©solÃ©, ce site est rÃ©servÃ© !" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2445 +msgid "Sorry, the user cannot be updated." +msgstr "DÃ©solÃ©, cet utilisateur ne peut pas Ãªtre mis Ã jour." +======= #: wp-includes/pluggable.php:1594 msgid "Currently %s comment is waiting for approval. Please visit the moderation panel:" msgid_plural "Currently %s comments are waiting for approval. Please visit the moderation panel:" msgstr[0] "En ce moment, %s commentaire attend votre approbation. Veuillez vous rendre sur le panneau de modÃ©ration :" msgstr[1] "En ce moment, %s commentaires attendent vos approbations. Veuillez vous rendre sur le panneau de modÃ©ration :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:56 +msgctxt "add new from admin bar" +msgid "Media" +msgstr "Fichier mÃ©dia" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3852 +msgid "Sorry, you are not allowed to edit posts." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier les articles." +======= #: wp-includes/pluggable.php:1587 msgid "Approve it: %s" msgstr "L'approuver : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:2478 +msgid "Manage Audio" +msgstr "GÃ©rer l’audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3856 +#: wp-includes/class-wp-xmlrpc-server.php:3924 +msgid "Sorry, revisions are disabled." +msgstr "DÃ©solÃ©, les rÃ©visions sont dÃ©sactivÃ©es." +======= #: wp-includes/pluggable.php:1577 msgid "A new comment on the post \"%s\" is waiting for your approval" msgstr "Un nouveau commentaire sur l'article Â« %s Â» attend votre approbation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:3284 +msgid "Whoops, the provided date is invalid." +msgstr "Oups, la date fournie n’est pas valable." +||||||| .r11156 +#: wp-includes/media-template.php:861 +msgid "Alternative Text" +msgstr "Texte alternatif" +======= #: wp-includes/pluggable.php:1574 msgid "Pingback excerpt: " msgstr "Extrait du ping :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:94 +msgid "Enter the URL" +msgstr "Saisissez l’adresse" +||||||| .r11156 +#: wp-includes/media-template.php:189 +msgctxt "Uploader: Drop files here - or - Select Files" +msgid "or" +msgstr "ou" +======= #: wp-includes/pluggable.php:1569 msgid "A new pingback on the post \"%s\" is waiting for your approval" msgstr "Un nouveau ping sur l'article Â« %s Â» attend votre approbation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1662 wp-includes/script-loader.php:614 +msgid "Use as featured image" +msgstr "Utiliser comme image Ã la Une" +||||||| .r11156 +#: wp-includes/media-template.php:190 +msgid "Select Files" +msgstr "SÃ©lectionner des fichiers" +======= #: wp-includes/pluggable.php:1566 msgid "Trackback excerpt: " msgstr "Extrait du rÃ©trolien :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:624 +msgid "" +"You are about to permanently delete this menu. \n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement ce menu.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:130 +msgid "Distraction Free Writing mode" +msgstr "Mode « aucune distraction »" +======= #: wp-includes/pluggable.php:1561 msgid "A new trackback on the post \"%s\" is waiting for your approval" msgstr "Un nouveau rÃ©trolien sur l'article Â« %s Â» attend votre approbation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:427 +msgid "Saved" +msgstr "EnregistrÃ©" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:135 +msgid "Editor width in Distraction Free Writing mode:" +msgstr "Largeur de l’Ã©diteur en mode « aucune distraction » :" +======= #: wp-includes/pluggable.php:1466 wp-includes/pluggable.php:1592 msgid "Spam it: %s" msgstr "Le marquer comme indÃ©sirable : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1223 +msgid "" +"New Site: %1$s\n" +"URL: %2$s\n" +"Remote IP: %3$s\n" +"\n" +"Disable these notifications: %4$s" +msgstr "" +"Nouveau site : %1$s\n" +"URL : %2$s\n" +"Adresse IP : %3$s\n" +"\n" +"DÃ©sactiver ces notifications : %4$s" +||||||| .r11156 +#: wp-includes/class-wp-admin-bar.php:367 +msgid "Skip to toolbar" +msgstr "Aller Ã la barre d’outils" +======= #: wp-includes/pluggable.php:1465 wp-includes/pluggable.php:1591 msgid "Delete it: %s" msgstr "Le supprimer : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:507 +msgid "Password Protected" +msgstr "ProtÃ©gÃ© par un mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-admin-bar.php:368 +msgid "Top navigation toolbar." +msgstr "Barre de navigation supÃ©rieure." +======= #: wp-includes/pluggable.php:1463 wp-includes/pluggable.php:1589 msgid "Trash it: %s" msgstr "Le mettre dans la Corbeille : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1000 +msgid "Invalid activation key." +msgstr "clÃ© d’activation invalide." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:180 wp-includes/class-wp-editor.php:1200 +msgctxt "Name for the Text editor tab (formerly HTML)" +msgid "Text" +msgstr "Texte" +======= #: wp-includes/pluggable.php:1459 msgid "Permalink: %s" msgstr "Permalien : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1857 +msgid "JavaScript must be enabled to use this feature." +msgstr "JavaScript doit Ãªtre activÃ© pour utiliser cette fonctionnalitÃ©." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:528 +msgid "Hex Value" +msgstr "Valeur hexadÃ©cimale" +======= #. translators: 1: blog name, 2: post title #: wp-includes/pluggable.php:1455 msgid "[%1$s] Comment: \"%2$s\"" msgstr "[%1$s] Commentaire : Â« %2$s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:339 +msgid "Download File" +msgstr "TÃ©lÃ©charger le fichier" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:984 +msgid "Header Text Color" +msgstr "Couleur du texte d’en-tÃªte" +======= #: wp-includes/pluggable.php:1453 msgid "You can see all comments on this post here:" msgstr "Vous pouvez lire tous les commentaires de cet article ici :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:340 +msgid "Download Video" +msgstr "TÃ©lÃ©charger la vidÃ©o" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:962 +msgid "Colors" +msgstr "Couleurs" +======= #: wp-includes/pluggable.php:1451 wp-includes/pluggable.php:1582 msgid "Whois: %s" msgstr "Whois : %s" +>>>>>>> .r12027 -#: wp-includes/pluggable.php:1449 wp-includes/pluggable.php:1580 +<<<<<<< .mine +#: wp-includes/script-loader.php:344 +msgid "Turn off Fullscreen" +msgstr "Quitter le plein Ã©cran" +||||||| .r11156 +#: wp-includes/script-loader.php:384 +msgid "Save & Activate" +msgstr "Enregistrer & activer" +======= +#: wp-includes/pluggable.php:1449 wp-includes/pluggable.php:1580 #: wp-includes/pluggable.php:1690 msgid "E-mail: %s" msgstr "E-mail : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:345 +msgid "Go Fullscreen" +msgstr "Passer en plein Ã©cran" +||||||| .r11156 +#: wp-includes/script-loader.php:387 +msgid "Saved" +msgstr "EnregistrÃ©" +======= #. translators: 1: comment author, 2: author IP, 3: author domain #: wp-includes/pluggable.php:1448 wp-includes/pluggable.php:1579 msgid "Author: %1$s (IP: %2$s, %3$s)" msgstr "Auteur : %1$s (IP : %2$s, %3$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:346 +msgid "Unmute" +msgstr "RÃ©activer le son" +||||||| .r11156 +#: wp-includes/script-loader.php:385 +msgid "Save & Publish" +msgstr "Enregistrer & publier" +======= #: wp-includes/pluggable.php:1446 msgid "New comment on your post \"%s\"" msgstr "Nouveau commentaire sur votre article Â« %s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:348 +msgid "Captions/Subtitles" +msgstr "LÃ©gendes/Sous-titres" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:752 +msgid "Select File" +msgstr "SÃ©lectionner un fichier" +======= #. translators: 1: blog name, 2: post title #: wp-includes/pluggable.php:1443 msgid "[%1$s] Pingback: \"%2$s\"" msgstr "[%1$s] Ping : Â« %2$s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:287 +msgid "moved to the trash." +msgstr "dÃ©placÃ© dans la corbeille." +||||||| .r11156 +#: wp-includes/admin-bar.php:668 +msgid "Customize" +msgstr "Personnaliser" +======= #: wp-includes/pluggable.php:1441 msgid "You can see all pingbacks on this post here:" msgstr "Vous pouvez voir tous les pings de cet article ici : " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:341 +msgid "Play/Pause" +msgstr "Lecture/Pause" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:582 +msgid "Insufficient arguments passed to this XML-RPC method." +msgstr "Arguments insuffisants passÃ©s Ã cette mÃ©thode XML-RPC." +======= #: wp-includes/pluggable.php:1436 msgid "New pingback on your post \"%s\"" msgstr "Nouveau ping sur votre article Â« %s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: post revision title: 1: author avatar, 2: author name, 3: time +#. ago, 4: date +#: wp-includes/post-template.php:1803 +msgctxt "post revision title" +msgid "%1$s %2$s, %3$s ago (%4$s)" +msgstr "%1$s %2$s, il y a %3$s (%4$s)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1237 +msgid "Sorry, you cannot stick a private post." +msgstr "DÃ©solÃ©, vous ne pouvez pas mettre en avant un article privÃ©." +======= #. translators: 1: blog name, 2: post title #: wp-includes/pluggable.php:1433 msgid "[%1$s] Trackback: \"%2$s\"" msgstr "[%1$s] RÃ©trolien : Â« %2$s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:157 +msgid "Your session has expired. You can log in again from this page or go to the login page." +msgstr "Votre session a expirÃ©. Vous pouvez vous reconnecter depuis cette page ou aller Ã la page de connexion." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:624 +msgid "No Image" +msgstr "Aucune image" +======= #: wp-includes/pluggable.php:1431 msgid "You can see all trackbacks on this post here:" msgstr "Vous pouvez voir tous les rÃ©troliens de cet article ici : " +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: month, 2: day, 3: year, 4: hour, 5: minute +#: wp-includes/script-loader.php:496 wp-includes/script-loader.php:534 +msgid "%1$s %2$s, %3$s @ %4$s:%5$s" +msgstr "%2$s %1$s %3$s Ã %4$s h %5$s min" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1109 +msgid "You can edit your menu content on the Menus screen in the Appearance section." +msgstr "Vous pouvez modifier le contenu de votre menu par le biais de l’Ã©cran Menus, dans la section Apparence." +======= #: wp-includes/pluggable.php:1430 wp-includes/pluggable.php:1440 #: wp-includes/pluggable.php:1452 wp-includes/pluggable.php:1583 msgid "Comment: %s" msgstr "Commentaire : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:92 +msgctxt "Post format" +msgid "Chat" +msgstr "Discussion" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:749 +msgid "Drop a file here or select a file." +msgstr "Glissez un fichier ici ou sÃ©lectionnez un fichier." +======= #: wp-includes/pluggable.php:1429 wp-includes/pluggable.php:1439 #: wp-includes/pluggable.php:1450 wp-includes/pluggable.php:1565 #: wp-includes/pluggable.php:1573 wp-includes/pluggable.php:1581 msgid "URL: %s" msgstr "Adresse web : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:256 +msgid "(more…)" +msgstr "(suite…)" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:848 +#: wp-includes/class-wp-customize-manager.php:1007 +msgid "Header Image" +msgstr "Image d’en-tÃªte" +======= #. translators: 1: website name, 2: website IP, 3: website hostname #: wp-includes/pluggable.php:1428 wp-includes/pluggable.php:1438 #: wp-includes/pluggable.php:1564 wp-includes/pluggable.php:1572 msgid "Website: %1$s (IP: %2$s, %3$s)" msgstr "Site web : %1$s (IP : %2$s, %3$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: date +#: wp-includes/post-template.php:1759 +msgctxt "post revision title extra" +msgid "%1$s [Autosave]" +msgstr "%1$s [Sauvegarde automatique]" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:407 +msgid "Post Thumbnail" +msgstr "Miniature d’article" +======= #: wp-includes/pluggable.php:1426 msgid "New trackback on your post \"%s\"" msgstr "Nouveau rÃ©trolien sur votre article Â« %s Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: date +#: wp-includes/post-template.php:1761 +msgctxt "post revision title extra" +msgid "%1$s [Current Revision]" +msgstr "%1$s [Version actuelle]" +||||||| .r11156 +#: wp-includes/script-loader.php:96 +msgid "text direction" +msgstr "direction du texte" +======= #: wp-includes/pluggable.php:1082 msgid "You should specify a nonce action to be verified by using the first parameter." msgstr "Vous devriez prÃ©ciser une action de type « nonce », qui sera vÃ©rifiÃ©e par le premier paramÃ¨tre." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-template.php:1667 +msgid "This content is password protected. To view it please enter your password below:" +msgstr "Cet article est protÃ©gÃ© par un mot de passe. Pour le lire, veuillez saisir votre mot de passe ci-dessous :" +||||||| .r11156 +#: wp-includes/script-loader.php:97 +msgid "Toggle Editor Text Direction" +msgstr "Inverser la direction de l’Ã©diteur de texte" +======= #: wp-includes/pluggable.php:568 msgid "ERROR: Invalid username or incorrect password." msgstr "ERREUR : l’identifiant ou le mot de passe n’est pas valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/query.php:728 +msgid "In %1$s, use the %2$s method, not the %3$s function. See %4$s." +msgstr "Dans %1$s, utilisez la mÃ©thode %2$s, pas la fonction %3$s. Lisez %4$s." +||||||| .r11156 +#: wp-includes/ms-functions.php:634 +msgid "Site name must be at least 4 characters." +msgstr "L’identifiant du site doit utiliser au moins 4 caractÃ¨res." +======= #: wp-includes/option.php:137 msgid "%s is a protected WP option and may not be modified" msgstr "%s est une option protÃ©gÃ©e de WordPress, et ne peut Ãªtre modifiÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: This is a comma-separated list of very common words that should +#. be excluded from a search, like a, an, and the. These are usually called +#. "stopwords". You should not simply translate these individual words into +#. your language. Instead, look for and provide commonly accepted stopwords in +#. your language. +#: wp-includes/query.php:2160 +msgctxt "Comma-separated list of search stopwords in your language" +msgid "about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www" +msgstr "le,la,les,de,des,un,uns,une,unes,et,a,Ã ,il,elle,on,ne,je,tu,nous,vous,ils,elles,son,sa,ses,que,quoi,se,qui,ce,cette,dans,en,du,au,aux,pour,pas,sur,y,ou,oÃ¹,si,ton,ta,te,mon,ma,tout,toute,tous,toutes,Ã§a,ni,www,com,fr,par,sur,par,dans,mais,vos,votre,vÃ´tre,c,d,j,,l,m,n,s,t,sans,toi,moi,lui,leur,leurs" +||||||| .r11156 +#: wp-includes/ms-functions.php:625 +msgid "Please enter a site name." +msgstr "Veuillez saisir un nom de site." +======= #: wp-includes/nav-menu.php:691 msgid "Custom Link" msgstr "Lien personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: To add an additional Open Sans character subset specific to +#. your language, translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not +#. translate into your own language. +#: wp-includes/script-loader.php:678 +msgctxt "Open Sans font: add new subset (greek, cyrillic, vietnamese)" +msgid "no-subset" +msgstr "no-subset" +||||||| .r11156 +#: wp-includes/ms-functions.php:490 +msgid "That username is not allowed." +msgstr "Cet identifiant n’est pas autorisÃ©." +======= #: wp-includes/nav-menu.php:668 wp-includes/nav-menu.php:731 #: wp-includes/post-template.php:1388 wp-includes/post-template.php:1478 msgid "#%d (no title)" msgstr "#%d (pas de titre)" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: If there are characters in your language that are not supported +#. by Open Sans, translate this to 'off'. Do not translate into your own +#. language. +#: wp-includes/script-loader.php:672 +msgctxt "Open Sans font: on or off" +msgid "on" +msgstr "on" +||||||| .r11156 +#: wp-includes/ms-functions.php:482 +msgid "Please enter a username." +msgstr "Veuillez saisir un identifiant." +======= #: wp-includes/nav-menu.php:317 msgid "Invalid menu ID." msgstr "Menu ID invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/nav-menu.php:353 +msgid "Invalid menu ID." +msgstr "Menu ID invalide." +||||||| .r11156 +#: wp-includes/ms-functions.php:662 +msgid "Please enter a site title." +msgstr "Veuillez saisir un titre de site." +======= #: wp-includes/nav-menu.php:312 msgid "The given object ID is not that of a menu item." msgstr "L’identifiant donnÃ© pour cet objet n’est pas une entrÃ©e de menu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1660 +msgid "Set featured image" +msgstr "Mettre une image Ã la Une" +||||||| .r11156 +#: wp-includes/ms-functions.php:631 +msgid "That name is not allowed." +msgstr "Ce nom n’est pas autorisÃ©." +======= #: wp-includes/nav-menu.php:247 wp-includes/nav-menu.php:254 msgid "The menu name %s conflicts with another menu name. Please try another." msgstr "Un menu nommÃ© %s est en conflit avec un autre nom de menu. Veuillez rÃ©essayer avec un notre nom." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:379 +msgid "Hide" +msgstr "Cacher" +||||||| .r11156 +#: wp-includes/ms-functions.php:496 +msgid "Username must be at least 4 characters." +msgstr "L’identifiant doit utiliser au moins 4 caractÃ¨res." +======= #: wp-includes/ms-load.php:427 msgid "If you’re still stuck with this message, then check that your database contains the following tables:" msgstr "Si vous Ãªtes toujours bloquÃ© par ce message, vÃ©rifiez alors que votre base de donnÃ©es contient bien les tables suivantes :" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:378 +msgid "Show" +msgstr "Afficher" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1158 +msgid "A static page" +msgstr "Une page statique" +======= #: wp-includes/ms-load.php:426 msgid "Read the bug report page. Some of the guidelines there may help you figure out what went wrong." msgstr "Lisez la page de gestions des bugs (en anglais). Certaines des bonnes pratiques qui y sont prÃ©sentÃ©es pourraient vous aider Ã comprendre ce qui a mal tournÃ©." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/post.php:1659 +msgid "Featured Image" +msgstr "Image Ã la Une" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:978 +msgid "Display Header Text" +msgstr "Afficher le texte d’en-tÃªte" +======= #: wp-includes/ms-load.php:425 msgid "What do I do now?" msgstr "Que dois-je faire maintenant ?" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:103 +msgid "Close italic tag" +msgstr "Fermer la baliste de l'italique" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:999 +msgid "Background Color" +msgstr "Couleur d’arriÃ¨re-plan" +======= #. translators: 1: site url, 2: table name, 3: database name #: wp-includes/ms-load.php:419 msgid "Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?" msgstr "Impossible de trouver le site %1$s. Nous avons cherchÃ© dans la table %2$s de la base de donnÃ©es %3$s. Est-ce bien correct ?" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:106 +msgid "Close blockquote tag" +msgstr "Fermer la baliste de citation" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:803 +#: wp-includes/class-wp-customize-manager.php:1027 +msgid "Background Image" +msgstr "Image d’arriÃ¨re-plan" +======= #. translators: %s: table name #: wp-includes/ms-load.php:413 msgid "Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now." msgstr "Il manque des tables Ã la base de donnÃ©es. Cela peut signifier que MySQL ne fonctionne pas, que WordPress n’a pas Ã©tÃ© correctement installÃ©, ou que quelqu’un a supprimÃ© %s. Vous devriez vraiment vÃ©rifier votre base de donnÃ©es maintenant." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:108 +msgid "Close deleted text tag" +msgstr "Fermer la baliste de texte supprimÃ©" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1049 +msgid "Background Repeat" +msgstr "RÃ©pÃ©tition de l’arriÃ¨re-plan" +======= #: wp-includes/ms-load.php:408 msgid "If you are the owner of this network please check that MySQL is running properly and all tables are error free." msgstr "Si vous Ãªtes le gestionnaire de ce rÃ©seau de sites, veuillez vous assurer que MySQL fonctionne correctement et qu'aucune table n'a d'erreur." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:110 +msgid "Close inserted text tag" +msgstr "Fermer la baliste d'insertion de texte" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1066 +msgid "Background Position" +msgstr "Position d’arriÃ¨re-plan" +======= #: wp-includes/ms-load.php:407 msgid "If your site does not display, please contact the owner of this network." msgstr "Si votre site ne s'affiche pas, veuillez contacter le gestionnaire de ce rÃ©seau de sites." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:113 +msgid "Close bulleted list tag" +msgstr "Fermer la baliste de liste Ã puce" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1082 +msgid "Background Attachment" +msgstr "Image d’arriÃ¨re-plan" +======= #: wp-includes/ms-load.php:109 msgid "This site has been archived or suspended." msgstr "Ce site a Ã©tÃ© archivÃ© ou suspendu." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:116 +msgid "List item" +msgstr "ÃlÃ©ment de liste" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:629 +msgid "Uploaded" +msgstr "Mis en ligne" +======= #: wp-includes/ms-load.php:102 msgid "This site has not been activated yet. If you are having problems activating your site, please contact %1$s." msgstr "Ce site n’a pas encore Ã©tÃ© activÃ©. Si vous rencontrez des problÃ¨mes durant l’activation de votre site, veuillez contacter %1$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post-formats.php:68 +msgid "Invalid post." +msgstr "Article non valide" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:628 +msgid "Upload New" +msgstr "Mettre en ligne" +======= #: wp-includes/ms-load.php:95 msgid "This site is no longer available." msgstr "Ce site n’est plus disponible." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/pluggable.php:1745 +msgid "[%s] Your username and password info" +msgstr "[%s] Votre identifiant et votre mot de passe" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:707 +msgid "Remove Image" +msgstr "Retirer l’image" +======= #: wp-includes/ms-functions.php:2083 msgid "" "Howdy USERNAME,\n" @@ -2256,31 +7563,106 @@ msgstr "" "Merci !\n" "\n" "--L'Ã©quipe de SITE_NAME" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/pluggable.php:1740 +msgid "To set your password, visit the following address:" +msgstr "Pour configurer votre mot de passe, rendez-vous Ã l'adresse suivante :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3741 +msgid "Sorry, you are not allowed to edit this post type." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier ce type de contenu." +======= #: wp-includes/ms-functions.php:1937 msgid "WordPress › Success" msgstr "WordPress » RÃ©ussite" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:117 +msgid "Close list item tag" +msgstr "Balise de fermeture de l'Ã©lÃ©ment de liste" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1086 +msgid "Scroll" +msgstr "DÃ©filant" +======= #: wp-includes/ms-functions.php:1937 msgid "You have been added to this site. Please visit the homepage or log in using your username and password." msgstr "Vous avez Ã©tÃ© ajoutÃ© Ã ce site. Vous pouvez vous rendre sur sa page d’accueil ou vous connecter Ã l’aide de votre identifiant et mot de passe." - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: Error string for a failed update +#: wp-includes/script-loader.php:569 +msgid "Update Failed: %s" +msgstr "La mise Ã jour a Ã©chouÃ© : %s" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1087 +msgid "Fixed" +msgstr "Fixe" +======= #: wp-includes/ms-functions.php:1935 msgid "An error occurred adding you to this site. Back to the homepage." msgstr "Une erreur est survenue lors de votre ajout Ã ce site. Retournez Ã l’accueil." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:107 +msgid "Deleted text (strikethrough)" +msgstr "Texte supprimÃ© (barrÃ©)" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1053 +msgid "No Repeat" +msgstr "Pas de rÃ©pÃ©tition" +======= #: wp-includes/ms-functions.php:1854 msgid "This file is too big. Files must be less than %d KB in size." msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %d Ko." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:101 +msgid "Close bold tag" +msgstr "Fermer la baliste de graisse" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1054 +msgid "Tile" +msgstr "Motif rÃ©pÃ©tÃ©" +======= #: wp-includes/ms-functions.php:1573 msgid "New %1$s User: %2$s" msgstr "Nouvel utilisateur %1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:476 +msgid "" +"Are you sure you want to edit this comment?\n" +"The changes you made will be lost." +msgstr "" +"Voulez-vous vraiment modifier ce commentaire ?\n" +"Les changements que vous y avez apportÃ©s seront perdus." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1055 +msgid "Tile Horizontally" +msgstr "RÃ©pÃ©tition horizontale" +======= #: wp-includes/ms-functions.php:1495 msgid "New %1$s Site: %2$s" msgstr "Nouveau site %1$s : %2$s" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:119 +msgid "Close code tag" +msgstr "Balise de fermeture du code" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1056 +msgid "Tile Vertically" +msgstr "RÃ©pÃ©tition verticale" +======= #: wp-includes/ms-functions.php:1437 msgid "" "Howdy USERNAME,\n" @@ -2311,19 +7693,64 @@ msgstr "" "Nous espÃ©rons que vous apprÃ©cierez votre nouveau site. Merci !\n" "\n" "--L'Ã©quipe de SITE_NAME" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:115 +msgid "Close numbered list tag" +msgstr "Fermer la baliste de liste numÃ©rotÃ©e" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1169 +msgid "Front page" +msgstr "Page d’accueil" +======= #: wp-includes/ms-functions.php:1343 msgid "You appear to have already installed WordPress. To reinstall please clear your old database tables first." msgstr "Il semblerait que WordPress soit dÃ©jÃ installÃ©. Pour le rÃ©installer, commencez par supprimer vos anciennes tables de la base de donnÃ©es." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:109 +msgid "Inserted text" +msgstr "Texte insÃ©rÃ©" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1181 +msgid "Posts page" +msgstr "Page des articles" +======= #: wp-includes/ms-functions.php:1343 msgid "Already Installed" msgstr "DÃ©jÃ installÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:499 +msgid "Search Categories" +msgstr "Rechercher dans les catÃ©gories" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:590 +msgid "Upload" +msgstr "Envoyer" +======= #: wp-includes/ms-functions.php:1255 msgid "New User Registration: %s" msgstr "Inscription d'un nouvel utilisateur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1654 +msgid "Search Posts" +msgstr "Rechercher dans les articles" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:591 +#: wp-includes/class-wp-customize-widgets.php:726 +#: wp-includes/media-template.php:452 wp-includes/media-template.php:1004 +#: wp-includes/media-template.php:1018 wp-includes/media-template.php:1088 +#: wp-includes/media-template.php:1100 wp-includes/media-template.php:1121 +#: wp-includes/media-template.php:1153 wp-includes/media.php:2909 +msgid "Remove" +msgstr "Supprimer" +======= #: wp-includes/ms-functions.php:1240 msgid "" "New User: %1$s\n" @@ -2335,11 +7762,32 @@ msgstr "" "Adresse IP : %2$s\n" "\n" "DÃ©sactiver ces notifications : %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:499 +msgid "Search Tags" +msgstr "Rechercher dans les Ã©tiquettes" +||||||| .r11156 +#: wp-includes/script-loader.php:393 +msgid "Allowed Files" +msgstr "Fichiers autorisÃ©s" +======= #: wp-includes/ms-functions.php:1213 msgid "New Site Registration: %s" msgstr "Inscription d'un nouveau site : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1654 +msgid "Search Pages" +msgstr "Rechercher dans les pages" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1736 +#: wp-includes/class-wp-xmlrpc-server.php:1835 +msgid "The term name cannot be empty." +msgstr "Le nom du terme ne peut Ãªtre vide." +======= #: wp-includes/ms-functions.php:1198 msgid "" "New Site: %1$s\n" @@ -2353,31 +7801,102 @@ msgstr "" "Adresse IP : %3$s\n" "\n" "DÃ©sactiver ces notifications : %4$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:97 +msgid "Search Link Categories" +msgstr "Rechercher dans les catÃ©gories de liens" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1727 +msgid "You are not allowed to create terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des termes dans cette taxinomie." +======= #: wp-includes/ms-functions.php:1133 msgid "Could not create site." msgstr "Impossible de crÃ©er le site." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/post.php:1661 +msgid "Remove featured image" +msgstr "Supprimer l’image Ã la Une" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1740 +msgid "This taxonomy is not hierarchical." +msgstr "Cette taxinomie n’est pas hiÃ©rarchique." +======= #: wp-includes/ms-functions.php:1003 msgid "That username is already activated." msgstr "Cet identifiant est dÃ©jÃ activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:567 +msgid "Updated!" +msgstr "Ã jour !" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1749 +#: wp-includes/class-wp-xmlrpc-server.php:1849 wp-includes/taxonomy.php:2424 +msgid "Parent term does not exist." +msgstr "Le terme parent n’existe pas." +======= #: wp-includes/ms-functions.php:995 msgid "Could not create user" msgstr "Impossible de crÃ©er l’utilisateur." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:504 +msgid "Edit Tag" +msgstr "Modifier lâÃ©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1766 +msgid "Sorry, your term could not be created. Something wrong happened." +msgstr "DÃ©solÃ©, votre terme n’a pu Ãªtre crÃ©Ã©. Une erreur est survenue." +======= #: wp-includes/ms-functions.php:981 msgid "The site is already active." msgstr "Ce site est dÃ©jÃ activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:501 +msgid "All Tags" +msgstr "Toutes les Ã©tiquettes" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1816 +msgid "You are not allowed to edit terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de modifier les termes de cette taxinomie." +======= #: wp-includes/ms-functions.php:979 msgid "The user is already active." msgstr "Cet utilisateur est dÃ©jÃ activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:508 +msgid "New Tag Name" +msgstr "Nom du nouveau Ã©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1840 +msgid "This taxonomy is not hierarchical so you can't set a parent." +msgstr "Cette taxinomie n’est pas hiÃ©rarchisÃ©e, donc vous ne pouvez crÃ©er de parent." +======= #: wp-includes/ms-functions.php:975 msgid "Invalid activation key." msgstr "clÃ© d’activation invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:507 +msgid "Add New Tag" +msgstr "Ajouter une nouvelle Ã©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1866 +msgid "Sorry, editing the term failed." +msgstr "DÃ©solÃ©, la modification du terme a Ã©chouÃ©." +======= #: wp-includes/ms-functions.php:927 msgid "" "To activate your user, please click the following link:\n" @@ -2391,11 +7910,31 @@ msgstr "" "%s\n" "\n" "AprÃ¨s l'activation, vous recevrez *un autre courrier* contenant votre identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:506 +msgid "Update Tag" +msgstr "Mettre Ã jour lâÃ©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1909 +msgid "You are not allowed to delete terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de supprimer les termes de cette taxinomie." +======= #: wp-includes/ms-functions.php:861 wp-includes/ms-functions.php:946 msgid "[%1$s] Activate %2$s" msgstr "[%1s] Activation de %2s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:500 +msgid "Popular Tags" +msgstr "Ãtiquettes populaires" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1925 +msgid "Sorry, deleting the term failed." +msgstr "DÃ©solÃ©, la suppression du terme a Ã©chouÃ©." +======= #: wp-includes/ms-functions.php:837 msgid "" "To activate your blog, please click the following link:\n" @@ -2417,320 +7956,1260 @@ msgstr "" "Vous pourrez alors vous rendre sur votre site ici :\n" "\n" "%s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:505 +msgid "View Tag" +msgstr "Voir lâÃ©tiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1977 +#: wp-includes/class-wp-xmlrpc-server.php:2031 +#: wp-includes/class-wp-xmlrpc-server.php:2120 +msgid "You are not allowed to assign terms in this taxonomy." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner des termes Ã cette taxinomie." +======= #: wp-includes/ms-functions.php:674 msgid "That site is currently reserved but may be available in a couple days." msgstr "Ce site est rÃ©servÃ© pour le moment, mais pourrait Ãªtre disponible dans quelques jours." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:497 +msgctxt "taxonomy general name" +msgid "Tags" +msgstr "Ãtiquettes" +||||||| .r11156 +#: wp-includes/default-widgets.php:181 +msgid "Select Link Category:" +msgstr "SÃ©lectionner la catÃ©gorie de liens :" +======= #: wp-includes/ms-functions.php:663 msgid "Sorry, that site is reserved!" msgstr "DÃ©solÃ©, ce site est rÃ©servÃ© !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:498 +msgctxt "taxonomy singular name" +msgid "Tag" +msgstr "Ãtiquette" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:397 +msgid "Template" +msgstr "ModÃ¨le" +======= #: wp-includes/ms-functions.php:659 wp-includes/ms-functions.php:1127 msgid "Sorry, that site already exists!" msgstr "DÃ©solÃ©, ce site existe dÃ©jÃ !" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: +#. those are placeholders. +#: wp-includes/ms-functions.php:2140 +msgid "" +"Howdy USERNAME,\n" +"\n" +"Your new account is set up.\n" +"\n" +"You can log in with the following information:\n" +"Username: USERNAME\n" +"Password: PASSWORD\n" +"LOGINLINK\n" +"\n" +"Thanks!\n" +"\n" +"--The Team @ SITE_NAME" +msgstr "" +"Cher/chÃ¨re USERNAME,\n" +"\n" +"Votre nouveau compte a Ã©tÃ© crÃ©Ã©.\n" +"\n" +"Vous pouvez vous connecter avec les informations suivantes :\n" +"Identifiant : USERNAME\n" +"Mot de passe : PASSWORD\n" +"LOGINLINK\n" +"\n" +"Merci !\n" +"\n" +"--L'Ã©quipe de SITE_NAME" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:402 +msgid "Stylesheet" +msgstr "Feuille de style" +======= #: wp-includes/ms-functions.php:648 msgid "Please enter a site title." msgstr "Veuillez saisir un titre de site." +>>>>>>> .r12027 -#: wp-includes/ms-functions.php:631 -msgid "Sorry, site names must have letters too!" -msgstr "DÃ©solÃ©, les identifiants de site doivent Ã©galement avoir des lettres !" - -#: wp-includes/ms-functions.php:627 -msgid "Sorry, you may not use that site name." -msgstr "DÃ©solÃ©, vous ne pouvez pas utiliser ce nom pour votre site." - -#: wp-includes/ms-functions.php:623 +<<<<<<< .mine +#. translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those +#. are placeholders. +#: wp-includes/ms-functions.php:1472 +msgid "" +"Howdy USERNAME,\n" +"\n" +"Your new SITE_NAME site has been successfully set up at:\n" +"BLOG_URL\n" +"\n" +"You can log in to the administrator account with the following information:\n" +"\n" +"Username: USERNAME\n" +"Password: PASSWORD\n" +"Log in here: BLOG_URLwp-login.php\n" +"\n" +"We hope you enjoy your new site. Thanks!\n" +"\n" +"--The Team @ SITE_NAME" +msgstr "" +"Cher/chÃ¨re USERNAME,\n" +"\n" +"Votre nouveau site SITE_NAME a Ã©tÃ© bien crÃ©Ã© Ã l'adresse :\n" +"BLOG_URL\n" +"\n" +"Vous pouvez vous connecter au compte administrateur avec les informations suivantes :\n" +"Identifiant : USERNAME\n" +"Mot de passe : PASSWORD\n" +"Connectez-vous ici : BLOG_URLwp-login.php\n" +"\n" +"Nous espÃ©rons que vous apprÃ©cierez votre nouveau site. Merci !\n" +"\n" +"--L'Ã©quipe de SITE_NAME" +||||||| .r11156 +#: wp-includes/default-widgets.php:194 +msgid "Link title" +msgstr "Titre du lien" +======= +#: wp-includes/ms-functions.php:631 +msgid "Sorry, site names must have letters too!" +msgstr "DÃ©solÃ©, les identifiants de site doivent Ã©galement avoir des lettres !" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/ms-load.php:433 +msgid "Read the bug report page. Some of the guidelines there may help you figure out what went wrong." +msgstr "Lisez la page de gestions des bugs (en anglais). Certaines des bonnes pratiques qui y sont prÃ©sentÃ©es pourraient vous aider Ã comprendre ce qui a mal tournÃ©." +||||||| .r11156 +#: wp-includes/default-widgets.php:195 +msgid "Link rating" +msgstr "Note du lien" +======= +#: wp-includes/ms-functions.php:627 +msgid "Sorry, you may not use that site name." +msgstr "DÃ©solÃ©, vous ne pouvez pas utiliser ce nom pour votre site." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/query.php:729 +msgid "https://codex.wordpress.org/Function_Reference/is_main_query" +msgstr "https://codex.wordpress.org/Function_Reference/is_main_query" +||||||| .r11156 +#: wp-includes/default-widgets.php:196 +msgid "Link ID" +msgstr "ID du lien" +======= +#: wp-includes/ms-functions.php:623 msgid "Sorry, site names may not contain the character “_”!" msgstr "DÃ©solÃ©, les identifiants de site ne doivent pas contenir le caractÃ¨re “_”!;!" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %s: table name +#: wp-includes/ms-load.php:420 +msgid "Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now." +msgstr "Il manque des tables Ã la base de donnÃ©es. Cela peut signifier que MySQL ne fonctionne pas, que WordPress n’a pas Ã©tÃ© correctement installÃ©, ou que quelqu’un a supprimÃ© %s. Vous devriez vraiment vÃ©rifier votre base de donnÃ©es maintenant." +||||||| .r11156 +#: wp-includes/default-widgets.php:211 +msgid "Number of links to show:" +msgstr "Nombre de liens Ã afficher :" +======= #: wp-includes/ms-functions.php:620 msgid "Site name must be at least 4 characters." msgstr "L’identifiant du site doit utiliser au moins 4 caractÃ¨res." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: site url, 2: table name, 3: database name +#: wp-includes/ms-load.php:426 +msgid "Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?" +msgstr "Impossible de trouver le site %1$s. Nous avons cherchÃ© dans la table %2$s de la base de donnÃ©es %3$s. Est-ce bien correct ?" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:225 +msgid "ERROR: The themes directory is either empty or doesn’t exist. Please check your installation." +msgstr "ERREUR : le rÃ©pertoire des thÃ¨mes est soit vide, ou n’existe pas. Veuillez vÃ©rifier votre installation." +======= #: wp-includes/ms-functions.php:617 msgid "That name is not allowed." msgstr "Ce nom n’est pas autorisÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: revision date format, see http:php.net/date +#: wp-includes/post-template.php:1757 wp-includes/post-template.php:1793 +msgctxt "revision date format" +msgid "F j, Y @ H:i:s" +msgstr "j F Y Ã G \\h i \\m\\i\\n" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:229 +msgid "Stylesheet is not readable." +msgstr "Impossible de lire la feuille de style." +======= #: wp-includes/ms-functions.php:611 msgid "Please enter a site name." msgstr "Veuillez saisir un nom de site." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: website name, 2: website IP, 3: website hostname +#: wp-includes/pluggable.php:1444 wp-includes/pluggable.php:1454 +#: wp-includes/pluggable.php:1579 wp-includes/pluggable.php:1587 +msgid "Website: %1$s (IP: %2$s, %3$s)" +msgstr "Site web : %1$s (IP : %2$s, %3$s)" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:278 wp-includes/class-wp-theme.php:282 +msgid "The \"%s\" theme is not a valid parent theme." +msgstr "Le thÃ¨me « %s » n’est un thÃ¨me parent valide." +======= #: wp-includes/ms-functions.php:531 msgid "That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing." msgstr "Cette adresse de messagerie a dÃ©jÃ Ã©tÃ© utilisÃ©e. Veuillez vÃ©rifier dans votre messagerie si le message d’activation ne s’y trouve pas. L’identifiant redeviendra disponible dans quelques jours si vous ne faites rien." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: comment author, 2: author IP, 3: author domain +#: wp-includes/pluggable.php:1464 wp-includes/pluggable.php:1594 +msgid "Author: %1$s (IP: %2$s, %3$s)" +msgstr "Auteur : %1$s (IP : %2$s, %3$s)" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1106 +msgid "Navigation" +msgstr "Navigation" +======= #: wp-includes/ms-functions.php:521 msgid "That username is currently reserved but may be available in a couple of days." msgstr "Cet identifiant est pour le moment rÃ©servÃ©, mais pourrait Ãªtre disponible dans quelques jours." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %d: nth embed found in a post +#: wp-includes/script-loader.php:520 +msgid "Suggested embed #%d" +msgstr "Inclusion suggÃ©rÃ©e #%d" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1109 +msgid "Your theme supports %s menu. Select which menu you would like to use." +msgid_plural "Your theme supports %s menus. Select which menu appears in each location." +msgstr[0] "Votre thÃ¨me peut utiliser %s menu. SÃ©lectionnez le menu que vous voudriez utiliser." +msgstr[1] "Votre thÃ¨me peut utiliser %s menus. SÃ©lectionnez le menu que vous voudriez utiliser pour chaque emplacement." +======= #: wp-includes/ms-functions.php:509 wp-includes/user.php:1906 msgid "Sorry, that email address is already used!" msgstr "DÃ©solÃ©, cette adresse de messagerie est dÃ©jÃ utilisÃ©e !" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: %d: nth image found in a post +#: wp-includes/script-loader.php:522 +msgid "Suggested image #%d" +msgstr "Image suggÃ©rÃ©e #%d" +||||||| .r11156 +#: wp-includes/media-template.php:508 +msgid "Refresh" +msgstr "RafraÃ®chir" +======= #: wp-includes/ms-functions.php:505 wp-includes/user.php:1850 msgid "Sorry, that username already exists!" msgstr "DÃ©solÃ©, cet identifiant existe dÃ©jÃ !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1354 wp-includes/post.php:1355 +msgid "Post type names must be between 1 and 20 characters in length." +msgstr "Le nom d'un type d'article doit contenir entre 1 et 20 caractÃ¨res." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1139 +msgid "Static Front Page" +msgstr "Page d’accueil statique" +======= #: wp-includes/ms-functions.php:500 msgid "Sorry, that email address is not allowed!" msgstr "DÃ©solÃ©, cette adresse de messagerie n’est pas autorisÃ©e !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:431 +msgid "Site Preview" +msgstr "AperÃ§u du site" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1142 +msgid "Your theme supports a static front page." +msgstr "Le thÃ¨me actuel accepte les pages statiques." +======= #: wp-includes/ms-functions.php:494 msgid "Please enter a valid email address." msgstr "Veuillez saisir une adresse de messagerie valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/taxonomy.php:362 wp-includes/taxonomy.php:363 +msgid "Taxonomy names must be between 1 and 32 characters in length." +msgstr "Un nom de taxinomie doit comporter entre 1 et 32 caractÃ¨res." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1157 +msgid "Your latest posts" +msgstr "Les derniers articles" +======= #: wp-includes/ms-functions.php:491 msgid "Sorry, usernames must have letters too!" msgstr "DÃ©solÃ©, les identifiants doivent aussi avoir des lettres !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:566 +msgid "Updating..." +msgstr "Mise Ã jour en cours..." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1153 +msgid "Front page displays" +msgstr "La page d’accueil affiche" +======= #: wp-includes/ms-functions.php:487 msgid "Sorry, usernames may not contain the character “_”!" msgstr "DÃ©solÃ©, les identifiants ne doivent pas contenir le caractÃ¨re « _ » !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:83 +msgid "Dismiss this notice." +msgstr "Ne pas tenir compte de ce message." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:933 +msgid "Site Title & Tagline" +msgstr "Titre de site et description" +======= #: wp-includes/ms-functions.php:484 msgid "Username must be at least 4 characters." msgstr "L’identifiant doit utiliser au moins 4 caractÃ¨res." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: JavaScript accessible string +#: wp-includes/script-loader.php:577 +msgid "Updating... please wait." +msgstr "Mise Ã jour en cours... veuillez patienter." +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:955 +msgid "Tagline" +msgstr "Slogan" +======= #: wp-includes/ms-functions.php:481 msgid "You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider." msgstr "Vous ne pouvez pas vous inscrire avec cette adresse de messagerie. Nous avons rencontrÃ© des problÃ¨mes de la part de ce service. Merci d’en utiliser un autre." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: JavaScript accessible string +#: wp-includes/script-loader.php:581 +msgid "Update canceled." +msgstr "Mises Ã jour annulÃ©e." +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:416 +#: wp-includes/class-wp-customize-manager.php:1113 +#: wp-includes/default-widgets.php:1362 +msgid "— Select —" +msgstr "— SÃ©lectionner —" +======= #: wp-includes/ms-functions.php:478 msgid "That username is not allowed." msgstr "Cet identifiant n’est pas autorisÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Plugin name and version +#: wp-includes/script-loader.php:575 +msgid "%s update failed" +msgstr "La mise Ã jour de %s a Ã©chouÃ©" +||||||| .r11156 +#: wp-includes/formatting.php:2589 wp-includes/script-loader.php:370 +msgctxt "word count: words or characters?" +msgid "words" +msgstr "words" +======= #: wp-includes/ms-functions.php:470 msgid "Please enter a username." msgstr "Veuillez saisir un identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:582 +msgid "Plugin updates may not complete if you navigate away from this page." +msgstr "Les mises Ã jour d’extensions peuvent ne pas se faire totalement si vous quittez cette page." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1168 +#: wp-includes/class-wp-xmlrpc-server.php:4747 +msgid "The post type may not be changed." +msgstr "Ce type de contenu ne peut pas Ãªtre supprimÃ©." +======= #: wp-includes/ms-functions.php:463 wp-includes/ms-functions.php:614 msgid "Only lowercase letters (a-z) and numbers are allowed." msgstr "Seuls les lettres minuscules (de a Ã z) et chiffres sont autorisÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Plugin name and version +#: wp-includes/script-loader.php:571 +msgid "Updating %s..." +msgstr "Mise Ã jour de %s..." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:387 +msgid "Image default size" +msgstr "Taille de l’imageÂ par dÃ©faut" +======= #: wp-includes/ms-functions.php:316 msgid "ERROR: problem creating site entry." msgstr "Erreur : problÃ¨me lors de la crÃ©ation de l’entrÃ©e du site." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: Plugin name and version +#: wp-includes/script-loader.php:573 +msgid "%s updated!" +msgstr "%s est Ã jour !" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:382 +msgid "Image default link type" +msgstr "Type du lien par dÃ©faut vers l’image" +======= #: wp-includes/ms-functions.php:309 msgid "ERROR: Site URL already taken." msgstr "Erreur p;: cette adresse de site est dÃ©jÃ prise." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:517 +msgid "Connection lost or the server is busy. Please try again later." +msgstr "Connexion perdue ou serveur occupÃ©. Veuillez rÃ©essayer plus tard." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:392 +msgid "Image default align" +msgstr "Alignement par dÃ©faut de l’image" +======= #: wp-includes/ms-functions.php:260 msgid "That user does not exist." msgstr "Cet utilisateur n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: JavaScript accessible string +#: wp-includes/script-loader.php:579 +msgid "Update completed successfully." +msgstr "Mise Ã jour rÃ©ussie." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1166 +msgid "Sorry, you are not allowed to edit this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +======= #: wp-includes/ms-functions.php:181 msgid "The requested user does not exist." msgstr "Cet utilisateur n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:371 +msgctxt "password strength" +msgid "Strong" +msgstr "Forte" +||||||| .r11156 +#: wp-includes/post.php:3855 wp-includes/script-loader.php:458 +#: wp-includes/script-loader.php:484 +msgctxt "tag delimiter" +msgid "," +msgstr ", " +======= #: wp-includes/ms-default-constants.php:129 msgid "Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting." msgstr "Les valeurs des constantes VHOST et SUBDOMAIN_INSTALL ne correspondent pas. C’est la valeur de SUBDOMAIN_INSTALL qui sera prise en compte pour votre rÃ©glage du mode sous-domaines." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:369 +msgctxt "password strength" +msgid "Weak" +msgstr "Faible" +||||||| .r11156 +#: wp-includes/admin-bar.php:305 +msgid "Edit Site" +msgstr "Modifier le site" +======= #: wp-includes/ms-default-constants.php:127 msgid "The constant VHOST is deprecated. Use the boolean constant SUBDOMAIN_INSTALL in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled." msgstr "La constante VHOST est obsolÃ¨te. Utilisez la constante boolÃ©enne SUBDOMAIN_INSTALL dans le fichier wp-config.php pour activer le mode sous-domaines. Utilisez is_subdomain_install() pour vÃ©rifier si le mode sous-domaine est effectivement activÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:372 +msgctxt "password mismatch" +msgid "Mismatch" +msgstr "Non concordance" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1642 +msgid "Sorry, you are not allowed to edit posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier des entrÃ©es dans ce type de contenu" +======= #: wp-includes/media.php:3113 msgid "Add to Video Playlist" msgstr "Ajouter Ã la liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:368 +msgctxt "password strength" +msgid "Very weak" +msgstr "TrÃ¨s faible" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1204 +#: wp-includes/class-wp-xmlrpc-server.php:4489 +msgid "Invalid author ID." +msgstr "Identifiant utilisateur non valable." +======= #: wp-includes/media.php:3112 msgid "Add to video playlist" msgstr "Ajouter Ã la liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:342 +msgid "Mute Toggle" +msgstr "Couper le son" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1487 +msgid "Sorry, you are not allowed to delete this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +======= #: wp-includes/media.php:3111 msgid "Update video playlist" msgstr "Mettre Ã jour la liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-load.php:92 +msgid "This site is no longer available." +msgstr "Ce site n’est plus disponible." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1322 +msgid "Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead." +msgstr "Un nom de terme est ambigu pour cette taxinomie hiÃ©rarchisÃ©e. Veuillez utiliser l’identifiant du terme Ã la place." +======= #: wp-includes/media.php:3110 msgid "Insert video playlist" msgstr "InsÃ©rer une liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1474 +msgid "Permalink: %s" +msgstr "Permalien : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1329 +msgid "Sorry, you are not allowed to add a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’ajouter un terme Ã l’une des taxinomies indiquÃ©es." +======= #: wp-includes/media.php:3109 msgid "← Cancel Video Playlist" msgstr "← Annuler la liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:22 +msgctxt "add new on admin bar" +msgid "Post" +msgstr "Article" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1492 +msgid "The post cannot be deleted." +msgstr "Cet article ne peut pas Ãªtre supprimÃ©." +======= #: wp-includes/media.php:3108 msgid "Edit Video Playlist" msgstr "Modifier une liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:38 +msgctxt "add new on admin bar" +msgid "Page" +msgstr "Page" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1636 +msgid "The post type specified is not valid" +msgstr "Le type de contenu spÃ©cifiÃ© n’est pas valable" +======= #: wp-includes/media.php:3107 msgid "Create Video Playlist" msgstr "CrÃ©er une liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:55 +msgctxt "post type general name" +msgid "Media" +msgstr "Fichier mÃ©dia" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1158 +#: wp-includes/class-wp-xmlrpc-server.php:3736 +#: wp-includes/class-wp-xmlrpc-server.php:4426 +#: wp-includes/class-wp-xmlrpc-server.php:4484 +#: wp-includes/class-wp-xmlrpc-server.php:4743 +#: wp-includes/class-wp-xmlrpc-server.php:4804 +msgid "Invalid post type" +msgstr "Type d’article invalide" +======= #: wp-includes/media.php:3106 msgid "Drag and drop to reorder videos." msgstr "Glisser-dÃ©poser pour rÃ©organiser les vidÃ©os." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:57 +msgctxt "add new media" +msgid "Add New" +msgstr "Ajouter" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1194 +msgid "Sorry, you are not allowed to create password protected posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus protÃ©gÃ©s par mot de passe avec ce type de contenu" +======= #: wp-includes/media.php:3103 msgid "Add to Audio Playlist" msgstr "Ajouter Ã la liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1457 +msgid "You can see all pingbacks on this post here:" +msgstr "Vous pouvez voir tous les pings de cet article ici : " +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1199 +#: wp-includes/class-wp-xmlrpc-server.php:4477 +msgid "You are not allowed to create posts as this user." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des contenus sous cet identifiant." +======= #: wp-includes/media.php:3102 msgid "Add to audio playlist" msgstr "Ajouter Ã la liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1447 +msgid "You can see all trackbacks on this post here:" +msgstr "Vous pouvez voir tous les rÃ©troliens de cet article ici :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1180 +msgid "Sorry, you are not allowed to create private posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus privÃ©s avec ce type de contenu" +======= #: wp-includes/media.php:3101 msgid "Update audio playlist" msgstr "Mettre Ã jour la liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1446 wp-includes/pluggable.php:1456 +#: wp-includes/pluggable.php:1467 wp-includes/pluggable.php:1597 +msgid "Comment: %s" +msgstr "Commentaire : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1185 +msgid "Sorry, you are not allowed to publish posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des contenus avec ce type de contenu" +======= #: wp-includes/media.php:3100 msgid "Insert audio playlist" msgstr "InsÃ©rer une liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1468 +msgid "You can see all comments on this post here:" +msgstr "Vous pouvez lire tous les commentaires de cet article ici :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1279 +#: wp-includes/class-wp-xmlrpc-server.php:1303 +msgid "Sorry, you are not allowed to assign a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner un terme Ã l’une des taxinomies indiquÃ©es." +======= #: wp-includes/media.php:3099 msgid "← Cancel Audio Playlist" msgstr "← Annuler la liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1445 wp-includes/pluggable.php:1455 +#: wp-includes/pluggable.php:1466 wp-includes/pluggable.php:1580 +#: wp-includes/pluggable.php:1588 wp-includes/pluggable.php:1596 +msgid "URL: %s" +msgstr "Adresse web : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1276 +#: wp-includes/class-wp-xmlrpc-server.php:1300 +msgid "Sorry, one of the given taxonomies is not supported by the post type." +msgstr "DÃ©solÃ©, l’une des taxinomies donnÃ©es n’est pas reconnue par ce type de contenu." +======= #: wp-includes/media.php:3098 msgid "Edit Audio Playlist" msgstr "Modifier la liste de lecture audio" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/shortcodes.php:301 +msgid "Attempting to parse a shortcode without a valid callback: %s" +msgstr "Tentative d’analyse d’un code court sans fonction de retour valide : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1242 +msgid "Sorry, you are not allowed to stick this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de mettre cet article en avant." +======= #: wp-includes/media.php:3097 msgid "Create Audio Playlist" msgstr "CrÃ©er une liste de lecture audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:609 +msgid "Could not load the preview image. Please reload the page and try again." +msgstr "Impossible de charger l’image de prÃ©visualisation. Veuillez recharger la page et rÃ©essayer. " +||||||| .r11156 +#: wp-includes/formatting.php:62 wp-includes/formatting.php:3842 +msgctxt "opening curly double quote" +msgid "“" +msgstr "« " +======= #: wp-includes/media.php:3096 msgid "Drag and drop to reorder tracks." msgstr "Glisser-dÃ©poser pour rÃ©organiser les pistes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/script-loader.php:434 +msgid "Expand Sidebar" +msgstr "Ãtendre la colonne latÃ©rale" +||||||| .r11156 +#: wp-includes/formatting.php:64 +msgctxt "closing curly double quote" +msgid "”" +msgstr " »" +======= #: wp-includes/media.php:3093 msgid "Add Subtitles" msgstr "Ajouter des sous-titres" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1238 +msgid "New Site Registration: %s" +msgstr "Inscription d'un nouveau site : %s" +||||||| .r11156 +#: wp-includes/formatting.php:67 +msgctxt "apostrophe" +msgid "’" +msgstr "’" +======= #: wp-includes/media.php:3092 msgid "Select Poster Image" msgstr "Choisir une image de couverture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1531 +msgid "New %1$s Site: %2$s" +msgstr "Nouveau site %1$s : %2$s" +||||||| .r11156 +#: wp-includes/formatting.php:70 +msgctxt "prime" +msgid "′" +msgstr "′" +======= #: wp-includes/media.php:3090 msgid "Add Video Source" msgstr "Ajouter une source vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/pluggable.php:1715 +msgid "New user registration on your site %s:" +msgstr "Inscription d'un nouvel utilisateur sur votre site %s :" +||||||| .r11156 +#: wp-includes/formatting.php:72 +msgctxt "double prime" +msgid "″" +msgstr "″" +======= #: wp-includes/media.php:3089 msgid "Replace Video" msgstr "Remplacer la vidÃ©o" +>>>>>>> .r12027 -#: wp-includes/media.php:3088 +<<<<<<< .mine +#. translators: 1: blog name, 2: post title +#: wp-includes/pluggable.php:1449 +msgid "[%1$s] Trackback: \"%2$s\"" +msgstr "[%1$s] RÃ©trolien : Â« %2$s Â»" +||||||| .r11156 +#: wp-includes/formatting.php:75 +msgctxt "opening curly single quote" +msgid "‘" +msgstr "‘" +======= +#: wp-includes/media.php:3088 msgid "Video Details" msgstr "DÃ©tails de la vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: post title +#: wp-includes/pluggable.php:1470 +msgid "[%1$s] Comment: \"%2$s\"" +msgstr "[%1$s] Commentaire : Â« %2$s Â»" +||||||| .r11156 +#: wp-includes/formatting.php:77 +msgctxt "closing curly single quote" +msgid "’" +msgstr "’" +======= #: wp-includes/media.php:3084 msgid "Add Audio Source" msgstr "Ajouter une source audio" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1609 +msgid "New %1$s User: %2$s" +msgstr "Nouvel utilisateur %1$s : %2$s" +||||||| .r11156 +#: wp-signup.php:127 +msgid "Allow search engines to index this site." +msgstr "Demander aux moteurs de recherche d’indexer ce site." +======= #: wp-includes/media.php:3083 msgid "Replace Audio" msgstr "Remplacer le son" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:1280 +msgid "New User Registration: %s" +msgstr "Inscription d'un nouvel utilisateur : %s" +||||||| .r11156 +#: wp-load.php:67 +msgid "There doesn't seem to be a wp-config.php file. I need this before we can get started." +msgstr "Il ne semble pas y avoir de fichier wp-config.php. J’en ai besoin pour lancer le processus." +======= #: wp-includes/media.php:3082 msgid "Audio Details" msgstr "DÃ©tails audio" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:381 +msgid "Show password" +msgstr "Afficher le mot de passe" +||||||| .r11156 +#: wp-load.php:68 +msgid "Need more help? We got it." +msgstr "Besoin d’aide ? En voici." +======= #: wp-includes/media.php:3079 msgid "There has been an error cropping your image." msgstr "Une erreur est survenue lors du recadrage de votre image." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:382 +msgid "Hide password" +msgstr "Cacher le mot de passe" +||||||| .r11156 +#: wp-load.php:69 +msgid "You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." +msgstr "Vous pouvez crÃ©er un fichier wp-config.php par le biais de cette interface, mais cela ne marche pour toutes les configurations de serveur. La maniÃ¨re la plus sÃ»re reste de crÃ©er le fichier Ã la main." +======= #: wp-includes/media.php:3077 msgid "Cropping…" msgstr "Recadrage…" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/script-loader.php:377 +msgid "Your new password has not been saved." +msgstr "Votre nouveau mot de passe n’a pas Ã©tÃ© enregistrÃ©." +||||||| .r11156 +#: wp-load.php:70 +msgid "Create a Configuration File" +msgstr "CrÃ©er un fichier de configuration" +======= #: wp-includes/media.php:3076 msgid "Crop your image" msgstr "Recadrer votre image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/post.php:1653 +msgid "View Page" +msgstr "Afficher la page" +||||||| .r11156 +#: wp-includes/admin-bar.php:138 +msgid "http://codex.wordpress.org/" +msgstr "http://codex.wordpress.org/" +======= #: wp-includes/media.php:3075 msgid "Crop Image" msgstr "Recadrer l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:694 wp-includes/media-template.php:769 +#: wp-includes/media-template.php:943 wp-includes/media.php:2787 +msgid "Thumbnail" +msgstr "Miniature" +||||||| .r11156 +#: wp-activate.php:98 +msgid "Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." +msgstr "Votre site est activÃ© Ã %2$s. Vous pouvez dÃ¨s maintenant vous connecter Ã ce site en utilisant l’identifiant choisi « %3$s ». Vous trouverez dans votre messagerie (sur %4$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." +======= #: wp-includes/media.php:3074 msgid "Skip Cropping" msgstr "Pas de recadrage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3031 +msgid "Add Media" +msgstr "Ajouter un mÃ©dia" +||||||| .r11156 +#: wp-signup.php:381 +msgid "http://%2$s is your new site. Log in as “%4$s” using your existing password." +msgstr "http://%2$s est votre nouveau site. Connectez-vous avec l’identifiant « %4$s », Ã l’aide de votre mot de passe actuel." +======= #: wp-includes/media.php:3073 msgid "Select and Crop" msgstr "SÃ©lectionner et rogner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:341 wp-includes/media-template.php:504 +msgid "Saved." +msgstr "EnregistrÃ©." +||||||| .r11156 +#: wp-activate.php:96 +msgid "Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." +msgstr "Votre compte vient d’Ãªtre activÃ©. Vous pouvez dÃ¨s maintenant vous connecter Ã votre site en utilisant votre identifiant « %2$s ». Vous trouverez dans votre messagerie (sur %3$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." +======= #: wp-includes/media.php:3068 wp-includes/media.php:3085 #: wp-includes/media.php:3091 msgid "Cancel Edit" msgstr "Annuler la modification" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:695 wp-includes/media-template.php:770 +#: wp-includes/media-template.php:944 wp-includes/media.php:2788 +msgid "Medium" +msgstr "Moyenne" +||||||| .r11156 +#: wp-includes/functions.php:1314 +msgid "One or more database tables are unavailable. The database may need to be repaired." +msgstr "Une ou plusieurs tables de votre base de donnÃ©es sont indisponibles. La base de donnÃ©es a peut-Ãªtre besoin d’Ãªtre rÃ©parÃ©e." +======= #: wp-includes/media.php:3067 msgid "Replace Image" msgstr "Remplacer l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:697 wp-includes/media-template.php:772 +#: wp-includes/media-template.php:946 wp-includes/media.php:2790 +msgid "Full Size" +msgstr "Taille originale" +||||||| .r11156 +#: wp-mail.php:255 +msgid "Mission complete. Message %s deleted." +msgstr "Mission terminÃ©e. Message %s supprimÃ©. " +======= #: wp-includes/media.php:3066 msgid "Image Details" msgstr "DÃ©tails de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:685 wp-includes/media-template.php:759 +#: wp-includes/media-template.php:934 +msgid "Size" +msgstr "Taille" +||||||| .r11156 +#: wp-includes/comment.php:961 wp-includes/comment.php:963 +msgid "You are posting comments too quickly. Slow down." +msgstr "Vous envoyez vos commentaires trop rapidement. Prenez votre temps." +======= #: wp-includes/media.php:3063 msgid "Reverse order" msgstr "Inverser l’ordre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:333 wp-includes/media-template.php:528 +#: wp-includes/media.php:3103 +msgid "Edit Image" +msgstr "Modifier lâimage" +||||||| .r11156 +#: wp-includes/admin-bar.php:598 +msgctxt "admin bar menu group label" +msgid "New" +msgstr "CrÃ©er" +======= #: wp-includes/media.php:3062 msgid "Add to Gallery" msgstr "Ajouter Ã la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:869 wp-includes/media-template.php:981 +msgid "Image URL" +msgstr "Adresse web de l’image" +||||||| .r11156 +#: wp-includes/admin-bar.php:634 +msgid "%s comment awaiting moderation" +msgid_plural "%s comments awaiting moderation" +msgstr[0] "%s commentaire en attente de modÃ©ration" +msgstr[1] "%s commentaires en attente de modÃ©ration" +======= #: wp-includes/media.php:3061 msgid "Add to gallery" msgstr "Ajouter Ã la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3035 wp-includes/script-loader.php:394 +#: wp-includes/script-loader.php:501 +msgid "Update" +msgstr "Mettre Ã jour" +||||||| .r11156 +#: wp-includes/ms-load.php:411 +msgid "What do I do now?" +msgstr "Que dois-je faire maintenant ?" +======= #: wp-includes/media.php:3060 msgid "Update gallery" msgstr "Mettre Ã jour la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3033 +msgid "Select" +msgstr "SÃ©lectionner" +||||||| .r11156 +#: wp-includes/script-loader.php:253 +msgid "%s exceeds the maximum upload size for the multi-file uploader when used in your browser." +msgstr "%s dÃ©passe la limite d’envoi pour l’outil de mise ne ligne multiple utilisÃ© avec votre navigateur." +======= #: wp-includes/media.php:3059 msgid "Insert gallery" msgstr "InsÃ©rer la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:2763 wp-includes/script-loader.php:396 +#: wp-includes/script-loader.php:547 +msgid "(no title)" +msgstr "(pas de titre)" +||||||| .r11156 +#: wp-includes/script-loader.php:252 +msgid "Please try uploading this file with the %1$sbrowser uploader%2$s." +msgstr "Veuillez essayer de mettre ce fichier en ligne Ã l’aide de l’%1$soutil du navigateur%2$s." +======= #: wp-includes/media.php:3058 msgid "← Cancel Gallery" msgstr "← Annuler la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1097 wp-includes/media-template.php:1186 +msgid "Loop" +msgstr "RÃ©pÃ©ter" +||||||| .r11156 +#: wp-includes/script-loader.php:261 +msgid "“%s” has failed to upload." +msgstr "Â« %s Â» n’a pas pu Ãªtre mis en ligne." +======= #: wp-includes/media.php:3057 msgid "Edit Gallery" msgstr "Modifier la galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:848 wp-includes/media-template.php:914 +msgid "Align" +msgstr "Alignement" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1213 +msgid "Blockquote (Alt + Shift + Q)" +msgstr "Bloc de citation (Alt + Maj. + Q)" +======= #: wp-includes/media.php:3056 msgid "Create Gallery" msgstr "CrÃ©er une galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3091 +msgid "Edit Gallery" +msgstr "Modifier la galerie" +||||||| .r11156 +#: wp-includes/default-widgets.php:183 +msgctxt "links widget" +msgid "All Links" +msgstr "Tous les liens" +======= #: wp-includes/media.php:3053 msgid "Set featured image" msgstr "Mettre une image Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1011 +msgid "Link Rel" +msgstr "Attribut « Rel » du lien" +||||||| .r11156 +#: wp-includes/formatting.php:80 +msgctxt "en dash" +msgid "–" +msgstr "–" +======= #: wp-includes/media.php:3052 msgid "Set Featured Image" msgstr "Mettre une image Ã la Une" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:537 +msgid "That username is currently reserved but may be available in a couple of days." +msgstr "Cet identifiant est pour le moment rÃ©servÃ©, mais pourrait Ãªtre disponible dans quelques jours." +||||||| .r11156 +#: wp-includes/formatting.php:82 +msgctxt "em dash" +msgid "—" +msgstr "—" +======= #: wp-includes/media.php:3049 msgid "Insert from URL" msgstr "InsÃ©rer Ã partir d’une adresse web" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:267 +msgid "That user does not exist." +msgstr "Cet utilisateur n’existe pas." +||||||| .r11156 +#: wp-includes/class-wp-admin-bar.php:108 +msgid "The menu ID should not be empty." +msgstr "L’identifiant du menu ne devrait pas Ãªtre vide." +======= #: wp-includes/media.php:3043 msgid "No media attachments found." msgstr "Il n’y a pas de fichier mÃ©dia attachÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:506 +msgid "Sorry, usernames must have letters too!" +msgstr "DÃ©solÃ©, les identifiants doivent aussi avoir des lettres !" +||||||| .r11156 +#: wp-includes/admin-bar.php:111 wp-includes/admin-bar.php:120 +msgid "About WordPress" +msgstr "Ã propos de WordPress" +======= #: wp-includes/media.php:3042 msgid "Search Media" msgstr "Rechercher un mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:521 wp-includes/user.php:1897 +msgid "Sorry, that username already exists!" +msgstr "DÃ©solÃ©, cet identifiant existe dÃ©jÃ !" +||||||| .r11156 +#: wp-includes/script-loader.php:241 +msgid "%s exceeds the maximum upload size for this site." +msgstr "%s dÃ©passe la limite d’envoi de ce site." +======= #: wp-includes/media.php:3041 msgid "Filter by type" msgstr "Filtrer par type" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:492 +msgid "You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider." +msgstr "Vous ne pouvez pas vous inscrire avec cette adresse de messagerie. Nous avons rencontrÃ© des problÃ¨mes de la part de ce service. Merci d’en utiliser un autre." +||||||| .r11156 +#: wp-includes/functions.php:3369 +msgid "Please see Debugging in WordPress for more information." +msgstr "Veuillez consulter la page DÃ©bugger dans WordPress (en) pour plus d’informations." +======= #: wp-includes/media.php:3040 msgid "Filter by date" msgstr "Filtrer par date" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:502 +msgid "Sorry, usernames may not contain the character “_”!" +msgstr "DÃ©solÃ©, les identifiants ne doivent pas contenir le caractÃ¨re « _ » !" +||||||| .r11156 +#: wp-includes/admin-bar.php:153 +msgid "Feedback" +msgstr "Remarque" +======= #: wp-includes/media.php:3037 msgid "Delete Selected" msgstr "Supprimer la sÃ©lection" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:515 +msgid "Sorry, that email address is not allowed!" +msgstr "DÃ©solÃ©, cette adresse de messagerie n’est pas autorisÃ©e !" +||||||| .r11156 +#: wp-includes/ms-functions.php:1466 +msgid "" +"Dear User,\n" +"\n" +"Your new SITE_NAME site has been successfully set up at:\n" +"BLOG_URL\n" +"\n" +"You can log in to the administrator account with the following information:\n" +"Username: USERNAME\n" +"Password: PASSWORD\n" +"Log in here: BLOG_URLwp-login.php\n" +"\n" +"We hope you enjoy your new site. Thanks!\n" +"\n" +"--The Team @ SITE_NAME" +msgstr "" +"Cher utilisateur,\n" +"\n" +"Votre nouveau site SITE_NAME a bien Ã©tÃ© crÃ©Ã© Ã l'adresse :\n" +"BLOG_URL\n" +"\n" +"Vous pouvez vous connecter au compte administrateur avec les informations suivantes :\n" +"Identifiant : USERNAME\n" +"Mot de passe : PASSWORD\n" +"Connectez-vous ici : BLOG_URLwp-login.php\n" +"\n" +"Nous espÃ©rons que vous apprÃ©cierez votre nouveau site. Merci !\n" +"\n" +"-- L'Ã©quipe @ SITE_NAME" +======= #: wp-includes/media.php:3036 msgid "Untrash Selected" msgstr "Retirer la sÃ©lection de la Corbeille" @@ -2754,7 +9233,17 @@ msgid "" msgstr "" "Vous vous apprÃªtez Ã mettre ces Ã©lÃ©ments Ã la Corbeille.\n" "'Annuler' pour arrÃªter, 'OK' pour les supprimer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:525 wp-includes/user.php:1953 +msgid "Sorry, that email address is already used!" +msgstr "DÃ©solÃ©, cette adresse de messagerie est dÃ©jÃ utilisÃ©e !" +||||||| .r11156 +#: wp-comments-post.php:128 +msgid "ERROR: please type a comment." +msgstr "ERREUR : veuillez saisir un commentaire." +======= #: wp-includes/media.php:3031 msgid "" "You are about to permanently delete these items.\n" @@ -2762,7 +9251,17 @@ msgid "" msgstr "" "Vous vous apprÃªtez Ã supprimer dÃ©finitivement ces Ã©lÃ©ments.\n" "'Annuler' pour arrÃªter, 'OK' pour continuer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:646 +msgid "Sorry, you may not use that site name." +msgstr "DÃ©solÃ©, vous ne pouvez pas utiliser ce nom pour votre site." +||||||| .r11156 +#: wp-comments-post.php:124 +msgid "ERROR: please enter a valid email address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie valide." +======= #: wp-includes/media.php:3030 msgid "" "You are about to permanently delete this item.\n" @@ -2770,76 +9269,273 @@ msgid "" msgstr "" "Vous Ãªtes sur le point de supprimer dÃ©finitivement cet Ã©lÃ©ment.\n" " Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:650 +msgid "Sorry, site names must have letters too!" +msgstr "DÃ©solÃ©, les identifiants de site doivent Ã©galement avoir des lettres !" +||||||| .r11156 +#: wp-comments-post.php:122 +msgid "ERROR: please fill the required fields (name, email)." +msgstr "ERREUR : veuillez renseigner les champs obligatoires (nom, e-mail)." +======= #: wp-includes/media.php:3029 msgid "Uploaded to this post" msgstr "Mis en ligne sur cet article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:678 wp-includes/ms-functions.php:1152 +msgid "Sorry, that site already exists!" +msgstr "DÃ©solÃ©, ce site existe dÃ©jÃ !" +||||||| .r11156 +#: wp-includes/script-loader.php:523 +msgid "Could not load the preview image. Please reload the page and try again." +msgstr "Impossible de charger l’image de prÃ©visualisation. Veuillez recharger la page et rÃ©essayer." +======= #: wp-includes/media.php:3029 msgid "Uploaded to this page" msgstr "Mis en ligne sur cette page" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/media-template.php:1082 wp-includes/media-template.php:1171 +msgid "Preload" +msgstr "PrÃ©charger" + +#: wp-includes/ms-default-constants.php:132 +msgid "The constant VHOST is deprecated. Use the boolean constant SUBDOMAIN_INSTALL in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled." +msgstr "La constante VHOST est obsolÃ¨te. Utilisez la constante boolÃ©enne SUBDOMAIN_INSTALL dans le fichier wp-config.php pour activer le mode sous-domaines. Utilisez is_subdomain_install() pour vÃ©rifier si le mode sous-domaine est effectivement activÃ©." +#: wp-includes/ms-functions.php:316 +msgid "ERROR: Site URL already taken." +msgstr "Erreur p;: cette adresse de site est dÃ©jÃ prise." +||||||| .r11156 +#: wp-includes/ms-functions.php:315 +msgid "ERROR: Site URL already taken." +msgstr "Erreur p;: cette adresse de site est dÃ©jÃ prise." +======= #: wp-includes/media.php:3028 msgctxt "noun" msgid "Trash" msgstr "Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:323 +msgid "ERROR: problem creating site entry." +msgstr "Erreur : problÃ¨me lors de la crÃ©ation de l’entrÃ©e du site." +||||||| .r11156 +#: wp-includes/ms-functions.php:322 +msgid "ERROR: problem creating site entry." +msgstr "Erreur : problÃ¨me lors de la crÃ©ation de l’entrÃ©e du site." +======= #: wp-includes/media.php:3027 msgid "Unattached" msgstr "Non-attachÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:474 wp-includes/ms-functions.php:633 +msgid "Only lowercase letters (a-z) and numbers are allowed." +msgstr "Seuls les lettres minuscules (de a Ã z) et chiffres sont autorisÃ©s." +||||||| .r11156 +#: wp-signup.php:135 +msgid "No" +msgstr "Non" +======= #: wp-includes/media.php:3026 msgid "Insert into post" msgstr "InsÃ©rer dans l’article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:481 +msgid "Please enter a username." +msgstr "Veuillez saisir un identifiant." +||||||| .r11156 +#: wp-includes/comment-template.php:2085 +msgid "Email" +msgstr "E-Mail" +======= #: wp-includes/media.php:3026 msgid "Insert into page" msgstr "InsÃ©rer dans la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:489 +msgid "That username is not allowed." +msgstr "Cet identifiant n’est pas autorisÃ©." +||||||| .r11156 +#: wp-includes/admin-bar.php:374 +msgid "Users" +msgstr "Utilisateurs" +======= #: wp-includes/media.php:3024 msgid "All dates" msgstr "Toutes les dates" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:495 +msgid "Username must be at least 4 characters." +msgstr "L’identifiant doit utiliser au moins 4 caractÃ¨res." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1188 wp-includes/media.php:2907 +#: wp-includes/script-loader.php:358 wp-includes/script-loader.php:449 +msgid "Update" +msgstr "Mettre Ã jour" +======= #: wp-includes/media.php:3023 msgid "All media items" msgstr "Tous les Ã©lÃ©ments mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:630 +msgid "Please enter a site name." +msgstr "Veuillez saisir un nom de site." +||||||| .r11156 +#: wp-includes/admin-bar.php:368 +msgid "Sites" +msgstr "Sites" +======= #: wp-includes/media.php:3022 msgid "← Return to library" msgstr "← Revenir Ã la bibliothÃ¨que" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:636 +msgid "That name is not allowed." +msgstr "Ce nom n’est pas autorisÃ©." +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:79 wp-login.php:711 +msgid "E-mail" +msgstr "E-mail" +======= #: wp-includes/media.php:3021 msgid "Create a new video playlist" msgstr "CrÃ©er une nouvelle liste de lecture vidÃ©o" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:639 +msgid "Site name must be at least 4 characters." +msgstr "L’identifiant du site doit utiliser au moins 4 caractÃ¨res." +||||||| .r11156 +#: wp-includes/comment-template.php:2083 +#: wp-includes/theme-compat/comments-popup.php:74 +#: wp-includes/theme-compat/comments.php:77 +msgid "Name" +msgstr "Nom" +======= #: wp-includes/media.php:3020 msgid "Create a new playlist" msgstr "CrÃ©er une nouvelle liste de lecture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:642 +msgid "Sorry, site names may not contain the character “_”!" +msgstr "DÃ©solÃ©, les identifiants de site ne doivent pas contenir le caractÃ¨re “_”!;!" +||||||| .r11156 +#: wp-includes/general-template.php:405 wp-login.php:707 wp-login.php:867 +msgid "Username" +msgstr "Identifiant" +======= #: wp-includes/media.php:3019 msgid "Create a new gallery" msgstr "CrÃ©er une nouvelle galerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:667 +msgid "Please enter a site title." +msgstr "Veuillez saisir un titre de site." +||||||| .r11156 +#: wp-includes/admin-bar.php:315 wp-includes/admin-bar.php:362 +#: wp-includes/admin-bar.php:418 wp-includes/deprecated.php:2854 +#: wp-includes/deprecated.php:2856 +msgid "Dashboard" +msgstr "Tableau de bord" +======= #: wp-includes/media.php:3018 msgid "Insert Media" msgstr "InsÃ©rer un mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:908 +msgid "Alternative Text" +msgstr "Texte alternatif" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:125 +#: wp-includes/script-loader.php:390 +msgid "Cheatin’ uh?" +msgstr "Alors, on triche ?" +======= #: wp-includes/media.php:3017 msgid "Media Library" msgstr "BibliothÃ¨que de mÃ©dias" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:207 +msgctxt "Uploader: Drop files here - or - Select Files" +msgid "or" +msgstr "ou" +||||||| .r11156 +#: wp-includes/admin-bar.php:380 wp-includes/admin-bar.php:658 +msgid "Themes" +msgstr "ThÃ¨mes" +======= #: wp-includes/media.php:3014 msgid "Upload Images" msgstr "Envoyer des images" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:488 +msgid "Describe this video…" +msgstr "DÃ©crivez cette vidÃ©o…" +||||||| .r11156 +#: wp-includes/general-template.php:408 wp-login.php:858 wp-login.php:884 +msgid "Log In" +msgstr "Connexion" +======= #: wp-includes/media.php:3013 msgid "Upload Files" msgstr "Envoyer des fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:490 +msgid "Describe this audio file…" +msgstr "DÃ©crivez ce fichier audio…" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:811 wp-includes/class-wp-editor.php:1388 +#: wp-includes/media-template.php:365 wp-includes/media-template.php:542 +#: wp-includes/media-template.php:773 wp-includes/revision.php:29 +msgid "Title" +msgstr "Titre" +======= #: wp-includes/media.php:3010 msgid "Drag and drop to reorder media files." msgstr "Glissez/dÃ©placez les mÃ©dias pour les rÃ©organiser." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:492 +msgid "Describe this media file…" +msgstr "DÃ©crivez ce fichier mÃ©dia…" +||||||| .r11156 +#: wp-includes/script-loader.php:453 +msgid "Public" +msgstr "Public" +======= #. translators: This is a would-be plural string used in the media manager. #. If there is not a word you can use in your language to avoid issues with #. the lack of plural support here, turn it into "selected: %d" then @@ -2847,122 +9543,438 @@ msgstr "Glissez/dÃ©placez les mÃ©dias pour les rÃ©organiser." #: wp-includes/media.php:3009 msgid "%d selected" msgstr "%d sÃ©lection(s)" +>>>>>>> .r12027 -#: wp-includes/media.php:3004 -msgid "Back" -msgstr "Retour" +<<<<<<< .mine +#: wp-includes/ms-default-constants.php:134 +msgid "Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting." +msgstr "Les valeurs des constantes VHOST et SUBDOMAIN_INSTALL ne correspondent pas. C’est la valeur de SUBDOMAIN_INSTALL qui sera prise en compte pour votre rÃ©glage du mode sous-domaines." +||||||| .r11156 +#: wp-includes/admin-bar.php:386 +msgid "Plugins" +msgstr "Extensions" +======= +#: wp-includes/media.php:3004 +msgid "Back" +msgstr "Retour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:185 +msgid "The requested user does not exist." +msgstr "Cet utilisateur n’existe pas." +||||||| .r11156 +#: wp-signup.php:131 +msgid "Yes" +msgstr "Oui" +======= #: wp-includes/media.php:2999 msgid "Select" msgstr "SÃ©lectionner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:509 +msgid "Please enter a valid email address." +msgstr "Veuillez saisir une adresse de messagerie valide." +||||||| .r11156 +#: wp-includes/admin-bar.php:342 +msgid "My Sites" +msgstr "Mes sites" +======= #: wp-includes/media.php:2997 msgid "Add Media" msgstr "Ajouter un mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3052 +msgid "Insert Media" +msgstr "InsÃ©rer un mÃ©dia" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:944 +#: wp-includes/class-wp-xmlrpc-server.php:419 +msgid "Site Title" +msgstr "Titre du site" +======= #: wp-includes/media.php:2737 wp-includes/script-loader.php:369 #: wp-includes/script-loader.php:509 msgid "(no title)" msgstr "(pas de titre)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3053 +msgid "Create a new gallery" +msgstr "CrÃ©er une nouvelle galerie" +||||||| .r11156 +#: wp-includes/deprecated.php:2737 +msgid "First Post" +msgstr "Premier article" +======= #: wp-includes/media.php:2532 msgid "No editor could be selected." msgstr "Aucun Ã©diteur n’a pas pu Ãªtre sÃ©lectionnÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3095 +msgid "Add to gallery" +msgstr "Ajouter Ã la galerie" +||||||| .r11156 +#: wp-activate.php:115 wp-includes/post-template.php:1567 +msgid "Password:" +msgstr "Mot de passe :" +======= #: wp-includes/media.php:1500 msgid "Bitrate Mode" msgstr "Mode de dÃ©bit" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3094 +msgid "Update gallery" +msgstr "Mettre Ã jour la galerie" +||||||| .r11156 +#: wp-activate.php:80 +msgid "Activate" +msgstr "Activer" +======= #: wp-includes/media.php:1499 msgid "Bitrate" msgstr "DÃ©bit" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:601 wp-includes/script-loader.php:591 +msgid "Clear" +msgstr "Effacer" +||||||| .r11156 +#: wp-includes/admin-bar.php:137 +msgid "Documentation" +msgstr "Documentation" +======= #: wp-includes/media.php:1497 msgctxt "video or audio" msgid "Length" msgstr "DurÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3047 +msgid "Upload Files" +msgstr "Envoyer des fichiers" +||||||| .r11156 +#: wp-includes/admin-bar.php:145 +msgid "Support Forums" +msgstr "Forums d’entraide" +======= #: wp-includes/media.php:1496 msgid "Year" msgstr "AnnÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3048 +msgid "Upload Images" +msgstr "Envoyer des images" +||||||| .r11156 +#: wp-includes/formatting.php:2584 wp-includes/general-template.php:2547 +msgid "…" +msgstr "…" +======= #: wp-includes/media.php:1495 msgid "Genre" msgstr "Genre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3051 +msgid "Media Library" +msgstr "BibliothÃ¨que de mÃ©dias" +||||||| .r11156 +#: wp-includes/functions.php:3137 +msgid "Database Error" +msgstr "Erreur de la base de donnÃ©es" +======= #: wp-includes/media-template.php:1232 wp-includes/media.php:3025 msgid "No items found." msgstr "Aucun Ã©lÃ©ment trouvÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3057 +msgid "All media items" +msgstr "Tous les Ã©lÃ©ments mÃ©dia" +||||||| .r11156 +#: wp-includes/functions.php:3141 wp-includes/ms-load.php:398 +msgid "Error establishing a database connection" +msgstr "Erreur lors de la connexion Ã la base de donnÃ©es" +======= #: wp-includes/media-template.php:1199 msgid "There are no associated subtitles." msgstr "Il n’y a pas de sous-titres associÃ©s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3060 +msgid "Insert into page" +msgstr "InsÃ©rer dans la page" +||||||| .r11156 +#: wp-includes/admin-bar.php:129 +msgid "WordPress.org" +msgstr "Site de WordPress-FR" +======= #: wp-includes/media-template.php:1186 msgid "Tracks (subtitles, captions, descriptions, chapters, or metadata)" msgstr "Pistes (sous-titres, lÃ©gendes, descriptions, chapitres ou mÃ©tadonnÃ©es)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3063 +msgid "Uploaded to this page" +msgstr "Mis en ligne sur cette page" +||||||| .r11156 +#: wp-includes/admin-bar.php:279 +msgid "Global Dashboard: %s" +msgstr "Tableau de bord global : %s" +======= #: wp-includes/media-template.php:1161 msgid "Poster Image" msgstr "Image de couverture" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3063 +msgid "Uploaded to this post" +msgstr "Mis en ligne sur cet article" +||||||| .r11156 +#: wp-includes/admin-bar.php:277 +msgid "Network Admin: %s" +msgstr "Admin du rÃ©seau : %s" +======= #: wp-includes/media-template.php:1093 wp-includes/media-template.php:1182 msgid "Loop" msgstr "RÃ©pÃ©ter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3090 +msgid "Create Gallery" +msgstr "CrÃ©er une galerie" +||||||| .r11156 +#: wp-includes/taxonomy.php:475 +msgctxt "taxonomy general name" +msgid "Tags" +msgstr "Mots-clÃ©s" +======= #: wp-includes/media-template.php:1088 wp-includes/media-template.php:1177 msgid "Autoplay" msgstr "Lecture automatique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3092 +msgid "← Cancel Gallery" +msgstr "← Annuler la galerie" +||||||| .r11156 +#: wp-includes/taxonomy.php:476 +msgctxt "taxonomy singular name" +msgid "Tag" +msgstr "Mot-clÃ©" +======= #: wp-includes/media-template.php:1081 wp-includes/media-template.php:1170 msgid "Metadata" msgstr "MÃ©tadonnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3093 +msgid "Insert gallery" +msgstr "InsÃ©rer la galerie" +||||||| .r11156 +#: wp-includes/functions.wp-scripts.php:40 +#: wp-includes/functions.wp-scripts.php:77 +#: wp-includes/functions.wp-scripts.php:117 +#: wp-includes/functions.wp-scripts.php:143 +#: wp-includes/functions.wp-scripts.php:199 +#: wp-includes/functions.wp-scripts.php:227 +#: wp-includes/functions.wp-scripts.php:252 +#: wp-includes/functions.wp-styles.php:39 +#: wp-includes/functions.wp-styles.php:72 +#: wp-includes/functions.wp-styles.php:107 +#: wp-includes/functions.wp-styles.php:129 +#: wp-includes/functions.wp-styles.php:162 +#: wp-includes/functions.wp-styles.php:188 +#: wp-includes/functions.wp-styles.php:212 +msgid "Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks." +msgstr "Les scripts et les styles ne peuvent pas Ãªtre enregistrÃ©s ou ajoutÃ©s avant le dÃ©clenchement des crochets %1$s, %2$s ou %3$s." +======= #: wp-includes/media-template.php:1080 wp-includes/media-template.php:1169 msgctxt "auto preload" msgid "Auto" msgstr "Automatique" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:199 +msgid "Upload Limit Exceeded" +msgstr "Limite de mise en ligne dÃ©passÃ©e" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:484 +msgid "Allow link notifications from other blogs (pingbacks and trackbacks)" +msgstr "Autoriser les liens de notifications depuis les autres sites (notifications par pings et rÃ©troliens)" +======= #: wp-includes/media-template.php:1078 wp-includes/media-template.php:1167 msgid "Preload" msgstr "PrÃ©charger" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:263 +msgid "Uploading" +msgstr "Mise en ligne" +||||||| .r11156 +#: wp-includes/capabilities.php:618 wp-includes/capabilities.php:638 +#: wp-includes/capabilities.php:664 +msgid "Use WP_User->ID instead." +msgstr "Utilisez plutÃ´t WP_User->ID." +======= #: wp-includes/media-template.php:1068 wp-includes/media-template.php:1150 msgid "Add alternate sources for maximum HTML5 playback:" msgstr "Ajoutez des sources alternatives pour une lecture optimale avec HTML5 :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:264 +msgid "Dismiss Errors" +msgstr "Ignorer les erreurs" +||||||| .r11156 +#: wp-includes/ms-functions.php:1967 +msgid "You have been added to this site. Please visit the homepage or log in using your username and password." +msgstr "Vous avez Ã©tÃ© ajoutÃ© Ã ce site. Vous pouvez vous rendre sur sa page d’accueil ou vous connecter Ã l’aide de votre identifiant et mot de passe." +======= #: wp-includes/media-template.php:1011 msgid "Link CSS Class" msgstr "Classe CSS du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:500 wp-includes/media.php:3080 +msgid "Attachment Details" +msgstr "DÃ©tails du fichier attachÃ©" +||||||| .r11156 +#: wp-includes/script-loader.php:245 +msgid "Memory exceeded. Please try another smaller file." +msgstr "MÃ©moire dÃ©passÃ©e. Veuillez rÃ©essayer avec un fichier plus petit." +======= #: wp-includes/media-template.php:1007 msgid "Link Rel" msgstr "Attribut « Rel » du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:404 wp-includes/media-template.php:584 +#: wp-includes/media-template.php:843 +msgid "Alt Text" +msgstr "Texte alternatif" +||||||| .r11156 +#: wp-includes/script-loader.php:246 +msgid "This is larger than the maximum size. Please try another." +msgstr "Ce fichier est plus grand que la taille maximale. Merci d’en envoyer un autre." +======= #: wp-includes/media-template.php:998 msgid "Image CSS Class" msgstr "Classe CSS de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:640 wp-includes/media-template.php:718 +#: wp-includes/media-template.php:866 wp-includes/media-template.php:970 +msgid "Link To" +msgstr "Lier Ã " +||||||| .r11156 +#: wp-includes/script-loader.php:244 +msgid "This file is not an image. Please try another." +msgstr "Ce fichier n’est pas une image. Merci d’en envoyer un autre." +======= #: wp-includes/media-template.php:994 msgid "Image Title Attribute" msgstr "Attribut « Title » de l’image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:672 wp-includes/media-template.php:872 +#: wp-includes/media-template.php:985 +msgid "Custom URL" +msgstr "Lien personnalisÃ©" +||||||| .r11156 +#: wp-includes/general-template.php:2635 +msgctxt "admin color scheme" +msgid "Blue" +msgstr "Bleu" +======= #: wp-includes/media-template.php:990 msgid "Advanced Options" msgstr "Options avancÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:667 wp-includes/media-template.php:728 +#: wp-includes/media-template.php:977 +msgid "Attachment Page" +msgstr "Page du fichier attachÃ©" +||||||| .r11156 +#: wp-includes/formatting.php:3403 +msgid "The timezone you have entered is not valid. Please select a valid timezone." +msgstr "Le fuseau horaire ne semble pas Ãªtre valide. Veuillez en choisir une valide." +======= #: wp-includes/media-template.php:955 msgid "Custom Size" msgstr "Taille personalisÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:696 wp-includes/media-template.php:771 +#: wp-includes/media-template.php:945 wp-includes/media.php:2789 +msgid "Large" +msgstr "Grande" +||||||| .r11156 +#: wp-includes/post.php:22 +msgctxt "add new on admin bar" +msgid "Post" +msgstr "Article" +======= #: wp-includes/media-template.php:908 msgid "Display Settings" msgstr "RÃ©glages de l’affichage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:715 +msgid "Gallery Settings" +msgstr "RÃ©glages de la galerie" +||||||| .r11156 +#: wp-includes/post.php:38 +msgctxt "add new on admin bar" +msgid "Page" +msgstr "Page" +======= #: wp-includes/media-template.php:904 msgid "Alternative Text" msgstr "Texte alternatif" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:740 +msgid "Columns" +msgstr "Colonnes" +||||||| .r11156 +#: wp-includes/post.php:56 +msgctxt "add new from admin bar" +msgid "Media" +msgstr "Fichier mÃ©dia" +======= #: wp-includes/media-template.php:888 wp-includes/media.php:3002 msgid "Replace" msgstr "Remplacer" @@ -3054,474 +10066,1548 @@ msgstr "Lien vers la page du fichier attachÃ©" #: wp-includes/media-template.php:970 msgid "Media File" msgstr "Fichier mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/ms-functions.php:547 +msgid "That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing." +msgstr "Cette adresse de messagerie a dÃ©jÃ Ã©tÃ© utilisÃ©e. Veuillez vÃ©rifier dans votre messagerie si le message d’activation ne s’y trouve pas. L’identifiant redeviendra disponible dans quelques jours si vous ne faites rien." +||||||| .r11156 +#: wp-includes/admin-bar.php:573 +msgctxt "add new from admin bar" +msgid "Link" +msgstr "Lien" +======= #: wp-includes/media-template.php:654 msgid "Link to Media File" msgstr "Lien vers le fichier mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:206 +msgid "Drop files anywhere to upload" +msgstr "DÃ©posez vos fichiers n’importe oÃ¹ pour les mettre en ligne" +||||||| .r11156 +#: wp-includes/admin-bar.php:593 +msgctxt "add new from admin bar" +msgid "User" +msgstr "Utilisateur" +======= #: wp-includes/media-template.php:647 msgid "Embed Media Player" msgstr "IntÃ©grer le lecteur de mÃ©dia" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:477 +msgid "Deselect" +msgstr "DÃ©sÃ©lectionner" +||||||| .r11156 +#: wp-includes/pluggable.php:1073 +msgid "You should specify a nonce action to be verified by using the first parameter." +msgstr "Vous devriez prÃ©ciser une action de type « nonce », qui sera vÃ©rifiÃ©e par le premier paramÃ¨tre." +======= #: wp-includes/media-template.php:636 wp-includes/media-template.php:714 #: wp-includes/media-template.php:862 wp-includes/media-template.php:966 msgid "Link To" msgstr "Lier Ã " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:608 +msgid "Attachment Display Settings" +msgstr "RÃ©glages de l’affichage du fichier attachÃ©" +||||||| .r11156 +#: wp-includes/taxonomy.php:483 +msgid "View Tag" +msgstr "Voir le mot-clÃ©" +======= #: wp-includes/media-template.php:634 msgid "Embed or Link" msgstr "IntÃ©grer ou lier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:660 wp-includes/media-template.php:731 +#: wp-includes/media-template.php:974 +msgid "Media File" +msgstr "Fichier mÃ©dia" +||||||| .r11156 +#: wp-includes/taxonomy.php:483 +msgid "View Category" +msgstr "Afficher la catÃ©gorie" +======= #: wp-includes/media-template.php:604 msgid "Attachment Display Settings" msgstr "RÃ©glages de l’affichage du fichier attachÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: This is a would-be plural string used in the media manager. +#. If there is not a word you can use in your language to avoid issues with +#. the lack of plural support here, turn it into "selected: %d" then +#. translate it. +#: wp-includes/media.php:3043 +msgid "%d selected" +msgstr "%d sÃ©lection(s)" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:137 +msgid "Wider" +msgstr "Plus large" +======= #: wp-includes/media-template.php:597 wp-includes/script-loader.php:552 msgid "Clear" msgstr "Effacer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1236 wp-includes/media.php:3059 +msgid "No items found." +msgstr "Aucun Ã©lÃ©ment trouvÃ©." +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:138 +msgid "Narrower" +msgstr "Plus Ã©troit" +======= #: wp-includes/media-template.php:594 msgid "Edit Selection" msgstr "Modifier la sÃ©lection" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3060 +msgid "Insert into post" +msgstr "InsÃ©rer dans l’article" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:139 +msgid "Default width" +msgstr "Largeur par dÃ©faut" +======= #: wp-includes/media-template.php:526 msgid "Refresh" msgstr "RafraÃ®chir" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3064 +msgid "" +"You are about to permanently delete this item.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement cet Ã©lÃ©ment.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1263 +msgid "Word count: %s" +msgstr "Compteur de mots : %s" +======= #: wp-includes/media-template.php:497 wp-includes/media.php:3046 msgid "Attachment Details" msgstr "DÃ©tails du fichier attachÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3083 +msgid "Insert from URL" +msgstr "InsÃ©rer Ã partir d’une adresse web" +||||||| .r11156 +#: wp-activate.php:121 +msgid "Your account is now activated. Log in or go back to the homepage." +msgstr "Votre compte est maintenant activÃ©. Connectez-vous ou retournez sur la page d’accueil de votre site." +======= #: wp-includes/media-template.php:489 msgid "Describe this media file…" msgstr "DÃ©crivez ce fichier mÃ©dia…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3096 +msgid "Add to Gallery" +msgstr "Ajouter Ã la galerie" +||||||| .r11156 +#: wp-activate.php:119 +msgid "Your account is now activated. View your site or Log in" +msgstr "Votre compte est maintenant activÃ©. Consultez votre site ou connectez-vous" +======= #: wp-includes/media-template.php:487 msgid "Describe this audio file…" msgstr "DÃ©crivez ce fichier audio…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3097 +msgid "Reverse order" +msgstr "Inverser l’ordre" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1217 +msgid "Help (Alt + Shift + H)" +msgstr "Aide (Alt + Maj. + H)" +======= #: wp-includes/media-template.php:485 msgid "Describe this video…" msgstr "DÃ©crivez cette vidÃ©o…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:442 wp-includes/media-template.php:544 +#: wp-includes/media.php:3072 +msgid "Delete Permanently" +msgstr "Supprimer dÃ©finitivement" +||||||| .r11156 +#: wp-includes/admin-bar.php:191 +msgid "Howdy, %1$s" +msgstr "Salutations, %1$s" +======= #: wp-includes/media-template.php:481 msgid "Caption this image…" msgstr "DÃ©crivez cette image…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:484 +msgid "Caption this image…" +msgstr "DÃ©crivez cette image…" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1194 +msgid "Exit fullscreen" +msgstr "Sortir du plein Ã©cran" +======= #: wp-includes/media-template.php:474 msgid "Deselect" msgstr "DÃ©sÃ©lectionner" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:754 +msgid "Random Order" +msgstr "Ordre alÃ©atoire" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1264 +msgid "Just write." +msgstr "Il ne reste plus qu’Ã Ã©crire." +======= #: wp-includes/media-template.php:439 wp-includes/media-template.php:542 #: wp-includes/media.php:3038 msgid "Delete Permanently" msgstr "Supprimer dÃ©finitivement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3056 +msgid "← Return to library" +msgstr "← Revenir Ã la bibliothÃ¨que" +||||||| .r11156 +#: wp-includes/script-loader.php:428 +msgid "Approve and Reply" +msgstr "Approuver et rÃ©pondre" +======= #: wp-includes/media-template.php:436 wp-includes/media-template.php:539 msgctxt "verb" msgid "Trash" msgstr "Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:2558 +msgid "No editor could be selected." +msgstr "Aucun Ã©diteur n’a pas pu Ãªtre sÃ©lectionnÃ©." +||||||| .r11156 +#: wp-includes/post.php:1633 +msgid "All Posts" +msgstr "Tous les articles" +======= #: wp-includes/media-template.php:434 wp-includes/media-template.php:537 msgid "Untrash" msgstr "Sortir de la Corbeille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:197 +msgid "The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead." +msgstr "Le navigateur web de votre systÃ¨me ne permet pas de mettre des fichiers en ligne. Vous devriez pouvoir le faire en passant par une application native." +||||||| .r11156 +#: wp-includes/post.php:1633 +msgid "All Pages" +msgstr "Toutes les pages" +======= #: wp-includes/media-template.php:429 msgid "Edit more details" msgstr " Indiquer plus de dÃ©tails" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:356 wp-includes/media-template.php:533 +msgid "Length:" +msgstr "DurÃ©e :" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1253 +msgid "Updated." +msgstr "Mis Ã jour." +======= #: wp-includes/media-template.php:427 msgid "View attachment page" msgstr "Afficher la page du fichier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:638 +msgid "Embed or Link" +msgstr "IntÃ©grer ou lier" +||||||| .r11156 +#: wp-includes/script-loader.php:94 +msgid "fullscreen" +msgstr "plein Ã©cran" +======= #: wp-includes/media-template.php:415 msgid "Uploaded To" msgstr "Mis en ligne sur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:651 +msgid "Embed Media Player" +msgstr "IntÃ©grer le lecteur de mÃ©dia" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1209 +msgid "Bold (Ctrl + B)" +msgstr "Gras (Ctrl + B)" +======= #: wp-includes/media-template.php:410 msgid "Uploaded By" msgstr "Mise en ligne par" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:658 +msgid "Link to Media File" +msgstr "Lien vers le fichier mÃ©dia" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1210 +msgid "Italic (Ctrl + I)" +msgstr "Italique (Ctrl + I)" +======= #: wp-includes/media-template.php:401 wp-includes/media-template.php:580 #: wp-includes/media-template.php:839 msgid "Alt Text" msgstr "Texte alternatif" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:665 +msgid "Link to Attachment Page" +msgstr "Lien vers la page du fichier attachÃ©" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1212 +msgid "Ordered list (Alt + Shift + O)" +msgstr "Liste ordonnÃ©e (Alt + Maj. + O)" +======= #: wp-includes/media-template.php:387 wp-includes/media-template.php:566 #: wp-includes/media.php:1491 msgid "Album" msgstr "Album" +>>>>>>> .r12027 -#: wp-includes/media-template.php:386 wp-includes/media-template.php:565 -#: wp-includes/media.php:1490 +<<<<<<< .mine +#: wp-includes/media-template.php:814 +msgid "Show Images" +msgstr "Montrer les images" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1211 +msgid "Unordered list (Alt + Shift + U)" +msgstr "Liste non ordonnÃ©e (Alt + Shift + U)" +======= +#: wp-includes/media-template.php:386 wp-includes/media-template.php:565 +#: wp-includes/media.php:1490 msgid "Artist" msgstr "Artiste" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1085 wp-includes/media-template.php:1174 +msgid "Metadata" +msgstr "MÃ©tadonnÃ©es" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1215 +msgid "Insert/edit link (Alt + Shift + A)" +msgstr "InsÃ©rer/modifier un lien (Alt + Shift + A)" +======= #: wp-includes/media-template.php:360 msgid "Bitrate:" msgstr "DÃ©bit binaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1165 +msgid "Poster Image" +msgstr "Image de couverture" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1216 +msgid "Unlink (Alt + Shift + S)" +msgstr "DÃ©faire le lien (Alt + Maj. + S)" +======= #: wp-includes/media-template.php:355 wp-includes/media-template.php:531 msgid "Length:" msgstr "DurÃ©e :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3054 +msgid "Create a new playlist" +msgstr "CrÃ©er une nouvelle liste de lecture" +||||||| .r11156 +#: wp-includes/comment-template.php:1774 +msgid "Pingback:" +msgstr "Ping :" +======= #: wp-includes/media-template.php:350 msgid "Dimensions:" msgstr "Dimensions :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3055 +msgid "Create a new video playlist" +msgstr "CrÃ©er une nouvelle liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:831 +msgid "Poster" +msgstr "Image" +======= #: wp-includes/media-template.php:347 msgid "File size:" msgstr "Taille du fichier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3107 +msgid "Select and Crop" +msgstr "SÃ©lectionner et rogner" +||||||| .r11156 +#: wp-includes/media-template.php:1035 wp-includes/media-template.php:1125 +msgid "Preload" +msgstr "PrÃ©charger" +======= #: wp-includes/media-template.php:345 msgid "Uploaded on:" msgstr "Mis en ligne le :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3131 +msgid "Create Audio Playlist" +msgstr "CrÃ©er une liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-http.php:221 +msgid "Destination directory for file streaming does not exist or is not writable." +msgstr "Le dossier de destination pour la diffusion de fichier n’existe pas ou n’est pas accessible en Ã©criture." +======= #: wp-includes/media-template.php:344 msgid "File type:" msgstr "Type du fichier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3140 +msgid "Drag and drop to reorder videos." +msgstr "Glisser-dÃ©poser pour rÃ©organiser les vidÃ©os." +||||||| .r11156 +#: wp-includes/class-http.php:350 +msgid "There are no HTTP transports available which can complete the requested request." +msgstr "Il n’y a pas de transport HTTP disponible pour mener Ã bien la requÃªte demandÃ©e." +======= #: wp-includes/media-template.php:343 msgid "File name:" msgstr "Nom du fichier :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3141 +msgid "Create Video Playlist" +msgstr "CrÃ©er une liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/taxonomy.php:119 wp-includes/taxonomy.php:120 +msgctxt "post format" +msgid "Format" +msgstr "Format" +======= #: wp-includes/media-template.php:332 wp-includes/media-template.php:525 #: wp-includes/media.php:3069 msgid "Edit Image" msgstr "Modifier lâimage" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3142 +msgid "Edit Video Playlist" +msgstr "Modifier une liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1383 +msgid "Enter the destination URL" +msgstr "Saisissez l’adresse de destination" +======= #: wp-includes/media-template.php:284 msgid "Edit next media item" msgstr "Modifier l’Ã©lÃ©ment mÃ©dia suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3143 +msgid "← Cancel Video Playlist" +msgstr "← Annuler la liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1394 +msgid "Or link to existing content" +msgstr "Ou alors, faites un lien vers l’un des contenus de votre site" +======= #: wp-includes/media-template.php:283 msgid "Edit previous media item" msgstr "Modifier l’Ã©lÃ©ment mÃ©dia prÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3144 +msgid "Insert video playlist" +msgstr "InsÃ©rer une liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/query.php:144 wp-includes/query.php:165 +#: wp-includes/query.php:186 wp-includes/query.php:210 +#: wp-includes/query.php:234 wp-includes/query.php:258 +#: wp-includes/query.php:287 wp-includes/query.php:307 +#: wp-includes/query.php:327 wp-includes/query.php:347 +#: wp-includes/query.php:368 wp-includes/query.php:388 +#: wp-includes/query.php:418 wp-includes/query.php:447 +#: wp-includes/query.php:467 wp-includes/query.php:494 +#: wp-includes/query.php:514 wp-includes/query.php:534 +#: wp-includes/query.php:554 wp-includes/query.php:574 +#: wp-includes/query.php:603 wp-includes/query.php:630 +#: wp-includes/query.php:650 wp-includes/query.php:670 +#: wp-includes/query.php:690 wp-includes/query.php:710 +msgid "Conditional query tags do not work before the query is run. Before then, they always return false." +msgstr "Les balises de requÃªte conditionnelle ne fonctionnent pas avant le lancement de la requÃªte. Avant cela, elles renvoient toujours le boolÃ©en false." +======= #: wp-includes/media-template.php:276 msgid "Error" msgstr "Erreur " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3145 +msgid "Update video playlist" +msgstr "Mettre Ã jour la liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/ms-functions.php:1001 +msgid "The user is already active." +msgstr "Cet utilisateur est dÃ©jÃ activÃ©." +======= #: wp-includes/media-template.php:262 msgid "Dismiss Errors" msgstr "Ignorer les erreurs" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3146 +msgid "Add to video playlist" +msgstr "Ajouter Ã la liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/functions.php:3370 +msgid "%1$s was called incorrectly. %2$s %3$s" +msgstr "%1$s est appelÃ©e de la mauvaise maniÃ¨re. %2$s %3$s" +======= #: wp-includes/media-template.php:261 msgid "Uploading" msgstr "Mise en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3147 +msgid "Add to Video Playlist" +msgstr "Ajouter Ã la liste de lecture vidÃ©o" +||||||| .r11156 +#: wp-includes/functions.php:3368 +msgid "(This message was added in version %s.)" +msgstr "(Ce message a Ã©tÃ© ajoutÃ© Ã la version %s.)" +======= #: wp-includes/media-template.php:256 msgid "Grid View" msgstr "Vue en grille" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3109 +msgid "Crop Image" +msgstr "Recadrer l’image" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5695 +msgid "Sorry, you cannot publish this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas publier cet article." +======= #: wp-includes/media-template.php:253 msgid "List View" msgstr "Vue en liste" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3110 +msgid "Crop your image" +msgstr "Recadrer votre image" +||||||| .r11156 +#: wp-includes/pluggable.php:1418 +msgid "Permalink: %s" +msgstr "Permalien : %s" +======= #: wp-includes/media-template.php:239 wp-includes/media.php:3078 msgid "Suggested image dimensions:" msgstr "Dimensions d’image suggÃ©rÃ©es :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3124 +msgid "Add Video Source" +msgstr "Ajouter une source vidÃ©o" +||||||| .r11156 +#: wp-includes/post-formats.php:92 +msgctxt "Post format" +msgid "Standard" +msgstr "Par dÃ©faut" +======= #: wp-includes/media-template.php:234 msgid "Maximum upload file size: %s." msgstr "Taille de fichier maximale pour la mise en ligne : %s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1092 wp-includes/media-template.php:1181 +msgid "Autoplay" +msgstr "Lecture automatique" +||||||| .r11156 +#: wp-includes/post.php:1337 wp-includes/post.php:1338 +msgid "Post types cannot exceed 20 characters in length" +msgstr "Les types de contenu ne peuvent dÃ©passer les 20 caractÃ¨res." +======= #: wp-includes/media-template.php:206 msgid "Select Files" msgstr "SÃ©lectionner des fichiers" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3127 +msgid "Add Subtitles" +msgstr "Ajouter des sous-titres" +||||||| .r11156 +#: wp-signup.php:112 +msgid "Your address will be %s." +msgstr "Votre adresse sera %s." +======= #: wp-includes/media-template.php:205 msgctxt "Uploader: Drop files here - or - Select Files" msgid "or" msgstr "ou" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3130 +msgid "Drag and drop to reorder tracks." +msgstr "Glisser-dÃ©poser pour rÃ©organiser les pistes." +||||||| .r11156 +#: wp-signup.php:111 +msgid "domain" +msgstr "domaine" +======= #: wp-includes/media-template.php:204 msgid "Drop files anywhere to upload" msgstr "DÃ©posez vos fichiers n’importe oÃ¹ pour les mettre en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3126 +msgid "Select Poster Image" +msgstr "Choisir une image de couverture" +||||||| .r11156 +#: wp-includes/admin-bar.php:605 +msgctxt "admin bar menu group label" +msgid "Add New" +msgstr "CrÃ©er" +======= #: wp-includes/media-template.php:197 msgid "Upload Limit Exceeded" msgstr "Limite de mise en ligne dÃ©passÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:892 wp-includes/media.php:3036 +msgid "Replace" +msgstr "Remplacer" +||||||| .r11156 +#: wp-includes/post-formats.php:101 +msgctxt "Post format" +msgid "Audio" +msgstr "Son" +======= #: wp-includes/media-template.php:195 msgid "The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead." msgstr "Le navigateur web de votre systÃ¨me ne permet pas de mettre des fichiers en ligne. Vous devriez pouvoir le faire en passant par une application native." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1190 +msgid "Tracks (subtitles, captions, descriptions, chapters, or metadata)" +msgstr "Pistes (sous-titres, lÃ©gendes, descriptions, chapitres ou mÃ©tadonnÃ©es)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4448 +#: wp-includes/class-wp-xmlrpc-server.php:4753 +msgid "Invalid post format" +msgstr "Format d’article invalide" +======= #: wp-includes/media-template.php:188 msgid "Close uploader" msgstr "Fermer le panneau de chargement" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3111 +msgid "Cropping…" +msgstr "Recadrage…" +||||||| .r11156 +#: wp-includes/pluggable.php:1410 wp-includes/pluggable.php:1539 +msgid "Whois : http://whois.arin.net/rest/ip/%s" +msgstr "Whois : http://whois.arin.net/rest/ip/%s" +======= #: wp-includes/media-template.php:175 wp-includes/media-template.php:181 msgid "Drop files to upload" msgstr "DÃ©posez vos fichiers pour les mettre en ligne" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3116 +msgid "Audio Details" +msgstr "DÃ©tails audio" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1391 wp-includes/media-template.php:961 +msgid "Open link in a new window/tab" +msgstr "Ouvrir le lien dans une nouvelle fenÃªtre/un nouvel onglet" +======= #: wp-includes/media-template.php:167 msgid "Close media panel" msgstr "Fermer le panneau des mÃ©dias" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3122 +msgid "Video Details" +msgstr "DÃ©tails de la vidÃ©o" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1411 +msgid "No search term specified. Showing recent items." +msgstr "Aucun mot n’a Ã©tÃ© donnÃ© pour cette recherche. Voici les recherches prÃ©cÃ©dentes." +======= #. translators: localized date and time format, see http:php.net/date #: wp-includes/locale.php:352 msgid "F j, Y g:i a" msgstr "j F Y G \\h i \\m\\i\\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3102 wp-includes/media.php:3119 +#: wp-includes/media.php:3125 +msgid "Cancel Edit" +msgstr "Annuler la modification" +||||||| .r11156 +#: wp-includes/plugin.php:806 +msgid "Only a static class method or function can be used in an uninstall hook." +msgstr "Seule une mÃ©thode statique de classe ou une fonction peut Ãªtre utilisÃ©e avec un crochet de dÃ©sinstallation." +======= #. translators: localized time format, see http:php.net/date #: wp-includes/locale.php:350 msgid "g:i a" msgstr "G \\h i \\m\\i\\n" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3118 +msgid "Add Audio Source" +msgstr "Ajouter une source audio" +||||||| .r11156 +#: wp-includes/post.php:2999 +msgid "Passing an integer number of posts is deprecated. Pass an array of arguments instead." +msgstr "Il n’est pas recommandÃ© de passer un nombre entier d’articles ; il est prÃ©fÃ©rable de passer un tableau d’arguments." +======= #. translators: localized date format, see http:php.net/date #: wp-includes/locale.php:348 msgid "F j, Y" msgstr "j F Y" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3117 +msgid "Replace Audio" +msgstr "Remplacer le son" +||||||| .r11156 +#: wp-includes/post-formats.php:93 +msgctxt "Post format" +msgid "Aside" +msgstr "En passant" +======= #. translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. #: wp-includes/locale.php:182 msgctxt "text direction" msgid "ltr" msgstr "ltr" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3123 +msgid "Replace Video" +msgstr "Remplacer la vidÃ©o" +||||||| .r11156 +#: wp-includes/post-formats.php:94 +msgctxt "Post format" +msgid "Chat" +msgstr "Discussion" +======= #. translators: $dec_point argument for http:php.net/number_format, default is #. . #: wp-includes/locale.php:175 msgid "number_format_decimal_point" msgstr ", " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3108 +msgid "Skip Cropping" +msgstr "Pas de recadrage" +||||||| .r11156 +#: wp-includes/post-formats.php:95 +msgctxt "Post format" +msgid "Gallery" +msgstr "Galerie" +======= #. translators: $thousands_sep argument for http:php.net/number_format, default #. is , #: wp-includes/locale.php:171 msgid "number_format_thousands_sep" msgstr " " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1084 wp-includes/media-template.php:1173 +msgctxt "auto preload" +msgid "Auto" +msgstr "Automatique" +||||||| .r11156 +#: wp-includes/post-formats.php:96 +msgctxt "Post format" +msgid "Link" +msgstr "Lien" +======= #: wp-includes/locale.php:165 msgid "PM" msgstr " " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3077 +msgid "No media attachments found." +msgstr "Il n’y a pas de fichier mÃ©dia attachÃ©." +||||||| .r11156 +#: wp-includes/post-formats.php:97 +msgctxt "Post format" +msgid "Image" +msgstr "Image" +======= #: wp-includes/locale.php:164 msgid "AM" msgstr " " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1015 +msgid "Link CSS Class" +msgstr "Classe CSS du lien" +||||||| .r11156 +#: wp-includes/post-formats.php:98 +msgctxt "Post format" +msgid "Quote" +msgstr "Citation" +======= #: wp-includes/locale.php:163 msgid "pm" msgstr " " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:795 +msgid "Show Video List" +msgstr "Afficher la list des vidÃ©os" +||||||| .r11156 +#: wp-includes/post-formats.php:99 +msgctxt "Post format" +msgid "Status" +msgstr "Ãtat" +======= #: wp-includes/locale.php:162 msgid "am" msgstr " " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:891 +msgid "Edit Original" +msgstr "Modifier l’original" +||||||| .r11156 +#: wp-includes/post-formats.php:100 +msgctxt "Post format" +msgid "Video" +msgstr "VidÃ©o" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:155 msgid "Dec_December_abbreviation" msgstr "dÃ©c" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:959 +msgid "Custom Size" +msgstr "Taille personalisÃ©e" +||||||| .r11156 +#: wp-includes/post.php:1631 +msgid "No pages found in Trash." +msgstr "Aucune page trouvÃ©e dans la corbeille." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:154 msgid "Nov_November_abbreviation" msgstr "nov" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:994 +msgid "Advanced Options" +msgstr "Options avancÃ©es" +||||||| .r11156 +#: wp-includes/post.php:1630 +msgid "No pages found." +msgstr "Aucune page trouvÃ©e." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:153 msgid "Oct_October_abbreviation" msgstr "oct" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1002 +msgid "Image CSS Class" +msgstr "Classe CSS de l’image" +||||||| .r11156 +#: wp-includes/post.php:1631 +msgid "No posts found in Trash." +msgstr "Aucun article trouvÃ© dans la corbeille." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:152 msgid "Sep_September_abbreviation" msgstr "sept" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:389 wp-includes/media-template.php:569 +#: wp-includes/media.php:1513 +msgid "Artist" +msgstr "Artiste" +||||||| .r11156 +#: wp-includes/admin-bar.php:469 +msgid "Shortlink" +msgstr "Lien court" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:151 msgid "Aug_August_abbreviation" msgstr "aoÃ»t" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:390 wp-includes/media-template.php:570 +#: wp-includes/media.php:1514 +msgid "Album" +msgstr "Album" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1255 +#: wp-includes/class-wp-xmlrpc-server.php:3575 +#: wp-includes/class-wp-xmlrpc-server.php:4631 +#: wp-includes/class-wp-xmlrpc-server.php:4964 +msgid "Invalid attachment ID." +msgstr "Identifiant du fichier invalide." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:150 msgid "Jul_July_abbreviation" msgstr "juil" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:1518 +msgid "Genre" +msgstr "Genre" +||||||| .r11156 +#: wp-includes/registration-functions.php:7 wp-includes/registration.php:7 +msgid "This file no longer needs to be included." +msgstr "Ce fichier n’a plus besoin d’Ãªtre inclus." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:149 msgid "Jun_June_abbreviation" msgstr "juin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:1519 +msgid "Year" +msgstr "AnnÃ©e" +||||||| .r11156 +#: wp-login.php:522 +msgid "Please enter your username or email address. You will receive a link to create a new password via email." +msgstr "Veuillez saisir votre identifiant ou votre adresse de messagerie. Un lien permettant de crÃ©er un nouveau mot de passe vous sera envoyÃ© par e-mail." +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:148 msgid "May_May_abbreviation" msgstr "mai" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:1520 +msgctxt "video or audio" +msgid "Length" +msgstr "DurÃ©e" +||||||| .r11156 +#: wp-includes/default-widgets.php:353 wp-includes/default-widgets.php:633 +msgid "Display as dropdown" +msgstr "Afficher comme liste dÃ©roulante" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:147 msgid "Apr_April_abbreviation" msgstr "avr" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3113 +msgid "There has been an error cropping your image." +msgstr "Une erreur est survenue lors du recadrage de votre image." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:474 +msgid "Large size image height" +msgstr "Hauteur de l’image en grande taille" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:146 msgid "Mar_March_abbreviation" msgstr "mar" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3132 +msgid "Edit Audio Playlist" +msgstr "Modifier la liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:459 +msgid "Medium size image width" +msgstr "Largeur de l’image en taille moyenne" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:145 msgid "Feb_February_abbreviation" msgstr "fÃ©v" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3133 +msgid "← Cancel Audio Playlist" +msgstr "← Annuler la liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:464 +msgid "Medium size image height" +msgstr "Hauteur de l’image en taille moyenne" +======= #. translators: three-letter abbreviation of the month #: wp-includes/locale.php:144 msgid "Jan_January_abbreviation" msgstr "jan" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3134 +msgid "Insert audio playlist" +msgstr "InsÃ©rer une liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:469 +msgid "Large size image width" +msgstr "Largeur de l’image en grande taille" +======= #. translators: month name #: wp-includes/locale.php:140 wp-includes/locale.php:155 msgid "December" msgstr "dÃ©cembre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3135 +msgid "Update audio playlist" +msgstr "Mettre Ã jour la liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:454 +msgid "Crop thumbnail to exact dimensions" +msgstr "Recadrer les images pour parvenir aux dimensions exactes" +======= #. translators: month name #: wp-includes/locale.php:139 wp-includes/locale.php:154 msgid "November" msgstr "novembre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3136 +msgid "Add to audio playlist" +msgstr "Ajouter Ã la liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:449 +msgid "Thumbnail Height" +msgstr "Hauteur des miniatures" +======= #. translators: month name #: wp-includes/locale.php:138 wp-includes/locale.php:153 msgid "October" msgstr "octobre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3137 +msgid "Add to Audio Playlist" +msgstr "Ajouter Ã la liste de lecture audio" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:444 +msgid "Thumbnail Width" +msgstr "Largeur des miniatures" +======= #. translators: month name #: wp-includes/locale.php:137 wp-includes/locale.php:152 msgid "September" msgstr "septembre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3100 +msgid "Image Details" +msgstr "DÃ©tails de l’image" +||||||| .r11156 +#: wp-includes/script-loader.php:361 +msgid "No matches found." +msgstr "Aucune correspondance trouvÃ©e." +======= #. translators: month name #: wp-includes/locale.php:136 wp-includes/locale.php:151 msgid "August" msgstr "aoÃ»t" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:806 +msgid "Show Artist Name in Tracklist" +msgstr "Afficher le nom de l’artiste dans la liste de lecture" +||||||| .r11156 +#: wp-login.php:620 +msgid "New password" +msgstr "Nouveau mot de passe" +======= #. translators: month name #: wp-includes/locale.php:135 wp-includes/locale.php:150 msgid "July" msgstr "juillet" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1203 +msgid "There are no associated subtitles." +msgstr "Il n’y a pas de sous-titres associÃ©s." +||||||| .r11156 +#: wp-login.php:624 +msgid "Confirm new password" +msgstr "Confirmer le nouveau mot de passe" +======= #. translators: month name #: wp-includes/locale.php:134 wp-includes/locale.php:149 msgid "June" msgstr "juin" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3101 +msgid "Replace Image" +msgstr "Remplacer l’image" +||||||| .r11156 +#: wp-login.php:364 +msgid "To reset your password, visit the following address:" +msgstr "Pour renouveler votre mot de passe, cliquez sur le lien suivant :" +======= #. translators: month name #: wp-includes/locale.php:133 wp-includes/locale.php:148 msgid "May" msgstr "mai" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:912 +msgid "Display Settings" +msgstr "RÃ©glages de l’affichage" +||||||| .r11156 +#: wp-login.php:613 wp-login.php:643 +msgid "Reset Password" +msgstr "RÃ©initialiser le mot de passe" +======= #. translators: month name #: wp-includes/locale.php:132 wp-includes/locale.php:147 msgid "April" msgstr "avril" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:998 +msgid "Image Title Attribute" +msgstr "Attribut « Title » de l’image" +||||||| .r11156 +#: wp-login.php:590 +msgid "The passwords do not match." +msgstr "Vos mots de passe ne correspondent pas." +======= #. translators: month name #: wp-includes/locale.php:131 wp-includes/locale.php:146 msgid "March" msgstr "mars" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3065 +msgid "" +"You are about to permanently delete these items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement ces Ã©lÃ©ments.\n" +"Â« Annuler Â» pour arrÃªter, Â« OK Â» pour continuer." +||||||| .r11156 +#: wp-login.php:605 +msgid "Password Reset" +msgstr "Renouvellement du mot de passe" +======= #. translators: month name #: wp-includes/locale.php:130 wp-includes/locale.php:145 msgid "February" msgstr "fÃ©vrier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1199 +msgctxt "media" +msgid "Remove video track" +msgstr "Supprimer la piste vidÃ©o" +||||||| .r11156 +#: wp-login.php:605 +msgid "Your password has been reset." +msgstr "Votre mot de passe a Ã©tÃ© rÃ©initialisÃ©." +======= #. translators: month name #: wp-includes/locale.php:129 wp-includes/locale.php:144 msgid "January" msgstr "janvier" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/media-template.php:1134 wp-includes/media-template.php:1146 +msgid "Remove video source" +msgstr "Supprimer la source vidÃ©o" +||||||| .r11156 +#: wp-login.php:360 +msgid "Someone requested that the password be reset for the following account:" +msgstr "Quelqu'un a demandÃ© le renouvellement de son mot de passe pour le compte suivant :" +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:126 msgid "Sat" msgstr "sam" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1051 wp-includes/media-template.php:1065 +msgid "Remove audio source" +msgstr "Supprimer la source audio" +||||||| .r11156 +#: wp-login.php:363 +msgid "If this was a mistake, just ignore this email and nothing will happen." +msgstr "S'il s'agit d'une erreur, ignorez ce message et la demande ne sera pas prise en compte." +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:125 msgid "Fri" msgstr "ven" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/ms-functions.php:498 +msgid "Username may not be longer than 60 characters." +msgstr "L'identifiant ne doit pas faire plus de 60 caractÃ¨res." +||||||| .r11156 +#: wp-login.php:613 +msgid "Enter your new password below." +msgstr "Veuillez saisir une deuxiÃ¨me fois votre nouveau mot de passe ci-dessous." +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:124 msgid "Thu" msgstr "jeu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:785 +msgid "Playlist Settings" +msgstr "RÃ©glages de liste de lecture" +||||||| .r11156 +#: wp-includes/post-formats.php:70 +msgid "Invalid post" +msgstr "Article invalide" +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:123 msgid "Wed" msgstr "mer" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3076 +msgid "Search Media" +msgstr "Rechercher un fichier mÃ©dia" +||||||| .r11156 +#: wp-includes/admin-bar.php:244 +msgid "Edit My Profile" +msgstr "Modifier mon profil" +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:122 msgid "Tue" msgstr "mar" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3066 +msgid "" +"You are about to trash these items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de mettre ces Ã©lÃ©ments Ã la Corbeille.\n" +"Â« Annuler Â» pour arrÃªter, Â« OK Â» pour les supprimer." +||||||| .r11156 +#: wp-includes/admin-bar.php:201 +msgid "My Account" +msgstr "Mon compte" +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:121 msgid "Mon" msgstr "lun" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3044 +msgid "Drag and drop to reorder media files." +msgstr "Glissez/dÃ©placez les mÃ©dias pour les rÃ©organiser." +||||||| .r11156 +#: wp-includes/admin-bar.php:435 +msgid "Manage Comments" +msgstr "GÃ©rer les commentaires" +======= #. translators: three-letter abbreviation of the weekday #: wp-includes/locale.php:120 msgid "Sun" msgstr "dim" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3068 +msgid "Cancel Selection" +msgstr "Annuler la sÃ©lection" +||||||| .r11156 +#: wp-includes/ms-functions.php:475 wp-includes/ms-functions.php:628 +msgid "Only lowercase letters (a-z) and numbers are allowed." +msgstr "Seuls les lettres minuscules (de a Ã z) et chiffres sont autorisÃ©s." +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:113 msgid "S_Saturday_initial" msgstr "S" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3071 +msgid "Delete Selected" +msgstr "Supprimer la sÃ©lection" +||||||| .r11156 +#: wp-includes/query.php:2402 +msgid "\"caller_get_posts\" is deprecated. Use \"ignore_sticky_posts\" instead." +msgstr "« caller_get_posts » n’est plus recommandÃ©. Utilisez « ignore_sticky_posts » Ã la place." +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:112 msgid "F_Friday_initial" msgstr "V" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:1522 +msgid "Bitrate" +msgstr "DÃ©bit" +||||||| .r11156 +#: wp-includes/taxonomy.php:97 +msgid "New Link Category Name" +msgstr "Nom de la nouvelle catÃ©gorie de liens" +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:111 msgid "T_Thursday_initial" msgstr "J" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:190 +msgid "Close uploader" +msgstr "Fermer le panneau de chargement" +||||||| .r11156 +#: wp-includes/taxonomy.php:96 +msgid "Add New Link Category" +msgstr "Ajouter une catÃ©gorie de liens" +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:110 msgid "W_Wednesday_initial" msgstr "Me" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3069 +msgid "Trash Selected" +msgstr "Mettre la sÃ©lection Ã la Corbeille" +||||||| .r11156 +#: wp-includes/taxonomy.php:95 +msgid "Update Link Category" +msgstr "Mettre Ã jour la catÃ©gorie de liens" +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:109 msgid "T_Tuesday_initial" msgstr "Ma" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3070 +msgid "Untrash Selected" +msgstr "Retirer la sÃ©lection de la Corbeille" +||||||| .r11156 +#: wp-includes/taxonomy.php:93 +msgid "All Link Categories" +msgstr "Toutes les catÃ©gories de liens" +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:108 msgid "M_Monday_initial" msgstr "L" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:437 wp-includes/media-template.php:539 +msgid "Untrash" +msgstr "Sortir de la Corbeille" +||||||| .r11156 +#: wp-includes/taxonomy.php:91 +msgid "Search Link Categories" +msgstr "Chercher une catÃ©gorie de liens" +======= #. translators: one-letter abbreviation of the weekday #: wp-includes/locale.php:107 msgid "S_Sunday_initial" msgstr "D" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3067 +msgid "Bulk Select" +msgstr "SÃ©lection en masse" +||||||| .r11156 +#: wp-includes/taxonomy.php:90 +msgid "Link Category" +msgstr "CatÃ©gorie de liens" +======= #. translators: weekday #: wp-includes/locale.php:103 wp-includes/locale.php:113 #: wp-includes/locale.php:126 msgid "Saturday" msgstr "samedi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:255 +msgid "List View" +msgstr "Vue en liste" +||||||| .r11156 +#: wp-includes/admin-bar.php:355 +msgid "Network Admin" +msgstr "Admin du rÃ©seau" +======= #. translators: weekday #: wp-includes/locale.php:102 wp-includes/locale.php:112 #: wp-includes/locale.php:125 msgid "Friday" msgstr "vendredi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:258 +msgid "Grid View" +msgstr "Vue en grille" +||||||| .r11156 +#: wp-includes/ms-load.php:412 +msgid "Read the bug report page. Some of the guidelines there may help you figure out what went wrong." +msgstr "Lisez la page de gestions des bugs (en anglais). Certaines des bonnes pratiques qui y sont prÃ©sentÃ©es pourraient vous aider Ã comprendre ce qui a mal tournÃ©." +======= #. translators: weekday #: wp-includes/locale.php:101 wp-includes/locale.php:111 #: wp-includes/locale.php:124 msgid "Thursday" msgstr "jeudi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:361 +msgid "Bitrate:" +msgstr "DÃ©bit binaire" +||||||| .r11156 +#: wp-includes/ms-functions.php:877 wp-includes/ms-functions.php:962 +msgid "[%1$s] Activate %2$s" +msgstr "[%1s] Activation de %2s" +======= #. translators: weekday #: wp-includes/locale.php:100 wp-includes/locale.php:110 #: wp-includes/locale.php:123 msgid "Wednesday" msgstr "mercredi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:413 +msgid "Uploaded By" +msgstr "Mise en ligne par" +||||||| .r11156 +#: wp-includes/load.php:117 +msgid "Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s." +msgstr "Votre serveur utilise la version %1$s de PHP mais WordPress %2$s nÃ©cessite au moins la version %3$s." +======= #. translators: weekday #: wp-includes/locale.php:99 wp-includes/locale.php:109 #: wp-includes/locale.php:122 @@ -3563,553 +11649,1929 @@ msgstr "Votre installation PHP ne dispose pas de MySQL. Extension requise pour W #: wp-includes/load.php:117 msgid "Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s." msgstr "Votre serveur utilise la version %1$s de PHP mais WordPress %2$s nÃ©cessite au moins la version %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:418 +msgid "Uploaded To" +msgstr "Mis en ligne sur" +||||||| .r11156 +#: wp-includes/pluggable.php:1520 +msgid "A new trackback on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau rÃ©trolien sur l'article Â« %s Â» attend votre approbation" +======= #: wp-includes/link-template.php:3361 msgid "This is the short link." msgstr "Ceci est un lien court." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:430 +msgid "View attachment page" +msgstr "Afficher la page du fichier" +||||||| .r11156 +#: wp-includes/ms-load.php:404 +msgid "If you are the owner of this network please check that MySQL is running properly and all tables are error free." +msgstr "Si vous Ãªtes le gestionnaire de ce rÃ©seau de sites, veuillez vous assurer que MySQL fonctionne correctement et qu’aucune table n’a d’erreur." +======= #: wp-includes/link-template.php:2529 msgid "« Older Comments" msgstr "« Commentaires plus anciens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:432 +msgid "Edit more details" +msgstr " Indiquer plus de dÃ©tails" +||||||| .r11156 +#: wp-includes/ms-load.php:403 +msgid "If your site does not display, please contact the owner of this network." +msgstr "Si votre site ne s’affiche pas, veuillez contacter le gestionnaire de ce rÃ©seau de sites." +======= #: wp-includes/link-template.php:2485 msgid "Newer Comments »" msgstr "Commentaires plus rÃ©cents »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:1523 +msgid "Bitrate Mode" +msgstr "Mode de dÃ©bit" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:26 +msgid "One Response to %2$s" +msgid_plural "%1$s Responses to %2$s" +msgstr[0] "Une rÃ©ponse Ã %2$s" +msgstr[1] "%1$s rÃ©ponses Ã %2$s" +======= #: wp-includes/link-template.php:2350 msgctxt "next post" msgid "Next" msgstr "Article suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3058 +msgid "All dates" +msgstr "Toutes les dates" +||||||| .r11156 +#: wp-signup.php:678 +msgctxt "Multisite active signup type" +msgid "user" +msgstr "utilisateur" +======= #: wp-includes/link-template.php:2349 msgctxt "previous post" msgid "Previous" msgstr "Article prÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3061 +msgid "Unattached" +msgstr "Non-attachÃ©" +||||||| .r11156 +#: wp-signup.php:677 +msgctxt "Multisite active signup type" +msgid "blog" +msgstr "site" +======= #: wp-includes/link-template.php:2296 wp-includes/link-template.php:2351 #: wp-includes/link-template.php:2396 msgid "Posts navigation" msgstr "Navigation des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3074 +msgid "Filter by date" +msgstr "Filtrer par date" +||||||| .r11156 +#: wp-signup.php:676 +msgctxt "Multisite active signup type" +msgid "none" +msgstr "aucune" +======= #: wp-includes/link-template.php:2295 msgid "Newer posts" msgstr "Articles plus rÃ©cents" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3075 +msgid "Filter by type" +msgstr "Filtrer par type" +||||||| .r11156 +#: wp-signup.php:675 +msgctxt "Multisite active signup type" +msgid "all" +msgstr "tous" +======= #: wp-includes/link-template.php:2294 msgid "Older posts" msgstr "Articles plus anciens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:236 +msgid "Maximum upload file size: %s." +msgstr "Taille de fichier maximale pour la mise en ligne : %s." +||||||| .r11156 +#: wp-includes/default-widgets.php:1308 +msgid "Custom Menu" +msgstr "Menu personnalisÃ©" +======= #: wp-includes/link-template.php:2242 msgid "Post navigation" msgstr "Navigation de l'article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:284 +msgid "Edit previous media item" +msgstr "Modifier l’Ã©lÃ©ment mÃ©dia prÃ©cÃ©dent" +||||||| .r11156 +#: wp-includes/pluggable.php:1395 +msgid "New pingback on your post \"%s\"" +msgstr "Nouveau ping sur votre article Â« %s Â»" +======= #: wp-includes/link-template.php:2145 wp-includes/link-template.php:2187 msgid "« Previous Page" msgstr "« Page prÃ©cÃ©dente" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:285 +msgid "Edit next media item" +msgstr "Modifier l’Ã©lÃ©ment mÃ©dia suivant" +||||||| .r11156 +#: wp-includes/pluggable.php:1527 +msgid "A new pingback on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau ping sur l'article Â« %s Â» attend votre approbation" +======= #: wp-includes/link-template.php:2066 wp-includes/link-template.php:2188 msgid "Next Page »" msgstr "Page suivante »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:344 +msgid "File name:" +msgstr "Nom du fichier :" +||||||| .r11156 +#: wp-includes/pluggable.php:1534 +msgid "A new comment on the post \"%s\" is waiting for your approval" +msgstr "Un nouveau commentaire sur l'article Â« %s Â» attend votre approbation" +======= #: wp-includes/link-template.php:1645 wp-includes/link-template.php:1877 msgid "Next Post" msgstr "Article suivant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:345 +msgid "File type:" +msgstr "Type du fichier :" +||||||| .r11156 +#: wp-includes/pluggable.php:1385 +msgid "New trackback on your post \"%s\"" +msgstr "Nouveau rÃ©trolien sur votre article Â« %s Â»" +======= #: wp-includes/link-template.php:1645 wp-includes/link-template.php:1877 msgid "Previous Post" msgstr "Article prÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:346 +msgid "Uploaded on:" +msgstr "Mis en ligne le :" +||||||| .r11156 +#: wp-includes/pluggable.php:1405 +msgid "New comment on your post \"%s\"" +msgstr "Nouveau commentaire sur votre article Â« %s Â»" +======= #: wp-includes/link-template.php:1495 msgid "Use commas instead of %s to separate excluded terms." msgstr "Utilisez des virgules au lieu de %s pour sÃ©parer les termes exclus." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:348 +msgid "File size:" +msgstr "Taille du fichier :" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:74 +msgid "XFN" +msgstr "XFN" +======= #: wp-includes/link-template.php:954 wp-includes/link-template.php:1220 #: wp-includes/link-template.php:1322 wp-includes/link-template.php:1383 msgid "Edit This" msgstr "Modifier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:351 +msgid "Dimensions:" +msgstr "Dimensions :" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:74 +msgid "XHTML Friends Network" +msgstr "XHTML Friends Network" +======= #: wp-includes/link-template.php:673 msgid "Comments Feed" msgstr "Flux des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:241 wp-includes/media.php:3112 +msgid "Suggested image dimensions:" +msgstr "Dimensions d’image suggÃ©rÃ©es :" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:73 +msgid "Valid XHTML" +msgstr "XHTML valide" +======= #: wp-includes/l10n.php:944 msgctxt "translations" msgid "Available" msgstr "Disponible" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1072 wp-includes/media-template.php:1154 +msgid "Add alternate sources for maximum HTML5 playback:" +msgstr "Ajoutez des sources alternatives pour une lecture optimale avec HTML5 :" +||||||| .r11156 +#: wp-includes/theme-compat/footer.php:19 +msgid "%1$s and %2$s." +msgstr "%1$s et %2$s." +======= #: wp-includes/l10n.php:926 msgctxt "translations" msgid "Installed" msgstr "InstallÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:439 wp-includes/media-template.php:541 +msgctxt "verb" +msgid "Trash" +msgstr "Corbeille" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:38 +msgid "F, Y" +msgstr "F Y" +======= #: wp-includes/js/tinymce/wp-mce-help.php:137 msgid "To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons." msgstr "Pour dÃ©placer la sÃ©lection Ã d'autres boutons, utilisez la touche Tab ou les touches flÃ©chÃ©es. Pour revenir Ã l'Ã©diteur, appuyez sur la touche Ãchapper ou utilisez l'un des boutons." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media.php:3062 +msgctxt "noun" +msgid "Trash" +msgstr "Corbeille" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:47 +msgid "You are currently browsing the %2$s blog archives." +msgstr "Vous parcourez actuellement les archives du site %2$s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:134 msgid "Elements path" msgstr "Chemin des Ã©lÃ©ments" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:598 +msgid "Edit Selection" +msgstr "Modifier la sÃ©lection" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:38 +msgid "You are currently browsing the %2$s blog archives for %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour %3$s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:133 msgid "Editor toolbar" msgstr "Barre d'outils de l'Ã©diteur" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/media-template.php:1248 +msgid "As a browser icon" +msgstr "En tant qu’icÃ´ne de navigateur" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:49 +msgid "Comments are closed." +msgstr "Les commentaires sont fermÃ©s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:132 msgid "Editor menu (when enabled)" msgstr "Menu de l'Ãditeur (lorsqu'il est activÃ©)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1253 +msgid "Preview as a browser icon" +msgstr "PrÃ©visualiser l’icÃ´ne de navigateur" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:41 +msgid "You are currently browsing the %2$s blog archives for the year %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour l’annÃ©e %3$s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:131 msgid "Image toolbar (when an image is selected)" msgstr "Barre d'outils de l'image (quand une image est sÃ©lectionnÃ©e)" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/media-template.php:1258 +msgid "As an app icon" +msgstr "En tant qu’icÃ´ne d’application" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:72 +msgid "Logged in as %2$s." +msgstr "ConnectÃ© en tant que %2$s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:128 msgid "Focus shortcuts:" msgstr "Raccourcis de sÃ©lections :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:1260 +msgid "Preview as an app icon" +msgstr "PrÃ©visualiser l’icÃ´ne d’application" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:70 +msgid "Logged in as %2$s. Log out »" +msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter »" +======= #: wp-includes/js/tinymce/wp-mce-help.php:125 msgid "Add/remove code tag" msgstr "Ajouter/enlever la balise de code" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/media-template.php:1167 +msgid "Remove poster image" +msgstr "Retirer l’image de couverture" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:91 +msgid "Submit Comment" +msgstr "Soumettre le commentaire" +======= #: wp-includes/js/tinymce/wp-mce-help.php:124 msgid "Help" msgstr "Aide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:208 +msgid "Select Files" +msgstr "Choisir des fichiers" +||||||| .r11156 +#: wp-includes/theme-compat/footer.php:17 +msgid "%1$s is proudly powered by %2$s" +msgstr "%1$s est fiÃ¨rement propulsÃ© par %2$s" +======= #: wp-includes/js/tinymce/wp-mce-help.php:124 msgid "Insert Page Break tag" msgstr "InsÃ©rer la balise « Page break »" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:797 +msgid "Show Tracklist" +msgstr "Montrer la liste des pistes" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:84 +msgid "URL" +msgstr "Adresse web" +======= #: wp-includes/js/tinymce/wp-mce-help.php:123 msgid "Insert More Tag" msgstr "InsÃ©rer la balise Â« More Â»" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2180 wp-includes/link-template.php:2224 +msgid "« Previous Page" +msgstr "« Page prÃ©cÃ©dente" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:89 +msgid "Your Comment" +msgstr "Votre commentaire" +======= #: wp-includes/js/tinymce/wp-mce-help.php:122 msgid "Insert Image" msgstr "InsÃ©rer une image" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2097 wp-includes/link-template.php:2225 +msgid "Next Page »" +msgstr "Page suivante »" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:97 +msgid "Say It!" +msgstr "Dites-le !" +======= #: wp-includes/js/tinymce/wp-mce-help.php:122 msgid "Quote" msgstr "Citation" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:970 wp-includes/link-template.php:1240 +#: wp-includes/link-template.php:1344 wp-includes/link-template.php:1405 +msgid "Edit This" +msgstr "Modifier" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:107 +msgid "Close this window." +msgstr "Fermer cette fenÃªtre." +======= #: wp-includes/js/tinymce/wp-mce-help.php:120 #: wp-includes/js/tinymce/wp-mce-help.php:121 msgid "List" msgstr "Liste" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: month name, 2: 4-digit year +#: wp-includes/general-template.php:1475 wp-includes/media.php:2970 +msgid "%1$s %2$d" +msgstr "%1$s %2$d" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:113 +msgid "Sorry, no posts matched your criteria." +msgstr "DÃ©solÃ©, aucun article ne correspond Ã vos critÃ¨res." +======= #: wp-includes/js/tinymce/wp-mce-help.php:119 msgid "Align Right" msgstr "Aligner Ã droite" +>>>>>>> .r12027 -#: wp-includes/js/tinymce/wp-mce-help.php:118 -msgid "Align Center" -msgstr "Centrer" - -#: wp-includes/js/tinymce/wp-mce-help.php:118 +<<<<<<< .mine +#. translators: Calendar caption: 1: month name, 2: 4-digit year +#: wp-includes/general-template.php:1686 +msgctxt "calendar caption" +msgid "%1$s %2$s" +msgstr "%1$s %2$s" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:117 +msgid "Powered by WordPress" +msgstr "PropulsÃ© par WordPress." +======= +#: wp-includes/js/tinymce/wp-mce-help.php:118 +msgid "Align Center" +msgstr "Centrer" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: Separator between blog name and feed type in feed links +#: wp-includes/general-template.php:2300 wp-includes/general-template.php:2323 +msgctxt "feed link" +msgid "»" +msgstr "»" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:72 +msgid "Log out of this account" +msgstr "Se dÃ©connecter" +======= +#: wp-includes/js/tinymce/wp-mce-help.php:118 msgid "Justify Text" msgstr "Justifier le texte" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog title, 2: separator (raquo) +#: wp-includes/general-template.php:2302 +msgid "%1$s %2$s Feed" +msgstr "%1$s %2$s Flux" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:72 +msgid "Log out »" +msgstr "DÃ©connexion »" +======= #: wp-includes/js/tinymce/wp-mce-help.php:117 msgid "Align Left" msgstr "Aligner Ã gauche" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog title, 2: separator (raquo) +#: wp-includes/general-template.php:2304 +msgid "%1$s %2$s Comments Feed" +msgstr "%1$s %2$s Flux des commentaires" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:80 +msgid "Mail (will not be published)" +msgstr "Adresse de messagerie (ne sera pas publiÃ©e)" +======= #: wp-includes/js/tinymce/wp-mce-help.php:108 msgid "Macintosh uses Ctrl + Alt + letter." msgstr "Sur Macintosh, utilisez les touches Ctrl + Alt + lettre." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: post title +#: wp-includes/general-template.php:2325 +msgid "%1$s %2$s %3$s Comments Feed" +msgstr "%1$s %2$s %3$s Flux des commentaires" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:87 +msgid "XHTML: You can use these tags: %s" +msgstr "XHTML : Vous pouvez utiliser ces balises : %s" +======= #: wp-includes/js/tinymce/wp-mce-help.php:107 msgid "The following shortcuts use different access keys: Alt + Shift + letter." msgstr "Vous pouvez accÃ©der aux raccourcis suivants via les touches : Alt+Shift+<lettre>." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: category name +#: wp-includes/general-template.php:2327 +msgid "%1$s %2$s %3$s Category Feed" +msgstr "%1$s %2$s Flux de la catÃ©gorie %3$s" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:44 +msgid "You have searched the %2$s blog archives for ‘%3$s’. If you are unable to find anything in these search results, you can try one of these links." +msgstr "Vous avez lancÃ© une recherche dans les archives du site %2$s avec la requÃªte « %3$s ». Si les rÃ©sultats ne vous conviennent pas, vous pouvez essayer l’un de ces liens." +======= #: wp-includes/js/tinymce/wp-mce-help.php:98 #: wp-includes/js/tinymce/wp-mce-help.php:111 msgid "Action" msgstr "Action" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: author name +#: wp-includes/general-template.php:2331 +msgid "%1$s %2$s Posts by %3$s Feed" +msgstr "%1$s %2$s Flux des articles Ã©crits par %3$s" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:35 +msgid "l, F jS, Y" +msgstr "l j F Y" +======= #: wp-includes/js/tinymce/wp-mce-help.php:98 #: wp-includes/js/tinymce/wp-mce-help.php:111 msgid "Letter" msgstr "Lettre" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: search phrase +#: wp-includes/general-template.php:2333 +msgid "%1$s %2$s Search Results for “%3$s” Feed" +msgstr "%1$s %2$s Flux de rÃ©sultats de la recherche pour "%3$s"" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:35 +msgid "You are currently browsing the %2$s blog archives for the day %3$s." +msgstr "Vous parcourez actuellement les archives du site %2$s pour la journÃ©e du %3$s." +======= #: wp-includes/js/tinymce/wp-mce-help.php:95 msgid "Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter." msgstr "PlutÃ´t que d’attraper votre souris pour cliquer sur la barre d’outils, utilisez les raccourcis clavier. Sous Windows et Linux, utilisez Ctrl+<lettre> sous Macintosh, utilisez la touche Commande+<lettre>." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2767 +msgid "« Previous" +msgstr "« PrÃ©cÃ©dent" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:32 +msgid "You are currently browsing the archives for the %s category." +msgstr "Vous parcourez actuellement les archives de la catÃ©gorie %s." +======= #: wp-includes/general-template.php:2841 msgctxt "admin color scheme" msgid "Coffee" msgstr "CafÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2768 +msgid "Next »" +msgstr "Suivant »" +||||||| .r11156 +#: wp-includes/theme-compat/footer.php:20 +msgid "%d queries. %s seconds." +msgstr "%d requÃªtes. %s secondes." +======= #: wp-includes/general-template.php:2835 msgctxt "admin color scheme" msgid "Ocean" msgstr "OcÃ©an" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:132 wp-includes/locale.php:147 +msgid "January" +msgstr "janvier" +||||||| .r11156 +#: wp-includes/theme-compat/footer.php:19 +msgid "Comments (RSS)" +msgstr "Commentaires (RSS)" +======= #: wp-includes/general-template.php:2829 msgctxt "admin color scheme" msgid "Ectoplasm" msgstr "Ectoplasme" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:133 wp-includes/locale.php:148 +msgid "February" +msgstr "fÃ©vrier" +||||||| .r11156 +#: wp-includes/theme-compat/footer.php:19 +msgid "Entries (RSS)" +msgstr "Articles (RSS)" +======= #: wp-includes/general-template.php:2823 msgctxt "admin color scheme" msgid "Sunrise" msgstr "Lever du soleil" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:134 wp-includes/locale.php:149 +msgid "March" +msgstr "mars" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:66 +msgid "Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: %s" +msgstr "Les paragraphes et retours Ã la ligne sont automatiques. Les adresses de messagerie ne sont pas affichÃ©es. HTML autorisÃ© : %s" +======= #: wp-includes/general-template.php:2817 msgctxt "admin color scheme" msgid "Midnight" msgstr "Minuit" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:135 wp-includes/locale.php:150 +msgid "April" +msgstr "avril" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:17 +msgid "This post is password protected. Enter the password to view comments." +msgstr "Cet article est protÃ©gÃ© par un mot de passe. Saisissez le mot de passe pour voir les commentaires." +======= #: wp-includes/general-template.php:2811 msgctxt "admin color scheme" msgid "Blue" msgstr "Bleu" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:136 wp-includes/locale.php:151 +msgid "May" +msgstr "mai" +||||||| .r11156 +#: wp-includes/theme-compat/sidebar.php:73 +msgid "This page validates as XHTML 1.0 Transitional" +msgstr "Cette page est en XHTML 1.0 Transitional valide" +======= #: wp-includes/general-template.php:2805 msgctxt "admin color scheme" msgid "Light" msgstr "Lumineux" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:137 wp-includes/locale.php:152 +msgid "June" +msgstr "juin" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:102 +msgid "Sorry, the comment form is closed at this time." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour le moment." +======= #: wp-includes/general-template.php:2795 msgctxt "admin color scheme" msgid "Default" msgstr "Par dÃ©faut" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:138 wp-includes/locale.php:153 +msgid "July" +msgstr "juillet" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:14 +msgid "%1$s - Comments on %2$s" +msgstr "%1$s - Commentaires sur %2$s" +======= #: wp-includes/general-template.php:2643 msgid "Next »" msgstr "Suivant »" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:139 wp-includes/locale.php:154 +msgid "August" +msgstr "aoÃ»t" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:35 +msgid "RSS feed for comments on this post." +msgstr "Flux RSS des commentaires de cet article." +======= #: wp-includes/general-template.php:2642 msgid "« Previous" msgstr "« PrÃ©cÃ©dent" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:140 wp-includes/locale.php:155 +msgid "September" +msgstr "septembre" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:38 +msgid "The URL to TrackBack this entry is: %s" +msgstr "L’adresse web pour faire un rÃ©trolien sur cet article est : %s" +======= #. translators: 1: blog name, 2: separator(raquo), 3: post type name #: wp-includes/general-template.php:2271 msgid "%1$s %2$s %3$s Feed" msgstr "%1$s %2$s Flux pour %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:141 wp-includes/locale.php:156 +msgid "October" +msgstr "octobre" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:55 +msgid "by %1$s — %2$s @ %4$s" +msgstr "par %1$s — %2$s Ã %4$s" +======= #. translators: 1: blog name, 2: separator(raquo), 3: search phrase #: wp-includes/general-template.php:2269 msgid "%1$s %2$s Search Results for “%3$s” Feed" msgstr "%1$s %2$s Flux de rÃ©sultats de la recherche pour "%3$s"" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:142 wp-includes/locale.php:157 +msgid "November" +msgstr "novembre" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:65 +msgid "Leave a comment" +msgstr "Laisser un commentaire" +======= #. translators: 1: blog name, 2: separator(raquo), 3: author name #: wp-includes/general-template.php:2267 msgid "%1$s %2$s Posts by %3$s Feed" msgstr "%1$s %2$s Flux des articles Ã©crits par %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: month name +#: wp-includes/locale.php:143 wp-includes/locale.php:158 +msgid "December" +msgstr "dÃ©cembre" +||||||| .r11156 +#: wp-includes/taxonomy.php:489 +msgid "Choose from the most used tags" +msgstr "Choisir parmi les mots-clÃ©s les plus utilisÃ©s" +======= #. translators: 1: blog name, 2: separator(raquo), 3: tag name #: wp-includes/general-template.php:2265 msgid "%1$s %2$s %3$s Tag Feed" msgstr "%1$s %2$s Flux de lâÃ©tiquette %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:147 +msgid "Jan_January_abbreviation" +msgstr "jan" +||||||| .r11156 +#: wp-includes/comment-template.php:2109 +msgid "You may use these HTML tags and attributes: %s" +msgstr "Vous pouvez utiliser ces balises et attributs HTML : %s" +======= #. translators: 1: blog name, 2: separator(raquo), 3: category name #: wp-includes/general-template.php:2263 msgid "%1$s %2$s %3$s Category Feed" msgstr "%1$s %2$s Flux de la catÃ©gorie %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:148 +msgid "Feb_February_abbreviation" +msgstr "fÃ©v" +||||||| .r11156 +#: wp-includes/taxonomy.php:476 +msgctxt "taxonomy singular name" +msgid "Category" +msgstr "CatÃ©gorie" +======= #. translators: 1: blog name, 2: separator(raquo), 3: post title #: wp-includes/general-template.php:2261 msgid "%1$s %2$s %3$s Comments Feed" msgstr "%1$s %2$s %3$s Flux des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:149 +msgid "Mar_March_abbreviation" +msgstr "mar" +||||||| .r11156 +#: wp-includes/taxonomy.php:477 +msgid "Search Tags" +msgstr "Chercher dans les mots-clÃ©s" +======= #. translators: 1: blog title, 2: separator (raquo) #: wp-includes/general-template.php:2240 msgid "%1$s %2$s Comments Feed" msgstr "%1$s %2$s Flux des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:150 +msgid "Apr_April_abbreviation" +msgstr "avr" +||||||| .r11156 +#: wp-includes/taxonomy.php:478 +msgid "Popular Tags" +msgstr "Mots-clÃ©s populaires" +======= #. translators: 1: blog title, 2: separator (raquo) #: wp-includes/general-template.php:2238 msgid "%1$s %2$s Feed" msgstr "%1$s %2$s Flux" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:151 +msgid "May_May_abbreviation" +msgstr "mai" +||||||| .r11156 +#: wp-includes/taxonomy.php:486 +msgid "New Category Name" +msgstr "Nom de la nouvelle catÃ©gorie" +======= #. translators: Separator between blog name and feed type in feed links #: wp-includes/general-template.php:2236 wp-includes/general-template.php:2259 msgctxt "feed link" msgid "»" msgstr "»" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:152 +msgid "Jun_June_abbreviation" +msgstr "juin" +||||||| .r11156 +#: wp-includes/taxonomy.php:486 +msgid "New Tag Name" +msgstr "Nom du nouveau mot-clÃ©" +======= #. translators: Calendar caption: 1: month name, 2: 4-digit year #: wp-includes/general-template.php:1627 msgctxt "calendar caption" msgid "%1$s %2$s" msgstr "%1$s %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:153 +msgid "Jul_July_abbreviation" +msgstr "juil" +||||||| .r11156 +#: wp-includes/taxonomy.php:485 +msgid "Add New Category" +msgstr "Ajouter une nouvelle catÃ©gorie" +======= #. translators: 1: month name, 2: 4-digit year #: wp-includes/general-template.php:1423 wp-includes/media.php:2942 msgid "%1$s %2$d" msgstr "%1$s %2$d" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:154 +msgid "Aug_August_abbreviation" +msgstr "aoÃ»t" +||||||| .r11156 +#: wp-includes/taxonomy.php:485 +msgid "Add New Tag" +msgstr "Ajouter un nouveau mot-clÃ©" +======= #. translators: 1: Taxonomy singular name, 2: Current taxonomy term #: wp-includes/general-template.php:1193 msgid "%1$s: %2$s" msgstr "%1$s : %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:155 +msgid "Sep_September_abbreviation" +msgstr "sept" +||||||| .r11156 +#: wp-includes/taxonomy.php:484 +msgid "Update Tag" +msgstr "Mettre Ã jour le mot-clÃ©" +======= #: wp-includes/general-template.php:1189 msgid "Archives: %s" msgstr "Archives : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:156 +msgid "Oct_October_abbreviation" +msgstr "oct" +||||||| .r11156 +#: wp-includes/taxonomy.php:481 +msgid "Parent Category:" +msgstr "CatÃ©gorie parente :" +======= #: wp-includes/general-template.php:1186 msgctxt "post format archive title" msgid "Chats" msgstr "Discussions" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:157 +msgid "Nov_November_abbreviation" +msgstr "nov" +||||||| .r11156 +#: wp-includes/taxonomy.php:480 +msgid "Parent Category" +msgstr "CatÃ©gorie parente" +======= #: wp-includes/general-template.php:1184 msgctxt "post format archive title" msgid "Audio" msgstr "Audio" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the month +#: wp-includes/locale.php:158 +msgid "Dec_December_abbreviation" +msgstr "dÃ©c" +||||||| .r11156 +#: wp-includes/taxonomy.php:479 +msgid "All Tags" +msgstr "Tous les mots-clÃ©s" +======= #: wp-includes/general-template.php:1182 msgctxt "post format archive title" msgid "Statuses" msgstr "Ãtats" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:123 +msgid "Sun" +msgstr "dim" +||||||| .r11156 +#: wp-includes/taxonomy.php:475 +msgctxt "taxonomy general name" +msgid "Categories" +msgstr "CatÃ©gories" +======= #: wp-includes/general-template.php:1180 msgctxt "post format archive title" msgid "Links" msgstr "Liens" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:124 +msgid "Mon" +msgstr "lun" +||||||| .r11156 +#: wp-signup.php:723 +msgid "Sorry, new registrations are not allowed at this time." +msgstr "DÃ©solÃ©, il n’est pas possible de s’enregistrer Ã l’heure actuelle." +======= #: wp-includes/general-template.php:1178 msgctxt "post format archive title" msgid "Quotes" msgstr "Citations" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:125 +msgid "Tue" +msgstr "mar" +||||||| .r11156 +#: wp-signup.php:510 wp-signup.php:646 +msgid "Check your inbox at %s and click the link given." +msgstr "Consultez la boite de rÃ©ception de l’adresse %s, et cliquez sur le lien qui vous a Ã©tÃ© envoyÃ©." +======= #: wp-includes/general-template.php:1176 msgctxt "post format archive title" msgid "Videos" msgstr "VidÃ©os" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:126 +msgid "Wed" +msgstr "mer" +||||||| .r11156 +#: wp-signup.php:652 +msgid "Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control." +msgstr "Veuillez patienter encore quelques instants. Parfois, la livraison des messages peut Ãªtre retardÃ©e par des processus en dehors de notre contrÃ´le." +======= #: wp-includes/general-template.php:1174 msgctxt "post format archive title" msgid "Images" msgstr "Images" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:127 +msgid "Thu" +msgstr "jeu" +||||||| .r11156 +#: wp-signup.php:653 +msgid "Check the junk or spam folder of your email client. Sometime emails wind up there by mistake." +msgstr "VÃ©rifiez le courrier indÃ©sirable (ou dossier spam) de votre client de messagerie. Parfois, certains messages arrivent lÃ par erreur." +======= #: wp-includes/general-template.php:1172 msgctxt "post format archive title" msgid "Galleries" msgstr "Galeries" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:128 +msgid "Fri" +msgstr "ven" +||||||| .r11156 +#: wp-signup.php:681 +msgid "Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your Options page." +msgstr "Salutations, cher administrateur du site ! Vous acceptez actuellement les inscriptions de type « %s ». Pour modifier ou dÃ©sactiver les inscriptions, allez sur votre page d’options." +======= #: wp-includes/general-template.php:1170 msgctxt "post format archive title" msgid "Asides" msgstr "En passant" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: three-letter abbreviation of the weekday +#: wp-includes/locale.php:129 +msgid "Sat" +msgstr "sam" +||||||| .r11156 +#: wp-signup.php:191 +msgid "We send your registration email to this address. (Double-check your email address before continuing.)" +msgstr "Nous enverrons votre confirmation d’inscription Ã cette adresse. VÃ©rifiez donc bien qu’elle est correcte avant de continuer." +======= #: wp-includes/general-template.php:1167 msgctxt "daily archives date format" msgid "F j, Y" msgstr "j F Y" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:685 +msgid "Comments Feed" +msgstr "Flux des commentaires" +||||||| .r11156 +#: wp-includes/post.php:1629 +msgid "Search Pages" +msgstr "Chercher dans les pages" +======= #: wp-includes/general-template.php:1167 msgid "Day: %s" msgstr "Jour : %s" +>>>>>>> .r12027 -#: wp-includes/general-template.php:1165 +<<<<<<< .mine +#: wp-includes/link-template.php:1669 wp-includes/link-template.php:1901 +msgid "Next Post" +msgstr "Article suivant" +||||||| .r11156 +#: wp-includes/post.php:1625 +msgid "Add New Post" +msgstr "Ajouter un nouvel article" +======= +#: wp-includes/general-template.php:1165 msgctxt "monthly archives date format" msgid "F Y" msgstr "F Y" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2524 +msgid "Newer Comments »" +msgstr "Commentaires plus rÃ©cents »" +||||||| .r11156 +#: wp-includes/post.php:1632 +msgid "Parent Page:" +msgstr "Page parente :" +======= #: wp-includes/general-template.php:1165 msgid "Month: %s" msgstr "Mois : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2568 +msgid "« Older Comments" +msgstr "« Commentaires plus anciens" +||||||| .r11156 +#: wp-includes/post.php:1622 +msgctxt "post type general name" +msgid "Posts" +msgstr "Articles" +======= #: wp-includes/general-template.php:1163 msgctxt "yearly archives date format" msgid "Y" msgstr "Y" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:110 +msgid "S_Sunday_initial" +msgstr "D" +||||||| .r11156 +#: wp-includes/post.php:1626 +msgid "Edit Page" +msgstr "Modifier la page" +======= #: wp-includes/general-template.php:1163 msgid "Year: %s" msgstr "AnnÃ©e : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:111 +msgid "M_Monday_initial" +msgstr "L" +||||||| .r11156 +#: wp-includes/post.php:1629 +msgid "Search Posts" +msgstr "Chercher dans les articles" +======= #: wp-includes/general-template.php:1161 msgid "Author: %s" msgstr "Auteur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:112 +msgid "T_Tuesday_initial" +msgstr "Ma" +||||||| .r11156 +#: wp-includes/post.php:1625 +msgid "Add New Page" +msgstr "Ajouter une nouvelle page" +======= #: wp-includes/general-template.php:1159 msgid "Tag: %s" msgstr "Ãtiquette : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:113 +msgid "W_Wednesday_initial" +msgstr "Me" +||||||| .r11156 +#: wp-includes/post.php:1622 +msgctxt "post type general name" +msgid "Pages" +msgstr "Pages" +======= #: wp-includes/general-template.php:1157 msgid "Category: %s" msgstr "CatÃ©gorie : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:114 +msgid "T_Thursday_initial" +msgstr "J" +||||||| .r11156 +#: wp-includes/post.php:1623 +msgctxt "post type singular name" +msgid "Page" +msgstr "Page" +======= #: wp-includes/general-template.php:884 msgid "Page %s" msgstr "Page %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:115 +msgid "F_Friday_initial" +msgstr "V" +||||||| .r11156 +#: wp-includes/post.php:1623 +msgctxt "post type singular name" +msgid "Post" +msgstr "Article" +======= #: wp-includes/general-template.php:851 msgid "Page not found" msgstr "Page non trouvÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: one-letter abbreviation of the weekday +#: wp-includes/locale.php:116 +msgid "S_Saturday_initial" +msgstr "S" +||||||| .r11156 +#: wp-includes/ms-default-constants.php:127 +msgid "The constant VHOST is deprecated. Use the boolean constant SUBDOMAIN_INSTALL in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled." +msgstr "La constante VHOST est obsolÃ¨te. Utilisez la constante boolÃ©enne SUBDOMAIN_INSTALL dans le fichier wp-config.php pour activer le mode sous-domaines. Utilisez is_subdomain_install() pour vÃ©rifier si le mode sous-domaine est effectivement activÃ©." +======= #. translators: 1: separator, 2: search phrase #: wp-includes/general-template.php:846 msgid "Search Results %1$s %2$s" msgstr "RÃ©sultats de recherche %1$s %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/locale.php:165 +msgid "am" +msgstr " " +||||||| .r11156 +#: wp-includes/ms-default-constants.php:129 +msgid "Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting." +msgstr "Les valeurs des constantes VHOST et SUBDOMAIN_INSTALL ne correspondent pas. C’est la valeur de SUBDOMAIN_INSTALL qui sera prise en compte pour votre rÃ©glage du mode sous-domaines." +======= #. translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: #. is_rtl() function name #: wp-includes/general-template.php:680 msgid "The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead." msgstr "L'option %1$s est obsolÃ¨te pour l'ensemble des fonctions %2$s. Utilisez plutÃ´t l'option %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/locale.php:166 +msgid "pm" +msgstr " " +||||||| .r11156 +#: wp-includes/user.php:2126 +msgid "ERROR: This username is invalid because it uses illegal characters. Please enter a valid username." +msgstr "ERREUR : cet identifiant n’est pas valide, car il utilise des caractÃ¨res non autorisÃ©s. Merci d’utiliser un identifiant valide." +======= #. translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: #. 'url' argument #: wp-includes/general-template.php:614 msgid "The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead." msgstr "L'option %1$s est obsolÃ¨te pour l'ensemble des fonctions %2$s. Utilisez plutÃ´t l'option %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/locale.php:167 +msgid "AM" +msgstr " " +||||||| .r11156 +#: wp-includes/comment-template.php:2091 +msgid "Required fields are marked %s" +msgstr "Les champs obligatoires sont indiquÃ©s avec %s" +======= #: wp-includes/general-template.php:529 msgid "Site Admin" msgstr "Admin. du Site" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/locale.php:168 +msgid "PM" +msgstr " " +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:10 +#: wp-includes/theme-compat/comments.php:10 +#: wp-includes/theme-compat/footer.php:10 +#: wp-includes/theme-compat/header.php:10 +#: wp-includes/theme-compat/sidebar.php:10 +msgid "Please include a %1$s template in your theme." +msgstr "Veuillez inclure un modÃ¨le de type « %1$s » Ã votre thÃ¨me." +======= #: wp-includes/general-template.php:525 wp-login.php:574 wp-login.php:679 #: wp-login.php:754 wp-login.php:936 msgid "Register" msgstr "Inscription" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:121 +msgid "Your PHP installation appears to be missing the MySQL extension which is required by WordPress." +msgstr "Votre installation PHP ne dispose pas de MySQL. Extension requise pour WordPress." +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:10 +#: wp-includes/theme-compat/comments.php:10 +#: wp-includes/theme-compat/footer.php:10 +#: wp-includes/theme-compat/header.php:10 +#: wp-includes/theme-compat/sidebar.php:10 +msgid "Theme without %1$s" +msgstr "ThÃ¨me sans %1$s." +======= #: wp-includes/general-template.php:395 wp-login.php:887 wp-login.php:919 msgid "Log In" msgstr "Se connecter" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:382 +msgid "ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores." +msgstr "ERREUR: la ligne $table_prefix du fichier wp-config.php ne doit contenir que des chiffres, lettres ou le caractÃ¨re soulignÃ©." +||||||| .r11156 +#: wp-includes/ms-load.php:409 +msgid "Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?" +msgstr "Le site %1$s Nous avons cherchÃ© la table %2$s dans la base de donnÃ©es %3$s. Est-ce correct ?" +======= #: wp-includes/general-template.php:394 wp-login.php:917 msgid "Remember Me" msgstr "Se souvenir de moi" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:3415 +msgid "This is the short link." +msgstr "Ceci est un lien court." +||||||| .r11156 +#: wp-includes/general-template.php:627 +msgid "The %s option is deprecated for the family of bloginfo() functions." +msgstr "L’option %s est obsolÃ¨te pour la famille des fonctions basÃ©es sur bloginfo()." +======= #: wp-includes/general-template.php:393 wp-login.php:906 msgid "Password" msgstr "Mot de passe" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:185 +msgid "Maintenance" +msgstr "Maintenance" +||||||| .r11156 +#: wp-includes/general-template.php:627 +msgid "Use the %s option instead." +msgstr "Utilisez plutÃ´t l’option %s." +======= #: wp-includes/general-template.php:392 wp-login.php:736 wp-login.php:902 msgid "Username" msgstr "Identifiant" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:189 +msgid "Briefly unavailable for scheduled maintenance. Check back in a minute." +msgstr "IndisponibilitÃ© temporaire pour cause de maintenance. Veuillez revenir dans un instant." +||||||| .r11156 +#: wp-includes/ms-load.php:407 +msgid "Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now." +msgstr "Des tables de la base de donnÃ©es sont manquantes. Cela peut signifier que MySQL ne fonctionne pas, ou que WordPress n’a pas Ã©tÃ© installÃ© correctement, ou que quelqu’un a effacÃ© %s. Vous devriez vraiment vraiment vÃ©rifier votre base de donnÃ©es au plus vite." +======= #: wp-includes/general-template.php:278 msgid "Log out" msgstr "DÃ©connexion" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2947 +msgctxt "admin color scheme" +msgid "Blue" +msgstr "Bleu" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4023 +msgid "Sorry, you do not have access to user data on this site." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux donnÃ©es utilisateurs de ce site." +======= #: wp-includes/general-template.php:276 wp-login.php:571 wp-login.php:634 #: wp-login.php:676 wp-login.php:758 msgid "Log in" msgstr "Connexion" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: post type name +#: wp-includes/general-template.php:2335 +msgid "%1$s %2$s %3$s Feed" +msgstr "%1$s %2$s Flux pour %3$s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1171 +#: wp-includes/class-wp-xmlrpc-server.php:4195 +msgid "Sorry, you are not allowed to post on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier sur ce site." +======= #: wp-includes/general-template.php:231 wp-includes/general-template.php:238 msgctxt "submit button" msgid "Search" msgstr "Rechercher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:470 +msgid "The site you have requested is not installed properly. Please contact the system administrator." +msgstr "Le site que vous avez demandÃ© n’est pas installÃ© correctement. Veuillez contacter l’administrateur de votre serveur." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4422 +#: wp-includes/class-wp-xmlrpc-server.php:4435 +#: wp-includes/class-wp-xmlrpc-server.php:4440 +msgid "Sorry, you are not allowed to publish posts on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des articles sur ce site." +======= #: wp-includes/general-template.php:229 msgctxt "placeholder" msgid "Search …" msgstr "Recherche…" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. +#: wp-includes/locale.php:185 +msgctxt "text direction" +msgid "ltr" +msgstr "ltr" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5258 +#: wp-includes/class-wp-xmlrpc-server.php:5481 +msgid "Sorry, you must be able to edit posts on this site in order to view categories." +msgstr "DÃ©solÃ©, vous devez avoir le droit d’Ã©crire des articles sur ce site si vous vous visualisez les catÃ©gories." +======= #: wp-includes/general-template.php:228 wp-includes/general-template.php:229 #: wp-includes/general-template.php:236 msgctxt "label" msgid "Search for:" msgstr "Rechercher :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/load.php:115 +msgid "Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s." +msgstr "Votre serveur utilise la version %1$s de PHP mais WordPress %2$s nÃ©cessite au moins la version %3$s." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4411 +msgid "Sorry, you are not allowed to publish pages on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des pages sur ce site." +======= #: wp-includes/functions.wp-styles.php:87 msgid "Do not pass style tags to wp_add_inline_style()." msgstr "Ne passez pas de balises de style dans wp_add_inline_style()." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:177 wp-includes/media-template.php:183 +msgid "Drop files to upload" +msgstr "DÃ©posez vos fichiers pour les mettre en ligne" +||||||| .r11156 +#: wp-includes/ms-functions.php:673 wp-includes/ms-functions.php:1154 +msgid "Sorry, that site already exists!" +msgstr "DÃ©solÃ©, ce site existe dÃ©jÃ !" +======= #: wp-includes/functions.wp-scripts.php:191 msgid "Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook." msgstr "Ne dÃ©senregistrez pas le script %1$s de la zone d’administration. Pour cibler le thÃ¨me public, utilisez le crochet %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: localized date format, see http:php.net/date +#: wp-includes/locale.php:358 +msgid "F j, Y" +msgstr "j F Y" +||||||| .r11156 +#: wp-includes/ms-functions.php:853 +msgid "" +"To activate your blog, please click the following link:\n" +"\n" +"%s\n" +"\n" +"After you activate, you will receive *another email* with your login.\n" +"\n" +"After you activate, you can visit your site here:\n" +"\n" +"%s" +msgstr "" +"Pour activer votre site, veuillez cliquer sur le lien suivant :\n" +"\n" +"%s\n" +"\n" +"AprÃ¨s l'activation, vous recevrez *un autre courrier* contenant votre identifiant.\n" +"\n" +"Vous pourrez alors vous rendre sur votre site ici :\n" +"\n" +"%s" +======= #: wp-includes/functions.wp-scripts.php:42 msgid "Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks." msgstr "Les scripts et les styles ne peuvent pas Ãªtre enregistrÃ©s ou ajoutÃ©s avant le dÃ©clenchement des crochets %1$s, %2$s ou %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: localized time format, see http:php.net/date +#: wp-includes/locale.php:360 +msgid "g:i a" +msgstr "G \\h i \\m\\i\\n" +||||||| .r11156 +#: wp-includes/ms-functions.php:1240 +msgid "New Site Registration: %s" +msgstr "Inscription d'un nouveau site : %s" +======= #: wp-includes/functions.php:4680 msgid "The login page will open in a new window. After logging in you can close it and return to this page." msgstr "La page de connexion s’ouvrira dans une nouvelle fenÃªtre. AprÃ¨s vous Ãªtre connectÃ©(e), vous pourrez la fermer et revenir Ã cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: localized date and time format, see http:php.net/date +#: wp-includes/locale.php:362 +msgid "F j, Y g:i a" +msgstr "j F Y G \\h i \\m\\i\\n" +||||||| .r11156 +#: wp-includes/ms-functions.php:637 +msgid "Sorry, site names may not contain the character “_”!" +msgstr "DÃ©solÃ©, les identifiants de site ne doivent pas contenir le caractÃ¨re “_”!;!" +======= #: wp-includes/functions.php:4679 wp-includes/user.php:187 msgid "Please log in again." msgstr "Veuillez vous reconnecter." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2931 +msgctxt "admin color scheme" +msgid "Default" +msgstr "Par dÃ©faut" +||||||| .r11156 +#: wp-includes/ms-functions.php:1523 +msgid "New %1$s Site: %2$s" +msgstr "Nouveau site %1$s : %2$s" +======= #: wp-includes/functions.php:4678 wp-includes/script-loader.php:401 msgid "Session expired" msgstr "La session a expirÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2953 +msgctxt "admin color scheme" +msgid "Midnight" +msgstr "Minuit" +||||||| .r11156 +#: wp-includes/ms-functions.php:1003 +msgid "The site is already active." +msgstr "Ce site est dÃ©jÃ activÃ©." +======= #: wp-includes/functions.php:4089 msgid "Manual Offsets" msgstr "DÃ©calages manuels" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:1519 +msgid "Use commas instead of %s to separate excluded terms." +msgstr "Utilisez des virgules au lieu de %s pour sÃ©parer les termes exclus." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2742 +#: wp-includes/class-wp-xmlrpc-server.php:4109 +#: wp-includes/class-wp-xmlrpc-server.php:5142 +msgid "Sorry, you cannot edit posts on this site." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les articles de ce site." +======= #: wp-includes/functions.php:4081 wp-includes/functions.php:4085 msgid "UTC" msgstr "UTC" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2941 +msgctxt "admin color scheme" +msgid "Light" +msgstr "Lumineux" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2934 +msgid "Sorry, you must be able to edit posts to this site in order to view categories." +msgstr "DÃ©solÃ©, vous devez avoir le droit d’Ã©crire des articles pour ce site si vous voulez visualiser les catÃ©gories." +======= #: wp-includes/functions.php:4036 msgid "Select a city" msgstr "SÃ©lectionnez une ville" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2959 +msgctxt "admin color scheme" +msgid "Sunrise" +msgstr "Lever du soleil" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3323 +#: wp-includes/class-wp-xmlrpc-server.php:3384 +#: wp-includes/class-wp-xmlrpc-server.php:3411 +#: wp-includes/class-wp-xmlrpc-server.php:3438 +#: wp-includes/class-wp-xmlrpc-server.php:3657 +msgid "You are not allowed access to details about this site." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails de ce site." +======= #: wp-includes/functions.php:3560 msgid "%1$s was called incorrectly. %2$s %3$s" msgstr "%1$s est appelÃ©e de la mauvaise maniÃ¨re. %2$s %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2965 +msgctxt "admin color scheme" +msgid "Ectoplasm" +msgstr "Ectoplasme" +||||||| .r11156 +#: wp-includes/ms-functions.php:1160 +msgid "Could not create site." +msgstr "Impossible de crÃ©er le site." +======= #: wp-includes/functions.php:3559 msgid "Please see Debugging in WordPress for more information." msgstr "Veuillez consulter la page DÃ©bugger dans WordPress (en) pour plus d’informations." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2971 +msgctxt "admin color scheme" +msgid "Ocean" +msgstr "OcÃ©an" +||||||| .r11156 +#: wp-includes/ms-functions.php:645 +msgid "Sorry, site names must have letters too!" +msgstr "DÃ©solÃ©, les identifiants de site doivent Ã©galement avoir des lettres !" +======= #: wp-includes/functions.php:3558 msgid "(This message was added in version %s.)" msgstr "(Ce message a Ã©tÃ© ajoutÃ© Ã la version %s.)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:2977 +msgctxt "admin color scheme" +msgid "Coffee" +msgstr "CafÃ©" +||||||| .r11156 +#: wp-includes/ms-functions.php:641 +msgid "Sorry, you may not use that site name." +msgstr "DÃ©solÃ©, vous ne pouvez pas utiliser ce nom pour votre site." +======= #: wp-includes/functions.php:3510 msgid "%1$s was called with an argument that is deprecated since version %2$s with no alternative available." msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:1669 wp-includes/link-template.php:1901 +msgid "Previous Post" +msgstr "Article prÃ©cÃ©dent" +||||||| .r11156 +#: wp-includes/ms-functions.php:677 +msgid "Sorry, that site is reserved!" +msgstr "DÃ©solÃ©, ce site est rÃ©servÃ© !" +======= #: wp-includes/functions.php:3508 msgid "%1$s was called with an argument that is deprecated since version %2$s! %3$s" msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s ! %3$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: $thousands_sep argument for http:php.net/number_format, default +#. is , +#: wp-includes/locale.php:174 +msgid "number_format_thousands_sep" +msgstr " " +||||||| .r11156 +#: wp-includes/ms-functions.php:688 +msgid "That site is currently reserved but may be available in a couple days." +msgstr "Ce site est rÃ©servÃ© pour le moment, mais pourrait Ãªtre disponible dans quelques jours." +======= #: wp-includes/functions.php:3393 wp-includes/functions.php:3450 msgid "%1$s is deprecated since version %2$s with no alternative available." msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." - +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: Name of the directory (build) +#: wp-includes/locale.php:199 +msgid "The %s directory of the develop repository must be used for RTL." +msgstr "Le rÃ©pertoire %s du rÃ©pertoire de dÃ©veloppement doit Ãªtre utilisÃ© pour le RTL." +||||||| .r11156 +#: wp-includes/pluggable.php:1645 +msgid "New user registration on your site %s:" +msgstr "Inscription d'un nouvel utilisateur sur votre site %s :" +======= #: wp-includes/functions.php:3391 wp-includes/functions.php:3448 msgid "%1$s is deprecated since version %2$s! Use %3$s instead." msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s! Utilisez %3$s Ã la place." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: Taxonomy singular name, 2: Current taxonomy term +#: wp-includes/general-template.php:1244 +msgid "%1$s: %2$s" +msgstr "%1$s : %2$s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2971 +#: wp-includes/class-wp-xmlrpc-server.php:3074 +#: wp-includes/class-wp-xmlrpc-server.php:3080 +#: wp-includes/class-wp-xmlrpc-server.php:3139 +#: wp-includes/class-wp-xmlrpc-server.php:3145 +msgid "You are not allowed to moderate comments on this site." +msgstr "Vous n’avez pas l’autorisation de modÃ©rer les commentaires de ce site." +======= #: wp-includes/functions.php:3331 wp-includes/ms-load.php:404 msgid "Error establishing a database connection" msgstr "Erreur lors de la connexion Ã la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1240 +msgid "Archives: %s" +msgstr "Archives : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2778 +msgid "Sorry, you must be able to edit posts on this site in order to view tags." +msgstr "DÃ©solÃ©, vous devez avoir le droit de modifier des articles sur ce site si vous voulez visualiser les mots-clÃ©s." +======= #: wp-includes/functions.php:3327 msgid "Database Error" msgstr "Erreur de la base de donnÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: blog name, 2: separator(raquo), 3: tag name +#: wp-includes/general-template.php:2329 +msgid "%1$s %2$s %3$s Tag Feed" +msgstr "%1$s %2$s Flux de lâÃ©tiquette %3$s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:424 +msgid "Site Tagline" +msgstr "Slogan du site" +======= #: wp-includes/functions.php:2462 wp-load.php:80 msgid "WordPress › Error" msgstr "WordPress » Erreur" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2387 +msgctxt "next post" +msgid "Next" +msgstr "Article suivant" +||||||| .r11156 +#: wp-includes/ms-load.php:109 +msgid "This site has been archived or suspended." +msgstr "Ce site a Ã©tÃ© archivÃ© ou suspendu." +======= #: wp-includes/functions.php:2450 msgid "« Back" msgstr "« Retour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2386 +msgctxt "previous post" +msgid "Previous" +msgstr "Article prÃ©cÃ©dent" +||||||| .r11156 +#: wp-includes/load.php:472 +msgid "The site you have requested is not installed properly. Please contact the system administrator." +msgstr "Le site que vous avez demandÃ© n’est pas installÃ© correctement. Veuillez contacter l’administrateur de votre serveur." +======= #: wp-includes/functions.php:2331 msgid "WordPress Failure Notice" msgstr "Avertissement d’Ã©chec de WordPress" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/media-template.php:169 +msgid "Close media panel" +msgstr "Fermer le panneau des mÃ©dias" +||||||| .r11156 +#: wp-includes/script-loader.php:537 +msgctxt "search results" +msgid "No results found." +msgstr "Aucun rÃ©sultat trouvÃ©." +======= #: wp-includes/functions.php:2328 wp-includes/ms-functions.php:1883 msgid "Please try again." msgstr "Veuillez rÃ©essayer." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:106 wp-includes/locale.php:116 +#: wp-includes/locale.php:129 +msgid "Saturday" +msgstr "samedi" +||||||| .r11156 +#: wp-includes/nav-menu.php:252 wp-includes/nav-menu.php:259 +msgid "The menu name %s conflicts with another menu name. Please try another." +msgstr "Un menu nommÃ© %s est en conflit avec un autre nom de menu. Veuillez rÃ©essayer avec un notre nom." +======= #: wp-includes/functions.php:2324 msgid "Do you really want to log out?" msgstr "Voulez-vous rÃ©ellement vous dÃ©connecter ?" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:100 wp-includes/locale.php:110 +#: wp-includes/locale.php:123 +msgid "Sunday" +msgstr "dimanche" +||||||| .r11156 +#: wp-includes/nav-menu.php:317 +msgid "The given object ID is not that of a menu item." +msgstr "L’identifiant donnÃ© pour cet objet n’est pas une entrÃ©e de menu." +======= #: wp-includes/functions.php:2322 msgid "You are attempting to log out of %s" msgstr "Vous Ãªtes en train de vous dÃ©connecter de %s." +>>>>>>> .r12027 -#: wp-includes/functions.php:1978 -msgid "Could not write file %s" -msgstr "Impossible d’Ã©crire le fichier %s" - -#: wp-includes/functions.php:1940 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:101 wp-includes/locale.php:111 +#: wp-includes/locale.php:124 +msgid "Monday" +msgstr "lundi" +||||||| .r11156 +#: wp-includes/formatting.php:3261 +msgid "The email address entered did not appear to be a valid email address. Please enter a valid email address." +msgstr "L’adresse de messagerie fournie ne semble pas Ãªtre valide. Veuillez saisir une adresse valide." +======= +#: wp-includes/functions.php:1978 +msgid "Could not write file %s" +msgstr "Impossible d’Ã©crire le fichier %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:102 wp-includes/locale.php:112 +#: wp-includes/locale.php:125 +msgid "Tuesday" +msgstr "mardi" +||||||| .r11156 +#: wp-includes/formatting.php:3348 +msgid "The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL." +msgstr "L’adresse de WordPress que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +======= +#: wp-includes/functions.php:1940 msgid "Invalid file type" msgstr "Type du fichier non valide" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:103 wp-includes/locale.php:113 +#: wp-includes/locale.php:126 +msgid "Wednesday" +msgstr "mercredi" +||||||| .r11156 +#: wp-includes/formatting.php:3358 +msgid "The Site address you entered did not appear to be a valid URL. Please enter a valid URL." +msgstr "L’adresse de site que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +======= #: wp-includes/functions.php:1936 msgid "Empty filename" msgstr "Pas de nom de fichier" @@ -4148,15 +13610,49 @@ msgstr "Le fuseau horaire ne semble pas Ãªtre valide. Veuillez en choisir une va #: wp-includes/formatting.php:3557 msgid "The Site address you entered did not appear to be a valid URL. Please enter a valid URL." msgstr "L’adresse de site que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:104 wp-includes/locale.php:114 +#: wp-includes/locale.php:127 +msgid "Thursday" +msgstr "jeudi" +||||||| .r11156 +#: wp-includes/taxonomy.php:2491 +msgid "A term with the name provided already exists with this parent." +msgstr "Un terme avec ce nom existe dÃ©jÃ pour ce parent." +======= #: wp-includes/formatting.php:3544 msgid "The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL." msgstr "L’adresse de WordPress que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: weekday +#: wp-includes/locale.php:105 wp-includes/locale.php:115 +#: wp-includes/locale.php:128 +msgid "Friday" +msgstr "vendredi" +||||||| .r11156 +#: wp-includes/ms-functions.php:1965 +msgid "An error occurred adding you to this site. Back to the homepage." +msgstr "Une erreur est survenue lors de votre ajout Ã ce site. Retournez Ã l’accueil." +======= #: wp-includes/formatting.php:3444 msgid "The email address entered did not appear to be a valid email address. Please enter a valid email address." msgstr "L’adresse de messagerie fournie ne semble pas Ãªtre valide. Veuillez saisir une adresse valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2332 +msgid "Newer posts" +msgstr "Articles plus rÃ©cents" +||||||| .r11156 +#: wp-includes/ms-functions.php:1881 +msgid "This file is too big. Files must be less than %d KB in size." +msgstr "Ce fichier est trop gros. La taille des fichiers doit Ãªtre infÃ©rieure %d Ko." +======= #. translators: If your word count is based on single characters (East Asian #. characters), enter 'characters'. Otherwise, enter 'words'. Do not #. translate into your own language. @@ -4167,138 +13663,417 @@ msgstr "L’adresse de messagerie fournie ne semble pas Ãªtre valide. Veuill msgctxt "word count: words or characters?" msgid "words" msgstr "words" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2333 wp-includes/link-template.php:2388 +#: wp-includes/link-template.php:2433 +msgid "Posts navigation" +msgstr "Navigation des articles" +||||||| .r11156 +#: wp-includes/locale.php:177 +msgid "number_format_decimal_point" +msgstr "," +======= #: wp-includes/formatting.php:2765 wp-includes/general-template.php:2721 msgid "…" msgstr "…" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2331 +msgid "Older posts" +msgstr "Articles plus anciens" +||||||| .r11156 +#: wp-includes/comment-template.php:2108 +msgid "Your email address will not be published." +msgstr "Votre adresse de messagerie ne sera pas publiÃ©e." +======= #: wp-includes/formatting.php:2678 msgid "%s year" msgid_plural "%s years" msgstr[0] "%s annÃ©e" msgstr[1] "%s annÃ©es" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/l10n.php:960 +msgctxt "translations" +msgid "Available" +msgstr "Disponible" +||||||| .r11156 +#: wp-includes/class-http.php:191 wp-includes/class-wp-xmlrpc-server.php:5749 +msgid "A valid URL was not provided." +msgstr "L’URL fournie est invalide." +======= #: wp-includes/formatting.php:2673 msgid "%s month" msgid_plural "%s months" msgstr[0] "%s mois" msgstr[1] "%s mois" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/l10n.php:942 +msgctxt "translations" +msgid "Installed" +msgstr "InstallÃ©" +||||||| .r11156 +#: wp-includes/comment-template.php:2107 +msgid "Logged in as %2$s. Log out?" +msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter ?" +======= #: wp-includes/formatting.php:2668 msgid "%s week" msgid_plural "%s weeks" msgstr[0] "%s semaine" msgstr[1] "%s semaines" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1235 +msgctxt "post format archive title" +msgid "Audio" +msgstr "Audio" +||||||| .r11156 +#: wp-includes/class-wp-image-editor-gd.php:175 +#: wp-includes/class-wp-image-editor-imagick.php:232 +msgid "Could not calculate resized image dimensions" +msgstr "Impossible de lire la taille de l’image redimensionnÃ©e" +======= #: wp-includes/formatting.php:2663 msgid "%s day" msgid_plural "%s days" msgstr[0] "%s jour" msgstr[1] "%s jours" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1237 +msgctxt "post format archive title" +msgid "Chats" +msgstr "Discussions" +||||||| .r11156 +#: wp-signup.php:112 +msgid "Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!" +msgstr "Doit contenir au moins 4 caractÃ¨res, avec uniquement des lettres et des chiffres. Vous ne pourrez pas en changer, donc choisissez bien !" +======= #: wp-includes/formatting.php:2658 msgid "%s hour" msgid_plural "%s hours" msgstr[0] "%s heure" msgstr[1] "%s heures" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1233 +msgctxt "post format archive title" +msgid "Statuses" +msgstr "Ãtats" +||||||| .r11156 +#: wp-signup.php:690 +msgid "You must first log in, and then you can create a new site." +msgstr "Vous devez d’abord vous connecter avant de pouvoir crÃ©er un nouveau site." +======= #. translators: min=minute #: wp-includes/formatting.php:2653 msgid "%s min" msgid_plural "%s mins" msgstr[0] "%s minute" msgstr[1] "%s minutes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1231 +msgctxt "post format archive title" +msgid "Links" +msgstr "Liens" +||||||| .r11156 +#: wp-signup.php:725 +msgid "You are logged in already. No need to register again!" +msgstr "Vous Ãªtes dÃ©jÃ connectÃ©. Pas besoin de vous rÃ©inscrire !" +======= #. translators: em dash #: wp-includes/formatting.php:82 msgctxt "em dash" msgid "—" msgstr "—" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1227 +msgctxt "post format archive title" +msgid "Videos" +msgstr "VidÃ©os" +||||||| .r11156 +#: wp-includes/comment-template.php:942 +msgid "Use get_trackback_url() instead if you do not want the value echoed." +msgstr "Utilisez plutÃ´t get_trackback_url() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." +======= #. translators: en dash #: wp-includes/formatting.php:80 msgctxt "en dash" msgid "–" msgstr "–" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1229 +msgctxt "post format archive title" +msgid "Quotes" +msgstr "Citations" +||||||| .r11156 +#: wp-mail.php:15 +msgid "This action has been disabled by the administrator." +msgstr "Cette action a Ã©tÃ© dÃ©sactivÃ©e par l’administrateur." +======= #. translators: closing curly single quote #: wp-includes/formatting.php:77 msgctxt "closing curly single quote" msgid "’" msgstr "’" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1223 +msgctxt "post format archive title" +msgid "Galleries" +msgstr "Galeries" +||||||| .r11156 +#: wp-signup.php:266 +msgid "Welcome back, %s. By filling out the form below, you can add another site to your account. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!" +msgstr "Heureux de voir revoir, %s ! En remplissant le formulaire ci-dessous, vous pouvez ajouter un autre site Ã votre compte. Il n’y a pas de limite au nombre de sites dont vous pouvez disposer, donc crÃ©ez-en autant que vous le souhaitez, mais Ã©crivez pondÃ©rÃ©ment." +======= #. translators: opening curly single quote #: wp-includes/formatting.php:75 msgctxt "opening curly single quote" msgid "‘" msgstr "‘" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1225 +msgctxt "post format archive title" +msgid "Images" +msgstr "Images" +||||||| .r11156 +#: wp-includes/ms-functions.php:499 +msgid "Sorry, usernames may not contain the character “_”!" +msgstr "DÃ©solÃ©, les identifiants ne doivent pas contenir le caractÃ¨re « _ » !" +======= #. translators: double prime, for example in 9" (nine inches) #: wp-includes/formatting.php:72 msgctxt "double prime" msgid "″" msgstr "″" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1218 +msgctxt "daily archives date format" +msgid "F j, Y" +msgstr "j F Y" +||||||| .r11156 +#: wp-signup.php:650 +msgid "If you haven’t received your email yet, there are a number of things you can do:" +msgstr "Si vous n’avez encore pas reÃ§u votre e-mail, il existe un certain nombre de choses que vous pouvez faire :" +======= #. translators: prime, for example in 9' (nine feet) #: wp-includes/formatting.php:70 msgctxt "prime" msgid "′" msgstr "′" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1221 +msgctxt "post format archive title" +msgid "Asides" +msgstr "En passant" +||||||| .r11156 +#: wp-includes/author-template.php:63 +msgid "Use get_the_author() instead if you do not want the value echoed." +msgstr "Utilisez plutÃ´t get_the_author() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." +======= #. translators: apostrophe, for example in 'cause or can't #: wp-includes/formatting.php:67 msgctxt "apostrophe" msgid "’" msgstr "’" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/link-template.php:2279 +msgid "Post navigation" +msgstr "Navigation de l'article" +||||||| .r11156 +#: wp-includes/ms-load.php:413 +msgid "If you’re still stuck with this message, then check that your database contains the following tables:" +msgstr "Si vous Ãªtes toujours bloquÃ© par ce message, vÃ©rifiez alors que votre base de donnÃ©es contient bien les tables suivantes :" +======= #. translators: closing curly double quote #: wp-includes/formatting.php:64 msgctxt "closing curly double quote" msgid "”" msgstr " »" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: $dec_point argument for http:php.net/number_format, default is +#. . +#: wp-includes/locale.php:178 +msgid "number_format_decimal_point" +msgstr "," +||||||| .r11156 +#: wp-includes/script-loader.php:495 +msgid "Are you sure you want to install this plugin?" +msgstr "Voulez-vous vraiment installer cette extension ?" +======= #. translators: opening curly double quote #: wp-includes/formatting.php:62 wp-includes/formatting.php:4067 msgctxt "opening curly double quote" msgid "“" msgstr "« " +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:388 wp-login.php:747 wp-login.php:913 +msgid "Username" +msgstr "Identifiant" +||||||| .r11156 +#: wp-includes/script-loader.php:528 +msgid "Use as featured image" +msgstr "Utiliser comme image Ã la Une" +======= #: wp-includes/feed-rss2-comments.php:82 msgid "Protected Comments: Please enter your password to view comments." msgstr "Commentaires protÃ©gÃ©s : saisissez votre mot de passe pour accÃ©der aux commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:389 wp-login.php:917 +msgid "Password" +msgstr "Mot de passe" +||||||| .r11156 +#: wp-includes/script-loader.php:345 +msgid "Mismatch" +msgstr "IncohÃ©rence" +======= #: wp-includes/feed-rss2-comments.php:37 msgid "Comments on: %s" msgstr "Commentaires sur : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:391 wp-login.php:898 wp-login.php:930 +msgid "Log In" +msgstr "Se connecter" +||||||| .r11156 +#: wp-includes/load.php:187 +msgid "Maintenance" +msgstr "Maintenance" +======= #: wp-includes/feed-atom-comments.php:75 wp-includes/feed-rss2-comments.php:74 msgid "By: %s" msgstr "Par : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4186 wp-includes/functions.php:4190 +msgid "UTC" +msgstr "UTC" +||||||| .r11156 +#: wp-includes/load.php:191 +msgid "Briefly unavailable for scheduled maintenance. Check back in a minute." +msgstr "IndisponibilitÃ© temporaire pour cause de maintenance. Veuillez revenir dans un instant." +======= #: wp-includes/feed-atom-comments.php:73 wp-includes/feed-rss2-comments.php:72 msgid "Comment on %1$s by %2$s" msgstr "Commentaires sur %1$s par %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:276 wp-login.php:578 wp-login.php:641 +#: wp-login.php:687 wp-login.php:769 +msgid "Log in" +msgstr "Connexion" +||||||| .r11156 +#: wp-includes/post.php:100 +msgid "Navigation Menu Items" +msgstr "ÃlÃ©ments de menu de navigation" +======= #: wp-includes/feed-atom-comments.php:36 wp-includes/feed-rss2-comments.php:41 msgid "Comments for %s" msgstr "Commentaires pour %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:278 +msgid "Log out" +msgstr "DÃ©connexion" +||||||| .r11156 +#: wp-includes/post.php:101 +msgid "Navigation Menu Item" +msgstr "ÃlÃ©ment de menu de navigation" +======= #: wp-includes/feed-atom-comments.php:34 wp-includes/feed-rss2-comments.php:39 msgid "Comments for %1$s searching on %2$s" msgstr "Commentaires pour %1$s, recherche de %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:390 wp-login.php:928 +msgid "Remember Me" +msgstr "Se souvenir de moi" +||||||| .r11156 +#: wp-includes/taxonomy.php:76 +msgid "Navigation Menus" +msgstr "Menus de navigation" +======= #: wp-includes/feed-atom-comments.php:32 msgid "Comments on %s" msgstr "Commentaires sur %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:518 wp-login.php:581 wp-login.php:690 +#: wp-login.php:765 wp-login.php:947 +msgid "Register" +msgstr "Inscription" +||||||| .r11156 +#: wp-links-opml.php:29 +msgid "Links for %s" +msgstr "Liens pour %s" +======= #: wp-includes/deprecated.php:3232 msgid "File “%s” is not an image." msgstr "Le fichier Â« %s Â» n’est pas une image." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:522 +msgid "Site Admin" +msgstr "Admin. du Site" +||||||| .r11156 +#: wp-includes/nav-menu.php:686 +msgid "Custom" +msgstr "Lien" +======= #: wp-includes/deprecated.php:3225 msgid "The GD image library is not installed." msgstr "La bibliothÃ¨que d’imagerie GD n’est pas installÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: separator, 2: search phrase +#: wp-includes/general-template.php:895 +msgid "Search Results %1$s %2$s" +msgstr "RÃ©sultats de recherche %1$s %2$s" +||||||| .r11156 +#: wp-includes/default-widgets.php:1351 +msgid "No menus have been created yet. Create some." +msgstr "Aucun menu n’a Ã©tÃ© crÃ©Ã© pour le moment. En crÃ©er un." +======= #: wp-includes/deprecated.php:3222 msgid "File “%s” doesn’t exist?" msgstr "Le fichier Â« %s Â» n’existe pas ?" @@ -4343,300 +14118,1096 @@ msgstr "SÃ©lectionner le menu :" #: wp-includes/default-widgets.php:1407 msgid "No menus have been created yet. Create some." msgstr "Aucun menu n’a Ã©tÃ© crÃ©Ã© pour le moment. En crÃ©er un." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:900 +msgid "Page not found" +msgstr "Page non trouvÃ©e" +||||||| .r11156 +#: wp-includes/script-loader.php:538 +msgid "" +"You are about to permanently delete this menu. \n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement ce menu.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour le supprimer." +======= #: wp-includes/default-widgets.php:1345 msgid "Custom Menu" msgstr "Menu personnalisÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3570 +msgid "%1$s was called with an argument that is deprecated since version %2$s! %3$s" +msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s ! %3$s" +||||||| .r11156 +#: wp-includes/link-template.php:3116 +msgid "This is the short link." +msgstr "Ceci est un lien court." +======= #: wp-includes/default-widgets.php:1344 msgid "Add a custom menu to your sidebar." msgstr "Ajouter un menu personnalisÃ© Ã votre barre latÃ©rale." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4194 +msgid "Manual Offsets" +msgstr "DÃ©calages manuels" +||||||| .r11156 +#: wp-includes/update.php:547 +msgid "%d WordPress Update" +msgstr "%d mise Ã jour de WordPress" +======= #: wp-includes/default-widgets.php:1316 msgid "Taxonomy:" msgstr "Taxinomie :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3620 +msgid "(This message was added in version %s.)" +msgstr "(Ce message a Ã©tÃ© ajoutÃ© Ã la version %s.)" +||||||| .r11156 +#: wp-includes/update.php:551 +msgid "%d Theme Update" +msgid_plural "%d Theme Updates" +msgstr[0] "%d mise Ã jour de thÃ¨me" +msgstr[1] "%d mises Ã jour de thÃ¨mes" +======= #: wp-includes/default-widgets.php:1270 msgid "Tags" msgstr "Ãtiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3622 +msgid "%1$s was called incorrectly. %2$s %3$s" +msgstr "%1$s est appelÃ©e de la mauvaise maniÃ¨re. %2$s %3$s" +||||||| .r11156 +#: wp-includes/update.php:549 +msgid "%d Plugin Update" +msgid_plural "%d Plugin Updates" +msgstr[0] "%d mise Ã jour d’extension" +msgstr[1] "%d mises Ã jour d’extensions" +======= #: wp-includes/default-widgets.php:1261 msgid "Tag Cloud" msgstr "Nuage dâÃ©tiquettes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3572 +msgid "%1$s was called with an argument that is deprecated since version %2$s with no alternative available." +msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." +||||||| .r11156 +#: wp-signup.php:379 +msgid "The site %s is yours." +msgstr "Le site %s est Ã vous." +======= #: wp-includes/default-widgets.php:1260 msgid "A cloud of your most used tags." msgstr "Un nuage de vos Ã©tiquettes les plus utilisÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.wp-scripts.php:42 +msgid "Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks." +msgstr "Les scripts et les styles ne peuvent pas Ãªtre enregistrÃ©s ou ajoutÃ©s avant le dÃ©clenchement des crochets %1$s, %2$s ou %3$s." +||||||| .r11156 +#: wp-signup.php:296 +msgid "Create Site" +msgstr "CrÃ©er un site" +======= #: wp-includes/default-widgets.php:1194 msgid "Display item date?" msgstr "Afficher la date de l’Ã©lÃ©ment ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4791 wp-includes/user.php:191 +msgid "Please log in again." +msgstr "Veuillez vous reconnecter." +||||||| .r11156 +#: wp-signup.php:281 +msgid "If you’re not going to use a great site domain, leave it for a new user. Now have at it!" +msgstr "Si vous ne comptez pas utiliser ce superbe nom de domaine, laissez-le Ã un autre utilisateur. Et maintenant, lancez-vous !" +======= #: wp-includes/default-widgets.php:1191 msgid "Display item author if available?" msgstr "Afficher l’auteur de l’Ã©lÃ©ment si disponible ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.wp-scripts.php:193 +msgid "Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook." +msgstr "Ne dÃ©senregistrez pas le script %1$s de la zone d’administration. Pour cibler le thÃ¨me public, utilisez le crochet %2$s." +||||||| .r11156 +#: wp-signup.php:272 +msgid "Sites you are already a member of:" +msgstr "Les sites que vous possÃ©dez dÃ©jÃ :" +======= #: wp-includes/default-widgets.php:1188 msgid "Display item content?" msgstr "Afficher le contenu de l’Ã©lÃ©ment ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:229 +msgctxt "placeholder" +msgid "Search …" +msgstr "Recherche…" +||||||| .r11156 +#: wp-includes/ms-load.php:102 +msgid "This site has not been activated yet. If you are having problems activating your site, please contact %1$s." +msgstr "Ce site n’a pas encore Ã©tÃ© activÃ©. Si vous rencontrez des problÃ¨mes durant l’activation de votre site, veuillez contacter %1$s." +======= #: wp-includes/default-widgets.php:1178 msgid "How many items would you like to display?" msgstr "Combien d’entrÃ©es souhaitez-vous afficher ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4790 wp-includes/script-loader.php:432 +msgid "Session expired" +msgstr "La session a expirÃ©" +||||||| .r11156 +#: wp-includes/script-loader.php:256 +msgid "File canceled." +msgstr "Fichier annulÃ©." +======= #: wp-includes/default-widgets.php:1175 msgid "Give the feed a title (optional):" msgstr "Donnez un titre au flux (facultatif) :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:231 wp-includes/general-template.php:238 +msgctxt "submit button" +msgid "Search" +msgstr "Rechercher" +||||||| .r11156 +#: wp-signup.php:117 +msgid "Site Title:" +msgstr "Titre du site :" +======= #: wp-includes/default-widgets.php:1172 msgid "Enter the RSS feed URL here:" msgstr "Saisissez l’adresse web du flux RSS ici :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1208 +msgid "Category: %s" +msgstr "CatÃ©gorie : %s" +||||||| .r11156 +#: wp-signup.php:96 +msgid "Site Domain:" +msgstr "Domaine du site :" +======= #: wp-includes/default-widgets.php:1167 msgid "RSS Error: %s" msgstr "Erreur RSS : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1214 +msgid "Year: %s" +msgstr "AnnÃ©e : %s" +||||||| .r11156 +#: wp-signup.php:94 +msgid "Site Name:" +msgstr "Nom du site :" +======= #: wp-includes/default-widgets.php:1088 msgid "Untitled" msgstr "Sans titre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1212 +msgid "Author: %s" +msgstr "Auteur : %s" +||||||| .r11156 +#: wp-signup.php:109 +msgid "sitename" +msgstr "nomdusite" +======= #: wp-includes/default-widgets.php:1072 wp-includes/rss.php:899 msgid "An error has occurred, which probably means the feed is down. Try again later." msgstr "Une erreur est survenue, le flux est probablement indisponible. Veuillez rÃ©essayer plus tard." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1210 +msgid "Tag: %s" +msgstr "Ãtiquette : %s" +||||||| .r11156 +#: wp-signup.php:260 +msgid "Get another %s site in seconds" +msgstr "Ouvrir un autre site %s en quelques secondes" +======= #: wp-includes/default-widgets.php:1057 msgid "RSS Error: %s" msgstr "Erreur RSS : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1218 +msgid "Day: %s" +msgstr "Jour : %s" +||||||| .r11156 +#: wp-signup.php:643 +msgid "Congratulations! Your new site, %s, is almost ready." +msgstr "FÃ©licitations! Votre nouveau site, %s, est presque prÃªt." +======= #: wp-includes/default-widgets.php:1000 msgid "Unknown Feed" msgstr "Flux inconnu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1216 +msgid "Month: %s" +msgstr "Mois : %s" +||||||| .r11156 +#: wp-signup.php:704 +msgid "Site registration has been disabled." +msgstr "Les inscriptions de sites sont dÃ©sactivÃ©es." +======= #: wp-includes/default-widgets.php:966 msgid "RSS" msgstr "Flux" +>>>>>>> .r12027 -#: wp-includes/default-widgets.php:964 -msgid "Entries from any RSS or Atom feed." -msgstr "Les entrÃ©es depuis n’importe quel flux RSS ou Atom." +<<<<<<< .mine +#: wp-includes/functions.php:3621 +msgid "Please see Debugging in WordPress for more information." +msgstr "Veuillez consulter la page DÃ©bugger dans WordPress (en) pour plus d’informations." +||||||| .r11156 +#: wp-signup.php:453 +msgid "Gimme a site!" +msgstr "Donnez-moi un site !" +======= +#: wp-includes/default-widgets.php:964 +msgid "Entries from any RSS or Atom feed." +msgstr "Les entrÃ©es depuis n’importe quel flux RSS ou Atom." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: +#. 'url' argument +#: wp-includes/general-template.php:608 +msgid "The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead." +msgstr "L'option %1$s est obsolÃ¨te pour l'ensemble des fonctions %2$s. Utilisez plutÃ´t l'option %3$s." +||||||| .r11156 +#: wp-signup.php:645 +msgid "But, before you can start using your site, you must activate it." +msgstr "Mais, avant d’utiliser votre nouveau site, vous devez l’activer." +======= #: wp-includes/default-widgets.php:950 msgid "Number of comments to show:" msgstr "Nombre de commentaires Ã afficher :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: +#. is_rtl() function name +#: wp-includes/general-template.php:674 +msgid "The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead." +msgstr "L'option %1$s est obsolÃ¨te pour l'ensemble des fonctions %2$s. Utilisez plutÃ´t l'option %3$s." +||||||| .r11156 +#: wp-signup.php:647 +msgid "If you do not activate your site within two days, you will have to sign up again." +msgstr "Si vous n’activez pas votre site dans les deux jours, vous devrez Ã nouveau l’enregistrer." +======= #. translators: comments widget: 1: comment author, 2: post link #: wp-includes/default-widgets.php:912 msgctxt "widgets" msgid "%1$s on %2$s" msgstr "%1$s dans %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:228 wp-includes/general-template.php:229 +#: wp-includes/general-template.php:236 +msgctxt "label" +msgid "Search for:" +msgstr "Rechercher :" +||||||| .r11156 +#: wp-includes/default-widgets.php:1360 +msgid "Select Menu:" +msgstr "SÃ©lectionner le menu :" +======= #: wp-includes/default-widgets.php:820 wp-includes/default-widgets.php:874 msgid "Recent Comments" msgstr "Commentaires rÃ©cents" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.wp-styles.php:87 +msgid "Do not pass style tags to wp_add_inline_style()." +msgstr "Ne passez pas de balises de style dans wp_add_inline_style()." +||||||| .r11156 +#: wp-includes/taxonomy.php:77 +msgid "Navigation Menu" +msgstr "Menu de navigation" +======= #: wp-includes/default-widgets.php:819 msgid "Your site’s most recent comments." msgstr "Les commentaires les plus rÃ©cents de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1216 +msgctxt "monthly archives date format" +msgid "F Y" +msgstr "F Y" +||||||| .r11156 +#: wp-includes/default-widgets.php:1279 +msgid "Taxonomy:" +msgstr "Taxinomie :" +======= #: wp-includes/default-widgets.php:806 msgid "Display post date?" msgstr "Afficher la date du contenu ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:933 +msgid "Page %s" +msgstr "Page %s" +||||||| .r11156 +#: wp-includes/admin-bar.php:681 +msgid "Menus" +msgstr "Menus" +======= #: wp-includes/default-widgets.php:802 msgid "Number of posts to show:" msgstr "Nombre d’articles Ã afficher :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/general-template.php:1214 +msgctxt "yearly archives date format" +msgid "Y" +msgstr "Y" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:352 +msgid "Software Name" +msgstr "Nom du logiciel" +======= #: wp-includes/default-widgets.php:690 wp-includes/default-widgets.php:719 msgid "Recent Posts" msgstr "Articles rÃ©cents" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4792 +msgid "The login page will open in a new window. After logging in you can close it and return to this page." +msgstr "La page de connexion s’ouvrira dans une nouvelle fenÃªtre. AprÃ¨s vous Ãªtre connectÃ©(e), vous pourrez la fermer et revenir Ã cette page." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:357 +msgid "Software Version" +msgstr "Version du logiciel" +======= #: wp-includes/default-widgets.php:689 msgid "Your site’s most recent Posts." msgstr "Les articles les plus rÃ©cents de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:4141 +msgid "Select a city" +msgstr "SÃ©lectionner une ville" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:414 +msgid "Time Zone" +msgstr "Fuseau horaire" +======= #: wp-includes/default-widgets.php:675 msgid "Show hierarchy" msgstr "Afficher la hiÃ©rarchie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:945 wp-includes/comment-template.php:2253 +msgctxt "noun" +msgid "Comment" +msgstr "Commentaire" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:439 +msgid "Allow new users to sign up" +msgstr "Autoriser les nouveaux utilisateurs Ã s’inscrire" +======= #: wp-includes/default-widgets.php:595 msgid "Select Category" msgstr "Choisir une catÃ©gorie" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: comment status +#: wp-includes/comment.php:1028 +msgctxt "adjective" +msgid "Approved" +msgstr "ApprouvÃ©" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2479 +msgid "Sorry, you cannot edit this page." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cette page." +======= #: wp-includes/default-widgets.php:563 msgid "A list or dropdown of categories." msgstr "Une liste ou un menu dÃ©roulant des catÃ©gories." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: comment status +#: wp-includes/comment.php:1030 +msgctxt "adjective" +msgid "Spam" +msgstr "IndÃ©sirable" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2490 +#: wp-includes/class-wp-xmlrpc-server.php:2597 +#: wp-includes/class-wp-xmlrpc-server.php:2647 +msgid "Sorry, no such page." +msgstr "DÃ©solÃ©, aucune page ne correspond." +======= #: wp-includes/default-widgets.php:550 msgid "Automatically add paragraphs" msgstr "CrÃ©er automatiquement les paragraphes" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2233 +#: wp-includes/theme-compat/comments-popup.php:74 +#: wp-includes/theme-compat/comments.php:87 +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2518 +#: wp-includes/class-wp-xmlrpc-server.php:2690 +msgid "Sorry, you cannot edit pages." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les pages." +======= #: wp-includes/default-widgets.php:503 msgid "Text" msgstr "Texte" - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/deprecated.php:703 wp-includes/media-template.php:629 +#: wp-includes/media-template.php:675 wp-includes/media-template.php:734 +#: wp-includes/media-template.php:860 wp-includes/media-template.php:875 +#: wp-includes/media-template.php:926 wp-includes/media-template.php:988 +#: wp-includes/media-template.php:1086 wp-includes/media-template.php:1175 +#: wp-includes/script-loader.php:343 +msgid "None" +msgstr "Aucun" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2601 +msgid "Sorry, you do not have the right to delete this page." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cette page." +======= #: wp-includes/default-widgets.php:501 msgid "Arbitrary text or HTML." msgstr "Texte arbitraire ou HTML." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:18 wp-includes/default-widgets.php:36 +#: wp-includes/post-template.php:1110 wp-includes/theme-compat/sidebar.php:55 +msgid "Pages" +msgstr "Pages" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2606 +msgid "Failed to delete the page." +msgstr "Ãchec lors de la suppression de la page." +======= #: wp-includes/default-widgets.php:458 msgid "Calendar" msgstr "Calendrier" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1094 +msgid "RSS" +msgstr "Flux" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2651 +msgid "Sorry, you do not have the right to edit this page." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cette page." +======= #: wp-includes/default-widgets.php:457 msgid "A calendar of your site’s Posts." msgstr "Un calendrier des articles de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:1952 +msgid "Invalid file type" +msgstr "Type du fichier non valide" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2825 +msgid "Sorry, you do not have the right to add a category." +msgstr "DÃ©solÃ©, vous n’avez pas les droits pour ajouter une catÃ©gorie." +======= #: wp-includes/default-widgets.php:423 msgctxt "meta widget link text" msgid "WordPress.org" msgstr "Site de WordPress-FR" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:928 wp-includes/default-widgets.php:994 +msgid "Recent Comments" +msgstr "Commentaires rÃ©cents" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2853 +#: wp-includes/class-wp-xmlrpc-server.php:2855 +msgid "Sorry, the new category failed." +msgstr "DÃ©solÃ©, la crÃ©ation de la catÃ©gorie a Ã©chouÃ©." +======= #: wp-includes/default-widgets.php:422 wp-includes/theme-compat/sidebar.php:75 msgid "Powered by WordPress, state-of-the-art semantic personal publishing platform." msgstr "PropulsÃ© par WordPress, plate-forme de publication personnelle sÃ©mantique de pointe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1392 wp-includes/script-loader.php:475 +msgid "Reply" +msgstr "RÃ©pondre" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2894 +msgid "Sorry, you do not have the right to delete a category." +msgstr "DÃ©solÃ©, vous n’avez pas les droits pour supprimer une catÃ©gorie." +======= #: wp-includes/default-widgets.php:411 msgid "Comments RSS" msgstr "RSS des commentaires" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:947 +msgid "Pingback" +msgstr "Ping" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:2977 +#: wp-includes/class-wp-xmlrpc-server.php:3077 +#: wp-includes/class-wp-xmlrpc-server.php:3142 +msgid "Invalid comment ID." +msgstr "Identifiant commentaire invalide." +======= #: wp-includes/default-widgets.php:410 msgid "Entries RSS" msgstr "Flux RSS des articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:946 +msgid "Trackback" +msgstr "RÃ©trolien" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3013 +msgid "Sorry, you cannot edit comments." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les commentaires." +======= #: wp-includes/default-widgets.php:394 wp-includes/default-widgets.php:400 #: wp-includes/theme-compat/sidebar.php:69 msgid "Meta" msgstr "MÃ©ta" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1078 +msgid "Number of comments to show:" +msgstr "Nombre de commentaires Ã afficher :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3155 +msgid "Invalid comment status." +msgstr "Statut du commentaire non valide." +======= #: wp-includes/default-widgets.php:393 msgid "Login, RSS, & WordPress.org links." msgstr "Connexion, flux RSS et liens WordPress.org." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1196 +msgid "RSS Error: %s" +msgstr "Erreur RSS : %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3187 +msgid "Sorry, the comment could not be edited. Something wrong happened." +msgstr "DÃ©solÃ©, votre commentaire n’a pu Ãªtre modifiÃ©. Une erreur est survenue." +======= #: wp-includes/default-widgets.php:377 wp-includes/default-widgets.php:672 msgid "Show post counts" msgstr "Afficher le nombre d’articles" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1131 +msgid "Unknown Feed" +msgstr "Flux inconnu" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3234 +msgid "You must be registered to comment" +msgstr "Vous devez Ãªtre enregistrÃ© pour laisser un commentaire" +======= #: wp-includes/default-widgets.php:375 wp-includes/default-widgets.php:669 msgid "Display as dropdown" msgstr "Afficher comme liste dÃ©roulante" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:306 wp-includes/default-widgets.php:318 +#: wp-includes/general-template.php:1246 +#: wp-includes/theme-compat/sidebar.php:57 +msgid "Archives" +msgstr "Archives" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1164 +#: wp-includes/class-wp-xmlrpc-server.php:1423 +#: wp-includes/class-wp-xmlrpc-server.php:1484 +#: wp-includes/class-wp-xmlrpc-server.php:1575 +#: wp-includes/class-wp-xmlrpc-server.php:2476 +#: wp-includes/class-wp-xmlrpc-server.php:3247 +#: wp-includes/class-wp-xmlrpc-server.php:3250 +#: wp-includes/class-wp-xmlrpc-server.php:4060 +#: wp-includes/class-wp-xmlrpc-server.php:4736 +#: wp-includes/class-wp-xmlrpc-server.php:5014 +#: wp-includes/class-wp-xmlrpc-server.php:5520 +#: wp-includes/class-wp-xmlrpc-server.php:5568 +#: wp-includes/class-wp-xmlrpc-server.php:5692 wp-includes/post.php:3098 +#: wp-includes/post.php:3545 +msgid "Invalid post ID." +msgstr "Identifiant de l’article non valide." +======= #: wp-includes/default-widgets.php:322 msgid "Select Post" msgstr "SÃ©lectionnez un article" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:3222 +msgid "File “%s” doesn’t exist?" +msgstr "Le fichier Â« %s Â» n’existe pas ?" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3276 +msgid "Comment author name and email are required" +msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +======= #: wp-includes/default-widgets.php:319 msgid "Select Week" msgstr "SÃ©lectionnez une semaine" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:3225 +msgid "The GD image library is not installed." +msgstr "La bibliothÃ¨que d’imagerie GD n’est pas installÃ©e." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3278 +msgid "A valid email address is required" +msgstr "Une adresse de messagerie valide est requise" +======= #: wp-includes/default-widgets.php:316 msgid "Select Day" msgstr "SÃ©lectionnez un jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:3232 +msgid "File “%s” is not an image." +msgstr "Le fichier Â« %s Â» n’est pas une image." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3351 +msgid "You are not allowed access to details about comments." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails des commentaires." +======= #: wp-includes/default-widgets.php:313 msgid "Select Month" msgstr "Choisir un mois" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:130 +msgid "Links" +msgstr "Liens" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:3520 +msgid "You are not allowed to update options." +msgstr "Vous n’avez pas l’autorisation de mettre Ã jour les options." +======= #: wp-includes/default-widgets.php:310 msgid "Select Year" msgstr "SÃ©lectionnez une annÃ©e" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:2731 +msgid "First Post" +msgstr "Premier article" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1578 +#: wp-includes/class-wp-xmlrpc-server.php:3920 +#: wp-includes/class-wp-xmlrpc-server.php:4063 +#: wp-includes/class-wp-xmlrpc-server.php:5017 +#: wp-includes/class-wp-xmlrpc-server.php:5360 +#: wp-includes/class-wp-xmlrpc-server.php:5571 +msgid "Sorry, you cannot edit this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +======= #: wp-includes/default-widgets.php:272 wp-includes/default-widgets.php:280 #: wp-includes/general-template.php:1195 #: wp-includes/theme-compat/sidebar.php:57 msgid "Archives" msgstr "Archives" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:571 +msgid "Text" +msgstr "Texte" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4117 +#: wp-includes/class-wp-xmlrpc-server.php:5429 +msgid "Either there are no posts, or something went wrong." +msgstr "Soit il n’y a pas d’articles, soit une erreur s’est produite." +======= #: wp-includes/default-widgets.php:271 msgid "A monthly archive of your site’s Posts." msgstr "Une archive mensuelle des articles de votre site." - +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/default-widgets.php:102 wp-includes/default-widgets.php:279 +#: wp-includes/default-widgets.php:419 wp-includes/default-widgets.php:501 +#: wp-includes/default-widgets.php:555 wp-includes/default-widgets.php:624 +#: wp-includes/default-widgets.php:758 wp-includes/default-widgets.php:907 +#: wp-includes/default-widgets.php:1075 wp-includes/default-widgets.php:1465 +#: wp-includes/default-widgets.php:1586 +msgid "Title:" +msgstr "Titre :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4260 +#: wp-includes/class-wp-xmlrpc-server.php:4325 +#: wp-includes/class-wp-xmlrpc-server.php:5114 +#: wp-includes/class-wp-xmlrpc-server.php:5645 +msgid "Sorry, no such post." +msgstr "DÃ©solÃ©, aucun article ne correspond." +======= #: wp-includes/default-widgets.php:227 msgctxt "Search widget" msgid "Search" msgstr "Chercher" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2237 +#: wp-includes/theme-compat/comments.php:93 +msgid "Website" +msgstr "Site web" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4269 +#: wp-includes/class-wp-xmlrpc-server.php:4909 +msgid "Sorry, you do not have the right to publish this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier cet article." +======= #: wp-includes/default-widgets.php:226 msgid "A search form for your site." msgstr "Un formulaire de recherche pour votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4571 +#: wp-includes/class-wp-xmlrpc-server.php:5067 +msgid "Sorry, you do not have the right to edit this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4797 +msgid "You are not allowed to change the post author as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +======= #: wp-includes/default-widgets.php:211 msgid "Number of links to show:" msgstr "Nombre de liens Ã afficher :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4639 +msgid "Sorry, you do not have the right to delete this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4801 +msgid "You are not allowed to change the page author as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +======= #: wp-includes/default-widgets.php:208 msgid "Show Link Rating" msgstr "Afficher la note du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/feed-atom-comments.php:32 +msgid "Comments on %s" +msgstr "Commentaires sur %s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4907 +msgid "Sorry, you do not have the right to publish this page." +msgstr "DÃ©solÃ©, vous n’avez pas le droit de publier cette page." +======= #: wp-includes/default-widgets.php:206 msgid "Show Link Description" msgstr "Afficher la description du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:471 wp-includes/theme-compat/sidebar.php:75 +msgid "Powered by WordPress, state-of-the-art semantic personal publishing platform." +msgstr "PropulsÃ© par WordPress, plate-forme de publication personnelle sÃ©mantique de pointe." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4945 +msgid "Sorry, your entry could not be edited. Something wrong happened." +msgstr "DÃ©solÃ©, votre entrÃ©e n’a pu Ãªtre modifiÃ©e. Une erreur est survenue." +======= #: wp-includes/default-widgets.php:204 msgid "Show Link Name" msgstr "Afficher le nom du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1323 +msgid "Enter your password to view comments." +msgstr "Saisissez votre mot de passe pour accÃ©der aux commentaires." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5351 +msgid "Could not write file %1$s (%2$s)" +msgstr "Impossible d’Ã©crire le fichier %1$s (%2$s)" +======= #: wp-includes/default-widgets.php:202 msgid "Show Link Image" msgstr "Afficher l’image du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:789 +msgid "No Comments" +msgstr "Pas de commentaire" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5523 +msgid "Sorry, you can not edit this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +======= #: wp-includes/default-widgets.php:197 msgctxt "Links widget" msgid "Random" msgstr "AlÃ©atoire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:791 +msgid "1 Comment" +msgstr "Un commentaire" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5754 +msgid "Is there no link to us?" +msgstr "N’y a-t-il aucun lien vers nous ?" +======= #: wp-includes/default-widgets.php:196 msgid "Link ID" msgstr "ID du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:787 +msgid "% Comments" +msgstr "% commentaires" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5794 +#: wp-includes/class-wp-xmlrpc-server.php:5801 +#: wp-includes/class-wp-xmlrpc-server.php:5808 +#: wp-includes/class-wp-xmlrpc-server.php:5948 +msgid "The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource." +msgstr "L’adresse web spÃ©cifiÃ©e ne peut Ãªtre utilisÃ©e comme cible. Soit elle n’existe pas, ou il ne s’agit pas d’une ressource reconnaissant les pings." +======= #: wp-includes/default-widgets.php:195 msgid "Link rating" msgstr "Note du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:460 +msgid "Comments RSS" +msgstr "RSS des commentaires" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5804 +msgid "The source URL and the target URL cannot both point to the same resource." +msgstr "L’adresse source et l’adresse cible ne peuvent pointer vers la mÃªme ressource." +======= #: wp-includes/default-widgets.php:194 msgid "Link title" msgstr "Titre du lien" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1928 +msgid "%s says:" +msgstr "%s dit :" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5812 +msgid "The pingback has already been registered." +msgstr "Le ping a dÃ©jÃ Ã©tÃ© enregistrÃ©." +======= #: wp-includes/default-widgets.php:183 msgctxt "links widget" msgid "All Links" msgstr "Tous les liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1931 wp-includes/comment-template.php:1993 +msgid "Your comment is awaiting moderation." +msgstr "Votre commentaire est en attente de modÃ©ration" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5836 +msgid "The source URL does not exist." +msgstr "L’adresse d’origine n’existe pas." +======= #: wp-includes/default-widgets.php:181 msgid "Select Link Category:" msgstr "SÃ©lectionner la catÃ©gorie de liens :" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: 1: date, 2: time +#: wp-includes/comment-template.php:1938 +msgid "%1$s at %2$s" +msgstr "%1$s Ã %2$s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5856 +msgid "We cannot find a title on that page." +msgstr "Nous ne trouvons pas du titre pour cette page." +======= #: wp-includes/default-widgets.php:118 msgid "Links" msgstr "Liens" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1938 +msgid "(Edit)" +msgstr "(Modifier)" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5892 +msgid "The source URL does not contain a link to the target URL, and so cannot be used as a source." +msgstr "L’adresse source ne contient pas de lien vers l’adresse cible, et ne peut donc pas Ãªtre utilisÃ©e comme source." +======= #: wp-includes/default-widgets.php:117 msgid "Your blogroll" msgstr "Vos liens prÃ©fÃ©rÃ©s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:440 wp-includes/default-widgets.php:449 +#: wp-includes/theme-compat/sidebar.php:69 +msgid "Meta" +msgstr "MÃ©ta" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5921 +msgid "Pingback from %1$s to %2$s registered. Keep the web talking! :-)" +msgstr "RÃ©ception d’un ping de %1$s pour %2$s. Continuons la conversation ! :-)" +======= #: wp-includes/default-widgets.php:102 msgid "Page IDs, separated by commas." msgstr "IDs de pages, sÃ©parÃ©s par une virgule." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1394 +msgid "Log in to Reply" +msgstr "Connectez-vous pour rÃ©pondre" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:5955 +msgid "The specified target URL does not exist." +msgstr "L’adresse cible spÃ©cifiÃ©e n’existe pas." +======= #: wp-includes/default-widgets.php:100 msgid "Exclude:" msgstr "Exclure :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1504 +msgid "Leave a Comment" +msgstr "Laisser un commentaire" +||||||| .r11156 +#: wp-includes/load.php:123 +msgid "Your PHP installation appears to be missing the MySQL extension which is required by WordPress." +msgstr "Votre installation PHP ne dispose pas de MySQL. Extension requise pour WordPress." +======= #: wp-includes/default-widgets.php:96 msgid "Page ID" msgstr "ID de la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1505 +msgid "Log in to leave a Comment" +msgstr "Connectez-vous pour laisser un commentaire" +||||||| .r11156 +#: wp-includes/load.php:384 +msgid "ERROR: $table_prefix in wp-config.php can only contain numbers, letters, and underscores." +msgstr "ERREUR: la ligne $table_prefix du fichier wp-config.php ne doit contenir que des chiffres, lettres ou le caractÃ¨re soulignÃ©." +======= #: wp-includes/default-widgets.php:95 msgid "Page order" msgstr "Ordre de la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1660 wp-includes/comment-template.php:2264 +#: wp-includes/theme-compat/comments.php:68 +msgid "Leave a Reply" +msgstr "Laisser un commentaire" +||||||| .r11156 +#: wp-includes/wp-db.php:1229 +msgid "WordPress database error %1$s for query %2$s made by %3$s" +msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s faite par %3$s" +======= #: wp-includes/default-widgets.php:94 msgid "Page title" msgstr "Titre de la page" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1661 wp-includes/comment-template.php:2265 +#: wp-includes/theme-compat/comments.php:68 +msgid "Leave a Reply to %s" +msgstr "RÃ©pondre Ã %s" +||||||| .r11156 +#: wp-includes/wp-db.php:1231 +msgid "WordPress database error %1$s for query %2$s" +msgstr "Erreur de la base de donnÃ©es WordPress %1$s pour la requÃªte %2$s" +======= #: wp-includes/default-widgets.php:92 wp-includes/default-widgets.php:192 msgid "Sort by:" msgstr "Trier par :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2266 +msgid "Cancel reply" +msgstr "Annuler la rÃ©ponse." +||||||| .r11156 +#: wp-includes/comment-template.php:2115 +msgid "Cancel reply" +msgstr "Annuler la rÃ©ponse." +======= #: wp-includes/default-widgets.php:90 wp-includes/default-widgets.php:250 #: wp-includes/default-widgets.php:373 wp-includes/default-widgets.php:444 #: wp-includes/default-widgets.php:487 wp-includes/default-widgets.php:545 @@ -4645,66 +15216,196 @@ msgstr "Trier par :" #: wp-includes/default-widgets.php:1412 msgid "Title:" msgstr "Titre :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2267 +msgid "Post Comment" +msgstr "Laisser un commentaire" +||||||| .r11156 +#: wp-includes/comment-template.php:2116 +msgid "Post Comment" +msgstr "Laisser un commentaire" +======= #: wp-includes/default-widgets.php:18 wp-includes/default-widgets.php:32 #: wp-includes/post-template.php:1084 wp-includes/theme-compat/sidebar.php:55 msgid "Pages" msgstr "Pages" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment.php:1026 +msgid "Unapproved" +msgstr "DÃ©sapprouvÃ©" +||||||| .r11156 +#: wp-includes/comment.php:532 +msgid "Unapproved" +msgstr "DÃ©sapprouvÃ©" +======= #: wp-includes/default-widgets.php:17 msgid "A list of your site’s Pages." msgstr "Une liste des pages de votre site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment.php:1381 wp-includes/comment.php:1383 +msgid "Duplicate comment detected; it looks as though you’ve already said that!" +msgstr "DÃ©tection d’un doublon : il semble que vous avez dÃ©jÃ envoyÃ© ce commentaire !" +||||||| .r11156 +#: wp-includes/comment.php:844 wp-includes/comment.php:846 +msgid "Duplicate comment detected; it looks as though you’ve already said that!" +msgstr "DÃ©tection d’un doublon : il semble que vous avez dÃ©jÃ envoyÃ© ce commentaire !" +======= #. translators: 1: month, 2: day of month #: wp-includes/date.php:457 msgid "The following values do not describe a valid date: month %1$s, day %2$s." msgstr "Les valeurs suivantes ne dÃ©crivent pas une date valide : mois de %1$s, jour %2$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment.php:2467 +msgid "Could not update comment status" +msgstr "Impossible de mettre Ã jour le statut du commentaire" +||||||| .r11156 +#: wp-includes/comment.php:1871 +msgid "Could not update comment status" +msgstr "Impossible de mettre Ã jour le statut du commentaire" +======= #. translators: 1: year, 2: month, 3: day of month #: wp-includes/date.php:440 msgid "The following values do not describe a valid date: year %1$s, month %2$s, day %3$s." msgstr "Les valeurs suivantes ne dÃ©crivent pas une date valide : annÃ©e %1$s, mois de %2$s, jour %3$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/cron.php:173 +msgid "This argument has changed to an array to match the behavior of the other cron functions." +msgstr "Cet argument a Ã©tÃ© transformÃ© en un tableau, afin de mieux correspondre au comportement des autres fonctions de cron." +||||||| .r11156 +#: wp-includes/cron.php:171 +msgid "This argument has changed to an array to match the behavior of the other cron functions." +msgstr "Cet argument a Ã©tÃ© transformÃ© en un tableau, afin de mieux correspondre au comportement des autres fonctions de cron." +======= #. translators: Date query invalid date message: 1: invalid value, 2: type of #. value, 3: minimum valid value, 4: maximum valid value #: wp-includes/date.php:410 msgid "Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s." msgstr "Valeur %1$s non valide pour %2$s. La valeur attendue doit se trouver entre %3$s et %4$s." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/cron.php:369 +msgid "Once Hourly" +msgstr "Une fois par heure" +||||||| .r11156 +#: wp-includes/cron.php:368 +msgid "Once Hourly" +msgstr "Une fois par heure" +======= #: wp-includes/cron.php:372 msgid "Once Daily" msgstr "Une fois par jour" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/cron.php:370 +||||||| .r11156 +#: wp-includes/cron.php:369 +======= #: wp-includes/cron.php:371 +>>>>>>> .r12027 msgid "Twice Daily" msgstr "Deux fois par jour" -#: wp-includes/cron.php:370 +#: wp-includes/cron.php:371 msgid "Once Hourly" msgstr "Une fois par heure" +<<<<<<< .mine +#: wp-includes/default-widgets.php:104 wp-includes/default-widgets.php:215 +msgid "Sort by:" +msgstr "Trier par :" +||||||| .r11156 +#: wp-includes/default-widgets.php:92 wp-includes/default-widgets.php:192 +msgid "Sort by:" +msgstr "Trier par :" +======= #: wp-includes/cron.php:172 msgid "This argument has changed to an array to match the behavior of the other cron functions." msgstr "Cet argument a Ã©tÃ© transformÃ© en un tableau, afin de mieux correspondre au comportement des autres fonctions de cron." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:106 +msgid "Page title" +msgstr "Titre de la page" +||||||| .r11156 +#: wp-includes/default-widgets.php:94 +msgid "Page title" +msgstr "Titre de la page" +======= #: wp-includes/comment.php:2375 msgid "Could not update comment status" msgstr "Impossible de mettre Ã jour le statut du commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:107 +msgid "Page order" +msgstr "Ordre de la page" +||||||| .r11156 +#: wp-includes/default-widgets.php:95 +msgid "Page order" +msgstr "Ordre de la page" +======= #: wp-includes/comment.php:1448 wp-includes/comment.php:1450 msgid "You are posting comments too quickly. Slow down." msgstr "Vous envoyez vos commentaires trop rapidement. Prenez votre temps." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:108 +msgid "Page ID" +msgstr "ID de la page" +||||||| .r11156 +#: wp-includes/default-widgets.php:96 +msgid "Page ID" +msgstr "ID de la page" +======= #: wp-includes/comment.php:1330 wp-includes/comment.php:1332 msgid "Duplicate comment detected; it looks as though you’ve already said that!" msgstr "DÃ©tection d’un doublon : il semble que vous avez dÃ©jÃ envoyÃ© ce commentaire !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:112 +msgid "Exclude:" +msgstr "Exclure :" +||||||| .r11156 +#: wp-includes/default-widgets.php:100 +msgid "Exclude:" +msgstr "Exclure :" +======= #. translators: comment status #: wp-includes/comment.php:1023 msgctxt "adjective" msgid "Spam" msgstr "IndÃ©sirable" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/default-widgets.php:129 +msgid "Your blogroll" +msgstr "Vos liens prÃ©fÃ©rÃ©s" +||||||| .r11156 +#: wp-includes/default-widgets.php:102 +msgid "Page IDs, separated by commas." +msgstr "IDs de pages, sÃ©parÃ©s par une virgule." +#: wp-includes/default-widgets.php:117 +msgid "Your blogroll" +msgstr "Vos liens prÃ©fÃ©rÃ©s" +======= #. translators: comment status #: wp-includes/comment.php:1021 msgctxt "adjective" @@ -4714,23 +15415,77 @@ msgstr "ApprouvÃ©" #: wp-includes/comment.php:1019 msgid "Unapproved" msgstr "DÃ©sapprouvÃ©" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:225 +msgid "Show Link Image" +msgstr "Afficher l’image du lien" +||||||| .r11156 +#: wp-includes/default-widgets.php:202 +msgid "Show Link Image" +msgstr "Afficher l’image du lien" +======= #: wp-includes/comment-template.php:2238 msgid "Post Comment" msgstr "Laisser un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:227 +msgid "Show Link Name" +msgstr "Afficher le nom du lien" +||||||| .r11156 +#: wp-includes/default-widgets.php:204 +msgid "Show Link Name" +msgstr "Afficher le nom du lien" +======= #: wp-includes/comment-template.php:2237 msgid "Cancel reply" msgstr "Annuler la rÃ©ponse." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:229 +msgid "Show Link Description" +msgstr "Afficher la description du lien" +||||||| .r11156 +#: wp-includes/default-widgets.php:206 +msgid "Show Link Description" +msgstr "Afficher la description du lien" +======= #: wp-includes/comment-template.php:2230 msgid "You may use these HTML tags and attributes: %s" msgstr "Vous pouvez utiliser ces balises et attributs HTML : %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:231 +msgid "Show Link Rating" +msgstr "Afficher la note du lien" +||||||| .r11156 +#: wp-includes/default-widgets.php:208 +msgid "Show Link Rating" +msgstr "Afficher la note du lien" +======= #: wp-includes/comment-template.php:2229 msgid "Your email address will not be published." msgstr "Votre adresse de messagerie ne sera pas publiÃ©e." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/default-widgets.php:423 wp-includes/default-widgets.php:765 +msgid "Show post counts" +msgstr "Afficher le nombre d’articles" +||||||| .r11156 +#: wp-includes/default-widgets.php:290 +msgid "Select Month" +msgstr "Choisir un mois" +#: wp-includes/default-widgets.php:355 wp-includes/default-widgets.php:636 +msgid "Show post counts" +msgstr "Afficher le nombre d’articles" +======= #: wp-includes/comment-template.php:2228 msgid "Logged in as %2$s. Log out?" msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter ?" @@ -4739,7 +15494,21 @@ msgstr "ConnectÃ© en tant que %2$s. logged in to post a comment." msgstr "Vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/default-widgets.php:515 +msgid "Calendar" +msgstr "Calendrier" +||||||| .r11156 +#: wp-includes/default-widgets.php:388 +msgid "Entries RSS" +msgstr "Flux RSS des articles" +#: wp-includes/default-widgets.php:436 +msgid "Calendar" +msgstr "Calendrier" +======= #: wp-includes/comment-template.php:2212 msgid "Required fields are marked %s" msgstr "Les champs obligatoires sont indiquÃ©s avec %s" @@ -4748,7 +15517,21 @@ msgstr "Les champs obligatoires sont indiquÃ©s avec %s" #: wp-includes/theme-compat/comments.php:93 msgid "Website" msgstr "Site web" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:630 +msgid "Automatically add paragraphs" +msgstr "CrÃ©er automatiquement les paragraphes" +||||||| .r11156 +#: wp-includes/default-widgets.php:481 +msgid "Text" +msgstr "Texte" + +#: wp-includes/default-widgets.php:528 +msgid "Automatically add paragraphs" +msgstr "CrÃ©er automatiquement les paragraphes" +======= #: wp-includes/comment-template.php:2206 msgid "Email" msgstr "Adresse de contact" @@ -4758,7 +15541,21 @@ msgstr "Adresse de contact" #: wp-includes/theme-compat/comments.php:87 msgid "Name" msgstr "Nom" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/default-widgets.php:768 +msgid "Show hierarchy" +msgstr "Afficher la hiÃ©rarchie" +||||||| .r11156 +#: wp-includes/default-widgets.php:562 +msgid "Select Category" +msgstr "Choisir une catÃ©gorie" +#: wp-includes/default-widgets.php:639 +msgid "Show hierarchy" +msgstr "Afficher la hiÃ©rarchie" +======= #: wp-includes/comment-template.php:1963 msgctxt "1: date, 2: time" msgid "%1$s at %2$s" @@ -4767,71 +15564,227 @@ msgstr "%1$s Ã %2$s" #: wp-includes/comment-template.php:1957 msgid "%s says:" msgstr "%s dit :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:783 wp-includes/default-widgets.php:816 +msgid "Recent Posts" +msgstr "Articles rÃ©cents" +||||||| .r11156 +#: wp-includes/default-widgets.php:654 wp-includes/default-widgets.php:683 +msgid "Recent Posts" +msgstr "Articles rÃ©cents" +======= #: wp-includes/comment-template.php:1915 msgid "(Edit)" msgstr "(Modifier)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:910 +msgid "Number of posts to show:" +msgstr "Nombre d’articles Ã afficher :" +||||||| .r11156 +#: wp-includes/default-widgets.php:766 +msgid "Number of posts to show:" +msgstr "Nombre d’articles Ã afficher :" +======= #. translators: 1: date, 2: time #: wp-includes/comment-template.php:1915 msgid "%1$s at %2$s" msgstr "%1$s Ã %2$s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: comments widget: 1: comment author, 2: post link +#: wp-includes/default-widgets.php:1032 +msgctxt "widgets" +msgid "%1$s on %2$s" +msgstr "%1$s dans %2$s" +||||||| .r11156 +#: wp-includes/default-widgets.php:876 +msgctxt "widgets" +msgid "%1$s on %2$s" +msgstr "%1$s dans %2$s" +======= #: wp-includes/comment-template.php:1908 wp-includes/comment-template.php:1970 msgid "Your comment is awaiting moderation." msgstr "Votre commentaire est en attente de modÃ©ration" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1227 +msgid "Untitled" +msgstr "Sans titre" +||||||| .r11156 +#: wp-includes/default-widgets.php:1052 +msgid "Untitled" +msgstr "Sans titre" +======= #: wp-includes/comment-template.php:1905 msgid "%s says:" msgstr "%s dit :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1306 +msgid "RSS Error: %s" +msgstr "Erreur RSS : %s" +||||||| .r11156 +#: wp-includes/default-widgets.php:1131 +msgid "RSS Error: %s" +msgstr "Erreur RSS : %s" +======= #: wp-includes/comment-template.php:1873 msgid "Pingback:" msgstr "Ping :" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1311 +msgid "Enter the RSS feed URL here:" +msgstr "Saisissez l’adresse web du flux RSS ici :" +||||||| .r11156 +#: wp-includes/default-widgets.php:1136 +msgid "Enter the RSS feed URL here:" +msgstr "Saisissez l’adresse web du flux RSS ici :" +======= #: wp-includes/comment-template.php:1643 wp-includes/comment-template.php:2236 #: wp-includes/theme-compat/comments.php:68 msgid "Leave a Reply to %s" msgstr "RÃ©pondre Ã %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1314 +msgid "Give the feed a title (optional):" +msgstr "Donnez un titre au flux (facultatif) :" +||||||| .r11156 +#: wp-includes/default-widgets.php:1139 +msgid "Give the feed a title (optional):" +msgstr "Donnez un titre au flux (facultatif) :" +======= #: wp-includes/comment-template.php:1642 wp-includes/comment-template.php:2235 #: wp-includes/theme-compat/comments.php:68 msgid "Leave a Reply" msgstr "Laisser un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1317 +msgid "How many items would you like to display?" +msgstr "Combien d’entrÃ©es souhaitez-vous afficher ?" +||||||| .r11156 +#: wp-includes/default-widgets.php:1142 +msgid "How many items would you like to display?" +msgstr "Combien d’entrÃ©es souhaitez-vous afficher ?" +======= #: wp-includes/comment-template.php:1556 msgid "Click here to cancel reply." msgstr "Cliquez ici pour annuler la rÃ©ponse." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1327 +msgid "Display item content?" +msgstr "Afficher le contenu de l’Ã©lÃ©ment ?" +||||||| .r11156 +#: wp-includes/default-widgets.php:1152 +msgid "Display item content?" +msgstr "Afficher le contenu de l’Ã©lÃ©ment ?" +======= #: wp-includes/comment-template.php:1490 msgid "Log in to leave a Comment" msgstr "Connectez-vous pour laisser un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1330 +msgid "Display item author if available?" +msgstr "Afficher l’auteur de l’Ã©lÃ©ment si disponible ?" +||||||| .r11156 +#: wp-includes/default-widgets.php:1155 +msgid "Display item author if available?" +msgstr "Afficher l’auteur de l’Ã©lÃ©ment si disponible ?" +======= #: wp-includes/comment-template.php:1489 msgid "Leave a Comment" msgstr "Laisser un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1333 +msgid "Display item date?" +msgstr "Afficher la date de l’Ã©lÃ©ment ?" +||||||| .r11156 +#: wp-includes/default-widgets.php:1158 +msgid "Display item date?" +msgstr "Afficher la date de l’Ã©lÃ©ment ?" +======= #: wp-includes/comment-template.php:1379 msgid "Log in to Reply" msgstr "Connectez-vous pour rÃ©pondre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1467 +msgid "Taxonomy:" +msgstr "Taxinomie :" +||||||| .r11156 +#: wp-includes/default-widgets.php:1225 +msgid "Tag Cloud" +msgstr "Nuage de mots-clÃ©s" +======= #: wp-includes/comment-template.php:1378 msgid "Reply to %s" msgstr "RÃ©pondre Ã %s" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1590 +msgid "Select Menu:" +msgstr "SÃ©lectionner le menu :" + +#: wp-includes/deprecated.php:62 +msgid "new WordPress Loop" +msgstr "Nouvelle boucle WordPress" +||||||| .r11156 +#: wp-includes/deprecated.php:62 +msgid "new WordPress Loop" +msgstr "Nouvelle boucle WordPress" +======= #: wp-includes/comment-template.php:1377 wp-includes/script-loader.php:440 msgid "Reply" msgstr "RÃ©pondre" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:985 +msgid "Last updated" +msgstr "Mis Ã jour rÃ©cemment" +||||||| .r11156 +#: wp-includes/deprecated.php:989 +msgid "Last updated" +msgstr "Mis Ã jour rÃ©cemment" +======= #: wp-includes/comment-template.php:1307 msgid "Enter your password to view comments." msgstr "Saisissez votre mot de passe pour accÃ©der aux commentaires." +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 +#: wp-includes/deprecated.php:1905 wp-includes/post-template.php:1472 +msgid "Missing Attachment" +msgstr "Fichier attachÃ© manquant" +======= #. translators: %s: post title #: wp-includes/comment-template.php:1298 msgid "Comments Off on %s" msgstr "Commentaires fermÃ©s sur %s" +>>>>>>> .r12027 #. translators: 1: Number of comments 2: post title #: wp-includes/comment-template.php:1292 msgid "%1$s Comment on %2$s" @@ -4844,19 +15797,71 @@ msgstr[1] "%1$s commentaires sur %2$s msgid "1 Comment on %s" msgstr "Un commentaire sur %s" +<<<<<<< .mine +#: wp-includes/feed-atom-comments.php:73 wp-includes/feed-rss2-comments.php:72 +msgid "Comment on %1$s by %2$s" +msgstr "Commentaires sur %1$s par %2$s" +||||||| .r11156 +#: wp-includes/feed-atom-comments.php:73 wp-includes/feed-rss2-comments.php:68 +msgid "Comment on %1$s by %2$s" +msgstr "Commentaires sur %1$s par %2$s" +======= #. translators: %s: post title #: wp-includes/comment-template.php:1282 msgid "No Comments on %s" msgstr "Aucun commentaire sur %s" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: opening curly double quote +#: wp-includes/formatting.php:88 wp-includes/formatting.php:4150 +msgctxt "opening curly double quote" +msgid "“" +msgstr "« " +||||||| .r11156 +#: wp-includes/feed-atom-comments.php:75 wp-includes/feed-rss2-comments.php:70 +msgid "By: %s" +msgstr "Par : %s" +======= #: wp-includes/comment-template.php:989 msgid "Use get_trackback_url() instead if you do not want the value echoed." msgstr "Utilisez plutÃ´t get_trackback_url() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: closing curly double quote +#: wp-includes/formatting.php:90 +msgctxt "closing curly double quote" +msgid "”" +msgstr " »" +||||||| .r11156 +#: wp-includes/feed-rss2-comments.php:37 +msgid "Comments on: %s" +msgstr "Commentaires sur : %s" +======= #: wp-includes/comment-template.php:937 msgid "Pingback" msgstr "Ping" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: min=minute +#: wp-includes/formatting.php:2741 +msgid "%s min" +msgid_plural "%s mins" +msgstr[0] "%s minute" +msgstr[1] "%s minutes" +||||||| .r11156 +#: wp-includes/feed-rss2-comments.php:78 +msgid "Protected Comments: Please enter your password to view comments." +msgstr "Commentaires protÃ©gÃ©s : saisissez votre mot de passe pour accÃ©der aux commentaires." +#: wp-includes/formatting.php:2472 +msgid "%s min" +msgid_plural "%s mins" +msgstr[0] "%s minute" +msgstr[1] "%s minutes" +======= #: wp-includes/comment-template.php:936 msgid "Trackback" msgstr "RÃ©trolien" @@ -4865,15 +15870,61 @@ msgstr "RÃ©trolien" msgctxt "noun" msgid "Comment" msgstr "Commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:2746 +msgid "%s hour" +msgid_plural "%s hours" +msgstr[0] "%s heure" +msgstr[1] "%s heures" +||||||| .r11156 +#: wp-includes/formatting.php:2477 +msgid "%s hour" +msgid_plural "%s hours" +msgstr[0] "%s heure" +msgstr[1] "%s heures" +======= #: wp-includes/comment-template.php:783 msgid "1 Comment" msgstr "Un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:2751 +msgid "%s day" +msgid_plural "%s days" +msgstr[0] "%s jour" +msgstr[1] "%s jours" +||||||| .r11156 +#: wp-includes/formatting.php:2482 +msgid "%s day" +msgid_plural "%s days" +msgstr[0] "%s jour" +msgstr[1] "%s jours" +======= #: wp-includes/comment-template.php:781 msgid "No Comments" msgstr "Pas de commentaire" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/functions.php:1848 wp-includes/functions.php:1984 +msgid "Unable to create directory %s. Is its parent directory writable by the server?" +msgstr "Impossible de crÃ©er le dossier %s. Son dossier parent est-il accessible en Ã©criture par le serveur ?" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:674 +msgid ", " +msgstr ", " +#: wp-includes/option.php:138 +msgid "%s is a protected WP option and may not be modified" +msgstr "%s est une option protÃ©gÃ©e de WordPress, et ne peut Ãªtre modifiÃ©e" + +#: wp-includes/functions.php:1832 wp-includes/functions.php:1968 +msgid "Unable to create directory %s. Is its parent directory writable by the server?" +msgstr "Impossible de crÃ©er le dossier %s. Son dossier parent est-il accessible en Ã©criture par le serveur ?" +======= #: wp-includes/comment-template.php:779 msgid "% Comments" msgstr "% commentaires" @@ -4885,30 +15936,94 @@ msgstr "L’adresse cible spÃ©cifiÃ©e n’existe pas." #: wp-includes/class-wp-xmlrpc-server.php:5870 msgid "Pingback from %1$s to %2$s registered. Keep the web talking! :-)" msgstr "RÃ©ception d’un ping de %1$s pour %2$s. Continuons la conversation ! :-)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:1948 +msgid "Empty filename" +msgstr "Pas de nom de fichier" +||||||| .r11156 +#: wp-includes/functions.php:1932 +msgid "Empty filename" +msgstr "Pas de nom de fichier" +======= #: wp-includes/class-wp-xmlrpc-server.php:5841 msgid "The source URL does not contain a link to the target URL, and so cannot be used as a source." msgstr "L’adresse source ne contient pas de lien vers l’adresse cible, et ne peut donc pas Ãªtre utilisÃ©e comme source." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:1990 +msgid "Could not write file %s" +msgstr "Impossible d’Ã©crire le fichier %s" +||||||| .r11156 +#: wp-includes/functions.php:1974 +msgid "Could not write file %s" +msgstr "Impossible d’Ã©crire le fichier %s" +======= #: wp-includes/class-wp-xmlrpc-server.php:5805 msgid "We cannot find a title on that page." msgstr "Nous ne trouvons pas du titre pour cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:2330 +msgid "You are attempting to log out of %s" +msgstr "Vous Ãªtes en train de vous dÃ©connecter de %s." +||||||| .r11156 +#: wp-includes/functions.php:2318 +msgid "You are attempting to log out of %s" +msgstr "Vous Ãªtes en train de vous dÃ©connecter de %s." +======= #: wp-includes/class-wp-xmlrpc-server.php:5785 msgid "The source URL does not exist." msgstr "L’adresse d’origine n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:2339 +msgid "WordPress Failure Notice" +msgstr "Avertissement d’Ã©chec de WordPress" +||||||| .r11156 +#: wp-includes/functions.php:2316 +msgid "WordPress Failure Notice" +msgstr "Avertissement d’Ã©chec de WordPress" +======= #: wp-includes/class-wp-xmlrpc-server.php:5761 msgid "The pingback has already been registered." msgstr "Le ping a dÃ©jÃ Ã©tÃ© enregistrÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:2332 +msgid "Do you really want to log out?" +msgstr "Voulez-vous rÃ©ellement vous dÃ©connecter ?" +||||||| .r11156 +#: wp-includes/functions.php:2320 +msgid "Do you really want to log out?" +msgstr "Voulez-vous rÃ©ellement vous dÃ©connecter ?" +======= #: wp-includes/class-wp-xmlrpc-server.php:5753 msgid "The source URL and the target URL cannot both point to the same resource." msgstr "L’adresse source et l’adresse cible ne peuvent pointer vers la mÃªme ressource." +>>>>>>> .r12027 -#: wp-includes/class-wp-xmlrpc-server.php:5743 -#: wp-includes/class-wp-xmlrpc-server.php:5750 -#: wp-includes/class-wp-xmlrpc-server.php:5757 +<<<<<<< .mine +#: wp-includes/functions.php:2458 +msgid "« Back" +msgstr "« Retour" +||||||| .r11156 +#: wp-includes/functions.php:2324 wp-includes/ms-functions.php:1912 +msgid "Please try again." +msgstr "Veuillez rÃ©essayer." + +#: wp-includes/functions.php:2420 +msgid "« Back" +msgstr "« Retour" +======= +#: wp-includes/class-wp-xmlrpc-server.php:5743 +#: wp-includes/class-wp-xmlrpc-server.php:5750 +#: wp-includes/class-wp-xmlrpc-server.php:5757 #: wp-includes/class-wp-xmlrpc-server.php:5897 msgid "The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource." msgstr "L’adresse web spÃ©cifiÃ©e ne peut Ãªtre utilisÃ©e comme cible. Soit elle n’existe pas, ou il ne s’agit pas d’une ressource reconnaissant les pings." @@ -4916,131 +16031,423 @@ msgstr "L’adresse web spÃ©cifiÃ©e ne peut Ãªtre utilisÃ©e comme cible. Soi #: wp-includes/class-wp-xmlrpc-server.php:5708 msgid "Is there no link to us?" msgstr "N’y a-t-il aucun lien vers nous ?" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:2470 wp-load.php:80 +msgid "WordPress › Error" +msgstr "WordPress » Erreur" +||||||| .r11156 +#: wp-includes/functions.php:2432 wp-load.php:72 +msgid "WordPress › Error" +msgstr "WordPress » Erreur" +======= #: wp-includes/class-wp-xmlrpc-server.php:5651 msgid "Sorry, you cannot publish this post." msgstr "DÃ©solÃ©, vous ne pouvez pas publier cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3406 wp-includes/functions.php:3510 +msgid "%1$s is deprecated since version %2$s! Use %3$s instead." +msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s! Utilisez %3$s Ã la place." +||||||| .r11156 +#: wp-includes/functions.php:3201 wp-includes/functions.php:3258 +msgid "%1$s is deprecated since version %2$s! Use %3$s instead." +msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s! Utilisez %3$s Ã la place." +======= #: wp-includes/class-wp-xmlrpc-server.php:5479 msgid "Sorry, you can not edit this post." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3408 wp-includes/functions.php:3512 +msgid "%1$s is deprecated since version %2$s with no alternative available." +msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." +||||||| .r11156 +#: wp-includes/functions.php:3203 wp-includes/functions.php:3260 +msgid "%1$s is deprecated since version %2$s with no alternative available." +msgstr "%1$s est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." +======= #: wp-includes/class-wp-xmlrpc-server.php:5314 msgid "Could not write file %1$s (%2$s)" msgstr "Impossible d’Ã©crire le fichier %1$s (%2$s)" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:2731 +msgid "Last Post" +msgstr "Dernier article" +||||||| .r11156 +#: wp-includes/functions.php:3318 +msgid "%1$s was called with an argument that is deprecated since version %2$s! %3$s" +msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s ! %3$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:4917 msgid "Sorry, your entry could not be edited. Something wrong happened." msgstr "DÃ©solÃ©, votre entrÃ©e n’a pu Ãªtre modifiÃ©e. Une erreur est survenue." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1211 wp-includes/rss.php:919 +msgid "An error has occurred, which probably means the feed is down. Try again later." +msgstr "Une erreur est survenue, le flux est probablement indisponible. Veuillez rÃ©essayer plus tard." +||||||| .r11156 +#: wp-includes/functions.php:3320 +msgid "%1$s was called with an argument that is deprecated since version %2$s with no alternative available." +msgstr "%1$s est appelÃ© avec un argument qui est dÃ©prÃ©ciÃ© depuis la version %2$s, aucune alternative n’est disponible." +======= #: wp-includes/class-wp-xmlrpc-server.php:4878 msgid "Sorry, you do not have the right to publish this page." msgstr "DÃ©solÃ©, vous n’avez pas le droit de publier cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4411 +#: wp-includes/class-wp-xmlrpc-server.php:5787 +msgid "Either there are no posts, or something went wrong." +msgstr "Soit il n’y a pas d’articles, soit une erreur s’est produite." +||||||| .r11156 +#: wp-includes/functions.php:3846 +msgid "Select a city" +msgstr "SÃ©lectionnez une ville" +======= #: wp-includes/class-wp-xmlrpc-server.php:4770 msgid "You are not allowed to change the page author as this user." msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4565 +#: wp-includes/class-wp-xmlrpc-server.php:4636 +#: wp-includes/class-wp-xmlrpc-server.php:5456 +#: wp-includes/class-wp-xmlrpc-server.php:6003 +msgid "Sorry, no such post." +msgstr "DÃ©solÃ©, aucun article ne correspond." +||||||| .r11156 +#: wp-includes/functions.php:3891 wp-includes/functions.php:3895 +msgid "UTC" +msgstr "UTC" +======= #: wp-includes/class-wp-xmlrpc-server.php:4765 msgid "You are not allowed to change the post author as this user." msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4574 +#: wp-includes/class-wp-xmlrpc-server.php:5241 +msgid "Sorry, you do not have the right to publish this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier cet article." +||||||| .r11156 +#: wp-includes/functions.php:3899 +msgid "Manual Offsets" +msgstr "DÃ©calages manuels" +======= #: wp-includes/class-wp-xmlrpc-server.php:4445 msgid "You are not allowed to create pages as this user." msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sous cet identifiant." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5126 +msgid "You are not allowed to change the post author as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des articles sous cet identifiant." +||||||| .r11156 +#: wp-includes/general-template.php:284 wp-login.php:545 wp-login.php:605 +#: wp-login.php:647 wp-login.php:729 +msgid "Log in" +msgstr "Connexion" +======= #: wp-includes/class-wp-xmlrpc-server.php:4412 #: wp-includes/class-wp-xmlrpc-server.php:4720 msgid "Invalid post format" msgstr "Format d’article invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5131 +msgid "You are not allowed to change the page author as this user." +msgstr "Vous n’avez pas l’autorisation de modifier des pages sous cet identifiant." +||||||| .r11156 +#: wp-includes/general-template.php:286 +msgid "Log out" +msgstr "DÃ©connexion" +======= #: wp-includes/class-wp-xmlrpc-server.php:4386 #: wp-includes/class-wp-xmlrpc-server.php:4399 #: wp-includes/class-wp-xmlrpc-server.php:4404 msgid "Sorry, you are not allowed to publish posts on this site." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des articles sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5239 +msgid "Sorry, you do not have the right to publish this page." +msgstr "DÃ©solÃ©, vous n’avez pas le droit de publier cette page." +||||||| .r11156 +#: wp-includes/general-template.php:407 wp-login.php:882 +msgid "Remember Me" +msgstr "Se souvenir de moi" +======= #: wp-includes/class-wp-xmlrpc-server.php:4375 msgid "Sorry, you are not allowed to publish pages on this site." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des pages sur ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5278 +msgid "Sorry, your entry could not be edited. Something wrong happened." +msgstr "DÃ©solÃ©, votre entrÃ©e n’a pu Ãªtre modifiÃ©e. Une erreur est survenue." +||||||| .r11156 +#: wp-includes/general-template.php:540 wp-login.php:548 wp-login.php:650 +#: wp-login.php:725 wp-login.php:901 +msgid "Register" +msgstr "Inscription" +======= #: wp-includes/class-wp-xmlrpc-server.php:4298 msgid "For some strange yet very annoying reason, this post could not be deleted." msgstr "Pour une bien Ã©trange raison, cet article n’a pu Ãªtre supprimÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5704 +msgid "Could not write file %1$s (%2$s)" +msgstr "Impossible d’Ã©crire le fichier %1$s (%2$s)" +||||||| .r11156 +#: wp-includes/general-template.php:544 +msgid "Site Admin" +msgstr "Admin. du Site" +======= #: wp-includes/class-wp-xmlrpc-server.php:4293 msgid "Sorry, you do not have the right to delete this post." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:5885 +msgid "Sorry, you can not edit this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +||||||| .r11156 +#: wp-includes/general-template.php:827 +msgid "Search Results %1$s %2$s" +msgstr "RÃ©sultats de recherche %1$s %2$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:4249 msgid "For some strange yet very annoying reason, this post could not be edited." msgstr "Pour une bien Ã©trange raison, cet article n’a pu Ãªtre modifiÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6118 +msgid "Is there no link to us?" +msgstr "N’y a-t-il aucun lien vers nous ?" +||||||| .r11156 +#: wp-includes/general-template.php:832 +msgid "Page not found" +msgstr "Page non trouvÃ©e" +======= #: wp-includes/class-wp-xmlrpc-server.php:4235 #: wp-includes/class-wp-xmlrpc-server.php:4880 msgid "Sorry, you do not have the right to publish this post." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6153 +#: wp-includes/class-wp-xmlrpc-server.php:6160 +#: wp-includes/class-wp-xmlrpc-server.php:6167 +#: wp-includes/class-wp-xmlrpc-server.php:6306 +msgid "The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource." +msgstr "L’adresse web spÃ©cifiÃ©e ne peut Ãªtre utilisÃ©e comme cible. Soit elle n’existe pas, ou il ne s’agit pas d’une ressource reconnaissant les pings." +||||||| .r11156 +#: wp-includes/general-template.php:1274 wp-includes/media.php:2848 +msgid "%1$s %2$d" +msgstr "%1$s %2$d" +======= #: wp-includes/class-wp-xmlrpc-server.php:4232 #: wp-includes/class-wp-xmlrpc-server.php:4706 msgid "Sorry, you do not have the right to edit this post." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6163 +msgid "The source URL and the target URL cannot both point to the same resource." +msgstr "L’adresse source et l’adresse cible ne peuvent pointer vers la mÃªme ressource." +||||||| .r11156 +#: wp-includes/general-template.php:1480 +msgctxt "calendar caption" +msgid "%1$s %2$s" +msgstr "%1$s %2$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:4226 #: wp-includes/class-wp-xmlrpc-server.php:4290 #: wp-includes/class-wp-xmlrpc-server.php:5086 #: wp-includes/class-wp-xmlrpc-server.php:5601 msgid "Sorry, no such post." msgstr "DÃ©solÃ©, aucun article ne correspond." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6171 +msgid "The pingback has already been registered." +msgstr "Le ping a dÃ©jÃ Ã©tÃ© enregistrÃ©." +||||||| .r11156 +#: wp-includes/general-template.php:2095 wp-includes/general-template.php:2118 +msgctxt "feed link" +msgid "»" +msgstr "»" +======= #: wp-includes/class-wp-xmlrpc-server.php:4123 #: wp-includes/class-wp-xmlrpc-server.php:4134 msgid "Sorry, that file cannot be edited." msgstr "DÃ©solÃ©, ce fichier ne peut pas Ãªtre modifiÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6195 +msgid "The source URL does not exist." +msgstr "L’adresse d’origine n’existe pas." +||||||| .r11156 +#: wp-includes/general-template.php:2097 +msgid "%1$s %2$s Feed" +msgstr "%1$s %2$s Flux" +======= #: wp-includes/class-wp-xmlrpc-server.php:4088 #: wp-includes/class-wp-xmlrpc-server.php:5391 msgid "Either there are no posts, or something went wrong." msgstr "Soit il n’y a pas d’articles, soit une erreur s’est produite." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6215 +msgid "We cannot find a title on that page." +msgstr "Nous ne trouvons pas du titre pour cette page." +||||||| .r11156 +#: wp-includes/general-template.php:2099 +msgid "%1$s %2$s Comments Feed" +msgstr "%1$s %2$s Flux des commentaires" +======= #: wp-includes/class-wp-xmlrpc-server.php:3995 msgid "Sorry, you do not have access to user data on this site." msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux donnÃ©es utilisateurs de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6251 +msgid "The source URL does not contain a link to the target URL, and so cannot be used as a source." +msgstr "L’adresse source ne contient pas de lien vers l’adresse cible, et ne peut donc pas Ãªtre utilisÃ©e comme source." +||||||| .r11156 +#: wp-includes/general-template.php:2120 +msgid "%1$s %2$s %3$s Comments Feed" +msgstr "%1$s %2$s %3$s Flux des commentaires" +======= #: wp-includes/class-wp-xmlrpc-server.php:3827 #: wp-includes/class-wp-xmlrpc-server.php:3894 msgid "Sorry, revisions are disabled." msgstr "DÃ©solÃ©, les rÃ©visions sont dÃ©sactivÃ©es." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6313 +msgid "The specified target URL does not exist." +msgstr "L’adresse cible spÃ©cifiÃ©e n’existe pas." +||||||| .r11156 +#: wp-includes/general-template.php:2122 +msgid "%1$s %2$s %3$s Category Feed" +msgstr "%1$s %2$s Flux de la catÃ©gorie %3$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:3823 msgid "Sorry, you are not allowed to edit posts." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier les articles." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:459 +msgid "Entries RSS" +msgstr "Flux RSS des articles" +||||||| .r11156 +#: wp-includes/general-template.php:2124 +msgid "%1$s %2$s %3$s Tag Feed" +msgstr "%1$s %2$s Flux du mot-clÃ© %3$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:3820 #: wp-includes/class-wp-xmlrpc-server.php:3881 #: wp-includes/class-wp-xmlrpc-server.php:3884 #: wp-includes/class-wp-xmlrpc-server.php:3887 wp-includes/revision.php:263 msgid "Invalid post ID" msgstr "Identifiant de l’article non valable" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1582 +msgid "No menus have been created yet. Create some." +msgstr "Aucun menu n’a Ã©tÃ© crÃ©Ã© pour le moment. En crÃ©er un." +||||||| .r11156 +#: wp-includes/general-template.php:2126 +msgid "%1$s %2$s Posts by %3$s Feed" +msgstr "%1$s %2$s Flux des articles Ã©crits par %3$s" +======= #: wp-includes/class-wp-xmlrpc-server.php:3714 msgid "Sorry, you are not allowed to edit this post type." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier ce type de contenu." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6280 +msgid "Pingback from %1$s to %2$s registered. Keep the web talking! :-)" +msgstr "RÃ©ception d’un ping de %1$s pour %2$s. Continuons la conversation ! :-)" +||||||| .r11156 +#: wp-includes/general-template.php:2128 +msgid "%1$s %2$s Search Results for “%3$s” Feed" +msgstr "%1$s %2$s Flux de rÃ©sultats de la recherche pour "%3$s"" +======= #: wp-includes/class-wp-xmlrpc-server.php:3544 #: wp-includes/class-wp-xmlrpc-server.php:3589 #: wp-includes/class-wp-xmlrpc-server.php:5276 msgid "You do not have permission to upload files." msgstr "Vous n’avez pas l’autorisation d’envoyer des fichiers." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:999 +msgid "Use get_trackback_url() instead if you do not want the value echoed." +msgstr "Utilisez plutÃ´t get_trackback_url() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." +||||||| .r11156 +#: wp-includes/general-template.php:2483 +msgid "« Previous" +msgstr "« PrÃ©cÃ©dent" +======= #: wp-includes/class-wp-xmlrpc-server.php:3495 msgid "You are not allowed to update options." msgstr "Vous n’avez pas l’autorisation de mettre Ã jour les options." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2241 +msgid "Required fields are marked %s" +msgstr "Les champs obligatoires sont indiquÃ©s avec %s" +||||||| .r11156 +#: wp-includes/general-template.php:2484 +msgid "Next »" +msgstr "Suivant »" +======= #: wp-includes/class-wp-xmlrpc-server.php:3331 msgid "You are not allowed access to details about comments." msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails des commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2258 +msgid "Your email address will not be published." +msgstr "Votre adresse de messagerie ne sera pas publiÃ©e." +||||||| .r11156 +#: wp-includes/class-http.php:194 +msgid "User has blocked requests through HTTP." +msgstr "L’utilisateur a bloquÃ© les requÃªtes HTTP." +======= #: wp-includes/class-wp-xmlrpc-server.php:3304 #: wp-includes/class-wp-xmlrpc-server.php:3363 #: wp-includes/class-wp-xmlrpc-server.php:3389 @@ -5048,37 +16455,120 @@ msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails #: wp-includes/class-wp-xmlrpc-server.php:3630 msgid "You are not allowed access to details about this site." msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:1500 +msgid "Custom Menu" +msgstr "Menu personnalisÃ©" +||||||| .r11156 +#: wp-includes/class-http.php:741 wp-includes/class-http.php:1413 +#: wp-includes/class-http.php:1441 +msgid "Too many redirects." +msgstr "Trop de redirections." +======= #: wp-includes/class-wp-xmlrpc-server.php:3260 msgid "A valid email address is required" msgstr "Une adresse de messagerie valide est requise" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:1899 wp-includes/post-template.php:1572 +msgid "Missing Attachment" +msgstr "Fichier attachÃ© manquant" +||||||| .r11156 +#: wp-includes/class-http.php:1005 wp-includes/class-http.php:1370 +msgid "Could not open handle for fopen() to %s" +msgstr "Impossible d’ouvrir le gestionnaire de fopen() pour %s" +======= #: wp-includes/class-wp-xmlrpc-server.php:3258 msgid "Comment author name and email are required" msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:3516 +msgid "The email address entered did not appear to be a valid email address. Please enter a valid email address." +msgstr "L’adresse de messagerie fournie ne semble pas Ãªtre valide. Veuillez saisir une adresse valide." +||||||| .r11156 +#: wp-includes/locale.php:131 wp-includes/locale.php:146 +msgid "January" +msgstr "janvier" +======= #: wp-includes/class-wp-xmlrpc-server.php:3214 msgid "You must be registered to comment" msgstr "Vous devez Ãªtre enregistrÃ© pour laisser un commentaire" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:3617 +msgid "The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL." +msgstr "L’adresse de WordPress que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +||||||| .r11156 +#: wp-includes/locale.php:132 wp-includes/locale.php:147 +msgid "February" +msgstr "fÃ©vrier" +======= #: wp-includes/class-wp-xmlrpc-server.php:3168 msgid "Sorry, the comment could not be edited. Something wrong happened." msgstr "DÃ©solÃ©, votre commentaire n’a pu Ãªtre modifiÃ©. Une erreur est survenue." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:3630 +msgid "The Site address you entered did not appear to be a valid URL. Please enter a valid URL." +msgstr "L’adresse de site que vous avez saisie ne semble pas Ãªtre valide. Veuillez entrer une adresse valide." +||||||| .r11156 +#: wp-includes/locale.php:133 wp-includes/locale.php:148 +msgid "March" +msgstr "mars" +======= #: wp-includes/class-wp-xmlrpc-server.php:3136 msgid "Invalid comment status." msgstr "Statut du commentaire non valide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4304 +msgid "Sorry, you do not have access to user data on this site." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux donnÃ©es utilisateurs de ce site." +||||||| .r11156 +#: wp-includes/locale.php:134 wp-includes/locale.php:149 +msgid "April" +msgstr "avril" +======= #: wp-includes/class-wp-xmlrpc-server.php:2996 msgid "Sorry, you cannot edit comments." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les commentaires." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4735 +#: wp-includes/class-wp-xmlrpc-server.php:4748 +#: wp-includes/class-wp-xmlrpc-server.php:4753 +msgid "Sorry, you are not allowed to publish posts on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des articles sur ce site." +||||||| .r11156 +#: wp-includes/locale.php:135 wp-includes/locale.php:150 +msgid "May" +msgstr "mai" +======= #: wp-includes/class-wp-xmlrpc-server.php:2961 #: wp-includes/class-wp-xmlrpc-server.php:3059 #: wp-includes/class-wp-xmlrpc-server.php:3123 msgid "Invalid comment ID." msgstr "Identifiant commentaire invalide." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4724 +msgid "Sorry, you are not allowed to publish pages on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des pages sur ce site." +||||||| .r11156 +#: wp-includes/locale.php:136 wp-includes/locale.php:151 +msgid "June" +msgstr "juin" +======= #: wp-includes/class-wp-xmlrpc-server.php:2955 #: wp-includes/class-wp-xmlrpc-server.php:3056 #: wp-includes/class-wp-xmlrpc-server.php:3062 @@ -5086,137 +16576,461 @@ msgstr "Identifiant commentaire invalide." #: wp-includes/class-wp-xmlrpc-server.php:3126 msgid "You are not allowed to moderate comments on this site." msgstr "Vous n’avez pas l’autorisation de modÃ©rer les commentaires de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:1572 +msgid "Click here to cancel reply." +msgstr "Cliquez ici pour annuler la rÃ©ponse." +||||||| .r11156 +#: wp-includes/locale.php:137 wp-includes/locale.php:152 +msgid "July" +msgstr "juillet" +======= #: wp-includes/class-wp-xmlrpc-server.php:2919 #: wp-includes/class-wp-xmlrpc-server.php:5221 #: wp-includes/class-wp-xmlrpc-server.php:5436 msgid "Sorry, you must be able to edit posts on this site in order to view categories." msgstr "DÃ©solÃ©, vous devez avoir le droit d’Ã©crire des articles sur ce site si vous vous visualisez les catÃ©gories." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment-template.php:2257 +msgid "Logged in as %2$s. Log out?" +msgstr "ConnectÃ© en tant que %2$s. Se dÃ©connecter ?" +||||||| .r11156 +#: wp-includes/locale.php:138 wp-includes/locale.php:153 +msgid "August" +msgstr "aoÃ»t" +======= #: wp-includes/class-wp-xmlrpc-server.php:2880 msgid "Sorry, you do not have the right to delete a category." msgstr "DÃ©solÃ©, vous n’avez pas les droits pour supprimer une catÃ©gorie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/deprecated.php:3172 wp-includes/functions.php:2334 +msgid "Are you sure you want to do this?" +msgstr "Voulez-vous vraiment faire cela ?" +||||||| .r11156 +#: wp-includes/locale.php:139 wp-includes/locale.php:154 +msgid "September" +msgstr "septembre" +======= #: wp-includes/class-wp-xmlrpc-server.php:2840 #: wp-includes/class-wp-xmlrpc-server.php:2842 msgid "Sorry, the new category failed." msgstr "DÃ©solÃ©, la crÃ©ation de la catÃ©gorie a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:421 wp-includes/default-widgets.php:762 +msgid "Display as dropdown" +msgstr "Afficher comme liste dÃ©roulante" +||||||| .r11156 +#: wp-includes/locale.php:140 wp-includes/locale.php:155 +msgid "October" +msgstr "octobre" +======= #: wp-includes/class-wp-xmlrpc-server.php:2812 msgid "Sorry, you do not have the right to add a category." msgstr "DÃ©solÃ©, vous n’avez pas les droits pour ajouter une catÃ©gorie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4761 +#: wp-includes/class-wp-xmlrpc-server.php:5081 +msgid "Invalid post format" +msgstr "Format d’article invalide" +||||||| .r11156 +#: wp-includes/locale.php:141 wp-includes/locale.php:156 +msgid "November" +msgstr "novembre" +======= #: wp-includes/class-wp-xmlrpc-server.php:2765 msgid "Sorry, you must be able to edit posts on this site in order to view tags." msgstr "DÃ©solÃ©, vous devez avoir le droit de modifier des articles sur ce site si vous voulez visualiser les Ã©tiquettes." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:6058 +msgid "Sorry, you cannot publish this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas publier cet article." +||||||| .r11156 +#: wp-includes/locale.php:142 wp-includes/locale.php:157 +msgid "December" +msgstr "dÃ©cembre" +======= #: wp-includes/class-wp-xmlrpc-server.php:2730 #: wp-includes/class-wp-xmlrpc-server.php:4080 #: wp-includes/class-wp-xmlrpc-server.php:5113 msgid "Sorry, you cannot edit posts on this site." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les articles de ce site." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/comment.php:1499 wp-includes/comment.php:1501 +msgid "You are posting comments too quickly. Slow down." +msgstr "Vous envoyez vos commentaires trop rapidement. Prenez votre temps." +||||||| .r11156 +#: wp-includes/locale.php:146 +msgid "Jan_January_abbreviation" +msgstr "jan" +======= #: wp-includes/class-wp-xmlrpc-server.php:2641 msgid "Sorry, you do not have the right to edit this page." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:114 +msgid "Page IDs, separated by commas." +msgstr "IDs de pages, sÃ©parÃ©s par une virgule." +||||||| .r11156 +#: wp-includes/locale.php:147 +msgid "Feb_February_abbreviation" +msgstr "fÃ©v" +======= #: wp-includes/class-wp-xmlrpc-server.php:2597 msgid "Failed to delete the page." msgstr "Ãchec lors de la suppression de la page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:206 +msgctxt "links widget" +msgid "All Links" +msgstr "Tous les liens" +||||||| .r11156 +#: wp-includes/locale.php:148 +msgid "Mar_March_abbreviation" +msgstr "mar" +======= #: wp-includes/class-wp-xmlrpc-server.php:2592 msgid "Sorry, you do not have the right to delete this page." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:217 +msgid "Link title" +msgstr "Titre du lien" +||||||| .r11156 +#: wp-includes/locale.php:149 +msgid "Apr_April_abbreviation" +msgstr "avr" +======= #: wp-includes/class-wp-xmlrpc-server.php:2514 #: wp-includes/class-wp-xmlrpc-server.php:2679 msgid "Sorry, you cannot edit pages." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les pages." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:218 +msgid "Link rating" +msgstr "Note du lien" +||||||| .r11156 +#: wp-includes/locale.php:150 +msgid "May_May_abbreviation" +msgstr "mai" +======= #: wp-includes/class-wp-xmlrpc-server.php:2487 #: wp-includes/class-wp-xmlrpc-server.php:2588 #: wp-includes/class-wp-xmlrpc-server.php:2637 msgid "Sorry, no such page." msgstr "DÃ©solÃ©, aucune page ne correspond." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:219 +msgid "Link ID" +msgstr "ID du lien" +||||||| .r11156 +#: wp-includes/locale.php:151 +msgid "Jun_June_abbreviation" +msgstr "juin" +======= #: wp-includes/class-wp-xmlrpc-server.php:2476 msgid "Sorry, you cannot edit this page." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cette page." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:234 +msgid "Number of links to show:" +msgstr "Nombre de liens Ã afficher :" +||||||| .r11156 +#: wp-includes/locale.php:152 +msgid "Jul_July_abbreviation" +msgstr "juil" +======= #: wp-includes/class-wp-xmlrpc-server.php:2443 msgid "Sorry, the user cannot be updated." msgstr "DÃ©solÃ©, cet utilisateur ne peut pas Ãªtre mis Ã jour." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: prime, for example in 9' (nine feet) +#: wp-includes/formatting.php:96 +msgctxt "prime" +msgid "′" +msgstr "′" +||||||| .r11156 +#: wp-includes/locale.php:153 +msgid "Aug_August_abbreviation" +msgstr "aoÃ»t" +======= #: wp-includes/class-wp-xmlrpc-server.php:2366 #: wp-includes/class-wp-xmlrpc-server.php:2409 msgid "Sorry, you cannot edit your profile." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier votre profil." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: double prime, for example in 9" (nine inches) +#: wp-includes/formatting.php:98 +msgctxt "double prime" +msgid "″" +msgstr "″" +||||||| .r11156 +#: wp-includes/locale.php:154 +msgid "Sep_September_abbreviation" +msgstr "sept" +======= #: wp-includes/class-wp-xmlrpc-server.php:2313 msgid "The role specified is not valid" msgstr "Le rÃ´le spÃ©cifiÃ© n’est pas valable" +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: opening curly single quote +#: wp-includes/formatting.php:101 +msgctxt "opening curly single quote" +msgid "‘" +msgstr "‘" +||||||| .r11156 +#: wp-includes/locale.php:155 +msgid "Oct_October_abbreviation" +msgstr "oct" +======= #: wp-includes/class-wp-xmlrpc-server.php:2297 msgid "Sorry, you cannot list users." msgstr "DÃ©solÃ©, vous ne pouvez pas lister les utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: en dash +#: wp-includes/formatting.php:106 +msgctxt "en dash" +msgid "–" +msgstr "–" +||||||| .r11156 +#: wp-includes/locale.php:156 +msgid "Nov_November_abbreviation" +msgstr "nov" +======= #: wp-includes/class-wp-xmlrpc-server.php:2247 msgid "Invalid user ID" msgstr "Identifiant utilisateur non valide" +>>>>>>> .r12027 -#: wp-includes/class-wp-xmlrpc-server.php:2242 -msgid "Sorry, you cannot edit users." +<<<<<<< .mine +#. translators: em dash +#: wp-includes/formatting.php:108 +msgctxt "em dash" +msgid "—" +msgstr "—" +||||||| .r11156 +#: wp-includes/locale.php:157 +msgid "Dec_December_abbreviation" +msgstr "dÃ©c" +======= +#: wp-includes/class-wp-xmlrpc-server.php:2242 +msgid "Sorry, you cannot edit users." msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les utilisateurs." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/formatting.php:2853 wp-includes/general-template.php:2853 +msgid "…" +msgstr "…" +||||||| .r11156 +#: wp-includes/locale.php:99 wp-includes/locale.php:109 +#: wp-includes/locale.php:122 +msgid "Sunday" +msgstr "Dimanche" +======= #: wp-includes/class-wp-xmlrpc-server.php:1982 #: wp-includes/class-wp-xmlrpc-server.php:2035 #: wp-includes/class-wp-xmlrpc-server.php:2123 msgid "You are not allowed to assign terms in this taxonomy." msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner des termes Ã cette taxinomie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:1329 +msgid "One or more database tables are unavailable. The database may need to be repaired." +msgstr "Une ou plusieurs tables de votre base de donnÃ©es sont indisponibles. La base de donnÃ©es a peut-Ãªtre besoin d’Ãªtre rÃ©parÃ©e." +||||||| .r11156 +#: wp-includes/locale.php:100 wp-includes/locale.php:110 +#: wp-includes/locale.php:123 +msgid "Monday" +msgstr "Lundi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1931 msgid "Sorry, deleting the term failed." msgstr "DÃ©solÃ©, la suppression du terme a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3342 +msgid "Database Error" +msgstr "Erreur de la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/locale.php:101 wp-includes/locale.php:111 +#: wp-includes/locale.php:124 +msgid "Tuesday" +msgstr "Mardi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1915 msgid "You are not allowed to delete terms in this taxonomy." msgstr "Vous n’avez pas l’autorisation de supprimer les termes de cette taxinomie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:3346 wp-includes/ms-load.php:411 +msgid "Error establishing a database connection" +msgstr "Erreur lors de la connexion Ã la base de donnÃ©es" +||||||| .r11156 +#: wp-includes/locale.php:102 wp-includes/locale.php:112 +#: wp-includes/locale.php:125 +msgid "Wednesday" +msgstr "Mercredi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1873 msgid "Sorry, editing the term failed." msgstr "DÃ©solÃ©, la modification du terme a Ã©chouÃ©." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4118 +msgid "Sorry, you are not allowed to edit posts." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier les articles." +||||||| .r11156 +#: wp-includes/locale.php:103 wp-includes/locale.php:113 +#: wp-includes/locale.php:126 +msgid "Thursday" +msgstr "Jeudi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1847 msgid "This taxonomy is not hierarchical so you can't set a parent." msgstr "Cette taxinomie n’est pas hiÃ©rarchisÃ©e, donc vous ne pouvez crÃ©er de parent." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4122 +#: wp-includes/class-wp-xmlrpc-server.php:4192 +msgid "Sorry, revisions are disabled." +msgstr "DÃ©solÃ©, les rÃ©visions sont dÃ©sactivÃ©es." +||||||| .r11156 +#: wp-includes/locale.php:104 wp-includes/locale.php:114 +#: wp-includes/locale.php:127 +msgid "Friday" +msgstr "Vendredi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1823 msgid "You are not allowed to edit terms in this taxonomy." msgstr "Vous n’avez pas l’autorisation de modifier les termes de cette taxinomie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4794 +msgid "You are not allowed to create pages as this user." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des pages sous cet identifiant." +||||||| .r11156 +#: wp-includes/locale.php:105 wp-includes/locale.php:115 +#: wp-includes/locale.php:128 +msgid "Saturday" +msgstr "Samedi" +======= #: wp-includes/class-wp-xmlrpc-server.php:1774 msgid "Sorry, your term could not be created. Something wrong happened." msgstr "DÃ©solÃ©, votre terme n’a pu Ãªtre crÃ©Ã©. Une erreur est survenue." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:204 +msgid "Select Link Category:" +msgstr "SÃ©lectionner la catÃ©gorie de liens :" +||||||| .r11156 +#: wp-includes/locale.php:122 +msgid "Sun" +msgstr "dim" +======= #: wp-includes/class-wp-xmlrpc-server.php:1757 #: wp-includes/class-wp-xmlrpc-server.php:1856 wp-includes/taxonomy.php:2876 #: wp-includes/taxonomy.php:3407 msgid "Parent term does not exist." msgstr "Le terme parent n’existe pas." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:914 +msgid "Display post date?" +msgstr "Afficher la date du contenu ?" +||||||| .r11156 +#: wp-includes/locale.php:123 +msgid "Mon" +msgstr "lun" +======= #: wp-includes/class-wp-xmlrpc-server.php:1748 msgid "This taxonomy is not hierarchical." msgstr "Cette taxinomie n’est pas hiÃ©rarchique." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: apostrophe, for example in 'cause or can't +#: wp-includes/formatting.php:93 +msgctxt "apostrophe" +msgid "’" +msgstr "’" +||||||| .r11156 +#: wp-includes/locale.php:124 +msgid "Tue" +msgstr "mar" +======= #: wp-includes/class-wp-xmlrpc-server.php:1744 #: wp-includes/class-wp-xmlrpc-server.php:1842 msgid "The term name cannot be empty." msgstr "Le nom du terme ne peut Ãªtre vide." +>>>>>>> .r12027 +<<<<<<< .mine +#. translators: closing curly single quote +#: wp-includes/formatting.php:103 +msgctxt "closing curly single quote" +msgid "’" +msgstr "’" +||||||| .r11156 +#: wp-includes/locale.php:125 +msgid "Wed" +msgstr "mer" +======= #: wp-includes/class-wp-xmlrpc-server.php:1735 msgid "You are not allowed to create terms in this taxonomy." msgstr "Vous n’avez pas l’autorisation de crÃ©er des termes dans cette taxinomie." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/functions.php:2336 wp-includes/ms-functions.php:1939 +msgid "Please try again." +msgstr "Veuillez rÃ©essayer." +||||||| .r11156 +#: wp-includes/locale.php:126 +msgid "Thu" +msgstr "jeu" +======= #: wp-includes/class-wp-xmlrpc-server.php:1730 #: wp-includes/class-wp-xmlrpc-server.php:1818 #: wp-includes/class-wp-xmlrpc-server.php:1910 @@ -5229,2031 +17043,7712 @@ msgstr "Vous n’avez pas l’autorisation de crÃ©er des termes dans cet #: wp-includes/taxonomy.php:3369 msgid "Invalid taxonomy" msgstr "La taxinomie est invalide" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4446 +#: wp-includes/class-wp-xmlrpc-server.php:4457 +msgid "Sorry, that file cannot be edited." +msgstr "DÃ©solÃ©, ce fichier ne peut pas Ãªtre modifiÃ©." +||||||| .r11156 +#: wp-includes/locale.php:127 +msgid "Fri" +msgstr "ven" +======= #: wp-includes/class-wp-xmlrpc-server.php:1651 msgid "Sorry, you are not allowed to edit posts in this post type" msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier des entrÃ©es dans ce type de contenu" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/default-widgets.php:220 +msgctxt "Links widget" +msgid "Random" +msgstr "AlÃ©atoire" +||||||| .r11156 +#: wp-includes/locale.php:128 +msgid "Sat" +msgstr "sam" +======= #: wp-includes/class-wp-xmlrpc-server.php:1645 msgid "The post type specified is not valid" msgstr "Le type de contenu spÃ©cifiÃ© n’est pas valable" +>>>>>>> .r12027 -#: wp-includes/class-wp-xmlrpc-server.php:1588 -#: wp-includes/class-wp-xmlrpc-server.php:3890 -#: wp-includes/class-wp-xmlrpc-server.php:4035 -#: wp-includes/class-wp-xmlrpc-server.php:4989 -#: wp-includes/class-wp-xmlrpc-server.php:5323 -#: wp-includes/class-wp-xmlrpc-server.php:5527 -msgid "Sorry, you cannot edit this post." -msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +<<<<<<< .mine +#: wp-includes/comment-template.php:1896 +msgid "Pingback:" +msgstr "Ping :" -#: wp-includes/class-wp-xmlrpc-server.php:1502 -msgid "The post cannot be deleted." -msgstr "Cet article ne peut pas Ãªtre supprimÃ©." +#: wp-includes/formatting.php:2756 +msgid "%s week" +msgid_plural "%s weeks" +msgstr[0] "%s semaine" +msgstr[1] "%s semaines" -#: wp-includes/class-wp-xmlrpc-server.php:1497 -msgid "Sorry, you are not allowed to delete this post." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +#: wp-includes/formatting.php:2761 +msgid "%s month" +msgid_plural "%s months" +msgstr[0] "%s mois" +msgstr[1] "%s mois" -#: wp-includes/class-wp-xmlrpc-server.php:1439 -msgid "There is a revision of this post that is more recent." -msgstr "Ce contenu a dÃ©jÃ une rÃ©vision plus rÃ©cente." +#: wp-includes/formatting.php:2766 +msgid "%s year" +msgid_plural "%s years" +msgstr[0] "%s annÃ©e" +msgstr[1] "%s annÃ©es" -#: wp-includes/class-wp-xmlrpc-server.php:1393 -#: wp-includes/class-wp-xmlrpc-server.php:4182 -#: wp-includes/class-wp-xmlrpc-server.php:4615 -msgid "Sorry, your entry could not be posted. Something wrong happened." -msgstr "DÃ©solÃ©, une erreur est survenue et votre texte n’a pas pu Ãªtre publiÃ©." +#: wp-includes/comment-template.php:1986 +msgctxt "1: date, 2: time" +msgid "%1$s at %2$s" +msgstr "%1$s Ã %2$s" -#: wp-includes/class-wp-xmlrpc-server.php:1341 -msgid "Sorry, you are not allowed to add a term to one of the given taxonomies." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’ajouter un terme Ã l’une des taxinomies indiquÃ©es." +#: wp-includes/comment-template.php:1980 +msgid "%s says:" +msgstr "%s dit :" -#: wp-includes/class-wp-xmlrpc-server.php:1334 -msgid "Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead." -msgstr "Un nom de terme est ambigu pour cette taxinomie hiÃ©rarchisÃ©e. Veuillez utiliser l’identifiant du terme Ã la place." +#: wp-includes/comment-template.php:2235 +msgid "Email" +msgstr "Adresse de contact" -#: wp-includes/class-wp-xmlrpc-server.php:1299 -#: wp-includes/class-wp-xmlrpc-server.php:1836 -#: wp-includes/class-wp-xmlrpc-server.php:1923 -#: wp-includes/class-wp-xmlrpc-server.php:1990 wp-includes/taxonomy.php:2867 -msgid "Invalid term ID" -msgstr "l’ID du terme est invalide" +#: wp-includes/default-widgets.php:472 +msgctxt "meta widget link text" +msgid "WordPress.org" +msgstr "Site de WordPress-FR" -#: wp-includes/class-wp-xmlrpc-server.php:1291 -#: wp-includes/class-wp-xmlrpc-server.php:1315 -msgid "Sorry, you are not allowed to assign a term to one of the given taxonomies." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner un terme Ã l’une des taxinomies indiquÃ©es." +#: wp-includes/functions.php:1153 +msgid "ERROR: This is not a valid feed template." +msgstr "ERREUR : ce n’est pas un flux valide." -#: wp-includes/class-wp-xmlrpc-server.php:1288 -#: wp-includes/class-wp-xmlrpc-server.php:1312 -msgid "Sorry, one of the given taxonomies is not supported by the post type." -msgstr "DÃ©solÃ©, l’une des taxinomies donnÃ©es n’est pas reconnue par ce type de contenu." +#: wp-includes/default-widgets.php:569 +msgid "Arbitrary text or HTML." +msgstr "Texte arbitraire ou HTML." -#: wp-includes/class-wp-xmlrpc-server.php:1267 -#: wp-includes/class-wp-xmlrpc-server.php:3550 -#: wp-includes/class-wp-xmlrpc-server.php:4594 -#: wp-includes/class-wp-xmlrpc-server.php:4936 -msgid "Invalid attachment ID." -msgstr "Identifiant du fichier invalide." +#: wp-includes/default-widgets.php:514 +msgid "A calendar of your site’s Posts." +msgstr "Un calendrier des articles de votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1254 -msgid "Sorry, you are not allowed to stick this post." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de mettre cet article en avant." +#: wp-includes/default-widgets.php:249 +msgid "A search form for your site." +msgstr "Un formulaire de recherche pour votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1249 -msgid "Sorry, you cannot stick a private post." -msgstr "DÃ©solÃ©, vous ne pouvez pas mettre en avant un article privÃ©." +#: wp-includes/default-widgets.php:305 +msgid "A monthly archive of your site’s Posts." +msgstr "Une archive mensuelle des articles de votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1216 -#: wp-includes/class-wp-xmlrpc-server.php:4452 -msgid "Invalid author ID." -msgstr "Identifiant utilisateur non valable." +#: wp-includes/default-widgets.php:782 +msgid "Your site’s most recent Posts." +msgstr "Les articles les plus rÃ©cents de votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1211 -#: wp-includes/class-wp-xmlrpc-server.php:4441 -msgid "You are not allowed to create posts as this user." -msgstr "Vous n’avez pas l’autorisation de crÃ©er des contenus sous cet identifiant." +#: wp-includes/default-widgets.php:927 +msgid "Your site’s most recent comments." +msgstr "Les commentaires les plus rÃ©cents de votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1206 -msgid "Sorry, you are not allowed to create password protected posts in this post type" -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus protÃ©gÃ©s par mot de passe avec ce type de contenu" +#: wp-includes/default-widgets.php:439 +msgid "Login, RSS, & WordPress.org links." +msgstr "Connexion, flux RSS et liens WordPress.org." -#: wp-includes/class-wp-xmlrpc-server.php:1197 -msgid "Sorry, you are not allowed to publish posts in this post type" -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des contenus avec ce type de contenu" +#: wp-includes/default-widgets.php:17 +msgid "A list of your site’s Pages." +msgstr "Une liste des pages de votre site." -#: wp-includes/class-wp-xmlrpc-server.php:1192 -msgid "Sorry, you are not allowed to create private posts in this post type" -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus privÃ©s avec ce type de contenu" +#: wp-includes/default-widgets.php:643 +msgid "A list or dropdown of categories." +msgstr "Une liste ou un menu dÃ©roulant des catÃ©gories." -#: wp-includes/class-wp-xmlrpc-server.php:1183 -#: wp-includes/class-wp-xmlrpc-server.php:4162 -msgid "Sorry, you are not allowed to post on this site." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier sur ce site." +#: wp-includes/default-widgets.php:1092 +msgid "Entries from any RSS or Atom feed." +msgstr "Les entrÃ©es depuis n’importe quel flux RSS ou Atom." -#: wp-includes/class-wp-xmlrpc-server.php:1180 -#: wp-includes/class-wp-xmlrpc-server.php:4714 -msgid "The post type may not be changed." -msgstr "Ce type de contenu ne peut pas Ãªtre supprimÃ©." +#. translators: used to join last two items in a list with more than 2 times +#: wp-includes/formatting.php:3901 +msgid "%s, and %s" +msgstr "%s et %s" -#: wp-includes/class-wp-xmlrpc-server.php:1178 -msgid "Sorry, you are not allowed to edit this post." -msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +#. translators: used to join items in a list with only 2 items +#: wp-includes/formatting.php:3903 +msgid "%s and %s" +msgstr "%s et %s" -#: wp-includes/class-wp-xmlrpc-server.php:1176 -#: wp-includes/class-wp-xmlrpc-server.php:1434 -#: wp-includes/class-wp-xmlrpc-server.php:1494 -#: wp-includes/class-wp-xmlrpc-server.php:1585 -#: wp-includes/class-wp-xmlrpc-server.php:2473 -#: wp-includes/class-wp-xmlrpc-server.php:3228 -#: wp-includes/class-wp-xmlrpc-server.php:3231 -#: wp-includes/class-wp-xmlrpc-server.php:4032 -#: wp-includes/class-wp-xmlrpc-server.php:4703 -#: wp-includes/class-wp-xmlrpc-server.php:4986 -#: wp-includes/class-wp-xmlrpc-server.php:5476 -#: wp-includes/class-wp-xmlrpc-server.php:5524 -#: wp-includes/class-wp-xmlrpc-server.php:5648 wp-includes/post.php:3125 -#: wp-includes/post.php:3583 -msgid "Invalid post ID." -msgstr "Identifiant de l’article non valide." +#. translators: used to join items in a list with more than 2 items +#: wp-includes/formatting.php:3899 +msgid "%s, %s" +msgstr "%s, %s" -#: wp-includes/class-wp-xmlrpc-server.php:1170 -#: wp-includes/class-wp-xmlrpc-server.php:3709 -#: wp-includes/class-wp-xmlrpc-server.php:4390 -#: wp-includes/class-wp-xmlrpc-server.php:4448 -#: wp-includes/class-wp-xmlrpc-server.php:4710 -#: wp-includes/class-wp-xmlrpc-server.php:4774 -msgid "Invalid post type" -msgstr "Type d’article invalide" +#: wp-includes/feed-atom-comments.php:75 wp-includes/feed-rss2-comments.php:74 +msgid "By: %s" +msgstr "Par : %s" -#: wp-includes/class-wp-xmlrpc-server.php:594 -msgid "Insufficient arguments passed to this XML-RPC method." -msgstr "Arguments insuffisants passÃ©s Ã cette mÃ©thode XML-RPC." +#: wp-includes/class-wp-xmlrpc-server.php:4644 +msgid "For some strange yet very annoying reason, this post could not be deleted." +msgstr "Pour une Ã©trange et trÃ¨s ennuyeuse raison, cet article n’a pas pu Ãªtre supprimÃ©." -#: wp-includes/class-wp-xmlrpc-server.php:496 -msgid "Allow link notifications from other blogs (pingbacks and trackbacks)" -msgstr "Autoriser les liens de notifications depuis les autres sites (notifications par pings et rÃ©troliens)" +#: wp-includes/class-wp-xmlrpc-server.php:4588 +msgid "For some strange yet very annoying reason, this post could not be edited." +msgstr "Pour une Ã©trange et trÃ¨s ennuyeuse raison, cet article n’a pas pu Ãªtre modifiÃ©." -#: wp-includes/class-wp-xmlrpc-server.php:491 -msgid "Allow people to post comments on new articles" -msgstr "Autoriser les lecteurs Ã publier des commentaires sur les nouveaux articles" +#: wp-includes/default-widgets.php:627 +msgid "Content:" +msgstr "Contient :" -#: wp-includes/class-wp-xmlrpc-server.php:486 -msgid "Large size image height" -msgstr "Hauteur de l’image en grande taille" +#: wp-includes/functions.php:3457 +msgid "The called constructor method for %1$s is deprecated since version %2$s! Use %3$s instead." +msgstr "La mÃ©thode constructor appelÃ©e pour %1$s est obsolÃ¨te depuis la version %2$s ! Veuillez utiliser %3$s Ã la place." -#: wp-includes/class-wp-xmlrpc-server.php:481 -msgid "Large size image width" -msgstr "Largeur de l’image en grande taille" +#: wp-includes/default-widgets.php:250 +msgctxt "Search widget" +msgid "Search" +msgstr "Rechercher" -#: wp-includes/class-wp-xmlrpc-server.php:476 -msgid "Medium size image height" -msgstr "Hauteur de l’image en taille moyenne" +#: wp-includes/default-widgets.php:1413 +msgid "Tags" +msgstr "Ãtiquettes" -#: wp-includes/class-wp-xmlrpc-server.php:471 -msgid "Medium size image width" -msgstr "Largeur de l’image en taille moyenne" +#: wp-includes/default-widgets.php:1400 +msgid "Tag Cloud" +msgstr "Nuage dâÃ©tiquettes" -#: wp-includes/class-wp-xmlrpc-server.php:466 -msgid "Crop thumbnail to exact dimensions" -msgstr "Recadrer les images pour parvenir aux dimensions exactes" +#: wp-includes/default-widgets.php:1399 +msgid "A cloud of your most used tags." +msgstr "Un nuage de vos Ã©tiquettes les plus utilisÃ©es." -#: wp-includes/class-wp-xmlrpc-server.php:461 -msgid "Thumbnail Height" -msgstr "Hauteur des miniatures" +#. translators: %s: post title +#: wp-includes/comment-template.php:1303 +msgid "1 Comment on %s" +msgstr "Un commentaire sur %s" -#: wp-includes/class-wp-xmlrpc-server.php:456 -msgid "Thumbnail Width" -msgstr "Largeur des miniatures" +#. translators: 1: Number of comments 2: post title +#: wp-includes/comment-template.php:1308 +msgid "%1$s Comment on %2$s" +msgid_plural "%1$s Comments on %2$s" +msgstr[0] "%1$s commentaire sur %2$s" +msgstr[1] "%1$s commentaires sur %2$s" -#: wp-includes/class-wp-xmlrpc-server.php:451 -msgid "Allow new users to sign up" -msgstr "Autoriser les nouveaux utilisateurs Ã s’inscrire" +#. translators: %s: post title +#: wp-includes/comment-template.php:1314 +msgid "Comments Off on %s" +msgstr "Commentaires fermÃ©s sur %s" -#: wp-includes/class-wp-xmlrpc-server.php:446 -msgid "Time Format" -msgstr "Format dâheure" +#. translators: %s: post title +#: wp-includes/comment-template.php:1298 +msgid "No Comments on %s" +msgstr "Aucun commentaire sur %s" -#: wp-includes/class-wp-xmlrpc-server.php:441 -msgid "Date Format" -msgstr "Format de date" +#: wp-includes/feed-rss2-comments.php:82 +msgid "Protected Comments: Please enter your password to view comments." +msgstr "Commentaires protÃ©gÃ©s : saisissez votre mot de passe pour accÃ©der aux commentaires." -#: wp-includes/class-wp-xmlrpc-server.php:436 -msgid "Site Tagline" -msgstr "Slogan du site" +#: wp-includes/comment-template.php:1393 +msgid "Reply to %s" +msgstr "RÃ©pondre Ã %s" -#: wp-includes/class-wp-xmlrpc-server.php:426 -msgid "Time Zone" -msgstr "Fuseau horaire" +#. translators: Date query invalid date message: 1: invalid value, 2: type of +#. value, 3: minimum valid value, 4: maximum valid value +#: wp-includes/date.php:410 +msgid "Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s." +msgstr "Valeur %1$s non valide pour %2$s. La valeur attendue doit se trouver entre %3$s et %4$s." -#: wp-includes/class-wp-xmlrpc-server.php:419 -msgid "Post Thumbnail" -msgstr "Miniature d’article" +#. translators: 1: month, 2: day of month +#: wp-includes/date.php:457 +msgid "The following values do not describe a valid date: month %1$s, day %2$s." +msgstr "Les valeurs suivantes ne dÃ©crivent pas une date valide : mois de %1$s, jour %2$s." -#: wp-includes/class-wp-xmlrpc-server.php:414 -msgid "Stylesheet" -msgstr "Feuille de style" +#: wp-includes/comment-template.php:2255 +#: wp-includes/theme-compat/comments.php:75 +msgid "You must be logged in to post a comment." +msgstr "Vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." -#: wp-includes/class-wp-xmlrpc-server.php:409 -msgid "Template" -msgstr "ModÃ¨le" +#: wp-includes/feed-rss2-comments.php:37 +msgid "Comments on: %s" +msgstr "Commentaires sur : %s" -#: wp-includes/class-wp-xmlrpc-server.php:404 -msgid "Image default align" -msgstr "Alignement par dÃ©faut de l’image" +#: wp-includes/formatting.php:125 +msgctxt "Comma-separated list of replacement words in your language" +msgid "’tain’t,’twere,’twas,’tis,’twill,’til,’bout,’nuff,’round,’cause,’em" +msgstr "’tain’t,’twere,’twas,’tis,’twill,’til,’bout,’nuff,’round,’cause,’em" -#: wp-includes/class-wp-xmlrpc-server.php:399 -msgid "Image default size" -msgstr "Taille de l’imageÂ par dÃ©faut" +#. translators: This is a comma-separated list of words that defy the syntax of +#. quotations in normal use, for example... 'We do not have enough words yet' +#. ... is a typical quoted phrase. But when we write lines of code 'til we +#. have enough of 'em, then we need to insert apostrophes instead of quotes. +#: wp-includes/formatting.php:122 +msgctxt "Comma-separated list of words to texturize in your language" +msgid "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em" +msgstr "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em" -#: wp-includes/class-wp-xmlrpc-server.php:394 -msgid "Image default link type" -msgstr "Type du lien par dÃ©faut vers l’image" +#. translators: 1: year, 2: month, 3: day of month +#: wp-includes/date.php:440 +msgid "The following values do not describe a valid date: year %1$s, month %2$s, day %3$s." +msgstr "Les valeurs suivantes ne dÃ©crivent pas une date valide : annÃ©e %1$s, mois %2$s, jour %3$s." + +#. translators: If your word count is based on single characters (e.g. East +#. Asian characters), enter 'characters_excluding_spaces' or +#. 'characters_including_spaces'. Otherwise, enter 'words'. Do not translate +#. into your own language. +#: wp-includes/formatting.php:2864 wp-includes/script-loader.php:409 +msgctxt "Word count type. Do not translate!" +msgid "words" +msgstr "words" -#: wp-includes/class-wp-xmlrpc-server.php:389 -msgid "The URL to the admin area" -msgstr "L’adresse web de la zone d’administration" +#: wp-includes/formatting.php:3685 +msgid "The timezone you have entered is not valid. Please select a valid timezone." +msgstr "Le fuseau horaire ne semble pas Ãªtre valide. Veuillez en choisir un valide." -#: wp-includes/class-wp-xmlrpc-server.php:384 -msgid "Login Address (URL)" -msgstr "Adresse de connexion (URL)" +#: wp-includes/default-widgets.php:360 +msgid "Select Post" +msgstr "SÃ©lectionner un article" -#: wp-includes/class-wp-xmlrpc-server.php:379 -msgid "Site Address (URL)" -msgstr "Adresse web du site (URL)" +#: wp-includes/default-widgets.php:357 +msgid "Select Week" +msgstr "SÃ©lectionner la semaine" -#: wp-includes/class-wp-xmlrpc-server.php:374 -msgid "WordPress Address (URL)" -msgstr "Adresse web de WordPress (URL)" +#: wp-includes/default-widgets.php:354 +msgid "Select Day" +msgstr "SÃ©lectionner le jour" -#: wp-includes/class-wp-xmlrpc-server.php:369 -msgid "Software Version" -msgstr "Version du logiciel" +#: wp-includes/default-widgets.php:348 +msgid "Select Year" +msgstr "SÃ©lectionner l’annÃ©e" -#: wp-includes/class-wp-xmlrpc-server.php:364 -msgid "Software Name" -msgstr "Nom du logiciel" +#: wp-includes/default-widgets.php:680 +msgid "Select Category" +msgstr "SÃ©lectionner une catÃ©gorie" -#: wp-includes/class-wp-xmlrpc-server.php:238 -msgid "Incorrect username or password." -msgstr "Identifiant ou mot de passe incorrect." +#: wp-includes/default-widgets.php:351 +msgid "Select Month" +msgstr "SÃ©lectionner un mois" -#: wp-includes/class-wp-xmlrpc-server.php:231 -msgid "XML-RPC services are disabled on this site." -msgstr "Les services XML-RPC sont dÃ©sactivÃ©s sur ce site." +#: wp-includes/default-widgets.php:1499 +msgid "Add a custom menu to your sidebar." +msgstr "Ajouter un menu personnalisÃ© Ã votre colonne latÃ©rale." -#. translators: used between list items, there is a space after the comma -#: wp-includes/class-wp-theme.php:678 -msgid ", " -msgstr ", " +#: wp-includes/class-wp-editor.php:884 wp-includes/media-template.php:383 +#: wp-includes/media-template.php:563 wp-includes/revision.php:31 +#: wp-includes/script-loader.php:516 +msgid "Title" +msgstr "Titre" -#: wp-includes/class-wp-theme.php:671 wp-includes/comment-template.php:29 -msgid "Anonymous" -msgstr "Anonyme" +#: wp-includes/class-wp-editor.php:1346 +msgid "Y/m/d" +msgstr "d/m/Y" -#: wp-includes/class-wp-theme.php:279 wp-includes/class-wp-theme.php:283 -msgid "The \"%s\" theme is not a valid parent theme." -msgstr "Le thÃ¨me « %s » n’est un thÃ¨me parent valide." +#: wp-includes/class-wp-xmlrpc-server.php:3822 +#: wp-includes/class-wp-xmlrpc-server.php:3870 +#: wp-includes/class-wp-xmlrpc-server.php:5666 +msgid "You do not have permission to upload files." +msgstr "Vous n’avez pas l’autorisation d’envoyer des fichiers." -#: wp-includes/class-wp-theme.php:267 -msgid "The parent theme is missing. Please install the \"%s\" parent theme." -msgstr "Le thÃ¨me parent est manquant. Merci d’installer le thÃ¨me parent « %s »." +#: wp-includes/class-wp-editor.php:888 wp-includes/theme-compat/sidebar.php:21 +msgid "Author" +msgstr "Auteur" -#: wp-includes/class-wp-theme.php:248 -msgid "Template is missing." -msgstr "Le modÃ¨le est manquant." +#: wp-includes/class-wp-editor.php:1036 wp-includes/comment-template.php:1896 +#: wp-includes/comment-template.php:1989 +msgid "Edit" +msgstr "Modifier" -#: wp-includes/class-wp-theme.php:230 -msgid "Stylesheet is not readable." -msgstr "Impossible de lire la feuille de style." +#: wp-includes/class-wp-editor.php:856 +msgid "Undo" +msgstr "Annuler" -#: wp-includes/class-wp-theme.php:226 -msgid "ERROR: The themes directory is either empty or doesn’t exist. Please check your installation." -msgstr "ERREUR : le rÃ©pertoire des thÃ¨mes est soit vide, ou n’existe pas. Veuillez vÃ©rifier votre installation." +#: wp-includes/class-wp-editor.php:1448 wp-includes/script-loader.php:395 +msgid "Add Link" +msgstr "Ajouter un lien" -#: wp-includes/class-wp-theme.php:222 -msgid "Stylesheet is missing." -msgstr "La feuille de style manque." +#: wp-includes/class-wp-editor.php:920 +msgid "Save" +msgstr "Enregistrer" -#: wp-includes/class-wp-theme.php:220 -msgid "The theme directory \"%s\" does not exist." -msgstr "Le rÃ©pertoire du thÃ¨me « %s » n’existe pas." +#: wp-includes/class-wp-editor.php:893 +msgid "Advanced" +msgstr "AvancÃ©" -#: wp-includes/class-wp-image-editor.php:282 -msgid "Attempted to set image quality outside of the range [1,100]." -msgstr "Tentative de mise en place d’une qualitÃ© d’image en dehors de l’intervalle [1100]." +#: wp-includes/class-wp-xmlrpc-server.php:1815 +#: wp-includes/class-wp-xmlrpc-server.php:1902 +#: wp-includes/class-wp-xmlrpc-server.php:1998 +#: wp-includes/class-wp-xmlrpc-server.php:2069 +#: wp-includes/class-wp-xmlrpc-server.php:2127 +#: wp-includes/class-wp-xmlrpc-server.php:2222 wp-includes/taxonomy.php:617 +#: wp-includes/taxonomy.php:1357 wp-includes/taxonomy.php:1506 +#: wp-includes/taxonomy.php:1669 wp-includes/taxonomy.php:2682 +#: wp-includes/taxonomy.php:2889 wp-includes/taxonomy.php:3113 +#: wp-includes/taxonomy.php:3444 +msgid "Invalid taxonomy" +msgstr "La taxinomie est invalide" -#: wp-includes/class-wp-image-editor-imagick.php:203 -msgid "Could not read image size" -msgstr "Impossible de lire la taille de l’image" +#: wp-includes/class-wp-theme.php:710 wp-includes/comment-template.php:29 +msgid "Anonymous" +msgstr "Anonyme" -#: wp-includes/class-wp-image-editor-gd.php:390 -#: wp-includes/class-wp-image-editor-gd.php:398 -#: wp-includes/class-wp-image-editor-gd.php:402 -#: wp-includes/class-wp-image-editor-gd.php:405 -msgid "Image Editor Save Failed" -msgstr "L’enregistrement de l’Ã©diteur d’images a Ã©chouÃ©." +#: wp-includes/class-wp-editor.php:860 wp-includes/class-wp-editor.php:1445 +#: wp-includes/media.php:3034 wp-includes/script-loader.php:380 +#: wp-includes/script-loader.php:428 wp-includes/script-loader.php:491 +msgid "Cancel" +msgstr "Annuler" -#: wp-includes/class-wp-image-editor-gd.php:352 -msgid "Image flip failed." -msgstr "Le retournement de l’image a Ã©chouÃ©." +#: wp-includes/class-wp-editor.php:857 +msgid "Redo" +msgstr "RÃ©tablir" -#: wp-includes/class-wp-image-editor-gd.php:322 -msgid "Image rotate failed." -msgstr "La rotation de l’image a Ã©chouÃ©." +#: wp-includes/class-wp-editor.php:985 wp-includes/media-template.php:612 +msgid "Alignment" +msgstr "Alignement" -#: wp-includes/class-wp-image-editor-gd.php:295 -msgid "Image crop failed." -msgstr "Le recadrage de l’image a Ã©chouÃ©." +#: wp-includes/class-wp-editor.php:984 wp-includes/media-template.php:399 +#: wp-includes/media-template.php:579 wp-includes/media-template.php:837 +#: wp-includes/media-template.php:902 +msgid "Caption" +msgstr "LÃ©gende" -#: wp-includes/class-wp-image-editor-gd.php:177 -#: wp-includes/class-wp-image-editor-imagick.php:237 -msgid "Could not calculate resized image dimensions" -msgstr "Impossible de lire la taille de l’image redimensionnÃ©e" +#: wp-includes/class-wp-editor.php:859 wp-includes/script-loader.php:490 +msgid "OK" +msgstr "OK" -#: wp-includes/class-wp-image-editor-gd.php:171 -#: wp-includes/class-wp-image-editor-gd.php:189 -msgid "Image resize failed." -msgstr "Le redimensionnement de l’image a Ã©chouÃ©." +#: wp-includes/class-wp-editor.php:861 wp-includes/class-wp-editor.php:1401 +#: wp-includes/functions.php:4779 wp-includes/script-loader.php:256 +#: wp-includes/script-loader.php:337 wp-includes/script-loader.php:429 +msgid "Close" +msgstr "Fermer" -#: wp-includes/class-wp-image-editor-gd.php:109 -msgid "Could not read image size." -msgstr "Impossible de lire la taille de l’image." +#: wp-includes/class-wp-editor.php:983 wp-includes/media-template.php:965 +msgid "Width" +msgstr "Largeur" -#: wp-includes/class-wp-image-editor-gd.php:105 -#: wp-includes/class-wp-image-editor-imagick.php:132 -msgid "File is not an image." -msgstr "Le fichier n’est pas une image." +#: wp-includes/class-wp-xmlrpc-server.php:463 +msgid "Date Format" +msgstr "Format de date" -#: wp-includes/class-wp-image-editor-gd.php:89 -#: wp-includes/class-wp-image-editor-imagick.php:122 -msgid "File doesn’t exist?" -msgstr "Le fichier n’existe pas ?" +#: wp-includes/class-wp-xmlrpc-server.php:468 +msgid "Time Format" +msgstr "Format dâheure" -#: wp-includes/class-wp-editor.php:1485 wp-includes/script-loader.php:368 -msgid "Add Link" -msgstr "Ajouter un lien" +#: wp-includes/class-wp-editor.php:982 wp-includes/media-template.php:965 +msgid "Height" +msgstr "Hauteur" -#: wp-includes/class-wp-editor.php:1471 -msgid "Search or use up and down arrow keys to select an item." -msgstr "Chercher ou utiliser les flÃ¨ches haut et bas pour choisir un Ã©lÃ©ment." +#. translators: used between list items, there is a space after the comma +#: wp-includes/class-wp-theme.php:717 +msgid ", " +msgstr ", " -#: wp-includes/class-wp-editor.php:1470 -msgid "No search term specified. Showing recent items." -msgstr "Aucun mot n’a Ã©tÃ© donnÃ© pour cette recherche. Voici les recherches prÃ©cÃ©dentes." +#: wp-includes/class-wp-editor.php:919 +msgid "Print" +msgstr "Imprimer" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:846 +msgid "Print" +msgstr "Imprimer" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1588 +#: wp-includes/class-wp-xmlrpc-server.php:3890 +#: wp-includes/class-wp-xmlrpc-server.php:4035 +#: wp-includes/class-wp-xmlrpc-server.php:4989 +#: wp-includes/class-wp-xmlrpc-server.php:5323 +#: wp-includes/class-wp-xmlrpc-server.php:5527 +msgid "Sorry, you cannot edit this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1453 -msgid "Or link to existing content" -msgstr "Ou alors, faites un lien vers l’un des contenus de votre site" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:891 +msgid "Insert/edit image" +msgstr "InsÃ©rer/modifier une image" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:818 +msgid "Insert/edit image" +msgstr "InsÃ©rer/modifier une image" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1502 +msgid "The post cannot be deleted." +msgstr "Cet article ne peut pas Ãªtre supprimÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1450 wp-includes/media-template.php:1004 -msgid "Open link in a new window/tab" -msgstr "Ouvrir le lien dans une nouvelle fenÃªtre/un nouvel onglet" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:925 wp-includes/class-wp-editor.php:1400 +#: wp-includes/script-loader.php:393 +msgid "Insert/edit link" +msgstr "InsÃ©rer/modifier un lien" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:852 wp-includes/class-wp-editor.php:1378 +#: wp-includes/js/tinymce/wp-mce-help.php:118 wp-includes/script-loader.php:357 +msgid "Insert/edit link" +msgstr "InsÃ©rer/modifier un lien" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1497 +msgid "Sorry, you are not allowed to delete this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1447 wp-includes/media-template.php:816 -msgid "Link Text" -msgstr "Texte du lien" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:969 +msgid "Insert row before" +msgstr "InsÃ©rer une ligne avant" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:889 +msgid "Insert row before" +msgstr "InsÃ©rer une ligne avant" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1439 +msgid "There is a revision of this post that is more recent." +msgstr "Ce contenu a dÃ©jÃ une rÃ©vision plus rÃ©cente." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1444 wp-includes/media-template.php:376 -#: wp-includes/media-template.php:555 wp-includes/media.php:2996 -msgid "URL" -msgstr "Adresse web" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:970 +msgid "Insert row after" +msgstr "InsÃ©rer une ligne aprÃ¨s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:890 +msgid "Insert row after" +msgstr "InsÃ©rer une ligne aprÃ¨s" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1393 +#: wp-includes/class-wp-xmlrpc-server.php:4182 +#: wp-includes/class-wp-xmlrpc-server.php:4615 +msgid "Sorry, your entry could not be posted. Something wrong happened." +msgstr "DÃ©solÃ©, une erreur est survenue et votre texte n’a pas pu Ãªtre publiÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1442 -msgid "Enter the destination URL" -msgstr "Saisissez l’adresse de destination" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:975 +msgid "Delete row" +msgstr "Supprimer la ligne" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:895 +msgid "Delete row" +msgstr "Supprimer la ligne" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1341 +msgid "Sorry, you are not allowed to add a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’ajouter un terme Ã l’une des taxinomies indiquÃ©es." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1385 -msgid "Y/m/d" -msgstr "d/m/Y" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:971 +msgid "Insert column before" +msgstr "InsÃ©rer une colonne avant" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:891 +msgid "Insert column before" +msgstr "InsÃ©rer une colonne avant" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1334 +msgid "Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead." +msgstr "Un nom de terme est ambigu pour cette taxinomie hiÃ©rarchisÃ©e. Veuillez utiliser l’identifiant du terme Ã la place." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1323 -msgid "Just write." -msgstr "Il ne reste plus qu’Ã Ã©crire." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:972 +msgid "Insert column after" +msgstr "InsÃ©rer une colonne aprÃ¨s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:892 +msgid "Insert column after" +msgstr "InsÃ©rer une colonne aprÃ¨s" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1299 +#: wp-includes/class-wp-xmlrpc-server.php:1836 +#: wp-includes/class-wp-xmlrpc-server.php:1923 +#: wp-includes/class-wp-xmlrpc-server.php:1990 wp-includes/taxonomy.php:2867 +msgid "Invalid term ID" +msgstr "l’ID du terme est invalide" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1322 -msgid "Word count: %s" -msgstr "Compteur de mots : %s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:979 +msgid "Merge table cells" +msgstr "Fusionner les cellules du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:899 +msgid "Merge table cells" +msgstr "Fusionner les cellules du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1291 +#: wp-includes/class-wp-xmlrpc-server.php:1315 +msgid "Sorry, you are not allowed to assign a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner un terme Ã l’une des taxinomies indiquÃ©es." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1313 -msgid "Save failed." -msgstr "Ãchec de la sauvegarde." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:955 +msgid "Table row properties" +msgstr "PropriÃ©tÃ©s de la ligne du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:876 +msgid "Table row properties" +msgstr "PropriÃ©tÃ©s de la ligne du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1288 +#: wp-includes/class-wp-xmlrpc-server.php:1312 +msgid "Sorry, one of the given taxonomies is not supported by the post type." +msgstr "DÃ©solÃ©, l’une des taxinomies donnÃ©es n’est pas reconnue par ce type de contenu." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1312 wp-includes/media-template.php:340 -#: wp-includes/media-template.php:501 -msgid "Saved." -msgstr "EnregistrÃ©." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:956 +msgid "Table cell properties" +msgstr "PropriÃ©tÃ©s de la cellule du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:877 +msgid "Table cell properties" +msgstr "PropriÃ©tÃ©s de la cellule du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1267 +#: wp-includes/class-wp-xmlrpc-server.php:3550 +#: wp-includes/class-wp-xmlrpc-server.php:4594 +#: wp-includes/class-wp-xmlrpc-server.php:4936 +msgid "Invalid attachment ID." +msgstr "Identifiant du fichier invalide." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1312 -msgid "Updated." -msgstr "Mis Ã jour." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:954 +msgid "Table properties" +msgstr "PropriÃ©tÃ©s du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:875 +msgid "Table properties" +msgstr "PropriÃ©tÃ©s du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1254 +msgid "Sorry, you are not allowed to stick this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de mettre cet article en avant." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1276 -msgid "Help (Alt + Shift + H)" -msgstr "Aide (Alt + Maj. + H)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:973 +msgid "Paste table row before" +msgstr "Coller la ligne du tableau avant" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:893 +msgid "Paste table row before" +msgstr "Coller la ligne du tableau avant" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1249 +msgid "Sorry, you cannot stick a private post." +msgstr "DÃ©solÃ©, vous ne pouvez pas mettre en avant un article privÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1275 -msgid "Unlink (Alt + Shift + S)" -msgstr "DÃ©faire le lien (Alt + Maj. + S)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:974 +msgid "Paste table row after" +msgstr "Coller la ligne du tableau aprÃ¨s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:894 +msgid "Paste table row after" +msgstr "Coller la ligne du tableau aprÃ¨s" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1216 +#: wp-includes/class-wp-xmlrpc-server.php:4452 +msgid "Invalid author ID." +msgstr "Identifiant utilisateur non valable." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1274 -msgid "Insert/edit link (Alt + Shift + A)" -msgstr "InsÃ©rer/modifier un lien (Alt + Shift + A)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:977 +msgid "Cut table row" +msgstr "Couper la ligne du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:897 +msgid "Cut table row" +msgstr "Couper la ligne du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1211 +#: wp-includes/class-wp-xmlrpc-server.php:4441 +msgid "You are not allowed to create posts as this user." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des contenus sous cet identifiant." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1273 -msgid "Media library (Alt + Shift + M)" -msgstr "BibliothÃ¨que de mÃ©dias (Alt + Shift + M)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:978 +msgid "Copy table row" +msgstr "Copier la ligne du tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:898 +msgid "Copy table row" +msgstr "Copier la ligne du tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1206 +msgid "Sorry, you are not allowed to create password protected posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus protÃ©gÃ©s par mot de passe avec ce type de contenu" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1272 -msgid "Blockquote (Alt + Shift + Q)" -msgstr "Bloc de citation (Alt + Maj. + Q)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:953 +msgid "Delete table" +msgstr "Supprimer le tableau" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:874 +msgid "Delete table" +msgstr "Supprimer le tableau" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1197 +msgid "Sorry, you are not allowed to publish posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des contenus avec ce type de contenu" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1271 -msgid "Ordered list (Alt + Shift + O)" -msgstr "Liste ordonnÃ©e (Alt + Maj. + O)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:959 +msgid "Row" +msgstr "Ligne" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:879 +msgid "Row" +msgstr "Ligne" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1192 +msgid "Sorry, you are not allowed to create private posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus privÃ©s avec ce type de contenu" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1270 -msgid "Unordered list (Alt + Shift + U)" -msgstr "Liste non ordonnÃ©e (Alt + Shift + U)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1016 wp-includes/script-loader.php:426 +#: wp-includes/script-loader.php:510 wp-includes/script-loader.php:518 +#: wp-includes/script-loader.php:625 wp-includes/theme.php:1925 +msgid "The changes you made will be lost if you navigate away from this page." +msgstr "Les modifications que vous avez faites seront perdues si vous changez de page." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:931 wp-includes/script-loader.php:386 +#: wp-includes/script-loader.php:459 wp-includes/script-loader.php:539 +#: wp-includes/theme.php:1934 +msgid "The changes you made will be lost if you navigate away from this page." +msgstr "Les modifications que vous avez faites seront perdues si vous changez de page." +======= +#: wp-includes/class-wp-xmlrpc-server.php:1183 +#: wp-includes/class-wp-xmlrpc-server.php:4162 +msgid "Sorry, you are not allowed to post on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier sur ce site." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1269 -msgid "Italic (Ctrl + I)" -msgstr "Italique (Ctrl + I)" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:882 +msgid "Document properties" +msgstr "PropriÃ©tÃ©s du document" +||||||| .r11156 +#: wp-includes/script-loader.php:95 +msgid "Toggle fullscreen mode" +msgstr "Mode plein Ã©cran" -#: wp-includes/class-wp-editor.php:1268 -msgid "Bold (Ctrl + B)" -msgstr "Gras (Ctrl + B)" +#: wp-includes/class-wp-editor.php:809 +msgid "Document properties" +msgstr "PropriÃ©tÃ©s du document" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1180 +#: wp-includes/class-wp-xmlrpc-server.php:4714 +msgid "The post type may not be changed." +msgstr "Ce type de contenu ne peut pas Ãªtre supprimÃ©." -#: wp-includes/class-wp-editor.php:1253 -msgid "Exit fullscreen" -msgstr "Sortir du plein Ã©cran" +#: wp-includes/class-wp-xmlrpc-server.php:1178 +msgid "Sorry, you are not allowed to edit this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:1247 wp-includes/media.php:3001 -#: wp-includes/script-loader.php:367 wp-includes/script-loader.php:465 -msgid "Update" -msgstr "Mettre Ã jour" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:838 wp-includes/script-loader.php:100 +msgid "Bold" +msgstr "Gras" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:753 +msgid "Paragraph" +msgstr "Paragraphe" -#: wp-includes/class-wp-editor.php:994 wp-includes/comment-template.php:1873 -#: wp-includes/comment-template.php:1966 -msgid "Edit" -msgstr "Modifier" +#: wp-includes/js/tinymce/wp-mce-help.php:117 +msgid "Address" +msgstr "Adresse" -#: wp-includes/class-wp-editor.php:992 -msgid "No alignment" -msgstr "Pas d'alignement" +#: wp-includes/class-wp-editor.php:744 +#: wp-includes/js/tinymce/wp-mce-help.php:114 +msgid "Heading 1" +msgstr "Titre 1" -#: wp-includes/class-wp-editor.php:991 -#: wp-includes/js/tinymce/wp-mce-help.php:123 wp-includes/script-loader.php:101 -msgid "Distraction-free writing mode" -msgstr "Mode d'Ã©criture sans distraction" +#: wp-includes/class-wp-editor.php:745 +#: wp-includes/js/tinymce/wp-mce-help.php:115 +msgid "Heading 2" +msgstr "Titre 2" -#: wp-includes/class-wp-editor.php:990 -msgid "Read more..." -msgstr "Lire la suite..." +#: wp-includes/class-wp-editor.php:746 +#: wp-includes/js/tinymce/wp-mce-help.php:115 +msgid "Heading 3" +msgstr "Titre 3" -#: wp-includes/class-wp-editor.php:989 -msgid "Insert Read More tag" -msgstr "InsÃ©rer la balise Â« Lire la suite... Â»" +#: wp-includes/class-wp-editor.php:747 +#: wp-includes/js/tinymce/wp-mce-help.php:116 +msgid "Heading 4" +msgstr "Titre 4" -#: wp-includes/class-wp-editor.php:988 -msgid "Toolbar Toggle" -msgstr "Ouvrir/fermer la barre d'outils" +#: wp-includes/class-wp-editor.php:748 +#: wp-includes/js/tinymce/wp-mce-help.php:116 +msgid "Heading 5" +msgstr "Titre 5" -#: wp-includes/class-wp-editor.php:987 -#: wp-includes/js/tinymce/wp-mce-help.php:16 -msgid "Keyboard Shortcuts" -msgstr "Raccourcis clavier" +#: wp-includes/class-wp-editor.php:749 +#: wp-includes/js/tinymce/wp-mce-help.php:117 +msgid "Heading 6" +msgstr "Titre 6" -#: wp-includes/class-wp-editor.php:984 -msgctxt "TinyMCE menu" -msgid "Format" -msgstr "Format" +#: wp-includes/class-wp-editor.php:754 +msgid "Blockquote" +msgstr "Bloc de citation" -#: wp-includes/class-wp-editor.php:983 -msgctxt "TinyMCE menu" -msgid "Table" -msgstr "Tableau" +#: wp-includes/class-wp-editor.php:765 +#: wp-includes/js/tinymce/wp-mce-help.php:113 +msgid "Bold" +msgstr "Gras" +======= +#: wp-includes/class-wp-xmlrpc-server.php:1176 +#: wp-includes/class-wp-xmlrpc-server.php:1434 +#: wp-includes/class-wp-xmlrpc-server.php:1494 +#: wp-includes/class-wp-xmlrpc-server.php:1585 +#: wp-includes/class-wp-xmlrpc-server.php:2473 +#: wp-includes/class-wp-xmlrpc-server.php:3228 +#: wp-includes/class-wp-xmlrpc-server.php:3231 +#: wp-includes/class-wp-xmlrpc-server.php:4032 +#: wp-includes/class-wp-xmlrpc-server.php:4703 +#: wp-includes/class-wp-xmlrpc-server.php:4986 +#: wp-includes/class-wp-xmlrpc-server.php:5476 +#: wp-includes/class-wp-xmlrpc-server.php:5524 +#: wp-includes/class-wp-xmlrpc-server.php:5648 wp-includes/post.php:3125 +#: wp-includes/post.php:3583 +msgid "Invalid post ID." +msgstr "Identifiant de l’article non valide." -#: wp-includes/class-wp-editor.php:982 -msgctxt "TinyMCE menu" -msgid "View" -msgstr "Voir" +#: wp-includes/class-wp-xmlrpc-server.php:1170 +#: wp-includes/class-wp-xmlrpc-server.php:3709 +#: wp-includes/class-wp-xmlrpc-server.php:4390 +#: wp-includes/class-wp-xmlrpc-server.php:4448 +#: wp-includes/class-wp-xmlrpc-server.php:4710 +#: wp-includes/class-wp-xmlrpc-server.php:4774 +msgid "Invalid post type" +msgstr "Type d’article invalide" -#: wp-includes/class-wp-editor.php:981 -msgctxt "TinyMCE menu" -msgid "Tools" -msgstr "Outils" +#: wp-includes/class-wp-xmlrpc-server.php:594 +msgid "Insufficient arguments passed to this XML-RPC method." +msgstr "Arguments insuffisants passÃ©s Ã cette mÃ©thode XML-RPC." -#: wp-includes/class-wp-editor.php:980 -msgctxt "TinyMCE menu" -msgid "Edit" -msgstr "Modifier" +#: wp-includes/class-wp-xmlrpc-server.php:496 +msgid "Allow link notifications from other blogs (pingbacks and trackbacks)" +msgstr "Autoriser les liens de notifications depuis les autres sites (notifications par pings et rÃ©troliens)" -#: wp-includes/class-wp-editor.php:979 -msgctxt "TinyMCE menu" -msgid "File" -msgstr "Fichier" +#: wp-includes/class-wp-xmlrpc-server.php:491 +msgid "Allow people to post comments on new articles" +msgstr "Autoriser les lecteurs Ã publier des commentaires sur les nouveaux articles" -#: wp-includes/class-wp-editor.php:978 -msgctxt "TinyMCE menu" -msgid "Insert" -msgstr "InsÃ©rer" +#: wp-includes/class-wp-xmlrpc-server.php:486 +msgid "Large size image height" +msgstr "Hauteur de l’image en grande taille" -#: wp-includes/class-wp-editor.php:975 -msgid "Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser’s edit menu instead." -msgstr "Votre navigateur ne supporte pas les accÃ¨s direct au presse-papier. Veuillez utiliser les raccourcis clavier ou le menu Ãdition de votre navigateur." +#: wp-includes/class-wp-xmlrpc-server.php:481 +msgid "Large size image width" +msgstr "Largeur de l’image en grande taille" -#: wp-includes/class-wp-editor.php:974 wp-includes/script-loader.php:395 -#: wp-includes/script-loader.php:474 wp-includes/script-loader.php:482 -#: wp-includes/script-loader.php:586 wp-includes/theme.php:1947 -msgid "The changes you made will be lost if you navigate away from this page." -msgstr "Les modifications que vous avez faites seront perdues si vous changez de page." +#: wp-includes/class-wp-xmlrpc-server.php:476 +msgid "Medium size image height" +msgstr "Hauteur de l’image en taille moyenne" -#: wp-includes/class-wp-editor.php:973 -msgid "Rich Text Area. Press Alt-Shift-H for help" -msgstr "Zone de texte enrichi. Appuyez sur Alt-Shift-H pour obtenir de l'aide" +#: wp-includes/class-wp-xmlrpc-server.php:471 +msgid "Medium size image width" +msgstr "Largeur de l’image en taille moyenne" -#: wp-includes/class-wp-editor.php:972 -msgid "If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically." -msgstr "Si vous souhaitez utiliser du contenu riche en provenance de Microsoft Word, essayez de dÃ©sactiver cette option. L’Ã©diteur nettoiera automatiquement les textes en provenance de Word." +#: wp-includes/class-wp-xmlrpc-server.php:466 +msgid "Crop thumbnail to exact dimensions" +msgstr "Recadrer les images pour parvenir aux dimensions exactes" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:972 -msgid "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off." -msgstr "Coller est maintenant en mode texte. Les contenus seront dorÃ©navant collÃ©s en mode texte jusqu‘Ã ce que cette option soit annulÃ©e." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:839 wp-includes/script-loader.php:102 +msgid "Italic" +msgstr "Italique" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:766 +#: wp-includes/js/tinymce/wp-mce-help.php:113 +msgid "Italic" +msgstr "Italique" +======= +#: wp-includes/class-wp-xmlrpc-server.php:461 +msgid "Thumbnail Height" +msgstr "Hauteur des miniatures" +>>>>>>> .r12027 -#. translators: word count -#: wp-includes/class-wp-editor.php:971 -msgid "Words: %s" -msgstr "Mots : %s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:833 +msgid "Underline" +msgstr "Souligner" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:760 +#: wp-includes/js/tinymce/wp-mce-help.php:114 +msgid "Underline" +msgstr "Souligner" +======= +#: wp-includes/class-wp-xmlrpc-server.php:456 +msgid "Thumbnail Width" +msgstr "Largeur des miniatures" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:968 -msgid "Show invisible characters" -msgstr "Voir les caractÃ¨res invisibles" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:835 +msgid "Subscript" +msgstr "Indice" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:761 +#: wp-includes/js/tinymce/wp-mce-help.php:126 +msgid "Strikethrough" +msgstr "Barrer" -#: wp-includes/class-wp-editor.php:967 -msgctxt "editor button" -msgid "Show blocks" -msgstr "Montrer les blocs" +#: wp-includes/js/tinymce/wp-mce-help.php:124 +msgid "Align Left" +msgstr "Aligner Ã gauche" -#: wp-includes/class-wp-editor.php:966 -msgid "Text color" -msgstr "Couleur du texte" +#: wp-includes/js/tinymce/wp-mce-help.php:125 +msgid "Align Center" +msgstr "Centrer" -#: wp-includes/class-wp-editor.php:965 -msgid "Background color" -msgstr "Couleur d’arriÃ¨re plan" +#: wp-includes/js/tinymce/wp-mce-help.php:126 +msgid "Align Right" +msgstr "Aligner Ã droite" -#: wp-includes/class-wp-editor.php:963 -msgctxt "TinyMCE" -msgid "Templates" -msgstr "ModÃ¨les" +#: wp-includes/class-wp-editor.php:762 +msgid "Subscript" +msgstr "Indice" +======= +#: wp-includes/class-wp-xmlrpc-server.php:451 +msgid "Allow new users to sign up" +msgstr "Autoriser les nouveaux utilisateurs Ã s’inscrire" -#: wp-includes/class-wp-editor.php:962 -msgctxt "TinyMCE" -msgid "Insert template" -msgstr "InsÃ©rer un modÃ¨le" +#: wp-includes/class-wp-xmlrpc-server.php:446 +msgid "Time Format" +msgstr "Format dâheure" -#: wp-includes/class-wp-editor.php:960 -msgctxt "table cell scope attribute" -msgid "Scope" -msgstr "PortÃ©e" +#: wp-includes/class-wp-xmlrpc-server.php:441 +msgid "Date Format" +msgstr "Format de date" -#: wp-includes/class-wp-editor.php:959 -msgid "Cell spacing" -msgstr "Espacement entre les cellules" +#: wp-includes/class-wp-xmlrpc-server.php:436 +msgid "Site Tagline" +msgstr "Slogan du site" -#: wp-includes/class-wp-editor.php:958 -msgid "Cell padding" -msgstr "Marge intÃ©rieure des cellules" +#: wp-includes/class-wp-xmlrpc-server.php:426 +msgid "Time Zone" +msgstr "Fuseau horaire" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:957 -msgid "Cell type" -msgstr "Type de cellule" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:836 +msgid "Superscript" +msgstr "Exposant" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:763 +msgid "Superscript" +msgstr "Exposant" +======= +#: wp-includes/class-wp-xmlrpc-server.php:419 +msgid "Post Thumbnail" +msgstr "Miniature d’article" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:956 -msgid "Row type" -msgstr "Type de ligne" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:852 +msgid "Cut" +msgstr "Couper" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:779 +#: wp-includes/js/tinymce/wp-mce-help.php:111 +msgid "Cut" +msgstr "Couper" +======= +#: wp-includes/class-wp-xmlrpc-server.php:414 +msgid "Stylesheet" +msgstr "Feuille de style" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:955 -msgid "Column group" -msgstr "Groupe de colonnes" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:853 +msgid "Copy" +msgstr "Copier" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:780 +#: wp-includes/js/tinymce/wp-mce-help.php:110 +msgid "Copy" +msgstr "Copier" +======= +#: wp-includes/class-wp-xmlrpc-server.php:409 +msgid "Template" +msgstr "ModÃ¨le" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:954 -msgid "Row group" -msgstr "Groupe de lignes" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:854 +msgid "Paste" +msgstr "Coller" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:781 +#: wp-includes/js/tinymce/wp-mce-help.php:110 +msgid "Paste" +msgstr "Coller" +======= +#: wp-includes/class-wp-xmlrpc-server.php:404 +msgid "Image default align" +msgstr "Alignement par dÃ©faut de l’image" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:952 -msgid "Bottom" -msgstr "Bas" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:898 +msgid "Image description" +msgstr "Description de l’image" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:740 +msgid "New document" +msgstr "Nouveau document" -#: wp-includes/class-wp-editor.php:951 -msgid "Middle" -msgstr "Milieu" +#: wp-includes/class-wp-editor.php:825 +msgid "Image description" +msgstr "Description de l’image" +======= +#: wp-includes/class-wp-xmlrpc-server.php:399 +msgid "Image default size" +msgstr "Taille de l’imageÂ par dÃ©faut" -#: wp-includes/class-wp-editor.php:950 -msgid "Top" -msgstr "Haut" +#: wp-includes/class-wp-xmlrpc-server.php:394 +msgid "Image default link type" +msgstr "Type du lien par dÃ©faut vers l’image" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:949 -msgctxt "vertical table cell alignment" -msgid "V Align" -msgstr "Alignement V" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:895 +msgid "Border" +msgstr "Bordure" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:822 +msgid "Border" +msgstr "Bordure" +======= +#: wp-includes/class-wp-xmlrpc-server.php:389 +msgid "The URL to the admin area" +msgstr "L’adresse web de la zone d’administration" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:948 -msgctxt "table cell alignment attribute" -msgid "None" -msgstr "Aucun" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:900 +msgid "Dimensions" +msgstr "Dimensions" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:827 +msgid "Dimensions" +msgstr "Dimensions" +======= +#: wp-includes/class-wp-xmlrpc-server.php:384 +msgid "Login Address (URL)" +msgstr "Adresse de connexion (URL)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:944 -msgctxt "horizontal table cell alignment" -msgid "H Align" -msgstr "Alignement H" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:897 +msgid "Vertical space" +msgstr "Espace vertical" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:824 +msgid "Vertical space" +msgstr "Espace vertical" +======= +#: wp-includes/class-wp-xmlrpc-server.php:379 +msgid "Site Address (URL)" +msgstr "Adresse web du site (URL)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:943 wp-includes/media-template.php:608 -msgid "Alignment" -msgstr "Alignement" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:923 +msgid "Horizontal space" +msgstr "Espace horizontal" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:850 +msgid "Horizontal space" +msgstr "Espace horizontal" +======= +#: wp-includes/class-wp-xmlrpc-server.php:374 +msgid "WordPress Address (URL)" +msgstr "Adresse web de WordPress (URL)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:942 wp-includes/media-template.php:396 -#: wp-includes/media-template.php:575 wp-includes/media-template.php:833 -#: wp-includes/media-template.php:898 -msgid "Caption" -msgstr "LÃ©gende" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:992 +msgid "Top" +msgstr "Haut" -#: wp-includes/class-wp-editor.php:941 wp-includes/media-template.php:961 -msgid "Width" -msgstr "Largeur" +#: wp-includes/class-wp-editor.php:993 +msgid "Middle" +msgstr "Milieu" -#: wp-includes/class-wp-editor.php:940 wp-includes/media-template.php:961 -msgid "Height" -msgstr "Hauteur" +#: wp-includes/class-wp-editor.php:994 +msgid "Bottom" +msgstr "Bas" -#: wp-includes/class-wp-editor.php:938 -msgid "Split table cell" -msgstr "Diviser une cellule du tableau" +#: wp-includes/class-wp-editor.php:892 +msgid "General" +msgstr "GÃ©nÃ©ral" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:819 +msgid "General" +msgstr "GÃ©nÃ©ral" +======= +#: wp-includes/class-wp-xmlrpc-server.php:369 +msgid "Software Version" +msgstr "Version du logiciel" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:937 -msgid "Merge table cells" -msgstr "Fusionner les cellules du tableau" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:896 +msgid "Constrain proportions" +msgstr "Respecter les proportions" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:127 +#: wp-includes/js/tinymce/wp-mce-help.php:128 +msgid "List" +msgstr "Liste" -#: wp-includes/class-wp-editor.php:936 -msgid "Copy table row" -msgstr "Copier la ligne du tableau" +#: wp-includes/class-wp-editor.php:823 +msgid "Constrain proportions" +msgstr "Respecter les proportions" +======= +#: wp-includes/class-wp-xmlrpc-server.php:364 +msgid "Software Name" +msgstr "Nom du logiciel" -#: wp-includes/class-wp-editor.php:935 -msgid "Cut table row" -msgstr "Couper la ligne du tableau" +#: wp-includes/class-wp-xmlrpc-server.php:238 +msgid "Incorrect username or password." +msgstr "Identifiant ou mot de passe incorrect." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:934 -msgid "Delete column" -msgstr "Supprimer la colonne" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:921 wp-includes/script-loader.php:338 +msgid "Fullscreen" +msgstr "Plein Ã©cran" +||||||| .r11156 +#: wp-includes/media-template.php:1050 wp-includes/media-template.php:1140 +msgid "Loop" +msgstr "RÃ©pÃ©ter" -#: wp-includes/class-wp-editor.php:933 -msgid "Delete row" -msgstr "Supprimer la ligne" +#: wp-includes/media-template.php:801 wp-includes/media-template.php:867 +msgid "Align" +msgstr "Alignement" -#: wp-includes/class-wp-editor.php:932 -msgid "Paste table row after" -msgstr "Coller la ligne du tableau aprÃ¨s" +#: wp-includes/admin-bar.php:684 +msgid "Background" +msgstr "ArriÃ¨re-plan" -#: wp-includes/class-wp-editor.php:931 -msgid "Paste table row before" -msgstr "Coller la ligne du tableau avant" +#: wp-includes/class-wp-editor.php:848 wp-includes/script-loader.php:310 +msgid "Fullscreen" +msgstr "Plein Ã©cran" +======= +#: wp-includes/class-wp-xmlrpc-server.php:231 +msgid "XML-RPC services are disabled on this site." +msgstr "Les services XML-RPC sont dÃ©sactivÃ©s sur ce site." -#: wp-includes/class-wp-editor.php:930 -msgid "Insert column after" -msgstr "InsÃ©rer une colonne aprÃ¨s" +#. translators: used between list items, there is a space after the comma +#: wp-includes/class-wp-theme.php:678 +msgid ", " +msgstr ", " -#: wp-includes/class-wp-editor.php:929 -msgid "Insert column before" -msgstr "InsÃ©rer une colonne avant" +#: wp-includes/class-wp-theme.php:671 wp-includes/comment-template.php:29 +msgid "Anonymous" +msgstr "Anonyme" -#: wp-includes/class-wp-editor.php:928 -msgid "Insert row after" -msgstr "InsÃ©rer une ligne aprÃ¨s" +#: wp-includes/class-wp-theme.php:279 wp-includes/class-wp-theme.php:283 +msgid "The \"%s\" theme is not a valid parent theme." +msgstr "Le thÃ¨me « %s » n’est un thÃ¨me parent valide." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:927 -msgid "Insert row before" -msgstr "InsÃ©rer une ligne avant" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:894 +msgid "Source" +msgstr "Adresse web source" +||||||| .r11156 +#: wp-includes/script-loader.php:319 +msgid "Mute" +msgstr "Muet" -#: wp-includes/class-wp-editor.php:925 -msgctxt "table footer" -msgid "Footer" -msgstr "Pied de page" +#: wp-includes/js/tinymce/wp-mce-help.php:130 +msgid "Insert More Tag" +msgstr "InsÃ©rer la balise Â« More Â»" -#: wp-includes/class-wp-editor.php:924 -msgctxt "table body" -msgid "Body" -msgstr "Corps" +#: wp-includes/media.php:2963 +msgid "Edit Gallery" +msgstr "Modifier la galerie" -#: wp-includes/class-wp-editor.php:923 -msgctxt "table header" -msgid "Header" -msgstr "En-tÃªte" +#: wp-includes/class-wp-editor.php:821 +msgid "Source" +msgstr "Adresse web source" +======= +#: wp-includes/class-wp-theme.php:267 +msgid "The parent theme is missing. Please install the \"%s\" parent theme." +msgstr "Le thÃ¨me parent est manquant. Merci d’installer le thÃ¨me parent « %s »." -#: wp-includes/class-wp-editor.php:922 -msgid "Header cell" -msgstr "Cellule d’en-tÃªte" +#: wp-includes/class-wp-theme.php:248 +msgid "Template is missing." +msgstr "Le modÃ¨le est manquant." -#: wp-includes/class-wp-editor.php:921 -msgctxt "table cell" -msgid "Cell" -msgstr "Cellule" +#: wp-includes/class-wp-theme.php:230 +msgid "Stylesheet is not readable." +msgstr "Impossible de lire la feuille de style." -#: wp-includes/class-wp-editor.php:920 -msgctxt "table columns" -msgid "Cols" -msgstr "Colonnes" +#: wp-includes/class-wp-theme.php:226 +msgid "ERROR: The themes directory is either empty or doesn’t exist. Please check your installation." +msgstr "ERREUR : le rÃ©pertoire des thÃ¨mes est soit vide, ou n’existe pas. Veuillez vÃ©rifier votre installation." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:919 -msgctxt "table column" -msgid "Column" -msgstr "Colonne" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1051 +msgid "Letter" +msgstr "Lettre" +||||||| .r11156 +#: wp-includes/media-template.php:964 +msgid "Link Rel" +msgstr "Attribut « Rel » du lien" -#: wp-includes/class-wp-editor.php:918 -msgid "Rows" -msgstr "Lignes" +#: wp-includes/js/tinymce/wp-mce-help.php:106 +msgid "Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter." +msgstr "PlutÃ´t que d’attraper votre souris pour cliquer sur la barre d’outils, utilisez les raccourcis clavier. Sous Windows et Linux, utilisez Ctrl+<lettre> sous Macintosh, utilisez la touche Commande+<lettre>." -#: wp-includes/class-wp-editor.php:917 -msgid "Row" -msgstr "Ligne" - -#: wp-includes/class-wp-editor.php:915 -msgid "Border color" -msgstr "Couleur de bordure" - -#: wp-includes/class-wp-editor.php:914 -msgid "Table cell properties" -msgstr "PropriÃ©tÃ©s de la cellule du tableau" - -#: wp-includes/class-wp-editor.php:913 -msgid "Table row properties" -msgstr "PropriÃ©tÃ©s de la ligne du tableau" - -#: wp-includes/class-wp-editor.php:912 -msgid "Table properties" -msgstr "PropriÃ©tÃ©s du tableau" - -#: wp-includes/class-wp-editor.php:911 -msgid "Delete table" -msgstr "Supprimer le tableau" +#: wp-includes/js/tinymce/wp-mce-help.php:109 +#: wp-includes/js/tinymce/wp-mce-help.php:123 +msgid "Letter" +msgstr "Lettre" +======= +#: wp-includes/class-wp-theme.php:222 +msgid "Stylesheet is missing." +msgstr "La feuille de style manque." -#: wp-includes/class-wp-editor.php:910 -msgid "Insert table" -msgstr "InsÃ©rer un tableau" +#: wp-includes/class-wp-theme.php:220 +msgid "The theme directory \"%s\" does not exist." +msgstr "Le rÃ©pertoire du thÃ¨me « %s » n’existe pas." -#: wp-includes/class-wp-editor.php:907 -msgid "Add to Dictionary" -msgstr "Ajouter au Dictionnaire" +#: wp-includes/class-wp-image-editor.php:282 +msgid "Attempted to set image quality outside of the range [1,100]." +msgstr "Tentative de mise en place d’une qualitÃ© d’image en dehors de l’intervalle [1100]." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:906 -msgctxt "spellcheck" -msgid "Ignore" -msgstr "Ignorer" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1052 +msgid "Action" +msgstr "Action" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:109 +#: wp-includes/js/tinymce/wp-mce-help.php:123 +msgid "Action" +msgstr "Action" +======= +#: wp-includes/class-wp-image-editor-imagick.php:203 +msgid "Could not read image size" +msgstr "Impossible de lire la taille de l’image" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:905 -msgctxt "spellcheck" -msgid "Ignore all" -msgstr "Tout ignorer" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:945 +msgid "Check Spelling" +msgstr "VÃ©rifier l’orthographe" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:782 +#: wp-includes/js/tinymce/wp-mce-help.php:111 +msgid "Select all" +msgstr "SÃ©lectionner tout" -#: wp-includes/class-wp-editor.php:904 -msgctxt "spellcheck" -msgid "Finish" -msgstr "Terminer" +#: wp-includes/js/tinymce/wp-mce-help.php:121 +msgid "The following shortcuts use different access keys: Alt + Shift + letter." +msgstr "Vous pouvez accÃ©der aux raccourcis suivants via les touches : Alt+Shift+<lettre>." -#: wp-includes/class-wp-editor.php:903 -#: wp-includes/js/tinymce/wp-mce-help.php:117 +#: wp-includes/class-wp-editor.php:867 +#: wp-includes/js/tinymce/wp-mce-help.php:124 msgid "Check Spelling" msgstr "VÃ©rifier l’orthographe" +======= +#: wp-includes/class-wp-image-editor-gd.php:390 +#: wp-includes/class-wp-image-editor-gd.php:398 +#: wp-includes/class-wp-image-editor-gd.php:402 +#: wp-includes/class-wp-image-editor-gd.php:405 +msgid "Image Editor Save Failed" +msgstr "L’enregistrement de l’Ã©diteur d’images a Ã©chouÃ©." -#: wp-includes/class-wp-editor.php:902 -msgid "Match case" -msgstr "Respecter la casse" - -#: wp-includes/class-wp-editor.php:901 -msgctxt "find/replace" -msgid "Replace all" -msgstr "Tout remplacer" +#: wp-includes/class-wp-image-editor-gd.php:352 +msgid "Image flip failed." +msgstr "Le retournement de l’image a Ã©chouÃ©." -#: wp-includes/class-wp-editor.php:900 -msgctxt "find/replace" -msgid "Find" -msgstr "Chercher" +#: wp-includes/class-wp-image-editor-gd.php:322 +msgid "Image rotate failed." +msgstr "La rotation de l’image a Ã©chouÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:899 -msgctxt "find/replace" -msgid "Replace with" -msgstr "Remplacer par" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1031 +msgid "Insert Page Break tag" +msgstr "InsÃ©rer la balise « Page break »" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:125 +msgid "Justify Text" +msgstr "Justifier le texte" +======= +#: wp-includes/class-wp-image-editor-gd.php:295 +msgid "Image crop failed." +msgstr "Le recadrage de l’image a Ã©chouÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:898 -msgid "Find and replace" -msgstr "Chercher et remplacer" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-imagick.php:211 +msgid "Could not read image size" +msgstr "Impossible de lire la taille de l’image" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:127 +msgid "Insert link" +msgstr "InsÃ©rer un lien" +======= +#: wp-includes/class-wp-image-editor-gd.php:177 +#: wp-includes/class-wp-image-editor-imagick.php:237 +msgid "Could not calculate resized image dimensions" +msgstr "Impossible de lire la taille de l’image redimensionnÃ©e" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:897 -msgctxt "find/replace" -msgid "Whole words" -msgstr "Mots entiers" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1371 +#: wp-includes/class-wp-xmlrpc-server.php:1920 +#: wp-includes/class-wp-xmlrpc-server.php:2011 +#: wp-includes/class-wp-xmlrpc-server.php:2082 wp-includes/taxonomy.php:2904 +msgid "Invalid term ID" +msgstr "l’ID du terme est invalide" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:853 +#: wp-includes/js/tinymce/wp-mce-help.php:128 +msgid "Remove link" +msgstr "Enlever le lien" +======= +#: wp-includes/class-wp-image-editor-gd.php:171 +#: wp-includes/class-wp-image-editor-gd.php:189 +msgid "Image resize failed." +msgstr "Le redimensionnement de l’image a Ã©chouÃ©." +>>>>>>> .r12027 -#. translators: previous -#: wp-includes/class-wp-editor.php:896 -msgctxt "find/replace" -msgid "Prev" -msgstr "PrÃ©c." +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:259 +msgid "Template is missing." +msgstr "Le modÃ¨le est manquant." +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:129 +msgid "Quote" +msgstr "Citation" +======= +#: wp-includes/class-wp-image-editor-gd.php:109 +msgid "Could not read image size." +msgstr "Impossible de lire la taille de l’image." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:894 -msgctxt "find/replace" -msgid "Next" -msgstr "Suivant" +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:233 +msgid "Stylesheet is missing." +msgstr "La feuille de style manque." +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:131 +msgid "Insert Page Break tag" +msgstr "InsÃ©rer la balise « Page break »" +======= +#: wp-includes/class-wp-image-editor-gd.php:105 +#: wp-includes/class-wp-image-editor-imagick.php:132 +msgid "File is not an image." +msgstr "Le fichier n’est pas une image." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:893 -msgctxt "find/replace" -msgid "Replace" -msgstr "Remplacer" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:386 +msgid "Software Name" +msgstr "Nom du logiciel" +||||||| .r11156 +#: wp-includes/link-template.php:671 +msgid "Comments Feed" +msgstr "Flux des commentaires" +======= +#: wp-includes/class-wp-image-editor-gd.php:89 +#: wp-includes/class-wp-image-editor-imagick.php:122 +msgid "File doesn’t exist?" +msgstr "Le fichier n’existe pas ?" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:892 -msgid "Could not find the specified string." -msgstr "Impossible de trouver la chaÃ®ne spÃ©cifiÃ©e." +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:391 +msgid "Software Version" +msgstr "Version du logiciel" +||||||| .r11156 +#: wp-includes/link-template.php:1609 wp-includes/link-template.php:1841 +msgid "Previous Post" +msgstr "Article prÃ©cÃ©dent" +======= +#: wp-includes/class-wp-editor.php:1485 wp-includes/script-loader.php:368 +msgid "Add Link" +msgstr "Ajouter un lien" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:889 -msgid "No color" -msgstr "Aucune couleur" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:448 +msgid "Time Zone" +msgstr "Fuseau horaire" +||||||| .r11156 +#: wp-includes/link-template.php:1609 wp-includes/link-template.php:1841 +msgid "Next Post" +msgstr "Article suivant" +======= +#: wp-includes/class-wp-editor.php:1471 +msgid "Search or use up and down arrow keys to select an item." +msgstr "Chercher ou utiliser les flÃ¨ches haut et bas pour choisir un Ã©lÃ©ment." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:888 -msgctxt "label for custom color" -msgid "Custom..." -msgstr "PersonnalisÃ©e..." +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:473 +msgid "Allow new users to sign up" +msgstr "Autoriser les nouveaux utilisateurs Ã s’inscrire" +||||||| .r11156 +#: wp-includes/deprecated.php:2737 +msgid "Last Post" +msgstr "Dernier article" +======= +#: wp-includes/class-wp-editor.php:1470 +msgid "No search term specified. Showing recent items." +msgstr "Aucun mot n’a Ã©tÃ© donnÃ© pour cette recherche. Voici les recherches prÃ©cÃ©dentes." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:887 -msgid "Custom color" -msgstr "Couleur personnalisÃ©e" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2604 +msgid "Sorry, you cannot edit this page." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cette page." +||||||| .r11156 +#: wp-includes/link-template.php:2260 +msgid "Newer Comments »" +msgstr "Commentaires plus rÃ©cents »" +======= +#: wp-includes/class-wp-editor.php:1453 +msgid "Or link to existing content" +msgstr "Ou alors, faites un lien vers l’un des contenus de votre site" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:886 -msgid "Color" -msgstr "Couleur" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2615 +#: wp-includes/class-wp-xmlrpc-server.php:2735 +#: wp-includes/class-wp-xmlrpc-server.php:2797 +msgid "Sorry, no such page." +msgstr "DÃ©solÃ©, aucune page ne correspond." +||||||| .r11156 +#: wp-includes/link-template.php:2304 +msgid "« Older Comments" +msgstr "« Commentaires plus anciens" +======= +#: wp-includes/class-wp-editor.php:1450 wp-includes/media-template.php:1004 +msgid "Open link in a new window/tab" +msgstr "Ouvrir le lien dans une nouvelle fenÃªtre/un nouvel onglet" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:884 -#: wp-includes/js/tinymce/wp-mce-help.php:121 -msgid "Remove link" -msgstr "Enlever le lien" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2645 +#: wp-includes/class-wp-xmlrpc-server.php:2847 +msgid "Sorry, you cannot edit pages." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les pages." +||||||| .r11156 +#: wp-includes/locale.php:109 +msgid "S_Sunday_initial" +msgstr "D" +======= +#: wp-includes/class-wp-editor.php:1447 wp-includes/media-template.php:816 +msgid "Link Text" +msgstr "Texte du lien" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:883 wp-includes/class-wp-editor.php:1437 -#: wp-includes/js/tinymce/wp-mce-help.php:103 -#: wp-includes/js/tinymce/wp-mce-help.php:120 wp-includes/script-loader.php:366 -msgid "Insert/edit link" -msgstr "InsÃ©rer/modifier un lien" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2739 +msgid "Sorry, you do not have the right to delete this page." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cette page." +||||||| .r11156 +#: wp-includes/locale.php:110 +msgid "M_Monday_initial" +msgstr "L" +======= +#: wp-includes/class-wp-editor.php:1444 wp-includes/media-template.php:376 +#: wp-includes/media-template.php:555 wp-includes/media.php:2996 +msgid "URL" +msgstr "Adresse web" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:882 -msgid "Restore last draft" -msgstr "RÃ©tablir le dernier brouillon" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2744 +msgid "Failed to delete the page." +msgstr "Ãchec lors de la suppression de la page." +||||||| .r11156 +#: wp-includes/locale.php:111 +msgid "T_Tuesday_initial" +msgstr "Ma" +======= +#: wp-includes/class-wp-editor.php:1442 +msgid "Enter the destination URL" +msgstr "Saisissez l’adresse de destination" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:881 -msgid "Horizontal space" -msgstr "Espace horizontal" - -#: wp-includes/class-wp-editor.php:880 -msgid "Horizontal line" -msgstr "Ligne horizontale" - -#: wp-includes/class-wp-editor.php:879 wp-includes/script-loader.php:318 -msgid "Fullscreen" -msgstr "Plein Ã©cran" - -#: wp-includes/class-wp-editor.php:878 wp-includes/class-wp-editor.php:1247 -msgid "Save" -msgstr "Enregistrer" - -#: wp-includes/class-wp-editor.php:877 -msgid "Print" -msgstr "Imprimer" - -#: wp-includes/class-wp-editor.php:876 -msgid "Preview" -msgstr "AperÃ§u" - -#: wp-includes/class-wp-editor.php:875 -msgid "Paste as text" -msgstr "Coller en texte" - -#: wp-includes/class-wp-editor.php:874 -msgid "Page break" -msgstr "Saut de page" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2801 +msgid "Sorry, you do not have the right to edit this page." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cette page." +||||||| .r11156 +#: wp-includes/locale.php:112 +msgid "W_Wednesday_initial" +msgstr "Me" +======= +#: wp-includes/class-wp-editor.php:1385 +msgid "Y/m/d" +msgstr "d/m/Y" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:873 -msgid "Nonbreaking space" -msgstr "Espace insÃ©cable" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2998 +msgid "Sorry, you do not have the right to add a category." +msgstr "DÃ©solÃ©, vous n’avez pas les droits pour ajouter une catÃ©gorie." +||||||| .r11156 +#: wp-includes/locale.php:113 +msgid "T_Thursday_initial" +msgstr "J" +======= +#: wp-includes/class-wp-editor.php:1323 +msgid "Just write." +msgstr "Il ne reste plus qu’Ã Ã©crire." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:872 -msgid "Emoticons" -msgstr "ÃmoticÃ´nes" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3026 +#: wp-includes/class-wp-xmlrpc-server.php:3028 +msgid "Sorry, the new category failed." +msgstr "DÃ©solÃ©, la crÃ©ation de la catÃ©gorie a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/locale.php:114 +msgid "F_Friday_initial" +msgstr "V" +======= +#: wp-includes/class-wp-editor.php:1322 +msgid "Word count: %s" +msgstr "Compteur de mots : %s" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:871 -msgctxt "editor button" -msgid "Left to right" -msgstr "Gauche Ã droite" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3073 +msgid "Sorry, you do not have the right to delete a category." +msgstr "DÃ©solÃ©, vous n’avez pas les droits pour supprimer une catÃ©gorie." +||||||| .r11156 +#: wp-includes/locale.php:115 +msgid "S_Saturday_initial" +msgstr "S" +======= +#: wp-includes/class-wp-editor.php:1313 +msgid "Save failed." +msgstr "Ãchec de la sauvegarde." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:870 -msgctxt "editor button" -msgid "Right to left" -msgstr "Droite Ã gauche (RTL)" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3169 +#: wp-includes/class-wp-xmlrpc-server.php:3278 +#: wp-includes/class-wp-xmlrpc-server.php:3345 +msgid "Invalid comment ID." +msgstr "Identifiant commentaire invalide." +||||||| .r11156 +#: wp-includes/locale.php:164 +msgid "am" +msgstr " " +======= +#: wp-includes/class-wp-editor.php:1312 wp-includes/media-template.php:340 +#: wp-includes/media-template.php:501 +msgid "Saved." +msgstr "EnregistrÃ©." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:869 -msgid "Special character" -msgstr "CaractÃ¨re spÃ©cial" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3211 +msgid "Sorry, you cannot edit comments." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les commentaires." +||||||| .r11156 +#: wp-includes/locale.php:165 +msgid "pm" +msgstr " " +======= +#: wp-includes/class-wp-editor.php:1312 +msgid "Updated." +msgstr "Mis Ã jour." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:866 -msgid "Embed" -msgstr "IntÃ©gration" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3358 +msgid "Invalid comment status." +msgstr "Statut du commentaire non valide." +||||||| .r11156 +#: wp-includes/locale.php:166 +msgid "AM" +msgstr " " +======= +#: wp-includes/class-wp-editor.php:1276 +msgid "Help (Alt + Shift + H)" +msgstr "Aide (Alt + Maj. + H)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:865 -msgid "Insert video" -msgstr "InsÃ©rer une vidÃ©o" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3390 +msgid "Sorry, the comment could not be edited. Something wrong happened." +msgstr "DÃ©solÃ©, votre commentaire n’a pu Ãªtre modifiÃ©. Une erreur est survenue." +||||||| .r11156 +#: wp-includes/locale.php:167 +msgid "PM" +msgstr " " +======= +#: wp-includes/class-wp-editor.php:1275 +msgid "Unlink (Alt + Shift + S)" +msgstr "DÃ©faire le lien (Alt + Maj. + S)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:864 -msgid "Paste your embed code below:" -msgstr "Collez votre code d’intÃ©gration ci-dessous :" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3444 +msgid "You must be registered to comment" +msgstr "Vous devez Ãªtre enregistrÃ© pour laisser un commentaire" +||||||| .r11156 +#: wp-includes/locale.php:173 +msgid "number_format_thousands_sep" +msgstr " " +======= +#: wp-includes/class-wp-editor.php:1274 +msgid "Insert/edit link (Alt + Shift + A)" +msgstr "InsÃ©rer/modifier un lien (Alt + Shift + A)" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1259 +#: wp-includes/class-wp-xmlrpc-server.php:1512 +#: wp-includes/class-wp-xmlrpc-server.php:1578 +#: wp-includes/class-wp-xmlrpc-server.php:1673 +#: wp-includes/class-wp-xmlrpc-server.php:2601 +#: wp-includes/class-wp-xmlrpc-server.php:3458 +#: wp-includes/class-wp-xmlrpc-server.php:3461 +#: wp-includes/class-wp-xmlrpc-server.php:4115 +#: wp-includes/class-wp-xmlrpc-server.php:4179 +#: wp-includes/class-wp-xmlrpc-server.php:4182 +#: wp-includes/class-wp-xmlrpc-server.php:4185 +#: wp-includes/class-wp-xmlrpc-server.php:4347 +#: wp-includes/class-wp-xmlrpc-server.php:5064 +#: wp-includes/class-wp-xmlrpc-server.php:5356 +#: wp-includes/class-wp-xmlrpc-server.php:5882 +#: wp-includes/class-wp-xmlrpc-server.php:5936 +#: wp-includes/class-wp-xmlrpc-server.php:6055 wp-includes/post.php:3172 +#: wp-includes/post.php:3632 wp-includes/revision.php:265 +msgid "Invalid post ID." +msgstr "Identifiant de l’article non valide." +||||||| .r11156 +#: wp-includes/class-wp-image-editor-imagick.php:198 +msgid "Could not read image size" +msgstr "Impossible de lire la taille de l’image" +======= +#: wp-includes/class-wp-editor.php:1273 +msgid "Media library (Alt + Shift + M)" +msgstr "BibliothÃ¨que de mÃ©dias (Alt + Shift + M)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:863 -msgid "Alternative source" -msgstr "Source alternative" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3574 +msgid "You are not allowed access to details about comments." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails des commentaires." +||||||| .r11156 +#: wp-includes/ms-functions.php:265 +msgid "That user does not exist." +msgstr "Cet utilisateur n’existe pas." +======= +#: wp-includes/class-wp-editor.php:1272 +msgid "Blockquote (Alt + Shift + Q)" +msgstr "Bloc de citation (Alt + Maj. + Q)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:862 -msgid "Poster" -msgstr "Image" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3770 +msgid "You are not allowed to update options." +msgstr "Vous n’avez pas l’autorisation de mettre Ã jour les options." +||||||| .r11156 +#: wp-includes/ms-functions.php:493 +msgid "You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider." +msgstr "Vous ne pouvez pas vous inscrire avec cette adresse de messagerie. Nous avons rencontrÃ© des problÃ¨mes de la part de ce service. Merci d’en utiliser un autre." +======= +#: wp-includes/class-wp-editor.php:1271 +msgid "Ordered list (Alt + Shift + O)" +msgstr "Liste ordonnÃ©e (Alt + Maj. + O)" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1676 +#: wp-includes/class-wp-xmlrpc-server.php:4188 +#: wp-includes/class-wp-xmlrpc-server.php:4350 +#: wp-includes/class-wp-xmlrpc-server.php:5359 +#: wp-includes/class-wp-xmlrpc-server.php:5713 +#: wp-includes/class-wp-xmlrpc-server.php:5939 +msgid "Sorry, you cannot edit this post." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier cet article." +||||||| .r11156 +#: wp-includes/ms-functions.php:503 +msgid "Sorry, usernames must have letters too!" +msgstr "DÃ©solÃ©, les identifiants doivent aussi avoir des lettres !" +======= +#: wp-includes/class-wp-editor.php:1270 +msgid "Unordered list (Alt + Shift + U)" +msgstr "Liste non ordonnÃ©e (Alt + Shift + U)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:861 -msgid "Insert/edit video" -msgstr "InsÃ©rer/modifier la vidÃ©o" +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:278 +msgid "The parent theme is missing. Please install the \"%s\" parent theme." +msgstr "Le thÃ¨me parent est manquant. Merci d’installer le thÃ¨me parent « %s »." +||||||| .r11156 +#: wp-includes/ms-functions.php:512 +msgid "Sorry, that email address is not allowed!" +msgstr "DÃ©solÃ©, cette adresse de messagerie n’est pas autorisÃ©e !" +======= +#: wp-includes/class-wp-editor.php:1269 +msgid "Italic (Ctrl + I)" +msgstr "Italique (Ctrl + I)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:860 -msgid "Insert date/time" -msgstr "InsÃ©rer l’heure/la date" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:193 +#: wp-includes/class-wp-image-editor-imagick.php:245 +msgid "Could not calculate resized image dimensions" +msgstr "Impossible de lire la taille de l’image redimensionnÃ©e" +||||||| .r11156 +#: wp-includes/ms-functions.php:517 wp-includes/user.php:1677 +msgid "Sorry, that username already exists!" +msgstr "DÃ©solÃ©, cet identifiant existe dÃ©jÃ !" +======= +#: wp-includes/class-wp-editor.php:1268 +msgid "Bold (Ctrl + B)" +msgstr "Gras (Ctrl + B)" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:859 -msgid "Insert image" -msgstr "InsÃ©rer une image" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:458 +msgid "Site Tagline" +msgstr "Slogan du site" +||||||| .r11156 +#: wp-includes/ms-functions.php:521 wp-includes/user.php:1720 +msgid "Sorry, that email address is already used!" +msgstr "DÃ©solÃ©, cette adresse de messagerie est dÃ©jÃ utilisÃ©e !" +======= +#: wp-includes/class-wp-editor.php:1253 +msgid "Exit fullscreen" +msgstr "Sortir du plein Ã©cran" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:858 -msgid "Dimensions" -msgstr "Dimensions" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2903 +#: wp-includes/class-wp-xmlrpc-server.php:4403 +#: wp-includes/class-wp-xmlrpc-server.php:5489 +msgid "Sorry, you cannot edit posts on this site." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les articles de ce site." +||||||| .r11156 +#: wp-includes/ms-functions.php:533 +msgid "That username is currently reserved but may be available in a couple of days." +msgstr "Cet identifiant est pour le moment rÃ©servÃ©, mais pourrait Ãªtre disponible dans quelques jours." +======= +#: wp-includes/class-wp-editor.php:1247 wp-includes/media.php:3001 +#: wp-includes/script-loader.php:367 wp-includes/script-loader.php:465 +msgid "Update" +msgstr "Mettre Ã jour" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3163 +#: wp-includes/class-wp-xmlrpc-server.php:3275 +#: wp-includes/class-wp-xmlrpc-server.php:3281 +#: wp-includes/class-wp-xmlrpc-server.php:3342 +#: wp-includes/class-wp-xmlrpc-server.php:3348 +msgid "You are not allowed to moderate comments on this site." +msgstr "Vous n’avez pas l’autorisation de modÃ©rer les commentaires de ce site." +||||||| .r11156 +#: wp-includes/ms-functions.php:543 +msgid "That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing." +msgstr "Cette adresse de messagerie a dÃ©jÃ Ã©tÃ© utilisÃ©e. Veuillez vÃ©rifier dans votre messagerie si le message d’activation ne s’y trouve pas. L’identifiant redeviendra disponible dans quelques jours si vous ne faites rien." +======= +#: wp-includes/class-wp-editor.php:994 wp-includes/comment-template.php:1873 +#: wp-includes/comment-template.php:1966 +msgid "Edit" +msgstr "Modifier" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:857 -msgid "Style" -msgstr "Style" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3488 +msgid "Comment author name and email are required" +msgstr "L’auteur d’un commentaire doit renseigner son nom et son adresse de messagerie" +||||||| .r11156 +#: wp-includes/ms-functions.php:997 +msgid "Invalid activation key." +msgstr "clÃ© d’activation invalide." +======= +#: wp-includes/class-wp-editor.php:992 +msgid "No alignment" +msgstr "Pas d'alignement" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:856 -msgid "Image description" -msgstr "Description de l’image" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3490 +msgid "A valid email address is required" +msgstr "Une adresse de messagerie valide est requise" +||||||| .r11156 +#: wp-includes/ms-functions.php:1017 +msgid "Could not create user" +msgstr "Impossible de crÃ©er l’utilisateur." +======= +#: wp-includes/class-wp-editor.php:991 +#: wp-includes/js/tinymce/wp-mce-help.php:123 wp-includes/script-loader.php:101 +msgid "Distraction-free writing mode" +msgstr "Mode d'Ã©criture sans distraction" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3540 +#: wp-includes/class-wp-xmlrpc-server.php:3612 +#: wp-includes/class-wp-xmlrpc-server.php:3644 +#: wp-includes/class-wp-xmlrpc-server.php:3676 +#: wp-includes/class-wp-xmlrpc-server.php:3914 +msgid "You are not allowed access to details about this site." +msgstr "Vous n’avez pas l’autorisation d’accÃ©der aux dÃ©tails de ce site." +||||||| .r11156 +#: wp-includes/ms-functions.php:1025 +msgid "That username is already activated." +msgstr "Cet identifiant est dÃ©jÃ activÃ©." +======= +#: wp-includes/class-wp-editor.php:990 +msgid "Read more..." +msgstr "Lire la suite..." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:855 -msgid "Vertical space" -msgstr "Espace vertical" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1266 +#: wp-includes/class-wp-xmlrpc-server.php:4493 +msgid "Sorry, you are not allowed to post on this site." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier sur ce site." +||||||| .r11156 +#: wp-includes/ms-functions.php:1283 +msgid "New User Registration: %s" +msgstr "Inscription d'un nouvel utilisateur : %s" +======= +#: wp-includes/class-wp-editor.php:989 +msgid "Insert Read More tag" +msgstr "InsÃ©rer la balise Â« Lire la suite... Â»" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:854 -msgid "Constrain proportions" -msgstr "Respecter les proportions" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:3120 +#: wp-includes/class-wp-xmlrpc-server.php:5602 +#: wp-includes/class-wp-xmlrpc-server.php:5837 +msgid "Sorry, you must be able to edit posts on this site in order to view categories." +msgstr "DÃ©solÃ©, vous devez avoir le droit d’Ã©crire des articles sur ce site si vous vous visualisez les catÃ©gories." +||||||| .r11156 +#: wp-includes/ms-functions.php:1601 +msgid "New %1$s User: %2$s" +msgstr "Nouvel utilisateur %1$s : %2$s" +======= +#: wp-includes/class-wp-editor.php:988 +msgid "Toolbar Toggle" +msgstr "Ouvrir/fermer la barre d'outils" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:853 -msgid "Border" -msgstr "Bordure" - -#: wp-includes/class-wp-editor.php:852 -msgid "Source" -msgstr "Adresse web source" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:478 +msgid "Thumbnail Width" +msgstr "Largeur des miniatures" +||||||| .r11156 +#: wp-includes/ms-functions.php:2119 +msgid "" +"Dear User,\n" +"\n" +"Your new account is set up.\n" +"\n" +"You can log in with the following information:\n" +"Username: USERNAME\n" +"Password: PASSWORD\n" +"LOGINLINK\n" +"\n" +"Thanks!\n" +"\n" +"--The Team @ SITE_NAME" +msgstr "" +"Cher utilisateur,\n" +"\n" +"Votre nouveau compte a Ã©tÃ© crÃ©Ã©.\n" +"\n" +"Vous pouvez vous connecter avec les informations suivantes :\n" +"Identifiant : USERNAME\n" +"Mot de passe : PASSWORD\n" +"LOGINLINK\n" +"\n" +"Merci !\n" +"\n" +"--L'Ã©quipe @ SITE_NAME" +======= +#: wp-includes/class-wp-editor.php:987 +#: wp-includes/js/tinymce/wp-mce-help.php:16 +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:851 -msgid "Advanced" -msgstr "AvancÃ©" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:483 +msgid "Thumbnail Height" +msgstr "Hauteur des miniatures" +||||||| .r11156 +#: wp-includes/pluggable.php:562 +msgid "ERROR: Invalid username or incorrect password." +msgstr "ERREUR : l’identifiant ou le mot de passe n’est pas valide." +======= +#: wp-includes/class-wp-editor.php:984 +msgctxt "TinyMCE menu" +msgid "Format" +msgstr "Format" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:850 -msgid "General" -msgstr "GÃ©nÃ©ral" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:488 +msgid "Crop thumbnail to exact dimensions" +msgstr "Recadrer les images pour parvenir aux dimensions exactes" +||||||| .r11156 +#: wp-includes/pluggable.php:1407 wp-includes/pluggable.php:1536 +msgid "Author : %1$s (IP: %2$s , %3$s)" +msgstr "Auteur : %1$s (IP : %2$s , %3$s)" +======= +#: wp-includes/class-wp-editor.php:983 +msgctxt "TinyMCE menu" +msgid "Table" +msgstr "Tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:849 -msgid "Insert/edit image" -msgstr "InsÃ©rer/modifier une image" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:493 +msgid "Medium size image width" +msgstr "Largeur de l’image en taille moyenne" +||||||| .r11156 +#: wp-includes/pluggable.php:1408 wp-includes/pluggable.php:1537 +msgid "E-mail : %s" +msgstr "E-mail : %s" +======= +#: wp-includes/class-wp-editor.php:982 +msgctxt "TinyMCE menu" +msgid "View" +msgstr "Voir" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:846 wp-includes/theme-compat/sidebar.php:21 -msgid "Author" -msgstr "Auteur" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:498 +msgid "Medium size image height" +msgstr "Hauteur de l’image en taille moyenne" +||||||| .r11156 +#: wp-includes/pluggable.php:1388 wp-includes/pluggable.php:1398 +#: wp-includes/pluggable.php:1409 wp-includes/pluggable.php:1523 +#: wp-includes/pluggable.php:1530 wp-includes/pluggable.php:1538 +msgid "URL : %s" +msgstr "Adresse : %s" +======= +#: wp-includes/class-wp-editor.php:981 +msgctxt "TinyMCE menu" +msgid "Tools" +msgstr "Outils" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:845 wp-includes/media-template.php:406 -#: wp-includes/media-template.php:585 -msgid "Description" -msgstr "Description" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:503 +msgid "Large size image width" +msgstr "Largeur de l’image en grande taille" +||||||| .r11156 +#: wp-includes/pluggable.php:1411 wp-includes/pluggable.php:1540 +msgid "Comment: " +msgstr "Commentaire :" +======= +#: wp-includes/class-wp-editor.php:980 +msgctxt "TinyMCE menu" +msgid "Edit" +msgstr "Modifier" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:844 -msgid "Encoding" -msgstr "Encodage" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:508 +msgid "Large size image height" +msgstr "Hauteur de l’image en grande taille" +||||||| .r11156 +#: wp-includes/pluggable.php:1412 +msgid "You can see all comments on this post here: " +msgstr "Vous pouvez lire tous les commentaires de cet article ici :" +======= +#: wp-includes/class-wp-editor.php:979 +msgctxt "TinyMCE menu" +msgid "File" +msgstr "Fichier" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:843 -msgid "Keywords" -msgstr "Mots-clÃ©s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1405 +msgid "Enter the destination URL" +msgstr "Saisissez l’adresse de destination" +||||||| .r11156 +#: wp-includes/pluggable.php:1414 +msgid "[%1$s] Comment: \"%2$s\"" +msgstr "[%1$s] Commentaire : Â« %2$s Â»" +======= +#: wp-includes/class-wp-editor.php:978 +msgctxt "TinyMCE menu" +msgid "Insert" +msgstr "InsÃ©rer" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:842 wp-includes/media-template.php:381 -#: wp-includes/media-template.php:560 wp-includes/revision.php:29 -#: wp-includes/script-loader.php:480 -msgid "Title" -msgstr "Titre" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1413 wp-includes/media-template.php:1008 +msgid "Open link in a new window/tab" +msgstr "Ouvrir le lien dans une nouvelle fenÃªtre/un nouvel onglet" +||||||| .r11156 +#: wp-includes/pluggable.php:1387 wp-includes/pluggable.php:1397 +msgid "Website: %1$s (IP: %2$s , %3$s)" +msgstr "Site Web : %1$s (IP : %2$s , %3$s)" +======= +#: wp-includes/class-wp-editor.php:975 +msgid "Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser’s edit menu instead." +msgstr "Votre navigateur ne supporte pas les accÃ¨s direct au presse-papier. Veuillez utiliser les raccourcis clavier ou le menu Ãdition de votre navigateur." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:841 -msgid "Robots" -msgstr "Robots" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1416 +msgid "Or link to existing content" +msgstr "Ou alors, faites un lien vers l’un des contenus de votre site" +||||||| .r11156 +#: wp-includes/pluggable.php:1389 wp-includes/pluggable.php:1399 +msgid "Excerpt: " +msgstr "Extrait :" +======= +#: wp-includes/class-wp-editor.php:974 wp-includes/script-loader.php:395 +#: wp-includes/script-loader.php:474 wp-includes/script-loader.php:482 +#: wp-includes/script-loader.php:586 wp-includes/theme.php:1947 +msgid "The changes you made will be lost if you navigate away from this page." +msgstr "Les modifications que vous avez faites seront perdues si vous changez de page." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:840 -msgid "Document properties" -msgstr "PropriÃ©tÃ©s du document" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1433 +msgid "No search term specified. Showing recent items." +msgstr "Aucun mot n’a Ã©tÃ© donnÃ© pour cette recherche. Voici les recherches prÃ©cÃ©dentes." +||||||| .r11156 +#: wp-includes/pluggable.php:1390 +msgid "You can see all trackbacks on this post here: " +msgstr "Vous pouvez lire tous les rÃ©troliens de cet article ici :" +======= +#: wp-includes/class-wp-editor.php:973 +msgid "Rich Text Area. Press Alt-Shift-H for help" +msgstr "Zone de texte enrichi. Appuyez sur Alt-Shift-H pour obtenir de l'aide" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:837 -msgctxt "Link anchors (TinyMCE)" -msgid "Anchors" -msgstr "Ancres" +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:241 +msgid "Stylesheet is not readable." +msgstr "Impossible de lire la feuille de style." +||||||| .r11156 +#: wp-includes/pluggable.php:1392 +msgid "[%1$s] Trackback: \"%2$s\"" +msgstr "[%1$s] RÃ©trolien : Â« %2$s Â»" +======= +#: wp-includes/class-wp-editor.php:972 +msgid "If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically." +msgstr "Si vous souhaitez utiliser du contenu riche en provenance de Microsoft Word, essayez de dÃ©sactiver cette option. L’Ã©diteur nettoiera automatiquement les textes en provenance de Word." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:836 -msgctxt "Link anchor (TinyMCE)" -msgid "Anchor" -msgstr "Ancre" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:416 +msgid "Image default link type" +msgstr "Type du lien par dÃ©faut vers l’image" +||||||| .r11156 +#: wp-includes/pluggable.php:1400 +msgid "You can see all pingbacks on this post here: " +msgstr "Vous pouvez lire tous les pings de cet article ici :" +======= +#: wp-includes/class-wp-editor.php:972 +msgid "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off." +msgstr "Coller est maintenant en mode texte. Les contenus seront dorÃ©navant collÃ©s en mode texte jusqu‘Ã ce que cette option soit annulÃ©e." +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:835 -msgctxt "Name of link anchor (TinyMCE)" -msgid "Name" -msgstr "Nom" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:431 +msgid "Template" +msgstr "ModÃ¨le" +||||||| .r11156 +#: wp-includes/pluggable.php:1402 +msgid "[%1$s] Pingback: \"%2$s\"" +msgstr "[%1$s] Ping : Â« %2$s Â»" +======= +#. translators: word count +#: wp-includes/class-wp-editor.php:971 +msgid "Words: %s" +msgstr "Mots : %s" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:832 -msgctxt "list style" -msgid "Lower Roman" -msgstr "Chiffres romains minuscules " +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:436 +msgid "Stylesheet" +msgstr "Feuille de style" +||||||| .r11156 +#: wp-includes/pluggable.php:1422 wp-includes/pluggable.php:1546 +msgid "Trash it: %s" +msgstr "Le mettre dans la Corbeille : %s" +======= +#: wp-includes/class-wp-editor.php:968 +msgid "Show invisible characters" +msgstr "Voir les caractÃ¨res invisibles" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:831 -msgctxt "list style" -msgid "Upper Roman" -msgstr "Chiffres romains majuscules" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:441 +msgid "Post Thumbnail" +msgstr "Miniature d’article" +||||||| .r11156 +#: wp-includes/pluggable.php:1424 wp-includes/pluggable.php:1548 +msgid "Delete it: %s" +msgstr "Le supprimer : %s" +======= +#: wp-includes/class-wp-editor.php:967 +msgctxt "editor button" +msgid "Show blocks" +msgstr "Montrer les blocs" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1253 +#: wp-includes/class-wp-xmlrpc-server.php:3997 +#: wp-includes/class-wp-xmlrpc-server.php:4739 +#: wp-includes/class-wp-xmlrpc-server.php:4797 +#: wp-includes/class-wp-xmlrpc-server.php:5071 +#: wp-includes/class-wp-xmlrpc-server.php:5135 +msgid "Invalid post type" +msgstr "Type d’article invalide" +||||||| .r11156 +#: wp-includes/pluggable.php:1425 wp-includes/pluggable.php:1549 +msgid "Spam it: %s" +msgstr "Le marquer comme indÃ©sirable : %s" +======= +#: wp-includes/class-wp-editor.php:966 +msgid "Text color" +msgstr "Couleur du texte" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:830 -msgctxt "list style" -msgid "Upper Alpha" -msgstr "Majuscules alphanumÃ©riques" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1261 +msgid "Sorry, you are not allowed to edit this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +||||||| .r11156 +#: wp-includes/pluggable.php:1522 wp-includes/pluggable.php:1529 +msgid "Website : %1$s (IP: %2$s , %3$s)" +msgstr "Site Web : %1$s (IP: %2$s , %3$s)" +======= +#: wp-includes/class-wp-editor.php:965 +msgid "Background color" +msgstr "Couleur d’arriÃ¨re plan" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:829 -msgctxt "list style" -msgid "Lower Alpha" -msgstr "Minuscules alphanumÃ©riques" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1275 +msgid "Sorry, you are not allowed to create private posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus privÃ©s avec ce type de contenu" +||||||| .r11156 +#: wp-includes/pluggable.php:1524 +msgid "Trackback excerpt: " +msgstr "Extrait du rÃ©trolien :" +======= +#: wp-includes/class-wp-editor.php:963 +msgctxt "TinyMCE" +msgid "Templates" +msgstr "ModÃ¨les" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:828 -msgctxt "list style" -msgid "Lower Greek" -msgstr "Minuscules grecques" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1280 +msgid "Sorry, you are not allowed to publish posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de publier des contenus avec ce type de contenu" +||||||| .r11156 +#: wp-includes/pluggable.php:1531 +msgid "Pingback excerpt: " +msgstr "Extrait du ping :" +======= +#: wp-includes/class-wp-editor.php:962 +msgctxt "TinyMCE" +msgid "Insert template" +msgstr "InsÃ©rer un modÃ¨le" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:827 -msgctxt "list style" -msgid "Disc" -msgstr "Rond" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1289 +msgid "Sorry, you are not allowed to create password protected posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de crÃ©er des contenus protÃ©gÃ©s par mot de passe avec ce type de contenu" +||||||| .r11156 +#: wp-includes/pluggable.php:1544 +msgid "Approve it: %s" +msgstr "L'approuver : %s" +======= +#: wp-includes/class-wp-editor.php:960 +msgctxt "table cell scope attribute" +msgid "Scope" +msgstr "PortÃ©e" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:826 -msgctxt "list style" -msgid "Circle" -msgstr "Cercle" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1294 +#: wp-includes/class-wp-xmlrpc-server.php:4790 +msgid "You are not allowed to create posts as this user." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des contenus sous cet identifiant." +||||||| .r11156 +#: wp-includes/pluggable.php:1551 +msgid "Currently %s comment is waiting for approval. Please visit the moderation panel:" +msgid_plural "Currently %s comments are waiting for approval. Please visit the moderation panel:" +msgstr[0] "En ce moment, %s commentaire attend votre approbation. Veuillez vous rendre sur le panneau de modÃ©ration :" +msgstr[1] "En ce moment, %s commentaires attendent vos approbations. Veuillez vous rendre sur le panneau de modÃ©ration :" +======= +#: wp-includes/class-wp-editor.php:959 +msgid "Cell spacing" +msgstr "Espacement entre les cellules" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:825 -msgctxt "list style" -msgid "Default" -msgstr "Par dÃ©faut" - -#: wp-includes/class-wp-editor.php:824 -msgctxt "list style" -msgid "Square" -msgstr "CarrÃ©" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1299 +#: wp-includes/class-wp-xmlrpc-server.php:4801 +msgid "Invalid author ID." +msgstr "Identifiant utilisateur non valable." +||||||| .r11156 +#: wp-includes/pluggable.php:1555 +msgid "[%1$s] Please moderate: \"%2$s\"" +msgstr "[%1$s] Demande de modÃ©ration pour Â« %2$s Â»" +======= +#: wp-includes/class-wp-editor.php:958 +msgid "Cell padding" +msgstr "Marge intÃ©rieure des cellules" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:823 -msgid "Numbered list" -msgstr "Liste numÃ©rotÃ©e" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1221 +msgid "Sorry, you are not allowed to stick this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de mettre cet article en avant." +||||||| .r11156 +#: wp-includes/pluggable.php:1618 +msgid "Password Lost and Changed for user: %s" +msgstr "Mot de passe oubliÃ© et changÃ© pour l'utilisateur : %s" +======= +#: wp-includes/class-wp-editor.php:957 +msgid "Cell type" +msgstr "Type de cellule" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:822 -msgid "Bulleted list" -msgstr "Liste Ã puces" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1581 +msgid "Sorry, you are not allowed to delete this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +||||||| .r11156 +#: wp-includes/pluggable.php:1622 +msgid "[%s] Password Lost/Changed" +msgstr "[%s] Mot de passe oubliÃ© et changÃ©" +======= +#: wp-includes/class-wp-editor.php:956 +msgid "Row type" +msgstr "Type de ligne" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:820 -msgid "Visual aids" -msgstr "Aides visuelles" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1586 +msgid "The post cannot be deleted." +msgstr "Cet article ne peut pas Ãªtre supprimÃ©." +||||||| .r11156 +#: wp-includes/pluggable.php:1646 wp-includes/pluggable.php:1654 +#: wp-login.php:362 +msgid "Username: %s" +msgstr "Identifiant : %s" +======= +#: wp-includes/class-wp-editor.php:955 +msgid "Column group" +msgstr "Groupe de colonnes" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:819 wp-includes/class-wp-editor.php:1438 -#: wp-includes/functions.php:4667 wp-includes/script-loader.php:236 -#: wp-includes/script-loader.php:317 wp-includes/script-loader.php:398 -msgid "Close" -msgstr "Fermer" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1820 +msgid "You are not allowed to create terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de crÃ©er des termes dans cette taxinomie." +||||||| .r11156 +#: wp-includes/pluggable.php:1649 +msgid "[%s] New User Registration" +msgstr "[%s] Inscription d'un nouvel utilisateur" +======= +#: wp-includes/class-wp-editor.php:954 +msgid "Row group" +msgstr "Groupe de lignes" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:818 wp-includes/class-wp-editor.php:1482 -#: wp-includes/media.php:3000 wp-includes/script-loader.php:397 -#: wp-includes/script-loader.php:455 -msgid "Cancel" -msgstr "Annuler" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1829 +#: wp-includes/class-wp-xmlrpc-server.php:1926 +msgid "The term name cannot be empty." +msgstr "Le nom du terme ne peut Ãªtre vide." +||||||| .r11156 +#: wp-includes/pluggable.php:1655 +msgid "Password: %s" +msgstr "Mot de passe : %s" +======= +#: wp-includes/class-wp-editor.php:952 +msgid "Bottom" +msgstr "Bas" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:817 wp-includes/script-loader.php:454 -msgid "OK" -msgstr "OK" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1859 +msgid "Sorry, your term could not be created. Something wrong happened." +msgstr "DÃ©solÃ©, votre terme n’a pu Ãªtre crÃ©Ã©. Une erreur est survenue." +||||||| .r11156 +#: wp-includes/pluggable.php:1658 +msgid "[%s] Your username and password" +msgstr "[%s] Votre identifiant et mot de passe" +======= +#: wp-includes/class-wp-editor.php:951 +msgid "Middle" +msgstr "Milieu" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:815 -#: wp-includes/js/tinymce/wp-mce-help.php:101 -msgid "Redo" -msgstr "RÃ©tablir" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1907 +msgid "You are not allowed to edit terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de modifier les termes de cette taxinomie." +||||||| .r11156 +#: wp-includes/post-template.php:131 +msgid "Protected: %s" +msgstr "ProtÃ©gÃ© : %s" +======= +#: wp-includes/class-wp-editor.php:950 +msgid "Top" +msgstr "Haut" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:814 -#: wp-includes/js/tinymce/wp-mce-help.php:101 -msgid "Undo" -msgstr "Annuler" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1957 +msgid "Sorry, editing the term failed." +msgstr "DÃ©solÃ©, la modification du terme a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/post-template.php:146 +msgid "Private: %s" +msgstr "PrivÃ© : %s" +======= +#: wp-includes/class-wp-editor.php:949 +msgctxt "vertical table cell alignment" +msgid "V Align" +msgstr "Alignement V" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:813 -#: wp-includes/js/tinymce/wp-mce-help.php:100 -msgid "Select all" -msgstr "SÃ©lectionner tout" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2003 +msgid "You are not allowed to delete terms in this taxonomy." +msgstr "Vous n’avez pas l’autorisation de supprimer les termes de cette taxinomie." +||||||| .r11156 +#: wp-includes/post-template.php:349 +msgid "There is no excerpt because this is a protected post." +msgstr "Il n’y pas d’extrait, car cet article est protÃ©gÃ©." +======= +#: wp-includes/class-wp-editor.php:948 +msgctxt "table cell alignment attribute" +msgid "None" +msgstr "Aucun" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:812 -#: wp-includes/js/tinymce/wp-mce-help.php:99 -msgid "Paste" -msgstr "Coller" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2019 +msgid "Sorry, deleting the term failed." +msgstr "DÃ©solÃ©, la suppression du terme a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/post-template.php:753 +msgid "Next page" +msgstr "Page suivante" +======= +#: wp-includes/class-wp-editor.php:944 +msgctxt "horizontal table cell alignment" +msgid "H Align" +msgstr "Alignement H" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:811 -#: wp-includes/js/tinymce/wp-mce-help.php:99 -msgid "Copy" -msgstr "Copier" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:4002 +msgid "Sorry, you are not allowed to edit this post type." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier ce type de contenu." +||||||| .r11156 +#: wp-includes/post-template.php:754 +msgid "Previous page" +msgstr "Page prÃ©cÃ©dente" +======= +#: wp-includes/class-wp-editor.php:943 wp-includes/media-template.php:608 +msgid "Alignment" +msgstr "Alignement" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:810 -#: wp-includes/js/tinymce/wp-mce-help.php:100 -msgid "Cut" -msgstr "Couper" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1263 +#: wp-includes/class-wp-xmlrpc-server.php:5075 +msgid "The post type may not be changed." +msgstr "Ce type de contenu ne peut pas Ãªtre supprimÃ©." +||||||| .r11156 +#: wp-includes/post-template.php:1139 +msgid "Home" +msgstr "Accueil" +======= +#: wp-includes/class-wp-editor.php:942 wp-includes/media-template.php:396 +#: wp-includes/media-template.php:575 wp-includes/media-template.php:833 +#: wp-includes/media-template.php:898 +msgid "Caption" +msgstr "LÃ©gende" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:808 -msgid "Decrease indent" -msgstr "Diminuer l’indentation" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:918 wp-includes/media-template.php:1247 +msgid "Preview" +msgstr "AperÃ§u" +||||||| .r11156 +#: wp-includes/post-template.php:1653 +msgctxt "revision date format" +msgid "j F, Y @ G:i" +msgstr "j F Y \\Ã G \\h i \\m" +======= +#: wp-includes/class-wp-editor.php:941 wp-includes/media-template.php:961 +msgid "Width" +msgstr "Largeur" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:807 -msgid "Increase indent" -msgstr "Augmenter l’indentation" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1737 +msgid "Sorry, you are not allowed to edit posts in this post type" +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier des entrÃ©es dans ce type de contenu" +||||||| .r11156 +#: wp-includes/post-template.php:1708 +msgid "%1$s [Autosave]" +msgstr "%1$s [Sauvegarde automatique]" +======= +#: wp-includes/class-wp-editor.php:940 wp-includes/media-template.php:961 +msgid "Height" +msgstr "Hauteur" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:806 -msgid "Justify" -msgstr "Justifier" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:113 +#: wp-includes/class-wp-image-editor-imagick.php:140 +msgid "File is not an image." +msgstr "Le fichier n’est pas une image." +||||||| .r11156 +#: wp-includes/post-template.php:1709 +msgid "%1$s [Current Revision]" +msgstr "%1$s [Version actuelle]" +======= +#: wp-includes/class-wp-editor.php:938 +msgid "Split table cell" +msgstr "Diviser une cellule du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:805 -msgid "Align left" -msgstr "Aligner Ã gauche" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:117 +msgid "Could not read image size." +msgstr "Impossible de lire la taille de l’image." +||||||| .r11156 +#: wp-includes/post.php:83 +msgid "Revision" +msgstr "RÃ©vision" +======= +#: wp-includes/class-wp-editor.php:937 +msgid "Merge table cells" +msgstr "Fusionner les cellules du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:804 -msgid "Align right" -msgstr "Aligner Ã droite" +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:237 +msgid "ERROR: The themes directory is either empty or doesn’t exist. Please check your installation." +msgstr "ERREUR : le rÃ©pertoire des thÃ¨mes est soit vide, ou n’existe pas. Veuillez vÃ©rifier votre installation." +||||||| .r11156 +#: wp-includes/post.php:112 +msgctxt "post" +msgid "Published" +msgstr "PubliÃ©" +======= +#: wp-includes/class-wp-editor.php:936 +msgid "Copy table row" +msgstr "Copier la ligne du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:803 -msgid "Align center" -msgstr "Centrer" +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:290 wp-includes/class-wp-theme.php:294 +msgid "The \"%s\" theme is not a valid parent theme." +msgstr "Le thÃ¨me « %s » n’est un thÃ¨me parent valide." +||||||| .r11156 +#: wp-includes/post.php:115 +msgid "Published (%s)" +msgid_plural "Published (%s)" +msgstr[0] "PubliÃ© (%s)" +msgstr[1] "PubliÃ©s (%s)" +======= +#: wp-includes/class-wp-editor.php:935 +msgid "Cut table row" +msgstr "Couper la ligne du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:801 -msgid "Font Sizes" -msgstr "Tailles de la police" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:250 +msgid "XML-RPC services are disabled on this site." +msgstr "Les services XML-RPC sont dÃ©sactivÃ©s sur ce site." +||||||| .r11156 +#: wp-includes/post.php:119 +msgctxt "post" +msgid "Scheduled" +msgstr "PlanifiÃ©" +======= +#: wp-includes/class-wp-editor.php:934 +msgid "Delete column" +msgstr "Supprimer la colonne" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:800 -msgid "Font Family" -msgstr "Famille de polices" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:257 +msgid "Incorrect username or password." +msgstr "Identifiant ou mot de passe incorrect." +||||||| .r11156 +#: wp-includes/post.php:122 +msgid "Scheduled (%s)" +msgid_plural "Scheduled (%s)" +msgstr[0] "PlanifiÃ© (%s)" +msgstr[1] "PlanifiÃ©s (%s)" +======= +#: wp-includes/class-wp-editor.php:933 +msgid "Delete row" +msgstr "Supprimer la ligne" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:799 -msgid "Source code" -msgstr "Code source" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:421 +msgid "Image default size" +msgstr "Taille de l’imageÂ par dÃ©faut" +||||||| .r11156 +#: wp-includes/post.php:126 +msgctxt "post" +msgid "Draft" +msgstr "Brouillon" +======= +#: wp-includes/class-wp-editor.php:932 +msgid "Paste table row after" +msgstr "Coller la ligne du tableau aprÃ¨s" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:798 -msgctxt "editor button" -msgid "Code" -msgstr "Code" - -#: wp-includes/class-wp-editor.php:797 -#: wp-includes/js/tinymce/wp-mce-help.php:102 -msgid "Italic" -msgstr "Italique" - -#: wp-includes/class-wp-editor.php:796 -#: wp-includes/js/tinymce/wp-mce-help.php:102 -msgid "Bold" -msgstr "Gras" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:426 +msgid "Image default align" +msgstr "Alignement par dÃ©faut de l’image" +||||||| .r11156 +#: wp-includes/post.php:129 +msgid "Draft (%s)" +msgid_plural "Drafts (%s)" +msgstr[0] "Brouillon (%s)" +msgstr[1] "Brouillons (%s)" +======= +#: wp-includes/class-wp-editor.php:931 +msgid "Paste table row before" +msgstr "Coller la ligne du tableau avant" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:795 -msgid "Clear formatting" -msgstr "Nettoyer le formatage " +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1360 +#: wp-includes/class-wp-xmlrpc-server.php:1384 +msgid "Sorry, one of the given taxonomies is not supported by the post type." +msgstr "DÃ©solÃ©, l’une des taxinomies donnÃ©es n’est pas reconnue par ce type de contenu." +||||||| .r11156 +#: wp-includes/post.php:133 +msgctxt "post" +msgid "Pending" +msgstr "En attente" +======= +#: wp-includes/class-wp-editor.php:930 +msgid "Insert column after" +msgstr "InsÃ©rer une colonne aprÃ¨s" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:794 -msgid "Superscript" -msgstr "Exposant" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1363 +#: wp-includes/class-wp-xmlrpc-server.php:1387 +msgid "Sorry, you are not allowed to assign a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner un terme Ã l’une des taxinomies indiquÃ©es." +||||||| .r11156 +#: wp-includes/post.php:136 +msgid "Pending (%s)" +msgid_plural "Pending (%s)" +msgstr[0] "En attente de relecture (%s)" +msgstr[1] "En attente de relecture (%s)" +======= +#: wp-includes/class-wp-editor.php:929 +msgid "Insert column before" +msgstr "InsÃ©rer une colonne avant" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:793 -msgid "Subscript" -msgstr "Indice" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1409 +msgid "Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead." +msgstr "Un nom de terme est ambigu pour cette taxinomie hiÃ©rarchisÃ©e. Veuillez utiliser l’identifiant du terme Ã la place." +||||||| .r11156 +#: wp-includes/post.php:140 +msgctxt "post" +msgid "Private" +msgstr "PrivÃ©" +======= +#: wp-includes/class-wp-editor.php:928 +msgid "Insert row after" +msgstr "InsÃ©rer une ligne aprÃ¨s" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:792 -#: wp-includes/js/tinymce/wp-mce-help.php:119 -msgid "Strikethrough" -msgstr "Barrer" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1416 +msgid "Sorry, you are not allowed to add a term to one of the given taxonomies." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’ajouter un terme Ã l’une des taxinomies indiquÃ©es." +||||||| .r11156 +#: wp-includes/post.php:143 +msgid "Private (%s)" +msgid_plural "Private (%s)" +msgstr[0] "PrivÃ© (%s)" +msgstr[1] "PrivÃ©s (%s)" +======= +#: wp-includes/class-wp-editor.php:927 +msgid "Insert row before" +msgstr "InsÃ©rer une ligne avant" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:791 -#: wp-includes/js/tinymce/wp-mce-help.php:103 -msgid "Underline" -msgstr "Souligner" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1731 +msgid "The post type specified is not valid" +msgstr "Le type de contenu spÃ©cifiÃ© n’est pas valable" +||||||| .r11156 +#: wp-includes/post.php:147 +msgctxt "post" +msgid "Trash" +msgstr "Corbeille" +======= +#: wp-includes/class-wp-editor.php:925 +msgctxt "table footer" +msgid "Footer" +msgstr "Pied de page" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:790 -msgctxt "HTML elements" -msgid "Inline" -msgstr "Inline" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1833 +msgid "This taxonomy is not hierarchical." +msgstr "Cette taxinomie n’est pas hiÃ©rarchique." +||||||| .r11156 +#: wp-includes/post.php:150 +msgid "Trash (%s)" +msgid_plural "Trash (%s)" +msgstr[0] "Corbeille (%s)" +msgstr[1] "Corbeille (%s)" +======= +#: wp-includes/class-wp-editor.php:924 +msgctxt "table body" +msgid "Body" +msgstr "Corps" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:788 -msgctxt "HTML tag" -msgid "Address" -msgstr "Adresse" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1842 +#: wp-includes/class-wp-xmlrpc-server.php:1940 wp-includes/taxonomy.php:2913 +#: wp-includes/taxonomy.php:3482 +msgid "Parent term does not exist." +msgstr "Le terme parent n’existe pas." +||||||| .r11156 +#: wp-includes/post.php:3142 +msgid "Content, title, and excerpt are empty." +msgstr "Le contenu de l’article, le titre et l’extrait sont vides." +======= +#: wp-includes/class-wp-editor.php:923 +msgctxt "table header" +msgid "Header" +msgstr "En-tÃªte" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:787 -msgctxt "HTML tag" -msgid "Pre" -msgstr "Pre" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1931 +msgid "This taxonomy is not hierarchical so you can't set a parent." +msgstr "Cette taxinomie n’est pas hiÃ©rarchisÃ©e, donc vous ne pouvez crÃ©er de parent." +||||||| .r11156 +#: wp-includes/post.php:3343 +msgid "Could not update post in the database" +msgstr "Impossible de mettre Ã jour l’article dans la base de donnÃ©es" +======= +#: wp-includes/class-wp-editor.php:922 +msgid "Header cell" +msgstr "Cellule d’en-tÃªte" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:786 -msgctxt "HTML tag" -msgid "Div" -msgstr "Div" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2074 +#: wp-includes/class-wp-xmlrpc-server.php:2132 +#: wp-includes/class-wp-xmlrpc-server.php:2227 +msgid "You are not allowed to assign terms in this taxonomy." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation d’assigner des termes Ã cette taxinomie." +||||||| .r11156 +#: wp-includes/post.php:3358 +msgid "Could not insert post into the database" +msgstr "Impossible d’insÃ©rer l’article dans la base de donnÃ©es" +======= +#: wp-includes/class-wp-editor.php:921 +msgctxt "table cell" +msgid "Cell" +msgstr "Cellule" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:785 -msgid "Blockquote" -msgstr "Bloc de citation" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2357 +msgid "Sorry, you cannot edit users." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier les utilisateurs." +||||||| .r11156 +#: wp-includes/post.php:3422 +msgid "The page template is invalid." +msgstr "Le modÃ¨le de page est invalide." +======= +#: wp-includes/class-wp-editor.php:920 +msgctxt "table columns" +msgid "Cols" +msgstr "Colonnes" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:784 -msgid "Paragraph" -msgstr "Paragraphe" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2415 +msgid "Sorry, you cannot list users." +msgstr "DÃ©solÃ©, vous ne pouvez pas lister les utilisateurs." +||||||| .r11156 +#: wp-includes/revision.php:254 +msgid "Cannot create a revision of a revision" +msgstr "Impossible de crÃ©er une version d’une version." +======= +#: wp-includes/class-wp-editor.php:919 +msgctxt "table column" +msgid "Column" +msgstr "Colonne" +>>>>>>> .r12027 -#. translators: block tags -#: wp-includes/class-wp-editor.php:783 -msgctxt "TinyMCE" -msgid "Blocks" -msgstr "Blocs" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2431 +msgid "The role specified is not valid" +msgstr "Le rÃ´le spÃ©cifiÃ© n’est pas valable" +||||||| .r11156 +#: wp-includes/revision.php:522 +msgid "You do not have permission to preview drafts." +msgstr "Vous n’avez pas l’autorisation de prÃ©visualiser les brouillons" +======= +#: wp-includes/class-wp-editor.php:918 +msgid "Rows" +msgstr "Lignes" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:780 -#: wp-includes/js/tinymce/wp-mce-help.php:115 -msgid "Heading 6" -msgstr "Titre 6" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2488 +#: wp-includes/class-wp-xmlrpc-server.php:2534 +msgid "Sorry, you cannot edit your profile." +msgstr "DÃ©solÃ©, vous ne pouvez pas modifier votre profil." +||||||| .r11156 +#: wp-includes/user.php:1674 +msgid "Cannot create a user with an empty login name." +msgstr "Impossible de crÃ©er un utilisateur avec un identifiant vide." +======= +#: wp-includes/class-wp-editor.php:917 +msgid "Row" +msgstr "Ligne" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:779 -#: wp-includes/js/tinymce/wp-mce-help.php:115 -msgid "Heading 5" -msgstr "Titre 5" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2568 +msgid "Sorry, the user cannot be updated." +msgstr "DÃ©solÃ©, cet utilisateur ne peut pas Ãªtre mis Ã jour." +||||||| .r11156 +#: wp-includes/user.php:1995 +msgid "AIM" +msgstr "AIM" +======= +#: wp-includes/class-wp-editor.php:915 +msgid "Border color" +msgstr "Couleur de bordure" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:778 -#: wp-includes/js/tinymce/wp-mce-help.php:114 -msgid "Heading 4" -msgstr "Titre 4" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:180 +#: wp-includes/class-wp-image-editor-gd.php:205 +msgid "Image resize failed." +msgstr "Le redimensionnement de l’image a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/user.php:1996 +msgid "Yahoo IM" +msgstr "Yahoo Messenger" +======= +#: wp-includes/class-wp-editor.php:914 +msgid "Table cell properties" +msgstr "PropriÃ©tÃ©s de la cellule du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:777 -#: wp-includes/js/tinymce/wp-mce-help.php:114 -msgid "Heading 3" -msgstr "Titre 3" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:311 +msgid "Image crop failed." +msgstr "Le recadrage de l’image a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/user.php:1997 +msgid "Jabber / Google Talk" +msgstr "Jabber / Google Talk" +======= +#: wp-includes/class-wp-editor.php:913 +msgid "Table row properties" +msgstr "PropriÃ©tÃ©s de la ligne du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:776 -#: wp-includes/js/tinymce/wp-mce-help.php:113 -msgid "Heading 2" -msgstr "Titre 2" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:338 +msgid "Image rotate failed." +msgstr "La rotation de l’image a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/default-widgets.php:1036 wp-includes/rss.php:899 +msgid "An error has occurred, which probably means the feed is down. Try again later." +msgstr "Une erreur est survenue, le flux est probablement indisponible. Veuillez rÃ©essayer plus tard." +======= +#: wp-includes/class-wp-editor.php:912 +msgid "Table properties" +msgstr "PropriÃ©tÃ©s du tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:775 -#: wp-includes/js/tinymce/wp-mce-help.php:113 -msgid "Heading 1" -msgstr "Titre 1" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:368 +msgid "Image flip failed." +msgstr "Le retournement de l’image a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/script-loader.php:82 +msgid "" +"You are about to permanently delete the selected items.\n" +" 'Cancel' to stop, 'OK' to delete." +msgstr "" +"Vous Ãªtes sur le point de supprimer dÃ©finitivement les Ã©lÃ©ments sÃ©lectionnÃ©s.\n" +" Â« Annuler Â» pour abandonner, Â« OK Â» pour les supprimer." +======= +#: wp-includes/class-wp-editor.php:911 +msgid "Delete table" +msgstr "Supprimer le tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:774 -msgctxt "TinyMCE" -msgid "Headings" -msgstr "En-tÃªtes" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1339 +#: wp-includes/class-wp-xmlrpc-server.php:3828 +#: wp-includes/class-wp-xmlrpc-server.php:4945 +#: wp-includes/class-wp-xmlrpc-server.php:5301 +msgid "Invalid attachment ID." +msgstr "Identifiant du fichier invalide." +||||||| .r11156 +#: wp-includes/script-loader.php:89 +msgid "Close all open tags" +msgstr "Fermer toutes les balises ouvertes" +======= +#: wp-includes/class-wp-editor.php:910 +msgid "Insert table" +msgstr "InsÃ©rer un tableau" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:772 -msgctxt "TinyMCE" -msgid "Formats" -msgstr "Formats" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1517 +msgid "There is a revision of this post that is more recent." +msgstr "Ce contenu a dÃ©jÃ une rÃ©vision plus rÃ©cente." +||||||| .r11156 +#: wp-includes/script-loader.php:90 +msgid "close tags" +msgstr "fermer les balises" +======= +#: wp-includes/class-wp-editor.php:907 +msgid "Add to Dictionary" +msgstr "Ajouter au Dictionnaire" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:771 -msgid "New document" -msgstr "Nouveau document" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:406 +msgid "Login Address (URL)" +msgstr "Adresse de connexion (URL)" +||||||| .r11156 +#: wp-includes/script-loader.php:91 +msgid "Enter the URL" +msgstr "Saisissez l’adresse" +======= +#: wp-includes/class-wp-editor.php:906 +msgctxt "spellcheck" +msgid "Ignore" +msgstr "Ignorer" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:176 wp-includes/class-wp-editor.php:1259 -msgctxt "Name for the Text editor tab (formerly HTML)" -msgid "Text" -msgstr "Texte" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:620 +msgid "Insufficient arguments passed to this XML-RPC method." +msgstr "Arguments insuffisants passÃ©s Ã cette mÃ©thode XML-RPC." +||||||| .r11156 +#: wp-includes/script-loader.php:92 +msgid "Enter the URL of the image" +msgstr "Saisissez l’adresse de l’image" +======= +#: wp-includes/class-wp-editor.php:905 +msgctxt "spellcheck" +msgid "Ignore all" +msgstr "Tout ignorer" +>>>>>>> .r12027 -#: wp-includes/class-wp-editor.php:175 wp-includes/class-wp-editor.php:1258 -msgid "Visual" -msgstr "Visuel" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:1213 +msgid "Sorry, you cannot stick a private post." +msgstr "DÃ©solÃ©, vous ne pouvez pas mettre en avant un article privÃ©." +||||||| .r11156 +#: wp-includes/script-loader.php:93 +msgid "Enter a description of the image" +msgstr "Saisissez une description pour l’image" +======= +#: wp-includes/class-wp-editor.php:904 +msgctxt "spellcheck" +msgid "Finish" +msgstr "Terminer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:978 -msgid "Shift-click to edit this widget." -msgstr "Faites Shift+clic pour modifier ce widget." +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:97 +#: wp-includes/class-wp-image-editor-imagick.php:130 +msgid "File doesn’t exist?" +msgstr "Le fichier n’existe pas ?" +||||||| .r11156 +#: wp-includes/script-loader.php:108 wp-includes/script-loader.php:420 +msgid "You do not have permission to do that." +msgstr "Vous n’avez pas l’autorisation d’effectuer cela." +======= +#: wp-includes/class-wp-editor.php:903 +#: wp-includes/js/tinymce/wp-mce-help.php:117 +msgid "Check Spelling" +msgstr "VÃ©rifier l’orthographe" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:669 -msgid "Search widgets…" -msgstr "Rechercher de widgets…" +<<<<<<< .mine +#: wp-includes/class-wp-image-editor-gd.php:406 +#: wp-includes/class-wp-image-editor-gd.php:414 +#: wp-includes/class-wp-image-editor-gd.php:418 +#: wp-includes/class-wp-image-editor-gd.php:421 +msgid "Image Editor Save Failed" +msgstr "L’enregistrement de l’Ã©diteur d’images a Ã©chouÃ©." +||||||| .r11156 +#: wp-includes/script-loader.php:109 wp-includes/script-loader.php:421 +msgid "An unidentified error has occurred." +msgstr "Une erreur non identifiÃ©e est survenue." +======= +#: wp-includes/class-wp-editor.php:902 +msgid "Match case" +msgstr "Respecter la casse" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:668 -msgid "Search Widgets" -msgstr "Rechercher des widgets" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:411 +msgid "The URL to the admin area" +msgstr "L’adresse web de la zone d’administration" +||||||| .r11156 +#: wp-includes/script-loader.php:225 +msgid "Next >" +msgstr "Suiv. >" +======= +#: wp-includes/class-wp-editor.php:901 +msgctxt "find/replace" +msgid "Replace all" +msgstr "Tout remplacer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:638 -msgid "Widget moved down" -msgstr "Widget dÃ©placÃ© vers le bas" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:396 +msgid "WordPress Address (URL)" +msgstr "Adresse web de WordPress (URL)" +||||||| .r11156 +#: wp-includes/script-loader.php:226 +msgid "< Prev" +msgstr "< PrÃ©c." +======= +#: wp-includes/class-wp-editor.php:900 +msgctxt "find/replace" +msgid "Find" +msgstr "Chercher" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:637 -msgid "Widget moved up" -msgstr "Widget dÃ©placÃ© vers le haut" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:401 +msgid "Site Address (URL)" +msgstr "Adresse web du site (URL)" +||||||| .r11156 +#: wp-includes/script-loader.php:227 +msgid "Image" +msgstr "Image" +======= +#: wp-includes/class-wp-editor.php:899 +msgctxt "find/replace" +msgid "Replace with" +msgstr "Remplacer par" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:636 -#: wp-includes/script-loader.php:565 -msgid "An error has occurred. Please reload the page and try again." -msgstr "Une erreur est survenue. Veuillez recharger la page et rÃ©essayer." +<<<<<<< .mine +#: wp-includes/class-wp-theme.php:231 +msgid "The theme directory \"%s\" does not exist." +msgstr "Le rÃ©pertoire du thÃ¨me « %s » n’existe pas." +||||||| .r11156 +#: wp-includes/script-loader.php:228 +msgid "of" +msgstr "sur" +======= +#: wp-includes/class-wp-editor.php:898 +msgid "Find and replace" +msgstr "Chercher et remplacer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:635 -msgid "Trash widget by moving it to the inactive widgets sidebar." -msgstr "Mettez le widget Ã la Corbeille en le dÃ©plaÃ§ant vers la barre latÃ©rale inactive." +<<<<<<< .mine +#: wp-includes/class-wp-image-editor.php:286 +msgid "Attempted to set image quality outside of the range [1,100]." +msgstr "Tentative de mise en place d’une qualitÃ© d’image en dehors de l’intervalle [1100]." +||||||| .r11156 +#: wp-includes/script-loader.php:230 +msgid "This feature requires inline frames. You have iframes disabled or your browser does not support them." +msgstr "Cette fonctionnalitÃ© requiert des iframes. Les iframes sont dÃ©sactivÃ©es sur votre navigateur, ou alors il ne les accepte pas." +======= +#: wp-includes/class-wp-editor.php:897 +msgctxt "find/replace" +msgid "Whole words" +msgstr "Mots entiers" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:633 -msgid "Save and preview changes before publishing them." -msgstr "Enregistrer les modifications et les prÃ©visualiser avant de les publier" +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2362 wp-includes/user.php:2134 +#: wp-includes/user.php:2140 +msgid "Invalid user ID." +msgstr "Identifiant utilisateur non valide." +||||||| .r11156 +#: wp-includes/script-loader.php:240 +msgid "You have attempted to queue too many files." +msgstr "Vous essayez d’envoyer trop de fichiers Ã la fois." +======= +#. translators: previous +#: wp-includes/class-wp-editor.php:896 +msgctxt "find/replace" +msgid "Prev" +msgstr "PrÃ©c." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:632 wp-includes/media.php:3039 -msgid "Apply" -msgstr "Appliquer" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1002 +msgctxt "table cell scope attribute" +msgid "Scope" +msgstr "PortÃ©e" +||||||| .r11156 +#: wp-includes/script-loader.php:242 +msgid "This file is empty. Please try another." +msgstr "Le fichier est vide. Merci d’en essayer un autre." +======= +#: wp-includes/class-wp-editor.php:894 +msgctxt "find/replace" +msgid "Next" +msgstr "Suivant" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:609 -msgctxt "Move widget" -msgid "Move" -msgstr "DÃ©placer" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:961 +msgctxt "table column" +msgid "Column" +msgstr "Colonne" +||||||| .r11156 +#: wp-includes/script-loader.php:243 +msgid "This file type is not allowed. Please try another." +msgstr "Ce type de fichier n’est pas autorisÃ©. Merci d’en essayer un autre." +======= +#: wp-includes/class-wp-editor.php:893 +msgctxt "find/replace" +msgid "Replace" +msgstr "Remplacer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:608 -msgid "Select an area to move this widget into:" -msgstr "SÃ©lectionnez une zone vers laquelle dÃ©placeer ce widget :" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:832 +msgctxt "HTML elements" +msgid "Inline" +msgstr "Inline" +||||||| .r11156 +#: wp-includes/script-loader.php:247 +msgid "An error occurred in the upload. Please try again later." +msgstr "Une erreur est survenue lors de l’envoi. Veuillez rÃ©essayer plus tard." +======= +#: wp-includes/class-wp-editor.php:892 +msgid "Could not find the specified string." +msgstr "Impossible de trouver la chaÃ®ne spÃ©cifiÃ©e." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:602 -msgid "Move up" -msgstr "Monter" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:935 +msgctxt "find/replace" +msgid "Replace" +msgstr "Remplacer" +||||||| .r11156 +#: wp-includes/script-loader.php:248 +msgid "There was a configuration error. Please contact the server administrator." +msgstr "Il y a une erreur de configuration. Veuillez contacter l’administrateur de votre serveur." +======= +#: wp-includes/class-wp-editor.php:889 +msgid "No color" +msgstr "Aucune couleur" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:601 -msgid "Move down" -msgstr "Descendre" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1020 +msgctxt "TinyMCE menu" +msgid "Insert" +msgstr "InsÃ©rer" +||||||| .r11156 +#: wp-includes/script-loader.php:249 +msgid "You may only upload 1 file." +msgstr "Vous pouvez seulement envoyer 1 fichier." +======= +#: wp-includes/class-wp-editor.php:888 +msgctxt "label for custom color" +msgid "Custom..." +msgstr "PersonnalisÃ©e..." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:600 -msgid "Move to another area…" -msgstr "DÃ©placer vers une autre zone…" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1021 +msgctxt "TinyMCE menu" +msgid "File" +msgstr "Fichier" +||||||| .r11156 +#: wp-includes/script-loader.php:250 +msgid "HTTP error." +msgstr "Erreur HTTP." +======= +#: wp-includes/class-wp-editor.php:887 +msgid "Custom color" +msgstr "Couleur personnalisÃ©e" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-widgets.php:346 -msgid "Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars)." -msgstr "Les widgets sont des sections de contenu indÃ©pendants qui peuvent Ãªtre placÃ©s dans les zones Ã widgets prÃ©vues dans votre thÃ¨me (gÃ©nÃ©ralement, les barres latÃ©rales)." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:864 wp-includes/script-loader.php:112 +msgid "Bulleted list" +msgstr "Liste Ã puces" +||||||| .r11156 +#: wp-includes/script-loader.php:251 +msgid "Upload failed." +msgstr "L’envoi a Ã©chouÃ©." +======= +#: wp-includes/class-wp-editor.php:886 +msgid "Color" +msgstr "Couleur" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-section.php:389 -#: wp-includes/class-wp-customize-section.php:390 -msgid "Search installed themes..." -msgstr "Chercher parmi les thÃ¨mes installÃ©s..." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:866 +msgctxt "list style" +msgid "Square" +msgstr "CarrÃ©" +||||||| .r11156 +#: wp-includes/script-loader.php:254 +msgid "IO error." +msgstr "Erreur I/O (EntrÃ©es-Sorties)." +======= +#: wp-includes/class-wp-editor.php:884 +#: wp-includes/js/tinymce/wp-mce-help.php:121 +msgid "Remove link" +msgstr "Enlever le lien" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-section.php:363 -msgctxt "theme" -msgid "Change" -msgstr "Changer" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:868 +msgctxt "list style" +msgid "Circle" +msgstr "Cercle" +||||||| .r11156 +#: wp-includes/script-loader.php:255 +msgid "Security error." +msgstr "Erreur de sÃ©curitÃ©." +======= +#: wp-includes/class-wp-editor.php:883 wp-includes/class-wp-editor.php:1437 +#: wp-includes/js/tinymce/wp-mce-help.php:103 +#: wp-includes/js/tinymce/wp-mce-help.php:120 wp-includes/script-loader.php:366 +msgid "Insert/edit link" +msgstr "InsÃ©rer/modifier un lien" +>>>>>>> .r12027 -#. translators: %s: theme name -#: wp-includes/class-wp-customize-section.php:359 -#: wp-includes/class-wp-customize-section.php:378 -msgid "Previewing theme %s" -msgstr "PrÃ©visualisation du thÃ¨me %s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:869 +msgctxt "list style" +msgid "Disc" +msgstr "Rond" +||||||| .r11156 +#: wp-includes/script-loader.php:257 +msgid "Upload stopped." +msgstr "L’envoi est stoppÃ©." +======= +#: wp-includes/class-wp-editor.php:882 +msgid "Restore last draft" +msgstr "RÃ©tablir le dernier brouillon" +>>>>>>> .r12027 -#. translators: %s: theme name -#: wp-includes/class-wp-customize-section.php:356 -#: wp-includes/class-wp-customize-section.php:375 -msgid "Active theme %s" -msgstr "Theme actuel %s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1024 +msgctxt "TinyMCE menu" +msgid "View" +msgstr "Voir" +||||||| .r11156 +#: wp-includes/script-loader.php:259 +msgid "Crunching…" +msgstr "En cours de traitement…" +======= +#: wp-includes/class-wp-editor.php:881 +msgid "Horizontal space" +msgstr "Espace horizontal" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-section.php:308 -msgid "Press return or enter to expand" -msgstr "Appuyez sur Envoi ou Retour pour ouvrir" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1023 +msgctxt "TinyMCE menu" +msgid "Tools" +msgstr "Outils" +||||||| .r11156 +#: wp-includes/script-loader.php:260 +msgid "moved to the trash." +msgstr "dÃ©placÃ© dans la corbeille." +======= +#: wp-includes/class-wp-editor.php:880 +msgid "Horizontal line" +msgstr "Ligne horizontale" +>>>>>>> .r12027 -#. translators: %s is the site/panel title in the Customizer -#: wp-includes/class-wp-customize-panel.php:322 -msgid "You are customizing %s" -msgstr "Vous personnalisez %s" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:877 +msgctxt "Name of link anchor (TinyMCE)" +msgid "Name" +msgstr "Nom" +||||||| .r11156 +#: wp-includes/script-loader.php:343 +msgctxt "password strength" +msgid "Medium" +msgstr "Moyenne" +======= +#: wp-includes/class-wp-editor.php:879 wp-includes/script-loader.php:318 +msgid "Fullscreen" +msgstr "Plein Ã©cran" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-panel.php:301 -msgid "Press return or enter to open this panel" -msgstr "Appuyer sur EntrÃ©e pour ouvrir ce panneau" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:878 +msgctxt "Link anchor (TinyMCE)" +msgid "Anchor" +msgstr "Ancre" +||||||| .r11156 +#: wp-includes/script-loader.php:440 +msgid "Publish on:" +msgstr "PubliÃ© le :" +======= +#: wp-includes/class-wp-editor.php:878 wp-includes/class-wp-editor.php:1247 +msgid "Save" +msgstr "Enregistrer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1488 -msgid "Posts page" -msgstr "Page des articles" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:879 +msgctxt "Link anchors (TinyMCE)" +msgid "Anchors" +msgstr "Ancres" +||||||| .r11156 +#: wp-includes/script-loader.php:441 +msgid "Schedule for:" +msgstr "Planifier pour :" +======= +#: wp-includes/class-wp-editor.php:877 +msgid "Print" +msgstr "Imprimer" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1476 -msgid "Front page" -msgstr "Page d’accueil" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1025 +msgctxt "TinyMCE menu" +msgid "Table" +msgstr "Tableau" +||||||| .r11156 +#: wp-includes/script-loader.php:442 +msgid "Published on:" +msgstr "PubliÃ© le :" +======= +#: wp-includes/class-wp-editor.php:876 +msgid "Preview" +msgstr "AperÃ§u" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1465 -msgid "A static page" -msgstr "Une page statique" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:948 +msgctxt "spellcheck" +msgid "Ignore" +msgstr "Ignorer" +||||||| .r11156 +#: wp-includes/script-loader.php:445 +msgid "Show more comments" +msgstr "Afficher plus de commentaires" +======= +#: wp-includes/class-wp-editor.php:875 +msgid "Paste as text" +msgstr "Coller en texte" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1464 -msgid "Your latest posts" -msgstr "Les derniers articles" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:962 +msgctxt "table columns" +msgid "Cols" +msgstr "Colonnes" +||||||| .r11156 +#: wp-includes/script-loader.php:446 +msgid "No more comments found." +msgstr "Il n’y a pas d’autres commentaires." +======= +#: wp-includes/class-wp-editor.php:874 +msgid "Page break" +msgstr "Saut de page" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1460 -msgid "Front page displays" -msgstr "La page d’accueil affiche" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:965 +msgctxt "table header" +msgid "Header" +msgstr "En-tÃªte" +||||||| .r11156 +#: wp-includes/script-loader.php:455 +msgid "Password Protected" +msgstr "ProtÃ©gÃ© par un mot de passe" +======= +#: wp-includes/class-wp-editor.php:873 +msgid "Nonbreaking space" +msgstr "Espace insÃ©cable" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1449 -msgid "Your theme supports a static front page." -msgstr "Le thÃ¨me actuel accepte les pages statiques." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:966 +msgctxt "table body" +msgid "Body" +msgstr "Corps" +||||||| .r11156 +#: wp-includes/script-loader.php:470 +msgid "Submitted on:" +msgstr "EnvoyÃ© le :" +======= +#: wp-includes/class-wp-editor.php:872 +msgid "Emoticons" +msgstr "ÃmoticÃ´nes" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1446 -msgid "Static Front Page" -msgstr "Page d’accueil statique" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:967 +msgctxt "table footer" +msgid "Footer" +msgstr "Pied de page" +||||||| .r11156 +#: wp-includes/script-loader.php:481 wp-includes/script-loader.php:489 +msgid "Error while saving the changes." +msgstr "Erreur lors de la sauvegarde des modifications." +======= +#: wp-includes/class-wp-editor.php:871 +msgctxt "editor button" +msgid "Left to right" +msgstr "Gauche Ã droite" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1414 -msgid "You can edit your menu content on the Menus screen in the Appearance section." -msgstr "Vous pouvez modifier le contenu de votre menu par le biais de l’Ã©cran Menus, dans la section Apparence." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1009 +msgctxt "editor button" +msgid "Show blocks" +msgstr "Montrer les blocs" +||||||| .r11156 +#: wp-includes/script-loader.php:482 +msgid "Remove From Bulk Edit" +msgstr "Enlever des modifications groupÃ©es" +======= +#: wp-includes/class-wp-editor.php:870 +msgctxt "editor button" +msgid "Right to left" +msgstr "Droite Ã gauche (RTL)" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1411 -msgid "Navigation" -msgstr "Navigation" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:913 +msgctxt "editor button" +msgid "Left to right" +msgstr "Gauche Ã droite" +||||||| .r11156 +#: wp-includes/script-loader.php:494 +msgid "Plugin Information:" +msgstr "Informations sur l’extension :" +======= +#: wp-includes/class-wp-editor.php:869 +msgid "Special character" +msgstr "CaractÃ¨re spÃ©cial" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1407 -msgid "Your theme supports %s menu. Select which menu appears in each location." -msgid_plural "Your theme supports %s menus. Select which menu appears in each location." -msgstr[0] "Votre thÃ¨me peut utiliser %s menu. SÃ©lectionnez le menu qui devra apparaÃ®tre dans l’emplacement." -msgstr[1] "Votre thÃ¨me peut utiliser %s menus. SÃ©lectionnez les menu qui devront apparaÃ®tre dans chaque emplacement." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:936 +msgctxt "find/replace" +msgid "Next" +msgstr "Suivant" +||||||| .r11156 +#: wp-includes/script-loader.php:529 +msgid "Saving..." +msgstr "Enregistrement..." +======= +#: wp-includes/class-wp-editor.php:866 +msgid "Embed" +msgstr "IntÃ©gration" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1405 -msgid "Your theme supports one menu. Select which menu you would like to use." -msgstr "Votre thÃ¨me ne supporte qu'un seul menu. SÃ©lectionnez le menu que vous dÃ©sirez utiliser." +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:942 +msgctxt "find/replace" +msgid "Find" +msgstr "Chercher" +||||||| .r11156 +#: wp-includes/script-loader.php:530 +msgid "Could not set that as the thumbnail image. Try a different attachment." +msgstr "Impossible de s’en servir comme miniature. Essayez un autre fichier attachÃ©." +======= +#: wp-includes/class-wp-editor.php:865 +msgid "Insert video" +msgstr "InsÃ©rer une vidÃ©o" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1386 -msgid "Fixed" -msgstr "Fixe" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:946 +msgctxt "spellcheck" +msgid "Finish" +msgstr "Terminer" +||||||| .r11156 +#: wp-includes/script-loader.php:460 +msgid "Saving Draft…" +msgstr "Enregistrement du brouillon…" +======= +#: wp-includes/class-wp-editor.php:864 +msgid "Paste your embed code below:" +msgstr "Collez votre code d’intÃ©gration ci-dessous :" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1385 -msgid "Scroll" -msgstr "DÃ©filant" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:947 +msgctxt "spellcheck" +msgid "Ignore all" +msgstr "Tout ignorer" +||||||| .r11156 +#: wp-includes/taxonomy.php:2761 +msgid "Invalid Taxonomy" +msgstr "Taxinomie invalide" +======= +#: wp-includes/class-wp-editor.php:863 +msgid "Alternative source" +msgstr "Source alternative" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1381 -msgid "Background Attachment" -msgstr "Image dâarriÃ¨re-plan" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:899 +msgid "Style" +msgstr "Style" +||||||| .r11156 +#: wp-includes/taxonomy.php:956 wp-includes/taxonomy.php:3656 +msgid "Empty Term" +msgstr "Pas de terme" +======= +#: wp-includes/class-wp-editor.php:862 +msgid "Poster" +msgstr "Image" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1371 -#: wp-includes/class-wp-editor.php:947 wp-includes/media-template.php:622 -#: wp-includes/media-template.php:853 wp-includes/media-template.php:919 -msgid "Right" -msgstr "Droite" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:885 +msgid "Keywords" +msgstr "Mots-clÃ©s" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1287 +#: wp-includes/class-wp-xmlrpc-server.php:1829 +#: wp-includes/class-wp-xmlrpc-server.php:1917 +#: wp-includes/class-wp-xmlrpc-server.php:1985 wp-includes/taxonomy.php:2415 +msgid "Invalid term ID" +msgstr "l’ID du terme est invalide" +======= +#: wp-includes/class-wp-editor.php:861 +msgid "Insert/edit video" +msgstr "InsÃ©rer/modifier la vidÃ©o" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1370 -#: wp-includes/class-wp-editor.php:946 wp-includes/media-template.php:619 -#: wp-includes/media-template.php:850 wp-includes/media-template.php:916 -msgid "Center" -msgstr "Centre" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:846 +msgid "Align right" +msgstr "Aligner Ã droite" +||||||| .r11156 +#: wp-includes/taxonomy.php:2418 wp-includes/taxonomy.php:2948 +msgid "A name is required for this term" +msgstr "Un nom est requis pour ce terme" +======= +#: wp-includes/class-wp-editor.php:860 +msgid "Insert date/time" +msgstr "InsÃ©rer l’heure/la date" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:865 wp-includes/script-loader.php:114 +msgid "Numbered list" +msgstr "Liste numÃ©rotÃ©e" +||||||| .r11156 +#: wp-includes/taxonomy.php:2496 wp-includes/taxonomy.php:2504 +#: wp-includes/taxonomy.php:2515 +msgid "Could not insert term into the database" +msgstr "Impossible d’insÃ©rer le terme dans la base de donnÃ©es" +======= +#: wp-includes/class-wp-editor.php:859 +msgid "Insert image" +msgstr "InsÃ©rer une image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:837 +msgid "Clear formatting" +msgstr "Nettoyer le formatage " +||||||| .r11156 +#: wp-includes/taxonomy.php:3004 +msgid "The slug “%s” is already in use by another term" +msgstr "L’identifiant Â« %s Â» est dÃ©jÃ utilisÃ© par un autre terme" +======= +#: wp-includes/class-wp-editor.php:858 +msgid "Dimensions" +msgstr "Dimensions" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:848 +msgid "Justify" +msgstr "Justifier" +||||||| .r11156 +#: wp-includes/taxonomy.php:3853 +msgid "Invalid object ID" +msgstr "Identifiant d’objet non valide." +======= +#: wp-includes/class-wp-editor.php:857 +msgid "Style" +msgstr "Style" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:847 +msgid "Align left" +msgstr "Aligner Ã gauche" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:247 +msgid "Template is missing." +msgstr "Le modÃ¨le est manquant." +======= +#: wp-includes/class-wp-editor.php:856 +msgid "Image description" +msgstr "Description de l’image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:862 +msgid "Visual aids" +msgstr "Aides visuelles" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:266 +msgid "The parent theme is missing. Please install the \"%s\" parent theme." +msgstr "Le thÃ¨me parent est manquant. Merci d’installer le thÃ¨me parent « %s »." +======= +#: wp-includes/class-wp-editor.php:855 +msgid "Vertical space" +msgstr "Espace vertical" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:924 +msgid "Restore last draft" +msgstr "RÃ©tablir le dernier brouillon" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:221 +msgid "Stylesheet is missing." +msgstr "La feuille de style manque." +======= +#: wp-includes/class-wp-editor.php:854 +msgid "Constrain proportions" +msgstr "Respecter les proportions" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:841 +msgid "Source code" +msgstr "Code source" +||||||| .r11156 +#: wp-includes/user.php:126 +msgid "ERROR: The username field is empty." +msgstr "ERREUR : le champ de l’identifiant est vide." +======= +#: wp-includes/class-wp-editor.php:853 +msgid "Border" +msgstr "Bordure" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1007 +msgid "Background color" +msgstr "Couleur d’arriÃ¨re plan" +||||||| .r11156 +#: wp-includes/user.php:129 +msgid "ERROR: The password field is empty." +msgstr "ERREUR : le champ du mot de passe est vide." +======= +#: wp-includes/class-wp-editor.php:852 +msgid "Source" +msgstr "Adresse web source" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1010 +msgid "Show invisible characters" +msgstr "Voir les caractÃ¨res invisibles" +||||||| .r11156 +#: wp-includes/user.php:217 +msgid "ERROR: Your account has been marked as a spammer." +msgstr "ERREUR : votre compte a Ã©tÃ© marquÃ© comme Ã©tant indÃ©sirable." +======= +#: wp-includes/class-wp-editor.php:851 +msgid "Advanced" +msgstr "AvancÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:907 +msgid "Insert video" +msgstr "InsÃ©rer une vidÃ©o" +||||||| .r11156 +#: wp-includes/functions.php:4485 wp-includes/user.php:187 +msgid "Please log in again." +msgstr "Veuillez vous reconnecter." +======= +#: wp-includes/class-wp-editor.php:850 +msgid "General" +msgstr "GÃ©nÃ©ral" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:840 +msgctxt "editor button" +msgid "Code" +msgstr "Code" +||||||| .r11156 +#: wp-includes/widgets.php:575 wp-includes/widgets.php:645 +msgid "Sidebar %d" +msgstr "Colonne latÃ©rale %d" +======= +#: wp-includes/class-wp-editor.php:849 +msgid "Insert/edit image" +msgstr "InsÃ©rer/modifier une image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:870 +msgctxt "list style" +msgid "Lower Greek" +msgstr "Minuscules grecques" +||||||| .r11156 +#: wp-includes/wp-db.php:2096 +msgid "ERROR: WordPress %1$s requires MySQL %2$s or higher" +msgstr "ERREUR : WordPress %1$s requiert MySQL %2$s ou une version supÃ©rieure." +======= +#: wp-includes/class-wp-editor.php:846 wp-includes/theme-compat/sidebar.php:21 +msgid "Author" +msgstr "Auteur" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:871 +msgctxt "list style" +msgid "Lower Alpha" +msgstr "Minuscules alphanumÃ©riques" +||||||| .r11156 +#: wp-login.php:101 +msgid "Powered by WordPress" +msgstr "PropulsÃ© par WordPress" +======= +#: wp-includes/class-wp-editor.php:845 wp-includes/media-template.php:406 +#: wp-includes/media-template.php:585 +msgid "Description" +msgstr "Description" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:872 +msgctxt "list style" +msgid "Upper Alpha" +msgstr "Majuscules alphanumÃ©riques" +||||||| .r11156 +#: wp-login.php:276 +msgid "ERROR: Enter a username or e-mail address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie ou un identifiant." +======= +#: wp-includes/class-wp-editor.php:844 +msgid "Encoding" +msgstr "Encodage" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:873 +msgctxt "list style" +msgid "Upper Roman" +msgstr "Chiffres romains majuscules" +||||||| .r11156 +#: wp-login.php:280 +msgid "ERROR: There is no user registered with that email address." +msgstr "ERREUR : il n’y aucun utilisateur enregistrÃ© avec cette adresse de messagerie." +======= +#: wp-includes/class-wp-editor.php:843 +msgid "Keywords" +msgstr "Mots-clÃ©s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:874 +msgctxt "list style" +msgid "Lower Roman" +msgstr "Chiffres romains minuscules " +||||||| .r11156 +#: wp-login.php:297 +msgid "ERROR: Invalid username or e-mail." +msgstr "ERREUR : l’identifiant ou l’adresse de messagerie n’est pas valide." +======= +#: wp-includes/class-wp-editor.php:842 wp-includes/media-template.php:381 +#: wp-includes/media-template.php:560 wp-includes/revision.php:29 +#: wp-includes/script-loader.php:480 +msgid "Title" +msgstr "Titre" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:934 +msgid "Could not find the specified string." +msgstr "Impossible de trouver la chaÃ®ne spÃ©cifiÃ©e." +||||||| .r11156 +#: wp-login.php:335 +msgid "Password reset is not allowed for this user" +msgstr "La rÃ©initialisation du mot de passe n’est pas autorisÃ©e pour cet utilisateur" +======= +#: wp-includes/class-wp-editor.php:841 +msgid "Robots" +msgstr "Robots" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1022 +msgctxt "TinyMCE menu" +msgid "Edit" +msgstr "Modifier" +||||||| .r11156 +#: wp-login.php:376 +msgid "[%s] Password Reset" +msgstr "[%s] Renouvellement du mot de passe" +======= +#: wp-includes/class-wp-editor.php:840 +msgid "Document properties" +msgstr "PropriÃ©tÃ©s du document" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:912 +msgctxt "editor button" +msgid "Right to left" +msgstr "Droite Ã gauche (RTL)" +||||||| .r11156 +#: wp-login.php:397 +msgid "The e-mail could not be sent." +msgstr "Le message n’a pas pu Ãªtre envoyÃ©." +======= +#: wp-includes/class-wp-editor.php:837 +msgctxt "Link anchors (TinyMCE)" +msgid "Anchors" +msgstr "Ancres" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:963 +msgctxt "table cell" +msgid "Cell" +msgstr "Cellule" +||||||| .r11156 +#: wp-includes/user.php:2042 wp-includes/user.php:2045 +#: wp-includes/user.php:2049 wp-includes/user.php:2060 +#: wp-includes/user.php:2076 +msgid "Invalid key" +msgstr "ClÃ© invalide" +======= +#: wp-includes/class-wp-editor.php:836 +msgctxt "Link anchor (TinyMCE)" +msgid "Anchor" +msgstr "Ancre" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1004 +msgctxt "TinyMCE" +msgid "Insert template" +msgstr "InsÃ©rer un modÃ¨le" +||||||| .r11156 +#: wp-includes/user.php:2134 +msgid "ERROR: Please type your e-mail address." +msgstr "ERREUR : l’adresse de messagerie est obligatoire." +======= +#: wp-includes/class-wp-editor.php:835 +msgctxt "Name of link anchor (TinyMCE)" +msgid "Name" +msgstr "Nom" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1005 +msgctxt "TinyMCE" +msgid "Templates" +msgstr "ModÃ¨les" +||||||| .r11156 +#: wp-includes/user.php:2136 +msgid "ERROR: The email address isn’t correct." +msgstr "ERREUR : adresse de messagerie incorrecte." +======= +#: wp-includes/class-wp-editor.php:832 +msgctxt "list style" +msgid "Lower Roman" +msgstr "Chiffres romains minuscules " +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: previous +#: wp-includes/class-wp-editor.php:938 +msgctxt "find/replace" +msgid "Prev" +msgstr "PrÃ©c." +||||||| .r11156 +#: wp-login.php:500 +msgid "Sorry, that key does not appear to be valid." +msgstr "DÃ©solÃ©, cette clÃ© ne semble pas Ãªtre valide." +======= +#: wp-includes/class-wp-editor.php:831 +msgctxt "list style" +msgid "Upper Roman" +msgstr "Chiffres romains majuscules" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:941 +msgctxt "find/replace" +msgid "Replace with" +msgstr "Remplacer par" +||||||| .r11156 +#: wp-login.php:522 +msgid "Lost Password" +msgstr "Mot de passe oubliÃ©" +======= +#: wp-includes/class-wp-editor.php:830 +msgctxt "list style" +msgid "Upper Alpha" +msgstr "Majuscules alphanumÃ©riques" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:943 +msgctxt "find/replace" +msgid "Replace all" +msgstr "Tout remplacer" +||||||| .r11156 +#: wp-login.php:530 +msgid "Username or E-mail:" +msgstr "Identifiant ou adresse de messagerie :" +======= +#: wp-includes/class-wp-editor.php:829 +msgctxt "list style" +msgid "Lower Alpha" +msgstr "Minuscules alphanumÃ©riques" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:939 +msgctxt "find/replace" +msgid "Whole words" +msgstr "Mots entiers" +||||||| .r11156 +#: wp-login.php:541 +msgid "Get New Password" +msgstr "GÃ©nÃ©rer un mot de passe" +======= +#: wp-includes/class-wp-editor.php:828 +msgctxt "list style" +msgid "Lower Greek" +msgstr "Minuscules grecques" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:845 +msgid "Align center" +msgstr "Centrer" +||||||| .r11156 +#: wp-login.php:218 +msgid "Are you lost?" +msgstr "Ãtes-vous perdu(e) ?" +======= +#: wp-includes/class-wp-editor.php:827 +msgctxt "list style" +msgid "Disc" +msgstr "Rond" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:911 +msgid "Special character" +msgstr "CaractÃ¨re spÃ©cial" +||||||| .r11156 +#: wp-login.php:218 +msgid "← Back to %s" +msgstr "← Retour sur %s" +======= +#: wp-includes/class-wp-editor.php:826 +msgctxt "list style" +msgid "Circle" +msgstr "Cercle" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:903 +msgid "Insert/edit video" +msgstr "InsÃ©rer/modifier la vidÃ©o" +||||||| .r11156 +#: wp-login.php:702 +msgid "Registration Form" +msgstr "Formulaire d’inscription" +======= +#: wp-includes/class-wp-editor.php:825 +msgctxt "list style" +msgid "Default" +msgstr "Par dÃ©faut" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:997 +msgid "Column group" +msgstr "Groupe de colonnes" +||||||| .r11156 +#: wp-login.php:702 +msgid "Register For This Site" +msgstr "S’inscrire sur ce site" +======= +#: wp-includes/class-wp-editor.php:824 +msgctxt "list style" +msgid "Square" +msgstr "CarrÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:901 wp-includes/script-loader.php:111 +msgid "Insert image" +msgstr "InsÃ©rer une image" +||||||| .r11156 +#: wp-login.php:722 +msgid "A password will be e-mailed to you." +msgstr "Un mot de passe vous sera envoyÃ© sur votre adresse de messagerie." +======= +#: wp-includes/class-wp-editor.php:823 +msgid "Numbered list" +msgstr "Liste numÃ©rotÃ©e" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:905 +msgid "Alternative source" +msgstr "Source alternative" +||||||| .r11156 +#: wp-login.php:730 wp-login.php:907 +msgid "Password Lost and Found" +msgstr "RÃ©cupÃ©ration de mot de passe" +======= +#: wp-includes/class-wp-editor.php:822 +msgid "Bulleted list" +msgstr "Liste Ã puces" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:960 +msgid "Rows" +msgstr "Lignes" +||||||| .r11156 +#: wp-login.php:730 wp-login.php:907 +msgid "Lost your password?" +msgstr "Mot de passe oubliÃ© ?" +======= +#: wp-includes/class-wp-editor.php:820 +msgid "Visual aids" +msgstr "Aides visuelles" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1000 +msgid "Cell padding" +msgstr "Marge intÃ©rieure des cellules" +||||||| .r11156 +#: wp-login.php:793 +msgid "You have logged in successfully." +msgstr "Vous vous Ãªtes bien connectÃ©." +======= +#: wp-includes/class-wp-editor.php:819 wp-includes/class-wp-editor.php:1438 +#: wp-includes/functions.php:4667 wp-includes/script-loader.php:236 +#: wp-includes/script-loader.php:317 wp-includes/script-loader.php:398 +msgid "Close" +msgstr "Fermer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1001 +msgid "Cell spacing" +msgstr "Espacement entre les cellules" +||||||| .r11156 +#: wp-login.php:831 +msgid "You are now logged out." +msgstr "Vous Ãªtes dÃ©sormais dÃ©connectÃ©(e)." +======= +#: wp-includes/class-wp-editor.php:818 wp-includes/class-wp-editor.php:1482 +#: wp-includes/media.php:3000 wp-includes/script-loader.php:397 +#: wp-includes/script-loader.php:455 +msgid "Cancel" +msgstr "Annuler" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:998 +msgid "Row type" +msgstr "Type de ligne" +||||||| .r11156 +#: wp-login.php:833 +msgid "User registration is currently not allowed." +msgstr "Les nouvelles inscriptions ne sont pas autorisÃ©es pour l’instant." +======= +#: wp-includes/class-wp-editor.php:817 wp-includes/script-loader.php:454 +msgid "OK" +msgstr "OK" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:952 +msgid "Insert table" +msgstr "InsÃ©rer un tableau" +||||||| .r11156 +#: wp-login.php:835 +msgid "Check your e-mail for the confirmation link." +msgstr "VÃ©rifiez votre messagerie pour y trouver le lien de confirmation." +======= +#: wp-includes/class-wp-editor.php:815 +#: wp-includes/js/tinymce/wp-mce-help.php:101 +msgid "Redo" +msgstr "RÃ©tablir" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:999 +msgid "Cell type" +msgstr "Type de cellule" +||||||| .r11156 +#: wp-login.php:837 +msgid "Check your e-mail for your new password." +msgstr "VÃ©rifiez votre messagerie pour y trouver votre nouveau mot de passe." +======= +#: wp-includes/class-wp-editor.php:814 +#: wp-includes/js/tinymce/wp-mce-help.php:101 +msgid "Undo" +msgstr "Annuler" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:996 +msgid "Row group" +msgstr "Groupe de lignes" +||||||| .r11156 +#: wp-login.php:839 +msgid "Registration complete. Please check your e-mail." +msgstr "Enregistrement terminÃ©. Veuillez vÃ©rifier vos nouveaux e-mails." +======= +#: wp-includes/class-wp-editor.php:813 +#: wp-includes/js/tinymce/wp-mce-help.php:100 +msgid "Select all" +msgstr "SÃ©lectionner tout" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:976 +msgid "Delete column" +msgstr "Supprimer la colonne" +||||||| .r11156 +#: wp-mail.php:34 +msgid "Slow down cowboy, no need to check for new mails so often!" +msgstr "LÃ¨ve le pied, champion ! Inutile de vÃ©rifier tes e-mails aussi souvent !" +======= +#: wp-includes/class-wp-editor.php:812 +#: wp-includes/js/tinymce/wp-mce-help.php:99 +msgid "Paste" +msgstr "Coller" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1008 +msgid "Text color" +msgstr "Couleur du texte" +||||||| .r11156 +#: wp-mail.php:54 +msgid "There doesn’t seem to be any new mail." +msgstr "Il ne semble pas y avoir de nouvel e-mail." +======= +#: wp-includes/class-wp-editor.php:811 +#: wp-includes/js/tinymce/wp-mce-help.php:99 +msgid "Copy" +msgstr "Copier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:914 +msgid "Emoticons" +msgstr "ÃmoticÃ´nes" +||||||| .r11156 +#: wp-mail.php:122 +msgid "Author is %s" +msgstr "L’auteur est %s" +======= +#: wp-includes/class-wp-editor.php:810 +#: wp-includes/js/tinymce/wp-mce-help.php:100 +msgid "Cut" +msgstr "Couper" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:883 +msgid "Robots" +msgstr "Robots" +||||||| .r11156 +#: wp-mail.php:247 +msgid "Author: %s" +msgstr "Auteur : %s" +======= +#: wp-includes/class-wp-editor.php:808 +msgid "Decrease indent" +msgstr "Diminuer l’indentation" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:886 +msgid "Encoding" +msgstr "Encodage" +||||||| .r11156 +#: wp-mail.php:248 +msgid "Posted title: %s" +msgstr "Titre publiÃ© : %s" +======= +#: wp-includes/class-wp-editor.php:807 +msgid "Increase indent" +msgstr "Augmenter l’indentation" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:922 +msgid "Horizontal line" +msgstr "Ligne horizontale" +||||||| .r11156 +#: wp-mail.php:251 +msgid "Oops: %s" +msgstr "Oups : %s" +======= +#: wp-includes/class-wp-editor.php:806 +msgid "Justify" +msgstr "Justifier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:908 +msgid "Embed" +msgstr "IntÃ©gration" +||||||| .r11156 +#: wp-signup.php:126 +msgid "Privacy:" +msgstr "Vie privÃ©e :" +======= +#: wp-includes/class-wp-editor.php:805 +msgid "Align left" +msgstr "Aligner Ã gauche" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:915 +msgid "Nonbreaking space" +msgstr "Espace insÃ©cable" +||||||| .r11156 +#: wp-signup.php:184 +msgid "(Must be at least 4 characters, letters and numbers only.)" +msgstr "(Doit contenir au moins 4 caractÃ¨res, uniquement des lettres ou des chiffres.)" +======= +#: wp-includes/class-wp-editor.php:804 +msgid "Align right" +msgstr "Aligner Ã droite" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:916 +msgid "Page break" +msgstr "Saut de page" +||||||| .r11156 +#: wp-signup.php:187 +msgid "Email Address:" +msgstr "Adresse e-mail :" +======= +#: wp-includes/class-wp-editor.php:803 +msgid "Align center" +msgstr "Centrer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:917 +msgid "Paste as text" +msgstr "Coller en texte" +||||||| .r11156 +#: wp-signup.php:263 +msgid "There was a problem, please correct the form below and try again." +msgstr "Il y a eu un problÃ¨me, veuillez remplir le formulaire ci-dessous et rÃ©essayer." +======= +#: wp-includes/class-wp-editor.php:801 +msgid "Font Sizes" +msgstr "Tailles de la police" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:940 +msgid "Find and replace" +msgstr "Chercher et remplacer" +||||||| .r11156 +#: wp-signup.php:437 +msgid "Get your own %s account in seconds" +msgstr "Obtenez votre propre compte %s en quelques secondes" +======= +#: wp-includes/class-wp-editor.php:800 +msgid "Font Family" +msgstr "Famille de polices" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:944 +msgid "Match case" +msgstr "Respecter la casse" +||||||| .r11156 +#: wp-signup.php:456 +msgid "Just a username, please." +msgstr "Juste l’identifiant, s’il vous plaÃ®t." +======= +#: wp-includes/class-wp-editor.php:799 +msgid "Source code" +msgstr "Code source" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1014 +msgid "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off." +msgstr "Coller est maintenant en mode texte. Les contenus seront dorÃ©navant collÃ©s en mode texte jusqu‘Ã ce que cette option soit annulÃ©e." +||||||| .r11156 +#: wp-signup.php:460 +msgid "Next" +msgstr "Suivant" +======= +#: wp-includes/class-wp-editor.php:798 +msgctxt "editor button" +msgid "Code" +msgstr "Code" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:834 +msgid "Strikethrough" +msgstr "Barrer" +||||||| .r11156 +#: wp-signup.php:508 +msgid "%s is your new username" +msgstr "Votre nouvel identifiant est %s" +======= +#: wp-includes/class-wp-editor.php:797 +#: wp-includes/js/tinymce/wp-mce-help.php:102 +msgid "Italic" +msgstr "Italique" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1039 +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" +||||||| .r11156 +#: wp-signup.php:509 +msgid "But, before you can start using your new username, you must activate it." +msgstr "Mais, avant d’utiliser votre nouvel identifiant, vous devez l’activer." +======= +#: wp-includes/class-wp-editor.php:796 +#: wp-includes/js/tinymce/wp-mce-help.php:102 +msgid "Bold" +msgstr "Gras" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:990 +msgctxt "table cell alignment attribute" +msgid "None" +msgstr "Aucun" +||||||| .r11156 +#: wp-signup.php:511 +msgid "If you do not activate your username within two days, you will have to sign up again." +msgstr "Si vous n’activez pas votre compte sous deux jours, vous devrez vous rÃ©inscrire." +======= +#: wp-includes/class-wp-editor.php:795 +msgid "Clear formatting" +msgstr "Nettoyer le formatage " +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:842 +msgid "Font Family" +msgstr "Famille de polices" +||||||| .r11156 +#: wp-signup.php:577 +msgid "Signup" +msgstr "Inscription" +======= +#: wp-includes/class-wp-editor.php:794 +msgid "Superscript" +msgstr "Exposant" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:843 +msgid "Font Sizes" +msgstr "Tailles de la police" +||||||| .r11156 +#: wp-signup.php:648 +msgid "Still waiting for your email?" +msgstr "Toujours dans l’attente de votre e-mail ?" +======= +#: wp-includes/class-wp-editor.php:793 +msgid "Subscript" +msgstr "Indice" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:980 +msgid "Split table cell" +msgstr "Diviser une cellule du tableau" +||||||| .r11156 +#: wp-signup.php:687 +msgid "Registration has been disabled." +msgstr "Les inscriptions ne sont pas autorisÃ©es pour le moment." +======= +#: wp-includes/class-wp-editor.php:792 +#: wp-includes/js/tinymce/wp-mce-help.php:119 +msgid "Strikethrough" +msgstr "Barrer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:849 +msgid "Increase indent" +msgstr "Augmenter l’indentation" +||||||| .r11156 +#: wp-signup.php:698 +msgid "User registration has been disabled." +msgstr "Les inscriptions d’utilisateurs sont dÃ©sactivÃ©es." +======= +#: wp-includes/class-wp-editor.php:791 +#: wp-includes/js/tinymce/wp-mce-help.php:103 +msgid "Underline" +msgstr "Souligner" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:850 +msgid "Decrease indent" +msgstr "Diminuer l’indentation" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:131 +msgid "Help" +msgstr "Aide" +======= +#: wp-includes/class-wp-editor.php:790 +msgctxt "HTML elements" +msgid "Inline" +msgstr "Inline" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:902 +msgid "Insert date/time" +msgstr "InsÃ©rer l’heure/la date" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:903 wp-includes/media-template.php:918 +msgid "Width" +msgstr "Largeur" +======= +#: wp-includes/class-wp-editor.php:788 +msgctxt "HTML tag" +msgid "Address" +msgstr "Adresse" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:964 +msgid "Header cell" +msgstr "Cellule d’en-tÃªte" +||||||| .r11156 +#: wp-includes/user.php:2124 +msgid "ERROR: Please enter a username." +msgstr "ERREUR : veuillez renseigner l’identifiant." +======= +#: wp-includes/class-wp-editor.php:787 +msgctxt "HTML tag" +msgid "Pre" +msgstr "Pre" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1014 +msgid "If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically." +msgstr "Si vous souhaitez utiliser du contenu riche en provenance de Microsoft Word, essayez de dÃ©sactiver cette option. L’Ã©diteur nettoiera automatiquement les textes en provenance de Word." +||||||| .r11156 +#: wp-includes/user.php:2139 +msgid "ERROR: This email is already registered, please choose another one." +msgstr "ERREUR : cette adresse de messagerie est dÃ©jÃ utilisÃ©e. Merci d’en choisir une autre." +======= +#: wp-includes/class-wp-editor.php:786 +msgctxt "HTML tag" +msgid "Div" +msgstr "Div" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1042 +msgid "Focus shortcuts:" +msgstr "Raccourcis de sÃ©lections :" +||||||| .r11156 +#: wp-includes/widgets.php:67 +msgid "There are no options for this widget." +msgstr "Il n’y a pas d’options pour ce widget." +======= +#: wp-includes/class-wp-editor.php:785 +msgid "Blockquote" +msgstr "Bloc de citation" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1043 +msgid "Inline toolbar (when an image, link or preview is selected)" +msgstr "Barre d'outils en ligne (quand une image, un lien ou un aperÃ§u est sÃ©lectionnÃ©)" +||||||| .r11156 +#: wp-includes/script-loader.php:339 wp-login.php:628 +msgid "Strength indicator" +msgstr "Indicateur de sÃ»retÃ©" +======= +#: wp-includes/class-wp-editor.php:784 +msgid "Paragraph" +msgstr "Paragraphe" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:518 +msgid "Allow link notifications from other blogs (pingbacks and trackbacks) on new articles" +msgstr "Autoriser les liens de notification d'autres blogs (pings et rÃ©troliens) sur les nouveaux articles" +||||||| .r11156 +#: wp-includes/script-loader.php:340 +msgid "Very weak" +msgstr "TrÃ¨s faible" +======= +#. translators: block tags +#: wp-includes/class-wp-editor.php:783 +msgctxt "TinyMCE" +msgid "Blocks" +msgstr "Blocs" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:926 +msgid "Remove link" +msgstr "Supprimer le lien" +||||||| .r11156 +#: wp-includes/script-loader.php:341 +msgid "Weak" +msgstr "Faible" +======= +#: wp-includes/class-wp-editor.php:780 +#: wp-includes/js/tinymce/wp-mce-help.php:115 +msgid "Heading 6" +msgstr "Titre 6" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1050 +msgid "Ctrl + letter:" +msgstr "Ctrl + lettre :" +||||||| .r11156 +#: wp-includes/script-loader.php:344 +msgid "Strong" +msgstr "Forte" +======= +#: wp-includes/class-wp-editor.php:779 +#: wp-includes/js/tinymce/wp-mce-help.php:115 +msgid "Heading 5" +msgstr "Titre 5" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1049 +msgid "Cmd + letter:" +msgstr "Cmd + lettre :" +||||||| .r11156 +#: wp-includes/taxonomy.php:482 +msgid "Edit Category" +msgstr "Modifier la catÃ©gorie" +======= +#: wp-includes/class-wp-editor.php:778 +#: wp-includes/js/tinymce/wp-mce-help.php:114 +msgid "Heading 4" +msgstr "Titre 4" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1048 +msgid "Shift + Alt + letter:" +msgstr "Shift + Alt + lettre :" +||||||| .r11156 +#: wp-includes/post.php:1624 +msgctxt "page" +msgid "Add New" +msgstr "Ajouter" +======= +#: wp-includes/class-wp-editor.php:777 +#: wp-includes/js/tinymce/wp-mce-help.php:114 +msgid "Heading 3" +msgstr "Titre 3" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1047 +msgid "Ctrl + Alt + letter:" +msgstr "Ctrl + Alt + lettre:" + +#: wp-includes/class-wp-editor.php:1434 +msgid "Search or use up and down arrow keys to select an item." +msgstr "Cherchez ou utilisez les flÃ¨ches haut et bas pour choisir un Ã©lÃ©ment." + +#: wp-includes/class-wp-xmlrpc-server.php:1468 +#: wp-includes/class-wp-xmlrpc-server.php:4513 +#: wp-includes/class-wp-xmlrpc-server.php:4966 +msgid "Sorry, your entry could not be posted. Something wrong happened." +msgstr "DÃ©solÃ©, une erreur est survenue et votre texte n’a pas pu Ãªtre publiÃ©." + +#: wp-includes/class-wp-xmlrpc-server.php:513 +msgid "Allow people to post comments on new articles" +msgstr "Autoriser les lecteurs Ã publier des commentaires sur les nouveaux articles" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:479 +msgid "Allow people to post comments on new articles" +msgstr "Autoriser les visiteurs Ã publier des commentaires sur les derniers articles" +======= +#: wp-includes/class-wp-editor.php:776 +#: wp-includes/js/tinymce/wp-mce-help.php:113 +msgid "Heading 2" +msgstr "Titre 2" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-xmlrpc-server.php:2944 +msgid "Sorry, you must be able to edit posts on this site in order to view tags." +msgstr "DÃ©solÃ©, vous devez avoir le droit de modifier des articles sur ce site si vous voulez visualiser les Ã©tiquettes." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:429 +msgid "Date Format" +msgstr "Format de date" +======= +#: wp-includes/class-wp-editor.php:775 +#: wp-includes/js/tinymce/wp-mce-help.php:113 +msgid "Heading 1" +msgstr "Titre 1" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1040 +msgid "Default shortcuts," +msgstr "Raccourcis par dÃ©faut," +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:434 +msgid "Time Format" +msgstr "Format dâheure" +======= +#: wp-includes/class-wp-editor.php:774 +msgctxt "TinyMCE" +msgid "Headings" +msgstr "En-tÃªtes" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1017 +msgid "Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser’s edit menu instead." +msgstr "Votre navigateur ne supporte pas les accÃ¨s direct au presse-papier. Veuillez utiliser les raccourcis clavier ou le menu Ãdition de votre navigateur." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:902 wp-includes/media-template.php:918 +msgid "Height" +msgstr "Hauteur" +======= +#: wp-includes/class-wp-editor.php:772 +msgctxt "TinyMCE" +msgid "Formats" +msgstr "Formats" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1032 +msgid "Read more..." +msgstr "Lire la suite..." + +#. translators: word count +#: wp-includes/class-wp-editor.php:1013 +msgid "Words: %s" +msgstr "Mots : %s" + +#: wp-includes/class-wp-editor.php:1029 +msgid "Toolbar Toggle" +msgstr "Ouvrir/fermer la barre d'outils" + +#: wp-includes/class-wp-editor.php:906 +msgid "Paste your embed code below:" +msgstr "Collez votre code d’intÃ©gration ci-dessous :" + +#: wp-includes/class-wp-editor.php:1030 wp-includes/script-loader.php:120 +msgid "Insert Read More tag" +msgstr "InsÃ©rer la balise Â« Lire la suite... Â»" + +#: wp-includes/class-wp-editor.php:1041 +msgid "Additional shortcuts," +msgstr "Raccourcis supplÃ©mentaires," + +#: wp-includes/class-wp-editor.php:1026 +msgctxt "TinyMCE menu" +msgid "Format" +msgstr "Format" + +#: wp-includes/class-wp-editor.php:867 +msgctxt "list style" +msgid "Default" +msgstr "Par dÃ©faut" +||||||| .r11156 +#: wp-includes/class-wp-customize-control.php:479 +#: wp-includes/class-wp-customize-control.php:810 +#: wp-includes/script-loader.php:506 +msgid "Default" +msgstr "Valeur par dÃ©faut" +======= +#: wp-includes/class-wp-editor.php:771 +msgid "New document" +msgstr "Nouveau document" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1034 +msgid "No alignment" +msgstr "Pas d'alignement" +||||||| .r11156 +#: wp-includes/js/tinymce/wp-mce-help.php:129 +msgid "Insert Image" +msgstr "InsÃ©rer une image" +======= +#: wp-includes/class-wp-editor.php:176 wp-includes/class-wp-editor.php:1259 +msgctxt "Name for the Text editor tab (formerly HTML)" +msgid "Text" +msgstr "Texte" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:991 +msgctxt "vertical table cell alignment" +msgid "V Align" +msgstr "Alignement V" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:181 wp-includes/class-wp-editor.php:1199 +msgid "Visual" +msgstr "Visuel" +======= +#: wp-includes/class-wp-editor.php:175 wp-includes/class-wp-editor.php:1258 +msgid "Visual" +msgstr "Visuel" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:986 +msgctxt "horizontal table cell alignment" +msgid "H Align" +msgstr "Alignement H" +||||||| .r11156 +#: wp-includes/default-widgets.php:90 wp-includes/default-widgets.php:250 +#: wp-includes/default-widgets.php:351 wp-includes/default-widgets.php:422 +#: wp-includes/default-widgets.php:465 wp-includes/default-widgets.php:523 +#: wp-includes/default-widgets.php:629 wp-includes/default-widgets.php:763 +#: wp-includes/default-widgets.php:911 wp-includes/default-widgets.php:1277 +#: wp-includes/default-widgets.php:1356 +msgid "Title:" +msgstr "Titre :" +======= +#: wp-includes/class-wp-customize-widgets.php:978 +msgid "Shift-click to edit this widget." +msgstr "Faites Shift+clic pour modifier ce widget." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:957 +msgid "Border color" +msgstr "Couleur de bordure" +||||||| .r11156 +#: wp-includes/taxonomy.php:487 +msgid "Separate tags with commas" +msgstr "SÃ©parez les mots-clÃ©s par des virgules" +======= +#: wp-includes/class-wp-customize-widgets.php:669 +msgid "Search widgets…" +msgstr "Rechercher de widgets…" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:949 +msgid "Add to Dictionary" +msgstr "Ajouter au Dictionnaire" +||||||| .r11156 +#: wp-includes/theme-compat/comments.php:77 +#: wp-includes/theme-compat/comments.php:80 +msgid "(required)" +msgstr "(obligatoire)" +======= +#: wp-includes/class-wp-customize-widgets.php:668 +msgid "Search Widgets" +msgstr "Rechercher des widgets" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:931 +msgid "No color" +msgstr "Aucune couleur" +||||||| .r11156 +#: wp-includes/comment-template.php:2087 +#: wp-includes/theme-compat/comments.php:83 +msgid "Website" +msgstr "Site web" +======= +#: wp-includes/class-wp-customize-widgets.php:638 +msgid "Widget moved down" +msgstr "Widget dÃ©placÃ© vers le bas" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:930 +msgctxt "label for custom color" +msgid "Custom..." +msgstr "PersonnalisÃ©e..." +||||||| .r11156 +#: wp-includes/admin-bar.php:678 wp-includes/class-wp-customize-widgets.php:437 +#: wp-includes/functions.php:3078 +msgid "Widgets" +msgstr "Widgets" +======= +#: wp-includes/class-wp-customize-widgets.php:637 +msgid "Widget moved up" +msgstr "Widget dÃ©placÃ© vers le haut" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:928 +msgid "Color" +msgstr "Couleur" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1381 +#: wp-includes/class-wp-xmlrpc-server.php:4215 +#: wp-includes/class-wp-xmlrpc-server.php:4652 +msgid "Sorry, your entry could not be posted. Something wrong happened." +msgstr "DÃ©solÃ©, votre entrÃ©e n’a pas pu Ãªtre publiÃ©e. Une erreur est survenue." +======= +#: wp-includes/class-wp-customize-widgets.php:636 +#: wp-includes/script-loader.php:565 +msgid "An error has occurred. Please reload the page and try again." +msgstr "Une erreur est survenue. Veuillez recharger la page et rÃ©essayer." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:929 +msgid "Custom color" +msgstr "Couleur personnalisÃ©e" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4266 +#: wp-includes/class-wp-xmlrpc-server.php:4739 +msgid "Sorry, you do not have the right to edit this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de modifier cet article." +======= +#: wp-includes/class-wp-customize-widgets.php:635 +msgid "Trash widget by moving it to the inactive widgets sidebar." +msgstr "Mettez le widget Ã la Corbeille en le dÃ©plaÃ§ant vers la barre latÃ©rale inactive." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1015 +msgid "Rich Text Area. Press Alt-Shift-H for help" +msgstr "Zone de texte enrichi. Appuyez sur Alt-Shift-H pour obtenir de l'aide" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4283 +msgid "For some strange yet very annoying reason, this post could not be edited." +msgstr "Pour une bien Ã©trange raison, cet article n’a pu Ãªtre modifiÃ©." +======= +#: wp-includes/class-wp-customize-widgets.php:633 +msgid "Save and preview changes before publishing them." +msgstr "Enregistrer les modifications et les prÃ©visualiser avant de les publier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1054 +msgid "To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons." +msgstr "Pour dÃ©placer la sÃ©lection Ã d'autres boutons, utilisez la touche Tab ou les touches flÃ©chÃ©es. Pour revenir Ã l'Ã©diteur, appuyez sur la touche Ãchapper ou utilisez l'un des boutons." +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4328 +msgid "Sorry, you do not have the right to delete this post." +msgstr "DÃ©solÃ©, vous n’avez pas l’autorisation de supprimer cet article." +======= +#: wp-includes/class-wp-customize-widgets.php:632 wp-includes/media.php:3039 +msgid "Apply" +msgstr "Appliquer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1045 +msgid "Editor toolbar" +msgstr "Barre d'outils de l'Ã©diteur" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:4333 +msgid "For some strange yet very annoying reason, this post could not be deleted." +msgstr "Pour une bien Ã©trange raison, cet article n’a pu Ãªtre supprimÃ©." +======= +#: wp-includes/class-wp-customize-widgets.php:609 +msgctxt "Move widget" +msgid "Move" +msgstr "DÃ©placer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1044 +msgid "Editor menu (when enabled)" +msgstr "Menu de l'Ãditeur (lorsqu'il est activÃ©)" +||||||| .r11156 +#: wp-comments-post.php:50 +msgid "Sorry, comments are closed for this item." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour cet article." +======= +#: wp-includes/class-wp-customize-widgets.php:608 +msgid "Select an area to move this widget into:" +msgstr "SÃ©lectionnez une zone vers laquelle dÃ©placeer ce widget :" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1046 +msgid "Elements path" +msgstr "Chemin des Ã©lÃ©ments" +||||||| .r11156 +#: wp-comments-post.php:115 +msgid "Sorry, you must be logged in to post a comment." +msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." +======= +#: wp-includes/class-wp-customize-widgets.php:602 +msgid "Move up" +msgstr "Monter" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1033 wp-includes/script-loader.php:99 +msgid "Distraction-free writing mode" +msgstr "Mode d'Ã©criture sans distraction" +||||||| .r11156 +#: wp-includes/link-template.php:2108 wp-includes/link-template.php:2151 +msgid "« Previous Page" +msgstr "« Page prÃ©cÃ©dente" +======= +#: wp-includes/class-wp-customize-widgets.php:601 +msgid "Move down" +msgstr "Descendre" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:904 +msgid "Poster" +msgstr "Couverture" +||||||| .r11156 +#: wp-includes/link-template.php:2029 wp-includes/link-template.php:2152 +msgid "Next Page »" +msgstr "Page suivante »" +======= +#: wp-includes/class-wp-customize-widgets.php:600 +msgid "Move to another area…" +msgstr "DÃ©placer vers une autre zone…" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1056 +msgid "When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo." +msgstr "Lorsque vous dÃ©marrez un nouveau paragraphe avec l'un de ces raccourcis de mise en forme suivi par une espace, la mise en forme sera appliquÃ©e automatiquement. Appuyez sur Retour arriÃ¨re ou Ãchap. pour annuler." +||||||| .r11156 +#: wp-includes/feed-atom-comments.php:32 +msgid "Comments on %s" +msgstr "Commentaires sur %s" +======= +#: wp-includes/class-wp-customize-widgets.php:346 +msgid "Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars)." +msgstr "Les widgets sont des sections de contenu indÃ©pendants qui peuvent Ãªtre placÃ©s dans les zones Ã widgets prÃ©vues dans votre thÃ¨me (gÃ©nÃ©ralement, les barres latÃ©rales)." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:1058 +msgid "The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo." +msgstr "Les raccourcis de mise en forme suivants sont remplacÃ©s en appuyant sur EntrÃ©e. Pressez Ãchap. ou le bouton Annuler pour revenir en arriÃ¨re." +||||||| .r11156 +#: wp-includes/default-widgets.php:400 wp-includes/theme-compat/sidebar.php:75 +msgid "Powered by WordPress, state-of-the-art semantic personal publishing platform." +msgstr "PropulsÃ© par WordPress, plate-forme de publication personnelle sÃ©mantique de pointe." +======= +#: wp-includes/class-wp-customize-section.php:389 +#: wp-includes/class-wp-customize-section.php:390 +msgid "Search installed themes..." +msgstr "Chercher parmi les thÃ¨mes installÃ©s..." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:855 +msgid "Select all" +msgstr "Tout sÃ©lectionner" +||||||| .r11156 +#: wp-includes/comment-template.php:1239 +msgid "Enter your password to view comments." +msgstr "Saisissez votre mot de passe pour accÃ©der aux commentaires." +======= +#: wp-includes/class-wp-customize-section.php:363 +msgctxt "theme" +msgid "Change" +msgstr "Changer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:186 +#: wp-includes/script-loader.php:430 +msgid "Cheatin’ uh?" +msgstr "Alors, on triche ?" +||||||| .r11156 +#: wp-includes/comment-template.php:737 wp-includes/comment-template.php:1226 +msgid "No Comments" +msgstr "Pas de commentaire" +======= +#. translators: %s: theme name +#: wp-includes/class-wp-customize-section.php:359 +#: wp-includes/class-wp-customize-section.php:378 +msgid "Previewing theme %s" +msgstr "PrÃ©visualisation du thÃ¨me %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1704 +#: wp-includes/class-wp-customize-nav-menus.php:737 +#: wp-includes/class-wp-editor.php:1407 wp-includes/media-template.php:377 +#: wp-includes/media-template.php:557 wp-includes/media.php:3030 +msgid "URL" +msgstr "Adresse web" +||||||| .r11156 +#: wp-includes/comment-template.php:739 wp-includes/comment-template.php:1227 +msgid "1 Comment" +msgstr "Un commentaire" +======= +#. translators: %s: theme name +#: wp-includes/class-wp-customize-section.php:356 +#: wp-includes/class-wp-customize-section.php:375 +msgid "Active theme %s" +msgstr "Theme actuel %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1487 +#: wp-includes/class-wp-editor.php:987 wp-includes/media-template.php:620 +#: wp-includes/media-template.php:851 wp-includes/media-template.php:917 +msgid "Left" +msgstr "Gauche" +||||||| .r11156 +#: wp-includes/comment-template.php:735 wp-includes/comment-template.php:1228 +msgid "% Comments" +msgstr "% commentaires" +======= +#: wp-includes/class-wp-customize-section.php:308 +msgid "Press return or enter to expand" +msgstr "Appuyez sur Envoi ou Retour pour ouvrir" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1488 +#: wp-includes/class-wp-editor.php:988 wp-includes/media-template.php:623 +#: wp-includes/media-template.php:854 wp-includes/media-template.php:920 +msgid "Center" +msgstr "Centre" +||||||| .r11156 +#: wp-includes/link-template.php:948 wp-includes/link-template.php:1214 +#: wp-includes/link-template.php:1316 wp-includes/link-template.php:1377 +msgid "Edit This" +msgstr "Modifier" +======= +#. translators: %s is the site/panel title in the Customizer +#: wp-includes/class-wp-customize-panel.php:322 +msgid "You are customizing %s" +msgstr "Vous personnalisez %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1489 +#: wp-includes/class-wp-editor.php:989 wp-includes/media-template.php:626 +#: wp-includes/media-template.php:857 wp-includes/media-template.php:923 +msgid "Right" +msgstr "Droite" +||||||| .r11156 +#: wp-includes/comment-template.php:2105 +#: wp-includes/theme-compat/comments.php:65 +msgid "You must be logged in to post a comment." +msgstr "Vous devez Ãªtre connectÃ© pour rÃ©diger un commentaire." +======= +#: wp-includes/class-wp-customize-panel.php:301 +msgid "Press return or enter to open this panel" +msgstr "Appuyer sur EntrÃ©e pour ouvrir ce panneau" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:651 wp-includes/media.php:3073 +msgid "Apply" +msgstr "Appliquer" +||||||| .r11156 +#: wp-includes/category-template.php:1199 +msgid "Tags: " +msgstr "Mots-clÃ©s : " +======= +#: wp-includes/class-wp-customize-manager.php:1488 +msgid "Posts page" +msgstr "Page des articles" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1741 +#: wp-includes/class-wp-customize-panel.php:440 +#: wp-includes/class-wp-editor.php:887 wp-includes/media-template.php:409 +#: wp-includes/media-template.php:589 +msgid "Description" +msgstr "Description" +||||||| .r11156 +#: wp-includes/post-template.php:747 +msgid "Pages:" +msgstr "Pages :" +======= +#: wp-includes/class-wp-customize-manager.php:1476 +msgid "Front page" +msgstr "Page d’accueil" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1416 +msgid "By %s" +msgstr "Par %s" +||||||| .r11156 +#: wp-includes/default-widgets.php:389 +msgid "Comments RSS" +msgstr "RSS des commentaires" +======= +#: wp-includes/class-wp-customize-manager.php:1465 +msgid "A static page" +msgstr "Une page statique" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-panel.php:375 +#: wp-includes/class-wp-customize-panel.php:469 +msgid "Help" +msgstr "Aide" +||||||| .r11156 +#: wp-includes/comment-template.php:1806 +msgid "%s says:" +msgstr "%s dit :" +======= +#: wp-includes/class-wp-customize-manager.php:1464 +msgid "Your latest posts" +msgstr "Les derniers articles" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1345 +#: wp-includes/class-wp-xmlrpc-server.php:453 +msgid "Site Title" +msgstr "Titre du site" +||||||| .r11156 +#: wp-includes/comment-template.php:1809 wp-includes/comment-template.php:1864 +msgid "Your comment is awaiting moderation." +msgstr "Votre commentaire est en attente de modÃ©ration" +======= +#: wp-includes/class-wp-customize-manager.php:1460 +msgid "Front page displays" +msgstr "La page d’accueil affiche" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:178 +msgid "Visual" +msgstr "Visuel" +||||||| .r11156 +#: wp-includes/comment-template.php:1816 +msgid "%1$s at %2$s" +msgstr "%1$s Ã %2$s" +======= +#: wp-includes/class-wp-customize-manager.php:1449 +msgid "Your theme supports a static front page." +msgstr "Le thÃ¨me actuel accepte les pages statiques." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:220 +#: wp-includes/script-loader.php:397 wp-includes/script-loader.php:623 +msgid "No results found." +msgstr "Aucun rÃ©sultat." +||||||| .r11156 +#: wp-includes/comment-template.php:1816 +msgid "(Edit)" +msgstr "(Modifier)" +======= +#: wp-includes/class-wp-customize-manager.php:1446 +msgid "Static Front Page" +msgstr "Page d’accueil statique" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:825 +msgid "Paragraph" +msgstr "Paragraphe" +||||||| .r11156 +#: wp-includes/default-widgets.php:372 wp-includes/default-widgets.php:378 +#: wp-includes/theme-compat/sidebar.php:69 +msgid "Meta" +msgstr "MÃ©ta" +======= +#: wp-includes/class-wp-customize-manager.php:1414 +msgid "You can edit your menu content on the Menus screen in the Appearance section." +msgstr "Vous pouvez modifier le contenu de votre menu par le biais de l’Ã©cran Menus, dans la section Apparence." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:816 +msgid "Heading 1" +msgstr "Titre 1" +||||||| .r11156 +#: wp-includes/atomlib.php:133 +msgid "XML error: %s at line %d" +msgstr "Erreur XML : %s Ã la ligne %d" +======= +#: wp-includes/class-wp-customize-manager.php:1411 +msgid "Navigation" +msgstr "Navigation" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:817 +msgid "Heading 2" +msgstr "Titre 2" +||||||| .r11156 +#: wp-includes/author-template.php:177 +msgid "Visit %s’s website" +msgstr "Aller sur le site de %s" +======= +#: wp-includes/class-wp-customize-manager.php:1407 +msgid "Your theme supports %s menu. Select which menu appears in each location." +msgid_plural "Your theme supports %s menus. Select which menu appears in each location." +msgstr[0] "Votre thÃ¨me peut utiliser %s menu. SÃ©lectionnez le menu qui devra apparaÃ®tre dans l’emplacement." +msgstr[1] "Votre thÃ¨me peut utiliser %s menus. SÃ©lectionnez les menu qui devront apparaÃ®tre dans chaque emplacement." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:818 +msgid "Heading 3" +msgstr "Titre 3" +||||||| .r11156 +#: wp-includes/author-template.php:251 wp-includes/author-template.php:389 +msgid "Posts by %s" +msgstr "Articles par %s" +======= +#: wp-includes/class-wp-customize-manager.php:1405 +msgid "Your theme supports one menu. Select which menu you would like to use." +msgstr "Votre thÃ¨me ne supporte qu'un seul menu. SÃ©lectionnez le menu que vous dÃ©sirez utiliser." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:819 +msgid "Heading 4" +msgstr "Titre 4" +||||||| .r11156 +#: wp-includes/bookmark-template.php:83 +msgid "Last updated: %s" +msgstr "DerniÃ¨re mise Ã jour : %s" +======= +#: wp-includes/class-wp-customize-manager.php:1386 +msgid "Fixed" +msgstr "Fixe" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:820 +msgid "Heading 5" +msgstr "Titre 5" +||||||| .r11156 +#: wp-includes/bookmark-template.php:206 +msgid "Bookmarks" +msgstr "Favoris" +======= +#: wp-includes/class-wp-customize-manager.php:1385 +msgid "Scroll" +msgstr "DÃ©filant" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:821 +msgid "Heading 6" +msgstr "Titre 6" +||||||| .r11156 +#: wp-includes/capabilities.php:964 +msgid "Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead." +msgstr "L’utilisation des niveaux d’utilisateur par les extensions et thÃ¨mes est dÃ©sormais interdite. Utiliser les rÃ´les et capacitÃ©s Ã la place." +======= +#: wp-includes/class-wp-customize-manager.php:1381 +msgid "Background Attachment" +msgstr "Image dâarriÃ¨re-plan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:826 wp-includes/script-loader.php:105 +msgid "Blockquote" +msgstr "Bloc de citation" +||||||| .r11156 +#: wp-includes/category-template.php:467 +msgid "No categories" +msgstr "Pas de catÃ©gorie" +======= +#: wp-includes/class-wp-customize-manager.php:1371 +#: wp-includes/class-wp-editor.php:947 wp-includes/media-template.php:622 +#: wp-includes/media-template.php:853 wp-includes/media-template.php:919 +msgid "Right" +msgstr "Droite" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:812 +msgid "New document" +msgstr "Nouveau document" +||||||| .r11156 +#: wp-includes/category-template.php:704 wp-includes/category-template.php:713 +msgid "%s topic" +msgid_plural "%s topics" +msgstr[0] "%s sujet" +msgstr[1] "%s sujets" +======= +#: wp-includes/class-wp-customize-manager.php:1370 +#: wp-includes/class-wp-editor.php:946 wp-includes/media-template.php:619 +#: wp-includes/media-template.php:850 wp-includes/media-template.php:916 +msgid "Center" +msgstr "Centre" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1416 +msgid "Background Color" +msgstr "Couleur d’arriÃ¨re-plan" +||||||| .r11156 +#: wp-includes/class-pop3.php:82 +msgid "No server specified" +msgstr "Aucun serveur spÃ©cifiÃ©" +======= #: wp-includes/class-wp-customize-manager.php:1369 #: wp-includes/class-wp-editor.php:945 wp-includes/media-template.php:616 #: wp-includes/media-template.php:847 wp-includes/media-template.php:913 msgid "Left" msgstr "Gauche" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1466 +msgid "Background Repeat" +msgstr "RÃ©pÃ©tition de l’arriÃ¨re-plan" +||||||| .r11156 +#: wp-includes/class-pop3.php:90 wp-includes/class-pop3.php:102 +#: wp-includes/class-pop3.php:123 wp-includes/class-pop3.php:246 +#: wp-includes/class-pop3.php:300 wp-includes/class-pop3.php:311 +#: wp-includes/class-pop3.php:359 wp-includes/class-pop3.php:393 +#: wp-includes/class-pop3.php:426 wp-includes/class-pop3.php:525 +#: wp-includes/class-pop3.php:548 +msgid "Error " +msgstr "Erreur " +======= +#: wp-includes/class-wp-customize-manager.php:1365 +msgid "Background Position" +msgstr "Position d’arriÃ¨re-plan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1470 +msgid "No Repeat" +msgstr "Pas de rÃ©pÃ©tition" +||||||| .r11156 +#: wp-includes/class-pop3.php:115 +msgid "no login ID submitted" +msgstr "pas d’identifiant de connexion envoyÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:1355 +msgid "Tile Vertically" +msgstr "RÃ©pÃ©tition verticale" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1471 +msgid "Tile" +msgstr "Motif rÃ©pÃ©tÃ©" +||||||| .r11156 +#: wp-includes/class-pop3.php:118 wp-includes/class-pop3.php:138 +msgid "connection not established" +msgstr "la connexion n’est pas Ã©tablie" +======= +#: wp-includes/class-wp-customize-manager.php:1354 +msgid "Tile Horizontally" +msgstr "RÃ©pÃ©tition horizontale" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1472 +msgid "Tile Horizontally" +msgstr "RÃ©pÃ©tition horizontale" +||||||| .r11156 +#: wp-includes/class-pop3.php:135 wp-includes/class-pop3.php:171 +msgid "No password submitted" +msgstr "Pas de mot de passe envoyÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:1353 +msgid "Tile" +msgstr "Motif rÃ©pÃ©tÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1473 +msgid "Tile Vertically" +msgstr "RÃ©pÃ©tition verticale" +||||||| .r11156 +#: wp-includes/class-pop3.php:143 +msgid "Authentication failed" +msgstr "L’authentification a Ã©chouÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:1352 +msgid "No Repeat" +msgstr "Pas de rÃ©pÃ©tition" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1483 +msgid "Background Position" +msgstr "Position d’arriÃ¨re-plan" +||||||| .r11156 +#: wp-includes/class-pop3.php:162 wp-includes/class-pop3.php:205 +#: wp-includes/class-pop3.php:230 wp-includes/class-pop3.php:272 +#: wp-includes/class-pop3.php:346 wp-includes/class-pop3.php:386 +#: wp-includes/class-pop3.php:416 wp-includes/class-pop3.php:450 +#: wp-includes/class-pop3.php:513 wp-includes/class-pop3.php:578 +msgid "No connection to server" +msgstr "Pas de connexion au serveur" +======= +#: wp-includes/class-wp-customize-manager.php:1348 +msgid "Background Repeat" +msgstr "RÃ©pÃ©tition de l’arriÃ¨re-plan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1504 +msgid "Fixed" +msgstr "Fixe" +||||||| .r11156 +#: wp-includes/class-pop3.php:168 +msgid "No login ID submitted" +msgstr "Pas d’identifiant de connexion envoyÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:1298 +msgid "Background Color" +msgstr "Couleur d’arriÃ¨re-plan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1503 +msgid "Scroll" +msgstr "DÃ©filant" +||||||| .r11156 +#: wp-includes/class-pop3.php:176 +msgid "No server banner" +msgstr "Pas de blocage serveur" +======= +#: wp-includes/class-wp-customize-manager.php:1283 +msgid "Header Text Color" +msgstr "Couleur du texte d’en-tÃªte" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1522 +msgid "Static Front Page" +msgstr "Page d’accueil statique" +||||||| .r11156 +#: wp-includes/class-pop3.php:176 wp-includes/class-pop3.php:186 +msgid "abort" +msgstr "abandonner" +======= +#: wp-includes/class-wp-customize-manager.php:1277 +msgid "Display Header Text" +msgstr "Afficher le texte d’en-tÃªte" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1525 +msgid "Your theme supports a static front page." +msgstr "Le thÃ¨me actuel accepte les pages statiques." +||||||| .r11156 +#: wp-includes/class-pop3.php:186 +msgid "apop authentication failed" +msgstr "l’identification APOP a Ã©chouÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:1261 +msgid "Colors" +msgstr "Couleurs" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1536 +msgid "Front page displays" +msgstr "La page d’accueil affiche" +||||||| .r11156 +#: wp-includes/class-pop3.php:323 +msgid "Premature end of list" +msgstr "Fin de liste inattendue" +======= +#: wp-includes/class-wp-customize-manager.php:1254 +msgid "Tagline" +msgstr "Slogan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1540 +msgid "Your latest posts" +msgstr "Les derniers articles" +||||||| .r11156 +#: wp-includes/class-pop3.php:456 +msgid "Empty command string" +msgstr "ChaÃ®ne de commande vide" +======= +#: wp-includes/class-wp-customize-manager.php:1243 +#: wp-includes/class-wp-xmlrpc-server.php:431 +msgid "Site Title" +msgstr "Titre du site" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1541 +msgid "A static page" +msgstr "Une page statique" +||||||| .r11156 +#: wp-includes/class-pop3.php:476 +msgid "connection does not exist" +msgstr "la connexion n’existe pas" +======= +#: wp-includes/class-wp-customize-manager.php:1232 +msgid "Site Title & Tagline" +msgstr "Titre de site et slogan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1552 +msgid "Front page" +msgstr "Page d’accueil" +||||||| .r11156 +#: wp-includes/class-pop3.php:583 +msgid "No msg number submitted" +msgstr "Pas de numÃ©ro de message envoyÃ©" +======= +#: wp-includes/class-wp-customize-manager.php:603 +msgid "Loading ..." +msgstr "Chargement..." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1564 +msgid "Posts page" +msgstr "Page des articles" +||||||| .r11156 +#: wp-includes/class-pop3.php:589 +msgid "Command failed " +msgstr "Ãchec de la commande " +======= +#: wp-includes/class-wp-customize-manager.php:159 +#: wp-includes/script-loader.php:399 +msgid "Cheatin’ uh?" +msgstr "Alors, on triche ?" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1356 +msgid "Tagline" +msgstr "Slogan" +||||||| .r11156 +#: wp-includes/category-template.php:1000 +msgid "Feed for all posts filed under %s" +msgstr "Flux pour tous les articles classÃ©s dans %s" +======= +#: wp-includes/class-wp-customize-control.php:1317 +msgctxt "Cancel reordering widgets in Customizer" +msgid "Done" +msgstr "TerminÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1378 +msgid "Colors" +msgstr "Couleurs" +||||||| .r11156 +#: wp-includes/comment-template.php:1229 +msgid "Comments Off" +msgstr "Commentaires fermÃ©s" +======= +#: wp-includes/class-wp-customize-control.php:1316 +msgctxt "Reorder widgets in Customizer" +msgid "Reorder" +msgstr "RÃ©ordonner" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1394 +msgid "Display Header Text" +msgstr "Afficher le texte d’en-tÃªte" +||||||| .r11156 +#: wp-includes/comment-template.php:1274 +msgid "Comment on %s" +msgstr "Commentaire sur %s" +======= +#: wp-includes/class-wp-customize-control.php:1312 +msgid "Add a Widget" +msgstr "Ajouter un Widget" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1401 +msgid "Header Text Color" +msgstr "Couleur du texte d’en-tÃªte" +||||||| .r11156 +#: wp-includes/comment-template.php:1311 +msgid "Log in to Reply" +msgstr "Connectez-vous pour rÃ©pondre" +======= +#: wp-includes/class-wp-customize-control.php:1282 +#: wp-includes/class-wp-customize-section.php:384 +msgid "Theme Details" +msgstr "DÃ©tails du thÃ¨me" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:180 +msgctxt "Name for the Text editor tab (formerly HTML)" +msgid "Text" +msgstr "Texte" +||||||| .r11156 +#: wp-includes/comment-template.php:1399 +msgid "Leave a Comment" +msgstr "Laisser un commentaire" +======= +#. translators: %s: theme name +#: wp-includes/class-wp-customize-control.php:1276 +msgid "Active: %s" +msgstr "ActivÃ© : %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %d: ID of a post +#: wp-includes/class-wp-customize-nav-menus.php:137 +#: wp-includes/class-wp-customize-nav-menus.php:266 +#: wp-includes/nav-menu.php:716 wp-includes/nav-menu.php:780 +#: wp-includes/post-template.php:1422 wp-includes/post-template.php:1513 +msgid "#%d (no title)" +msgstr "#%d (pas de titre)" +||||||| .r11156 +#: wp-includes/comment-template.php:1400 +msgid "Log in to leave a Comment" +msgstr "Connectez-vous pour laisser un commentaire" +======= +#: wp-includes/class-wp-customize-control.php:1270 +msgid "By %s" +msgstr "Par %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:813 +msgctxt "TinyMCE" +msgid "Formats" +msgstr "Formats" +||||||| .r11156 +#: wp-includes/comment-template.php:1457 +msgid "Click here to cancel reply." +msgstr "Cliquez ici pour annuler la rÃ©ponse." +======= +#: wp-includes/class-wp-customize-control.php:1267 +msgid "Live Preview" +msgstr "PrÃ©visualisation en direct" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: block tags +#: wp-includes/class-wp-editor.php:824 +msgctxt "TinyMCE" +msgid "Blocks" +msgstr "Blocs" +||||||| .r11156 +#: wp-includes/comment-template.php:1543 wp-includes/comment-template.php:2113 +#: wp-includes/theme-compat/comments.php:58 +msgid "Leave a Reply" +msgstr "Laisser un commentaire" +======= +#: wp-includes/class-wp-customize-control.php:1178 +msgctxt "custom headers" +msgid "Suggested" +msgstr "SuggÃ©rÃ©s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:827 +msgctxt "HTML tag" +msgid "Div" +msgstr "Div" +||||||| .r11156 +#: wp-includes/comment-template.php:1544 wp-includes/comment-template.php:2114 +#: wp-includes/theme-compat/comments.php:58 +msgid "Leave a Reply to %s" +msgstr "RÃ©pondre Ã %s" +======= +#: wp-includes/class-wp-customize-control.php:1171 +msgctxt "custom headers" +msgid "Previously uploaded" +msgstr "PrÃ©cÃ©demment chargÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:828 +msgctxt "HTML tag" +msgid "Pre" +msgstr "Pre" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:815 wp-includes/theme-compat/sidebar.php:21 +msgid "Author" +msgstr "Auteur" +======= +#. translators: New as in add new header image via the Customizer +#: wp-includes/class-wp-customize-control.php:1166 +msgctxt "header image" +msgid "Add new image" +msgstr "Ajouter une nouvelle image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:621 +msgid "Move to another area…" +msgstr "DÃ©placer vers une autre zone…" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1385 wp-includes/media-template.php:360 +#: wp-includes/media-template.php:537 wp-includes/media.php:2902 +msgid "URL" +msgstr "Adresse web" +======= +#. translators: Hide as in hide header image via the Customizer +#: wp-includes/class-wp-customize-control.php:1164 +msgctxt "custom header" +msgid "Hide image" +msgstr "Cacher l’image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:703 +#: wp-includes/class-wp-customize-panel.php:369 +#: wp-includes/class-wp-customize-panel.php:459 +#: wp-includes/class-wp-customize-section.php:356 +#: wp-includes/class-wp-customize-widgets.php:688 wp-includes/media.php:3038 +msgid "Back" +msgstr "Retour" +||||||| .r11156 +#: wp-includes/comment-template.php:888 wp-includes/comment-template.php:2103 +msgctxt "noun" +msgid "Comment" +msgstr "Commentaire" +======= +#: wp-includes/class-wp-customize-control.php:1157 +msgid "Current header" +msgstr "En-tÃªte actuel" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1461 +#: wp-includes/class-wp-customize-widgets.php:695 +msgid "Add a Widget" +msgstr "Ajouter un Widget" +||||||| .r11156 +#: wp-includes/deprecated.php:3180 wp-includes/functions.php:2322 +msgid "Are you sure you want to do this?" +msgstr "Voulez-vous vraiment faire cela ?" +======= +#: wp-includes/class-wp-customize-control.php:1151 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header height of %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une hauteur de %s pixels pour l’en-tÃªte." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:682 +#: wp-includes/class-wp-customize-widgets.php:622 +msgid "Move down" +msgstr "Descendre" +||||||| .r11156 +#: wp-includes/comment-template.php:1774 wp-includes/comment-template.php:1860 +#: wp-includes/media-template.php:576 +msgid "Edit" +msgstr "Modifier" +======= +#: wp-includes/class-wp-customize-control.php:1149 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header width of %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une largeur de %s pixels pour l’en-tÃªte." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:681 +#: wp-includes/class-wp-customize-widgets.php:623 +msgid "Move up" +msgstr "Monter" +||||||| .r11156 +#: wp-includes/media.php:3023 +msgid "No media attachments found." +msgstr "Il n’y a pas de fichier mÃ©dia attachÃ©." +======= +#: wp-includes/class-wp-customize-control.php:1147 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header size of %s × %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une taille de %s × %s pixels pour l’en-tÃªte." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1303 +msgid "Current header" +msgstr "En-tÃªte actuel" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:783 +#: wp-includes/js/tinymce/wp-mce-help.php:112 +msgid "Undo" +msgstr "Annuler" +======= +#: wp-includes/class-wp-customize-control.php:1116 +msgid "No image set" +msgstr "Pas de jeu d’images" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1324 +msgctxt "custom headers" +msgid "Suggested" +msgstr "SuggÃ©rÃ©s" +||||||| .r11156 +#: wp-includes/class-wp-customize-widgets.php:724 wp-includes/media.php:2946 +msgid "Apply" +msgstr "Appliquer" +======= +#: wp-includes/class-wp-customize-control.php:1100 +msgid "Randomizing suggested headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes suggÃ©rÃ©s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:655 +#: wp-includes/script-loader.php:604 +msgid "An error has occurred. Please reload the page and try again." +msgstr "Une erreur est survenue. Veuillez recharger la page et rÃ©essayer." +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:33 +msgid "Comments" +msgstr "Commentaires" +======= +#: wp-includes/class-wp-customize-control.php:1098 +msgid "Randomizing uploaded headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes chargÃ©s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1243 +msgid "Randomizing suggested headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes suggÃ©rÃ©s" +||||||| .r11156 +#: wp-includes/script-loader.php:447 +msgid "Publish" +msgstr "Publier" +======= +#: wp-includes/class-wp-customize-control.php:1083 +msgid "Set image" +msgstr "DÃ©finir l’image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1241 +msgid "Randomizing uploaded headers" +msgstr "Rendre alÃ©atoire les en-tÃªtes chargÃ©s" +||||||| .r11156 +#: wp-includes/revision.php:31 +msgid "Excerpt" +msgstr "Extrait" +======= +#: wp-includes/class-wp-customize-control.php:1070 +msgid "Randomize suggested headers" +msgstr "En-tÃªtes suggÃ©rÃ©s alÃ©atoires" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1317 +msgctxt "custom headers" +msgid "Previously uploaded" +msgstr "PrÃ©cÃ©demment chargÃ©" +||||||| .r11156 +#: wp-includes/post.php:82 +msgid "Revisions" +msgstr "RÃ©visions" +======= +#: wp-includes/class-wp-customize-control.php:1068 +msgid "Randomize uploaded headers" +msgstr "En-tÃªtes chargÃ©s alÃ©atoires" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:630 +msgctxt "Move widget" +msgid "Move" +msgstr "DÃ©placer" +||||||| .r11156 +#: wp-includes/comment.php:534 +msgctxt "adjective" +msgid "Approved" +msgstr "ApprouvÃ©" +======= +#: wp-includes/class-wp-customize-control.php:1012 +#: wp-includes/class-wp-customize-manager.php:1306 +msgid "Header Image" +msgstr "Image d’en-tÃªte" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1226 +msgid "Set image" +msgstr "DÃ©finir l’image" +||||||| .r11156 +#: wp-includes/comment.php:536 +msgctxt "adjective" +msgid "Spam" +msgstr "IndÃ©sirable" +======= +#: wp-includes/class-wp-customize-control.php:974 +#: wp-includes/class-wp-customize-manager.php:1326 +msgid "Background Image" +msgstr "Image dâarriÃ¨re-plan" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1466 +msgctxt "Cancel reordering widgets in Customizer" +msgid "Done" +msgstr "TerminÃ©" +||||||| .r11156 +#: wp-includes/taxonomy.php:89 +msgid "Link Categories" +msgstr "CatÃ©gories de liens" +======= +#: wp-includes/class-wp-customize-control.php:916 wp-includes/media.php:3072 +msgid "Choose Image" +msgstr "Choisir une image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:652 +msgid "Save and preview changes before publishing them." +msgstr "Enregistrer les modifications et les prÃ©visualiser avant de les publier" +||||||| .r11156 +#: wp-includes/taxonomy.php:477 +msgid "Search Categories" +msgstr "Chercher une catÃ©gorie" +======= +#: wp-includes/class-wp-customize-control.php:914 +msgid "No image selected" +msgstr "Aucune image sÃ©lectionnÃ©e" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:815 +msgctxt "TinyMCE" +msgid "Headings" +msgstr "En-tÃªtes" +||||||| .r11156 +#: wp-includes/taxonomy.php:94 +msgid "Edit Link Category" +msgstr "Modifier la catÃ©gorie de lien" +======= +#: wp-includes/class-wp-customize-control.php:911 +msgid "Change Image" +msgstr "Changer l’image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1259 +msgid "No image set" +msgstr "Pas de jeu d’images" +||||||| .r11156 +#: wp-includes/taxonomy.php:484 +msgid "Update Category" +msgstr "Mettre Ã jour la catÃ©gorie" +======= +#: wp-includes/class-wp-customize-control.php:910 +#: wp-includes/class-wp-customize-control.php:915 +msgid "Select Image" +msgstr "SÃ©lectionner une image" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:830 +msgctxt "HTML tag" +msgid "Address" +msgstr "Adresse" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1426 wp-includes/script-loader.php:359 +msgid "Add Link" +msgstr "Ajouter un lien" +======= +#: wp-includes/class-wp-customize-control.php:693 +msgid "Choose File" +msgstr "Choisissez un fichier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:1016 +msgid "Shift-click to edit this widget." +msgstr "Faites Shift+clic pour modifier ce widget." +||||||| .r11156 +#: wp-includes/class-wp-editor.php:847 wp-includes/class-wp-editor.php:1188 +msgid "Save" +msgstr "Enregistrer" +======= +#: wp-includes/class-wp-customize-control.php:691 +msgid "No file selected" +msgstr "Aucun fichier sÃ©lectionnÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1334 +msgid "Site Identity" +msgstr "IdentitÃ© du site" +||||||| .r11156 +#: wp-includes/category-template.php:475 wp-includes/default-widgets.php:542 +#: wp-includes/default-widgets.php:548 wp-includes/theme-compat/sidebar.php:63 +msgid "Categories" +msgstr "CatÃ©gories" +======= +#: wp-includes/class-wp-customize-control.php:690 +#: wp-includes/class-wp-customize-control.php:912 +#: wp-includes/class-wp-customize-widgets.php:634 +#: wp-includes/class-wp-editor.php:993 wp-includes/media-template.php:470 +#: wp-includes/media-template.php:1047 wp-includes/media-template.php:1061 +#: wp-includes/media-template.php:1130 wp-includes/media-template.php:1142 +#: wp-includes/media-template.php:1163 wp-includes/media-template.php:1195 +#: wp-includes/media.php:3003 +msgid "Remove" +msgstr "Supprimer" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1310 +msgid "Hide image" +msgstr "Masquer l’image" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:820 +msgid "Advanced" +msgstr "AvancÃ©" +======= +#: wp-includes/class-wp-customize-control.php:688 +msgid "Change File" +msgstr "Changer le fichier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1310 +msgid "Hide header image" +msgstr "Masquer l’image d’en-tÃªte" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:814 wp-includes/media-template.php:390 +#: wp-includes/media-template.php:567 +msgid "Description" +msgstr "Description" +======= +#: wp-includes/class-wp-customize-control.php:687 +#: wp-includes/class-wp-customize-control.php:692 +msgid "Select File" +msgstr "SÃ©lectionner un fichier" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1311 +msgid "Add new header image" +msgstr "Ajouter une nouvelle image d’en-tÃªte" +||||||| .r11156 +#: wp-includes/deprecated.php:707 wp-includes/media-template.php:607 +#: wp-includes/media-template.php:653 wp-includes/media-template.php:712 +#: wp-includes/media-template.php:813 wp-includes/media-template.php:828 +#: wp-includes/media-template.php:879 wp-includes/media-template.php:941 +#: wp-includes/media-template.php:1039 wp-includes/media-template.php:1129 +#: wp-includes/script-loader.php:315 +msgid "None" +msgstr "Aucun" +======= +#: wp-includes/class-wp-customize-control.php:633 +msgid "Hex Value" +msgstr "Valeur hexadÃ©cimale" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1311 +msgid "Add new image" +msgstr "Ajouter une nouvelle image" +||||||| .r11156 +#: wp-includes/class-wp-xmlrpc-server.php:1722 +#: wp-includes/class-wp-xmlrpc-server.php:1811 +#: wp-includes/class-wp-xmlrpc-server.php:1904 +#: wp-includes/class-wp-xmlrpc-server.php:1972 +#: wp-includes/class-wp-xmlrpc-server.php:2026 +#: wp-includes/class-wp-xmlrpc-server.php:2115 wp-includes/taxonomy.php:589 +#: wp-includes/taxonomy.php:961 wp-includes/taxonomy.php:1113 +#: wp-includes/taxonomy.php:1276 wp-includes/taxonomy.php:2223 +#: wp-includes/taxonomy.php:2400 wp-includes/taxonomy.php:2624 +#: wp-includes/taxonomy.php:2919 +msgid "Invalid taxonomy" +msgstr "La taxinomie est invalide" +======= +#: wp-includes/class-wp-customize-control.php:576 +#: wp-includes/class-wp-customize-control.php:689 +#: wp-includes/class-wp-customize-control.php:913 +#: wp-includes/script-loader.php:553 +msgid "Default" +msgstr "Valeur par dÃ©faut" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1367 +msgid "Site Icon" +msgstr "IcÃ´ne du site" +||||||| .r11156 +#: wp-includes/taxonomy.php:482 +msgid "Edit Tag" +msgstr "Modifier le mot-clÃ©" +======= +#: wp-includes/class-wp-customize-control.php:481 +#: wp-includes/class-wp-customize-manager.php:1418 +#: wp-includes/default-widgets.php:1418 +msgid "— Select —" +msgstr "— SÃ©lectionner —" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:351 +msgid "Reorder mode closed" +msgstr "Mode de rÃ©arrangement fermÃ©" +||||||| .r11156 +#: wp-includes/post.php:1624 +msgctxt "post" +msgid "Add New" +msgstr "Ajouter" +======= +#: wp-includes/class-wp-admin-bar.php:370 +msgid "Toolbar" +msgstr "Barre d’outils" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:350 +msgid "Reorder mode enabled" +msgstr "Mode de rÃ©arrangement activÃ©" +||||||| .r11156 +#: wp-includes/post.php:1628 +msgid "View Post" +msgstr "Afficher l’article" +======= +#: wp-includes/class-wp-admin-bar.php:368 +msgid "Skip to toolbar" +msgstr "Aller Ã la barre d’outils" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1465 +msgctxt "Reorder widgets in Customizer" +msgid "Reorder" +msgstr "RÃ©arranger" +||||||| .r11156 +#: wp-includes/post.php:1626 +msgid "Edit Post" +msgstr "Modifier l’article" +======= +#: wp-includes/class-wp-admin-bar.php:108 +msgid "The menu ID should not be empty." +msgstr "L’identifiant du menu ne devrait pas Ãªtre vide." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1598 +msgctxt "Current menu location" +msgid "(Current: %s)" +msgstr "(Actuellement : %s)" + +#: wp-includes/class-wp-customize-control.php:1591 +msgid "Menu locations" +msgstr "Emplacements de menus" + +#: wp-includes/class-wp-customize-nav-menus.php:335 +msgid "Menu item moved up" +msgstr "L&rsquoÃ©lÃ©ment du menu a Ã©tÃ© dÃ©placÃ© vers le haut" + +#: wp-includes/class-wp-customize-nav-menus.php:334 +msgid "Menu deleted" +msgstr "L&rsquoÃ©lÃ©ment du menu a Ã©tÃ© supprimÃ©" + +#: wp-includes/class-wp-customize-nav-menus.php:337 +msgid "Menu item moved out of submenu" +msgstr "L'Ã©lÃ©ment du menu a Ã©tÃ© dÃ©placÃ© hors du sous-menu" + +#: wp-includes/class-wp-customize-nav-menus.php:333 +msgid "Menu created" +msgstr "Menu crÃ©Ã©" + +#: wp-includes/class-wp-customize-nav-menus.php:338 +msgid "Menu item is now a sub-item" +msgstr "L’Ã©lÃ©ment du menu est maintenant un sous-Ã©lÃ©ment" + +#: wp-includes/class-wp-customize-nav-menus.php:346 +msgid "Post Type" +msgstr "Type d’article" + +#: wp-includes/class-wp-customize-nav-menus.php:474 +msgid "Menu Locations" +msgstr "Emplacements de menus" + +#: wp-includes/class-wp-customize-nav-menus.php:471 +msgid "You can also place menus in widget areas with the Custom Menu widget." +msgstr "Vous pouvez aussi ajouter des menus dans des zones de widgets avec le widget Menu PersonnalisÃ©." + +#: wp-includes/class-wp-customize-nav-menus.php:470 +msgid "Your theme contains %s menu location. Select which menu you would like to use." +msgid_plural "Your theme contains %s menu locations. Select which menu appears in each location." +msgstr[0] "Votre thÃ¨me possÃ¨de %s emplacement de menu. SÃ©lectionnez le menu que vous souhaitez utiliser." +msgstr[1] "Votre thÃ¨me possÃ¨de %s emplacements de menu. SÃ©lectionnez le menu Ã afficher dans chacun d'eux." + +#. translators: 1: Title of a menu item, 2: Type of a menu item +#: wp-includes/class-wp-customize-nav-menus.php:668 +msgid "Add to menu: %1$s (%2$s)" +msgstr "Ajouter au menu : %1$s (%2$s)" + +#: wp-includes/class-wp-customize-control.php:1220 +msgid "Remove image" +msgstr "Retirer l’image" + +#: wp-includes/class-wp-customize-nav-menus.php:347 +msgid "Number of items found: %d" +msgstr "Nombre d'Ã©lÃ©ment(s) trouvÃ©(s) : %d" + +#: wp-includes/class-wp-customize-nav-menus.php:349 +msgid "Loading more results... please wait." +msgstr "Chargement de plus de rÃ©sultats... Veuillez patienter." + +#: wp-includes/class-wp-customize-control.php:1578 +msgctxt "Reorder menu items in Customizer" +msgid "Reorder" +msgstr "RÃ©ordonner" + +#: wp-includes/class-wp-customize-control.php:1579 +msgctxt "Cancel reordering menu items in Customizer" +msgid "Done" +msgstr "TerminÃ©" +||||||| .r11156 +#: wp-includes/script-loader.php:531 +msgid "Done" +msgstr "TerminÃ©" +======= +#: wp-includes/class-http.php:1114 wp-includes/class-http.php:1530 +msgid "Failed to write request to temporary file." +msgstr "Impossible d’Ã©crire la requÃªte dans un fichier temporaire." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1575 +msgid "Add Items" +msgstr "Ajouter des Ã©lÃ©ments" +||||||| .r11156 +#: wp-includes/class-wp-theme.php:667 wp-includes/comment-template.php:29 +msgid "Anonymous" +msgstr "Anonyme" +======= +#: wp-includes/class-http.php:1086 wp-includes/class-http.php:1462 +msgid "Could not open handle for fopen() to %s" +msgstr "Impossible d’ouvrir le gestionnaire de fopen() pour %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:332 +msgid "Menu item deleted" +msgstr "ÃlÃ©ment du menu supprimÃ©" +||||||| .r11156 +#: wp-includes/post-template.php:1567 +msgid "Submit" +msgstr "Envoyer" +======= +#: wp-includes/class-http.php:1014 wp-includes/class-http.php:1022 +msgid "The SSL certificate for the host could not be verified." +msgstr "Le certificat SSL de l’hÃ´te n’a pas pu Ãªtre vÃ©rifiÃ©." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:331 +msgid "Menu item added" +msgstr "ÃlÃ©ment du menu ajoutÃ©" +||||||| .r11156 +#: wp-includes/default-widgets.php:930 +msgid "RSS" +msgstr "Flux" +======= +#: wp-includes/class-http.php:813 wp-includes/class-http.php:1505 +#: wp-includes/class-http.php:1544 +msgid "Too many redirects." +msgstr "Trop de redirections." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:336 +msgid "Menu item moved down" +msgstr "L'Ã©lÃ©ment du menu a Ã©tÃ© dÃ©placÃ© vers le bas" +||||||| .r11156 +#: wp-includes/functions.php:1936 +msgid "Invalid file type" +msgstr "Type du fichier non valide" +======= +#: wp-includes/class-http.php:353 +msgid "There are no HTTP transports available which can complete the requested request." +msgstr "Il n’y a pas de transport HTTP disponible pour mener Ã bien la requÃªte demandÃ©e." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:345 +msgid "Taxonomy" +msgstr "Taxinomie" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:845 +msgid "Preview" +msgstr "AperÃ§u" +======= +#: wp-includes/class-http.php:224 +msgid "Destination directory for file streaming does not exist or is not writable." +msgstr "Le dossier de destination pour la diffusion de fichier n’existe pas ou n’est pas accessible en Ã©criture." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:712 +msgid "Add Menu Items" +msgstr "Ajouter des Ã©lÃ©ments au menu" +||||||| .r11156 +#: wp-includes/default-widgets.php:784 wp-includes/default-widgets.php:838 +msgid "Recent Comments" +msgstr "Commentaires rÃ©cents" +======= +#: wp-includes/class-http.php:196 +msgid "User has blocked requests through HTTP." +msgstr "L’utilisateur a bloquÃ© les requÃªtes HTTP." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:717 +msgid "Search Menu Items" +msgstr "Rechercher dans les Ã©lÃ©ments du menu" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:787 wp-includes/class-wp-editor.php:1423 +#: wp-includes/media.php:2906 wp-includes/script-loader.php:388 +#: wp-includes/script-loader.php:439 +msgid "Cancel" +msgstr "Annuler" +======= +#: wp-includes/class-http.php:193 wp-includes/class-wp-xmlrpc-server.php:5703 +msgid "A valid URL was not provided." +msgstr "L’URL fournie est invalide." +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: ▸ is the unicode right-pointing triangle, and %s is the +#. section title in the Customizer +#: wp-includes/class-wp-customize-nav-menus.php:340 +#: wp-includes/class-wp-customize-nav-menus.php:709 +#: wp-includes/class-wp-customize-section.php:234 +#: wp-includes/class-wp-customize-widgets.php:693 +msgid "Customizing ▸ %s" +msgstr "Personnalisation ▸ %s" +||||||| .r11156 +#: wp-includes/revision.php:30 +msgid "Content" +msgstr "Contenu" +======= +#: wp-includes/category-template.php:1248 +msgid "Tags: " +msgstr "Ãtiquettes : " +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:684 +msgid "Move one level down" +msgstr "DÃ©placer un niveau vers le bas" +||||||| .r11156 +#: wp-includes/default-widgets.php:1234 +msgid "Tags" +msgstr "Mots-clÃ©s" +======= +#: wp-includes/category-template.php:1024 +msgid "Feed for all posts filed under %s" +msgstr "Flux pour tous les articles classÃ©s dans %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:683 +msgid "Move one level up" +msgstr "DÃ©placer un niveau vers le haut" +||||||| .r11156 +#: wp-includes/script-loader.php:451 +msgid "Save Draft" +msgstr "Enregistrer brouillon" +======= +#: wp-includes/category-template.php:723 wp-includes/category-template.php:732 +msgid "%s topic" +msgid_plural "%s topics" +msgstr[0] "%s sujet" +msgstr[1] "%s sujets" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1365 -msgid "Background Position" -msgstr "Position d’arriÃ¨re-plan" +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:570 +msgid "New menu name" +msgstr "Nom du nouveau menu" +||||||| .r11156 +#: wp-includes/theme-compat/comments-popup.php:61 +msgid "No comments yet." +msgstr "Pas encore de commentaire." +======= +#: wp-includes/category-template.php:494 wp-includes/default-widgets.php:564 +#: wp-includes/default-widgets.php:570 wp-includes/theme-compat/sidebar.php:63 +msgid "Categories" +msgstr "CatÃ©gories" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:553 +msgid "Add a Menu" +msgstr "Ajouter un menu" +||||||| .r11156 +#: wp-includes/comment-template.php:1310 wp-includes/script-loader.php:429 +msgid "Reply" +msgstr "RÃ©pondre" +======= +#: wp-includes/category-template.php:486 +msgid "No categories" +msgstr "Aucune catÃ©gorie" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:718 +msgid "Search menu items…" +msgstr "Rechercher des Ã©lÃ©ments de menu…" +||||||| .r11156 +#: wp-includes/comment-template.php:890 +msgid "Pingback" +msgstr "Ping" +======= +#: wp-includes/category-template.php:171 +msgid "Uncategorized" +msgstr "Non classÃ©" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-section.php:236 +#: wp-includes/class-wp-customize-section.php:420 +msgid "Customizing" +msgstr "Personnalisation" +||||||| .r11156 +#: wp-includes/comment-template.php:889 +msgid "Trackback" +msgstr "RÃ©trolien" +======= +#: wp-includes/capabilities.php:993 +msgid "Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead." +msgstr "L’utilisation des niveaux d’utilisateur par les extensions et thÃ¨mes est dÃ©sormais interdite. Utiliser les rÃ´les et capacitÃ©s Ã la place." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-panel.php:472 +msgid "Menu Options" +msgstr "Options du menu" +||||||| .r11156 +#: wp-includes/default-widgets.php:914 +msgid "Number of comments to show:" +msgstr "Nombre de commentaires Ã afficher :" +======= +#: wp-includes/capabilities.php:640 wp-includes/capabilities.php:662 +#: wp-includes/capabilities.php:688 +msgid "Use WP_User->ID instead." +msgstr "Utilisez plutÃ´t WP_User->ID." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1355 -msgid "Tile Vertically" -msgstr "RÃ©pÃ©tition verticale" +<<<<<<< .mine +#: wp-includes/class-wp-editor.php:829 +msgctxt "HTML tag" +msgid "Preformatted" +msgstr "PrÃ©formatÃ©" +||||||| .r11156 +#: wp-includes/default-widgets.php:1021 +msgid "RSS Error: %s" +msgstr "Erreur RSS : %s" +======= +#: wp-includes/bookmark-template.php:206 +msgid "Bookmarks" +msgstr "Favoris" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1354 -msgid "Tile Horizontally" -msgstr "RÃ©pÃ©tition horizontale" +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:455 +msgid "Menus can be displayed in locations defined by your theme or in widget areas by adding a “Custom Menu” widget." +msgstr "Les menus peuvent Ãªtre affichÃ©s dans les emplacements dÃ©finis par votre thÃ¨me ou dans des zones de widget en ajoutant un widget de « Menu personnalisÃ© »." +||||||| .r11156 +#: wp-includes/default-widgets.php:964 +msgid "Unknown Feed" +msgstr "Flux inconnu" +======= +#: wp-includes/bookmark-template.php:83 +msgid "Last updated: %s" +msgstr "DerniÃ¨re mise Ã jour : %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: 1: original menu name, 2: duplicate count +#: wp-includes/class-wp-customize-setting.php:1919 +msgid "%1$s (%2$d)" +msgstr "%1$s (%2$d)" +||||||| .r11156 +#: wp-includes/admin-bar.php:687 +msgid "Header" +msgstr "En-tÃªte" +======= +#: wp-includes/author-template.php:234 wp-includes/author-template.php:372 +msgid "Posts by %s" +msgstr "Articles par %s" -#: wp-includes/class-wp-customize-manager.php:1353 -msgid "Tile" -msgstr "Motif rÃ©pÃ©tÃ©" +#: wp-includes/author-template.php:168 +msgid "Visit %s’s website" +msgstr "Aller sur le site de %s" -#: wp-includes/class-wp-customize-manager.php:1352 -msgid "No Repeat" -msgstr "Pas de rÃ©pÃ©tition" +#: wp-includes/author-template.php:62 +msgid "Use get_the_author() instead if you do not want the value echoed." +msgstr "Utilisez plutÃ´t get_the_author() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." -#: wp-includes/class-wp-customize-manager.php:1348 -msgid "Background Repeat" -msgstr "RÃ©pÃ©tition de l’arriÃ¨re-plan" +#: wp-includes/atomlib.php:133 +msgid "XML error: %s at line %d" +msgstr "Erreur XML : %s Ã la ligne %d" -#: wp-includes/class-wp-customize-manager.php:1298 -msgid "Background Color" -msgstr "Couleur d’arriÃ¨re-plan" +#: wp-includes/admin-bar.php:820 wp-includes/admin-bar.php:821 +#: wp-includes/class-wp-editor.php:1457 wp-includes/media.php:2998 +msgid "Search" +msgstr "Recherche" -#: wp-includes/class-wp-customize-manager.php:1283 -msgid "Header Text Color" -msgstr "Couleur du texte d’en-tÃªte" +#: wp-includes/admin-bar.php:758 wp-includes/admin-bar.php:769 +msgid "Header" +msgstr "En-tÃªte" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:457 +msgid "Menus can be displayed in locations defined by your theme." +msgstr "Les menus peuvent Ãªtre affichÃ©s dans les emplacements dÃ©finis par votre thÃ¨me." +||||||| .r11156 +#: wp-includes/widgets.php:577 +msgid "Sidebar" +msgstr "Colonne latÃ©rale" +======= +#: wp-includes/admin-bar.php:734 wp-includes/admin-bar.php:745 +msgid "Background" +msgstr "ArriÃ¨re-plan" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1277 -msgid "Display Header Text" -msgstr "Afficher le texte d’en-tÃªte" +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1574 +msgid "Add or remove menu items" +msgstr "Ajouter ou supprimer des Ã©lÃ©ments de menu" +||||||| .r11156 +#: wp-includes/default-widgets.php:272 wp-includes/default-widgets.php:280 +#: wp-includes/theme-compat/sidebar.php:57 +msgid "Archives" +msgstr "Archives" +======= +#: wp-includes/admin-bar.php:728 +msgid "Menus" +msgstr "Menus" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-section.php:412 +#: wp-includes/class-wp-customize-section.php:429 +msgid "Previewing theme" +msgstr "PrÃ©visualisation du thÃ¨me" +||||||| .r11156 +#: wp-includes/general-template.php:406 wp-login.php:871 +msgid "Password" +msgstr "Mot de passe" +======= +#: wp-includes/admin-bar.php:707 wp-includes/admin-bar.php:718 +#: wp-includes/class-wp-customize-widgets.php:345 +#: wp-includes/functions.php:3268 +msgid "Widgets" +msgstr "Widgets" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:326 +#: wp-includes/class-wp-customize-setting.php:1837 +msgctxt "Missing menu name." +msgid "(unnamed)" +msgstr "(sans nom)" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:784 +#: wp-includes/js/tinymce/wp-mce-help.php:112 +msgid "Redo" +msgstr "RÃ©tablir" +======= +#: wp-includes/admin-bar.php:690 +#: wp-includes/class-wp-customize-control.php:1265 +#: wp-includes/class-wp-customize-section.php:381 +msgid "Customize" +msgstr "Personnaliser" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1718 +msgid "Open link in a new tab" +msgstr "Ouvrir le lien dans un nouvel onglet" +||||||| .r11156 +#: wp-includes/media-template.php:672 wp-includes/media-template.php:896 +#: wp-includes/media.php:2674 +msgid "Thumbnail" +msgstr "Miniature" +======= +#: wp-includes/admin-bar.php:636 +msgid "%s comment awaiting moderation" +msgid_plural "%s comments awaiting moderation" +msgstr[0] "%s commentaire en attente de modÃ©ration" +msgstr[1] "%s commentaires en attente de modÃ©ration" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1261 -msgid "Colors" -msgstr "Couleurs" +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:699 +msgid "Search Widgets" +msgstr "Rechercher des widgets" +||||||| .r11156 +#: wp-includes/deprecated.php:3230 +msgid "File “%s” doesn’t exist?" +msgstr "Le fichier Â« %s Â» n’existe pas ?" +======= +#: wp-includes/admin-bar.php:603 +msgctxt "admin bar menu group label" +msgid "New" +msgstr "CrÃ©er" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1254 -msgid "Tagline" -msgstr "Slogan" +<<<<<<< .mine +#: wp-includes/class-wp-customize-section.php:440 +#: wp-includes/class-wp-customize-section.php:441 +msgid "Search installed themes..." +msgstr "Recherche dans les thÃ¨mes installÃ©s..." +||||||| .r11156 +#: wp-includes/deprecated.php:3233 +msgid "The GD image library is not installed." +msgstr "La bibliothÃ¨que d’imagerie GD n’est pas installÃ©e." +======= +#: wp-includes/admin-bar.php:598 +msgctxt "add new from admin bar" +msgid "User" +msgstr "Utilisateur" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1243 -#: wp-includes/class-wp-xmlrpc-server.php:431 -msgid "Site Title" -msgstr "Titre du site" +<<<<<<< .mine +#: wp-includes/class-wp-customize-widgets.php:700 +msgid "Search widgets…" +msgstr "Recherche de widgets…" +||||||| .r11156 +#: wp-includes/deprecated.php:3240 +msgid "File “%s” is not an image." +msgstr "Le fichier Â« %s Â» n’est pas une image." +======= +#: wp-includes/admin-bar.php:578 +msgctxt "add new from admin bar" +msgid "Link" +msgstr "Lien" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:764 +msgid "No items" +msgstr "Aucun Ã©lÃ©ment" +||||||| .r11156 +#: wp-includes/media.php:2903 +msgid "Add Media" +msgstr "Ajouter un mÃ©dia" +======= +#: wp-includes/admin-bar.php:472 +msgid "Shortlink" +msgstr "Lien court" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-panel.php:436 +msgid "Link Target" +msgstr "Cible du lien" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1253 wp-includes/media-template.php:324 +#: wp-includes/media-template.php:483 +msgid "Saved." +msgstr "EnregistrÃ©." +======= +#: wp-includes/admin-bar.php:438 +msgid "Manage Comments" +msgstr "GÃ©rer les commentaires" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-panel.php:434 +msgid "Show advanced menu properties" +msgstr "Afficher les propriÃ©tÃ©s avancÃ©es du menu" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1070 +#: wp-includes/class-wp-editor.php:906 wp-includes/media-template.php:598 +#: wp-includes/media-template.php:804 wp-includes/media-template.php:870 +msgid "Left" +msgstr "Gauche" +======= +#: wp-includes/admin-bar.php:429 wp-includes/post.php:1636 +msgid "New Post" +msgstr "Nouvel article" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:749 +msgid "Add to Menu" +msgstr "Ajouter au menu" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1071 +#: wp-includes/class-wp-editor.php:907 wp-includes/media-template.php:601 +#: wp-includes/media-template.php:807 wp-includes/media-template.php:873 +msgid "Center" +msgstr "Centre" +======= +#: wp-includes/admin-bar.php:384 +msgid "Plugins" +msgstr "Extensions" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:727 +msgid "Custom Links" +msgstr "Liens personnalisÃ©s" +||||||| .r11156 +#: wp-includes/class-wp-customize-manager.php:1072 +#: wp-includes/class-wp-editor.php:908 wp-includes/media-template.php:604 +#: wp-includes/media-template.php:810 wp-includes/media-template.php:876 +msgid "Right" +msgstr "Droite" +======= +#: wp-includes/admin-bar.php:378 wp-includes/admin-bar.php:666 +#: wp-includes/admin-bar.php:677 wp-includes/class-wp-customize-section.php:367 +msgid "Themes" +msgstr "ThÃ¨mes" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1585 +msgid "Delete menu" +msgstr "Supprimer le menu" +||||||| .r11156 +#: wp-includes/media-template.php:673 wp-includes/media-template.php:897 +#: wp-includes/media.php:2675 +msgid "Medium" +msgstr "Moyenne" +======= +#: wp-includes/admin-bar.php:372 +msgid "Users" +msgstr "Utilisateurs" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1711 +msgid "Navigation Label" +msgstr "Titre de la navigation" +||||||| .r11156 +#: wp-includes/media-template.php:675 wp-includes/media-template.php:899 +#: wp-includes/media.php:2677 +msgid "Full Size" +msgstr "Taille originale" +======= +#: wp-includes/admin-bar.php:366 +msgid "Sites" +msgstr "Sites" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1723 +#: wp-includes/class-wp-customize-panel.php:437 +msgid "Title Attribute" +msgstr "Attribut de titre" +||||||| .r11156 +#: wp-includes/media-template.php:663 wp-includes/media-template.php:887 +msgid "Size" +msgstr "Taille" +======= +#: wp-includes/admin-bar.php:353 +msgid "Network Admin" +msgstr "Admin du rÃ©seau" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1729 +#: wp-includes/class-wp-customize-panel.php:438 +msgid "CSS Classes" +msgstr "Classes CSS" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:905 wp-includes/media-template.php:590 +msgid "Alignment" +msgstr "Alignement" +======= +#: wp-includes/admin-bar.php:340 +msgid "My Sites" +msgstr "Mes sites" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1735 +#: wp-includes/class-wp-customize-panel.php:439 +msgid "Link Relationship (XFN)" +msgstr "Relation avec le propriÃ©taire du site liÃ© (XFN)" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:904 wp-includes/media-template.php:380 +#: wp-includes/media-template.php:557 wp-includes/media-template.php:790 +#: wp-includes/media-template.php:855 +msgid "Caption" +msgstr "LÃ©gende" +======= +#: wp-includes/admin-bar.php:307 wp-includes/admin-bar.php:360 +#: wp-includes/admin-bar.php:421 wp-includes/deprecated.php:2848 +#: wp-includes/deprecated.php:2850 +msgid "Dashboard" +msgstr "Tableau de bord" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1743 +msgid "The description will be displayed in the menu if the current theme supports it." +msgstr "La description sera affichÃ©e dans le menu si le thÃ¨me actuel l’accepte." +||||||| .r11156 +#: wp-includes/media-template.php:316 wp-includes/media-template.php:507 +#: wp-includes/media.php:2975 +msgid "Edit Image" +msgstr "Modifier lâimage" +======= +#: wp-includes/admin-bar.php:297 +msgid "Edit Site" +msgstr "Modifier le site" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1750 +msgid "Original: %s" +msgstr "Original : %s" +||||||| .r11156 +#: wp-includes/media-template.php:822 wp-includes/media-template.php:934 +msgid "Image URL" +msgstr "Adresse web de l’image" +======= +#: wp-includes/admin-bar.php:289 wp-includes/admin-bar.php:446 +#: wp-includes/deprecated.php:2846 +msgid "Visit Site" +msgstr "Aller sur le site" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1967 +msgid "Create Menu" +msgstr "CrÃ©er le menu" +||||||| .r11156 +#: wp-includes/script-loader.php:450 +msgid "Save as Pending" +msgstr "Mettre Ã relire" +======= +#: wp-includes/admin-bar.php:271 +msgid "Global Dashboard: %s" +msgstr "Tableau de bord global : %s" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:1232 -msgid "Site Title & Tagline" -msgstr "Titre de site et slogan" +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:118 +msgctxt "nav menu home label" +msgid "Home" +msgstr "Accueil" +||||||| .r11156 +#: wp-includes/script-loader.php:456 +msgid "Privately Published" +msgstr "PubliÃ© en privÃ©" +======= +#: wp-includes/admin-bar.php:269 +msgid "Network Admin: %s" +msgstr "Admin du rÃ©seau : %s" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: title of menu item which is invalid +#: wp-includes/class-wp-customize-nav-menus.php:342 +msgid "%s (Invalid)" +msgstr "%s (non valide)" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:786 wp-includes/script-loader.php:438 +msgid "OK" +msgstr "OK" +======= +#: wp-includes/admin-bar.php:241 wp-includes/class-wp-admin-bar.php:376 +msgid "Log Out" +msgstr "Se dÃ©connecter" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: title of menu item in draft status +#: wp-includes/class-wp-customize-nav-menus.php:344 +msgid "%s (Pending)" +msgstr "%s (en attente)" +||||||| .r11156 +#: wp-includes/post.php:907 wp-includes/post.php:927 +#: wp-includes/script-loader.php:452 +msgid "Private" +msgstr "PrivÃ©" +======= +#: wp-includes/admin-bar.php:235 +msgid "Edit My Profile" +msgstr "Modifier mon profil" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:369 +msgid "Move up one" +msgstr "Monter d’un cran" +||||||| .r11156 +#: wp-includes/script-loader.php:454 +msgid "Public, Sticky" +msgstr "Public, mis en avant" +======= +#: wp-includes/admin-bar.php:183 +msgid "Howdy, %1$s" +msgstr "Salutations, %1$s" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:370 +msgid "Move down one" +msgstr "Descendre d’un cran" +||||||| .r11156 +#: wp-includes/script-loader.php:448 +msgid "Schedule" +msgstr "Planifier" +======= +#: wp-includes/admin-bar.php:161 +msgid "Menu" +msgstr "Menu" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:603 -msgid "Loading ..." -msgstr "Chargement..." +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:371 +msgid "Move to the top" +msgstr "DÃ©placer tout en haut" +||||||| .r11156 +#: wp-includes/taxonomy.php:488 +msgid "Add or remove tags" +msgstr "Ajouter ou retirer des mots-clÃ©s" +======= +#: wp-includes/admin-bar.php:146 +msgid "https://wordpress.org/support/forum/requests-and-feedback" +msgstr "https://wordpress.org/support/forum/requests-and-feedback" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: previous item name +#: wp-includes/class-wp-customize-nav-menus.php:373 +msgid "Move under %s" +msgstr "Placer sous %s" +||||||| .r11156 +#: wp-includes/taxonomy.php:479 +msgid "All Categories" +msgstr "Toutes" +======= +#: wp-includes/admin-bar.php:145 +msgid "Feedback" +msgstr "Remarque" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: previous item name +#: wp-includes/class-wp-customize-nav-menus.php:375 +msgid "Move out from under %s" +msgstr "Sortir de sous %s" +||||||| .r11156 +#: wp-includes/script-loader.php:114 wp-includes/script-loader.php:258 +msgid "Dismiss" +msgstr "Fermer" +======= +#: wp-includes/admin-bar.php:138 wp-login.php:800 +msgid "https://wordpress.org/support/" +msgstr "http://www.wordpress-fr.net/support" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: previous item name +#: wp-includes/class-wp-customize-nav-menus.php:377 +msgid "Under %s" +msgstr "Sous %s" +||||||| .r11156 +#: wp-includes/admin-bar.php:730 wp-includes/class-wp-editor.php:1398 +#: wp-includes/media.php:2904 +msgid "Search" +msgstr "Recherche" +======= +#: wp-includes/admin-bar.php:137 +msgid "Support Forums" +msgstr "Forums d’entraide" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: %s: previous item name +#: wp-includes/class-wp-customize-nav-menus.php:379 +msgid "Out from under %s" +msgstr "Sortir de sous %s" +||||||| .r11156 +#: wp-includes/post.php:2434 +msgid "Images" +msgstr "Images" +======= +#: wp-includes/admin-bar.php:130 +msgid "https://codex.wordpress.org/" +msgstr "https://codex.wordpress.org/" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: 1: item name, 2: item position, 3: total number of items +#: wp-includes/class-wp-customize-nav-menus.php:381 +msgid "%1$s. Menu item %2$d of %3$d." +msgstr "%1$s. ÃlÃ©ment de menu %2$d sur %3$d." +||||||| .r11156 +#: wp-includes/post.php:1628 +msgid "View Page" +msgstr "Voir la page" +======= +#: wp-includes/admin-bar.php:129 +msgid "Documentation" +msgstr "Documentation" +>>>>>>> .r12027 + +<<<<<<< .mine +#. translators: 1: item name, 2: item position, 3: parent item name +#: wp-includes/class-wp-customize-nav-menus.php:383 +msgid "%1$s. Sub item number %2$d under %3$s." +msgstr "%1$s. Sous-Ã©lÃ©ment numÃ©ro %2$d sous %3$s." +||||||| .r11156 +#: wp-includes/default-widgets.php:118 +msgid "Links" +msgstr "Liens" +======= +#: wp-includes/admin-bar.php:122 wp-includes/default-widgets.php:421 +#: wp-login.php:101 +msgid "https://wordpress.org/" +msgstr "http://www.wordpress-fr.net/" +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:719 +msgid "The search results will be updated as you type." +msgstr "Les rÃ©sultats de la recherche seront mis Ã jour au fur et Ã mesure de votre saisie." +||||||| .r11156 +#: wp-includes/category-template.php:172 +msgid "Uncategorized" +msgstr "Non classÃ©" +======= +#: wp-includes/admin-bar.php:121 +msgid "WordPress.org" +msgstr "Site de WordPress-FR" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-manager.php:159 -#: wp-includes/script-loader.php:399 -msgid "Cheatin’ uh?" -msgstr "Alors, on triche ?" +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:1499 +msgid "Background Attachment" +msgstr "Image dâarriÃ¨re-plan" +||||||| .r11156 +#: wp-includes/pluggable.php:1647 +msgid "E-mail: %s" +msgstr "E-mail : %s" +======= +#: wp-includes/admin-bar.php:103 wp-includes/admin-bar.php:112 +msgid "About WordPress" +msgstr "Ã propos de WordPress" +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-control.php:1317 -msgctxt "Cancel reordering widgets in Customizer" -msgid "Done" -msgstr "TerminÃ©" +<<<<<<< .mine +#. translators: %s: theme name +#: wp-includes/class-wp-customize-control.php:1422 +msgid "Active: %s" +msgstr "ActivÃ© : %s" +||||||| .r11156 +#: wp-includes/default-widgets.php:18 wp-includes/default-widgets.php:32 +#: wp-includes/post-template.php:1023 wp-includes/theme-compat/sidebar.php:55 +msgid "Pages" +msgstr "Pages" +======= +#: wp-comments-post.php:139 +msgid "ERROR: The comment could not be saved. Please try again later." +msgstr "ERREUR : le commentaire n’a pas pu Ãªtre enregistrÃ©. Veuillez rÃ©essayer plus tard." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-control.php:1316 -msgctxt "Reorder widgets in Customizer" -msgid "Reorder" -msgstr "RÃ©ordonner" +<<<<<<< .mine +#: wp-includes/class-wp-customize-section.php:416 +msgctxt "theme" +msgid "Change" +msgstr "Changer" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:788 wp-includes/class-wp-editor.php:1379 +#: wp-includes/functions.php:4473 wp-includes/script-loader.php:229 +#: wp-includes/script-loader.php:309 wp-includes/script-loader.php:389 +msgid "Close" +msgstr "Fermer" +======= +#: wp-comments-post.php:130 +msgid "ERROR: please type a comment." +msgstr "ERREUR : veuillez saisir un commentaire." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-control.php:1312 -msgid "Add a Widget" -msgstr "Ajouter un Widget" +<<<<<<< .mine +#: wp-includes/class-wp-customize-nav-menus.php:120 +#: wp-includes/class-wp-customize-nav-menus.php:327 +#: wp-includes/class-wp-customize-setting.php:1160 wp-includes/nav-menu.php:739 +msgid "Custom Link" +msgstr "Lien personnalisÃ©" +||||||| .r11156 +#: wp-includes/media.php:2905 +msgid "Select" +msgstr "SÃ©lectionner" +======= +#: wp-comments-post.php:125 +msgid "ERROR: please enter a valid email address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie valide." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-control.php:1282 -#: wp-includes/class-wp-customize-section.php:384 +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1428 +#: wp-includes/class-wp-customize-section.php:435 msgid "Theme Details" msgstr "DÃ©tails du thÃ¨me" +||||||| .r11156 +#: wp-includes/post.php:1627 +msgid "New Page" +msgstr "Nouvelle page" +======= +#: wp-comments-post.php:123 +msgid "ERROR: please fill the required fields (name, email)." +msgstr "ERREUR : veuillez renseigner les champs obligatoires (nom, e-mail)." +>>>>>>> .r12027 -#. translators: %s: theme name -#: wp-includes/class-wp-customize-control.php:1276 -msgid "Active: %s" -msgstr "ActivÃ© : %s" - -#: wp-includes/class-wp-customize-control.php:1270 -msgid "By %s" -msgstr "Par %s" - -#: wp-includes/class-wp-customize-control.php:1267 +<<<<<<< .mine +#: wp-includes/class-wp-customize-control.php:1413 msgid "Live Preview" msgstr "PrÃ©visualisation en direct" +||||||| .r11156 +#: wp-includes/post.php:58 +msgid "Edit Media" +msgstr "Modifier un mÃ©dia" +======= +#: wp-comments-post.php:115 +msgid "Sorry, you must be logged in to post a comment." +msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." +>>>>>>> .r12027 -#: wp-includes/class-wp-customize-control.php:1178 -msgctxt "custom headers" -msgid "Suggested" -msgstr "SuggÃ©rÃ©s" +<<<<<<< .mine +#: wp-includes/class-wp-customize-manager.php:630 +msgid "Loading ..." +msgstr "Chargement..." -#: wp-includes/class-wp-customize-control.php:1171 -msgctxt "custom headers" -msgid "Previously uploaded" -msgstr "PrÃ©cÃ©demment chargÃ©" +#: wp-includes/class-wp-customize-section.php:410 +#: wp-includes/class-wp-customize-section.php:427 +msgid "Active theme" +msgstr "ThÃ¨me actif" -#. translators: New as in add new header image via the Customizer -#: wp-includes/class-wp-customize-control.php:1166 -msgctxt "header image" -msgid "Add new image" -msgstr "Ajouter une nouvelle image" +#: wp-includes/class-wp-customize-panel.php:348 +msgid "Press return or enter to open this panel" +msgstr "Appuyer sur EntrÃ©e pour ouvrir ce panneau" -#. translators: Hide as in hide header image via the Customizer -#: wp-includes/class-wp-customize-control.php:1164 -msgctxt "custom header" -msgid "Hide image" -msgstr "Cacher l’image" +#: wp-includes/class-wp-customize-nav-menus.php:325 +#: wp-includes/script-loader.php:626 +msgctxt "missing menu item navigation label" +msgid "(no label)" +msgstr "(Aucune information)" -#: wp-includes/class-wp-customize-control.php:1157 -msgid "Current header" -msgstr "En-tÃªte actuel" +#: wp-includes/class-wp-customize-control.php:1293 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header size of %s × %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une taille de %s × %s pixels pour l’en-tÃªte." -#: wp-includes/class-wp-customize-control.php:1151 +#: wp-includes/class-wp-customize-control.php:1295 +msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header width of %s pixels." +msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une largeur de %s pixels pour l’en-tÃªte." + +#: wp-includes/class-wp-customize-control.php:1297 msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header height of %s pixels." msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une hauteur de %s pixels pour l’en-tÃªte." -#: wp-includes/class-wp-customize-control.php:1149 -msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header width of %s pixels." -msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une largeur de %s pixels pour l’en-tÃªte." +#: wp-includes/class-wp-customize-section.php:350 +msgid "Press return or enter to open" +msgstr "Appuyez sur Envoi ou Retour pour ouvrir" -#: wp-includes/class-wp-customize-control.php:1147 -msgid "While you can crop images to your liking after clicking Add new image, your theme recommends a header size of %s × %s pixels." -msgstr "Bien que vous puissiez recadrer vos images comme bon vous semble aprÃ¨s avoir cliquÃ© sur Ajouter une image, votre thÃ¨me recommande d’utiliser une taille de %s × %s pixels pour l’en-tÃªte." +#. translators: %s is the site/panel title in the Customizer +#. Translators: %s is the site/panel title in the Customizer. +#: wp-includes/class-wp-customize-panel.php:373 +#: wp-includes/class-wp-customize-panel.php:465 +msgid "You are customizing %s" +msgstr "Vous personnalisez %s" -#: wp-includes/class-wp-customize-control.php:1116 -msgid "No image set" -msgstr "Pas de jeu d’images" +#: wp-includes/class-wp-customize-control.php:1932 +msgid "Menu options" +msgstr "Options du menu" -#: wp-includes/class-wp-customize-control.php:1100 -msgid "Randomizing suggested headers" -msgstr "Rendre alÃ©atoire les en-tÃªtes suggÃ©rÃ©s" +#: wp-includes/class-wp-customize-widgets.php:657 +msgid "Widget moved down" +msgstr "Widget dÃ©placÃ© vers le bas" -#: wp-includes/class-wp-customize-control.php:1098 -msgid "Randomizing uploaded headers" -msgstr "Rendre alÃ©atoire les en-tÃªtes chargÃ©s" +#: wp-includes/class-wp-customize-widgets.php:656 +msgid "Widget moved up" +msgstr "Widget dÃ©placÃ© vers le haut" -#: wp-includes/class-wp-customize-control.php:1083 -msgid "Set image" -msgstr "DÃ©finir l’image" +#: wp-includes/class-wp-customize-nav-menus.php:743 +#: wp-includes/class-wp-editor.php:1410 wp-includes/media-template.php:820 +msgid "Link Text" +msgstr "Texte du lien" -#: wp-includes/class-wp-customize-control.php:1070 -msgid "Randomize suggested headers" -msgstr "En-tÃªtes suggÃ©rÃ©s alÃ©atoires" +#: wp-includes/class-wp-customize-nav-menus.php:348 +msgid "Additional items found: %d" +msgstr "Nombre d’Ã©lÃ©ment(s) supplÃ©mentaire(s) trouvÃ©(s) : %d" -#: wp-includes/class-wp-customize-control.php:1068 -msgid "Randomize uploaded headers" -msgstr "En-tÃªtes chargÃ©s alÃ©atoires" +#: wp-includes/class-wp-customize-control.php:1577 +#: wp-includes/class-wp-customize-nav-menus.php:352 +msgid "Reorder menu items" +msgstr "RÃ©arranger les Ã©lÃ©ments du menu" -#: wp-includes/class-wp-customize-control.php:1012 -#: wp-includes/class-wp-customize-manager.php:1306 -msgid "Header Image" -msgstr "Image d’en-tÃªte" +#: wp-includes/class-wp-customize-nav-menus.php:353 +msgid "Close reorder mode" +msgstr "Fermer le mode de rÃ©arrangement" -#: wp-includes/class-wp-customize-control.php:974 -#: wp-includes/class-wp-customize-manager.php:1326 -msgid "Background Image" -msgstr "Image dâarriÃ¨re-plan" +#: wp-includes/class-wp-customize-control.php:1581 +msgid "When in reorder mode, additional controls to reorder menu items will be available in the items list above." +msgstr "En mode de rÃ©arrangement, des contrÃ´les supplÃ©mentaires seront disponibles pour organiser les Ã©lÃ©ments de la liste ci-dessus. " -#: wp-includes/class-wp-customize-control.php:916 wp-includes/media.php:3072 -msgid "Choose Image" -msgstr "Choisir une image" +#: wp-includes/class-wp-customize-control.php:1935 +msgid "Automatically add new top-level pages to this menu" +msgstr "Ajouter automatiquement les pages de premier niveau Ã ce menu" -#: wp-includes/class-wp-customize-control.php:914 -msgid "No image selected" -msgstr "Aucune image sÃ©lectionnÃ©e" +#: wp-includes/class-wp-customize-manager.php:1368 +msgid "The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least 512px wide and tall." +msgstr "L’icÃ´ne du site est utilisÃ©e pour reprÃ©senter votre site en tant qu’icÃ´ne de navigateur (favicon) et icÃ´ne d’application. Les icÃ´nes doivent Ãªtre au format carrÃ©, et mesurer au moins 512px en largeur comme en hauteur. " -#: wp-includes/class-wp-customize-control.php:911 -msgid "Change Image" -msgstr "Changer l’image" +#: wp-includes/class-wp-customize-nav-menus.php:330 +msgid "Menu Name" +msgstr "Nom du menu" -#: wp-includes/class-wp-customize-control.php:910 -#: wp-includes/class-wp-customize-control.php:915 -msgid "Select Image" -msgstr "SÃ©lectionner une image" +#. translators: 1: Title of a menu item, 2: Type of a menu item +#: wp-includes/class-wp-customize-control.php:1694 +msgid "Remove Menu Item: %1$s (%2$s)" +msgstr "Enlever l’Ã©lÃ©ment du menu : %1$s (%2$s)" -#: wp-includes/class-wp-customize-control.php:693 -msgid "Choose File" -msgstr "Choisissez un fichier" +#. translators: 1: Title of a menu item, 2: Type of a menu item +#: wp-includes/class-wp-customize-control.php:1690 +msgid "Edit menu item: %1$s (%2$s)" +msgstr "Modifier l’Ã©lÃ©ment de menu : %1$s (%2$s)" -#: wp-includes/class-wp-customize-control.php:691 -msgid "No file selected" -msgstr "Aucun fichier sÃ©lectionnÃ©" +#: wp-includes/class-wp-customize-nav-menus.php:453 +msgid "This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links." +msgstr "Ce panneau est utilisÃ© pour gÃ©rer les menus de navigation pour le contenu que vous avez dÃ©jÃ publiÃ© sur votre site. Vous pouvez crÃ©er des menus et y ajouter des Ã©lÃ©ments pour le contenu existant, comme les pages, les articles, les catÃ©gories, les Ã©tiquettes, les formats, ou des liens personnalisÃ©s." -#: wp-includes/class-wp-customize-control.php:690 -#: wp-includes/class-wp-customize-control.php:912 -#: wp-includes/class-wp-customize-widgets.php:634 -#: wp-includes/class-wp-editor.php:993 wp-includes/media-template.php:470 -#: wp-includes/media-template.php:1047 wp-includes/media-template.php:1061 -#: wp-includes/media-template.php:1130 wp-includes/media-template.php:1142 -#: wp-includes/media-template.php:1163 wp-includes/media-template.php:1195 -#: wp-includes/media.php:3003 -msgid "Remove" -msgstr "Supprimer" +#. translators: %s: Title of a section with menu items +#: wp-includes/class-wp-customize-nav-menus.php:768 +msgid "Toggle section: %s" +msgstr "Ouvrir/fermer la section : %s" + +#: wp-includes/class-wp-customize-nav-menus.php:729 +msgid "Toggle section: Custom Links" +msgstr "Ouvrir/fermer la section : Liens personnalisÃ©s" -#: wp-includes/class-wp-customize-control.php:688 -msgid "Change File" -msgstr "Changer le fichier" +#: wp-includes/class-wp-customize-nav-menus.php:721 +msgid "Clear Results" +msgstr "Effacer les rÃ©sultats" -#: wp-includes/class-wp-customize-control.php:687 -#: wp-includes/class-wp-customize-control.php:692 -msgid "Select File" -msgstr "SÃ©lectionner un fichier" +#. translators: %s: Current menu location +#: wp-includes/class-wp-customize-nav-menus.php:329 +msgid "(Currently set to: %s)" +msgstr "(Actuellement rÃ©glÃ© sur : %s)" -#: wp-includes/class-wp-customize-control.php:633 -msgid "Hex Value" -msgstr "Valeur hexadÃ©cimale" +#: wp-includes/class-wp-customize-widgets.php:629 +msgid "Select an area to move this widget into:" +msgstr "SÃ©lectionner une zone vers laquelle dÃ©placer ce widget :" + +#: wp-includes/class-wp-customize-widgets.php:359 +msgid "Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars)." +msgstr "Les widgets sont des sections de contenu indÃ©pendants qui peuvent Ãªtre placÃ©s dans les zones Ã widgets prÃ©vues dans votre thÃ¨me (gÃ©nÃ©ralement, les colonnes latÃ©rales)." + +#: wp-includes/class-wp-customize-widgets.php:654 +msgid "Trash widget by moving it to the inactive widgets sidebar." +msgstr "Mettez le widget Ã la Corbeille en le dÃ©plaÃ§ant vers la colonne latÃ©rale inactive." #: wp-includes/class-wp-customize-control.php:576 -#: wp-includes/class-wp-customize-control.php:689 -#: wp-includes/class-wp-customize-control.php:913 -#: wp-includes/script-loader.php:553 +#: wp-includes/class-wp-customize-control.php:691 +#: wp-includes/class-wp-customize-control.php:921 +#: wp-includes/script-loader.php:592 msgid "Default" msgstr "Valeur par dÃ©faut" -#: wp-includes/class-wp-customize-control.php:481 -#: wp-includes/class-wp-customize-manager.php:1418 -#: wp-includes/default-widgets.php:1418 -msgid "— Select —" -msgstr "— SÃ©lectionner —" +#: wp-includes/class-http.php:198 +msgid "User has blocked requests through HTTP." +msgstr "L’utilisateur a bloquÃ© les requÃªtes HTTP." -#: wp-includes/class-wp-admin-bar.php:370 -msgid "Toolbar" -msgstr "Barre d’outils" +#: wp-includes/class-http.php:826 wp-includes/class-http.php:1518 +#: wp-includes/class-http.php:1557 +msgid "Too many redirects." +msgstr "Trop de redirections." -#: wp-includes/class-wp-admin-bar.php:368 -msgid "Skip to toolbar" -msgstr "Aller Ã la barre d’outils" +#: wp-includes/class-http.php:195 wp-includes/class-wp-xmlrpc-server.php:6113 +msgid "A valid URL was not provided." +msgstr "L’URL fournie est invalide." -#: wp-includes/class-wp-admin-bar.php:108 +#: wp-includes/class-http.php:226 +msgid "Destination directory for file streaming does not exist or is not writable." +msgstr "Le dossier de destination pour la diffusion de fichier n’existe pas ou n’est pas accessible en Ã©criture." + +#: wp-includes/class-http.php:357 +msgid "There are no HTTP transports available which can complete the requested request." +msgstr "Il n’y a pas de transport HTTP disponible pour mener Ã bien la requÃªte demandÃ©e." + +#: wp-includes/class-wp-admin-bar.php:121 msgid "The menu ID should not be empty." msgstr "L’identifiant du menu ne devrait pas Ãªtre vide." -#: wp-includes/class-http.php:1114 wp-includes/class-http.php:1530 -msgid "Failed to write request to temporary file." -msgstr "Impossible d’Ã©crire la requÃªte dans un fichier temporaire." +#: wp-includes/class-wp-customize-control.php:481 +#: wp-includes/class-wp-customize-nav-menus.php:480 +#: wp-includes/default-widgets.php:1592 +msgid "— Select —" +msgstr "— SÃ©lectionner —" -#: wp-includes/class-http.php:1086 wp-includes/class-http.php:1462 +#: wp-includes/class-wp-customize-control.php:692 +#: wp-includes/class-wp-customize-control.php:920 +#: wp-includes/class-wp-customize-control.php:1754 +#: wp-includes/class-wp-customize-widgets.php:653 +#: wp-includes/class-wp-editor.php:1035 wp-includes/media-template.php:473 +#: wp-includes/media.php:3037 +msgid "Remove" +msgstr "Supprimer" + +#: wp-includes/class-wp-customize-control.php:1145 +#: wp-includes/class-wp-customize-manager.php:1424 +msgid "Header Image" +msgstr "Image d’en-tÃªte" + +#: wp-includes/class-wp-admin-bar.php:411 +msgid "Toolbar" +msgstr "Barre d’outils" + +#: wp-includes/class-http.php:1099 wp-includes/class-http.php:1475 msgid "Could not open handle for fopen() to %s" msgstr "Impossible d’ouvrir le gestionnaire de fopen() pour %s" -#: wp-includes/class-http.php:1014 wp-includes/class-http.php:1022 +#: wp-includes/class-wp-customize-control.php:633 +msgid "Hex Value" +msgstr "Valeur hexadÃ©cimale" + +#: wp-includes/class-wp-admin-bar.php:409 +msgid "Skip to toolbar" +msgstr "Aller Ã la barre d’outils" + +#: wp-includes/class-http.php:1027 wp-includes/class-http.php:1035 msgid "The SSL certificate for the host could not be verified." msgstr "Le certificat SSL de l’hÃ´te n’a pas pu Ãªtre vÃ©rifiÃ©." -#: wp-includes/class-http.php:813 wp-includes/class-http.php:1505 -#: wp-includes/class-http.php:1544 -msgid "Too many redirects." -msgstr "Trop de redirections." +#: wp-includes/class-http.php:1127 wp-includes/class-http.php:1543 +msgid "Failed to write request to temporary file." +msgstr "Impossible d’Ã©crire la requÃªte dans un fichier temporaire." -#: wp-includes/class-http.php:353 -msgid "There are no HTTP transports available which can complete the requested request." -msgstr "Il n’y a pas de transport HTTP disponible pour mener Ã bien la requÃªte demandÃ©e." +#: wp-includes/class-wp-customize-control.php:924 wp-includes/media.php:3106 +msgid "Choose Image" +msgstr "Choisir une image" -#: wp-includes/class-http.php:224 -msgid "Destination directory for file streaming does not exist or is not writable." -msgstr "Le dossier de destination pour la diffusion de fichier n’existe pas ou n’est pas accessible en Ã©criture." +#: wp-includes/class-wp-customize-control.php:1213 +msgid "Randomize suggested headers" +msgstr "En-tÃªtes suggÃ©rÃ©s alÃ©atoires" -#: wp-includes/class-http.php:196 -msgid "User has blocked requests through HTTP." -msgstr "L’utilisateur a bloquÃ© les requÃªtes HTTP." +#: wp-includes/class-wp-customize-control.php:1211 +msgid "Randomize uploaded headers" +msgstr "En-tÃªtes chargÃ©s alÃ©atoires" -#: wp-includes/class-http.php:193 wp-includes/class-wp-xmlrpc-server.php:5703 -msgid "A valid URL was not provided." -msgstr "L’URL fournie est invalide." +#: wp-includes/class-wp-customize-control.php:982 +#: wp-includes/class-wp-customize-manager.php:1444 +msgid "Background Image" +msgstr "Image dâarriÃ¨re-plan" -#: wp-includes/category-template.php:1248 +#: wp-includes/category-template.php:1306 msgid "Tags: " msgstr "Ãtiquettes : " -#: wp-includes/category-template.php:1024 -msgid "Feed for all posts filed under %s" -msgstr "Flux pour tous les articles classÃ©s dans %s" - -#: wp-includes/category-template.php:723 wp-includes/category-template.php:732 -msgid "%s topic" -msgid_plural "%s topics" -msgstr[0] "%s sujet" -msgstr[1] "%s sujets" - -#: wp-includes/category-template.php:494 wp-includes/default-widgets.php:564 -#: wp-includes/default-widgets.php:570 wp-includes/theme-compat/sidebar.php:63 -msgid "Categories" -msgstr "CatÃ©gories" - -#: wp-includes/category-template.php:486 -msgid "No categories" -msgstr "Aucune catÃ©gorie" +#: wp-includes/class-wp-customize-control.php:919 +msgid "Change Image" +msgstr "Changer l’image" -#: wp-includes/category-template.php:171 -msgid "Uncategorized" -msgstr "Non classÃ©" +#: wp-includes/class-wp-customize-control.php:922 +msgid "No image selected" +msgstr "Aucune image sÃ©lectionnÃ©e" -#: wp-includes/capabilities.php:993 -msgid "Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead." -msgstr "L’utilisation des niveaux d’utilisateur par les extensions et thÃ¨mes est dÃ©sormais interdite. Utiliser les rÃ´les et capacitÃ©s Ã la place." +#: wp-includes/class-wp-customize-control.php:918 +#: wp-includes/class-wp-customize-control.php:923 +msgid "Select Image" +msgstr "SÃ©lectionner une image" -#: wp-includes/capabilities.php:640 wp-includes/capabilities.php:662 -#: wp-includes/capabilities.php:688 -msgid "Use WP_User->ID instead." -msgstr "Utilisez plutÃ´t WP_User->ID." +#: wp-includes/class-wp-customize-control.php:695 +msgid "Choose File" +msgstr "Choisissez un fichier" -#: wp-includes/bookmark-template.php:206 -msgid "Bookmarks" -msgstr "Favoris" +#: wp-includes/class-wp-customize-control.php:693 +msgid "No file selected" +msgstr "Aucun fichier sÃ©lectionnÃ©" -#: wp-includes/bookmark-template.php:83 -msgid "Last updated: %s" -msgstr "DerniÃ¨re mise Ã jour : %s" +#: wp-includes/class-wp-customize-control.php:690 +msgid "Change File" +msgstr "Changer le fichier" -#: wp-includes/author-template.php:234 wp-includes/author-template.php:372 -msgid "Posts by %s" -msgstr "Articles par %s" +#: wp-includes/class-wp-customize-control.php:689 +#: wp-includes/class-wp-customize-control.php:694 +msgid "Select File" +msgstr "Choisir un fichier" -#: wp-includes/author-template.php:168 -msgid "Visit %s’s website" -msgstr "Aller sur le site de %s" +#: wp-activate.php:80 +msgid "Activate" +msgstr "Activer" -#: wp-includes/author-template.php:62 -msgid "Use get_the_author() instead if you do not want the value echoed." -msgstr "Utilisez plutÃ´t get_the_author() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." +#: wp-activate.php:114 wp-signup.php:177 +msgid "Username:" +msgstr "Identifiant :" -#: wp-includes/atomlib.php:133 -msgid "XML error: %s at line %d" -msgstr "Erreur XML : %s Ã la ligne %d" +#: wp-activate.php:115 wp-includes/post-template.php:1668 +msgid "Password:" +msgstr "Mot de passe :" -#: wp-includes/admin-bar.php:820 wp-includes/admin-bar.php:821 -#: wp-includes/class-wp-editor.php:1457 wp-includes/media.php:2998 -msgid "Search" -msgstr "Recherche" +#: wp-includes/admin-bar.php:294 wp-includes/admin-bar.php:478 +#: wp-includes/deprecated.php:2846 +msgid "Visit Site" +msgstr "Aller sur le site" -#: wp-includes/admin-bar.php:758 wp-includes/admin-bar.php:769 -msgid "Header" -msgstr "En-tÃªte" +#: wp-includes/admin-bar.php:246 wp-includes/class-wp-admin-bar.php:417 +msgid "Log Out" +msgstr "Se dÃ©connecter" -#: wp-includes/admin-bar.php:734 wp-includes/admin-bar.php:745 +#: wp-includes/admin-bar.php:723 msgid "Background" msgstr "ArriÃ¨re-plan" -#: wp-includes/admin-bar.php:728 -msgid "Menus" -msgstr "Menus" - -#: wp-includes/admin-bar.php:707 wp-includes/admin-bar.php:718 -#: wp-includes/class-wp-customize-widgets.php:345 -#: wp-includes/functions.php:3268 -msgid "Widgets" -msgstr "Widgets" - -#: wp-includes/admin-bar.php:690 -#: wp-includes/class-wp-customize-control.php:1265 -#: wp-includes/class-wp-customize-section.php:381 -msgid "Customize" -msgstr "Personnaliser" - -#: wp-includes/admin-bar.php:636 -msgid "%s comment awaiting moderation" -msgid_plural "%s comments awaiting moderation" -msgstr[0] "%s commentaire en attente de modÃ©ration" -msgstr[1] "%s commentaires en attente de modÃ©ration" +#: wp-includes/admin-bar.php:735 +msgid "Header" +msgstr "En-tÃªte" -#: wp-includes/admin-bar.php:603 -msgctxt "admin bar menu group label" -msgid "New" -msgstr "CrÃ©er" +#: wp-includes/category-template.php:501 wp-includes/default-widgets.php:644 +#: wp-includes/default-widgets.php:657 wp-includes/theme-compat/sidebar.php:63 +msgid "Categories" +msgstr "CatÃ©gories" -#: wp-includes/admin-bar.php:598 -msgctxt "add new from admin bar" -msgid "User" -msgstr "Utilisateur" +#: wp-includes/admin-bar.php:404 +msgid "Users" +msgstr "Utilisateurs" -#: wp-includes/admin-bar.php:578 -msgctxt "add new from admin bar" -msgid "Link" -msgstr "Lien" +#: wp-includes/admin-bar.php:416 +msgid "Plugins" +msgstr "Extensions" -#: wp-includes/admin-bar.php:472 -msgid "Shortlink" -msgstr "Lien court" +#: wp-includes/admin-bar.php:785 wp-includes/admin-bar.php:786 +#: wp-includes/class-wp-editor.php:1420 wp-includes/media.php:3032 +msgid "Search" +msgstr "Recherche" -#: wp-includes/admin-bar.php:438 -msgid "Manage Comments" -msgstr "GÃ©rer les commentaires" +#: wp-includes/category-template.php:178 +msgid "Uncategorized" +msgstr "Non classÃ©" -#: wp-includes/admin-bar.php:429 wp-includes/post.php:1636 +#: wp-includes/admin-bar.php:461 wp-includes/post.php:1652 +msgid "New Post" +msgstr "Nouvel article" +||||||| .r11156 +#: wp-includes/admin-bar.php:426 wp-includes/post.php:1627 msgid "New Post" msgstr "Nouvel article" +======= +#: wp-comments-post.php:50 +msgid "Sorry, comments are closed for this item." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour cet article." +>>>>>>> .r12027 -#: wp-includes/admin-bar.php:384 -msgid "Plugins" -msgstr "Extensions" +<<<<<<< .mine +#: wp-includes/admin-bar.php:312 wp-includes/admin-bar.php:392 +#: wp-includes/admin-bar.php:453 wp-includes/deprecated.php:2848 +#: wp-includes/deprecated.php:2850 +msgid "Dashboard" +msgstr "Tableau de bord" +||||||| .r11156 +#: wp-includes/media.php:2650 wp-includes/script-loader.php:360 +#: wp-includes/script-loader.php:483 +msgid "(no title)" +msgstr "(pas de titre)" +======= +#: wp-activate.php:121 +msgid "Your account is now activated. Log in or go back to the homepage." +msgstr "Votre compte est maintenant activÃ©. Connectez-vous ou retournez sur la page d’accueil de votre site." +>>>>>>> .r12027 + +<<<<<<< .mine +#: wp-includes/admin-bar.php:398 +msgid "Sites" +msgstr "Sites" +||||||| .r11156 +#: wp-activate.php:73 +msgid "Activation Key Required" +msgstr "ClÃ© d’activation requise" +======= +#: wp-activate.php:119 +msgid "Your account is now activated. View your site or Log in" +msgstr "Votre compte est maintenant activÃ©. Consultez votre site ou connectez-vous" +>>>>>>> .r12027 -#: wp-includes/admin-bar.php:378 wp-includes/admin-bar.php:666 -#: wp-includes/admin-bar.php:677 wp-includes/class-wp-customize-section.php:367 +<<<<<<< .mine +#: wp-includes/admin-bar.php:410 wp-includes/admin-bar.php:698 +#: wp-includes/class-wp-customize-section.php:421 msgid "Themes" msgstr "ThÃ¨mes" +||||||| .r11156 +#: wp-activate.php:76 +msgid "Activation Key:" +msgstr "ClÃ© d’activation :" +======= +#: wp-activate.php:115 wp-includes/post-template.php:1633 +msgid "Password:" +msgstr "Mot de passe :" +>>>>>>> .r12027 +<<<<<<< .mine #: wp-includes/admin-bar.php:372 -msgid "Users" -msgstr "Utilisateurs" +msgid "My Sites" +msgstr "Mes sites" -#: wp-includes/admin-bar.php:366 -msgid "Sites" -msgstr "Sites" +#: wp-includes/admin-bar.php:717 +#: wp-includes/class-wp-customize-nav-menus.php:460 +msgid "Menus" +msgstr "Menus" -#: wp-includes/admin-bar.php:353 -msgid "Network Admin" -msgstr "Admin du rÃ©seau" +#: wp-includes/admin-bar.php:711 wp-includes/class-wp-customize-widgets.php:358 +#: wp-includes/functions.php:3283 +msgid "Widgets" +msgstr "Widgets" -#: wp-includes/admin-bar.php:340 -msgid "My Sites" -msgstr "Mes sites" +#: wp-comments-post.php:50 +msgid "Sorry, comments are closed for this item." +msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour cet article." -#: wp-includes/admin-bar.php:307 wp-includes/admin-bar.php:360 -#: wp-includes/admin-bar.php:421 wp-includes/deprecated.php:2848 -#: wp-includes/deprecated.php:2850 -msgid "Dashboard" -msgstr "Tableau de bord" +#: wp-comments-post.php:115 +msgid "Sorry, you must be logged in to post a comment." +msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." -#: wp-includes/admin-bar.php:297 -msgid "Edit Site" -msgstr "Modifier le site" +#: wp-includes/author-template.php:180 +msgid "Visit %s’s website" +msgstr "Aller sur le site de %s" -#: wp-includes/admin-bar.php:289 wp-includes/admin-bar.php:446 -#: wp-includes/deprecated.php:2846 -msgid "Visit Site" -msgstr "Aller sur le site" +#: wp-includes/author-template.php:251 wp-includes/author-template.php:393 +msgid "Posts by %s" +msgstr "Articles par %s" -#: wp-includes/admin-bar.php:271 -msgid "Global Dashboard: %s" -msgstr "Tableau de bord global : %s" +#: wp-includes/bookmark-template.php:83 +msgid "Last updated: %s" +msgstr "DerniÃ¨re mise Ã jour : %s" -#: wp-includes/admin-bar.php:269 -msgid "Network Admin: %s" -msgstr "Admin du rÃ©seau : %s" +#: wp-includes/bookmark-template.php:206 +msgid "Bookmarks" +msgstr "Favoris" -#: wp-includes/admin-bar.php:241 wp-includes/class-wp-admin-bar.php:376 -msgid "Log Out" -msgstr "Se dÃ©connecter" +#: wp-includes/category-template.php:752 wp-includes/category-template.php:761 +msgid "%s topic" +msgid_plural "%s topics" +msgstr[0] "%s sujet" +msgstr[1] "%s sujets" -#: wp-includes/admin-bar.php:235 -msgid "Edit My Profile" -msgstr "Modifier mon profil" +#: wp-includes/category-template.php:1079 +msgid "Feed for all posts filed under %s" +msgstr "Flux pour tous les articles classÃ©s dans %s" -#: wp-includes/admin-bar.php:183 -msgid "Howdy, %1$s" -msgstr "Salutations, %1$s" +#: wp-activate.php:92 wp-activate.php:111 +msgid "Your account is now active!" +msgstr "Votre compte est maintenant activÃ© !" +||||||| .r11156 +#: wp-activate.php:92 wp-activate.php:111 +msgid "Your account is now active!" +msgstr "Votre compte est maintenant activÃ© !" +======= +#: wp-activate.php:114 wp-signup.php:177 +msgid "Username:" +msgstr "Identifiant :" +>>>>>>> .r12027 -#: wp-includes/admin-bar.php:161 -msgid "Menu" -msgstr "Menu" +#: wp-includes/capabilities.php:1036 +msgid "Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead." +msgstr "L’utilisation des niveaux d’utilisateur par les extensions et thÃ¨mes est dÃ©sormais interdite. Utiliser les rÃ´les et capacitÃ©s Ã la place." -#: wp-includes/admin-bar.php:146 -msgid "https://wordpress.org/support/forum/requests-and-feedback" -msgstr "https://wordpress.org/support/forum/requests-and-feedback" +#: wp-includes/author-template.php:62 +msgid "Use get_the_author() instead if you do not want the value echoed." +msgstr "Utilisez plutÃ´t get_the_author() si vous prÃ©fÃ©rez que la valeur ne soit pas affichÃ©e." -#: wp-includes/admin-bar.php:145 -msgid "Feedback" -msgstr "Remarque" +#: wp-includes/admin-bar.php:240 +msgid "Edit My Profile" +msgstr "Modifier mon profil" -#: wp-includes/admin-bar.php:138 wp-login.php:800 -msgid "https://wordpress.org/support/" -msgstr "http://www.wordpress-fr.net/support" +#: wp-includes/admin-bar.php:470 +msgid "Manage Comments" +msgstr "GÃ©rer les commentaires" -#: wp-includes/admin-bar.php:137 -msgid "Support Forums" -msgstr "Forums d’entraide" +#: wp-includes/admin-bar.php:504 +msgid "Shortlink" +msgstr "Lien court" -#: wp-includes/admin-bar.php:130 -msgid "https://codex.wordpress.org/" -msgstr "https://codex.wordpress.org/" +#: wp-includes/admin-bar.php:385 +msgid "Network Admin" +msgstr "Admin du rÃ©seau" -#: wp-includes/admin-bar.php:129 -msgid "Documentation" -msgstr "Documentation" +#: wp-activate.php:96 +msgid "Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." +msgstr "Votre compte vient d’Ãªtre activÃ©. Vous pouvez dÃ¨s maintenant vous connecter Ã votre site en utilisant votre identifiant « %2$s ». Vous trouverez dans votre messagerie (sur %3$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." -#: wp-includes/admin-bar.php:122 wp-includes/default-widgets.php:421 -#: wp-login.php:101 -msgid "https://wordpress.org/" -msgstr "http://www.wordpress-fr.net/" +#: wp-activate.php:98 +msgid "Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." +msgstr "Votre site est activÃ© Ã %2$s. Vous pouvez dÃ¨s maintenant vous connecter Ã ce site en utilisant l’identifiant choisi « %3$s ». Vous trouverez dans votre messagerie (sur %4$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." -#: wp-includes/admin-bar.php:121 -msgid "WordPress.org" -msgstr "Site de WordPress-FR" +#: wp-activate.php:119 +msgid "Your account is now activated. View your site or Log in" +msgstr "Votre compte est maintenant activÃ©. Consultez votre site ou connectez-vous" -#: wp-includes/admin-bar.php:103 wp-includes/admin-bar.php:112 -msgid "About WordPress" -msgstr "Ã propos de WordPress" +#: wp-activate.php:121 +msgid "Your account is now activated. Log in or go back to the homepage." +msgstr "Votre compte est maintenant activÃ©. Connectez-vous ou retournez sur la page d’accueil de votre site." -#: wp-comments-post.php:139 -msgid "ERROR: The comment could not be saved. Please try again later." -msgstr "ERREUR : le commentaire n’a pas pu Ãªtre enregistrÃ©. Veuillez rÃ©essayer plus tard." +#: wp-comments-post.php:123 +msgid "ERROR: please fill the required fields (name, email)." +msgstr "ERREUR : veuillez renseigner les champs obligatoires (nom, e-mail)." + +#: wp-comments-post.php:125 +msgid "ERROR: please enter a valid email address." +msgstr "ERREUR : veuillez saisir une adresse de messagerie valide." #: wp-comments-post.php:130 msgid "ERROR: please type a comment." msgstr "ERREUR : veuillez saisir un commentaire." -#: wp-comments-post.php:125 -msgid "ERROR: please enter a valid email address." -msgstr "ERREUR : veuillez saisir une adresse de messagerie valide." +#: wp-includes/admin-bar.php:108 wp-includes/admin-bar.php:117 +msgid "About WordPress" +msgstr "Ã propos de WordPress" -#: wp-comments-post.php:123 -msgid "ERROR: please fill the required fields (name, email)." -msgstr "ERREUR : veuillez renseigner les champs obligatoires (nom, e-mail)." +#: wp-includes/admin-bar.php:134 +msgid "Documentation" +msgstr "Documentation" -#: wp-comments-post.php:115 -msgid "Sorry, you must be logged in to post a comment." -msgstr "DÃ©solÃ©, vous devez Ãªtre connectÃ©(e) pour rÃ©diger un commentaire." +#: wp-includes/admin-bar.php:150 +msgid "Feedback" +msgstr "Remarque" -#: wp-comments-post.php:50 -msgid "Sorry, comments are closed for this item." -msgstr "DÃ©solÃ©, les commentaires sont fermÃ©s pour cet article." +#: wp-includes/admin-bar.php:188 +msgid "Howdy, %1$s" +msgstr "Salutations, %1$s" -#: wp-activate.php:121 -msgid "Your account is now activated. Log in or go back to the homepage." -msgstr "Votre compte est maintenant activÃ©. Connectez-vous ou retournez sur la page d’accueil de votre site." +#: wp-includes/admin-bar.php:274 +msgid "Network Admin: %s" +msgstr "Admin du rÃ©seau : %s" -#: wp-activate.php:119 -msgid "Your account is now activated. View your site or Log in" -msgstr "Votre compte est maintenant activÃ©. Consultez votre site ou connectez-vous" +#: wp-includes/admin-bar.php:302 +msgid "Edit Site" +msgstr "Modifier le site" -#: wp-activate.php:115 wp-includes/post-template.php:1633 -msgid "Password:" -msgstr "Mot de passe :" +#: wp-includes/admin-bar.php:633 +msgctxt "add new from admin bar" +msgid "User" +msgstr "Utilisateur" -#: wp-activate.php:114 wp-signup.php:177 -msgid "Username:" -msgstr "Identifiant :" +#: wp-includes/admin-bar.php:671 +msgid "%s comment awaiting moderation" +msgid_plural "%s comments awaiting moderation" +msgstr[0] "%s commentaire en attente de modÃ©ration" +msgstr[1] "%s commentaires en attente de modÃ©ration" + +#: wp-includes/capabilities.php:659 wp-includes/capabilities.php:681 +#: wp-includes/capabilities.php:707 +msgid "Use WP_User->ID instead." +msgstr "Utilisez plutÃ´t WP_User->ID." #: wp-activate.php:103 msgid "An error occurred during the activation" msgstr "Une erreur est survenue lors de l’activation" +<<<<<<< .mine +#: wp-includes/admin-bar.php:126 +msgid "WordPress.org" +msgstr "Site de WordPress-FR" +||||||| .r11156 +#: wp-activate.php:114 wp-signup.php:179 +msgid "Username:" +msgstr "Identifiant :" +======= #: wp-activate.php:98 msgid "Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." msgstr "Votre site est activÃ© Ã %2$s. Vous pouvez dÃ¨s maintenant vous connecter Ã ce site en utilisant l’identifiant choisi « %3$s ». Vous trouverez dans votre messagerie (sur %4$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/admin-bar.php:142 +msgid "Support Forums" +msgstr "Forums d’entraide" +||||||| .r11156 +#: wp-includes/post.php:1630 +msgid "No posts found." +msgstr "Aucun article trouvÃ©." +======= #: wp-activate.php:96 msgid "Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password." msgstr "Votre compte vient d’Ãªtre activÃ©. Vous pouvez dÃ¨s maintenant vous connecter Ã votre site en utilisant votre identifiant « %2$s ». Vous trouverez dans votre messagerie (sur %3$s) un message vous donnant votre mot de passe et identifiant, ainsi que les instructions pour vous connecter. Si vous ne recevez pas d’e-mail, pensez Ã consulter le dossier « spam » de votre client de messagerie. Si vous ne recevez pas votre mot de passe dans moins d’une heure, vous pouvez rÃ©initialiser votre mot de passe." +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-includes/admin-bar.php:339 +#: wp-includes/class-wp-customize-control.php:1411 +#: wp-includes/class-wp-customize-section.php:432 +msgid "Customize" +msgstr "Personnaliser" +||||||| .r11156 +#: wp-includes/post.php:908 wp-includes/post.php:928 +#: wp-includes/script-loader.php:457 +msgid "Published" +msgstr "PubliÃ©" +======= #: wp-activate.php:92 wp-activate.php:111 msgid "Your account is now active!" msgstr "Votre compte est maintenant activÃ© !" +>>>>>>> .r12027 +<<<<<<< .mine +#: wp-activate.php:73 +msgid "Activation Key Required" +msgstr "ClÃ© d’activation requise" +||||||| .r11156 +#: wp-includes/post.php:906 +msgid "Pending Review" +msgstr "En attente de relecture" +======= #: wp-activate.php:80 msgid "Activate" msgstr "Activer" +>>>>>>> .r12027 #: wp-activate.php:76 msgid "Activation Key:" msgstr "ClÃ© d’activation :" +<<<<<<< .mine +#: wp-includes/admin-bar.php:638 +msgctxt "admin bar menu group label" +msgid "New" +msgstr "CrÃ©er" + +#: wp-includes/admin-bar.php:166 +msgid "Menu" +msgstr "Menu" + +#: wp-includes/admin-bar.php:127 wp-includes/default-widgets.php:470 +#: wp-login.php:101 +msgid "https://wordpress.org/" +msgstr "http://www.wordpress-fr.net/" + +#: wp-includes/admin-bar.php:143 wp-login.php:811 +msgid "https://wordpress.org/support/" +msgstr "http://www.wordpress-fr.net/support" + +#: wp-includes/admin-bar.php:151 +msgid "https://wordpress.org/support/forum/requests-and-feedback" +msgstr "https://wordpress.org/support/forum/requests-and-feedback" + +#. translators: 1: error message, 2: line number +#: wp-includes/atomlib.php:144 +msgid "XML Error: %1$s at line %2$s" +msgstr "Erreur XML : %1$s Ã la ligne %2$s" + +#: wp-includes/category-template.php:493 wp-includes/taxonomy.php:513 +msgid "No categories" +msgstr "Aucune catÃ©gorie" + +#: wp-includes/admin-bar.php:135 +msgid "https://codex.wordpress.org/" +msgstr "https://codex.wordpress.org/" + +#: wp-comments-post.php:139 +msgid "ERROR: The comment could not be saved. Please try again later." +msgstr "ERREUR : le commentaire n’a pas pu Ãªtre enregistrÃ©. Veuillez rÃ©essayer plus tard." + +#: wp-includes/admin-bar.php:613 +msgctxt "add new from admin bar" +msgid "Link" +msgstr "Lien" + +#: wp-includes/admin-bar.php:276 +msgid "User Dashboard: %s" +msgstr "Tableau de bord de l’utilisateur : %s" +||||||| .r11156 +#: wp-includes/class-wp-editor.php:1326 +msgid "Y/m/d" +msgstr "d/m/Y" + +#: wp-includes/admin-bar.php:297 wp-includes/admin-bar.php:443 +#: wp-includes/deprecated.php:2852 +msgid "Visit Site" +msgstr "Aller sur le site" + +#: wp-includes/admin-bar.php:250 wp-includes/class-wp-admin-bar.php:374 +msgid "Log Out" +msgstr "Se dÃ©connecter" + +#: wp-includes/class-wp-xmlrpc-server.php:3569 +#: wp-includes/class-wp-xmlrpc-server.php:3615 +#: wp-includes/class-wp-xmlrpc-server.php:5313 +msgid "You do not have permission to upload files." +msgstr "Vous n’avez pas l’autorisation d’envoyer des fichiers." +======= #: wp-activate.php:73 msgid "Activation Key Required" msgstr "ClÃ© d’activation requise" +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/README.md b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/README.md index d519181f..a2c03d40 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/README.md +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/README.md @@ -3,7 +3,139 @@ Cherry Plugin Cherry Plugin contains all shortcodes and widgets used in Cherry Framework. Also Cherry Framework Import/Export features are also added by Cherry plugin. +#### v1.2.8.1 #### + +<<<<<<< .mine +* FIX: Minor bugfixes + +#### v1.2.8 #### + +* ADD: `lightbox` attribute to `posts_grid`, `mini_posts_grid`, `video-preview` +* ADD: `custom_tag` attribute in `recentposts` shortcode +* ADD: `text` and `linked` attributes to `testi` shortcode +* ADD: Output photos by hashtag in `Instagram` widget +* FIX: Disable draggable option in `google_map` on mobile devices +* FIX: `banner` shortcode logic +* FIX: Widget visibility on blog page +* FIX: Gravatar in `Recent Comments` widget +* FIX: WP_Query in `My Recent Posts widget` +* FIX: WP 4.3.0 compatibility - updated constructor method for WP_Widget +* UPD: Language files +* UPD: Maintenance Mode page + +#### v1.2.7 #### + +* ADD: `Pinterest` and `Twitter` widgets +* ADD: icon_link attribute to the `service_box` shortcode +* FIX: Plugin security bug +* FIX: Usage of `wp-content` in code +* FIX: Check and validation for amount parametr in `flickr` widget +* FIX: `roundabout` shortcode in home page +* FIX: a limit parametr for `twitter` widget +* FIX: Added a check for empty post array in `carousel_owl` and `posts_grid` shortcodes +* FIX: widget visibility +* FIX: Save menu badges meta data if is WooCommerce template +* UPD: Width for pseudo-elements in `content_box` shortcode CSS +* UPD: Centering of navigation icons in `Post Cycle` widget +* UPD: Changed a priority for wp_enqueue_scripts +* UPD: Added a `wc-logs` directory to the exclude folder for export +* UPD: Visibility items in `carousel_owl` shortcode +* UPD: Language files + +#### v1.2.6 #### + +* FIX: `set_site_transient` for update_plugins +* FIX: Replaced a double quote on a single quote in ru_RU.po file +* UPD: Replaced using function for trims text +* UPD: Changed a content_box shortcode logic + + +#### v1.2.5 #### + +* Not use `wptexturize` in content and excerpt. Removed temporary. (@link https://core.trac.wordpress.org/ticket/29557) + + +#### v1.2.4 #### + +* ADD: New google map api shortcode +* FIX: Shortcode dialog (changed sizes) +* FIX: A wrong function_exists check for content_box shortcode +* FIX: Trouble when used Ñyrillic in the tabs shortcode +* FIX: Argumets variable name in carousel_owl shortcode +* UPD: Changed maintenance mode user rights +* UPD: Rename title_box shortcode in wp-editor and edit description + + +#### v1.2.3 #### + +* FIX: Reset to the previous columns.php file version + + +#### v1.2.2 #### + +* FIX: conflicts flexslider.css +* UPD: carousel.php +* ADD: Added style for under-construction page in mobile devices +* UPD: recent post shortcode(video post type) +* upd: my-social-widget widgets +* FIX: Fixed quotes +* ADD: Added clearfix class to the li item in recent_posts shortcode +* ADD: Added to the all shortcodes filters html-formatted data before return +* ADD: Added outputing value for email custom field in Team and Testimonails post type +* ADD: Added some style to the flex-slider +* Fix: Fixed https://github.com/CherryFramework/CherryFramework/issues/17 +* Fix: Fixed display parametr in button shortcode +* UPD: ul counter for post grid shotcode +* FIX: https://github.com/CherryFramework/CherryFramework/issues/13 +* FIX: https://github.com/CherryFramework/CherryFramework/issues/10 +* UPD: recent testimonials shotcode +* ADD: category filter to mini post shotcode +* UPD: postcycle widget +* UPD: flex slider css +* UPD: Updated flexslider to version 2.2.2 +* UPD: css .comments-custom +* Fix: hotfix: removed post-cycle's loader +* Fix: hotfix: Fixed rtl-support in post_cycle shortcode +* Fix: hotfix: removed post-cycle's loader +* Fix: hotfix: Fixed rlt-support in post_cycle shortcode + + +#### v1.2.1 #### + +* Add: Added rtl-language support +* Upd: Improved Cherry Recent Comments widget â get comment for posts, pages, attachments and porfolio custom post type +* Add: Added compatibility audio shortcode with MotoPress plugin +* UPD: get_the_date() +* ADD: content_box shortcode +* ADD: tag option to posts grid shortcode +* ADD: tag option to posts-list shortcode +* ADD: tag option to recent posts shortcode +* UPD: Cherry recent posts (the_date(); -> the_time(âF j, Yâ);) +* UPD: widget banner +* ADD: item counter class +* Add: added custom-class option to row, span, shortcodes +* Fix: Fixed outputing notice +* Fix: Fixed outputing notice +* Add: Added define API_URL constant + + +#### v1.2 #### + +* Add: Compatibility with WP 3.9: fix shortcode dialog +* UPD: Exclude widgets manager on customize.php +* UPD: Improved wpml-plugin compatibility for widgets +* FIX: Fixed issue with french translation - https://github.com/CherryFramework/CherryFramework/issues/6 +* FIX: Compatibility with old TM-themes +* FIX: fix instagram and banner widgets +* FIX: import algorithm. +* FIX: remote server error +* UPD: Removed logic for style-switcher +* UPD: readme update + + +||||||| .r11156 +======= #### v1.2.6 #### * FIX: `set_site_transient` for update_plugins @@ -95,6 +227,7 @@ Cherry Plugin contains all shortcodes and widgets used in Cherry Framework. Also * UPD: readme update +>>>>>>> .r12027 #### v1.1 #### * Fix: import errors diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/admin.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/admin.php index 3edbfef4..38989a5a 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/admin.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/admin.php @@ -7,7 +7,9 @@ //xml parser class include_once (CHERRY_PLUGIN_DIR . 'lib/php/parsers.php'); - //import ajax function + //import/export ajax function + include_once (CHERRY_PLUGIN_DIR . 'admin/import-export/upload.php'); + include_once (CHERRY_PLUGIN_DIR . 'admin/import-export/download-content.php'); include_once (CHERRY_PLUGIN_DIR . 'admin/import-export/import-functions.php'); include_once (CHERRY_PLUGIN_DIR . 'admin/import-export/export-functions.php'); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/css/widget-rules.css b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/css/widget-rules.css index 13abd8f2..7b555bd9 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/css/widget-rules.css +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/css/widget-rules.css @@ -69,7 +69,7 @@ } .gk_widget_rules_form legend, -.gk_widget_rules_pages legend { +.gk_widget_rules_pages legend { margin: 0 0 0 -5px; font-size: 11px; font-weight: bold; @@ -105,6 +105,9 @@ .gk_widget_rules_pages div span.homepage { background: #049cdb; } +.gk_widget_rules_pages div span.blog { + background: #447744; +} .gk_widget_rules_pages div span.page { background: #0064cd; diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/download-content.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/download-content.php index e6cba158..9dbfe356 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/download-content.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/download-content.php @@ -1,7 +1,35 @@ \ No newline at end of file +} + +add_action( 'wp_ajax_cherry_plugin_get_export_file', 'cherry_plugin_get_export_file' ); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export-functions.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export-functions.php index 97971f7a..1d294577 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export-functions.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export-functions.php @@ -6,7 +6,11 @@ add_action('wp_ajax_export_content', 'cherry_plugin_export_content'); function cherry_plugin_export_content() { $exclude_files = array('xml', 'json'); - $exclude_folder = array('woocommerce_uploads'); + /** + * Filters folders to exclude from export parser + * @var array + */ + $exclude_folder = apply_filters( 'cherry_export_exclude_folders', array( 'woocommerce_uploads', 'wc-logs' ) ); $response = array( 'what'=>'status', 'action'=>'export_content', @@ -47,10 +51,14 @@ cherry_plugin_delete_file($xml_file); } + $nonce = wp_create_nonce( 'cherry_plugin_download_content' ); + + $file_url = add_query_arg( array( 'action' => 'cherry_plugin_get_export_file', 'file' => $zip_name, '_wpnonce' => $nonce ), admin_url( 'admin-ajax.php' ) ); + if ($result == 0) { $response['data'] = "Error : ".$zip->errorInfo(true); }else{ - $response_file['data'] = $zip_name; + $response_file['data'] = $file_url; } $xmlResponse = new WP_Ajax_Response($response); @@ -143,7 +151,7 @@ return $json_dir; } - function sort_widget_array($array){ + function sort_widget_array($array){ return (!empty($array) && is_array($array)); } function cherry_plugin_delete_file($file){ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export.php index a6cbd3c5..dfd00565 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/export.php @@ -9,10 +9,10 @@ jQuery.post(ajaxurl, {action: 'export_content'}, function(response) { var res = wpAjax.parseAjaxResponse(response, "ajax-response"); if(!res.errors){ - var file = res.responses[1].data, + var file_url = res.responses[1].data, status = res.responses[0].data; - if(file.indexOf('.zip')!=-1){ - window.location.href = '?file=' + file; + if ( file_url.indexOf('.zip')!=-1 ) { + window.location.href = file_url; } }else{ //console.log('error 1'); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import-functions.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import-functions.php index 74b741a6..e7591f39 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import-functions.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import-functions.php @@ -6,7 +6,7 @@ $json_file = isset($_POST['file']) ? $_POST['file'] : 'false' ; $json = file_get_contents(UPLOAD_DIR.$json_file); - + $upload_dir = wp_upload_dir(); $upload_dir = $upload_dir['url']; $cut_upload_dir = substr($upload_dir, strpos($upload_dir, 'wp-content/uploads'), strlen($upload_dir)-1); @@ -48,7 +48,7 @@ if ( !is_array($users) ) { $users = array(); } - + if(!empty($rules_data)) { $new = array('widget_responsive'); foreach($rules_data as $key => $value) { @@ -187,7 +187,7 @@ $_SESSION = array(); do_action( 'cherry_plugin_import_xml' ); - + add_filter( 'import_post_meta_key', 'cherry_plugin_is_valid_meta_key' ); $xml_file = isset($_POST['file']) ? $_POST['file'] : 'false' ; @@ -378,7 +378,7 @@ continue; } } - + unset($_SESSION['terms']); exit('import_posts'); } @@ -402,7 +402,7 @@ $posts_array = $_SESSION['posts']; $posts_array = apply_filters( 'wp_import_posts', $posts_array ); $attachment_posts = array(); - + foreach ( $posts_array as $post ) { $post = apply_filters( 'wp_import_post_data_raw', $post ); @@ -699,7 +699,19 @@ 'menu-item-status' => $item['status'] ); $id = wp_update_nav_menu_item( $menu_id, 0, $args ); - if ( $id && ! is_wp_error( $id ) ) $_SESSION['processed_menu_items'][intval($item['post_id'])] = (int) $id; + if ( $id && ! is_wp_error( $id ) ) { + $_SESSION['processed_menu_items'][intval($item['post_id'])] = (int) $id; + + /** + * Save menu badges meta data if is WooCommerce template + */ + if ( isset($_cherry_woo_badge_text) ) { + update_post_meta( $id, '_cherry_woo_badge_text', $_cherry_woo_badge_text ); + } + if ( isset($_cherry_woo_badge_type) ) { + update_post_meta( $id, '_cherry_woo_badge_type', $_cherry_woo_badge_type ); + } + } } add_action('wp_ajax_import_attachment', 'cherry_plugin_import_attachment'); function cherry_plugin_import_attachment() { @@ -725,21 +737,21 @@ $post = apply_filters( 'wp_import_post_data_raw', $post ); $postdata = array( - 'import_id' => $post['post_id'], - 'post_author' => $author, + 'import_id' => $post['post_id'], + 'post_author' => $author, 'post_date' => $post['post_date'], - 'post_date_gmt' => $post['post_date_gmt'], + 'post_date_gmt' => $post['post_date_gmt'], 'post_content' => $post['post_content'], - 'post_excerpt' => $post['post_excerpt'], + 'post_excerpt' => $post['post_excerpt'], 'post_title' => $post['post_title'], - 'post_status' => $post['status'], + 'post_status' => $post['status'], 'post_name' => $post['post_name'], - 'comment_status' => $post['comment_status'], + 'comment_status' => $post['comment_status'], 'ping_status' => $post['ping_status'], - 'guid' => $post['guid'], - /*'post_parent' => $post_parent,*/ + 'guid' => $post['guid'], + /*'post_parent' => $post_parent,*/ 'menu_order' => $post['menu_order'], - 'post_type' => $post['post_type'], + 'post_type' => $post['post_type'], 'post_password' => $post['post_password'] ); @@ -955,7 +967,7 @@ $cut_upload_dir = substr($upload_dir, strpos($upload_dir, 'wp-content/uploads'), strlen($upload_dir)-1); $cut_date_upload_dir = 'set_permalink_structure( $permalink_structure ); $wp_rewrite->flush_rules(); - + //activate plugin form $plugin_path = WP_PLUGIN_DIR.'/contact-form-7/wp-contact-form-7.php'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import.php index 5aae8063..d73bc78e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/import.php @@ -16,9 +16,11 @@ } else { $upload_size_unit = (int) $upload_size_unit; } - $upload_dir = wp_upload_dir(); - $upload_dir = $upload_dir['path'].'/'; - $action_url = CHERRY_PLUGIN_URL.'admin/import-export/upload.php?upload_dir='.str_replace("\\", "/", $upload_dir); + + $upload_dir = wp_upload_dir(); + $upload_dir = trailingslashit( $upload_dir['path'] ); + $upload_nonce = wp_create_nonce( 'cherry_plugin_upload' ); + $action_url = add_query_arg( array( 'action' => 'cherry_import_files', 'dir' => urlencode( $upload_dir ), '_wpnonce' => $upload_nonce ), admin_url( 'admin-ajax.php' ) ); add_thickbox(); echo cherry_plugin_help_import_popup(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/upload.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/upload.php index d9d7ed5a..f39d02b1 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/upload.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/import-export/upload.php @@ -1,6 +1,32 @@ >>>>>> .r12027 } if(array_key_exists('file',$_FILES)){ $upload_dir = isset($_REQUEST['upload_dir']) ? $_REQUEST['upload_dir'] : $upload_dir ; @@ -9,4 +35,6 @@ $result = move_uploaded_file($_FILES['file']['tmp_name'], $upload_file); } exit; -?> \ No newline at end of file +} + +add_action( 'wp_ajax_cherry_import_files', 'cherry_plugin_process_upload' ); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/js/widget-rules.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/js/widget-rules.js index a8f5c75b..eba816e1 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/js/widget-rules.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/js/widget-rules.js @@ -58,7 +58,7 @@ jQuery(window).on('beforeunload', function() { jQuery(document).click(function(e) { if(jQuery(e.target).hasClass('gk_widget_rules_btn')) { var wrap = jQuery(e.target).next('.gk_widget_rules_wrapper'); - + if(wrap.hasClass('active')) { wrap.removeClass('active'); jQuery.cookie('gk_last_opened_widget_rules_wrap', 0, { expires: 365, path: '/' }); @@ -74,7 +74,7 @@ function gk_widget_control_init(id, inner) { var allForms = jQuery('.gk_widget_rules_form'), newest = null, flag = 0; - + if(!inner) { for(var i = 0; i < allForms.length; i++) { if('#' + jQuery(allForms[i]).attr('id') == id) { @@ -82,7 +82,7 @@ function gk_widget_control_init(id, inner) { flag += 1; } } - + if(flag > 1) { newest.attr('id', newest.attr('id') + '-' + Math.floor((Math.random() * 10000 + 1))); newest.attr('data-state', 'uninitialized'); @@ -98,7 +98,7 @@ function gk_widget_control_init(id, inner) { jQuery(document).unbind('mouseup', mouseUpEvent); }, 250); }; - + jQuery(document).bind('mouseup', mouseUpEvent); } else { gk_widget_control_init_events(id, inner); @@ -107,16 +107,16 @@ function gk_widget_control_init(id, inner) { // function to init form event function gk_widget_control_init_events(id, inner) { var form = jQuery(id); - + // if(inner) { // form.parent().find('select:last-child').css('opacity', '0.5'); - + // setTimeout(function() { // var btn = form.parent().parent().parent().find('*[name="savewidget"]'); // btn.click(); // }, 1000); // } - + if(form.attr('data-state') !== 'initialized') { form.attr('data-state', 'initialized'); var firstSelect = form.parent().find('.gk_widget_rules_select'), @@ -134,7 +134,7 @@ function gk_widget_control_init_events(id, inner) { // change event firstSelect.change(function() { var value = firstSelect.children('option:selected').val(); - + if(value == 'all') { form.css('display', 'none'); } else { @@ -146,7 +146,7 @@ function gk_widget_control_init_events(id, inner) { // add onChange event to the selectbox select.change(function() { var value = select.children('option:selected').val() - + if(value == 'homepage' || value == 'page404' || value == 'search' || value == 'archive') { page.css('display', 'none'); post.css('display', 'none'); @@ -194,12 +194,14 @@ function gk_widget_control_init_events(id, inner) { // add the onClick event to the button btn.click(function(event) { event.preventDefault(); - - var output = form.find('.gk_widget_rules_output'); - var value = select.children('option:selected').val() - + + var output = form.find('.gk_widget_rules_output'), + value = select.children('option:selected').val(); + if(value == 'homepage') { output.val(output.val() + ',homepage'); + } else if(value == 'blog') { + output.val(output.val() + ',blog'); } else if(value == 'search') { output.val(output.val() + ',search'); } else if(value == 'archive') { @@ -217,37 +219,37 @@ function gk_widget_control_init_events(id, inner) { } else if(value == 'author:') { output.val(output.val() + ',author:' + form.find('.gk_widget_rules_form_input_author').val()); } - + gk_widget_control_refresh(form); }); // event to remove the page tags form.find('.gk_widget_rules_pages div').click(function(event) { if(event.target.nodeName.toLowerCase() == 'strong') { - var output = form.find('.gk_widget_rules_output'); - var parent = jQuery(event.target).parent(); + var output = form.find('.gk_widget_rules_output'), + parent = jQuery(event.target).parent(); parent.find('strong').remove(); var text = parent.text(); - + if(text == 'All pages') text = 'page:'; - else if(text == 'All posts pages') text = 'post'; + else if(text == 'All posts pages') text = 'post:'; else if(text== 'All category pages') text = 'category:'; else if(text == 'All tag pages') text = 'tag:'; else if(text == 'All author pages') text = 'author:'; - + output.val(output.val().replace("," + text, "")); gk_widget_control_refresh(form); } }); - // event to display the custom CSS class field + // event to display the custom CSS class field var selectStyles = jQuery(document).find('.gk_widget_rules_select_styles'); selectStyles.each(function(i, select) { select = jQuery(select); - + if(!select.hasClass('initialized')) { select.change(function() { var value = select.children('option:selected').val(); var field = select.parent().parent().next('p'); - + if(value != 'gkcustom') { if(!field.hasClass('gk-unvisible')) { field.addClass('gk-unvisible'); @@ -256,9 +258,9 @@ function gk_widget_control_init_events(id, inner) { if(field.hasClass('gk-unvisible')) { field.removeClass('gk-unvisible'); } - } + } }); - + select.addClass('initialized'); } }); @@ -271,14 +273,14 @@ function gk_widget_control_refresh(form) { if(output.length > 0) { var list = form.find('.gk_widget_rules_pages div'); list.html(''); - var pages = output.val().split(','); - var pages_exist = false; - + var pages = output.val().split(','), + pages_exist = false; + for(var i = 0; i < pages.length; i++) { if(pages[i] != '') { pages_exist = true; var type = 'homepage'; - + if(pages[i].substr(0,5) == 'page:') type = 'page'; else if(pages[i].substr(0,5) == 'post:') type = 'post'; else if(pages[i].substr(0,9) == 'category:') type = 'category'; @@ -287,15 +289,16 @@ function gk_widget_control_refresh(form) { else if(pages[i].substr(0,7) == 'author:') type = 'author'; else if(pages[i].substr(0,7) == 'page404') type = 'page404'; else if(pages[i].substr(0,6) == 'search') type = 'search'; - + else if(pages[i].substr(0,4) == 'blog') type = 'blog'; + var out = pages[i]; - + if(out == 'page:') out = 'All pages'; else if(out == 'post:') out = 'All posts pages'; else if(out == 'category:') out = 'All category pages'; else if(out == 'tag:') out = 'All tag pages'; else if(out == 'author:') out = 'All author pages'; - + list.html(list.html() + ""+out+"×"); } } diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/dialog.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/dialog.js new file mode 100644 index 00000000..6ecf5331 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/dialog.js @@ -0,0 +1,414 @@ +var shortcode_generator_url = plugin_data.url + 'admin/shortcodes/', + cherrySelectedShortcodeType, + tb_dialog_helper = { + cherrySelectedShortcodeType: '', + needsPreview: false, + setUpButtons: function(){ + var a = this; + jQuery("#cancel-button").click(function(){ + a.closeDialog() + }); + jQuery("#insert-button").click(function(){ + a.insertAction() + }); + }, + + setupShortcodeType: function ( shortcode ) { + cherrySelectedShortcodeType = shortcode; + this.cherrySelectedShortcodeType = shortcode; + }, + + loadShortcodeDetails: function() { + if (cherrySelectedShortcodeType) { + var a = this; + // Clean out the table rows before applying the new ones. + jQuery( '#options-table' ).html( '' ); + jQuery.getScript(shortcode_generator_url + "shortcodes/my_" + cherrySelectedShortcodeType + ".js", function () { + a.initializeDialog(); + + // Set the default content to the highlighted text, for certain shortcode types. + switch ( cherrySelectedShortcodeType ) { + case 'box': + case 'ilink': + case 'quote': + case 'button': + case 'abbr': + case 'unordered_list': + case 'ordered_list': + case 'typography': + jQuery('input#value-content').val( selectedText ); + case 'toggle': + jQuery('textarea#value-content').val( selectedText ); + break; + } + }) + } + }, + + initializeDialog: function (){ + if (typeof frameworkShortcodeAtts == "undefined") { + jQuery("#shortcode-options").append("
Error loading details for shortcode: " + cherrySelectedShortcodeType + "
"); + } else { + var a = frameworkShortcodeAtts.attributes, + b = jQuery("#options-table"); + + // Clean out the table rows before applying the new ones. + b.html( '' ); + + for (var c in a) { + var f = "mytheme-value-" + a[c].id, + d = a[c].isRequired ? "mytheme-required" : "", + g = jQuery('

'); + + var requiredSpan = ''; + + if (a[c].isRequired) { + + requiredSpan = '*'; + + } // End IF Statement + jQuery("").attr("for", f).attr("class", a[c].id).html(a[c].label).append(requiredSpan).appendTo(g); + f = jQuery("").append(g).append(f).appendTo(b) + } + jQuery(".mytheme-focus-here:first").focus() + + // Add additional wrappers, etc, to each select box. + jQuery( '#woo-options select' ).each( function ( i ) { + if ( ! jQuery( this ).parent().hasClass( 'select_wrapper' ) ) { + jQuery( this ).wrap( '
' ).before( '' ); + } + }); + + jQuery('#shortcode-options select option:selected').each( function () { + jQuery(this).parents('.select_wrapper').find('span').text( jQuery(this).text() ); + }); + + } // End IF Statement + }, + + /* Tab Generator Element */ + + createTabControl: function (a, b, c) { + new myThemeTabMaker(b, 10, c ? "mytheme-focus-here" : null); + b.addClass("mytheme-marker-tab-control") + }, + + /* Generic Text Element */ + + createTextControl: function (a, b, c) { + + var f = a.validateLink ? "mytheme-validation-marker" : "", + d = a.isRequired ? "mytheme-required" : "", + g = "framework-" + a.id, + defaultValue = a.defaultValue ? a.defaultValue : ""; + + jQuery('').attr("id", g).attr("name", g).attr( 'value', defaultValue ).addClass(f).addClass(d).addClass('txt input-text').addClass(c ? "mytheme-focus-here" : "").appendTo(b); + + if (a = a.help) { + jQuery("
").appendTo(b); + jQuery("").addClass("input-help").html(a).appendTo(b) + } + + var h = this; + b.find("#" + g).bind("keydown focusout", function (e) { + }) + + }, + + /* Generic TextArea Element */ + + createTextAreaControl: function (a, b, c) { + + var f = a.validateLink ? "mytheme-validation-marker" : "", + d = a.isRequired ? "mytheme-required" : "", + g = "framework-" + a.id; + + jQuery('').attr("id", g).attr("name", g).attr("rows", 10).attr("cols", 30).addClass(f).addClass(d).addClass('txt input-textarea').addClass(c ? "mytheme-focus-here" : "").appendTo(b); + b.addClass("framework-marker-textarea-control"); + + if (a = a.help) { + jQuery("<br/>").appendTo(b); + jQuery("<span/>").addClass("input-help").html(a).appendTo(b) + } + + var h = this; + b.find("#" + g).bind("keydown focusout", function (e) { + }) + + }, + + /* Select Box Element */ + + createSelectControl: function (a, b, c) { + + var f = a.validateLink ? "mytheme-validation-marker" : "", + d = a.isRequired ? "mytheme-required" : "", + g = "framework-" + a.id; + + var selectNode = jQuery('<select>').attr("id", g).attr("name", g).addClass(f).addClass(d).addClass('select input-select').addClass(c ? "mytheme-focus-here" : ""); + + b.addClass('framework-marker-select-control'); + + var selectBoxValues = a.selectValues; + + var labelValues = a.selectValues; + + for (v in selectBoxValues) { + + var value = selectBoxValues[v]; + var label = labelValues[v]; + var selected = ''; + + if (value == '') { + + if (a.defaultValue == value) { + + label = a.defaultText; + + } // End IF Statement + } else { + + if (value == a.defaultValue) { + label = a.defaultText; + } // End IF Statement + } // End IF Statement + if (value == a.defaultValue) { + selected = ' selected="selected"'; + } // End IF Statement + + selectNode.append('<option value="' + value + '"' + selected + '>' + label + '</option>'); + + } // End FOREACH Loop + + selectNode.appendTo(b); + + if (a = a.help) { + jQuery("<br/>").appendTo(b); + jQuery("<span/>").addClass("input-help").html(a).appendTo(b) + } + + var h = this; + + b.find("#" + g).bind("change", function (e) { + // Update the text in the appropriate span tag. + var newText = jQuery(this).children('option:selected').text(); + + jQuery(this).parents('.select_wrapper').find('span').text( newText ); + }) + + }, + + getTextKeyValue: function (a) { + var b = a.find( "input" ); + if (!b.length) return null; + a = 'text-input-id'; + if ( b.attr( 'id' ) != undefined ) { + a = b.attr( "id" ).substring(10); + } + b = b.val(); + return { + key: a, + value: b + } + }, + + getTextAreaKeyValue: function (a) { + var b = a.find("textarea"); + if (!b.length) return null; + a = b.attr("id").substring(10); + b = b.val(); + b = b.replace(/\n\r?/g, '<br />'); + return { + key: a, + value: b + } + }, + + getColumnKeyValue: function (a) { + var b = a.find("#framework-column-text").text(); + if (a = Number(a.find("select option:selected").val())) return { + key: "data", + value: { + content: b, + numColumns: a + } + } + }, + + getTabKeyValue: function (a) { + var b = a.find("#framework-tab-text").text(); + if (a = Number(a.find("select option:selected").val())) return { + key: "data", + value: { + content: b, + numTabs: a + } + } + }, + + makeShortcode: function () { + + var a = {}, + b = this; + + jQuery("#options-table td").each(function () { + + var h = jQuery(this), + e = null; + + if (e = h.hasClass("framework-marker-select-control") ? b.getSelectKeyValue(h) : b.getTextKeyValue(h)) a[e.key] = e.value + if (e = h.hasClass("framework-marker-tab-control") ? b.getTabKeyValue(h) : b.getTextKeyValue(h)) a[e.key] = e.value + if (e = h.hasClass("framework-marker-textarea-control") ? b.getTextAreaKeyValue(h) : b.getTextKeyValue(h)) a[e.key] = e.value + + }); + + if (frameworkShortcodeAtts.customMakeShortcode) return frameworkShortcodeAtts.customMakeShortcode(a); + var c = a.content ? a.content : frameworkShortcodeAtts.defaultContent, + f = ""; + for (var d in a) { + var g = a[d]; + if (g && d != "content") f += " " + d + '="' + g + '"' + } + + // Customise the shortcode output for various shortcode types. + + switch ( frameworkShortcodeAtts.shortcodeType ) { + + case 'text-replace': + + var shortcode = "[" + frameworkShortcodeAtts.shortcode + f + "]" + (c ? c + "[/" + frameworkShortcodeAtts.shortcode + "]" : "") + + break; + + default: + + var shortcode = "[" + frameworkShortcodeAtts.shortcode + f + "]" + (c ? c + "[/" + frameworkShortcodeAtts.shortcode + "]" : "") + + break; + + } // End SWITCH Statement + + return shortcode; + }, + + getSelectKeyValue: function (a) { + var b = a.find("select"); + if (!b.length) return null; + a = b.attr("id").substring(10); + b = b.val(); + return { + key: a, + value: b + } + }, + + insertAction: function () { + if (typeof frameworkShortcodeAtts != "undefined") { + var a = this.makeShortcode(), + name = jQuery('#selected-shortcode').val(), + columnNum = 1, + rowNum = 4, + i = 1; + + if (name == 'chp_pricing_table') { + columnNum = jQuery('#framework-columns').val(); + labelled = jQuery('#framework-labelled').val(); + a += '<br/><br/>'; + + if (labelled == 'yes') { + a += '[chp_pricing_column_label title="Features"]<br/>'; + for(var n=1;n<=rowNum;n++) { + if (n % 2 == 0) { + a += '[chp_pricing_row_label] Label ' + n + ' [/chp_pricing_row_label]<br/>'; + } else { + a += '[chp_pricing_row_label odd="true"] Label ' + n + ' [/chp_pricing_row_label]<br/>'; + } + } + a += '[/chp_pricing_column_label]<br/><br/>'; + i++; + } + + for(;i<=columnNum;i++) { + if(2 === i) { + a += '[chp_pricing_column title="Column '+i+'" highlight="true" highlight_reason="Most Popular" price="'+100*i+'" currency_symbol="$" interval="Per Month"]<br/>'; + } else { + a += '[chp_pricing_column title="Column '+i+'" price="'+100*i+'" currency_symbol="$" interval="Per Month"]<br/>'; + } + for(var n=1;n<=rowNum;n++) { + if (labelled == 'yes') { + a += '[chp_pricing_row_label] Label ' + n + ' [/chp_pricing_row_label]<br/>'; + } + if (n % 2 == 0) { + a += '[chp_pricing_row] Your text here [/chp_pricing_row]<br/>'; + } else { + a += '[chp_pricing_row odd="true"] Your text here [/chp_pricing_row]<br/>'; + } + } + a += '[button text="Sign Up" link="#" style="default" size="normal" target="_self" display="inline" icon="no"]<br/>'; + a += '[/chp_pricing_column]<br/><br/>'; + } + a += '[/' + name + ']'; + } + tinyMCE.activeEditor.execCommand("mceInsertContent", false, a); + this.closeDialog() + } + }, + + closeDialog: function () { + this.needsPreview = false; + tb_remove(); + //jQuery("#dialog").remove() + }, + + validateLinkFor: function (a) { + var b = jQuery(a); + b.removeClass("framework-validation-error"); + b.removeClass("framework-validated"); + if (a = b.val()) { + b.addClass("framework-validating"); + jQuery.ajax({ + url: ajaxurl, + dataType: "json", + data: { + action: "framework_check_url_action", + url: a + }, + error: function () { + b.removeClass("framework-validating") + }, + success: function (c) { + b.removeClass("framework-validating"); + c.error || b.addClass(c.exists ? "framework-validated" : "framework-validation-error") + } + }) + } + } + +}; + +tb_dialog_helper.setUpButtons(); +tb_dialog_helper.loadShortcodeDetails(); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_carousel_owl.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_carousel_owl.js index 5a07be18..dde7d1c5 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_carousel_owl.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_carousel_owl.js @@ -13,7 +13,7 @@ frameworkShortcodeAtts={ { label:"Which category to pull from?", id:"categories", - help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." + help:"Enter the name of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." }, { label:"How many posts to show?", diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_mini_posts_grid.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_mini_posts_grid.js index 18c98264..14364a18 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_mini_posts_grid.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_mini_posts_grid.js @@ -1,74 +1,83 @@ -frameworkShortcodeAtts={ - attributes:[ - { - label:"Type of posts", - id:"type", - help:"This is the type of posts. Use post slug, e.g. \"portfolio\" or blank for posts from Blog" - }, - { - label:"How many posts to show?", - id:"numb", - help:"Total number of posts, -1 for all posts" - }, - { - label:"Thumbnails", - id:"thumbs", - controlType:"select-control", - selectValues:['small', 'smaller', 'smallest'], - defaultValue: 'small', - defaultText: 'small', - help:"Size of post thumbnails" - }, - { - label:"Image width", - id:"thumb_width", - help:"Set width for your featured images." - }, - { - label:"Image height", - id:"thumb_height", - help:"Set height for your featured images." - }, - { - label:"Which category to pull from? (for Blog posts)", - id:"category", - help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." - }, - { - label:"Which category to pull from? (for Custom posts)", - id:"custom_category", - help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." - }, - { - label:"Order by", - id:"order_by", - controlType:"select-control", - selectValues:['date', 'title', 'popular', 'random'], - help:"Choose the order by mode." - }, - { - label:"Order", - id:"order", - controlType:"select-control", - selectValues:['DESC', 'ASC'], - help:"Choose the order mode ( from Z to A or from A to Z)." - }, - { - label:"Align", - id:"align", - controlType:"select-control", - selectValues:['left', 'right', 'center'], - defaultValue: 'left', - defaultText: 'left', - help:"Alignment of grid - left, right, or center." - }, - { - label:"Custom class", - id:"custom_class", - help:"Use this field if you want to use a custom class." - } - ], - defaultContent:"", - shortcode:"mini_posts_grid", - shortcodeType: "text-replace" +frameworkShortcodeAtts={ + attributes:[ + { + label:"Type of posts", + id:"type", + help:"This is the type of posts. Use post slug, e.g. \"portfolio\" or blank for posts from Blog" + }, + { + label:"How many posts to show?", + id:"numb", + help:"Total number of posts, -1 for all posts" + }, + { + label:"Thumbnails", + id:"thumbs", + controlType:"select-control", + selectValues:['small', 'smaller', 'smallest'], + defaultValue: 'small', + defaultText: 'small', + help:"Size of post thumbnails" + }, + { + label:"Image width", + id:"thumb_width", + help:"Set width for your featured images." + }, + { + label:"Image height", + id:"thumb_height", + help:"Set height for your featured images." + }, + { + label:"Lightbox", + id:"lightbox", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"Enable Lightbox?" + }, + { + label:"Which category to pull from? (for Blog posts)", + id:"category", + help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." + }, + { + label:"Which category to pull from? (for Custom posts)", + id:"custom_category", + help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." + }, + { + label:"Order by", + id:"order_by", + controlType:"select-control", + selectValues:['date', 'title', 'popular', 'random'], + help:"Choose the order by mode." + }, + { + label:"Order", + id:"order", + controlType:"select-control", + selectValues:['DESC', 'ASC'], + help:"Choose the order mode ( from Z to A or from A to Z)." + }, + { + label:"Align", + id:"align", + controlType:"select-control", + selectValues:['left', 'right', 'center'], + defaultValue: 'left', + defaultText: 'left', + help:"Alignment of grid - left, right, or center." + }, + { + label:"Custom class", + id:"custom_class", + help:"Use this field if you want to use a custom class." + } + ], + defaultContent:"", + shortcode:"mini_posts_grid", + shortcodeType: "text-replace" }; \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_posts_grid.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_posts_grid.js index 7c981034..5c5bb9f2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_posts_grid.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_posts_grid.js @@ -1,92 +1,101 @@ -frameworkShortcodeAtts={ - attributes:[ - { - label:"Type of posts", - id:"type", - help:"This is the type of posts. Use post slug, e.g. \"portfolio\" or blank for posts from Blog" - }, - { - label:"Columns", - id:"columns", - help:"Number of posts per row" - }, - { - label:"Rows", - id:"rows", - help:"Number of rows" - }, - { - label:"Order by", - id:"order_by", - controlType:"select-control", - selectValues:['date', 'title', 'popular', 'random'], - help:"Choose the order by mode." - }, - { - label:"Order", - id:"order", - controlType:"select-control", - selectValues:['DESC', 'ASC'], - help:"Choose the order mode ( from Z to A or from A to Z)." - }, - { - label:"Image width", - id:"thumb_width", - help:"Set width for your featured images." - }, - { - label:"Image height", - id:"thumb_height", - help:"Set height for your featured images." - }, - { - label:"Meta", - id:"meta", - controlType:"select-control", - selectValues:['yes', 'no'], - defaultValue: 'yes', - defaultText: 'yes', - help:"Show a post meta?" - }, - { - label:"The number of words in the excerpt", - id:"excerpt_count", - help:"How many words are displayed in the excerpt?" - }, - { - label:"Link", - id:"link", - controlType:"select-control", - selectValues:['yes', 'no'], - help:"Show link after posts, yes or no." - }, - { - label:"Link Text", - id:"link_text", - help:"Text for the link." - }, - { - label:"Which category to pull from? (for Blog posts)", - id:"category", - help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." - }, - { - label:"Which category to pull from? (for Custom posts)", - id:"custom_category", - help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." - }, - { - label:"Posts tag", - id:"tag", - help:"Enter tags for posts filtering. Leave blank to pull all tags" - }, - { - label:"Custom class", - id:"custom_class", - help:"Use this field if you want to use a custom class for posts." - } - ], - defaultContent:"", - shortcode:"posts_grid", - shortcodeType: "text-replace" +frameworkShortcodeAtts={ + attributes:[ + { + label:"Type of posts", + id:"type", + help:"This is the type of posts. Use post slug, e.g. \"portfolio\" or blank for posts from Blog" + }, + { + label:"Columns", + id:"columns", + help:"Number of posts per row" + }, + { + label:"Rows", + id:"rows", + help:"Number of rows" + }, + { + label:"Order by", + id:"order_by", + controlType:"select-control", + selectValues:['date', 'title', 'popular', 'random'], + help:"Choose the order by mode." + }, + { + label:"Order", + id:"order", + controlType:"select-control", + selectValues:['DESC', 'ASC'], + help:"Choose the order mode ( from Z to A or from A to Z)." + }, + { + label:"Image width", + id:"thumb_width", + help:"Set width for your featured images." + }, + { + label:"Image height", + id:"thumb_height", + help:"Set height for your featured images." + }, + { + label:"Lightbox", + id:"lightbox", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"Enable Lightbox?" + }, + { + label:"Meta", + id:"meta", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"Show a post meta?" + }, + { + label:"The number of words in the excerpt", + id:"excerpt_count", + help:"How many words are displayed in the excerpt?" + }, + { + label:"Link", + id:"link", + controlType:"select-control", + selectValues:['yes', 'no'], + help:"Show link after posts, yes or no." + }, + { + label:"Link Text", + id:"link_text", + help:"Text for the link." + }, + { + label:"Which category to pull from? (for Blog posts)", + id:"category", + help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." + }, + { + label:"Which category to pull from? (for Custom posts)", + id:"custom_category", + help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." + }, + { + label:"Posts tag", + id:"tag", + help:"Enter tags for posts filtering. Leave blank to pull all tags" + }, + { + label:"Custom class", + id:"custom_class", + help:"Use this field if you want to use a custom class for posts." + } + ], + defaultContent:"", + shortcode:"posts_grid", + shortcodeType: "text-replace" }; \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recentposts.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recentposts.js index a0a2b99f..a57114c9 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recentposts.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recentposts.js @@ -63,10 +63,15 @@ frameworkShortcodeAtts={ help:"Enter the slug of the category you'd like to pull posts from. Leave blank if you'd like to pull from all categories." }, { - label:"Input post tag", + label:"Input post tag (for Blog posts)", id:"tag", help:"Enter tags for posts filtering. Leave blank to pull all tags" }, + { + label:"Input post tag (for Custom posts)", + id:"custom_tag", + help:"Enter tags for posts filtering. Leave blank to pull all tags" + }, { label:"The number of words in the excerpt", id:"excerpt_count", diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recenttesti.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recenttesti.js index 93fb7f0f..16000d3f 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recenttesti.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_recenttesti.js @@ -14,11 +14,28 @@ frameworkShortcodeAtts={ defaultText: 'true', help:"Enable or disable featured image." }, + { + label:"Post content", + id:"text", + controlType:"select-control", + selectValues:['part', 'full'], + defaultValue: 'part', + defaultText: 'part', + help:"Choose to display an part or full content." + }, { label:"The number of words in the excerpt", id:"excerpt_count", help:"How many words are displayed in the excerpt?" }, + { + label:"Linked text?", + id:"linked", + controlType:"select-control", + selectValues:['true', 'false'], + defaultValue: 'true', + defaultText: 'true', + }, { label:"Custom class", id:"custom_class", diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_service_box.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_service_box.js index 52eab422..77dd9405 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_service_box.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_service_box.js @@ -15,14 +15,19 @@ frameworkShortcodeAtts={ id:"icon", controlType:"select-control", selectValues:['no', 'icon1', 'icon2', 'icon3', 'icon4', 'icon5', 'icon6', 'icon7', 'icon8', 'icon9', 'icon10'], - defaultValue: 'icon1', + defaultValue: 'icon1', defaultText: 'icon1', help:"Select the icon image for box." }, + { + label:"Icon Link", + id:"icon_link", + help:"Enter the link for icon. (e.g. http://demolink.org)" + }, { label:"Text", id:"text", - controlType:"textarea-control", + controlType:"textarea-control", help:"Enter text for box." }, { @@ -40,7 +45,7 @@ frameworkShortcodeAtts={ id:"btn_size", controlType:"select-control", selectValues:['small', 'normal', 'large'], - defaultValue: 'normal', + defaultValue: 'normal', defaultText: 'normal', help:"Choose button size." }, @@ -49,7 +54,7 @@ frameworkShortcodeAtts={ id:"target", controlType:"select-control", selectValues:['_blank', '_self', '_parent', '_top'], - defaultValue: '_self', + defaultValue: '_self', defaultText: '_self', help:"The target attribute specifies a window or a frame where the linked document is loaded." }, diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_video_preview.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_video_preview.js index 0b9f1c3e..48384e0b 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_video_preview.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/shortcodes/my_video_preview.js @@ -1,43 +1,52 @@ -frameworkShortcodeAtts={ - attributes:[ - { - label:"Link to post", - id:"post_url", - help:"You can insert the link into the post that contains video from YouTube or Vimeo. Example link: http://demolink.org/blog/video-post-type/" - }, - { - label:"Need to display the name of the post?", - id:"title", - controlType:"select-control", - selectValues:['yes', 'no'], - defaultValue: 'yes', - defaultText: 'yes', - help:"You can display or hide the name of the post with the following shortcode." - }, - { - label:"Need to display the post creation date?", - id:"date", - controlType:"select-control", - selectValues:['yes', 'no'], - defaultValue: 'yes', - defaultText: 'yes', - help:"You can show or hide the post creation date with the following shortcode." - }, - { - label:"Need to display the author of the post?", - id:"author", - controlType:"select-control", - selectValues:['yes', 'no'], - defaultValue: 'yes', - defaultText: 'yes', - help:"You can show or hide the author of the post with the following shortcode." - }, - { - label:"Custom class", - id:"custom_class", - help:"Use this field if you want to use a custom class." - } - ], - defaultContent:"", - shortcode:"video_preview" +frameworkShortcodeAtts={ + attributes:[ + { + label:"Link to post", + id:"post_url", + help:"You can insert the link into the post that contains video from YouTube or Vimeo. Example link: http://demolink.org/blog/video-post-type/" + }, + { + label:"Need to display the name of the post?", + id:"title", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"You can display or hide the name of the post with the following shortcode." + }, + { + label:"Need to display the post creation date?", + id:"date", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"You can show or hide the post creation date with the following shortcode." + }, + { + label:"Need to display the author of the post?", + id:"author", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"You can show or hide the author of the post with the following shortcode." + }, + { + label:"Lightbox", + id:"lightbox", + controlType:"select-control", + selectValues:['yes', 'no'], + defaultValue: 'yes', + defaultText: 'yes', + help:"Enable Lightbox?" + }, + { + label:"Custom class", + id:"custom_class", + help:"Use this field if you want to use a custom class." + } + ], + defaultContent:"", + shortcode:"video_preview" }; \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/tinymce-shortcodes.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/tinymce-shortcodes.php index 74856a97..eaf18fb6 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/tinymce-shortcodes.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/admin/shortcodes/tinymce-shortcodes.php @@ -16,6 +16,8 @@ if ( !class_exists('Cherry_TinyMCE_Shortcodes') ) { add_action( 'wp_ajax_cherry_check_url_action', array( $this, 'ajax_action_check_url' ) ); add_action( 'wp_ajax_cherry_shortcodes_nonce', array( $this, 'ajax_action_generate_nonce' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 99 ); + // Output the markup in the footer. add_action( 'admin_footer', array( $this, 'output_dialog_markup' ) ); } @@ -77,10 +79,19 @@ if ( !class_exists('Cherry_TinyMCE_Shortcodes') ) { die(); } + function enqueue_scripts() { + wp_register_script( 'tinymce-dialog-script', plugins_url( 'dialog.js', __FILE__ ), array( 'jquery' ), CHERRY_PLUGIN_VERSION, true ); + wp_enqueue_script( 'tinymce-dialog-script' ); + $plugin_data = array( + 'url' => CHERRY_PLUGIN_URL, + ); + wp_localize_script( 'tinymce-dialog-script', 'plugin_data', $plugin_data ); + } + /** * Output the HTML markup for the dialog box. */ - public function output_dialog_markup () { + function output_dialog_markup () { // URL to TinyMCE plugin folder $plugin_url = CHERRY_PLUGIN_URL . '/includes/shortcodes/'; ?> @@ -98,7 +109,6 @@ if ( !class_exists('Cherry_TinyMCE_Shortcodes') ) { <input type="hidden" id="selected-shortcode" value=""> </div> <div class="clear"></div> - <script type="text/javascript" id="cherry-shortcode-dialog" src="<?php echo esc_url( CHERRY_PLUGIN_URL . 'admin/shortcodes/dialog-js.php' ); ?>"></script> </div> <?php } } diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/cherry-plugin.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/cherry-plugin.php index bfc09578..3ef07fde 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/cherry-plugin.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/cherry-plugin.php @@ -1,7 +1,13 @@ <?php /* Plugin Name: Cherry Plugin +<<<<<<< .mine + Version: 1.2.8.1 +||||||| .r11156 + Version: 1.2.5 +======= Version: 1.2.6 +>>>>>>> .r12027 Plugin URI: http://www.cherryframework.com/update/meet-the-cherry-plugin-bare-functionalities-no-strings-attached/ Description: Cherry team has already created a Cherry framework that can be reasonably called perfect, but we are always looking for more improvements. Meet the Cherry Plugin. This is an extension for our Cherry framework where we've included all shortcodes and widgets you will ever need. The plugin is fully compatible with any WordPress theme powered by Cherry Framework. So far the plugin is a beta release, but we're going to keep on improving it, to deliver even more cool features. Author: Cherry Team. @@ -37,9 +43,9 @@ define('UPLOAD_BASE_DIR', str_replace("\\", "/", $upload_dir['basedir'])); define('UPLOAD_DIR', str_replace("\\", "/", $upload_dir['path'].'/')); - if ( !defined('API_URL') ) { - define( 'API_URL', esc_url( 'http://updates.cherry.template-help.com/cherrymoto/v3/api/' ) ); - } + // if ( !defined('API_URL') ) { + // define( 'API_URL', esc_url( 'http://updates.cherry.template-help.com/cherrymoto/v3/api/' ) ); + // } load_plugin_textdomain( CHERRY_PLUGIN_DOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/'.CHERRY_PLUGIN_DOMAIN_DIR); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.css b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.css index e746e8fe..9b1d35f0 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.css +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.css @@ -498,7 +498,6 @@ margin: 15px 0 0 5px; } .site_map ul li { - word-break: break-word; padding-bottom: 5px; } @media (max-width: 480px) { @@ -1035,17 +1034,19 @@ z-index: -1; } .google-map-api { - width:100%; - height:600px; - top:0; - position:relative; - background:#fff; + width: 100%; + height: 600px; + top: 0; + position: relative; + background: #fff; } .google-map-api .gmap { - width:100%; - height:100%; + width: 100%; + height: 100%; +} +.google-map-api .gmap img { + max-width: none !important; } -.google-map-api .gmap img { max-width:none !important; } /* #Widgets ================================================== */ /* General for Widget @@ -1350,15 +1351,15 @@ iframe .uiHeader h3 { content: ""; position: absolute; top: 0; - width: 101%; + width: 231%; height: 100%; z-index: -1; } .content_box:after { - right: -99%; + right: -230%; } .content_box:before { - left: -99%; + left: -230%; } #maintenance_mode_notice { position: fixed; @@ -1582,17 +1583,17 @@ div[id^="cherry_instagram_widget"] .img_thumbnail ul li { } } /*.ie8{ - div[id^="cherry_instagram_widget"]{ - .img_likes{ - i{ - color: rgba(255, 0, 0); + div[id^="cherry_instagram_widget"]{ + .img_likes{ + i{ + color: rgba(255, 0, 0); - } - } - .img_commetn_count{ - i{ - color: rgba(0, 122, 255); - } - } - } + } + } + .img_commetn_count{ + i{ + color: rgba(0, 122, 255); + } + } + } }*/ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.less b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.less index 5261a237..bf7ca16d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.less +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/css/cherry-plugin.less @@ -592,7 +592,6 @@ list-style: none; margin: 15px 0 0 5px; li{ - word-break: break-word; padding-bottom: 5px; @media (max-width: 480px) { float: none; @@ -1477,6 +1476,41 @@ iframe .uiHeader h3{ .content_box{ position:relative; background: #F5F5F5; +<<<<<<< .mine + + &:after, &:before { + background: #F5F5F5; + content: ""; + position: absolute; + top: 0; + width: 231%; + height: 100%; + z-index:-1; + } + &:after{ + right: -230%; + } + &:before { + left: -230%; + } +||||||| .r11156 + &:after, &:before { + background: #F5F5F5; + content: ""; + position: absolute; + top: 0; + width: 101%; + height: 100%; + z-index:-1; + } + &:after{ + right: -99%; + } + &:before { + left: -99%; + } +======= +>>>>>>> .r12027 } //-------------------------------------------------------- diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/js/cherry-plugin.js b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/js/cherry-plugin.js index 7ef53924..06e38be0 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/js/cherry-plugin.js +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/js/cherry-plugin.js @@ -1,6 +1,26 @@ jQuery(document).ready(function(){ // OWL Carousel init. cherryPluginCarouselInit(); +<<<<<<< .mine + + // Full-width block with left-right paddings. + jQuery('.content_box.full-width').wrapInner('<div class="full-block-wrap"></div>'); + jQuery(window).resize( function(){ + contenBoxResizeFunction(); + }); + + contenBoxResizeFunction(); + function contenBoxResizeFunction(){ + var width_of_viewport = jQuery(window).width(), + half_width_of_viewport = width_of_viewport / 2, + width_of_container = jQuery('.content-holder > .container').width(); + + jQuery('.content_box.full-width').width(width_of_container); + jQuery('.content_box.full-width').css({'padding-left': half_width_of_viewport+'px', 'padding-right': half_width_of_viewport+'px', 'margin-left': '-'+half_width_of_viewport+'px'}); + jQuery('.full-block-wrap').width(width_of_container); + } +||||||| .r11156 +======= // Full-width block with left-right paddings. jQuery('.content_box').wrapInner('<div class="full-block-wrap"></div>'); @@ -15,6 +35,7 @@ jQuery(document).ready(function(){ jQuery('.full-block-wrap').width(width_of_container); } ).trigger('resize'); +>>>>>>> .r12027 }); function cherryPluginCarouselInit() { @@ -24,19 +45,19 @@ function cherryPluginCarouselInit() { items_count = parseInt(carousel.attr('data-items')), display_navs = carousel.attr('data-nav')=='true' ? true : false, display_pagination = carousel.attr('data-pagination')=='true' ? true : false, - auto_height = items_count<=1 ? true : false; + auto_height = items_count<=1 ? true : false, + keys = Object.keys(items_custom), + last_key = keys[keys.length-1]; + + items_custom[last_key] = [items_custom[last_key][0], items_count]; jQuery(carousel).owlCarousel({ autoPlay: auto_play, - items: items_count, navigation: display_navs, pagination: display_pagination, navigationText: false, autoHeight: auto_height, - itemsDesktop: [1170, 5], - itemsDesktopSmall: [980, 4], - itemsTablet: [768, 3], - itemsMobile: [480, 2] + itemsCustom: items_custom }); }) jQuery('.owl-prev').addClass('icon-chevron-left'); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-assets.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-assets.php index 9b895193..935b2f7a 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-assets.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-assets.php @@ -46,9 +46,11 @@ } } function cherry_under_construction_page_content(){ - $files = '/plugin-under-construction-content.php'; - $template_dir = file_exists(CURRENT_THEME_DIR . $files) ? CURRENT_THEME_DIR . $files : CHERRY_PLUGIN_DIR .'includes' . $files ; - include_once ($template_dir); + echo '<body class="' . join( ' ', get_body_class() ) . '"><div id="motopress-main" class="main-holder">'; + $files = '/plugin-under-construction-content.php'; + $template_dir = file_exists(CURRENT_THEME_DIR . $files) ? CURRENT_THEME_DIR . $files : CHERRY_PLUGIN_DIR .'includes' . $files ; + include_once ($template_dir); + echo '</body></div><html>'; exit; } function cherry_maintenance_mode_notice(){ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-script.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-script.php index 0e0c7d38..6f389129 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-script.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-script.php @@ -1,3 +1,109 @@ +<<<<<<< .mine +<?php +//include stylesheet files + if ( !function_exists('cherry_include_stylesheet') ) { + function cherry_include_stylesheet() { + + wp_deregister_style( 'flexslider' ); + wp_register_style( 'flexslider', CHERRY_PLUGIN_URL . 'lib/js/FlexSlider/flexslider.css', false, '2.2.0', 'all' ); + wp_register_style( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.css', false, '1.24', 'all' ); + wp_register_style( 'owl-theme', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.theme.css', false, '1.24', 'all' ); + wp_enqueue_style( 'flexslider' ); + wp_enqueue_style( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.css', false, '1.24', 'all' ); + wp_enqueue_style( 'owl-theme', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.theme.css', false, '1.24', 'all' ); + wp_enqueue_style( 'font-awesome', '//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css', false, '3.2.1', 'all' ); + + if ( is_rtl() ) { + wp_enqueue_style( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/css/cherry-plugin-rtl.css', false, CHERRY_PLUGIN_VERSION, 'all' ); + } else { + wp_enqueue_style( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/css/cherry-plugin.css', false, CHERRY_PLUGIN_VERSION, 'all' ); + } + } + add_action( 'wp_enqueue_scripts', 'cherry_include_stylesheet', 9); + } + +//include script files + if ( !function_exists('cherry_include_script') ) { + function cherry_include_script(){ + wp_deregister_script( 'flexslider' ); + wp_register_script( 'flexslider', CHERRY_PLUGIN_URL . 'lib/js/FlexSlider/jquery.flexslider-min.js', array('jquery'), '2.2.2', true ); + wp_enqueue_script( 'flexslider' ); + + wp_deregister_script( 'easing' ); + wp_register_script( 'easing', CHERRY_PLUGIN_URL . 'lib/js/jquery.easing.1.3.js', array('jquery'), '1.3' ); + wp_enqueue_script( 'easing' ); + + wp_deregister_script( 'elastislide' ); + wp_register_script( 'elastislide', CHERRY_PLUGIN_URL . 'lib/js/elasti-carousel/jquery.elastislide.js', array('jquery', 'easing'), CHERRY_PLUGIN_VERSION ); + wp_enqueue_script( 'elastislide' ); + + wp_register_script( 'googlemapapis', '//maps.googleapis.com/maps/api/js?v=3.exp&sensor=false', array('jquery'), false, false ); + wp_enqueue_script( 'googlemapapis' ); + + wp_enqueue_script( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/js/cherry-plugin.js', array('jquery'), CHERRY_PLUGIN_VERSION, true ); + + /** + * Filters a custom variations of a OWL-carousel items. + * + * @since 1.2.6 + * @param array $items_custom + */ + $items_custom = apply_filters( 'cherry_plugin_owl_items_custom', array( + array( 0, 1 ), + array( 480, 2 ), + array( 768, 3 ), + array( 980, 4 ), + array( 1170, 5 ), + ) ); + wp_localize_script( 'cherry-plugin', 'items_custom', $items_custom ); + } + add_action( 'wp_enqueue_scripts', 'cherry_include_script', 9 ); + }||||||| .r11156 +<?php +//include stylesheet files + if ( !function_exists('cherry_include_stylesheet') ) { + function cherry_include_stylesheet() { + + wp_deregister_style( 'flexslider' ); + wp_register_style( 'flexslider', CHERRY_PLUGIN_URL . 'lib/js/FlexSlider/flexslider.css', false, '2.2.0', 'all' ); + wp_register_style( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.css', false, '1.24', 'all' ); + wp_register_style( 'owl-theme', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.theme.css', false, '1.24', 'all' ); + wp_enqueue_style( 'flexslider' ); + wp_enqueue_style( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.css', false, '1.24', 'all' ); + wp_enqueue_style( 'owl-theme', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.theme.css', false, '1.24', 'all' ); + wp_enqueue_style( 'font-awesome', 'http://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css', false, '3.2.1', 'all' ); + + if ( is_rtl() ) { + wp_enqueue_style( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/css/cherry-plugin-rtl.css', false, CHERRY_PLUGIN_VERSION, 'all' ); + } else { + wp_enqueue_style( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/css/cherry-plugin.css', false, CHERRY_PLUGIN_VERSION, 'all' ); + } + } + add_action( 'wp_enqueue_scripts', 'cherry_include_stylesheet', 9); + } + +//include script files + if ( !function_exists('cherry_include_script') ) { + function cherry_include_script(){ + wp_deregister_script( 'flexslider' ); + wp_register_script( 'flexslider', CHERRY_PLUGIN_URL . 'lib/js/FlexSlider/jquery.flexslider-min.js', array('jquery'), '2.2.2', true ); + wp_enqueue_script( 'flexslider' ); + + wp_deregister_script( 'easing' ); + wp_register_script( 'easing', CHERRY_PLUGIN_URL . 'lib/js/jquery.easing.1.3.js', array('jquery'), '1.3' ); + wp_enqueue_script( 'easing' ); + + wp_deregister_script( 'elastislide' ); + wp_register_script( 'elastislide', CHERRY_PLUGIN_URL . 'lib/js/elasti-carousel/jquery.elastislide.js', array('jquery', 'easing'), CHERRY_PLUGIN_VERSION ); + wp_enqueue_script( 'elastislide' ); + + wp_register_script( 'googlemapapis', '//maps.googleapis.com/maps/api/js?v=3.exp&sensor=false', array('jquery'), false, false ); + wp_enqueue_script( 'googlemapapis' ); + + wp_enqueue_script( 'cherry-plugin', CHERRY_PLUGIN_URL . 'includes/js/cherry-plugin.js', array('jquery'), CHERRY_PLUGIN_VERSION, true ); + } + add_action( 'wp_enqueue_scripts', 'cherry_include_script' ); + }======= <?php //include stylesheet files if ( !function_exists('cherry_include_stylesheet') ) { @@ -43,3 +149,4 @@ } add_action( 'wp_enqueue_scripts', 'cherry_include_script' ); } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-under-construction-content.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-under-construction-content.php index da699d01..3e350fd2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-under-construction-content.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/plugin-under-construction-content.php @@ -51,7 +51,7 @@ }); </script> <div id="under_construction_page" class="container"> -<?php +<?php if(isset($mtc_options['mtc_mode_logo'])){ ?> <div id="under_construction_logo"> <?php if($get_theme['Template']=='CherryFramework'){ @@ -82,14 +82,14 @@ if(isset($mtc_options['mtc_mode_timer'])){ ?> </div> <div id="minute_left" class="box"> <div class="numbers"></div> - <div class="lable"><?php _e('Minuts', CHERRY_PLUGIN_DOMAIN); ?></div> + <div class="lable"><?php _e('Minutes', CHERRY_PLUGIN_DOMAIN); ?></div> </div> <div id="seconds_left" class="box"> <div class="numbers"></div> <div class="lable"><?php _e('Seconds', CHERRY_PLUGIN_DOMAIN); ?></div> </div> </div> -<?php +<?php }; ?> <div id="under-construction-area"> diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/banner.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/banner.php index 946b4fa1..8cd9da9d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/banner.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/banner.php @@ -17,22 +17,17 @@ if ( !function_exists( 'banner_shortcode' ) ) { 'custom_class' => '' ), $atts)); - // Get the URL to the content area. - $content_url = untrailingslashit( content_url() ); + $uploads = wp_upload_dir(); + $uploads_dir_name = end( ( explode( '/', $uploads['baseurl'] ) ) ); - // Find latest '/' in content URL. - $last_slash_pos = strrpos( $content_url, '/' ); - - // 'wp-content' or something else. - $content_dir_name = substr( $content_url, $last_slash_pos - strlen( $content_url ) + 1 ); - - $pos = strpos( $img, $content_dir_name ); - - if ( false !== $pos ) { - - $img_new = substr( $img, $pos + strlen( $content_dir_name ), strlen( $img ) - $pos ); - $img = $content_url . $img_new; + $img_path = explode( 'uploads', $img ); + if ( 1 == count( $img_path ) ) { + $img_path = explode( $uploads_dir_name, $img ); + } + $_img = end( $img_path ); + if ( 1 < count( $img_path ) ) { + $img = $uploads['baseurl'] . $_img; } $output = '<div class="banner-wrap '.$custom_class.'">'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/carousel-owl.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/carousel-owl.php index 94bb4978..09d4c207 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/carousel-owl.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/carousel-owl.php @@ -1,3 +1,432 @@ +<<<<<<< .mine +<?php +/** + * Carousel OWL + */ +if ( !function_exists('shortcode_carousel_owl') ) { + function shortcode_carousel_owl( $atts, $content = null, $shortcodename = '' ) { + wp_enqueue_script( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.min.js', array('jquery'), '1.31', true ); + + extract( shortcode_atts( array( + 'title' => '', + 'posts_count' => 10, + 'post_type' => 'blog', + 'post_status' => 'publish', + 'visibility_items' => 5, + 'thumb' => 'yes', + 'thumb_width' => 220, + 'thumb_height' => 180, + 'more_text_single' => '', + 'categories' => '', + 'excerpt_count' => 15, + 'date' => 'yes', + 'author' => 'yes', + 'comments' => 'no', + 'auto_play' => 0, + 'display_navs' => 'yes', + 'display_pagination' => 'yes', + 'custom_class' => '' + ), $atts ) ); + + $random_ID = uniqid(); + $posts_count = intval( $posts_count ); + $thumb = $thumb == 'yes' ? true : false; + $thumb_width = absint( $thumb_width ); + $thumb_height = absint( $thumb_height ); + $excerpt_count = absint( $excerpt_count ); + $visibility_items = absint( $visibility_items ); + $auto_play = absint( $auto_play ); + $date = $date == 'yes' ? true : false; + $author = $author == 'yes' ? true : false; + $comments = $comments == 'yes' ? true : false; + $display_navs = $display_navs == 'yes' ? 'true' : 'false'; + $display_pagination = $display_pagination == 'yes' ? 'true' : 'false'; + $itemcounter = 0; + + switch ( strtolower( str_replace(' ', '-', $post_type) ) ) { + case 'blog': + $post_type = 'post'; + break; + case 'portfolio': + $post_type = 'portfolio'; + break; + case 'testimonial': + $post_type = 'testi'; + break; + case 'services': + $post_type = 'services'; + break; + case 'our-team': + $post_type = 'team'; + break; + } + + $get_category_type = $post_type == 'post' ? 'category' : $post_type.'_category'; + $categories_ids = array(); + foreach ( explode(',', str_replace(', ', ',', $categories)) as $category ) { + $get_cat_id = get_term_by( 'name', $category, $get_category_type ); + if ( $get_cat_id ) { + $categories_ids[] = $get_cat_id->term_id; + } + } + $get_query_tax = $categories_ids ? 'tax_query' : ''; + + $suppress_filters = get_option('suppress_filters'); // WPML filter + + // WP_Query arguments + $args = array( + 'post_status' => $post_status, + 'posts_per_page' => $posts_count, + 'ignore_sticky_posts' => 1, + 'post_type' => $post_type, + 'suppress_filters' => $suppress_filters, + "$get_query_tax" => array( + array( + 'taxonomy' => $get_category_type, + 'field' => 'id', + 'terms' => $categories_ids + ) + ) + ); + + // The Query + $carousel_query = new WP_Query( $args ); + $output = ''; + + if ( $carousel_query->have_posts() ) : + + $output .= '<div class="carousel-wrap ' . $custom_class . '">'; + $output .= $title ? '<h2>' . $title . '</h2>' : ''; + $output .= '<div id="owl-carousel-' . $random_ID . '" class="owl-carousel-' . $post_type . ' owl-carousel" data-items="' . $visibility_items . '" data-auto-play="' . $auto_play . '" data-nav="' . $display_navs . '" data-pagination="' . $display_pagination . '">'; + + while ( $carousel_query->have_posts() ) : $carousel_query->the_post(); + $post_id = $carousel_query->post->ID; + $post_title = esc_html( get_the_title( $post_id ) ); + $post_title_attr = esc_attr( strip_tags( get_the_title( $post_id ) ) ); + $format = get_post_format( $post_id ); + $format = (empty( $format )) ? 'format-standart' : 'format-' . $format; + if ( get_post_meta( $post_id, 'tz_link_url', true ) ) { + $post_permalink = ( $format == 'format-link' ) ? esc_url( get_post_meta( $post_id, 'tz_link_url', true ) ) : get_permalink( $post_id ); + } else { + $post_permalink = get_permalink( $post_id ); + } + if ( has_excerpt( $post_id ) ) { + $excerpt = wp_strip_all_tags( get_the_excerpt() ); + } else { + $excerpt = wp_strip_all_tags( strip_shortcodes (get_the_content() ) ); + } + + $output .= '<div class="item ' . $format . ' item-list-'.$itemcounter.'">'; + + // post thumbnail + if ( $thumb ) : + + if ( has_post_thumbnail( $post_id ) ) { + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, $thumb_width, $thumb_height, true); + + $output .= '<figure>'; + $output .= '<a href="' . $post_permalink . '" title="' . $post_title . '">'; + $output .= '<img src="' . $image . '" alt="' . $post_title . '" />'; + $output .= '</a>'; + $output .= '</figure>'; + + } else { + + $attachments = get_children( array( + 'orderby' => 'menu_order', + 'order' => 'ASC', + 'post_type' => 'attachment', + 'post_parent' => $post_id, + 'post_mime_type' => 'image', + 'post_status' => null, + 'numberposts' => 1 + ) ); + if ( $attachments ) { + foreach ( $attachments as $attachment_id => $attachment ) { + $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); + $img = aq_resize( $image_attributes[0], $thumb_width, $thumb_height, true ); + $alt = get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ); + + $output .= '<figure>'; + $output .= '<a href="' . $post_permalink.'" title="' . $post_title . '">'; + $output .= '<img src="' . $img . '" alt="' . $alt . '" />'; + $output .= '</a>'; + $output .= '</figure>'; + } + } + } + + endif; + + $output .= '<div class="desc">'; + + // post date + $output .= $date ? '<time datetime="' . get_the_time( 'Y-m-d\TH:i:s', $post_id ) . '">' . get_the_date() . '</time>' : ''; + + // post author + $output .= $author ? '<em class="author"> <span>' . __('by ', CHERRY_PLUGIN_DOMAIN) . '</span> <a href="' . get_author_posts_url( get_the_author_meta( 'ID' ) ).'">' . get_the_author_meta( 'display_name' ) . '</a> </em>' : ''; + + // post comment count + if ( $comments == 'yes' ) { + $comment_count = $carousel_query->post->comment_count; + if ( $comment_count >= 1 ) : + $comment_count = $comment_count . ' <span>' . __( 'Comments', CHERRY_PLUGIN_DOMAIN ) . '</span>'; + else : + $comment_count = $comment_count . ' <span>' . __( 'Comment', CHERRY_PLUGIN_DOMAIN ) . '</span>'; + endif; + $output .= '<a href="'. $post_permalink . '#comments" class="comments_link">' . $comment_count . '</a>'; + } + + // post title + if ( !empty($post_title{0}) ) { + $output .= '<h5><a href="' . $post_permalink . '" title="' . $post_title_attr . '">'; + $output .= $post_title; + $output .= '</a></h5>'; + } + + // post excerpt + if ( !empty($excerpt{0}) ) { + $output .= $excerpt_count > 0 ? '<p class="excerpt">' . wp_trim_words( $excerpt, $excerpt_count ) . '</p>' : ''; + } + + // post more button + $more_text_single = esc_html( wp_kses_data( $more_text_single ) ); + if ( $more_text_single != '' ) { + $output .= '<a href="' . get_permalink( $post_id ) . '" class="btn btn-primary" title="' . $post_title_attr . '">'; + $output .= __( $more_text_single, CHERRY_PLUGIN_DOMAIN ); + $output .= '</a>'; + } + $output .= '</div>'; + $output .= '</div>'; + $itemcounter++; + endwhile; + $output .= '</div></div>'; + endif; + + // Restore original Post Data + wp_reset_postdata(); + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode( 'carousel_owl', 'shortcode_carousel_owl' ); +||||||| .r11156 +<?php +/** + * Carousel OWL + */ +if ( !function_exists('shortcode_carousel_owl') ) { + function shortcode_carousel_owl( $atts, $content = null, $shortcodename = '' ) { + wp_enqueue_script( 'owl-carousel', CHERRY_PLUGIN_URL . 'lib/js/owl-carousel/owl.carousel.min.js', array('jquery'), '1.31', true ); + + extract( shortcode_atts( array( + 'title' => '', + 'posts_count' => 10, + 'post_type' => 'blog', + 'post_status' => 'publish', + 'visibility_items' => 5, + 'thumb' => 'yes', + 'thumb_width' => 220, + 'thumb_height' => 180, + 'more_text_single' => '', + 'categories' => '', + 'excerpt_count' => 15, + 'date' => 'yes', + 'author' => 'yes', + 'comments' => 'no', + 'auto_play' => 0, + 'display_navs' => 'yes', + 'display_pagination' => 'yes', + 'custom_class' => '' + ), $atts ) ); + + $random_ID = uniqid(); + $posts_count = intval( $posts_count ); + $thumb = $thumb == 'yes' ? true : false; + $thumb_width = absint( $thumb_width ); + $thumb_height = absint( $thumb_height ); + $excerpt_count = absint( $excerpt_count ); + $visibility_items = absint( $visibility_items ); + $auto_play = absint( $auto_play ); + $date = $date == 'yes' ? true : false; + $author = $author == 'yes' ? true : false; + $comments = $comments == 'yes' ? true : false; + $display_navs = $display_navs == 'yes' ? 'true' : 'false'; + $display_pagination = $display_pagination == 'yes' ? 'true' : 'false'; + $itemcounter = 0; + + switch ( strtolower( str_replace(' ', '-', $post_type) ) ) { + case 'blog': + $post_type = 'post'; + break; + case 'portfolio': + $post_type = 'portfolio'; + break; + case 'testimonial': + $post_type = 'testi'; + break; + case 'services': + $post_type = 'services'; + break; + case 'our-team': + $post_type = 'team'; + break; + } + + $get_category_type = $post_type == 'post' ? 'category' : $post_type.'_category'; + $categories_ids = array(); + foreach ( explode(',', str_replace(', ', ',', $categories)) as $category ) { + $get_cat_id = get_term_by( 'name', $category, $get_category_type ); + if ( $get_cat_id ) { + $categories_ids[] = $get_cat_id->term_id; + } + } + $get_query_tax = $categories_ids ? 'tax_query' : ''; + + $suppress_filters = get_option('suppress_filters'); // WPML filter + + // WP_Query arguments + $args = array( + 'post_status' => $post_status, + 'posts_per_page' => $posts_count, + 'ignore_sticky_posts' => 1, + 'post_type' => $post_type, + 'suppress_filters' => $suppress_filters, + "$get_query_tax" => array( + array( + 'taxonomy' => $get_category_type, + 'field' => 'id', + 'terms' => $categories_ids + ) + ) + ); + + // The Query + $carousel_query = new WP_Query( $args ); + if ( $carousel_query->have_posts() ) : + + $output = '<div class="carousel-wrap ' . $custom_class . '">'; + $output .= $title ? '<h2>' . $title . '</h2>' : ''; + $output .= '<div id="owl-carousel-' . $random_ID . '" class="owl-carousel-' . $post_type . ' owl-carousel" data-items="' . $visibility_items . '" data-auto-play="' . $auto_play . '" data-nav="' . $display_navs . '" data-pagination="' . $display_pagination . '">'; + + while ( $carousel_query->have_posts() ) : $carousel_query->the_post(); + $post_id = $carousel_query->post->ID; + $post_title = esc_html( get_the_title( $post_id ) ); + $post_title_attr = esc_attr( strip_tags( get_the_title( $post_id ) ) ); + $format = get_post_format( $post_id ); + $format = (empty( $format )) ? 'format-standart' : 'format-' . $format; + if ( get_post_meta( $post_id, 'tz_link_url', true ) ) { + $post_permalink = ( $format == 'format-link' ) ? esc_url( get_post_meta( $post_id, 'tz_link_url', true ) ) : get_permalink( $post_id ); + } else { + $post_permalink = get_permalink( $post_id ); + } + if ( has_excerpt( $post_id ) ) { + $excerpt = wp_strip_all_tags( get_the_excerpt() ); + } else { + $excerpt = wp_strip_all_tags( strip_shortcodes (get_the_content() ) ); + } + + $output .= '<div class="item ' . $format . ' item-list-'.$itemcounter.'">'; + + // post thumbnail + if ( $thumb ) : + + if ( has_post_thumbnail( $post_id ) ) { + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, $thumb_width, $thumb_height, true); + + $output .= '<figure>'; + $output .= '<a href="' . $post_permalink . '" title="' . $post_title . '">'; + $output .= '<img src="' . $image . '" alt="' . $post_title . '" />'; + $output .= '</a>'; + $output .= '</figure>'; + + } else { + + $attachments = get_children( array( + 'orderby' => 'menu_order', + 'order' => 'ASC', + 'post_type' => 'attachment', + 'post_parent' => $post_id, + 'post_mime_type' => 'image', + 'post_status' => null, + 'numberposts' => 1 + ) ); + if ( $attachments ) { + foreach ( $attachments as $attachment_id => $attachment ) { + $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); + $img = aq_resize( $image_attributes[0], $thumb_width, $thumb_height, true ); + $alt = get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ); + + $output .= '<figure>'; + $output .= '<a href="' . $post_permalink.'" title="' . $post_title . '">'; + $output .= '<img src="' . $img . '" alt="' . $alt . '" />'; + $output .= '</a>'; + $output .= '</figure>'; + } + } + } + + endif; + + $output .= '<div class="desc">'; + + // post date + $output .= $date ? '<time datetime="' . get_the_time( 'Y-m-d\TH:i:s', $post_id ) . '">' . get_the_date() . '</time>' : ''; + + // post author + $output .= $author ? '<em class="author"> <span>' . __('by ', CHERRY_PLUGIN_DOMAIN) . '</span> <a href="' . get_author_posts_url( get_the_author_meta( 'ID' ) ).'">' . get_the_author_meta( 'display_name' ) . '</a> </em>' : ''; + + // post comment count + if ( $comments == 'yes' ) { + $comment_count = $carousel_query->post->comment_count; + if ( $comment_count >= 1 ) : + $comment_count = $comment_count . ' <span>' . __( 'Comments', CHERRY_PLUGIN_DOMAIN ) . '</span>'; + else : + $comment_count = $comment_count . ' <span>' . __( 'Comment', CHERRY_PLUGIN_DOMAIN ) . '</span>'; + endif; + $output .= '<a href="'. $post_permalink . '#comments" class="comments_link">' . $comment_count . '</a>'; + } + + // post title + if ( !empty($post_title{0}) ) { + $output .= '<h5><a href="' . $post_permalink . '" title="' . $post_title_attr . '">'; + $output .= $post_title; + $output .= '</a></h5>'; + } + + // post excerpt + if ( !empty($excerpt{0}) ) { + $output .= $excerpt_count > 0 ? '<p class="excerpt">' . my_string_limit_words( $excerpt, $excerpt_count ) . '</p>' : ''; + } + + // post more button + $more_text_single = esc_html( wp_kses_data( $more_text_single ) ); + if ( $more_text_single != '' ) { + $output .= '<a href="' . get_permalink( $post_id ) . '" class="btn btn-primary" title="' . $post_title_attr . '">'; + $output .= __( $more_text_single, CHERRY_PLUGIN_DOMAIN ); + $output .= '</a>'; + } + $output .= '</div>'; + $output .= '</div>'; + $itemcounter++; + endwhile; + $output .= '</div></div>'; + endif; + + // Restore original Post Data + wp_reset_postdata(); + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode( 'carousel_owl', 'shortcode_carousel_owl' ); +======= <?php /** * Carousel OWL @@ -210,4 +639,5 @@ if ( !function_exists('shortcode_carousel_owl') ) { return $output; } add_shortcode( 'carousel_owl', 'shortcode_carousel_owl' ); +>>>>>>> .r12027 } ?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/html.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/html.php index b296bd04..cd5b208e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/html.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/html.php @@ -1,3 +1,1287 @@ +<<<<<<< .mine +<?php +/** + * + * HTML Shortcodes + * + */ + +// Frames +if (!function_exists('frame_shortcode')) { + function frame_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<figure class="frame thumbnail align' . $atts['align'] . ' clearfix">'; + $output .= do_shortcode($content); + $output .= '</figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('frame', 'frame_shortcode'); +} +// Button +if (!function_exists('button_shortcode')) { + function button_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'link' => 'http://www.google.com', + 'text' => __('Read more', CHERRY_PLUGIN_DOMAIN), + 'size' => 'normal', + 'style' => '', + 'target' => '_self', + 'display' => '', + 'class' => '', + 'icon' => 'no' + ), $atts)); + + $output = '<a href="'.$link.'" title="'.$text.'" class="btn btn-'.$style.' btn-'.$size.' btn-'.$display.' '.$class.'" target="'.$target.'">'; + if ($icon != 'no') { + $output .= '<i class="icon-'.$icon.'"></i>'; + } + $output .= $text; + $output .= '</a>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('button', 'button_shortcode'); +} + +// Map +if (!function_exists('map_shortcode')) { + function map_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'src' => '', + 'width' => '', + 'height' => '' + ), $atts)); + + $output = '<div class="google-map">'; + $output .= '<iframe src="'.$src.'" frameborder="0" width="'.$width.'" height="'.$height.'" marginwidth="0" marginheight="0" scrolling="no">'; + $output .= '</iframe>'; + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('map', 'map_shortcode'); +} +// google_api_map +if ( !function_exists('google_map_api_shortcode') ) { + function google_map_api_shortcode( $atts, $content = null ) { + extract(shortcode_atts(array( + 'lat_value' => '41.850033' + , 'lng_value' => '-87.6500523' + , 'zoom_value' => '8' + , 'zoom_wheel' => 'no' + , 'custom_class' => '' + ), $atts)); + + $random_id = rand(); + $lat_value = floatval( $lat_value ); + $lng_value = floatval( $lng_value ); + $zoom_value = intval( $zoom_value ); + $zoom_wheel = $zoom_wheel=='yes' ? 'true' : 'false'; + + $output = '<div class="google-map-api '.$custom_class.'">'; + $output .= '<div id="map-canvas-'.$random_id.'" class="gmap"></div>'; + $output .= '</div>'; + $output .= '<script type="text/javascript"> + google_api_map_init_'.$random_id.'(); + function google_api_map_init_'.$random_id.'(){ + var map; + var coordData = new google.maps.LatLng(parseFloat('.$lat_value.'), parseFloat('.$lng_value.')); + var marker; + var isDraggable = jQuery(document).width() > 768 ? true : false; + + function initialize() { + var mapOptions = { + zoom: '.$zoom_value.', + center: coordData, + draggable: isDraggable, + scrollwheel: '.$zoom_wheel.' + } + var map = new google.maps.Map(document.getElementById("map-canvas-'.$random_id.'"), mapOptions); + marker = new google.maps.Marker({ + map: map, + draggable: false, + position: coordData + }); + } + google.maps.event.addDomListener(window, "load", initialize); + } + + </script>'; + return $output; + } + add_shortcode('google_map_api', 'google_map_api_shortcode'); +} + +// Dropcaps +if (!function_exists('dropcap_shortcode')) { + function dropcap_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<span class="dropcap">'; + $output .= do_shortcode($content); + $output .= '</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('dropcap', 'dropcap_shortcode'); +} + +// Horizontal Rule +if (!function_exists('hr_shortcode')) { + function hr_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="hr"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('hr', 'hr_shortcode'); +} + + +// Small Horizontal Rule +if (!function_exists('sm_hr_shortcode')) { + function sm_hr_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="sm_hr"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('sm_hr', 'sm_hr_shortcode'); +} + +// Spacer +if (!function_exists('spacer_shortcode')) { + function spacer_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="spacer"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('spacer', 'spacer_shortcode'); +} + +// Blockquote +if (!function_exists('blockquote_shortcode')) { + function blockquote_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<blockquote>'; + $output .= do_shortcode($content); + $output .= '</blockquote>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('blockquote', 'blockquote_shortcode'); +} + +// Row +if (!function_exists('row_shortcode')) { + function row_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row', 'row_shortcode'); +} + +// Row Inner +if (!function_exists('row_inner_shortcode')) { +function row_inner_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div> '; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row_in', 'row_inner_shortcode'); +} + +// Row Fluid +if (!function_exists('row_fluid_shortcode')) { + function row_fluid_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row-fluid '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div> '; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row_fluid', 'row_fluid_shortcode'); +} +// Clear +if (!function_exists('clear_shortcode')) { + function clear_shortcode() { + return '<div class="clear"></div>'; + } + add_shortcode('clear', 'clear_shortcode'); +} + +// Address +if (!function_exists('address_shortcode')) { + function address_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<address>'; + $output .= do_shortcode($content); + $output .= '</address>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('address', 'address_shortcode'); +} + +/** + * Lists + */ + +// Unstyled +if ( !function_exists('list_un_shortcode') ) { + function list_un_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list unstyled">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('list_un', 'list_un_shortcode'); +} + +// Check List +if ( !function_exists('check_list_shortcode') ) { + function check_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled check-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('check_list', 'check_list_shortcode'); +} + +// OK-circle List +if ( !function_exists('ok_circle_list_shortcode') ) { + function ok_circle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled ok-circle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('ok_circle_list', 'ok_circle_list_shortcode'); +} + +// OK-sign List +if ( !function_exists('ok_sign_list_shortcode') ) { + function ok_sign_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled ok-sign-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('ok_sign_list', 'ok_sign_list_shortcode'); +} + +// Check2 List +if ( !function_exists('check2_list_shortcode') ) { + function check2_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled check2-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('check2_list', 'check2_list_shortcode'); +} + +// Arrow List +if ( !function_exists('arrow_list_shortcode') ) { + function arrow_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled arrow-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('arrow_list', 'arrow_list_shortcode'); +} + +// Arrow2 List +if ( !function_exists('arrow2_list_shortcode') ) { + function arrow2_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled arrow2-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('arrow2_list', 'arrow2_list_shortcode'); +} + +// Circle-Arrow List +if ( !function_exists('circle_arrow_list_shortcode') ) { + function circle_arrow_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-arrow-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_arrow_list', 'circle_arrow_list_shortcode'); +} + +// Caret List +if ( !function_exists('caret_list_shortcode') ) { + function caret_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled caret-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('caret_list', 'caret_list_shortcode'); +} + +// Angle List +if ( !function_exists('angle_list_shortcode') ) { + function angle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled angle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('angle_list', 'angle_list_shortcode'); +} + +// Double-Angle List +if ( !function_exists('double_angle_list_shortcode') ) { + function double_angle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled double-angle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('double_angle_list', 'double_angle_list_shortcode'); +} + +// Star List +if ( !function_exists( 'star_list_shortcode') ) { + function star_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled star-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('star_list', 'star_list_shortcode'); +} + +// Plus List +if ( !function_exists('plus_list_shortcode') ) { + function plus_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled plus-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('plus_list', 'plus_list_shortcode'); +} + +// Minus List +if ( !function_exists('minus_list_shortcode') ) { + function minus_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled minus-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('minus_list', 'minus_list_shortcode'); +} + +// Circle List +if ( !function_exists('circle_list_shortcode') ) { + function circle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_list', 'circle_list_shortcode'); +} + +// Circle Blank List +if ( !function_exists('circle_blank_list_shortcode') ) { + function circle_blank_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-blank-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_blank_list', 'circle_blank_list_shortcode'); +} + +// Custom List +if ( !function_exists('custom_list_shortcode') ) { + function custom_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled custom-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('custom_list', 'custom_list_shortcode'); +} + +// Vertical Rule +if (!function_exists('vr_shortcode')) { + function vr_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<div class="vertical-divider">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('vr', 'vr_shortcode'); +} + + +// Label +if (!function_exists('label_shortcode')) { + function label_shortcode( $atts, $content = null, $shortcodename = '' ) { + + extract(shortcode_atts( + array( + 'style' => '', + 'icon' => '' + ), $atts)); + + $output = '<span class="label label-'.$style.'">'; + if ($icon != "") { + $output .= '<i class="'.$icon.'"></i>'; + } + $output .= $content .'</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('label', 'label_shortcode'); +} + + +// Text Highlight +if (!function_exists('highlight_shortcode')) { + function highlight_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<span class="text-highlight">'; + $output .= do_shortcode($content); + $output .= '</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('highlight', 'highlight_shortcode'); +} + +// Icon +if (!function_exists('icon_shortcode')) { + function icon_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'icon_type' => '', + 'icon' => 'alert', + 'icon_font' => '', + 'icon_font_size' => '', + 'icon_font_color' => '', + 'custom_class' => '', + 'align' => '' + ), $atts)); + + if ($icon_type == 'Images' || $icon_type == '') { + $icon = isset($icon_images) ? $icon_images : $icon ; + $icon_url = CHERRY_PLUGIN_URL . 'includes/images/iconSweets/' . strtolower($icon) . '.png' ; + if( defined ('CHILD_DIR') ) { + if(file_exists(CHILD_DIR.'/images/iconSweets/'.strtolower($icon).'.png')){ + $icon_url = CHILD_URL.'/images/iconSweets/'.strtolower($icon).'.png'; + } + } + $output = '<figure class="align'. $align ." ".$custom_class.'"><img src="'. $icon_url .'" alt=""></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + }else{ + $icon_font = ($icon_font != '')? strtolower($icon_font) : "icon-question"; + $icon_font_size = ($icon_font_size != '')? $icon_font_size : "14px"; + if(stripos($icon_font_size, "px")===false && stripos($icon_font_size, "em")===false){ + $icon_font_size = (int) $icon_font_size . "px"; + } + $icon_font_color = ($icon_font_color != '')? $icon_font_color : "#00000"; + $output = '<figure class="align'.$align.' aligntext'.$align.' "><i class="'.$icon_font.' '.$custom_class.'" style="color:'.$icon_font_color.'; font-size:'.$icon_font_size.'; line-height:1.2em;"></i></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + } + add_shortcode('icon', 'icon_shortcode'); +} + +// Template URL +if ( !function_exists( 'template_url_shortcode' ) ) { + + function template_url_shortcode( $atts, $content = null ) { + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + if ( false === $last_slash_pos ) { + + return $content_url; + + } else { + + $template_url = substr( $content_url, 0, $last_slash_pos ); + + return $template_url; + } + } + add_shortcode( 'template_url', 'template_url_shortcode' ); + +} +// Extra Wrap +if (!function_exists('extra_wrap_shortcode')) { + function extra_wrap_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<div class="extra-wrap">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('extra_wrap', 'extra_wrap_shortcode'); +} +?> +||||||| .r11156 +<?php +/** + * + * HTML Shortcodes + * + */ + +// Frames +if (!function_exists('frame_shortcode')) { + function frame_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<figure class="frame thumbnail align' . $atts['align'] . ' clearfix">'; + $output .= do_shortcode($content); + $output .= '</figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('frame', 'frame_shortcode'); +} +// Button +if (!function_exists('button_shortcode')) { + function button_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'link' => 'http://www.google.com', + 'text' => __('Read more', CHERRY_PLUGIN_DOMAIN), + 'size' => 'normal', + 'style' => '', + 'target' => '_self', + 'display' => '', + 'class' => '', + 'icon' => 'no' + ), $atts)); + + $output = '<a href="'.$link.'" title="'.$text.'" class="btn btn-'.$style.' btn-'.$size.' btn-'.$display.' '.$class.'" target="'.$target.'">'; + if ($icon != 'no') { + $output .= '<i class="icon-'.$icon.'"></i>'; + } + $output .= $text; + $output .= '</a>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('button', 'button_shortcode'); +} + +// Map +if (!function_exists('map_shortcode')) { + function map_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'src' => '', + 'width' => '', + 'height' => '' + ), $atts)); + + $output = '<div class="google-map">'; + $output .= '<iframe src="'.$src.'" frameborder="0" width="'.$width.'" height="'.$height.'" marginwidth="0" marginheight="0" scrolling="no">'; + $output .= '</iframe>'; + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('map', 'map_shortcode'); +} +// google_api_map +if ( !function_exists('google_map_api_shortcode') ) { + function google_map_api_shortcode( $atts, $content = null ) { + extract(shortcode_atts(array( + 'lat_value' => '41.850033' + , 'lng_value' => '-87.6500523' + , 'zoom_value' => '8' + , 'zoom_wheel' => 'no' + , 'custom_class' => '' + ), $atts)); + + $random_id = rand(); + $lat_value = floatval( $lat_value ); + $lng_value = floatval( $lng_value ); + $zoom_value = intval( $zoom_value ); + $zoom_wheel = $zoom_wheel=='yes' ? 'true' : 'false'; + + $output = '<div class="google-map-api '.$custom_class.'">'; + $output .= '<div id="map-canvas-'.$random_id.'" class="gmap"></div>'; + $output .= '</div>'; + $output .= '<script type="text/javascript"> + google_api_map_init_'.$random_id.'(); + function google_api_map_init_'.$random_id.'(){ + var map; + var coordData = new google.maps.LatLng(parseFloat('.$lat_value.'), parseFloat('.$lng_value.')); + var marker; + + function initialize() { + var mapOptions = { + zoom: '.$zoom_value.', + center: coordData, + scrollwheel: '.$zoom_wheel.' + } + var map = new google.maps.Map(document.getElementById("map-canvas-'.$random_id.'"), mapOptions); + marker = new google.maps.Marker({ + map:map, + draggable:true, + position: coordData + }); + } + google.maps.event.addDomListener(window, "load", initialize); + } + + </script>'; + return $output; + } + add_shortcode('google_map_api', 'google_map_api_shortcode'); +} + +// Dropcaps +if (!function_exists('dropcap_shortcode')) { + function dropcap_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<span class="dropcap">'; + $output .= do_shortcode($content); + $output .= '</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('dropcap', 'dropcap_shortcode'); +} + +// Horizontal Rule +if (!function_exists('hr_shortcode')) { + function hr_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="hr"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('hr', 'hr_shortcode'); +} + + +// Small Horizontal Rule +if (!function_exists('sm_hr_shortcode')) { + function sm_hr_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="sm_hr"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('sm_hr', 'sm_hr_shortcode'); +} + +// Spacer +if (!function_exists('spacer_shortcode')) { + function spacer_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="spacer"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('spacer', 'spacer_shortcode'); +} + +// Blockquote +if (!function_exists('blockquote_shortcode')) { + function blockquote_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<blockquote>'; + $output .= do_shortcode($content); + $output .= '</blockquote>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('blockquote', 'blockquote_shortcode'); +} + +// Row +if (!function_exists('row_shortcode')) { + function row_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row', 'row_shortcode'); +} + +// Row Inner +if (!function_exists('row_inner_shortcode')) { +function row_inner_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div> '; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row_in', 'row_inner_shortcode'); +} + +// Row Fluid +if (!function_exists('row_fluid_shortcode')) { + function row_fluid_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'custom_class' => '' + ), $atts)); + // add divs to the content + $output = '<div class="row-fluid '.$custom_class.'">'; + $output .= do_shortcode($content); + $output .= '</div> '; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('row_fluid', 'row_fluid_shortcode'); +} +// Clear +if (!function_exists('clear_shortcode')) { + function clear_shortcode() { + return '<div class="clear"></div>'; + } + add_shortcode('clear', 'clear_shortcode'); +} + +// Address +if (!function_exists('address_shortcode')) { + function address_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<address>'; + $output .= do_shortcode($content); + $output .= '</address>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('address', 'address_shortcode'); +} + +/** + * Lists + */ + +// Unstyled +if ( !function_exists('list_un_shortcode') ) { + function list_un_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list unstyled">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('list_un', 'list_un_shortcode'); +} + +// Check List +if ( !function_exists('check_list_shortcode') ) { + function check_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled check-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('check_list', 'check_list_shortcode'); +} + +// OK-circle List +if ( !function_exists('ok_circle_list_shortcode') ) { + function ok_circle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled ok-circle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('ok_circle_list', 'ok_circle_list_shortcode'); +} + +// OK-sign List +if ( !function_exists('ok_sign_list_shortcode') ) { + function ok_sign_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled ok-sign-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('ok_sign_list', 'ok_sign_list_shortcode'); +} + +// Check2 List +if ( !function_exists('check2_list_shortcode') ) { + function check2_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled check2-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('check2_list', 'check2_list_shortcode'); +} + +// Arrow List +if ( !function_exists('arrow_list_shortcode') ) { + function arrow_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled arrow-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('arrow_list', 'arrow_list_shortcode'); +} + +// Arrow2 List +if ( !function_exists('arrow2_list_shortcode') ) { + function arrow2_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled arrow2-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('arrow2_list', 'arrow2_list_shortcode'); +} + +// Circle-Arrow List +if ( !function_exists('circle_arrow_list_shortcode') ) { + function circle_arrow_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-arrow-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_arrow_list', 'circle_arrow_list_shortcode'); +} + +// Caret List +if ( !function_exists('caret_list_shortcode') ) { + function caret_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled caret-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('caret_list', 'caret_list_shortcode'); +} + +// Angle List +if ( !function_exists('angle_list_shortcode') ) { + function angle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled angle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('angle_list', 'angle_list_shortcode'); +} + +// Double-Angle List +if ( !function_exists('double_angle_list_shortcode') ) { + function double_angle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled double-angle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('double_angle_list', 'double_angle_list_shortcode'); +} + +// Star List +if ( !function_exists( 'star_list_shortcode') ) { + function star_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled star-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('star_list', 'star_list_shortcode'); +} + +// Plus List +if ( !function_exists('plus_list_shortcode') ) { + function plus_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled plus-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('plus_list', 'plus_list_shortcode'); +} + +// Minus List +if ( !function_exists('minus_list_shortcode') ) { + function minus_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled minus-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('minus_list', 'minus_list_shortcode'); +} + +// Circle List +if ( !function_exists('circle_list_shortcode') ) { + function circle_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_list', 'circle_list_shortcode'); +} + +// Circle Blank List +if ( !function_exists('circle_blank_list_shortcode') ) { + function circle_blank_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled circle-blank-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('circle_blank_list', 'circle_blank_list_shortcode'); +} + +// Custom List +if ( !function_exists('custom_list_shortcode') ) { + function custom_list_shortcode( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="list styled custom-list">'; + $output .= do_shortcode( $content ); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('custom_list', 'custom_list_shortcode'); +} + +// Vertical Rule +if (!function_exists('vr_shortcode')) { + function vr_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<div class="vertical-divider">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('vr', 'vr_shortcode'); +} + + +// Label +if (!function_exists('label_shortcode')) { + function label_shortcode( $atts, $content = null, $shortcodename = '' ) { + + extract(shortcode_atts( + array( + 'style' => '', + 'icon' => '' + ), $atts)); + + $output = '<span class="label label-'.$style.'">'; + if ($icon != "") { + $output .= '<i class="'.$icon.'"></i>'; + } + $output .= $content .'</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('label', 'label_shortcode'); +} + + +// Text Highlight +if (!function_exists('highlight_shortcode')) { + function highlight_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<span class="text-highlight">'; + $output .= do_shortcode($content); + $output .= '</span>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('highlight', 'highlight_shortcode'); +} + +// Icon +if (!function_exists('icon_shortcode')) { + function icon_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'icon_type' => '', + 'icon' => 'alert', + 'icon_font' => '', + 'icon_font_size' => '', + 'icon_font_color' => '', + 'custom_class' => '', + 'align' => '' + ), $atts)); + + if ($icon_type == 'Images' || $icon_type == '') { + $icon = isset($icon_images) ? $icon_images : $icon ; + $icon_url = CHERRY_PLUGIN_URL . 'includes/images/iconSweets/' . strtolower($icon) . '.png' ; + if( defined ('CHILD_DIR') ) { + if(file_exists(CHILD_DIR.'/images/iconSweets/'.strtolower($icon).'.png')){ + $icon_url = CHILD_URL.'/images/iconSweets/'.strtolower($icon).'.png'; + } + } + $output = '<figure class="align'. $align ." ".$custom_class.'"><img src="'. $icon_url .'" alt=""></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + }else{ + $icon_font = ($icon_font != '')? strtolower($icon_font) : "icon-question"; + $icon_font_size = ($icon_font_size != '')? $icon_font_size : "14px"; + if(stripos($icon_font_size, "px")===false && stripos($icon_font_size, "em")===false){ + $icon_font_size = (int) $icon_font_size . "px"; + } + $icon_font_color = ($icon_font_color != '')? $icon_font_color : "#00000"; + $output = '<figure class="align'.$align.' aligntext'.$align.' "><i class="'.$icon_font.' '.$custom_class.'" style="color:'.$icon_font_color.'; font-size:'.$icon_font_size.'; line-height:1.2em;"></i></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + } + add_shortcode('icon', 'icon_shortcode'); +} + +// Template URL +if ( !function_exists( 'template_url_shortcode' ) ) { + + function template_url_shortcode( $atts, $content = null ) { + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + if ( false === $last_slash_pos ) { + + return $content_url; + + } else { + + $template_url = substr( $content_url, 0, $last_slash_pos ); + + return $template_url; + } + } + add_shortcode( 'template_url', 'template_url_shortcode' ); + +} +// Extra Wrap +if (!function_exists('extra_wrap_shortcode')) { + function extra_wrap_shortcode( $atts, $content = null, $shortcodename = '' ) { + + $output = '<div class="extra-wrap">'; + $output .= do_shortcode($content); + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('extra_wrap', 'extra_wrap_shortcode'); +} +?>======= <?php /** * @@ -637,4 +1921,4 @@ if (!function_exists('extra_wrap_shortcode')) { } add_shortcode('extra_wrap', 'extra_wrap_shortcode'); } -?> \ No newline at end of file +?>>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/mini-posts-grid.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/mini-posts-grid.php index c48160eb..2c5d3ae7 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/mini-posts-grid.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/mini-posts-grid.php @@ -1,208 +1,218 @@ -<?php -/** - * Mini Post Grid - * - */ -if (!function_exists('mini_posts_grid_shortcode')) { - function mini_posts_grid_shortcode( $atts, $content = null, $shortcodename = '' ) { - extract(shortcode_atts(array( - 'type' => 'post', - 'category' => '', - 'custom_category' => '', - 'numb' => '8', - 'thumbs' => '', - 'thumb_width' => '', - 'thumb_height' => '', - 'order_by' => 'date', - 'order' => 'DESC', - 'align' => '', - 'custom_class' => '' - ), $atts)); - - $template_url = get_stylesheet_directory_uri(); - - // check what order by method user selected - switch ($order_by) { - case 'date': - $order_by = 'post_date'; - break; - case 'title': - $order_by = 'title'; - break; - case 'popular': - $order_by = 'comment_count'; - break; - case 'random': - $order_by = 'rand'; - break; - } - - // check what order method user selected (DESC or ASC) - switch ($order) { - case 'DESC': - $order = 'DESC'; - break; - case 'ASC': - $order = 'ASC'; - break; - } - - // thumbnail size - $thumb_x = 0; - $thumb_y = 0; - if (($thumb_width != '') && ($thumb_height != '')) { - $thumbs = 'custom_thumb'; - $thumb_x = $thumb_width; - $thumb_y = $thumb_height; - } else { - switch ($thumbs) { - case 'small': - $thumb_x = 110; - $thumb_y = 110; - break; - case 'smaller': - $thumb_x = 90; - $thumb_y = 90; - break; - case 'smallest': - $thumb_x = 60; - $thumb_y = 60; - break; - } - } - - global $post; - global $my_string_limit_words; - - // WPML filter - $suppress_filters = get_option('suppress_filters'); - - $args = array( - 'post_type' => $type, - 'category_name' => $category, - $type . '_category' => $custom_category, - 'numberposts' => $numb, - 'orderby' => $order_by, - 'order' => $order, - 'suppress_filters' => $suppress_filters - ); - - $posts = get_posts($args); - $i = 0; - - $output = '<ul class="mini-posts-grid grid-align-'.$align.' unstyled '.$custom_class.'">'; - - foreach($posts as $key => $post) { - //Check if WPML is activated - if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { - global $sitepress; - - $post_lang = $sitepress->get_language_for_element($post->ID, 'post_' . $type); - $curr_lang = $sitepress->get_current_language(); - // Unset not translated posts - if ( $post_lang != $curr_lang ) { - unset( $posts[$key] ); - } - // Post ID is different in a second language Solution - if ( function_exists( 'icl_object_id' ) ) { - $post = get_post( icl_object_id( $post->ID, $type, true ) ); - } - } - setup_postdata($post); - $excerpt = get_the_excerpt(); - $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full' ); - $url = $attachment_url['0']; - $image = aq_resize($url, $thumb_x, $thumb_y, true); - $mediaType = get_post_meta($post->ID, 'tz_portfolio_type', true); - $prettyType = 0; - - $output .= '<li class="'.$thumbs.' list-item-'.$i.'">'; - if(has_post_thumbnail($post->ID) && $mediaType == 'Image') { - - $prettyType = 'prettyPhoto'; - - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$url.'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; - $output .= '<span class="zoom-icon"></span></a></figure>'; - } elseif ($mediaType != 'Video' && $mediaType != 'Audio') { - - $thumbid = 0; - $thumbid = get_post_thumbnail_id($post->ID); - - $images = get_children( array( - 'orderby' => 'menu_order', - 'order' => 'ASC', - 'post_type' => 'attachment', - 'post_parent' => $post->ID, - 'post_mime_type' => 'image', - 'post_status' => null, - 'numberposts' => -1 - ) ); - - if ( $images ) { - - $k = 0; - //looping through the images - foreach ( $images as $attachment_id => $attachment ) { - $prettyType = "prettyPhoto[gallery".$i."]"; - //if( $attachment->ID == $thumbid ) continue; - - $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array - $img = aq_resize( $image_attributes[0], $thumb_x, $thumb_y, true ); //resize & crop img - $alt = get_post_meta($attachment->ID, '_wp_attachment_image_alt', true); - $image_title = $attachment->post_title; - - if ( $k == 0 ) { - if (has_post_thumbnail($post->ID)) { - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; - } else { - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$img.'" alt="'.get_the_title($post->ID).'" />'; - } - } else { - $output .= '<figure class="featured-thumbnail thumbnail" style="display:none;">'; - $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; - } - $output .= '<span class="zoom-icon"></span></a></figure>'; - $k++; - } - } elseif (has_post_thumbnail($post->ID)) { - $prettyType = 'prettyPhoto'; - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$url.'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; - $output .= '<span class="zoom-icon"></span></a></figure>'; - } else { - // empty_featured_thumb.gif - for post without featured thumbnail - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; - $output .= '<img src="'.$template_url.'/images/empty_thumb.gif" alt="'.get_the_title($post->ID).'" />'; - $output .= '</a></figure>'; - } - } else { - - // for Video and Audio post format - no lightbox - $output .= '<figure class="featured-thumbnail thumbnail"><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; - $output .= '</a></figure>'; - } - - $output .= '</li>'; - $i++; - - } // end foreach - wp_reset_postdata(); // restore the global $post variable - $output .= '</ul>'; - $output .= '<div class="clear"></div>'; - - $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); - - return $output; - } - add_shortcode('mini_posts_grid', 'mini_posts_grid_shortcode'); - +<?php +/** + * Mini Post Grid + * + */ +if (!function_exists('mini_posts_grid_shortcode')) { + function mini_posts_grid_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'type' => 'post', + 'category' => '', + 'custom_category' => '', + 'numb' => '8', + 'thumbs' => '', + 'thumb_width' => '', + 'thumb_height' => '', + 'lightbox' => 'yes', + 'order_by' => 'date', + 'order' => 'DESC', + 'align' => '', + 'custom_class' => '' + ), $atts)); + + $template_url = get_stylesheet_directory_uri(); + + // check what order by method user selected + switch ($order_by) { + case 'date': + $order_by = 'post_date'; + break; + case 'title': + $order_by = 'title'; + break; + case 'popular': + $order_by = 'comment_count'; + break; + case 'random': + $order_by = 'rand'; + break; + } + + // check what order method user selected (DESC or ASC) + switch ($order) { + case 'DESC': + $order = 'DESC'; + break; + case 'ASC': + $order = 'ASC'; + break; + } + + // thumbnail size + $thumb_x = 0; + $thumb_y = 0; + if (($thumb_width != '') && ($thumb_height != '')) { + $thumbs = 'custom_thumb'; + $thumb_x = $thumb_width; + $thumb_y = $thumb_height; + } else { + switch ($thumbs) { + case 'small': + $thumb_x = 110; + $thumb_y = 110; + break; + case 'smaller': + $thumb_x = 90; + $thumb_y = 90; + break; + case 'smallest': + $thumb_x = 60; + $thumb_y = 60; + break; + } + } + + global $post; + global $my_string_limit_words; + + // WPML filter + $suppress_filters = get_option('suppress_filters'); + + $args = array( + 'post_type' => $type, + 'category_name' => $category, + $type . '_category' => $custom_category, + 'numberposts' => $numb, + 'orderby' => $order_by, + 'order' => $order, + 'suppress_filters' => $suppress_filters + ); + + $posts = get_posts($args); + $i = 0; + + $output = '<ul class="mini-posts-grid grid-align-'.$align.' unstyled '.$custom_class.'">'; + + foreach($posts as $key => $post) { + //Check if WPML is activated + if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { + global $sitepress; + + $post_lang = $sitepress->get_language_for_element($post->ID, 'post_' . $type); + $curr_lang = $sitepress->get_current_language(); + // Unset not translated posts + if ( $post_lang != $curr_lang ) { + unset( $posts[$key] ); + } + // Post ID is different in a second language Solution + if ( function_exists( 'icl_object_id' ) ) { + $post = get_post( icl_object_id( $post->ID, $type, true ) ); + } + } + setup_postdata($post); + $excerpt = get_the_excerpt(); + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, $thumb_x, $thumb_y, true); + $mediaType = get_post_meta($post->ID, 'tz_portfolio_type', true); + $prettyType = 0; + + $output .= '<li class="'.$thumbs.' list-item-'.$i.'">'; + + if($lightbox == 'yes') { + if(has_post_thumbnail($post->ID) && $mediaType == 'Image') { + + $prettyType = 'prettyPhoto'; + + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$url.'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; + $output .= '<span class="zoom-icon"></span></a></figure>'; + } elseif ($mediaType != 'Video' && $mediaType != 'Audio') { + + $thumbid = 0; + $thumbid = get_post_thumbnail_id($post->ID); + + $images = get_children( array( + 'orderby' => 'menu_order', + 'order' => 'ASC', + 'post_type' => 'attachment', + 'post_parent' => $post->ID, + 'post_mime_type' => 'image', + 'post_status' => null, + 'numberposts' => -1 + ) ); + + if ( $images ) { + + $k = 0; + //looping through the images + foreach ( $images as $attachment_id => $attachment ) { + $prettyType = "prettyPhoto[gallery".$i."]"; + //if( $attachment->ID == $thumbid ) continue; + + $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array + $img = aq_resize( $image_attributes[0], $thumb_x, $thumb_y, true ); //resize & crop img + $alt = get_post_meta($attachment->ID, '_wp_attachment_image_alt', true); + $image_title = $attachment->post_title; + + if ( $k == 0 ) { + if (has_post_thumbnail($post->ID)) { + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; + } else { + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$img.'" alt="'.get_the_title($post->ID).'" />'; + } + } else { + $output .= '<figure class="featured-thumbnail thumbnail" style="display:none;">'; + $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; + } + $output .= '<span class="zoom-icon"></span></a></figure>'; + $k++; + } + } elseif (has_post_thumbnail($post->ID)) { + $prettyType = 'prettyPhoto'; + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$url.'" title="'.get_the_title($post->ID).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; + $output .= '<span class="zoom-icon"></span></a></figure>'; + } else { + // empty_featured_thumb.gif - for post without featured thumbnail + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= '<img src="'.$template_url.'/images/empty_thumb.gif" alt="'.get_the_title($post->ID).'" />'; + $output .= '</a></figure>'; + } + } else { + + // for Video and Audio post format - no lightbox + $output .= '<figure class="featured-thumbnail thumbnail"><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; + $output .= '</a></figure>'; + } + } else { + if(has_post_thumbnail($post->ID)) { + $output .= '<figure class="featured-thumbnail thumbnail"><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post->ID).'" />'; + $output .= '</a></figure>'; + } + } + + $output .= '</li>'; + $i++; + + } // end foreach + wp_reset_postdata(); // restore the global $post variable + $output .= '</ul>'; + $output .= '<div class="clear"></div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('mini_posts_grid', 'mini_posts_grid_shortcode'); + }?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/posts-grid.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/posts-grid.php index 0e6a0d3a..0d846c80 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/posts-grid.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/posts-grid.php @@ -17,6 +17,7 @@ if (!function_exists('posts_grid_shortcode')) { 'order' => 'DESC', 'thumb_width' => '370', 'thumb_height' => '250', + 'lightbox' => 'yes', 'meta' => '', 'excerpt_count' => '15', 'link' => 'yes', @@ -101,11 +102,17 @@ if (!function_exists('posts_grid_shortcode')) { 'suppress_filters' => $suppress_filters ); - $posts = get_posts($args); + $posts = get_posts( $args ); + + if ( empty( $posts ) ) { + wp_reset_postdata(); + return; + } + $i = 0; $count = 1; $output_end = ''; - $countul = 0; + $countul = 0; if ($numb > count($posts)) { $output_end = '</ul>'; @@ -147,72 +154,82 @@ if (!function_exists('posts_grid_shortcode')) { } $output .= '<li class="'. $spans .' list-item-'.$count.'">'; - if(has_post_thumbnail($post_id) && $mediaType == 'Image') { - - $prettyType = 'prettyPhoto-'.$rand; - - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$url.'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; - $output .= '<span class="zoom-icon"></span></a></figure>'; - } elseif ($mediaType != 'Video' && $mediaType != 'Audio') { - - $thumbid = 0; - $thumbid = get_post_thumbnail_id($post_id); - - $images = get_children( array( - 'orderby' => 'menu_order', - 'order' => 'ASC', - 'post_type' => 'attachment', - 'post_parent' => $post_id, - 'post_mime_type' => 'image', - 'post_status' => null, - 'numberposts' => -1 - ) ); - - if ( $images ) { - - $k = 0; - //looping through the images - foreach ( $images as $attachment_id => $attachment ) { - $prettyType = "prettyPhoto-".$rand ."[gallery".$i."]"; - //if( $attachment->ID == $thumbid ) continue; - - $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array - $img = aq_resize( $image_attributes[0], $thumb_width, $thumb_height, true ); //resize & crop img - $alt = get_post_meta($attachment->ID, '_wp_attachment_image_alt', true); - $image_title = $attachment->post_title; - - if ( $k == 0 ) { - if (has_post_thumbnail($post_id)) { - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; + + if($lightbox == 'yes') { + if(has_post_thumbnail($post_id) && $mediaType == 'Image') { + + $prettyType = 'prettyPhoto-'.$rand; + + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$url.'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; + $output .= '<span class="zoom-icon"></span></a></figure>'; + } elseif ($mediaType != 'Video' && $mediaType != 'Audio') { + + $thumbid = 0; + $thumbid = get_post_thumbnail_id($post_id); + + $images = get_children( array( + 'orderby' => 'menu_order', + 'order' => 'ASC', + 'post_type' => 'attachment', + 'post_parent' => $post_id, + 'post_mime_type' => 'image', + 'post_status' => null, + 'numberposts' => -1 + ) ); + + if ( $images ) { + + $k = 0; + //looping through the images + foreach ( $images as $attachment_id => $attachment ) { + $prettyType = "prettyPhoto-".$rand ."[gallery".$i."]"; + //if( $attachment->ID == $thumbid ) continue; + + $image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array + $img = aq_resize( $image_attributes[0], $thumb_width, $thumb_height, true ); //resize & crop img + $alt = get_post_meta($attachment->ID, '_wp_attachment_image_alt', true); + $image_title = $attachment->post_title; + + if ( $k == 0 ) { + if (has_post_thumbnail($post_id)) { + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; + } else { + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$img.'" alt="'.get_the_title($post_id).'" />'; + } } else { - $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<figure class="featured-thumbnail thumbnail" style="display:none;">'; $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; - $output .= '<img src="'.$img.'" alt="'.get_the_title($post_id).'" />'; } - } else { - $output .= '<figure class="featured-thumbnail thumbnail" style="display:none;">'; - $output .= '<a href="'.$image_attributes[0].'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + $output .= '<span class="zoom-icon"></span></a></figure>'; + $k++; } + } elseif (has_post_thumbnail($post_id)) { + $prettyType = 'prettyPhoto-'.$rand; + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.$url.'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; $output .= '<span class="zoom-icon"></span></a></figure>'; - $k++; } - } elseif (has_post_thumbnail($post_id)) { - $prettyType = 'prettyPhoto-'.$rand; - $output .= '<figure class="featured-thumbnail thumbnail">'; - $output .= '<a href="'.$url.'" title="'.get_the_title($post_id).'" rel="' .$prettyType.'">'; + } else { + + // for Video and Audio post format - no lightbox + $output .= '<figure class="featured-thumbnail thumbnail"><a href="'.get_permalink($post_id).'" title="'.get_the_title($post_id).'">'; $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; - $output .= '<span class="zoom-icon"></span></a></figure>'; + $output .= '</a></figure>'; } } else { - - // for Video and Audio post format - no lightbox - $output .= '<figure class="featured-thumbnail thumbnail"><a href="'.get_permalink($post_id).'" title="'.get_the_title($post_id).'">'; - $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; - $output .= '</a></figure>'; + if(has_post_thumbnail($post_id)) { + $output .= '<figure class="featured-thumbnail thumbnail">'; + $output .= '<a href="'.get_permalink($post_id).'" title="'.get_the_title($post_id).'">'; + $output .= '<img src="'.$image.'" alt="'.get_the_title($post_id).'" />'; + $output .= '</a></figure>'; + } } $output .= '<div class="clear"></div>'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/roundabout.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/roundabout.php index efa7acf7..9618b7fc 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/roundabout.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/roundabout.php @@ -1,11 +1,10 @@ <?php /** - * Roundabout - * + * Roundabout shortcode. */ -if (!function_exists('shortcode_roundabout')) { +if ( !function_exists( 'shortcode_roundabout' ) ) { function shortcode_roundabout( $atts, $content = null, $shortcodename = '' ) { - extract(shortcode_atts(array( + extract( shortcode_atts( array( 'title' => '', 'num' => '3', 'type' => '', @@ -15,43 +14,50 @@ if (!function_exists('shortcode_roundabout')) { 'custom_category' => '', 'more_button_text' => '', 'more_button_link' => '', - 'custom_class' => '' - ), $atts)); + 'custom_class' => '', + ), $atts ) ); - wp_enqueue_script( 'roundabout_script', CHERRY_PLUGIN_URL . 'lib/js/roundabout/jquery.roundabout.min.js', array('jquery') ); - wp_enqueue_script( 'roundabout_shape', CHERRY_PLUGIN_URL . 'lib/js/roundabout/jquery.roundabout-shapes.min.js', array('jquery') ); + wp_enqueue_script( 'roundabout_script', CHERRY_PLUGIN_URL . 'lib/js/roundabout/jquery.roundabout.min.js', array( 'jquery' ), '1.0' ); + wp_enqueue_script( 'roundabout_shape', CHERRY_PLUGIN_URL . 'lib/js/roundabout/jquery.roundabout-shapes.min.js', array( 'jquery' ), '1.0' ); - $ra_id = uniqid(); + $ra_id = uniqid(); $itemcounter = 0; - // check what type of post user selected - switch ($type) { + + // Check what type of post user selected. + switch ( $type ) { case 'blog': $type_post = 'post'; break; + case 'portfolio': $type_post = 'portfolio'; break; + case 'testimonial': $type_post = 'testi'; break; + case 'our team': $type_post = 'team'; break; + default: $type_post = 'post'; break; } - $output = '<div class="roundabout-holder '.$custom_class.'">'; - if ($title != '') { - $output .= '<h2>'.$title.'</h2>'; + $output = '<div class="roundabout-holder ' . $custom_class . '">'; + + if ( $title != '' ) { + $output .= '<h2>' . $title . '</h2>'; } - $output .= '<ul id="roundabout-list-'.$ra_id.'" class="unstyled">'; + + $output .= '<ul id="roundabout-list-' . $ra_id . '" class="unstyled">'; global $post; - // WPML filter - $suppress_filters = get_option('suppress_filters'); + // WPML filter. + $suppress_filters = get_option( 'suppress_filters' ); $args = array( 'post_type' => $type_post, @@ -60,36 +66,40 @@ if (!function_exists('shortcode_roundabout')) { 'posts_per_page' => -1, 'orderby' => 'post_date', 'order' => 'DESC', - 'suppress_filters' => $suppress_filters + 'suppress_filters' => $suppress_filters, ); - $posts = get_posts($args); - $i = 1; + $posts = get_posts( $args ); + $i = 1; + + foreach ( $posts as $key => $post ) { - foreach($posts as $key => $post) { - //Check if WPML is activated + // Check if WPML is activated. if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { global $sitepress; $post_lang = $sitepress->get_language_for_element($post->ID, 'post_' . $type_post); $curr_lang = $sitepress->get_current_language(); - // Unset not translated posts + + // Unset not translated posts. if ( $post_lang != $curr_lang ) { unset( $posts[$key] ); } - // Post ID is different in a second language Solution + + // Post ID is different in a second language Solution. if ( function_exists( 'icl_object_id' ) ) { $post = get_post( icl_object_id( $post->ID, $type_post, true ) ); } } - setup_postdata($post); + + setup_postdata( $post ); if ( $num == -1 ) { - $num = count($posts); + $num = count( $posts ); } if ( $num >= $i ) { - if (has_post_thumbnail($post->ID)) { + if ( has_post_thumbnail( $post->ID ) ) { $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full' ); $url = $attachment_url['0']; $image = aq_resize($url, $thumb_width, $thumb_height, true); @@ -103,7 +113,9 @@ if (!function_exists('shortcode_roundabout')) { } } } - wp_reset_postdata(); // restore the global $post variable + + // Restore the global $post variable. + wp_reset_postdata(); $output .= '</ul>'; if (($more_button_text != '') && ($more_button_link != '')) { @@ -119,13 +131,13 @@ if (!function_exists('shortcode_roundabout')) { shape: "square", responsive: true }); - }); - jQuery(window).bind("resize", function() { - jQuery("#roundabout-list-'.$ra_id.' li").removeAttr("style"); - jQuery("#roundabout-list-'.$ra_id.'").roundabout({ - minOpacity: 1, - minScale: 0.6, - responsive: false + jQuery(window).bind("resize", function() { + jQuery("#roundabout-list-'.$ra_id.' li").removeAttr("style"); + jQuery("#roundabout-list-'.$ra_id.'").roundabout({ + minOpacity: 1, + minScale: 0.6, + responsive: false + }); }); });'; $output .= '</script>'; @@ -134,6 +146,6 @@ if (!function_exists('shortcode_roundabout')) { $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); return $output; -} - add_shortcode('roundabout', 'shortcode_roundabout'); -}?> + } + add_shortcode( 'roundabout', 'shortcode_roundabout' ); +} ?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/service-box.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/service-box.php index 20223313..eaf0ea75 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/service-box.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/service-box.php @@ -11,12 +11,13 @@ if (!function_exists('service_box_shortcode')) { 'title' => '', 'subtitle' => '', 'icon' => '', + 'icon_link' => '', 'text' => '', 'btn_text' => __('Read more', CHERRY_PLUGIN_DOMAIN), 'btn_link' => '', 'btn_size' => '', 'target' => '', - 'custom_class' => '' + 'custom_class' => '', ), $atts)); $output = '<div class="service-box '.$custom_class.'">'; @@ -28,7 +29,11 @@ if (!function_exists('service_box_shortcode')) { $icon_url = CHILD_URL.'/images/'.strtolower($icon).'.png'; } } - $output .= '<figure class="icon"><img src="'.$icon_url.'" alt="" /></figure>'; + if ( empty( $icon_link ) ) { + $output .= '<figure class="icon"><img src="'.$icon_url.'" alt="" /></figure>'; + } else { + $output .= '<figure class="icon"><a href="' . esc_url( $icon_link ) . '"><img src="' . $icon_url . '" alt="" /></a></figure>'; + } } $output .= '<div class="service-box_body">'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/shortcodes.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/shortcodes.php index 0917073e..5674226c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/shortcodes.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/shortcodes/shortcodes.php @@ -1,3 +1,1556 @@ +<<<<<<< .mine +<?php +//Recent Posts +if (!function_exists('shortcode_recent_posts')) { + + function shortcode_recent_posts( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'type' => 'post', + 'category' => '', + 'custom_category' => '', + 'tag' => '', + 'custom_tag' => '', + 'post_format' => 'standard', + 'num' => '5', + 'meta' => 'true', + 'thumb' => 'true', + 'thumb_width' => '120', + 'thumb_height' => '120', + 'more_text_single' => '', + 'excerpt_count' => '0', + 'custom_class' => '', + ), $atts)); + + $output = '<ul class="recent-posts '.$custom_class.' unstyled">'; + + global $post; + global $my_string_limit_words; + $item_counter = 0; + // WPML filter + $suppress_filters = get_option('suppress_filters'); + + if($post_format == 'standard') { + + $args = array( + 'post_type' => $type, + 'category_name' => $category, + 'tag' => $tag, + $type . '_category' => $custom_category, + $type . '_tag' => $custom_tag, + 'numberposts' => $num, + 'orderby' => 'post_date', + 'order' => 'DESC', + 'tax_query' => array( + 'relation' => 'AND', + array( + 'taxonomy' => 'post_format', + 'field' => 'slug', + 'terms' => array('post-format-aside', 'post-format-gallery', 'post-format-link', 'post-format-image', 'post-format-quote', 'post-format-audio', 'post-format-video'), + 'operator' => 'NOT IN' + ) + ), + 'suppress_filters' => $suppress_filters + ); + + } else { + + $args = array( + 'post_type' => $type, + 'category_name' => $category, + 'tag' => $tag, + $type . '_category' => $custom_category, + 'numberposts' => $num, + 'orderby' => 'post_date', + 'order' => 'DESC', + 'tax_query' => array( + 'relation' => 'AND', + array( + 'taxonomy' => 'post_format', + 'field' => 'slug', + 'terms' => array('post-format-' . $post_format) + ) + ), + 'suppress_filters' => $suppress_filters + ); + } + + $latest = get_posts($args); + + foreach($latest as $k => $post) { + //Check if WPML is activated + if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { + global $sitepress; + + $post_lang = $sitepress->get_language_for_element($post->ID, 'post_' . $type); + $curr_lang = $sitepress->get_current_language(); + // Unset not translated posts + if ( $post_lang != $curr_lang ) { + unset( $latest[$k] ); + } + // Post ID is different in a second language Solution + if ( function_exists( 'icl_object_id' ) ) { + $post = get_post( icl_object_id( $post->ID, $type, true ) ); + } + } + setup_postdata($post); + $excerpt = get_the_excerpt(); + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, $thumb_width, $thumb_height, true); + + $post_classes = get_post_class(); + foreach ($post_classes as $key => $value) { + $pos = strripos($value, 'tag-'); + if ($pos !== false) { + unset($post_classes[$key]); + } + } + $post_classes = implode(' ', $post_classes); + + $output .= '<li class="recent-posts_li ' . $post_classes . ' list-item-' . $item_counter . ' clearfix">'; + + //Aside + if($post_format == "aside") { + + $output .= the_content($post->ID); + + } elseif ($post_format == "link") { + + $url = get_post_meta(get_the_ID(), 'tz_link_url', true); + + $output .= '<a target="_blank" href="'. $url . '">'; + $output .= get_the_title($post->ID); + $output .= '</a>'; + + //Quote + } elseif ($post_format == "quote") { + + $quote = get_post_meta(get_the_ID(), 'tz_quote', true); + + $output .= '<div class="quote-wrap clearfix">'; + + $output .= '<blockquote>'; + $output .= $quote; + $output .= '</blockquote>'; + + $output .= '</div>'; + + //Image + } elseif ($post_format == "image") { + + if (has_post_thumbnail() ) : + + // $lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE); + + $src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' ); + + $thumb = get_post_thumbnail_id(); + $img_url = wp_get_attachment_url( $thumb,'full'); //get img URL + $image = aq_resize( $img_url, 200, 120, true ); //resize & crop img + + + $output .= '<figure class="thumbnail featured-thumbnail large">'; + $output .= '<a class="image-wrap" rel="prettyPhoto" title="' . get_the_title($post->ID) . '" href="' . $src[0] . '">'; + $output .= '<img src="' . $image . '" alt="' . get_the_title($post->ID) .'" />'; + $output .= '<span class="zoom-icon"></span></a>'; + $output .= '</figure>'; + + endif; + + + //Audio + } elseif ($post_format == "audio") { + + $template_url = get_template_directory_uri(); + $id = $post->ID; + + // get audio attribute + $audio_title = get_post_meta(get_the_ID(), 'tz_audio_title', true); + $audio_artist = get_post_meta(get_the_ID(), 'tz_audio_artist', true); + $audio_format = get_post_meta(get_the_ID(), 'tz_audio_format', true); + $audio_url = get_post_meta(get_the_ID(), 'tz_audio_url', true); + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + // 'wp-content' or something else. + $content_dir_name = substr( $content_url, $last_slash_pos - strlen( $content_url ) + 1 ); + + $pos = strpos( $audio_url, $content_dir_name ); + + if ( false === $pos ) { + $file = $audio_url; + } else { + $audio_new = substr( $audio_url, $pos + strlen( $content_dir_name ), strlen( $audio_url ) - $pos ); + $file = $content_url . $audio_new; + } + + $output .= '<script type="text/javascript"> + jQuery(document).ready(function(){ + var myPlaylist_'. $id.' = new jPlayerPlaylist({ + jPlayer: "#jquery_jplayer_'. $id .'", + cssSelectorAncestor: "#jp_container_'. $id .'" + }, [ + { + title:"'. $audio_title .'", + artist:"'. $audio_artist .'", + '. $audio_format .' : "'. stripslashes(htmlspecialchars_decode($file)) .'"} + ], { + playlistOptions: {enableRemoveControls: false}, + ready: function () {jQuery(this).jPlayer("setMedia", {'. $audio_format .' : "'. stripslashes(htmlspecialchars_decode($file)) .'", poster: "'. $image .'"}); + }, + swfPath: "'. $template_url .'/flash", + supplied: "'. $audio_format .', all", + wmode:"window" + }); + }); + </script>'; + + $output .= '<div id="jquery_jplayer_'.$id.'" class="jp-jplayer"></div> + <div id="jp_container_'.$id.'" class="jp-audio"> + <div class="jp-type-single"> + <div class="jp-gui"> + <div class="jp-interface"> + <div class="jp-progress"> + <div class="jp-seek-bar"> + <div class="jp-play-bar"></div> + </div> + </div> + <div class="jp-duration"></div> + <div class="jp-time-sep"></div> + <div class="jp-current-time"></div> + <div class="jp-controls-holder"> + <ul class="jp-controls"> + <li><a href="javascript:;" class="jp-previous" tabindex="1" title="'.__('Previous', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Previous', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-play" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Play', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-pause" tabindex="1" title="'.__('Pause', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Pause', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-next" tabindex="1" title="'.__('Next', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Next', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-stop" tabindex="1" title="'.__('Stop', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Stop', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + </ul> + <div class="jp-volume-bar"> + <div class="jp-volume-bar-value"></div> + </div> + <ul class="jp-toggles"> + <li><a href="javascript:;" class="jp-mute" tabindex="1" title="'.__('Mute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Mute', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-unmute" tabindex="1" title="'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + </ul> + </div> + </div> + <div class="jp-no-solution"> + <span>'.__('Update Required.', CHERRY_PLUGIN_DOMAIN).'</span>'.__('To play the media you will need to either update your browser to a recent version or update your ', CHERRY_PLUGIN_DOMAIN).'<a href="http://get.adobe.com/flashplayer/" target="_blank">'.__('Flash plugin', CHERRY_PLUGIN_DOMAIN).'</a> + </div> + </div> + </div> + <div class="jp-playlist"> + <ul> + <li></li> + </ul> + </div> + </div>'; + + + $output .= '<div class="entry-content">'; + $output .= get_the_content($post->ID); + $output .= '</div>'; + + //Video + } elseif ($post_format == "video") { + + $template_url = get_template_directory_uri(); + $id = $post->ID; + + // get video attribute + $video_title = get_post_meta(get_the_ID(), 'tz_video_title', true); + $video_artist = get_post_meta(get_the_ID(), 'tz_video_artist', true); + $embed = get_post_meta(get_the_ID(), 'tz_video_embed', true); + $m4v_url = get_post_meta(get_the_ID(), 'tz_m4v_url', true); + $ogv_url = get_post_meta(get_the_ID(), 'tz_ogv_url', true); + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + // 'wp-content' or something else. + $content_dir_name = substr( $content_url, $last_slash_pos - strlen( $content_url ) + 1 ); + + $pos1 = strpos($m4v_url, $content_dir_name); + if ($pos1 === false) { + $file1 = $m4v_url; + } else { + $m4v_new = substr($m4v_url, $pos1+strlen($content_dir_name), strlen($m4v_url) - $pos1); + $file1 = $content_url.$m4v_new; + } + + $pos2 = strpos($ogv_url, $content_dir_name); + if ($pos2 === false) { + $file2 = $ogv_url; + } else { + $ogv_new = substr($ogv_url, $pos2+strlen($content_dir_name), strlen($ogv_url) - $pos2); + $file2 = $content_url.$ogv_new; + } + + // get thumb + if(has_post_thumbnail()) { + $thumb = get_post_thumbnail_id(); + $img_url = wp_get_attachment_url( $thumb,'full'); //get img URL + $image = aq_resize( $img_url, 770, 380, true ); //resize & crop img + } + + if ($embed == '') { + $output .= '<script type="text/javascript"> + jQuery(document).ready(function(){ + var + jPlayerObj = jQuery("#jquery_jplayer_'. $id.'") + , jPlayerContainer = jQuery("#jp_container_'. $id.'") + , isPause = true + ; + jPlayerObj.jPlayer({ + ready: function () { + jQuery(this).jPlayer("setMedia", { + m4v: "'. stripslashes(htmlspecialchars_decode($file1)) .'", + ogv: "'. stripslashes(htmlspecialchars_decode($file2)) .'", + poster: "'. $image .'" + }); + }, + swfPath: "'. $template_url .'/flash", + solution: "flash, html", + supplied: "ogv, m4v, all", + cssSelectorAncestor: "#jp_container_'. $id.'", + size: { + width: "100%", + height: "100%" + } + }); + jPlayerObj.on(jQuery.jPlayer.event.ready + ".jp-repeat", function(event) { + jQuery("img", this).addClass("poster"); + jQuery("video", this).addClass("video"); + jQuery("object", this).addClass("flashObject"); + jQuery(".video", jPlayerContainer).on("click", function(){ + jPlayerObj.jPlayer("pause"); + }) + }) + jPlayerObj.on(jQuery.jPlayer.event.ended + ".jp-repeat", function(event) { + isPause = true + jQuery(".poster", jPlayerContainer).css({display:"inline"}); + jQuery(".video", jPlayerContainer).css({width:"0%", height:"0%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"0%", height:"0%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"block"}); + }); + jPlayerObj.on(jQuery.jPlayer.event.play + ".jp-repeat", function(event) { + isPause = false + emulSwitch(isPause); + }); + jPlayerObj.on(jQuery.jPlayer.event.pause + ".jp-repeat", function(event) { + isPause = true + emulSwitch(isPause); + }); + function emulSwitch(_pause){ + if(_pause){ + jQuery(".poster", jPlayerContainer).css({display:"none"}); + jQuery(".video", jPlayerContainer).css({width:"100%", height:"100%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"100%", height:"100%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"block"}); + }else{ + jQuery(".poster", jPlayerContainer).css({display:"none"}); + jQuery(".video", jPlayerContainer).css({width:"100%", height:"100%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"100%", height:"100%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"none"}); + } + } + }); + </script>'; + $output .= '<div id="jp_container_'. $id .'" class="jp-video fullwidth">'; + $output .= '<div class="jp-type-list-parent">'; + $output .= '<div class="jp-type-single">'; + $output .= '<div id="jquery_jplayer_'. $id .'" class="jp-jplayer"></div>'; + $output .= '<div class="jp-gui">'; + $output .= '<div class="jp-video-play">'; + $output .= '<a href="javascript:;" class="jp-video-play-icon" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'">'.__('Play', CHERRY_PLUGIN_DOMAIN).'</a></div>'; + $output .= '<div class="jp-interface">'; + $output .= '<div class="jp-progress">'; + $output .= '<div class="jp-seek-bar">'; + $output .= '<div class="jp-play-bar">'; + $output .= '</div></div></div>'; + $output .= '<div class="jp-duration"></div>'; + $output .= '<div class="jp-time-sep">/</div>'; + $output .= '<div class="jp-current-time"></div>'; + $output .= '<div class="jp-controls-holder">'; + $output .= '<ul class="jp-controls">'; + $output .= '<li><a href="javascript:;" class="jp-play" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Play', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li><a href="javascript:;" class="jp-pause" tabindex="1" title="'.__('Pause', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Pause', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li class="li-jp-stop"><a href="javascript:;" class="jp-stop" tabindex="1" title="'.__('Stop', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Stop', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '</ul>'; + $output .= '<div class="jp-volume-bar">'; + $output .= '<div class="jp-volume-bar-value">'; + $output .= '</div></div>'; + $output .= '<ul class="jp-toggles">'; + $output .= '<li><a href="javascript:;" class="jp-mute" tabindex="1" title="'.__('Mute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Mute', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li><a href="javascript:;" class="jp-unmute" tabindex="1" title="'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '</ul>'; + $output .= '</div></div>'; + $output .= '<div class="jp-no-solution">'; + $output .= '<span>'.__('Update Required.', CHERRY_PLUGIN_DOMAIN).'</span>'.__('To play the media you will need to either update your browser to a recent version or update your ', CHERRY_PLUGIN_DOMAIN).'<a href="http://get.adobe.com/flashplayer/" target="_blank">'.__('Flash plugin', CHERRY_PLUGIN_DOMAIN).'</a>'; + $output .= '</div></div></div></div>'; + $output .= '</div>'; + } else { + $output .= '<div class="video-wrap">' . stripslashes(htmlspecialchars_decode($embed)) . '</div>'; + } + + if($excerpt_count >= 1){ + $output .= '<div class="excerpt">'; + $output .= wp_trim_words($excerpt,$excerpt_count); + $output .= '</div>'; + } + + //Standard + } else { + + if ($thumb == 'true') { + if ( has_post_thumbnail($post->ID) ){ + $output .= '<figure class="thumbnail featured-thumbnail"><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= '<img src="'.$image.'" alt="' . get_the_title($post->ID) .'"/>'; + $output .= '</a></figure>'; + } + } + $output .= '<h5><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= get_the_title($post->ID); + $output .= '</a></h5>'; + if ($meta == 'true') { + $output .= '<span class="meta">'; + $output .= '<span class="post-date">'; + $output .= get_the_date(); + $output .= '</span>'; + $output .= '<span class="post-comments">'; + $output .= '<a href="'.get_comments_link($post->ID).'">'; + $output .= get_comments_number($post->ID); + $output .= '</a>'; + $output .= '</span>'; + $output .= '</span>'; + } + $output .= cherry_get_post_networks(array('post_id' => $post->ID, 'display_title' => false, 'output_type' => 'return')); + if ($excerpt_count >= 1) { + $output .= '<div class="excerpt">'; + $output .= wp_trim_words($excerpt,$excerpt_count); + $output .= '</div>'; + } + if ($more_text_single!="") { + $output .= '<a href="'.get_permalink($post->ID).'" class="btn btn-primary" title="'.get_the_title($post->ID).'">'; + $output .= $more_text_single; + $output .= '</a>'; + } + } + $output .= '<div class="clear"></div>'; + $item_counter ++; + $output .= '</li>'; + } + wp_reset_postdata(); // restore the global $post variable + $output .= '</ul>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recent_posts', 'shortcode_recent_posts'); +} + + +// Recent Comments +if (!function_exists('shortcode_recent_comments')) { + + function shortcode_recent_comments( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'num' => '5', + 'custom_class' => '' + ), $atts)); + + global $wpdb; + $itemcounter = 0; + + if ( function_exists( 'wpml_get_language_information' ) ) { + global $sitepress; + $sql = " + SELECT * FROM {$wpdb->comments} + JOIN {$wpdb->prefix}icl_translations + ON {$wpdb->comments}.comment_post_id = {$wpdb->prefix}icl_translations.element_id + AND {$wpdb->prefix}icl_translations.element_type='post_post' + WHERE comment_approved = '1' + AND language_code = '".$sitepress->get_current_language()."' + ORDER BY comment_date_gmt DESC LIMIT {$num}"; + } else { + $sql = " + SELECT * FROM $wpdb->comments + LEFT OUTER JOIN $wpdb->posts + ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) + WHERE comment_approved = '1' + AND comment_type = '' + AND post_password = '' + ORDER BY comment_date_gmt DESC LIMIT {$num}"; + } + + $comment_len = 100; + $comments = $wpdb->get_results($sql); + + $output = '<ul class="recent-comments unstyled">'; + + foreach ($comments as $comment) { + $output .= '<li class="list-item-'.$itemcounter.'">'; + $output .= '<a href="'.get_comment_link($comment->comment_ID).'" title="on '.get_the_title($comment->comment_post_ID).'">'; + $output .= strip_tags($comment->comment_author).' : ' . strip_tags(substr(apply_filters('get_comment_text', $comment->comment_content), 0, $comment_len)); + if (strlen($comment->comment_content) > $comment_len) $output .= '...'; + $output .= '</a>'; + $output .= '</li>'; + $itemcounter++; + } + + $output .= '</ul>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recent_comments', 'shortcode_recent_comments'); +} + + +//Recent Testimonials +if (!function_exists('shortcode_recenttesti')) { + + function shortcode_recenttesti( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'num' => '5', + 'thumb' => 'true', + 'text' => 'part', // part|full + 'excerpt_count' => '30', + 'linked' => 'true', // true|false + 'custom_class' => '', + ), $atts)); + + // WPML filter + $suppress_filters = get_option('suppress_filters'); + + $args = array( + 'post_type' => 'testi', + 'numberposts' => $num, + 'orderby' => 'post_date', + 'suppress_filters' => $suppress_filters + ); + $testi = get_posts($args); + + $itemcounter = 0; + + $output = '<div class="testimonials '.$custom_class.'">'; + + global $post; + global $my_string_limit_words; + + foreach ($testi as $k => $post) { + //Check if WPML is activated + if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { + global $sitepress; + + $post_lang = $sitepress->get_language_for_element($post->ID, 'post_testi'); + $curr_lang = $sitepress->get_current_language(); + // Unset not translated posts + if ( $post_lang != $curr_lang ) { + unset( $testi[$k] ); + } + // Post ID is different in a second language Solution + if ( function_exists( 'icl_object_id' ) ) { + $post = get_post( icl_object_id( $post->ID, 'testi', true ) ); + } + } + setup_postdata( $post ); + $post_id = $post->ID; + $excerpt = get_the_excerpt(); + + // Get custom metabox value. + $testiname = get_post_meta( $post_id, 'my_testi_caption', true ); + $testiurl = esc_url( get_post_meta( $post_id, 'my_testi_url', true ) ); + $testiinfo = get_post_meta( $post_id, 'my_testi_info', true ); + $testiemail = sanitize_email( get_post_meta( $post_id, 'my_testi_email', true ) ); + + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, 280, 240, true); + + $output .= '<div class="testi-item list-item-'.$itemcounter.'">'; + $output .= '<blockquote class="testi-item_blockquote">'; + if ($thumb == 'true') { + if ( has_post_thumbnail( $post_id ) ){ + $output .= '<figure class="featured-thumbnail">'; + $output .= '<img src="'.$image.'" alt="" />'; + $output .= '</figure>'; + } + } + + if ( 'full' == $text ) { + $_content = apply_filters( 'the_content', get_the_content( '' ) ); + } else { + $_content = wp_trim_words( $excerpt, $excerpt_count, apply_filters( 'cherry_plugin_shortcode_excerpt_more', '', $atts, 'recenttesti' ) ); + } + + $text_wrap = '<a href="%2$s">%1$s</a>'; + if ( 'false' == $linked ) { + $text_wrap = '%1$s'; + } + + $output .= sprintf( $text_wrap, $_content, esc_url( get_permalink( $post_id ) ) ); + + $output .= '<div class="clear"></div></blockquote>'; + + $output .= '<small class="testi-meta">'; + if ( !empty( $testiname ) ) { + $output .= '<span class="user">'; + $output .= $testiname; + $output .= '</span>'; + } + + if ( !empty( $testiinfo ) ) { + $output .= ' <span class="info">'; + $output .= $testiinfo; + $output .= '</span><br>'; + } + + if ( !empty( $testiurl ) ) { + $output .= '<a class="testi-url" href="'.$testiurl.'">'; + $output .= $testiurl; + $output .= '</a><br>'; + } + + if ( !empty( $testiemail ) && is_email( $testiemail ) ) { + $output .= '<a class="testi-email" href="mailto:' . antispambot( $testiemail, 1 ) . '" >' . antispambot( $testiemail ) . ' </a>'; + } + + $output .= '</small>'; + + $output .= '</div>'; + $itemcounter++; + + } + wp_reset_postdata(); // restore the global $post variable + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recenttesti', 'shortcode_recenttesti'); + +} + + +//Tag Cloud +if (!function_exists('shortcode_tags')) { + + function shortcode_tags( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="tags-cloud clearfix">'; + $tags = wp_tag_cloud('smallest=8&largest=8&format=array'); + + foreach($tags as $tag){ + $output .= $tag.' '; + } + + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('tags', 'shortcode_tags'); + +} + +//video preview +if (!function_exists('shortcode_video_preview')) { + function shortcode_video_preview( $atts, $content = null, $shortcodename = '' ) { + extract( shortcode_atts( array( + 'title' => '', + 'post_url' => '', + 'date' => '', + 'author' => '', + 'lightbox' => 'no', + 'custom_class' => '', + ), $atts ) ); + + $output_title = ''; + $output_author = ''; + $output_date = ''; + $post_ID = url_to_postid( $post_url); + $get_post = get_post($post_ID); + $get_user = get_userdata($get_post->post_author); + $user_url = get_bloginfo('url').'/author/'.$get_user->user_nicename; + + $video_embed_meta = get_post_meta( $post_ID, 'tz_video_embed', true ); + + if ( empty( $video_embed_meta ) ) { + return ''; + } + + $video_url = parser_video_url( $video_embed_meta ); + $video_url_popup = str_replace('src=', '', $video_url); + $rand = rand(); + + if(strpos($video_url, 'youtube') !== false) { + $video_url_popup = str_replace('embed/', 'watch?v=', $video_url_popup); + } + + $get_image_url = video_image($video_url); + $img=''; + + if($title=="yes"){ + $output_title = '<h4><a href="'.$post_url.'" title="'.$get_post->post_title.'">'.$get_post->post_title.'</a></h4>'; + } + if($author=="yes"){ + $output_author = '<span class="post_author">Posts by <a href="'.$user_url.'" title="Posts by '.$get_user->user_nicename.'" rel="author">'.$get_user->user_nicename.'</a></span>'; + } + if($date=="yes"){ + $output_date = '<span class="post_date"><time datetime="'.$get_post->post_date.'"> '.get_the_date().'</time></span>'; + } + if($get_image_url!=false && $get_image_url!=''){ + if($lightbox == 'yes') { + $img = ' <script type="text/javascript"> + jQuery(document).ready(function() { + jQuery(\'.popup-video-'.$rand.'\').magnificPopup({ + type: \'iframe\', + mainClass: \'mfp-fade\', + removalDelay: 160, + preloader: false, + fixedContentPos: false + }); + }); + </script>'; + $img .= '<a class="popup-video-'.$rand.'" href="'.$video_url_popup.'" title="'.$get_image_url.'"><img src="'.$get_image_url.'" alt=""><span class="icon-play-circle hover"></span></a>'; + } else { + $img = '<a class="preview_image" href="'.$post_url.'" title="'.$get_image_url.'"><img src="'.$get_image_url.'" alt=""><span class="icon-play-circle hover"></span></a>'; + } + } + $output ='<figure class="featured-thumbnail thumbnail video_preview clearfix'.$custom_class.'"><div>'.$img.'<figcaption>'.$output_title.$output_author.$output_date.'</figcaption></div></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('video_preview', 'shortcode_video_preview'); +} + +// Content Box +if ( !function_exists( 'content_box_shortcode' ) ) { + function content_box_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract( shortcode_atts( + array( + 'full_width' => 'no', + 'custom_class' => '', + ), $atts ) ); + + $full_width = ( $full_width == 'yes' ) ? 'full-width' : ''; + + $output = '<div class="content_box ' . $custom_class . ' ' . $full_width . '">'; + $output .= do_shortcode( $content ); + $output .= '<div class="clear"></div>'; + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode( 'content_box', 'content_box_shortcode' ); +} + +if (!function_exists('parser_video_url')) { + function parser_video_url($video_url){ + $video_url = explode(" ", $video_url); + foreach ($video_url as $item) { + if(stripos($item, 'src')!==false){ + $url_array = parse_url($item); + $video_url = $url_array["path"]; + $video_url = stripcslashes($video_url); + $video_url = strip_tags($video_url); + $video_url = str_replace('"', '', $video_url); + break; + } + } + return $video_url; + } +} +if (!function_exists('video_image')) { + function video_image($url){ + if($url[0]!==''){ + $image_id = basename($url); + if(stripos($url, "youtube")!==false){ + return "http://img.youtube.com/vi/".$image_id."/0.jpg"; + } else if(stripos($url, "vimeo")!==false){ + $get_header = @get_headers("http://vimeo.com/api/v2/video/".$image_id.".php"); + if(stripos($get_header[0],'200 OK')){ + $hash = unserialize(file_get_contents("http://vimeo.com/api/v2/video/".$image_id.".php")); + return $hash[0]["thumbnail_large"]; + }else{ + return false; + } + } + }else{ + return false; + } + } +} +?> +||||||| .r11156 +<?php +//Recent Posts +if (!function_exists('shortcode_recent_posts')) { + + function shortcode_recent_posts( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'type' => 'post', + 'category' => '', + 'custom_category' => '', + 'tag' => '', + 'post_format' => 'standard', + 'num' => '5', + 'meta' => 'true', + 'thumb' => 'true', + 'thumb_width' => '120', + 'thumb_height' => '120', + 'more_text_single' => '', + 'excerpt_count' => '0', + 'custom_class' => '' + ), $atts)); + + $output = '<ul class="recent-posts '.$custom_class.' unstyled">'; + + global $post; + global $my_string_limit_words; + $item_counter = 0; + // WPML filter + $suppress_filters = get_option('suppress_filters'); + + if($post_format == 'standard') { + + $args = array( + 'post_type' => $type, + 'category_name' => $category, + 'tag' => $tag, + $type . '_category' => $custom_category, + 'numberposts' => $num, + 'orderby' => 'post_date', + 'order' => 'DESC', + 'tax_query' => array( + 'relation' => 'AND', + array( + 'taxonomy' => 'post_format', + 'field' => 'slug', + 'terms' => array('post-format-aside', 'post-format-gallery', 'post-format-link', 'post-format-image', 'post-format-quote', 'post-format-audio', 'post-format-video'), + 'operator' => 'NOT IN' + ) + ), + 'suppress_filters' => $suppress_filters + ); + + } else { + + $args = array( + 'post_type' => $type, + 'category_name' => $category, + 'tag' => $tag, + $type . '_category' => $custom_category, + 'numberposts' => $num, + 'orderby' => 'post_date', + 'order' => 'DESC', + 'tax_query' => array( + 'relation' => 'AND', + array( + 'taxonomy' => 'post_format', + 'field' => 'slug', + 'terms' => array('post-format-' . $post_format) + ) + ), + 'suppress_filters' => $suppress_filters + ); + } + + $latest = get_posts($args); + + foreach($latest as $k => $post) { + //Check if WPML is activated + if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { + global $sitepress; + + $post_lang = $sitepress->get_language_for_element($post->ID, 'post_' . $type); + $curr_lang = $sitepress->get_current_language(); + // Unset not translated posts + if ( $post_lang != $curr_lang ) { + unset( $latest[$k] ); + } + // Post ID is different in a second language Solution + if ( function_exists( 'icl_object_id' ) ) { + $post = get_post( icl_object_id( $post->ID, $type, true ) ); + } + } + setup_postdata($post); + $excerpt = get_the_excerpt(); + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, $thumb_width, $thumb_height, true); + + $post_classes = get_post_class(); + foreach ($post_classes as $key => $value) { + $pos = strripos($value, 'tag-'); + if ($pos !== false) { + unset($post_classes[$key]); + } + } + $post_classes = implode(' ', $post_classes); + + $output .= '<li class="recent-posts_li ' . $post_classes . ' list-item-' . $item_counter . ' clearfix">'; + + //Aside + if($post_format == "aside") { + + $output .= the_content($post->ID); + + } elseif ($post_format == "link") { + + $url = get_post_meta(get_the_ID(), 'tz_link_url', true); + + $output .= '<a target="_blank" href="'. $url . '">'; + $output .= get_the_title($post->ID); + $output .= '</a>'; + + //Quote + } elseif ($post_format == "quote") { + + $quote = get_post_meta(get_the_ID(), 'tz_quote', true); + + $output .= '<div class="quote-wrap clearfix">'; + + $output .= '<blockquote>'; + $output .= $quote; + $output .= '</blockquote>'; + + $output .= '</div>'; + + //Image + } elseif ($post_format == "image") { + + if (has_post_thumbnail() ) : + + // $lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE); + + $src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' ); + + $thumb = get_post_thumbnail_id(); + $img_url = wp_get_attachment_url( $thumb,'full'); //get img URL + $image = aq_resize( $img_url, 200, 120, true ); //resize & crop img + + + $output .= '<figure class="thumbnail featured-thumbnail large">'; + $output .= '<a class="image-wrap" rel="prettyPhoto" title="' . get_the_title($post->ID) . '" href="' . $src[0] . '">'; + $output .= '<img src="' . $image . '" alt="' . get_the_title($post->ID) .'" />'; + $output .= '<span class="zoom-icon"></span></a>'; + $output .= '</figure>'; + + endif; + + + //Audio + } elseif ($post_format == "audio") { + + $template_url = get_template_directory_uri(); + $id = $post->ID; + + // get audio attribute + $audio_title = get_post_meta(get_the_ID(), 'tz_audio_title', true); + $audio_artist = get_post_meta(get_the_ID(), 'tz_audio_artist', true); + $audio_format = get_post_meta(get_the_ID(), 'tz_audio_format', true); + $audio_url = get_post_meta(get_the_ID(), 'tz_audio_url', true); + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + // 'wp-content' or something else. + $content_dir_name = substr( $content_url, $last_slash_pos - strlen( $content_url ) + 1 ); + + $pos = strpos( $audio_url, $content_dir_name ); + + if ( false === $pos ) { + $file = $audio_url; + } else { + $audio_new = substr( $audio_url, $pos + strlen( $content_dir_name ), strlen( $audio_url ) - $pos ); + $file = $content_url . $audio_new; + } + + $output .= '<script type="text/javascript"> + jQuery(document).ready(function(){ + var myPlaylist_'. $id.' = new jPlayerPlaylist({ + jPlayer: "#jquery_jplayer_'. $id .'", + cssSelectorAncestor: "#jp_container_'. $id .'" + }, [ + { + title:"'. $audio_title .'", + artist:"'. $audio_artist .'", + '. $audio_format .' : "'. stripslashes(htmlspecialchars_decode($file)) .'"} + ], { + playlistOptions: {enableRemoveControls: false}, + ready: function () {jQuery(this).jPlayer("setMedia", {'. $audio_format .' : "'. stripslashes(htmlspecialchars_decode($file)) .'", poster: "'. $image .'"}); + }, + swfPath: "'. $template_url .'/flash", + supplied: "'. $audio_format .', all", + wmode:"window" + }); + }); + </script>'; + + $output .= '<div id="jquery_jplayer_'.$id.'" class="jp-jplayer"></div> + <div id="jp_container_'.$id.'" class="jp-audio"> + <div class="jp-type-single"> + <div class="jp-gui"> + <div class="jp-interface"> + <div class="jp-progress"> + <div class="jp-seek-bar"> + <div class="jp-play-bar"></div> + </div> + </div> + <div class="jp-duration"></div> + <div class="jp-time-sep"></div> + <div class="jp-current-time"></div> + <div class="jp-controls-holder"> + <ul class="jp-controls"> + <li><a href="javascript:;" class="jp-previous" tabindex="1" title="'.__('Previous', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Previous', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-play" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Play', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-pause" tabindex="1" title="'.__('Pause', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Pause', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-next" tabindex="1" title="'.__('Next', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Next', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-stop" tabindex="1" title="'.__('Stop', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Stop', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + </ul> + <div class="jp-volume-bar"> + <div class="jp-volume-bar-value"></div> + </div> + <ul class="jp-toggles"> + <li><a href="javascript:;" class="jp-mute" tabindex="1" title="'.__('Mute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Mute', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + <li><a href="javascript:;" class="jp-unmute" tabindex="1" title="'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'</span></a></li> + </ul> + </div> + </div> + <div class="jp-no-solution"> + <span>'.__('Update Required.', CHERRY_PLUGIN_DOMAIN).'</span>'.__('To play the media you will need to either update your browser to a recent version or update your ', CHERRY_PLUGIN_DOMAIN).'<a href="http://get.adobe.com/flashplayer/" target="_blank">'.__('Flash plugin', CHERRY_PLUGIN_DOMAIN).'</a> + </div> + </div> + </div> + <div class="jp-playlist"> + <ul> + <li></li> + </ul> + </div> + </div>'; + + + $output .= '<div class="entry-content">'; + $output .= get_the_content($post->ID); + $output .= '</div>'; + + //Video + } elseif ($post_format == "video") { + + $template_url = get_template_directory_uri(); + $id = $post->ID; + + // get video attribute + $video_title = get_post_meta(get_the_ID(), 'tz_video_title', true); + $video_artist = get_post_meta(get_the_ID(), 'tz_video_artist', true); + $embed = get_post_meta(get_the_ID(), 'tz_video_embed', true); + $m4v_url = get_post_meta(get_the_ID(), 'tz_m4v_url', true); + $ogv_url = get_post_meta(get_the_ID(), 'tz_ogv_url', true); + + // Get the URL to the content area. + $content_url = untrailingslashit( content_url() ); + + // Find latest '/' in content URL. + $last_slash_pos = strrpos( $content_url, '/' ); + + // 'wp-content' or something else. + $content_dir_name = substr( $content_url, $last_slash_pos - strlen( $content_url ) + 1 ); + + $pos1 = strpos($m4v_url, $content_dir_name); + if ($pos1 === false) { + $file1 = $m4v_url; + } else { + $m4v_new = substr($m4v_url, $pos1+strlen($content_dir_name), strlen($m4v_url) - $pos1); + $file1 = $content_url.$m4v_new; + } + + $pos2 = strpos($ogv_url, $content_dir_name); + if ($pos2 === false) { + $file2 = $ogv_url; + } else { + $ogv_new = substr($ogv_url, $pos2+strlen($content_dir_name), strlen($ogv_url) - $pos2); + $file2 = $content_url.$ogv_new; + } + + // get thumb + if(has_post_thumbnail()) { + $thumb = get_post_thumbnail_id(); + $img_url = wp_get_attachment_url( $thumb,'full'); //get img URL + $image = aq_resize( $img_url, 770, 380, true ); //resize & crop img + } + + if ($embed == '') { + $output .= '<script type="text/javascript"> + jQuery(document).ready(function(){ + var + jPlayerObj = jQuery("#jquery_jplayer_'. $id.'") + , jPlayerContainer = jQuery("#jp_container_'. $id.'") + , isPause = true + ; + jPlayerObj.jPlayer({ + ready: function () { + jQuery(this).jPlayer("setMedia", { + m4v: "'. stripslashes(htmlspecialchars_decode($file1)) .'", + ogv: "'. stripslashes(htmlspecialchars_decode($file2)) .'", + poster: "'. $image .'" + }); + }, + swfPath: "'. $template_url .'/flash", + solution: "flash, html", + supplied: "ogv, m4v, all", + cssSelectorAncestor: "#jp_container_'. $id.'", + size: { + width: "100%", + height: "100%" + } + }); + jPlayerObj.on(jQuery.jPlayer.event.ready + ".jp-repeat", function(event) { + jQuery("img", this).addClass("poster"); + jQuery("video", this).addClass("video"); + jQuery("object", this).addClass("flashObject"); + jQuery(".video", jPlayerContainer).on("click", function(){ + jPlayerObj.jPlayer("pause"); + }) + }) + jPlayerObj.on(jQuery.jPlayer.event.ended + ".jp-repeat", function(event) { + isPause = true + jQuery(".poster", jPlayerContainer).css({display:"inline"}); + jQuery(".video", jPlayerContainer).css({width:"0%", height:"0%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"0%", height:"0%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"block"}); + }); + jPlayerObj.on(jQuery.jPlayer.event.play + ".jp-repeat", function(event) { + isPause = false + emulSwitch(isPause); + }); + jPlayerObj.on(jQuery.jPlayer.event.pause + ".jp-repeat", function(event) { + isPause = true + emulSwitch(isPause); + }); + function emulSwitch(_pause){ + if(_pause){ + jQuery(".poster", jPlayerContainer).css({display:"none"}); + jQuery(".video", jPlayerContainer).css({width:"100%", height:"100%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"100%", height:"100%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"block"}); + }else{ + jQuery(".poster", jPlayerContainer).css({display:"none"}); + jQuery(".video", jPlayerContainer).css({width:"100%", height:"100%"}); + jQuery(".flashObject", jPlayerContainer).css({width:"100%", height:"100%"}); + jPlayerObj.siblings(".jp-gui").find(".jp-video-play").css({display:"none"}); + } + } + }); + </script>'; + $output .= '<div id="jp_container_'. $id .'" class="jp-video fullwidth">'; + $output .= '<div class="jp-type-list-parent">'; + $output .= '<div class="jp-type-single">'; + $output .= '<div id="jquery_jplayer_'. $id .'" class="jp-jplayer"></div>'; + $output .= '<div class="jp-gui">'; + $output .= '<div class="jp-video-play">'; + $output .= '<a href="javascript:;" class="jp-video-play-icon" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'">'.__('Play', CHERRY_PLUGIN_DOMAIN).'</a></div>'; + $output .= '<div class="jp-interface">'; + $output .= '<div class="jp-progress">'; + $output .= '<div class="jp-seek-bar">'; + $output .= '<div class="jp-play-bar">'; + $output .= '</div></div></div>'; + $output .= '<div class="jp-duration"></div>'; + $output .= '<div class="jp-time-sep">/</div>'; + $output .= '<div class="jp-current-time"></div>'; + $output .= '<div class="jp-controls-holder">'; + $output .= '<ul class="jp-controls">'; + $output .= '<li><a href="javascript:;" class="jp-play" tabindex="1" title="'.__('Play', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Play', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li><a href="javascript:;" class="jp-pause" tabindex="1" title="'.__('Pause', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Pause', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li class="li-jp-stop"><a href="javascript:;" class="jp-stop" tabindex="1" title="'.__('Stop', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Stop', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '</ul>'; + $output .= '<div class="jp-volume-bar">'; + $output .= '<div class="jp-volume-bar-value">'; + $output .= '</div></div>'; + $output .= '<ul class="jp-toggles">'; + $output .= '<li><a href="javascript:;" class="jp-mute" tabindex="1" title="'.__('Mute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Mute', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '<li><a href="javascript:;" class="jp-unmute" tabindex="1" title="'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'"><span>'.__('Unmute', CHERRY_PLUGIN_DOMAIN).'</span></a></li>'; + $output .= '</ul>'; + $output .= '</div></div>'; + $output .= '<div class="jp-no-solution">'; + $output .= '<span>'.__('Update Required.', CHERRY_PLUGIN_DOMAIN).'</span>'.__('To play the media you will need to either update your browser to a recent version or update your ', CHERRY_PLUGIN_DOMAIN).'<a href="http://get.adobe.com/flashplayer/" target="_blank">'.__('Flash plugin', CHERRY_PLUGIN_DOMAIN).'</a>'; + $output .= '</div></div></div></div>'; + $output .= '</div>'; + } else { + $output .= '<div class="video-wrap">' . stripslashes(htmlspecialchars_decode($embed)) . '</div>'; + } + + if($excerpt_count >= 1){ + $output .= '<div class="excerpt">'; + $output .= my_string_limit_words($excerpt,$excerpt_count); + $output .= '</div>'; + } + + //Standard + } else { + + if ($thumb == 'true') { + if ( has_post_thumbnail($post->ID) ){ + $output .= '<figure class="thumbnail featured-thumbnail"><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= '<img src="'.$image.'" alt="' . get_the_title($post->ID) .'"/>'; + $output .= '</a></figure>'; + } + } + $output .= '<h5><a href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; + $output .= get_the_title($post->ID); + $output .= '</a></h5>'; + if ($meta == 'true') { + $output .= '<span class="meta">'; + $output .= '<span class="post-date">'; + $output .= get_the_date(); + $output .= '</span>'; + $output .= '<span class="post-comments">'; + $output .= '<a href="'.get_comments_link($post->ID).'">'; + $output .= get_comments_number($post->ID); + $output .= '</a>'; + $output .= '</span>'; + $output .= '</span>'; + } + $output .= cherry_get_post_networks(array('post_id' => $post->ID, 'display_title' => false, 'output_type' => 'return')); + if ($excerpt_count >= 1) { + $output .= '<div class="excerpt">'; + $output .= my_string_limit_words($excerpt,$excerpt_count); + $output .= '</div>'; + } + if ($more_text_single!="") { + $output .= '<a href="'.get_permalink($post->ID).'" class="btn btn-primary" title="'.get_the_title($post->ID).'">'; + $output .= $more_text_single; + $output .= '</a>'; + } + } + $output .= '<div class="clear"></div>'; + $item_counter ++; + $output .= '</li>'; + } + wp_reset_postdata(); // restore the global $post variable + $output .= '</ul>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recent_posts', 'shortcode_recent_posts'); +} + + +// Recent Comments +if (!function_exists('shortcode_recent_comments')) { + + function shortcode_recent_comments( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'num' => '5', + 'custom_class' => '' + ), $atts)); + + global $wpdb; + $itemcounter = 0; + + if ( function_exists( 'wpml_get_language_information' ) ) { + global $sitepress; + $sql = " + SELECT * FROM {$wpdb->comments} + JOIN {$wpdb->prefix}icl_translations + ON {$wpdb->comments}.comment_post_id = {$wpdb->prefix}icl_translations.element_id + AND {$wpdb->prefix}icl_translations.element_type='post_post' + WHERE comment_approved = '1' + AND language_code = '".$sitepress->get_current_language()."' + ORDER BY comment_date_gmt DESC LIMIT {$num}"; + } else { + $sql = " + SELECT * FROM $wpdb->comments + LEFT OUTER JOIN $wpdb->posts + ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) + WHERE comment_approved = '1' + AND comment_type = '' + AND post_password = '' + ORDER BY comment_date_gmt DESC LIMIT {$num}"; + } + + $comment_len = 100; + $comments = $wpdb->get_results($sql); + + $output = '<ul class="recent-comments unstyled">'; + + foreach ($comments as $comment) { + $output .= '<li class="list-item-'.$itemcounter.'">'; + $output .= '<a href="'.get_comment_link($comment->comment_ID).'" title="on '.get_the_title($comment->comment_post_ID).'">'; + $output .= strip_tags($comment->comment_author).' : ' . strip_tags(substr(apply_filters('get_comment_text', $comment->comment_content), 0, $comment_len)); + if (strlen($comment->comment_content) > $comment_len) $output .= '...'; + $output .= '</a>'; + $output .= '</li>'; + $itemcounter++; + } + + $output .= '</ul>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recent_comments', 'shortcode_recent_comments'); +} + + +//Recent Testimonials +if (!function_exists('shortcode_recenttesti')) { + + function shortcode_recenttesti( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts(array( + 'num' => '5', + 'thumb' => 'true', + 'excerpt_count' => '30', + 'custom_class' => '', + ), $atts)); + + // WPML filter + $suppress_filters = get_option('suppress_filters'); + + $args = array( + 'post_type' => 'testi', + 'numberposts' => $num, + 'orderby' => 'post_date', + 'suppress_filters' => $suppress_filters + ); + $testi = get_posts($args); + + $itemcounter = 0; + + $output = '<div class="testimonials '.$custom_class.'">'; + + global $post; + global $my_string_limit_words; + + foreach ($testi as $k => $post) { + //Check if WPML is activated + if ( defined( 'ICL_SITEPRESS_VERSION' ) ) { + global $sitepress; + + $post_lang = $sitepress->get_language_for_element($post->ID, 'post_testi'); + $curr_lang = $sitepress->get_current_language(); + // Unset not translated posts + if ( $post_lang != $curr_lang ) { + unset( $testi[$k] ); + } + // Post ID is different in a second language Solution + if ( function_exists( 'icl_object_id' ) ) { + $post = get_post( icl_object_id( $post->ID, 'testi', true ) ); + } + } + setup_postdata( $post ); + $post_id = $post->ID; + $excerpt = get_the_excerpt(); + + // Get custom metabox value. + $testiname = get_post_meta( $post_id, 'my_testi_caption', true ); + $testiurl = esc_url( get_post_meta( $post_id, 'my_testi_url', true ) ); + $testiinfo = get_post_meta( $post_id, 'my_testi_info', true ); + $testiemail = sanitize_email( get_post_meta( $post_id, 'my_testi_email', true ) ); + + $attachment_url = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' ); + $url = $attachment_url['0']; + $image = aq_resize($url, 280, 240, true); + + $output .= '<div class="testi-item list-item-'.$itemcounter.'">'; + $output .= '<blockquote class="testi-item_blockquote">'; + if ($thumb == 'true') { + if ( has_post_thumbnail( $post_id ) ){ + $output .= '<figure class="featured-thumbnail">'; + $output .= '<img src="'.$image.'" alt="" />'; + $output .= '</figure>'; + } + } + $output .= '<a href="'.get_permalink( $post_id ).'">'; + $output .= my_string_limit_words($excerpt,$excerpt_count); + $output .= '</a><div class="clear"></div>'; + + $output .= '</blockquote>'; + + $output .= '<small class="testi-meta">'; + if ( !empty( $testiname ) ) { + $output .= '<span class="user">'; + $output .= $testiname; + $output .= '</span>'; + } + + if ( !empty( $testiinfo ) ) { + $output .= ' <span class="info">'; + $output .= $testiinfo; + $output .= '</span><br>'; + } + + if ( !empty( $testiurl ) ) { + $output .= '<a class="testi-url" href="'.$testiurl.'">'; + $output .= $testiurl; + $output .= '</a><br>'; + } + + if ( !empty( $testiemail ) && is_email( $testiemail ) ) { + $output .= '<a class="testi-email" href="mailto:' . antispambot( $testiemail, 1 ) . '" >' . antispambot( $testiemail ) . ' </a>'; + } + + $output .= '</small>'; + + $output .= '</div>'; + $itemcounter++; + + } + wp_reset_postdata(); // restore the global $post variable + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('recenttesti', 'shortcode_recenttesti'); + +} + + +//Tag Cloud +if (!function_exists('shortcode_tags')) { + + function shortcode_tags( $atts, $content = null, $shortcodename = '' ) { + $output = '<div class="tags-cloud clearfix">'; + $tags = wp_tag_cloud('smallest=8&largest=8&format=array'); + + foreach($tags as $tag){ + $output .= $tag.' '; + } + + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('tags', 'shortcode_tags'); + +} + +//video preview +if (!function_exists('shortcode_video_preview')) { + function shortcode_video_preview( $atts, $content = null, $shortcodename = '' ) { + extract(shortcode_atts( + array( + 'title' => '', + 'post_url' => '', + 'date' => '', + 'author' => '', + 'custom_class' => '', + ), $atts)); + $output_title = ''; + $output_author = ''; + $output_date = ''; + $post_ID = url_to_postid($post_url); + $get_post = get_post($post_ID); + $get_user = get_userdata($get_post->post_author); + $user_url = get_bloginfo('url').'/author/'.$get_user->user_nicename; + $video_url = parser_video_url(get_post_meta($post_ID, 'tz_video_embed', true)); + $get_image_url = video_image($video_url); + $img=''; + + if($title=="yes"){ + $output_title = '<h4><a href="'.$post_url.'" title="'.$get_post->post_title.'">'.$get_post->post_title.'</a></h4>'; + } + if($author=="yes"){ + $output_author = '<span class="post_author">Posts by <a href="'.$user_url.'" title="Posts by '.$get_user->user_nicename.'" rel="author">'.$get_user->user_nicename.'</a></span>'; + } + if($date=="yes"){ + $output_date = '<span class="post_date"><time datetime="'.$get_post->post_date.'"> '.get_the_date().'</time></span>'; + } + if($get_image_url!=false && $get_image_url!=''){ + $img = '<a class="preview_image" href="'.$post_url.'" title="'.$get_image_url.'"><img src="'.$get_image_url.'" alt=""><span class="icon-play-circle hover"></span></a>'; + } + $output ='<figure class="featured-thumbnail thumbnail video_preview clearfix'.$custom_class.'"><div>'.$img.'<figcaption>'.$output_title.$output_author.$output_date.'</figcaption></div></figure>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode('video_preview', 'shortcode_video_preview'); +} + +// Content Box +if ( !function_exists( 'content_box_shortcode' ) ) { + function content_box_shortcode( $atts, $content = null, $shortcodename = '' ) { + extract( shortcode_atts( + array( + 'custom_class' => '', + ), $atts ) ); + + $output = '<div class="content_box ' . $custom_class . '">'; + $output .= do_shortcode( $content ); + $output .= '<div class="clear"></div>'; + $output .= '</div>'; + + $output = apply_filters( 'cherry_plugin_shortcode_output', $output, $atts, $shortcodename ); + + return $output; + } + add_shortcode( 'content_box', 'content_box_shortcode' ); +} + +if (!function_exists('parser_video_url')) { + function parser_video_url($video_url){ + $video_url = explode(" ", $video_url); + foreach ($video_url as $item) { + if(stripos($item, 'src')!==false){ + $url_array = parse_url($item); + $video_url = $url_array["path"]; + $video_url = stripcslashes($video_url); + $video_url = strip_tags($video_url); + $video_url = str_replace('"', '', $video_url); + break; + } + } + return $video_url; + } +} +if (!function_exists('video_image')) { + function video_image($url){ + if($url[0]!==''){ + $image_id = basename($url); + if(stripos($url, "youtube")!==false){ + return "http://img.youtube.com/vi/".$image_id."/0.jpg"; + } else if(stripos($url, "vimeo")!==false){ + $get_header = @get_headers("http://vimeo.com/api/v2/video/".$image_id.".php"); + if(stripos($get_header[0],'200 OK')){ + $hash = unserialize(file_get_contents("http://vimeo.com/api/v2/video/".$image_id.".php")); + return $hash[0]["thumbnail_large"]; + }else{ + return false; + } + } + }else{ + return false; + } + } +} +?>======= <?php //Recent Posts if (!function_exists('shortcode_recent_posts')) { @@ -749,4 +2302,4 @@ if (!function_exists('video_image')) { } } } -?> \ No newline at end of file +?>>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-banner-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-banner-widget.php index eadf9744..29b21415 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-banner-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-banner-widget.php @@ -2,7 +2,7 @@ class Cherry_Banner_Widget extends WP_Widget { /* constructor */ public function Cherry_Banner_Widget() { - parent::WP_Widget(false, __('Cherry - Banner', CHERRY_PLUGIN_DOMAIN), array('description'=>'Cherry Banner Widget')); + parent::__construct(false, __('Cherry - Banner', CHERRY_PLUGIN_DOMAIN), array('description'=>'Cherry Banner Widget')); add_action('admin_enqueue_scripts', array($this, 'upload_scripts')); add_action('admin_enqueue_styles', array($this, 'upload_styles')); } diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-instagram-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-instagram-widget.php index 20352c99..8490fdf6 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-instagram-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-instagram-widget.php @@ -2,45 +2,99 @@ class Cherry_Instagram_Widget extends WP_Widget { /* constructor */ public function Cherry_Instagram_Widget() { - parent::WP_Widget(false, __('Cherry - Instagram', CHERRY_PLUGIN_DOMAIN), array('description' => __('Widget for popular social network Instagram', CHERRY_PLUGIN_DOMAIN))); + parent::__construct(false, __('Cherry - Instagram', CHERRY_PLUGIN_DOMAIN), array('description' => __('Widget for popular social network Instagram', CHERRY_PLUGIN_DOMAIN))); } /** @see WP_Widget::widget */ - public function widget($args, $instance) { - extract(array_merge($args , $instance)); + public function widget( $args, $instance ) { + extract( array_merge( $args, $instance ) ); + + if ( 'hashtag' == $endpoints ) { + if ( empty( $tag ) ) { + return print $before_widget . __( 'Please, enter #hashtag.', CHERRY_PLUGIN_DOMAIN ) . $after_widget; + } + } + + if ( 'self' == $endpoints ) { + if ( empty( $user_name ) ) { + return print $before_widget . __( 'Please, enter your username.', CHERRY_PLUGIN_DOMAIN ) . $after_widget; + } + } + + if ( empty( $client_id ) ) { + return print $before_widget . __( 'Please, enter your Instagram CLIENT ID.', CHERRY_PLUGIN_DOMAIN ) . $after_widget; + } + + if ( intval( $image_counter ) <= 0 ) { + return ''; + } + + $config = array(); + + if ( isset( $link ) ) $config[] = 'link'; + if ( isset( $display_comments ) ) $config[] = 'comments'; + if ( isset( $display_likes ) ) $config[] = 'likes'; + if ( isset( $display_time ) ) $config[] = 'time'; + if ( isset( $display_description ) ) $config[] = 'description'; + if ( isset( $image_size ) ) $config['thumb'] = $image_size; + + if ( 'self' == $endpoints ) { + $user_id = $this->get_user_id( $user_name, $client_id ); + + if ( ! $user_id ) { + return print $before_widget . __( 'Please, enter a valid username and CLIENT ID.' ) . $after_widget; + } + + $data = $user_id; + + } else { + $data = $tag; + } + + $config['endpoints'] = $endpoints; + $photos = $this->get_photos( $data, $client_id, $image_counter, $config ); + + if ( ! $photos ) { + return print $before_widget . __( 'Please, enter a valid CLIENT ID.' ) . $after_widget; + } $button_text = apply_filters( 'cherry_text_translate', $instance['button_text'], $instance['title'] . ' button_text' ); - $user_name = strtolower(trim($user_name)); - $date_format = get_option('date_format'); - $img_list = $this->get_user_profile($user_name, $image_counter); - $images_size_class = 'img_'.$image_size ; + $user_name = strtolower( trim( $user_name ) ); + $date_format = get_option( 'date_format' ); + $images_size_class = 'img_' . $image_size; $output = $before_widget; - $output .= $title ? $before_title . $title . $after_title : '' ; + $output .= $title ? $before_title . $title . $after_title : '' ; - if(!empty($img_list)){ $output .= '<div class="imgs_wrapper '.$images_size_class.'"><ul class="clearfix">'; - foreach ($img_list as $img_key => $img_value) { - $class = ($img_key%2 == 0) ? 'odd' : 'even' ; - $class .= isset($link) ? ' inst_link' : '' ; - $class .= isset($img_list[$img_key+1]) ? '' : ' last_child' ; - - $output .= '<li class="'.$class.'"><figure>'; - $output .= '<div class="img_wrapp">'; - $output .= isset($link) ? '<a href="'.$img_value['link'].'" title="'.$img_value['description'].'" target="_blank" >' : '' ; - $output .= '<img class="inst_img" src="'.$img_value[$image_size]['url'].'" alt="'.$img_value['description'].'">'; - $output .= isset($display_comments) ? '<span class="img_likes"><i class="icon-heart"></i><span class="counter">'.$img_value['likes'].'</span></span>' : '' ; - $output .= isset($display_likes) ? '<span class="img_commetn_count"><i class="icon-comment"></i><span class="counter">'.$img_value['comments'].'</span></span>' : '' ; - $output .= isset($link) ? '</a>' : '' ; - $output .= '</div>'; - $output .= isset($display_time) ? '<span class="img_public_date"><i class="icon-calendar"></i> '.date($date_format, $img_value['time']).'</span>' : '' ; - $output .= isset($display_description) && $img_value['description'] ? '<span class="img_description"><i class="icon-pencil"></i> '.$img_value['description'].'</span>' : '' ; + + foreach ( (array) $photos as $key => $photo ) { + + $class = ( $key % 2 == 0 ) ? 'odd' : 'even'; + $class .= isset( $link ) ? ' inst_link' : ''; + $class .= isset( $photos[ $key + 1 ] ) ? '' : ' last_child'; + $desc = ( isset( $photo['description'] ) ) ? $photo['description'] : ''; + + $output .= '<li class="' . $class . '"><figure>'; + + $output .= '<div class="img_wrapp">'; + $output .= isset( $link ) ? '<a href="' . esc_url( $photo['link'] ) . '" title="' . esc_attr( $desc ) . '" target="_blank" >' : ''; + $output .= '<img class="inst_img" src="' . esc_url( $photo['thumb'] ) . '" alt="' . esc_attr( $desc ) . '">'; + $output .= isset( $display_comments ) ? '<span class="img_likes"><i class="icon-heart"></i><span class="counter">' . $photo['comments'] . '</span></span>' : ''; + $output .= isset( $display_likes ) ? '<span class="img_commetn_count"><i class="icon-comment"></i><span class="counter">' . $photo['likes'] . '</span></span>' : ''; + $output .= isset( $link ) ? '</a>' : ''; + $output .= '</div>'; + + $output .= isset( $display_time ) ? '<time datetime="' . esc_attr( date( 'Y-m-d\TH:i:sP' ), $photo['time'] ) . '" class="img_public_date"><i class="icon-calendar"></i> ' . date( $date_format, $photo['time'] ) . '</time>' : ''; + $output .= isset( $display_description ) && $desc ? '<span class="img_description"><i class="icon-pencil"></i> ' . $photo['description'] . '</span>' : ''; + $output .= '</figure></li>'; } + $output .= '</ul></div>'; - } - $output .= $button_text ? '<a href="http://instagram.com/'.$user_name.'" class="btn btn-primary" title="Instagram" target="_blank">'.$button_text.'</a>' : '' ; + + $output .= $button_text ? '<a href="//instagram.com/' . $user_name . '" class="btn btn-primary" title="Instagram" target="_blank">' . $button_text . '</a>' : ''; $output .= $after_widget; echo $output; @@ -48,48 +102,84 @@ /** @see WP_Widget::update */ public function update( $new_instance, $old_instance ) { + delete_transient( 'cherry_plugin_instagram_user_id' ); + delete_transient( 'cherry_plugin_instagram_photos' ); return $new_instance; } /** @see WP_Widget::form */ public function form($instance) { $defaults = array( - 'title' => '', - 'user_name' => '', - 'image_counter' => '10', - 'image_size' => 'large', + 'title' => '', + 'endpoints' => 'hashtag', // hashtag or self + 'user_name' => '', + 'tag' => '', + 'client_id' => '', + 'image_counter' => '4', + 'image_size' => 'thumbnail', 'display_description' => 'on', - 'display_comments' => 'on', - 'display_likes' => 'on', - 'display_time' => 'on', - 'link' => 'on', - 'button_text' => '' + 'display_comments' => 'on', + 'display_likes' => 'on', + 'display_time' => 'on', + 'link' => 'on', + 'button_text' => '', ); - extract(array_merge($defaults, $instance)); + + extract( array_merge( $defaults, $instance ) ); $form_field_type = array( - 'title' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Widget Title', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $title), - 'user_name' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('User Name', CHERRY_PLUGIN_DOMAIN), 'description' => 'Widget will work only for users who have full rights opened in Instagram account.', 'value' => $user_name), - 'image_counter' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Number of displayed images', CHERRY_PLUGIN_DOMAIN), 'description' => __('Max value: 20 images.', CHERRY_PLUGIN_DOMAIN), 'value' => $image_counter), - 'image_size' => array('type' => 'select', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Image dimentions', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $image_size, 'value_options' => array('large' => __('Large', CHERRY_PLUGIN_DOMAIN), 'thumbnail' => __('Thumbnail', CHERRY_PLUGIN_DOMAIN)) ), - 'display_description' => array('type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show image description', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_description), - 'display_comments' => array('type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show comments number', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_comments), - 'display_likes' => array('type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show likes number', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_likes), - 'display_time' => array('type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show image publication date', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_time), - 'link' => array('type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Image URL', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $link), - 'button_text' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('User account button text', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $button_text) + 'title' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Widget Title', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $title + ), + 'endpoints' => array( + 'type' => 'select', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Content type', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $endpoints, 'value_options' => array('self' => __('My Photos', CHERRY_PLUGIN_DOMAIN), 'hashtag' => __('Tagged photos', CHERRY_PLUGIN_DOMAIN)) + ), + 'user_name' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('User Name', CHERRY_PLUGIN_DOMAIN), 'description' => __('Widget will work only for users who have full rights opened in Instagram account.', CHERRY_PLUGIN_DOMAIN), 'value' => $user_name + ), + 'tag' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Hashtag', CHERRY_PLUGIN_DOMAIN), 'description' => __('Enter without #-symbol.', CHERRY_PLUGIN_DOMAIN), 'value' => $tag + ), + 'client_id' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Client ID', CHERRY_PLUGIN_DOMAIN), 'description' => __('Follow this <a href="https://instagram.com/developer/clients/manage/" target="_blank">link</a> and create the application. After that you will get your applications data where you will see the CLIENT ID.', CHERRY_PLUGIN_DOMAIN), 'value' => $client_id + ), + 'image_counter' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Number of displayed images', CHERRY_PLUGIN_DOMAIN), 'description' => __('Max value: 20 images.', CHERRY_PLUGIN_DOMAIN), 'value' => $image_counter + ), + 'image_size' => array( + 'type' => 'select', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Image dimentions', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $image_size, 'value_options' => array('large' => __('Large', CHERRY_PLUGIN_DOMAIN), 'thumbnail' => __('Thumbnail', CHERRY_PLUGIN_DOMAIN)) + ), + 'display_description' => array( + 'type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show image description', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_description + ), + 'display_comments' => array( + 'type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show comments number', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_comments + ), + 'display_likes' => array( + 'type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show likes number', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_likes + ), + 'display_time' => array( + 'type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Show image publication date', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $display_time + ), + 'link' => array( + 'type' => 'checkbox', 'class' => '', 'inline_style' => '', 'title' => __('Image URL', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $link + ), + 'button_text' => array( + 'type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('User account button text', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $button_text + ) ); + $output = ''; foreach ($form_field_type as $key => $args) { - $field_id = esc_attr($this->get_field_id($key)); - $field_name = esc_attr($this->get_field_name($key)); - $field_class = $args['class']; - $field_title = $args['title']; + $field_id = esc_attr($this->get_field_id($key)); + $field_name = esc_attr($this->get_field_name($key)); + $field_class = $args['class']; + $field_title = $args['title']; $field_description = $args['description']; - $field_value = $args['value']; - $field_options = isset($args['value_options']) ? $args['value_options'] : array() ; - $inline_style = $args['inline_style'] ? 'style="'.$args['inline_style'].'"' : '' ; + $field_value = $args['value']; + $field_options = isset($args['value_options']) ? $args['value_options'] : array() ; + $inline_style = $args['inline_style'] ? 'style="'.$args['inline_style'].'"' : '' ; $output .= '<p>'; switch ($args['type']) { @@ -118,39 +208,113 @@ } echo $output; } - function get_user_profile($user_name, $img_counter){ - $counter= 0; - $response = wp_remote_get('http://instagram.com/'.$user_name); - if(is_wp_error($response) || empty($response) || $response ['response']['code'] != "200"){ - return array(); + function get_user_id( $user_name, $client_id ) { + $cached = get_transient( 'cherry_plugin_instagram_user_id' ); + + if ( false !== $cached ) { + return $cached; + } + + $url = add_query_arg( + array( 'q' => esc_attr( $user_name ), 'client_id' => esc_attr( $client_id ) ), + 'https://api.instagram.com/v1/users/search/' + ); + $response = wp_remote_get( $url ); + + if ( is_wp_error( $response ) || empty( $response ) || $response ['response']['code'] != '200' ) { + set_transient( 'cherry_plugin_instagram_user_id', false, HOUR_IN_SECONDS ); + return false; + } + + $result = json_decode( wp_remote_retrieve_body( $response ), true ); + $user_id = false; + + foreach ( $result['data'] as $key => $data ) { + + if ( $user_name != $data['username'] ) { + continue; + } + + $user_id = $data['id']; + } + + set_transient( 'cherry_plugin_instagram_user_id', $user_id, HOUR_IN_SECONDS ); + + return $user_id; + } + + function get_photos( $data, $client_id, $img_counter, $config ) { + $cached = get_transient( 'cherry_plugin_instagram_photos' ); + + if ( false !== $cached ) { + return $cached; + } + + if ( 'self' == $config['endpoints'] ) { + $old_url = 'https://api.instagram.com/v1/users/' . $data . '/media/recent/'; + } else { + $old_url = 'https://api.instagram.com/v1/tags/' . $data . '/media/recent/'; } - $get_images_array = explode('window._sharedData = ', $response['body']); - $get_images_array = explode(';</script>', $get_images_array[1]); - $get_images_array = json_decode($get_images_array[0], TRUE); - $get_images_array = $get_images_array['entry_data']['UserProfile'][0]['userMedia']; + $url = add_query_arg( + array( 'client_id' => esc_attr( $client_id ) ), + $old_url + ); + + $response = wp_remote_get( $url ); + + if ( is_wp_error( $response ) || empty( $response ) || $response ['response']['code'] != '200' ) { + set_transient( 'cherry_plugin_instagram_photos', false, HOUR_IN_SECONDS ); + return false; + } - $images_array = array(); - foreach ($get_images_array as $image) { - if($img_counter<=$counter){ + $result = json_decode( wp_remote_retrieve_body( $response ), true ); + $photos = array(); + $counter = 1; + + foreach ( $result['data'] as $photo ) { + + if ( $counter > $img_counter ) { + break; + } + + if ( 'image' != $photo['type'] ) { continue; - }else{ - if ($image['type'] == 'image' && $image['user']['username'] == $user_name) { - $images_array[] = array( - 'description' => $image['caption']['text'], - 'link' => $image['link'], - 'time' => $image['created_time'], - 'comments' => $image['comments']['count'], - 'likes' => $image['likes']['count'], - 'thumbnail' => $image['images']['thumbnail'], - 'large' => $image['images']['standard_resolution'] - ); - $counter++; - } } + + $_photo = array(); + + if ( in_array( 'link', $config ) ) + $_photo = array_merge( $_photo, array( 'link' => esc_url( $photo['link'] ) ) ); + + if ( in_array( 'comments', $config ) ) + $_photo = array_merge( $_photo, array( 'comments' => absint( $photo['comments']['count'] ) ) ); + + if ( in_array( 'likes', $config ) ) + $_photo = array_merge( $_photo, array( 'likes' => absint( $photo['likes']['count'] ) ) ); + + if ( in_array( 'time', $config ) ) + $_photo = array_merge( $_photo, array( 'time' => sanitize_text_field( $photo['created_time'] ) ) ); + + if ( in_array( 'description', $config ) ) + $_photo = array_merge( $_photo, array( 'description' => wp_trim_words( $photo['caption']['text'], 10 ) ) ); + + if ( array_key_exists( 'thumb', $config ) ) { + $size = ( 'large' == $config['thumb'] ) ? 'standard_resolution' : 'thumbnail'; + $_photo = array_merge( $_photo, array( 'thumb' => $photo['images'][ $size ]['url'] ) ); + } + + if ( ! empty( $_photo ) ) { + array_push( $photos, $_photo ); + } + + $counter++; } - return $images_array; + + set_transient( 'cherry_plugin_instagram_photos', $photos, HOUR_IN_SECONDS ); + + return $photos; } } ?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-pinterest-embed-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-pinterest-embed-widget.php new file mode 100644 index 00000000..662cdae8 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-pinterest-embed-widget.php @@ -0,0 +1,130 @@ +<?php +$error = array(); + class Cherry_Pinterest_Embed_Widget extends WP_Widget { + + /* constructor */ + public function Cherry_Pinterest_Embed_Widget() { + parent::__construct(false, __('Cherry - Pinterest Embed', CHERRY_PLUGIN_DOMAIN), array('description' => __('Widget for Pinterest embed content', CHERRY_PLUGIN_DOMAIN))); + } + + /** @see WP_Widget::widget */ + public function widget($args, $instance) { + extract(array_merge($args , $instance)); + + $url = strtolower(esc_html($url)); + $lang = get_bloginfo('language'); + + $output = $before_widget; + $output .= $title ? $before_title . $title . $after_title : '' ; + + if($instance['error'] === '') { + $output .= '<div id="pin-container"> + <script type="text/javascript"> + + jQuery(document).ready(function() { + var boardWidth, scaleWidth; + + jQuery(window).resize( + function(){ + boardWidth = jQuery("#pin-container").width(); + scaleWidth = Math.floor(boardWidth/4.1111); + } + ).trigger(\'resize\'); + }); + + </script> + <a data-pin-do="embedUser" href="'.$url.'"></a> + <script type="text/javascript" async src="//assets.pinterest.com/js/pinit.js"></script> + </div>'; + } else { + $output .= '<div style="margin:20px 0 15px;padding:10px;background:#ff9b9b">'.__('There is some errors. Please check widgets page.', CHERRY_PLUGIN_DOMAIN).'</div>'; + } + $output .= $after_widget; + + echo $output; + } + + /** @see WP_Widget::update */ + public function update( $new_instance, $old_instance ) { + + $instance = $old_instance; + + // keep all of the fields passed from the new instance + foreach ( $new_instance as $key => $value ){ + $instance[ $key ] = strip_tags($value); + } + + if ( empty( $instance['url'] ) ) { + $instance['error'] = __('Field is empty', CHERRY_PLUGIN_DOMAIN); + } else { + $instance['error'] = ''; + } + + return $instance; + } + + /** @see WP_Widget::form */ + public function form($instance) { + $defaults = array( + 'title' => '', + 'url' => '', + 'error' => '' + ); + + extract(array_merge($defaults, $instance)); + + $form_field_type = array( + 'title' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Widget Title', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $title), + 'url' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Pinterest User URL', CHERRY_PLUGIN_DOMAIN), 'description' => __('Enter Pinterest User URL.', CHERRY_PLUGIN_DOMAIN), 'value' => $url), + ); + $output = ''; + + $title = esc_attr($title); + + if ($error) { + $output .= '<div style="margin:20px 0 15px;padding:10px;background:#ff9b9b">'.$error.'</div>'; + } + + foreach ($form_field_type as $key => $args) { + + $field_id = esc_attr($this->get_field_id($key)); + $field_name = esc_attr($this->get_field_name($key)); + + $field_class = $args['class']; + $field_title = $args['title']; + $field_description = $args['description']; + $field_value = $args['value']; + $field_options = isset($args['value_options']) ? $args['value_options'] : array() ; + $inline_style = $args['inline_style'] ? 'style="'.$args['inline_style'].'"' : '' ; + + $output .= '<p>'; + + switch ($args['type']) { + case 'text': + $output .= '<label for="'.$field_id.'">'.$field_title.': <input '.$inline_style.' class="'.$field_class.'" id="'.$field_id.'" name="'.$field_name.'" type="text" value="'.esc_attr($field_value).'"/></label>'; + break; + case 'checkbox': + $checked = isset($instance[$key]) ? 'checked' : '' ; + $output .= '<label for="'.$field_id.'"><input value="on" '.$inline_style.' class="'.$field_class.'" id="'.$field_id.'" name="'.$field_name.'" type="checkbox" '.$checked.' />'.$field_title.'</label>'; + + break; + case 'select': + $output .= '<label for="'.$field_id.'">'.$field_title.':</label>'; + $output .= '<select id="'.$field_id.'" name="'.$field_name.'" '.$inline_style.' class="'.$field_class.'">'; + if(!empty($field_options)){ + foreach ($field_options as $key_options => $value_options) { + $selected = $key_options == $field_value ? ' selected' : '' ; + $output .= '<option value="'.$key_options.'" '.$selected.'>'.$value_options.'</option>'; + } + } + $output .= '</select>'; + break; + } + $output .= '<br><small>'.$field_description.'</small>'; + + $output .= '</p>'; + } + echo $output; + } + } +?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-twitter-embed-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-twitter-embed-widget.php new file mode 100644 index 00000000..b2eb35d5 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/cherry-twitter-embed-widget.php @@ -0,0 +1,125 @@ +<?php +$error = array(); + class Cherry_Twitter_Embed_Widget extends WP_Widget { + + /* constructor */ + public function Cherry_Twitter_Embed_Widget() { + parent::__construct(false, __('Cherry - Twitter Embed', CHERRY_PLUGIN_DOMAIN), array('description' => __('Widget for Twitter embed content', CHERRY_PLUGIN_DOMAIN))); + } + + /** @see WP_Widget::widget */ + public function widget($args, $instance) { + extract(array_merge($args , $instance)); + + $lang = get_bloginfo('language'); + + $output = $before_widget; + $output .= $title ? $before_title . $title . $after_title : '' ; + if($limit) { + $limit_string = 'data-tweet-limit="'.$limit.'"'; + } + if($instance['error'] === '') { + $output .= '<a class="twitter-timeline" data-screen-name="'.$userName.'" data-theme="'.$color_scheme.'" data-widget-id="'.$widgetId.'" '.$limit_string.'></a> + <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>'; + } else { + $output .= '<div style="margin:20px 0 15px;padding:10px;background:#ff9b9b">'.__('There is some errors. Please check widgets page.', CHERRY_PLUGIN_DOMAIN).'</div>'; + } + $output .= $after_widget; + + echo $output; + } + + /** @see WP_Widget::update */ + public function update( $new_instance, $old_instance ) { + + $instance = $old_instance; + + // keep all of the fields passed from the new instance + foreach ( $new_instance as $key => $value ){ + $instance[ $key ] = strip_tags($value); + } + + if ( empty( $instance['widgetId'] ) ) { + $instance['error'] = __('Field is empty', CHERRY_PLUGIN_DOMAIN); + } else { + if ( !is_numeric ( $instance['widgetId'] ) ) { + $instance['error'] = __('Widget ID can contains only numbers', CHERRY_PLUGIN_DOMAIN); + } else { + $instance['error'] = ''; + } + } + + return $instance; + } + + /** @see WP_Widget::form */ + public function form($instance) { + $defaults = array( + 'title' => '', + 'widgetId' => '', + 'userName' => '', + 'color_scheme' => 'light', + 'limit' => '', + 'error' => '' + ); + + extract(array_merge($defaults, $instance)); + + $form_field_type = array( + 'title' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Widget Title', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $title), + 'widgetId' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Widget ID', CHERRY_PLUGIN_DOMAIN), 'description' => __('ID of your widget. First of all you need make a new one widget on page https://twitter.com/settings/widgets/new. After it copy and paste here ID of widget. You can find it after creating of widget in browser\'s URL field. It contents only numbers.', CHERRY_PLUGIN_DOMAIN), 'value' => $widgetId), + 'userName' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('User Name', CHERRY_PLUGIN_DOMAIN), 'description' => __('Twitter username you need to show. If empty, then will shown twitter that you set in Twitter\'s configure page.', CHERRY_PLUGIN_DOMAIN), 'value' => $userName), + 'color_scheme' => array('type' => 'select', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Color Scheme', CHERRY_PLUGIN_DOMAIN), 'description' => '', 'value' => $color_scheme, 'value_options' => array('light' => __('Light', CHERRY_PLUGIN_DOMAIN), 'dark' => __('Dark', CHERRY_PLUGIN_DOMAIN)) ), + 'limit' => array('type' => 'text', 'class' => 'widefat', 'inline_style' => '', 'title' => __('Tweet limit', CHERRY_PLUGIN_DOMAIN), 'description' => __('Number of tweets. Leave blank if you don\'t want to limit tweet\'s number.', CHERRY_PLUGIN_DOMAIN), 'value' => $limit), + ); + $output = ''; + + $title = esc_attr($title); + + if ($error) { + $output .= '<div style="margin:20px 0 15px;padding:10px;background:#ff9b9b">'.$error.'</div>'; + } + + foreach ($form_field_type as $key => $args) { + + $field_id = esc_attr($this->get_field_id($key)); + $field_name = esc_attr($this->get_field_name($key)); + + $field_class = $args['class']; + $field_title = $args['title']; + $field_description = $args['description']; + $field_value = $args['value']; + $field_options = isset($args['value_options']) ? $args['value_options'] : array() ; + $inline_style = $args['inline_style'] ? 'style="'.$args['inline_style'].'"' : '' ; + + $output .= '<p>'; + + switch ($args['type']) { + case 'text': + $output .= '<label for="'.$field_id.'">'.$field_title.': <input '.$inline_style.' class="'.$field_class.'" id="'.$field_id.'" name="'.$field_name.'" type="text" value="'.esc_attr($field_value).'"/></label>'; + break; + case 'checkbox': + $checked = isset($instance[$key]) ? 'checked' : '' ; + $output .= '<label for="'.$field_id.'"><input value="on" '.$inline_style.' class="'.$field_class.'" id="'.$field_id.'" name="'.$field_name.'" type="checkbox" '.$checked.' />'.$field_title.'</label>'; + + break; + case 'select': + $output .= '<label for="'.$field_id.'">'.$field_title.':</label>'; + $output .= '<select id="'.$field_id.'" name="'.$field_name.'" '.$inline_style.' class="'.$field_class.'">'; + if(!empty($field_options)){ + foreach ($field_options as $key_options => $value_options) { + $selected = $key_options == $field_value ? ' selected' : '' ; + $output .= '<option value="'.$key_options.'" '.$selected.'>'.$value_options.'</option>'; + } + } + $output .= '</select>'; + break; + } + $output .= '<br><small>'.$field_description.'</small>'; + + $output .= '</p>'; + } + echo $output; + } + } +?> diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-banners-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-banners-widget.php index 5d5d3a32..85f7671b 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-banners-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-banners-widget.php @@ -4,10 +4,10 @@ class Ad_125_125_Widget extends WP_Widget { function Ad_125_125_Widget() { $widget_ops = array( 'classname' => 'ad_125_125', - 'description' => __('Add 125x125 ads.', CHERRY_PLUGIN_DOMAIN), - ); + 'description' => __( 'Add 125x125 ads.', CHERRY_PLUGIN_DOMAIN ), + ); $control_ops = array( 'id_base' => 'ad_125_125-widget' ); - $this->WP_Widget( 'ad_125_125-widget', __( 'Cherry - 125x125 Ads', CHERRY_PLUGIN_DOMAIN ), $widget_ops, $control_ops ); + parent::__construct( 'ad_125_125-widget', $name = __( 'Cherry - 125x125 Ads', CHERRY_PLUGIN_DOMAIN ), $widget_ops, $control_ops ); } function widget( $args, $instance ) { diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-comment-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-comment-widget.php index 7ff4abf6..5965413a 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-comment-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-comment-widget.php @@ -1,8 +1,8 @@ <?php -class MY_CommentWidget extends WP_Widget_Recent_Comments { +class MY_CommentWidget extends WP_Widget { function MY_CommentWidget() { - parent::WP_Widget( 'my-recent-comments', $name = __( 'Cherry - Recent Comments', CHERRY_PLUGIN_DOMAIN ) ); + parent::__construct( 'my-recent-comments', $name = __( 'Cherry - Recent Comments', CHERRY_PLUGIN_DOMAIN ) ); } function widget( $args, $instance ) { @@ -63,11 +63,10 @@ class MY_CommentWidget extends WP_Widget_Recent_Comments { if ( $comments ) : foreach ( (array) $comments as $comment) : ?> <li class="comments-custom_li"> - <?php if(function_exists('get_avatar') && $display_avatar != 'off') { + <?php if ( function_exists( 'get_avatar' ) && $display_avatar != 'off' ) { echo '<figure class="thumbnail featured-thumbnail">'; - $comment_ID = get_comment_ID(); - echo get_avatar( get_the_author_meta('email', $id = get_comment( $comment_ID )->user_id), $avatar_size ); - /* This avatar is the user's gravatar (http://gravatar.com) based on their administrative email address */ + $comment_ID = get_comment_ID(); + echo get_avatar( get_comment( $comment_ID )->comment_author_email, $avatar_size ); echo '</figure>'; } ?> <?php if($display_post_title != 'off') { diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-flickr-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-flickr-widget.php index bdbd51b2..2f736643 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-flickr-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-flickr-widget.php @@ -3,7 +3,7 @@ class MY_FlickrWidget extends WP_Widget { /* constructor */ function MY_FlickrWidget() { - parent::WP_Widget(false, $name = __('Cherry - Flickr', CHERRY_PLUGIN_DOMAIN)); + parent::__construct( false, $name = __( 'Cherry - Flickr', CHERRY_PLUGIN_DOMAIN ) ); } /** @see WP_Widget::widget */ @@ -11,7 +11,7 @@ class MY_FlickrWidget extends WP_Widget { extract( $args ); $title = apply_filters('widget_title', $instance['title']); $flickr_id = apply_filters('flickr_id', $instance['flickr_id']); - $amount = apply_filters('flickr_image_amount', $instance['image_amount']); + $amount = intval( apply_filters('flickr_image_amount', $instance['image_amount']) ); $linktext = apply_filters('cherry_text_translate', $instance['linktext'], $instance['title'] . ' linktext'); $suf = rand(100000, 999999); @@ -19,20 +19,25 @@ class MY_FlickrWidget extends WP_Widget { if ( $title ) echo $before_title . $title . $after_title; ?> - <ul id="flickr" class="flickr_list unstyled clearfix row-fluid"></ul> - <a href="http://flickr.com/photos/<?php echo $flickr_id ?>" class="link" target="_blank"><?php echo $linktext; ?></a> - <script> - jQuery('#flickr').jflickrfeed({ - limit: <?php echo $amount ?>, - qstrings: { - id: '<?php echo $flickr_id ?>' - }, - itemTemplate: '<li class="flickr_li span4"><a class="thumbnail" rel="prettyPhoto[gallery-<?php echo $suf; ?>]" href="{{image_b}}" title="{{title}}"><div class="wrapper"><img class="flickr_img" src="{{image_s}}" alt="{{title}}" /><span class="zoom-icon"></span></div></a></li>' - }, function(data) { - magnific_popup_init(jQuery("#flickr")); - jQuery(".flickr_li:nth-child(3n-2)").addClass("nomargin"); - }); - </script> + <?php if ($amount) { ?> + <ul id="flickr" class="flickr_list unstyled clearfix row-fluid"></ul> + <a href="http://flickr.com/photos/<?php echo $flickr_id ?>" class="link" target="_blank"><?php echo $linktext; ?></a> + <script> + jQuery('#flickr').jflickrfeed({ + limit: <?php echo $amount ?>, + qstrings: { + id: '<?php echo $flickr_id ?>' + }, + itemTemplate: '<li class="flickr_li span4"><a class="thumbnail" rel="prettyPhoto[gallery-<?php echo $suf; ?>]" href="{{image_b}}" title="{{title}}"><div class="wrapper"><img class="flickr_img" src="{{image_s}}" alt="{{title}}" /><span class="zoom-icon"></span></div></a></li>' + }, function(data) { + magnific_popup_init(jQuery("#flickr")); + jQuery(".flickr_li:nth-child(3n-2)").addClass("nomargin"); + }); + </script> + + <?php } else { ?> + <div style="margin:20px 0 15px;padding:10px;background:#ff9b9b;color:#fff;"><?php echo __('You need enter number of images in widget settings.', CHERRY_PLUGIN_DOMAIN) ?></div> + <?php } ?> <?php wp_reset_query(); echo $after_widget; @@ -46,12 +51,12 @@ class MY_FlickrWidget extends WP_Widget { /** @see WP_Widget::form */ function form($instance) { /* Set up some default widget settings. */ - $defaults = array( 'title' => '', 'flickr_id' => '', 'image_amount' => '', 'linktext' => '' ); + $defaults = array( 'title' => '', 'flickr_id' => '', 'image_amount' => '4', 'linktext' => '' ); $instance = wp_parse_args( (array) $instance, $defaults ); $title = esc_attr($instance['title']); $flickr_id = esc_attr($instance['flickr_id']); - $amount = esc_attr($instance['image_amount']); + $amount = intval($instance['image_amount']); $linktext = esc_attr($instance['linktext']); ?> <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', CHERRY_PLUGIN_DOMAIN); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" /></label></p> diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-post-cycle-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-post-cycle-widget.php index 263ed059..2ab2629d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-post-cycle-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-post-cycle-widget.php @@ -3,7 +3,7 @@ class MY_CycleWidget extends WP_Widget { /* constructor */ function MY_CycleWidget() { - parent::WP_Widget(false, $name = __('Cherry - Post Cycle', CHERRY_PLUGIN_DOMAIN)); + parent::__construct( false, $name = __( 'Cherry - Post Cycle', CHERRY_PLUGIN_DOMAIN ) ); } /* @see WP_Widget::widget */ @@ -63,6 +63,15 @@ class MY_CycleWidget extends WP_Widget { } ?> <script type="text/javascript"> + <?php if($direction_nav) { ?> + function navigationCenter() { + var firstImageHeight = jQuery("#flexslider_<?php echo $random ?> a > img").first().height(); + var navIconHeight = jQuery('#flexslider_<?php echo $random ?> .flex-direction-nav a').innerHeight(); + activeImageCenter = firstImageHeight / 2; + navObject = jQuery('#flexslider_<?php echo $random ?>').find("ul.flex-direction-nav li a"); + navObject.animate({"top":activeImageCenter-navIconHeight/2}, 200); + } + <?php } ?> jQuery(window).load(function() { jQuery('#flexslider_<?php echo $random ?>').flexslider({ animation: "slide", @@ -72,9 +81,26 @@ class MY_CycleWidget extends WP_Widget { controlNav: <?php echo $control_nav; ?>, directionNav: <?php echo $direction_nav; ?>, prevText: '', - nextText: '' + nextText: '', + <?php if($direction_nav) { ?> + /* Centering direction navs relatively on thumbnail height */ + start: function() { + navigationCenter(); + } + <?php } ?> }); + }); + /* Centering direction navs relatively on thumbnail height */ + <?php if($direction_nav) { ?> + jQuery(document).ready(function() { + jQuery(window).resize( + function(){ + navigationCenter(); + } + ).trigger('resize'); + }); + <?php } ?> </script> <div id="flexslider_<?php echo $random ?>" class="flexslider widget-flexslider"> <ul class="slides unstyled"> @@ -373,4 +399,4 @@ class MY_CycleWidget extends WP_Widget { <?php } } // class Cycle Widget -?> \ No newline at end of file +?> diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-posts-type-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-posts-type-widget.php index ac7538ca..e885dbed 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-posts-type-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-posts-type-widget.php @@ -6,7 +6,7 @@ class MY_PostsTypeWidget extends WP_Widget { function MY_PostsTypeWidget() { $widget_ops = array('classname' => 'my_posts_type_widget', 'description' => __('Show custom posts', CHERRY_PLUGIN_DOMAIN)); $control_ops = array('width' => 510, 'height' => 350); - parent::WP_Widget(false, __('Cherry - Advanced Cycle', CHERRY_PLUGIN_DOMAIN), $widget_ops, $control_ops); + parent::__construct( false, $name = __( 'Cherry - Advanced Cycle', CHERRY_PLUGIN_DOMAIN ), $widget_ops, $control_ops ); } /** diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-recent-posts.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-recent-posts.php index 876b36f0..ceef6c18 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-recent-posts.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-recent-posts.php @@ -3,7 +3,7 @@ class MY_PostWidget extends WP_Widget { /** constructor */ function MY_PostWidget() { - parent::WP_Widget(false, $name = __('Cherry - Recent Posts', CHERRY_PLUGIN_DOMAIN)); + parent::__construct( false, $name = __( 'Cherry - Recent Posts', CHERRY_PLUGIN_DOMAIN ) ); } /** @see WP_Widget::widget */ @@ -53,10 +53,10 @@ class MY_PostWidget extends WP_Widget { ); } - $wp_query = new WP_Query( $args ); ?> + $recent_posts = new WP_Query( $args ); ?> <ul class="post-list unstyled"> - <?php if ($wp_query->have_posts()) : while ($wp_query->have_posts()) : $wp_query->the_post();?> + <?php if ($recent_posts->have_posts()) : while ($recent_posts->have_posts()) : $recent_posts->the_post();?> <li class="post-list_li clearfix"> @@ -92,7 +92,7 @@ class MY_PostWidget extends WP_Widget { <?php endif; - $wp_query = null; + wp_reset_postdata(); ?>  diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-social-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-social-widget.php index 411be5c7..509a5c81 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-social-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-social-widget.php @@ -4,7 +4,7 @@ class My_SocialNetworksWidget extends WP_Widget { function My_SocialNetworksWidget() { $widget_ops = array('classname' => 'social_networks_widget', 'description' => __('Link to your social networks.', CHERRY_PLUGIN_DOMAIN) ); - $this->WP_Widget('social_networks', __('Cherry - Social Networks', CHERRY_PLUGIN_DOMAIN), $widget_ops); + parent::__construct( false, $name = __( 'Cherry - Social Networks', CHERRY_PLUGIN_DOMAIN ), $widget_ops ); } function widget( $args, $instance ) { diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-vcard-widget.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-vcard-widget.php index 14e608f2..20c653e2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-vcard-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/my-vcard-widget.php @@ -2,7 +2,7 @@ class MY_Vcard_Widget extends WP_Widget { function MY_Vcard_Widget() { $widget_ops = array('classname' => 'widget_cherry_vcard', 'description' => __('Use this widget to add a vCard', CHERRY_PLUGIN_DOMAIN)); - $this->WP_Widget('widget_cherry_vcard', __('Cherry - vCard', CHERRY_PLUGIN_DOMAIN), $widget_ops); + parent::__construct( 'widget_cherry_vcard', $name = __( 'Cherry - vCard', CHERRY_PLUGIN_DOMAIN ), $widget_ops ); $this->alt_option_name = 'widget_cherry_vcard'; add_action('save_post', array(&$this, 'flush_widget_cache')); diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/register-widgets.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/register-widgets.php index fff9e97c..86357bce 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/register-widgets.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/register-widgets.php @@ -1,3 +1,64 @@ +<<<<<<< .mine +<?php +/** + * Loads up all the widgets defined by this theme. Note that this function will not work for versions of WordPress 2.7 or lower + * + */ +function cherry_load_widgets() { + $widget_files = array( + 'MY_PostWidget' => 'my-recent-posts.php', + 'MY_CommentWidget' => 'my-comment-widget.php', + 'My_SocialNetworksWidget' => 'my-social-widget.php', + 'MY_PostsTypeWidget' => 'my-posts-type-widget.php', + 'MY_FlickrWidget' => 'my-flickr-widget.php', + 'Ad_125_125_Widget' => 'my-banners-widget.php', + 'MY_Vcard_Widget' => 'my-vcard-widget.php', + 'My_Facebook_Widget' => 'my-facebook-widget.php', + 'MY_CycleWidget' => 'my-post-cycle-widget.php', + 'Cherry_Instagram_Widget' => 'cherry-instagram-widget.php', + 'Cherry_Banner_Widget' => 'cherry-banner-widget.php', + 'Cherry_Twitter_Embed_Widget' => 'cherry-twitter-embed-widget.php', + 'Cherry_Pinterest_Embed_Widget' => 'cherry-pinterest-embed-widget.php', + ); + foreach ( $widget_files as $class_name => $file_name ) { + $widget_dir = file_exists( CURRENT_THEME_DIR . '/includes/widgets/' . $file_name ) ? CURRENT_THEME_DIR . '/includes/widgets/' . $file_name : CHERRY_PLUGIN_DIR . 'includes/widgets/' . $file_name ; + include_once ( $widget_dir ); + if ( class_exists( $class_name ) ) { + register_widget( $class_name ); + } + } +} +add_action( 'widgets_init', 'cherry_load_widgets' ); +||||||| .r11156 +<?php +/** + * Loads up all the widgets defined by this theme. Note that this function will not work for versions of WordPress 2.7 or lower + * + */ +function cherry_load_widgets() { + $widget_files = array( + 'MY_PostWidget' => 'my-recent-posts.php', + 'MY_CommentWidget' => 'my-comment-widget.php', + 'My_SocialNetworksWidget' => 'my-social-widget.php', + 'MY_PostsTypeWidget' => 'my-posts-type-widget.php', + 'MY_FlickrWidget' => 'my-flickr-widget.php', + 'Ad_125_125_Widget' => 'my-banners-widget.php', + 'MY_Vcard_Widget' => 'my-vcard-widget.php', + 'My_Facebook_Widget' => 'my-facebook-widget.php', + 'MY_CycleWidget' => 'my-post-cycle-widget.php', + 'Cherry_Instagram_Widget' => 'cherry-instagram-widget.php', + 'Cherry_Banner_Widget' => 'cherry-banner-widget.php', + ); + foreach ( $widget_files as $class_name => $file_name ) { + $widget_dir = file_exists( CURRENT_THEME_DIR . '/includes/widgets/' . $file_name ) ? CURRENT_THEME_DIR . '/includes/widgets/' . $file_name : CHERRY_PLUGIN_DIR . 'includes/widgets/' . $file_name ; + include_once ( $widget_dir ); + if ( class_exists( $class_name ) ) { + register_widget( $class_name ); + } + } +} +add_action( 'widgets_init', 'cherry_load_widgets' ); +======= <?php /** * Loads up all the widgets defined by this theme. Note that this function will not work for versions of WordPress 2.7 or lower @@ -26,4 +87,5 @@ function cherry_load_widgets() { } } add_action( 'widgets_init', 'cherry_load_widgets' ); +>>>>>>> .r12027 ?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/widgets-manager.php b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/widgets-manager.php index eb62e703..ee72c224 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/widgets-manager.php +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/includes/widgets/widgets-manager.php @@ -69,6 +69,23 @@ function clean_rules() { // get all widgets names $all_widgets = array(); +<<<<<<< .mine + $all_widgets_assoc = get_option('sidebars_widgets'); + // iterate throug the sidebar widgets settings to get all active widgets names + foreach($all_widgets_assoc as $sidebar_name => $sidebar) { + // remember about wp_inactive_widgets and array_version fields! + if($sidebar_name != 'wp_inactive_widgets' && is_array($sidebar) && count($sidebar) > 0) { + foreach($sidebar as $widget_name) { + array_push($all_widgets, $widget_name); +||||||| .r11156 + $all_widgets_assoc = get_option('sidebars_widgets'); + // iterate throug the sidebar widgets settings to get all active widgets names + foreach($all_widgets_assoc as $sidebar_name => $sidebar) { + // remember about wp_inactive_widgets and array_version fields! + if($sidebar_name != 'wp_inactive_widgets' && is_array($sidebar) && count($sidebar) > 0) { + foreach($sidebar as $widget_name) { + array_push($all_widgets, $widget_name); +======= $all_widgets_assoc = get_option( 'sidebars_widgets', array() ); if ( !empty( $all_widgets_assoc ) ) : @@ -79,6 +96,7 @@ function clean_rules() { foreach($sidebar as $widget_name) { array_push($all_widgets, $widget_name); } +>>>>>>> .r12027 } } endif; @@ -475,6 +493,7 @@ function cherry_widget_control() { <legend>'.__('Select page to add', CHERRY_PLUGIN_DOMAIN).'</legend> <select class="widefat gk_widget_rules_form_select"> <option value="homepage">'.__('Homepage', CHERRY_PLUGIN_DOMAIN).'</option> + <option value="blog">'.__('Blog', CHERRY_PLUGIN_DOMAIN).'</option> <option value="page:">'.__('Page', CHERRY_PLUGIN_DOMAIN).'</option> <option value="post:">'.__('Post', CHERRY_PLUGIN_DOMAIN).'</option> <option value="category:">'.__('Archive', CHERRY_PLUGIN_DOMAIN).'</option> @@ -606,9 +625,16 @@ function check_widget_visibility($id) { function cherry_condition($mode, $input, $users) { // Example input: // homepage,page:12,post:10,category:test,tag:test + $mode_output = ''; +<<<<<<< .mine +||||||| .r11156 + $mode_output = ''; + +======= $mode_output = ''; +>>>>>>> .r12027 if ( !empty($input) ) : $mode_output = ' ('; if ( $mode == 'all' ) { @@ -629,6 +655,8 @@ function cherry_condition($mode, $input, $users) { if(stripos($input[$i], 'homepage') !== FALSE) { $mode_output .= ' is_front_page() '; + } else if(stripos($input[$i], 'blog') !== FALSE) { + $mode_output .= ' is_home() '; } else if(stripos($input[$i], 'page:') !== FALSE) { $mode_output .= ' is_page(\'' . substr($input[$i], 5) . '\') '; } else if(stripos($input[$i], 'post:') !== FALSE) { diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.mo index 4e4fa132..390c4e66 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.po index 5b47559a..7e81d9ef 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-blank.po @@ -1,3913 +1,1626 @@ msgid "" msgstr "" -"Project-Id-Version: Cherry Framework\n" -"POT-Creation-Date: 2013-10-17 15:01+0200\n" -"PO-Revision-Date: 2014-03-03 15:09+0200\n" +"Project-Id-Version: blank\n" +"POT-Creation-Date: 2015-06-24 13:02+0200\n" +"PO-Revision-Date: 2015-06-24 13:06+0200\n" "Last-Translator: \n" -"Language-Team: Cherry Framework Team\n" +"Language-Team: Cherry Team <demolink@info.org>\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SearchPath-0: ..\n" -"X-Poedit-SearchPath-1: .\n" -#: ../admin/options-sanitize.php:257 ../includes/locals.php:367 -msgid "No Repeat" +#: ../admin/admin.php:30 +msgid "Cherry plugin" msgstr "" -#: ../admin/options-sanitize.php:258 ../includes/locals.php:368 -msgid "Repeat Horizontally" +#: ../admin/admin.php:33 ../admin/admin.php:54 +msgid "Summary" msgstr "" -#: ../admin/options-sanitize.php:259 ../includes/locals.php:369 -msgid "Repeat Vertically" +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/plugin-pages.php:100 +msgid "Maintenance Mode" msgstr "" -#: ../admin/options-sanitize.php:260 ../includes/locals.php:370 -msgid "Repeat All" +#: ../admin/admin.php:39 +msgid "Import Content" msgstr "" -#: ../admin/options-sanitize.php:273 ../includes/locals.php:371 -msgid "Top Left" +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 +msgid "Export Content" msgstr "" -#: ../admin/options-sanitize.php:274 ../includes/locals.php:372 -msgid "Top Center" +#: ../admin/import-export/export-functions.php:18 +msgid "Export content done" msgstr "" -#: ../admin/options-sanitize.php:275 ../includes/locals.php:373 -msgid "Top Right" +#: ../admin/import-export/export.php:28 +msgid "" +"Export allows you to create a backup of your website content in one click. " +"You'll get a downloaded archive containing all website data: images, audio, " +"video and other files from your media library. XML file with your posts and " +"categories data, JSON file with widget settings. You can use downloaded " +"archive to move your website to other hosting server or restore website " +"data. " msgstr "" -#: ../admin/options-sanitize.php:276 ../includes/locals.php:374 -msgid "Middle Left" +#: ../admin/import-export/export.php:29 +msgid "Please note! " msgstr "" -#: ../admin/options-sanitize.php:277 ../includes/locals.php:375 -msgid "Middle Center" +#: ../admin/import-export/export.php:29 +msgid "" +"XML file doesn't contain any user data except name and email of the website " +"administrator." msgstr "" -#: ../admin/options-sanitize.php:278 ../includes/locals.php:376 -msgid "Middle Right" +#: ../admin/import-export/import-check-settings.php:46 +msgid "Your browser is out of date!" msgstr "" -#: ../admin/options-sanitize.php:279 ../includes/locals.php:377 -msgid "Bottom Left" +#: ../admin/import-export/import-check-settings.php:49 +#, php-format +msgid "" +"It looks like you're using an insecure version of <a href='%s'>%s</a>. Using " +"an outdated browser makes your computer unsafe. For the best WordPress " +"experience, please update your browser." msgstr "" -#: ../admin/options-sanitize.php:280 ../includes/locals.php:378 -msgid "Bottom Center" +#: ../admin/import-export/import-check-settings.php:51 +#, php-format +msgid "" +"It looks like you're using an old version of <a href='%s'>%s</a>. For the " +"best WordPress experience, please update your browser." msgstr "" -#: ../admin/options-sanitize.php:281 ../includes/locals.php:379 -msgid "Bottom Right" +#: ../admin/import-export/import-check-settings.php:68 +#, php-format +msgid "" +"<a href=\"%1$s\" class=\"update-browser-link\">Update %2$s</a> or learn how " +"to <a href=\"%3$s\" class=\"browse-happy-link\">browse happy</a>" msgstr "" -#: ../admin/options-sanitize.php:294 ../includes/locals.php:380 -msgid "Scroll Normally" +#: ../admin/import-export/import-check-settings.php:75 +msgid "" +"Some of your server settings do not meet the requirements for installing the " +"sample data. Please, consult with your hosting provider on how to increase " +"the required values." msgstr "" -#: ../admin/options-sanitize.php:295 ../includes/locals.php:381 -msgid "Fixed in Place" +#: ../admin/import-export/import-check-settings.php:78 +msgid "Server Settings" msgstr "" -#: ../admin/options-sanitize.php:346 -msgid "1" +#: ../admin/import-export/import-check-settings.php:79 +msgid "Current" msgstr "" -#: ../admin/options-sanitize.php:347 -msgid "1.2" +#: ../admin/import-export/import-check-settings.php:80 +msgid "Required" msgstr "" -#: ../admin/options-sanitize.php:348 -msgid "1.5" +#: ../admin/import-export/import-check-settings.php:104 +msgid "Continue" msgstr "" -#: ../admin/options-sanitize.php:349 -msgid "2" +#: ../admin/import-export/import.php:34 +msgid "Upload Error" msgstr "" -#: ../admin/options-sanitize.php:391 ../includes/locals.php:877 -msgid "Latin" +#: ../admin/import-export/import.php:35 +msgid "The file is too big!" msgstr "" -#: ../admin/options-sanitize.php:392 ../includes/locals.php:878 -msgid "Latin Extended" +#: ../admin/import-export/import.php:36 +msgid "The file type is error!" msgstr "" -#: ../admin/options-sanitize.php:393 ../includes/locals.php:879 -msgid "Greek" +#: ../admin/import-export/import.php:37 +msgid "Folder cannot be uploaded!" msgstr "" -#: ../admin/options-sanitize.php:394 ../includes/locals.php:880 -msgid "Greek Extended" +#: ../admin/import-export/import.php:38 +msgid "Uploading" msgstr "" -#: ../admin/options-sanitize.php:395 ../includes/locals.php:881 -msgid "Cyrillic" +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 +msgid "Upload" msgstr "" -#: ../admin/options-sanitize.php:396 ../includes/locals.php:882 -msgid "Cyrillic Extended" +#: ../admin/import-export/import.php:40 +msgid "Upload Complete" msgstr "" -#: ../admin/options-sanitize.php:397 ../includes/locals.php:883 -msgid "Vietnamese" +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 +msgid "item" msgstr "" -#: ../admin/options-sanitize.php:414 ../includes/locals.php:9 -#: ../includes/locals.php:884 -msgid "Normal" +#: ../admin/import-export/import.php:42 +msgid "items" msgstr "" -#: ../admin/options-sanitize.php:415 ../includes/locals.php:885 -msgid "Italic" +#: ../admin/import-export/import.php:43 +msgid "" +"Sample data installing. Some steps may take some time depending on your " +"server settings. Please be patient." msgstr "" -#: ../admin/options-sanitize.php:416 ../includes/locals.php:886 -msgid "Bold" +#: ../admin/import-export/import.php:44 +msgid "Upload complete please click Continue Install button to proceed." msgstr "" -#: ../admin/options-sanitize.php:417 ../includes/locals.php:887 -msgid "Bold Italic" +#: ../admin/import-export/import.php:46 +msgid "Importing XML" msgstr "" -#: ../admin/parsers.php:43 ../admin/parsers.php:75 ../admin/parsers.php:83 -#: ../includes/locals.php:890 ../includes/locals.php:892 -msgid "There was an error when reading this WXR file" +#: ../admin/import-export/import.php:47 +msgid "Importing categories" msgstr "" -#: ../admin/parsers.php:44 ../includes/locals.php:891 -msgid "" -"Details are shown above. The importer will now try again with a different " -"parser..." +#: ../admin/import-export/import.php:48 +msgid "Importing tags" msgstr "" -#: ../admin/parsers.php:87 ../admin/parsers.php:92 ../admin/parsers.php:284 -#: ../admin/parsers.php:475 ../includes/locals.php:893 -msgid "" -"This does not appear to be a WXR file, missing/invalid WXR version number" +#: ../admin/import-export/import.php:49 +msgid "Processing dependencies" msgstr "" -#: ../includes/class-tgm-plugin-activation.php:170 -msgid "Return to the dashboard" +#: ../admin/import-export/import.php:50 +msgid "Importing posts. This may take some time. Please wait." msgstr "" -#: ../includes/class-tgm-plugin-activation.php:172 ../includes/locals.php:596 -msgid "The following plugin was activated successfully:" +#: ../admin/import-export/import.php:51 +msgid "Importing menu items. This may take some time. Please wait." msgstr "" -#: ../includes/class-tgm-plugin-activation.php:174 ../includes/locals.php:579 -#: ../includes/locals.php:903 -msgid "Dismiss this notice" +#: ../admin/import-export/import.php:52 +msgid "Importing media library." msgstr "" -#: ../includes/locals.php:6 -msgid "No" +#: ../admin/import-export/import.php:53 +msgid "Importing attachements meta." msgstr "" -#: ../includes/locals.php:7 -msgid "Yes" +#: ../admin/import-export/import.php:54 +msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" -#: ../includes/locals.php:8 -msgid "Slow" +#: ../admin/import-export/import.php:55 +msgid "Generating content hierarchy" msgstr "" -#: ../includes/locals.php:10 -msgid "Fast" +#: ../admin/import-export/import.php:56 +msgid "Updating featured images" msgstr "" -#: ../includes/locals.php:11 -msgid "Normal size" +#: ../admin/import-export/import.php:57 +msgid "Updating attachments" msgstr "" -#: ../includes/locals.php:12 -msgid "Large size" +#: ../admin/import-export/import.php:58 +msgid "Importing JSON" msgstr "" -#: ../includes/locals.php:13 -msgid "Font Size" +#: ../admin/import-export/import.php:59 +msgid "Installing content complete" msgstr "" -#: ../includes/locals.php:14 -msgid "Lineheight" +#: ../admin/import-export/import.php:60 +msgid "Installing content error" msgstr "" -#: ../includes/locals.php:15 -msgid "Font Face" +#: ../admin/import-export/import.php:66 +msgid "Warning!" msgstr "" -#: ../includes/locals.php:16 -msgid "Character Sets" +#: ../admin/import-export/import.php:66 +msgid "" +"Installing sample data will replace your website content. Please make sure " +"to backup your website data before importing content." msgstr "" -#: ../includes/locals.php:17 -msgid "Font Style" +#: ../admin/import-export/import.php:74 +msgid "Please Drop all needed files here <br> to import sample data" msgstr "" -#: ../includes/locals.php:18 -msgid "Color" +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 +msgid "or" msgstr "" -#: ../includes/locals.php:19 -msgid "Import" +#: ../admin/import-export/import.php:77 +msgid "Browse local files" msgstr "" -#: ../includes/locals.php:20 -msgid "Export" +#: ../admin/import-export/import.php:80 +#, php-format +msgid "Maximum upload file size: %d %s." msgstr "" -#: ../includes/locals.php:21 -msgid "Done" +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" msgstr "" -#: ../includes/locals.php:22 -msgid "Error" +#: ../admin/import-export/import.php:83 +msgid "View Demo" msgstr "" -#: ../includes/locals.php:23 -msgid "success" +#: ../admin/import-export/import.php:97 +msgid "File name" msgstr "" -#: ../includes/locals.php:24 -msgid "Upload" +#: ../admin/import-export/import.php:97 +msgid "File size" msgstr "" -#: ../includes/locals.php:25 -msgid "try again" +#: ../admin/import-export/import.php:97 +msgid "Uploaded file:" msgstr "" -#: ../includes/locals.php:26 -msgid "Finish" +#: ../admin/import-export/import.php:107 +msgid "Installing content started." msgstr "" -#: ../includes/locals.php:27 -msgid "Skip this step" +#: ../admin/import-export/import.php:117 +msgid "Install" msgstr "" -#: ../includes/locals.php:28 -msgid "next" +#: ../admin/import-export/import.php:122 +msgid "" +"Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " +"and <b>.XML</b> files to install theme sample data." msgstr "" -#: ../includes/locals.php:29 -msgid "None" +#: ../admin/import-export/import.php:124 +msgid "Add More Files" msgstr "" -#: ../includes/locals.php:30 ../includes/locals.php:742 -msgid "Date" +#: ../admin/import-export/import.php:126 +msgid "Continue Install" msgstr "" -#: ../includes/locals.php:31 -msgid "Title" +#: ../admin/import-export/import.php:126 +msgid "Missing .XML or .JSON file" msgstr "" -#: ../includes/locals.php:32 -msgid "Info" +#: ../admin/import-export/import.php:132 +msgid "Congratulations" msgstr "" -#: ../includes/locals.php:33 -msgid "Random" +#: ../admin/import-export/import.php:133 +msgid "Content has been installed successfully" msgstr "" -#: ../includes/locals.php:34 -msgid "Comment count" +#: ../admin/import-export/import.php:135 +msgid "View your site" msgstr "" -#: ../includes/locals.php:35 -msgid "Enable Lightbox" +#: ../admin/import-export/import.php:136 +msgid "go to Cherry Options" msgstr "" -#: ../includes/locals.php:36 -msgid "Check this to enable the lightbox." +#: ../admin/plugin-components.php:36 +msgid "Documentation" msgstr "" -#: ../includes/locals.php:37 -msgid "Permalink" +#: ../admin/plugin-components.php:37 +msgid "Support" msgstr "" -#: ../includes/locals.php:38 -msgid "Read more" +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" msgstr "" -#: ../includes/locals.php:39 -msgid "View all" +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" msgstr "" -#: ../includes/locals.php:40 -msgid "Width" +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" msgstr "" -#: ../includes/locals.php:41 -msgid "Height" +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." msgstr "" -#: ../includes/locals.php:42 -msgid "Excerpt length (words):" +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" msgstr "" -#: ../includes/locals.php:43 -msgid "Link Text:" +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" msgstr "" -#: ../includes/locals.php:44 -msgid "Link URL" +#: ../admin/plugin-maintenance-mode.php:79 +msgid "Description" msgstr "" -#: ../includes/locals.php:45 -msgid "Standard" +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" msgstr "" -#: ../includes/locals.php:46 -msgid "Aside" +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." msgstr "" -#: ../includes/locals.php:47 -msgid "Quote" +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." msgstr "" -#: ../includes/locals.php:48 -msgid "Link" +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" msgstr "" -#: ../includes/locals.php:49 -msgid "Image" +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" msgstr "" -#: ../includes/locals.php:50 -msgid "Gallery" +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" msgstr "" -#: ../includes/locals.php:51 -msgid "Audio" +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" msgstr "" -#: ../includes/locals.php:52 -msgid "Video" +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" msgstr "" -#: ../includes/locals.php:53 -msgid "Categories" +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" msgstr "" -#: ../includes/locals.php:54 -msgid "Tags" +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" msgstr "" -#: ../includes/locals.php:55 -msgid "Show All" +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " msgstr "" -#: ../includes/locals.php:56 -msgid "search" +#: ../admin/plugin-pages.php:19 +msgid "Import" msgstr "" -#: ../includes/locals.php:57 -msgid "Go" +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." msgstr "" -#: ../includes/locals.php:58 -msgid "« Previous post." +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" msgstr "" -#: ../includes/locals.php:59 -msgid "Next Post »" +#: ../admin/plugin-pages.php:30 +msgid "Export" msgstr "" -#: ../includes/locals.php:60 -msgid "URL" +#: ../admin/plugin-pages.php:31 +msgid "" +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." msgstr "" -#: ../includes/locals.php:61 -msgid "URL #1" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" msgstr "" -#: ../includes/locals.php:62 -msgid "URL #2" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." msgstr "" -#: ../includes/locals.php:63 -msgid "Uncategorized" +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" msgstr "" -#: ../includes/locals.php:64 -msgid "Last" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." msgstr "" -#: ../includes/locals.php:65 -msgid "First" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" msgstr "" -#: ../includes/locals.php:66 -msgid "Delete" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" msgstr "" -#: ../includes/locals.php:69 -msgid "Previous" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" msgstr "" -#: ../includes/locals.php:70 -msgid "Next" +#: ../admin/shortcodes/dialog.php:20 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 +msgid "Cancel" msgstr "" -#: ../includes/locals.php:71 -msgid "Play" +#: ../admin/shortcodes/dialog.php:21 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 +msgid "Insert" msgstr "" -#: ../includes/locals.php:72 -msgid "Pause" +#: ../admin/shortcodes/dialog.php:25 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 +msgid "Shortcode Options" msgstr "" -#: ../includes/locals.php:73 -msgid "Stop" +#: ../includes/plugin-assets.php:38 +msgid "Under Construction Page Widgets Area." msgstr "" -#: ../includes/locals.php:74 -msgid "Mute" +#: ../includes/plugin-assets.php:40 +msgid "Under construction page widgets area." msgstr "" -#: ../includes/locals.php:75 -msgid "Unmute" +#: ../includes/plugin-assets.php:58 +msgid "Maintenance mode activated. Website is blocked from public" msgstr "" -#: ../includes/locals.php:76 -msgid "" -"<span>Update Required. </span>To play the media you will need to either " -"update your browser to a recent version or update your <a href='http://get." -"adobe.com/flashplayer/' target='_blank'>Flash plugin</a>." +#: ../includes/plugin-assets.php:58 +msgid "Settings." msgstr "" -#: ../includes/locals.php:79 -msgid "Cherry Options" +#: ../includes/plugin-under-construction-content.php:31 +msgid "Website is currently down for maintenance." msgstr "" -#: ../includes/locals.php:80 -msgid "Customize" +#: ../includes/plugin-under-construction-content.php:77 +msgid "Days" msgstr "" -#: ../includes/locals.php:81 -msgid "Support" +#: ../includes/plugin-under-construction-content.php:81 +msgid "Hours" msgstr "" -#: ../includes/locals.php:82 -msgid "Documentation" +#: ../includes/plugin-under-construction-content.php:85 +msgid "Minutes" msgstr "" -#: ../includes/locals.php:83 -msgid "Save Options" +#: ../includes/plugin-under-construction-content.php:89 +msgid "Seconds" msgstr "" -#: ../includes/locals.php:84 -msgid "Restore Defaults" +#: ../includes/shortcodes/carousel-owl.php:168 +#: ../includes/shortcodes/posts-list.php:154 +msgid "by " msgstr "" -#: ../includes/locals.php:85 -msgid "Click OK to reset. Any theme settings will be lost!" +#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel.php:167 +#: ../includes/shortcodes/post-cycle.php:150 +#: ../includes/shortcodes/posts-list.php:163 +#: ../includes/shortcodes/posts-list.php:164 +#: ../includes/widgets/my-post-cycle-widget.php:153 +msgid "Comments" msgstr "" -#: ../includes/locals.php:88 -msgid "General" +#: ../includes/shortcodes/carousel-owl.php:176 +#: ../includes/shortcodes/carousel.php:169 +#: ../includes/widgets/my-post-cycle-widget.php:155 +msgid "Comment" msgstr "" -#: ../includes/locals.php:89 -msgid "Body styling" +#: ../includes/shortcodes/carousel.php:160 +#: ../includes/widgets/my-post-cycle-widget.php:144 +msgid "by" msgstr "" -#: ../includes/locals.php:90 -msgid "Change the background style" +#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 +#: ../includes/shortcodes/post-cycle.php:17 +#: ../includes/shortcodes/posts-grid.php:24 +#: ../includes/shortcodes/posts-list.php:19 +#: ../includes/shortcodes/service-box.php:16 +#: ../includes/widgets/my-posts-type-widget.php:165 +#: ../includes/widgets/my-recent-posts.php:87 +msgid "Read more" msgstr "" -#: ../includes/locals.php:91 -msgid "Background Image" +#: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 +#: ../includes/shortcodes/media.php:251 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 +msgid "Play" msgstr "" -#: ../includes/locals.php:92 -msgid "Background Color" +#: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 +msgid "Pause" msgstr "" -#: ../includes/locals.php:93 -msgid "Header background color" +#: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 +msgid "Stop" msgstr "" -#: ../includes/locals.php:94 -msgid "Change the header background color" +#: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 +msgid "Mute" msgstr "" -#: ../includes/locals.php:95 -msgid "Link color" +#: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 +msgid "Unmute" msgstr "" -#: ../includes/locals.php:96 -msgid "Change the color of link" +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 +msgid "Update Required." msgstr "" -#: ../includes/locals.php:97 -msgid "Link color hover" +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 +msgid "" +"To play the media you will need to either update your browser to a recent " +"version or update your " msgstr "" -#: ../includes/locals.php:98 -msgid "Change the color of link hover state" +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 +msgid "Flash plugin" msgstr "" -#: ../includes/locals.php:99 -msgid "Body Text" +#: ../includes/shortcodes/post-cycle.php:210 +msgid "Client" msgstr "" -#: ../includes/locals.php:100 -msgid "" -"Choose your prefered font for body text. <em>Note: fonts marked with " -"<strong>*</strong> symbol will be loaded from the <a href='http://www.google." -"com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/shortcodes/post-cycle.php:211 +#: ../includes/widgets/my-comment-widget.php:97 +#: ../includes/widgets/my-recent-posts.php:147 +msgid "Date" msgstr "" -#: ../includes/locals.php:101 -msgid "H1 Heading" +#: ../includes/shortcodes/post-cycle.php:212 +msgid "Info" msgstr "" -#: ../includes/locals.php:102 -msgid "" -"Choose your prefered font for H1 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/shortcodes/post-cycle.php:213 +msgid "Launch Project" msgstr "" -#: ../includes/locals.php:103 -msgid "H2 Heading" +#: ../includes/shortcodes/posts-list.php:130 +#: ../includes/shortcodes/posts-list.php:139 +msgid "Posted in" msgstr "" -#: ../includes/locals.php:104 -msgid "" -"Choose your prefered font for H2 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/shortcodes/posts-list.php:283 +msgid "Tags" msgstr "" -#: ../includes/locals.php:105 -msgid "H3 Heading" +#: ../includes/shortcodes/shortcodes.php:226 +msgid "Previous" msgstr "" -#: ../includes/locals.php:106 -msgid "" -"Choose your prefered font for H3 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/shortcodes/shortcodes.php:229 +msgid "Next" msgstr "" -#: ../includes/locals.php:107 -msgid "H4 Heading" +#: ../includes/widgets/cherry-banner-widget.php:5 +msgid "Cherry - Banner" msgstr "" -#: ../includes/locals.php:108 -msgid "" -"Choose your prefered font for H4 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/widgets/cherry-banner-widget.php:46 +#: ../includes/widgets/my-comment-widget.php:146 +#: ../includes/widgets/my-facebook-widget.php:79 +#: ../includes/widgets/my-flickr-widget.php:62 +#: ../includes/widgets/my-posts-type-widget.php:225 +#: ../includes/widgets/my-recent-posts.php:126 +#: ../includes/widgets/my-recent-posts.php:148 +#: ../includes/widgets/my-social-widget.php:108 +#: ../includes/widgets/my-vcard-widget.php:155 +msgid "Title" msgstr "" -#: ../includes/locals.php:109 -msgid "H5 Heading" +#: ../includes/widgets/cherry-banner-widget.php:47 +msgid "Banner description" msgstr "" -#: ../includes/locals.php:110 -msgid "" -"Choose your prefered font for H5 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/widgets/cherry-banner-widget.php:48 +#: ../includes/widgets/cherry-instagram-widget.php:165 +msgid "Image URL" msgstr "" -#: ../includes/locals.php:111 -msgid "H6 Heading" +#: ../includes/widgets/cherry-banner-widget.php:49 +msgid "Fill image" msgstr "" -#: ../includes/locals.php:112 -msgid "" -"Choose your prefered font for H6 heading and titles. <em>Note: fonts marked " -"with <strong>*</strong> symbol will be loaded from the <a href='http://www." -"google.com/webfonts'>Google Web Fonts</a> library.</em>" +#: ../includes/widgets/cherry-banner-widget.php:50 +#: ../includes/widgets/my-posts-type-widget.php:398 +#: ../includes/widgets/my-recent-posts.php:160 +msgid "Link URL" msgstr "" -#: ../includes/locals.php:113 -msgid "Display search box?" +#: ../includes/widgets/cherry-banner-widget.php:89 +msgid "Select Image" msgstr "" -#: ../includes/locals.php:114 -msgid "Display search box in the header?" +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Cherry - Instagram" msgstr "" -#: ../includes/locals.php:115 -msgid "Display breadcrumbs?" +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Widget for popular social network Instagram" msgstr "" -#: ../includes/locals.php:116 -msgid "Display breadcrumbs in the page?" +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." msgstr "" -#: ../includes/locals.php:117 -msgid "Custom CSS" +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." msgstr "" -#: ../includes/locals.php:118 -msgid "" -"Want to add any custom CSS code? Put in here, and the rest is taken care of. " -"This overrides any other stylesheets. eg: a.button{color:green}" +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." msgstr "" -#: ../includes/locals.php:121 -msgid "Logo" +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." msgstr "" -#: ../includes/locals.php:122 -msgid "Logo & Favicon" +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." msgstr "" -#: ../includes/locals.php:123 -msgid "What kind of logo?" +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 +msgid "Widget Title" msgstr "" -#: ../includes/locals.php:124 -msgid "" -"Select whether you want your main logo to be an image or text. If you select " -"\"image\" you can put in the image url in the next option, and if you select " -"\"text\" your Site Title will be shown instead." +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" msgstr "" -#: ../includes/locals.php:125 -msgid "Image Logo" +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" msgstr "" -#: ../includes/locals.php:126 -msgid "Text Logo" +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" msgstr "" -#: ../includes/locals.php:127 -msgid "Logo Typography" +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "User Name" msgstr "" -#: ../includes/locals.php:128 ../includes/locals.php:137 +#: ../includes/widgets/cherry-instagram-widget.php:138 msgid "" -"Choose your prefered font for menu. <em>Note: fonts marked with <strong>*</" -"strong> symbol will be loaded from the <a href='http://www.google.com/" -"webfonts'>Google Web Fonts</a> library.</em>" +"Widget will work only for users who have full rights opened in Instagram " +"account." msgstr "" -#: ../includes/locals.php:129 -msgid "Logo Image Path" +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" msgstr "" -#: ../includes/locals.php:130 -msgid "" -"Click Upload or Enter the direct path to your <strong>logo image</strong>. " -"For example <em>http://your_website_url_here/wp-content/themes/themeXXXX/" -"images/logo.png</em>" +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." msgstr "" -#: ../includes/locals.php:131 -msgid "Favicon" +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" msgstr "" -#: ../includes/locals.php:132 +#: ../includes/widgets/cherry-instagram-widget.php:144 msgid "" -"Click Upload or Enter the direct path to your <strong>favicon</strong>. For " -"example <em>http://your_website_url_here/wp-content/themes/themeXXXX/favicon." -"ico</em>" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." msgstr "" -#: ../includes/locals.php:135 -msgid "Navigation" +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Number of displayed images" msgstr "" -#: ../includes/locals.php:136 -msgid "Menu Typography" +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Max value: 20 images." msgstr "" -#: ../includes/locals.php:138 -msgid "Delay" +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Image dimentions" msgstr "" -#: ../includes/locals.php:139 -msgid "Miliseconds delay on mouseout." +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Large" msgstr "" -#: ../includes/locals.php:140 -msgid "Fade-in animation" -msgstr "" - -#: ../includes/locals.php:141 -msgid "Fade-in animation." +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Thumbnail" msgstr "" -#: ../includes/locals.php:142 ../includes/locals.php:143 -msgid "Slide-down animation." +#: ../includes/widgets/cherry-instagram-widget.php:153 +msgid "Show image description" msgstr "" -#: ../includes/locals.php:144 -msgid "Enable fade-in animation" +#: ../includes/widgets/cherry-instagram-widget.php:156 +msgid "Show comments number" msgstr "" -#: ../includes/locals.php:145 -msgid "Disable fade-in animation" +#: ../includes/widgets/cherry-instagram-widget.php:159 +msgid "Show likes number" msgstr "" -#: ../includes/locals.php:146 -msgid "Enable slide-down animation" +#: ../includes/widgets/cherry-instagram-widget.php:162 +msgid "Show image publication date" msgstr "" -#: ../includes/locals.php:147 -msgid "Disable slide-down animation" +#: ../includes/widgets/cherry-instagram-widget.php:168 +msgid "User account button text" msgstr "" -#: ../includes/locals.php:148 -msgid "Speed" +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" msgstr "" -#: ../includes/locals.php:149 -msgid "Animation speed." +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" msgstr "" -#: ../includes/locals.php:150 -msgid "Arrows markup." +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." msgstr "" -#: ../includes/locals.php:151 -msgid "Do you want to generate arrow mark-up?" +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" msgstr "" -#: ../includes/locals.php:152 -msgid "Mobile menu label." +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" msgstr "" -#: ../includes/locals.php:153 -msgid "This text is visible in mobile select menu." +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." msgstr "" -#: ../includes/locals.php:154 -msgid "Navigate to..." +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" msgstr "" -#: ../includes/locals.php:157 -msgid "Slider Settings" +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" msgstr "" -#: ../includes/locals.php:158 -msgid "Slider" +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" msgstr "" -#: ../includes/locals.php:159 -msgid "The type of slider" +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" msgstr "" -#: ../includes/locals.php:160 -msgid "You can choose the type of slider that suits you best." +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." msgstr "" -#: ../includes/locals.php:161 -msgid "Disable slider" +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." msgstr "" -#: ../includes/locals.php:162 ../includes/locals.php:208 -#: ../includes/locals.php:477 -msgid "Slideshow" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" msgstr "" -#: ../includes/locals.php:163 ../includes/locals.php:463 -msgid "Slides" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" msgstr "" -#: ../includes/locals.php:164 -msgid "Sliding effect" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" msgstr "" -#: ../includes/locals.php:165 -msgid "Select your animation type." +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" msgstr "" -#: ../includes/locals.php:166 -msgid "random" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." msgstr "" -#: ../includes/locals.php:167 -msgid "simpleFade" +#: ../includes/widgets/my-banners-widget.php:7 +msgid "Add 125x125 ads." msgstr "" -#: ../includes/locals.php:168 -msgid "curtainTopLeft" +#: ../includes/widgets/my-banners-widget.php:10 +msgid "Cherry - 125x125 Ads" msgstr "" -#: ../includes/locals.php:169 -msgid "curtainTopRight" +#: ../includes/widgets/my-banners-widget.php:65 +msgid "Ad 1" msgstr "" -#: ../includes/locals.php:170 -msgid "curtainBottomLeft" +#: ../includes/widgets/my-banners-widget.php:67 +#: ../includes/widgets/my-banners-widget.php:76 +#: ../includes/widgets/my-banners-widget.php:85 +#: ../includes/widgets/my-banners-widget.php:94 +msgid "Image Ad Link:" msgstr "" -#: ../includes/locals.php:171 -msgid "curtainBottomRight" +#: ../includes/widgets/my-banners-widget.php:71 +#: ../includes/widgets/my-banners-widget.php:80 +#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:98 +msgid "Ad Link:" msgstr "" -#: ../includes/locals.php:172 -msgid "curtainSliceLeft" +#: ../includes/widgets/my-banners-widget.php:74 +msgid "Ad 2" msgstr "" -#: ../includes/locals.php:173 -msgid "curtainSliceRight" +#: ../includes/widgets/my-banners-widget.php:83 +msgid "Ad 3" msgstr "" -#: ../includes/locals.php:174 -msgid "blindCurtainTopLeft" +#: ../includes/widgets/my-banners-widget.php:92 +msgid "Ad 4" msgstr "" -#: ../includes/locals.php:175 -msgid "blindCurtainTopRight" +#: ../includes/widgets/my-comment-widget.php:5 +msgid "Cherry - Recent Comments" msgstr "" -#: ../includes/locals.php:176 -msgid "blindCurtainBottomLeft" +#: ../includes/widgets/my-comment-widget.php:13 +#: ../includes/widgets/my-comment-widget.php:133 +msgid "My Recent Comments" msgstr "" -#: ../includes/locals.php:177 -msgid "blindCurtainBottomRight" +#: ../includes/widgets/my-comment-widget.php:78 +msgid "Comment in" msgstr "" -#: ../includes/locals.php:178 -msgid "blindCurtainSliceBottom" +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 +msgid "Author" msgstr "" -#: ../includes/locals.php:179 -msgid "blindCurtainSliceTop" +#: ../includes/widgets/my-comment-widget.php:105 +msgid "Go to this comment" msgstr "" -#: ../includes/locals.php:180 -msgid "stampede" +#: ../includes/widgets/my-comment-widget.php:147 +msgid "Number of comments to show" msgstr "" -#: ../includes/locals.php:181 -msgid "mosaic" +#: ../includes/widgets/my-comment-widget.php:148 +msgid "Display avatar" msgstr "" -#: ../includes/locals.php:182 -msgid "mosaicReverse" +#: ../includes/widgets/my-comment-widget.php:149 +msgid "Avatar size (px)" msgstr "" -#: ../includes/locals.php:183 -msgid "mosaicRandom" +#: ../includes/widgets/my-comment-widget.php:158 +msgid "Display the comment author" msgstr "" -#: ../includes/locals.php:184 -msgid "mosaicSpiral" +#: ../includes/widgets/my-comment-widget.php:159 +msgid "Display the comment date" msgstr "" -#: ../includes/locals.php:185 -msgid "mosaicSpiralReverse" +#: ../includes/widgets/my-comment-widget.php:160 +msgid "Display post title" msgstr "" -#: ../includes/locals.php:186 -msgid "topLeftBottomRight" +#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:195 +msgid "Meta format" msgstr "" -#: ../includes/locals.php:187 -msgid "bottomRightTopLeft" +#: ../includes/widgets/my-comment-widget.php:163 +#: ../includes/widgets/my-vcard-widget.php:197 +#: ../includes/widgets/widgets-manager.php:507 +msgid "None" msgstr "" -#: ../includes/locals.php:188 -msgid "bottomLeftTopRight" +#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-social-widget.php:185 +#: ../includes/widgets/my-vcard-widget.php:198 +msgid "Icons" msgstr "" -#: ../includes/locals.php:189 ../includes/locals.php:190 -msgid "Number of columns" +#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-vcard-widget.php:199 +msgid "Labels" msgstr "" -#: ../includes/locals.php:191 ../includes/locals.php:192 -msgid "Number of rows" +#: ../includes/widgets/my-facebook-widget.php:4 +msgid "Cherry - Facebook Like Box Widget" msgstr "" -#: ../includes/locals.php:193 -msgid "Banner effect" +#: ../includes/widgets/my-facebook-widget.php:9 +msgid "My Facebook Page" msgstr "" -#: ../includes/locals.php:194 -msgid "moveFromLeft" +#: ../includes/widgets/my-facebook-widget.php:84 +msgid "Facebook page url" msgstr "" -#: ../includes/locals.php:195 -msgid "moveFromRight" +#: ../includes/widgets/my-facebook-widget.php:86 +msgid "The Like Box only works with " msgstr "" -#: ../includes/locals.php:196 -msgid "moveFromTop" +#: ../includes/widgets/my-facebook-widget.php:86 +msgid "Facebook Pages." msgstr "" -#: ../includes/locals.php:197 -msgid "moveFromBottom" +#: ../includes/widgets/my-facebook-widget.php:90 +#: ../includes/widgets/my-posts-type-widget.php:367 +msgid "Width" msgstr "" -#: ../includes/locals.php:198 -msgid "fadeIn" +#: ../includes/widgets/my-facebook-widget.php:95 +#: ../includes/widgets/my-posts-type-widget.php:372 +msgid "Height" msgstr "" -#: ../includes/locals.php:199 -msgid "fadeFromLeft" +#: ../includes/widgets/my-facebook-widget.php:109 +msgid "Display header" msgstr "" -#: ../includes/locals.php:200 -msgid "fadeFromRight" +#: ../includes/widgets/my-facebook-widget.php:113 +msgid "Display faces" msgstr "" -#: ../includes/locals.php:201 -msgid "fadeFromTop" +#: ../includes/widgets/my-facebook-widget.php:117 +msgid "Display stream" msgstr "" -#: ../includes/locals.php:202 -msgid "fadeFromBottom" +#: ../includes/widgets/my-facebook-widget.php:121 +msgid "Display border" msgstr "" -#: ../includes/locals.php:203 -msgid "Select your banner animation type." +#: ../includes/widgets/my-flickr-widget.php:6 +msgid "Cherry - Flickr" msgstr "" -#: ../includes/locals.php:204 -msgid "Pause time" +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." msgstr "" -#: ../includes/locals.php:205 -msgid "Pause time (ms)." +#: ../includes/widgets/my-flickr-widget.php:64 +msgid "Flickr ID" msgstr "" -#: ../includes/locals.php:206 -msgid "Animation speed" +#: ../includes/widgets/my-flickr-widget.php:65 +msgid "Images count" msgstr "" -#: ../includes/locals.php:207 -msgid "Animation speed (ms)" +#: ../includes/widgets/my-flickr-widget.php:66 +#: ../includes/widgets/my-posts-type-widget.php:345 +#: ../includes/widgets/my-posts-type-widget.php:392 +#: ../includes/widgets/my-recent-posts.php:158 +msgid "Link Text" msgstr "" -#: ../includes/locals.php:209 -msgid "Animate slider automatically?" +#: ../includes/widgets/my-post-cycle-widget.php:6 +msgid "Cherry - Post Cycle" msgstr "" -#: ../includes/locals.php:210 -msgid "Thumbnails" +#: ../includes/widgets/my-post-cycle-widget.php:221 +msgid "Title:" msgstr "" -#: ../includes/locals.php:211 -msgid "Display thumbnails?" +#: ../includes/widgets/my-post-cycle-widget.php:223 +msgid "Select post type:" msgstr "" -#: ../includes/locals.php:212 -msgid "Pagination" +#: ../includes/widgets/my-post-cycle-widget.php:253 +msgid "Categories (names separated by \",\"):" msgstr "" -#: ../includes/locals.php:213 -msgid "Display pagination?" +#: ../includes/widgets/my-post-cycle-widget.php:255 +msgid "Posts count:" msgstr "" -#: ../includes/locals.php:214 -msgid "Next & Prev navigation" +#: ../includes/widgets/my-post-cycle-widget.php:257 +msgid "Thumbnail Width (in pixels):" msgstr "" -#: ../includes/locals.php:215 -msgid "Display next & prev navigation?" +#: ../includes/widgets/my-post-cycle-widget.php:259 +msgid "Thumbnail Height (in pixels):" msgstr "" -#: ../includes/locals.php:216 -msgid "Display next & prev navigation only on hover?" +#: ../includes/widgets/my-post-cycle-widget.php:261 +msgid "Show titles:" msgstr "" -#: ../includes/locals.php:217 -msgid "" -"If true the navigation button (prev, next and play/stop buttons) will be " -"visible on hover state only, if false they will be visible always" +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 +msgid "yes" msgstr "" -#: ../includes/locals.php:218 -msgid "Play/Pause button" +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 +msgid "no" msgstr "" -#: ../includes/locals.php:219 -msgid "Display Play/Pause button?" +#: ../includes/widgets/my-post-cycle-widget.php:280 +msgid "Show date:" msgstr "" -#: ../includes/locals.php:220 -msgid "Loader" +#: ../includes/widgets/my-post-cycle-widget.php:299 +msgid "Show author:" msgstr "" -#: ../includes/locals.php:221 -msgid "Slider loader" +#: ../includes/widgets/my-post-cycle-widget.php:318 +msgid "Show comments:" msgstr "" -#: ../includes/locals.php:222 -msgid "Pie" +#: ../includes/widgets/my-post-cycle-widget.php:337 +msgid "Show excerpt:" msgstr "" -#: ../includes/locals.php:223 -msgid "Bar" +#: ../includes/widgets/my-post-cycle-widget.php:356 +msgid "Excerpt word count:" msgstr "" -#: ../includes/locals.php:226 -msgid "Slides to display" +#: ../includes/widgets/my-post-cycle-widget.php:358 +msgid "More Button Text:" msgstr "" -#: ../includes/locals.php:227 -msgid "" -"Select the slides that you want to be displayed on slider. If no slide is " -"selected, all slides will be displayed." +#: ../includes/widgets/my-post-cycle-widget.php:360 +msgid "Slideshow cycling speed (in sec.):" msgstr "" -#: ../includes/locals.php:228 -msgid "Pause on mouseover" +#: ../includes/widgets/my-post-cycle-widget.php:362 +msgid "Arrows:" msgstr "" -#: ../includes/locals.php:229 -msgid "The auto play will pause when you mouse over the slider." +#: ../includes/widgets/my-post-cycle-widget.php:381 +msgid "Pagination:" msgstr "" -#: ../includes/locals.php:230 -msgid "Animation slowdown" +#: ../includes/widgets/my-posts-type-widget.php:7 +msgid "Show custom posts" msgstr "" -#: ../includes/locals.php:231 -msgid "" -"You can choose different types of animation slowdown for transition of " -"slides." +#: ../includes/widgets/my-posts-type-widget.php:9 +msgid "Cherry - Advanced Cycle" msgstr "" -#: ../includes/locals.php:232 -msgid "Mouse events for transition of slides" +#: ../includes/widgets/my-posts-type-widget.php:172 +msgid "View all" msgstr "" -#: ../includes/locals.php:233 -msgid "" -"You can choose different types of mouse events for transition of slides." +#: ../includes/widgets/my-posts-type-widget.php:232 +msgid "Posts type" msgstr "" -#: ../includes/locals.php:234 -msgid "Click" +#: ../includes/widgets/my-posts-type-widget.php:249 +msgid "Number of posts to show" msgstr "" -#: ../includes/locals.php:235 -msgid "Mouseover" +#: ../includes/widgets/my-posts-type-widget.php:256 +msgid "Sort by" msgstr "" -#: ../includes/locals.php:236 -msgid "Double click" +#: ../includes/widgets/my-posts-type-widget.php:270 +msgid "Reverse sort order (ascending)" msgstr "" -#: ../includes/locals.php:237 -msgid "Active slide" +#: ../includes/widgets/my-posts-type-widget.php:276 +msgid "Show number of comments" msgstr "" -#: ../includes/locals.php:238 -msgid "" -"Set the number of slide that will be active by default. If the value is 0, " -"all slides will be of the same width when page loads." +#: ../includes/widgets/my-posts-type-widget.php:283 +msgid "Show meta" msgstr "" -#: ../includes/locals.php:239 -msgid "linear" +#: ../includes/widgets/my-posts-type-widget.php:289 +msgid "Container class" msgstr "" -#: ../includes/locals.php:240 -msgid "easeInSine" +#: ../includes/widgets/my-posts-type-widget.php:290 +msgid "default: \"featured_custom_posts\"" msgstr "" -#: ../includes/locals.php:241 -msgid "easeOutSine" +#: ../includes/widgets/my-posts-type-widget.php:295 +msgid "Post title" msgstr "" -#: ../includes/locals.php:242 -msgid "easeInOutSine" +#: ../includes/widgets/my-posts-type-widget.php:299 +msgid "Show post title" msgstr "" -#: ../includes/locals.php:243 -msgid "easeInQuad" +#: ../includes/widgets/my-posts-type-widget.php:305 +msgid "Date as title " msgstr "" -#: ../includes/locals.php:244 -msgid "easeOutQuad" +#: ../includes/widgets/my-posts-type-widget.php:312 +msgid "Excerpt" msgstr "" -#: ../includes/locals.php:245 -msgid "easeInOutQuad" +#: ../includes/widgets/my-posts-type-widget.php:316 +msgid "Show post excerpt" msgstr "" -#: ../includes/locals.php:246 -msgid "easeInCubic" +#: ../includes/widgets/my-posts-type-widget.php:321 +#: ../includes/widgets/my-recent-posts.php:156 +msgid "Excerpt length (words)" msgstr "" -#: ../includes/locals.php:247 -msgid "easeOutCubic" +#: ../includes/widgets/my-posts-type-widget.php:328 +msgid "Excerpt as link" msgstr "" -#: ../includes/locals.php:248 -msgid "easeInOutCubic" +#: ../includes/widgets/my-posts-type-widget.php:335 +msgid "More link" msgstr "" -#: ../includes/locals.php:249 -msgid "easeInQuart" +#: ../includes/widgets/my-posts-type-widget.php:339 +msgid "Show \"More link" msgstr "" -#: ../includes/locals.php:250 -msgid "easeOutQuart" +#: ../includes/widgets/my-posts-type-widget.php:346 +msgid "default: \"Read more\"" msgstr "" -#: ../includes/locals.php:251 -msgid "easeInOutQuart" +#: ../includes/widgets/my-posts-type-widget.php:351 +msgid "Link class" msgstr "" -#: ../includes/locals.php:252 -msgid "easeInQuint" +#: ../includes/widgets/my-posts-type-widget.php:352 +msgid "default: \"link\"" msgstr "" -#: ../includes/locals.php:253 -msgid "easeOutQuint" +#: ../includes/widgets/my-posts-type-widget.php:357 +msgid "Thumbnail dimensions" msgstr "" -#: ../includes/locals.php:254 -msgid "easeInOutQuint" +#: ../includes/widgets/my-posts-type-widget.php:362 +msgid "Show post thumbnail" msgstr "" -#: ../includes/locals.php:255 -msgid "easeInExpo" +#: ../includes/widgets/my-posts-type-widget.php:378 +msgid "Thumbnail as link" msgstr "" -#: ../includes/locals.php:256 -msgid "easeOutExpo" +#: ../includes/widgets/my-posts-type-widget.php:383 +msgid "Link to all posts" msgstr "" -#: ../includes/locals.php:257 -msgid "easeInOutExpo" +#: ../includes/widgets/my-posts-type-widget.php:387 +msgid "Show global link to all posts" msgstr "" -#: ../includes/locals.php:258 -msgid "easeInCirc" +#: ../includes/widgets/my-posts-type-widget.php:393 +msgid "default: \"View all\"" msgstr "" -#: ../includes/locals.php:259 -msgid "easeOutCirc" +#: ../includes/widgets/my-recent-posts.php:6 +msgid "Cherry - Recent Posts" msgstr "" -#: ../includes/locals.php:260 -msgid "easeInOutCirc" +#: ../includes/widgets/my-recent-posts.php:76 +msgid "Permanent Link to" msgstr "" -#: ../includes/locals.php:261 -msgid "easeInBack" +#: ../includes/widgets/my-recent-posts.php:128 +msgid "Category Slug" msgstr "" -#: ../includes/locals.php:262 -msgid "easeOutBack" +#: ../includes/widgets/my-recent-posts.php:130 +msgid "Post format" msgstr "" -#: ../includes/locals.php:263 -msgid "easeInOutBack" +#: ../includes/widgets/my-recent-posts.php:133 +msgid "Standard" msgstr "" -#: ../includes/locals.php:264 -msgid "easeInElastic" +#: ../includes/widgets/my-recent-posts.php:134 +msgid "Aside" msgstr "" -#: ../includes/locals.php:265 -msgid "easeOutElastic" +#: ../includes/widgets/my-recent-posts.php:135 +msgid "Quote" msgstr "" -#: ../includes/locals.php:266 -msgid "easeInOutElastic" +#: ../includes/widgets/my-recent-posts.php:136 +msgid "Link" msgstr "" -#: ../includes/locals.php:267 -msgid "easeInBounce" +#: ../includes/widgets/my-recent-posts.php:137 +msgid "Image" msgstr "" -#: ../includes/locals.php:268 -msgid "easeOutBounce" +#: ../includes/widgets/my-recent-posts.php:138 +msgid "Gallery" msgstr "" -#: ../includes/locals.php:269 -msgid "easeInOutBounce" +#: ../includes/widgets/my-recent-posts.php:139 +msgid "Audio" msgstr "" -#: ../includes/locals.php:272 -msgid "Blog" +#: ../includes/widgets/my-recent-posts.php:140 +msgid "Video" msgstr "" -#: ../includes/locals.php:273 -msgid "Blog Title" +#: ../includes/widgets/my-recent-posts.php:144 +msgid "Post order" msgstr "" -#: ../includes/locals.php:274 -msgid "Enter Your Blog Title used on Blog page." +#: ../includes/widgets/my-recent-posts.php:149 +msgid "Comment count" msgstr "" -#: ../includes/locals.php:275 -msgid "Related Posts Title" +#: ../includes/widgets/my-recent-posts.php:150 +msgid "Random" msgstr "" -#: ../includes/locals.php:276 -msgid "Enter Your Title used on Single Post page for related posts." +#: ../includes/widgets/my-recent-posts.php:154 +msgid "Posts per page" msgstr "" -#: ../includes/locals.php:277 -msgid "Related Posts" +#: ../includes/widgets/my-social-widget.php:6 +msgid "Link to your social networks." msgstr "" -#: ../includes/locals.php:278 -msgid "Blog layout" +#: ../includes/widgets/my-social-widget.php:7 +msgid "Cherry - Social Networks" msgstr "" -#: ../includes/locals.php:279 -msgid "Choose blog layout." +#: ../includes/widgets/my-social-widget.php:112 +msgid "Facebook" msgstr "" -#: ../includes/locals.php:280 -msgid "Aside left." +#: ../includes/widgets/my-social-widget.php:114 +msgid "Facebook URL" msgstr "" -#: ../includes/locals.php:281 -msgid "Aside right." +#: ../includes/widgets/my-social-widget.php:117 +msgid "Facebook label" msgstr "" -#: ../includes/locals.php:282 -msgid "Full width." +#: ../includes/widgets/my-social-widget.php:122 +msgid "Twitter" msgstr "" -#: ../includes/locals.php:283 -msgid "Masonry." +#: ../includes/widgets/my-social-widget.php:123 +msgid "Twitter URL" msgstr "" -#: ../includes/locals.php:284 -msgid "Blog image size" +#: ../includes/widgets/my-social-widget.php:125 +msgid "Twitter label" msgstr "" -#: ../includes/locals.php:285 -msgid "Featured image size on the blog." +#: ../includes/widgets/my-social-widget.php:130 +msgid "Flickr" msgstr "" -#: ../includes/locals.php:286 -msgid "Should images be uploaded on page scroll?" +#: ../includes/widgets/my-social-widget.php:131 +msgid "Flickr URL" msgstr "" -#: ../includes/locals.php:287 -msgid "" -"You can enable images load only as you scroll down the page. Otherwise " -"images will load all at once." +#: ../includes/widgets/my-social-widget.php:133 +msgid "Flickr label" msgstr "" -#: ../includes/locals.php:288 ../includes/locals.php:289 -msgid "Display share button in single post?" +#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:139 +msgid "RSS feed" msgstr "" -#: ../includes/locals.php:290 -msgid "Single post image size" +#: ../includes/widgets/my-social-widget.php:141 +msgid "RSS label" msgstr "" -#: ../includes/locals.php:291 -msgid "Featured image size on the single page." +#: ../includes/widgets/my-social-widget.php:146 +msgid "Linkedin" msgstr "" -#: ../includes/locals.php:292 -msgid "View meta of the blog." +#: ../includes/widgets/my-social-widget.php:147 +msgid "Linkedin URL" msgstr "" -#: ../includes/locals.php:293 -msgid "Select meta block type which will be displayed on blog and post pages." +#: ../includes/widgets/my-social-widget.php:149 +msgid "Linkedin label" msgstr "" -#: ../includes/locals.php:294 -msgid "Enable excerpt for blog posts?" +#: ../includes/widgets/my-social-widget.php:154 +msgid "Delicious" msgstr "" -#: ../includes/locals.php:295 -msgid "Enable or Disable excerpt for blog posts." +#: ../includes/widgets/my-social-widget.php:155 +msgid "Delicious URL" msgstr "" -#: ../includes/locals.php:296 ../includes/locals.php:297 -msgid "Button text for blog posts." +#: ../includes/widgets/my-social-widget.php:157 +msgid "Delicious label" msgstr "" -#: ../includes/locals.php:298 -msgid "Do not show." +#: ../includes/widgets/my-social-widget.php:162 +msgid "Youtube" msgstr "" -#: ../includes/locals.php:299 -msgid "Lines." +#: ../includes/widgets/my-social-widget.php:164 +msgid "Youtube URL" msgstr "" -#: ../includes/locals.php:300 -msgid "Columns." +#: ../includes/widgets/my-social-widget.php:167 +msgid "Youtube label" msgstr "" -#: ../includes/locals.php:301 -msgid "Icons." +#: ../includes/widgets/my-social-widget.php:173 +msgid "Google" msgstr "" -#: ../includes/locals.php:302 -msgid "Post publication date." +#: ../includes/widgets/my-social-widget.php:175 +msgid "Google URL" msgstr "" -#: ../includes/locals.php:303 -msgid "Should the post publication date be displayed?" +#: ../includes/widgets/my-social-widget.php:178 +msgid "Google label" msgstr "" -#: ../includes/locals.php:304 -msgid "Author of the post." +#: ../includes/widgets/my-social-widget.php:184 +msgid "Display" msgstr "" -#: ../includes/locals.php:305 -msgid "Display the author of the post?" +#: ../includes/widgets/my-social-widget.php:187 +msgid "Both" msgstr "" -#: ../includes/locals.php:306 -msgid "Direct link to the post." +#: ../includes/widgets/my-vcard-widget.php:4 +msgid "Use this widget to add a vCard" msgstr "" -#: ../includes/locals.php:307 -msgid "Should the direct link to the post be displayed? " +#: ../includes/widgets/my-vcard-widget.php:5 +msgid "Cherry - vCard" msgstr "" -#: ../includes/locals.php:308 -msgid "Post categories." +#: ../includes/widgets/my-vcard-widget.php:32 +msgid "vCard" msgstr "" -#: ../includes/locals.php:309 -msgid "Should the post categories be displayed?" +#: ../includes/widgets/my-vcard-widget.php:55 +#: ../includes/widgets/my-vcard-widget.php:171 +msgid "Street Address" msgstr "" -#: ../includes/locals.php:310 -msgid "Tags be displayed." +#: ../includes/widgets/my-vcard-widget.php:56 +#: ../includes/widgets/my-vcard-widget.php:175 +msgid "City/Locality" msgstr "" -#: ../includes/locals.php:311 -msgid "Should the tags be displayed?" +#: ../includes/widgets/my-vcard-widget.php:57 +#: ../includes/widgets/my-vcard-widget.php:179 +msgid "State/Region" msgstr "" -#: ../includes/locals.php:312 -msgid "Number of comments." +#: ../includes/widgets/my-vcard-widget.php:58 +#: ../includes/widgets/my-vcard-widget.php:183 +msgid "Zipcode/Postal Code" msgstr "" -#: ../includes/locals.php:313 -msgid "Should the number of comments be displayed?" +#: ../includes/widgets/my-vcard-widget.php:59 +#: ../includes/widgets/my-vcard-widget.php:187 +msgid "Telephone" msgstr "" -#: ../includes/locals.php:314 ../includes/locals.php:643 -msgid "Number of view." +#: ../includes/widgets/my-vcard-widget.php:60 +#: ../includes/widgets/my-vcard-widget.php:191 +msgid "Email" msgstr "" -#: ../includes/locals.php:315 -msgid "Should the number of view be displayed?" +#: ../includes/widgets/my-vcard-widget.php:160 +msgid "Google Map" msgstr "" -#: ../includes/locals.php:316 -msgid "Number of likes." +#: ../includes/widgets/my-vcard-widget.php:162 +msgid "Display map" msgstr "" -#: ../includes/locals.php:317 -msgid "Should the number of likes be displayed?" +#: ../includes/widgets/my-vcard-widget.php:165 +msgid "HTML map code" msgstr "" -#: ../includes/locals.php:318 -msgid "Number of dislikes." +#: ../includes/widgets/widgets-manager.php:458 +msgid "Custom CSS class" msgstr "" -#: ../includes/locals.php:319 -msgid "Should the number of dislikes be displayed?" +#: ../includes/widgets/widgets-manager.php:460 +msgid "Visibility" msgstr "" -#: ../includes/locals.php:323 -msgid "Portfolio" +#: ../includes/widgets/widgets-manager.php:463 +msgid "Visible at" msgstr "" -#: ../includes/locals.php:324 -msgid "Filter" +#: ../includes/widgets/widgets-manager.php:465 +msgid "All pages" msgstr "" -#: ../includes/locals.php:325 -msgid "Portfolio filter." +#: ../includes/widgets/widgets-manager.php:466 +msgid "All pages expecting" msgstr "" -#: ../includes/locals.php:326 -msgid "By category" +#: ../includes/widgets/widgets-manager.php:467 +msgid "No pages expecting" msgstr "" -#: ../includes/locals.php:327 -msgid "By tags" +#: ../includes/widgets/widgets-manager.php:471 +msgid "Select page to add" msgstr "" -#: ../includes/locals.php:328 -msgid "Both (by category and tags)" +#: ../includes/widgets/widgets-manager.php:473 +msgid "Homepage" msgstr "" -#: ../includes/locals.php:329 -msgid "Show title?" +#: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" msgstr "" -#: ../includes/locals.php:330 -msgid "Enable or Disable title for portfolio posts." +#: ../includes/widgets/widgets-manager.php:475 +msgid "Page" msgstr "" -#: ../includes/locals.php:331 -msgid "Show excerpt?" +#: ../includes/widgets/widgets-manager.php:476 +msgid "Post" msgstr "" -#: ../includes/locals.php:332 -msgid "Enable or Disable excerpt for portfolio posts." +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 +msgid "Archive" msgstr "" -#: ../includes/locals.php:333 ../includes/locals.php:334 -msgid "Button text for portfolio posts." +#: ../includes/widgets/widgets-manager.php:478 +msgid "Tag" msgstr "" -#: ../includes/locals.php:335 -msgid "Excerpt words" +#: ../includes/widgets/widgets-manager.php:481 +msgid "Search page" msgstr "" -#: ../includes/locals.php:336 -msgid "Excerpt length (words)." +#: ../includes/widgets/widgets-manager.php:482 +msgid "404 page" msgstr "" -#: ../includes/locals.php:337 -msgid "Show button?" +#: ../includes/widgets/widgets-manager.php:484 +msgid "Page ID/Title/slug" msgstr "" -#: ../includes/locals.php:338 -msgid "Enable or Disable button for portfolio posts." +#: ../includes/widgets/widgets-manager.php:485 +msgid "Post ID/Title/slug" msgstr "" -#: ../includes/locals.php:339 -msgid "Show portfolio meta?" +#: ../includes/widgets/widgets-manager.php:486 +msgid "Category ID/Name/slug" msgstr "" -#: ../includes/locals.php:340 -msgid "Enable or Disable meta for single portfolio posts." +#: ../includes/widgets/widgets-manager.php:487 +msgid "Tag ID/Name" msgstr "" -#: ../includes/locals.php:341 -msgid "Enable or Disable lightbox for portfolio posts." +#: ../includes/widgets/widgets-manager.php:489 +msgid "Add page" msgstr "" -#: ../includes/locals.php:342 -msgid "Layout" +#: ../includes/widgets/widgets-manager.php:492 +msgid "Selected pages" msgstr "" -#: ../includes/locals.php:343 -msgid "" -"Portfolio has different layout modes. You can set and change the layout mode " -"via this option." +#: ../includes/widgets/widgets-manager.php:493 +msgid "No pages" msgstr "" -#: ../includes/locals.php:344 -msgid "Fit rows" +#: ../includes/widgets/widgets-manager.php:511 +msgid "All devices" msgstr "" -#: ../includes/locals.php:345 -msgid "Masonry" +#: ../includes/widgets/widgets-manager.php:512 +msgid "Desktops" msgstr "" -#: ../includes/locals.php:346 -msgid "Portfolio 2 columns items amount" +#: ../includes/widgets/widgets-manager.php:513 +msgid "Tablets" msgstr "" -#: ../includes/locals.php:347 -msgid "Portfolio items amount for Portfolio 2 columns template." +#: ../includes/widgets/widgets-manager.php:514 +msgid "Phones" msgstr "" -#: ../includes/locals.php:348 -msgid "Portfolio 3 columns items amount" +#: ../includes/widgets/widgets-manager.php:515 +msgid "Desktops/Tablets" msgstr "" -#: ../includes/locals.php:349 -msgid "Portfolio items amount for Portfolio 3 columns template." +#: ../includes/widgets/widgets-manager.php:516 +msgid "Tablets/Phones" msgstr "" -#: ../includes/locals.php:350 -msgid "Portfolio 4 columns items amount" +#: ../includes/widgets/widgets-manager.php:517 +msgid "Desktops/Phones" msgstr "" -#: ../includes/locals.php:351 -msgid "Portfolio items amount for Portfolio 4 columns template." +#: ../includes/widgets/widgets-manager.php:520 +msgid "Visible on" msgstr "" -#: ../includes/locals.php:354 -msgid "Footer" +#: ../includes/widgets/widgets-manager.php:529 +msgid "All users" msgstr "" -#: ../includes/locals.php:355 -msgid "Footer copyright text" +#: ../includes/widgets/widgets-manager.php:530 +msgid "Only guests" msgstr "" -#: ../includes/locals.php:356 -msgid "Enter text used in the right side of the footer. HTML tags are allowed." +#: ../includes/widgets/widgets-manager.php:531 +msgid "Only registered users" msgstr "" -#: ../includes/locals.php:357 -msgid "Google Analytics Code" +#: ../includes/widgets/widgets-manager.php:532 +msgid "Only administrator" msgstr "" -#: ../includes/locals.php:358 -msgid "" -"You can paste your Google Analytics or other tracking code in this box. This " -"will be automatically added to the footer." +#: ../includes/widgets/widgets-manager.php:535 +msgid "Visible for" msgstr "" -#: ../includes/locals.php:359 -msgid "Feedburner URL" +#: ../lib/php/parsers.php:43 ../lib/php/parsers.php:75 +#: ../lib/php/parsers.php:83 +msgid "There was an error when reading this WXR file" msgstr "" -#: ../includes/locals.php:360 +#: ../lib/php/parsers.php:44 msgid "" -"Feedburner is a Google service that takes care of your RSS feed. Paste your " -"Feedburner URL here to let readers see it in your website." -msgstr "" - -#: ../includes/locals.php:361 -msgid "Display Footer Menu?" -msgstr "" - -#: ../includes/locals.php:362 -msgid "Do you want to display footer menu?" -msgstr "" - -#: ../includes/locals.php:363 -msgid "Footer Menu Typography" +"Details are shown above. The importer will now try again with a different " +"parser..." msgstr "" -#: ../includes/locals.php:364 +#: ../lib/php/parsers.php:87 ../lib/php/parsers.php:92 +#: ../lib/php/parsers.php:284 ../lib/php/parsers.php:475 msgid "" -"Choose your prefered font for menu. <em>Note: fonts marked with <strong>*</" -"strong> symbol will be loaded from the <a href=\"http://www.google.com/" -"webfonts\">Google Web Fonts</a> library.</em>" -msgstr "" - -#: ../includes/locals.php:384 -msgid "<span>Step <i>1</i></span>Theme Options Import" -msgstr "" - -#: ../includes/locals.php:385 -msgid "Select the file that contains Theme Options (e.g. <b>options.json</b> )" -msgstr "" - -#: ../includes/locals.php:386 -msgid "Upload File and Import" -msgstr "" - -#: ../includes/locals.php:387 -msgid "<span>Step <i>1</i></span>Theme Options Export" -msgstr "" - -#: ../includes/locals.php:388 -msgid "Welcome to the OptionsFramework Backup Manager." -msgstr "" - -#: ../includes/locals.php:389 -msgid "There was a problem importing your settings. Please Try again." -msgstr "" - -#: ../includes/locals.php:390 -msgid "There was a problem exporting your settings. Please Try again." -msgstr "" - -#: ../includes/locals.php:391 -msgid "The import file you've provided is invalid. Please try again." -msgstr "" - -#: ../includes/locals.php:393 -msgid "<span>Step <i>1</i></span> Widget Settings Export" -msgstr "" - -#: ../includes/locals.php:394 -msgid "<span>Step <i>3</i></span> Widget Settings Import" -msgstr "" - -#: ../includes/locals.php:395 -msgid "<span>Step <i>4</i></span> Widget Settings Import" -msgstr "" - -#: ../includes/locals.php:396 -msgid "Import Settings" -msgstr "" - -#: ../includes/locals.php:397 -msgid "" -"Incorrect file. Please, <a href='admin.php?page=options-framework-import&" -"step=1'>try again</a>." -msgstr "" - -#: ../includes/locals.php:398 -msgid "" -"Select the file that contains Widget Settings (e.g. <b>your_template_package/" -"sources/sample_data/widgets.json</b>)" -msgstr "" - -#: ../includes/locals.php:399 -msgid "Show Widget Settings" -msgstr "" - -#: ../includes/locals.php:400 -msgid "Your have no widgets. Please, click next to go to the next step." -msgstr "" - -#: ../includes/locals.php:401 -msgid "" -"Disable the widgets you don't need and click \"Next\". All the selected " -"widgets will be imported into the theme by default." -msgstr "" - -#: ../includes/locals.php:402 -msgid "go to widgets" -msgstr "" - -#: ../includes/locals.php:405 -msgid "Sorry, there has been an error." -msgstr "" - -#: ../includes/locals.php:406 -msgid "The file does not exist, please " -msgstr "" - -#: ../includes/locals.php:407 -msgid "Please" -msgstr "" - -#: ../includes/locals.php:408 -#, php-format -msgid "" -"This WXR file (version %s) may not be supported by this version of the " -"importer. Please consider updating." -msgstr "" - -#: ../includes/locals.php:409 -#, php-format -msgid "" -"The export file could not be found at <code>%s</code>. It is likely that " -"this was caused by a permissions problem." -msgstr "" - -#: ../includes/locals.php:410 -#, php-format -msgid "" -"Failed to import author %s. Their posts will be attributed to the current " -"user." -msgstr "" - -#: ../includes/locals.php:411 -msgid "Assign Authors" -msgstr "" - -#: ../includes/locals.php:412 -msgid "" -"To make it easier for you to edit and save the imported content, you may " -"want to reassign the author of the imported item to an existing user of this " -"site. For example, you may want to import all the entries as <b>admin</b> " -"entries." -msgstr "" - -#: ../includes/locals.php:413 -#, php-format -msgid "" -"If a new user is created by WordPress, a new password will be randomly " -"generated and the new user’s role will be set as %s. Manually changing " -"the new user’s details will be necessary." -msgstr "" - -#: ../includes/locals.php:414 -msgid "Download and import file attachments" -msgstr "" - -#: ../includes/locals.php:415 -msgid "Import Data" -msgstr "" - -#: ../includes/locals.php:416 -msgid "Import author:" -msgstr "" - -#: ../includes/locals.php:417 -msgid "assign posts to an existing user:" -msgstr "" - -#: ../includes/locals.php:418 -msgid "- Select -" -msgstr "" - -#: ../includes/locals.php:419 -#, php-format -msgid "" -"Failed to create new user for %s. Their posts will be attributed to the " -"current user." -msgstr "" - -#: ../includes/locals.php:420 -#, php-format -msgid "Failed to import category %s " -msgstr "" - -#: ../includes/locals.php:421 -#, php-format -msgid "Failed to import post tag %s" -msgstr "" - -#: ../includes/locals.php:422 -#, php-format -msgid "Failed to import %s %s " -msgstr "" - -#: ../includes/locals.php:423 -#, php-format -msgid "Failed to import “%s”: Invalid post type %s " -msgstr "" - -#: ../includes/locals.php:424 -#, php-format -msgid "%s “%s” already exists." -msgstr "" - -#: ../includes/locals.php:425 -#, php-format -msgid "Failed to import %s “%s” " -msgstr "" - -#: ../includes/locals.php:426 -msgid "Menu item skipped due to missing menu slug " -msgstr "" - -#: ../includes/locals.php:427 -#, php-format -msgid "Menu item skipped due to invalid menu slug: %s " -msgstr "" - -#: ../includes/locals.php:428 -msgid "Fetching attachments is not enabled " -msgstr "" - -#: ../includes/locals.php:429 -msgid "Invalid file type" -msgstr "" - -#: ../includes/locals.php:430 -msgid "Remote server did not respond" -msgstr "" - -#: ../includes/locals.php:431 -#, php-format -msgid "Remote server returned error response %1$d %2$s " -msgstr "" - -#: ../includes/locals.php:432 -msgid "Remote file is incorrect size " -msgstr "" - -#: ../includes/locals.php:433 -msgid "Zero size file downloaded " -msgstr "" - -#: ../includes/locals.php:434 -#, php-format -msgid "Remote file is too large, limit is %s " -msgstr "" - -#: ../includes/locals.php:435 -msgid "<span>Step <i>1</i></span> Data Import" -msgstr "" - -#: ../includes/locals.php:436 -msgid "<span>Step <i>2</i></span> Assign Authors" -msgstr "" - -#: ../includes/locals.php:437 -#, php-format -msgid "" -"A new version of this importer is available. Please update to version %s to " -"ensure compatibility with newer export files. " -msgstr "" - -#: ../includes/locals.php:438 -msgid "" -"Select (<b>.xml</b>) file to upload sample data.<br>If you do not want to " -"install sample data from livedemo you need to <b>skip this step</b>." -msgstr "" - -#: ../includes/locals.php:439 -msgid "" -"Please note that certain content is already installed. You may simply need " -"to skip this step. Otherwise, you can proceed with the installation." -msgstr "" - -#: ../includes/locals.php:441 -msgid "" -"Some of your server settings do not meet the requirements for installing the " -"sample data. Please, consult with your hosting provider on how to increase " -"the required values." -msgstr "" - -#: ../includes/locals.php:442 -msgid "Server Settings" -msgstr "" - -#: ../includes/locals.php:443 -msgid "Current" -msgstr "" - -#: ../includes/locals.php:444 -msgid "NOTE" -msgstr "" - -#: ../includes/locals.php:445 -msgid "" -"if for some reason those settings can not be adjusted, you may install the " -"sample data using an <strong>alternative method</strong> - importing the " -"<strong>.sql</strong> file directly into the database. Refer to the template " -"documentation for instructions." -msgstr "" - -#: ../includes/locals.php:446 -msgid "" -"You can proceed with the template installation without updating server " -"settings, however in this case you can get errors or only part of your " -"content will be loaded." -msgstr "" - -#: ../includes/locals.php:447 -msgid "Congratulations" -msgstr "" - -#: ../includes/locals.php:448 -msgid "" -"You have successfully installed your <b>Cherry WordPress Theme</b>.<br /> " -"You can look theme now" -msgstr "" - -#: ../includes/locals.php:449 -msgid "visit site" -msgstr "" - -#: ../includes/locals.php:450 -msgid "" -"You might see only the white screen on the next step. Don't worry, the " -"importing is being continued. Please wait until the installation is finished." -msgstr "" - -#: ../includes/locals.php:451 -msgid "" -"<b>Attention:</b> the Jigoshop plugin is not activated. We recommend that " -"you install and activate this plugin to ensure correct data importing. " -"Otherwise, some data may be lost during the import." -msgstr "" - -#: ../includes/locals.php:452 -msgid "" -"<b>Attention:</b> the WooCommerce plugin is not activated. We recommend that " -"you install and activate this plugin to ensure correct data importing. " -"Otherwise, some data may be lost during the import." -msgstr "" - -#: ../includes/locals.php:455 -msgid "The login information you have entered is incorrect." -msgstr "" - -#: ../includes/locals.php:456 -msgid "" -"You need to enable write permissions on your server to use these functions." -msgstr "" - -#: ../includes/locals.php:457 -msgid "" -"Cherry Framework is not able to perform necessary changes for the correct " -"work with your child theme." -msgstr "" - -#: ../includes/locals.php:458 -msgid "" -"See <a target=\"_blank\" href=\"http://codex.wordpress.org/" -"Changing_File_Permissions\">the Codex</a> for more information." -msgstr "" - -#: ../includes/locals.php:461 -msgid "Header Menu" -msgstr "" - -#: ../includes/locals.php:462 -msgid "Footer Menu" -msgstr "" - -#: ../includes/locals.php:464 -msgid "Testimonial" -msgstr "" - -#: ../includes/locals.php:465 -msgid "Services" -msgstr "" - -#: ../includes/locals.php:466 -msgid "FAQs" -msgstr "" - -#: ../includes/locals.php:467 -msgid "Our Team" -msgstr "" - -#: ../includes/locals.php:468 -msgid "Category" -msgstr "" - -#: ../includes/locals.php:469 -msgid "Tag" -msgstr "" - -#: ../includes/locals.php:472 -msgid "Thumbnail" -msgstr "" - -#: ../includes/locals.php:473 -msgid "Your comment is awaiting moderation." -msgstr "" - -#: ../includes/locals.php:476 -msgid "Please choose desired Portfolio Format and fill additional fields." -msgstr "" - -#: ../includes/locals.php:478 -msgid "Grid Gallery" -msgstr "" - -#: ../includes/locals.php:479 -msgid "Portfolio Options" -msgstr "" - -#: ../includes/locals.php:480 -msgid "Format" -msgstr "" - -#: ../includes/locals.php:481 -msgid "Choose post format that most fit your needs." -msgstr "" - -#: ../includes/locals.php:482 -msgid "Input project end date." -msgstr "" - -#: ../includes/locals.php:483 -msgid "Client" -msgstr "" - -#: ../includes/locals.php:484 -msgid "Input project owner name." -msgstr "" - -#: ../includes/locals.php:485 -msgid "Additional info for this portfolio item." -msgstr "" - -#: ../includes/locals.php:486 -msgid "Input the project URL (external link)" -msgstr "" - -#: ../includes/locals.php:487 ../includes/locals.php:541 -msgid "Image Settings" -msgstr "" - -#: ../includes/locals.php:488 -msgid "Video Settings" -msgstr "" - -#: ../includes/locals.php:489 -msgid "Input the video title (for playlist)" -msgstr "" - -#: ../includes/locals.php:490 -msgid "Artist" -msgstr "" - -#: ../includes/locals.php:491 -msgid "Input the video artist (for playlist)." -msgstr "" - -#: ../includes/locals.php:492 -msgid "Input URL to the <b>m4v</b> video format." -msgstr "" - -#: ../includes/locals.php:493 -msgid "Input URL to the <b>ogv</b> video format." -msgstr "" - -#: ../includes/locals.php:494 -msgid "Embedded Code" -msgstr "" - -#: ../includes/locals.php:495 -msgid "" -"You can include embedded code here.<br><b>Attention!</b> This code overwrite " -"your video URL(s)." -msgstr "" - -#: ../includes/locals.php:496 -msgid "Audio Settings" -msgstr "" - -#: ../includes/locals.php:497 -msgid "Input the audio title (for playlist)." -msgstr "" - -#: ../includes/locals.php:498 -msgid "Input the audio artist (for playlist)." -msgstr "" - -#: ../includes/locals.php:499 -msgid "Audio format" -msgstr "" - -#: ../includes/locals.php:500 -msgid "Choose audio format." -msgstr "" - -#: ../includes/locals.php:501 -msgid "Audio URL" -msgstr "" - -#: ../includes/locals.php:502 -msgid "Input the audio URL." -msgstr "" - -#: ../includes/locals.php:505 -msgid "Slider Options" -msgstr "" - -#: ../includes/locals.php:506 -msgid "Caption" -msgstr "" - -#: ../includes/locals.php:507 -msgid "Input your caption for slide (HTML tags are allowed)." -msgstr "" - -#: ../includes/locals.php:508 -msgid "Input the slide URL (can be external link)" -msgstr "" - -#: ../includes/locals.php:509 -msgid "Please fill additional fields for slide." -msgstr "" - -#: ../includes/locals.php:512 -msgid "Personal Options" -msgstr "" - -#: ../includes/locals.php:513 -msgid "Please fill additional fields for person." -msgstr "" - -#: ../includes/locals.php:514 -msgid "Position" -msgstr "" - -#: ../includes/locals.php:515 -msgid "Input position of the person." -msgstr "" - -#: ../includes/locals.php:516 -msgid "Input additional info." -msgstr "" - -#: ../includes/locals.php:517 -msgid "Social Networks" -msgstr "" - -#: ../includes/locals.php:518 -msgid "Page URL" -msgstr "" - -#: ../includes/locals.php:519 -msgid "Your Social Networks." -msgstr "" - -#: ../includes/locals.php:520 -msgid "" -"In icon field you need to specify the icon name that can be copied from the " -"<a target=\"_blank\" href=\"http://fortawesome.github.io/Font-Awesome/icons/" -"#brand\">website</a>. E.g. \"icon-facebook\"." -msgstr "" - -#: ../includes/locals.php:521 -msgid "Social Networks Title" -msgstr "" - -#: ../includes/locals.php:522 -msgid "Specify the heading for the social networks block." -msgstr "" - -#: ../includes/locals.php:525 -msgid "Testimonial Options" -msgstr "" - -#: ../includes/locals.php:526 -msgid "Please fill additional fields for testimonial." -msgstr "" - -#: ../includes/locals.php:527 ../includes/locals.php:854 -#: ../includes/locals.php:919 -msgid "Name" -msgstr "" - -#: ../includes/locals.php:528 -msgid "Input author's name." -msgstr "" - -#: ../includes/locals.php:529 -msgid "Input author's URL." -msgstr "" - -#: ../includes/locals.php:530 -msgid "Input author's additional info." -msgstr "" - -#: ../includes/locals.php:533 -msgid "Quote Settings" -msgstr "" - -#: ../includes/locals.php:534 -msgid "The Quote" -msgstr "" - -#: ../includes/locals.php:535 -msgid "Put your quote in this field." -msgstr "" - -#: ../includes/locals.php:536 ../includes/locals.php:743 -#: ../includes/locals.php:855 -msgid "Author" -msgstr "" - -#: ../includes/locals.php:537 -msgid "Put quote author in this field." -msgstr "" - -#: ../includes/locals.php:538 -msgid "Link Settings" -msgstr "" - -#: ../includes/locals.php:539 -msgid "The URL" -msgstr "" - -#: ../includes/locals.php:540 -msgid "Insert the URL you wish to link to." -msgstr "" - -#: ../includes/locals.php:542 -msgid "Input the video title (for playlist)." -msgstr "" - -#: ../includes/locals.php:545 -msgid "Category Include" -msgstr "" - -#: ../includes/locals.php:546 -msgid "The Category Slug" -msgstr "" - -#: ../includes/locals.php:547 -msgid "" -"Name of the custom category that is displayed on this page. You need to use " -"the slug of the category here." -msgstr "" - -#: ../includes/locals.php:550 -msgid "Install Required Plugins" -msgstr "" - -#: ../includes/locals.php:551 -msgid "Install Plugins" -msgstr "" - -#: ../includes/locals.php:552 -#, php-format -msgid "Installing Plugin: %s" -msgstr "" - -#: ../includes/locals.php:553 -msgid "Something went wrong" -msgstr "" - -#: ../includes/locals.php:554 -#, php-format -msgid "This theme requires the following plugin: %1$s." -msgstr "" - -#: ../includes/locals.php:555 -#, php-format -msgid "This theme requires the following plugins: %1$s." -msgstr "" - -#: ../includes/locals.php:556 -#, php-format -msgid "This theme recommends the following plugin: %1$s." -msgstr "" - -#: ../includes/locals.php:557 -#, php-format -msgid "This theme recommends the following plugins: %1$s." -msgstr "" - -#: ../includes/locals.php:558 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to install the %s plugin. " -"Contact the administrator of this site for help on getting the plugin " -"installed." -msgstr "" - -#: ../includes/locals.php:559 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to install the %s " -"plugins. Contact the administrator of this site for help on getting the " -"plugins installed." -msgstr "" - -#: ../includes/locals.php:560 -#, php-format -msgid "The following required plugin is currently inactive: %1$s." -msgstr "" - -#: ../includes/locals.php:561 -#, php-format -msgid "The following required plugins are currently inactive: %1$s." -msgstr "" - -#: ../includes/locals.php:562 -#, php-format -msgid "The following recommended plugin is currently inactive: %1$s" -msgstr "" - -#: ../includes/locals.php:563 -#, php-format -msgid "The following recommended plugins are currently inactive: %1$s." -msgstr "" - -#: ../includes/locals.php:564 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to activate the %s " -"plugin. Contact the administrator of this site for help on getting the " -"plugin activated." -msgstr "" - -#: ../includes/locals.php:565 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to activate the %s " -"plugins. Contact the administrator of this site for help on getting the " -"plugins activated." -msgstr "" - -#: ../includes/locals.php:566 -#, php-format -msgid "" -"The following plugin needs to be updated to its latest version to ensure " -"maximum compatibility with this theme: %1$s." -msgstr "" - -#: ../includes/locals.php:567 -#, php-format -msgid "" -"The following plugins need to be updated to their latest version to ensure " -"maximum compatibility with this theme: %1$s" -msgstr "" - -#: ../includes/locals.php:568 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to update the %s plugin. " -"Contact the administrator of this site for help on getting the plugin " -"updated." -msgstr "" - -#: ../includes/locals.php:569 -#, php-format -msgid "" -"Sorry, but you do not have the correct permissions to update the %s plugins. " -"Contact the administrator of this site for help on getting the plugins " -"updated." -msgstr "" - -#: ../includes/locals.php:570 -msgid "Begin installing plugin" -msgstr "" - -#: ../includes/locals.php:571 -msgid "Begin installing plugins" -msgstr "" - -#: ../includes/locals.php:572 -msgid "Activate installed plugin" -msgstr "" - -#: ../includes/locals.php:573 -msgid "Activate installed plugins" -msgstr "" - -#: ../includes/locals.php:574 -msgid "Return to Required Plugins Installer" -msgstr "" - -#: ../includes/locals.php:575 -msgid "Plugin activated successfully" -msgstr "" - -#: ../includes/locals.php:576 -#, php-format -msgid "All plugins installed and activated successfully. %1$s" -msgstr "" - -#: ../includes/locals.php:577 ../includes/locals.php:589 -msgid "Return to the Dashboard" -msgstr "" - -#: ../includes/locals.php:578 -#, php-format -msgid "The following plugin was activated successfully: %s." -msgstr "" - -#: ../includes/locals.php:580 -msgid "External Link" -msgstr "" - -#: ../includes/locals.php:581 -msgid "Private Repository" -msgstr "" - -#: ../includes/locals.php:582 -msgid "Pre-Packaged" -msgstr "" - -#: ../includes/locals.php:583 -msgid "WordPress Repository" -msgstr "" - -#: ../includes/locals.php:584 -msgid "Required" -msgstr "" - -#: ../includes/locals.php:585 -msgid "Recommended" -msgstr "" - -#: ../includes/locals.php:586 -msgid "Not Installed" -msgstr "" - -#: ../includes/locals.php:587 -msgid "Installed But Not Activated" -msgstr "" - -#: ../includes/locals.php:588 -msgid "No plugins to install or activate." -msgstr "" - -#: ../includes/locals.php:590 -msgid "Plugin" -msgstr "" - -#: ../includes/locals.php:591 -msgid "Source" -msgstr "" - -#: ../includes/locals.php:592 -msgid "Type" -msgstr "" - -#: ../includes/locals.php:593 -msgid "Status" -msgstr "" - -#: ../includes/locals.php:594 -msgid "Install" -msgstr "" - -#: ../includes/locals.php:595 -msgid "Activate" -msgstr "" - -#: ../includes/locals.php:597 -msgid "The following plugins were activated successfully:" -msgstr "" - -#: ../includes/locals.php:598 -msgid "Install package not available." -msgstr "" - -#: ../includes/locals.php:599 -#, php-format -msgid "Downloading install package from <span class='code'>%s</span>…" -msgstr "" - -#: ../includes/locals.php:600 -msgid "Unpacking the package…" -msgstr "" - -#: ../includes/locals.php:601 -msgid "Installing the plugin…" -msgstr "" - -#: ../includes/locals.php:602 -msgid "Plugin install failed." -msgstr "" - -#: ../includes/locals.php:603 -msgid "Plugin installed successfully." -msgstr "" - -#: ../includes/locals.php:604 -msgid "Plugin activation failed." -msgstr "" - -#: ../includes/locals.php:605 -msgid "Plugin activated successfully." -msgstr "" - -#: ../includes/locals.php:606 -msgid "" -"The installation and activation process is starting. This process may take a " -"while on some hosts, so please be patient." -msgstr "" - -#: ../includes/locals.php:607 -#, php-format -msgid "%1$s installed and activated successfully." -msgstr "" - -#: ../includes/locals.php:608 -msgid "Show Details" -msgstr "" - -#: ../includes/locals.php:609 -msgid "Hide Details" -msgstr "" - -#: ../includes/locals.php:610 -msgid "All installations and activations have been completed." -msgstr "" - -#: ../includes/locals.php:611 -#, php-format -msgid "Installing and Activating Plugin %1$s (%2$d/%3$d)" -msgstr "" - -#: ../includes/locals.php:612 -msgid "" -"The installation process is starting. This process may take a while on some " -"hosts, so please be patient." -msgstr "" - -#: ../includes/locals.php:613 -#, php-format -msgid "An error occurred while installing %1$s: <strong>%2$s</strong>." -msgstr "" - -#: ../includes/locals.php:614 -#, php-format -msgid "The installation of %1$s failed." -msgstr "" - -#: ../includes/locals.php:615 -#, php-format -msgid "%1$s installed successfully." -msgstr "" - -#: ../includes/locals.php:616 -msgid "All installations have been completed." -msgstr "" - -#: ../includes/locals.php:617 -#, php-format -msgid "Installing Plugin %1$s (%2$d/%3$d)" -msgstr "" - -#: ../includes/locals.php:618 -msgid "Something went wrong with the plugin API._" -msgstr "" - -#: ../includes/locals.php:619 -msgid "updated" -msgstr "" - -#: ../includes/locals.php:622 -msgid "Close" -msgstr "" - -#: ../includes/locals.php:625 -msgid "Sidebar" -msgstr "" - -#: ../includes/locals.php:626 -msgid "Located at the right side of pages." -msgstr "" - -#: ../includes/locals.php:627 -msgid "Footer Area 1" -msgstr "" - -#: ../includes/locals.php:628 -msgid "Footer Area 2" -msgstr "" - -#: ../includes/locals.php:629 -msgid "Footer Area 3" -msgstr "" - -#: ../includes/locals.php:630 -msgid "Footer Area 4" -msgstr "" - -#: ../includes/locals.php:631 -msgid "Located at the bottom of pages." -msgstr "" - -#: ../includes/locals.php:632 -msgid "Archives" -msgstr "" - -#: ../includes/locals.php:633 -msgid "Meta" -msgstr "" - -#: ../includes/locals.php:636 -msgid "No comments" -msgstr "" - -#: ../includes/locals.php:637 -msgid "1 comment" -msgstr "" - -#: ../includes/locals.php:638 -msgid "comments" -msgstr "" - -#: ../includes/locals.php:639 -msgid "comments-link" -msgstr "" - -#: ../includes/locals.php:640 -msgid "Comments are closed" -msgstr "" - -#: ../includes/locals.php:641 -msgid "No tags" -msgstr "" - -#: ../includes/locals.php:642 -msgid "No category" -msgstr "" - -#: ../includes/locals.php:644 -msgid "I like it." -msgstr "" - -#: ../includes/locals.php:645 -msgid "I don't like." -msgstr "" - -#: ../includes/locals.php:646 -msgid "Only registered users can vote!" -msgstr "" - -#: ../includes/locals.php:647 -msgid "You have already voted." -msgstr "" - -#: ../includes/locals.php:650 -msgid "« Older Entries" -msgstr "" - -#: ../includes/locals.php:651 -msgid "Newer Entries »" -msgstr "" - -#: ../includes/locals.php:654 -msgid "Shortcode Options" -msgstr "" - -#: ../includes/locals.php:655 -msgid "Cancel" -msgstr "" - -#: ../includes/locals.php:656 -msgid "Insert Shortcode" -msgstr "" - -#: ../includes/locals.php:659 -msgid "Posts" -msgstr "" - -#: ../includes/locals.php:660 -msgid "Posts Grid" -msgstr "" - -#: ../includes/locals.php:661 -msgid "Posts List" -msgstr "" - -#: ../includes/locals.php:662 -msgid "Mini Posts Grid" -msgstr "" - -#: ../includes/locals.php:663 -msgid "Mini Posts List" -msgstr "" - -#: ../includes/locals.php:664 -msgid "Recent Posts" -msgstr "" - -#: ../includes/locals.php:665 -msgid "Recent Testimonials" -msgstr "" - -#: ../includes/locals.php:666 -msgid "Basic" -msgstr "" - -#: ../includes/locals.php:667 -msgid "Banner" -msgstr "" - -#: ../includes/locals.php:668 -msgid "Comments" -msgstr "" - -#: ../includes/locals.php:669 -msgid "Post Cycle" -msgstr "" - -#: ../includes/locals.php:670 -msgid "Carousel (Elasti)" -msgstr "" - -#: ../includes/locals.php:671 -msgid "Carousel (OWL)" -msgstr "" - -#: ../includes/locals.php:672 -msgid "Roundabout" -msgstr "" - -#: ../includes/locals.php:673 -msgid "Service Box" -msgstr "" - -#: ../includes/locals.php:674 -msgid "Hero Unit" -msgstr "" - -#: ../includes/locals.php:675 -msgid "Columns" -msgstr "" - -#: ../includes/locals.php:676 -msgid "Fluid Column" -msgstr "" - -#: ../includes/locals.php:677 -msgid "2 Columns" -msgstr "" - -#: ../includes/locals.php:678 -msgid "3 Columns" -msgstr "" - -#: ../includes/locals.php:679 -msgid "4 Columns" -msgstr "" - -#: ../includes/locals.php:680 -msgid "Elements" -msgstr "" - -#: ../includes/locals.php:681 -msgid "Label" -msgstr "" - -#: ../includes/locals.php:682 -msgid "Text Highlight" -msgstr "" - -#: ../includes/locals.php:683 -msgid "Button" -msgstr "" - -#: ../includes/locals.php:684 -msgid "Drop Cap" -msgstr "" - -#: ../includes/locals.php:685 -msgid "Blockquote" -msgstr "" - -#: ../includes/locals.php:686 -msgid "Icon" -msgstr "" - -#: ../includes/locals.php:687 -msgid "Frame" -msgstr "" - -#: ../includes/locals.php:688 -msgid "Horizontal Rule" -msgstr "" - -#: ../includes/locals.php:689 -msgid "Small Horizontal Rule" -msgstr "" - -#: ../includes/locals.php:690 -msgid "Vertical Rule" -msgstr "" - -#: ../includes/locals.php:691 -msgid "Spacer" -msgstr "" - -#: ../includes/locals.php:692 -msgid "Progressbar" -msgstr "" - -#: ../includes/locals.php:693 -msgid "Address" -msgstr "" - -#: ../includes/locals.php:694 -msgid "Clear" -msgstr "" - -#: ../includes/locals.php:695 -msgid "Extra Wrap" -msgstr "" - -#: ../includes/locals.php:696 -msgid "Lists" -msgstr "" - -#: ../includes/locals.php:697 -msgid "Unstyled" -msgstr "" - -#: ../includes/locals.php:698 -msgid "Check List" -msgstr "" - -#: ../includes/locals.php:699 -msgid "Check 2 List" -msgstr "" - -#: ../includes/locals.php:700 -msgid "Arrow List" -msgstr "" - -#: ../includes/locals.php:701 -msgid "Arrow 2 List" -msgstr "" - -#: ../includes/locals.php:702 -msgid "Star List" -msgstr "" - -#: ../includes/locals.php:703 -msgid "Plus List" -msgstr "" - -#: ../includes/locals.php:704 -msgid "Minus List" -msgstr "" - -#: ../includes/locals.php:705 -msgid "Custom List" -msgstr "" - -#: ../includes/locals.php:706 -msgid "Audio & Video" -msgstr "" - -#: ../includes/locals.php:707 -msgid "Video Preview" -msgstr "" - -#: ../includes/locals.php:708 -msgid "Misc" -msgstr "" - -#: ../includes/locals.php:709 -msgid "Alert Box" -msgstr "" - -#: ../includes/locals.php:710 -msgid "Close icon" -msgstr "" - -#: ../includes/locals.php:711 -msgid "Well" -msgstr "" - -#: ../includes/locals.php:712 -msgid "Small" -msgstr "" - -#: ../includes/locals.php:713 -msgid "Title Box" -msgstr "" - -#: ../includes/locals.php:714 -msgid "Template URL" -msgstr "" - -#: ../includes/locals.php:715 -msgid "Tabs" -msgstr "" - -#: ../includes/locals.php:716 -msgid "Accordion" -msgstr "" - -#: ../includes/locals.php:717 -msgid "Table" -msgstr "" - -#: ../includes/locals.php:718 -msgid "Google Map" -msgstr "" - -#: ../includes/locals.php:719 -msgid "Sitemap" -msgstr "" - -#: ../includes/locals.php:722 -msgid "Add 125x125 ads." -msgstr "" - -#: ../includes/locals.php:723 -msgid "Cherry - 125x125 Ads" -msgstr "" - -#: ../includes/locals.php:724 -msgid "Ad 1" -msgstr "" - -#: ../includes/locals.php:725 -msgid "Ad 2" -msgstr "" - -#: ../includes/locals.php:726 -msgid "Ad 3" -msgstr "" - -#: ../includes/locals.php:727 -msgid "Ad 4" -msgstr "" - -#: ../includes/locals.php:728 -msgid "Image Ad Link:" -msgstr "" - -#: ../includes/locals.php:729 -msgid "Ad Link:" -msgstr "" - -#: ../includes/locals.php:732 -msgid "Cherry - Recent Comments" -msgstr "" - -#: ../includes/locals.php:733 -msgid "My Recent Comments" -msgstr "" - -#: ../includes/locals.php:734 -msgid "Go to this comment" -msgstr "" - -#: ../includes/locals.php:735 -msgid "Number of comments to show" -msgstr "" - -#: ../includes/locals.php:736 -msgid "Display avatar" -msgstr "" - -#: ../includes/locals.php:737 -msgid "Avatar size (px)" -msgstr "" - -#: ../includes/locals.php:738 -msgid "Display the comment author" -msgstr "" - -#: ../includes/locals.php:739 -msgid "Display the comment date" -msgstr "" - -#: ../includes/locals.php:740 -msgid "Display post title" -msgstr "" - -#: ../includes/locals.php:741 -msgid "Meta format" -msgstr "" - -#: ../includes/locals.php:744 -msgid "Comment in" -msgstr "" - -#: ../includes/locals.php:747 -msgid "Cherry - Flickr" -msgstr "" - -#: ../includes/locals.php:748 -msgid "Flickr ID:" -msgstr "" - -#: ../includes/locals.php:749 -msgid "Images count:" -msgstr "" - -#: ../includes/locals.php:752 -msgid "Cherry - Advanced Cycle" -msgstr "" - -#: ../includes/locals.php:753 -msgid "Show custom posts" -msgstr "" - -#: ../includes/locals.php:754 -msgid "Posts type" -msgstr "" - -#: ../includes/locals.php:755 -msgid "Number of posts to show" -msgstr "" - -#: ../includes/locals.php:756 -msgid "Sort by" -msgstr "" - -#: ../includes/locals.php:757 -msgid "Reverse sort order (ascending)" -msgstr "" - -#: ../includes/locals.php:758 -msgid "Show number of comments" -msgstr "" - -#: ../includes/locals.php:759 -msgid "Show meta" -msgstr "" - -#: ../includes/locals.php:760 -msgid "Container class" -msgstr "" - -#: ../includes/locals.php:761 -msgid "(default: \"featured_custom_posts\")" -msgstr "" - -#: ../includes/locals.php:762 -msgid "Post title" -msgstr "" - -#: ../includes/locals.php:763 -msgid "Show post title" -msgstr "" - -#: ../includes/locals.php:764 -msgid "" -"Date as title <span style='font-size:11px; color:#999;'>('[mm-dd-yyyy]')</" -"span>" -msgstr "" - -#: ../includes/locals.php:765 -msgid "Excerpt" -msgstr "" - -#: ../includes/locals.php:766 -msgid "Show post excerpt" -msgstr "" - -#: ../includes/locals.php:767 -msgid "Excerpt as link" -msgstr "" - -#: ../includes/locals.php:768 -msgid "More link" -msgstr "" - -#: ../includes/locals.php:769 -msgid "Show \"More link" -msgstr "" - -#: ../includes/locals.php:770 -msgid "(default: \"Read more\")" -msgstr "" - -#: ../includes/locals.php:771 -msgid "Link class" -msgstr "" - -#: ../includes/locals.php:772 -msgid "(default: \"link\")" -msgstr "" - -#: ../includes/locals.php:773 -msgid "Thumbnail dimensions" -msgstr "" - -#: ../includes/locals.php:774 -msgid "Show post thumbnail" -msgstr "" - -#: ../includes/locals.php:775 -msgid "Thumbnail as link" -msgstr "" - -#: ../includes/locals.php:776 -msgid "Link to all posts" -msgstr "" - -#: ../includes/locals.php:777 -msgid "Show global link to all posts" -msgstr "" - -#: ../includes/locals.php:778 -msgid "(default: \"View all\")" -msgstr "" - -#: ../includes/locals.php:781 -msgid "Cherry - Recent Posts" -msgstr "" - -#: ../includes/locals.php:782 -msgid "Permanent Link to" -msgstr "" - -#: ../includes/locals.php:783 -msgid "Category Slug:" -msgstr "" - -#: ../includes/locals.php:784 -msgid "Post format:" -msgstr "" - -#: ../includes/locals.php:785 -msgid "Post order:" -msgstr "" - -#: ../includes/locals.php:786 -msgid "Posts per page:" -msgstr "" - -#: ../includes/locals.php:789 -msgid "Cherry - Social Networks" -msgstr "" - -#: ../includes/locals.php:790 -msgid "Link to your social networks." -msgstr "" - -#: ../includes/locals.php:792 -msgid "Display:" -msgstr "" - -#: ../includes/locals.php:793 -msgid "Icons" -msgstr "" - -#: ../includes/locals.php:794 -msgid "Labels" -msgstr "" - -#: ../includes/locals.php:795 -msgid "Both" -msgstr "" - -#: ../includes/locals.php:798 -msgid "Cherry - Twitter" -msgstr "" - -#: ../includes/locals.php:799 -msgid "Twitter Name:" -msgstr "" - -#: ../includes/locals.php:800 -msgid "Twitts Number:" -msgstr "" - -#: ../includes/locals.php:803 -msgid "Cherry - vCard" -msgstr "" - -#: ../includes/locals.php:804 -msgid "Use this widget to add a vCard" -msgstr "" - -#: ../includes/locals.php:805 -msgid "vCard" -msgstr "" - -#: ../includes/locals.php:806 -msgid "Street Address:" -msgstr "" - -#: ../includes/locals.php:807 -msgid "HTML map code:" -msgstr "" - -#: ../includes/locals.php:808 -msgid "Map width:" -msgstr "" - -#: ../includes/locals.php:809 -msgid "Map height:" -msgstr "" - -#: ../includes/locals.php:810 -msgid "Display map" -msgstr "" - -#: ../includes/locals.php:811 -msgid "City/Locality:" -msgstr "" - -#: ../includes/locals.php:812 -msgid "State/Region:" -msgstr "" - -#: ../includes/locals.php:813 -msgid "Zipcode/Postal Code:" -msgstr "" - -#: ../includes/locals.php:814 -msgid "Telephone:" -msgstr "" - -#: ../includes/locals.php:815 -msgid "Email:" -msgstr "" - -#: ../includes/locals.php:818 ../includes/locals.php:819 -msgid "Cherry - Facebook Like Box Widget" -msgstr "" - -#: ../includes/locals.php:820 -msgid "Facebook page url" -msgstr "" - -#: ../includes/locals.php:821 -msgid "" -"The Like Box only works with <a target=\"_blank\" href=\"https://www." -"facebook.com/help/174987089221178/\" title=\"Facebook Pages\">Facebook Pages." -"</a>" -msgstr "" - -#: ../includes/locals.php:822 -msgid "Color Scheme" -msgstr "" - -#: ../includes/locals.php:823 -msgid "Light" -msgstr "" - -#: ../includes/locals.php:824 -msgid "Dark" -msgstr "" - -#: ../includes/locals.php:825 -msgid "Display header" -msgstr "" - -#: ../includes/locals.php:826 -msgid "Display stream" -msgstr "" - -#: ../includes/locals.php:827 -msgid "Display border" -msgstr "" - -#: ../includes/locals.php:828 -msgid "Display faces" -msgstr "" - -#: ../includes/locals.php:829 -msgid "My Facebook Page" -msgstr "" - -#: ../includes/locals.php:832 -msgid "Default options restored." -msgstr "" - -#: ../includes/locals.php:833 -msgid "Options saved." -msgstr "" - -#: ../includes/locals.php:834 -msgid "Cherry Store" -msgstr "" - -#: ../includes/locals.php:835 -msgid "Latest Templates" -msgstr "" - -#: ../includes/locals.php:836 -msgid "News & Updates" -msgstr "" - -#: ../includes/locals.php:837 -msgid "Help & Support" -msgstr "" - -#: ../includes/locals.php:838 -msgid "No items" -msgstr "" - -#: ../includes/locals.php:839 -msgid "Posted" -msgstr "" - -#: ../includes/locals.php:840 -msgid "All templates" -msgstr "" - -#: ../includes/locals.php:843 -msgid "Start" -msgstr "" - -#: ../includes/locals.php:846 -msgid "Data Management" -msgstr "" - -#: ../includes/locals.php:847 -msgid "Cherry Framework" -msgstr "" - -#: ../includes/locals.php:848 -msgid "Update Info" -msgstr "" - -#: ../includes/locals.php:849 -msgid "Child Theme" -msgstr "" - -#: ../includes/locals.php:850 -msgid "Update" -msgstr "" - -#: ../includes/locals.php:851 -msgid "Backup" -msgstr "" - -#: ../includes/locals.php:852 -msgid "Restore" -msgstr "" - -#: ../includes/locals.php:853 -msgid "Download Backup" -msgstr "" - -#: ../includes/locals.php:856 -msgid "Your Version" -msgstr "" - -#: ../includes/locals.php:857 -msgid "Update Version" -msgstr "" - -#: ../includes/locals.php:858 -msgid "Backup Version" -msgstr "" - -#: ../includes/locals.php:859 -msgid "Last Backup Date" -msgstr "" - -#: ../includes/locals.php:860 -msgid "Preview" -msgstr "" - -#: ../includes/locals.php:861 -msgid "Description" -msgstr "" - -#: ../includes/locals.php:862 -msgid "No backup." -msgstr "" - -#: ../includes/locals.php:863 -msgid "Not defined" -msgstr "" - -#: ../includes/locals.php:864 -msgid "Unfortunately theme " -msgstr "" - -#: ../includes/locals.php:865 -msgid " backup file not found. Please try to create backup once again." -msgstr "" - -#: ../includes/locals.php:866 -msgid "" -"Data Management allows to update or backup framework and themes. Framework " -"is regularly updated thus delivering new opportunities for your site.<br> To " -"keep your data safe, you can back up the framework or child theme, to be " -"able to download it later. If necessary, you can restore the framework or " -"your theme using the backup." -msgstr "" - -#: ../includes/locals.php:867 -msgid "" -"<b>Warning!</b> Before updating framework you are strongly advised to backup " -"your data." -msgstr "" - -#: ../includes/locals.php:868 -msgid "" -"You can back up your theme. If the theme has a backup copy, it is possible " -"to restore it or download. The date of the latest backup copy is displayed " -"in the column <b>Last Backup Date</b>." -msgstr "" - -#: ../includes/locals.php:869 -msgid "" -"<b style=\"color:red;\">Warning!</b> Before updating framework you are " -"strongly advised to <a href=\"admin.php?page=options-framework-data-" -"management\">backup</a> your data." -msgstr "" - -#: ../includes/locals.php:873 -msgid "View File" -msgstr "" - -#: ../includes/locals.php:874 -msgid "Previously Uploaded" -msgstr "" - -#: ../includes/locals.php:896 -msgid "" -"<p>An Unexpected HTTP Error occurred during the API request.</p><p><a " -"href='#' onclick='document.location.reload(); return false;'>Try again</a></" -"p>" -msgstr "" - -#: ../includes/locals.php:897 -msgid "An unknown error occurred" -msgstr "" - -#: ../includes/locals.php:898 -msgid "There is a new version of Cherry framework available" -msgstr "" - -#: ../includes/locals.php:899 -msgid "View version " -msgstr "" - -#: ../includes/locals.php:900 -msgid " details" -msgstr "" - -#: ../includes/locals.php:901 -msgid "or" -msgstr "" - -#: ../includes/locals.php:902 -msgid "update now." -msgstr "" - -#: ../includes/locals.php:906 -msgid "Please do not load this page directly. Thanks!" -msgstr "" - -#: ../includes/locals.php:907 -msgid "This post is password protected. Enter the password to view comments." -msgstr "" - -#: ../includes/locals.php:908 -msgid "1 Response" -msgstr "" - -#: ../includes/locals.php:909 -#, php-format -msgid "%1$s Responses" -msgstr "" - -#: ../includes/locals.php:910 -msgid "No Comments Yet." -msgstr "" - -#: ../includes/locals.php:911 -msgid "Comments are closed." -msgstr "" - -#: ../includes/locals.php:912 -msgid "Leave a comment" -msgstr "" - -#: ../includes/locals.php:913 -msgid "You must be" -msgstr "" - -#: ../includes/locals.php:914 -msgid "to post a comment." -msgstr "" - -#: ../includes/locals.php:915 -msgid "Logged in" -msgstr "" - -#: ../includes/locals.php:916 -msgid "Logged in as" -msgstr "" - -#: ../includes/locals.php:917 -msgid "Log out of this account;" -msgstr "" - -#: ../includes/locals.php:918 -msgid "Log out »" -msgstr "" - -#: ../includes/locals.php:920 -msgid "Email (will not be published)" -msgstr "" - -#: ../includes/locals.php:921 -msgid "Website" -msgstr "" - -#: ../includes/locals.php:922 -msgid "Your comment*" -msgstr "" - -#: ../includes/locals.php:923 -msgid "Submit Comment" -msgstr "" - -#: ../includes/locals.php:926 -msgid "Tweet this article" -msgstr "" - -#: ../includes/locals.php:929 -msgid "Continue Reading" -msgstr "" - -#: ../includes/locals.php:930 -msgid "Pages:" -msgstr "" - -#: ../includes/locals.php:931 -msgid "Last 30 Posts" -msgstr "" - -#: ../includes/locals.php:932 -msgid "Archives by Month:" -msgstr "" - -#: ../includes/locals.php:933 -msgid "Archives by Subject:" -msgstr "" - -#: ../includes/locals.php:936 -msgid "About:" -msgstr "" - -#: ../includes/locals.php:937 -msgid "Recent Posts by" -msgstr "" - -#: ../includes/locals.php:938 -msgid "No post yet" -msgstr "" - -#: ../includes/locals.php:939 -msgid "Recent Comments by" -msgstr "" - -#: ../includes/locals.php:940 -#, php-format -msgid "%1$s on %2$s" -msgstr "" - -#: ../includes/locals.php:941 -msgid "No comments by" -msgstr "" - -#: ../includes/locals.php:942 -msgid "yet." -msgstr "" - -#: ../includes/locals.php:945 -msgid "There has been an error." -msgstr "" - -#: ../includes/locals.php:946 -msgid "We apologize for any inconvenience, please" -msgstr "" - -#: ../includes/locals.php:947 -msgid "return to the home page" -msgstr "" - -#: ../includes/locals.php:948 -msgid "or use the search form below." -msgstr "" - -#: ../includes/locals.php:951 -msgid "Q?" -msgstr "" - -#: ../includes/locals.php:952 -msgid "A." -msgstr "" - -#: ../includes/locals.php:955 -msgid "Written by" -msgstr "" - -#: ../includes/locals.php:956 -msgid "View all posts by" -msgstr "" - -#: ../includes/locals.php:959 -msgid "Not Found" -msgstr "" - -#: ../includes/locals.php:960 -msgid "" -"Apologies, but no results were found for the requested archive. Perhaps " -"searching will help find a related post." -msgstr "" - -#: ../includes/locals.php:963 -msgid "is proudly powered by" -msgstr "" - -#: ../includes/locals.php:964 -msgid "Entries (RSS)" -msgstr "" - -#: ../includes/locals.php:965 -msgid "Comments (RSS)" -msgstr "" - -#: ../includes/locals.php:966 -msgid "Privacy Policy" -msgstr "" - -#: ../includes/locals.php:969 -msgid "Category Archives" -msgstr "" - -#: ../includes/locals.php:970 -msgid "Portfolio Category" -msgstr "" - -#: ../includes/locals.php:971 -msgid "Search for" -msgstr "" - -#: ../includes/locals.php:972 -msgid "Daily Archives" -msgstr "" - -#: ../includes/locals.php:973 -msgid "Monthly Archives" -msgstr "" - -#: ../includes/locals.php:974 -msgid "Yearly Archives" -msgstr "" - -#: ../includes/locals.php:975 -msgid "by " -msgstr "" - -#: ../includes/locals.php:976 -msgid "Tag Archives" -msgstr "" - -#: ../includes/locals.php:977 -msgid "Portfolio Tag" -msgstr "" - -#: ../includes/locals.php:980 -msgid "Category Archive for" -msgstr "" - -#: ../includes/locals.php:981 -msgid "Tag Archive for" -msgstr "" - -#: ../includes/locals.php:982 ../includes/locals.php:1025 -msgid "Archive" -msgstr "" - -#: ../includes/locals.php:983 -msgid "Error 404 Not Found" -msgstr "" - -#: ../includes/locals.php:986 -msgid "Launch Project" -msgstr "" - -#: ../includes/locals.php:989 -msgid "Sorry!" -msgstr "" - -#: ../includes/locals.php:990 -msgid "Page Not Found" -msgstr "" - -#: ../includes/locals.php:991 -msgid "" -"The page you are looking for might have been removed, had its name changed, " -"or is temporarily unavailable." -msgstr "" - -#: ../includes/locals.php:992 -msgid "" -"Please try using our search box below to look for information on the " -"internet." -msgstr "" - -#: ../includes/locals.php:995 -msgid "Posted in" -msgstr "" - -#: ../includes/locals.php:998 -msgid "Featured" -msgstr "" - -#: ../includes/locals.php:1002 -msgid "Submit Permalink Structure" -msgstr "" - -#: ../includes/locals.php:1003 -msgid "" -"This way of links configuration can be used by not only our blog followers " -"but will help in SEO-optimisation as well. The effectiveness and main " -"features of this link configuration method are revealed <a href='http://" -"codex.wordpress.org/Using_Permalinks'>here</a>" -msgstr "" - -#: ../includes/locals.php:1004 -msgid "Import Sample Data" -msgstr "" - -#: ../includes/locals.php:1005 -msgid "" -"If you want to install sample data from livedemo you need to go to " -"<strong>Cherry Options</strong> > <strong>Import</strong> and follow the " -"tips." -msgstr "" - -#: ../includes/locals.php:1006 -msgid "" -"If you want to install sample data from livedemo you need to go to " -"<strong>Import</strong> and follow the tips." -msgstr "" - -#: ../includes/locals.php:1009 -msgid "No lable." -msgstr "" - -#: ../includes/locals.php:1012 -msgid "Theme Options Media" -msgstr "" - -#: ../includes/locals.php:1015 -msgid "Visibility" -msgstr "" - -#: ../includes/locals.php:1016 -msgid "Visible at" -msgstr "" - -#: ../includes/locals.php:1017 -msgid "Visible on" -msgstr "" - -#: ../includes/locals.php:1018 -msgid "Visible for" -msgstr "" - -#: ../includes/locals.php:1019 -msgid "All pages" -msgstr "" - -#: ../includes/locals.php:1020 -msgid "All pages expecting" -msgstr "" - -#: ../includes/locals.php:1021 -msgid "No pages expecting" -msgstr "" - -#: ../includes/locals.php:1022 -msgid "Homepage" -msgstr "" - -#: ../includes/locals.php:1023 -msgid "Page" -msgstr "" - -#: ../includes/locals.php:1024 -msgid "Post" -msgstr "" - -#: ../includes/locals.php:1026 -msgid "Page Template" -msgstr "" - -#: ../includes/locals.php:1027 -msgid "Search page" -msgstr "" - -#: ../includes/locals.php:1028 -msgid "404 page" -msgstr "" - -#: ../includes/locals.php:1029 -msgid "Page ID/Title/slug" -msgstr "" - -#: ../includes/locals.php:1030 -msgid "Post ID/Title/slug" -msgstr "" - -#: ../includes/locals.php:1031 -msgid "Category ID/Name/slug" -msgstr "" - -#: ../includes/locals.php:1032 -msgid "Tag ID/Name" -msgstr "" - -#: ../includes/locals.php:1033 -msgid "Template" -msgstr "" - -#: ../includes/locals.php:1034 -msgid "Add page" -msgstr "" - -#: ../includes/locals.php:1035 -msgid "Selected pages" -msgstr "" - -#: ../includes/locals.php:1036 -msgid "No pages" -msgstr "" - -#: ../includes/locals.php:1037 -msgid "All devices" -msgstr "" - -#: ../includes/locals.php:1038 -msgid "Desktops" -msgstr "" - -#: ../includes/locals.php:1039 -msgid "Tablets" -msgstr "" - -#: ../includes/locals.php:1040 -msgid "Phones" -msgstr "" - -#: ../includes/locals.php:1041 -msgid "Desktops/Tablets" -msgstr "" - -#: ../includes/locals.php:1042 -msgid "Tablets/Phones" -msgstr "" - -#: ../includes/locals.php:1043 -msgid "Desktops/Phones" -msgstr "" - -#: ../includes/locals.php:1044 -msgid "All users" -msgstr "" - -#: ../includes/locals.php:1045 -msgid "Only guests" -msgstr "" - -#: ../includes/locals.php:1046 -msgid "Only registered users" -msgstr "" - -#: ../includes/locals.php:1047 -msgid "Only administrator" -msgstr "" - -#: ../includes/locals.php:1048 -msgid "Select page to add" -msgstr "" - -#: ../includes/locals.php:1049 -msgid "Custom CSS class" -msgstr "" - -#: ../includes/locals.php:1052 -msgid "Sitemap XML" -msgstr "" - -#: ../includes/locals.php:1053 -msgid "Include post types." -msgstr "" - -#: ../includes/locals.php:1054 -msgid "Priority." -msgstr "" - -#: ../includes/locals.php:1055 -msgid "Change freq." -msgstr "" - -#: ../includes/locals.php:1056 -msgid "Post types settings." -msgstr "" - -#: ../includes/locals.php:1057 -msgid "" -"<strong>Include post types</strong> - specify the post types which will be " -"included into your sitemap." -msgstr "" - -#: ../includes/locals.php:1058 -msgid "" -"<strong>Priority</strong> - set post type priorities on your site. For " -"example, if the blog page content is more important for search engines than " -"the portfolio page content, set the priority for blog posts as 1, for " -"portfolio pages as 0.9 and so on." -msgstr "" - -#: ../includes/locals.php:1059 -msgid "" -"<strong>Change frequency</strong> - specify how often you change certain " -"post types. It helps the search engines to determine how relevant your " -"information is at the moment of search." -msgstr "" - -#: ../includes/locals.php:1060 -msgid "" -"<strong>Ping sitemap</strong> - choose the search engines which will receive " -"the link to your sitemap." -msgstr "" - -#: ../includes/locals.php:1061 -msgid "Ping sitemap." -msgstr "" - -#: ../includes/locals.php:1062 -msgid "SEO" -msgstr "" - -#: ../includes/locals.php:1063 -msgid "Your website indexation settings." -msgstr "" - -#: ../includes/locals.php:1064 -msgid "" -"Forbid the search engines to index the following directories of your site." -msgstr "" - -#: ../includes/locals.php:1065 -msgid "" -"These settings will help reduce the information search range on your site. " -msgstr "" - -#: ../includes/locals.php:1066 -msgid "WordPress engine system files and folders <em>(recommended)</em>" -msgstr "" - -#: ../includes/locals.php:1067 -msgid "Your plugins system files and folders <em>(recommended)</em>" -msgstr "" - -#: ../includes/locals.php:1068 -msgid "Your themes system files and folders <em>(recommended)</em>" -msgstr "" - -#: ../includes/locals.php:1069 -msgid "" -"Media library files (images, video, audio, etc.) <em>(not recommended)</em>" -msgstr "" - -#: ../includes/locals.php:1070 -msgid "" -"Add the <em>\"rel\"</em> attribute with the <em>\"nofollow\"</em> value to " -"content links." -msgstr "" - -#: ../includes/locals.php:1071 -msgid "" -"This option will stop the search engines from going to other sites following " -"the links in your site content." +"This does not appear to be a WXR file, missing/invalid WXR version number" msgstr "" diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.mo index 438e6580..a90798e4 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.po index 89c695e1..ef8ce71e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-de_DE.po @@ -1,207 +1,42 @@ msgid "" msgstr "" "Project-Id-Version: de_DE\n" -"POT-Creation-Date: 2014-02-25 10:43+0200\n" -"PO-Revision-Date: 2014-03-03 15:09+0200\n" -"Last-Translator: Alex Ross <alex@template-telp.com>\n" -"Language-Team: <demolink@info.org>\n" +"POT-Creation-Date: 2015-06-24 13:07+0200\n" +"PO-Revision-Date: 2015-06-24 13:08+0200\n" +"Last-Translator: \n" +"Language-Team: Cherry Team <demolink@info.org>\n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -#: ../admin/admin.php:28 +#: ../admin/admin.php:30 msgid "Cherry plugin" msgstr "Kirsche Plugin" -#: ../admin/admin.php:31 ../admin/admin.php:52 +#: ../admin/admin.php:33 ../admin/admin.php:54 msgid "Summary" msgstr "Zusammenfassung" -#: ../admin/admin.php:34 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 #: ../admin/plugin-pages.php:100 msgid "Maintenance Mode" msgstr "Wartungsmodus" -#: ../admin/admin.php:37 +#: ../admin/admin.php:39 msgid "Import Content" msgstr "importieren Inhalt" -#: ../admin/admin.php:40 ../admin/import-export/export.php:30 +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 msgid "Export Content" msgstr "Exportieren Inhalt" -#: ../admin/plugin-components.php:36 -msgid "Documentation" -msgstr "Dokumentation" - -#: ../admin/plugin-components.php:37 -msgid "Support" -msgstr "Support" - -#: ../admin/plugin-function.php:5 -msgid "Remove Inactive Widgets" -msgstr "Entfernen Inaktive Widgets" - -#: ../admin/plugin-function.php:23 -msgid "CTRL+A (Command-A) to select all files" -msgstr "STRG + A (Befehlstaste-A), um alle Dateien auszuwÃ¤hlen" - -#: ../admin/plugin-function.php:37 -msgid "Files are downloaded as a .zip archive" -msgstr "Die Dateien werden als. zip archiv heruntergeladen" - -#: ../admin/plugin-maintenance-mode.php:62 -msgid "Enable this option to activate website maintenance mode." -msgstr "Aktivieren Sie diese Option, um Website Wartung Modus zu aktivieren." - -#: ../admin/plugin-maintenance-mode.php:68 -msgid "Display Logo?" -msgstr "Logo anzeigen? " - -#: ../admin/plugin-maintenance-mode.php:73 -msgid "" -"Enable this option to display website logo at the under construction page" -msgstr "" -"Aktivieren Sie diese Option, um Website-Logo an der im Bau-Seite anzuzeigen " - -#: ../admin/plugin-maintenance-mode.php:79 -msgid "Description." -msgstr "Beschreibung. " - -#: ../admin/plugin-maintenance-mode.php:89 -#: ../admin/plugin-maintenance-mode.php:94 -msgid "Display timer?" -msgstr "Anzeige-Timer? " - -#: ../admin/plugin-maintenance-mode.php:100 -msgid "Website launch date." -msgstr "Website-Starttermin. " - -#: ../admin/plugin-maintenance-mode.php:101 -msgid "Date is not correct." -msgstr "Datum ist nicht korrekt. " - -#: ../admin/plugin-maintenance-mode.php:105 -msgid "Year:" -msgstr "Jahr: " - -#: ../admin/plugin-maintenance-mode.php:107 -msgid "Month:" -msgstr "Monat: " - -#: ../admin/plugin-maintenance-mode.php:109 -msgid "Day:" -msgstr "Tag:" - -#: ../admin/plugin-maintenance-mode.php:113 -msgid "Hour:" -msgstr "Stunde: " - -#: ../admin/plugin-maintenance-mode.php:115 -msgid "Minute:" -msgstr "Minute: " - -#: ../admin/plugin-maintenance-mode.php:123 -msgid "Save Changes" -msgstr "Ãnderungen speichern" - -#: ../admin/plugin-pages.php:6 -msgid "Cherry Plugin" -msgstr "Kirsch Plugin " - -#: ../admin/plugin-pages.php:11 -msgid "" -"Cherry Plugin has been released with intention to separate widgets, " -"shortcodes and data management logics with theme editor options. Cherry " -"Plugin is installed automatically on CherryFramework installation and is " -"required for the correct work of CherryFramework. " -msgstr "" -"Kirsch Plugin hat mit Absicht getrennte Widgets, Shortcodes und Daten-" -"Management-Logiken mit Thema Editor-Optionen verÃ¶ffentlicht. Kirsch Plugin " -"wird automatisch auf CherryFramework Installation installiert und ist fÃ¼r " -"die korrekte Arbeit von CherryFramework erforderlich. " - -#: ../admin/plugin-pages.php:15 ../admin/import-export/import.php:80 -msgid "Files Import demo" -msgstr "Demo Dateien importieren" - -#: ../admin/plugin-pages.php:19 -msgid "Import" -msgstr "importieren" - -#: ../admin/plugin-pages.php:20 -msgid "" -"Option to import website content from the backup. Select all files from the " -"backup archive and drag them to the upload files area to start uploading." -msgstr "" -"Option, um Website-Inhalte aus dem Backup zu importieren. WÃ¤hlen Sie alle " -"Dateien aus dem Backup-Archiv und ziehen Sie sie auf den Bereich Upload-" -"Dateien, um das Hochladen zu starten." - -#: ../admin/plugin-pages.php:26 -msgid "Files Export demo" -msgstr "Demo Dateien exportieren" - -#: ../admin/plugin-pages.php:30 -msgid "Export" -msgstr "exportieren" - -#: ../admin/plugin-pages.php:31 -msgid "" -"Option to backup your website data creating a downloadable archive. Use this " -"option to keep your website data on performing some serious modifications or " -"moving website to other hosting." -msgstr "" -"Option zur Sicherung Ihrer Website-Daten Erstellen einer Download- Archiv. " -"Verwenden Sie diese Option, um Ihre Website-Daten Ã¼ber die AusfÃ¼hrung einige " -"gravierende Ãnderungen oder Verschieben Website zu anderen Hosting halten." - -#: ../admin/plugin-pages.php:42 -msgid "Widgets" -msgstr "Widgets" - -#: ../admin/plugin-pages.php:43 -msgid "" -"Cherry Widgets offer additional ways to place content to widget areas. " -"Several available widget will allow you to add more functionality to your " -"website." -msgstr "" -"Kirsch Widgets bieten zusÃ¤tzliche MÃ¶glichkeiten, Inhalte zu Widget Bereichen " -"zu platzieren. Mehrere VerfÃ¼gung Widget ermÃ¶glicht es Ihnen, mehr " -"FunktionalitÃ¤t zu Ihrer Website hinzufÃ¼gen." - -#: ../admin/plugin-pages.php:52 -msgid "Shortcodes" -msgstr "Shortcodes" - -#: ../admin/plugin-pages.php:53 -msgid "" -"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " -"create various content structures in WordPress posts. Use \"Insert Shortcode" -"\" icon in post editor toolbar to add shortcodes." -msgstr "" -"Kirsch Plugin fÃ¼gt verschiedene Widgets auf den Post-Editor . Shortcodes " -"erlauben , verschiedene Content-Strukturen in Wordpress BeitrÃ¤ge erstellen. " -"Verwenden Symbol \"Einsetzen Kurzwahl\" in dem Editor, um " -"KurzwahlleistehinzufÃ¼gen." - -#: ../admin/plugin-pages.php:53 -msgid "Learn more" -msgstr "Erfahren Sie mehr" - -#: ../admin/plugin-pages.php:79 -msgid "Cherry Content Import" -msgstr "Kirsch Inhalt Import" - -#: ../admin/plugin-pages.php:90 -msgid "Cherry Content Export" -msgstr "Kirsch Inhalt Export" - -#: ../admin/import-export/export-functions.php:14 +#: ../admin/import-export/export-functions.php:18 msgid "Export content done" msgstr "Exportanteil getan" @@ -293,43 +128,43 @@ msgstr "BenÃ¶tig" msgid "Continue" msgstr "Fortsetzen" -#: ../admin/import-export/import.php:32 +#: ../admin/import-export/import.php:34 msgid "Upload Error" msgstr "Fehler Galerie " -#: ../admin/import-export/import.php:33 +#: ../admin/import-export/import.php:35 msgid "The file is too big!" msgstr "Die Datei ist zu groÃ! " -#: ../admin/import-export/import.php:34 +#: ../admin/import-export/import.php:36 msgid "The file type is error!" msgstr "Der Dateityp ist Fehler! " -#: ../admin/import-export/import.php:35 +#: ../admin/import-export/import.php:37 msgid "Folder cannot be uploaded!" msgstr "Ordner kÃ¶nnen nicht hochgeladen werden! " -#: ../admin/import-export/import.php:36 +#: ../admin/import-export/import.php:38 msgid "Uploading" msgstr "Hochladen" -#: ../admin/import-export/import.php:37 ../admin/import-export/import.php:111 +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 msgid "Upload" msgstr "Hochladen" -#: ../admin/import-export/import.php:38 +#: ../admin/import-export/import.php:40 msgid "Upload Complete" msgstr "Hochladen Komplett" -#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 msgid "item" msgstr "Artikel" -#: ../admin/import-export/import.php:40 +#: ../admin/import-export/import.php:42 msgid "items" msgstr "Artikel" -#: ../admin/import-export/import.php:41 +#: ../admin/import-export/import.php:43 msgid "" "Sample data installing. Some steps may take some time depending on your " "server settings. Please be patient." @@ -337,79 +172,79 @@ msgstr "" "Sample-Daten Installation. Einige Schritte kann einige Zeit dauern, abhÃ¤ngig " "von der Server-Einstellungen. Bitte haben Sie Geduld." -#: ../admin/import-export/import.php:42 +#: ../admin/import-export/import.php:44 msgid "Upload complete please click Continue Install button to proceed." msgstr "" "Galerie klicken Sie bitte auf komplette Installation fortsetzen, um " "fortzufahren." -#: ../admin/import-export/import.php:44 +#: ../admin/import-export/import.php:46 msgid "Importing XML" msgstr "Importieren von XML" -#: ../admin/import-export/import.php:45 +#: ../admin/import-export/import.php:47 msgid "Importing categories" msgstr "Importieren Kategorien" -#: ../admin/import-export/import.php:46 +#: ../admin/import-export/import.php:48 msgid "Importing tags" msgstr "Importieren Tags" -#: ../admin/import-export/import.php:47 +#: ../admin/import-export/import.php:49 msgid "Processing dependencies" msgstr "Verarbeitung AbhÃ¤ngigkeiten" -#: ../admin/import-export/import.php:48 +#: ../admin/import-export/import.php:50 msgid "Importing posts. This may take some time. Please wait." msgstr "Importieren BeitrÃ¤ge. Dies kann einige Zeit dauern. Bitte warten Sie." -#: ../admin/import-export/import.php:49 +#: ../admin/import-export/import.php:51 msgid "Importing menu items. This may take some time. Please wait." msgstr "" "Importieren von MenÃ¼punkten. Dies kann einige Zeit dauern. Bitte warten Sie." -#: ../admin/import-export/import.php:50 +#: ../admin/import-export/import.php:52 msgid "Importing media library." msgstr "Importieren Medienbibliothek." -#: ../admin/import-export/import.php:51 +#: ../admin/import-export/import.php:53 msgid "Importing attachements meta." msgstr "Importieren Beilage Meta." -#: ../admin/import-export/import.php:52 +#: ../admin/import-export/import.php:54 msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" "Generieren von Meta-Beilage. Dies kann einige Zeit dauern. Bitte warten Sie." -#: ../admin/import-export/import.php:53 +#: ../admin/import-export/import.php:55 msgid "Generating content hierarchy" msgstr "Generierung von Inhalten Hierarchie" -#: ../admin/import-export/import.php:54 +#: ../admin/import-export/import.php:56 msgid "Updating featured images" msgstr "Aktualisieren Besondere Aufnahmen" -#: ../admin/import-export/import.php:55 +#: ../admin/import-export/import.php:57 msgid "Updating attachments" msgstr "AnhÃ¤nge werden aktualisiert" -#: ../admin/import-export/import.php:56 +#: ../admin/import-export/import.php:58 msgid "Importing JSON" msgstr "Importieren JSON" -#: ../admin/import-export/import.php:57 +#: ../admin/import-export/import.php:59 msgid "Installing content complete" msgstr "Installieren komplette Inhalt" -#: ../admin/import-export/import.php:58 +#: ../admin/import-export/import.php:60 msgid "Installing content error" msgstr "Installieren inhaltlicher Fehler" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "Warning!" msgstr "Achtung!" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "" "Installing sample data will replace your website content. Please make sure " "to backup your website data before importing content." @@ -418,50 +253,54 @@ msgstr "" "stellen Sie sicher, dass Sie ein Backup Ihrer Website-Daten vor dem Import " "Inhalt." -#: ../admin/import-export/import.php:72 +#: ../admin/import-export/import.php:74 msgid "Please Drop all needed files here <br> to import sample data" msgstr "" "Bitte LÃ¶schen Sie alle benÃ¶tigten Dateien hier <br>, um Beispieldaten " "importieren" -#: ../admin/import-export/import.php:73 ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 msgid "or" msgstr "oder" -#: ../admin/import-export/import.php:75 +#: ../admin/import-export/import.php:77 msgid "Browse local files" msgstr "Durchsuchen Sie lokale Dateien " -#: ../admin/import-export/import.php:78 +#: ../admin/import-export/import.php:80 #, php-format msgid "Maximum upload file size: %d %s." msgstr "Maximale Upload DateigrÃ¶Ãe: %d %s. " -#: ../admin/import-export/import.php:81 +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" +msgstr "Demo Dateien importieren" + +#: ../admin/import-export/import.php:83 msgid "View Demo" msgstr "Demo anzeigen " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File name" msgstr "Dateiname " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File size" msgstr "DateigrÃ¶Ãe " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "Uploaded file:" msgstr "Hochgeladene Datei: " -#: ../admin/import-export/import.php:105 +#: ../admin/import-export/import.php:107 msgid "Installing content started." msgstr "Installieren Inhalte gestartet." -#: ../admin/import-export/import.php:115 +#: ../admin/import-export/import.php:117 msgid "Install" msgstr "Installieren" -#: ../admin/import-export/import.php:120 +#: ../admin/import-export/import.php:122 msgid "" "Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " "and <b>.XML</b> files to install theme sample data." @@ -470,359 +309,225 @@ msgstr "" "<b>JSON</ b> und <b>.XML </b> Dateien auf Thema Beispieldaten zu " "installieren. " -#: ../admin/import-export/import.php:122 +#: ../admin/import-export/import.php:124 msgid "Add More Files" msgstr "Weitere Dateien hinzufÃ¼gen" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Continue Install" msgstr "Installation fortsetzen" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Missing .XML or .JSON file" msgstr "Fehlende. XML oder. JSON Datei" -#: ../admin/import-export/import.php:130 +#: ../admin/import-export/import.php:132 msgid "Congratulations" msgstr "GlÃ¼ckwÃ¼nsche" -#: ../admin/import-export/import.php:131 +#: ../admin/import-export/import.php:133 msgid "Content has been installed successfully" msgstr "Inhalt wurde erfolgreich installiert" -#: ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:135 msgid "View your site" msgstr "Sehen Sie Ihre Website" -#: ../admin/import-export/import.php:134 +#: ../admin/import-export/import.php:136 msgid "go to Cherry Options" msgstr "gehen Sie Cherry Optionen" -#: ../admin/shortcodes/dialog.php:21 -msgid "Shortcode Options" -msgstr "Shortcode-Optionen" - -#: ../admin/shortcodes/dialog.php:32 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../admin/shortcodes/dialog.php:33 ../admin/shortcodes/editor-plugin.php:782 -msgid "Insert Shortcode" -msgstr "Shortcode einfÃ¼gen" +#: ../admin/plugin-components.php:36 +msgid "Documentation" +msgstr "Dokumentation" -#: ../admin/shortcodes/editor-plugin.php:788 -msgid "Posts" -msgstr "Artikel" +#: ../admin/plugin-components.php:37 +msgid "Support" +msgstr "Support" -#: ../admin/shortcodes/editor-plugin.php:789 -msgid "Posts Grid" -msgstr "Artikel Grid" - -#: ../admin/shortcodes/editor-plugin.php:790 -msgid "Posts List" -msgstr "Artikel-Listen" - -#: ../admin/shortcodes/editor-plugin.php:791 -msgid "Mini Posts Grid" -msgstr "Mini Artikel Grid" - -#: ../admin/shortcodes/editor-plugin.php:792 -msgid "Mini Posts List" -msgstr "Mini Artikel-Listen" - -#: ../admin/shortcodes/editor-plugin.php:793 -msgid "Recent Posts" -msgstr "Aktuelle Artikel" - -#: ../admin/shortcodes/editor-plugin.php:794 -msgid "Recent Testimonials" -msgstr "Aktuelle Testimonials" - -#: ../admin/shortcodes/editor-plugin.php:795 -msgid "Basic" -msgstr "Basis" - -#: ../admin/shortcodes/editor-plugin.php:796 -msgid "Banner" -msgstr "Banner" - -#: ../admin/shortcodes/editor-plugin.php:797 -#: ../includes/shortcodes/carousel-owl.php:171 -#: ../includes/shortcodes/carousel.php:154 -#: ../includes/shortcodes/post-cycle.php:139 -#: ../includes/shortcodes/posts-list.php:161 -#: ../includes/shortcodes/posts-list.php:162 -#: ../includes/widgets/my-post-cycle-widget.php:127 -msgid "Comments" -msgstr "Kommentare" +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" +msgstr "Entfernen Inaktive Widgets" -#: ../admin/shortcodes/editor-plugin.php:798 -msgid "Post Cycle" -msgstr "Post Cycle" +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" +msgstr "STRG + A (Befehlstaste-A), um alle Dateien auszuwÃ¤hlen" -#: ../admin/shortcodes/editor-plugin.php:799 -msgid "Carousel (Elasti)" -msgstr "Karussell (Elasti)" +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" +msgstr "Die Dateien werden als. zip archiv heruntergeladen" -#: ../admin/shortcodes/editor-plugin.php:800 -msgid "Carousel (OWL)" -msgstr "Karussell (OWL)" +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." +msgstr "Aktivieren Sie diese Option, um Website Wartung Modus zu aktivieren." -#: ../admin/shortcodes/editor-plugin.php:801 -msgid "Roundabout" -msgstr "Roundabout " +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" +msgstr "Logo anzeigen? " -#: ../admin/shortcodes/editor-plugin.php:802 -msgid "Service Box" -msgstr "ServiceBox " +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" +msgstr "" +"Aktivieren Sie diese Option, um Website-Logo an der im Bau-Seite anzuzeigen " -#: ../admin/shortcodes/editor-plugin.php:803 -msgid "Hero Unit" -msgstr "HeroUnit" +#: ../admin/plugin-maintenance-mode.php:79 +msgid "Description" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:804 -msgid "Categories" -msgstr "Kategorien" +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" +msgstr "Anzeige-Timer? " -#: ../admin/shortcodes/editor-plugin.php:805 -#: ../includes/shortcodes/posts-list.php:281 -msgid "Tags" -msgstr "Tags" - -#: ../admin/shortcodes/editor-plugin.php:806 -msgid "Columns" -msgstr "Spalten" - -#: ../admin/shortcodes/editor-plugin.php:821 -msgid "Fluid Column" -msgstr "flexible Spalten" - -#: ../admin/shortcodes/editor-plugin.php:830 -msgid "2 Columns" -msgstr "2 Spalten" - -#: ../admin/shortcodes/editor-plugin.php:834 -msgid "3 Columns" -msgstr "3 Spalten" - -#: ../admin/shortcodes/editor-plugin.php:839 -msgid "4 Columns" -msgstr "4 Spalten" - -#: ../admin/shortcodes/editor-plugin.php:841 -msgid "Elements" -msgstr "Elementen" - -#: ../admin/shortcodes/editor-plugin.php:842 -msgid "Label" -msgstr "Marke" - -#: ../admin/shortcodes/editor-plugin.php:843 -msgid "Text Highlight" -msgstr "Textmarkierung " - -#: ../admin/shortcodes/editor-plugin.php:844 -msgid "Button" -msgstr "Schalter" - -#: ../admin/shortcodes/editor-plugin.php:845 -msgid "Drop Cap" -msgstr "DropCap (Initial gestalten)" - -#: ../admin/shortcodes/editor-plugin.php:846 -msgid "Blockquote" -msgstr "Blockquote" - -#: ../admin/shortcodes/editor-plugin.php:847 -msgid "Icon" -msgstr "Icon" - -#: ../admin/shortcodes/editor-plugin.php:848 -msgid "Frame" -msgstr "Rahmen " - -#: ../admin/shortcodes/editor-plugin.php:849 -msgid "Horizontal Rule" -msgstr "Horizontale Linie" - -#: ../admin/shortcodes/editor-plugin.php:850 -msgid "Small Horizontal Rule" -msgstr "Kleine horizontale Linie" - -#: ../admin/shortcodes/editor-plugin.php:851 -msgid "Vertical Rule" -msgstr "Vertikale Linie" - -#: ../admin/shortcodes/editor-plugin.php:852 -msgid "Spacer" -msgstr "Abstandhalter" - -#: ../admin/shortcodes/editor-plugin.php:853 -msgid "Progressbar" -msgstr "Fortschrittsanzeige" - -#: ../admin/shortcodes/editor-plugin.php:854 -msgid "Address" -msgstr "Adresse" - -#: ../admin/shortcodes/editor-plugin.php:855 -msgid "Clear" -msgstr "Sauber" - -#: ../admin/shortcodes/editor-plugin.php:856 -msgid "Extra Wrap" -msgstr "Extra Wrap" - -#: ../admin/shortcodes/editor-plugin.php:857 -msgid "Lists" -msgstr "Listen" - -#: ../admin/shortcodes/editor-plugin.php:858 -msgid "Unstyled" -msgstr "Unformatierte" - -#: ../admin/shortcodes/editor-plugin.php:859 -msgid "Check List" -msgstr "Liste markieren" - -#: ../admin/shortcodes/editor-plugin.php:860 -msgid "Check 2 List" -msgstr "2 Liste markieren" - -#: ../admin/shortcodes/editor-plugin.php:861 -msgid "OK Circle List" -msgstr "OK Kreis Liste" - -#: ../admin/shortcodes/editor-plugin.php:862 -msgid "OK Sign List" -msgstr "Okayzeichen Liste" - -#: ../admin/shortcodes/editor-plugin.php:863 -msgid "Arrow List" -msgstr "Liste mit Pfeil-Symbol " - -#: ../admin/shortcodes/editor-plugin.php:864 -msgid "Arrow 2 List" -msgstr "Arrow 2 List" +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." +msgstr "Website-Starttermin. " -#: ../admin/shortcodes/editor-plugin.php:865 -msgid "Circle Arrow List" -msgstr "Kreis Pfeil Liste " +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." +msgstr "Datum ist nicht korrekt. " -#: ../admin/shortcodes/editor-plugin.php:866 -msgid "Caret List" -msgstr "EinfÃ¼gezeichen Liste" +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" +msgstr "Jahr: " -#: ../admin/shortcodes/editor-plugin.php:867 -msgid "Angle List" -msgstr "Winkel Liste" +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" +msgstr "Monat: " -#: ../admin/shortcodes/editor-plugin.php:868 -msgid "Double Angle List" -msgstr "Doppelwinkel Liste" +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" +msgstr "Tag:" -#: ../admin/shortcodes/editor-plugin.php:869 -msgid "Star List" -msgstr "Liste mit Sternchen-Symbol " +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" +msgstr "Stunde: " -#: ../admin/shortcodes/editor-plugin.php:870 -msgid "Plus List" -msgstr "Liste mit Plus-Symbol " +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" +msgstr "Minute: " -#: ../admin/shortcodes/editor-plugin.php:871 -msgid "Minus List" -msgstr "Liste mit Minus-Symbol " +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" +msgstr "Ãnderungen speichern" -#: ../admin/shortcodes/editor-plugin.php:872 -msgid "Circle List" -msgstr "Kreis Liste" +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" +msgstr "Kirsch Plugin " -#: ../admin/shortcodes/editor-plugin.php:873 -msgid "Circle Blank List" -msgstr "Kreis Leer Liste" +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " +msgstr "" +"Kirsch Plugin hat mit Absicht getrennte Widgets, Shortcodes und Daten-" +"Management-Logiken mit Thema Editor-Optionen verÃ¶ffentlicht. Kirsch Plugin " +"wird automatisch auf CherryFramework Installation installiert und ist fÃ¼r " +"die korrekte Arbeit von CherryFramework erforderlich. " -#: ../admin/shortcodes/editor-plugin.php:874 -msgid "Custom List" -msgstr "Custom-List " +#: ../admin/plugin-pages.php:19 +msgid "Import" +msgstr "importieren" -#: ../admin/shortcodes/editor-plugin.php:875 -msgid "Misc" -msgstr "Misc" +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." +msgstr "" +"Option, um Website-Inhalte aus dem Backup zu importieren. WÃ¤hlen Sie alle " +"Dateien aus dem Backup-Archiv und ziehen Sie sie auf den Bereich Upload-" +"Dateien, um das Hochladen zu starten." -#: ../admin/shortcodes/editor-plugin.php:876 -msgid "Alert Box" -msgstr "Alertbox " +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" +msgstr "Demo Dateien exportieren" -#: ../admin/shortcodes/editor-plugin.php:877 -msgid "Close icon" -msgstr "Icon schlieÃen" +#: ../admin/plugin-pages.php:30 +msgid "Export" +msgstr "exportieren" -#: ../admin/shortcodes/editor-plugin.php:878 -msgid "Well" -msgstr "Gud" +#: ../admin/plugin-pages.php:31 +msgid "" +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." +msgstr "" +"Option zur Sicherung Ihrer Website-Daten Erstellen einer Download- Archiv. " +"Verwenden Sie diese Option, um Ihre Website-Daten Ã¼ber die AusfÃ¼hrung einige " +"gravierende Ãnderungen oder Verschieben Website zu anderen Hosting halten." -#: ../admin/shortcodes/editor-plugin.php:879 -msgid "Small" -msgstr "Klein" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" +msgstr "Widgets" -#: ../admin/shortcodes/editor-plugin.php:880 -#: ../includes/widgets/my-comment-widget.php:140 -#: ../includes/widgets/my-facebook-widget.php:79 -#: ../includes/widgets/my-flickr-widget.php:57 -#: ../includes/widgets/my-posts-type-widget.php:205 -#: ../includes/widgets/my-recent-posts.php:126 -#: ../includes/widgets/my-recent-posts.php:148 -#: ../includes/widgets/my-social-widget.php:132 -#: ../includes/widgets/my-vcard-widget.php:151 -msgid "Title" -msgstr "Titel" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." +msgstr "" +"Kirsch Widgets bieten zusÃ¤tzliche MÃ¶glichkeiten, Inhalte zu Widget Bereichen " +"zu platzieren. Mehrere VerfÃ¼gung Widget ermÃ¶glicht es Ihnen, mehr " +"FunktionalitÃ¤t zu Ihrer Website hinzufÃ¼gen." -#: ../admin/shortcodes/editor-plugin.php:881 -msgid "Template URL" -msgstr "Template URL" +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" +msgstr "Shortcodes" -#: ../admin/shortcodes/editor-plugin.php:882 -msgid "Sitemap" -msgstr "Ãbersicht" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." +msgstr "" +"Kirsch Plugin fÃ¼gt verschiedene Widgets auf den Post-Editor . Shortcodes " +"erlauben , verschiedene Content-Strukturen in Wordpress BeitrÃ¤ge erstellen. " +"Verwenden Symbol \"Einsetzen Kurzwahl\" in dem Editor, um " +"KurzwahlleistehinzufÃ¼gen." -#: ../admin/shortcodes/editor-plugin.php:883 -msgid "Video Preview" -msgstr "Video-Vorschau" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" +msgstr "Erfahren Sie mehr" -#: ../admin/shortcodes/editor-plugin.php:884 -msgid "Tabs" -msgstr "Tabs" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" +msgstr "Kirsch Inhalt Import" -#: ../admin/shortcodes/editor-plugin.php:885 -msgid "Accordion" -msgstr "Akkordion" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" +msgstr "Kirsch Inhalt Export" -#: ../admin/shortcodes/editor-plugin.php:886 -msgid "Table" -msgstr "Tabelle" +#: ../admin/shortcodes/dialog.php:20 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 +msgid "Cancel" +msgstr "Abbrechen" -#: ../admin/shortcodes/editor-plugin.php:887 -msgid "Pricing Table" -msgstr "Preis Tabelle" +#: ../admin/shortcodes/dialog.php:21 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 +msgid "Insert" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:888 -#: ../includes/widgets/my-vcard-widget.php:156 -msgid "Google Map" -msgstr "Google Map" +#: ../admin/shortcodes/dialog.php:25 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 +msgid "Shortcode Options" +msgstr "Shortcode-Optionen" -#: ../includes/plugin-assets.php:32 +#: ../includes/plugin-assets.php:38 msgid "Under Construction Page Widgets Area." msgstr "Unter Konstruktion Seite Widgets Bereich." -#: ../includes/plugin-assets.php:34 +#: ../includes/plugin-assets.php:40 msgid "Under construction page widgets area." msgstr "Im Bau Widgets Bereich." -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Maintenance mode activated. Website is blocked from public" msgstr "Wartungsmodus aktiviert. Webseite aus Ã¶ffentlichen gesperrt" -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Settings." msgstr "Einstellungen." @@ -839,102 +544,89 @@ msgid "Hours" msgstr "Stunden" #: ../includes/plugin-under-construction-content.php:85 -msgid "Minuts" -msgstr "Minuten" +msgid "Minutes" +msgstr "" #: ../includes/plugin-under-construction-content.php:89 msgid "Seconds" msgstr "Sekunden" -#: ../includes/gt-custom/gt-custom.php:112 -msgid "Style Switcher Preview" -msgstr "Stil Umschalter ubersicht" - -#: ../includes/gt-custom/gt-customize.php:17 -msgid "Cheatin’ uh?" -msgstr "Cheatin’ uh?" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "%1$s — WordPress" -msgstr "%1$s — WordPress" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "Customize %s" -msgstr "Anpassen %s" - -#: ../includes/gt-custom/gt-customize.php:112 -msgid "Style Switcher" -msgstr "Stil Umschalter" - -#: ../includes/shortcodes/carousel-owl.php:165 -#: ../includes/shortcodes/posts-list.php:152 +#: ../includes/shortcodes/carousel-owl.php:168 +#: ../includes/shortcodes/posts-list.php:154 msgid "by " msgstr "von" -#: ../includes/shortcodes/carousel-owl.php:173 -#: ../includes/shortcodes/carousel.php:156 -#: ../includes/widgets/my-post-cycle-widget.php:129 +#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel.php:167 +#: ../includes/shortcodes/post-cycle.php:150 +#: ../includes/shortcodes/posts-list.php:163 +#: ../includes/shortcodes/posts-list.php:164 +#: ../includes/widgets/my-post-cycle-widget.php:153 +msgid "Comments" +msgstr "Kommentare" + +#: ../includes/shortcodes/carousel-owl.php:176 +#: ../includes/shortcodes/carousel.php:169 +#: ../includes/widgets/my-post-cycle-widget.php:155 msgid "Comment" msgstr "Kommentar" -#: ../includes/shortcodes/carousel.php:147 -#: ../includes/widgets/my-post-cycle-widget.php:118 +#: ../includes/shortcodes/carousel.php:160 +#: ../includes/widgets/my-post-cycle-widget.php:144 msgid "by" msgstr "von" -#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:25 +#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 #: ../includes/shortcodes/post-cycle.php:17 -#: ../includes/shortcodes/posts-grid.php:22 +#: ../includes/shortcodes/posts-grid.php:24 #: ../includes/shortcodes/posts-list.php:19 -#: ../includes/shortcodes/service-box.php:15 -#: ../includes/widgets/my-posts-type-widget.php:145 +#: ../includes/shortcodes/service-box.php:16 +#: ../includes/widgets/my-posts-type-widget.php:165 #: ../includes/widgets/my-recent-posts.php:87 msgid "Read more" msgstr "Mehr lesen" -#: ../includes/shortcodes/media.php:82 ../includes/shortcodes/media.php:205 -#: ../includes/shortcodes/media.php:216 -#: ../includes/shortcodes/shortcodes.php:211 -#: ../includes/shortcodes/shortcodes.php:309 -#: ../includes/shortcodes/shortcodes.php:320 +#: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 +#: ../includes/shortcodes/media.php:251 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 msgid "Play" msgstr "Start " -#: ../includes/shortcodes/media.php:83 ../includes/shortcodes/media.php:217 -#: ../includes/shortcodes/shortcodes.php:212 -#: ../includes/shortcodes/shortcodes.php:321 +#: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 msgid "Pause" msgstr "Pause" -#: ../includes/shortcodes/media.php:84 ../includes/shortcodes/media.php:218 -#: ../includes/shortcodes/shortcodes.php:214 -#: ../includes/shortcodes/shortcodes.php:322 +#: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 msgid "Stop" msgstr "Stopp" -#: ../includes/shortcodes/media.php:90 ../includes/shortcodes/media.php:224 -#: ../includes/shortcodes/shortcodes.php:220 -#: ../includes/shortcodes/shortcodes.php:328 +#: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 msgid "Mute" msgstr "Laut" -#: ../includes/shortcodes/media.php:91 ../includes/shortcodes/media.php:225 -#: ../includes/shortcodes/shortcodes.php:221 -#: ../includes/shortcodes/shortcodes.php:329 +#: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 msgid "Unmute" msgstr "Leise" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Update Required." msgstr "Aktualisierung erforderlich." -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "" "To play the media you will need to either update your browser to a recent " "version or update your " @@ -942,148 +634,387 @@ msgstr "" "Um die Medien zu spielen, mÃ¼ssen Sie entweder aktualisieren Sie Ihren " "Browser auf eine aktuelle Version oder aktualisieren Sie Ihre" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Flash plugin" msgstr "Flash plugin" -#: ../includes/shortcodes/post-cycle.php:166 +#: ../includes/shortcodes/post-cycle.php:210 msgid "Client" msgstr "Kunde " -#: ../includes/shortcodes/post-cycle.php:167 -#: ../includes/widgets/my-comment-widget.php:91 +#: ../includes/shortcodes/post-cycle.php:211 +#: ../includes/widgets/my-comment-widget.php:97 #: ../includes/widgets/my-recent-posts.php:147 msgid "Date" msgstr "Datum" -#: ../includes/shortcodes/post-cycle.php:168 -msgid "Info" -msgstr "Info" +#: ../includes/shortcodes/post-cycle.php:212 +msgid "Info" +msgstr "Info" + +#: ../includes/shortcodes/post-cycle.php:213 +msgid "Launch Project" +msgstr "Projekt starten" + +#: ../includes/shortcodes/posts-list.php:130 +#: ../includes/shortcodes/posts-list.php:139 +msgid "Posted in" +msgstr "Posted in" + +#: ../includes/shortcodes/posts-list.php:283 +msgid "Tags" +msgstr "Tags" + +#: ../includes/shortcodes/shortcodes.php:226 +msgid "Previous" +msgstr "Vorherige" + +#: ../includes/shortcodes/shortcodes.php:229 +msgid "Next" +msgstr "NÃ¤chste " + +#: ../includes/widgets/cherry-banner-widget.php:5 +msgid "Cherry - Banner" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:46 +#: ../includes/widgets/my-comment-widget.php:146 +#: ../includes/widgets/my-facebook-widget.php:79 +#: ../includes/widgets/my-flickr-widget.php:62 +#: ../includes/widgets/my-posts-type-widget.php:225 +#: ../includes/widgets/my-recent-posts.php:126 +#: ../includes/widgets/my-recent-posts.php:148 +#: ../includes/widgets/my-social-widget.php:108 +#: ../includes/widgets/my-vcard-widget.php:155 +msgid "Title" +msgstr "Titel" + +#: ../includes/widgets/cherry-banner-widget.php:47 +msgid "Banner description" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:48 +#: ../includes/widgets/cherry-instagram-widget.php:165 +msgid "Image URL" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:49 +msgid "Fill image" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:50 +#: ../includes/widgets/my-posts-type-widget.php:398 +#: ../includes/widgets/my-recent-posts.php:160 +msgid "Link URL" +msgstr "Link URL" + +#: ../includes/widgets/cherry-banner-widget.php:89 +msgid "Select Image" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Cherry - Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Widget for popular social network Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 +msgid "Widget Title" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "User Name" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +msgid "" +"Widget will work only for users who have full rights opened in Instagram " +"account." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Number of displayed images" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Max value: 20 images." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Image dimentions" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Large" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Thumbnail" +msgstr "Thumbnail (Miniaturbild)" + +#: ../includes/widgets/cherry-instagram-widget.php:153 +msgid "Show image description" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:156 +msgid "Show comments number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:159 +msgid "Show likes number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:162 +msgid "Show image publication date" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:168 +msgid "User account button text" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" +msgstr "Farbschema" -#: ../includes/shortcodes/post-cycle.php:169 -msgid "Launch Project" -msgstr "Projekt starten" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" +msgstr "Hell" -#: ../includes/shortcodes/posts-list.php:128 -#: ../includes/shortcodes/posts-list.php:137 -msgid "Posted in" -msgstr "Posted in" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" +msgstr "Dunkel" -#: ../includes/shortcodes/shortcodes.php:210 -msgid "Previous" -msgstr "Vorherige" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" +msgstr "" -#: ../includes/shortcodes/shortcodes.php:213 -msgid "Next" -msgstr "NÃ¤chste " +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." +msgstr "" -#: ../includes/widgets/my-banners-widget.php:13 +#: ../includes/widgets/my-banners-widget.php:7 msgid "Add 125x125 ads." msgstr "125x125-Ads hinzufÃ¼gen." -#: ../includes/widgets/my-banners-widget.php:17 -msgid "Cherry - 125x125 Ads." -msgstr "Cherry - 125x125 Ads." +#: ../includes/widgets/my-banners-widget.php:10 +msgid "Cherry - 125x125 Ads" +msgstr "" -#: ../includes/widgets/my-banners-widget.php:60 +#: ../includes/widgets/my-banners-widget.php:65 msgid "Ad 1" msgstr "Anzeige 1" -#: ../includes/widgets/my-banners-widget.php:62 -#: ../includes/widgets/my-banners-widget.php:71 -#: ../includes/widgets/my-banners-widget.php:80 -#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:67 +#: ../includes/widgets/my-banners-widget.php:76 +#: ../includes/widgets/my-banners-widget.php:85 +#: ../includes/widgets/my-banners-widget.php:94 msgid "Image Ad Link:" msgstr "Bild AdLink:" -#: ../includes/widgets/my-banners-widget.php:66 -#: ../includes/widgets/my-banners-widget.php:75 -#: ../includes/widgets/my-banners-widget.php:84 -#: ../includes/widgets/my-banners-widget.php:93 +#: ../includes/widgets/my-banners-widget.php:71 +#: ../includes/widgets/my-banners-widget.php:80 +#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:98 msgid "Ad Link:" msgstr "AdLink:" -#: ../includes/widgets/my-banners-widget.php:69 +#: ../includes/widgets/my-banners-widget.php:74 msgid "Ad 2" msgstr "Anzeige 2" -#: ../includes/widgets/my-banners-widget.php:78 +#: ../includes/widgets/my-banners-widget.php:83 msgid "Ad 3" msgstr "Anzeige 3" -#: ../includes/widgets/my-banners-widget.php:87 +#: ../includes/widgets/my-banners-widget.php:92 msgid "Ad 4" msgstr "Anzeige 4" -#: ../includes/widgets/my-comment-widget.php:4 +#: ../includes/widgets/my-comment-widget.php:5 msgid "Cherry - Recent Comments" msgstr "Cherry - Letzte Kommentare" -#: ../includes/widgets/my-comment-widget.php:11 -#: ../includes/widgets/my-comment-widget.php:127 +#: ../includes/widgets/my-comment-widget.php:13 +#: ../includes/widgets/my-comment-widget.php:133 msgid "My Recent Comments" msgstr "Meine Letzte Kommentare" -#: ../includes/widgets/my-comment-widget.php:72 +#: ../includes/widgets/my-comment-widget.php:78 msgid "Comment in" msgstr "Kommentar in" -#: ../includes/widgets/my-comment-widget.php:81 -#: ../includes/widgets/widgets-manager.php:479 -#: ../includes/widgets/widgets-manager.php:487 +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 msgid "Author" msgstr "Autor" -#: ../includes/widgets/my-comment-widget.php:99 +#: ../includes/widgets/my-comment-widget.php:105 msgid "Go to this comment" msgstr "Kommentare ansehen" -#: ../includes/widgets/my-comment-widget.php:141 +#: ../includes/widgets/my-comment-widget.php:147 msgid "Number of comments to show" msgstr "Anzahl der Kommentare zu zeigen" -#: ../includes/widgets/my-comment-widget.php:142 +#: ../includes/widgets/my-comment-widget.php:148 msgid "Display avatar" msgstr "Avatar anzeigen" -#: ../includes/widgets/my-comment-widget.php:143 +#: ../includes/widgets/my-comment-widget.php:149 msgid "Avatar size (px)" msgstr "AvatargrÃ¶Ãe (px)" -#: ../includes/widgets/my-comment-widget.php:152 +#: ../includes/widgets/my-comment-widget.php:158 msgid "Display the comment author" msgstr "Den Autor des Kommentars anzeigen" -#: ../includes/widgets/my-comment-widget.php:153 +#: ../includes/widgets/my-comment-widget.php:159 msgid "Display the comment date" msgstr "Das Datum des Kommentars anzeigen" -#: ../includes/widgets/my-comment-widget.php:154 +#: ../includes/widgets/my-comment-widget.php:160 msgid "Display post title" msgstr "Den Artikeltitel anzeigen" -#: ../includes/widgets/my-comment-widget.php:155 -#: ../includes/widgets/my-vcard-widget.php:191 +#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:195 msgid "Meta format" msgstr "Metaformat " -#: ../includes/widgets/my-comment-widget.php:157 -#: ../includes/widgets/my-vcard-widget.php:193 -#: ../includes/widgets/widgets-manager.php:506 +#: ../includes/widgets/my-comment-widget.php:163 +#: ../includes/widgets/my-vcard-widget.php:197 +#: ../includes/widgets/widgets-manager.php:507 msgid "None" msgstr "Keine(r, s)" -#: ../includes/widgets/my-comment-widget.php:158 -#: ../includes/widgets/my-social-widget.php:209 -#: ../includes/widgets/my-vcard-widget.php:194 +#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-social-widget.php:185 +#: ../includes/widgets/my-vcard-widget.php:198 msgid "Icons" msgstr "Icons" -#: ../includes/widgets/my-comment-widget.php:159 -#: ../includes/widgets/my-social-widget.php:210 -#: ../includes/widgets/my-vcard-widget.php:195 +#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-vcard-widget.php:199 msgid "Labels" msgstr "Labels" @@ -1108,27 +1039,15 @@ msgid "Facebook Pages." msgstr "Facebook Seiten." #: ../includes/widgets/my-facebook-widget.php:90 -#: ../includes/widgets/my-posts-type-widget.php:347 +#: ../includes/widgets/my-posts-type-widget.php:367 msgid "Width" msgstr "Breite" #: ../includes/widgets/my-facebook-widget.php:95 -#: ../includes/widgets/my-posts-type-widget.php:352 +#: ../includes/widgets/my-posts-type-widget.php:372 msgid "Height" msgstr "HÃ¶he" -#: ../includes/widgets/my-facebook-widget.php:100 -msgid "Color Scheme" -msgstr "Farbschema" - -#: ../includes/widgets/my-facebook-widget.php:102 -msgid "Light" -msgstr "Hell" - -#: ../includes/widgets/my-facebook-widget.php:103 -msgid "Dark" -msgstr "Dunkel" - #: ../includes/widgets/my-facebook-widget.php:109 msgid "Display header" msgstr "Den Header anzeigen" @@ -1149,17 +1068,21 @@ msgstr "Rahmen anzeigen" msgid "Cherry - Flickr" msgstr "Cherry - Flickr" -#: ../includes/widgets/my-flickr-widget.php:59 +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." +msgstr "" + +#: ../includes/widgets/my-flickr-widget.php:64 msgid "Flickr ID" msgstr "Flickr ID" -#: ../includes/widgets/my-flickr-widget.php:60 +#: ../includes/widgets/my-flickr-widget.php:65 msgid "Images count" msgstr "Bilder zÃ¤hlen " -#: ../includes/widgets/my-flickr-widget.php:61 -#: ../includes/widgets/my-posts-type-widget.php:325 -#: ../includes/widgets/my-posts-type-widget.php:372 +#: ../includes/widgets/my-flickr-widget.php:66 +#: ../includes/widgets/my-posts-type-widget.php:345 +#: ../includes/widgets/my-posts-type-widget.php:392 #: ../includes/widgets/my-recent-posts.php:158 msgid "Link Text" msgstr "Link Text" @@ -1168,87 +1091,87 @@ msgstr "Link Text" msgid "Cherry - Post Cycle" msgstr "Cherry - Post Cycle" -#: ../includes/widgets/my-post-cycle-widget.php:195 +#: ../includes/widgets/my-post-cycle-widget.php:221 msgid "Title:" msgstr "Titel:" -#: ../includes/widgets/my-post-cycle-widget.php:197 +#: ../includes/widgets/my-post-cycle-widget.php:223 msgid "Select post type:" msgstr "WÃ¤hlen Sie nach Art: " -#: ../includes/widgets/my-post-cycle-widget.php:227 +#: ../includes/widgets/my-post-cycle-widget.php:253 msgid "Categories (names separated by \",\"):" msgstr "Kategorien (Namen getrennt durch \", \"): " -#: ../includes/widgets/my-post-cycle-widget.php:229 +#: ../includes/widgets/my-post-cycle-widget.php:255 msgid "Posts count:" msgstr "BeitrÃ¤ge insgesamt: " -#: ../includes/widgets/my-post-cycle-widget.php:231 +#: ../includes/widgets/my-post-cycle-widget.php:257 msgid "Thumbnail Width (in pixels):" msgstr "Vorschaubild Breite (in Pixeln):" -#: ../includes/widgets/my-post-cycle-widget.php:233 +#: ../includes/widgets/my-post-cycle-widget.php:259 msgid "Thumbnail Height (in pixels):" msgstr "Vorschaubild HÃ¶he (in pixels):" -#: ../includes/widgets/my-post-cycle-widget.php:235 +#: ../includes/widgets/my-post-cycle-widget.php:261 msgid "Show titles:" msgstr "Titel anzeigen:" -#: ../includes/widgets/my-post-cycle-widget.php:242 -#: ../includes/widgets/my-post-cycle-widget.php:261 -#: ../includes/widgets/my-post-cycle-widget.php:280 -#: ../includes/widgets/my-post-cycle-widget.php:299 -#: ../includes/widgets/my-post-cycle-widget.php:318 -#: ../includes/widgets/my-post-cycle-widget.php:343 -#: ../includes/widgets/my-post-cycle-widget.php:362 +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 msgid "yes" msgstr "ja" -#: ../includes/widgets/my-post-cycle-widget.php:247 -#: ../includes/widgets/my-post-cycle-widget.php:266 -#: ../includes/widgets/my-post-cycle-widget.php:285 -#: ../includes/widgets/my-post-cycle-widget.php:304 -#: ../includes/widgets/my-post-cycle-widget.php:323 -#: ../includes/widgets/my-post-cycle-widget.php:348 -#: ../includes/widgets/my-post-cycle-widget.php:367 +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 msgid "no" msgstr "nein" -#: ../includes/widgets/my-post-cycle-widget.php:254 +#: ../includes/widgets/my-post-cycle-widget.php:280 msgid "Show date:" msgstr "Zeigen Datum:" -#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:299 msgid "Show author:" msgstr "Zeigen Autor:" -#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:318 msgid "Show comments:" msgstr "Kommentare anzeigen:" -#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:337 msgid "Show excerpt:" msgstr "Zeigen Auszug:" -#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:356 msgid "Excerpt word count:" msgstr "Auszug Wortzahl:" -#: ../includes/widgets/my-post-cycle-widget.php:332 +#: ../includes/widgets/my-post-cycle-widget.php:358 msgid "More Button Text:" msgstr "Mehr Button Text:" -#: ../includes/widgets/my-post-cycle-widget.php:334 +#: ../includes/widgets/my-post-cycle-widget.php:360 msgid "Slideshow cycling speed (in sec.):" msgstr "Diashow Fahrgeschwindigkeit (in sek.)" -#: ../includes/widgets/my-post-cycle-widget.php:336 +#: ../includes/widgets/my-post-cycle-widget.php:362 msgid "Arrows:" msgstr "Pfeile:" -#: ../includes/widgets/my-post-cycle-widget.php:355 +#: ../includes/widgets/my-post-cycle-widget.php:381 msgid "Pagination:" msgstr "Paginierung:" @@ -1260,120 +1183,115 @@ msgstr "Custom Posts anzeigen " msgid "Cherry - Advanced Cycle" msgstr "Cherry - Advanced Cycle" -#: ../includes/widgets/my-posts-type-widget.php:152 +#: ../includes/widgets/my-posts-type-widget.php:172 msgid "View all" msgstr "Alle anschauen" -#: ../includes/widgets/my-posts-type-widget.php:212 +#: ../includes/widgets/my-posts-type-widget.php:232 msgid "Posts type" msgstr "Artikeltypen " -#: ../includes/widgets/my-posts-type-widget.php:229 +#: ../includes/widgets/my-posts-type-widget.php:249 msgid "Number of posts to show" msgstr "Anzahl der Artikel zu zeigen" -#: ../includes/widgets/my-posts-type-widget.php:236 +#: ../includes/widgets/my-posts-type-widget.php:256 msgid "Sort by" msgstr "Sortiere nach" -#: ../includes/widgets/my-posts-type-widget.php:250 +#: ../includes/widgets/my-posts-type-widget.php:270 msgid "Reverse sort order (ascending)" msgstr "umgekehrte Sortierung (aufsteigend)" -#: ../includes/widgets/my-posts-type-widget.php:256 +#: ../includes/widgets/my-posts-type-widget.php:276 msgid "Show number of comments" msgstr "Anzahl der Kommentare anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:263 +#: ../includes/widgets/my-posts-type-widget.php:283 msgid "Show meta" msgstr "Meta anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:269 +#: ../includes/widgets/my-posts-type-widget.php:289 msgid "Container class" msgstr "Container class" -#: ../includes/widgets/my-posts-type-widget.php:270 +#: ../includes/widgets/my-posts-type-widget.php:290 msgid "default: \"featured_custom_posts\"" msgstr "default: \"featured_custom_posts\"" -#: ../includes/widgets/my-posts-type-widget.php:275 +#: ../includes/widgets/my-posts-type-widget.php:295 msgid "Post title" msgstr "Titel des Artikels" -#: ../includes/widgets/my-posts-type-widget.php:279 +#: ../includes/widgets/my-posts-type-widget.php:299 msgid "Show post title" msgstr "Titel des Artikels anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:285 +#: ../includes/widgets/my-posts-type-widget.php:305 msgid "Date as title " msgstr "Datum als Titel" -#: ../includes/widgets/my-posts-type-widget.php:292 +#: ../includes/widgets/my-posts-type-widget.php:312 msgid "Excerpt" msgstr "Auszug " -#: ../includes/widgets/my-posts-type-widget.php:296 +#: ../includes/widgets/my-posts-type-widget.php:316 msgid "Show post excerpt" msgstr "Artikelauszug anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:301 +#: ../includes/widgets/my-posts-type-widget.php:321 #: ../includes/widgets/my-recent-posts.php:156 msgid "Excerpt length (words)" msgstr "Auszug LÃ¤nge (WÃ¶rter)" -#: ../includes/widgets/my-posts-type-widget.php:308 +#: ../includes/widgets/my-posts-type-widget.php:328 msgid "Excerpt as link" msgstr "Auszug als Link" -#: ../includes/widgets/my-posts-type-widget.php:315 +#: ../includes/widgets/my-posts-type-widget.php:335 msgid "More link" msgstr "Mehr Link" -#: ../includes/widgets/my-posts-type-widget.php:319 +#: ../includes/widgets/my-posts-type-widget.php:339 msgid "Show \"More link" msgstr "Zeigen \"Mehr Link" -#: ../includes/widgets/my-posts-type-widget.php:326 +#: ../includes/widgets/my-posts-type-widget.php:346 msgid "default: \"Read more\"" msgstr "Standard: \"Mehr\"" -#: ../includes/widgets/my-posts-type-widget.php:331 +#: ../includes/widgets/my-posts-type-widget.php:351 msgid "Link class" msgstr "Link Klasse " -#: ../includes/widgets/my-posts-type-widget.php:332 +#: ../includes/widgets/my-posts-type-widget.php:352 msgid "default: \"link\"" msgstr "Standard: \"link \"" -#: ../includes/widgets/my-posts-type-widget.php:337 +#: ../includes/widgets/my-posts-type-widget.php:357 msgid "Thumbnail dimensions" msgstr "Vorschaubild Dimensionen" -#: ../includes/widgets/my-posts-type-widget.php:342 +#: ../includes/widgets/my-posts-type-widget.php:362 msgid "Show post thumbnail" msgstr "Artikelbilder anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:358 +#: ../includes/widgets/my-posts-type-widget.php:378 msgid "Thumbnail as link" msgstr "Thumbnail als Link" -#: ../includes/widgets/my-posts-type-widget.php:363 +#: ../includes/widgets/my-posts-type-widget.php:383 msgid "Link to all posts" msgstr "Link zu allen Artikeln " -#: ../includes/widgets/my-posts-type-widget.php:367 +#: ../includes/widgets/my-posts-type-widget.php:387 msgid "Show global link to all posts" msgstr "Global Link zu allen artikeln anzeigen" -#: ../includes/widgets/my-posts-type-widget.php:373 +#: ../includes/widgets/my-posts-type-widget.php:393 msgid "default: \"View all\"" msgstr "Standard: \"alles ansehen\"" -#: ../includes/widgets/my-posts-type-widget.php:378 -#: ../includes/widgets/my-recent-posts.php:160 -msgid "Link URL" -msgstr "Link URL" - #: ../includes/widgets/my-recent-posts.php:6 msgid "Cherry - Recent Posts" msgstr "Cherry - Letzte Artikel" @@ -1446,104 +1364,104 @@ msgstr "Link zu Sozialen Netzwerken " msgid "Cherry - Social Networks" msgstr "Cherry - Soziale Netzwerke" -#: ../includes/widgets/my-social-widget.php:136 +#: ../includes/widgets/my-social-widget.php:112 msgid "Facebook" msgstr "Facebook" -#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:114 msgid "Facebook URL" msgstr "Facebook URL" -#: ../includes/widgets/my-social-widget.php:141 +#: ../includes/widgets/my-social-widget.php:117 msgid "Facebook label" msgstr "Facebook Etikett" -#: ../includes/widgets/my-social-widget.php:146 +#: ../includes/widgets/my-social-widget.php:122 msgid "Twitter" msgstr "Twitter" -#: ../includes/widgets/my-social-widget.php:147 +#: ../includes/widgets/my-social-widget.php:123 msgid "Twitter URL" msgstr "Twitter URL" -#: ../includes/widgets/my-social-widget.php:149 +#: ../includes/widgets/my-social-widget.php:125 msgid "Twitter label" msgstr "Twitter Etikett" -#: ../includes/widgets/my-social-widget.php:154 +#: ../includes/widgets/my-social-widget.php:130 msgid "Flickr" msgstr "Flickr" -#: ../includes/widgets/my-social-widget.php:155 +#: ../includes/widgets/my-social-widget.php:131 msgid "Flickr URL" msgstr "Flickr URL" -#: ../includes/widgets/my-social-widget.php:157 +#: ../includes/widgets/my-social-widget.php:133 msgid "Flickr label" msgstr "Flickr label" -#: ../includes/widgets/my-social-widget.php:162 -#: ../includes/widgets/my-social-widget.php:163 +#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:139 msgid "RSS feed" msgstr "RSS feed" -#: ../includes/widgets/my-social-widget.php:165 +#: ../includes/widgets/my-social-widget.php:141 msgid "RSS label" msgstr "RSS label" -#: ../includes/widgets/my-social-widget.php:170 +#: ../includes/widgets/my-social-widget.php:146 msgid "Linkedin" msgstr "Linkedin" -#: ../includes/widgets/my-social-widget.php:171 +#: ../includes/widgets/my-social-widget.php:147 msgid "Linkedin URL" msgstr "Linkedin URL" -#: ../includes/widgets/my-social-widget.php:173 +#: ../includes/widgets/my-social-widget.php:149 msgid "Linkedin label" msgstr "Linkedin label" -#: ../includes/widgets/my-social-widget.php:178 +#: ../includes/widgets/my-social-widget.php:154 msgid "Delicious" msgstr "Delicious" -#: ../includes/widgets/my-social-widget.php:179 +#: ../includes/widgets/my-social-widget.php:155 msgid "Delicious URL" msgstr "Delicious URL" -#: ../includes/widgets/my-social-widget.php:181 +#: ../includes/widgets/my-social-widget.php:157 msgid "Delicious label" msgstr "Delicious label" -#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-social-widget.php:162 msgid "Youtube" msgstr "Youtube" -#: ../includes/widgets/my-social-widget.php:188 +#: ../includes/widgets/my-social-widget.php:164 msgid "Youtube URL" msgstr "Youtube URL" -#: ../includes/widgets/my-social-widget.php:191 +#: ../includes/widgets/my-social-widget.php:167 msgid "Youtube label" msgstr "Youtube label" -#: ../includes/widgets/my-social-widget.php:197 -msgid "Google+" -msgstr "Google+" +#: ../includes/widgets/my-social-widget.php:173 +msgid "Google" +msgstr "" -#: ../includes/widgets/my-social-widget.php:199 -msgid "Google+ URL" -msgstr "Google+ URL" +#: ../includes/widgets/my-social-widget.php:175 +msgid "Google URL" +msgstr "" -#: ../includes/widgets/my-social-widget.php:202 -msgid "Google+ label" -msgstr "Google+ label" +#: ../includes/widgets/my-social-widget.php:178 +msgid "Google label" +msgstr "" -#: ../includes/widgets/my-social-widget.php:208 +#: ../includes/widgets/my-social-widget.php:184 msgid "Display" msgstr "Anzeigen" -#: ../includes/widgets/my-social-widget.php:211 +#: ../includes/widgets/my-social-widget.php:187 msgid "Both" msgstr "Beide" @@ -1559,41 +1477,45 @@ msgstr "Cherry - vCard" msgid "vCard" msgstr "vCard" -#: ../includes/widgets/my-vcard-widget.php:51 -#: ../includes/widgets/my-vcard-widget.php:167 +#: ../includes/widgets/my-vcard-widget.php:55 +#: ../includes/widgets/my-vcard-widget.php:171 msgid "Street Address" msgstr "Strasse" -#: ../includes/widgets/my-vcard-widget.php:52 -#: ../includes/widgets/my-vcard-widget.php:171 +#: ../includes/widgets/my-vcard-widget.php:56 +#: ../includes/widgets/my-vcard-widget.php:175 msgid "City/Locality" msgstr "Stadt/Ort " -#: ../includes/widgets/my-vcard-widget.php:53 -#: ../includes/widgets/my-vcard-widget.php:175 +#: ../includes/widgets/my-vcard-widget.php:57 +#: ../includes/widgets/my-vcard-widget.php:179 msgid "State/Region" msgstr "Bundesland/Region" -#: ../includes/widgets/my-vcard-widget.php:54 -#: ../includes/widgets/my-vcard-widget.php:179 +#: ../includes/widgets/my-vcard-widget.php:58 +#: ../includes/widgets/my-vcard-widget.php:183 msgid "Zipcode/Postal Code" msgstr "Bundesland/Region " -#: ../includes/widgets/my-vcard-widget.php:55 -#: ../includes/widgets/my-vcard-widget.php:183 +#: ../includes/widgets/my-vcard-widget.php:59 +#: ../includes/widgets/my-vcard-widget.php:187 msgid "Telephone" msgstr " Telefon" -#: ../includes/widgets/my-vcard-widget.php:56 -#: ../includes/widgets/my-vcard-widget.php:187 +#: ../includes/widgets/my-vcard-widget.php:60 +#: ../includes/widgets/my-vcard-widget.php:191 msgid "Email" msgstr "Email" -#: ../includes/widgets/my-vcard-widget.php:158 +#: ../includes/widgets/my-vcard-widget.php:160 +msgid "Google Map" +msgstr "Google Map" + +#: ../includes/widgets/my-vcard-widget.php:162 msgid "Display map" msgstr "Zeige eine Karte" -#: ../includes/widgets/my-vcard-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:165 msgid "HTML map code" msgstr "HTML Code Karte" @@ -1630,107 +1552,111 @@ msgid "Homepage" msgstr "Startseite" #: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" +msgstr "Blog" + +#: ../includes/widgets/widgets-manager.php:475 msgid "Page" msgstr "Seite" -#: ../includes/widgets/widgets-manager.php:475 +#: ../includes/widgets/widgets-manager.php:476 msgid "Post" msgstr "Beitrag" -#: ../includes/widgets/widgets-manager.php:476 -#: ../includes/widgets/widgets-manager.php:478 +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 msgid "Archive" msgstr "Archiv" -#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:478 msgid "Tag" msgstr "Tag" -#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:481 msgid "Search page" msgstr "Die Seite suchen" -#: ../includes/widgets/widgets-manager.php:481 +#: ../includes/widgets/widgets-manager.php:482 msgid "404 page" msgstr "404 Seite" -#: ../includes/widgets/widgets-manager.php:483 +#: ../includes/widgets/widgets-manager.php:484 msgid "Page ID/Title/slug" msgstr "Seite ID/Titel/Slug " -#: ../includes/widgets/widgets-manager.php:484 +#: ../includes/widgets/widgets-manager.php:485 msgid "Post ID/Title/slug" msgstr "Artikel ID/Titel/Slug " -#: ../includes/widgets/widgets-manager.php:485 +#: ../includes/widgets/widgets-manager.php:486 msgid "Category ID/Name/slug" msgstr "Kategorie ID/Name/Slug" -#: ../includes/widgets/widgets-manager.php:486 +#: ../includes/widgets/widgets-manager.php:487 msgid "Tag ID/Name" msgstr "Tag-ID/Name" -#: ../includes/widgets/widgets-manager.php:488 +#: ../includes/widgets/widgets-manager.php:489 msgid "Add page" msgstr "Eine Seite hinzufÃ¼gen" -#: ../includes/widgets/widgets-manager.php:491 +#: ../includes/widgets/widgets-manager.php:492 msgid "Selected pages" msgstr "AusgewÃ¤hlte Seiten" -#: ../includes/widgets/widgets-manager.php:492 +#: ../includes/widgets/widgets-manager.php:493 msgid "No pages" msgstr "Keine Seiten" -#: ../includes/widgets/widgets-manager.php:510 +#: ../includes/widgets/widgets-manager.php:511 msgid "All devices" msgstr "Alle GerÃ¤te" -#: ../includes/widgets/widgets-manager.php:511 +#: ../includes/widgets/widgets-manager.php:512 msgid "Desktops" msgstr "Desktops" -#: ../includes/widgets/widgets-manager.php:512 +#: ../includes/widgets/widgets-manager.php:513 msgid "Tablets" msgstr "Tablets" -#: ../includes/widgets/widgets-manager.php:513 +#: ../includes/widgets/widgets-manager.php:514 msgid "Phones" msgstr "Smartphones " -#: ../includes/widgets/widgets-manager.php:514 +#: ../includes/widgets/widgets-manager.php:515 msgid "Desktops/Tablets" msgstr "Desktops/Tablets" -#: ../includes/widgets/widgets-manager.php:515 +#: ../includes/widgets/widgets-manager.php:516 msgid "Tablets/Phones" msgstr "Tablets/Smartphones " -#: ../includes/widgets/widgets-manager.php:516 +#: ../includes/widgets/widgets-manager.php:517 msgid "Desktops/Phones" msgstr "Desktops/Smartphones " -#: ../includes/widgets/widgets-manager.php:519 +#: ../includes/widgets/widgets-manager.php:520 msgid "Visible on" msgstr "Sichtbar auf" -#: ../includes/widgets/widgets-manager.php:528 +#: ../includes/widgets/widgets-manager.php:529 msgid "All users" msgstr "Alle Benutzer" -#: ../includes/widgets/widgets-manager.php:529 +#: ../includes/widgets/widgets-manager.php:530 msgid "Only guests" msgstr "Nur GÃ¤ste" -#: ../includes/widgets/widgets-manager.php:530 +#: ../includes/widgets/widgets-manager.php:531 msgid "Only registered users" msgstr "Nur registrierte Benutzer" -#: ../includes/widgets/widgets-manager.php:531 +#: ../includes/widgets/widgets-manager.php:532 msgid "Only administrator" msgstr "Nur Administrator " -#: ../includes/widgets/widgets-manager.php:534 +#: ../includes/widgets/widgets-manager.php:535 msgid "Visible for" msgstr "Sichtbar fÃ¼r" @@ -1755,6 +1681,243 @@ msgstr "" "Dies scheint keine WXR Datei zu sein, die WXR Versionsnummer fehlt oder ist " "ungÃ¼ltig " +#~ msgid "Minuts" +#~ msgstr "Minuten" + +#~ msgid "Description." +#~ msgstr "Beschreibung. " + +#~ msgid "Insert Shortcode" +#~ msgstr "Shortcode einfÃ¼gen" + +#~ msgid "Posts" +#~ msgstr "Artikel" + +#~ msgid "Posts Grid" +#~ msgstr "Artikel Grid" + +#~ msgid "Posts List" +#~ msgstr "Artikel-Listen" + +#~ msgid "Mini Posts Grid" +#~ msgstr "Mini Artikel Grid" + +#~ msgid "Mini Posts List" +#~ msgstr "Mini Artikel-Listen" + +#~ msgid "Recent Posts" +#~ msgstr "Aktuelle Artikel" + +#~ msgid "Recent Testimonials" +#~ msgstr "Aktuelle Testimonials" + +#~ msgid "Basic" +#~ msgstr "Basis" + +#~ msgid "Banner" +#~ msgstr "Banner" + +#~ msgid "Post Cycle" +#~ msgstr "Post Cycle" + +#~ msgid "Carousel (Elasti)" +#~ msgstr "Karussell (Elasti)" + +#~ msgid "Carousel (OWL)" +#~ msgstr "Karussell (OWL)" + +#~ msgid "Roundabout" +#~ msgstr "Roundabout " + +#~ msgid "Service Box" +#~ msgstr "ServiceBox " + +#~ msgid "Hero Unit" +#~ msgstr "HeroUnit" + +#~ msgid "Categories" +#~ msgstr "Kategorien" + +#~ msgid "Columns" +#~ msgstr "Spalten" + +#~ msgid "Fluid Column" +#~ msgstr "flexible Spalten" + +#~ msgid "2 Columns" +#~ msgstr "2 Spalten" + +#~ msgid "3 Columns" +#~ msgstr "3 Spalten" + +#~ msgid "4 Columns" +#~ msgstr "4 Spalten" + +#~ msgid "Elements" +#~ msgstr "Elementen" + +#~ msgid "Label" +#~ msgstr "Marke" + +#~ msgid "Text Highlight" +#~ msgstr "Textmarkierung " + +#~ msgid "Button" +#~ msgstr "Schalter" + +#~ msgid "Drop Cap" +#~ msgstr "DropCap (Initial gestalten)" + +#~ msgid "Blockquote" +#~ msgstr "Blockquote" + +#~ msgid "Icon" +#~ msgstr "Icon" + +#~ msgid "Frame" +#~ msgstr "Rahmen " + +#~ msgid "Horizontal Rule" +#~ msgstr "Horizontale Linie" + +#~ msgid "Small Horizontal Rule" +#~ msgstr "Kleine horizontale Linie" + +#~ msgid "Vertical Rule" +#~ msgstr "Vertikale Linie" + +#~ msgid "Spacer" +#~ msgstr "Abstandhalter" + +#~ msgid "Progressbar" +#~ msgstr "Fortschrittsanzeige" + +#~ msgid "Address" +#~ msgstr "Adresse" + +#~ msgid "Clear" +#~ msgstr "Sauber" + +#~ msgid "Extra Wrap" +#~ msgstr "Extra Wrap" + +#~ msgid "Lists" +#~ msgstr "Listen" + +#~ msgid "Unstyled" +#~ msgstr "Unformatierte" + +#~ msgid "Check List" +#~ msgstr "Liste markieren" + +#~ msgid "Check 2 List" +#~ msgstr "2 Liste markieren" + +#~ msgid "OK Circle List" +#~ msgstr "OK Kreis Liste" + +#~ msgid "OK Sign List" +#~ msgstr "Okayzeichen Liste" + +#~ msgid "Arrow List" +#~ msgstr "Liste mit Pfeil-Symbol " + +#~ msgid "Arrow 2 List" +#~ msgstr "Arrow 2 List" + +#~ msgid "Circle Arrow List" +#~ msgstr "Kreis Pfeil Liste " + +#~ msgid "Caret List" +#~ msgstr "EinfÃ¼gezeichen Liste" + +#~ msgid "Angle List" +#~ msgstr "Winkel Liste" + +#~ msgid "Double Angle List" +#~ msgstr "Doppelwinkel Liste" + +#~ msgid "Star List" +#~ msgstr "Liste mit Sternchen-Symbol " + +#~ msgid "Plus List" +#~ msgstr "Liste mit Plus-Symbol " + +#~ msgid "Minus List" +#~ msgstr "Liste mit Minus-Symbol " + +#~ msgid "Circle List" +#~ msgstr "Kreis Liste" + +#~ msgid "Circle Blank List" +#~ msgstr "Kreis Leer Liste" + +#~ msgid "Custom List" +#~ msgstr "Custom-List " + +#~ msgid "Misc" +#~ msgstr "Misc" + +#~ msgid "Alert Box" +#~ msgstr "Alertbox " + +#~ msgid "Close icon" +#~ msgstr "Icon schlieÃen" + +#~ msgid "Well" +#~ msgstr "Gud" + +#~ msgid "Small" +#~ msgstr "Klein" + +#~ msgid "Template URL" +#~ msgstr "Template URL" + +#~ msgid "Sitemap" +#~ msgstr "Ãbersicht" + +#~ msgid "Video Preview" +#~ msgstr "Video-Vorschau" + +#~ msgid "Tabs" +#~ msgstr "Tabs" + +#~ msgid "Accordion" +#~ msgstr "Akkordion" + +#~ msgid "Table" +#~ msgstr "Tabelle" + +#~ msgid "Pricing Table" +#~ msgstr "Preis Tabelle" + +#~ msgid "Style Switcher Preview" +#~ msgstr "Stil Umschalter ubersicht" + +#~ msgid "Cheatin’ uh?" +#~ msgstr "Cheatin’ uh?" + +#~ msgid "%1$s — WordPress" +#~ msgstr "%1$s — WordPress" + +#~ msgid "Customize %s" +#~ msgstr "Anpassen %s" + +#~ msgid "Style Switcher" +#~ msgstr "Stil Umschalter" + +#~ msgid "Cherry - 125x125 Ads." +#~ msgstr "Cherry - 125x125 Ads." + +#~ msgid "Google+" +#~ msgstr "Google+" + +#~ msgid "Google+ URL" +#~ msgstr "Google+ URL" + +#~ msgid "Google+ label" +#~ msgstr "Google+ label" + #~ msgid "No Repeat" #~ msgstr "Keine Wiederholung" @@ -2558,9 +2721,6 @@ msgstr "" #~ msgid "easeInOutBounce" #~ msgstr "easeInOutBounce" -#~ msgid "Blog" -#~ msgstr "Blog" - #~ msgid "Blog Title" #~ msgstr "Blog-Titel" @@ -3146,9 +3306,6 @@ msgstr "" #~ msgid "Category" #~ msgstr "Kategorie" -#~ msgid "Thumbnail" -#~ msgstr "Thumbnail (Miniaturbild)" - #~ msgid "Your comment is awaiting moderation." #~ msgstr "Ihr Kommentar wartet auf Freischaltung" @@ -3657,8 +3814,8 @@ msgstr "" #~ "Date as title <span style='font-size:11px; color:#999;'>('[mm-dd-yyyy]')</" #~ "span>" #~ msgstr "" -#~ "Datum als Titel <span style='font-size:11px; color:#999;'>('[mm-dd-yyyy]')" -#~ "</span>" +#~ "Datum als Titel <span style='font-size:11px; color:#999;'>('[mm-dd-" +#~ "yyyy]')</span>" #~ msgid "Cherry - Twitter" #~ msgstr "Cherry - Twitter" diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.mo index 32582f96..91bc8cc9 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.po index 52972015..b0b16b72 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-es_ES.po @@ -1,210 +1,42 @@ msgid "" msgstr "" "Project-Id-Version: es_ES\n" -"POT-Creation-Date: 2014-02-25 10:49+0200\n" -"PO-Revision-Date: 2014-03-03 15:09+0200\n" -"Last-Translator: Alex Ross <alex@template-telp.com>\n" -"Language-Team: <demolink@info.org>\n" +"POT-Creation-Date: 2015-06-24 13:08+0200\n" +"PO-Revision-Date: 2015-06-24 13:08+0200\n" +"Last-Translator: \n" +"Language-Team: Cherry Team <demolink@info.org>\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" -"Language: es_ES\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -#: ../admin/admin.php:28 +#: ../admin/admin.php:30 msgid "Cherry plugin" msgstr "Cherry plugin" -#: ../admin/admin.php:31 ../admin/admin.php:52 +#: ../admin/admin.php:33 ../admin/admin.php:54 msgid "Summary" msgstr "Resumen" -#: ../admin/admin.php:34 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 #: ../admin/plugin-pages.php:100 msgid "Maintenance Mode" msgstr "Modo de Mantenimiento" -#: ../admin/admin.php:37 +#: ../admin/admin.php:39 msgid "Import Content" msgstr "Importar Contenidos" -#: ../admin/admin.php:40 ../admin/import-export/export.php:30 +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 msgid "Export Content" msgstr "Exportar Contenidos" -#: ../admin/plugin-components.php:36 -msgid "Documentation" -msgstr "DocumentaciÃ³n" - -#: ../admin/plugin-components.php:37 -msgid "Support" -msgstr "Soporte" - -#: ../admin/plugin-function.php:5 -msgid "Remove Inactive Widgets" -msgstr "Remover Widgets Inactivos" - -#: ../admin/plugin-function.php:23 -msgid "CTRL+A (Command-A) to select all files" -msgstr "CTRL+A (Comando-A) para seleccionar archivos " - -#: ../admin/plugin-function.php:37 -msgid "Files are downloaded as a .zip archive" -msgstr "Los ficheros son descargados como archivos .zip" - -#: ../admin/plugin-maintenance-mode.php:62 -msgid "Enable this option to activate website maintenance mode." -msgstr "" -"Habilitar esta opciÃ³n para activar el modo de mantenimiento de la pÃ¡gina web" - -#: ../admin/plugin-maintenance-mode.php:68 -msgid "Display Logo?" -msgstr "Â¿Mostrar logotipo?" - -#: ../admin/plugin-maintenance-mode.php:73 -msgid "" -"Enable this option to display website logo at the under construction page" -msgstr "" -"Activar esta opciÃ³n para mostrar el logotipo en una pÃ¡gina en construcciÃ³n" - -#: ../admin/plugin-maintenance-mode.php:79 -msgid "Description." -msgstr "DescripciÃ³n" - -#: ../admin/plugin-maintenance-mode.php:89 -#: ../admin/plugin-maintenance-mode.php:94 -msgid "Display timer?" -msgstr "Â¿Mostrar temporizador?" - -#: ../admin/plugin-maintenance-mode.php:100 -msgid "Website launch date." -msgstr "Fecha de lanzamiento de la pÃ¡gina web." - -#: ../admin/plugin-maintenance-mode.php:101 -msgid "Date is not correct." -msgstr "La fecha no estÃ¡ correcta." - -#: ../admin/plugin-maintenance-mode.php:105 -msgid "Year:" -msgstr "AÃ±o:" - -#: ../admin/plugin-maintenance-mode.php:107 -msgid "Month:" -msgstr "Mes:" - -#: ../admin/plugin-maintenance-mode.php:109 -msgid "Day:" -msgstr "DÃa:" - -#: ../admin/plugin-maintenance-mode.php:113 -msgid "Hour:" -msgstr "Hora:" - -#: ../admin/plugin-maintenance-mode.php:115 -msgid "Minute:" -msgstr "Minuto:" - -#: ../admin/plugin-maintenance-mode.php:123 -msgid "Save Changes" -msgstr "Guardar Cambios" - -#: ../admin/plugin-pages.php:6 -msgid "Cherry Plugin" -msgstr "Cherry Plugin" - -#: ../admin/plugin-pages.php:11 -msgid "" -"Cherry Plugin has been released with intention to separate widgets, " -"shortcodes and data management logics with theme editor options. Cherry " -"Plugin is installed automatically on CherryFramework installation and is " -"required for the correct work of CherryFramework. " -msgstr "" -"El Cherry Plugin ha sido lanzado con la intenciÃ³n de separar widgets, " -"cÃ³digos cortos y la administraciÃ³n de datos con un editor de opciones. El " -"Cherry Plugin se instala automÃ¡ticamente en la instalaciÃ³n CherryFramework y " -"es obligatÃ³rio para el correcto funcionamiento de CherryFramework." - -#: ../admin/plugin-pages.php:15 ../admin/import-export/import.php:80 -msgid "Files Import demo" -msgstr "Demo de ImportaciÃ³n de Archivos" - -#: ../admin/plugin-pages.php:19 -msgid "Import" -msgstr "Importar" - -#: ../admin/plugin-pages.php:20 -msgid "" -"Option to import website content from the backup. Select all files from the " -"backup archive and drag them to the upload files area to start uploading." -msgstr "" -"OpciÃ³n para importar contenido de la pÃ¡gina web desde la copia de seguridad. " -"Seleccione todos los archivos desde el archivo de copia de seguridad y " -"arrÃ¡strelos a la zona apropiada para subir archivos." - -#: ../admin/plugin-pages.php:26 -msgid "Files Export demo" -msgstr "Demo de ExportaciÃ³n de Archivos" - -#: ../admin/plugin-pages.php:30 -msgid "Export" -msgstr "Exportar" - -#: ../admin/plugin-pages.php:31 -msgid "" -"Option to backup your website data creating a downloadable archive. Use this " -"option to keep your website data on performing some serious modifications or " -"moving website to other hosting." -msgstr "" -"OpciÃ³n para crear una copia de seguridad de su pÃ¡gina web mediante un " -"archivo descargable. Utilice esta opciÃ³n para mantener los datos de la " -"pÃ¡gina web, siempre que realizar algunas modificaciones importantes o haga " -"una transferencia de la pÃ¡gina web a otro alojamiento." - -#: ../admin/plugin-pages.php:42 -msgid "Widgets" -msgstr "Widgets" - -#: ../admin/plugin-pages.php:43 -msgid "" -"Cherry Widgets offer additional ways to place content to widget areas. " -"Several available widget will allow you to add more functionality to your " -"website." -msgstr "" -"El Cherry Widgets ofrece formas adicionales de colocar el contenido en las " -"Ã¡reas destinadas a widgets. MÃ¡s widgets disponibles le permitirÃ¡ aÃ±adir mÃ¡s " -"funcionalidades a su pÃ¡gina web." - -#: ../admin/plugin-pages.php:52 -msgid "Shortcodes" -msgstr "CÃ³digos cortos" - -#: ../admin/plugin-pages.php:53 -msgid "" -"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " -"create various content structures in WordPress posts. Use \"Insert Shortcode" -"\" icon in post editor toolbar to add shortcodes." -msgstr "" -"El Cherry Plugin aÃ±ade varios widgets al editor de entradas. Los cÃ³digos " -"cortos permiten crear varias estructuras de contenido en las entradas de " -"WordPress. Utilice el icono \"Inserir CÃ³digo Corto\" en el editor de " -"entradas de la barra de herramientas para aÃ±adir cÃ³digos cortos." - -#: ../admin/plugin-pages.php:53 -msgid "Learn more" -msgstr "MÃ¡s informaciÃ³n" - -#: ../admin/plugin-pages.php:79 -msgid "Cherry Content Import" -msgstr "Importar Contenidos Cherry" - -#: ../admin/plugin-pages.php:90 -msgid "Cherry Content Export" -msgstr "Exportar Contenidos Cherry" - -#: ../admin/import-export/export-functions.php:14 +#: ../admin/import-export/export-functions.php:18 msgid "Export content done" msgstr "La exportaciÃ³n de contenidos ha terminado" @@ -297,43 +129,43 @@ msgstr "Obligatorio" msgid "Continue" msgstr "Continuar" -#: ../admin/import-export/import.php:32 +#: ../admin/import-export/import.php:34 msgid "Upload Error" msgstr "Error de Carga" -#: ../admin/import-export/import.php:33 +#: ../admin/import-export/import.php:35 msgid "The file is too big!" msgstr "Â¡El archivo es demasiado grande!" -#: ../admin/import-export/import.php:34 +#: ../admin/import-export/import.php:36 msgid "The file type is error!" msgstr "Â¡El tipo de archivo da error!" -#: ../admin/import-export/import.php:35 +#: ../admin/import-export/import.php:37 msgid "Folder cannot be uploaded!" msgstr "Â¡La carpeta no se puede cargar!" -#: ../admin/import-export/import.php:36 +#: ../admin/import-export/import.php:38 msgid "Uploading" msgstr "Cargando" -#: ../admin/import-export/import.php:37 ../admin/import-export/import.php:111 +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 msgid "Upload" msgstr "Subir" -#: ../admin/import-export/import.php:38 +#: ../admin/import-export/import.php:40 msgid "Upload Complete" msgstr "Carga Terminada" -#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 msgid "item" msgstr "Ãtem" -#: ../admin/import-export/import.php:40 +#: ../admin/import-export/import.php:42 msgid "items" msgstr "Ãtems" -#: ../admin/import-export/import.php:41 +#: ../admin/import-export/import.php:43 msgid "" "Sample data installing. Some steps may take some time depending on your " "server settings. Please be patient." @@ -341,81 +173,81 @@ msgstr "" "Instalando los datos de muestra. Algunas etapas pueden demorar, depende de " "la configuraciÃ³n del servidor. Por favor, sea paciente." -#: ../admin/import-export/import.php:42 +#: ../admin/import-export/import.php:44 msgid "Upload complete please click Continue Install button to proceed." msgstr "" "Carga completa, por favor, haga clic en el botÃ³n Continuar InstalaciÃ³n para " "avanzar." -#: ../admin/import-export/import.php:44 +#: ../admin/import-export/import.php:46 msgid "Importing XML" msgstr "Importando XML" -#: ../admin/import-export/import.php:45 +#: ../admin/import-export/import.php:47 msgid "Importing categories" msgstr "Importando categorÃas" -#: ../admin/import-export/import.php:46 +#: ../admin/import-export/import.php:48 msgid "Importing tags" msgstr "Importando etiquetas" -#: ../admin/import-export/import.php:47 +#: ../admin/import-export/import.php:49 msgid "Processing dependencies" msgstr "Procesando dependencias" -#: ../admin/import-export/import.php:48 +#: ../admin/import-export/import.php:50 msgid "Importing posts. This may take some time. Please wait." msgstr "" "Importando entradas. Esto puede tardar algÃºn tiempo. Por favor aguarde." -#: ../admin/import-export/import.php:49 +#: ../admin/import-export/import.php:51 msgid "Importing menu items. This may take some time. Please wait." msgstr "" "Importando Ãtems de menÃºs. Esto puede tardar algÃºn tiempo. Por favor aguarde." -#: ../admin/import-export/import.php:50 +#: ../admin/import-export/import.php:52 msgid "Importing media library." msgstr "Importando biblioteca de multimedia." -#: ../admin/import-export/import.php:51 +#: ../admin/import-export/import.php:53 msgid "Importing attachements meta." msgstr "Importando datos meta adjuntos." -#: ../admin/import-export/import.php:52 +#: ../admin/import-export/import.php:54 msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" "Generando datos meta adjuntos. Esto puede tardar algÃºn tiempo. Por favor " "aguarde." -#: ../admin/import-export/import.php:53 +#: ../admin/import-export/import.php:55 msgid "Generating content hierarchy" msgstr "Generando jerarquÃa de contenido" -#: ../admin/import-export/import.php:54 +#: ../admin/import-export/import.php:56 msgid "Updating featured images" msgstr "Actualizando imÃ¡genes destacadas" -#: ../admin/import-export/import.php:55 +#: ../admin/import-export/import.php:57 msgid "Updating attachments" msgstr "Actualizando datos adjuntos" -#: ../admin/import-export/import.php:56 +#: ../admin/import-export/import.php:58 msgid "Importing JSON" msgstr "Importando JSON" -#: ../admin/import-export/import.php:57 +#: ../admin/import-export/import.php:59 msgid "Installing content complete" msgstr "InstalaciÃ³n de contenidos completa" -#: ../admin/import-export/import.php:58 +#: ../admin/import-export/import.php:60 msgid "Installing content error" msgstr "Error en la instalaciÃ³n de contenidos" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "Warning!" msgstr "Â¡Aviso!" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "" "Installing sample data will replace your website content. Please make sure " "to backup your website data before importing content." @@ -424,50 +256,54 @@ msgstr "" "web. Por favor, asegÃºrese de hacer una copia de seguridad de los datos de la " "pÃ¡gina web antes de importar el contenido." -#: ../admin/import-export/import.php:72 +#: ../admin/import-export/import.php:74 msgid "Please Drop all needed files here <br> to import sample data" msgstr "" "Por favor Coloque todos los archivos necesarios aquÃ <br> para importar los " "datos de muestra" -#: ../admin/import-export/import.php:73 ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 msgid "or" msgstr "o" -#: ../admin/import-export/import.php:75 +#: ../admin/import-export/import.php:77 msgid "Browse local files" msgstr "Examinar archivos locales" -#: ../admin/import-export/import.php:78 +#: ../admin/import-export/import.php:80 #, php-format msgid "Maximum upload file size: %d %s." msgstr "TamaÃ±o mÃ¡ximo para subir un archivo: %d %s." -#: ../admin/import-export/import.php:81 +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" +msgstr "Demo de ImportaciÃ³n de Archivos" + +#: ../admin/import-export/import.php:83 msgid "View Demo" msgstr "Ver Demo" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File name" msgstr "Nombre de archivo" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File size" msgstr "TamaÃ±o de archivo" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "Uploaded file:" msgstr "Archivo cargado" -#: ../admin/import-export/import.php:105 +#: ../admin/import-export/import.php:107 msgid "Installing content started." msgstr "InstalaciÃ³n de contenido iniciada." -#: ../admin/import-export/import.php:115 +#: ../admin/import-export/import.php:117 msgid "Install" msgstr "Instalar" -#: ../admin/import-export/import.php:120 +#: ../admin/import-export/import.php:122 msgid "" "Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " "and <b>.XML</b> files to install theme sample data." @@ -476,359 +312,227 @@ msgstr "" "archivos <b>.JSON</b> y <b>.XML</b> para instalar los datos de muestra del " "tema. " -#: ../admin/import-export/import.php:122 +#: ../admin/import-export/import.php:124 msgid "Add More Files" msgstr "AÃ±adir MÃ¡s Archivos" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Continue Install" msgstr "Continuar InstalaciÃ³n" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Missing .XML or .JSON file" msgstr "Falta el archivo .XML o el archivo .JSON" -#: ../admin/import-export/import.php:130 +#: ../admin/import-export/import.php:132 msgid "Congratulations" msgstr "Â¡Felicidades" -#: ../admin/import-export/import.php:131 +#: ../admin/import-export/import.php:133 msgid "Content has been installed successfully" msgstr "Contenido instalado con Ã©xito" -#: ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:135 msgid "View your site" msgstr "Visitar su pÃ¡gina web" -#: ../admin/import-export/import.php:134 +#: ../admin/import-export/import.php:136 msgid "go to Cherry Options" msgstr "ir a Opciones del Cherry" -#: ../admin/shortcodes/dialog.php:21 -msgid "Shortcode Options" -msgstr "Opciones de cÃ³digo corto" - -#: ../admin/shortcodes/dialog.php:32 -msgid "Cancel" -msgstr "Cancelar" +#: ../admin/plugin-components.php:36 +msgid "Documentation" +msgstr "DocumentaciÃ³n" -#: ../admin/shortcodes/dialog.php:33 ../admin/shortcodes/editor-plugin.php:782 -msgid "Insert Shortcode" -msgstr "Insertar cÃ³digo corto" - -#: ../admin/shortcodes/editor-plugin.php:788 -msgid "Posts" -msgstr "Entradas" - -#: ../admin/shortcodes/editor-plugin.php:789 -msgid "Posts Grid" -msgstr "Grid de entradas" - -#: ../admin/shortcodes/editor-plugin.php:790 -msgid "Posts List" -msgstr "Lista de entradas" - -#: ../admin/shortcodes/editor-plugin.php:791 -msgid "Mini Posts Grid" -msgstr "Mini Posts Grid/Entradas Mini Grid" - -#: ../admin/shortcodes/editor-plugin.php:792 -msgid "Mini Posts List" -msgstr "Mini Posts List/Entradas Mini Lista" - -#: ../admin/shortcodes/editor-plugin.php:793 -msgid "Recent Posts" -msgstr "Entradas nuevas" - -#: ../admin/shortcodes/editor-plugin.php:794 -msgid "Recent Testimonials" -msgstr "Testimonios nuevos" - -#: ../admin/shortcodes/editor-plugin.php:795 -msgid "Basic" -msgstr "BÃ¡sico" - -#: ../admin/shortcodes/editor-plugin.php:796 -msgid "Banner" -msgstr "Banner" - -#: ../admin/shortcodes/editor-plugin.php:797 -#: ../includes/shortcodes/carousel-owl.php:171 -#: ../includes/shortcodes/carousel.php:154 -#: ../includes/shortcodes/post-cycle.php:139 -#: ../includes/shortcodes/posts-list.php:161 -#: ../includes/shortcodes/posts-list.php:162 -#: ../includes/widgets/my-post-cycle-widget.php:127 -msgid "Comments" -msgstr "Comentarios" +#: ../admin/plugin-components.php:37 +msgid "Support" +msgstr "Soporte" -#: ../admin/shortcodes/editor-plugin.php:798 -msgid "Post Cycle" -msgstr "Post Cycle/Ciclo de Entrada" +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" +msgstr "Remover Widgets Inactivos" -#: ../admin/shortcodes/editor-plugin.php:799 -msgid "Carousel (Elasti)" -msgstr "Carrusel (Elasti)" +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" +msgstr "CTRL+A (Comando-A) para seleccionar archivos " -#: ../admin/shortcodes/editor-plugin.php:800 -msgid "Carousel (OWL)" -msgstr "Carrusel (OWL)" +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" +msgstr "Los ficheros son descargados como archivos .zip" -#: ../admin/shortcodes/editor-plugin.php:801 -msgid "Roundabout" -msgstr "Rotonda" +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." +msgstr "" +"Habilitar esta opciÃ³n para activar el modo de mantenimiento de la pÃ¡gina web" -#: ../admin/shortcodes/editor-plugin.php:802 -msgid "Service Box" -msgstr "Cuadro de Servicio" +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" +msgstr "Â¿Mostrar logotipo?" -#: ../admin/shortcodes/editor-plugin.php:803 -msgid "Hero Unit" -msgstr "Hero Unit" +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" +msgstr "" +"Activar esta opciÃ³n para mostrar el logotipo en una pÃ¡gina en construcciÃ³n" -#: ../admin/shortcodes/editor-plugin.php:804 -msgid "Categories" -msgstr "CategorÃas" +#: ../admin/plugin-maintenance-mode.php:79 +msgid "Description" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:805 -#: ../includes/shortcodes/posts-list.php:281 -msgid "Tags" -msgstr "Etiquetas" - -#: ../admin/shortcodes/editor-plugin.php:806 -msgid "Columns" -msgstr "Columnas" - -#: ../admin/shortcodes/editor-plugin.php:821 -msgid "Fluid Column" -msgstr "Columna Fluida" - -#: ../admin/shortcodes/editor-plugin.php:830 -msgid "2 Columns" -msgstr "2 Columnas" - -#: ../admin/shortcodes/editor-plugin.php:834 -msgid "3 Columns" -msgstr "3 Columnas" - -#: ../admin/shortcodes/editor-plugin.php:839 -msgid "4 Columns" -msgstr "4 Columnas" - -#: ../admin/shortcodes/editor-plugin.php:841 -msgid "Elements" -msgstr "Elementos" - -#: ../admin/shortcodes/editor-plugin.php:842 -msgid "Label" -msgstr "Etiqueta" - -#: ../admin/shortcodes/editor-plugin.php:843 -msgid "Text Highlight" -msgstr "Texto destacado" - -#: ../admin/shortcodes/editor-plugin.php:844 -msgid "Button" -msgstr "BotÃ³n" - -#: ../admin/shortcodes/editor-plugin.php:845 -msgid "Drop Cap" -msgstr "/Letra Capital" - -#: ../admin/shortcodes/editor-plugin.php:846 -msgid "Blockquote" -msgstr "Bloque de cita" - -#: ../admin/shortcodes/editor-plugin.php:847 -msgid "Icon" -msgstr "Icono" - -#: ../admin/shortcodes/editor-plugin.php:848 -msgid "Frame" -msgstr "Marca" - -#: ../admin/shortcodes/editor-plugin.php:849 -msgid "Horizontal Rule" -msgstr "Regla horizontal" - -#: ../admin/shortcodes/editor-plugin.php:850 -msgid "Small Horizontal Rule" -msgstr "Regla pequeÃ±a horizontal" - -#: ../admin/shortcodes/editor-plugin.php:851 -msgid "Vertical Rule" -msgstr "Regla vertical" - -#: ../admin/shortcodes/editor-plugin.php:852 -msgid "Spacer" -msgstr "Spacer" - -#: ../admin/shortcodes/editor-plugin.php:853 -msgid "Progressbar" -msgstr "Barra de progreso" - -#: ../admin/shortcodes/editor-plugin.php:854 -msgid "Address" -msgstr "DirecciÃ³n" - -#: ../admin/shortcodes/editor-plugin.php:855 -msgid "Clear" -msgstr "Limpio" - -#: ../admin/shortcodes/editor-plugin.php:856 -msgid "Extra Wrap" -msgstr "Envoltura adicional" - -#: ../admin/shortcodes/editor-plugin.php:857 -msgid "Lists" -msgstr "Listas" - -#: ../admin/shortcodes/editor-plugin.php:858 -msgid "Unstyled" -msgstr "Sin estilo" - -#: ../admin/shortcodes/editor-plugin.php:859 -msgid "Check List" -msgstr "Lista de verificaciÃ³n" - -#: ../admin/shortcodes/editor-plugin.php:860 -msgid "Check 2 List" -msgstr "Lista de verificaciÃ³n 2" - -#: ../admin/shortcodes/editor-plugin.php:861 -msgid "OK Circle List" -msgstr "Lista Buena Gente" - -#: ../admin/shortcodes/editor-plugin.php:862 -msgid "OK Sign List" -msgstr "Lista OK de Registro" - -#: ../admin/shortcodes/editor-plugin.php:863 -msgid "Arrow List" -msgstr "Lista de flechas" +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" +msgstr "Â¿Mostrar temporizador?" -#: ../admin/shortcodes/editor-plugin.php:864 -msgid "Arrow 2 List" -msgstr "Lista de flechas 2" +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." +msgstr "Fecha de lanzamiento de la pÃ¡gina web." -#: ../admin/shortcodes/editor-plugin.php:865 -msgid "Circle Arrow List" -msgstr "Lista Flecha CÃrculo" +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." +msgstr "La fecha no estÃ¡ correcta." -#: ../admin/shortcodes/editor-plugin.php:866 -msgid "Caret List" -msgstr "Lista SÃmbolo de IntercalaciÃ³n" +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" +msgstr "AÃ±o:" -#: ../admin/shortcodes/editor-plugin.php:867 -msgid "Angle List" -msgstr "Lista Ãngulo" +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" +msgstr "Mes:" -#: ../admin/shortcodes/editor-plugin.php:868 -msgid "Double Angle List" -msgstr "Lista Doble Ãngulo" +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" +msgstr "DÃa:" -#: ../admin/shortcodes/editor-plugin.php:869 -msgid "Star List" -msgstr "Lista de estrellas" +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" +msgstr "Hora:" -#: ../admin/shortcodes/editor-plugin.php:870 -msgid "Plus List" -msgstr "Lista de signo mÃ¡s" +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" +msgstr "Minuto:" -#: ../admin/shortcodes/editor-plugin.php:871 -msgid "Minus List" -msgstr "Lista de signo menos" +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" +msgstr "Guardar Cambios" -#: ../admin/shortcodes/editor-plugin.php:872 -msgid "Circle List" -msgstr "Lista" +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" +msgstr "Cherry Plugin" -#: ../admin/shortcodes/editor-plugin.php:873 -msgid "Circle Blank List" -msgstr "Lista en Blanco" +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " +msgstr "" +"El Cherry Plugin ha sido lanzado con la intenciÃ³n de separar widgets, " +"cÃ³digos cortos y la administraciÃ³n de datos con un editor de opciones. El " +"Cherry Plugin se instala automÃ¡ticamente en la instalaciÃ³n CherryFramework y " +"es obligatÃ³rio para el correcto funcionamiento de CherryFramework." -#: ../admin/shortcodes/editor-plugin.php:874 -msgid "Custom List" -msgstr "Lista personalizada" +#: ../admin/plugin-pages.php:19 +msgid "Import" +msgstr "Importar" -#: ../admin/shortcodes/editor-plugin.php:875 -msgid "Misc" -msgstr "MiscelÃ¡neo" +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." +msgstr "" +"OpciÃ³n para importar contenido de la pÃ¡gina web desde la copia de seguridad. " +"Seleccione todos los archivos desde el archivo de copia de seguridad y " +"arrÃ¡strelos a la zona apropiada para subir archivos." -#: ../admin/shortcodes/editor-plugin.php:876 -msgid "Alert Box" -msgstr "Cuadro de advertencia" +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" +msgstr "Demo de ExportaciÃ³n de Archivos" -#: ../admin/shortcodes/editor-plugin.php:877 -msgid "Close icon" -msgstr "Cerrar icono" +#: ../admin/plugin-pages.php:30 +msgid "Export" +msgstr "Exportar" -#: ../admin/shortcodes/editor-plugin.php:878 -msgid "Well" -msgstr "Bien" +#: ../admin/plugin-pages.php:31 +msgid "" +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." +msgstr "" +"OpciÃ³n para crear una copia de seguridad de su pÃ¡gina web mediante un " +"archivo descargable. Utilice esta opciÃ³n para mantener los datos de la " +"pÃ¡gina web, siempre que realizar algunas modificaciones importantes o haga " +"una transferencia de la pÃ¡gina web a otro alojamiento." -#: ../admin/shortcodes/editor-plugin.php:879 -msgid "Small" -msgstr "PequeÃ±o" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" +msgstr "Widgets" -#: ../admin/shortcodes/editor-plugin.php:880 -#: ../includes/widgets/my-comment-widget.php:140 -#: ../includes/widgets/my-facebook-widget.php:79 -#: ../includes/widgets/my-flickr-widget.php:57 -#: ../includes/widgets/my-posts-type-widget.php:205 -#: ../includes/widgets/my-recent-posts.php:126 -#: ../includes/widgets/my-recent-posts.php:148 -#: ../includes/widgets/my-social-widget.php:132 -#: ../includes/widgets/my-vcard-widget.php:151 -msgid "Title" -msgstr "TÃtulo" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." +msgstr "" +"El Cherry Widgets ofrece formas adicionales de colocar el contenido en las " +"Ã¡reas destinadas a widgets. MÃ¡s widgets disponibles le permitirÃ¡ aÃ±adir mÃ¡s " +"funcionalidades a su pÃ¡gina web." -#: ../admin/shortcodes/editor-plugin.php:881 -msgid "Template URL" -msgstr "URL de Plantilla" +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" +msgstr "CÃ³digos cortos" -#: ../admin/shortcodes/editor-plugin.php:882 -msgid "Sitemap" -msgstr "Mapa del sitio" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." +msgstr "" +"El Cherry Plugin aÃ±ade varios widgets al editor de entradas. Los cÃ³digos " +"cortos permiten crear varias estructuras de contenido en las entradas de " +"WordPress. Utilice el icono \"Inserir CÃ³digo Corto\" en el editor de " +"entradas de la barra de herramientas para aÃ±adir cÃ³digos cortos." -#: ../admin/shortcodes/editor-plugin.php:883 -msgid "Video Preview" -msgstr "Vista previa de vÃdeo" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" +msgstr "MÃ¡s informaciÃ³n" -#: ../admin/shortcodes/editor-plugin.php:884 -msgid "Tabs" -msgstr "PestaÃ±as" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" +msgstr "Importar Contenidos Cherry" -#: ../admin/shortcodes/editor-plugin.php:885 -msgid "Accordion" -msgstr "AcordeÃ³n" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" +msgstr "Exportar Contenidos Cherry" -#: ../admin/shortcodes/editor-plugin.php:886 -msgid "Table" -msgstr "Tabla" +#: ../admin/shortcodes/dialog.php:20 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 +msgid "Cancel" +msgstr "Cancelar" -#: ../admin/shortcodes/editor-plugin.php:887 -msgid "Pricing Table" -msgstr "Tabla de DeterminaciÃ³n de Precios" +#: ../admin/shortcodes/dialog.php:21 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 +msgid "Insert" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:888 -#: ../includes/widgets/my-vcard-widget.php:156 -msgid "Google Map" -msgstr "Mapa de Google" +#: ../admin/shortcodes/dialog.php:25 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 +msgid "Shortcode Options" +msgstr "Opciones de cÃ³digo corto" -#: ../includes/plugin-assets.php:32 +#: ../includes/plugin-assets.php:38 msgid "Under Construction Page Widgets Area." msgstr "Ãrea de Widgets en ConstrucciÃ³n." -#: ../includes/plugin-assets.php:34 +#: ../includes/plugin-assets.php:40 msgid "Under construction page widgets area." msgstr "Ãrea de widgets en construcciÃ³n." -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Maintenance mode activated. Website is blocked from public" msgstr "Modo de mantenimiento activado. PÃ¡gina web bloqueada al pÃºblico" -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Settings." msgstr "Configuraciones." @@ -845,102 +549,89 @@ msgid "Hours" msgstr "Horas" #: ../includes/plugin-under-construction-content.php:85 -msgid "Minuts" -msgstr "Minutos" +msgid "Minutes" +msgstr "" #: ../includes/plugin-under-construction-content.php:89 msgid "Seconds" msgstr "Segundos" -#: ../includes/gt-custom/gt-custom.php:112 -msgid "Style Switcher Preview" -msgstr "Previsualizar Style Switcher" - -#: ../includes/gt-custom/gt-customize.php:17 -msgid "Cheatin’ uh?" -msgstr "EngaÃ±and’ Â¿QuÃ©?" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "%1$s — WordPress" -msgstr "%1$s — WordPress" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "Customize %s" -msgstr "Personalizar %s" - -#: ../includes/gt-custom/gt-customize.php:112 -msgid "Style Switcher" -msgstr "Style Switcher" - -#: ../includes/shortcodes/carousel-owl.php:165 -#: ../includes/shortcodes/posts-list.php:152 +#: ../includes/shortcodes/carousel-owl.php:168 +#: ../includes/shortcodes/posts-list.php:154 msgid "by " msgstr "por" -#: ../includes/shortcodes/carousel-owl.php:173 -#: ../includes/shortcodes/carousel.php:156 -#: ../includes/widgets/my-post-cycle-widget.php:129 +#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel.php:167 +#: ../includes/shortcodes/post-cycle.php:150 +#: ../includes/shortcodes/posts-list.php:163 +#: ../includes/shortcodes/posts-list.php:164 +#: ../includes/widgets/my-post-cycle-widget.php:153 +msgid "Comments" +msgstr "Comentarios" + +#: ../includes/shortcodes/carousel-owl.php:176 +#: ../includes/shortcodes/carousel.php:169 +#: ../includes/widgets/my-post-cycle-widget.php:155 msgid "Comment" msgstr "Comentario" -#: ../includes/shortcodes/carousel.php:147 -#: ../includes/widgets/my-post-cycle-widget.php:118 +#: ../includes/shortcodes/carousel.php:160 +#: ../includes/widgets/my-post-cycle-widget.php:144 msgid "by" msgstr "de" -#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:25 +#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 #: ../includes/shortcodes/post-cycle.php:17 -#: ../includes/shortcodes/posts-grid.php:22 +#: ../includes/shortcodes/posts-grid.php:24 #: ../includes/shortcodes/posts-list.php:19 -#: ../includes/shortcodes/service-box.php:15 -#: ../includes/widgets/my-posts-type-widget.php:145 +#: ../includes/shortcodes/service-box.php:16 +#: ../includes/widgets/my-posts-type-widget.php:165 #: ../includes/widgets/my-recent-posts.php:87 msgid "Read more" msgstr "Leer mÃ¡s" -#: ../includes/shortcodes/media.php:82 ../includes/shortcodes/media.php:205 -#: ../includes/shortcodes/media.php:216 -#: ../includes/shortcodes/shortcodes.php:211 -#: ../includes/shortcodes/shortcodes.php:309 -#: ../includes/shortcodes/shortcodes.php:320 +#: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 +#: ../includes/shortcodes/media.php:251 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 msgid "Play" msgstr "Reproducir" -#: ../includes/shortcodes/media.php:83 ../includes/shortcodes/media.php:217 -#: ../includes/shortcodes/shortcodes.php:212 -#: ../includes/shortcodes/shortcodes.php:321 +#: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 msgid "Pause" msgstr "Pausa" -#: ../includes/shortcodes/media.php:84 ../includes/shortcodes/media.php:218 -#: ../includes/shortcodes/shortcodes.php:214 -#: ../includes/shortcodes/shortcodes.php:322 +#: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 msgid "Stop" msgstr "Parar" -#: ../includes/shortcodes/media.php:90 ../includes/shortcodes/media.php:224 -#: ../includes/shortcodes/shortcodes.php:220 -#: ../includes/shortcodes/shortcodes.php:328 +#: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 msgid "Mute" msgstr "Mudo" -#: ../includes/shortcodes/media.php:91 ../includes/shortcodes/media.php:225 -#: ../includes/shortcodes/shortcodes.php:221 -#: ../includes/shortcodes/shortcodes.php:329 +#: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 msgid "Unmute" msgstr "Activar el sonido" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Update Required." msgstr "ActualizaciÃ³n necesaria" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "" "To play the media you will need to either update your browser to a recent " "version or update your " @@ -948,148 +639,387 @@ msgstr "" "Para reproducir el archivo multimedia tendrÃ¡ que actualizar su navegador a " "una versiÃ³n mÃ¡s reciente o actualizar el" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Flash plugin" msgstr "plugin del Flash" -#: ../includes/shortcodes/post-cycle.php:166 +#: ../includes/shortcodes/post-cycle.php:210 msgid "Client" msgstr "Cliente" -#: ../includes/shortcodes/post-cycle.php:167 -#: ../includes/widgets/my-comment-widget.php:91 +#: ../includes/shortcodes/post-cycle.php:211 +#: ../includes/widgets/my-comment-widget.php:97 #: ../includes/widgets/my-recent-posts.php:147 msgid "Date" msgstr "Fecha" -#: ../includes/shortcodes/post-cycle.php:168 -msgid "Info" -msgstr "InformaciÃ³n" +#: ../includes/shortcodes/post-cycle.php:212 +msgid "Info" +msgstr "InformaciÃ³n" + +#: ../includes/shortcodes/post-cycle.php:213 +msgid "Launch Project" +msgstr "Lanzar proyecto" + +#: ../includes/shortcodes/posts-list.php:130 +#: ../includes/shortcodes/posts-list.php:139 +msgid "Posted in" +msgstr "Publicado en" + +#: ../includes/shortcodes/posts-list.php:283 +msgid "Tags" +msgstr "Etiquetas" + +#: ../includes/shortcodes/shortcodes.php:226 +msgid "Previous" +msgstr "Anterior" + +#: ../includes/shortcodes/shortcodes.php:229 +msgid "Next" +msgstr "Siguiente" + +#: ../includes/widgets/cherry-banner-widget.php:5 +msgid "Cherry - Banner" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:46 +#: ../includes/widgets/my-comment-widget.php:146 +#: ../includes/widgets/my-facebook-widget.php:79 +#: ../includes/widgets/my-flickr-widget.php:62 +#: ../includes/widgets/my-posts-type-widget.php:225 +#: ../includes/widgets/my-recent-posts.php:126 +#: ../includes/widgets/my-recent-posts.php:148 +#: ../includes/widgets/my-social-widget.php:108 +#: ../includes/widgets/my-vcard-widget.php:155 +msgid "Title" +msgstr "TÃtulo" + +#: ../includes/widgets/cherry-banner-widget.php:47 +msgid "Banner description" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:48 +#: ../includes/widgets/cherry-instagram-widget.php:165 +msgid "Image URL" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:49 +msgid "Fill image" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:50 +#: ../includes/widgets/my-posts-type-widget.php:398 +#: ../includes/widgets/my-recent-posts.php:160 +msgid "Link URL" +msgstr "URL de enlace" + +#: ../includes/widgets/cherry-banner-widget.php:89 +msgid "Select Image" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Cherry - Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Widget for popular social network Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 +msgid "Widget Title" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "User Name" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +msgid "" +"Widget will work only for users who have full rights opened in Instagram " +"account." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Number of displayed images" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Max value: 20 images." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Image dimentions" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Large" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Thumbnail" +msgstr "Thumbnail" + +#: ../includes/widgets/cherry-instagram-widget.php:153 +msgid "Show image description" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:156 +msgid "Show comments number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:159 +msgid "Show likes number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:162 +msgid "Show image publication date" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:168 +msgid "User account button text" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" +msgstr "Esquema de color" -#: ../includes/shortcodes/post-cycle.php:169 -msgid "Launch Project" -msgstr "Lanzar proyecto" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" +msgstr "Luz" -#: ../includes/shortcodes/posts-list.php:128 -#: ../includes/shortcodes/posts-list.php:137 -msgid "Posted in" -msgstr "Publicado en" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" +msgstr "Oscuro" -#: ../includes/shortcodes/shortcodes.php:210 -msgid "Previous" -msgstr "Anterior" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" +msgstr "" -#: ../includes/shortcodes/shortcodes.php:213 -msgid "Next" -msgstr "Siguiente" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." +msgstr "" -#: ../includes/widgets/my-banners-widget.php:13 +#: ../includes/widgets/my-banners-widget.php:7 msgid "Add 125x125 ads." msgstr "Agregar anuncios 125x125." -#: ../includes/widgets/my-banners-widget.php:17 -msgid "Cherry - 125x125 Ads." -msgstr "Cherry - Anuncios 125x125." +#: ../includes/widgets/my-banners-widget.php:10 +msgid "Cherry - 125x125 Ads" +msgstr "" -#: ../includes/widgets/my-banners-widget.php:60 +#: ../includes/widgets/my-banners-widget.php:65 msgid "Ad 1" msgstr "Anuncio 1" -#: ../includes/widgets/my-banners-widget.php:62 -#: ../includes/widgets/my-banners-widget.php:71 -#: ../includes/widgets/my-banners-widget.php:80 -#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:67 +#: ../includes/widgets/my-banners-widget.php:76 +#: ../includes/widgets/my-banners-widget.php:85 +#: ../includes/widgets/my-banners-widget.php:94 msgid "Image Ad Link:" msgstr "Enlace de Imagen de anuncio:" -#: ../includes/widgets/my-banners-widget.php:66 -#: ../includes/widgets/my-banners-widget.php:75 -#: ../includes/widgets/my-banners-widget.php:84 -#: ../includes/widgets/my-banners-widget.php:93 +#: ../includes/widgets/my-banners-widget.php:71 +#: ../includes/widgets/my-banners-widget.php:80 +#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:98 msgid "Ad Link:" msgstr "Enlace de Anuncio:" -#: ../includes/widgets/my-banners-widget.php:69 +#: ../includes/widgets/my-banners-widget.php:74 msgid "Ad 2" msgstr "Anuncio 2" -#: ../includes/widgets/my-banners-widget.php:78 +#: ../includes/widgets/my-banners-widget.php:83 msgid "Ad 3" msgstr "Anuncio 3" -#: ../includes/widgets/my-banners-widget.php:87 +#: ../includes/widgets/my-banners-widget.php:92 msgid "Ad 4" msgstr "Anuncio 4" -#: ../includes/widgets/my-comment-widget.php:4 +#: ../includes/widgets/my-comment-widget.php:5 msgid "Cherry - Recent Comments" msgstr "Cherry - Comentarios nuevos" -#: ../includes/widgets/my-comment-widget.php:11 -#: ../includes/widgets/my-comment-widget.php:127 +#: ../includes/widgets/my-comment-widget.php:13 +#: ../includes/widgets/my-comment-widget.php:133 msgid "My Recent Comments" msgstr "Mis comentarios nuevos" -#: ../includes/widgets/my-comment-widget.php:72 +#: ../includes/widgets/my-comment-widget.php:78 msgid "Comment in" msgstr "Comentarios en" -#: ../includes/widgets/my-comment-widget.php:81 -#: ../includes/widgets/widgets-manager.php:479 -#: ../includes/widgets/widgets-manager.php:487 +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 msgid "Author" msgstr "Autor" -#: ../includes/widgets/my-comment-widget.php:99 +#: ../includes/widgets/my-comment-widget.php:105 msgid "Go to this comment" msgstr "Abrir este comentario" -#: ../includes/widgets/my-comment-widget.php:141 +#: ../includes/widgets/my-comment-widget.php:147 msgid "Number of comments to show" msgstr "Numero de comentarios para mostrar" -#: ../includes/widgets/my-comment-widget.php:142 +#: ../includes/widgets/my-comment-widget.php:148 msgid "Display avatar" msgstr "Mostrar avatar" -#: ../includes/widgets/my-comment-widget.php:143 +#: ../includes/widgets/my-comment-widget.php:149 msgid "Avatar size (px)" msgstr "TamaÃ±o de avatar" -#: ../includes/widgets/my-comment-widget.php:152 +#: ../includes/widgets/my-comment-widget.php:158 msgid "Display the comment author" msgstr "Mostrar comentario del autor" -#: ../includes/widgets/my-comment-widget.php:153 +#: ../includes/widgets/my-comment-widget.php:159 msgid "Display the comment date" msgstr "Mostrar fecha del comentario" -#: ../includes/widgets/my-comment-widget.php:154 +#: ../includes/widgets/my-comment-widget.php:160 msgid "Display post title" msgstr "Mostrar titulo de entrada" -#: ../includes/widgets/my-comment-widget.php:155 -#: ../includes/widgets/my-vcard-widget.php:191 +#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:195 msgid "Meta format" msgstr "Formato meta" -#: ../includes/widgets/my-comment-widget.php:157 -#: ../includes/widgets/my-vcard-widget.php:193 -#: ../includes/widgets/widgets-manager.php:506 +#: ../includes/widgets/my-comment-widget.php:163 +#: ../includes/widgets/my-vcard-widget.php:197 +#: ../includes/widgets/widgets-manager.php:507 msgid "None" msgstr "NingÃºn" -#: ../includes/widgets/my-comment-widget.php:158 -#: ../includes/widgets/my-social-widget.php:209 -#: ../includes/widgets/my-vcard-widget.php:194 +#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-social-widget.php:185 +#: ../includes/widgets/my-vcard-widget.php:198 msgid "Icons" msgstr "Iconos" -#: ../includes/widgets/my-comment-widget.php:159 -#: ../includes/widgets/my-social-widget.php:210 -#: ../includes/widgets/my-vcard-widget.php:195 +#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-vcard-widget.php:199 msgid "Labels" msgstr "Etiquetas" @@ -1114,27 +1044,15 @@ msgid "Facebook Pages." msgstr "PÃ¡ginas de Facebook" #: ../includes/widgets/my-facebook-widget.php:90 -#: ../includes/widgets/my-posts-type-widget.php:347 +#: ../includes/widgets/my-posts-type-widget.php:367 msgid "Width" msgstr "Ancho" #: ../includes/widgets/my-facebook-widget.php:95 -#: ../includes/widgets/my-posts-type-widget.php:352 +#: ../includes/widgets/my-posts-type-widget.php:372 msgid "Height" msgstr "Altura" -#: ../includes/widgets/my-facebook-widget.php:100 -msgid "Color Scheme" -msgstr "Esquema de color" - -#: ../includes/widgets/my-facebook-widget.php:102 -msgid "Light" -msgstr "Luz" - -#: ../includes/widgets/my-facebook-widget.php:103 -msgid "Dark" -msgstr "Oscuro" - #: ../includes/widgets/my-facebook-widget.php:109 msgid "Display header" msgstr "Mostrar encabezado" @@ -1155,17 +1073,21 @@ msgstr "Mostrar marco" msgid "Cherry - Flickr" msgstr "Cherry - Flickr" -#: ../includes/widgets/my-flickr-widget.php:59 +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." +msgstr "" + +#: ../includes/widgets/my-flickr-widget.php:64 msgid "Flickr ID" msgstr "Id. Flickr " -#: ../includes/widgets/my-flickr-widget.php:60 +#: ../includes/widgets/my-flickr-widget.php:65 msgid "Images count" msgstr "Recuento de imÃ¡genes" -#: ../includes/widgets/my-flickr-widget.php:61 -#: ../includes/widgets/my-posts-type-widget.php:325 -#: ../includes/widgets/my-posts-type-widget.php:372 +#: ../includes/widgets/my-flickr-widget.php:66 +#: ../includes/widgets/my-posts-type-widget.php:345 +#: ../includes/widgets/my-posts-type-widget.php:392 #: ../includes/widgets/my-recent-posts.php:158 msgid "Link Text" msgstr "Enlace del Texto" @@ -1174,87 +1096,87 @@ msgstr "Enlace del Texto" msgid "Cherry - Post Cycle" msgstr "Cherry â Ciclo de PublicaciÃ³n" -#: ../includes/widgets/my-post-cycle-widget.php:195 +#: ../includes/widgets/my-post-cycle-widget.php:221 msgid "Title:" msgstr "TÃtulo" -#: ../includes/widgets/my-post-cycle-widget.php:197 +#: ../includes/widgets/my-post-cycle-widget.php:223 msgid "Select post type:" msgstr "Seleccionar el tipo de entrada:" -#: ../includes/widgets/my-post-cycle-widget.php:227 +#: ../includes/widgets/my-post-cycle-widget.php:253 msgid "Categories (names separated by \",\"):" msgstr "CategorÃas (nombres separados por \",\"):" -#: ../includes/widgets/my-post-cycle-widget.php:229 +#: ../includes/widgets/my-post-cycle-widget.php:255 msgid "Posts count:" msgstr "Recuento de entradas:" -#: ../includes/widgets/my-post-cycle-widget.php:231 +#: ../includes/widgets/my-post-cycle-widget.php:257 msgid "Thumbnail Width (in pixels):" msgstr "Anchura del Thumbnail (en pÃxeles):" -#: ../includes/widgets/my-post-cycle-widget.php:233 +#: ../includes/widgets/my-post-cycle-widget.php:259 msgid "Thumbnail Height (in pixels):" msgstr "Altura del Thumbnail (en pÃxeles):" -#: ../includes/widgets/my-post-cycle-widget.php:235 +#: ../includes/widgets/my-post-cycle-widget.php:261 msgid "Show titles:" msgstr "Mostrar tÃtulos:" -#: ../includes/widgets/my-post-cycle-widget.php:242 -#: ../includes/widgets/my-post-cycle-widget.php:261 -#: ../includes/widgets/my-post-cycle-widget.php:280 -#: ../includes/widgets/my-post-cycle-widget.php:299 -#: ../includes/widgets/my-post-cycle-widget.php:318 -#: ../includes/widgets/my-post-cycle-widget.php:343 -#: ../includes/widgets/my-post-cycle-widget.php:362 +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 msgid "yes" msgstr "sÃ" -#: ../includes/widgets/my-post-cycle-widget.php:247 -#: ../includes/widgets/my-post-cycle-widget.php:266 -#: ../includes/widgets/my-post-cycle-widget.php:285 -#: ../includes/widgets/my-post-cycle-widget.php:304 -#: ../includes/widgets/my-post-cycle-widget.php:323 -#: ../includes/widgets/my-post-cycle-widget.php:348 -#: ../includes/widgets/my-post-cycle-widget.php:367 +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 msgid "no" msgstr "no" -#: ../includes/widgets/my-post-cycle-widget.php:254 +#: ../includes/widgets/my-post-cycle-widget.php:280 msgid "Show date:" msgstr "Mostrar fecha:" -#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:299 msgid "Show author:" msgstr "Mostrar autor:" -#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:318 msgid "Show comments:" msgstr "Mostrar comentarios:" -#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:337 msgid "Show excerpt:" msgstr "Mostrar extracto:" -#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:356 msgid "Excerpt word count:" msgstr "Recuento de palabras en el extracto:" -#: ../includes/widgets/my-post-cycle-widget.php:332 +#: ../includes/widgets/my-post-cycle-widget.php:358 msgid "More Button Text:" msgstr "MÃ¡s Botones de Texto:" -#: ../includes/widgets/my-post-cycle-widget.php:334 +#: ../includes/widgets/my-post-cycle-widget.php:360 msgid "Slideshow cycling speed (in sec.):" msgstr "Velocidad de la presentaciÃ³n de diapositivas (en seg.):" -#: ../includes/widgets/my-post-cycle-widget.php:336 +#: ../includes/widgets/my-post-cycle-widget.php:362 msgid "Arrows:" msgstr "Flechas:" -#: ../includes/widgets/my-post-cycle-widget.php:355 +#: ../includes/widgets/my-post-cycle-widget.php:381 msgid "Pagination:" msgstr "PaginaciÃ³n:" @@ -1266,120 +1188,115 @@ msgstr "Mostrar entradas personalizadas" msgid "Cherry - Advanced Cycle" msgstr "Cherry - Ciclo avanzado" -#: ../includes/widgets/my-posts-type-widget.php:152 +#: ../includes/widgets/my-posts-type-widget.php:172 msgid "View all" msgstr "Ver todo" -#: ../includes/widgets/my-posts-type-widget.php:212 +#: ../includes/widgets/my-posts-type-widget.php:232 msgid "Posts type" msgstr "Tipo de entrada" -#: ../includes/widgets/my-posts-type-widget.php:229 +#: ../includes/widgets/my-posts-type-widget.php:249 msgid "Number of posts to show" msgstr "NÃºmero de entradas mostradas" -#: ../includes/widgets/my-posts-type-widget.php:236 +#: ../includes/widgets/my-posts-type-widget.php:256 msgid "Sort by" msgstr "Ordenar" -#: ../includes/widgets/my-posts-type-widget.php:250 +#: ../includes/widgets/my-posts-type-widget.php:270 msgid "Reverse sort order (ascending)" msgstr "Invertir orden de clasificaciÃ³n (ascendente)" -#: ../includes/widgets/my-posts-type-widget.php:256 +#: ../includes/widgets/my-posts-type-widget.php:276 msgid "Show number of comments" msgstr "Mostrar nÃºmero de comentarios" -#: ../includes/widgets/my-posts-type-widget.php:263 +#: ../includes/widgets/my-posts-type-widget.php:283 msgid "Show meta" msgstr "Mostrar meta" -#: ../includes/widgets/my-posts-type-widget.php:269 +#: ../includes/widgets/my-posts-type-widget.php:289 msgid "Container class" msgstr "Clase de contenedor" -#: ../includes/widgets/my-posts-type-widget.php:270 +#: ../includes/widgets/my-posts-type-widget.php:290 msgid "default: \"featured_custom_posts\"" msgstr "por defecto: \"featured_custom_posts\"" -#: ../includes/widgets/my-posts-type-widget.php:275 +#: ../includes/widgets/my-posts-type-widget.php:295 msgid "Post title" msgstr "TÃtulo de entrada" -#: ../includes/widgets/my-posts-type-widget.php:279 +#: ../includes/widgets/my-posts-type-widget.php:299 msgid "Show post title" msgstr "Mostrar tÃtulo de entrada" -#: ../includes/widgets/my-posts-type-widget.php:285 +#: ../includes/widgets/my-posts-type-widget.php:305 msgid "Date as title " msgstr "Fecha como tÃtulo" -#: ../includes/widgets/my-posts-type-widget.php:292 +#: ../includes/widgets/my-posts-type-widget.php:312 msgid "Excerpt" msgstr "Extracto" -#: ../includes/widgets/my-posts-type-widget.php:296 +#: ../includes/widgets/my-posts-type-widget.php:316 msgid "Show post excerpt" msgstr "Mostrar extracto de entrada" -#: ../includes/widgets/my-posts-type-widget.php:301 +#: ../includes/widgets/my-posts-type-widget.php:321 #: ../includes/widgets/my-recent-posts.php:156 msgid "Excerpt length (words)" msgstr "TamaÃ±o del extracto (palabras)" -#: ../includes/widgets/my-posts-type-widget.php:308 +#: ../includes/widgets/my-posts-type-widget.php:328 msgid "Excerpt as link" msgstr "Extracto como enlace" -#: ../includes/widgets/my-posts-type-widget.php:315 +#: ../includes/widgets/my-posts-type-widget.php:335 msgid "More link" msgstr "Enlace MÃ¡s" -#: ../includes/widgets/my-posts-type-widget.php:319 +#: ../includes/widgets/my-posts-type-widget.php:339 msgid "Show \"More link" msgstr "Mostrar enlace \"More (MÃ¡s)\"" -#: ../includes/widgets/my-posts-type-widget.php:326 +#: ../includes/widgets/my-posts-type-widget.php:346 msgid "default: \"Read more\"" msgstr "por defecto: \"Read more\"" -#: ../includes/widgets/my-posts-type-widget.php:331 +#: ../includes/widgets/my-posts-type-widget.php:351 msgid "Link class" msgstr "Clase de enlace" -#: ../includes/widgets/my-posts-type-widget.php:332 +#: ../includes/widgets/my-posts-type-widget.php:352 msgid "default: \"link\"" msgstr "por defecto:\"link\"" -#: ../includes/widgets/my-posts-type-widget.php:337 +#: ../includes/widgets/my-posts-type-widget.php:357 msgid "Thumbnail dimensions" msgstr "Dimensiones miniaturas" -#: ../includes/widgets/my-posts-type-widget.php:342 +#: ../includes/widgets/my-posts-type-widget.php:362 msgid "Show post thumbnail" msgstr "Mostrar thumbnail de entrada" -#: ../includes/widgets/my-posts-type-widget.php:358 +#: ../includes/widgets/my-posts-type-widget.php:378 msgid "Thumbnail as link" msgstr "Thumbnail como enlace" -#: ../includes/widgets/my-posts-type-widget.php:363 +#: ../includes/widgets/my-posts-type-widget.php:383 msgid "Link to all posts" msgstr "Enlace a todas entradas" -#: ../includes/widgets/my-posts-type-widget.php:367 +#: ../includes/widgets/my-posts-type-widget.php:387 msgid "Show global link to all posts" msgstr "Mostrar el enlace global a todas entradas." -#: ../includes/widgets/my-posts-type-widget.php:373 +#: ../includes/widgets/my-posts-type-widget.php:393 msgid "default: \"View all\"" msgstr "por defecto:\"View all\"" -#: ../includes/widgets/my-posts-type-widget.php:378 -#: ../includes/widgets/my-recent-posts.php:160 -msgid "Link URL" -msgstr "URL de enlace" - #: ../includes/widgets/my-recent-posts.php:6 msgid "Cherry - Recent Posts" msgstr "Cherry - Entradas nuevas" @@ -1452,104 +1369,104 @@ msgstr "Enlace a su red social." msgid "Cherry - Social Networks" msgstr "Cherry - Redes sociales" -#: ../includes/widgets/my-social-widget.php:136 +#: ../includes/widgets/my-social-widget.php:112 msgid "Facebook" msgstr "Facebook" -#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:114 msgid "Facebook URL" msgstr "Facebook URL" -#: ../includes/widgets/my-social-widget.php:141 +#: ../includes/widgets/my-social-widget.php:117 msgid "Facebook label" msgstr "Etiqueta Facebook" -#: ../includes/widgets/my-social-widget.php:146 +#: ../includes/widgets/my-social-widget.php:122 msgid "Twitter" msgstr "Twitter" -#: ../includes/widgets/my-social-widget.php:147 +#: ../includes/widgets/my-social-widget.php:123 msgid "Twitter URL" msgstr "Twitter URL" -#: ../includes/widgets/my-social-widget.php:149 +#: ../includes/widgets/my-social-widget.php:125 msgid "Twitter label" msgstr "Etiqueta Twitter" -#: ../includes/widgets/my-social-widget.php:154 +#: ../includes/widgets/my-social-widget.php:130 msgid "Flickr" msgstr "Flickr" -#: ../includes/widgets/my-social-widget.php:155 +#: ../includes/widgets/my-social-widget.php:131 msgid "Flickr URL" msgstr "Flickr URL" -#: ../includes/widgets/my-social-widget.php:157 +#: ../includes/widgets/my-social-widget.php:133 msgid "Flickr label" msgstr "Etiqueta Flickr " -#: ../includes/widgets/my-social-widget.php:162 -#: ../includes/widgets/my-social-widget.php:163 +#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:139 msgid "RSS feed" msgstr "RSS feed" -#: ../includes/widgets/my-social-widget.php:165 +#: ../includes/widgets/my-social-widget.php:141 msgid "RSS label" msgstr "Etiqueta RSS" -#: ../includes/widgets/my-social-widget.php:170 +#: ../includes/widgets/my-social-widget.php:146 msgid "Linkedin" msgstr "Linkedin" -#: ../includes/widgets/my-social-widget.php:171 +#: ../includes/widgets/my-social-widget.php:147 msgid "Linkedin URL" msgstr "Linkedin URL" -#: ../includes/widgets/my-social-widget.php:173 +#: ../includes/widgets/my-social-widget.php:149 msgid "Linkedin label" msgstr "Etiqueta Linkedin " -#: ../includes/widgets/my-social-widget.php:178 +#: ../includes/widgets/my-social-widget.php:154 msgid "Delicious" msgstr "Delicious" -#: ../includes/widgets/my-social-widget.php:179 +#: ../includes/widgets/my-social-widget.php:155 msgid "Delicious URL" msgstr "Delicious URL" -#: ../includes/widgets/my-social-widget.php:181 +#: ../includes/widgets/my-social-widget.php:157 msgid "Delicious label" msgstr "Etiqueta Delicious " -#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-social-widget.php:162 msgid "Youtube" msgstr "Youtube" -#: ../includes/widgets/my-social-widget.php:188 +#: ../includes/widgets/my-social-widget.php:164 msgid "Youtube URL" msgstr "Youtube URL" -#: ../includes/widgets/my-social-widget.php:191 +#: ../includes/widgets/my-social-widget.php:167 msgid "Youtube label" msgstr "Etiqueta Youtube " -#: ../includes/widgets/my-social-widget.php:197 -msgid "Google+" -msgstr "Google+" +#: ../includes/widgets/my-social-widget.php:173 +msgid "Google" +msgstr "" -#: ../includes/widgets/my-social-widget.php:199 -msgid "Google+ URL" -msgstr "Google+ URL" +#: ../includes/widgets/my-social-widget.php:175 +msgid "Google URL" +msgstr "" -#: ../includes/widgets/my-social-widget.php:202 -msgid "Google+ label" -msgstr "Etiqueta Google+" +#: ../includes/widgets/my-social-widget.php:178 +msgid "Google label" +msgstr "" -#: ../includes/widgets/my-social-widget.php:208 +#: ../includes/widgets/my-social-widget.php:184 msgid "Display" msgstr "Mostrar" -#: ../includes/widgets/my-social-widget.php:211 +#: ../includes/widgets/my-social-widget.php:187 msgid "Both" msgstr "Ambos" @@ -1565,41 +1482,45 @@ msgstr "Cherry - vCard" msgid "vCard" msgstr "vCard" -#: ../includes/widgets/my-vcard-widget.php:51 -#: ../includes/widgets/my-vcard-widget.php:167 +#: ../includes/widgets/my-vcard-widget.php:55 +#: ../includes/widgets/my-vcard-widget.php:171 msgid "Street Address" msgstr "Domicilio" -#: ../includes/widgets/my-vcard-widget.php:52 -#: ../includes/widgets/my-vcard-widget.php:171 +#: ../includes/widgets/my-vcard-widget.php:56 +#: ../includes/widgets/my-vcard-widget.php:175 msgid "City/Locality" msgstr "Ciudad/Localidad" -#: ../includes/widgets/my-vcard-widget.php:53 -#: ../includes/widgets/my-vcard-widget.php:175 +#: ../includes/widgets/my-vcard-widget.php:57 +#: ../includes/widgets/my-vcard-widget.php:179 msgid "State/Region" msgstr "Estado/RegiÃ³n" -#: ../includes/widgets/my-vcard-widget.php:54 -#: ../includes/widgets/my-vcard-widget.php:179 +#: ../includes/widgets/my-vcard-widget.php:58 +#: ../includes/widgets/my-vcard-widget.php:183 msgid "Zipcode/Postal Code" msgstr "CÃ³digo Postal" -#: ../includes/widgets/my-vcard-widget.php:55 -#: ../includes/widgets/my-vcard-widget.php:183 +#: ../includes/widgets/my-vcard-widget.php:59 +#: ../includes/widgets/my-vcard-widget.php:187 msgid "Telephone" msgstr "TelÃ©fono" -#: ../includes/widgets/my-vcard-widget.php:56 -#: ../includes/widgets/my-vcard-widget.php:187 +#: ../includes/widgets/my-vcard-widget.php:60 +#: ../includes/widgets/my-vcard-widget.php:191 msgid "Email" msgstr "Correo ElectrÃ³nico" -#: ../includes/widgets/my-vcard-widget.php:158 +#: ../includes/widgets/my-vcard-widget.php:160 +msgid "Google Map" +msgstr "Mapa de Google" + +#: ../includes/widgets/my-vcard-widget.php:162 msgid "Display map" msgstr "Mostrar mapa" -#: ../includes/widgets/my-vcard-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:165 msgid "HTML map code" msgstr "CÃ³digo mapa HTML" @@ -1636,107 +1557,111 @@ msgid "Homepage" msgstr "PÃ¡gina de inicio" #: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" +msgstr "Blog" + +#: ../includes/widgets/widgets-manager.php:475 msgid "Page" msgstr "PÃ¡gina" -#: ../includes/widgets/widgets-manager.php:475 +#: ../includes/widgets/widgets-manager.php:476 msgid "Post" msgstr "Entrada" -#: ../includes/widgets/widgets-manager.php:476 -#: ../includes/widgets/widgets-manager.php:478 +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 msgid "Archive" msgstr "Archivo" -#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:478 msgid "Tag" msgstr "Etiqueta" -#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:481 msgid "Search page" msgstr "Buscar pagina" -#: ../includes/widgets/widgets-manager.php:481 +#: ../includes/widgets/widgets-manager.php:482 msgid "404 page" msgstr "pÃ¡gina 404" -#: ../includes/widgets/widgets-manager.php:483 +#: ../includes/widgets/widgets-manager.php:484 msgid "Page ID/Title/slug" msgstr "ID de PÃ¡gina/TÃtulo/slug" -#: ../includes/widgets/widgets-manager.php:484 +#: ../includes/widgets/widgets-manager.php:485 msgid "Post ID/Title/slug" msgstr "ID de la entrada/Titulo/ficha" -#: ../includes/widgets/widgets-manager.php:485 +#: ../includes/widgets/widgets-manager.php:486 msgid "Category ID/Name/slug" msgstr "ID de la categorÃa/Nombre/ficha" -#: ../includes/widgets/widgets-manager.php:486 +#: ../includes/widgets/widgets-manager.php:487 msgid "Tag ID/Name" msgstr "ID de Etiqueta/Nombre" -#: ../includes/widgets/widgets-manager.php:488 +#: ../includes/widgets/widgets-manager.php:489 msgid "Add page" msgstr "Agregar pÃ¡gina" -#: ../includes/widgets/widgets-manager.php:491 +#: ../includes/widgets/widgets-manager.php:492 msgid "Selected pages" msgstr "PÃ¡ginas seleccionadas" -#: ../includes/widgets/widgets-manager.php:492 +#: ../includes/widgets/widgets-manager.php:493 msgid "No pages" msgstr "No hay pÃ¡ginas" -#: ../includes/widgets/widgets-manager.php:510 +#: ../includes/widgets/widgets-manager.php:511 msgid "All devices" msgstr "Todos los dipositivos" -#: ../includes/widgets/widgets-manager.php:511 +#: ../includes/widgets/widgets-manager.php:512 msgid "Desktops" msgstr "Desktops" -#: ../includes/widgets/widgets-manager.php:512 +#: ../includes/widgets/widgets-manager.php:513 msgid "Tablets" msgstr "Tabletas" -#: ../includes/widgets/widgets-manager.php:513 +#: ../includes/widgets/widgets-manager.php:514 msgid "Phones" msgstr "MÃ³viles" -#: ../includes/widgets/widgets-manager.php:514 +#: ../includes/widgets/widgets-manager.php:515 msgid "Desktops/Tablets" msgstr "Desktops/Tabletas" -#: ../includes/widgets/widgets-manager.php:515 +#: ../includes/widgets/widgets-manager.php:516 msgid "Tablets/Phones" msgstr "Tabletas/MÃ³viles" -#: ../includes/widgets/widgets-manager.php:516 +#: ../includes/widgets/widgets-manager.php:517 msgid "Desktops/Phones" msgstr "Desktops/MÃ³viles" -#: ../includes/widgets/widgets-manager.php:519 +#: ../includes/widgets/widgets-manager.php:520 msgid "Visible on" msgstr "Visible en" -#: ../includes/widgets/widgets-manager.php:528 +#: ../includes/widgets/widgets-manager.php:529 msgid "All users" msgstr "Todos usuarios" -#: ../includes/widgets/widgets-manager.php:529 +#: ../includes/widgets/widgets-manager.php:530 msgid "Only guests" msgstr "SÃ³lo huÃ©spedes" -#: ../includes/widgets/widgets-manager.php:530 +#: ../includes/widgets/widgets-manager.php:531 msgid "Only registered users" msgstr "SÃ³lo usuarios registrados" -#: ../includes/widgets/widgets-manager.php:531 +#: ../includes/widgets/widgets-manager.php:532 msgid "Only administrator" msgstr "SÃ³lo administrador" -#: ../includes/widgets/widgets-manager.php:534 +#: ../includes/widgets/widgets-manager.php:535 msgid "Visible for" msgstr "Visible para" @@ -1759,6 +1684,243 @@ msgid "" "This does not appear to be a WXR file, missing/invalid WXR version number" msgstr "Esto no es un fichero WXR, falta/nÃºmero no vÃ¡lido de versiÃ³n WXR" +#~ msgid "Minuts" +#~ msgstr "Minutos" + +#~ msgid "Description." +#~ msgstr "DescripciÃ³n" + +#~ msgid "Insert Shortcode" +#~ msgstr "Insertar cÃ³digo corto" + +#~ msgid "Posts" +#~ msgstr "Entradas" + +#~ msgid "Posts Grid" +#~ msgstr "Grid de entradas" + +#~ msgid "Posts List" +#~ msgstr "Lista de entradas" + +#~ msgid "Mini Posts Grid" +#~ msgstr "Mini Posts Grid/Entradas Mini Grid" + +#~ msgid "Mini Posts List" +#~ msgstr "Mini Posts List/Entradas Mini Lista" + +#~ msgid "Recent Posts" +#~ msgstr "Entradas nuevas" + +#~ msgid "Recent Testimonials" +#~ msgstr "Testimonios nuevos" + +#~ msgid "Basic" +#~ msgstr "BÃ¡sico" + +#~ msgid "Banner" +#~ msgstr "Banner" + +#~ msgid "Post Cycle" +#~ msgstr "Post Cycle/Ciclo de Entrada" + +#~ msgid "Carousel (Elasti)" +#~ msgstr "Carrusel (Elasti)" + +#~ msgid "Carousel (OWL)" +#~ msgstr "Carrusel (OWL)" + +#~ msgid "Roundabout" +#~ msgstr "Rotonda" + +#~ msgid "Service Box" +#~ msgstr "Cuadro de Servicio" + +#~ msgid "Hero Unit" +#~ msgstr "Hero Unit" + +#~ msgid "Categories" +#~ msgstr "CategorÃas" + +#~ msgid "Columns" +#~ msgstr "Columnas" + +#~ msgid "Fluid Column" +#~ msgstr "Columna Fluida" + +#~ msgid "2 Columns" +#~ msgstr "2 Columnas" + +#~ msgid "3 Columns" +#~ msgstr "3 Columnas" + +#~ msgid "4 Columns" +#~ msgstr "4 Columnas" + +#~ msgid "Elements" +#~ msgstr "Elementos" + +#~ msgid "Label" +#~ msgstr "Etiqueta" + +#~ msgid "Text Highlight" +#~ msgstr "Texto destacado" + +#~ msgid "Button" +#~ msgstr "BotÃ³n" + +#~ msgid "Drop Cap" +#~ msgstr "/Letra Capital" + +#~ msgid "Blockquote" +#~ msgstr "Bloque de cita" + +#~ msgid "Icon" +#~ msgstr "Icono" + +#~ msgid "Frame" +#~ msgstr "Marca" + +#~ msgid "Horizontal Rule" +#~ msgstr "Regla horizontal" + +#~ msgid "Small Horizontal Rule" +#~ msgstr "Regla pequeÃ±a horizontal" + +#~ msgid "Vertical Rule" +#~ msgstr "Regla vertical" + +#~ msgid "Spacer" +#~ msgstr "Spacer" + +#~ msgid "Progressbar" +#~ msgstr "Barra de progreso" + +#~ msgid "Address" +#~ msgstr "DirecciÃ³n" + +#~ msgid "Clear" +#~ msgstr "Limpio" + +#~ msgid "Extra Wrap" +#~ msgstr "Envoltura adicional" + +#~ msgid "Lists" +#~ msgstr "Listas" + +#~ msgid "Unstyled" +#~ msgstr "Sin estilo" + +#~ msgid "Check List" +#~ msgstr "Lista de verificaciÃ³n" + +#~ msgid "Check 2 List" +#~ msgstr "Lista de verificaciÃ³n 2" + +#~ msgid "OK Circle List" +#~ msgstr "Lista Buena Gente" + +#~ msgid "OK Sign List" +#~ msgstr "Lista OK de Registro" + +#~ msgid "Arrow List" +#~ msgstr "Lista de flechas" + +#~ msgid "Arrow 2 List" +#~ msgstr "Lista de flechas 2" + +#~ msgid "Circle Arrow List" +#~ msgstr "Lista Flecha CÃrculo" + +#~ msgid "Caret List" +#~ msgstr "Lista SÃmbolo de IntercalaciÃ³n" + +#~ msgid "Angle List" +#~ msgstr "Lista Ãngulo" + +#~ msgid "Double Angle List" +#~ msgstr "Lista Doble Ãngulo" + +#~ msgid "Star List" +#~ msgstr "Lista de estrellas" + +#~ msgid "Plus List" +#~ msgstr "Lista de signo mÃ¡s" + +#~ msgid "Minus List" +#~ msgstr "Lista de signo menos" + +#~ msgid "Circle List" +#~ msgstr "Lista" + +#~ msgid "Circle Blank List" +#~ msgstr "Lista en Blanco" + +#~ msgid "Custom List" +#~ msgstr "Lista personalizada" + +#~ msgid "Misc" +#~ msgstr "MiscelÃ¡neo" + +#~ msgid "Alert Box" +#~ msgstr "Cuadro de advertencia" + +#~ msgid "Close icon" +#~ msgstr "Cerrar icono" + +#~ msgid "Well" +#~ msgstr "Bien" + +#~ msgid "Small" +#~ msgstr "PequeÃ±o" + +#~ msgid "Template URL" +#~ msgstr "URL de Plantilla" + +#~ msgid "Sitemap" +#~ msgstr "Mapa del sitio" + +#~ msgid "Video Preview" +#~ msgstr "Vista previa de vÃdeo" + +#~ msgid "Tabs" +#~ msgstr "PestaÃ±as" + +#~ msgid "Accordion" +#~ msgstr "AcordeÃ³n" + +#~ msgid "Table" +#~ msgstr "Tabla" + +#~ msgid "Pricing Table" +#~ msgstr "Tabla de DeterminaciÃ³n de Precios" + +#~ msgid "Style Switcher Preview" +#~ msgstr "Previsualizar Style Switcher" + +#~ msgid "Cheatin’ uh?" +#~ msgstr "EngaÃ±and’ Â¿QuÃ©?" + +#~ msgid "%1$s — WordPress" +#~ msgstr "%1$s — WordPress" + +#~ msgid "Customize %s" +#~ msgstr "Personalizar %s" + +#~ msgid "Style Switcher" +#~ msgstr "Style Switcher" + +#~ msgid "Cherry - 125x125 Ads." +#~ msgstr "Cherry - Anuncios 125x125." + +#~ msgid "Google+" +#~ msgstr "Google+" + +#~ msgid "Google+ URL" +#~ msgstr "Google+ URL" + +#~ msgid "Google+ label" +#~ msgstr "Etiqueta Google+" + #~ msgid "No Repeat" #~ msgstr "No se repite" @@ -2553,9 +2715,6 @@ msgstr "Esto no es un fichero WXR, falta/nÃºmero no vÃ¡lido de versiÃ³n WXR" #~ msgid "easeInOutBounce" #~ msgstr "easeInOutBounce" -#~ msgid "Blog" -#~ msgstr "Blog" - #~ msgid "Blog Title" #~ msgstr "TÃtulo de Blog" @@ -3144,9 +3303,6 @@ msgstr "Esto no es un fichero WXR, falta/nÃºmero no vÃ¡lido de versiÃ³n WXR" #~ msgid "Category" #~ msgstr "CategorÃa" -#~ msgid "Thumbnail" -#~ msgstr "Thumbnail" - #~ msgid "Your comment is awaiting moderation." #~ msgstr "Su comentario necesita moderaciÃ³n." @@ -4121,8 +4277,8 @@ msgstr "Esto no es un fichero WXR, falta/nÃºmero no vÃ¡lido de versiÃ³n WXR" #~ msgid "WordPress engine system files and folders <em>(recommended)</em>" #~ msgstr "" -#~ "Las carpetas y archivos de sistema del motor de WordPress <em>" -#~ "(recomendado)</em>" +#~ "Las carpetas y archivos de sistema del motor de WordPress " +#~ "<em>(recomendado)</em>" #~ msgid "Your plugins system files and folders <em>(recommended)</em>" #~ msgstr "" diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.mo index 7b49f3a1..55ca24ae 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.po index cb1a6955..d3a4f1c5 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-fr_FR.po @@ -1,211 +1,43 @@ msgid "" msgstr "" -"Project-Id-Version: Cherry Framework\n" -"POT-Creation-Date: 2014-02-25 10:55+0200\n" -"PO-Revision-Date: 2014-03-03 15:09+0200\n" -"Last-Translator: Alex Ross <alex@template-telp.com>\n" -"Language-Team: Cherry Framework Team\n" +"Project-Id-Version: fr_FR\n" +"POT-Creation-Date: 2015-06-24 13:08+0200\n" +"PO-Revision-Date: 2015-06-24 13:08+0200\n" +"Last-Translator: \n" +"Language-Team: Cherry Team <demolink@info.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -"X-Poedit-SearchPath-1: .\n" -#: ../admin/admin.php:28 +#: ../admin/admin.php:30 msgid "Cherry plugin" msgstr "Plugin Cherry" -#: ../admin/admin.php:31 ../admin/admin.php:52 +#: ../admin/admin.php:33 ../admin/admin.php:54 msgid "Summary" msgstr "RÃ©sumÃ©" -#: ../admin/admin.php:34 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 #: ../admin/plugin-pages.php:100 msgid "Maintenance Mode" msgstr "Mode maintenance" -#: ../admin/admin.php:37 +#: ../admin/admin.php:39 msgid "Import Content" msgstr "Importer le contenu" -#: ../admin/admin.php:40 ../admin/import-export/export.php:30 +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 msgid "Export Content" msgstr "Exporter le contenu" -#: ../admin/plugin-components.php:36 -msgid "Documentation" -msgstr "Documentation" - -#: ../admin/plugin-components.php:37 -msgid "Support" -msgstr "Soutien" - -#: ../admin/plugin-function.php:5 -msgid "Remove Inactive Widgets" -msgstr "Supprimer les widgets inactifs" - -#: ../admin/plugin-function.php:23 -msgid "CTRL+A (Command-A) to select all files" -msgstr "CTRL+A (Command-A) pour sÃ©lectionner tous les fichiers" - -#: ../admin/plugin-function.php:37 -msgid "Files are downloaded as a .zip archive" -msgstr "Les fichiers sont tÃ©lÃ©chargÃ©s sous la forme d'une archive .zip" - -#: ../admin/plugin-maintenance-mode.php:62 -msgid "Enable this option to activate website maintenance mode." -msgstr "Activer cette option pour activer le mode maintenance du site" - -#: ../admin/plugin-maintenance-mode.php:68 -msgid "Display Logo?" -msgstr "Afficher le logo ?" - -#: ../admin/plugin-maintenance-mode.php:73 -msgid "" -"Enable this option to display website logo at the under construction page" -msgstr "" -"Activer cette option pour afficher le logo du site sur la page \"en " -"construction\"" - -#: ../admin/plugin-maintenance-mode.php:79 -msgid "Description." -msgstr "Description" - -#: ../admin/plugin-maintenance-mode.php:89 -#: ../admin/plugin-maintenance-mode.php:94 -msgid "Display timer?" -msgstr "Afficher le compte Ã rebours ?" - -#: ../admin/plugin-maintenance-mode.php:100 -msgid "Website launch date." -msgstr "Date de lancement du site." - -#: ../admin/plugin-maintenance-mode.php:101 -msgid "Date is not correct." -msgstr "La date n'est pas correcte." - -#: ../admin/plugin-maintenance-mode.php:105 -msgid "Year:" -msgstr "AnnÃ©e :" - -#: ../admin/plugin-maintenance-mode.php:107 -msgid "Month:" -msgstr "Mois :" - -#: ../admin/plugin-maintenance-mode.php:109 -msgid "Day:" -msgstr "Jour :" - -#: ../admin/plugin-maintenance-mode.php:113 -msgid "Hour:" -msgstr "Heure :" - -#: ../admin/plugin-maintenance-mode.php:115 -msgid "Minute:" -msgstr "Minute :" - -#: ../admin/plugin-maintenance-mode.php:123 -msgid "Save Changes" -msgstr "Enregistrer les changements" - -#: ../admin/plugin-pages.php:6 -msgid "Cherry Plugin" -msgstr "Plugin Cherry" - -#: ../admin/plugin-pages.php:11 -msgid "" -"Cherry Plugin has been released with intention to separate widgets, " -"shortcodes and data management logics with theme editor options. Cherry " -"Plugin is installed automatically on CherryFramework installation and is " -"required for the correct work of CherryFramework. " -msgstr "" -"Le plugin Cherry a Ã©tÃ© crÃ©Ã© pour sÃ©parer les widgets, shortcodes et la " -"gestion des donnÃ©es des options de l'Ã©diteur de thÃ¨me. Le Cherry plugin est " -"installÃ© automatiquement avec le framework Cherry et est nÃ©cessaire pour le " -"bon fonctionnement du framework Cherry." - -#: ../admin/plugin-pages.php:15 ../admin/import-export/import.php:80 -msgid "Files Import demo" -msgstr "Importer les fichiers de dÃ©mo" - -#: ../admin/plugin-pages.php:19 -msgid "Import" -msgstr "Importer" - -#: ../admin/plugin-pages.php:20 -msgid "" -"Option to import website content from the backup. Select all files from the " -"backup archive and drag them to the upload files area to start uploading." -msgstr "" -"Option pour importer le contenu du site Ã partir de la sauvegarde. " -"SÃ©lectionnez tous les fichiers de la sauvegarde et faites les glisser dans " -"la section de mise en ligne des fichiers pour commencer. " - -#: ../admin/plugin-pages.php:26 -msgid "Files Export demo" -msgstr "DÃ©mo d'exportation des fichiers" - -#: ../admin/plugin-pages.php:30 -msgid "Export" -msgstr "Exporter" - -#: ../admin/plugin-pages.php:31 -msgid "" -"Option to backup your website data creating a downloadable archive. Use this " -"option to keep your website data on performing some serious modifications or " -"moving website to other hosting." -msgstr "" -"Option pour sauvegarder les donnÃ©es de votre site et crÃ©er une archive " -"tÃ©lÃ©chargeable. Utilisez cette option avant de mettre en place des " -"modifications importantes ou de changer d'hÃ©bergeur. " - -#: ../admin/plugin-pages.php:42 -msgid "Widgets" -msgstr "Widgets" - -#: ../admin/plugin-pages.php:43 -msgid "" -"Cherry Widgets offer additional ways to place content to widget areas. " -"Several available widget will allow you to add more functionality to your " -"website." -msgstr "" -"Les widgets Cherry offrent de des faÃ§ons supplÃ©mentaires de placer du " -"contenu dans les zones widget. Plusieurs widgets disponibles vous " -"permettront d'ajouter des fonctionnalitÃ©s Ã votre site. " - -#: ../admin/plugin-pages.php:52 -msgid "Shortcodes" -msgstr "Shortcodes" - -#: ../admin/plugin-pages.php:53 -msgid "" -"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " -"create various content structures in WordPress posts. Use \"Insert Shortcode" -"\" icon in post editor toolbar to add shortcodes." -msgstr "" -"Le plugin Cherry ajoute diffÃ©rents widgets Ã l'Ã©diteur de texte. Les " -"shortcodes permettent de crÃ©er diffÃ©rentes structures de contenu dans les " -"articles Wordpress. Utilisez l'icÃ´ne \"Insert Shortcode\" dans la boite Ã " -"outils de l'Ã©diteur de texte pour ajouter des shortcodes." - -#: ../admin/plugin-pages.php:53 -msgid "Learn more" -msgstr "En savoir plus" - -#: ../admin/plugin-pages.php:79 -msgid "Cherry Content Import" -msgstr "Importation du contenu de Cherry" - -#: ../admin/plugin-pages.php:90 -msgid "Cherry Content Export" -msgstr "Exportation du contenu de Cherry" - -#: ../admin/import-export/export-functions.php:14 +#: ../admin/import-export/export-functions.php:18 msgid "Export content done" msgstr "Exportation du contenu terminÃ©e" @@ -300,43 +132,43 @@ msgstr "Requis" msgid "Continue" msgstr "Continuer" -#: ../admin/import-export/import.php:32 +#: ../admin/import-export/import.php:34 msgid "Upload Error" msgstr "Erreur lors de la mise en ligne" -#: ../admin/import-export/import.php:33 +#: ../admin/import-export/import.php:35 msgid "The file is too big!" msgstr "Le fichier est trop grand !" -#: ../admin/import-export/import.php:34 +#: ../admin/import-export/import.php:36 msgid "The file type is error!" msgstr "Le type de fichier gÃ©nÃ¨re une erreur !" -#: ../admin/import-export/import.php:35 +#: ../admin/import-export/import.php:37 msgid "Folder cannot be uploaded!" msgstr "Le dossier ne peut Ãªtre mis en ligne !" -#: ../admin/import-export/import.php:36 +#: ../admin/import-export/import.php:38 msgid "Uploading" msgstr "Mise en ligne" -#: ../admin/import-export/import.php:37 ../admin/import-export/import.php:111 +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 msgid "Upload" msgstr "TÃ©lÃ©charger" -#: ../admin/import-export/import.php:38 +#: ../admin/import-export/import.php:40 msgid "Upload Complete" msgstr "Mise en ligne terminÃ©e" -#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 msgid "item" msgstr "objet" -#: ../admin/import-export/import.php:40 +#: ../admin/import-export/import.php:42 msgid "items" msgstr "objets" -#: ../admin/import-export/import.php:41 +#: ../admin/import-export/import.php:43 msgid "" "Sample data installing. Some steps may take some time depending on your " "server settings. Please be patient." @@ -344,82 +176,82 @@ msgstr "" "Installation des donnÃ©es d'exemple. Certaines Ã©tapes peuvent prendre du " "temps suivant les rÃ©glages de votre serveur. Merci d'Ãªtre patient." -#: ../admin/import-export/import.php:42 +#: ../admin/import-export/import.php:44 msgid "Upload complete please click Continue Install button to proceed." msgstr "" "Mise en ligne terminÃ©e. Merci de cliquer sur continuer l'installation pour " "poursuivre." -#: ../admin/import-export/import.php:44 +#: ../admin/import-export/import.php:46 msgid "Importing XML" msgstr "Importation XML" -#: ../admin/import-export/import.php:45 +#: ../admin/import-export/import.php:47 msgid "Importing categories" msgstr "Importation des catÃ©gories" -#: ../admin/import-export/import.php:46 +#: ../admin/import-export/import.php:48 msgid "Importing tags" msgstr "Importations des tags" -#: ../admin/import-export/import.php:47 +#: ../admin/import-export/import.php:49 msgid "Processing dependencies" msgstr "Traitement des dÃ©pendences" -#: ../admin/import-export/import.php:48 +#: ../admin/import-export/import.php:50 msgid "Importing posts. This may take some time. Please wait." msgstr "" "Importation des articles. Cela peut prendre du temps. Merci de patienter." -#: ../admin/import-export/import.php:49 +#: ../admin/import-export/import.php:51 msgid "Importing menu items. This may take some time. Please wait." msgstr "" "Importation des Ã©lÃ©ments du menu. Cela peut prendre du temps. Merci de " "patienter." -#: ../admin/import-export/import.php:50 +#: ../admin/import-export/import.php:52 msgid "Importing media library." msgstr "Importation de la bibliothÃ¨que de mÃ©dias." -#: ../admin/import-export/import.php:51 +#: ../admin/import-export/import.php:53 msgid "Importing attachements meta." msgstr "Importation des tags meta des fichiers joints." -#: ../admin/import-export/import.php:52 +#: ../admin/import-export/import.php:54 msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" "Mise en place des tags meta des fichiers joints. Cela peut prend un peu de " "temps. Attendez s'il-vous-plaÃ®t." -#: ../admin/import-export/import.php:53 +#: ../admin/import-export/import.php:55 msgid "Generating content hierarchy" msgstr "Mise en place de la hiÃ©rarchie du contenu" -#: ../admin/import-export/import.php:54 +#: ../admin/import-export/import.php:56 msgid "Updating featured images" msgstr "Mise en ligne des images Ã la une" -#: ../admin/import-export/import.php:55 +#: ../admin/import-export/import.php:57 msgid "Updating attachments" msgstr "Mise en ligne des fichiers joints" -#: ../admin/import-export/import.php:56 +#: ../admin/import-export/import.php:58 msgid "Importing JSON" msgstr "Importation de JSON" -#: ../admin/import-export/import.php:57 +#: ../admin/import-export/import.php:59 msgid "Installing content complete" msgstr "Installation du contenu terminÃ©e" -#: ../admin/import-export/import.php:58 +#: ../admin/import-export/import.php:60 msgid "Installing content error" msgstr "Erreur lors de l'installation du contenu" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "Warning!" msgstr "Attention!" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "" "Installing sample data will replace your website content. Please make sure " "to backup your website data before importing content." @@ -428,50 +260,54 @@ msgstr "" "de vous assurer que vous avez une sauvegarde des donnÃ©es de votre site avant " "d'importer du contenu." -#: ../admin/import-export/import.php:72 +#: ../admin/import-export/import.php:74 msgid "Please Drop all needed files here <br> to import sample data" msgstr "" "Merci de dÃ©poser tous les fichiers nÃ©cessaires ici <br /> afin d'importer " "les donnÃ©es d'exemple" -#: ../admin/import-export/import.php:73 ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 msgid "or" msgstr "ou" -#: ../admin/import-export/import.php:75 +#: ../admin/import-export/import.php:77 msgid "Browse local files" msgstr "Parcourir les fichiers locaux" -#: ../admin/import-export/import.php:78 +#: ../admin/import-export/import.php:80 #, php-format msgid "Maximum upload file size: %d %s." msgstr "Taille maximum des fichiers mis en ligne %d %s." -#: ../admin/import-export/import.php:81 +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" +msgstr "Importer les fichiers de dÃ©mo" + +#: ../admin/import-export/import.php:83 msgid "View Demo" msgstr "Voir DÃ©mo" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File name" msgstr "Nom du fichier" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File size" msgstr "Taille du fichier" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "Uploaded file:" msgstr "Fichier mis en ligne:" -#: ../admin/import-export/import.php:105 +#: ../admin/import-export/import.php:107 msgid "Installing content started." msgstr "Installation du contenu commencÃ©e." -#: ../admin/import-export/import.php:115 +#: ../admin/import-export/import.php:117 msgid "Install" msgstr "Installer" -#: ../admin/import-export/import.php:120 +#: ../admin/import-export/import.php:122 msgid "" "Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " "and <b>.XML</b> files to install theme sample data." @@ -480,359 +316,226 @@ msgstr "" "ligne les fichiers <b>.JSON</b> et <b>.XML</b> pour installer les donnÃ©es " "d'exemple du thÃ¨me." -#: ../admin/import-export/import.php:122 +#: ../admin/import-export/import.php:124 msgid "Add More Files" msgstr "Ajouter plus de fichiers" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Continue Install" msgstr "Poursuivre l'installation" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Missing .XML or .JSON file" msgstr "Fichier .XML ou .JSON manquant" -#: ../admin/import-export/import.php:130 +#: ../admin/import-export/import.php:132 msgid "Congratulations" msgstr "FÃ©licitations" -#: ../admin/import-export/import.php:131 +#: ../admin/import-export/import.php:133 msgid "Content has been installed successfully" msgstr "Le contenu a Ã©tÃ© installÃ© avec succÃ¨s" -#: ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:135 msgid "View your site" msgstr "Voir votre site" -#: ../admin/import-export/import.php:134 +#: ../admin/import-export/import.php:136 msgid "go to Cherry Options" msgstr "Aller aux options Cherry" -#: ../admin/shortcodes/dialog.php:21 -msgid "Shortcode Options" -msgstr "Options code court" +#: ../admin/plugin-components.php:36 +msgid "Documentation" +msgstr "Documentation" -#: ../admin/shortcodes/dialog.php:32 -msgid "Cancel" -msgstr "Annuler" +#: ../admin/plugin-components.php:37 +msgid "Support" +msgstr "Soutien" -#: ../admin/shortcodes/dialog.php:33 ../admin/shortcodes/editor-plugin.php:782 -msgid "Insert Shortcode" -msgstr "InsÃ©rer le code court" - -#: ../admin/shortcodes/editor-plugin.php:788 -msgid "Posts" -msgstr "Messages" - -#: ../admin/shortcodes/editor-plugin.php:789 -msgid "Posts Grid" -msgstr "Messages Grille" - -#: ../admin/shortcodes/editor-plugin.php:790 -msgid "Posts List" -msgstr "Liste des messages" - -#: ../admin/shortcodes/editor-plugin.php:791 -msgid "Mini Posts Grid" -msgstr "Mini Messages Grille" - -#: ../admin/shortcodes/editor-plugin.php:792 -msgid "Mini Posts List" -msgstr "Liste de messages Mini" - -#: ../admin/shortcodes/editor-plugin.php:793 -msgid "Recent Posts" -msgstr "Les messages rÃ©cents" - -#: ../admin/shortcodes/editor-plugin.php:794 -msgid "Recent Testimonials" -msgstr "TÃ©moignages rÃ©cents" - -#: ../admin/shortcodes/editor-plugin.php:795 -msgid "Basic" -msgstr "D base" - -#: ../admin/shortcodes/editor-plugin.php:796 -msgid "Banner" -msgstr "BnniÃ¨re" - -#: ../admin/shortcodes/editor-plugin.php:797 -#: ../includes/shortcodes/carousel-owl.php:171 -#: ../includes/shortcodes/carousel.php:154 -#: ../includes/shortcodes/post-cycle.php:139 -#: ../includes/shortcodes/posts-list.php:161 -#: ../includes/shortcodes/posts-list.php:162 -#: ../includes/widgets/my-post-cycle-widget.php:127 -msgid "Comments" -msgstr "Cmmentaires" +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" +msgstr "Supprimer les widgets inactifs" -#: ../admin/shortcodes/editor-plugin.php:798 -msgid "Post Cycle" -msgstr "Pst-cycle" +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" +msgstr "CTRL+A (Command-A) pour sÃ©lectionner tous les fichiers" -#: ../admin/shortcodes/editor-plugin.php:799 -msgid "Carousel (Elasti)" -msgstr "Carousel (Elasti)" +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" +msgstr "Les fichiers sont tÃ©lÃ©chargÃ©s sous la forme d'une archive .zip" -#: ../admin/shortcodes/editor-plugin.php:800 -msgid "Carousel (OWL)" -msgstr "Carousel (OWL)" +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." +msgstr "Activer cette option pour activer le mode maintenance du site" -#: ../admin/shortcodes/editor-plugin.php:801 -msgid "Roundabout" -msgstr "MnÃ¨ge" +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" +msgstr "Afficher le logo ?" -#: ../admin/shortcodes/editor-plugin.php:802 -msgid "Service Box" -msgstr "BoÃ®te de service" +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" +msgstr "" +"Activer cette option pour afficher le logo du site sur la page \"en " +"construction\"" -#: ../admin/shortcodes/editor-plugin.php:803 -msgid "Hero Unit" -msgstr "UnitÃ© de hÃ©ros" +#: ../admin/plugin-maintenance-mode.php:79 +msgid "Description" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:804 -msgid "Categories" -msgstr "CtÃ©gories" +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" +msgstr "Afficher le compte Ã rebours ?" -#: ../admin/shortcodes/editor-plugin.php:805 -#: ../includes/shortcodes/posts-list.php:281 -msgid "Tags" -msgstr "Mots clÃ©s" - -#: ../admin/shortcodes/editor-plugin.php:806 -msgid "Columns" -msgstr "Clonnes" - -#: ../admin/shortcodes/editor-plugin.php:821 -msgid "Fluid Column" -msgstr "Colonne de fluide" - -#: ../admin/shortcodes/editor-plugin.php:830 -msgid "2 Columns" -msgstr "2 colonnes" - -#: ../admin/shortcodes/editor-plugin.php:834 -msgid "3 Columns" -msgstr "3 colonnes" - -#: ../admin/shortcodes/editor-plugin.php:839 -msgid "4 Columns" -msgstr "4 colonnes" - -#: ../admin/shortcodes/editor-plugin.php:841 -msgid "Elements" -msgstr "Ã©lÃ©ments" - -#: ../admin/shortcodes/editor-plugin.php:842 -msgid "Label" -msgstr "Ã©tiquette" - -#: ../admin/shortcodes/editor-plugin.php:843 -msgid "Text Highlight" -msgstr "Srbrillance du texte" - -#: ../admin/shortcodes/editor-plugin.php:844 -msgid "Button" -msgstr "Buton" - -#: ../admin/shortcodes/editor-plugin.php:845 -msgid "Drop Cap" -msgstr "Lttrine" - -#: ../admin/shortcodes/editor-plugin.php:846 -msgid "Blockquote" -msgstr "Bloquer citation" - -#: ../admin/shortcodes/editor-plugin.php:847 -msgid "Icon" -msgstr "IÃ´ne" - -#: ../admin/shortcodes/editor-plugin.php:848 -msgid "Frame" -msgstr "Frame" - -#: ../admin/shortcodes/editor-plugin.php:849 -msgid "Horizontal Rule" -msgstr "Hrizontal Rule" - -#: ../admin/shortcodes/editor-plugin.php:850 -msgid "Small Horizontal Rule" -msgstr "Petit rÃ¨gle horizontale" - -#: ../admin/shortcodes/editor-plugin.php:851 -msgid "Vertical Rule" -msgstr "Rgle verticale" - -#: ../admin/shortcodes/editor-plugin.php:852 -msgid "Spacer" -msgstr "Entretoise" - -#: ../admin/shortcodes/editor-plugin.php:853 -msgid "Progressbar" -msgstr "Barre de progression" - -#: ../admin/shortcodes/editor-plugin.php:854 -msgid "Address" -msgstr "Aresse" - -#: ../admin/shortcodes/editor-plugin.php:855 -msgid "Clear" -msgstr "Cair" - -#: ../admin/shortcodes/editor-plugin.php:856 -msgid "Extra Wrap" -msgstr "Enveloppe supplÃ©mentaire" - -#: ../admin/shortcodes/editor-plugin.php:857 -msgid "Lists" -msgstr "Listes" - -#: ../admin/shortcodes/editor-plugin.php:858 -msgid "Unstyled" -msgstr "Sns style" - -#: ../admin/shortcodes/editor-plugin.php:859 -msgid "Check List" -msgstr "Liste de ContrÃ´le" - -#: ../admin/shortcodes/editor-plugin.php:860 -msgid "Check 2 List" -msgstr "VÃ©rifiez 2 Liste" - -#: ../admin/shortcodes/editor-plugin.php:861 -msgid "OK Circle List" -msgstr "Liste Ã cercle OK" - -#: ../admin/shortcodes/editor-plugin.php:862 -msgid "OK Sign List" -msgstr "Liste Ã signe OK" - -#: ../admin/shortcodes/editor-plugin.php:863 -msgid "Arrow List" -msgstr "Liste flÃ¨che" - -#: ../admin/shortcodes/editor-plugin.php:864 -msgid "Arrow 2 List" -msgstr "FlÃ¨che 2 Liste" +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." +msgstr "Date de lancement du site." -#: ../admin/shortcodes/editor-plugin.php:865 -msgid "Circle Arrow List" -msgstr "Liste Ã cercle flÃ¨che" +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." +msgstr "La date n'est pas correcte." -#: ../admin/shortcodes/editor-plugin.php:866 -msgid "Caret List" -msgstr "Notation caret" +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" +msgstr "AnnÃ©e :" -#: ../admin/shortcodes/editor-plugin.php:867 -msgid "Angle List" -msgstr "Liste Ã angle" +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" +msgstr "Mois :" -#: ../admin/shortcodes/editor-plugin.php:868 -msgid "Double Angle List" -msgstr "Liste Ã double angle" +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" +msgstr "Jour :" -#: ../admin/shortcodes/editor-plugin.php:869 -msgid "Star List" -msgstr "Liste d'Ãtoile" +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" +msgstr "Heure :" -#: ../admin/shortcodes/editor-plugin.php:870 -msgid "Plus List" -msgstr "Plus Liste" +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" +msgstr "Minute :" -#: ../admin/shortcodes/editor-plugin.php:871 -msgid "Minus List" -msgstr "Moins Liste" +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" +msgstr "Enregistrer les changements" -#: ../admin/shortcodes/editor-plugin.php:872 -msgid "Circle List" -msgstr "Liste en cercle" +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" +msgstr "Plugin Cherry" -#: ../admin/shortcodes/editor-plugin.php:873 -msgid "Circle Blank List" -msgstr "Liste en cercle vide" +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " +msgstr "" +"Le plugin Cherry a Ã©tÃ© crÃ©Ã© pour sÃ©parer les widgets, shortcodes et la " +"gestion des donnÃ©es des options de l'Ã©diteur de thÃ¨me. Le Cherry plugin est " +"installÃ© automatiquement avec le framework Cherry et est nÃ©cessaire pour le " +"bon fonctionnement du framework Cherry." -#: ../admin/shortcodes/editor-plugin.php:874 -msgid "Custom List" -msgstr "Liste PersonnalisÃ©e" +#: ../admin/plugin-pages.php:19 +msgid "Import" +msgstr "Importer" -#: ../admin/shortcodes/editor-plugin.php:875 -msgid "Misc" -msgstr "Divers" +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." +msgstr "" +"Option pour importer le contenu du site Ã partir de la sauvegarde. " +"SÃ©lectionnez tous les fichiers de la sauvegarde et faites les glisser dans " +"la section de mise en ligne des fichiers pour commencer. " -#: ../admin/shortcodes/editor-plugin.php:876 -msgid "Alert Box" -msgstr "BoÃ®te d'avertissement" +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" +msgstr "DÃ©mo d'exportation des fichiers" -#: ../admin/shortcodes/editor-plugin.php:877 -msgid "Close icon" -msgstr "IcÃ´ne proche" +#: ../admin/plugin-pages.php:30 +msgid "Export" +msgstr "Exporter" -#: ../admin/shortcodes/editor-plugin.php:878 -msgid "Well" -msgstr "Bien" +#: ../admin/plugin-pages.php:31 +msgid "" +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." +msgstr "" +"Option pour sauvegarder les donnÃ©es de votre site et crÃ©er une archive " +"tÃ©lÃ©chargeable. Utilisez cette option avant de mettre en place des " +"modifications importantes ou de changer d'hÃ©bergeur. " -#: ../admin/shortcodes/editor-plugin.php:879 -msgid "Small" -msgstr "Petit" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" +msgstr "Widgets" -#: ../admin/shortcodes/editor-plugin.php:880 -#: ../includes/widgets/my-comment-widget.php:140 -#: ../includes/widgets/my-facebook-widget.php:79 -#: ../includes/widgets/my-flickr-widget.php:57 -#: ../includes/widgets/my-posts-type-widget.php:205 -#: ../includes/widgets/my-recent-posts.php:126 -#: ../includes/widgets/my-recent-posts.php:148 -#: ../includes/widgets/my-social-widget.php:132 -#: ../includes/widgets/my-vcard-widget.php:151 -msgid "Title" -msgstr "Titre" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." +msgstr "" +"Les widgets Cherry offrent de des faÃ§ons supplÃ©mentaires de placer du " +"contenu dans les zones widget. Plusieurs widgets disponibles vous " +"permettront d'ajouter des fonctionnalitÃ©s Ã votre site. " -#: ../admin/shortcodes/editor-plugin.php:881 -msgid "Template URL" -msgstr "URL de modÃ¨le" +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" +msgstr "Shortcodes" -#: ../admin/shortcodes/editor-plugin.php:882 -msgid "Sitemap" -msgstr "Plan de site" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." +msgstr "" +"Le plugin Cherry ajoute diffÃ©rents widgets Ã l'Ã©diteur de texte. Les " +"shortcodes permettent de crÃ©er diffÃ©rentes structures de contenu dans les " +"articles Wordpress. Utilisez l'icÃ´ne \"Insert Shortcode\" dans la boite Ã " +"outils de l'Ã©diteur de texte pour ajouter des shortcodes." -#: ../admin/shortcodes/editor-plugin.php:883 -msgid "Video Preview" -msgstr "PrÃ©visualisation VidÃ©o" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" +msgstr "En savoir plus" -#: ../admin/shortcodes/editor-plugin.php:884 -msgid "Tabs" -msgstr "Onglets" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" +msgstr "Importation du contenu de Cherry" -#: ../admin/shortcodes/editor-plugin.php:885 -msgid "Accordion" -msgstr "AccordÃ©on" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" +msgstr "Exportation du contenu de Cherry" -#: ../admin/shortcodes/editor-plugin.php:886 -msgid "Table" -msgstr "Table" +#: ../admin/shortcodes/dialog.php:20 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 +msgid "Cancel" +msgstr "Annuler" -#: ../admin/shortcodes/editor-plugin.php:887 -msgid "Pricing Table" -msgstr "Tableau des prix" +#: ../admin/shortcodes/dialog.php:21 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 +msgid "Insert" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:888 -#: ../includes/widgets/my-vcard-widget.php:156 -msgid "Google Map" -msgstr "Carte de Google" +#: ../admin/shortcodes/dialog.php:25 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 +msgid "Shortcode Options" +msgstr "Options code court" -#: ../includes/plugin-assets.php:32 +#: ../includes/plugin-assets.php:38 msgid "Under Construction Page Widgets Area." msgstr "Zone Widgets De La Page En Construction." -#: ../includes/plugin-assets.php:34 +#: ../includes/plugin-assets.php:40 msgid "Under construction page widgets area." msgstr "Zone widgets de la page en construction." -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Maintenance mode activated. Website is blocked from public" msgstr "Mode maintenance activÃ©. Le site n'est plus accessible au public" -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Settings." msgstr "RÃ©glages." @@ -849,102 +552,89 @@ msgid "Hours" msgstr "Heures" #: ../includes/plugin-under-construction-content.php:85 -msgid "Minuts" -msgstr "Minutes" +msgid "Minutes" +msgstr "" #: ../includes/plugin-under-construction-content.php:89 msgid "Seconds" msgstr "Secondes" -#: ../includes/gt-custom/gt-custom.php:112 -msgid "Style Switcher Preview" -msgstr "PrÃ©visualisation de l'outil de changement de style" - -#: ../includes/gt-custom/gt-customize.php:17 -msgid "Cheatin’ uh?" -msgstr "En train de tricher#8217; uh?" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "%1$s — WordPress" -msgstr "%1$s — WordPress" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "Customize %s" -msgstr "Personnaliser %s" - -#: ../includes/gt-custom/gt-customize.php:112 -msgid "Style Switcher" -msgstr "Outil de changement de style" - -#: ../includes/shortcodes/carousel-owl.php:165 -#: ../includes/shortcodes/posts-list.php:152 +#: ../includes/shortcodes/carousel-owl.php:168 +#: ../includes/shortcodes/posts-list.php:154 msgid "by " msgstr "par" -#: ../includes/shortcodes/carousel-owl.php:173 -#: ../includes/shortcodes/carousel.php:156 -#: ../includes/widgets/my-post-cycle-widget.php:129 +#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel.php:167 +#: ../includes/shortcodes/post-cycle.php:150 +#: ../includes/shortcodes/posts-list.php:163 +#: ../includes/shortcodes/posts-list.php:164 +#: ../includes/widgets/my-post-cycle-widget.php:153 +msgid "Comments" +msgstr "Cmmentaires" + +#: ../includes/shortcodes/carousel-owl.php:176 +#: ../includes/shortcodes/carousel.php:169 +#: ../includes/widgets/my-post-cycle-widget.php:155 msgid "Comment" msgstr "Commentaire" -#: ../includes/shortcodes/carousel.php:147 -#: ../includes/widgets/my-post-cycle-widget.php:118 +#: ../includes/shortcodes/carousel.php:160 +#: ../includes/widgets/my-post-cycle-widget.php:144 msgid "by" msgstr "par" -#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:25 +#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 #: ../includes/shortcodes/post-cycle.php:17 -#: ../includes/shortcodes/posts-grid.php:22 +#: ../includes/shortcodes/posts-grid.php:24 #: ../includes/shortcodes/posts-list.php:19 -#: ../includes/shortcodes/service-box.php:15 -#: ../includes/widgets/my-posts-type-widget.php:145 +#: ../includes/shortcodes/service-box.php:16 +#: ../includes/widgets/my-posts-type-widget.php:165 #: ../includes/widgets/my-recent-posts.php:87 msgid "Read more" -msgstr "Lre la suite" +msgstr "Lire la suite" -#: ../includes/shortcodes/media.php:82 ../includes/shortcodes/media.php:205 -#: ../includes/shortcodes/media.php:216 -#: ../includes/shortcodes/shortcodes.php:211 -#: ../includes/shortcodes/shortcodes.php:309 -#: ../includes/shortcodes/shortcodes.php:320 +#: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 +#: ../includes/shortcodes/media.php:251 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 msgid "Play" msgstr "Play" -#: ../includes/shortcodes/media.php:83 ../includes/shortcodes/media.php:217 -#: ../includes/shortcodes/shortcodes.php:212 -#: ../includes/shortcodes/shortcodes.php:321 +#: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 msgid "Pause" msgstr "Pause" -#: ../includes/shortcodes/media.php:84 ../includes/shortcodes/media.php:218 -#: ../includes/shortcodes/shortcodes.php:214 -#: ../includes/shortcodes/shortcodes.php:322 +#: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 msgid "Stop" msgstr "Stop" -#: ../includes/shortcodes/media.php:90 ../includes/shortcodes/media.php:224 -#: ../includes/shortcodes/shortcodes.php:220 -#: ../includes/shortcodes/shortcodes.php:328 +#: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 msgid "Mute" msgstr "Mute" -#: ../includes/shortcodes/media.php:91 ../includes/shortcodes/media.php:225 -#: ../includes/shortcodes/shortcodes.php:221 -#: ../includes/shortcodes/shortcodes.php:329 +#: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 msgid "Unmute" msgstr "Activer" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Update Required." msgstr "Mise Ã jour requise." -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "" "To play the media you will need to either update your browser to a recent " "version or update your " @@ -952,148 +642,387 @@ msgstr "" "Pour afficher ce fichier vous devez mettre Ã jour votre navigateur vers une " "version plus rÃ©cente ou mettre Ã jour votre" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Flash plugin" msgstr "Plugin Flash" -#: ../includes/shortcodes/post-cycle.php:166 +#: ../includes/shortcodes/post-cycle.php:210 msgid "Client" msgstr "Cient" -#: ../includes/shortcodes/post-cycle.php:167 -#: ../includes/widgets/my-comment-widget.php:91 +#: ../includes/shortcodes/post-cycle.php:211 +#: ../includes/widgets/my-comment-widget.php:97 #: ../includes/widgets/my-recent-posts.php:147 msgid "Date" msgstr "Date" -#: ../includes/shortcodes/post-cycle.php:168 -msgid "Info" -msgstr "Infos" +#: ../includes/shortcodes/post-cycle.php:212 +msgid "Info" +msgstr "Infos" + +#: ../includes/shortcodes/post-cycle.php:213 +msgid "Launch Project" +msgstr "Projet de Lancement" + +#: ../includes/shortcodes/posts-list.php:130 +#: ../includes/shortcodes/posts-list.php:139 +msgid "Posted in" +msgstr "PostÃ© dans" + +#: ../includes/shortcodes/posts-list.php:283 +msgid "Tags" +msgstr "Mots clÃ©s" + +#: ../includes/shortcodes/shortcodes.php:226 +msgid "Previous" +msgstr "PrÃ©cÃ©dent" + +#: ../includes/shortcodes/shortcodes.php:229 +msgid "Next" +msgstr "Suivant" + +#: ../includes/widgets/cherry-banner-widget.php:5 +msgid "Cherry - Banner" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:46 +#: ../includes/widgets/my-comment-widget.php:146 +#: ../includes/widgets/my-facebook-widget.php:79 +#: ../includes/widgets/my-flickr-widget.php:62 +#: ../includes/widgets/my-posts-type-widget.php:225 +#: ../includes/widgets/my-recent-posts.php:126 +#: ../includes/widgets/my-recent-posts.php:148 +#: ../includes/widgets/my-social-widget.php:108 +#: ../includes/widgets/my-vcard-widget.php:155 +msgid "Title" +msgstr "Titre" + +#: ../includes/widgets/cherry-banner-widget.php:47 +msgid "Banner description" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:48 +#: ../includes/widgets/cherry-instagram-widget.php:165 +msgid "Image URL" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:49 +msgid "Fill image" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:50 +#: ../includes/widgets/my-posts-type-widget.php:398 +#: ../includes/widgets/my-recent-posts.php:160 +msgid "Link URL" +msgstr "Lien URL" + +#: ../includes/widgets/cherry-banner-widget.php:89 +msgid "Select Image" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Cherry - Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Widget for popular social network Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 +msgid "Widget Title" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "User Name" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +msgid "" +"Widget will work only for users who have full rights opened in Instagram " +"account." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Number of displayed images" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Max value: 20 images." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Image dimentions" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Large" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Thumbnail" +msgstr "Vignette" + +#: ../includes/widgets/cherry-instagram-widget.php:153 +msgid "Show image description" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:156 +msgid "Show comments number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:159 +msgid "Show likes number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:162 +msgid "Show image publication date" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:168 +msgid "User account button text" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" +msgstr "Combinaison des couleurs" -#: ../includes/shortcodes/post-cycle.php:169 -msgid "Launch Project" -msgstr "Projet de Lancement" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" +msgstr "LumiÃ¨re" -#: ../includes/shortcodes/posts-list.php:128 -#: ../includes/shortcodes/posts-list.php:137 -msgid "Posted in" -msgstr "PostÃ© dans" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" +msgstr "Sombre" -#: ../includes/shortcodes/shortcodes.php:210 -msgid "Previous" -msgstr "PrÃ©cÃ©dent" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" +msgstr "" -#: ../includes/shortcodes/shortcodes.php:213 -msgid "Next" -msgstr "Suivant" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." +msgstr "" -#: ../includes/widgets/my-banners-widget.php:13 +#: ../includes/widgets/my-banners-widget.php:7 msgid "Add 125x125 ads." msgstr "Ajoutez 125x125 des annonces." -#: ../includes/widgets/my-banners-widget.php:17 -msgid "Cherry - 125x125 Ads." -msgstr "Cherry - PubilicitÃ©s 125*125" +#: ../includes/widgets/my-banners-widget.php:10 +msgid "Cherry - 125x125 Ads" +msgstr "" -#: ../includes/widgets/my-banners-widget.php:60 +#: ../includes/widgets/my-banners-widget.php:65 msgid "Ad 1" msgstr "L'annonce 1" -#: ../includes/widgets/my-banners-widget.php:62 -#: ../includes/widgets/my-banners-widget.php:71 -#: ../includes/widgets/my-banners-widget.php:80 -#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:67 +#: ../includes/widgets/my-banners-widget.php:76 +#: ../includes/widgets/my-banners-widget.php:85 +#: ../includes/widgets/my-banners-widget.php:94 msgid "Image Ad Link:" msgstr "Lien d'Annonce d'Image :" -#: ../includes/widgets/my-banners-widget.php:66 -#: ../includes/widgets/my-banners-widget.php:75 -#: ../includes/widgets/my-banners-widget.php:84 -#: ../includes/widgets/my-banners-widget.php:93 +#: ../includes/widgets/my-banners-widget.php:71 +#: ../includes/widgets/my-banners-widget.php:80 +#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:98 msgid "Ad Link:" msgstr "Lien d'Annonce :" -#: ../includes/widgets/my-banners-widget.php:69 +#: ../includes/widgets/my-banners-widget.php:74 msgid "Ad 2" msgstr "L'annonce 2" -#: ../includes/widgets/my-banners-widget.php:78 +#: ../includes/widgets/my-banners-widget.php:83 msgid "Ad 3" msgstr "L'annonce 3" -#: ../includes/widgets/my-banners-widget.php:87 +#: ../includes/widgets/my-banners-widget.php:92 msgid "Ad 4" msgstr "L'annonce 4" -#: ../includes/widgets/my-comment-widget.php:4 +#: ../includes/widgets/my-comment-widget.php:5 msgid "Cherry - Recent Comments" msgstr "Cerise - Commentaires RÃ©cents" -#: ../includes/widgets/my-comment-widget.php:11 -#: ../includes/widgets/my-comment-widget.php:127 +#: ../includes/widgets/my-comment-widget.php:13 +#: ../includes/widgets/my-comment-widget.php:133 msgid "My Recent Comments" msgstr "Mes Commentaires RÃ©cents" -#: ../includes/widgets/my-comment-widget.php:72 +#: ../includes/widgets/my-comment-widget.php:78 msgid "Comment in" msgstr "Commentaire dans" -#: ../includes/widgets/my-comment-widget.php:81 -#: ../includes/widgets/widgets-manager.php:479 -#: ../includes/widgets/widgets-manager.php:487 +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 msgid "Author" msgstr "Auteur" -#: ../includes/widgets/my-comment-widget.php:99 +#: ../includes/widgets/my-comment-widget.php:105 msgid "Go to this comment" msgstr "Allez Ã ce commentaire" -#: ../includes/widgets/my-comment-widget.php:141 +#: ../includes/widgets/my-comment-widget.php:147 msgid "Number of comments to show" msgstr "Le nombre de commentaires pour montrer" -#: ../includes/widgets/my-comment-widget.php:142 +#: ../includes/widgets/my-comment-widget.php:148 msgid "Display avatar" msgstr "Avatar d'affichage" -#: ../includes/widgets/my-comment-widget.php:143 +#: ../includes/widgets/my-comment-widget.php:149 msgid "Avatar size (px)" msgstr "Taille d'avatar (px)" -#: ../includes/widgets/my-comment-widget.php:152 +#: ../includes/widgets/my-comment-widget.php:158 msgid "Display the comment author" msgstr "Affichez l'auteur de commentaire" -#: ../includes/widgets/my-comment-widget.php:153 +#: ../includes/widgets/my-comment-widget.php:159 msgid "Display the comment date" msgstr "Affichez la date de commentaire" -#: ../includes/widgets/my-comment-widget.php:154 +#: ../includes/widgets/my-comment-widget.php:160 msgid "Display post title" msgstr "Titre de poste d'affichage" -#: ../includes/widgets/my-comment-widget.php:155 -#: ../includes/widgets/my-vcard-widget.php:191 +#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:195 msgid "Meta format" msgstr "Format meta" -#: ../includes/widgets/my-comment-widget.php:157 -#: ../includes/widgets/my-vcard-widget.php:193 -#: ../includes/widgets/widgets-manager.php:506 +#: ../includes/widgets/my-comment-widget.php:163 +#: ../includes/widgets/my-vcard-widget.php:197 +#: ../includes/widgets/widgets-manager.php:507 msgid "None" msgstr "Aucun" -#: ../includes/widgets/my-comment-widget.php:158 -#: ../includes/widgets/my-social-widget.php:209 -#: ../includes/widgets/my-vcard-widget.php:194 +#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-social-widget.php:185 +#: ../includes/widgets/my-vcard-widget.php:198 msgid "Icons" msgstr "IcÃ´nes" -#: ../includes/widgets/my-comment-widget.php:159 -#: ../includes/widgets/my-social-widget.php:210 -#: ../includes/widgets/my-vcard-widget.php:195 +#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-vcard-widget.php:199 msgid "Labels" msgstr "Ã©tiquettes" @@ -1118,27 +1047,15 @@ msgid "Facebook Pages." msgstr "Pages Facebook" #: ../includes/widgets/my-facebook-widget.php:90 -#: ../includes/widgets/my-posts-type-widget.php:347 +#: ../includes/widgets/my-posts-type-widget.php:367 msgid "Width" msgstr "Largeur" #: ../includes/widgets/my-facebook-widget.php:95 -#: ../includes/widgets/my-posts-type-widget.php:352 +#: ../includes/widgets/my-posts-type-widget.php:372 msgid "Height" msgstr "Hauteur" -#: ../includes/widgets/my-facebook-widget.php:100 -msgid "Color Scheme" -msgstr "Combinaison des couleurs" - -#: ../includes/widgets/my-facebook-widget.php:102 -msgid "Light" -msgstr "LumiÃ¨re" - -#: ../includes/widgets/my-facebook-widget.php:103 -msgid "Dark" -msgstr "Sombre" - #: ../includes/widgets/my-facebook-widget.php:109 msgid "Display header" msgstr "TÃªte d'affichage" @@ -1159,17 +1076,21 @@ msgstr "FrontiÃ¨re d'affichage" msgid "Cherry - Flickr" msgstr "Cherry - Flickr" -#: ../includes/widgets/my-flickr-widget.php:59 +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." +msgstr "" + +#: ../includes/widgets/my-flickr-widget.php:64 msgid "Flickr ID" msgstr "Id Flickr" -#: ../includes/widgets/my-flickr-widget.php:60 +#: ../includes/widgets/my-flickr-widget.php:65 msgid "Images count" msgstr "Compteur d'images" -#: ../includes/widgets/my-flickr-widget.php:61 -#: ../includes/widgets/my-posts-type-widget.php:325 -#: ../includes/widgets/my-posts-type-widget.php:372 +#: ../includes/widgets/my-flickr-widget.php:66 +#: ../includes/widgets/my-posts-type-widget.php:345 +#: ../includes/widgets/my-posts-type-widget.php:392 #: ../includes/widgets/my-recent-posts.php:158 msgid "Link Text" msgstr "Texte du lien" @@ -1178,87 +1099,87 @@ msgstr "Texte du lien" msgid "Cherry - Post Cycle" msgstr "Cycle des articles Cherry" -#: ../includes/widgets/my-post-cycle-widget.php:195 +#: ../includes/widgets/my-post-cycle-widget.php:221 msgid "Title:" msgstr "Titre :" -#: ../includes/widgets/my-post-cycle-widget.php:197 +#: ../includes/widgets/my-post-cycle-widget.php:223 msgid "Select post type:" msgstr "SÃ©lectionner le type d'article" -#: ../includes/widgets/my-post-cycle-widget.php:227 +#: ../includes/widgets/my-post-cycle-widget.php:253 msgid "Categories (names separated by \",\"):" msgstr "CatÃ©gories (noms sÃ©parÃ©s par \",\"):" -#: ../includes/widgets/my-post-cycle-widget.php:229 +#: ../includes/widgets/my-post-cycle-widget.php:255 msgid "Posts count:" msgstr "Compteur d'articles" -#: ../includes/widgets/my-post-cycle-widget.php:231 +#: ../includes/widgets/my-post-cycle-widget.php:257 msgid "Thumbnail Width (in pixels):" msgstr "Largeur de la miniature (en pixels) : " -#: ../includes/widgets/my-post-cycle-widget.php:233 +#: ../includes/widgets/my-post-cycle-widget.php:259 msgid "Thumbnail Height (in pixels):" msgstr "Hauteur de la miniature (en pixels) :" -#: ../includes/widgets/my-post-cycle-widget.php:235 +#: ../includes/widgets/my-post-cycle-widget.php:261 msgid "Show titles:" msgstr "Afficher les titres :" -#: ../includes/widgets/my-post-cycle-widget.php:242 -#: ../includes/widgets/my-post-cycle-widget.php:261 -#: ../includes/widgets/my-post-cycle-widget.php:280 -#: ../includes/widgets/my-post-cycle-widget.php:299 -#: ../includes/widgets/my-post-cycle-widget.php:318 -#: ../includes/widgets/my-post-cycle-widget.php:343 -#: ../includes/widgets/my-post-cycle-widget.php:362 +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 msgid "yes" msgstr "oui" -#: ../includes/widgets/my-post-cycle-widget.php:247 -#: ../includes/widgets/my-post-cycle-widget.php:266 -#: ../includes/widgets/my-post-cycle-widget.php:285 -#: ../includes/widgets/my-post-cycle-widget.php:304 -#: ../includes/widgets/my-post-cycle-widget.php:323 -#: ../includes/widgets/my-post-cycle-widget.php:348 -#: ../includes/widgets/my-post-cycle-widget.php:367 +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 msgid "no" msgstr "non" -#: ../includes/widgets/my-post-cycle-widget.php:254 +#: ../includes/widgets/my-post-cycle-widget.php:280 msgid "Show date:" msgstr "Afficher la date :" -#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:299 msgid "Show author:" msgstr "Montrer l'auteur :" -#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:318 msgid "Show comments:" msgstr "Afficher les commentaires :" -#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:337 msgid "Show excerpt:" msgstr "Afficher l'extrait :" -#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:356 msgid "Excerpt word count:" msgstr "Nombre de mots dans l'extrait" -#: ../includes/widgets/my-post-cycle-widget.php:332 +#: ../includes/widgets/my-post-cycle-widget.php:358 msgid "More Button Text:" msgstr "Texte du bouton plus" -#: ../includes/widgets/my-post-cycle-widget.php:334 +#: ../includes/widgets/my-post-cycle-widget.php:360 msgid "Slideshow cycling speed (in sec.):" msgstr "Vitesse d'affichage du diaporama (en secondes) :" -#: ../includes/widgets/my-post-cycle-widget.php:336 +#: ../includes/widgets/my-post-cycle-widget.php:362 msgid "Arrows:" msgstr "FlÃ¨ches :" -#: ../includes/widgets/my-post-cycle-widget.php:355 +#: ../includes/widgets/my-post-cycle-widget.php:381 msgid "Pagination:" msgstr "Pagination:" @@ -1270,120 +1191,115 @@ msgstr "Montrez des postes personnalisÃ©s" msgid "Cherry - Advanced Cycle" msgstr "Cerise - Cycle AvancÃ©" -#: ../includes/widgets/my-posts-type-widget.php:152 +#: ../includes/widgets/my-posts-type-widget.php:172 msgid "View all" msgstr "Voir tous" -#: ../includes/widgets/my-posts-type-widget.php:212 +#: ../includes/widgets/my-posts-type-widget.php:232 msgid "Posts type" msgstr "Type de postes" -#: ../includes/widgets/my-posts-type-widget.php:229 +#: ../includes/widgets/my-posts-type-widget.php:249 msgid "Number of posts to show" msgstr "Nombre de messages Ã afficher" -#: ../includes/widgets/my-posts-type-widget.php:236 +#: ../includes/widgets/my-posts-type-widget.php:256 msgid "Sort by" msgstr "Trier par" -#: ../includes/widgets/my-posts-type-widget.php:250 +#: ../includes/widgets/my-posts-type-widget.php:270 msgid "Reverse sort order (ascending)" msgstr "Ordre de tri inverse (croissant)" -#: ../includes/widgets/my-posts-type-widget.php:256 +#: ../includes/widgets/my-posts-type-widget.php:276 msgid "Show number of comments" msgstr "Afficher le numÃ©ro de commentaires" -#: ../includes/widgets/my-posts-type-widget.php:263 +#: ../includes/widgets/my-posts-type-widget.php:283 msgid "Show meta" msgstr "Afficher mÃ©ta" -#: ../includes/widgets/my-posts-type-widget.php:269 +#: ../includes/widgets/my-posts-type-widget.php:289 msgid "Container class" msgstr "Classe Container" -#: ../includes/widgets/my-posts-type-widget.php:270 +#: ../includes/widgets/my-posts-type-widget.php:290 msgid "default: \"featured_custom_posts\"" msgstr "par dÃ©faut \"featured_custom_posts\"" -#: ../includes/widgets/my-posts-type-widget.php:275 +#: ../includes/widgets/my-posts-type-widget.php:295 msgid "Post title" msgstr "Titre du poste" -#: ../includes/widgets/my-posts-type-widget.php:279 +#: ../includes/widgets/my-posts-type-widget.php:299 msgid "Show post title" msgstr "Montrer les messages titre" -#: ../includes/widgets/my-posts-type-widget.php:285 +#: ../includes/widgets/my-posts-type-widget.php:305 msgid "Date as title " msgstr "Date comme titre" -#: ../includes/widgets/my-posts-type-widget.php:292 +#: ../includes/widgets/my-posts-type-widget.php:312 msgid "Excerpt" msgstr "Extrait" -#: ../includes/widgets/my-posts-type-widget.php:296 +#: ../includes/widgets/my-posts-type-widget.php:316 msgid "Show post excerpt" msgstr "Afficher poste extrait" -#: ../includes/widgets/my-posts-type-widget.php:301 +#: ../includes/widgets/my-posts-type-widget.php:321 #: ../includes/widgets/my-recent-posts.php:156 msgid "Excerpt length (words)" msgstr "Longueur de l'extrait (mots)" -#: ../includes/widgets/my-posts-type-widget.php:308 +#: ../includes/widgets/my-posts-type-widget.php:328 msgid "Excerpt as link" msgstr "Extrait de lien" -#: ../includes/widgets/my-posts-type-widget.php:315 +#: ../includes/widgets/my-posts-type-widget.php:335 msgid "More link" msgstr "Plus Lien" -#: ../includes/widgets/my-posts-type-widget.php:319 +#: ../includes/widgets/my-posts-type-widget.php:339 msgid "Show \"More link" msgstr "Show \"Plus lien" -#: ../includes/widgets/my-posts-type-widget.php:326 +#: ../includes/widgets/my-posts-type-widget.php:346 msgid "default: \"Read more\"" msgstr "par dÃ©faut \"Lire Plus\"" -#: ../includes/widgets/my-posts-type-widget.php:331 +#: ../includes/widgets/my-posts-type-widget.php:351 msgid "Link class" msgstr "Classe de Lien" -#: ../includes/widgets/my-posts-type-widget.php:332 +#: ../includes/widgets/my-posts-type-widget.php:352 msgid "default: \"link\"" msgstr "par dÃ©faut \"lien\"" -#: ../includes/widgets/my-posts-type-widget.php:337 +#: ../includes/widgets/my-posts-type-widget.php:357 msgid "Thumbnail dimensions" msgstr "Dimensions miniatures" -#: ../includes/widgets/my-posts-type-widget.php:342 +#: ../includes/widgets/my-posts-type-widget.php:362 msgid "Show post thumbnail" msgstr "Afficher Post Thumbnail" -#: ../includes/widgets/my-posts-type-widget.php:358 +#: ../includes/widgets/my-posts-type-widget.php:378 msgid "Thumbnail as link" msgstr "Vignette comme lien" -#: ../includes/widgets/my-posts-type-widget.php:363 +#: ../includes/widgets/my-posts-type-widget.php:383 msgid "Link to all posts" msgstr "Lien vers tous les messages" -#: ../includes/widgets/my-posts-type-widget.php:367 +#: ../includes/widgets/my-posts-type-widget.php:387 msgid "Show global link to all posts" msgstr "Montrez le lien global Ã tous les postes" -#: ../includes/widgets/my-posts-type-widget.php:373 +#: ../includes/widgets/my-posts-type-widget.php:393 msgid "default: \"View all\"" msgstr "par dÃ©faut \"Tout afficher\"" -#: ../includes/widgets/my-posts-type-widget.php:378 -#: ../includes/widgets/my-recent-posts.php:160 -msgid "Link URL" -msgstr "Lien URL" - #: ../includes/widgets/my-recent-posts.php:6 msgid "Cherry - Recent Posts" msgstr "Cerise - Postes RÃ©cents" @@ -1456,104 +1372,104 @@ msgstr "Lien vers vos rÃ©seaux sociaux." msgid "Cherry - Social Networks" msgstr "Cherry - RÃ©seaux sociaux" -#: ../includes/widgets/my-social-widget.php:136 +#: ../includes/widgets/my-social-widget.php:112 msgid "Facebook" msgstr "Facebook" -#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:114 msgid "Facebook URL" msgstr "Adresse Facebook" -#: ../includes/widgets/my-social-widget.php:141 +#: ../includes/widgets/my-social-widget.php:117 msgid "Facebook label" msgstr "Etiquette Facebook" -#: ../includes/widgets/my-social-widget.php:146 +#: ../includes/widgets/my-social-widget.php:122 msgid "Twitter" msgstr "Twitter" -#: ../includes/widgets/my-social-widget.php:147 +#: ../includes/widgets/my-social-widget.php:123 msgid "Twitter URL" msgstr "Adresse Twitter" -#: ../includes/widgets/my-social-widget.php:149 +#: ../includes/widgets/my-social-widget.php:125 msgid "Twitter label" msgstr "Etiquette Twitter" -#: ../includes/widgets/my-social-widget.php:154 +#: ../includes/widgets/my-social-widget.php:130 msgid "Flickr" msgstr "Flickr" -#: ../includes/widgets/my-social-widget.php:155 +#: ../includes/widgets/my-social-widget.php:131 msgid "Flickr URL" msgstr "Adresse Flickr" -#: ../includes/widgets/my-social-widget.php:157 +#: ../includes/widgets/my-social-widget.php:133 msgid "Flickr label" msgstr "Etiquette Flickr" -#: ../includes/widgets/my-social-widget.php:162 -#: ../includes/widgets/my-social-widget.php:163 +#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:139 msgid "RSS feed" msgstr "Flux RSS" -#: ../includes/widgets/my-social-widget.php:165 +#: ../includes/widgets/my-social-widget.php:141 msgid "RSS label" msgstr "Etiquette RSS" -#: ../includes/widgets/my-social-widget.php:170 +#: ../includes/widgets/my-social-widget.php:146 msgid "Linkedin" msgstr "Linkedin" -#: ../includes/widgets/my-social-widget.php:171 +#: ../includes/widgets/my-social-widget.php:147 msgid "Linkedin URL" msgstr "Adresse Linkedin" -#: ../includes/widgets/my-social-widget.php:173 +#: ../includes/widgets/my-social-widget.php:149 msgid "Linkedin label" msgstr "Etiquette Linkedin" -#: ../includes/widgets/my-social-widget.php:178 +#: ../includes/widgets/my-social-widget.php:154 msgid "Delicious" msgstr "Delicious" -#: ../includes/widgets/my-social-widget.php:179 +#: ../includes/widgets/my-social-widget.php:155 msgid "Delicious URL" msgstr "Adresse Delicious" -#: ../includes/widgets/my-social-widget.php:181 +#: ../includes/widgets/my-social-widget.php:157 msgid "Delicious label" msgstr "Etiquette Delicious" -#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-social-widget.php:162 msgid "Youtube" msgstr "Youtube" -#: ../includes/widgets/my-social-widget.php:188 +#: ../includes/widgets/my-social-widget.php:164 msgid "Youtube URL" msgstr "Adresse Youtube" -#: ../includes/widgets/my-social-widget.php:191 +#: ../includes/widgets/my-social-widget.php:167 msgid "Youtube label" msgstr "Etiquette Youtube" -#: ../includes/widgets/my-social-widget.php:197 -msgid "Google+" -msgstr "Google+" +#: ../includes/widgets/my-social-widget.php:173 +msgid "Google" +msgstr "" -#: ../includes/widgets/my-social-widget.php:199 -msgid "Google+ URL" -msgstr "Adresse Google+" +#: ../includes/widgets/my-social-widget.php:175 +msgid "Google URL" +msgstr "" -#: ../includes/widgets/my-social-widget.php:202 -msgid "Google+ label" -msgstr "Etiquette Google +" +#: ../includes/widgets/my-social-widget.php:178 +msgid "Google label" +msgstr "" -#: ../includes/widgets/my-social-widget.php:208 +#: ../includes/widgets/my-social-widget.php:184 msgid "Display" msgstr "Affichage" -#: ../includes/widgets/my-social-widget.php:211 +#: ../includes/widgets/my-social-widget.php:187 msgid "Both" msgstr "Tous les deux" @@ -1569,41 +1485,45 @@ msgstr "Cerise - vCard" msgid "vCard" msgstr "vCard" -#: ../includes/widgets/my-vcard-widget.php:51 -#: ../includes/widgets/my-vcard-widget.php:167 +#: ../includes/widgets/my-vcard-widget.php:55 +#: ../includes/widgets/my-vcard-widget.php:171 msgid "Street Address" msgstr "Adresse de la rue" -#: ../includes/widgets/my-vcard-widget.php:52 -#: ../includes/widgets/my-vcard-widget.php:171 +#: ../includes/widgets/my-vcard-widget.php:56 +#: ../includes/widgets/my-vcard-widget.php:175 msgid "City/Locality" msgstr "Ville" -#: ../includes/widgets/my-vcard-widget.php:53 -#: ../includes/widgets/my-vcard-widget.php:175 +#: ../includes/widgets/my-vcard-widget.php:57 +#: ../includes/widgets/my-vcard-widget.php:179 msgid "State/Region" msgstr "RÃ©gion/dÃ©partement" -#: ../includes/widgets/my-vcard-widget.php:54 -#: ../includes/widgets/my-vcard-widget.php:179 +#: ../includes/widgets/my-vcard-widget.php:58 +#: ../includes/widgets/my-vcard-widget.php:183 msgid "Zipcode/Postal Code" msgstr "Code postal" -#: ../includes/widgets/my-vcard-widget.php:55 -#: ../includes/widgets/my-vcard-widget.php:183 +#: ../includes/widgets/my-vcard-widget.php:59 +#: ../includes/widgets/my-vcard-widget.php:187 msgid "Telephone" msgstr "TÃ©lÃ©phone" -#: ../includes/widgets/my-vcard-widget.php:56 -#: ../includes/widgets/my-vcard-widget.php:187 +#: ../includes/widgets/my-vcard-widget.php:60 +#: ../includes/widgets/my-vcard-widget.php:191 msgid "Email" msgstr "Email" -#: ../includes/widgets/my-vcard-widget.php:158 +#: ../includes/widgets/my-vcard-widget.php:160 +msgid "Google Map" +msgstr "Carte de Google" + +#: ../includes/widgets/my-vcard-widget.php:162 msgid "Display map" msgstr "Carte d'affichage" -#: ../includes/widgets/my-vcard-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:165 msgid "HTML map code" msgstr "Code de la balise HTML map" @@ -1640,107 +1560,111 @@ msgid "Homepage" msgstr "Page d'accueil" #: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" +msgstr "Blog" + +#: ../includes/widgets/widgets-manager.php:475 msgid "Page" msgstr "Page" -#: ../includes/widgets/widgets-manager.php:475 +#: ../includes/widgets/widgets-manager.php:476 msgid "Post" msgstr "Poster" -#: ../includes/widgets/widgets-manager.php:476 -#: ../includes/widgets/widgets-manager.php:478 +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 msgid "Archive" msgstr "Archives" -#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:478 msgid "Tag" msgstr "Balise" -#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:481 msgid "Search page" msgstr "Page de recherche" -#: ../includes/widgets/widgets-manager.php:481 +#: ../includes/widgets/widgets-manager.php:482 msgid "404 page" msgstr "404 page" -#: ../includes/widgets/widgets-manager.php:483 +#: ../includes/widgets/widgets-manager.php:484 msgid "Page ID/Title/slug" msgstr "ID de page / Titre / slug" -#: ../includes/widgets/widgets-manager.php:484 +#: ../includes/widgets/widgets-manager.php:485 msgid "Post ID/Title/slug" msgstr "Poster ID / Titre / slug" -#: ../includes/widgets/widgets-manager.php:485 +#: ../includes/widgets/widgets-manager.php:486 msgid "Category ID/Name/slug" msgstr "CatÃ©gorie ID / Nom / slug" -#: ../includes/widgets/widgets-manager.php:486 +#: ../includes/widgets/widgets-manager.php:487 msgid "Tag ID/Name" msgstr "Tag ID / Nom" -#: ../includes/widgets/widgets-manager.php:488 +#: ../includes/widgets/widgets-manager.php:489 msgid "Add page" msgstr "Ajouter la page" -#: ../includes/widgets/widgets-manager.php:491 +#: ../includes/widgets/widgets-manager.php:492 msgid "Selected pages" msgstr "Pages sÃ©lectionnÃ©es" -#: ../includes/widgets/widgets-manager.php:492 +#: ../includes/widgets/widgets-manager.php:493 msgid "No pages" msgstr "No pages" -#: ../includes/widgets/widgets-manager.php:510 +#: ../includes/widgets/widgets-manager.php:511 msgid "All devices" msgstr "tous les appareils" -#: ../includes/widgets/widgets-manager.php:511 +#: ../includes/widgets/widgets-manager.php:512 msgid "Desktops" msgstr "Ordinateurs de bureau" -#: ../includes/widgets/widgets-manager.php:512 +#: ../includes/widgets/widgets-manager.php:513 msgid "Tablets" msgstr "Tablettes" -#: ../includes/widgets/widgets-manager.php:513 +#: ../includes/widgets/widgets-manager.php:514 msgid "Phones" msgstr "TÃ©lÃ©phones" -#: ../includes/widgets/widgets-manager.php:514 +#: ../includes/widgets/widgets-manager.php:515 msgid "Desktops/Tablets" msgstr "Bureaux/Tablettes" -#: ../includes/widgets/widgets-manager.php:515 +#: ../includes/widgets/widgets-manager.php:516 msgid "Tablets/Phones" msgstr "Tablettes/TÃ©lÃ©phones" -#: ../includes/widgets/widgets-manager.php:516 +#: ../includes/widgets/widgets-manager.php:517 msgid "Desktops/Phones" msgstr "Bureaux/tÃ©lÃ©phones" -#: ../includes/widgets/widgets-manager.php:519 +#: ../includes/widgets/widgets-manager.php:520 msgid "Visible on" msgstr "Visible sur" -#: ../includes/widgets/widgets-manager.php:528 +#: ../includes/widgets/widgets-manager.php:529 msgid "All users" msgstr "Tous les utilisateurs" -#: ../includes/widgets/widgets-manager.php:529 +#: ../includes/widgets/widgets-manager.php:530 msgid "Only guests" msgstr "Seulement invitÃ©s" -#: ../includes/widgets/widgets-manager.php:530 +#: ../includes/widgets/widgets-manager.php:531 msgid "Only registered users" msgstr "Seulement utilisateurs inscrits" -#: ../includes/widgets/widgets-manager.php:531 +#: ../includes/widgets/widgets-manager.php:532 msgid "Only administrator" msgstr "Seulement administrateur" -#: ../includes/widgets/widgets-manager.php:534 +#: ../includes/widgets/widgets-manager.php:535 msgid "Visible for" msgstr "Visible" @@ -1765,6 +1689,243 @@ msgstr "" "Cela ne semble pas Ãªtre un fichier WXR, manquant / non valable WXR numÃ©ro de " "version" +#~ msgid "Minuts" +#~ msgstr "Minutes" + +#~ msgid "Description." +#~ msgstr "Description" + +#~ msgid "Insert Shortcode" +#~ msgstr "InsÃ©rer le code court" + +#~ msgid "Posts" +#~ msgstr "Messages" + +#~ msgid "Posts Grid" +#~ msgstr "Messages Grille" + +#~ msgid "Posts List" +#~ msgstr "Liste des messages" + +#~ msgid "Mini Posts Grid" +#~ msgstr "Mini Messages Grille" + +#~ msgid "Mini Posts List" +#~ msgstr "Liste de messages Mini" + +#~ msgid "Recent Posts" +#~ msgstr "Les messages rÃ©cents" + +#~ msgid "Recent Testimonials" +#~ msgstr "TÃ©moignages rÃ©cents" + +#~ msgid "Basic" +#~ msgstr "D base" + +#~ msgid "Banner" +#~ msgstr "BnniÃ¨re" + +#~ msgid "Post Cycle" +#~ msgstr "Pst-cycle" + +#~ msgid "Carousel (Elasti)" +#~ msgstr "Carousel (Elasti)" + +#~ msgid "Carousel (OWL)" +#~ msgstr "Carousel (OWL)" + +#~ msgid "Roundabout" +#~ msgstr "MnÃ¨ge" + +#~ msgid "Service Box" +#~ msgstr "BoÃ®te de service" + +#~ msgid "Hero Unit" +#~ msgstr "UnitÃ© de hÃ©ros" + +#~ msgid "Categories" +#~ msgstr "CtÃ©gories" + +#~ msgid "Columns" +#~ msgstr "Clonnes" + +#~ msgid "Fluid Column" +#~ msgstr "Colonne de fluide" + +#~ msgid "2 Columns" +#~ msgstr "2 colonnes" + +#~ msgid "3 Columns" +#~ msgstr "3 colonnes" + +#~ msgid "4 Columns" +#~ msgstr "4 colonnes" + +#~ msgid "Elements" +#~ msgstr "Ã©lÃ©ments" + +#~ msgid "Label" +#~ msgstr "Ã©tiquette" + +#~ msgid "Text Highlight" +#~ msgstr "Srbrillance du texte" + +#~ msgid "Button" +#~ msgstr "Buton" + +#~ msgid "Drop Cap" +#~ msgstr "Lttrine" + +#~ msgid "Blockquote" +#~ msgstr "Bloquer citation" + +#~ msgid "Icon" +#~ msgstr "IÃ´ne" + +#~ msgid "Frame" +#~ msgstr "Frame" + +#~ msgid "Horizontal Rule" +#~ msgstr "Hrizontal Rule" + +#~ msgid "Small Horizontal Rule" +#~ msgstr "Petit rÃ¨gle horizontale" + +#~ msgid "Vertical Rule" +#~ msgstr "Rgle verticale" + +#~ msgid "Spacer" +#~ msgstr "Entretoise" + +#~ msgid "Progressbar" +#~ msgstr "Barre de progression" + +#~ msgid "Address" +#~ msgstr "Aresse" + +#~ msgid "Clear" +#~ msgstr "Cair" + +#~ msgid "Extra Wrap" +#~ msgstr "Enveloppe supplÃ©mentaire" + +#~ msgid "Lists" +#~ msgstr "Listes" + +#~ msgid "Unstyled" +#~ msgstr "Sns style" + +#~ msgid "Check List" +#~ msgstr "Liste de ContrÃ´le" + +#~ msgid "Check 2 List" +#~ msgstr "VÃ©rifiez 2 Liste" + +#~ msgid "OK Circle List" +#~ msgstr "Liste Ã cercle OK" + +#~ msgid "OK Sign List" +#~ msgstr "Liste Ã signe OK" + +#~ msgid "Arrow List" +#~ msgstr "Liste flÃ¨che" + +#~ msgid "Arrow 2 List" +#~ msgstr "FlÃ¨che 2 Liste" + +#~ msgid "Circle Arrow List" +#~ msgstr "Liste Ã cercle flÃ¨che" + +#~ msgid "Caret List" +#~ msgstr "Notation caret" + +#~ msgid "Angle List" +#~ msgstr "Liste Ã angle" + +#~ msgid "Double Angle List" +#~ msgstr "Liste Ã double angle" + +#~ msgid "Star List" +#~ msgstr "Liste d'Ãtoile" + +#~ msgid "Plus List" +#~ msgstr "Plus Liste" + +#~ msgid "Minus List" +#~ msgstr "Moins Liste" + +#~ msgid "Circle List" +#~ msgstr "Liste en cercle" + +#~ msgid "Circle Blank List" +#~ msgstr "Liste en cercle vide" + +#~ msgid "Custom List" +#~ msgstr "Liste PersonnalisÃ©e" + +#~ msgid "Misc" +#~ msgstr "Divers" + +#~ msgid "Alert Box" +#~ msgstr "BoÃ®te d'avertissement" + +#~ msgid "Close icon" +#~ msgstr "IcÃ´ne proche" + +#~ msgid "Well" +#~ msgstr "Bien" + +#~ msgid "Small" +#~ msgstr "Petit" + +#~ msgid "Template URL" +#~ msgstr "URL de modÃ¨le" + +#~ msgid "Sitemap" +#~ msgstr "Plan de site" + +#~ msgid "Video Preview" +#~ msgstr "PrÃ©visualisation VidÃ©o" + +#~ msgid "Tabs" +#~ msgstr "Onglets" + +#~ msgid "Accordion" +#~ msgstr "AccordÃ©on" + +#~ msgid "Table" +#~ msgstr "Table" + +#~ msgid "Pricing Table" +#~ msgstr "Tableau des prix" + +#~ msgid "Style Switcher Preview" +#~ msgstr "PrÃ©visualisation de l'outil de changement de style" + +#~ msgid "Cheatin’ uh?" +#~ msgstr "En train de tricher#8217; uh?" + +#~ msgid "%1$s — WordPress" +#~ msgstr "%1$s — WordPress" + +#~ msgid "Customize %s" +#~ msgstr "Personnaliser %s" + +#~ msgid "Style Switcher" +#~ msgstr "Outil de changement de style" + +#~ msgid "Cherry - 125x125 Ads." +#~ msgstr "Cherry - PubilicitÃ©s 125*125" + +#~ msgid "Google+" +#~ msgstr "Google+" + +#~ msgid "Google+ URL" +#~ msgstr "Adresse Google+" + +#~ msgid "Google+ label" +#~ msgstr "Etiquette Google +" + #~ msgid "No Repeat" #~ msgstr "Pas de rÃ©pÃ©tition" @@ -2049,9 +2210,9 @@ msgstr "" #~ "url dans l'option suivante(prochaine) et si vous choisissez \"le texte \" " #~ "votre Titre de Site montrera au lieu de cela.Choisissez si vous voulez " #~ "que votre logo principal soit une image ou un texte. Si vous choisissez " -#~ "\"l'image \" vous pouvez mettre dans l'image url dans l'option suivante" -#~ "(prochaine) et si vous choisissez \"le texte \" votre Titre de Site " -#~ "montrera au lieu de cela." +#~ "\"l'image \" vous pouvez mettre dans l'image url dans l'option " +#~ "suivante(prochaine) et si vous choisissez \"le texte \" votre Titre de " +#~ "Site montrera au lieu de cela." #~ msgid "Image Logo" #~ msgstr "image Logo" @@ -2462,9 +2623,6 @@ msgstr "" #~ msgid "easeInOutBounce" #~ msgstr "faciliter In Out Bounce" -#~ msgid "Blog" -#~ msgstr "Blog" - #~ msgid "Blog Title" #~ msgstr "Titre du blog" @@ -3049,9 +3207,6 @@ msgstr "" #~ msgid "Category" #~ msgstr "catÃ©gorie" -#~ msgid "Thumbnail" -#~ msgstr "Vignette" - #~ msgid "Your comment is awaiting moderation." #~ msgstr "Votre commentaire est en attente de modÃ©ration." diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.mo index 281ff931..8917d7a0 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.po index dc2449ce..f1a970b2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-it_IT.po @@ -1,208 +1,42 @@ msgid "" msgstr "" -"Project-Id-Version: ru_RU\n" -"POT-Creation-Date: 2014-02-25 10:49+0200\n" -"PO-Revision-Date: 2014-03-03 15:09+0200\n" -"Last-Translator: Barbara <babyjewel@gmail.com>\n" -"Language-Team: <demolink@info.org>\n" +"Project-Id-Version: it_IT\n" +"POT-Creation-Date: 2015-06-24 13:08+0200\n" +"PO-Revision-Date: 2015-06-24 13:08+0200\n" +"Last-Translator: \n" +"Language-Team: Cherry Team <demolink@info.org>\n" +"Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -#: ../admin/admin.php:28 +#: ../admin/admin.php:30 msgid "Cherry plugin" msgstr "Plugin Cherry " -#: ../admin/admin.php:31 ../admin/admin.php:52 +#: ../admin/admin.php:33 ../admin/admin.php:54 msgid "Summary" msgstr "Sommario " -#: ../admin/admin.php:34 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 #: ../admin/plugin-pages.php:100 msgid "Maintenance Mode" msgstr "ModalitÃ Manutenzione " -#: ../admin/admin.php:37 +#: ../admin/admin.php:39 msgid "Import Content" msgstr "Importa Contenuto " -#: ../admin/admin.php:40 ../admin/import-export/export.php:30 +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 msgid "Export Content" msgstr "Esporta Contenuto " -#: ../admin/plugin-components.php:36 -msgid "Documentation" -msgstr "Documentazione" - -#: ../admin/plugin-components.php:37 -msgid "Support" -msgstr "Supporto" - -#: ../admin/plugin-function.php:5 -msgid "Remove Inactive Widgets" -msgstr "Rimuovi Widget Inattivi " - -#: ../admin/plugin-function.php:23 -msgid "CTRL+A (Command-A) to select all files" -msgstr "CTRL+A (Command-A) per selezionare tutti i file " - -#: ../admin/plugin-function.php:37 -msgid "Files are downloaded as a .zip archive" -msgstr "I file sono scaricati come archivio .zip" - -#: ../admin/plugin-maintenance-mode.php:62 -msgid "Enable this option to activate website maintenance mode." -msgstr "Abilita questa opzione per attivare la modalitÃ manutenzione sito." - -#: ../admin/plugin-maintenance-mode.php:68 -msgid "Display Logo?" -msgstr "Mostrare Logo?" - -#: ../admin/plugin-maintenance-mode.php:73 -msgid "" -"Enable this option to display website logo at the under construction page" -msgstr "" -"Abilita questa opzione per mostrare il logo del sito web nella pagina in " -"costruzione" - -#: ../admin/plugin-maintenance-mode.php:79 -msgid "Description." -msgstr "Descrizione." - -#: ../admin/plugin-maintenance-mode.php:89 -#: ../admin/plugin-maintenance-mode.php:94 -msgid "Display timer?" -msgstr "Mostrare il timer?" - -#: ../admin/plugin-maintenance-mode.php:100 -msgid "Website launch date." -msgstr "Data di lancio del sito web. " - -#: ../admin/plugin-maintenance-mode.php:101 -msgid "Date is not correct." -msgstr "La data non Ã¨ corretta." - -#: ../admin/plugin-maintenance-mode.php:105 -msgid "Year:" -msgstr "Anno:" - -#: ../admin/plugin-maintenance-mode.php:107 -msgid "Month:" -msgstr "Mese:" - -#: ../admin/plugin-maintenance-mode.php:109 -msgid "Day:" -msgstr "Giorno:" - -#: ../admin/plugin-maintenance-mode.php:113 -msgid "Hour:" -msgstr "Ora:" - -#: ../admin/plugin-maintenance-mode.php:115 -msgid "Minute:" -msgstr "Minuto:" - -#: ../admin/plugin-maintenance-mode.php:123 -msgid "Save Changes" -msgstr "Salva Modifiche " - -#: ../admin/plugin-pages.php:6 -msgid "Cherry Plugin" -msgstr "Plugin Cherry " - -#: ../admin/plugin-pages.php:11 -msgid "" -"Cherry Plugin has been released with intention to separate widgets, " -"shortcodes and data management logics with theme editor options. Cherry " -"Plugin is installed automatically on CherryFramework installation and is " -"required for the correct work of CherryFramework. " -msgstr "" -"Il Plugin Cherry Ã¨ stato rilasciato con lo scopo di separare widgets, " -"shortcodes e i logics gestione dati dalle opzioni editor del tema. Il Plugin " -"Cherry Ã¨ installato automaticamente con l'installazione di CherryFramework " -"ed Ã¨ necessario per il corretto funzionamento di CherryFramework." - -#: ../admin/plugin-pages.php:15 ../admin/import-export/import.php:80 -msgid "Files Import demo" -msgstr "Demo Importazione File " - -#: ../admin/plugin-pages.php:19 -msgid "Import" -msgstr "Importa" - -#: ../admin/plugin-pages.php:20 -msgid "" -"Option to import website content from the backup. Select all files from the " -"backup archive and drag them to the upload files area to start uploading." -msgstr "" -"Opzione per importare il contenuto del sito web dal backup. Seleziona tutti " -"i file dall'archivio di backup e trascinali nell'area upload per iniziare il " -"caricamento." - -#: ../admin/plugin-pages.php:26 -msgid "Files Export demo" -msgstr "Demo Esportazione File " - -#: ../admin/plugin-pages.php:30 -msgid "Export" -msgstr "Esporta" - -#: ../admin/plugin-pages.php:31 -msgid "" -"Option to backup your website data creating a downloadable archive. Use this " -"option to keep your website data on performing some serious modifications or " -"moving website to other hosting." -msgstr "" -"Opzione per eseguire il backup dei dati del tuo sito web creando un archivio " -"scaricabile. Utilizza questa opzione per mantenere i dati del sito quando " -"effettui modifiche sostanziali o sposti il sito ad un altro hosting." - -#: ../admin/plugin-pages.php:42 -msgid "Widgets" -msgstr "Widget" - -#: ../admin/plugin-pages.php:43 -msgid "" -"Cherry Widgets offer additional ways to place content to widget areas. " -"Several available widget will allow you to add more functionality to your " -"website." -msgstr "" -"Cherry Widgets offre modi aggiuntivi per inserire contenuto nelle aree " -"widget. Diversi widget disponibili ti permetteranno di aggiungere piÃ¹ " -"funzionalitÃ al tuo sito web." - -#: ../admin/plugin-pages.php:52 -msgid "Shortcodes" -msgstr "Shortcodes" - -#: ../admin/plugin-pages.php:53 -msgid "" -"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " -"create various content structures in WordPress posts. Use \"Insert Shortcode" -"\" icon in post editor toolbar to add shortcodes." -msgstr "" -"Il Plugin Cherry aggiunge vari widget all'editor dei post. Gli shortcodes " -"consentono di creare varie strutture di contenuto nei post di WordPress. Usa " -"l'icona \"Inserisci Shortcode\" nella barra strumenti dell'editor di post " -"per aggiungere shortcodes." - -#: ../admin/plugin-pages.php:53 -msgid "Learn more" -msgstr "Per saperne di piÃ¹" - -#: ../admin/plugin-pages.php:79 -msgid "Cherry Content Import" -msgstr "Importa Contenuto Cherry" - -#: ../admin/plugin-pages.php:90 -msgid "Cherry Content Export" -msgstr "Esporta Contenuto Cherry" - -#: ../admin/import-export/export-functions.php:14 +#: ../admin/import-export/export-functions.php:18 msgid "Export content done" msgstr "Esportazione contenuto effettuata " @@ -293,43 +127,43 @@ msgstr "Richiesto" msgid "Continue" msgstr "Continua " -#: ../admin/import-export/import.php:32 +#: ../admin/import-export/import.php:34 msgid "Upload Error" msgstr "Errore di Caricamento " -#: ../admin/import-export/import.php:33 +#: ../admin/import-export/import.php:35 msgid "The file is too big!" msgstr "Il file Ã¨ troppo grosso!" -#: ../admin/import-export/import.php:34 +#: ../admin/import-export/import.php:36 msgid "The file type is error!" msgstr "Il tipo di file Ã¨ sbagliato!" -#: ../admin/import-export/import.php:35 +#: ../admin/import-export/import.php:37 msgid "Folder cannot be uploaded!" msgstr "La cartella non puÃ² essere caricata!" -#: ../admin/import-export/import.php:36 +#: ../admin/import-export/import.php:38 msgid "Uploading" msgstr "Sto caricando" -#: ../admin/import-export/import.php:37 ../admin/import-export/import.php:111 +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 msgid "Upload" msgstr "Caricare" -#: ../admin/import-export/import.php:38 +#: ../admin/import-export/import.php:40 msgid "Upload Complete" msgstr "Caricamento Completato" -#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 msgid "item" msgstr "oggetto" -#: ../admin/import-export/import.php:40 +#: ../admin/import-export/import.php:42 msgid "items" msgstr "oggetti" -#: ../admin/import-export/import.php:41 +#: ../admin/import-export/import.php:43 msgid "" "Sample data installing. Some steps may take some time depending on your " "server settings. Please be patient." @@ -337,81 +171,81 @@ msgstr "" "Sto installando i dati campione. Alcuni processi possono richiedere del " "tempo a seconda delle impostazioni del tuo server. Per favore attendi." -#: ../admin/import-export/import.php:42 +#: ../admin/import-export/import.php:44 msgid "Upload complete please click Continue Install button to proceed." msgstr "" "Caricamento completato per favore clicca sul pulsante Continua Installazione " "per procedere." -#: ../admin/import-export/import.php:44 +#: ../admin/import-export/import.php:46 msgid "Importing XML" msgstr "Sto importando XML" -#: ../admin/import-export/import.php:45 +#: ../admin/import-export/import.php:47 msgid "Importing categories" msgstr "Sto importando le categorie " -#: ../admin/import-export/import.php:46 +#: ../admin/import-export/import.php:48 msgid "Importing tags" msgstr "Sto importando i tag" -#: ../admin/import-export/import.php:47 +#: ../admin/import-export/import.php:49 msgid "Processing dependencies" msgstr "Sto processando le dipendenze" -#: ../admin/import-export/import.php:48 +#: ../admin/import-export/import.php:50 msgid "Importing posts. This may take some time. Please wait." msgstr "Sto importando i post. PuÃ² richiedere del tempo. Per favore attendi." -#: ../admin/import-export/import.php:49 +#: ../admin/import-export/import.php:51 msgid "Importing menu items. This may take some time. Please wait." msgstr "" "Sto importando gli oggetti del menu. PuÃ² richiedere del tempo. Per favore " "attendi." -#: ../admin/import-export/import.php:50 +#: ../admin/import-export/import.php:52 msgid "Importing media library." msgstr "Sto importando la libreria multimediale." -#: ../admin/import-export/import.php:51 +#: ../admin/import-export/import.php:53 msgid "Importing attachements meta." msgstr "Sto importando gli allegati meta." -#: ../admin/import-export/import.php:52 +#: ../admin/import-export/import.php:54 msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" "Sto generando gli allegati meta. PuÃ² richiedere del tempo. Per favore " "attendi." -#: ../admin/import-export/import.php:53 +#: ../admin/import-export/import.php:55 msgid "Generating content hierarchy" msgstr "Sto generando la gerarchia del contenuto" -#: ../admin/import-export/import.php:54 +#: ../admin/import-export/import.php:56 msgid "Updating featured images" msgstr "Sto aggiornando le immagini in evidenza " -#: ../admin/import-export/import.php:55 +#: ../admin/import-export/import.php:57 msgid "Updating attachments" msgstr "Sto aggiornando gli allegati " -#: ../admin/import-export/import.php:56 +#: ../admin/import-export/import.php:58 msgid "Importing JSON" msgstr "Sto importando JSON" -#: ../admin/import-export/import.php:57 +#: ../admin/import-export/import.php:59 msgid "Installing content complete" msgstr "Installazione del contenuto completata" -#: ../admin/import-export/import.php:58 +#: ../admin/import-export/import.php:60 msgid "Installing content error" msgstr "Errore nell'installazione del contenuto" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "Warning!" msgstr "Avvertenza!" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "" "Installing sample data will replace your website content. Please make sure " "to backup your website data before importing content." @@ -420,50 +254,54 @@ msgstr "" "Asicurati di eseguire un backup del tuo sito prima di importare del " "contenuto." -#: ../admin/import-export/import.php:72 +#: ../admin/import-export/import.php:74 msgid "Please Drop all needed files here <br> to import sample data" msgstr "" "Per favore Trascina tutti i file necessari qui <br> per importare i dati " "campione " -#: ../admin/import-export/import.php:73 ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 msgid "or" msgstr "oppure" -#: ../admin/import-export/import.php:75 +#: ../admin/import-export/import.php:77 msgid "Browse local files" msgstr "Sfoglia i file locali " -#: ../admin/import-export/import.php:78 +#: ../admin/import-export/import.php:80 #, php-format msgid "Maximum upload file size: %d %s." msgstr "Dimensione massima file da caricare: %d %s." -#: ../admin/import-export/import.php:81 +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" +msgstr "Demo Importazione File " + +#: ../admin/import-export/import.php:83 msgid "View Demo" msgstr "Vedi Demo " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File name" msgstr "Nome file " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File size" msgstr "Dimensione file " -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "Uploaded file:" msgstr "Carica il file:" -#: ../admin/import-export/import.php:105 +#: ../admin/import-export/import.php:107 msgid "Installing content started." msgstr "Installazione contenuto iniziata." -#: ../admin/import-export/import.php:115 +#: ../admin/import-export/import.php:117 msgid "Install" msgstr "Installa" -#: ../admin/import-export/import.php:120 +#: ../admin/import-export/import.php:122 msgid "" "Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " "and <b>.XML</b> files to install theme sample data." @@ -471,359 +309,226 @@ msgstr "" "File caricati con successo. Assicurati di aver caricato i file <b>.JSON</b> " "e <b>.XML</b> per installare i dati campione del tema." -#: ../admin/import-export/import.php:122 +#: ../admin/import-export/import.php:124 msgid "Add More Files" msgstr "Aggiungi Altri File " -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Continue Install" msgstr "Continua Installazione" -#: ../admin/import-export/import.php:124 +#: ../admin/import-export/import.php:126 msgid "Missing .XML or .JSON file" msgstr "File .XML o .JSON mancante" -#: ../admin/import-export/import.php:130 +#: ../admin/import-export/import.php:132 msgid "Congratulations" msgstr "Congratulazioni" -#: ../admin/import-export/import.php:131 +#: ../admin/import-export/import.php:133 msgid "Content has been installed successfully" msgstr "Il contenuto Ã¨ stato installato con successo" -#: ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:135 msgid "View your site" msgstr "Vedi il tuo sito " -#: ../admin/import-export/import.php:134 +#: ../admin/import-export/import.php:136 msgid "go to Cherry Options" msgstr "vai alle Opzioni Cherry " -#: ../admin/shortcodes/dialog.php:21 -msgid "Shortcode Options" -msgstr "Shortcode Opzioni" +#: ../admin/plugin-components.php:36 +msgid "Documentation" +msgstr "Documentazione" -#: ../admin/shortcodes/dialog.php:32 -msgid "Cancel" -msgstr "Annullare" +#: ../admin/plugin-components.php:37 +msgid "Support" +msgstr "Supporto" -#: ../admin/shortcodes/dialog.php:33 ../admin/shortcodes/editor-plugin.php:782 -msgid "Insert Shortcode" -msgstr "Inserire Shortcode" - -#: ../admin/shortcodes/editor-plugin.php:788 -msgid "Posts" -msgstr "Messaggi" - -#: ../admin/shortcodes/editor-plugin.php:789 -msgid "Posts Grid" -msgstr "Griglia Messaggi" - -#: ../admin/shortcodes/editor-plugin.php:790 -msgid "Posts List" -msgstr "Lista Messaggi" - -#: ../admin/shortcodes/editor-plugin.php:791 -msgid "Mini Posts Grid" -msgstr "Mini Griglia Messaggi" - -#: ../admin/shortcodes/editor-plugin.php:792 -msgid "Mini Posts List" -msgstr "Mini Lista Messaggi" - -#: ../admin/shortcodes/editor-plugin.php:793 -msgid "Recent Posts" -msgstr "Messaggi recenti" - -#: ../admin/shortcodes/editor-plugin.php:794 -msgid "Recent Testimonials" -msgstr "Testimonianze recenti" - -#: ../admin/shortcodes/editor-plugin.php:795 -msgid "Basic" -msgstr "Di base" - -#: ../admin/shortcodes/editor-plugin.php:796 -msgid "Banner" -msgstr "Banner" - -#: ../admin/shortcodes/editor-plugin.php:797 -#: ../includes/shortcodes/carousel-owl.php:171 -#: ../includes/shortcodes/carousel.php:154 -#: ../includes/shortcodes/post-cycle.php:139 -#: ../includes/shortcodes/posts-list.php:161 -#: ../includes/shortcodes/posts-list.php:162 -#: ../includes/widgets/my-post-cycle-widget.php:127 -msgid "Comments" -msgstr "Commenti" +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" +msgstr "Rimuovi Widget Inattivi " -#: ../admin/shortcodes/editor-plugin.php:798 -msgid "Post Cycle" -msgstr "Ciclo Messaggio" +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" +msgstr "CTRL+A (Command-A) per selezionare tutti i file " -#: ../admin/shortcodes/editor-plugin.php:799 -msgid "Carousel (Elasti)" -msgstr "Carosello (Elasti)" +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" +msgstr "I file sono scaricati come archivio .zip" -#: ../admin/shortcodes/editor-plugin.php:800 -msgid "Carousel (OWL)" -msgstr "Carosello (OWL)" +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." +msgstr "Abilita questa opzione per attivare la modalitÃ manutenzione sito." -#: ../admin/shortcodes/editor-plugin.php:801 -msgid "Roundabout" -msgstr "Giostra" +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" +msgstr "Mostrare Logo?" -#: ../admin/shortcodes/editor-plugin.php:802 -msgid "Service Box" -msgstr "Box Servizio" +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" +msgstr "" +"Abilita questa opzione per mostrare il logo del sito web nella pagina in " +"costruzione" -#: ../admin/shortcodes/editor-plugin.php:803 -msgid "Hero Unit" -msgstr "UnitÃ Eroe" +#: ../admin/plugin-maintenance-mode.php:79 +msgid "Description" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:804 -msgid "Categories" -msgstr "Categorie" +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" +msgstr "Mostrare il timer?" -#: ../admin/shortcodes/editor-plugin.php:805 -#: ../includes/shortcodes/posts-list.php:281 -msgid "Tags" -msgstr "Tag" - -#: ../admin/shortcodes/editor-plugin.php:806 -msgid "Columns" -msgstr "Colonne" - -#: ../admin/shortcodes/editor-plugin.php:821 -msgid "Fluid Column" -msgstr "Colonna fluida" - -#: ../admin/shortcodes/editor-plugin.php:830 -msgid "2 Columns" -msgstr "2 Colonne" - -#: ../admin/shortcodes/editor-plugin.php:834 -msgid "3 Columns" -msgstr "3 Colonne" - -#: ../admin/shortcodes/editor-plugin.php:839 -msgid "4 Columns" -msgstr "4 Colonne" - -#: ../admin/shortcodes/editor-plugin.php:841 -msgid "Elements" -msgstr "Elementi" - -#: ../admin/shortcodes/editor-plugin.php:842 -msgid "Label" -msgstr "Etichetta" - -#: ../admin/shortcodes/editor-plugin.php:843 -msgid "Text Highlight" -msgstr "Evidenziatore Testo" - -#: ../admin/shortcodes/editor-plugin.php:844 -msgid "Button" -msgstr "Pulsante" - -#: ../admin/shortcodes/editor-plugin.php:845 -msgid "Drop Cap" -msgstr "Drop Cap " - -#: ../admin/shortcodes/editor-plugin.php:846 -msgid "Blockquote" -msgstr "Blockquote" - -#: ../admin/shortcodes/editor-plugin.php:847 -msgid "Icon" -msgstr "Icona" - -#: ../admin/shortcodes/editor-plugin.php:848 -msgid "Frame" -msgstr "Frame" - -#: ../admin/shortcodes/editor-plugin.php:849 -msgid "Horizontal Rule" -msgstr "Righello Orizzontale " - -#: ../admin/shortcodes/editor-plugin.php:850 -msgid "Small Horizontal Rule" -msgstr "Righello Orizzontale Piccolo " - -#: ../admin/shortcodes/editor-plugin.php:851 -msgid "Vertical Rule" -msgstr "Righello Verticale " - -#: ../admin/shortcodes/editor-plugin.php:852 -msgid "Spacer" -msgstr "Spaziatore " - -#: ../admin/shortcodes/editor-plugin.php:853 -msgid "Progressbar" -msgstr "Barra progresso" - -#: ../admin/shortcodes/editor-plugin.php:854 -msgid "Address" -msgstr "Indirizzo" - -#: ../admin/shortcodes/editor-plugin.php:855 -msgid "Clear" -msgstr "Cancella" - -#: ../admin/shortcodes/editor-plugin.php:856 -msgid "Extra Wrap" -msgstr "Extra Wrap" - -#: ../admin/shortcodes/editor-plugin.php:857 -msgid "Lists" -msgstr "Elenchi" - -#: ../admin/shortcodes/editor-plugin.php:858 -msgid "Unstyled" -msgstr "Senza stile" - -#: ../admin/shortcodes/editor-plugin.php:859 -msgid "Check List" -msgstr "Lista Check" - -#: ../admin/shortcodes/editor-plugin.php:860 -msgid "Check 2 List" -msgstr "Lista Check 2 " - -#: ../admin/shortcodes/editor-plugin.php:861 -msgid "OK Circle List" -msgstr "Lista Circle OK " - -#: ../admin/shortcodes/editor-plugin.php:862 -msgid "OK Sign List" -msgstr "Lista Sign OK " - -#: ../admin/shortcodes/editor-plugin.php:863 -msgid "Arrow List" -msgstr "Lista Arrow" - -#: ../admin/shortcodes/editor-plugin.php:864 -msgid "Arrow 2 List" -msgstr "List Arrow 2" +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." +msgstr "Data di lancio del sito web. " -#: ../admin/shortcodes/editor-plugin.php:865 -msgid "Circle Arrow List" -msgstr "Lista Circle Arrow " +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." +msgstr "La data non Ã¨ corretta." -#: ../admin/shortcodes/editor-plugin.php:866 -msgid "Caret List" -msgstr "Lista Caret " +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" +msgstr "Anno:" -#: ../admin/shortcodes/editor-plugin.php:867 -msgid "Angle List" -msgstr "Lista Angle " +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" +msgstr "Mese:" -#: ../admin/shortcodes/editor-plugin.php:868 -msgid "Double Angle List" -msgstr "Lista Double Angle" +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" +msgstr "Giorno:" -#: ../admin/shortcodes/editor-plugin.php:869 -msgid "Star List" -msgstr "Lista Star " +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" +msgstr "Ora:" -#: ../admin/shortcodes/editor-plugin.php:870 -msgid "Plus List" -msgstr "Lista plus" +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" +msgstr "Minuto:" -#: ../admin/shortcodes/editor-plugin.php:871 -msgid "Minus List" -msgstr "Lista minima" +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" +msgstr "Salva Modifiche " -#: ../admin/shortcodes/editor-plugin.php:872 -msgid "Circle List" -msgstr "Lista Circle " +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" +msgstr "Plugin Cherry " -#: ../admin/shortcodes/editor-plugin.php:873 -msgid "Circle Blank List" -msgstr "Lista Vuota Circle " +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " +msgstr "" +"Il Plugin Cherry Ã¨ stato rilasciato con lo scopo di separare widgets, " +"shortcodes e i logics gestione dati dalle opzioni editor del tema. Il Plugin " +"Cherry Ã¨ installato automaticamente con l'installazione di CherryFramework " +"ed Ã¨ necessario per il corretto funzionamento di CherryFramework." -#: ../admin/shortcodes/editor-plugin.php:874 -msgid "Custom List" -msgstr "Elenco personalizzato" +#: ../admin/plugin-pages.php:19 +msgid "Import" +msgstr "Importa" -#: ../admin/shortcodes/editor-plugin.php:875 -msgid "Misc" -msgstr "Varie" +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." +msgstr "" +"Opzione per importare il contenuto del sito web dal backup. Seleziona tutti " +"i file dall'archivio di backup e trascinali nell'area upload per iniziare il " +"caricamento." -#: ../admin/shortcodes/editor-plugin.php:876 -msgid "Alert Box" -msgstr "Alert Box" +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" +msgstr "Demo Esportazione File " -#: ../admin/shortcodes/editor-plugin.php:877 -msgid "Close icon" -msgstr "Chiudi icona" +#: ../admin/plugin-pages.php:30 +msgid "Export" +msgstr "Esporta" -#: ../admin/shortcodes/editor-plugin.php:878 -msgid "Well" -msgstr "Bene" +#: ../admin/plugin-pages.php:31 +msgid "" +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." +msgstr "" +"Opzione per eseguire il backup dei dati del tuo sito web creando un archivio " +"scaricabile. Utilizza questa opzione per mantenere i dati del sito quando " +"effettui modifiche sostanziali o sposti il sito ad un altro hosting." -#: ../admin/shortcodes/editor-plugin.php:879 -msgid "Small" -msgstr "Piccolo" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" +msgstr "Widget" -#: ../admin/shortcodes/editor-plugin.php:880 -#: ../includes/widgets/my-comment-widget.php:140 -#: ../includes/widgets/my-facebook-widget.php:79 -#: ../includes/widgets/my-flickr-widget.php:57 -#: ../includes/widgets/my-posts-type-widget.php:205 -#: ../includes/widgets/my-recent-posts.php:126 -#: ../includes/widgets/my-recent-posts.php:148 -#: ../includes/widgets/my-social-widget.php:132 -#: ../includes/widgets/my-vcard-widget.php:151 -msgid "Title" -msgstr "Titolo" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." +msgstr "" +"Cherry Widgets offre modi aggiuntivi per inserire contenuto nelle aree " +"widget. Diversi widget disponibili ti permetteranno di aggiungere piÃ¹ " +"funzionalitÃ al tuo sito web." -#: ../admin/shortcodes/editor-plugin.php:881 -msgid "Template URL" -msgstr "URL Template " +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" +msgstr "Shortcodes" -#: ../admin/shortcodes/editor-plugin.php:882 -msgid "Sitemap" -msgstr "Mappa del sito" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." +msgstr "" +"Il Plugin Cherry aggiunge vari widget all'editor dei post. Gli shortcodes " +"consentono di creare varie strutture di contenuto nei post di WordPress. Usa " +"l'icona \"Inserisci Shortcode\" nella barra strumenti dell'editor di post " +"per aggiungere shortcodes." -#: ../admin/shortcodes/editor-plugin.php:883 -msgid "Video Preview" -msgstr "Anteprima Video" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" +msgstr "Per saperne di piÃ¹" -#: ../admin/shortcodes/editor-plugin.php:884 -msgid "Tabs" -msgstr "Tabs" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" +msgstr "Importa Contenuto Cherry" -#: ../admin/shortcodes/editor-plugin.php:885 -msgid "Accordion" -msgstr "Fisarmonica" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" +msgstr "Esporta Contenuto Cherry" -#: ../admin/shortcodes/editor-plugin.php:886 -msgid "Table" -msgstr "Tavolo" +#: ../admin/shortcodes/dialog.php:20 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 +msgid "Cancel" +msgstr "Annullare" -#: ../admin/shortcodes/editor-plugin.php:887 -msgid "Pricing Table" -msgstr "Tabella Prezzi" +#: ../admin/shortcodes/dialog.php:21 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 +msgid "Insert" +msgstr "" -#: ../admin/shortcodes/editor-plugin.php:888 -#: ../includes/widgets/my-vcard-widget.php:156 -msgid "Google Map" -msgstr "Google Map" +#: ../admin/shortcodes/dialog.php:25 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 +msgid "Shortcode Options" +msgstr "Shortcode Opzioni" -#: ../includes/plugin-assets.php:32 +#: ../includes/plugin-assets.php:38 msgid "Under Construction Page Widgets Area." msgstr "Area Widget Pagina In Costruzione." -#: ../includes/plugin-assets.php:34 +#: ../includes/plugin-assets.php:40 msgid "Under construction page widgets area." msgstr "Area widget pagina in costruzione." -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Maintenance mode activated. Website is blocked from public" msgstr "ModalitÃ manutenzione attivata. Il sito web Ã¨ bloccato al pubblico " -#: ../includes/plugin-assets.php:52 +#: ../includes/plugin-assets.php:58 msgid "Settings." msgstr "Impostazioni." @@ -840,102 +545,89 @@ msgid "Hours" msgstr "Ore" #: ../includes/plugin-under-construction-content.php:85 -msgid "Minuts" -msgstr "Minuti" +msgid "Minutes" +msgstr "" #: ../includes/plugin-under-construction-content.php:89 msgid "Seconds" msgstr "Secondi" -#: ../includes/gt-custom/gt-custom.php:112 -msgid "Style Switcher Preview" -msgstr "Anteprima Variatore Stile " - -#: ../includes/gt-custom/gt-customize.php:17 -msgid "Cheatin’ uh?" -msgstr "Stai barando eh?" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "%1$s — WordPress" -msgstr "%1$s — WordPress" - -#: ../includes/gt-custom/gt-customize.php:84 -#, php-format -msgid "Customize %s" -msgstr "Personalizza %s" - -#: ../includes/gt-custom/gt-customize.php:112 -msgid "Style Switcher" -msgstr "Variatore Stile " - -#: ../includes/shortcodes/carousel-owl.php:165 -#: ../includes/shortcodes/posts-list.php:152 +#: ../includes/shortcodes/carousel-owl.php:168 +#: ../includes/shortcodes/posts-list.php:154 msgid "by " msgstr "da " -#: ../includes/shortcodes/carousel-owl.php:173 -#: ../includes/shortcodes/carousel.php:156 -#: ../includes/widgets/my-post-cycle-widget.php:129 +#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel.php:167 +#: ../includes/shortcodes/post-cycle.php:150 +#: ../includes/shortcodes/posts-list.php:163 +#: ../includes/shortcodes/posts-list.php:164 +#: ../includes/widgets/my-post-cycle-widget.php:153 +msgid "Comments" +msgstr "Commenti" + +#: ../includes/shortcodes/carousel-owl.php:176 +#: ../includes/shortcodes/carousel.php:169 +#: ../includes/widgets/my-post-cycle-widget.php:155 msgid "Comment" msgstr "Commento" -#: ../includes/shortcodes/carousel.php:147 -#: ../includes/widgets/my-post-cycle-widget.php:118 +#: ../includes/shortcodes/carousel.php:160 +#: ../includes/widgets/my-post-cycle-widget.php:144 msgid "by" msgstr "di" -#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:25 +#: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 #: ../includes/shortcodes/post-cycle.php:17 -#: ../includes/shortcodes/posts-grid.php:22 +#: ../includes/shortcodes/posts-grid.php:24 #: ../includes/shortcodes/posts-list.php:19 -#: ../includes/shortcodes/service-box.php:15 -#: ../includes/widgets/my-posts-type-widget.php:145 +#: ../includes/shortcodes/service-box.php:16 +#: ../includes/widgets/my-posts-type-widget.php:165 #: ../includes/widgets/my-recent-posts.php:87 msgid "Read more" msgstr "Per saperne di piÃ¹" -#: ../includes/shortcodes/media.php:82 ../includes/shortcodes/media.php:205 -#: ../includes/shortcodes/media.php:216 -#: ../includes/shortcodes/shortcodes.php:211 -#: ../includes/shortcodes/shortcodes.php:309 -#: ../includes/shortcodes/shortcodes.php:320 +#: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 +#: ../includes/shortcodes/media.php:251 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 msgid "Play" msgstr "Play" -#: ../includes/shortcodes/media.php:83 ../includes/shortcodes/media.php:217 -#: ../includes/shortcodes/shortcodes.php:212 -#: ../includes/shortcodes/shortcodes.php:321 +#: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 msgid "Pause" msgstr "Pausa" -#: ../includes/shortcodes/media.php:84 ../includes/shortcodes/media.php:218 -#: ../includes/shortcodes/shortcodes.php:214 -#: ../includes/shortcodes/shortcodes.php:322 +#: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 msgid "Stop" msgstr "Stop" -#: ../includes/shortcodes/media.php:90 ../includes/shortcodes/media.php:224 -#: ../includes/shortcodes/shortcodes.php:220 -#: ../includes/shortcodes/shortcodes.php:328 +#: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 msgid "Mute" msgstr "Mute" -#: ../includes/shortcodes/media.php:91 ../includes/shortcodes/media.php:225 -#: ../includes/shortcodes/shortcodes.php:221 -#: ../includes/shortcodes/shortcodes.php:329 +#: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 msgid "Unmute" msgstr "Riattivare" -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Update Required." msgstr "Aggiornamento Necessario." -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "" "To play the media you will need to either update your browser to a recent " "version or update your " @@ -943,148 +635,387 @@ msgstr "" "Per poter riprodurre il contenuto multimediale Ã¨ necessario aggiornare il " "browser o " -#: ../includes/shortcodes/media.php:96 ../includes/shortcodes/media.php:229 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:333 +#: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Flash plugin" msgstr "Plugin Flash" -#: ../includes/shortcodes/post-cycle.php:166 +#: ../includes/shortcodes/post-cycle.php:210 msgid "Client" msgstr "Cliente" -#: ../includes/shortcodes/post-cycle.php:167 -#: ../includes/widgets/my-comment-widget.php:91 +#: ../includes/shortcodes/post-cycle.php:211 +#: ../includes/widgets/my-comment-widget.php:97 #: ../includes/widgets/my-recent-posts.php:147 msgid "Date" msgstr "Data" -#: ../includes/shortcodes/post-cycle.php:168 -msgid "Info" -msgstr "Info" +#: ../includes/shortcodes/post-cycle.php:212 +msgid "Info" +msgstr "Info" + +#: ../includes/shortcodes/post-cycle.php:213 +msgid "Launch Project" +msgstr "Lancia Progetto" + +#: ../includes/shortcodes/posts-list.php:130 +#: ../includes/shortcodes/posts-list.php:139 +msgid "Posted in" +msgstr "Pubblicato in " + +#: ../includes/shortcodes/posts-list.php:283 +msgid "Tags" +msgstr "Tag" + +#: ../includes/shortcodes/shortcodes.php:226 +msgid "Previous" +msgstr "Precedente" + +#: ../includes/shortcodes/shortcodes.php:229 +msgid "Next" +msgstr "Successivo" + +#: ../includes/widgets/cherry-banner-widget.php:5 +msgid "Cherry - Banner" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:46 +#: ../includes/widgets/my-comment-widget.php:146 +#: ../includes/widgets/my-facebook-widget.php:79 +#: ../includes/widgets/my-flickr-widget.php:62 +#: ../includes/widgets/my-posts-type-widget.php:225 +#: ../includes/widgets/my-recent-posts.php:126 +#: ../includes/widgets/my-recent-posts.php:148 +#: ../includes/widgets/my-social-widget.php:108 +#: ../includes/widgets/my-vcard-widget.php:155 +msgid "Title" +msgstr "Titolo" + +#: ../includes/widgets/cherry-banner-widget.php:47 +msgid "Banner description" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:48 +#: ../includes/widgets/cherry-instagram-widget.php:165 +msgid "Image URL" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:49 +msgid "Fill image" +msgstr "" + +#: ../includes/widgets/cherry-banner-widget.php:50 +#: ../includes/widgets/my-posts-type-widget.php:398 +#: ../includes/widgets/my-recent-posts.php:160 +msgid "Link URL" +msgstr "URL Link " + +#: ../includes/widgets/cherry-banner-widget.php:89 +msgid "Select Image" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Cherry - Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:5 +msgid "Widget for popular social network Instagram" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 +msgid "Widget Title" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "User Name" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +msgid "" +"Widget will work only for users who have full rights opened in Instagram " +"account." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Number of displayed images" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 +msgid "Max value: 20 images." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Image dimentions" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Large" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:150 +msgid "Thumbnail" +msgstr "Thumbnail" + +#: ../includes/widgets/cherry-instagram-widget.php:153 +msgid "Show image description" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:156 +msgid "Show comments number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:159 +msgid "Show likes number" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:162 +msgid "Show image publication date" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:168 +msgid "User account button text" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" +msgstr "Schema dei colori" -#: ../includes/shortcodes/post-cycle.php:169 -msgid "Launch Project" -msgstr "Lancia Progetto" +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" +msgstr "Chiaro" -#: ../includes/shortcodes/posts-list.php:128 -#: ../includes/shortcodes/posts-list.php:137 -msgid "Posted in" -msgstr "Pubblicato in " +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" +msgstr "Scuro" -#: ../includes/shortcodes/shortcodes.php:210 -msgid "Previous" -msgstr "Precedente" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" +msgstr "" -#: ../includes/shortcodes/shortcodes.php:213 -msgid "Next" -msgstr "Successivo" +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." +msgstr "" -#: ../includes/widgets/my-banners-widget.php:13 +#: ../includes/widgets/my-banners-widget.php:7 msgid "Add 125x125 ads." msgstr "Aggiungi 125x125 annunci." -#: ../includes/widgets/my-banners-widget.php:17 -msgid "Cherry - 125x125 Ads." -msgstr "Cherry - 125x125 Ads." +#: ../includes/widgets/my-banners-widget.php:10 +msgid "Cherry - 125x125 Ads" +msgstr "" -#: ../includes/widgets/my-banners-widget.php:60 +#: ../includes/widgets/my-banners-widget.php:65 msgid "Ad 1" msgstr "Annuncio 1" -#: ../includes/widgets/my-banners-widget.php:62 -#: ../includes/widgets/my-banners-widget.php:71 -#: ../includes/widgets/my-banners-widget.php:80 -#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:67 +#: ../includes/widgets/my-banners-widget.php:76 +#: ../includes/widgets/my-banners-widget.php:85 +#: ../includes/widgets/my-banners-widget.php:94 msgid "Image Ad Link:" msgstr "Immagine Ad Link:" -#: ../includes/widgets/my-banners-widget.php:66 -#: ../includes/widgets/my-banners-widget.php:75 -#: ../includes/widgets/my-banners-widget.php:84 -#: ../includes/widgets/my-banners-widget.php:93 +#: ../includes/widgets/my-banners-widget.php:71 +#: ../includes/widgets/my-banners-widget.php:80 +#: ../includes/widgets/my-banners-widget.php:89 +#: ../includes/widgets/my-banners-widget.php:98 msgid "Ad Link:" msgstr "Ad Link:" -#: ../includes/widgets/my-banners-widget.php:69 +#: ../includes/widgets/my-banners-widget.php:74 msgid "Ad 2" msgstr "Annuncio 2" -#: ../includes/widgets/my-banners-widget.php:78 +#: ../includes/widgets/my-banners-widget.php:83 msgid "Ad 3" msgstr "Annuncio 3" -#: ../includes/widgets/my-banners-widget.php:87 +#: ../includes/widgets/my-banners-widget.php:92 msgid "Ad 4" msgstr "Annuncio 4" -#: ../includes/widgets/my-comment-widget.php:4 +#: ../includes/widgets/my-comment-widget.php:5 msgid "Cherry - Recent Comments" msgstr "Cherry - commenti recenti" -#: ../includes/widgets/my-comment-widget.php:11 -#: ../includes/widgets/my-comment-widget.php:127 +#: ../includes/widgets/my-comment-widget.php:13 +#: ../includes/widgets/my-comment-widget.php:133 msgid "My Recent Comments" msgstr "I miei commenti recenti" -#: ../includes/widgets/my-comment-widget.php:72 +#: ../includes/widgets/my-comment-widget.php:78 msgid "Comment in" msgstr "Commento in" -#: ../includes/widgets/my-comment-widget.php:81 -#: ../includes/widgets/widgets-manager.php:479 -#: ../includes/widgets/widgets-manager.php:487 +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 msgid "Author" msgstr "Autore" -#: ../includes/widgets/my-comment-widget.php:99 +#: ../includes/widgets/my-comment-widget.php:105 msgid "Go to this comment" msgstr "Vai a questo commento" -#: ../includes/widgets/my-comment-widget.php:141 +#: ../includes/widgets/my-comment-widget.php:147 msgid "Number of comments to show" msgstr "Numero di commenti da mostrare" -#: ../includes/widgets/my-comment-widget.php:142 +#: ../includes/widgets/my-comment-widget.php:148 msgid "Display avatar" msgstr "Visualizzare avatar" -#: ../includes/widgets/my-comment-widget.php:143 +#: ../includes/widgets/my-comment-widget.php:149 msgid "Avatar size (px)" msgstr "Dimensione Avatar (px)" -#: ../includes/widgets/my-comment-widget.php:152 +#: ../includes/widgets/my-comment-widget.php:158 msgid "Display the comment author" msgstr "Visualizzare il commento dell'autore" -#: ../includes/widgets/my-comment-widget.php:153 +#: ../includes/widgets/my-comment-widget.php:159 msgid "Display the comment date" msgstr "Visualizzare la data di commento" -#: ../includes/widgets/my-comment-widget.php:154 +#: ../includes/widgets/my-comment-widget.php:160 msgid "Display post title" msgstr "Mostra titolo del post" -#: ../includes/widgets/my-comment-widget.php:155 -#: ../includes/widgets/my-vcard-widget.php:191 +#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:195 msgid "Meta format" msgstr "formato di Meta" -#: ../includes/widgets/my-comment-widget.php:157 -#: ../includes/widgets/my-vcard-widget.php:193 -#: ../includes/widgets/widgets-manager.php:506 +#: ../includes/widgets/my-comment-widget.php:163 +#: ../includes/widgets/my-vcard-widget.php:197 +#: ../includes/widgets/widgets-manager.php:507 msgid "None" msgstr "Nessuno" -#: ../includes/widgets/my-comment-widget.php:158 -#: ../includes/widgets/my-social-widget.php:209 -#: ../includes/widgets/my-vcard-widget.php:194 +#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-social-widget.php:185 +#: ../includes/widgets/my-vcard-widget.php:198 msgid "Icons" msgstr "Icone" -#: ../includes/widgets/my-comment-widget.php:159 -#: ../includes/widgets/my-social-widget.php:210 -#: ../includes/widgets/my-vcard-widget.php:195 +#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-vcard-widget.php:199 msgid "Labels" msgstr "Etichette" @@ -1109,27 +1040,15 @@ msgid "Facebook Pages." msgstr "Pagine Facebook." #: ../includes/widgets/my-facebook-widget.php:90 -#: ../includes/widgets/my-posts-type-widget.php:347 +#: ../includes/widgets/my-posts-type-widget.php:367 msgid "Width" msgstr "Larghezza" #: ../includes/widgets/my-facebook-widget.php:95 -#: ../includes/widgets/my-posts-type-widget.php:352 +#: ../includes/widgets/my-posts-type-widget.php:372 msgid "Height" msgstr "Altezza" -#: ../includes/widgets/my-facebook-widget.php:100 -msgid "Color Scheme" -msgstr "Schema dei colori" - -#: ../includes/widgets/my-facebook-widget.php:102 -msgid "Light" -msgstr "Chiaro" - -#: ../includes/widgets/my-facebook-widget.php:103 -msgid "Dark" -msgstr "Scuro" - #: ../includes/widgets/my-facebook-widget.php:109 msgid "Display header" msgstr "Mostra intestazione" @@ -1150,17 +1069,21 @@ msgstr "Visualizzare bordo" msgid "Cherry - Flickr" msgstr "Cherry - Flickr" -#: ../includes/widgets/my-flickr-widget.php:59 +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." +msgstr "" + +#: ../includes/widgets/my-flickr-widget.php:64 msgid "Flickr ID" msgstr "ID Flickr" -#: ../includes/widgets/my-flickr-widget.php:60 +#: ../includes/widgets/my-flickr-widget.php:65 msgid "Images count" msgstr "Conteggio immagini " -#: ../includes/widgets/my-flickr-widget.php:61 -#: ../includes/widgets/my-posts-type-widget.php:325 -#: ../includes/widgets/my-posts-type-widget.php:372 +#: ../includes/widgets/my-flickr-widget.php:66 +#: ../includes/widgets/my-posts-type-widget.php:345 +#: ../includes/widgets/my-posts-type-widget.php:392 #: ../includes/widgets/my-recent-posts.php:158 msgid "Link Text" msgstr "Testo Link" @@ -1169,87 +1092,87 @@ msgstr "Testo Link" msgid "Cherry - Post Cycle" msgstr "Cherry - Posta Cycle" -#: ../includes/widgets/my-post-cycle-widget.php:195 +#: ../includes/widgets/my-post-cycle-widget.php:221 msgid "Title:" msgstr "Titolo:" -#: ../includes/widgets/my-post-cycle-widget.php:197 +#: ../includes/widgets/my-post-cycle-widget.php:223 msgid "Select post type:" msgstr "Seleziona tipo di post:" -#: ../includes/widgets/my-post-cycle-widget.php:227 +#: ../includes/widgets/my-post-cycle-widget.php:253 msgid "Categories (names separated by \",\"):" msgstr "Categorie (nomi separati da \",\"):" -#: ../includes/widgets/my-post-cycle-widget.php:229 +#: ../includes/widgets/my-post-cycle-widget.php:255 msgid "Posts count:" msgstr "Conteggio messaggi:" -#: ../includes/widgets/my-post-cycle-widget.php:231 +#: ../includes/widgets/my-post-cycle-widget.php:257 msgid "Thumbnail Width (in pixels):" msgstr "Larghezza thumbnail (in pixel):" -#: ../includes/widgets/my-post-cycle-widget.php:233 +#: ../includes/widgets/my-post-cycle-widget.php:259 msgid "Thumbnail Height (in pixels):" msgstr "Altezza thumbnail (in pixel):" -#: ../includes/widgets/my-post-cycle-widget.php:235 +#: ../includes/widgets/my-post-cycle-widget.php:261 msgid "Show titles:" msgstr "Mostra titoli:" -#: ../includes/widgets/my-post-cycle-widget.php:242 -#: ../includes/widgets/my-post-cycle-widget.php:261 -#: ../includes/widgets/my-post-cycle-widget.php:280 -#: ../includes/widgets/my-post-cycle-widget.php:299 -#: ../includes/widgets/my-post-cycle-widget.php:318 -#: ../includes/widgets/my-post-cycle-widget.php:343 -#: ../includes/widgets/my-post-cycle-widget.php:362 +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 msgid "yes" msgstr "si" -#: ../includes/widgets/my-post-cycle-widget.php:247 -#: ../includes/widgets/my-post-cycle-widget.php:266 -#: ../includes/widgets/my-post-cycle-widget.php:285 -#: ../includes/widgets/my-post-cycle-widget.php:304 -#: ../includes/widgets/my-post-cycle-widget.php:323 -#: ../includes/widgets/my-post-cycle-widget.php:348 -#: ../includes/widgets/my-post-cycle-widget.php:367 +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 msgid "no" msgstr "no" -#: ../includes/widgets/my-post-cycle-widget.php:254 +#: ../includes/widgets/my-post-cycle-widget.php:280 msgid "Show date:" msgstr "Mostra data:" -#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:299 msgid "Show author:" msgstr "Mostra autore:" -#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:318 msgid "Show comments:" msgstr "Mostra commenti:" -#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:337 msgid "Show excerpt:" msgstr "Mostra un estratto:" -#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:356 msgid "Excerpt word count:" msgstr "Conteggio parole estratto:" -#: ../includes/widgets/my-post-cycle-widget.php:332 +#: ../includes/widgets/my-post-cycle-widget.php:358 msgid "More Button Text:" msgstr "Testo Pulsante Di PiÃ¹:" -#: ../includes/widgets/my-post-cycle-widget.php:334 +#: ../includes/widgets/my-post-cycle-widget.php:360 msgid "Slideshow cycling speed (in sec.):" msgstr "VelocitÃ ciclo diapositive (in sec.):" -#: ../includes/widgets/my-post-cycle-widget.php:336 +#: ../includes/widgets/my-post-cycle-widget.php:362 msgid "Arrows:" msgstr "Frecce:" -#: ../includes/widgets/my-post-cycle-widget.php:355 +#: ../includes/widgets/my-post-cycle-widget.php:381 msgid "Pagination:" msgstr "Numerazione pagine:" @@ -1261,120 +1184,115 @@ msgstr "Mostra i messaggi personalizzati" msgid "Cherry - Advanced Cycle" msgstr "Cherry - ciclo avanzato" -#: ../includes/widgets/my-posts-type-widget.php:152 +#: ../includes/widgets/my-posts-type-widget.php:172 msgid "View all" msgstr "Vedi tutti" -#: ../includes/widgets/my-posts-type-widget.php:212 +#: ../includes/widgets/my-posts-type-widget.php:232 msgid "Posts type" msgstr "Tipo di messaggi" -#: ../includes/widgets/my-posts-type-widget.php:229 +#: ../includes/widgets/my-posts-type-widget.php:249 msgid "Number of posts to show" msgstr "Numero di messaggi da mostrare" -#: ../includes/widgets/my-posts-type-widget.php:236 +#: ../includes/widgets/my-posts-type-widget.php:256 msgid "Sort by" msgstr "Ordina per" -#: ../includes/widgets/my-posts-type-widget.php:250 +#: ../includes/widgets/my-posts-type-widget.php:270 msgid "Reverse sort order (ascending)" msgstr "Ordinamento inverso (crescente)" -#: ../includes/widgets/my-posts-type-widget.php:256 +#: ../includes/widgets/my-posts-type-widget.php:276 msgid "Show number of comments" msgstr "Mostra numero di commenti" -#: ../includes/widgets/my-posts-type-widget.php:263 +#: ../includes/widgets/my-posts-type-widget.php:283 msgid "Show meta" msgstr "Mostra meta" -#: ../includes/widgets/my-posts-type-widget.php:269 +#: ../includes/widgets/my-posts-type-widget.php:289 msgid "Container class" msgstr "Classe Container " -#: ../includes/widgets/my-posts-type-widget.php:270 +#: ../includes/widgets/my-posts-type-widget.php:290 msgid "default: \"featured_custom_posts\"" msgstr "predefinito: \"featured_custom_posts\"" -#: ../includes/widgets/my-posts-type-widget.php:275 +#: ../includes/widgets/my-posts-type-widget.php:295 msgid "Post title" msgstr "Titolo del post" -#: ../includes/widgets/my-posts-type-widget.php:279 +#: ../includes/widgets/my-posts-type-widget.php:299 msgid "Show post title" msgstr "Mostra titolo del post" -#: ../includes/widgets/my-posts-type-widget.php:285 +#: ../includes/widgets/my-posts-type-widget.php:305 msgid "Date as title " msgstr "Data come titolo " -#: ../includes/widgets/my-posts-type-widget.php:292 +#: ../includes/widgets/my-posts-type-widget.php:312 msgid "Excerpt" msgstr "Estratto" -#: ../includes/widgets/my-posts-type-widget.php:296 +#: ../includes/widgets/my-posts-type-widget.php:316 msgid "Show post excerpt" msgstr "Mostra estratto messaggio " -#: ../includes/widgets/my-posts-type-widget.php:301 +#: ../includes/widgets/my-posts-type-widget.php:321 #: ../includes/widgets/my-recent-posts.php:156 msgid "Excerpt length (words)" msgstr "Lunghezza estratto (parole)" -#: ../includes/widgets/my-posts-type-widget.php:308 +#: ../includes/widgets/my-posts-type-widget.php:328 msgid "Excerpt as link" msgstr "Estratto come link " -#: ../includes/widgets/my-posts-type-widget.php:315 +#: ../includes/widgets/my-posts-type-widget.php:335 msgid "More link" msgstr "PiÃ collegamenti" -#: ../includes/widgets/my-posts-type-widget.php:319 +#: ../includes/widgets/my-posts-type-widget.php:339 msgid "Show \"More link" msgstr "Mostra \"PiÃ¹ collegamento " -#: ../includes/widgets/my-posts-type-widget.php:326 +#: ../includes/widgets/my-posts-type-widget.php:346 msgid "default: \"Read more\"" msgstr "predefinito: \"Per saperne di piÃ¹\"" -#: ../includes/widgets/my-posts-type-widget.php:331 +#: ../includes/widgets/my-posts-type-widget.php:351 msgid "Link class" msgstr "Classe link " -#: ../includes/widgets/my-posts-type-widget.php:332 +#: ../includes/widgets/my-posts-type-widget.php:352 msgid "default: \"link\"" msgstr "predefinito: \"link\"" -#: ../includes/widgets/my-posts-type-widget.php:337 +#: ../includes/widgets/my-posts-type-widget.php:357 msgid "Thumbnail dimensions" msgstr " Dimensioni Thumbnail" -#: ../includes/widgets/my-posts-type-widget.php:342 +#: ../includes/widgets/my-posts-type-widget.php:362 msgid "Show post thumbnail" msgstr "Visualizza miniatura messaggio" -#: ../includes/widgets/my-posts-type-widget.php:358 +#: ../includes/widgets/my-posts-type-widget.php:378 msgid "Thumbnail as link" msgstr "Miniatura come collegamento" -#: ../includes/widgets/my-posts-type-widget.php:363 +#: ../includes/widgets/my-posts-type-widget.php:383 msgid "Link to all posts" msgstr "Link a tutti i messaggi" -#: ../includes/widgets/my-posts-type-widget.php:367 +#: ../includes/widgets/my-posts-type-widget.php:387 msgid "Show global link to all posts" msgstr "Mostra collegamento globale di tutti i messaggi" -#: ../includes/widgets/my-posts-type-widget.php:373 +#: ../includes/widgets/my-posts-type-widget.php:393 msgid "default: \"View all\"" msgstr "predefinito: \"Vedi tutto\"" -#: ../includes/widgets/my-posts-type-widget.php:378 -#: ../includes/widgets/my-recent-posts.php:160 -msgid "Link URL" -msgstr "URL Link " - #: ../includes/widgets/my-recent-posts.php:6 msgid "Cherry - Recent Posts" msgstr "Cherry - Messaggi recenti" @@ -1447,104 +1365,104 @@ msgstr "Link al tuo social networks." msgid "Cherry - Social Networks" msgstr "Cherry - Social Networks" -#: ../includes/widgets/my-social-widget.php:136 +#: ../includes/widgets/my-social-widget.php:112 msgid "Facebook" msgstr "Facebook " -#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:114 msgid "Facebook URL" msgstr "URL Facebook" -#: ../includes/widgets/my-social-widget.php:141 +#: ../includes/widgets/my-social-widget.php:117 msgid "Facebook label" msgstr "Etichetta Facebook " -#: ../includes/widgets/my-social-widget.php:146 +#: ../includes/widgets/my-social-widget.php:122 msgid "Twitter" msgstr "Twitter " -#: ../includes/widgets/my-social-widget.php:147 +#: ../includes/widgets/my-social-widget.php:123 msgid "Twitter URL" msgstr "URL Twitter " -#: ../includes/widgets/my-social-widget.php:149 +#: ../includes/widgets/my-social-widget.php:125 msgid "Twitter label" msgstr "Etichetta Twitter " -#: ../includes/widgets/my-social-widget.php:154 +#: ../includes/widgets/my-social-widget.php:130 msgid "Flickr" msgstr "Flickr " -#: ../includes/widgets/my-social-widget.php:155 +#: ../includes/widgets/my-social-widget.php:131 msgid "Flickr URL" msgstr "URL Flickr" -#: ../includes/widgets/my-social-widget.php:157 +#: ../includes/widgets/my-social-widget.php:133 msgid "Flickr label" msgstr "Etichetta Flickr" -#: ../includes/widgets/my-social-widget.php:162 -#: ../includes/widgets/my-social-widget.php:163 +#: ../includes/widgets/my-social-widget.php:138 +#: ../includes/widgets/my-social-widget.php:139 msgid "RSS feed" msgstr "Feed RSS" -#: ../includes/widgets/my-social-widget.php:165 +#: ../includes/widgets/my-social-widget.php:141 msgid "RSS label" msgstr "Etichetta RSS" -#: ../includes/widgets/my-social-widget.php:170 +#: ../includes/widgets/my-social-widget.php:146 msgid "Linkedin" msgstr "Linkedin " -#: ../includes/widgets/my-social-widget.php:171 +#: ../includes/widgets/my-social-widget.php:147 msgid "Linkedin URL" msgstr "URL Linkedin " -#: ../includes/widgets/my-social-widget.php:173 +#: ../includes/widgets/my-social-widget.php:149 msgid "Linkedin label" msgstr "Etichetta Linkedin " -#: ../includes/widgets/my-social-widget.php:178 +#: ../includes/widgets/my-social-widget.php:154 msgid "Delicious" msgstr "Delicious " -#: ../includes/widgets/my-social-widget.php:179 +#: ../includes/widgets/my-social-widget.php:155 msgid "Delicious URL" msgstr "URL Delicious " -#: ../includes/widgets/my-social-widget.php:181 +#: ../includes/widgets/my-social-widget.php:157 msgid "Delicious label" msgstr "Etichetta Delicious " -#: ../includes/widgets/my-social-widget.php:186 +#: ../includes/widgets/my-social-widget.php:162 msgid "Youtube" msgstr "Youtube " -#: ../includes/widgets/my-social-widget.php:188 +#: ../includes/widgets/my-social-widget.php:164 msgid "Youtube URL" msgstr "URL Youtube " -#: ../includes/widgets/my-social-widget.php:191 +#: ../includes/widgets/my-social-widget.php:167 msgid "Youtube label" msgstr "Etichetta Youtube " -#: ../includes/widgets/my-social-widget.php:197 -msgid "Google+" -msgstr "Google+" +#: ../includes/widgets/my-social-widget.php:173 +msgid "Google" +msgstr "" -#: ../includes/widgets/my-social-widget.php:199 -msgid "Google+ URL" -msgstr "URL Google+" +#: ../includes/widgets/my-social-widget.php:175 +msgid "Google URL" +msgstr "" -#: ../includes/widgets/my-social-widget.php:202 -msgid "Google+ label" -msgstr "Etichetta Google+" +#: ../includes/widgets/my-social-widget.php:178 +msgid "Google label" +msgstr "" -#: ../includes/widgets/my-social-widget.php:208 +#: ../includes/widgets/my-social-widget.php:184 msgid "Display" msgstr "Mostra " -#: ../includes/widgets/my-social-widget.php:211 +#: ../includes/widgets/my-social-widget.php:187 msgid "Both" msgstr "Entrambi" @@ -1560,41 +1478,45 @@ msgstr "Cherry - vCard" msgid "vCard" msgstr "vCard" -#: ../includes/widgets/my-vcard-widget.php:51 -#: ../includes/widgets/my-vcard-widget.php:167 +#: ../includes/widgets/my-vcard-widget.php:55 +#: ../includes/widgets/my-vcard-widget.php:171 msgid "Street Address" msgstr "Via Indirizzo " -#: ../includes/widgets/my-vcard-widget.php:52 -#: ../includes/widgets/my-vcard-widget.php:171 +#: ../includes/widgets/my-vcard-widget.php:56 +#: ../includes/widgets/my-vcard-widget.php:175 msgid "City/Locality" msgstr "CittÃ /LocalitÃ " -#: ../includes/widgets/my-vcard-widget.php:53 -#: ../includes/widgets/my-vcard-widget.php:175 +#: ../includes/widgets/my-vcard-widget.php:57 +#: ../includes/widgets/my-vcard-widget.php:179 msgid "State/Region" msgstr "Stato/Regione " -#: ../includes/widgets/my-vcard-widget.php:54 -#: ../includes/widgets/my-vcard-widget.php:179 +#: ../includes/widgets/my-vcard-widget.php:58 +#: ../includes/widgets/my-vcard-widget.php:183 msgid "Zipcode/Postal Code" msgstr "Codice postale " -#: ../includes/widgets/my-vcard-widget.php:55 -#: ../includes/widgets/my-vcard-widget.php:183 +#: ../includes/widgets/my-vcard-widget.php:59 +#: ../includes/widgets/my-vcard-widget.php:187 msgid "Telephone" msgstr "Telefono " -#: ../includes/widgets/my-vcard-widget.php:56 -#: ../includes/widgets/my-vcard-widget.php:187 +#: ../includes/widgets/my-vcard-widget.php:60 +#: ../includes/widgets/my-vcard-widget.php:191 msgid "Email" msgstr "Email " -#: ../includes/widgets/my-vcard-widget.php:158 +#: ../includes/widgets/my-vcard-widget.php:160 +msgid "Google Map" +msgstr "Google Map" + +#: ../includes/widgets/my-vcard-widget.php:162 msgid "Display map" msgstr "Visualizzazione mappa" -#: ../includes/widgets/my-vcard-widget.php:161 +#: ../includes/widgets/my-vcard-widget.php:165 msgid "HTML map code" msgstr "Codice mappa HTML" @@ -1631,107 +1553,111 @@ msgid "Homepage" msgstr "Homepage" #: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" +msgstr "Blog" + +#: ../includes/widgets/widgets-manager.php:475 msgid "Page" msgstr "Pagina" -#: ../includes/widgets/widgets-manager.php:475 +#: ../includes/widgets/widgets-manager.php:476 msgid "Post" msgstr "Post" -#: ../includes/widgets/widgets-manager.php:476 -#: ../includes/widgets/widgets-manager.php:478 +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 msgid "Archive" msgstr "Archivio" -#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:478 msgid "Tag" msgstr "Tag" -#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:481 msgid "Search page" msgstr "Pagina di ricerca" -#: ../includes/widgets/widgets-manager.php:481 +#: ../includes/widgets/widgets-manager.php:482 msgid "404 page" msgstr "404 pagina" -#: ../includes/widgets/widgets-manager.php:483 +#: ../includes/widgets/widgets-manager.php:484 msgid "Page ID/Title/slug" msgstr "ID Pagina / Titolo / slug" -#: ../includes/widgets/widgets-manager.php:484 +#: ../includes/widgets/widgets-manager.php:485 msgid "Post ID/Title/slug" msgstr "Post ID / Titolo / slug" -#: ../includes/widgets/widgets-manager.php:485 +#: ../includes/widgets/widgets-manager.php:486 msgid "Category ID/Name/slug" msgstr "Categoria ID / Nome / slug" -#: ../includes/widgets/widgets-manager.php:486 +#: ../includes/widgets/widgets-manager.php:487 msgid "Tag ID/Name" msgstr "ID / Nome Tag" -#: ../includes/widgets/widgets-manager.php:488 +#: ../includes/widgets/widgets-manager.php:489 msgid "Add page" msgstr "Aggiungi pagina" -#: ../includes/widgets/widgets-manager.php:491 +#: ../includes/widgets/widgets-manager.php:492 msgid "Selected pages" msgstr "Pagine selezionate" -#: ../includes/widgets/widgets-manager.php:492 +#: ../includes/widgets/widgets-manager.php:493 msgid "No pages" msgstr "Nessuna pagina" -#: ../includes/widgets/widgets-manager.php:510 +#: ../includes/widgets/widgets-manager.php:511 msgid "All devices" msgstr "Tutti i dispositivi" -#: ../includes/widgets/widgets-manager.php:511 +#: ../includes/widgets/widgets-manager.php:512 msgid "Desktops" msgstr "Desktops" -#: ../includes/widgets/widgets-manager.php:512 +#: ../includes/widgets/widgets-manager.php:513 msgid "Tablets" msgstr "Tablets " -#: ../includes/widgets/widgets-manager.php:513 +#: ../includes/widgets/widgets-manager.php:514 msgid "Phones" msgstr "Cellulari" -#: ../includes/widgets/widgets-manager.php:514 +#: ../includes/widgets/widgets-manager.php:515 msgid "Desktops/Tablets" msgstr "Desktops/Tablets" -#: ../includes/widgets/widgets-manager.php:515 +#: ../includes/widgets/widgets-manager.php:516 msgid "Tablets/Phones" msgstr "Tablets/Telefoni" -#: ../includes/widgets/widgets-manager.php:516 +#: ../includes/widgets/widgets-manager.php:517 msgid "Desktops/Phones" msgstr "Desktop / Telefoni" -#: ../includes/widgets/widgets-manager.php:519 +#: ../includes/widgets/widgets-manager.php:520 msgid "Visible on" msgstr "Visibile" -#: ../includes/widgets/widgets-manager.php:528 +#: ../includes/widgets/widgets-manager.php:529 msgid "All users" msgstr "Tutti gli utenti" -#: ../includes/widgets/widgets-manager.php:529 +#: ../includes/widgets/widgets-manager.php:530 msgid "Only guests" msgstr "Solo gli ospiti" -#: ../includes/widgets/widgets-manager.php:530 +#: ../includes/widgets/widgets-manager.php:531 msgid "Only registered users" msgstr "Solo gli utenti registrati" -#: ../includes/widgets/widgets-manager.php:531 +#: ../includes/widgets/widgets-manager.php:532 msgid "Only administrator" msgstr "Solo amministratore " -#: ../includes/widgets/widgets-manager.php:534 +#: ../includes/widgets/widgets-manager.php:535 msgid "Visible for" msgstr "Visibile per" @@ -1756,6 +1682,243 @@ msgstr "" "Questo non sembra essere un file WXR, mancante / non valido numero di " "versione WXR" +#~ msgid "Minuts" +#~ msgstr "Minuti" + +#~ msgid "Description." +#~ msgstr "Descrizione." + +#~ msgid "Insert Shortcode" +#~ msgstr "Inserire Shortcode" + +#~ msgid "Posts" +#~ msgstr "Messaggi" + +#~ msgid "Posts Grid" +#~ msgstr "Griglia Messaggi" + +#~ msgid "Posts List" +#~ msgstr "Lista Messaggi" + +#~ msgid "Mini Posts Grid" +#~ msgstr "Mini Griglia Messaggi" + +#~ msgid "Mini Posts List" +#~ msgstr "Mini Lista Messaggi" + +#~ msgid "Recent Posts" +#~ msgstr "Messaggi recenti" + +#~ msgid "Recent Testimonials" +#~ msgstr "Testimonianze recenti" + +#~ msgid "Basic" +#~ msgstr "Di base" + +#~ msgid "Banner" +#~ msgstr "Banner" + +#~ msgid "Post Cycle" +#~ msgstr "Ciclo Messaggio" + +#~ msgid "Carousel (Elasti)" +#~ msgstr "Carosello (Elasti)" + +#~ msgid "Carousel (OWL)" +#~ msgstr "Carosello (OWL)" + +#~ msgid "Roundabout" +#~ msgstr "Giostra" + +#~ msgid "Service Box" +#~ msgstr "Box Servizio" + +#~ msgid "Hero Unit" +#~ msgstr "UnitÃ Eroe" + +#~ msgid "Categories" +#~ msgstr "Categorie" + +#~ msgid "Columns" +#~ msgstr "Colonne" + +#~ msgid "Fluid Column" +#~ msgstr "Colonna fluida" + +#~ msgid "2 Columns" +#~ msgstr "2 Colonne" + +#~ msgid "3 Columns" +#~ msgstr "3 Colonne" + +#~ msgid "4 Columns" +#~ msgstr "4 Colonne" + +#~ msgid "Elements" +#~ msgstr "Elementi" + +#~ msgid "Label" +#~ msgstr "Etichetta" + +#~ msgid "Text Highlight" +#~ msgstr "Evidenziatore Testo" + +#~ msgid "Button" +#~ msgstr "Pulsante" + +#~ msgid "Drop Cap" +#~ msgstr "Drop Cap " + +#~ msgid "Blockquote" +#~ msgstr "Blockquote" + +#~ msgid "Icon" +#~ msgstr "Icona" + +#~ msgid "Frame" +#~ msgstr "Frame" + +#~ msgid "Horizontal Rule" +#~ msgstr "Righello Orizzontale " + +#~ msgid "Small Horizontal Rule" +#~ msgstr "Righello Orizzontale Piccolo " + +#~ msgid "Vertical Rule" +#~ msgstr "Righello Verticale " + +#~ msgid "Spacer" +#~ msgstr "Spaziatore " + +#~ msgid "Progressbar" +#~ msgstr "Barra progresso" + +#~ msgid "Address" +#~ msgstr "Indirizzo" + +#~ msgid "Clear" +#~ msgstr "Cancella" + +#~ msgid "Extra Wrap" +#~ msgstr "Extra Wrap" + +#~ msgid "Lists" +#~ msgstr "Elenchi" + +#~ msgid "Unstyled" +#~ msgstr "Senza stile" + +#~ msgid "Check List" +#~ msgstr "Lista Check" + +#~ msgid "Check 2 List" +#~ msgstr "Lista Check 2 " + +#~ msgid "OK Circle List" +#~ msgstr "Lista Circle OK " + +#~ msgid "OK Sign List" +#~ msgstr "Lista Sign OK " + +#~ msgid "Arrow List" +#~ msgstr "Lista Arrow" + +#~ msgid "Arrow 2 List" +#~ msgstr "List Arrow 2" + +#~ msgid "Circle Arrow List" +#~ msgstr "Lista Circle Arrow " + +#~ msgid "Caret List" +#~ msgstr "Lista Caret " + +#~ msgid "Angle List" +#~ msgstr "Lista Angle " + +#~ msgid "Double Angle List" +#~ msgstr "Lista Double Angle" + +#~ msgid "Star List" +#~ msgstr "Lista Star " + +#~ msgid "Plus List" +#~ msgstr "Lista plus" + +#~ msgid "Minus List" +#~ msgstr "Lista minima" + +#~ msgid "Circle List" +#~ msgstr "Lista Circle " + +#~ msgid "Circle Blank List" +#~ msgstr "Lista Vuota Circle " + +#~ msgid "Custom List" +#~ msgstr "Elenco personalizzato" + +#~ msgid "Misc" +#~ msgstr "Varie" + +#~ msgid "Alert Box" +#~ msgstr "Alert Box" + +#~ msgid "Close icon" +#~ msgstr "Chiudi icona" + +#~ msgid "Well" +#~ msgstr "Bene" + +#~ msgid "Small" +#~ msgstr "Piccolo" + +#~ msgid "Template URL" +#~ msgstr "URL Template " + +#~ msgid "Sitemap" +#~ msgstr "Mappa del sito" + +#~ msgid "Video Preview" +#~ msgstr "Anteprima Video" + +#~ msgid "Tabs" +#~ msgstr "Tabs" + +#~ msgid "Accordion" +#~ msgstr "Fisarmonica" + +#~ msgid "Table" +#~ msgstr "Tavolo" + +#~ msgid "Pricing Table" +#~ msgstr "Tabella Prezzi" + +#~ msgid "Style Switcher Preview" +#~ msgstr "Anteprima Variatore Stile " + +#~ msgid "Cheatin’ uh?" +#~ msgstr "Stai barando eh?" + +#~ msgid "%1$s — WordPress" +#~ msgstr "%1$s — WordPress" + +#~ msgid "Customize %s" +#~ msgstr "Personalizza %s" + +#~ msgid "Style Switcher" +#~ msgstr "Variatore Stile " + +#~ msgid "Cherry - 125x125 Ads." +#~ msgstr "Cherry - 125x125 Ads." + +#~ msgid "Google+" +#~ msgstr "Google+" + +#~ msgid "Google+ URL" +#~ msgstr "URL Google+" + +#~ msgid "Google+ label" +#~ msgstr "Etichetta Google+" + #, fuzzy #~ msgid "Main Page" #~ msgstr "Pagina" @@ -2570,9 +2733,6 @@ msgstr "" #~ msgid "easeInOutBounce" #~ msgstr "easeInOutBounce" -#~ msgid "Blog" -#~ msgstr "Blog" - #~ msgid "Blog Title" #~ msgstr "Blog Titolo" @@ -3155,9 +3315,6 @@ msgstr "" #~ msgid "Category" #~ msgstr "Categoria" -#~ msgid "Thumbnail" -#~ msgstr "Thumbnail" - #~ msgid "Your comment is awaiting moderation." #~ msgstr "Il tuo commento Ã¨ in attesa di moderazione." diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.mo b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.mo index fb051955..9c242ef4 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.mo and b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.po b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.po index 3cc5ddc7..b938b057 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.po +++ b/pavillonmadeleine.fr/wp-content/plugins/cherry-plugin/languages/cherry-plugin-ru_RU.po @@ -1,212 +1,42 @@ msgid "" msgstr "" "Project-Id-Version: ru_RU\n" -"POT-Creation-Date: 2014-09-26 16:13+0200\n" -"PO-Revision-Date: 2014-09-26 16:13+0200\n" -"Last-Translator: Alex Ross <alex@template-telp.com>\n" -"Language-Team: <demolink@info.org>\n" +"POT-Creation-Date: 2015-06-24 13:08+0200\n" +"PO-Revision-Date: 2015-06-24 13:08+0200\n" +"Last-Translator: \n" +"Language-Team: Cherry Team <demolink@info.org>\n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.1\n" "X-Poedit-KeywordsList: __;_e\n" "X-Poedit-Basepath: ./\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: ..\n" -#: ../admin/admin.php:28 +#: ../admin/admin.php:30 msgid "Cherry plugin" msgstr "ÐÐ»Ð°Ð³Ð¸Ð½ Cherry" -#: ../admin/admin.php:31 ../admin/admin.php:52 +#: ../admin/admin.php:33 ../admin/admin.php:54 msgid "Summary" msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" -#: ../admin/admin.php:34 ../admin/plugin-maintenance-mode.php:57 +#: ../admin/admin.php:36 ../admin/plugin-maintenance-mode.php:57 #: ../admin/plugin-pages.php:100 msgid "Maintenance Mode" msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ð³Ð¾ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ" -#: ../admin/admin.php:37 +#: ../admin/admin.php:39 msgid "Import Content" msgstr "ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐµÐ½Ñ" -#: ../admin/admin.php:40 ../admin/import-export/export.php:30 +#: ../admin/admin.php:42 ../admin/import-export/export.php:30 msgid "Export Content" msgstr "ÐÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐµÐ½Ñ" -#: ../admin/plugin-components.php:36 -msgid "Documentation" -msgstr "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ" - -#: ../admin/plugin-components.php:37 -msgid "Support" -msgstr "ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ°" - -#: ../admin/plugin-function.php:5 -msgid "Remove Inactive Widgets" -msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ" - -#: ../admin/plugin-function.php:23 -msgid "CTRL+A (Command-A) to select all files" -msgstr "CTRL+A (Command-A) ÑÑÐ¾Ð±Ñ Ð²ÑÐ±ÑÐ°ÑÑ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ" - -#: ../admin/plugin-function.php:37 -msgid "Files are downloaded as a .zip archive" -msgstr "Ð¤Ð°Ð¹Ð»Ñ ÑÐºÐ°ÑÐµÐ½Ñ ÐºÐ°Ðº Ð°ÑÑÐ¸Ð² .zip " - -#: ../admin/plugin-maintenance-mode.php:62 -msgid "Enable this option to activate website maintenance mode." -msgstr "" -"ÐÐºÐ»ÑÑÐ¸ÑÐµ ÑÑÑ Ð¾Ð¿ÑÐ¸Ñ, ÑÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ð³Ð¾ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð½Ð° " -"ÑÐ°Ð¹ÑÐµ." - -#: ../admin/plugin-maintenance-mode.php:68 -msgid "Display Logo?" -msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð»Ð¾Ð³Ð¾?" - -#: ../admin/plugin-maintenance-mode.php:73 -msgid "" -"Enable this option to display website logo at the under construction page" -msgstr "" -"ÐÐºÐ»ÑÑÐ¸ÑÐµ ÑÑÑ Ð¾Ð¿ÑÐ¸Ñ, ÑÑÐ¾Ð±Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿ ÑÐ°Ð¹ÑÐ° Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐµ \"Ð ÑÑÐ°Ð´Ð¸Ð¸ " -"ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ¸\"." - -#: ../admin/plugin-maintenance-mode.php:79 -#, fuzzy -msgid "Description" -msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ." - -#: ../admin/plugin-maintenance-mode.php:89 -#: ../admin/plugin-maintenance-mode.php:94 -msgid "Display timer?" -msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ°Ð¹Ð¼ÐµÑ?" - -#: ../admin/plugin-maintenance-mode.php:100 -msgid "Website launch date." -msgstr "ÐÐ°ÑÐ° Ð·Ð°Ð¿ÑÑÐºÐ° ÑÐ°Ð¹ÑÐ°." - -#: ../admin/plugin-maintenance-mode.php:101 -msgid "Date is not correct." -msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ Ð´Ð°ÑÐ°." - -#: ../admin/plugin-maintenance-mode.php:105 -msgid "Year:" -msgstr "ÐÐ¾Ð´:" - -#: ../admin/plugin-maintenance-mode.php:107 -msgid "Month:" -msgstr "ÐÐµÑÑÑ:" - -#: ../admin/plugin-maintenance-mode.php:109 -msgid "Day:" -msgstr "ÐÐµÐ½Ñ:" - -#: ../admin/plugin-maintenance-mode.php:113 -msgid "Hour:" -msgstr "Ð§Ð°Ñ:" - -#: ../admin/plugin-maintenance-mode.php:115 -msgid "Minute:" -msgstr "ÐÐ¸Ð½ÑÑÐ°:" - -#: ../admin/plugin-maintenance-mode.php:123 -msgid "Save Changes" -msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" - -#: ../admin/plugin-pages.php:6 -msgid "Cherry Plugin" -msgstr "ÐÐ»Ð°Ð³Ð¸Ð½ Cherry" - -#: ../admin/plugin-pages.php:11 -msgid "" -"Cherry Plugin has been released with intention to separate widgets, " -"shortcodes and data management logics with theme editor options. Cherry " -"Plugin is installed automatically on CherryFramework installation and is " -"required for the correct work of CherryFramework. " -msgstr "" -"ÐÐ»Ð°Ð³Ð¸Ð½ Cherry Ð±ÑÐ» ÑÐ¾Ð·Ð´Ð°Ð½ Ñ ÑÐµÐ»ÑÑ ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¸Ð´Ð¶ÐµÑÐ°Ð¼Ð¸, " -"ÑÐ¾ÑÑÐºÐ¾Ð´Ð°Ð¼Ð¸, ÐºÐ¾Ð½ÑÐµÐ½ÑÐ¾Ð¼ Ñ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ¾Ð¼ Ð¾Ð¿ÑÐ¸Ð¹ ÑÐµÐ¼Ñ. ÐÐ»Ð°Ð³Ð¸Ð½ Cherry " -"ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð½Ð° Cherry Framework Ð¸ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾Ð¹ " -"ÑÐ°Ð±Ð¾ÑÑ ÑÑÐµÐ¹Ð¼Ð²Ð¾ÑÐºÐ°." - -#: ../admin/plugin-pages.php:15 ../admin/import-export/import.php:80 -msgid "Files Import demo" -msgstr "ÐÐµÐ¼Ð¾Ð½ÑÑÑÐ°ÑÐ¸Ñ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° ÑÐ°Ð¹Ð»Ð¾Ð²" - -#: ../admin/plugin-pages.php:19 -msgid "Import" -msgstr "ÐÐ¼Ð¿Ð¾ÑÑ" - -#: ../admin/plugin-pages.php:20 -msgid "" -"Option to import website content from the backup. Select all files from the " -"backup archive and drag them to the upload files area to start uploading." -msgstr "" -"ÐÐ¿ÑÐ¸Ñ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ñ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸. ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸Ð· Ð°ÑÑÐ¸Ð²Ð° " -"ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¸ Ð¿ÐµÑÐµÑÐ°ÑÐ¸ÑÐµ Ð¸Ñ Ð² Ð·Ð¾Ð½Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ " -"Ð·Ð°Ð³ÑÑÐ·ÐºÑ." - -#: ../admin/plugin-pages.php:26 -msgid "Files Export demo" -msgstr "ÐÐµÐ¼Ð¾Ð½ÑÑÑÐ°ÑÐ¸Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ° ÑÐ°Ð¹Ð»Ð¾Ð²" - -#: ../admin/plugin-pages.php:30 -msgid "Export" -msgstr "ÐÐºÑÐ¿Ð¾ÑÑ" - -#: ../admin/plugin-pages.php:31 -msgid "" -"Option to backup your website data creating a downloadable archive. Use this " -"option to keep your website data on performing some serious modifications or " -"moving website to other hosting." -msgstr "" -"ÐÐ¿ÑÐ¸Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑÐºÐ°ÑÐ¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð°ÑÑÐ¸Ð²Ð°. " -"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÐµÐµ Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ð¿ÑÐ¸ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÑ ÑÐµÑÑÐµÐ·Ð½ÑÑ " -"Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¿ÑÐ¸ Ð¿ÐµÑÐµÐ½ÐµÑÐµÐ½Ð¸Ð¸ ÑÐ°Ð¹ÑÐ° Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¾ÑÑÐ¸Ð½Ð³." - -#: ../admin/plugin-pages.php:42 -msgid "Widgets" -msgstr "ÐÐ¸Ð´Ð¶ÐµÑÑ" - -#: ../admin/plugin-pages.php:43 -msgid "" -"Cherry Widgets offer additional ways to place content to widget areas. " -"Several available widget will allow you to add more functionality to your " -"website." -msgstr "" -"ÐÐ¸Ð´Ð¶ÐµÑÑ Cherry Ð¿ÑÐµÐ´Ð»Ð°Ð³Ð°ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ ÑÐ°Ð·Ð¼ÐµÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð² Ð¿Ð¾Ð»Ñ " -"Ð´Ð»Ñ Ð²Ð¸Ð´Ð¶ÐµÑÐ¾Ð². ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑ ÐÐ°Ð¼ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð° ÑÐ°Ð¹Ñ Ð±Ð¾Ð»ÑÑÐµ " -"ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð°Ð»Ð°." - -#: ../admin/plugin-pages.php:52 -msgid "Shortcodes" -msgstr "Ð¨Ð¾ÑÑÐºÐ¾Ð´Ñ" - -#: ../admin/plugin-pages.php:53 -msgid "" -"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " -"create various content structures in WordPress posts. Use \"Insert Shortcode" -"\" icon in post editor toolbar to add shortcodes." -msgstr "" -"ÐÐ»Ð°Ð³Ð¸Ð½ Cherry Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐµÑ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ Ð² ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹. Ð¨Ð¾ÑÑÐºÐ¾Ð´Ñ " -"Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÑÑ ÑÐ°Ð·Ð½ÑÐµ ÑÑÑÑÐºÑÑÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð² Ð¿Ð¾ÑÑÐ°Ñ WordPress. " -"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Ð¸ÐºÐ¾Ð½ÐºÑ \"ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐºÐ¾Ð´\" Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð² ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ°, " -"ÑÑÐ¾Ð±Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐºÐ¾Ð´." - -#: ../admin/plugin-pages.php:53 -msgid "Learn more" -msgstr "ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ" - -#: ../admin/plugin-pages.php:79 -msgid "Cherry Content Import" -msgstr "ÐÐ¼Ð¿Ð¾ÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Cherry" - -#: ../admin/plugin-pages.php:90 -msgid "Cherry Content Export" -msgstr "ÐÐºÑÐ¿Ð¾ÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Cherry" - -#: ../admin/import-export/export-functions.php:14 +#: ../admin/import-export/export-functions.php:18 msgid "Export content done" msgstr "ÐÐºÑÐ¿Ð¾ÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð·Ð°Ð²ÐµÑÑÐµÐ½" @@ -298,43 +128,43 @@ msgstr "Ð¢ÑÐµÐ±ÑÐµÑÑÑ" msgid "Continue" msgstr "ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ" -#: ../admin/import-export/import.php:32 +#: ../admin/import-export/import.php:34 msgid "Upload Error" msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸" -#: ../admin/import-export/import.php:33 +#: ../admin/import-export/import.php:35 msgid "The file is too big!" msgstr "Ð¤Ð°Ð¹Ð» ÑÐ»Ð¸ÑÐºÐ¾Ð¼ ÑÑÐ¶ÐµÐ»ÑÐ¹!" -#: ../admin/import-export/import.php:34 +#: ../admin/import-export/import.php:36 msgid "The file type is error!" msgstr "ÐÑÐ¸Ð±ÐºÐ° ÑÐ¾ÑÐ¼Ð°ÑÐ° ÑÐ°Ð¹Ð»Ð°!" -#: ../admin/import-export/import.php:35 +#: ../admin/import-export/import.php:37 msgid "Folder cannot be uploaded!" msgstr "ÐÐ°Ð¿ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð°!" -#: ../admin/import-export/import.php:36 +#: ../admin/import-export/import.php:38 msgid "Uploading" msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ°" -#: ../admin/import-export/import.php:37 ../admin/import-export/import.php:111 +#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:113 msgid "Upload" msgstr "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ" -#: ../admin/import-export/import.php:38 +#: ../admin/import-export/import.php:40 msgid "Upload Complete" msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°" -#: ../admin/import-export/import.php:39 ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:41 ../admin/import-export/import.php:97 msgid "item" msgstr "Ð¿ÑÐ½ÐºÑ" -#: ../admin/import-export/import.php:40 +#: ../admin/import-export/import.php:42 msgid "items" msgstr "Ð¿ÑÐ½ÐºÑÑ" -#: ../admin/import-export/import.php:41 +#: ../admin/import-export/import.php:43 msgid "" "Sample data installing. Some steps may take some time depending on your " "server settings. Please be patient." @@ -342,81 +172,81 @@ msgstr "" "ÐÐ´ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð´ÐµÐ¼Ð¾-ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°. ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ°Ð³Ð¸ Ð¼Ð¾Ð³ÑÑ Ð·Ð°Ð½ÑÑÑ Ð²ÑÐµÐ¼Ñ, Ð² " "Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð¾Ñ Ð½Ð°ÑÑÑÐ¾ÐµÐº ÐÐ°ÑÐµÐ³Ð¾ ÑÐµÑÐ²ÐµÑÐ°. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð±ÑÐ´ÑÑÐµ ÑÐµÑÐ¿ÐµÐ»Ð¸Ð²Ñ." -#: ../admin/import-export/import.php:42 +#: ../admin/import-export/import.php:44 msgid "Upload complete please click Continue Install button to proceed." msgstr "" "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ 'ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ', " "ÑÑÐ¾Ð±Ñ Ð¿ÐµÑÐµÐ¹ÑÐ¸ Ðº ÑÐ»ÐµÐ´ÑÑÑÐµÐ¼Ñ ÑÐ°Ð³Ñ." -#: ../admin/import-export/import.php:44 +#: ../admin/import-export/import.php:46 msgid "Importing XML" msgstr "ÐÐ¼Ð¿Ð¾ÑÑ XML" -#: ../admin/import-export/import.php:45 +#: ../admin/import-export/import.php:47 msgid "Importing categories" msgstr "ÐÐ´ÐµÑ Ð¸Ð¼Ð¿Ð¾ÑÑ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¹." -#: ../admin/import-export/import.php:46 +#: ../admin/import-export/import.php:48 msgid "Importing tags" msgstr "ÐÐ¼Ð¿Ð¾ÑÑ ÑÐµÐ³Ð¾Ð²." -#: ../admin/import-export/import.php:47 +#: ../admin/import-export/import.php:49 msgid "Processing dependencies" msgstr "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° ÑÑÑÑÐºÑÑÑ" -#: ../admin/import-export/import.php:48 +#: ../admin/import-export/import.php:50 msgid "Importing posts. This may take some time. Please wait." msgstr "" "ÐÐ¼Ð¿Ð¾ÑÑ Ð¿Ð¾ÑÑÐ¾Ð². ÐÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²ÑÐµÐ¼Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ." -#: ../admin/import-export/import.php:49 +#: ../admin/import-export/import.php:51 msgid "Importing menu items. This may take some time. Please wait." msgstr "" "ÐÐ¼Ð¿Ð¾ÑÑ Ð¿ÑÐ½ÐºÑÐ¾Ð² Ð¼ÐµÐ½Ñ. ÐÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²ÑÐµÐ¼Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ." -#: ../admin/import-export/import.php:50 +#: ../admin/import-export/import.php:52 msgid "Importing media library." msgstr "ÐÐ¼Ð¿Ð¾ÑÑ Ð¼ÐµÐ´Ð¸Ð° Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸." -#: ../admin/import-export/import.php:51 +#: ../admin/import-export/import.php:53 msgid "Importing attachements meta." msgstr "ÐÐ´ÐµÑ Ð¸Ð¼Ð¿Ð¾ÑÑ Ð¼ÐµÑÐ° Ð´Ð°Ð½Ð½ÑÑ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹." -#: ../admin/import-export/import.php:52 +#: ../admin/import-export/import.php:54 msgid "Generating attachements meta. This may take some time. Please wait." msgstr "" "ÐÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¼ÐµÑÐ° Ð´Ð°Ð½Ð½ÑÑÐ²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹. ÐÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²ÑÐµÐ¼Ñ. " "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ." -#: ../admin/import-export/import.php:53 +#: ../admin/import-export/import.php:55 msgid "Generating content hierarchy" msgstr "ÐÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¸ÐµÑÐ°ÑÑÐ¸Ð¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°." -#: ../admin/import-export/import.php:54 +#: ../admin/import-export/import.php:56 msgid "Updating featured images" msgstr "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¼Ð¸Ð½Ð¸Ð°ÑÑÑ (featured images)" -#: ../admin/import-export/import.php:55 +#: ../admin/import-export/import.php:57 msgid "Updating attachments" msgstr "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹." -#: ../admin/import-export/import.php:56 +#: ../admin/import-export/import.php:58 msgid "Importing JSON" msgstr "ÐÐ´ÐµÑ Ð¸Ð¼Ð¿Ð¾ÑÑ JSON." -#: ../admin/import-export/import.php:57 +#: ../admin/import-export/import.php:59 msgid "Installing content complete" msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°." -#: ../admin/import-export/import.php:58 +#: ../admin/import-export/import.php:60 msgid "Installing content error" msgstr "ÐÑÐ¸Ð±ÐºÐ° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°." -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "Warning!" msgstr "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ!" -#: ../admin/import-export/import.php:64 +#: ../admin/import-export/import.php:66 msgid "" "Installing sample data will replace your website content. Please make sure " "to backup your website data before importing content." @@ -425,97 +255,268 @@ msgstr "" "ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ ÑÑÐ¾ ÐÑ ÑÐ¾Ð·Ð´Ð°Ð»Ð¸ ÑÐµÐ·ÐµÑÐ²Ð½ÑÑ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ð¿ÐµÑÐµÐ´ Ð¸Ð¼Ð¿Ð¾ÑÑÐ¾Ð¼ Ð´ÐµÐ¼Ð¾-" "ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°." -#: ../admin/import-export/import.php:72 +#: ../admin/import-export/import.php:74 msgid "Please Drop all needed files here <br> to import sample data" msgstr "" "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÑÐ°ÑÐ¸ÑÐµ Ð²ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÐµ ÑÐ°Ð¹Ð»Ñ ÑÑÐ´Ð° <br> , ÑÑÐ¾Ð±Ñ Ð¸Ð¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ " "Ð´ÐµÐ¼Ð¾-ÐºÐ¾Ð½ÑÐµÐ½Ñ." -#: ../admin/import-export/import.php:73 ../admin/import-export/import.php:133 +#: ../admin/import-export/import.php:75 ../admin/import-export/import.php:135 msgid "or" msgstr "Ð¸Ð»Ð¸" -#: ../admin/import-export/import.php:75 +#: ../admin/import-export/import.php:77 msgid "Browse local files" msgstr "ÐÑÐ±ÑÐ°ÑÑ ÑÐ°Ð¹Ð»Ñ" -#: ../admin/import-export/import.php:78 +#: ../admin/import-export/import.php:80 #, php-format msgid "Maximum upload file size: %d %s." msgstr "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ Ð·Ð°Ð³ÑÑÐ¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°: %d %s." -#: ../admin/import-export/import.php:81 +#: ../admin/import-export/import.php:82 ../admin/plugin-pages.php:15 +msgid "Files Import demo" +msgstr "ÐÐµÐ¼Ð¾Ð½ÑÑÑÐ°ÑÐ¸Ñ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° ÑÐ°Ð¹Ð»Ð¾Ð²" + +#: ../admin/import-export/import.php:83 msgid "View Demo" msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´ÐµÐ¼Ð¾" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File name" msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð°" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "File size" msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð°" -#: ../admin/import-export/import.php:95 +#: ../admin/import-export/import.php:97 msgid "Uploaded file:" msgstr "ÐÐ°Ð³ÑÑÐ¶ÐµÐ½ÑÐ¹ ÑÐ°Ð¹Ð»:" -#: ../admin/import-export/import.php:105 -msgid "Installing content started." -msgstr "ÐÐ°ÑÐ°Ð»Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°." +#: ../admin/import-export/import.php:107 +msgid "Installing content started." +msgstr "ÐÐ°ÑÐ°Ð»Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°." + +#: ../admin/import-export/import.php:117 +msgid "Install" +msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°" + +#: ../admin/import-export/import.php:122 +msgid "" +"Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " +"and <b>.XML</b> files to install theme sample data." +msgstr "" +"Ð¤Ð°Ð¹Ð»Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ ÐÑ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð»Ð¸ <b>.JSON</" +"b> Ð¸ <b>.XML</b> ÑÐ°Ð¹Ð»Ñ, ÑÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÐµÐ¼Ð¾-ÐºÐ¾Ð½ÑÐµÐ½Ñ." + +#: ../admin/import-export/import.php:124 +msgid "Add More Files" +msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÑÐµ ÑÐ°Ð¹Ð»Ñ" + +#: ../admin/import-export/import.php:126 +msgid "Continue Install" +msgstr "ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ" + +#: ../admin/import-export/import.php:126 +msgid "Missing .XML or .JSON file" +msgstr "Ð¤Ð°Ð¹Ð» .XML Ð¸Ð»Ð¸ .JSON Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½" + +#: ../admin/import-export/import.php:132 +msgid "Congratulations" +msgstr "ÐÐ¾Ð·Ð´ÑÐ°Ð²Ð»ÑÐµÐ¼" + +#: ../admin/import-export/import.php:133 +msgid "Content has been installed successfully" +msgstr "ÐÐ¾Ð½ÑÐµÐ½Ñ Ð±ÑÐ» ÑÑÐ¿ÐµÑÐ½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" + +#: ../admin/import-export/import.php:135 +msgid "View your site" +msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÐÐ°Ñ ÑÐ°Ð¹Ñ" + +#: ../admin/import-export/import.php:136 +msgid "go to Cherry Options" +msgstr "ÐÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð² ÐÐ¿ÑÐ¸Ð¸ Cherry" + +#: ../admin/plugin-components.php:36 +msgid "Documentation" +msgstr "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ" + +#: ../admin/plugin-components.php:37 +msgid "Support" +msgstr "ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ°" + +#: ../admin/plugin-function.php:5 +msgid "Remove Inactive Widgets" +msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ" + +#: ../admin/plugin-function.php:23 +msgid "CTRL+A (Command-A) to select all files" +msgstr "CTRL+A (Command-A) ÑÑÐ¾Ð±Ñ Ð²ÑÐ±ÑÐ°ÑÑ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ" + +#: ../admin/plugin-function.php:37 +msgid "Files are downloaded as a .zip archive" +msgstr "Ð¤Ð°Ð¹Ð»Ñ ÑÐºÐ°ÑÐµÐ½Ñ ÐºÐ°Ðº Ð°ÑÑÐ¸Ð² .zip " + +#: ../admin/plugin-maintenance-mode.php:62 +msgid "Enable this option to activate website maintenance mode." +msgstr "" +"ÐÐºÐ»ÑÑÐ¸ÑÐµ ÑÑÑ Ð¾Ð¿ÑÐ¸Ñ, ÑÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ð³Ð¾ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð½Ð° " +"ÑÐ°Ð¹ÑÐµ." + +#: ../admin/plugin-maintenance-mode.php:68 +msgid "Display Logo?" +msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð»Ð¾Ð³Ð¾?" + +#: ../admin/plugin-maintenance-mode.php:73 +msgid "" +"Enable this option to display website logo at the under construction page" +msgstr "" +"ÐÐºÐ»ÑÑÐ¸ÑÐµ ÑÑÑ Ð¾Ð¿ÑÐ¸Ñ, ÑÑÐ¾Ð±Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð»Ð¾Ð³Ð¾ÑÐ¸Ð¿ ÑÐ°Ð¹ÑÐ° Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐµ \"Ð ÑÑÐ°Ð´Ð¸Ð¸ " +"ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ¸\"." + +#: ../admin/plugin-maintenance-mode.php:79 +#, fuzzy +msgid "Description" +msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ." + +#: ../admin/plugin-maintenance-mode.php:89 +#: ../admin/plugin-maintenance-mode.php:94 +msgid "Display timer?" +msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ°Ð¹Ð¼ÐµÑ?" + +#: ../admin/plugin-maintenance-mode.php:100 +msgid "Website launch date." +msgstr "ÐÐ°ÑÐ° Ð·Ð°Ð¿ÑÑÐºÐ° ÑÐ°Ð¹ÑÐ°." + +#: ../admin/plugin-maintenance-mode.php:101 +msgid "Date is not correct." +msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ Ð´Ð°ÑÐ°." + +#: ../admin/plugin-maintenance-mode.php:105 +msgid "Year:" +msgstr "ÐÐ¾Ð´:" + +#: ../admin/plugin-maintenance-mode.php:107 +msgid "Month:" +msgstr "ÐÐµÑÑÑ:" + +#: ../admin/plugin-maintenance-mode.php:109 +msgid "Day:" +msgstr "ÐÐµÐ½Ñ:" + +#: ../admin/plugin-maintenance-mode.php:113 +msgid "Hour:" +msgstr "Ð§Ð°Ñ:" + +#: ../admin/plugin-maintenance-mode.php:115 +msgid "Minute:" +msgstr "ÐÐ¸Ð½ÑÑÐ°:" + +#: ../admin/plugin-maintenance-mode.php:123 +msgid "Save Changes" +msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" + +#: ../admin/plugin-pages.php:6 +msgid "Cherry Plugin" +msgstr "ÐÐ»Ð°Ð³Ð¸Ð½ Cherry" + +#: ../admin/plugin-pages.php:11 +msgid "" +"Cherry Plugin has been released with intention to separate widgets, " +"shortcodes and data management logics with theme editor options. Cherry " +"Plugin is installed automatically on CherryFramework installation and is " +"required for the correct work of CherryFramework. " +msgstr "" +"ÐÐ»Ð°Ð³Ð¸Ð½ Cherry Ð±ÑÐ» ÑÐ¾Ð·Ð´Ð°Ð½ Ñ ÑÐµÐ»ÑÑ ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¸Ð´Ð¶ÐµÑÐ°Ð¼Ð¸, " +"ÑÐ¾ÑÑÐºÐ¾Ð´Ð°Ð¼Ð¸, ÐºÐ¾Ð½ÑÐµÐ½ÑÐ¾Ð¼ Ñ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ¾Ð¼ Ð¾Ð¿ÑÐ¸Ð¹ ÑÐµÐ¼Ñ. ÐÐ»Ð°Ð³Ð¸Ð½ Cherry " +"ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð½Ð° Cherry Framework Ð¸ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾Ð¹ " +"ÑÐ°Ð±Ð¾ÑÑ ÑÑÐµÐ¹Ð¼Ð²Ð¾ÑÐºÐ°." + +#: ../admin/plugin-pages.php:19 +msgid "Import" +msgstr "ÐÐ¼Ð¿Ð¾ÑÑ" + +#: ../admin/plugin-pages.php:20 +msgid "" +"Option to import website content from the backup. Select all files from the " +"backup archive and drag them to the upload files area to start uploading." +msgstr "" +"ÐÐ¿ÑÐ¸Ñ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ñ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸. ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸Ð· Ð°ÑÑÐ¸Ð²Ð° " +"ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¸ Ð¿ÐµÑÐµÑÐ°ÑÐ¸ÑÐµ Ð¸Ñ Ð² Ð·Ð¾Ð½Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ " +"Ð·Ð°Ð³ÑÑÐ·ÐºÑ." + +#: ../admin/plugin-pages.php:26 +msgid "Files Export demo" +msgstr "ÐÐµÐ¼Ð¾Ð½ÑÑÑÐ°ÑÐ¸Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ° ÑÐ°Ð¹Ð»Ð¾Ð²" -#: ../admin/import-export/import.php:115 -msgid "Install" -msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°" +#: ../admin/plugin-pages.php:30 +msgid "Export" +msgstr "ÐÐºÑÐ¿Ð¾ÑÑ" -#: ../admin/import-export/import.php:120 +#: ../admin/plugin-pages.php:31 msgid "" -"Files successfully uploaded. Please make sure you have uploaded <b>.JSON</b> " -"and <b>.XML</b> files to install theme sample data." +"Option to backup your website data creating a downloadable archive. Use this " +"option to keep your website data on performing some serious modifications or " +"moving website to other hosting." msgstr "" -"Ð¤Ð°Ð¹Ð»Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ ÐÑ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð»Ð¸ <b>.JSON</" -"b> Ð¸ <b>.XML</b> ÑÐ°Ð¹Ð»Ñ, ÑÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÐµÐ¼Ð¾-ÐºÐ¾Ð½ÑÐµÐ½Ñ." +"ÐÐ¿ÑÐ¸Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑÐºÐ°ÑÐ¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð°ÑÑÐ¸Ð²Ð°. " +"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÐµÐµ Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° ÑÐ°Ð¹ÑÐ° Ð¿ÑÐ¸ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÑ ÑÐµÑÑÐµÐ·Ð½ÑÑ " +"Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¿ÑÐ¸ Ð¿ÐµÑÐµÐ½ÐµÑÐµÐ½Ð¸Ð¸ ÑÐ°Ð¹ÑÐ° Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¾ÑÑÐ¸Ð½Ð³." -#: ../admin/import-export/import.php:122 -msgid "Add More Files" -msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÑÐµ ÑÐ°Ð¹Ð»Ñ" +#: ../admin/plugin-pages.php:42 +msgid "Widgets" +msgstr "ÐÐ¸Ð´Ð¶ÐµÑÑ" -#: ../admin/import-export/import.php:124 -msgid "Continue Install" -msgstr "ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ" +#: ../admin/plugin-pages.php:43 +msgid "" +"Cherry Widgets offer additional ways to place content to widget areas. " +"Several available widget will allow you to add more functionality to your " +"website." +msgstr "" +"ÐÐ¸Ð´Ð¶ÐµÑÑ Cherry Ð¿ÑÐµÐ´Ð»Ð°Ð³Ð°ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ ÑÐ°Ð·Ð¼ÐµÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð² Ð¿Ð¾Ð»Ñ " +"Ð´Ð»Ñ Ð²Ð¸Ð´Ð¶ÐµÑÐ¾Ð². ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑ ÐÐ°Ð¼ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð° ÑÐ°Ð¹Ñ Ð±Ð¾Ð»ÑÑÐµ " +"ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð°Ð»Ð°." -#: ../admin/import-export/import.php:124 -msgid "Missing .XML or .JSON file" -msgstr "Ð¤Ð°Ð¹Ð» .XML Ð¸Ð»Ð¸ .JSON Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½" +#: ../admin/plugin-pages.php:52 +msgid "Shortcodes" +msgstr "Ð¨Ð¾ÑÑÐºÐ¾Ð´Ñ" -#: ../admin/import-export/import.php:130 -msgid "Congratulations" -msgstr "ÐÐ¾Ð·Ð´ÑÐ°Ð²Ð»ÑÐµÐ¼" +#: ../admin/plugin-pages.php:53 +msgid "" +"Cherry Plugin adds various widgets to the post editor. Shortcodes allow to " +"create various content structures in WordPress posts. Use \"Insert Shortcode" +"\" icon in post editor toolbar to add shortcodes." +msgstr "" +"ÐÐ»Ð°Ð³Ð¸Ð½ Cherry Ð´Ð¾Ð±Ð°Ð²Ð»ÑÐµÑ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÐµ Ð²Ð¸Ð´Ð¶ÐµÑÑ Ð² ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹. Ð¨Ð¾ÑÑÐºÐ¾Ð´Ñ " +"Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÑÑ ÑÐ°Ð·Ð½ÑÐµ ÑÑÑÑÐºÑÑÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Ð² Ð¿Ð¾ÑÑÐ°Ñ WordPress. " +"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Ð¸ÐºÐ¾Ð½ÐºÑ \"ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐºÐ¾Ð´\" Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð² ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ°, " +"ÑÑÐ¾Ð±Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐºÐ¾Ð´." -#: ../admin/import-export/import.php:131 -msgid "Content has been installed successfully" -msgstr "ÐÐ¾Ð½ÑÐµÐ½Ñ Ð±ÑÐ» ÑÑÐ¿ÐµÑÐ½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" +#: ../admin/plugin-pages.php:53 +msgid "Learn more" +msgstr "ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ" -#: ../admin/import-export/import.php:133 -msgid "View your site" -msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÐÐ°Ñ ÑÐ°Ð¹Ñ" +#: ../admin/plugin-pages.php:79 +msgid "Cherry Content Import" +msgstr "ÐÐ¼Ð¿Ð¾ÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Cherry" -#: ../admin/import-export/import.php:134 -msgid "go to Cherry Options" -msgstr "ÐÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð² ÐÐ¿ÑÐ¸Ð¸ Cherry" +#: ../admin/plugin-pages.php:90 +msgid "Cherry Content Export" +msgstr "ÐÐºÑÐ¿Ð¾ÑÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ° Cherry" #: ../admin/shortcodes/dialog.php:20 -#: ../admin/shortcodes/tinymce-shortcodes.php:89 +#: ../admin/shortcodes/tinymce-shortcodes.php:100 msgid "Cancel" msgstr "ÐÑÐ¼ÐµÐ½Ð°" #: ../admin/shortcodes/dialog.php:21 -#: ../admin/shortcodes/tinymce-shortcodes.php:90 +#: ../admin/shortcodes/tinymce-shortcodes.php:101 msgid "Insert" msgstr "" #: ../admin/shortcodes/dialog.php:25 -#: ../admin/shortcodes/tinymce-shortcodes.php:94 +#: ../admin/shortcodes/tinymce-shortcodes.php:105 msgid "Shortcode Options" msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¾ÑÑÐºÐ¾Ð´Ð¾Ð²" @@ -549,43 +550,43 @@ msgid "Hours" msgstr "Ð§Ð°ÑÑ" #: ../includes/plugin-under-construction-content.php:85 -msgid "Minuts" -msgstr "ÐÐ¸Ð½ÑÑÑ" +msgid "Minutes" +msgstr "" #: ../includes/plugin-under-construction-content.php:89 msgid "Seconds" msgstr "Ð¡ÐµÐºÑÐ½Ð´Ñ" -#: ../includes/shortcodes/carousel-owl.php:166 +#: ../includes/shortcodes/carousel-owl.php:168 #: ../includes/shortcodes/posts-list.php:154 msgid "by " msgstr " " -#: ../includes/shortcodes/carousel-owl.php:172 +#: ../includes/shortcodes/carousel-owl.php:174 #: ../includes/shortcodes/carousel.php:167 #: ../includes/shortcodes/post-cycle.php:150 #: ../includes/shortcodes/posts-list.php:163 #: ../includes/shortcodes/posts-list.php:164 -#: ../includes/widgets/my-post-cycle-widget.php:127 +#: ../includes/widgets/my-post-cycle-widget.php:153 msgid "Comments" msgstr "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸" -#: ../includes/shortcodes/carousel-owl.php:174 +#: ../includes/shortcodes/carousel-owl.php:176 #: ../includes/shortcodes/carousel.php:169 -#: ../includes/widgets/my-post-cycle-widget.php:129 +#: ../includes/widgets/my-post-cycle-widget.php:155 msgid "Comment" msgstr "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" #: ../includes/shortcodes/carousel.php:160 -#: ../includes/widgets/my-post-cycle-widget.php:118 +#: ../includes/widgets/my-post-cycle-widget.php:144 msgid "by" msgstr " " #: ../includes/shortcodes/hero-unit.php:13 ../includes/shortcodes/html.php:27 #: ../includes/shortcodes/post-cycle.php:17 -#: ../includes/shortcodes/posts-grid.php:23 +#: ../includes/shortcodes/posts-grid.php:24 #: ../includes/shortcodes/posts-list.php:19 -#: ../includes/shortcodes/service-box.php:15 +#: ../includes/shortcodes/service-box.php:16 #: ../includes/widgets/my-posts-type-widget.php:165 #: ../includes/widgets/my-recent-posts.php:87 msgid "Read more" @@ -593,45 +594,45 @@ msgstr "Ð§Ð¸ÑÐ°ÑÑ Ð´Ð°Ð»ÐµÐµ" #: ../includes/shortcodes/media.php:110 ../includes/shortcodes/media.php:240 #: ../includes/shortcodes/media.php:251 -#: ../includes/shortcodes/shortcodes.php:225 -#: ../includes/shortcodes/shortcodes.php:370 -#: ../includes/shortcodes/shortcodes.php:381 +#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:372 +#: ../includes/shortcodes/shortcodes.php:383 msgid "Play" msgstr "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ" #: ../includes/shortcodes/media.php:111 ../includes/shortcodes/media.php:252 -#: ../includes/shortcodes/shortcodes.php:226 -#: ../includes/shortcodes/shortcodes.php:382 +#: ../includes/shortcodes/shortcodes.php:228 +#: ../includes/shortcodes/shortcodes.php:384 msgid "Pause" msgstr "ÐÐ°ÑÐ·Ð°" #: ../includes/shortcodes/media.php:112 ../includes/shortcodes/media.php:253 -#: ../includes/shortcodes/shortcodes.php:228 -#: ../includes/shortcodes/shortcodes.php:383 +#: ../includes/shortcodes/shortcodes.php:230 +#: ../includes/shortcodes/shortcodes.php:385 msgid "Stop" msgstr "Ð¡ÑÐ¾Ð¿" #: ../includes/shortcodes/media.php:118 ../includes/shortcodes/media.php:259 -#: ../includes/shortcodes/shortcodes.php:234 -#: ../includes/shortcodes/shortcodes.php:389 +#: ../includes/shortcodes/shortcodes.php:236 +#: ../includes/shortcodes/shortcodes.php:391 msgid "Mute" msgstr "ÐÐµÐ· Ð·Ð²ÑÐºÐ°" #: ../includes/shortcodes/media.php:119 ../includes/shortcodes/media.php:260 -#: ../includes/shortcodes/shortcodes.php:235 -#: ../includes/shortcodes/shortcodes.php:390 +#: ../includes/shortcodes/shortcodes.php:237 +#: ../includes/shortcodes/shortcodes.php:392 msgid "Unmute" msgstr "ÐÐºÐ»ÑÑÐ¸ÑÑ Ð·Ð²ÑÐº" #: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 -#: ../includes/shortcodes/shortcodes.php:240 -#: ../includes/shortcodes/shortcodes.php:394 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Update Required." msgstr "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ." #: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 -#: ../includes/shortcodes/shortcodes.php:240 -#: ../includes/shortcodes/shortcodes.php:394 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "" "To play the media you will need to either update your browser to a recent " "version or update your " @@ -640,8 +641,8 @@ msgstr "" "Ð±ÑÐ°ÑÐ·ÐµÑ Ð´Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð²ÐµÑÑÐ¸Ð¸, Ð»Ð¸Ð±Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ ÐÐ°Ñ" #: ../includes/shortcodes/media.php:124 ../includes/shortcodes/media.php:264 -#: ../includes/shortcodes/shortcodes.php:240 -#: ../includes/shortcodes/shortcodes.php:394 +#: ../includes/shortcodes/shortcodes.php:242 +#: ../includes/shortcodes/shortcodes.php:396 msgid "Flash plugin" msgstr "Flash Ð¿Ð»ÐµÐµÑ Ð¿Ð»Ð°Ð³Ð¸Ð½" @@ -650,7 +651,7 @@ msgid "Client" msgstr "ÐÐ»Ð¸ÐµÐ½Ñ" #: ../includes/shortcodes/post-cycle.php:211 -#: ../includes/widgets/my-comment-widget.php:98 +#: ../includes/widgets/my-comment-widget.php:97 #: ../includes/widgets/my-recent-posts.php:147 msgid "Date" msgstr "ÐÐ°ÑÐ°" @@ -672,11 +673,11 @@ msgstr "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð²" msgid "Tags" msgstr "Ð¢ÑÐ³Ð¸" -#: ../includes/shortcodes/shortcodes.php:224 +#: ../includes/shortcodes/shortcodes.php:226 msgid "Previous" msgstr "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ" -#: ../includes/shortcodes/shortcodes.php:227 +#: ../includes/shortcodes/shortcodes.php:229 msgid "Next" msgstr "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ" @@ -686,9 +687,9 @@ msgid "Cherry - Banner" msgstr "Cherry - vCard" #: ../includes/widgets/cherry-banner-widget.php:46 -#: ../includes/widgets/my-comment-widget.php:147 +#: ../includes/widgets/my-comment-widget.php:146 #: ../includes/widgets/my-facebook-widget.php:79 -#: ../includes/widgets/my-flickr-widget.php:57 +#: ../includes/widgets/my-flickr-widget.php:62 #: ../includes/widgets/my-posts-type-widget.php:225 #: ../includes/widgets/my-recent-posts.php:126 #: ../includes/widgets/my-recent-posts.php:148 @@ -703,7 +704,7 @@ msgid "Banner description" msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ." #: ../includes/widgets/cherry-banner-widget.php:48 -#: ../includes/widgets/cherry-instagram-widget.php:79 +#: ../includes/widgets/cherry-instagram-widget.php:165 #, fuzzy msgid "Image URL" msgstr "ÐÐ´ÑÐµÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" @@ -733,61 +734,201 @@ msgstr "Cherry - vCard" msgid "Widget for popular social network Instagram" msgstr "Ð¡ÑÑÐ»ÐºÐ¸ Ð½Ð° ÐÐ°ÑÐ¸ ÑÐ¾ÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÑÐµÑÐ¸." -#: ../includes/widgets/cherry-instagram-widget.php:71 +#: ../includes/widgets/cherry-instagram-widget.php:14 +msgid "Please, enter #hashtag." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:20 +msgid "Please, enter your username." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:25 +msgid "Please, enter your Instagram CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:45 +msgid "Please, enter a valid username and CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:58 +msgid "Please, enter a valid CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:132 +#: ../includes/widgets/cherry-pinterest-embed-widget.php:77 +#: ../includes/widgets/cherry-twitter-embed-widget.php:69 #, fuzzy msgid "Widget Title" msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð±Ð»Ð¾Ð³Ð°" -#: ../includes/widgets/cherry-instagram-widget.php:72 +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Content type" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "My Photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:135 +msgid "Tagged photos" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:138 +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 #, fuzzy msgid "User Name" msgstr "ÐÐ¼Ñ" -#: ../includes/widgets/cherry-instagram-widget.php:73 +#: ../includes/widgets/cherry-instagram-widget.php:138 +msgid "" +"Widget will work only for users who have full rights opened in Instagram " +"account." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Hashtag" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:141 +msgid "Enter without #-symbol." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "Client ID" +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:144 +msgid "" +"Follow this <a href=\"https://instagram.com/developer/clients/manage/\" " +"target=\"_blank\">link</a> and create the application. After that you will " +"get your applications data where you will see the CLIENT ID." +msgstr "" + +#: ../includes/widgets/cherry-instagram-widget.php:147 #, fuzzy msgid "Number of displayed images" msgstr "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ \"Ð´Ð¸Ð·Ð»Ð°Ð¹ÐºÐ¾Ð²\"." -#: ../includes/widgets/cherry-instagram-widget.php:73 +#: ../includes/widgets/cherry-instagram-widget.php:147 msgid "Max value: 20 images." msgstr "" -#: ../includes/widgets/cherry-instagram-widget.php:74 +#: ../includes/widgets/cherry-instagram-widget.php:150 #, fuzzy msgid "Image dimentions" msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ" -#: ../includes/widgets/cherry-instagram-widget.php:74 +#: ../includes/widgets/cherry-instagram-widget.php:150 msgid "Large" msgstr "" -#: ../includes/widgets/cherry-instagram-widget.php:74 +#: ../includes/widgets/cherry-instagram-widget.php:150 msgid "Thumbnail" msgstr "ÐÐ¸Ð½Ð¸Ð°ÑÑÑÐ°" -#: ../includes/widgets/cherry-instagram-widget.php:75 +#: ../includes/widgets/cherry-instagram-widget.php:153 #, fuzzy msgid "Show image description" msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð²Ð¸Ð´Ð¶ÐµÑÐ¾Ð²" -#: ../includes/widgets/cherry-instagram-widget.php:76 +#: ../includes/widgets/cherry-instagram-widget.php:156 #, fuzzy msgid "Show comments number" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÐºÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸:" -#: ../includes/widgets/cherry-instagram-widget.php:77 +#: ../includes/widgets/cherry-instagram-widget.php:159 msgid "Show likes number" msgstr "" -#: ../includes/widgets/cherry-instagram-widget.php:78 +#: ../includes/widgets/cherry-instagram-widget.php:162 #, fuzzy msgid "Show image publication date" msgstr "ÐÐ°ÑÐ° Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ¸." -#: ../includes/widgets/cherry-instagram-widget.php:80 +#: ../includes/widgets/cherry-instagram-widget.php:168 msgid "User account button text" msgstr "" +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Cherry - Pinterest Embed" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:7 +msgid "Widget for Pinterest embed content" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:40 +#: ../includes/widgets/cherry-twitter-embed-widget.php:25 +msgid "There is some errors. Please check widgets page." +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:58 +#: ../includes/widgets/cherry-twitter-embed-widget.php:43 +msgid "Field is empty" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Pinterest User URL" +msgstr "" + +#: ../includes/widgets/cherry-pinterest-embed-widget.php:78 +msgid "Enter Pinterest User URL." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Cherry - Twitter Embed" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:7 +msgid "Widget for Twitter embed content" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:46 +msgid "Widget ID can contains only numbers" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "Widget ID" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:70 +msgid "" +"ID of your widget. First of all you need make a new one widget on page " +"https://twitter.com/settings/widgets/new. After it copy and paste here ID of " +"widget. You can find it after creating of widget in browser's URL field. It " +"contents only numbers." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:71 +msgid "" +"Twitter username you need to show. If empty, then will shown twitter that " +"you set in Twitter's configure page." +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:100 +msgid "Color Scheme" +msgstr "Ð¦Ð²ÐµÑÐ¾Ð²Ð°Ñ ÑÑÐµÐ¼Ð°" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:102 +msgid "Light" +msgstr "Ð¡Ð²ÐµÑÐ»Ð°Ñ" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:72 +#: ../includes/widgets/my-facebook-widget.php:103 +msgid "Dark" +msgstr "Ð¢ÐµÐ¼Ð½Ð°Ñ" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "Tweet limit" +msgstr "" + +#: ../includes/widgets/cherry-twitter-embed-widget.php:73 +msgid "" +"Number of tweets. Leave blank if you don't want to limit tweet's number." +msgstr "" + #: ../includes/widgets/my-banners-widget.php:7 msgid "Add 125x125 ads." msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð±Ð°Ð½ÐµÑ 125x125." @@ -832,66 +973,66 @@ msgid "Cherry - Recent Comments" msgstr "Cherry - ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸" #: ../includes/widgets/my-comment-widget.php:13 -#: ../includes/widgets/my-comment-widget.php:134 +#: ../includes/widgets/my-comment-widget.php:133 msgid "My Recent Comments" msgstr "ÐÐ¾Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸" -#: ../includes/widgets/my-comment-widget.php:79 +#: ../includes/widgets/my-comment-widget.php:78 msgid "Comment in" msgstr "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð²" -#: ../includes/widgets/my-comment-widget.php:88 -#: ../includes/widgets/widgets-manager.php:479 -#: ../includes/widgets/widgets-manager.php:487 +#: ../includes/widgets/my-comment-widget.php:87 +#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:488 msgid "Author" msgstr "ÐÐ²ÑÐ¾Ñ" -#: ../includes/widgets/my-comment-widget.php:106 +#: ../includes/widgets/my-comment-widget.php:105 msgid "Go to this comment" msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ" -#: ../includes/widgets/my-comment-widget.php:148 +#: ../includes/widgets/my-comment-widget.php:147 msgid "Number of comments to show" msgstr "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸ÐµÐ² Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ" -#: ../includes/widgets/my-comment-widget.php:149 +#: ../includes/widgets/my-comment-widget.php:148 msgid "Display avatar" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð°Ð²Ð°ÑÐ°Ñ" -#: ../includes/widgets/my-comment-widget.php:150 +#: ../includes/widgets/my-comment-widget.php:149 msgid "Avatar size (px)" msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð°Ð²Ð°ÑÐ°ÑÐ° (px)" -#: ../includes/widgets/my-comment-widget.php:159 +#: ../includes/widgets/my-comment-widget.php:158 msgid "Display the comment author" msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð°Ð²ÑÐ¾ÑÐ° ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ" -#: ../includes/widgets/my-comment-widget.php:160 +#: ../includes/widgets/my-comment-widget.php:159 msgid "Display the comment date" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð´Ð°ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ" -#: ../includes/widgets/my-comment-widget.php:161 +#: ../includes/widgets/my-comment-widget.php:160 msgid "Display post title" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð´Ð°ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ¸" -#: ../includes/widgets/my-comment-widget.php:162 +#: ../includes/widgets/my-comment-widget.php:161 #: ../includes/widgets/my-vcard-widget.php:195 msgid "Meta format" msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¼eta Ð´Ð°Ð½Ð½ÑÑ" -#: ../includes/widgets/my-comment-widget.php:164 +#: ../includes/widgets/my-comment-widget.php:163 #: ../includes/widgets/my-vcard-widget.php:197 -#: ../includes/widgets/widgets-manager.php:506 +#: ../includes/widgets/widgets-manager.php:507 msgid "None" msgstr "ÐÑÑÑÑÑÑÐ²ÑÐµÑ" -#: ../includes/widgets/my-comment-widget.php:165 +#: ../includes/widgets/my-comment-widget.php:164 #: ../includes/widgets/my-social-widget.php:185 #: ../includes/widgets/my-vcard-widget.php:198 msgid "Icons" msgstr "ÐÐºÐ¾Ð½ÐºÐ¸" -#: ../includes/widgets/my-comment-widget.php:166 +#: ../includes/widgets/my-comment-widget.php:165 #: ../includes/widgets/my-social-widget.php:186 #: ../includes/widgets/my-vcard-widget.php:199 msgid "Labels" @@ -927,18 +1068,6 @@ msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð°" msgid "Height" msgstr "ÐÑÑÐ¾ÑÐ°" -#: ../includes/widgets/my-facebook-widget.php:100 -msgid "Color Scheme" -msgstr "Ð¦Ð²ÐµÑÐ¾Ð²Ð°Ñ ÑÑÐµÐ¼Ð°" - -#: ../includes/widgets/my-facebook-widget.php:102 -msgid "Light" -msgstr "Ð¡Ð²ÐµÑÐ»Ð°Ñ" - -#: ../includes/widgets/my-facebook-widget.php:103 -msgid "Dark" -msgstr "Ð¢ÐµÐ¼Ð½Ð°Ñ" - #: ../includes/widgets/my-facebook-widget.php:109 msgid "Display header" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº" @@ -959,15 +1088,19 @@ msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ" msgid "Cherry - Flickr" msgstr "Cherry - Flickr" -#: ../includes/widgets/my-flickr-widget.php:59 +#: ../includes/widgets/my-flickr-widget.php:39 +msgid "You need enter number of images in widget settings." +msgstr "" + +#: ../includes/widgets/my-flickr-widget.php:64 msgid "Flickr ID" msgstr "Flickr ID" -#: ../includes/widgets/my-flickr-widget.php:60 +#: ../includes/widgets/my-flickr-widget.php:65 msgid "Images count" msgstr "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÐºÐ°ÑÑÐ¸Ð½Ð¾Ðº" -#: ../includes/widgets/my-flickr-widget.php:61 +#: ../includes/widgets/my-flickr-widget.php:66 #: ../includes/widgets/my-posts-type-widget.php:345 #: ../includes/widgets/my-posts-type-widget.php:392 #: ../includes/widgets/my-recent-posts.php:158 @@ -978,87 +1111,87 @@ msgstr "Ð¢ÐµÐºÑÑ ÑÑÑÐ»ÐºÐ¸" msgid "Cherry - Post Cycle" msgstr "Cherry -Ð¦Ð¸ÐºÐ» Ð·Ð°Ð¿Ð¸ÑÐµÐ¹" -#: ../includes/widgets/my-post-cycle-widget.php:195 +#: ../includes/widgets/my-post-cycle-widget.php:221 msgid "Title:" msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº:" -#: ../includes/widgets/my-post-cycle-widget.php:197 +#: ../includes/widgets/my-post-cycle-widget.php:223 msgid "Select post type:" msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ Ð¿Ð¾ÑÑÐ°:" -#: ../includes/widgets/my-post-cycle-widget.php:227 +#: ../includes/widgets/my-post-cycle-widget.php:253 msgid "Categories (names separated by \",\"):" msgstr "ÐÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¸ (Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð½ÑÐµ \",\"):" -#: ../includes/widgets/my-post-cycle-widget.php:229 +#: ../includes/widgets/my-post-cycle-widget.php:255 msgid "Posts count:" msgstr "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ Ð¿Ð¾ÑÑÐ¾Ð²" -#: ../includes/widgets/my-post-cycle-widget.php:231 +#: ../includes/widgets/my-post-cycle-widget.php:257 msgid "Thumbnail Width (in pixels):" msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð° ÐºÐ°ÑÑÐ¸Ð½ÐºÐ¸ (Ð² Ð¿Ð¸ÐºÑÐµÐ»ÑÑ):" -#: ../includes/widgets/my-post-cycle-widget.php:233 +#: ../includes/widgets/my-post-cycle-widget.php:259 msgid "Thumbnail Height (in pixels):" msgstr "ÐÑÑÐ¾ÑÐ° ÐºÐ°ÑÑÐ¸Ð½ÐºÐ¸ (Ð² Ð¿Ð¸ÐºÑÐµÐ»ÑÑ):" -#: ../includes/widgets/my-post-cycle-widget.php:235 +#: ../includes/widgets/my-post-cycle-widget.php:261 msgid "Show titles:" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸:" -#: ../includes/widgets/my-post-cycle-widget.php:242 -#: ../includes/widgets/my-post-cycle-widget.php:261 -#: ../includes/widgets/my-post-cycle-widget.php:280 -#: ../includes/widgets/my-post-cycle-widget.php:299 -#: ../includes/widgets/my-post-cycle-widget.php:318 -#: ../includes/widgets/my-post-cycle-widget.php:343 -#: ../includes/widgets/my-post-cycle-widget.php:362 +#: ../includes/widgets/my-post-cycle-widget.php:268 +#: ../includes/widgets/my-post-cycle-widget.php:287 +#: ../includes/widgets/my-post-cycle-widget.php:306 +#: ../includes/widgets/my-post-cycle-widget.php:325 +#: ../includes/widgets/my-post-cycle-widget.php:344 +#: ../includes/widgets/my-post-cycle-widget.php:369 +#: ../includes/widgets/my-post-cycle-widget.php:388 msgid "yes" msgstr "Ð´Ð°" -#: ../includes/widgets/my-post-cycle-widget.php:247 -#: ../includes/widgets/my-post-cycle-widget.php:266 -#: ../includes/widgets/my-post-cycle-widget.php:285 -#: ../includes/widgets/my-post-cycle-widget.php:304 -#: ../includes/widgets/my-post-cycle-widget.php:323 -#: ../includes/widgets/my-post-cycle-widget.php:348 -#: ../includes/widgets/my-post-cycle-widget.php:367 +#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:349 +#: ../includes/widgets/my-post-cycle-widget.php:374 +#: ../includes/widgets/my-post-cycle-widget.php:393 msgid "no" msgstr "Ð½ÐµÑ" -#: ../includes/widgets/my-post-cycle-widget.php:254 +#: ../includes/widgets/my-post-cycle-widget.php:280 msgid "Show date:" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð´Ð°ÑÑ:" -#: ../includes/widgets/my-post-cycle-widget.php:273 +#: ../includes/widgets/my-post-cycle-widget.php:299 msgid "Show author:" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð°Ð²ÑÐ¾ÑÐ°:" -#: ../includes/widgets/my-post-cycle-widget.php:292 +#: ../includes/widgets/my-post-cycle-widget.php:318 msgid "Show comments:" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÐºÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸:" -#: ../includes/widgets/my-post-cycle-widget.php:311 +#: ../includes/widgets/my-post-cycle-widget.php:337 msgid "Show excerpt:" msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÐ¸ÑÐ°ÑÑ:" -#: ../includes/widgets/my-post-cycle-widget.php:330 +#: ../includes/widgets/my-post-cycle-widget.php:356 msgid "Excerpt word count:" msgstr "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ»Ð¾Ð² ÑÐ¸ÑÐ°ÑÑ:" -#: ../includes/widgets/my-post-cycle-widget.php:332 +#: ../includes/widgets/my-post-cycle-widget.php:358 msgid "More Button Text:" msgstr "Ð¢ÐµÐºÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸ \"ÐÐ°Ð»ÐµÐµ\"" -#: ../includes/widgets/my-post-cycle-widget.php:334 +#: ../includes/widgets/my-post-cycle-widget.php:360 msgid "Slideshow cycling speed (in sec.):" msgstr "Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ ÑÐ»Ð°Ð¹Ð´ÑÐ¾Ñ (Ð² ÑÐµÐº.):" -#: ../includes/widgets/my-post-cycle-widget.php:336 +#: ../includes/widgets/my-post-cycle-widget.php:362 msgid "Arrows:" msgstr "Ð¡ÑÑÐµÐ»ÐºÐ¸:" -#: ../includes/widgets/my-post-cycle-widget.php:355 +#: ../includes/widgets/my-post-cycle-widget.php:381 msgid "Pagination:" msgstr "ÐÑÐ¼ÐµÑÐ°ÑÐ¸Ñ ÑÑÑÐ°Ð½Ð¸Ñ:" @@ -1442,107 +1575,111 @@ msgid "Homepage" msgstr "ÐÐ»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" #: ../includes/widgets/widgets-manager.php:474 +msgid "Blog" +msgstr "ÐÐ»Ð¾Ð³" + +#: ../includes/widgets/widgets-manager.php:475 msgid "Page" msgstr "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°" -#: ../includes/widgets/widgets-manager.php:475 +#: ../includes/widgets/widgets-manager.php:476 msgid "Post" msgstr "ÐÐ°Ð¿Ð¸ÑÑ" -#: ../includes/widgets/widgets-manager.php:476 -#: ../includes/widgets/widgets-manager.php:478 +#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:479 msgid "Archive" msgstr "ÐÑÑÐ¸Ð²" -#: ../includes/widgets/widgets-manager.php:477 +#: ../includes/widgets/widgets-manager.php:478 msgid "Tag" msgstr "Ð¢ÑÐ³" -#: ../includes/widgets/widgets-manager.php:480 +#: ../includes/widgets/widgets-manager.php:481 msgid "Search page" msgstr "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð¸ÑÐºÐ°" -#: ../includes/widgets/widgets-manager.php:481 +#: ../includes/widgets/widgets-manager.php:482 msgid "404 page" msgstr "404 ÑÑÑÐ°Ð½Ð¸ÑÐ°" -#: ../includes/widgets/widgets-manager.php:483 +#: ../includes/widgets/widgets-manager.php:484 msgid "Page ID/Title/slug" msgstr "ID ÑÑÑÐ°Ð½Ð¸ÑÑ/ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº/ÑÐ»Ð°Ð³" -#: ../includes/widgets/widgets-manager.php:484 +#: ../includes/widgets/widgets-manager.php:485 msgid "Post ID/Title/slug" msgstr "ID Ð·Ð°Ð¿Ð¸ÑÐ¸/ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº/ÑÐ»Ð°Ð³" -#: ../includes/widgets/widgets-manager.php:485 +#: ../includes/widgets/widgets-manager.php:486 msgid "Category ID/Name/slug" msgstr "ID ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¸/ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ/ÑÐ»Ð°Ð³" -#: ../includes/widgets/widgets-manager.php:486 +#: ../includes/widgets/widgets-manager.php:487 msgid "Tag ID/Name" msgstr "ID ÑÑÐ³Ð°/ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ" -#: ../includes/widgets/widgets-manager.php:488 +#: ../includes/widgets/widgets-manager.php:489 msgid "Add page" msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" -#: ../includes/widgets/widgets-manager.php:491 +#: ../includes/widgets/widgets-manager.php:492 msgid "Selected pages" msgstr "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÑ" -#: ../includes/widgets/widgets-manager.php:492 +#: ../includes/widgets/widgets-manager.php:493 msgid "No pages" msgstr "ÐÐµÑ ÑÑÑÐ°Ð½Ð¸Ñ" -#: ../includes/widgets/widgets-manager.php:510 +#: ../includes/widgets/widgets-manager.php:511 msgid "All devices" msgstr "ÐÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" -#: ../includes/widgets/widgets-manager.php:511 +#: ../includes/widgets/widgets-manager.php:512 msgid "Desktops" msgstr "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ" -#: ../includes/widgets/widgets-manager.php:512 +#: ../includes/widgets/widgets-manager.php:513 msgid "Tablets" msgstr "ÐÐ»Ð°Ð½ÑÐµÑÑ" -#: ../includes/widgets/widgets-manager.php:513 +#: ../includes/widgets/widgets-manager.php:514 msgid "Phones" msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½Ñ" -#: ../includes/widgets/widgets-manager.php:514 +#: ../includes/widgets/widgets-manager.php:515 msgid "Desktops/Tablets" msgstr "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ Ð¸ Ð¿Ð»Ð°Ð½ÑÐµÑÑ" -#: ../includes/widgets/widgets-manager.php:515 +#: ../includes/widgets/widgets-manager.php:516 msgid "Tablets/Phones" msgstr "ÐÐ»Ð°Ð½ÑÐµÑÑ Ð¸ ÑÐµÐ»ÐµÑÐ¾Ð½Ñ" -#: ../includes/widgets/widgets-manager.php:516 +#: ../includes/widgets/widgets-manager.php:517 msgid "Desktops/Phones" msgstr "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ Ð¸ ÑÐµÐ»ÐµÑÐ¾Ð½Ñ" -#: ../includes/widgets/widgets-manager.php:519 +#: ../includes/widgets/widgets-manager.php:520 msgid "Visible on" msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð½Ð°" -#: ../includes/widgets/widgets-manager.php:528 +#: ../includes/widgets/widgets-manager.php:529 msgid "All users" msgstr "ÐÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸" -#: ../includes/widgets/widgets-manager.php:529 +#: ../includes/widgets/widgets-manager.php:530 msgid "Only guests" msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð³Ð¾ÑÑÐ¸" -#: ../includes/widgets/widgets-manager.php:530 +#: ../includes/widgets/widgets-manager.php:531 msgid "Only registered users" msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ" -#: ../includes/widgets/widgets-manager.php:531 +#: ../includes/widgets/widgets-manager.php:532 msgid "Only administrator" msgstr "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ" -#: ../includes/widgets/widgets-manager.php:534 +#: ../includes/widgets/widgets-manager.php:535 msgid "Visible for" msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð´Ð»Ñ" @@ -1565,6 +1702,9 @@ msgid "" "This does not appear to be a WXR file, missing/invalid WXR version number" msgstr "ÐÑÐ¾ Ð½Ðµ WXR ÑÐ°Ð¹Ð». ÐÑÑÑÑÑÑÐ²ÑÐµÑ Ð¸Ð»Ð¸ Ð¾ÑÐ¸Ð±ÐºÐ° Ð²ÐµÑÑÐ¸Ð¸ WXR" +#~ msgid "Minuts" +#~ msgstr "ÐÐ¸Ð½ÑÑÑ" + #~ msgid "Insert Shortcode" #~ msgstr "ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾ÑÑÐºÐ¾Ð´" @@ -2589,9 +2729,6 @@ msgstr "ÐÑÐ¾ Ð½Ðµ WXR ÑÐ°Ð¹Ð». ÐÑÑÑÑÑÑÐ²ÑÐµÑ Ð¸Ð»Ð¸ Ð¾ÑÐ¸Ð±ÐºÐ° Ð² #~ msgid "easeInOutBounce" #~ msgstr "easeInOutBounce" -#~ msgid "Blog" -#~ msgstr "ÐÐ»Ð¾Ð³" - #~ msgid "Enter Your Blog Title used on Blog page." #~ msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð±Ð»Ð¾Ð³Ð°. ÐÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐµ ÐÐ»Ð¾Ð³." diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/admin.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/admin.php index 0f7297d1..46f64182 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/admin.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/admin.php @@ -4,6 +4,12 @@ require_once WPCF7_PLUGIN_DIR . '/admin/includes/admin-functions.php'; require_once WPCF7_PLUGIN_DIR . '/admin/includes/help-tabs.php'; require_once WPCF7_PLUGIN_DIR . '/admin/includes/tag-generator.php'; +add_action( 'admin_init', 'wpcf7_admin_init' ); + +function wpcf7_admin_init() { + do_action( 'wpcf7_admin_init' ); +} + add_action( 'admin_menu', 'wpcf7_admin_menu', 9 ); function wpcf7_admin_menu() { @@ -175,7 +181,6 @@ function wpcf7_load_contact_form_admin() { array( 'WPCF7_Contact_Form_List_Table', 'define_columns' ) ); add_screen_option( 'per_page', array( - 'label' => __( 'Contact Forms', 'contact-form-7' ), 'default' => 20, 'option' => 'cfseven_contact_forms_per_page' ) ); } @@ -341,22 +346,21 @@ function wpcf7_admin_integration_page() { add_action( 'wpcf7_admin_notices', 'wpcf7_admin_updated_message' ); function wpcf7_admin_updated_message() { - if ( empty( $_REQUEST['message'] ) ) + if ( empty( $_REQUEST['message'] ) ) { return; + } - if ( 'created' == $_REQUEST['message'] ) - $updated_message = esc_html( __( 'Contact form created.', 'contact-form-7' ) ); - elseif ( 'saved' == $_REQUEST['message'] ) - $updated_message = esc_html( __( 'Contact form saved.', 'contact-form-7' ) ); - elseif ( 'deleted' == $_REQUEST['message'] ) - $updated_message = esc_html( __( 'Contact form deleted.', 'contact-form-7' ) ); - - if ( empty( $updated_message ) ) - return; + if ( 'created' == $_REQUEST['message'] ) { + $updated_message = __( 'Contact form created.', 'contact-form-7' ); + } elseif ( 'saved' == $_REQUEST['message'] ) { + $updated_message = __( 'Contact form saved.', 'contact-form-7' ); + } elseif ( 'deleted' == $_REQUEST['message'] ) { + $updated_message = __( 'Contact form deleted.', 'contact-form-7' ); + } -?> -<div id="message" class="updated"><p><?php echo $updated_message; ?></p></div> -<?php + if ( ! empty( $updated_message ) ) { + echo sprintf( '<div id="message" class="updated notice notice-success is-dismissible"><p>%s</p></div>', esc_html( $updated_message ) ); + } } add_filter( 'plugin_action_links', 'wpcf7_plugin_action_links', 10, 2 ); @@ -373,28 +377,48 @@ function wpcf7_plugin_action_links( $links, $file ) { return $links; } -add_action( 'admin_notices', 'wpcf7_old_wp_version_error', 9 ); +<<<<<<< .mine +add_action( 'wpcf7_admin_notices', 'wpcf7_old_wp_version_error', 2 ); + +||||||| .r11156 +add_action( 'wpcf7_admin_notices', 'wpcf7_cf7com_links', 9 ); + +function wpcf7_cf7com_links() { + $links = '<div class="cf7com-links">' + . '<a href="' . esc_url( __( 'http://contactform7.com/docs/', 'contact-form-7' ) ) . '" target="_blank">' + . esc_html( __( 'Docs', 'contact-form-7' ) ) . '</a> - ' + . '<a href="' . esc_url( __( 'http://contactform7.com/faq/', 'contact-form-7' ) ) . '" target="_blank">' + . esc_html( __( 'FAQ', 'contact-form-7' ) ) . '</a> - ' + . '<a href="' . esc_url( __( 'http://contactform7.com/support/', 'contact-form-7' ) ) . '" target="_blank">' + . esc_html( __( 'Support', 'contact-form-7' ) ) . '</a> - ' + . '<a href="' . esc_url( __( 'http://contactform7.com/donate/', 'contact-form-7' ) ) . '" target="_blank">' + . esc_html( __( 'Donate', 'contact-form-7' ) ) . '</a>' + . '</div>'; + + echo apply_filters( 'wpcf7_cf7com_links', $links ); +} -function wpcf7_old_wp_version_error() { - global $plugin_page; +add_action( 'admin_notices', 'wpcf7_old_wp_version_error', 9 ); - if ( 'wpcf7' != substr( $plugin_page, 0, 5 ) ) { - return; - } +======= +add_action( 'admin_notices', 'wpcf7_old_wp_version_error', 9 ); +>>>>>>> .r12027 +function wpcf7_old_wp_version_error() { $wp_version = get_bloginfo( 'version' ); - if ( ! version_compare( $wp_version, WPCF7_REQUIRED_WP_VERSION, '<' ) ) + if ( ! version_compare( $wp_version, WPCF7_REQUIRED_WP_VERSION, '<' ) ) { return; + } ?> -<div class="error"> +<div class="notice notice-error is-dismissible"> <p><?php echo sprintf( __( '<strong>Contact Form 7 %1$s requires WordPress %2$s or higher.</strong> Please <a href="%3$s">update WordPress</a> first.', 'contact-form-7' ), WPCF7_VERSION, WPCF7_REQUIRED_WP_VERSION, admin_url( 'update-core.php' ) ); ?></p> </div> <?php } -add_action( 'wpcf7_admin_notices', 'wpcf7_welcome_panel', 2 ); +add_action( 'wpcf7_admin_notices', 'wpcf7_welcome_panel', 4 ); function wpcf7_welcome_panel() { global $plugin_page; @@ -473,6 +497,29 @@ function wpcf7_admin_ajax_welcome_panel() { wp_die( 1 ); } +<<<<<<< .mine +add_action( 'wpcf7_admin_notices', 'wpcf7_not_allowed_to_edit' ); + +function wpcf7_not_allowed_to_edit() { + if ( ! $contact_form = wpcf7_get_current_contact_form() ) { + return; + } + + $post_id = $contact_form->id(); + + if ( current_user_can( 'wpcf7_edit_contact_form', $post_id ) ) { + return; + } + + $message = __( "You are not allowed to edit this contact form.", + 'contact-form-7' ); + + echo sprintf( + '<div class="notice notice-warning is-dismissible"><p>%s</p></div>', + esc_html( $message ) ); +} +||||||| .r11156 +?>======= add_action( 'wpcf7_admin_notices', 'wpcf7_not_allowed_to_edit' ); function wpcf7_not_allowed_to_edit() { @@ -492,3 +539,4 @@ function wpcf7_not_allowed_to_edit() { echo sprintf( '<div class="notice notice-warning"><p>%s</p></div>', esc_html( $message ) ); } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/edit-contact-form.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/edit-contact-form.php index 33d77924..2bca7534 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/edit-contact-form.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/edit-contact-form.php @@ -143,6 +143,20 @@ if ( $post ) : </div> <?php endif; ?> +<<<<<<< .mine +<div id="publishing-action"> + <span class="spinner"></span> + <?php wpcf7_admin_save_button( $post_id ); ?> +</div> +<div class="clear"></div> +</div> +</div> +</div> +</div> +<?php endif; ?> +||||||| .r11156 +do_action( 'wpcf7_admin_after_general_settings', $post ); +======= <div class="save-contact-form textright"> <?php wpcf7_admin_save_button( $post_id ); ?> </div> @@ -151,6 +165,7 @@ if ( $post ) : </div> </div> <?php endif; ?> +>>>>>>> .r12027 <div id="informationdiv" class="postbox"> <h3><?php echo esc_html( __( 'Information', 'contact-form-7' ) ); ?></h3> diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/class-contact-forms-list-table.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/class-contact-forms-list-table.php index ee92f8c6..ba0a7eb2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/class-contact-forms-list-table.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/class-contact-forms-list-table.php @@ -128,11 +128,16 @@ class WPCF7_Contact_Form_List_Table extends WP_List_Table { function column_author( $item ) { $post = get_post( $item->id() ); - if ( ! $post ) + if ( ! $post ) { return; + } $author = get_userdata( $post->post_author ); + if ( false === $author ) { + return; + } + return esc_html( $author->display_name ); } diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/editor.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/editor.php index 72701917..ac315557 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/editor.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/includes/editor.php @@ -1,3 +1,212 @@ +<<<<<<< .mine +<?php + +class WPCF7_Editor { + + private $contact_form; + private $panels = array(); + + public function __construct( WPCF7_ContactForm $contact_form ) { + $this->contact_form = $contact_form; + } + + public function add_panel( $id, $title, $callback ) { + if ( wpcf7_is_name( $id ) ) { + $this->panels[$id] = array( + 'title' => $title, + 'callback' => $callback ); + } + } + + public function display() { + if ( empty( $this->panels ) ) { + return; + } + + echo '<ul id="contact-form-editor-tabs">'; + + foreach ( $this->panels as $id => $panel ) { + echo sprintf( '<li id="%1$s-tab"><a href="#%1$s">%2$s</a></li>', + esc_attr( $id ), esc_html( $panel['title'] ) ); + } + + echo '</ul>'; + + foreach ( $this->panels as $id => $panel ) { + echo sprintf( '<div class="contact-form-editor-panel" id="%1$s">', + esc_attr( $id ) ); + call_user_func( $panel['callback'], $this->contact_form ); + echo '</div>'; + } + } +} + +function wpcf7_editor_panel_form( $post ) { +?> +<h3><?php echo esc_html( __( 'Form', 'contact-form-7' ) ); ?></h3> + +<?php + $tag_generator = WPCF7_TagGenerator::get_instance(); + $tag_generator->print_buttons(); +?> + +<textarea id="wpcf7-form" name="wpcf7-form" cols="100" rows="24" class="large-text code"><?php echo esc_textarea( $post->prop( 'form' ) ); ?> +'; + + wpcf7_editor_box_mail( $post, array( + 'id' => 'wpcf7-mail-2', + 'name' => 'mail_2', + 'title' => __( 'Mail (2)', 'contact-form-7' ), + 'use' => __( 'Use Mail (2)', 'contact-form-7' ) ) ); +} + +function wpcf7_editor_box_mail( $post, $args = '' ) { + $args = wp_parse_args( $args, array( + 'id' => 'wpcf7-mail', + 'name' => 'mail', + 'title' => __( 'Mail', 'contact-form-7' ), + 'use' => null ) ); + + $id = esc_attr( $args['id'] ); + + $mail = wp_parse_args( $post->prop( $args['name'] ), array( + 'active' => false, 'recipient' => '', 'sender' => '', + 'subject' => '', 'body' => '', 'additional_headers' => '', + 'attachments' => '', 'use_html' => false, 'exclude_blank' => false ) ); + +?> +
+
+ + + /> +
+ + +
+
+suggest_mail_tags( $args['name'] ); ?> +




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

	+<<<<<<< .mine +\|\|\|\|\|\|\| .r11156 + + + +======= +>>>>>>> .r12027
	+ + + + +
	/>
	/>
	"); + + d = (d = a[c].controlType) ? d : "text-control"; + + switch (d) { + case "tab-control": + this.createTabControl(a[c], f, c == 0); + break; + + case "icon-control": + case "link-control": + case "text-control": + this.createTextControl(a[c], f, c == 0); + break; + + case "textarea-control": + this.createTextAreaControl(a[c], f, c == 0); + break; + + case "select-control": + this.createSelectControl(a[c], f, c == 0); + break; + } + + jQuery("

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +	+ +
+ +	+ +
+ +	+ +
+ +	+ <?php echo esc_textarea( $mail['additional_headers'] ); ?> +
+ +	+ <?php echo esc_textarea( $mail['body'] ); ?> + + /> + + /> +
+ +	+ <?php echo esc_textarea( $mail['attachments'] ); ?> +

+ +

+ +
+
+ + $arr ) { + $field_name = 'wpcf7-message-' . strtr( $key, '_', '-' ); +?> +
+
+ + +
+ +
+ +
+
+ +<?php echo esc_textarea( $post->prop( 'additional_settings' ) ); ?> +
+ >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/scripts.js b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/scripts.js index 899b9d9a..4d67d032 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/scripts.js +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/scripts.js @@ -74,11 +74,26 @@ } }); +<<<<<<< .mine + $('#wpcf7-admin-form-element').submit(function() { + if ('copy' != this.action.value) { + $(window).off('beforeunload'); + } + + if ('save' == this.action.value) { + $('#publishing-action .spinner').addClass('is-active'); + } + }); +||||||| .r11156 + } catch (e) { + } +======= $('#wpcf7-admin-form-element').submit(function() { if ('copy' != this.action.value) { $(window).off('beforeunload'); } }); +>>>>>>> .r12027 }); $.fn.wpcf7ToggleFormTable = function() { diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/tag-generator.js b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/tag-generator.js index 6f36fbe6..4db8880f 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/tag-generator.js +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/admin/js/tag-generator.js @@ -1,3 +1,234 @@ +<<<<<<< .mine +(function($) { + + if (typeof _wpcf7 == 'undefined' || _wpcf7 === null) { + _wpcf7 = {}; + } + + _wpcf7.taggen = {}; + + $(function() { + $('form.tag-generator-panel').each(function() { + _wpcf7.taggen.update($(this)); + }); + }); + + $('form.tag-generator-panel').submit(function(event) { + return false; + }); + + $('form.tag-generator-panel .control-box :input').change(function(event) { + var form = $(this).closest('form.tag-generator-panel'); + _wpcf7.taggen.normalize($(this)); + _wpcf7.taggen.update(form); + }); + + $('input.insert-tag').click(function(event) { + var form = $(this).closest('form.tag-generator-panel'); + var tag = form.find('input.tag').val(); + _wpcf7.taggen.insert(tag); + tb_remove(); // close thickbox + return false; + }); + + _wpcf7.taggen.update = function($form) { + var id = $form.attr('data-id'); + var name = ''; + var name_fields = $form.find('input[name="name"]'); + + if (name_fields.length) { + name = name_fields.val(); + + if ('' == name) { + name = id + '-' + Math.floor(Math.random() * 1000); + name_fields.val(name); + } + } + + if ($.isFunction(_wpcf7.taggen.update[id])) { + return _wpcf7.taggen.update[id].call(this, $form); + } + + $form.find('input.tag').each(function() { + var tag_type = $(this).attr('name'); + + if ($form.find(':input[name="tagtype"]').length) { + tag_type = $form.find(':input[name="tagtype"]').val(); + } + + if ($form.find(':input[name="required"]').is(':checked')) { + tag_type += '*'; + } + + components = _wpcf7.taggen.compose(tag_type, $form); + $(this).val(components); + }); + + $form.find('span.mail-tag').text('[' + name + ']'); + + $form.find('input.mail-tag').each(function() { + $(this).val('[' + name + ']'); + }); + + }; + + _wpcf7.taggen.update.captcha = function($form) { + var captchac = _wpcf7.taggen.compose('captchac', $form); + var captchar = _wpcf7.taggen.compose('captchar', $form); + + $form.find('input.tag').val(captchac + ' ' + captchar); + }; + + _wpcf7.taggen.compose = function(tagType, $form) { + var name = $form.find('input[name="name"]').val(); + var scope = $form.find('.scope.' + tagType); + + if (! scope.length) { + scope = $form; + } + + var options = []; + + scope.find('input.option').not(':checkbox,:radio').each(function(i) { + var val = $(this).val(); + + if (! val) { + return; + } + + if ($(this).hasClass('filetype')) { + val = val.split(/[,|\s]+/).join('|'); + } + + if ($(this).hasClass('color')) { + val = '#' + val; + } + + if ('class' == $(this).attr('name')) { + $.each(val.split(' '), function(i, n) { options.push('class:' + n) }); + } else { + options.push($(this).attr('name') + ':' + val); + } + }); + + scope.find('input:checkbox.option').each(function(i) { + if ($(this).is(':checked')) { + options.push($(this).attr('name')); + } + }); + + scope.find('input:radio.option').each(function(i) { + if ($(this).is(':checked') && ! $(this).hasClass('default')) { + options.push($(this).attr('name') + ':' + $(this).val()); + } + }); + + options = (options.length > 0) ? options.join(' ') : ''; + + var value = ''; + + if (scope.find(':input[name="values"]').val()) { + $.each(scope.find(':input[name="values"]').val().split("\n"), function(i, n) { + value += ' "' + n.replace(/["]/g, '"') + '"'; + }); + } + + var components = []; + + $.each([tagType, name, options, value], function(i, v) { + v = $.trim(v); + + if ('' != v) { + components.push(v); + } + }); + + components = $.trim(components.join(' ')); + return '[' + components + ']'; + } + + _wpcf7.taggen.normalize = function($input) { + var val = $input.val(); + + if ($input.is('input[name="name"]')) { + val = val.replace(/[^0-9a-zA-Z:._-]/g, '').replace(/^[^a-zA-Z]+/, ''); + } + + if ($input.is('.numeric')) { + val = val.replace(/[^0-9.-]/g, ''); + } + + if ($input.is('.idvalue')) { + val = val.replace(/[^-0-9a-zA-Z_]/g, ''); + } + + if ($input.is('.classvalue')) { + val = $.map(val.split(' '), function(n) { + return n.replace(/[^-0-9a-zA-Z_]/g, ''); + }).join(' '); + + val = $.trim(val.replace(/\s+/g, ' ')); + } + + if ($input.is('.color')) { + val = val.replace(/[^0-9a-fA-F]/g, ''); + } + + if ($input.is('.filesize')) { + val = val.replace(/[^0-9kKmMbB]/g, ''); + } + + if ($input.is('.filetype')) { + val = val.replace(/[^0-9a-zA-Z.,|\s]/g, ''); + } + + if ($input.is('.date')) { + if (! val.match(/^\d{4}-\d{2}-\d{2}$/)) { // 'yyyy-mm-dd' ISO 8601 format + val = ''; + } + } + + if ($input.is(':input[name="values"]')) { + val = $.trim(val); + } + + $input.val(val); + + if ($input.is(':checkbox.exclusive')) { + _wpcf7.taggen.exclusiveCheckbox($input); + } + } + + _wpcf7.taggen.exclusiveCheckbox = function($cb) { + if ($cb.is(':checked')) { + $cb.siblings(':checkbox.exclusive').prop('checked', false); + } + }; + + _wpcf7.taggen.insert = function(content) { + $('textarea#wpcf7-form').each(function() { + this.focus(); + + if (document.selection) { // IE + var selection = document.selection.createRange(); + selection.text = content; + } else if (this.selectionEnd || 0 === this.selectionEnd) { + var val = $(this).val(); + var end = this.selectionEnd; + $(this).val(val.substring(0, end) + content + val.substring(end, val.length)); + this.selectionStart = end + content.length; + this.selectionEnd = end + content.length; + } else { + $(this).val($(this).val() + content); + } + + this.focus(); + }); + }; + +})(jQuery); +||||||| .r0 +======= (function($) { if (typeof _wpcf7 == 'undefined' || _wpcf7 === null) { @@ -239,3 +470,4 @@ }; })(jQuery); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/contact-form.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/contact-form.php index de4343b1..396ffe83 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/contact-form.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/contact-form.php @@ -357,15 +357,19 @@ class WPCF7_ContactForm { '_wpcf7_locale' => $this->locale, '_wpcf7_unit_tag' => $this->unit_tag ); - if ( WPCF7_VERIFY_NONCE ) + if ( WPCF7_VERIFY_NONCE ) { $hidden_fields['_wpnonce'] = wpcf7_create_nonce( $this->id ); + } + + $hidden_fields += (array) apply_filters( + 'wpcf7_form_hidden_fields', array() ); $content = ''; foreach ( $hidden_fields as $name => $value ) { - $content .= '' . "\n"; + $content .= sprintf( + '', + esc_attr( $name ), esc_attr( $value ) ) . "\n"; } return '
' . "\n" . $content . '
' . "\n"; @@ -508,11 +512,13 @@ class WPCF7_ContactForm { $this->scanned_form_tags = $scanned; } - if ( empty( $scanned ) ) - return null; + if ( empty( $scanned ) ) { + return array(); + } - if ( ! is_array( $cond ) || empty( $cond ) ) + if ( ! is_array( $cond ) || empty( $cond ) ) { return $scanned; + } for ( $i = 0, $size = count( $scanned ); $i < $size; $i++ ) { @@ -815,15 +821,17 @@ function wpcf7_get_contact_form_by_old_id( $old_id ) { $q = "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_old_cf7_unit_id'" . $wpdb->prepare( " AND meta_value = %d", $old_id ); - if ( $new_id = $wpdb->get_var( $q ) ) + if ( $new_id = $wpdb->get_var( $q ) ) { return wpcf7_contact_form( $new_id ); + } } function wpcf7_get_contact_form_by_title( $title ) { $page = get_page_by_title( $title, OBJECT, WPCF7_ContactForm::post_type ); - if ( $page ) + if ( $page ) { return wpcf7_contact_form( $page->ID ); + } return null; } @@ -835,8 +843,9 @@ function wpcf7_get_current_contact_form() { } function wpcf7_is_posted() { - if ( ! $contact_form = wpcf7_get_current_contact_form() ) + if ( ! $contact_form = wpcf7_get_current_contact_form() ) { return false; + } return $contact_form->is_posted(); } @@ -856,22 +865,25 @@ function wpcf7_get_hangover( $name, $default = null ) { } function wpcf7_get_validation_error( $name ) { - if ( ! $contact_form = wpcf7_get_current_contact_form() ) + if ( ! $contact_form = wpcf7_get_current_contact_form() ) { return ''; + } return $contact_form->validation_error( $name ); } function wpcf7_get_message( $status ) { - if ( ! $contact_form = wpcf7_get_current_contact_form() ) + if ( ! $contact_form = wpcf7_get_current_contact_form() ) { return ''; + } return $contact_form->message( $status ); } function wpcf7_scan_shortcode( $cond = null ) { - if ( ! $contact_form = wpcf7_get_current_contact_form() ) - return null; + if ( ! $contact_form = wpcf7_get_current_contact_form() ) { + return array(); + } return $contact_form->form_scan_shortcode( $cond ); } @@ -887,8 +899,9 @@ function wpcf7_form_controls_class( $type, $default = '' ) { $classes[] = 'wpcf7-' . $typebase; - if ( $required ) + if ( $required ) { $classes[] = 'wpcf7-validates-as-required'; + } $classes = array_unique( $classes ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/controller.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/controller.php index 2e3df4d3..295acb14 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/controller.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/controller.php @@ -1,6 +1,6 @@ wpcf7_ajax_loader(), + 'recaptchaEmpty' => + __( 'Please verify that you are not a robot.', 'contact-form-7' ), 'sending' => __( 'Sending ...', 'contact-form-7' ) ); - if ( defined( 'WP_CACHE' ) && WP_CACHE ) + if ( defined( 'WP_CACHE' ) && WP_CACHE ) { $_wpcf7['cached'] = 1; + } - if ( wpcf7_support_html5_fallback() ) + if ( wpcf7_support_html5_fallback() ) { $_wpcf7['jqueryUi'] = 1; + } wp_localize_script( 'contact-form-7', '_wpcf7', $_wpcf7 ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/css/styles.css b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/css/styles.css index 448c9fa4..d6251e97 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/css/styles.css +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/css/styles.css @@ -35,7 +35,7 @@ div.wpcf7-validation-errors { border: 2px solid #f7e700; } -span.wpcf7-form-control-wrap { +.wpcf7-form-control-wrap { position: relative; } @@ -45,7 +45,7 @@ span.wpcf7-not-valid-tip { display: block; } -.use-floating-validation-tip span.wpcf7-not-valid-tip { +.use-floating-validation-tip span.wpcf7-not-valid-tip { position: absolute; top: 20%; left: 20%; @@ -75,4 +75,4 @@ div.wpcf7 div.ajax-error { div.wpcf7 .placeheld { color: #888; -} \ No newline at end of file +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/formatting.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/formatting.php index 5061e5ac..a95736a1 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/formatting.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/formatting.php @@ -13,8 +13,9 @@ function wpcf7_autop( $pee, $br = 1 ) { $pee = preg_replace( '!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee ); $pee = preg_replace( '!()!', "$1\n\n", $pee ); - /* wpcf7: take care of [response] tag */ - $pee = preg_replace( '!(\[response[^]]*\])!', "\n$1\n\n", $pee ); + /* wpcf7: take care of [response] and [recaptcha] tag */ + $pee = preg_replace( '!(\[(?:response|recaptcha)[^]]*\])!', + "\n$1\n\n", $pee ); $pee = str_replace( array( "\r\n", "\r" ), "\n", $pee ); // cross-platform newlines @@ -41,9 +42,11 @@ function wpcf7_autop( $pee, $br = 1 ) { $pee = preg_replace( '!
\s*(]*>)!', "$1", $pee ); $pee = preg_replace( '!(]*>)\s*
!', "$1", $pee ); - /* wpcf7: take care of [response] tag */ - $pee = preg_replace( '!
\s*(\[response[^]]*\])!', "$1", $pee ); - $pee = preg_replace( '!(\[response[^]]*\])\s*
!', "$1", $pee ); + /* wpcf7: take care of [response] and [recaptcha] tag */ + $pee = preg_replace( '!
\s*(\[(?:response|recaptcha)[^]]*\])!', + "$1", $pee ); + $pee = preg_replace( '!(\[(?:response|recaptcha)[^]]*\])\s*
!', + "$1", $pee ); if ( $br ) { /* wpcf7: add textarea */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/functions.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/functions.php index 64371bd6..6720a976 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/functions.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/functions.php @@ -29,6 +29,104 @@ function wpcf7_upload_dir( $type = false ) { return $uploads; } +<<<<<<< .mine +||||||| .r11156 +function wpcf7_l10n() { + static $l10n = array(); + + if ( ! empty( $l10n ) ) { + return $l10n; + } + + $l10n = array( + 'af' => __( 'Afrikaans', 'contact-form-7' ), + 'sq' => __( 'Albanian', 'contact-form-7' ), + 'ar' => __( 'Arabic', 'contact-form-7' ), + 'hy_AM' => __( 'Armenian', 'contact-form-7' ), + 'az_AZ' => __( 'Azerbaijani', 'contact-form-7' ), + 'bn_BD' => __( 'Bangla', 'contact-form-7' ), + 'eu' => __( 'Basque', 'contact-form-7' ), + 'be_BY' => __( 'Belarusian', 'contact-form-7' ), + 'bs' => __( 'Bosnian', 'contact-form-7' ), + 'pt_BR' => __( 'Brazilian Portuguese', 'contact-form-7' ), + 'bg_BG' => __( 'Bulgarian', 'contact-form-7' ), + 'ca' => __( 'Catalan', 'contact-form-7' ), + 'ckb' => __( 'Central Kurdish', 'contact-form-7' ), + 'zh_CN' => __( 'Chinese (Simplified)', 'contact-form-7' ), + 'zh_TW' => __( 'Chinese (Traditional)', 'contact-form-7' ), + 'hr' => __( 'Croatian', 'contact-form-7' ), + 'cs_CZ' => __( 'Czech', 'contact-form-7' ), + 'da_DK' => __( 'Danish', 'contact-form-7' ), + 'nl_NL' => __( 'Dutch', 'contact-form-7' ), + 'en_US' => __( 'English', 'contact-form-7' ), + 'eo_EO' => __( 'Esperanto', 'contact-form-7' ), + 'et' => __( 'Estonian', 'contact-form-7' ), + 'fi' => __( 'Finnish', 'contact-form-7' ), + 'fr_FR' => __( 'French', 'contact-form-7' ), + 'gl_ES' => __( 'Galician', 'contact-form-7' ), + 'gu_IN' => __( 'Gujarati', 'contact-form-7' ), + 'ka_GE' => __( 'Georgian', 'contact-form-7' ), + 'de_DE' => __( 'German', 'contact-form-7' ), + 'el' => __( 'Greek', 'contact-form-7' ), + 'ht' => __( 'Haitian', 'contact-form-7' ), + 'he_IL' => __( 'Hebrew', 'contact-form-7' ), + 'hi_IN' => __( 'Hindi', 'contact-form-7' ), + 'hu_HU' => __( 'Hungarian', 'contact-form-7' ), + 'bn_IN' => __( 'Indian Bengali', 'contact-form-7' ), + 'id_ID' => __( 'Indonesian', 'contact-form-7' ), + 'ga_IE' => __( 'Irish', 'contact-form-7' ), + 'it_IT' => __( 'Italian', 'contact-form-7' ), + 'ja' => __( 'Japanese', 'contact-form-7' ), + 'ko_KR' => __( 'Korean', 'contact-form-7' ), + 'lv' => __( 'Latvian', 'contact-form-7' ), + 'lt_LT' => __( 'Lithuanian', 'contact-form-7' ), + 'mk_MK' => __( 'Macedonian', 'contact-form-7' ), + 'ms_MY' => __( 'Malay', 'contact-form-7' ), + 'ml_IN' => __( 'Malayalam', 'contact-form-7' ), + 'mt_MT' => __( 'Maltese', 'contact-form-7' ), + 'nb_NO' => __( 'Norwegian', 'contact-form-7' ), + 'fa_IR' => __( 'Persian', 'contact-form-7' ), + 'pl_PL' => __( 'Polish', 'contact-form-7' ), + 'pt_PT' => __( 'Portuguese', 'contact-form-7' ), + 'pa_IN' => __( 'Punjabi', 'contact-form-7' ), + 'ru_RU' => __( 'Russian', 'contact-form-7' ), + 'ro_RO' => __( 'Romanian', 'contact-form-7' ), + 'sr_RS' => __( 'Serbian', 'contact-form-7' ), + 'si_LK' => __( 'Sinhala', 'contact-form-7' ), + 'sk_SK' => __( 'Slovak', 'contact-form-7' ), + 'sl_SI' => __( 'Slovene', 'contact-form-7' ), + 'es_ES' => __( 'Spanish', 'contact-form-7' ), + 'sv_SE' => __( 'Swedish', 'contact-form-7' ), + 'ta' => __( 'Tamil', 'contact-form-7' ), + 'th' => __( 'Thai', 'contact-form-7' ), + 'tl' => __( 'Tagalog', 'contact-form-7' ), + 'tr_TR' => __( 'Turkish', 'contact-form-7' ), + 'uk' => __( 'Ukrainian', 'contact-form-7' ), + 'vi' => __( 'Vietnamese', 'contact-form-7' ) + ); + + return $l10n; +} + +function wpcf7_is_valid_locale( $locale ) { + $l10n = wpcf7_l10n(); + return isset( $l10n[$locale] ); +} + +function wpcf7_is_rtl( $locale = '' ) { + if ( empty( $locale ) ) { + return function_exists( 'is_rtl' ) ? is_rtl() : false; + } + + $rtl_locales = array( + 'ar' => 'Arabic', + 'he_IL' => 'Hebrew', + 'fa_IR' => 'Persian' ); + + return isset( $rtl_locales[$locale] ); +} + +======= function wpcf7_l10n() { static $l10n = array(); @@ -124,6 +222,7 @@ function wpcf7_is_rtl( $locale = '' ) { return isset( $rtl_locales[$locale] ); } +>>>>>>> .r12027 function wpcf7_ajax_loader() { $url = wpcf7_plugin_url( 'images/ajax-loader.gif' ); @@ -197,6 +296,11 @@ function wpcf7_support_html5_fallback() { return (bool) apply_filters( 'wpcf7_support_html5_fallback', false ); } +function wpcf7_use_really_simple_captcha() { + return apply_filters( 'wpcf7_use_really_simple_captcha', + WPCF7_USE_REALLY_SIMPLE_CAPTCHA ); +} + function wpcf7_load_js() { return apply_filters( 'wpcf7_load_js', WPCF7_LOAD_JS ); } @@ -237,6 +341,15 @@ function wpcf7_format_atts( $atts ) { return $html; } +<<<<<<< .mine +function wpcf7_link( $url, $anchor_text, $args = '' ) { + $defaults = array( + 'id' => '', + 'class' => '' ); +||||||| .r11156 +function wpcf7_load_textdomain( $locale = null ) { + global $l10n; +======= function wpcf7_link( $url, $anchor_text, $args = '' ) { $defaults = array( 'id' => '', @@ -256,39 +369,45 @@ function wpcf7_link( $url, $anchor_text, $args = '' ) { function wpcf7_load_textdomain( $locale = null ) { global $l10n; +>>>>>>> .r12027 + + $args = wp_parse_args( $args, $defaults ); + $args = array_intersect_key( $args, $defaults ); + $atts = wpcf7_format_atts( $args ); + + $link = sprintf( '%2$s', + esc_url( $url ), + esc_html( $anchor_text ), + $atts ? ( ' ' . $atts ) : '' ); - $domain = 'contact-form-7'; + return $link; +} + +<<<<<<< .mine +||||||| .r11156 +function wpcf7_load_modules() { + $dir = WPCF7_PLUGIN_MODULES_DIR; - if ( get_locale() == $locale ) { - $locale = null; + if ( empty( $dir ) || ! is_dir( $dir ) ) { + return false; } - if ( empty( $locale ) ) { - if ( is_textdomain_loaded( $domain ) ) { - return true; - } else { - return load_plugin_textdomain( $domain, false, $domain . '/languages' ); - } - } else { - $mo_orig = $l10n[$domain]; - unload_textdomain( $domain ); + $mods = array( + 'acceptance', 'flamingo', + 'akismet', 'jetpack', 'submit', 'captcha', 'number', + 'text', 'checkbox', 'quiz', 'textarea', 'date', + 'response', 'file', 'select', 'listo' ); - $mofile = $domain . '-' . $locale . '.mo'; - $path = WP_PLUGIN_DIR . '/' . $domain . '/languages'; + foreach ( $mods as $mod ) { + $file = trailingslashit( $dir ) . $mod . '.php'; - if ( $loaded = load_textdomain( $domain, $path . '/'. $mofile ) ) { - return $loaded; - } else { - $mofile = WP_LANG_DIR . '/plugins/' . $mofile; - return load_textdomain( $domain, $mofile ); + if ( file_exists( $file ) ) { + include_once $file; } - - $l10n[$domain] = $mo_orig; } - - return false; } +======= function wpcf7_load_modules() { $dir = WPCF7_PLUGIN_MODULES_DIR; @@ -311,6 +430,7 @@ function wpcf7_load_modules() { } } +>>>>>>> .r12027 function wpcf7_get_request_uri() { static $request_uri = ''; diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/integration.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/integration.php index 79bd71be..4fc07557 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/integration.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/integration.php @@ -1,3 +1,140 @@ +<<<<<<< .mine +services[$name] ) ) { + return false; + } + + $this->services[$name] = $service; + } + + public function add_category( $name, $title ) { + $name = sanitize_key( $name ); + + if ( empty( $name ) || isset( $this->categories[$name] ) ) { + return false; + } + + $this->categories[$name] = $title; + } + + public function service_exists( $name = '' ) { + if ( '' == $name ) { + return (bool) count( $this->services ); + } else { + return isset( $this->services[$name] ); + } + } + + public function get_service( $name ) { + if ( $this->service_exists( $name ) ) { + return $this->services[$name]; + } else { + return false; + } + } + + public function list_services( $args = '' ) { + $args = wp_parse_args( $args, array( + 'include' => array() ) ); + + $singular = false; + $services = (array) $this->services; + + if ( ! empty( $args['include'] ) ) { + $services = array_intersect_key( $services, + array_flip( (array) $args['include'] ) ); + + if ( 1 == count( $services ) ) { + $singular = true; + } + } + + if ( empty( $services ) ) { + return; + } + + $action = wpcf7_current_action(); + + foreach ( $services as $name => $service ) { + $cats = array_intersect_key( $this->categories, + array_flip( $service->get_categories() ) ); +?> +
+icon(); ?> +
get_title() ); ?>
+
+ +
+link(); ?> +
+
+ +
+display( $action ); + } else { + $service->display(); + } +?> +
+
+>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/js/scripts.js b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/js/scripts.js index d60c3a22..6c69145d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/js/scripts.js +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/js/scripts.js @@ -1,14 +1,12 @@ (function($) { - if (typeof _wpcf7 == 'undefined' || _wpcf7 === null) + if (typeof _wpcf7 == 'undefined' || _wpcf7 === null) { _wpcf7 = {}; + } - _wpcf7 = $.extend({ cached: 0 }, _wpcf7); - - $(function() { - _wpcf7.supportHtml5 = $.wpcf7SupportHtml5(); - $('div.wpcf7 > form').wpcf7InitForm(); - }); + _wpcf7 = $.extend({ + cached: 0 + }, _wpcf7); $.fn.wpcf7InitForm = function() { this.ajaxForm({ @@ -33,8 +31,9 @@ } }); - if (_wpcf7.cached) + if (_wpcf7.cached) { this.wpcf7OnloadRefill(); + } this.wpcf7ToggleSubmit(); @@ -78,8 +77,9 @@ }; $.wpcf7AjaxSuccess = function(data, status, xhr, $form) { - if (! $.isPlainObject(data) || $.isEmptyObject(data)) + if (! $.isPlainObject(data) || $.isEmptyObject(data)) { return; + } var $responseOutput = $form.find('div.wpcf7-response-output'); @@ -88,11 +88,13 @@ $form.find('.wpcf7-form-control').removeClass('wpcf7-not-valid'); $form.removeClass('invalid spam sent failed'); - if (data.captcha) + if (data.captcha) { $form.wpcf7RefillCaptcha(data.captcha); + } - if (data.quiz) + if (data.quiz) { $form.wpcf7RefillQuiz(data.quiz); + } if (data.invalids) { $.each(data.invalids, function(i, n) { @@ -104,37 +106,52 @@ $responseOutput.addClass('wpcf7-validation-errors'); $form.addClass('invalid'); - $(data.into).trigger('invalid.wpcf7'); + $(data.into).trigger('wpcf7:invalid'); + $(data.into).trigger('invalid.wpcf7'); // deprecated } else if (1 == data.spam) { + $form.find('[name="g-recaptcha-response"]').each(function() { + if ('' == $(this).val()) { + var $recaptcha = $(this).closest('.wpcf7-form-control-wrap'); + $recaptcha.wpcf7NotValidTip(_wpcf7.recaptchaEmpty); + } + }); + $responseOutput.addClass('wpcf7-spam-blocked'); $form.addClass('spam'); - $(data.into).trigger('spam.wpcf7'); + $(data.into).trigger('wpcf7:spam'); + $(data.into).trigger('spam.wpcf7'); // deprecated } else if (1 == data.mailSent) { $responseOutput.addClass('wpcf7-mail-sent-ok'); $form.addClass('sent'); - if (data.onSentOk) + if (data.onSentOk) { $.each(data.onSentOk, function(i, n) { eval(n) }); + } - $(data.into).trigger('mailsent.wpcf7'); + $(data.into).trigger('wpcf7:mailsent'); + $(data.into).trigger('mailsent.wpcf7'); // deprecated } else { $responseOutput.addClass('wpcf7-mail-sent-ng'); $form.addClass('failed'); - $(data.into).trigger('mailfailed.wpcf7'); + $(data.into).trigger('wpcf7:mailfailed'); + $(data.into).trigger('mailfailed.wpcf7'); // deprecated } - if (data.onSubmit) + if (data.onSubmit) { $.each(data.onSubmit, function(i, n) { eval(n) }); + } - $(data.into).trigger('submit.wpcf7'); + $(data.into).trigger('wpcf7:submit'); + $(data.into).trigger('submit.wpcf7'); // deprecated - if (1 == data.mailSent) + if (1 == data.mailSent) { $form.resetForm(); + } $form.find('[placeholder].placeheld').each(function(i, n) { $(n).val($(n).attr('placeholder')); @@ -154,8 +171,9 @@ }; $.fn.wpcf7Placeholder = function() { - if (_wpcf7.supportHtml5.placeholder) + if (_wpcf7.supportHtml5.placeholder) { return this; + } return this.each(function() { $(this).val($(this).attr('placeholder')); @@ -188,11 +206,14 @@ $.fn.wpcf7ToggleSubmit = function() { return this.each(function() { var form = $(this); - if (this.tagName.toLowerCase() != 'form') + + if (this.tagName.toLowerCase() != 'form') { form = $(this).find('form').first(); + } - if (form.hasClass('wpcf7-acceptance-as-validation')) + if (form.hasClass('wpcf7-acceptance-as-validation')) { return; + } var submit = form.find('input:submit'); if (! submit.length) return; @@ -204,8 +225,9 @@ acceptances.each(function(i, n) { n = $(n); if (n.hasClass('wpcf7-invert') && n.is(':checked') - || ! n.hasClass('wpcf7-invert') && ! n.is(':checked')) + || ! n.hasClass('wpcf7-invert') && ! n.is(':checked')) { submit.attr('disabled', 'disabled'); + } }); }); }; @@ -316,8 +338,10 @@ $.fn.wpcf7OnloadRefill = function() { return this.each(function() { var url = $(this).attr('action'); - if (0 < url.indexOf('#')) + + if (0 < url.indexOf('#')) { url = url.substr(0, url.indexOf('#')); + } var id = $(this).find('input[name="_wpcf7"]').val(); var unitTag = $(this).find('input[name="_wpcf7_unit_tag"]').val(); @@ -325,11 +349,13 @@ $.getJSON(url, { _wpcf7_is_ajax_call: 1, _wpcf7: id, _wpcf7_request_ver: $.now() }, function(data) { - if (data && data.captcha) + if (data && data.captcha) { $('#' + unitTag).wpcf7RefillCaptcha(data.captcha); + } - if (data && data.quiz) + if (data && data.quiz) { $('#' + unitTag).wpcf7RefillQuiz(data.quiz); + } } ); }); @@ -411,4 +437,14 @@ return features; }; +<<<<<<< .mine + $(function() { + _wpcf7.supportHtml5 = $.wpcf7SupportHtml5(); + $('div.wpcf7 > form').wpcf7InitForm(); + }); + +})(jQuery); +||||||| .r11156 +})(jQuery);======= })(jQuery); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/l10n.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/l10n.php new file mode 100644 index 00000000..3b4ec85c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/l10n.php @@ -0,0 +1,131 @@ + __( 'Afrikaans', 'contact-form-7' ), + 'sq' => __( 'Albanian', 'contact-form-7' ), + 'ar' => __( 'Arabic', 'contact-form-7' ), + 'hy_AM' => __( 'Armenian', 'contact-form-7' ), + 'az' => __( 'Azerbaijani', 'contact-form-7' ), + 'bn_BD' => __( 'Bangla', 'contact-form-7' ), + 'eu' => __( 'Basque', 'contact-form-7' ), + 'be_BY' => __( 'Belarusian', 'contact-form-7' ), + 'bs_BA' => __( 'Bosnian', 'contact-form-7' ), + 'bg_BG' => __( 'Bulgarian', 'contact-form-7' ), + 'ca' => __( 'Catalan', 'contact-form-7' ), + 'ckb' => __( 'Central Kurdish', 'contact-form-7' ), + 'zh_CN' => __( 'Chinese (China)', 'contact-form-7' ), + 'zh_TW' => __( 'Chinese (Taiwan)', 'contact-form-7' ), + 'hr' => __( 'Croatian', 'contact-form-7' ), + 'cs_CZ' => __( 'Czech', 'contact-form-7' ), + 'da_DK' => __( 'Danish', 'contact-form-7' ), + 'nl_NL' => __( 'Dutch', 'contact-form-7' ), + 'en_US' => __( 'English (United States)', 'contact-form-7' ), + 'eo_EO' => __( 'Esperanto', 'contact-form-7' ), + 'et' => __( 'Estonian', 'contact-form-7' ), + 'fi' => __( 'Finnish', 'contact-form-7' ), + 'fr_FR' => __( 'French (France)', 'contact-form-7' ), + 'gl_ES' => __( 'Galician', 'contact-form-7' ), + 'gu_IN' => __( 'Gujarati', 'contact-form-7' ), + 'ka_GE' => __( 'Georgian', 'contact-form-7' ), + 'de_DE' => __( 'German', 'contact-form-7' ), + 'el' => __( 'Greek', 'contact-form-7' ), + 'ht' => __( 'Haitian', 'contact-form-7' ), + 'he_IL' => __( 'Hebrew', 'contact-form-7' ), + 'hi_IN' => __( 'Hindi', 'contact-form-7' ), + 'hu_HU' => __( 'Hungarian', 'contact-form-7' ), + 'bn_IN' => __( 'Indian Bengali', 'contact-form-7' ), + 'id_ID' => __( 'Indonesian', 'contact-form-7' ), + 'ga_IE' => __( 'Irish', 'contact-form-7' ), + 'it_IT' => __( 'Italian', 'contact-form-7' ), + 'ja' => __( 'Japanese', 'contact-form-7' ), + 'ko_KR' => __( 'Korean', 'contact-form-7' ), + 'lv' => __( 'Latvian', 'contact-form-7' ), + 'lt_LT' => __( 'Lithuanian', 'contact-form-7' ), + 'mk_MK' => __( 'Macedonian', 'contact-form-7' ), + 'ms_MY' => __( 'Malay', 'contact-form-7' ), + 'ml_IN' => __( 'Malayalam', 'contact-form-7' ), + 'mt_MT' => __( 'Maltese', 'contact-form-7' ), + 'nb_NO' => __( 'Norwegian (BokmÃ¥l)', 'contact-form-7' ), + 'fa_IR' => __( 'Persian', 'contact-form-7' ), + 'pl_PL' => __( 'Polish', 'contact-form-7' ), + 'pt_BR' => __( 'Portuguese (Brazil)', 'contact-form-7' ), + 'pt_PT' => __( 'Portuguese (Portugal)', 'contact-form-7' ), + 'pa_IN' => __( 'Punjabi', 'contact-form-7' ), + 'ru_RU' => __( 'Russian', 'contact-form-7' ), + 'ro_RO' => __( 'Romanian', 'contact-form-7' ), + 'sr_RS' => __( 'Serbian', 'contact-form-7' ), + 'si_LK' => __( 'Sinhala', 'contact-form-7' ), + 'sk_SK' => __( 'Slovak', 'contact-form-7' ), + 'sl_SI' => __( 'Slovene', 'contact-form-7' ), + 'es_ES' => __( 'Spanish (Spain)', 'contact-form-7' ), + 'sv_SE' => __( 'Swedish', 'contact-form-7' ), + 'ta' => __( 'Tamil', 'contact-form-7' ), + 'th' => __( 'Thai', 'contact-form-7' ), + 'tl' => __( 'Tagalog', 'contact-form-7' ), + 'tr_TR' => __( 'Turkish', 'contact-form-7' ), + 'uk' => __( 'Ukrainian', 'contact-form-7' ), + 'vi' => __( 'Vietnamese', 'contact-form-7' ) + ); + + return $l10n; +} + +function wpcf7_is_valid_locale( $locale ) { + $l10n = wpcf7_l10n(); + return isset( $l10n[$locale] ); +} + +function wpcf7_is_rtl( $locale = '' ) { + if ( empty( $locale ) ) { + return function_exists( 'is_rtl' ) ? is_rtl() : false; + } + + $rtl_locales = array( + 'ar' => 'Arabic', + 'he_IL' => 'Hebrew', + 'fa_IR' => 'Persian' ); + + return isset( $rtl_locales[$locale] ); +} + +function wpcf7_load_textdomain( $locale = null ) { + global $l10n; + + $domain = 'contact-form-7'; + + if ( get_locale() == $locale ) { + $locale = null; + } + + if ( empty( $locale ) ) { + if ( is_textdomain_loaded( $domain ) ) { + return true; + } else { + return load_plugin_textdomain( $domain, false, $domain . '/languages' ); + } + } else { + $mo_orig = $l10n[$domain]; + unload_textdomain( $domain ); + + $mofile = $domain . '-' . $locale . '.mo'; + $path = WP_PLUGIN_DIR . '/' . $domain . '/languages'; + + if ( $loaded = load_textdomain( $domain, $path . '/'. $mofile ) ) { + return $loaded; + } else { + $mofile = WP_LANG_DIR . '/plugins/' . $mofile; + return load_textdomain( $domain, $mofile ); + } + + $l10n[$domain] = $mo_orig; + } + + return false; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/shortcodes.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/shortcodes.php index cca1e9a3..980558ba 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/shortcodes.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/shortcodes.php @@ -349,6 +349,12 @@ class WPCF7_Shortcode { } public function get_cols_option( $default = '' ) { + $option = $this->get_option( 'cols', 'int', true ); + + if ( $option ) { + return $option; + } + $matches_a = $this->get_all_match_options( '%^([0-9]*)x([0-9]*)(?:/[0-9]+)?$%' ); @@ -361,6 +367,12 @@ class WPCF7_Shortcode { } public function get_rows_option( $default = '' ) { + $option = $this->get_option( 'rows', 'int', true ); + + if ( $option ) { + return $option; + } + $matches_a = $this->get_all_match_options( '%^([0-9]*)x([0-9]*)(?:/[0-9]+)?$%' ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/submission.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/submission.php index 401186b9..502ed45e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/submission.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/includes/submission.php @@ -131,9 +131,11 @@ class WPCF7_Submission { } $this->meta = array( - 'remote_ip' => preg_replace( '/[^0-9a-f.:, ]/', '', - $_SERVER['REMOTE_ADDR'] ), - 'user_agent' => substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 ), + 'remote_ip' => isset( $_SERVER['REMOTE_ADDR'] ) + ? preg_replace( '/[^0-9a-f.:, ]/', '', $_SERVER['REMOTE_ADDR'] ) + : '', + 'user_agent' => isset( $_SERVER['HTTP_USER_AGENT'] ) + ? substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 ) : '', 'url' => preg_replace( '%(? current_time( 'timestamp' ), diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-da_DK.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-da_DK.mo index ab9361b9..7ce73d31 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-da_DK.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-da_DK.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-fa_IR.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-fa_IR.mo index 68f6a357..fcbbda43 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-fa_IR.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-fa_IR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hr.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hr.mo index bb873c6e..ddfddbef 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hr.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hr.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hu_HU.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hu_HU.mo index 6c3debe6..b70b1bbc 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hu_HU.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-hu_HU.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-ja.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-ja.mo index 2a6a4e4c..2c71f911 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-ja.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-ja.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-pt_PT.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-pt_PT.mo index e534547e..a36c8b4b 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-pt_PT.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-pt_PT.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-sv_SE.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-sv_SE.mo index 992435d2..d1c6350f 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-sv_SE.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-sv_SE.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-tr_TR.mo b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-tr_TR.mo index bbfff3f8..857f750a 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-tr_TR.mo and b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7-tr_TR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7.pot b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7.pot index 167a1861..5886e518 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7.pot +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/languages/contact-form-7.pot @@ -3,8 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: Contact Form 7\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< .mine +"POT-Creation-Date: 2015-11-24 01:46+0900\n" +"PO-Revision-Date: 2015-05-18 21:49+0900\n" +||||||| .r11156 +"POT-Creation-Date: 2014-08-31 15:20+0900\n" +"PO-Revision-Date: 2014-08-31 15:20+0900\n" +======= "POT-Creation-Date: 2015-07-22 06:38+0900\n" "PO-Revision-Date: 2015-05-18 21:49+0900\n" +>>>>>>> .r12027 "Last-Translator: Takayuki Miyoshi \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -14,43 +22,112 @@ msgstr "" "X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_c\n" "X-Poedit-Basepath: ../..\n" "Plural-Forms: nplurals=1; plural=0;\n" +<<<<<<< .mine +"X-Generator: Poedit 1.8.6\n" +||||||| .r11156 +"X-Generator: Poedit 1.5.7\n" +======= "X-Generator: Poedit 1.8.1\n" +>>>>>>> .r12027 "X-Poedit-SearchPath-0: contact-form-7\n" #: contact-form-7/wp-contact-form-7.php:5 msgid "Just another contact form plugin. Simple but flexible." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:16 contact-form-7/modules/flamingo.php:136 +||||||| .r11156 +#: contact-form-7/settings.php:71 +#, php-format +msgid "Contact form %d" +msgstr "" + +#: contact-form-7/admin/admin.php:8 contact-form-7/modules/flamingo.php:134 +======= #: contact-form-7/admin/admin.php:10 contact-form-7/modules/flamingo.php:134 +>>>>>>> .r12027 msgid "Contact Form 7" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:17 +||||||| .r11156 +#: contact-form-7/admin/admin.php:9 +======= #: contact-form-7/admin/admin.php:11 +>>>>>>> .r12027 msgid "Contact" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:22 +#: contact-form-7/admin/edit-contact-form.php:38 +||||||| .r11156 +#: contact-form-7/admin/admin.php:14 +#: contact-form-7/admin/edit-contact-form.php:13 +======= #: contact-form-7/admin/admin.php:16 #: contact-form-7/admin/edit-contact-form.php:38 +>>>>>>> .r12027 msgid "Edit Contact Form" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:23 contact-form-7/admin/admin.php:239 +||||||| .r11156 +#: contact-form-7/admin/admin.php:15 contact-form-7/admin/admin.php:155 +#: contact-form-7/admin/admin.php:211 +======= #: contact-form-7/admin/admin.php:17 contact-form-7/admin/admin.php:178 #: contact-form-7/admin/admin.php:234 +>>>>>>> .r12027 #: contact-form-7/includes/contact-form.php:29 msgid "Contact Forms" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:30 contact-form-7/admin/admin.php:283 +#: contact-form-7/admin/edit-contact-form.php:36 +||||||| .r11156 +#: contact-form-7/admin/admin.php:22 contact-form-7/admin/admin.php:253 +#: contact-form-7/admin/edit-contact-form.php:11 +======= #: contact-form-7/admin/admin.php:24 contact-form-7/admin/admin.php:278 #: contact-form-7/admin/edit-contact-form.php:36 +>>>>>>> .r12027 msgid "Add New Contact Form" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:31 contact-form-7/admin/admin.php:242 +#: contact-form-7/admin/admin.php:288 contact-form-7/admin/admin.php:300 +#: contact-form-7/admin/edit-contact-form.php:41 +||||||| .r11156 +#: contact-form-7/admin/admin.php:23 contact-form-7/admin/admin.php:213 +#: contact-form-7/admin/admin.php:258 contact-form-7/admin/admin.php:270 +#: contact-form-7/admin/edit-contact-form.php:15 +======= #: contact-form-7/admin/admin.php:25 contact-form-7/admin/admin.php:237 #: contact-form-7/admin/admin.php:283 contact-form-7/admin/admin.php:295 #: contact-form-7/admin/edit-contact-form.php:41 +>>>>>>> .r12027 msgid "Add New" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:41 contact-form-7/admin/admin.php:325 +msgid "Integration with Other Services" +msgstr "" + +#: contact-form-7/admin/admin.php:42 +msgid "Integration" +msgstr "" + +#: contact-form-7/admin/admin.php:72 contact-form-7/admin/admin.php:94 +||||||| .r11156 +#: contact-form-7/admin/admin.php:52 contact-form-7/admin/admin.php:73 +======= #: contact-form-7/admin/admin.php:35 contact-form-7/admin/admin.php:320 msgid "Integration with Other Services" msgstr "" @@ -60,81 +137,249 @@ msgid "Integration" msgstr "" #: contact-form-7/admin/admin.php:66 contact-form-7/admin/admin.php:88 +>>>>>>> .r12027 msgid "You are not allowed to edit this item." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:133 +||||||| .r11156 +#: contact-form-7/admin/admin.php:112 +======= #: contact-form-7/admin/admin.php:127 +>>>>>>> .r12027 msgid "You are not allowed to delete this item." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:136 +||||||| .r11156 +#: contact-form-7/admin/admin.php:115 +======= #: contact-form-7/admin/admin.php:130 +>>>>>>> .r12027 msgid "Error in deleting." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:213 +msgid "The changes you made will be lost if you navigate away from this page." +||||||| .r11156 +#: contact-form-7/admin/admin.php:190 +msgid "Generate Tag" +======= #: contact-form-7/admin/admin.php:208 msgid "The changes you made will be lost if you navigate away from this page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:247 +||||||| .r11156 +#: contact-form-7/admin/admin.php:217 +======= #: contact-form-7/admin/admin.php:242 +>>>>>>> .r12027 #, php-format msgid "Search results for “%s”" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:256 +||||||| .r11156 +#: contact-form-7/admin/admin.php:226 +======= #: contact-form-7/admin/admin.php:251 +>>>>>>> .r12027 msgid "Search Contact Forms" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:287 +||||||| .r11156 +#: contact-form-7/admin/admin.php:257 +======= #: contact-form-7/admin/admin.php:282 +>>>>>>> .r12027 #, php-format msgid "Use the default language (%s)" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:291 +||||||| .r11156 +#: contact-form-7/admin/admin.php:261 +======= #: contact-form-7/admin/admin.php:286 +>>>>>>> .r12027 msgid "Or" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:295 +||||||| .r11156 +#: contact-form-7/admin/admin.php:265 +======= #: contact-form-7/admin/admin.php:290 +>>>>>>> .r12027 msgid "(select language)" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:354 +||||||| .r11156 +#: contact-form-7/admin/admin.php:277 +msgid "Form" +msgstr "" + +#: contact-form-7/admin/admin.php:280 +msgid "Mail" +msgstr "" + +#: contact-form-7/admin/admin.php:283 +msgid "Mail (2)" +msgstr "" + +#: contact-form-7/admin/admin.php:288 +msgid "Use mail (2)" +msgstr "" + +#: contact-form-7/admin/admin.php:290 +msgid "Messages" +msgstr "" + +#: contact-form-7/admin/admin.php:293 +msgid "Additional Settings" +msgstr "" + +#: contact-form-7/admin/admin.php:308 +======= #: contact-form-7/admin/admin.php:348 +>>>>>>> .r12027 msgid "Contact form created." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:356 +||||||| .r11156 +#: contact-form-7/admin/admin.php:310 +======= #: contact-form-7/admin/admin.php:350 +>>>>>>> .r12027 msgid "Contact form saved." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:358 +||||||| .r11156 +#: contact-form-7/admin/admin.php:312 +======= #: contact-form-7/admin/admin.php:352 +>>>>>>> .r12027 msgid "Contact form deleted." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:373 +||||||| .r11156 +#: contact-form-7/admin/admin.php:329 +======= #: contact-form-7/admin/admin.php:369 +>>>>>>> .r12027 msgid "Settings" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:391 +||||||| .r11156 +#: contact-form-7/admin/admin.php:340 +msgid "http://contactform7.com/docs/" +msgstr "" + +#: contact-form-7/admin/admin.php:341 +msgid "Docs" +msgstr "" + +#: contact-form-7/admin/admin.php:342 +msgid "http://contactform7.com/faq/" +msgstr "" + +#: contact-form-7/admin/admin.php:343 +msgid "FAQ" +msgstr "" + +#: contact-form-7/admin/admin.php:344 +msgid "http://contactform7.com/support/" +msgstr "" + +#: contact-form-7/admin/admin.php:345 +msgid "Support" +msgstr "" + +#: contact-form-7/admin/admin.php:346 contact-form-7/admin/admin.php:402 +msgid "http://contactform7.com/donate/" +msgstr "" + +#: contact-form-7/admin/admin.php:347 contact-form-7/admin/admin.php:402 +msgid "Donate" +msgstr "" + +#: contact-form-7/admin/admin.php:369 +======= #: contact-form-7/admin/admin.php:392 +>>>>>>> .r12027 #, php-format msgid "" "Contact Form 7 %1$s requires WordPress %2$s or higher. " "Please update WordPress first." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:417 +||||||| .r11156 +#: contact-form-7/admin/admin.php:395 +======= #: contact-form-7/admin/admin.php:418 +>>>>>>> .r12027 msgid "Dismiss" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:422 +||||||| .r11156 +#: contact-form-7/admin/admin.php:400 +======= #: contact-form-7/admin/admin.php:423 +>>>>>>> .r12027 msgid "Contact Form 7 Needs Your Support" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:423 +||||||| .r11156 +#: contact-form-7/admin/admin.php:401 +======= #: contact-form-7/admin/admin.php:424 +>>>>>>> .r12027 msgid "" "It is hard to continue development and support for this plugin without " "contributions from users like you. If you enjoy using Contact Form 7 and " "find it useful, please consider making a donation." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:424 +msgid "http://contactform7.com/donate/" +msgstr "" + +#: contact-form-7/admin/admin.php:424 +msgid "Donate" +msgstr "" + +#: contact-form-7/admin/admin.php:428 +||||||| .r11156 +#: contact-form-7/admin/admin.php:406 +======= #: contact-form-7/admin/admin.php:425 msgid "http://contactform7.com/donate/" msgstr "" @@ -144,78 +389,200 @@ msgid "Donate" msgstr "" #: contact-form-7/admin/admin.php:429 +>>>>>>> .r12027 msgid "Get Started" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:430 +||||||| .r11156 +#: contact-form-7/admin/admin.php:408 +======= #: contact-form-7/admin/admin.php:431 +>>>>>>> .r12027 msgid "http://contactform7.com/getting-started-with-contact-form-7/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:430 +||||||| .r11156 +#: contact-form-7/admin/admin.php:408 +======= #: contact-form-7/admin/admin.php:431 +>>>>>>> .r12027 msgid "Getting Started with Contact Form 7" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:431 +||||||| .r11156 +#: contact-form-7/admin/admin.php:409 +======= #: contact-form-7/admin/admin.php:432 +>>>>>>> .r12027 msgid "http://contactform7.com/admin-screen/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:431 +||||||| .r11156 +#: contact-form-7/admin/admin.php:409 +======= #: contact-form-7/admin/admin.php:432 +>>>>>>> .r12027 msgid "Admin Screen" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:432 +||||||| .r11156 +#: contact-form-7/admin/admin.php:410 +======= #: contact-form-7/admin/admin.php:433 +>>>>>>> .r12027 msgid "http://contactform7.com/tag-syntax/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:432 +||||||| .r11156 +#: contact-form-7/admin/admin.php:410 +======= #: contact-form-7/admin/admin.php:433 +>>>>>>> .r12027 msgid "How Tags Work" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:433 +||||||| .r11156 +#: contact-form-7/admin/admin.php:411 +======= #: contact-form-7/admin/admin.php:434 +>>>>>>> .r12027 msgid "http://contactform7.com/setting-up-mail/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:433 +||||||| .r11156 +#: contact-form-7/admin/admin.php:411 +======= #: contact-form-7/admin/admin.php:434 +>>>>>>> .r12027 msgid "Setting Up Mail" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:438 +||||||| .r11156 +#: contact-form-7/admin/admin.php:416 +======= #: contact-form-7/admin/admin.php:439 +>>>>>>> .r12027 msgid "Did You Know?" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:440 +||||||| .r11156 +#: contact-form-7/admin/admin.php:418 +======= #: contact-form-7/admin/admin.php:441 +>>>>>>> .r12027 msgid "http://contactform7.com/spam-filtering-with-akismet/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:440 +||||||| .r11156 +#: contact-form-7/admin/admin.php:418 +======= #: contact-form-7/admin/admin.php:441 +>>>>>>> .r12027 msgid "Spam Filtering with Akismet" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:441 +||||||| .r11156 +#: contact-form-7/admin/admin.php:419 +======= #: contact-form-7/admin/admin.php:442 +>>>>>>> .r12027 msgid "http://contactform7.com/save-submitted-messages-with-flamingo/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:441 +||||||| .r11156 +#: contact-form-7/admin/admin.php:419 +======= #: contact-form-7/admin/admin.php:442 +>>>>>>> .r12027 msgid "Save Messages with Flamingo" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:442 +||||||| .r11156 +#: contact-form-7/admin/admin.php:420 +======= #: contact-form-7/admin/admin.php:443 +>>>>>>> .r12027 msgid "http://contactform7.com/selectable-recipient-with-pipes/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:442 +||||||| .r11156 +#: contact-form-7/admin/admin.php:420 +======= #: contact-form-7/admin/admin.php:443 +>>>>>>> .r12027 msgid "Selectable Recipient with Pipes" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:443 +||||||| .r11156 +#: contact-form-7/admin/admin.php:421 +======= #: contact-form-7/admin/admin.php:444 +>>>>>>> .r12027 msgid "" "http://contactform7.com/tracking-form-submissions-with-google-analytics/" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:443 +||||||| .r11156 +#: contact-form-7/admin/admin.php:421 +======= #: contact-form-7/admin/admin.php:444 +>>>>>>> .r12027 msgid "Tracking with Google Analytics" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/admin.php:488 +msgid "You are not allowed to edit this contact form." +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:26 +#: contact-form-7/admin/edit-contact-form.php:124 +#: contact-form-7/modules/recaptcha.php:206 +msgid "Save" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:74 +msgid "Enter title here" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:96 +||||||| .r11156 +#: contact-form-7/admin/edit-contact-form.php:47 +======= #: contact-form-7/admin/admin.php:489 msgid "You are not allowed to edit this contact form." msgstr "" @@ -230,6 +597,7 @@ msgid "Enter title here" msgstr "" #: contact-form-7/admin/edit-contact-form.php:96 +>>>>>>> .r12027 msgid "" "Copy this shortcode and paste it into your post, page, or text widget " "content:" @@ -259,6 +627,74 @@ msgid "" " 'Cancel' to stop, 'OK' to delete." msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/edit-contact-form.php:158 +msgid "Information" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:161 +#: contact-form-7/admin/includes/help-tabs.php:103 +msgid "http://contactform7.com/docs/" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:161 +#: contact-form-7/admin/includes/help-tabs.php:103 +msgid "Docs" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:162 +#: contact-form-7/admin/includes/help-tabs.php:104 +msgid "http://contactform7.com/faq/" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:162 +#: contact-form-7/admin/includes/help-tabs.php:104 +msgid "FAQ" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:163 +#: contact-form-7/admin/includes/help-tabs.php:105 +msgid "http://contactform7.com/support/" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:163 +#: contact-form-7/admin/includes/help-tabs.php:105 +msgid "Support" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:172 +#, php-format +msgid "%s keys switch panels" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:182 +#: contact-form-7/admin/includes/editor.php:45 +msgid "Form" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:185 +#: contact-form-7/admin/includes/editor.php:72 +msgid "Mail" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:188 +#: contact-form-7/admin/includes/editor.php:172 +msgid "Messages" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:199 +#, php-format +msgid "Additional Settings (%d)" +msgstr "" + +#: contact-form-7/admin/edit-contact-form.php:201 +#: contact-form-7/admin/includes/editor.php:195 +#: contact-form-7/admin/includes/editor.php:200 +msgid "Additional Settings" +msgstr "" + +||||||| .r11156 +======= #: contact-form-7/admin/edit-contact-form.php:156 msgid "Information" msgstr "" @@ -324,6 +760,7 @@ msgstr "" msgid "Additional Settings" msgstr "" +>>>>>>> .r12027 #: contact-form-7/admin/includes/class-contact-forms-list-table.php:11 msgid "Title" msgstr "" @@ -349,16 +786,34 @@ msgstr "" msgid "Edit “%s”" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:165 +||||||| .r11156 +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:158 +======= #: contact-form-7/admin/includes/class-contact-forms-list-table.php:160 +>>>>>>> .r12027 msgid "Y/m/d g:i:s A" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:172 +||||||| .r11156 +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:165 +======= #: contact-form-7/admin/includes/class-contact-forms-list-table.php:167 +>>>>>>> .r12027 #, php-format msgid "%s ago" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:174 +||||||| .r11156 +#: contact-form-7/admin/includes/class-contact-forms-list-table.php:167 +======= #: contact-form-7/admin/includes/class-contact-forms-list-table.php:169 +>>>>>>> .r12027 msgid "Y/m/d" msgstr "" @@ -411,6 +866,19 @@ msgstr "" msgid "File Attachments" msgstr "" +<<<<<<< .mine +#: contact-form-7/admin/includes/editor.php:174 +msgid "Edit messages used in the following situations." +msgstr "" + +#: contact-form-7/admin/includes/editor.php:194 +msgid "http://contactform7.com/additional-settings/" +msgstr "" + +#: contact-form-7/admin/includes/editor.php:196 +||||||| .r11156 +#: contact-form-7/includes/contact-form.php:152 +======= #: contact-form-7/admin/includes/editor.php:169 msgid "Edit messages used in the following situations." msgstr "" @@ -420,6 +888,7 @@ msgid "http://contactform7.com/additional-settings/" msgstr "" #: contact-form-7/admin/includes/editor.php:191 +>>>>>>> .r12027 #, php-format msgid "You can add customization code snippets here. For details, see %s." msgstr "" @@ -678,16 +1147,77 @@ msgstr "" msgid "Please fill in the required field." msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/contact-form-template.php:159 +msgid "" +"There is a field that the user input is longer than the maximum allowed " +"length" +msgstr "" + +#: contact-form-7/includes/contact-form-template.php:161 +msgid "This input is too long." +msgstr "" + +#: contact-form-7/includes/contact-form-template.php:166 +msgid "" +"There is a field that the user input is shorter than the minimum allowed " +"length" +msgstr "" + +#: contact-form-7/includes/contact-form-template.php:168 +msgid "This input is too short." +msgstr "" + +#: contact-form-7/includes/contact-form.php:30 +msgid "Contact Form" +msgstr "" + +#: contact-form-7/includes/contact-form.php:76 +#: contact-form-7/includes/contact-form.php:226 +msgid "Untitled" +msgstr "" + +#: contact-form-7/includes/contact-form.php:152 +#, php-format +msgid "" +"%1$s property of a WPCF7_ContactForm object is " +"no longer accessible. Use %2$s method instead." +msgstr "" + +#: contact-form-7/includes/controller.php:170 +msgid "Please verify that you are not a robot." +msgstr "" + +#: contact-form-7/includes/controller.php:171 +msgid "Sending ..." +||||||| .r11156 +#: contact-form-7/includes/controller.php:211 +msgid "Sending ..." +======= #: contact-form-7/includes/contact-form-template.php:159 msgid "" "There is a field that the user input is longer than the maximum allowed " "length" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:11 +msgid "Afrikaans" +||||||| .r11156 +#: contact-form-7/includes/functions.php:39 +msgid "Afrikaans" +======= #: contact-form-7/includes/contact-form-template.php:161 msgid "This input is too long." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:12 +||||||| .r11156 +#: contact-form-7/includes/functions.php:40 +======= #: contact-form-7/includes/contact-form-template.php:166 msgid "" "There is a field that the user input is shorter than the minimum allowed " @@ -719,230 +1249,301 @@ msgid "Sending ..." msgstr "" #: contact-form-7/includes/functions.php:40 +>>>>>>> .r12027 msgid "Afrikaans" msgstr "" -#: contact-form-7/includes/functions.php:41 +#: contact-form-7/includes/l10n.php:13 msgid "Albanian" msgstr "" -#: contact-form-7/includes/functions.php:42 +#: contact-form-7/includes/l10n.php:14 msgid "Arabic" msgstr "" -#: contact-form-7/includes/functions.php:43 +#: contact-form-7/includes/l10n.php:15 msgid "Armenian" msgstr "" -#: contact-form-7/includes/functions.php:44 +#: contact-form-7/includes/l10n.php:16 msgid "Azerbaijani" msgstr "" -#: contact-form-7/includes/functions.php:45 +#: contact-form-7/includes/l10n.php:17 msgid "Bangla" msgstr "" -#: contact-form-7/includes/functions.php:46 +#: contact-form-7/includes/l10n.php:18 msgid "Basque" msgstr "" -#: contact-form-7/includes/functions.php:47 +#: contact-form-7/includes/l10n.php:19 msgid "Belarusian" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:20 +||||||| .r11156 +#: contact-form-7/includes/functions.php:48 +msgid "Brazilian Portuguese" +msgstr "" + +#: contact-form-7/includes/functions.php:49 +======= #: contact-form-7/includes/functions.php:48 msgid "Bosnian" msgstr "" #: contact-form-7/includes/functions.php:49 +>>>>>>> .r12027 msgid "Bulgarian" msgstr "" -#: contact-form-7/includes/functions.php:50 +#: contact-form-7/includes/l10n.php:21 msgid "Catalan" msgstr "" -#: contact-form-7/includes/functions.php:51 +#: contact-form-7/includes/l10n.php:22 msgid "Central Kurdish" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:23 +msgid "Chinese (China)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:52 +msgid "Chinese (Simplified)" +======= #: contact-form-7/includes/functions.php:52 msgid "Chinese (China)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:24 +msgid "Chinese (Taiwan)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:53 +msgid "Chinese (Traditional)" +======= #: contact-form-7/includes/functions.php:53 msgid "Chinese (Taiwan)" +>>>>>>> .r12027 msgstr "" -#: contact-form-7/includes/functions.php:54 +#: contact-form-7/includes/l10n.php:25 msgid "Croatian" msgstr "" -#: contact-form-7/includes/functions.php:55 +#: contact-form-7/includes/l10n.php:26 msgid "Czech" msgstr "" -#: contact-form-7/includes/functions.php:56 +#: contact-form-7/includes/l10n.php:27 msgid "Danish" msgstr "" -#: contact-form-7/includes/functions.php:57 +#: contact-form-7/includes/l10n.php:28 msgid "Dutch" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:29 +msgid "English (United States)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:58 +msgid "English" +======= #: contact-form-7/includes/functions.php:58 msgid "English (United States)" +>>>>>>> .r12027 msgstr "" -#: contact-form-7/includes/functions.php:59 +#: contact-form-7/includes/l10n.php:30 msgid "Esperanto" msgstr "" -#: contact-form-7/includes/functions.php:60 +#: contact-form-7/includes/l10n.php:31 msgid "Estonian" msgstr "" -#: contact-form-7/includes/functions.php:61 +#: contact-form-7/includes/l10n.php:32 msgid "Finnish" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:33 +msgid "French (France)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:62 +msgid "French" +======= #: contact-form-7/includes/functions.php:62 msgid "French (France)" +>>>>>>> .r12027 msgstr "" -#: contact-form-7/includes/functions.php:63 +#: contact-form-7/includes/l10n.php:34 msgid "Galician" msgstr "" -#: contact-form-7/includes/functions.php:64 +#: contact-form-7/includes/l10n.php:35 msgid "Gujarati" msgstr "" -#: contact-form-7/includes/functions.php:65 +#: contact-form-7/includes/l10n.php:36 msgid "Georgian" msgstr "" -#: contact-form-7/includes/functions.php:66 +#: contact-form-7/includes/l10n.php:37 msgid "German" msgstr "" -#: contact-form-7/includes/functions.php:67 +#: contact-form-7/includes/l10n.php:38 msgid "Greek" msgstr "" -#: contact-form-7/includes/functions.php:68 +#: contact-form-7/includes/l10n.php:39 msgid "Haitian" msgstr "" -#: contact-form-7/includes/functions.php:69 +#: contact-form-7/includes/l10n.php:40 msgid "Hebrew" msgstr "" -#: contact-form-7/includes/functions.php:70 +#: contact-form-7/includes/l10n.php:41 msgid "Hindi" msgstr "" -#: contact-form-7/includes/functions.php:71 +#: contact-form-7/includes/l10n.php:42 msgid "Hungarian" msgstr "" -#: contact-form-7/includes/functions.php:72 +#: contact-form-7/includes/l10n.php:43 msgid "Indian Bengali" msgstr "" -#: contact-form-7/includes/functions.php:73 +#: contact-form-7/includes/l10n.php:44 msgid "Indonesian" msgstr "" -#: contact-form-7/includes/functions.php:74 +#: contact-form-7/includes/l10n.php:45 msgid "Irish" msgstr "" -#: contact-form-7/includes/functions.php:75 +#: contact-form-7/includes/l10n.php:46 msgid "Italian" msgstr "" -#: contact-form-7/includes/functions.php:76 +#: contact-form-7/includes/l10n.php:47 msgid "Japanese" msgstr "" -#: contact-form-7/includes/functions.php:77 +#: contact-form-7/includes/l10n.php:48 msgid "Korean" msgstr "" -#: contact-form-7/includes/functions.php:78 +#: contact-form-7/includes/l10n.php:49 msgid "Latvian" msgstr "" -#: contact-form-7/includes/functions.php:79 +#: contact-form-7/includes/l10n.php:50 msgid "Lithuanian" msgstr "" -#: contact-form-7/includes/functions.php:80 +#: contact-form-7/includes/l10n.php:51 msgid "Macedonian" msgstr "" -#: contact-form-7/includes/functions.php:81 +#: contact-form-7/includes/l10n.php:52 msgid "Malay" msgstr "" -#: contact-form-7/includes/functions.php:82 +#: contact-form-7/includes/l10n.php:53 msgid "Malayalam" msgstr "" -#: contact-form-7/includes/functions.php:83 +#: contact-form-7/includes/l10n.php:54 msgid "Maltese" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:55 +msgid "Norwegian (BokmÃ¥l)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:84 +msgid "Norwegian" +======= #: contact-form-7/includes/functions.php:84 msgid "Norwegian (BokmÃ¥l)" +>>>>>>> .r12027 msgstr "" -#: contact-form-7/includes/functions.php:85 +#: contact-form-7/includes/l10n.php:56 msgid "Persian" msgstr "" -#: contact-form-7/includes/functions.php:86 +#: contact-form-7/includes/l10n.php:57 msgid "Polish" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:58 +msgid "Portuguese (Brazil)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:87 +msgid "Portuguese" +======= #: contact-form-7/includes/functions.php:87 msgid "Portuguese (Brazil)" +>>>>>>> .r12027 +msgstr "" + +#: contact-form-7/includes/l10n.php:59 +msgid "Portuguese (Portugal)" msgstr "" -#: contact-form-7/includes/functions.php:88 +#: contact-form-7/includes/l10n.php:60 msgid "Portuguese (Portugal)" msgstr "" -#: contact-form-7/includes/functions.php:89 +#: contact-form-7/includes/l10n.php:61 msgid "Punjabi" msgstr "" -#: contact-form-7/includes/functions.php:90 +#: contact-form-7/includes/l10n.php:62 msgid "Russian" msgstr "" -#: contact-form-7/includes/functions.php:91 +#: contact-form-7/includes/l10n.php:63 msgid "Romanian" msgstr "" -#: contact-form-7/includes/functions.php:92 +#: contact-form-7/includes/l10n.php:64 msgid "Serbian" msgstr "" -#: contact-form-7/includes/functions.php:93 +#: contact-form-7/includes/l10n.php:65 msgid "Sinhala" msgstr "" -#: contact-form-7/includes/functions.php:94 +#: contact-form-7/includes/l10n.php:66 msgid "Slovak" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:67 +msgid "Spanish (Spain)" +||||||| .r11156 +#: contact-form-7/includes/functions.php:95 +msgid "Spanish" +======= #: contact-form-7/includes/functions.php:95 msgid "Slovene" +>>>>>>> .r12027 msgstr "" -#: contact-form-7/includes/functions.php:96 +#: contact-form-7/includes/l10n.php:68 msgid "Spanish (Spain)" msgstr "" @@ -950,44 +1551,151 @@ msgstr "" msgid "Swedish" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:69 +||||||| .r11156 +#: contact-form-7/includes/functions.php:97 +======= #: contact-form-7/includes/functions.php:98 +>>>>>>> .r12027 msgid "Tamil" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:70 +||||||| .r11156 +#: contact-form-7/includes/functions.php:98 +======= #: contact-form-7/includes/functions.php:99 +>>>>>>> .r12027 msgid "Thai" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:71 +||||||| .r11156 +#: contact-form-7/includes/functions.php:99 +======= #: contact-form-7/includes/functions.php:100 +>>>>>>> .r12027 msgid "Tagalog" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:72 +||||||| .r11156 +#: contact-form-7/includes/functions.php:100 +======= #: contact-form-7/includes/functions.php:101 +>>>>>>> .r12027 msgid "Turkish" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:73 +||||||| .r11156 +#: contact-form-7/includes/functions.php:101 +======= #: contact-form-7/includes/functions.php:102 +>>>>>>> .r12027 msgid "Ukrainian" msgstr "" +<<<<<<< .mine +#: contact-form-7/includes/l10n.php:74 +||||||| .r11156 +#: contact-form-7/includes/functions.php:102 +======= #: contact-form-7/includes/functions.php:103 +>>>>>>> .r12027 msgid "Vietnamese" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:130 +msgid "acceptance" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:137 +msgid "Acceptance" +======= #: contact-form-7/modules/acceptance.php:132 msgid "acceptance" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:138 +#, php-format +msgid "" +"Generate a form-tag for an acceptance checkbox. For more details, see %s." +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:146 +#: contact-form-7/modules/captcha.php:210 +#: contact-form-7/modules/checkbox.php:289 contact-form-7/modules/date.php:164 +#: contact-form-7/modules/file.php:241 contact-form-7/modules/number.php:174 +#: contact-form-7/modules/quiz.php:171 contact-form-7/modules/select.php:161 +#: contact-form-7/modules/text.php:217 contact-form-7/modules/textarea.php:116 +msgid "Name" +======= #: contact-form-7/modules/acceptance.php:140 #, php-format msgid "" "Generate a form-tag for an acceptance checkbox. For more details, see %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:140 +msgid "http://contactform7.com/acceptance-checkbox/" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:151 +#: contact-form-7/modules/acceptance.php:154 +#: contact-form-7/modules/captcha.php:217 +#: contact-form-7/modules/captcha.php:220 +#: contact-form-7/modules/captcha.php:225 +#: contact-form-7/modules/captcha.php:228 +#: contact-form-7/modules/captcha.php:232 +#: contact-form-7/modules/captcha.php:243 +#: contact-form-7/modules/captcha.php:246 +#: contact-form-7/modules/captcha.php:251 +#: contact-form-7/modules/captcha.php:254 +#: contact-form-7/modules/checkbox.php:294 +#: contact-form-7/modules/checkbox.php:297 contact-form-7/modules/date.php:169 +#: contact-form-7/modules/date.php:172 contact-form-7/modules/date.php:177 +#: contact-form-7/modules/date.php:180 contact-form-7/modules/date.php:185 +#: contact-form-7/modules/date.php:190 contact-form-7/modules/file.php:246 +#: contact-form-7/modules/file.php:249 contact-form-7/modules/file.php:254 +#: contact-form-7/modules/file.php:257 contact-form-7/modules/number.php:179 +#: contact-form-7/modules/number.php:182 contact-form-7/modules/number.php:187 +#: contact-form-7/modules/number.php:190 contact-form-7/modules/number.php:195 +#: contact-form-7/modules/number.php:200 contact-form-7/modules/quiz.php:176 +#: contact-form-7/modules/quiz.php:179 contact-form-7/modules/quiz.php:184 +#: contact-form-7/modules/quiz.php:187 contact-form-7/modules/select.php:166 +#: contact-form-7/modules/select.php:169 contact-form-7/modules/submit.php:59 +#: contact-form-7/modules/submit.php:62 contact-form-7/modules/submit.php:67 +#: contact-form-7/modules/text.php:222 contact-form-7/modules/text.php:225 +#: contact-form-7/modules/text.php:230 contact-form-7/modules/text.php:233 +#: contact-form-7/modules/text.php:239 contact-form-7/modules/text.php:252 +#: contact-form-7/modules/textarea.php:121 +#: contact-form-7/modules/textarea.php:124 +#: contact-form-7/modules/textarea.php:129 +#: contact-form-7/modules/textarea.php:132 +#: contact-form-7/modules/textarea.php:137 +#: contact-form-7/modules/textarea.php:142 +msgid "optional" +======= #: contact-form-7/modules/acceptance.php:142 msgid "http://contactform7.com/acceptance-checkbox/" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:140 +msgid "Acceptance Checkbox" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:160 +msgid "Make this checkbox checked by default?" +======= #: contact-form-7/modules/acceptance.php:142 msgid "Acceptance Checkbox" msgstr "" @@ -1007,16 +1715,56 @@ msgstr "" #: contact-form-7/modules/checkbox.php:318 #: contact-form-7/modules/select.php:195 contact-form-7/modules/select.php:198 msgid "Options" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:150 +#: contact-form-7/modules/checkbox.php:309 contact-form-7/modules/date.php:169 +#: contact-form-7/modules/file.php:253 contact-form-7/modules/number.php:177 +#: contact-form-7/modules/quiz.php:181 +#: contact-form-7/modules/really-simple-captcha.php:233 +#: contact-form-7/modules/select.php:188 contact-form-7/modules/text.php:239 +#: contact-form-7/modules/textarea.php:155 +msgid "Name" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:161 +msgid "Make this checkbox work inversely?" +======= #: contact-form-7/modules/acceptance.php:161 msgid "Make this checkbox checked by default" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:155 +#: contact-form-7/modules/acceptance.php:158 +#: contact-form-7/modules/checkbox.php:314 +#: contact-form-7/modules/checkbox.php:317 +#: contact-form-7/modules/select.php:193 contact-form-7/modules/select.php:196 +msgid "Options" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:162 +msgid "* That means visitor who accepts the term unchecks it." +======= #: contact-form-7/modules/acceptance.php:162 msgid "Make this work inversely" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:159 +msgid "Make this checkbox checked by default" +||||||| .r11156 +#: contact-form-7/modules/acceptance.php:167 +#: contact-form-7/modules/captcha.php:259 +#: contact-form-7/modules/checkbox.php:317 contact-form-7/modules/date.php:198 +#: contact-form-7/modules/file.php:262 contact-form-7/modules/number.php:208 +#: contact-form-7/modules/quiz.php:199 contact-form-7/modules/select.php:186 +#: contact-form-7/modules/submit.php:74 contact-form-7/modules/text.php:260 +#: contact-form-7/modules/textarea.php:150 +msgid "Copy this code and paste it into the form left." +======= #: contact-form-7/modules/acceptance.php:168 #: contact-form-7/modules/captcha.php:240 #: contact-form-7/modules/captcha.php:255 @@ -1026,8 +1774,18 @@ msgstr "" #: contact-form-7/modules/submit.php:73 contact-form-7/modules/text.php:281 #: contact-form-7/modules/textarea.php:168 msgid "Id attribute" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:160 +msgid "Make this work inversely" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:19 +msgid "" +"To use CAPTCHA, you need Really Simple CAPTCHA plugin installed." +======= #: contact-form-7/modules/acceptance.php:173 #: contact-form-7/modules/captcha.php:245 #: contact-form-7/modules/captcha.php:260 @@ -1053,89 +1811,297 @@ msgstr "" msgid "" "To use CAPTCHA, you need Really Simple CAPTCHA plugin installed." -msgstr "" - +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:166 +#: contact-form-7/modules/checkbox.php:330 contact-form-7/modules/date.php:198 +#: contact-form-7/modules/file.php:268 contact-form-7/modules/number.php:206 +#: contact-form-7/modules/quiz.php:197 +#: contact-form-7/modules/really-simple-captcha.php:243 +#: contact-form-7/modules/really-simple-captcha.php:258 +#: contact-form-7/modules/recaptcha.php:445 +#: contact-form-7/modules/select.php:206 contact-form-7/modules/submit.php:71 +#: contact-form-7/modules/text.php:279 contact-form-7/modules/textarea.php:166 +msgid "Id attribute" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:182 +msgid "The code that sender entered does not match the CAPTCHA" +======= #: contact-form-7/modules/captcha.php:185 msgid "The code that sender entered does not match the CAPTCHA" -msgstr "" - -#: contact-form-7/modules/captcha.php:186 +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:171 +#: contact-form-7/modules/checkbox.php:335 contact-form-7/modules/date.php:203 +#: contact-form-7/modules/file.php:273 contact-form-7/modules/number.php:211 +#: contact-form-7/modules/quiz.php:202 +#: contact-form-7/modules/really-simple-captcha.php:248 +#: contact-form-7/modules/really-simple-captcha.php:263 +#: contact-form-7/modules/recaptcha.php:450 +#: contact-form-7/modules/select.php:211 contact-form-7/modules/submit.php:76 +#: contact-form-7/modules/text.php:284 contact-form-7/modules/textarea.php:171 +msgid "Class attribute" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:183 msgid "Your entered code is incorrect." -msgstr "" - +======= +#: contact-form-7/modules/captcha.php:186 +msgid "Your entered code is incorrect." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/acceptance.php:184 +#: contact-form-7/modules/checkbox.php:348 contact-form-7/modules/date.php:215 +#: contact-form-7/modules/file.php:286 contact-form-7/modules/number.php:223 +#: contact-form-7/modules/quiz.php:215 +#: contact-form-7/modules/really-simple-captcha.php:275 +#: contact-form-7/modules/recaptcha.php:463 +#: contact-form-7/modules/select.php:224 contact-form-7/modules/submit.php:89 +#: contact-form-7/modules/text.php:297 contact-form-7/modules/textarea.php:184 +msgid "Insert Tag" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:196 +msgid "CAPTCHA" +======= #: contact-form-7/modules/captcha.php:199 #: contact-form-7/modules/captcha.php:220 msgid "CAPTCHA" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:267 +msgid "checkboxes" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:207 +msgid "Note: To use CAPTCHA, you need Really Simple CAPTCHA plugin installed." +======= #: contact-form-7/modules/captcha.php:210 #, php-format msgid "To use CAPTCHA, you first need to install and activate %s plugin." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:269 +msgid "radio buttons" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:214 +msgid "Image settings" +======= #: contact-form-7/modules/captcha.php:218 #, php-format msgid "" "Generate form-tags for a CAPTCHA image and corresponding response input " "field. For more details, see %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:282 +#, php-format +msgid "" +"Generate a form-tag for a group of checkboxes. For more details, see %s." +||||||| .r11156 +#: contact-form-7/modules/captcha.php:225 +msgid "Foreground color" +======= #: contact-form-7/modules/captcha.php:220 msgid "http://contactform7.com/captcha/" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:284 +#, php-format +msgid "" +"Generate a form-tag for a group of radio buttons. For more details, see %s." +||||||| .r11156 +#: contact-form-7/modules/captcha.php:228 +msgid "Background color" +======= #: contact-form-7/modules/captcha.php:237 msgid "Image settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:287 +#: contact-form-7/modules/select.php:168 +msgid "http://contactform7.com/checkboxes-radio-buttons-and-menus/" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:232 +msgid "Image size" +======= #: contact-form-7/modules/captcha.php:252 msgid "Input field settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:287 +#: contact-form-7/modules/select.php:168 +msgid "Checkboxes, Radio Buttons and Menus" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:233 +msgid "Small" +======= #: contact-form-7/modules/captcha.php:301 #, php-format msgid "" "This contact form contains CAPTCHA fields, but the temporary folder for the " "files (%s) does not exist or is not writable. You can create the folder or " "change its permission manually." -msgstr "" - +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:298 +#: contact-form-7/modules/checkbox.php:301 contact-form-7/modules/date.php:159 +#: contact-form-7/modules/date.php:162 contact-form-7/modules/file.php:243 +#: contact-form-7/modules/file.php:246 contact-form-7/modules/number.php:162 +#: contact-form-7/modules/number.php:165 contact-form-7/modules/select.php:178 +#: contact-form-7/modules/select.php:181 contact-form-7/modules/text.php:229 +#: contact-form-7/modules/text.php:232 contact-form-7/modules/textarea.php:145 +#: contact-form-7/modules/textarea.php:148 +msgid "Field type" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:234 +msgid "Medium" +======= #: contact-form-7/modules/captcha.php:307 msgid "" "This contact form contains CAPTCHA fields, but the necessary libraries (GD " "and FreeType) are not available on your server." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:302 contact-form-7/modules/date.php:163 +#: contact-form-7/modules/file.php:247 contact-form-7/modules/number.php:171 +#: contact-form-7/modules/select.php:182 contact-form-7/modules/text.php:233 +#: contact-form-7/modules/textarea.php:149 +msgid "Required field" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:235 +msgid "Large" +======= #: contact-form-7/modules/checkbox.php:268 msgid "checkboxes" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:319 +#: contact-form-7/modules/select.php:198 +msgid "One option per line." +||||||| .r11156 +#: contact-form-7/modules/captcha.php:240 +msgid "Input field settings" +======= #: contact-form-7/modules/checkbox.php:270 msgid "radio buttons" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:320 +msgid "Put a label first, a checkbox last" +msgstr "" + +#: contact-form-7/modules/checkbox.php:321 +msgid "Wrap each item with label element" +msgstr "" + +#: contact-form-7/modules/checkbox.php:323 +msgid "Make checkboxes exclusive" +||||||| .r11156 +#: contact-form-7/modules/captcha.php:260 +msgid "For image" msgstr "" +#: contact-form-7/modules/captcha.php:262 +msgid "For input field" +msgstr "" + +#: contact-form-7/modules/captcha.php:293 +#, php-format +msgid "" +"This contact form contains CAPTCHA fields, but the temporary folder for the " +"files (%s) does not exist or is not writable. You can create the folder or " +"change its permission manually." +======= #: contact-form-7/modules/checkbox.php:283 #, php-format msgid "" "Generate a form-tag for a group of checkboxes. For more details, see %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/checkbox.php:353 contact-form-7/modules/date.php:220 +#: contact-form-7/modules/number.php:228 contact-form-7/modules/select.php:229 +#: contact-form-7/modules/text.php:302 contact-form-7/modules/textarea.php:189 +#, php-format +||||||| .r11156 +#: contact-form-7/modules/captcha.php:299 +======= #: contact-form-7/modules/checkbox.php:285 #, php-format +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"To use the value input through this field in a mail field, you need to " +"insert the corresponding mail-tag (%s) into the field on the Mail tab." +||||||| .r11156 +"This contact form contains CAPTCHA fields, but the necessary libraries (GD " +"and FreeType) are not available on your server." +======= "Generate a form-tag for a group of radio buttons. For more details, see %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:117 +msgid "Date format that the sender entered is invalid" +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:262 +msgid "Checkboxes" +======= #: contact-form-7/modules/checkbox.php:288 #: contact-form-7/modules/select.php:170 msgid "http://contactform7.com/checkboxes-radio-buttons-and-menus/" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:118 +msgid "Date format seems invalid." +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:265 +msgid "Radio buttons" +======= #: contact-form-7/modules/checkbox.php:288 #: contact-form-7/modules/select.php:170 msgid "Checkboxes, Radio Buttons and Menus" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:122 +msgid "Date is earlier than minimum limit" +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:286 contact-form-7/modules/date.php:163 +#: contact-form-7/modules/file.php:240 contact-form-7/modules/number.php:173 +#: contact-form-7/modules/select.php:160 contact-form-7/modules/text.php:216 +#: contact-form-7/modules/textarea.php:115 +msgid "Required field?" +======= #: contact-form-7/modules/checkbox.php:299 #: contact-form-7/modules/checkbox.php:302 contact-form-7/modules/date.php:161 #: contact-form-7/modules/date.php:164 contact-form-7/modules/file.php:243 @@ -1145,32 +2111,85 @@ msgstr "" #: contact-form-7/modules/text.php:234 contact-form-7/modules/textarea.php:147 #: contact-form-7/modules/textarea.php:150 msgid "Field type" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:123 +msgid "This date is too early." +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:302 +#: contact-form-7/modules/select.php:174 +msgid "Choices" +======= #: contact-form-7/modules/checkbox.php:303 contact-form-7/modules/date.php:165 #: contact-form-7/modules/file.php:247 contact-form-7/modules/number.php:173 #: contact-form-7/modules/select.php:184 contact-form-7/modules/text.php:235 #: contact-form-7/modules/textarea.php:151 msgid "Required field" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:127 +msgid "Date is later than maximum limit" +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:304 +#: contact-form-7/modules/select.php:176 +msgid "* One choice per line." +======= #: contact-form-7/modules/checkbox.php:320 #: contact-form-7/modules/select.php:200 msgid "One option per line." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:128 +msgid "This date is too late." +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:308 +msgid "Put a label first, a checkbox last?" +======= #: contact-form-7/modules/checkbox.php:321 msgid "Put a label first, a checkbox last" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:139 +msgid "date" +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:309 +msgid "Wrap each item with tag?" +======= #: contact-form-7/modules/checkbox.php:322 msgid "Wrap each item with label element" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:147 +#, php-format +msgid "Generate a form-tag for a date input field. For more details, see %s." +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:311 +msgid "Make checkboxes exclusive?" +======= #: contact-form-7/modules/checkbox.php:324 msgid "Make checkboxes exclusive" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:149 +msgid "http://contactform7.com/date-field/" +||||||| .r11156 +#: contact-form-7/modules/checkbox.php:319 contact-form-7/modules/date.php:200 +#: contact-form-7/modules/number.php:210 contact-form-7/modules/select.php:188 +#: contact-form-7/modules/text.php:262 contact-form-7/modules/textarea.php:152 +msgid "And, put this code into the Mail fields below." +======= #: contact-form-7/modules/checkbox.php:354 contact-form-7/modules/date.php:222 #: contact-form-7/modules/number.php:230 contact-form-7/modules/select.php:231 #: contact-form-7/modules/text.php:304 contact-form-7/modules/textarea.php:191 @@ -1178,32 +2197,99 @@ msgstr "" msgid "" "To use the value input through this field in a mail field, you need to " "insert the corresponding mail-tag (%s) into the field on the Mail tab." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:149 +msgid "Date Field" +||||||| .r11156 +#: contact-form-7/modules/date.php:123 +msgid "Date format that the sender entered is invalid" +======= #: contact-form-7/modules/date.php:117 msgid "Date format that the sender entered is invalid" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:174 contact-form-7/modules/number.php:182 +#: contact-form-7/modules/text.php:244 contact-form-7/modules/textarea.php:160 +msgid "Default value" +||||||| .r11156 +#: contact-form-7/modules/date.php:124 +msgid "Date format seems invalid." +======= #: contact-form-7/modules/date.php:118 msgid "Date format seems invalid." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:176 contact-form-7/modules/number.php:184 +#: contact-form-7/modules/text.php:246 contact-form-7/modules/textarea.php:162 +msgid "Use this text as the placeholder of the field" +||||||| .r11156 +#: contact-form-7/modules/date.php:128 +msgid "Date is earlier than minimum limit" +======= #: contact-form-7/modules/date.php:122 msgid "Date is earlier than minimum limit" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:180 contact-form-7/modules/date.php:183 +#: contact-form-7/modules/number.php:188 contact-form-7/modules/number.php:191 +msgid "Range" +||||||| .r11156 +#: contact-form-7/modules/date.php:129 +msgid "This date is too early." +======= #: contact-form-7/modules/date.php:123 msgid "This date is too early." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:185 contact-form-7/modules/number.php:193 +msgid "Min" +||||||| .r11156 +#: contact-form-7/modules/date.php:133 +msgid "Date is later than maximum limit" +======= #: contact-form-7/modules/date.php:127 msgid "Date is later than maximum limit" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/date.php:190 contact-form-7/modules/number.php:198 +msgid "Max" +||||||| .r11156 +#: contact-form-7/modules/date.php:134 +msgid "This date is too late." +======= #: contact-form-7/modules/date.php:128 msgid "This date is too late." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:195 +||||||| .r11156 +#: contact-form-7/modules/date.php:190 contact-form-7/modules/number.php:200 +#: contact-form-7/modules/text.php:252 contact-form-7/modules/textarea.php:142 +msgid "Default value" +msgstr "" + +#: contact-form-7/modules/date.php:193 contact-form-7/modules/number.php:203 +#: contact-form-7/modules/text.php:255 contact-form-7/modules/textarea.php:145 +msgid "Use this text as placeholder?" +msgstr "" + +#: contact-form-7/modules/file.php:201 +======= #: contact-form-7/modules/date.php:141 msgid "date" msgstr "" @@ -1245,34 +2331,77 @@ msgid "Max" msgstr "" #: contact-form-7/modules/file.php:193 +>>>>>>> .r12027 msgid "Uploading a file fails for any reason" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:196 +||||||| .r11156 +#: contact-form-7/modules/file.php:202 +======= #: contact-form-7/modules/file.php:194 +>>>>>>> .r12027 msgid "Failed to upload file." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:200 +||||||| .r11156 +#: contact-form-7/modules/file.php:206 +======= #: contact-form-7/modules/file.php:198 +>>>>>>> .r12027 msgid "Uploaded file is not allowed file type" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:201 +||||||| .r11156 +#: contact-form-7/modules/file.php:207 +======= #: contact-form-7/modules/file.php:199 +>>>>>>> .r12027 msgid "This file type is not allowed." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:205 +||||||| .r11156 +#: contact-form-7/modules/file.php:211 +======= #: contact-form-7/modules/file.php:203 +>>>>>>> .r12027 msgid "Uploaded file is too large" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:206 +||||||| .r11156 +#: contact-form-7/modules/file.php:212 +======= #: contact-form-7/modules/file.php:204 +>>>>>>> .r12027 msgid "This file is too large." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:210 +||||||| .r11156 +#: contact-form-7/modules/file.php:216 +======= #: contact-form-7/modules/file.php:208 +>>>>>>> .r12027 msgid "Uploading a file fails for PHP error" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:211 +||||||| .r11156 +#: contact-form-7/modules/file.php:217 +======= #: contact-form-7/modules/file.php:209 +>>>>>>> .r12027 msgid "Failed to upload file. Error occurred." msgstr "" @@ -1310,7 +2439,13 @@ msgid "" "tab." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/file.php:317 +||||||| .r11156 +#: contact-form-7/modules/file.php:290 +======= #: contact-form-7/modules/file.php:316 +>>>>>>> .r12027 #, php-format msgid "" "This contact form contains file uploading fields, but the temporary folder " @@ -1357,17 +2492,57 @@ msgstr "" msgid "This number is too large." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/number.php:142 +msgid "number" +msgstr "" + +#: contact-form-7/modules/number.php:150 +#, php-format +msgid "" +"Generate a form-tag for a field for numeric value input. For more details, " +"see %s." +||||||| .r11156 +#: contact-form-7/modules/number.php:150 +msgid "Number (spinbox)" +======= #: contact-form-7/modules/number.php:144 msgid "number" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/number.php:152 +msgid "http://contactform7.com/number-fields/" +||||||| .r11156 +#: contact-form-7/modules/number.php:153 +msgid "Number (slider)" +======= #: contact-form-7/modules/number.php:152 #, php-format msgid "" "Generate a form-tag for a field for numeric value input. For more details, " "see %s." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/number.php:152 +msgid "Number Fields" msgstr "" +#: contact-form-7/modules/number.php:167 +msgid "Spinbox" +msgstr "" + +#: contact-form-7/modules/number.php:168 +msgid "Slider" +msgstr "" + +#: contact-form-7/modules/quiz.php:149 +||||||| .r11156 +#: contact-form-7/modules/quiz.php:148 +======= #: contact-form-7/modules/number.php:154 msgid "http://contactform7.com/number-fields/" msgstr "" @@ -1385,6 +2560,7 @@ msgid "Slider" msgstr "" #: contact-form-7/modules/quiz.php:149 +>>>>>>> .r12027 msgid "Sender doesn't enter the correct answer to the quiz" msgstr "" @@ -1392,6 +2568,25 @@ msgstr "" msgid "Your answer is not correct." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/quiz.php:161 +msgid "quiz" +msgstr "" + +#: contact-form-7/modules/quiz.php:169 +#, php-format +msgid "" +"Generate a form-tag for a question-answer pair. For more details, see %s." +msgstr "" + +#: contact-form-7/modules/quiz.php:171 +msgid "http://contactform7.com/quiz/" +msgstr "" + +#: contact-form-7/modules/quiz.php:171 +||||||| .r11156 +#: contact-form-7/modules/quiz.php:162 +======= #: contact-form-7/modules/quiz.php:163 msgid "quiz" msgstr "" @@ -1407,40 +2602,271 @@ msgid "http://contactform7.com/quiz/" msgstr "" #: contact-form-7/modules/quiz.php:173 +>>>>>>> .r12027 msgid "Quiz" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/quiz.php:186 contact-form-7/modules/quiz.php:189 +msgid "Questions and answers" +||||||| .r11156 +#: contact-form-7/modules/quiz.php:192 +msgid "Quizzes" +======= #: contact-form-7/modules/quiz.php:188 contact-form-7/modules/quiz.php:191 msgid "Questions and answers" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/quiz.php:191 +msgid "" +"One pipe-separated question-answer pair (e.g. The capital of Brazil?|Rio) " +"per line." +||||||| .r11156 +#: contact-form-7/modules/quiz.php:194 +msgid "* quiz|answer (e.g. 1+1=?|2)" +======= #: contact-form-7/modules/quiz.php:193 msgid "" "One pipe-separated question-answer pair (e.g. The capital of Brazil?|Rio) " "per line." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/really-simple-captcha.php:19 +msgid "" +"To use CAPTCHA, you need Really Simple CAPTCHA plugin installed." +||||||| .r11156 +#: contact-form-7/modules/select.php:151 +msgid "Drop-down menu" +======= #: contact-form-7/modules/select.php:161 msgid "drop-down menu" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/really-simple-captcha.php:185 +msgid "The code that sender entered does not match the CAPTCHA" +||||||| .r11156 +#: contact-form-7/modules/select.php:180 +msgid "Allow multiple selections?" +======= #: contact-form-7/modules/select.php:168 #, php-format msgid "Generate a form-tag for a drop-down menu. For more details, see %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/really-simple-captcha.php:186 +msgid "Your entered code is incorrect." +||||||| .r11156 +#: contact-form-7/modules/select.php:181 +msgid "Insert a blank item as the first option?" +======= #: contact-form-7/modules/select.php:201 msgid "Allow multiple selections" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/really-simple-captcha.php:202 +msgid "CAPTCHA (Really Simple CAPTCHA)" +||||||| .r11156 +#: contact-form-7/modules/submit.php:49 +msgid "Submit button" +======= #: contact-form-7/modules/select.php:202 msgid "Insert a blank item as the first option" msgstr "" #: contact-form-7/modules/submit.php:49 msgid "submit" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/really-simple-captcha.php:213 +#, php-format +msgid "To use CAPTCHA, you first need to install and activate %s plugin." +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:221 +#, php-format +msgid "" +"Generate form-tags for a CAPTCHA image and corresponding response input " +"field. For more details, see %s." +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:223 +msgid "http://contactform7.com/captcha/" +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:223 +#: contact-form-7/modules/recaptcha.php:218 +msgid "CAPTCHA" +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:240 +msgid "Image settings" +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:255 +msgid "Input field settings" +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:306 +#, php-format +msgid "" +"This contact form contains CAPTCHA fields, but the temporary folder for the " +"files (%s) does not exist or is not writable. You can create the folder or " +"change its permission manually." +msgstr "" + +#: contact-form-7/modules/really-simple-captcha.php:312 +msgid "" +"This contact form contains CAPTCHA fields, but the necessary libraries (GD " +"and FreeType) are not available on your server." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:23 +#: contact-form-7/modules/recaptcha.php:184 +#: contact-form-7/modules/recaptcha.php:388 +#: contact-form-7/modules/recaptcha.php:401 +#: contact-form-7/modules/recaptcha.php:411 +msgid "reCAPTCHA" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:138 +msgid "ERROR" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:139 +msgid "Invalid key values." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:144 +msgid "Settings saved." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:150 +msgid "" +"reCAPTCHA is a free service to protect your website from spam and abuse." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:165 +#: contact-form-7/modules/recaptcha.php:196 +msgid "Site Key" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:169 +#: contact-form-7/modules/recaptcha.php:200 +msgid "Secret Key" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:175 +msgid "Reset Keys" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:180 +msgid "To use reCAPTCHA, you need to install an API key pair." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:182 +msgid "Configure Keys" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:184 +#, php-format +msgid "For more details, see %s." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:184 +#: contact-form-7/modules/recaptcha.php:401 +#: contact-form-7/modules/recaptcha.php:411 +msgid "http://contactform7.com/recaptcha/" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:401 +#, php-format +msgid "" +"To use reCAPTCHA, first you need to install an API key pair. For more " +"details, see %s." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:409 +#, php-format +msgid "Generate a form-tag for a reCAPTCHA widget. For more details, see %s." +msgstr "" + +#: contact-form-7/modules/recaptcha.php:421 +#: contact-form-7/modules/recaptcha.php:424 +msgid "Theme" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:425 +msgid "Light" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:427 +msgid "Dark" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:433 +#: contact-form-7/modules/recaptcha.php:436 +msgid "Size" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:437 +msgid "Normal" +msgstr "" + +#: contact-form-7/modules/recaptcha.php:439 +msgid "Compact" +msgstr "" + +#: contact-form-7/modules/select.php:159 +msgid "drop-down menu" +msgstr "" + +#: contact-form-7/modules/select.php:166 +#, php-format +msgid "Generate a form-tag for a drop-down menu. For more details, see %s." +msgstr "" + +#: contact-form-7/modules/select.php:199 +msgid "Allow multiple selections" +msgstr "" + +#: contact-form-7/modules/select.php:200 +msgid "Insert a blank item as the first option" +msgstr "" + +#: contact-form-7/modules/submit.php:47 +msgid "submit" +msgstr "" + +#: contact-form-7/modules/submit.php:54 +#, php-format +msgid "Generate a form-tag for a submit button. For more details, see %s." msgstr "" +#: contact-form-7/modules/submit.php:56 +msgid "http://contactform7.com/submit-button/" +msgstr "" + +#: contact-form-7/modules/submit.php:56 +msgid "Submit Button" +msgstr "" + +#: contact-form-7/modules/submit.php:66 +||||||| .r11156 +#: contact-form-7/modules/submit.php:67 +======= #: contact-form-7/modules/submit.php:56 #, php-format msgid "Generate a form-tag for a submit button. For more details, see %s." @@ -1455,6 +2881,7 @@ msgid "Submit Button" msgstr "" #: contact-form-7/modules/submit.php:68 +>>>>>>> .r12027 msgid "Label" msgstr "" @@ -1482,22 +2909,93 @@ msgstr "" msgid "Telephone number seems invalid." msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:191 +msgid "text" +||||||| .r11156 +#: contact-form-7/modules/text.php:179 +msgid "Text field" +======= #: contact-form-7/modules/text.php:193 msgid "text" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:193 +msgid "email" +||||||| .r11156 +#: contact-form-7/modules/text.php:182 +msgid "Email" +======= #: contact-form-7/modules/text.php:195 msgid "email" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:195 +||||||| .r11156 +#: contact-form-7/modules/text.php:185 +======= #: contact-form-7/modules/text.php:197 +>>>>>>> .r12027 msgid "URL" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:197 +msgid "tel" +||||||| .r11156 +#: contact-form-7/modules/text.php:188 +msgid "Telephone number" +======= #: contact-form-7/modules/text.php:199 msgid "tel" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: contact-form-7/modules/text.php:210 +#, php-format +msgid "" +"Generate a form-tag for a single-line plain text input field. For more " +"details, see %s." msgstr "" +#: contact-form-7/modules/text.php:212 +#, php-format +msgid "" +"Generate a form-tag for a single-line email address input field. For more " +"details, see %s." +msgstr "" + +#: contact-form-7/modules/text.php:214 +#, php-format +msgid "" +"Generate a form-tag for a single-line URL input field. For more details, see " +"%s." +msgstr "" + +#: contact-form-7/modules/text.php:216 +#, php-format +msgid "" +"Generate a form-tag for a single-line telephone number input field. For more " +"details, see %s." +msgstr "" + +#: contact-form-7/modules/text.php:219 contact-form-7/modules/textarea.php:135 +msgid "http://contactform7.com/text-fields/" +msgstr "" + +#: contact-form-7/modules/text.php:219 contact-form-7/modules/textarea.php:135 +msgid "Text Fields" +msgstr "" + +#: contact-form-7/modules/text.php:251 contact-form-7/modules/text.php:254 +||||||| .r11156 +#: contact-form-7/modules/text.php:239 +======= #: contact-form-7/modules/text.php:212 #, php-format msgid "" @@ -1535,24 +3033,66 @@ msgid "Text Fields" msgstr "" #: contact-form-7/modules/text.php:253 contact-form-7/modules/text.php:256 +>>>>>>> .r12027 msgid "Akismet" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:259 +||||||| .r11156 +#: contact-form-7/modules/text.php:241 +======= #: contact-form-7/modules/text.php:261 +>>>>>>> .r12027 msgid "This field requires author's name" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:264 +||||||| .r11156 +#: contact-form-7/modules/text.php:243 +======= #: contact-form-7/modules/text.php:266 +>>>>>>> .r12027 msgid "This field requires author's email address" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/text.php:269 +||||||| .r11156 +#: contact-form-7/modules/text.php:245 +======= #: contact-form-7/modules/text.php:271 +>>>>>>> .r12027 msgid "This field requires author's URL" msgstr "" +<<<<<<< .mine +#: contact-form-7/modules/textarea.php:125 +msgid "text area" +||||||| .r11156 +#: contact-form-7/modules/textarea.php:106 +msgid "Text area" +======= #: contact-form-7/modules/textarea.php:127 msgid "text area" +>>>>>>> .r12027 +msgstr "" +<<<<<<< .mine + +#: contact-form-7/modules/textarea.php:133 +#, php-format +msgid "" +"Generate a form-tag for a multi-line text input field. For more details, see " +"%s." +msgstr "" + +#: contact-form-7/settings.php:132 +#, php-format +msgid "Contact form %d" msgstr "" +||||||| .r11156 +======= #: contact-form-7/modules/textarea.php:135 #, php-format @@ -1565,3 +3105,4 @@ msgstr "" #, php-format msgid "Contact form %d" msgstr "" +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/license.txt b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/license.txt index d159169d..dcb2129c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/license.txt +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/license.txt @@ -1,339 +1,16 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 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. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program 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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program 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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), 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 Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. 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 program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; 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. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +Contact Form 7 WordPress Plugin, 2007-2015 Takayuki Miyoshi +Contact Form 7 is distributed under the terms of the GNU GPL + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/acceptance.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/acceptance.php index f4e29ed6..083aef34 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/acceptance.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/acceptance.php @@ -123,9 +123,15 @@ function wpcf7_acceptance_as_validation() { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_acceptance', 35 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_acceptance', 35 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_acceptance', 35 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_acceptance() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/checkbox.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/checkbox.php index 7811e0fc..e433064c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/checkbox.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/checkbox.php @@ -259,9 +259,16 @@ function wpcf7_checkbox_posted_data( $posted_data ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', + 'wpcf7_add_tag_generator_checkbox_and_radio', 30 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_checkbox_and_radio', 30 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_checkbox_and_radio', 30 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_checkbox_and_radio() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/date.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/date.php index 89dbae8c..fb24d67e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/date.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/date.php @@ -132,9 +132,15 @@ function wpcf7_date_messages( $messages ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_date', 19 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_date', 19 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_date', 19 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_date() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/file.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/file.php index f5d448e9..8fcae1c7 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/file.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/file.php @@ -15,15 +15,17 @@ function wpcf7_add_shortcode_file() { function wpcf7_file_shortcode_handler( $tag ) { $tag = new WPCF7_Shortcode( $tag ); - if ( empty( $tag->name ) ) + if ( empty( $tag->name ) ) { return ''; + } $validation_error = wpcf7_get_validation_error( $tag->name ); $class = wpcf7_form_controls_class( $tag->type ); - if ( $validation_error ) + if ( $validation_error ) { $class .= ' wpcf7-not-valid'; + } $atts = array(); @@ -32,14 +34,14 @@ function wpcf7_file_shortcode_handler( $tag ) { $atts['id'] = $tag->get_id_option(); $atts['tabindex'] = $tag->get_option( 'tabindex', 'int', true ); - if ( $tag->is_required() ) + if ( $tag->is_required() ) { $atts['aria-required'] = 'true'; + } $atts['aria-invalid'] = $validation_error ? 'true' : 'false'; $atts['type'] = 'file'; $atts['name'] = $tag->name; - $atts['value'] = '1'; $atts = wpcf7_format_atts( $atts ); @@ -214,9 +216,15 @@ function wpcf7_file_messages( $messages ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_file', 50 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_file', 50 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_file', 50 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_file() { $tag_generator = WPCF7_TagGenerator::get_instance(); @@ -306,8 +314,9 @@ function wpcf7_file_display_warning_message() { $has_tags = (bool) $contact_form->form_scan_shortcode( array( 'type' => array( 'file', 'file*' ) ) ); - if ( ! $has_tags ) + if ( ! $has_tags ) { return; + } $uploads_dir = wpcf7_upload_tmp_dir(); wpcf7_init_uploads(); @@ -315,7 +324,13 @@ function wpcf7_file_display_warning_message() { if ( ! is_dir( $uploads_dir ) || ! wp_is_writable( $uploads_dir ) ) { $message = sprintf( __( 'This contact form contains file uploading fields, but the temporary folder for the files (%s) does not exist or is not writable. You can create the folder or change its permission manually.', 'contact-form-7' ), $uploads_dir ); +<<<<<<< .mine + echo '
' . esc_html( $message ) . '
'; +||||||| .r11156 + echo '
' . esc_html( $message ) . '
'; +======= echo '
' . esc_html( $message ) . '
'; +>>>>>>> .r12027 } } diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/flamingo.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/flamingo.php index 410a796f..c67b5b03 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/flamingo.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/flamingo.php @@ -39,6 +39,8 @@ function wpcf7_flamingo_submit( $contactform, $result ) { $exclude_names[] = $tag['name']; } + $exclude_names[] = 'g-recaptcha-response'; + foreach ( $posted_data as $key => $value ) { if ( '_' == substr( $key, 0, 1 ) || in_array( $key, $exclude_names ) ) { unset( $posted_data[$key] ); @@ -167,5 +169,3 @@ function wpcf7_flamingo_add_channel( $slug, $name = '' ) { return (int) $channel['term_id']; } - -?> \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/jetpack.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/jetpack.php index b99dcdb9..ebebec1c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/jetpack.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/jetpack.php @@ -20,8 +20,16 @@ function wpcf7_jetpack_admin_notices() { $desc_link = wpcf7_link( __( 'http://contactform7.com/jetpack-overrides-contact-forms/', 'contact-form-7' ), __( 'Jetpack Overrides Contact Forms', 'contact-form-7' ) ); ?> +<<<<<<< .mine +

+
+||||||| .r11156 +

Jetpack may cause problems for other plugins in certain cases. See how to avoid it.', 'contact-form-7' ), $url ); ?>

+=======

+>>>>>>> .r12027

>>>>>> .r12027 function wpcf7_add_tag_generator_number() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/quiz.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/quiz.php index 1b7978fa..a47f34a6 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/quiz.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/quiz.php @@ -154,9 +154,15 @@ function wpcf7_quiz_messages( $messages ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_quiz', 40 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_quiz', 40 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_quiz', 40 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_quiz() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/really-simple-captcha.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/really-simple-captcha.php new file mode 100644 index 00000000..18695836 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/really-simple-captcha.php @@ -0,0 +1,543 @@ +type && ! class_exists( 'ReallySimpleCaptcha' ) ) + return '' . __( 'To use CAPTCHA, you need Really Simple CAPTCHA plugin installed.', 'contact-form-7' ) . ''; + + if ( empty( $tag->name ) ) + return ''; + + $validation_error = wpcf7_get_validation_error( $tag->name ); + + $class = wpcf7_form_controls_class( $tag->type ); + + if ( 'captchac' == $tag->type ) { // CAPTCHA-Challenge (image) + $class .= ' wpcf7-captcha-' . $tag->name; + + $atts = array(); + + $atts['class'] = $tag->get_class_option( $class ); + $atts['id'] = $tag->get_id_option(); + + $op = array( // Default + 'img_size' => array( 72, 24 ), + 'base' => array( 6, 18 ), + 'font_size' => 14, + 'font_char_width' => 15 ); + + $op = array_merge( $op, wpcf7_captchac_options( $tag->options ) ); + + if ( ! $filename = wpcf7_generate_captcha( $op ) ) + return ''; + + if ( ! empty( $op['img_size'] ) ) { + if ( isset( $op['img_size'][0] ) ) + $atts['width'] = $op['img_size'][0]; + + if ( isset( $op['img_size'][1] ) ) + $atts['height'] = $op['img_size'][1]; + } + + $atts['alt'] = 'captcha'; + $atts['src'] = wpcf7_captcha_url( $filename ); + + $atts = wpcf7_format_atts( $atts ); + + $prefix = substr( $filename, 0, strrpos( $filename, '.' ) ); + + $html = sprintf( + '', + $tag->name, $prefix, $atts ); + + return $html; + + } elseif ( 'captchar' == $tag->type ) { // CAPTCHA-Response (input) + if ( $validation_error ) + $class .= ' wpcf7-not-valid'; + + $atts = array(); + + $atts['size'] = $tag->get_size_option( '40' ); + $atts['maxlength'] = $tag->get_maxlength_option(); + $atts['minlength'] = $tag->get_minlength_option(); + + if ( $atts['maxlength'] && $atts['minlength'] + && $atts['maxlength'] < $atts['minlength'] ) { + unset( $atts['maxlength'], $atts['minlength'] ); + } + + $atts['class'] = $tag->get_class_option( $class ); + $atts['id'] = $tag->get_id_option(); + $atts['tabindex'] = $tag->get_option( 'tabindex', 'int', true ); + + $atts['aria-invalid'] = $validation_error ? 'true' : 'false'; + + $value = (string) reset( $tag->values ); + + if ( wpcf7_is_posted() ) + $value = ''; + + if ( $tag->has_option( 'placeholder' ) || $tag->has_option( 'watermark' ) ) { + $atts['placeholder'] = $value; + $value = ''; + } + + $atts['value'] = $value; + $atts['type'] = 'text'; + $atts['name'] = $tag->name; + + $atts = wpcf7_format_atts( $atts ); + + $html = sprintf( + '%3$s', + sanitize_html_class( $tag->name ), $atts, $validation_error ); + + return $html; + } +} + + +/* Validation filter */ + +add_filter( 'wpcf7_validate_captchar', 'wpcf7_captcha_validation_filter', 10, 2 ); + +function wpcf7_captcha_validation_filter( $result, $tag ) { + $tag = new WPCF7_Shortcode( $tag ); + + $type = $tag->type; + $name = $tag->name; + + $captchac = '_wpcf7_captcha_challenge_' . $name; + + $prefix = isset( $_POST[$captchac] ) ? (string) $_POST[$captchac] : ''; + $response = isset( $_POST[$name] ) ? (string) $_POST[$name] : ''; + $response = wpcf7_canonicalize( $response ); + + if ( 0 == strlen( $prefix ) || ! wpcf7_check_captcha( $prefix, $response ) ) { + $result->invalidate( $tag, wpcf7_get_message( 'captcha_not_match' ) ); + } + + if ( 0 != strlen( $prefix ) ) { + wpcf7_remove_captcha( $prefix ); + } + + return $result; +} + + +/* Ajax echo filter */ + +add_filter( 'wpcf7_ajax_onload', 'wpcf7_captcha_ajax_refill' ); +add_filter( 'wpcf7_ajax_json_echo', 'wpcf7_captcha_ajax_refill' ); + +function wpcf7_captcha_ajax_refill( $items ) { + if ( ! is_array( $items ) ) + return $items; + + $fes = wpcf7_scan_shortcode( array( 'type' => 'captchac' ) ); + + if ( empty( $fes ) ) + return $items; + + $refill = array(); + + foreach ( $fes as $fe ) { + $name = $fe['name']; + $options = $fe['options']; + + if ( empty( $name ) ) + continue; + + $op = wpcf7_captchac_options( $options ); + if ( $filename = wpcf7_generate_captcha( $op ) ) { + $captcha_url = wpcf7_captcha_url( $filename ); + $refill[$name] = $captcha_url; + } + } + + if ( ! empty( $refill ) ) + $items['captcha'] = $refill; + + return $items; +} + + +/* Messages */ + +add_filter( 'wpcf7_messages', 'wpcf7_captcha_messages' ); + +function wpcf7_captcha_messages( $messages ) { + return array_merge( $messages, array( 'captcha_not_match' => array( + 'description' => __( "The code that sender entered does not match the CAPTCHA", 'contact-form-7' ), + 'default' => __( 'Your entered code is incorrect.', 'contact-form-7' ) + ) ) ); +} + + +/* Tag generator */ + +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_captcha', 46 ); + +function wpcf7_add_tag_generator_captcha() { + if ( ! wpcf7_use_really_simple_captcha() ) { + return; + } + + $tag_generator = WPCF7_TagGenerator::get_instance(); + $tag_generator->add( 'captcha', + __( 'CAPTCHA (Really Simple CAPTCHA)', 'contact-form-7' ), + 'wpcf7_tag_generator_captcha' ); +} + +function wpcf7_tag_generator_captcha( $contact_form, $args = '' ) { + $args = wp_parse_args( $args, array() ); + + if ( ! class_exists( 'ReallySimpleCaptcha' ) ) { +?> +

+ +

+ + + + + + + + + +

+ + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + +

+ +

+ + +

+ +

+form_scan_shortcode( + array( 'type' => array( 'captchac' ) ) ); + + if ( ! $has_tags ) { + return; + } + + if ( ! class_exists( 'ReallySimpleCaptcha' ) ) { + return; + } + + $uploads_dir = wpcf7_captcha_tmp_dir(); + wpcf7_init_captcha(); + + if ( ! is_dir( $uploads_dir ) || ! wp_is_writable( $uploads_dir ) ) { + $message = sprintf( __( 'This contact form contains CAPTCHA fields, but the temporary folder for the files (%s) does not exist or is not writable. You can create the folder or change its permission manually.', 'contact-form-7' ), $uploads_dir ); + + echo '

' . esc_html( $message ) . '

'; + } + + if ( ! function_exists( 'imagecreatetruecolor' ) || ! function_exists( 'imagettftext' ) ) { + $message = __( 'This contact form contains CAPTCHA fields, but the necessary libraries (GD and FreeType) are not available on your server.', 'contact-form-7' ); + + echo '

' . esc_html( $message ) . '

'; + } +} + + +/* CAPTCHA functions */ + +function wpcf7_init_captcha() { + static $captcha = null; + + if ( $captcha ) { + return $captcha; + } + + if ( class_exists( 'ReallySimpleCaptcha' ) ) { + $captcha = new ReallySimpleCaptcha(); + } else { + return false; + } + + $dir = trailingslashit( wpcf7_captcha_tmp_dir() ); + + $captcha->tmp_dir = $dir; + + if ( is_callable( array( $captcha, 'make_tmp_dir' ) ) ) { + $result = $captcha->make_tmp_dir(); + + if ( ! $result ) { + return false; + } + + return $captcha; + } + + if ( wp_mkdir_p( $dir ) ) { + $htaccess_file = $dir . '.htaccess'; + + if ( file_exists( $htaccess_file ) ) { + return $captcha; + } + + if ( $handle = @fopen( $htaccess_file, 'w' ) ) { + fwrite( $handle, 'Order deny,allow' . "\n" ); + fwrite( $handle, 'Deny from all' . "\n" ); + fwrite( $handle, '' . "\n" ); + fwrite( $handle, ' Allow from all' . "\n" ); + fwrite( $handle, '' . "\n" ); + fclose( $handle ); + } + } else { + return false; + } + + return $captcha; +} + +function wpcf7_captcha_tmp_dir() { + if ( defined( 'WPCF7_CAPTCHA_TMP_DIR' ) ) + return WPCF7_CAPTCHA_TMP_DIR; + else + return wpcf7_upload_dir( 'dir' ) . '/wpcf7_captcha'; +} + +function wpcf7_captcha_tmp_url() { + if ( defined( 'WPCF7_CAPTCHA_TMP_URL' ) ) + return WPCF7_CAPTCHA_TMP_URL; + else + return wpcf7_upload_dir( 'url' ) . '/wpcf7_captcha'; +} + +function wpcf7_captcha_url( $filename ) { + $url = trailingslashit( wpcf7_captcha_tmp_url() ) . $filename; + + if ( is_ssl() && 'http:' == substr( $url, 0, 5 ) ) { + $url = 'https:' . substr( $url, 5 ); + } + + return apply_filters( 'wpcf7_captcha_url', esc_url_raw( $url ) ); +} + +function wpcf7_generate_captcha( $options = null ) { + if ( ! $captcha = wpcf7_init_captcha() ) { + return false; + } + + if ( ! is_dir( $captcha->tmp_dir ) || ! wp_is_writable( $captcha->tmp_dir ) ) + return false; + + $img_type = imagetypes(); + if ( $img_type & IMG_PNG ) + $captcha->img_type = 'png'; + elseif ( $img_type & IMG_GIF ) + $captcha->img_type = 'gif'; + elseif ( $img_type & IMG_JPG ) + $captcha->img_type = 'jpeg'; + else + return false; + + if ( is_array( $options ) ) { + if ( isset( $options['img_size'] ) ) + $captcha->img_size = $options['img_size']; + if ( isset( $options['base'] ) ) + $captcha->base = $options['base']; + if ( isset( $options['font_size'] ) ) + $captcha->font_size = $options['font_size']; + if ( isset( $options['font_char_width'] ) ) + $captcha->font_char_width = $options['font_char_width']; + if ( isset( $options['fg'] ) ) + $captcha->fg = $options['fg']; + if ( isset( $options['bg'] ) ) + $captcha->bg = $options['bg']; + } + + $prefix = wp_rand(); + $captcha_word = $captcha->generate_random_word(); + return $captcha->generate_image( $prefix, $captcha_word ); +} + +function wpcf7_check_captcha( $prefix, $response ) { + if ( ! $captcha = wpcf7_init_captcha() ) { + return false; + } + + return $captcha->check( $prefix, $response ); +} + +function wpcf7_remove_captcha( $prefix ) { + if ( ! $captcha = wpcf7_init_captcha() ) { + return false; + } + + if ( preg_match( '/[^0-9]/', $prefix ) ) // Contact Form 7 generates $prefix with wp_rand() + return false; + + $captcha->remove( $prefix ); +} + +add_action( 'template_redirect', 'wpcf7_cleanup_captcha_files', 20 ); + +function wpcf7_cleanup_captcha_files() { + if ( ! $captcha = wpcf7_init_captcha() ) { + return false; + } + + if ( is_callable( array( $captcha, 'cleanup' ) ) ) + return $captcha->cleanup(); + + $dir = trailingslashit( wpcf7_captcha_tmp_dir() ); + + if ( ! is_dir( $dir ) || ! is_readable( $dir ) || ! wp_is_writable( $dir ) ) + return false; + + if ( $handle = @opendir( $dir ) ) { + while ( false !== ( $file = readdir( $handle ) ) ) { + if ( ! preg_match( '/^[0-9]+\.(php|txt|png|gif|jpeg)$/', $file ) ) + continue; + + $stat = @stat( $dir . $file ); + if ( $stat['mtime'] + 3600 < time() ) // 3600 secs == 1 hour + @unlink( $dir . $file ); + } + closedir( $handle ); + } +} + +function wpcf7_captchac_options( $options ) { + if ( ! is_array( $options ) ) + return array(); + + $op = array(); + $image_size_array = preg_grep( '%^size:[smlSML]$%', $options ); + + if ( $image_size = array_shift( $image_size_array ) ) { + preg_match( '%^size:([smlSML])$%', $image_size, $is_matches ); + switch ( strtolower( $is_matches[1] ) ) { + case 's': + $op['img_size'] = array( 60, 20 ); + $op['base'] = array( 6, 15 ); + $op['font_size'] = 11; + $op['font_char_width'] = 13; + break; + case 'l': + $op['img_size'] = array( 84, 28 ); + $op['base'] = array( 6, 20 ); + $op['font_size'] = 17; + $op['font_char_width'] = 19; + break; + case 'm': + default: + $op['img_size'] = array( 72, 24 ); + $op['base'] = array( 6, 18 ); + $op['font_size'] = 14; + $op['font_char_width'] = 15; + } + } + + $fg_color_array = preg_grep( '%^fg:#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$%', $options ); + if ( $fg_color = array_shift( $fg_color_array ) ) { + preg_match( '%^fg:#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$%', $fg_color, $fc_matches ); + if ( 3 == strlen( $fc_matches[1] ) ) { + $r = substr( $fc_matches[1], 0, 1 ); + $g = substr( $fc_matches[1], 1, 1 ); + $b = substr( $fc_matches[1], 2, 1 ); + $op['fg'] = array( hexdec( $r . $r ), hexdec( $g . $g ), hexdec( $b . $b ) ); + } elseif ( 6 == strlen( $fc_matches[1] ) ) { + $r = substr( $fc_matches[1], 0, 2 ); + $g = substr( $fc_matches[1], 2, 2 ); + $b = substr( $fc_matches[1], 4, 2 ); + $op['fg'] = array( hexdec( $r ), hexdec( $g ), hexdec( $b ) ); + } + } + + $bg_color_array = preg_grep( '%^bg:#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$%', $options ); + if ( $bg_color = array_shift( $bg_color_array ) ) { + preg_match( '%^bg:#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$%', $bg_color, $bc_matches ); + if ( 3 == strlen( $bc_matches[1] ) ) { + $r = substr( $bc_matches[1], 0, 1 ); + $g = substr( $bc_matches[1], 1, 1 ); + $b = substr( $bc_matches[1], 2, 1 ); + $op['bg'] = array( hexdec( $r . $r ), hexdec( $g . $g ), hexdec( $b . $b ) ); + } elseif ( 6 == strlen( $bc_matches[1] ) ) { + $r = substr( $bc_matches[1], 0, 2 ); + $g = substr( $bc_matches[1], 2, 2 ); + $b = substr( $bc_matches[1], 4, 2 ); + $op['bg'] = array( hexdec( $r ), hexdec( $g ), hexdec( $b ) ); + } + } + + return $op; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/recaptcha.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/recaptcha.php new file mode 100644 index 00000000..125ad0c8 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/recaptcha.php @@ -0,0 +1,475 @@ +sitekeys = WPCF7::get_option( 'recaptcha' ); + } + + public function get_title() { + return __( 'reCAPTCHA', 'contact-form-7' ); + } + + public function is_active() { + $sitekey = $this->get_sitekey(); + $secret = $this->get_secret( $sitekey ); + return $sitekey && $secret; + } + + public function get_categories() { + return array( 'captcha' ); + } + + public function icon() { + } + + public function link() { + echo sprintf( '%2$s', + 'https://www.google.com/recaptcha/intro/index.html', + 'google.com/recaptcha' ); + } + + public function get_sitekey() { + if ( empty( $this->sitekeys ) || ! is_array( $this->sitekeys ) ) { + return false; + } + + $sitekeys = array_keys( $this->sitekeys ); + + return $sitekeys[0]; + } + + public function get_secret( $sitekey ) { + $sitekeys = (array) $this->sitekeys; + + if ( isset( $sitekeys[$sitekey] ) ) { + return $sitekeys[$sitekey]; + } else { + return false; + } + } + + public function verify( $response_token ) { + $is_human = false; + + if ( empty( $response_token ) ) { + return $is_human; + } + + $url = self::VERIFY_URL; + $sitekey = $this->get_sitekey(); + $secret = $this->get_secret( $sitekey ); + + $response = wp_safe_remote_post( $url, array( + 'body' => array( + 'secret' => $secret, + 'response' => $response_token, + 'remoteip' => $_SERVER['REMOTE_ADDR'] ) ) ); + + if ( 200 != wp_remote_retrieve_response_code( $response ) ) { + return $is_human; + } + + $response = wp_remote_retrieve_body( $response ); + $response = json_decode( $response, true ); + + $is_human = isset( $response['success'] ) && true == $response['success']; + return $is_human; + } + + private function menu_page_url( $args = '' ) { + $args = wp_parse_args( $args, array() ); + + $url = menu_page_url( 'wpcf7-integration', false ); + $url = add_query_arg( array( 'service' => 'recaptcha' ), $url ); + + if ( ! empty( $args) ) { + $url = add_query_arg( $args, $url ); + } + + return $url; + } + + public function load( $action = '' ) { + if ( 'setup' == $action ) { + if ( 'POST' == $_SERVER['REQUEST_METHOD'] ) { + check_admin_referer( 'wpcf7-recaptcha-setup' ); + + $sitekey = isset( $_POST['sitekey'] ) ? trim( $_POST['sitekey'] ) : ''; + $secret = isset( $_POST['secret'] ) ? trim( $_POST['secret'] ) : ''; + + if ( $sitekey && $secret ) { + WPCF7::update_option( 'recaptcha', array( $sitekey => $secret ) ); + $redirect_to = $this->menu_page_url( array( + 'message' => 'success' ) ); + } elseif ( '' === $sitekey && '' === $secret ) { + WPCF7::update_option( 'recaptcha', null ); + $redirect_to = $this->menu_page_url( array( + 'message' => 'success' ) ); + } else { + $redirect_to = $this->menu_page_url( array( + 'action' => 'setup', + 'message' => 'invalid' ) ); + } + + wp_safe_redirect( $redirect_to ); + exit(); + } + } + } + + public function admin_notice( $message = '' ) { + if ( 'invalid' == $message ) { + echo sprintf( + '

%1$s: %2$s

', + esc_html( __( "ERROR", 'contact-form-7' ) ), + esc_html( __( "Invalid key values.", 'contact-form-7' ) ) ); + } + + if ( 'success' == $message ) { + echo sprintf( '

', + esc_html( __( 'Settings saved.', 'contact-form-7' ) ) ); + } + } + + public function display( $action = '' ) { +?> +

+ +display_setup(); + return; + } + + if ( $this->is_active() ) { + $sitekey = $this->get_sitekey(); + $secret = $this->get_secret( $sitekey ); +?> + + + + + + + + + + + +

+ +

+ + +

+ +

+ + + + + + + + + + + + + + +

+ +

+ + __( 'CAPTCHA', 'contact-form-7' ) ); + + foreach ( $categories as $name => $category ) { + $integration->add_category( $name, $category ); + } + + $services = array( + 'recaptcha' => WPCF7_RECAPTCHA::get_instance() ); + + foreach ( $services as $name => $service ) { + $integration->add_service( $name, $service ); + } +} + +add_action( 'wpcf7_enqueue_scripts', 'wpcf7_recaptcha_enqueue_scripts' ); + +function wpcf7_recaptcha_enqueue_scripts() { + $url = 'https://www.google.com/recaptcha/api.js'; + $url = add_query_arg( array( + 'onload' => 'recaptchaCallback', + 'render' => 'explicit' ), $url ); + + wp_register_script( 'google-recaptcha', $url, array(), '2.0', true ); +} + +add_action( 'wp_footer', 'wpcf7_recaptcha_callback_script' ); + +function wpcf7_recaptcha_callback_script() { + if ( ! wp_script_is( 'google-recaptcha', 'enqueued' ) ) { + return; + } + +?> + +is_active() ) { + wpcf7_add_shortcode( 'recaptcha', 'wpcf7_recaptcha_shortcode_handler' ); + } +} + +function wpcf7_recaptcha_shortcode_handler( $tag ) { + wp_enqueue_script( 'google-recaptcha' ); + + $tag = new WPCF7_Shortcode( $tag ); + + $atts = array(); + + $recaptcha = WPCF7_RECAPTCHA::get_instance(); + $atts['data-sitekey'] = $recaptcha->get_sitekey(); + $atts['data-theme'] = $tag->get_option( 'theme', '(dark|light)', true ); + $atts['data-type'] = $tag->get_option( 'type', '(audio|image)', true ); + $atts['data-size'] = $tag->get_option( 'size', '(compact|normal)', true ); + $atts['data-tabindex'] = $tag->get_option( 'tabindex', 'int', true ); + $atts['data-callback'] = $tag->get_option( 'callback', '', true ); + $atts['data-expired-callback'] = + $tag->get_option( 'expired-callback', '', true ); + + $atts['class'] = $tag->get_class_option( + wpcf7_form_controls_class( $tag->type, 'g-recaptcha' ) ); + $atts['id'] = $tag->get_id_option(); + + $html = sprintf( '

', wpcf7_format_atts( $atts ) ); + $html .= wpcf7_recaptcha_noscript( + array( 'sitekey' => $atts['data-sitekey'] ) ); + $html = sprintf( '

', $html ); + + return $html; +} + +function wpcf7_recaptcha_noscript( $args = '' ) { + $args = wp_parse_args( $args, array( + 'sitekey' => '' ) ); + + if ( empty( $args['sitekey'] ) ) { + return; + } + + $url = add_query_arg( 'k', $args['sitekey'], + 'https://www.google.com/recaptcha/api/fallback' ); + + ob_start(); +?> + +

+ +

+form_scan_shortcode( array( 'type' => 'recaptcha' ) ); + + if ( empty( $tags ) ) { + return $spam; + } + + $recaptcha = WPCF7_RECAPTCHA::get_instance(); + + if ( ! $recaptcha->is_active() ) { + return $spam; + } + + $response_token = wpcf7_recaptcha_response(); + $spam = ! $recaptcha->verify( $response_token ); + + return $spam; +} + +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_recaptcha', 45 ); + +function wpcf7_add_tag_generator_recaptcha() { + $tag_generator = WPCF7_TagGenerator::get_instance(); + $tag_generator->add( 'recaptcha', __( 'reCAPTCHA', 'contact-form-7' ), + 'wpcf7_tag_generator_recaptcha', array( 'nameless' => 1 ) ); +} + +function wpcf7_tag_generator_recaptcha( $contact_form, $args = '' ) { + $args = wp_parse_args( $args, array() ); + + $recaptcha = WPCF7_RECAPTCHA::get_instance(); + + if ( ! $recaptcha->is_active() ) { +?> +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +

	+ + + + + + +
	+ + + + + + +

+ +

+ + +

+ +

+>>>>>> .r12027 function wpcf7_add_tag_generator_menu() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/submit.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/submit.php index 2f289ddd..c955b84e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/submit.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/submit.php @@ -40,9 +40,15 @@ function wpcf7_submit_shortcode_handler( $tag ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_submit', 55 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_submit', 55 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_submit', 55 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_submit() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/text.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/text.php index f142be3b..3e6f9d8f 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/text.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/text.php @@ -184,9 +184,15 @@ function wpcf7_text_messages( $messages ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_text', 15 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_text', 15 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_text', 15 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_text() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/textarea.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/textarea.php index 98cfcb1f..82ee5587 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/textarea.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/modules/textarea.php @@ -118,9 +118,15 @@ function wpcf7_textarea_validation_filter( $result, $tag ) { /* Tag generator */ +<<<<<<< .mine +add_action( 'wpcf7_admin_init', 'wpcf7_add_tag_generator_textarea', 20 ); +||||||| .r11156 +add_action( 'admin_init', 'wpcf7_add_tag_generator_textarea', 20 ); +======= if ( is_admin() ) { add_action( 'admin_init', 'wpcf7_add_tag_generator_textarea', 20 ); } +>>>>>>> .r12027 function wpcf7_add_tag_generator_textarea() { $tag_generator = WPCF7_TagGenerator::get_instance(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/readme.txt b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/readme.txt index 96959419..01074f7c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/readme.txt +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/readme.txt @@ -2,9 +2,19 @@ Contributors: takayukister Donate link: http://contactform7.com/donate/ Tags: contact, form, contact form, feedback, email, ajax, captcha, akismet, multilingual +<<<<<<< .mine +Requires at least: 4.2 +Tested up to: 4.4 +Stable tag: 4.3.1 +||||||| .r11156 +Requires at least: 3.8 +Tested up to: 4.0 +Stable tag: 3.9.3 +======= Requires at least: 4.1 Tested up to: 4.3 Stable tag: 4.2.2 +>>>>>>> .r12027 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -24,11 +34,13 @@ It is hard to continue development and support for this free plugin without cont = Recommended Plugins = -The following are other recommended plugins by the author of Contact Form 7. +The following plugins are recommended for Contact Form 7 users: -* [Flamingo](http://wordpress.org/extend/plugins/flamingo/) - With Flamingo, you can save submitted messages via contact forms in the database. -* [Really Simple CAPTCHA](http://wordpress.org/extend/plugins/really-simple-captcha/) - Really Simple CAPTCHA is a simple CAPTCHA module which works well with Contact Form 7. -* [Bogo](http://wordpress.org/extend/plugins/bogo/) - Bogo is a straight-forward multilingual plugin that doesn't cause headaches. +* [Flamingo](http://wordpress.org/extend/plugins/flamingo/) by Takayuki Miyoshi - With Flamingo, you can save submitted messages via contact forms in the database. +* [Postman](https://wordpress.org/plugins/postman-smtp/) by +Jason Hendriks - Postman is a next-generation SMTP Mailer, software that assists in the delivery of email generated by your WordPress site. +* [Contact Form 7: Accessible Defaults](https://wordpress.org/plugins/contact-form-7-accessible-defaults/) by Joe Dolson - Replaces the default Contact Form 7 form with an accessible equivalent and provides a suite of selectable base forms. +* [Bogo](http://wordpress.org/extend/plugins/bogo/) by Takayuki Miyoshi - Bogo is a straight-forward multilingual plugin that doesn't cause headaches. = Translators = @@ -44,13 +56,89 @@ The following are other recommended plugins by the author of Contact Form 7. * Bulgarian (bg_BG) - Iliyan Darganov * Catalan (ca) - Jordi Sancho, Robert Buj, Jaume Aragay Badia, luba lee * Central Kurdish (ckb) - Mahr Hassan +<<<<<<< .mine +* Chinese (China; zh_CN) - Soz, Keefe Dunn, Stella Hu +* Chinese (Taiwan; zh_TW) - James Wu +* Croatian (hr) - tolingo Translation Services, Marko Puskaric, Sanjin Barac +* Czech (cs_CZ) - Korry, Radovan Fiser, Tomas Vesely, Pavel Bilek, Vladislav Å enk +* Danish (da_DK) - Jens Griebel, Georg S. Adamsen, Thomas Blomberg Hansen +* Dutch (nl_NL) - Chris Devriese, Martin Hein, Rene, TenSheep, Tim de Hoog, Henk Buma +||||||| .r11156 +* Chinese, Simplified (zh_CN) - [Soz](http://www.webtoolol.com/), [Keefe Dunn](http://dengkefu.com/), [Stella Hu](http://prowordpresser.com/) +* Chinese, Traditional (zh_TW) - [James Wu](http://jameswublog.com) +* Croatian (hr) - [tolingo Translation Services](http://www.tolingo.com) +* Czech (cs_CZ) - Korry, [Radovan Fiser](http://algymsa.cz/), [Tomas Vesely](http://www.mcmotylek.cz/), [Pavel Bilek](http://chcistranky.eu/zdarma/), Vladislav Å enk +* Danish (da_DK) - [Jens Griebel](http://www.kompas-it.dk/), [Georg S. Adamsen](http://wordpress.blogos.dk/) +* Dutch (nl_NL) - [Chris Devriese](http://www.100it.be/), [Martin Hein](http://www.split-a-pixel.nl/), [Rene](http://wpwebshop.com/), [TenSheep](http://tensheep.nl/), [Tim de Hoog](http://www.ecommany.com/) +======= * Chinese (China; zh_CN) - Soz, Keefe Dunn, Stella Hu * Chinese (Taiwan; zh_TW) - James Wu * Croatian (hr) - tolingo Translation Services, Marko Puskaric * Czech (cs_CZ) - Korry, Radovan Fiser, Tomas Vesely, Pavel Bilek, Vladislav Å enk * Danish (da_DK) - Jens Griebel, Georg S. Adamsen * Dutch (nl_NL) - Chris Devriese, Martin Hein, Rene, TenSheep, Tim de Hoog, Henk Buma +>>>>>>> .r12027 * Esperanto (eo_EO) - Arkadiusz Zychewicz +<<<<<<< .mine +* Estonian (et) - Peeter Rahuvarm, Egon Elbre, Tanel JÃ¼ris +* Finnish (fi) - Miika Turunen, Mediajalostamo, Jani Alha +* French (fr_FR) - Jillij, Oncle Tom, MaÃ®tre MÃ´, Emmanuel Simond, HÃ©di Sellami +* Galician (gl_ES) - Arume Desenvolvementos InformÃ¡ticos +* Georgian (ka_GE) - Nodar Rocko Davituri +* German (de_DE) - Marcel Spitau, Ivan Graf +* Greek (el) - Nick Mouratidis, Pr. friedlich, John D. Dimoferlias +* Gujarati (gu_IN) - Apoto +* Haitian (ht) - Lam Tu Do +* Hebrew (he_IL) - Yaron Ofer, Arik Galansky, Ahrale +* Hindi (hi_IN) - Tarun Joshi, Ashish +* Hungarian (hu_HU) - Andras Hirschler, JÃ¡nos CsÃ¡rdi-Braunstein, Farkas GyÅzÅ +* Indian Bengali (bn_IN) - Suman Manna +* Indonesian (Bahasa Indonesia; id_ID) - Hendry Lee, Belajar Seo Indonesia +* Irish (ga_IE) - Vikas Arora +* Italian (it_IT) - Bruno, Gianni Diurno +* Japanese (ja) - Takayuki Miyoshi +* Korean (ko_KR) - Seong Eun Lee, Jong-In Kim, martian36 +* Latvian (lv) - Sandis Veinbergs +* Lithuanian (lt_LT) - Ernestas Kardzys, Vincent G, Mantas Malcius +* Macedonian (mk_MK) - Darko +* Malay (ms_MY) - Zairul Azmil +* Malayalam (ml_IN) - RAHUL.S.A +* Maltese (mt_MT) - Ajoft Technologies +* Norwegian (nb_NO) - Kjetil M. Bergem, aanvik.net, Peter Holme +* Persian (Farsi; fa_IR) - Mohammad Musavi, Mohsen Firoozmandan, Ghaem Omidi, Ehsan Np +* Polish (pl_PL) - Zbigniew Czernik, Daniel Fruzynski, RafalDesign, Bartosz Arendt +* Portuguese (Brazil; pt_BR) - Leonardo Pinheiro, Henrique Vianna, Caciano Gabriel Batista, GervÃ¡sio AntÃ´nio, Gilvanilson Santos +* Portuguese (Portugal; pt_PT) - Hugo Baeta, Pedro Nave, Pedro MendonÃ§a +||||||| .r11156 +* Estonian (et) - [Peeter Rahuvarm](http://www.kraabus.ee), Egon Elbre +* Finnish (fi) - [Miika Turunen](http://www.webwork.fi/), [Mediajalostamo](http://www.mediajalostamo.fi/), [Jani Alha](http://www.wysiwyg.fi/) +* French (fr_FR) - [Jillij](http://www.jillij.com/), [Oncle Tom](http://case.oncle-tom.net/), [MaÃ®tre MÃ´](http://maitremo.fr/), Emmanuel Simond, HÃ©di Sellami +* Galician (gl_ES) - [Arume Desenvolvementos InformÃ¡ticos](http://www.arumeinformatica.es/) +* Georgian (ka_GE) - [Nodar Rocko Davituri](http://davituri.com/) +* German (de_DE) - [Marcel Spitau](http://blog.spitau.de), [Ivan Graf](http://blog.bildergallery.com/) +* Greek (el) - [Nick Mouratidis](http://www.kepik.gr/), [Pr. friedlich](http://friedlich.wordpress.com/), John D. Dimoferlias +* Gujarati (gu_IN) - [Apoto](http://www.apoto.com/) +* Haitian (ht) - [Lam Tu Do](http://bizover.net/) +* Hebrew (he_IL) - [Yaron Ofer](http://www.gadgetguru.co.il/), [Arik Galansky](http://www.arikg.co.il/) +* Hindi (hi_IN) - [Tarun Joshi](http://www.readers-cafe.net/), [Ashish](http://outshinesolutions.com/) +* Hungarian (hu_HU) - [Andras Hirschler](http://hia.itblog.hu/), [JÃ¡nos CsÃ¡rdi-Braunstein](http://blogocska.org/), [Farkas GyÅzÅ](http://www.sakraft.hu/) +* Indian Bengali (bn_IN) - [Suman Manna](http://www.gwebpro.com/) +* Indonesian (Bahasa Indonesia; id_ID) - [Hendry Lee](http://blogbuildingu.com/), [Belajar Seo Indonesia](http://dhany.web.id/panduan-seo) +* Irish (ga_IE) - [Vikas Arora](http://www.wiznicworld.com/) +* Italian (it_IT) - [Bruno](http://www.brunosalzano.com), [Gianni Diurno](http://gidibao.net/) +* Japanese (ja) - [Takayuki Miyoshi](http://ideasilo.wordpress.com) +* Korean (ko_KR) - Seong Eun Lee, [Jong-In Kim](http://incommunity.codex.kr/wordpress/), [martian36](http://martian36.tistory.com/) +* Latvian (lv) - [Sandis Veinbergs](http://www.kleofass.lv/) +* Lithuanian (lt_LT) - [Ernestas Kardzys](http://www.ernestas.info/), [Vincent G](http://www.host1free.com/), [Mantas Malcius](http://mantas.malcius.lt/) +* Macedonian (mk_MK) - [Darko](http://www.findermind.com/) +* Malay (ms_MY) - [Zairul Azmil](http://www.zairul.com/) +* Malayalam (ml_IN) - [RAHUL.S.A](http://www.infution.co.cc/) +* Maltese (mt_MT) - [Ajoft Technologies](http://www.ajoft.com/) +* Norwegian (nb_NO) - Kjetil M. Bergem, [aanvik.net](http://www.aanvik.net), [Peter Holme](http://holme.se/nettsteder/) +* Persian (Farsi; fa_IR) - [Mohammad Musavi](http://www.musavis.com/), [Mohsen Firoozmandan](http://www.rankbazar.com/), Ghaem Omidi +* Polish (pl_PL) - [Zbigniew Czernik](http://zibik.jogger.pl/), [Daniel Fruzynski](http://www.poradnik-webmastera.com), [RafalDesign](http://www.rafaldesign.pl/), [Bartosz Arendt](http://digitalfactory.pl/) +* Portuguese (pt_PT) - [Hugo Baeta](http://hugobaeta.com), [Pedro Nave](http://pedronave.com/) +======= * Estonian (et) - Peeter Rahuvarm, Egon Elbre, Tanel JÃ¼ris * Finnish (fi) - Miika Turunen, Mediajalostamo, Jani Alha * French (fr_FR) - Jillij, Oncle Tom, MaÃ®tre MÃ´, Emmanuel Simond, HÃ©di Sellami @@ -80,6 +168,7 @@ The following are other recommended plugins by the author of Contact Form 7. * Polish (pl_PL) - Zbigniew Czernik, Daniel Fruzynski, RafalDesign, Bartosz Arendt * Portuguese (Brazil; pt_BR) - Leonardo Pinheiro, Henrique Vianna, Caciano Gabriel Batista, GervÃ¡sio AntÃ´nio, Gilvanilson Santos * Portuguese (Portugal; pt_PT) - Hugo Baeta, Pedro Nave, Pedro MendonÃ§a +>>>>>>> .r12027 * Punjabi (pa_IN) - Jasvinder Sing * Russian (ru_RU) - Dmitry Volotovich, Denis Voituk, twisted tits, kg69design * Romanian (ro_RO) - Stas Sushkov, Anunturi Jibo, Marius Olar, Inbox Translation @@ -125,13 +214,64 @@ Do you have questions or issues with Contact Form 7? Use these support channels For more information, see [Releases](http://contactform7.com/category/releases/). +<<<<<<< .mine += 4.3.1 = +||||||| .r11156 += 3.9.3 = +======= = 4.2.2 = +>>>>>>> .r12027 +<<<<<<< .mine +* Use wp_loaded action hook instead of init to initialize the controller process. +* Fixed: Validation error messages for Really Simple CAPTCHA fields didnât appear. +* Display an alert message if there is a reCAPTCHA widget left unanswered. +* Translations for Portuguese, Hungarian, and Turkish have been updated. +||||||| .r11156 +* Fixed: file uploading was disabled in some of server environments because of wrong use of mt_rand() function. +* Translations for Hungarian has been updated. +======= * Fixed: Possible empty name attribute of form element (invalid HTML5). * Translations for Portuguese, Hungarian, and Spanish have been updated. +>>>>>>> .r12027 +<<<<<<< .mine += 4.3 = +||||||| .r11156 += 3.9.2 = +======= = 4.2.1 = +>>>>>>> .r12027 + +<<<<<<< .mine +* reCAPTCHA module has been introduced. +* Translations for Croatian, Danish, Persian, and Swedish have been updated. +* WordPress 4.2 or higher is required. +||||||| .r11156 +* Fixed: incorrect behavior seen in demo mode. +* Fixed: Flamingo saved submitter's contact info even when the submission was spam. +* New: introduce wpcf7_skip_mail filter. +* Enhancement: add a random-named directory to each uploaded file's temporary file path in order to make the path harder for a submitter to guess. +* Translation for Punjabi has been created. +* Translations for Turkish, Korean and Slovak have been updated. + += 3.9.1 = + +* Fix: options with empty values didn't work correctly in a drop-down menu. +* Fix: broke layout of input fields after validation by an incorrect jQuery use. +* Fix: couldn't enqueue JavaScript manually with wpcf7_enqueue_scripts() when WPCF7_LOAD_JS was false. +* Fix: couldn't enqueue CSS manually with wpcf7_enqueue_styles() when WPCF7_LOAD_CSS was false. +* Translations for Greek and Hungarian have been updated. + += 3.9 = +* A major change has been made to the internal structure. For details, see [beta release announcement](http://contactform7.com/2014/07/02/contact-form-7-39-beta/). +* The exclude_blank mail option has been introduced. +* The wpcf7_load_js and wpcf7_load_css (functions and filter hooks) have been introduced. +* The jQuery Form Plugin (jquery.form.js) has been updated to 3.51.0. +* Translations for Persian and Slovak have been updated. +* WordPress 3.8 or higher is required. +======= * Corrected admin script dependencies. * Shows a hint for keyboard operation in the editor screen. * Translations for Estonian, Portuguese, Dutch, and Turkish have been updated. @@ -141,3 +281,4 @@ For more information, see [Releases](http://contactform7.com/category/releases/) * Renewal of the editor screen. * Translation for Slovene has been updated. * WordPress 4.1 or higher is required. +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/settings.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/settings.php index 486d08a4..47a98332 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/settings.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/settings.php @@ -1,6 +1,7 @@ $value ) ); + update_option( 'wpcf7', $option ); + } +} + add_action( 'plugins_loaded', 'wpcf7' ); function wpcf7() { wpcf7_load_textdomain(); - wpcf7_load_modules(); + WPCF7::load_modules(); + + /* Shortcodes */ + add_shortcode( 'contact-form-7', 'wpcf7_contact_form_tag_func' ); + add_shortcode( 'contact-form', 'wpcf7_contact_form_tag_func' ); /* Shortcodes */ add_shortcode( 'contact-form-7', 'wpcf7_contact_form_tag_func' ); @@ -41,22 +105,16 @@ function wpcf7_init() { add_action( 'admin_init', 'wpcf7_upgrade' ); function wpcf7_upgrade() { - $opt = get_option( 'wpcf7' ); - - if ( ! is_array( $opt ) ) - $opt = array(); - - $old_ver = isset( $opt['version'] ) ? (string) $opt['version'] : '0'; + $old_ver = WPCF7::get_option( 'version', '0' ); $new_ver = WPCF7_VERSION; - if ( $old_ver == $new_ver ) + if ( $old_ver == $new_ver ) { return; + } do_action( 'wpcf7_upgrade', $new_ver, $old_ver ); - $opt['version'] = $new_ver; - - update_option( 'wpcf7', $opt ); + WPCF7::update_option( 'version', $new_ver ); } /* Install and default settings */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/wp-contact-form-7.php b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/wp-contact-form-7.php index ed1c6252..5e7355d2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/wp-contact-form-7.php +++ b/pavillonmadeleine.fr/wp-content/plugins/contact-form-7/wp-contact-form-7.php @@ -7,32 +7,45 @@ Author: Takayuki Miyoshi Author URI: http://ideasilo.wordpress.com/ Text Domain: contact-form-7 Domain Path: /languages/ +<<<<<<< .mine +Version: 4.3.1 +||||||| .r11156 +Version: 3.9.3 +======= Version: 4.2.2 +>>>>>>> .r12027 */ +<<<<<<< .mine +define( 'WPCF7_VERSION', '4.3.1' ); +||||||| .r11156 +/* Copyright 2007-2014 Takayuki Miyoshi (email: takayukister at gmail.com) +======= /* Copyright 2007-2015 Takayuki Miyoshi (email: takayukister at gmail.com) +>>>>>>> .r12027 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +define( 'WPCF7_REQUIRED_WP_VERSION', '4.2' ); - This program 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 General Public License for more details. +define( 'WPCF7_PLUGIN', __FILE__ ); - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ +define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( WPCF7_PLUGIN ) ); + +<<<<<<< .mine +||||||| .r11156 +define( 'WPCF7_VERSION', '3.9.3' ); + +define( 'WPCF7_REQUIRED_WP_VERSION', '3.8' ); + +define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); +======= define( 'WPCF7_VERSION', '4.2.2' ); define( 'WPCF7_REQUIRED_WP_VERSION', '4.1' ); define( 'WPCF7_PLUGIN', __FILE__ ); +>>>>>>> .r12027 define( 'WPCF7_PLUGIN_BASENAME', plugin_basename( WPCF7_PLUGIN ) ); define( 'WPCF7_PLUGIN_NAME', trim( dirname( WPCF7_PLUGIN_BASENAME ), '/' ) ); @@ -69,7 +82,18 @@ if ( ! defined( 'WPCF7_VERIFY_NONCE' ) ) { define( 'WPCF7_VERIFY_NONCE', true ); } +<<<<<<< .mine +if ( ! defined( 'WPCF7_USE_REALLY_SIMPLE_CAPTCHA' ) ) { + define( 'WPCF7_USE_REALLY_SIMPLE_CAPTCHA', false ); +} + +// Deprecated, not used in the plugin core. Use wpcf7_plugin_url() instead. +define( 'WPCF7_PLUGIN_URL', untrailingslashit( plugins_url( '', WPCF7_PLUGIN ) ) ); + +||||||| .r11156 +======= // Deprecated, not used in the plugin core. Use wpcf7_plugin_url() instead. define( 'WPCF7_PLUGIN_URL', untrailingslashit( plugins_url( '', WPCF7_PLUGIN ) ) ); +>>>>>>> .r12027 require_once WPCF7_PLUGIN_DIR . '/settings.php'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/css/main.css b/pavillonmadeleine.fr/wp-content/plugins/wordfence/css/main.css index b9d9b958..4369744e 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/css/main.css +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/css/main.css @@ -1,3 +1,4 @@ +<<<<<<< .mine .wrap.wordfence { direction: ltr; } @@ -474,3 +475,489 @@ table.block-ranges-table tr td { border-width: 1px 0; padding: 10px 0 12px 0; } + +.wf-notice { + margin: 12px 0; + padding: 8px; + background-color: #ffffe0; + border: 1px solid #ffd975; + border-width: 1px 1px 1px 10px; +}||||||| .r0 +======= +.wrap.wordfence { + direction: ltr; +} +.wordfenceWrap { + margin: 20px 0 0 20px; +} +div.wordfenceLive { + height: 29px; + white-space: nowrap; + overflow: hidden; + border-width: 1px 0 1px 0; + background-color: #FFFCEF; + border-color: #666; + border-style: solid; + margin: 20px 0 10px 0; + padding: 3px 3px 3px 10px; + font-family: Arial; + font-size: 14px; + -webkit-font-smoothing: antialiased; +} +div.wordfenceLive h2 { + font-weight: bold; + color: #888; + margin: 0 10px 0 0; + padding: 0; + display: inline; + font-size: 14px; + font-family: Georgia, serif; + font-style: italic; + -webkit-font-smoothing: antialiased; +} +div.wordfenceLive p { + color: #000; + font-weight: normal; + display: inline; +} +.wordfence-icon32 { + width: 32px; + height: 32px; + background-position: 0 0; + background-repeat: no-repeat; + padding: 0; + margin: 7px 5px 0 0; + float: left; +} +#wfHeading { + white-space: nowrap; +} +div.wordfence-lock-icon { + background-image: url(../images/wordfence-logo-32x32.png); +} +a.wfhelp { + background-image: url(../images/help.png); + width: 12px; + height: 12px; + background-position: 0 0; + background-repeat: no-repeat; + padding: 0; + margin: 0 3px 0 3px; + text-decoration: none; + display: inline-block; + vertical-align: middle; +} + +.wordfence .resulticon { + display: block; + float: left; + width: 16px; + height: 16px; + background-position: 0 0; + background-repeat: no-repeat; + border-width: 0; + padding: 0; + margin: 0 3px 0 0; + background-image: url(../images/icons/bullet_yellow.png); +} + +.wordfence .wordfenceScanButton { margin: 20px 0 20px 0; } + +.wordfenceBoldTD { + font-weight: bold; +} + +.wfAjax24 { + display: none; + width: 24px; + height: 24px; + background-image: url(../images/icons/ajax24.gif); + margin: 0; + padding: 0; +} + + +div.wfLoadingWhite32 { + width: 32px; + height: 32px; + background-image: url(../images/icons/ajaxWhite32x32.gif); + margin: 0; + padding: 0; +} + +div.wordfenceScanButton input.button-wf-grey { + background: #EFEFEF url(../images/button-grad-grey.png) repeat-x scroll left top; + border-color: #EFEFEF; +} +.wordfenceScanButton table td { vertical-align: top; } + +.wfTabsContainer { + background-color: #FFF; + overflow: hidden; + border: 1px solid #CCC; + max-width: 900px; + padding: 15px; + min-height: 200px; + -webkit-font-smoothing: antialiased; +} +#wfTabs::after { + content: "."; + display: block; + height: 0; + width: 0; + line-height: 0; + clear: both; + visibility: hidden; +} +#wfTabs a { + float: left; + z-index: 10; + height: 18px; + margin: 0 5px -1px 0; + padding: 5px 8px; + border: 1px solid #CCC; + text-decoration: none; + background-color: #EFEFEF; + color: #21759B; + -moz-border-radius-topright: 3px; + -moz-border-radius-topleft: 3px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} +#wfTabs a.selected { + border-bottom: 1px solid #FFF; + background-color: #FFF; + color: #777; +} +table.wfSummaryParent { font-family: sans-serif; font-size: 14px; color: #000; z-index: 9;} +table.wfSummaryParent td { vertical-align: top; padding: 0; margin: 0; } +table.wfSummaryParent table.wfSummaryChild th { font-weight: bold; text-align: right; font-family: Georgia, serif; color: #000; padding: 5px 10px 5px 0; border-top: 1px solid #CCC; } +table.wfSummaryParent table.wfSummaryChild td { font-weight: normal; text-align: left; padding: 5px 0 5px 0; border-top: 1px solid #CCC; } +table.wfSummaryParent table.wfSC1 td { width: 300px; padding: 0 25px 10px 0; } +table.wfSummaryParent table.wfSC2 th { width: 80px; } +table.wfSummaryParent table.wfSC2 td { width: 100px; } +table.wfSummaryParent table.wfSC3 th { width: 80px; } +table.wfSummaryParent table.wfSC3 td { width: 250px; } +table.wfSummaryParent th.wfHead { font-size: 22px; font-family: Georgia, serif; font-style: italic; color: #555; font-weight: bold; text-align: left; padding: 20px 0 20px 0; -webkit-font-smoothing: antialiased; } + +div.wfIssue table.wfIssue td { padding: 2px; margin: 0; border-width: 0; text-align: left; } +div.wfIssue table.wfIssue th { padding: 2px; margin: 0; font-weight: bold; text-align: left; color: #777; } +div.wfIssue h2 { margin: 0 0 5px 0; padding: 0; } +div.wfIssue table.wfIssueLinks td { border-width: 0; text-align: left; padding-right: 10px; } +.wfIssueOptions { + border-top: 1px solid #CCC; + padding: 10px; +} +.wfIssueOptions a { + margin-left: 10px; +} +.wfIssueOptions strong { + float: left; + display: block; + width: 60px; +} +.wfProbSev1, .wfProbSev2, .wfAjaxLight128, .wfResolved { + width: 128px; + height: 128px; + border: 0; + margin: 0 auto; + background-repeat: no-repeat; background-position: 0 0; + text-decoration: none; + display: block; +} +.wfProbSev1 { background-image: url(../images/icons/error128.png); } +.wfProbSev2 { background-image: url(../images/icons/warning128.png); } +.wfResolved { background-image: url(../images/icons/tick128.png); } +.wfAjaxLight128 { background-image: url(../images/icons/ajax3.gif); } +.wfStrong { font-weight: bold; } +.wordfenceModeElem { display: none; } +.wfIssuesContainer { width: 800px; display: none; } +.wfIssuesContainer p { width: 550px; } +.wfWarn { color: #F00; } +img.wfFlag { vertical-align: middle; margin: -3px 4px 0 0; } +.wfHitTime { font-style: italic; } +.wfAvatar img { vertical-align: middle; } +.wfActEvent { border-bottom: 1px solid #CCC; margin: 0 0 10px 0; padding: 0 0 10px 0; } +.wfTimeAgo { font-family: Georgia, times; color: #999; font-weight: bold; font-style: italic; } +table.wfConfigForm th { + font-weight: normal; + text-align: left; + padding: 2px 3px 1px 0; + vertical-align: middle; +} +table.wfConfigForm td { + vertical-align: middle; +} +table th.wfConfigEnable { font-weight: bold; } +.wfSavedMsg { display: none; color: #A00; } +table th.wfSubheading { font-weight: bold; padding-top: 10px; } +.wfALogTime { color: #999; } +.wfALogEntry { } +.wfALogMailLink, .wfALogViewLink { + display: block; + position: absolute; + padding: 0 0 0 18px; + margin: 0; + right: 10px; + top: 0; + background-repeat: no-repeat; + font-weight: normal; +} +.wfALogMailLink { + background-image: url(../images/icons/email_go.png); +} +.wfALogViewLink { + background-image: url(../images/icons/magnifier.png); +} +#wfActivity { position: relative; } +h3.wfConfigHeading { + font-size: 22px; + color: #777; + font-family: Georgia; + font-style: italic; + font-weight: normal +} +.wfTipText { + color: #777; + font-family: Georgia; + font-style: italic; +} + +.consoleHead { + position: relative; + padding: 0 0 0 3px; + font-weight: bold; + width: 800px; +} +.consoleHeadText { + font-size: 18px; + font-family: Georgia, serif; + font-style: italic; + color: #555; + font-weight: bold; + -webkit-font-smoothing: antialiased; + +} +.consoleOuter { width: 800px; } +.consoleInner { height: 116px; overflow: auto; z-index: 1; } +.bevelDiv1 { border: 1px solid #EFEFEF; } +.bevelDiv2 { border: 1px solid #AAA; } +.bevelDiv3 { border: 1px solid #555; + background-color: #FFFFE0; /* #FFFFF0; /* #FFEBCD; #FFFACD; */ + color: #000; padding: 5px; font-family: Arial; -webkit-font-smoothing: none; } + +.wfBlackCursor{ color: #FFF; } +.wfSecure { color: #0A0; font-weight: bold; } +.wfActivityLine { +} +.wfSummaryDate { float: left; margin-left: 3px; } +.wfSummaryMsg { float: left; margin-left: 3px; } +.wfSummaryResult { float: right; text-align: left; width: 280px; } +.wfSummaryLoading { width: 16px; height: 11px; background-image: url('../images/icons/ajaxScan.gif'); } +.wfSummaryBad, .wfSummaryErr { color: #A00; } +.wfSummaryOK { color: #0A0; } +.wfClear { + content: "."; + display: block; + height: 0; + width: 0; + line-height: 0; + clear: both; + visibility: hidden; +} +.wfSummaryFinal { + -webkit-font-smoothing: antialiased; + font-weight: bold; + color: #555; +} +input.wfStartScanButton { width: 160px; text-align: left; padding-left: 20px; } +.wferror { + color: #F00; +} +#wordfenceWorking { + padding: 2px 8px 2px 24px; + z-index: 100000; + position: fixed; + right: 2px; + bottom: 2px; + border: 1px solid #000; + background-color: #F00; + color: #FFF; + font-size: 12px; + font-weight: bold; + font-family: Arial; + text-align: center; + background-image: url('../images/icons/ajaxRed16.gif'); + background-position: 2px 2px; + background-repeat: no-repeat; +} +#paidWrap { + position: relative; +} +#paidCover { +} +.paidInnerMsg { + width: 500px; + margin: 150px auto 0 auto; + color: #000; + font-size: 18px; + font-family: Georgia, Times; + line-height: 1.8em; + text-align: center; + -webkit-font-smoothing: antialiased; +} +.wfMarker { + height: 1px; + width: 1px; +} +.wfPaidOnlyNotice { + width: 500px; + background-color: #FFFFE0; + border: 1px solid #000; + padding: 10px; + margin: 20px; +} +.wfFalconNotice { + width: 500px; + background-color: #FFD7CE; + border: 1px solid #000; + padding: 10px; + margin: 20px; +} +.wfFalcon { + width: 63px; + height: 63px; + border-width: 0; + background-color: transparent; + background-image: url(../images/wordfenceFalcon.png); + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; + right: 2px; + top: 3px; +} +.wfFalconImage { + width: 63px; + height: 63px; + border-width: 0; + background-color: transparent; + background-image: url(../images/wordfenceFalcon.png); + background-position: 0 0; + background-repeat: no-repeat; + margin: 5px auto 15px auto; +} +.wfSmallFalcon { + width: 33px; + height: 16px; + border-width: 0; + background-color: transparent; + background-image: url(../images/wordfenceFalconSmall.png); + background-position: 0 0; + background-repeat: no-repeat; + margin: 0; + padding: 0; + display: inline; + float: right; +} + + + +.wfOnOffSwitch { + position: relative !important ; width: 69px !important ; + -webkit-user-select:none !important ; -moz-user-select:none !important ; -ms-user-select: none !important ; +} +.wfOnOffSwitch-checkbox { + display: none !important ; +} +.wfOnOffSwitch-label { + display: block !important ; overflow: hidden !important ; cursor: pointer !important ; + border: 2px solid #999999 !important ; border-radius: 19px !important ; +} +.wfOnOffSwitch-inner { + width: 200% !important ; margin-left: -100% !important ; + -moz-transition: margin 0.3s ease-in 0s !important ; -webkit-transition: margin 0.3s ease-in 0s !important ; + -o-transition: margin 0.3s ease-in 0s !important ; transition: margin 0.3s ease-in 0s !important ; +} +.wfOnOffSwitch-inner:before, .wfOnOffSwitch-inner:after { + float: left !important ; width: 50% !important ; height: 19px !important ; padding: 0 !important ; line-height: 19px !important ; + font-size: 14px !important ; color: white !important ; font-family: Trebuchet, Arial, sans-serif !important ; font-weight: bold !important ; + -moz-box-sizing: border-box !important ; -webkit-box-sizing: border-box !important ; box-sizing: border-box !important ; + border-radius: 19px !important ; + box-shadow: 0 9.5px 0 rgba(0,0,0,0.08) inset !important ; +} +.wfOnOffSwitch-inner:before { + content: "ON" !important ; + padding-left: 10px !important ; + background-color: #30D965 !important ; color: #FFFFFF !important ; + border-radius: 19px 0 0 19px !important ; +} +.wfOnOffSwitch-inner:after { + content: "OFF" !important ; + padding-right: 10px !important ; + background-color: #EEEEEE !important ; color: #999999 !important ; + text-align: right !important ; + border-radius: 0 19px 19px 0 !important ; +} +.wfOnOffSwitch-switch { + width: 19px !important ; margin: 0 !important ; + background: #FFFFFF !important ; + border: 2px solid #999999 !important ; border-radius: 19px !important ; + position: absolute !important ; top: 0 !important ; bottom: 0 !important ; right: 46px !important ; + -moz-transition: all 0.3s ease-in 0s !important ; -webkit-transition: all 0.3s ease-in 0s !important ; + -o-transition: all 0.3s ease-in 0s !important ; transition: all 0.3s ease-in 0s !important ; + background-image: -moz-linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 80%) !important ; + background-image: -webkit-linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 80%) !important ; + background-image: -o-linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 80%) !important ; + background-image: linear-gradient(center top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0) 80%) !important ; + box-shadow: 0 1px 1px white inset !important ; +} +.wfOnOffSwitch-checkbox:checked + .wfOnOffSwitch-label .wfOnOffSwitch-inner { + margin-left: 0 !important ; +} +.wfOnOffSwitch-checkbox:checked + .wfOnOffSwitch-label .wfOnOffSwitch-switch { + right: 0 !important ; +} +#wordfenceConfigWarning { + clear: left; + margin-top: 5px; +} + +table.wf-table { + width: 100%; + max-width: 100%; + border-collapse: collapse; +} +table.wf-table th, +table.wf-table td { + padding: 6px 4px; + border: 1px solid #ccc; +} +table.wf-table thead th, +table.wf-table thead td { + background-color: #222; + color: #fff; + font-weight: bold; + border-color: #474747; + text-align: left; +} +table.wf-table tbody tr td { + background-color: #fff; +} +table.wf-table tbody tr.even td, +table.wf-table tbody tr:nth-child(2n) td { + background-color: #eee; +} +table.wf-table tbody tr:hover td { + background-color: #fffbd8; +} + +table.block-ranges-table { + border-collapse: collapse; + margin: 10px 0 0; +} +table.block-ranges-table tr td { + border: 1px solid #CCC; + border-width: 1px 0; + padding: 10px 0 12px 0; +} +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/js/admin.js b/pavillonmadeleine.fr/wp-content/plugins/wordfence/js/admin.js index b5b8be3a..5fe2f1f5 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/js/admin.js +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/js/admin.js @@ -1,3 +1,2155 @@ +<<<<<<< .mine +(function($) { + if (!window['wordfenceAdmin']) { //To compile for checking: java -jar /usr/local/bin/closure.jar --js=admin.js --js_output_file=test.js + window['wordfenceAdmin'] = { + loading16: '

', + loadingCount: 0, + dbCheckTables: [], + dbCheckCount_ok: 0, + dbCheckCount_skipped: 0, + dbCheckCount_errors: 0, + issues: [], + ignoreData: false, + iconErrorMsgs: [], + scanIDLoaded: 0, + colorboxQueue: [], + mode: '', + visibleIssuesPanel: 'new', + preFirstScanMsgsLoaded: false, + newestActivityTime: 0, //must be 0 to force loading of all initially + elementGeneratorIter: 1, + reloadConfigPage: false, + nonce: false, + tickerUpdatePending: false, + activityLogUpdatePending: false, + lastALogCtime: 0, + activityQueue: [], + totalActAdded: 0, + maxActivityLogItems: 1000, + scanReqAnimation: false, + debugOn: false, + blockedCountriesPending: [], + ownCountry: "", + schedStartHour: false, + currentPointer: false, + countryMap: false, + countryCodesToSave: "", + performanceScale: 3, + performanceMinWidth: 20, + tourClosed: false, + welcomeClosed: false, + passwdAuditUpdateInt: false, + _windowHasFocus: true, + serverTimestampOffset: 0, + + init: function() { + this.nonce = WordfenceAdminVars.firstNonce; + this.debugOn = WordfenceAdminVars.debugOn == '1' ? true : false; + this.tourClosed = WordfenceAdminVars.tourClosed == '1' ? true : false; + this.welcomeClosed = WordfenceAdminVars.welcomeClosed == '1' ? true : false; + var startTicker = false; + var self = this; + + $(window).on('blur', function() { + self._windowHasFocus = false; + }).on('focus', function() { + self._windowHasFocus = true; + }).focus(); + + $(document).focus(); + + // (docs|support).wordfence.com GA links + $(document).on('click', 'a', function() { + if (this.href && this.href.indexOf('utm_source') > -1) { + return; + } + var utm = ''; + if (this.host == 'docs.wordfence.com') { + utm = 'utm_source=plugin&utm_medium=pluginUI&utm_campaign=docsIcon'; + } + if (utm) { + utm = (this.search ? '&' : '?') + utm; + this.href = this.protocol + '//' + this.host + this.pathname + this.search + utm + this.hash; + } + + if (this.href == 'http://support.wordfence.com/') { + this.href = 'https://support.wordfence.com/support/home?utm_source=plugin&utm_medium=pluginUI&utm_campaign=supportLink'; + } + }); + + if (jQuery('#wordfenceMode_scan').length > 0) { + this.mode = 'scan'; + jQuery('#wfALogViewLink').prop('href', WordfenceAdminVars.siteBaseURL + '?_wfsf=viewActivityLog&nonce=' + this.nonce); + jQuery('#consoleActivity').scrollTop(jQuery('#consoleActivity').prop('scrollHeight')); + jQuery('#consoleScan').scrollTop(jQuery('#consoleScan').prop('scrollHeight')); + this.noScanHTML = jQuery('#wfNoScanYetTmpl').tmpl().html(); + this.loadIssues(); + this.startActivityLogUpdates(); + if (this.needTour()) { + this.scanTourStart(); + } + } else if (jQuery('#wordfenceMode_activity').length > 0) { + this.mode = 'activity'; + this.setupSwitches('wfLiveTrafficOnOff', 'liveTrafficEnabled', function() { + }); + jQuery('#wfLiveTrafficOnOff').change(function() { + if (/^(?:falcon|php)$/.test(WordfenceAdminVars.cacheType)) { + jQuery('#wfLiveTrafficOnOff').attr('checked', false); + self.colorbox('400px', "Live Traffic not available in high performance mode", "Please note that you can't enable live traffic when Falcon Engine or basic caching is enabled. This is done for performance reasons. If you want live traffic, go to the 'Performance Setup' menu and disable caching."); + } else { + self.updateSwitch('wfLiveTrafficOnOff', 'liveTrafficEnabled', function() { + window.location.reload(true); + }); + } + }); + + if (WordfenceAdminVars.liveTrafficEnabled) { + this.activityMode = 'hit'; + } else { + this.activityMode = 'loginLogout'; + this.switchTab(jQuery('#wfLoginLogoutTab'), 'wfTab1', 'wfDataPanel', 'wfActivity_loginLogout', function() { + WFAD.activityTabChanged(); + }); + } + startTicker = true; + if (this.needTour()) { + this.tour('wfWelcomeContent3', 'wfHeading', 'top', 'left', "Learn about Site Performance", function() { + self.tourRedir('WordfenceSitePerf'); + }); + } + } else if (jQuery('#wordfenceMode_options').length > 0) { + this.mode = 'options'; + jQuery('.wfConfigElem').change(function() { + jQuery('#securityLevel').val('CUSTOM'); + }); + this.updateTicker(true); + startTicker = true; + if (this.needTour()) { + this.tour('wfContentBasicOptions', 'wfMarkerBasicOptions', 'top', 'left', "Learn about Live Traffic Options", function() { + self.tour('wfContentLiveTrafficOptions', 'wfMarkerLiveTrafficOptions', 'bottom', 'left', "Learn about Scanning Options", function() { + self.tour('wfContentScansToInclude', 'wfMarkerScansToInclude', 'bottom', 'left', "Learn about Firewall Rules", function() { + self.tour('wfContentFirewallRules', 'wfMarkerFirewallRules', 'bottom', 'left', "Learn about Login Security", function() { + self.tour('wfContentLoginSecurity', 'wfMarkerLoginSecurity', 'bottom', 'left', "Learn about Other Options", function() { + self.tour('wfContentOtherOptions', 'wfMarkerOtherOptions', 'bottom', 'left', false, false); + }); + }); + }); + }); + }); + } + } else if (jQuery('#wordfenceMode_blockedIPs').length > 0) { + this.mode = 'blocked'; + this.staticTabChanged(); + this.updateTicker(true); + startTicker = true; + if (this.needTour()) { + this.tour('wfWelcomeContent4', 'wfHeading', 'top', 'left', "Learn about Auditing Passwords", function() { + self.tourRedir('WordfencePasswdAudit'); + }); + } + } else if (jQuery('#wordfenceMode_passwd').length > 0) { + this.mode = 'passwd'; + startTicker = false; + this.doPasswdAuditUpdate(); + if (this.needTour()) { + this.tour('wfWelcomePasswd', 'wfHeading', 'top', 'left', "Learn about Cellphone Sign-in", function() { + self.tourRedir('WordfenceTwoFactor'); + }); + } + } else if (jQuery('#wordfenceMode_twoFactor').length > 0) { + this.mode = 'twoFactor'; + startTicker = false; + if (this.needTour()) { + this.tour('wfWelcomeTwoFactor', 'wfHeading', 'top', 'left', "Learn how to Block Countries", function() { + self.tourRedir('WordfenceCountryBlocking'); + }); + } + this.loadTwoFactor(); + + } else if (jQuery('#wordfenceMode_countryBlocking').length > 0) { + this.mode = 'countryBlocking'; + startTicker = false; + if (this.needTour()) { + this.tour('wfWelcomeContentCntBlk', 'wfHeading', 'top', 'left', "Learn how to Schedule Scans", function() { + self.tourRedir('WordfenceScanSchedule'); + }); + } + } else if (jQuery('#wordfenceMode_rangeBlocking').length > 0) { + this.mode = 'rangeBlocking'; + startTicker = false; + if (this.needTour()) { + this.tour('wfWelcomeContentRangeBlocking', 'wfHeading', 'top', 'left', "Learn how to Customize Wordfence", function() { + self.tourRedir('WordfenceSecOpt'); + }); + } + this.calcRangeTotal(); + this.loadBlockRanges(); + } else if (jQuery('#wordfenceMode_whois').length > 0) { + this.mode = 'whois'; + startTicker = false; + if (this.needTour()) { + this.tour('wfWelcomeContentWhois', 'wfHeading', 'top', 'left', "Learn how to use Advanced Blocking", function() { + self.tourRedir('WordfenceRangeBlocking'); + }); + } + this.calcRangeTotal(); + this.loadBlockRanges(); + + } else if (jQuery('#wordfenceMode_scanScheduling').length > 0) { + this.mode = 'scanScheduling'; + startTicker = false; + this.sched_modeChange(); + if (this.needTour()) { + this.tour('wfWelcomeContentScanSched', 'wfHeading', 'top', 'left', "Learn about WHOIS", function() { + self.tourRedir('WordfenceWhois'); + }); + } + } else if (jQuery('#wordfenceMode_caching').length > 0) { + this.mode = 'caching'; + startTicker = false; + if (this.needTour()) { + this.tour('wfWelcomeContentCaching', 'wfHeading', 'top', 'left', "Learn about IP Blocking", function() { + self.tourRedir('WordfenceBlockedIPs'); + }); + } + this.loadCacheExclusions(); + } else { + this.mode = false; + } + if (this.mode) { //We are in a Wordfence page + if (startTicker) { + this.updateTicker(); + this.liveInt = setInterval(function() { + self.updateTicker(); + }, WordfenceAdminVars.actUpdateInterval); + } + jQuery(document).bind('cbox_closed', function() { + self.colorboxIsOpen = false; + self.colorboxServiceQueue(); + }); + } + }, + needTour: function() { + if ((!this.tourClosed) && this.welcomeClosed) { + return true; + } else { + return false; + } + }, + sendTestEmail: function(email) { + var self = this; + this.ajax('wordfence_sendTestEmail', {email: email}, function(res) { + if (res.result) { + self.colorbox('400px', "Test Email Sent", "Your test email was sent to the requested email address. The result we received from the WordPress wp_mail() function was: " + + res.result + "

A 'True' result means WordPress thinks the mail was sent without errors. A 'False' result means that WordPress encountered an error sending your mail. Note that it's possible to get a 'True' response with an error elsewhere in your mail system that may cause emails to not be delivered."); + } + }); + }, + loadAvgSitePerf: function() { + var self = this; + this.ajax('wordfence_loadAvgSitePerf', {limit: jQuery('#wfAvgPerfNum').val()}, function(res) { + res['scale'] = self.performanceScale; + res['min'] = self.performanceMinWidth; + jQuery('#wfAvgSitePerfContent').empty(); + var newElem = jQuery('#wfAvgPerfTmpl').tmpl(res); + newElem.prependTo('#wfAvgSitePerfContent').fadeIn(); + }); + }, + updateSwitch: function(elemID, configItem, cb) { + var setting = jQuery('#' + elemID).is(':checked'); + this.updateConfig(configItem, jQuery('#' + elemID).is(':checked') ? 1 : 0, cb); + }, + setupSwitches: function(elemID, configItem, cb) { + jQuery('.wfOnOffSwitch-checkbox').change(function() { + jQuery.data(this, 'lastSwitchChange', (new Date()).getTime()); + }); + var self = this; + jQuery('div.wfOnOffSwitch').mouseup(function() { + var elem = jQuery(this); + setTimeout(function() { + var checkedElem = elem.find('.wfOnOffSwitch-checkbox'); + if ((new Date()).getTime() - jQuery.data(checkedElem[0], 'lastSwitchChange') > 300) { + checkedElem.prop('checked', !checkedElem.is(':checked')); + self.updateSwitch(elemID, configItem, cb); + } + }, 50); + }); + }, + scanTourStart: function() { + var self = this; + this.tour('wfWelcomeContent1', 'wfHeading', 'top', 'left', "Continue the Tour", function() { + self.tour('wfWelcomeContent2', 'wfHeading', 'top', 'left', "Learn how to use Wordfence", function() { + self.tour('wfWelcomeContent3', 'wfHeading', 'top', 'left', "Learn about Live Traffic", function() { + self.tourRedir('WordfenceActivity'); + }); + }); + }); + }, + tourRedir: function(menuItem) { + window.location.href = 'admin.php?page=' + menuItem; + }, + updateConfig: function(key, val, cb) { + this.ajax('wordfence_updateConfig', {key: key, val: val}, function() { + cb(); + }); + }, + tourFinish: function() { + this.ajax('wordfence_tourClosed', {}, function(res) { + }); + }, + downgradeLicense: function() { + this.colorbox('400px', "Confirm Downgrade", "Are you sure you want to downgrade your Wordfence Premium License? This will disable all Premium features and return you to the free version of Wordfence. Click here to renew your paid membership or click the button below to confirm you want to downgrade.

"); + }, + downgradeLicenseConfirm: function() { + jQuery.colorbox.close(); + this.ajax('wordfence_downgradeLicense', {}, function(res) { + location.reload(true); + }); + }, + tour: function(contentID, elemID, edge, align, buttonLabel, buttonCallback) { + var self = this; + if (this.currentPointer) { + this.currentPointer.pointer('destroy'); + this.currentPointer = false; + } + var options = { + buttons: function(event, t) { + var buttonElem = jQuery('

End the Tour

Help spread the word by rating us 5★ on WordPress.org

'); + buttonElem.find('#pointer-close').bind('click.pointer', function(evtObj) { + var evtSourceElem = evtObj.srcElement ? evtObj.srcElement : evtObj.target; + if (evtSourceElem.id == 'wfRateLink') { + return true; + } + self.tourFinish(); + t.element.pointer('close'); + return false; + }); + return buttonElem; + }, + close: function() { + }, + content: jQuery('#' + contentID).tmpl().html(), + pointerWidth: 400, + position: { + edge: edge, + align: align + } + }; + this.currentPointer = jQuery('#' + elemID).pointer(options).pointer('open'); + if (buttonLabel && buttonCallback) { + jQuery('#pointer-close').after('' + buttonLabel + ''); + jQuery('#pointer-primary').click(buttonCallback); + } + }, + startTourAgain: function() { + var self = this; + this.ajax('wordfence_startTourAgain', {}, function(res) { + self.tourClosed = false; + self.scanTourStart(); + }); + }, + showLoading: function() { + this.loadingCount++; + if (this.loadingCount == 1) { + jQuery('

Wordfence is working...

').appendTo('body'); + } + }, + removeLoading: function() { + this.loadingCount--; + if (this.loadingCount == 0) { + jQuery('#wordfenceWorking').remove(); + } + }, + startActivityLogUpdates: function() { + var self = this; + setInterval(function() { + self.updateActivityLog(); + }, parseInt(WordfenceAdminVars.actUpdateInterval)); + }, + updateActivityLog: function() { + if (this.activityLogUpdatePending || !this.windowHasFocus()) { + return; + } + this.activityLogUpdatePending = true; + var self = this; + this.ajax('wordfence_activityLogUpdate', { + lastctime: this.lastALogCtime + }, function(res) { + self.doneUpdateActivityLog(res); + }, function() { + self.activityLogUpdatePending = false; + }, true); + + }, + doneUpdateActivityLog: function(res) { + this.actNextUpdateAt = (new Date()).getTime() + parseInt(WordfenceAdminVars.actUpdateInterval); + if (res.ok) { + if (res.items.length > 0) { + this.activityQueue.push.apply(this.activityQueue, res.items); + this.lastALogCtime = res.items[res.items.length - 1].ctime; + this.processActQueue(res.currentScanID); + } + } + this.activityLogUpdatePending = false; + }, + processActQueue: function(currentScanID) { + if (this.activityQueue.length > 0) { + this.addActItem(this.activityQueue.shift()); + this.totalActAdded++; + if (this.totalActAdded > this.maxActivityLogItems) { + jQuery('#consoleActivity div:first').remove(); + this.totalActAdded--; + } + var timeTillNextUpdate = this.actNextUpdateAt - (new Date()).getTime(); + var maxRate = 50 / 1000; //Rate per millisecond + var bulkTotal = 0; + while (this.activityQueue.length > 0 && this.activityQueue.length / timeTillNextUpdate > maxRate) { + var item = this.activityQueue.shift(); + if (item) { + bulkTotal++; + this.addActItem(item); + } + } + this.totalActAdded += bulkTotal; + if (this.totalActAdded > this.maxActivityLogItems) { + jQuery('#consoleActivity div:lt(' + bulkTotal + ')').remove(); + this.totalActAdded -= bulkTotal; + } + var minDelay = 100; + var delay = minDelay; + if (timeTillNextUpdate < 1) { + delay = minDelay; + } else { + delay = Math.round(timeTillNextUpdate / this.activityQueue.length); + if (delay < minDelay) { + delay = minDelay; + } + } + var self = this; + setTimeout(function() { + self.processActQueue(); + }, delay); + } + jQuery('#consoleActivity').scrollTop(jQuery('#consoleActivity').prop('scrollHeight')); + }, + processActArray: function(arr) { + for (var i = 0; i < arr.length; i++) { + this.addActItem(arr[i]); + } + }, + addActItem: function(item) { + if (!item) { + return; + } + if (!item.msg) { + return; + } + if (item.msg.indexOf('SUM_') == 0) { + this.processSummaryLine(item); + jQuery('#consoleSummary').scrollTop(jQuery('#consoleSummary').prop('scrollHeight')); + jQuery('#wfStartingScan').addClass('wfSummaryOK').html('Done.'); + } else if (this.debugOn || item.level < 4) { + + var html = '

[' + item.date + '] ' + item.msg + '

'; + jQuery('#consoleActivity').append(html); + if (/Scan complete\./i.test(item.msg)) { + this.loadIssues(); + } + } + }, + processSummaryLine: function(item) { + var msg, summaryUpdated; + if (item.msg.indexOf('SUM_START:') != -1) { + msg = item.msg.replace('SUM_START:', ''); + jQuery('#consoleSummary').append('

[' + item.date + ']

' + msg + '

'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_ENDBAD') != -1) { + msg = item.msg.replace('SUM_ENDBAD:', ''); + jQuery('div.wfSummaryMsg:contains("' + msg + '")').next().addClass('wfSummaryBad').html('Problems found.'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_ENDFAILED') != -1) { + msg = item.msg.replace('SUM_ENDFAILED:', ''); + jQuery('div.wfSummaryMsg:contains("' + msg + '")').next().addClass('wfSummaryBad').html('Failed.'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_ENDOK') != -1) { + msg = item.msg.replace('SUM_ENDOK:', ''); + jQuery('div.wfSummaryMsg:contains("' + msg + '")').next().addClass('wfSummaryOK').html('Secure.'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_ENDSUCCESS') != -1) { + msg = item.msg.replace('SUM_ENDSUCCESS:', ''); + jQuery('div.wfSummaryMsg:contains("' + msg + '")').next().addClass('wfSummaryOK').html('Success.'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_ENDERR') != -1) { + msg = item.msg.replace('SUM_ENDERR:', ''); + jQuery('div.wfSummaryMsg:contains("' + msg + '")').next().addClass('wfSummaryErr').html('An error occurred.'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_DISABLED:') != -1) { + msg = item.msg.replace('SUM_DISABLED:', ''); + jQuery('#consoleSummary').append('

[' + item.date + ']

' + msg + '

Disabled [Visit Options to Enable]

'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_PAIDONLY:') != -1) { + msg = item.msg.replace('SUM_PAIDONLY:', ''); + jQuery('#consoleSummary').append('

[' + item.date + ']

' + msg + '

Paid Members Only

'); + summaryUpdated = true; + } else if (item.msg.indexOf('SUM_FINAL:') != -1) { + msg = item.msg.replace('SUM_FINAL:', ''); + jQuery('#consoleSummary').append('

[' + item.date + ']

' + msg + '

Scan Complete.

'); + } else if (item.msg.indexOf('SUM_PREP:') != -1) { + msg = item.msg.replace('SUM_PREP:', ''); + jQuery('#consoleSummary').empty().html('

[' + item.date + ']

' + msg + '

'); + } else if (item.msg.indexOf('SUM_KILLED:') != -1) { + msg = item.msg.replace('SUM_KILLED:', ''); + jQuery('#consoleSummary').empty().html('

[' + item.date + ']

' + msg + '

Scan Complete.

'); + } + }, + processActQueueItem: function() { + var item = this.activityQueue.shift(); + if (item) { + jQuery('#consoleActivity').append('

[' + item.date + '] ' + item.msg + '

'); + this.totalActAdded++; + if (this.totalActAdded > this.maxActivityLogItems) { + jQuery('#consoleActivity div:first').remove(); + this.totalActAdded--; + } + if (item.msg == 'Scan complete.') { + this.loadIssues(); + } + } + }, + updateTicker: function(forceUpdate) { + if ((!forceUpdate) && (this.tickerUpdatePending || !this.windowHasFocus())) { + return; + } + this.tickerUpdatePending = true; + var self = this; + var alsoGet = ''; + var otherParams = ''; + if (this.mode == 'activity' && /^(?:404|hit|human|ruser|gCrawler|crawler|loginLogout)$/.test(this.activityMode)) { + alsoGet = 'logList_' + this.activityMode; + otherParams = this.newestActivityTime; + } else if (this.mode == 'perfStats') { + alsoGet = 'perfStats'; + otherParams = this.newestActivityTime; + } + this.ajax('wordfence_ticker', { + alsoGet: alsoGet, + otherParams: otherParams + }, function(res) { + self.handleTickerReturn(res); + }, function() { + self.tickerUpdatePending = false; + }, true); + }, + handleTickerReturn: function(res) { + this.tickerUpdatePending = false; + var newMsg = ""; + var oldMsg = jQuery('#wfLiveStatus').text(); + if (res.msg) { + newMsg = res.msg; + } else { + newMsg = "Idle"; + } + if (newMsg && newMsg != oldMsg) { + jQuery('#wfLiveStatus').hide().html(newMsg).fadeIn(200); + } + var haveEvents, newElem; + this.serverTimestampOffset = (new Date().getTime() / 1000) - res.serverTime; + + if (this.mode == 'activity') { + if (res.alsoGet != 'logList_' + this.activityMode) { + return; + } //user switched panels since ajax request started + if (res.events.length > 0) { + this.newestActivityTime = res.events[0]['ctime']; + } + haveEvents = false; + if (jQuery('#wfActivity_' + this.activityMode + ' .wfActEvent').length > 0) { + haveEvents = true; + } + if (res.events.length > 0) { + if (!haveEvents) { + jQuery('#wfActivity_' + this.activityMode).empty(); + } + for (i = res.events.length - 1; i >= 0; i--) { + var elemID = '#wfActEvent_' + res.events[i].id; + if (jQuery(elemID).length < 1) { + res.events[i]['activityMode'] = this.activityMode; + if (this.activityMode == 'loginLogout') { + newElem = jQuery('#wfLoginLogoutEventTmpl').tmpl(res.events[i]); + } else { + newElem = jQuery('#wfHitsEventTmpl').tmpl(res.events[i]); + } + jQuery(newElem).find('.wfTimeAgo').data('wfctime', res.events[i].ctime); + newElem.prependTo('#wfActivity_' + this.activityMode).fadeIn(); + } + } + this.reverseLookupIPs(); + } else { + if (!haveEvents) { + jQuery('#wfActivity_' + this.activityMode).html('

No events to report yet.

'); + } + } + var self = this; + this.updateTimeAgo(); + } else if (this.mode == 'perfStats') { + haveEvents = false; + if (jQuery('#wfPerfStats .wfPerfEvent').length > 0) { + haveEvents = true; + } + if (res.events.length > 0) { + if (!haveEvents) { + jQuery('#wfPerfStats').empty(); + } + var curLength = parseInt(jQuery('#wfPerfStats').css('width')); + if (res.longestLine > curLength) { + jQuery('#wfPerfStats').css('width', (res.longestLine + 200) + 'px'); + } + this.newestActivityTime = res.events[0]['ctime']; + for (var i = res.events.length - 1; i >= 0; i--) { + res.events[i]['scale'] = this.performanceScale; + res.events[i]['min'] = this.performanceMinWidth; + newElem = jQuery('#wfPerfStatTmpl').tmpl(res.events[i]); + jQuery(newElem).find('.wfTimeAgo').data('wfctime', res.events[i].ctime); + newElem.prependTo('#wfPerfStats').fadeIn(); + } + } else { + if (!haveEvents) { + jQuery('#wfPerfStats').html('

No events to report yet.

'); + } + } + this.updateTimeAgo(); + } + }, + reverseLookupIPs: function() { + var ips = []; + jQuery('.wfReverseLookup').each(function(idx, elem) { + var txt = jQuery(elem).text(); + if (/^\d+\.\d+\.\d+\.\d+$/.test(txt) && (!jQuery(elem).data('wfReverseDone'))) { + jQuery(elem).data('wfReverseDone', true); + ips.push(jQuery(elem).text()); + } + }); + if (ips.length < 1) { + return; + } + var uni = {}; + var uniqueIPs = []; + for (var i = 0; i < ips.length; i++) { + if (!uni[ips[i]]) { + uni[ips[i]] = true; + uniqueIPs.push(ips[i]); + } + } + this.ajax('wordfence_reverseLookup', { + ips: uniqueIPs.join(',') + }, + function(res) { + if (res.ok) { + jQuery('.wfReverseLookup').each(function(idx, elem) { + var txt = jQuery(elem).text(); + for (var ip in res.ips) { + if (txt == ip) { + if (res.ips[ip]) { + jQuery(elem).html('Hostname: ' + res.ips[ip]); + } else { + jQuery(elem).html(''); + } + } + } + }); + } + }, false, false); + }, + killScan: function() { + var self = this; + this.ajax('wordfence_killScan', {}, function(res) { + if (res.ok) { + self.colorbox('400px', "Kill requested", "A termination request has been sent to any running scans."); + } else { + self.colorbox('400px', "Kill failed", "We failed to send a termination request."); + } + }); + }, + startScan: function() { + var scanReqAnimation = setInterval(function() { + var str = jQuery('#wfStartScanButton1').prop('value'); + var ch = str.charAt(str.length - 1); + if (ch == '/') { + ch = '-'; + } + else if (ch == '-') { + ch = '\\'; + } + else if (ch == '\\') { + ch = '|'; + } + else if (ch == '|') { + ch = '/'; + } + else { + ch = '/'; + } + jQuery('#wfStartScanButton1,#wfStartScanButton2').prop('value', "Requesting a New Scan " + ch); + }, 100); + setTimeout(function(res) { + clearInterval(scanReqAnimation); + jQuery('#wfStartScanButton1,#wfStartScanButton2').prop('value', "Start a Wordfence Scan"); + }, 3000); + this.ajax('wordfence_scan', {}, function(res) { + }); + }, + displayPWAuditJobs: function(res) { + if (res && res.results && res.results.length > 0) { + var wfAuditJobs = $('#wfAuditJobs'); + jQuery('#wfAuditJobs').empty(); + jQuery('#wfAuditJobsTable').tmpl().appendTo(wfAuditJobs); + var wfAuditJobsBody = wfAuditJobs.find('.wf-pw-audit-tbody'); + for (var i = 0; i < res.results.length; i++) { + jQuery('#wfAuditJobsInProg').tmpl(res.results[i]).appendTo(wfAuditJobsBody); + } + } else { + jQuery('#wfAuditJobs').empty().html("

You don't have any password auditing jobs in progress or completed yet.

"); + } + }, + loadIssues: function(callback) { + if (this.mode != 'scan') { + return; + } + var self = this; + this.ajax('wordfence_loadIssues', {}, function(res) { + self.displayIssues(res, callback); + }); + }, + sev2num: function(str) { + if (/wfProbSev1/.test(str)) { + return 1; + } else if (/wfProbSev2/.test(str)) { + return 2; + } else { + return 0; + } + }, + displayIssues: function(res, callback) { + var self = this; + try { + res.summary['lastScanCompleted'] = res['lastScanCompleted']; + } catch (err) { + res.summary['lastScanCompleted'] = 'Never'; + } + jQuery('.wfIssuesContainer').hide(); + for (var issueStatus in res.issuesLists) { + var containerID = 'wfIssues_dataTable_' + issueStatus; + var tableID = 'wfIssuesTable_' + issueStatus; + if (jQuery('#' + containerID).length < 1) { + //Invalid issue status + continue; + } + if (res.issuesLists[issueStatus].length < 1) { + if (issueStatus == 'new') { + if (res.lastScanCompleted == 'ok') { + jQuery('#' + containerID).html('

Congratulations! No security problems were detected by Wordfence.

'); + } else if (res['lastScanCompleted']) { + //jQuery('#' + containerID).html('

The latest scan failed: ' + res.lastScanCompleted + '

'); + } else { + jQuery('#' + containerID).html(); + } + + } else { + jQuery('#' + containerID).html('

There are currently no issues being ignored on this site.

'); + } + continue; + } + jQuery('#' + containerID).html('

'); + + jQuery.fn.dataTableExt.oSort['severity-asc'] = function(y, x) { + x = WFAD.sev2num(x); + y = WFAD.sev2num(y); + if (x < y) { + return 1; + } + if (x > y) { + return -1; + } + return 0; + }; + jQuery.fn.dataTableExt.oSort['severity-desc'] = function(y, x) { + x = WFAD.sev2num(x); + y = WFAD.sev2num(y); + if (x > y) { + return 1; + } + if (x < y) { + return -1; + } + return 0; + }; + + jQuery('#' + tableID).dataTable({ + "bFilter": false, + "bInfo": false, + "bPaginate": false, + "bLengthChange": false, + "bAutoWidth": false, + "aaData": res.issuesLists[issueStatus], + "aoColumns": [ + { + "sTitle": '

Severity

', + "sWidth": '128px', + "sClass": "center", + "sType": 'severity', + "fnRender": function(obj) { + var cls = 'wfProbSev' + obj.aData.severity; + return ''; + } + }, + { + "sTitle": '

Issue

', + "bSortable": false, + "sWidth": '400px', + "sType": 'html', + fnRender: function(obj) { + var tmplName = 'issueTmpl_' + obj.aData.type; + return jQuery('#' + tmplName).tmpl(obj.aData).html(); + } + } + ] + }); + } + if (callback) { + jQuery('#wfIssues_' + this.visibleIssuesPanel).fadeIn(500, function() { + callback(); + }); + } else { + jQuery('#wfIssues_' + this.visibleIssuesPanel).fadeIn(500); + } + return true; + }, + ajax: function(action, data, cb, cbErr, noLoading) { + if (typeof(data) == 'string') { + if (data.length > 0) { + data += '&'; + } + data += 'action=' + action + '&nonce=' + this.nonce; + } else if (typeof(data) == 'object') { + data['action'] = action; + data['nonce'] = this.nonce; + } + if (!cbErr) { + cbErr = function() { + }; + } + var self = this; + if (!noLoading) { + this.showLoading(); + } + jQuery.ajax({ + type: 'POST', + url: WordfenceAdminVars.ajaxURL, + dataType: "json", + data: data, + success: function(json) { + if (!noLoading) { + self.removeLoading(); + } + if (json && json.nonce) { + self.nonce = json.nonce; + } + if (json && json.errorMsg) { + self.colorbox('400px', 'An error occurred', json.errorMsg); + } + cb(json); + }, + error: function() { + if (!noLoading) { + self.removeLoading(); + } + cbErr(); + } + }); + }, + colorbox: function(width, heading, body) { + this.colorboxQueue.push([width, heading, body]); + this.colorboxServiceQueue(); + }, + colorboxServiceQueue: function() { + if (this.colorboxIsOpen) { + return; + } + if (this.colorboxQueue.length < 1) { + return; + } + var elem = this.colorboxQueue.shift(); + this.colorboxOpen(elem[0], elem[1], elem[2]); + }, + colorboxOpen: function(width, heading, body) { + this.colorboxIsOpen = true; + jQuery.colorbox({width: width, html: "

" + heading + "

" + body + "

"}); + }, + scanRunningMsg: function() { + this.colorbox('400px', "A scan is running", "A scan is currently in progress. Please wait until it finishes before starting another scan."); + }, + errorMsg: function(msg) { + this.colorbox('400px', "An error occurred:", msg); + }, + bulkOperation: function(op) { + var self = this; + if (op == 'del' || op == 'repair') { + var ids = jQuery('input.wf' + op + 'Checkbox:checked').map(function() { + return jQuery(this).val(); + }).get(); + if (ids.length < 1) { + this.colorbox('400px', "No files were selected", "You need to select files to perform a bulk operation. There is a checkbox in each issue that lets you select that file. You can then select a bulk operation and hit the button to perform that bulk operation."); + return; + } + if (op == 'del') { + this.colorbox('400px', "Are you sure you want to delete?", "Are you sure you want to delete a total of " + ids.length + " files? Do not delete files on your system unless you're ABSOLUTELY sure you know what you're doing. If you delete the wrong file it could cause your WordPress website to stop functioning and you will probably have to restore from backups. If you're unsure, Cancel and work with your hosting provider to clean your system of infected files.


"); + } else if (op == 'repair') { + this.colorbox('400px', "Are you sure you want to repair?", "Are you sure you want to repair a total of " + ids.length + " files? Do not repair files on your system unless you're sure you have reviewed the differences between the original file and your version of the file in the files you are repairing. If you repair a file that has been customized for your system by a developer or your hosting provider it may leave your system unusable. If you're unsure, Cancel and work with your hosting provider to clean your system of infected files.


"); + } + } else { + return; + } + }, + bulkOperationConfirmed: function(op) { + jQuery.colorbox.close(); + var self = this; + this.ajax('wordfence_bulkOperation', { + op: op, + ids: jQuery('input.wf' + op + 'Checkbox:checked').map(function() { + return jQuery(this).val(); + }).get() + }, function(res) { + self.doneBulkOperation(res); + }); + }, + doneBulkOperation: function(res) { + var self = this; + if (res.ok) { + this.loadIssues(function() { + self.colorbox('400px', res.bulkHeading, res.bulkBody); + }); + } else { + this.loadIssues(function() { + }); + } + }, + deleteFile: function(issueID, force) { + var self = this; + this.ajax('wordfence_deleteFile', { + issueID: issueID, + forceDelete: force + }, function(res) { + self.doneDeleteFile(res); + }); + }, + doneDeleteFile: function(res) { + var cb = false; + var self = this; + if (res.ok) { + this.loadIssues(function() { + self.colorbox('400px', "Success deleting file", "The file " + res.file + " was successfully deleted."); + }); + } else if (res.cerrorMsg) { + this.loadIssues(function() { + self.colorbox('400px', 'An error occurred', res.cerrorMsg); + }); + } + }, + deleteDatabaseOption: function(issueID) { + var self = this; + this.ajax('wordfence_deleteDatabaseOption', { + issueID: issueID + }, function(res) { + self.doneDeleteDatabaseOption(res); + }); + }, + doneDeleteDatabaseOption: function(res) { + var cb = false; + var self = this; + if (res.ok) { + this.loadIssues(function() { + self.colorbox('400px', "Success removing option", "The option " + res.option_name + " was successfully removed."); + }); + } else if (res.cerrorMsg) { + this.loadIssues(function() { + self.colorbox('400px', 'An error occurred', res.cerrorMsg); + }); + } + }, + restoreFile: function(issueID) { + var self = this; + this.ajax('wordfence_restoreFile', { + issueID: issueID + }, function(res) { + self.doneRestoreFile(res); + }); + }, + doneRestoreFile: function(res) { + var self = this; + if (res.ok) { + this.loadIssues(function() { + self.colorbox("400px", "File restored OK", "The file " + res.file + " was restored successfully."); + }); + } else if (res.cerrorMsg) { + this.loadIssues(function() { + self.colorbox('400px', 'An error occurred', res.cerrorMsg); + }); + } + }, + deleteIssue: function(id) { + var self = this; + this.ajax('wordfence_deleteIssue', {id: id}, function(res) { + self.loadIssues(); + }); + }, + updateIssueStatus: function(id, st) { + var self = this; + this.ajax('wordfence_updateIssueStatus', {id: id, 'status': st}, function(res) { + if (res.ok) { + self.loadIssues(); + } + }); + }, + updateAllIssues: function(op) { // deleteIgnored, deleteNew, ignoreAllNew + var head = "Please confirm"; + var body; + if (op == 'deleteIgnored') { + body = "You have chosen to remove all ignored issues. Once these issues are removed they will be re-scanned by Wordfence and if they have not been fixed, they will appear in the 'new issues' list. Are you sure you want to do this?"; + } else if (op == 'deleteNew') { + body = "You have chosen to mark all new issues as fixed. If you have not really fixed these issues, they will reappear in the new issues list on the next scan. If you have not fixed them and want them excluded from scans you should choose to 'ignore' them instead. Are you sure you want to mark all new issues as fixed?"; + } else if (op == 'ignoreAllNew') { + body = "You have chosen to ignore all new issues. That means they will be excluded from future scans. You should only do this if you're sure all new issues are not a problem. Are you sure you want to ignore all new issues?"; + } else { + return; + } + this.colorbox('450px', head, body + '


'); + }, + confirmUpdateAllIssues: function(op) { + var self = this; + this.ajax('wordfence_updateAllIssues', {op: op}, function(res) { + self.loadIssues(); + }); + }, + es: function(val) { + if (val) { + return val; + } else { + return ""; + } + }, + noQuotes: function(str) { + return str.replace(/"/g, '"').replace(/\'/g, '‘'); + }, + commify: function(num) { + return ("" + num).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"); + }, + switchToLiveTab: function(elem) { + jQuery('.wfTab1').removeClass('selected'); + jQuery(elem).addClass('selected'); + jQuery('.wfDataPanel').hide(); + var self = this; + jQuery('#wfActivity').fadeIn(function() { + self.completeLiveTabSwitch(); + }); + }, + completeLiveTabSwitch: function() { + this.ajax('wordfence_loadActivityLog', {}, function(res) { + var html = ''; + if (res.events && res.events.length > 0) { + jQuery('#wfActivity').empty(); + for (var i = 0; i < res.events.length; i++) { + var timeTaken = '0.0000'; + if (res.events[i + 1]) { + timeTaken = (res.events[i].ctime - res.events[i + 1].ctime).toFixed(4); + } + var red = ""; + if (res.events[i].type == 'error') { + red = ' class="wfWarn" '; + } + html += '

[' + res.events[i].type + ' : ' + timeTaken + ' : ' + res.events[i].timeAgo + ' ago] ' + res.events[i].msg + "

"; + } + jQuery('#wfActivity').html(html); + } else { + jQuery('#wfActivity').html("

No activity to report yet. Please complete your first scan.

"); + } + }); + }, + emailActivityLog: function() { + this.colorbox('400px', 'Email Wordfence Activity Log', "Enter the email address you would like to send the Wordfence activity log to. Note that the activity log may contain thousands of lines of data. This log is usually only sent to a member of the Wordfence support team. It also contains your PHP configuration from the phpinfo() function for diagnostic data.

"); + }, + completeEmailActivityLog: function() { + jQuery.colorbox.close(); + var email = jQuery('#wfALogRecip').val(); + if (!/^[^@]+@[^@]+$/.test(email)) { + alert("Please enter a valid email address."); + return; + } + var self = this; + this.ajax('wordfence_sendActivityLog', {email: jQuery('#wfALogRecip').val()}, function(res) { + if (res.ok) { + self.colorbox('400px', 'Activity Log Sent', "Your Wordfence activity log was sent to " + email + "

"); + } + }); + }, + reloadActivityData: function() { + jQuery('#wfActivity').html('

'); //

+ this.completeLiveTabSwitch(); + }, + switchToSummaryTab: function(elem) { + jQuery('.wfTab1').removeClass('selected'); + jQuery(elem).addClass('selected'); + jQuery('.wfDataPanel').hide(); + jQuery('#wfSummaryTables').fadeIn(); + }, + switchIssuesTab: function(elem, type) { + jQuery('.wfTab2').removeClass('selected'); + jQuery('.wfIssuesContainer').hide(); + jQuery(elem).addClass('selected'); + this.visibleIssuesPanel = type; + jQuery('#wfIssues_' + type).fadeIn(); + }, + switchTab: function(tabElement, tabClass, contentClass, selectedContentID, callback) { + jQuery('.' + tabClass).removeClass('selected'); + jQuery(tabElement).addClass('selected'); + jQuery('.' + contentClass).hide().html('

'); + var func = function() { + }; + if (callback) { + func = function() { + callback(); + }; + } + jQuery('#' + selectedContentID).fadeIn(func); + }, + activityTabChanged: function() { + var mode = jQuery('.wfDataPanel:visible')[0].id.replace('wfActivity_', ''); + if (!mode) { + return; + } + this.activityMode = mode; + this.reloadActivities(); + }, + reloadActivities: function() { + jQuery('#wfActivity_' + this.activityMode).html('

'); + this.newestActivityTime = 0; + this.updateTicker(true); + }, + staticTabChanged: function() { + var mode = jQuery('.wfDataPanel:visible')[0].id.replace('wfActivity_', ''); + if (!mode) { + return; + } + this.activityMode = mode; + + var self = this; + this.ajax('wordfence_loadStaticPanel', { + mode: this.activityMode + }, function(res) { + self.completeLoadStaticPanel(res); + }); + }, + completeLoadStaticPanel: function(res) { + var contentElem = '#wfActivity_' + this.activityMode; + jQuery(contentElem).empty(); + if (res.results && res.results.length > 0) { + var tmpl; + if (this.activityMode == 'topScanners' || this.activityMode == 'topLeechers') { + tmpl = '#wfLeechersTmpl'; + } else if (this.activityMode == 'blockedIPs') { + tmpl = '#wfBlockedIPsTmpl'; + } else if (this.activityMode == 'lockedOutIPs') { + tmpl = '#wfLockedOutIPsTmpl'; + } else if (this.activityMode == 'throttledIPs') { + tmpl = '#wfThrottledIPsTmpl'; + } else { + return; + } + var i, j, chunk = 1000; + var bigArray = res.results.slice(0); + res.results = false; + for (i = 0, j = bigArray.length; i < j; i += chunk) { + res.results = bigArray.slice(i, i + chunk); + jQuery(tmpl).tmpl(res).appendTo(contentElem); + } + this.reverseLookupIPs(); + } else { + if (this.activityMode == 'topScanners' || this.activityMode == 'topLeechers') { + jQuery(contentElem).html("No site hits have been logged yet. Check back soon."); + } else if (this.activityMode == 'blockedIPs') { + jQuery(contentElem).html("No IP addresses have been blocked yet. If you manually block an IP address or if Wordfence automatically blocks one, it will appear here."); + } else if (this.activityMode == 'lockedOutIPs') { + jQuery(contentElem).html("No IP addresses have been locked out from signing in or using the password recovery system."); + } else if (this.activityMode == 'throttledIPs') { + jQuery(contentElem).html("No IP addresses have been throttled yet. If an IP address accesses the site too quickly and breaks one of the Wordfence rules, it will appear here."); + } else { + return; + } + } + }, + loadPasswdAuditResults: function() { + var self = this; + this.ajax('wordfence_passwdLoadResults', {}, function(res) { + self.displayPWAuditResults(res); + }); + }, + doPasswdAuditUpdate: function(freq) { + this.loadPasswdAuditJobs(); + this.loadPasswdAuditResults(); + }, + stopPasswdAuditUpdate: function() { + clearInterval(this.passwdAuditUpdateInt); + }, + killPasswdAudit: function(jobID) { + var self = this; + this.ajax('wordfence_killPasswdAudit', {jobID: jobID}, function(res) { + if (res.ok) { + self.colorbox('300px', "Stop Requested", "We have sent a request to stop the password audit in progress. It may take a few minutes before results stop appearing. You can immediately start another audit if you'd like."); + } + }); + }, + displayPWAuditResults: function(res) { + if (res && res.results && res.results.length > 0) { + var wfAuditResults = $('#wfAuditResults'); + jQuery('#wfAuditResults').empty(); + jQuery('#wfAuditResultsTable').tmpl().appendTo(wfAuditResults); + var wfAuditResultsBody = wfAuditResults.find('.wf-pw-audit-tbody'); + for (var i = 0; i < res.results.length; i++) { + jQuery('#wfAuditResultsRow').tmpl(res.results[i]).appendTo(wfAuditResultsBody); + } + } else { + jQuery('#wfAuditResults').empty().html("

You don't have any user accounts with a weak password at this time.

"); + } + }, + loadPasswdAuditJobs: function() { + var self = this; + this.ajax('wordfence_passwdLoadJobs', {}, function(res) { + if (res && res.results && res.results.length > 0) { + var stat = res.results[0].jobStatus; + if (stat == 'running' || stat == 'queued') { + setTimeout(function() { + self.doPasswdAuditUpdate() + }, 10000); + } + } + + self.displayPWAuditJobs(res); + }); + }, + deletePasswdAudit: function(jobID) { + var self = this; + this.ajax('wordfence_deletePasswdAudit', {jobID: jobID}, function(res) { + self.loadPasswdAuditJobs(res); + }); + }, + doFixWeakPasswords: function() { + var self = this; + var mode = jQuery('#wfPasswdFixAction').val(); + var ids = jQuery('input.wfUserCheck:checked').map(function() { + return jQuery(this).val(); + }).get(); + if (ids.length < 1) { + self.colorbox('300px', "Please select users", "You did not select any users from the list. Select which site members you want to email or to change their passwords."); + return; + } + this.ajax('wordfence_weakPasswordsFix', { + mode: mode, + ids: ids.join(',') + }, function(res) { + if (res.ok && res.title && res.msg) { + self.colorbox('300px', res.title, res.msg); + } + }); + }, + ucfirst: function(str) { + str = "" + str; + return str.charAt(0).toUpperCase() + str.slice(1); + }, + makeIPTrafLink: function(IP) { + return WordfenceAdminVars.siteBaseURL + '?_wfsf=IPTraf&nonce=' + this.nonce + '&IP=' + encodeURIComponent(IP); + }, + makeDiffLink: function(dat) { + return WordfenceAdminVars.siteBaseURL + '?_wfsf=diff&nonce=' + this.nonce + + '&file=' + encodeURIComponent(this.es(dat['file'])) + + '&cType=' + encodeURIComponent(this.es(dat['cType'])) + + '&cKey=' + encodeURIComponent(this.es(dat['cKey'])) + + '&cName=' + encodeURIComponent(this.es(dat['cName'])) + + '&cVersion=' + encodeURIComponent(this.es(dat['cVersion'])); + }, + makeViewFileLink: function(file) { + return WordfenceAdminVars.siteBaseURL + '?_wfsf=view&nonce=' + this.nonce + '&file=' + encodeURIComponent(file); + }, + makeViewOptionLink: function(option, siteID) { + return WordfenceAdminVars.siteBaseURL + '?_wfsf=viewOption&nonce=' + this.nonce + '&option=' + encodeURIComponent(option) + '&site_id=' + encodeURIComponent(siteID); + }, + makeTimeAgo: function(t) { + var months = Math.floor(t / (86400 * 30)); + var days = Math.floor(t / 86400); + var hours = Math.floor(t / 3600); + var minutes = Math.floor(t / 60); + if (months > 0) { + days -= months * 30; + return this.pluralize(months, 'month', days, 'day'); + } else if (days > 0) { + hours -= days * 24; + return this.pluralize(days, 'day', hours, 'hour'); + } else if (hours > 0) { + minutes -= hours * 60; + return this.pluralize(hours, 'hour', minutes, 'min'); + } else if (minutes > 0) { + //t -= minutes * 60; + return this.pluralize(minutes, 'minute'); + } else { + return Math.round(t) + " seconds"; + } + }, + pluralize: function(m1, t1, m2, t2) { + if (m1 != 1) { + t1 = t1 + 's'; + } + if (m2 != 1) { + t2 = t2 + 's'; + } + if (m1 && m2) { + return m1 + ' ' + t1 + ' ' + m2 + ' ' + t2; + } else { + return m1 + ' ' + t1; + } + }, + calcRangeTotal: function() { + var range = jQuery('#ipRange').val(); + if (!range) { + return; + } + range = range.replace(/ /g, ''); + if (range && /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s*\-\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(range)) { + var ips = range.split('-'); + var total = this.inet_aton(ips[1]) - this.inet_aton(ips[0]) + 1; + if (total < 1) { + jQuery('#wfShowRangeTotal').html("Invalid. Starting IP is greater than ending IP."); + return; + } + jQuery('#wfShowRangeTotal').html("Valid: " + total + " addresses in range."); + } else { + jQuery('#wfShowRangeTotal').empty(); + } + }, + loadBlockRanges: function() { + var self = this; + this.ajax('wordfence_loadBlockRanges', {}, function(res) { + self.completeLoadBlockRanges(res); + }); + + }, + completeLoadBlockRanges: function(res) { + jQuery('#currentBlocks').empty(); + if (res.results && res.results.length > 0) { + jQuery('#wfBlockedRangesTmpl').tmpl(res).prependTo('#currentBlocks'); + } else { + jQuery('#currentBlocks').html("You have not blocked any IP ranges or other patterns yet."); + } + }, + whois: function(val) { + val = val.replace(' ', ''); + if (!/\w+/.test(val)) { + this.colorbox('300px', "Enter a valid IP or domain", "Please enter a valid IP address or domain name for your whois lookup."); + return; + } + var self = this; + jQuery('#whoisbutton').attr('disabled', 'disabled'); + jQuery('#whoisbutton').attr('value', 'Loading...'); + this.ajax('wordfence_whois', { + val: val + }, function(res) { + jQuery('#whoisbutton').removeAttr('disabled'); + jQuery('#whoisbutton').attr('value', 'Look up IP or Domain'); + if (res.ok) { + self.completeWhois(res); + } + }); + }, + completeWhois: function(res) { + var self = this; + if (res.ok && res.result && res.result.rawdata && res.result.rawdata.length > 0) { + var rawhtml = ""; + for (var i = 0; i < res.result.rawdata.length; i++) { + res.result.rawdata[i] = jQuery('

" + jQuery('<div/>').text(res.code).html() + "

"); + } + }); + }, + confirmSwitchToFalcon: function(noEditHtaccess) { + jQuery.colorbox.close(); + var cacheType = 'falcon'; + var self = this; + this.ajax('wordfence_saveCacheConfig', { + cacheType: cacheType, + noEditHtaccess: noEditHtaccess + }, function(res) { + if (res.ok) { + self.colorbox('400px', res.heading, res.body); + } + } + ); + }, + saveCacheConfig: function() { + var cacheType = jQuery('input:radio[name=cacheType]:checked').val(); + if (cacheType == 'falcon') { + return this.switchToFalcon(); + } + var self = this; + this.ajax('wordfence_saveCacheConfig', { + cacheType: cacheType + }, function(res) { + if (res.ok) { + self.colorbox('400px', res.heading, res.body); + } + } + ); + }, + saveCacheOptions: function() { + var self = this; + this.ajax('wordfence_saveCacheOptions', { + allowHTTPSCaching: (jQuery('#wfallowHTTPSCaching').is(':checked') ? 1 : 0), + addCacheComment: (jQuery('#wfaddCacheComment').is(':checked') ? 1 : 0), + clearCacheSched: (jQuery('#wfclearCacheSched').is(':checked') ? 1 : 0) + }, function(res) { + if (res.updateErr) { + self.colorbox('400px', "You need to manually update your .htaccess", res.updateErr + "
Your option was updated but you need to change the Wordfence code in your .htaccess to the following:
'); + } + } + ); + }, + saveConfig: function() { + var qstr = jQuery('#wfConfigForm').serialize(); + var self = this; + jQuery('.wfSavedMsg').hide(); + jQuery('.wfAjax24').show(); + this.ajax('wordfence_saveConfig', qstr, function(res) { + jQuery('.wfAjax24').hide(); + if (res.ok) { + if (res['paidKeyMsg']) { + self.colorbox('400px', "Congratulations! You have been upgraded to Premium Scanning.", "You have upgraded to a Premium API key. Once this page reloads, you can choose which premium scanning options you would like to enable and then click save. Click the button below to reload this page now.

"); + return; + } else if (res['reload'] == 'reload' || WFAD.reloadConfigPage) { + self.colorbox('400px', "Please reload this page", "You selected a config option that requires a page reload. Click the button below to reload this page to update the menu.

"); + return; + } else { + self.pulse('.wfSavedMsg'); + } + } else if (res.errorMsg) { + return; + } else { + self.colorbox('400px', 'An error occurred', 'We encountered an error trying to save your changes.'); + } + }); + }, + changeSecurityLevel: function() { + var level = jQuery('#securityLevel').val(); + for (var k in WFSLevels[level].checkboxes) { + if (k != 'liveTraf_ignorePublishers') { + jQuery('#' + k).prop("checked", WFSLevels[level].checkboxes[k]); + } + } + for (var k in WFSLevels[level].otherParams) { + if (!/^(?:apiKey|securityLevel|alertEmails|liveTraf_ignoreUsers|liveTraf_ignoreIPs|liveTraf_ignoreUA|liveTraf_hitsMaxSize|maxMem|maxExecutionTime|actUpdateInterval)$/.test(k)) { + jQuery('#' + k).val(WFSLevels[level].otherParams[k]); + } + } + }, + clearAllBlocked: function(op) { + if (op == 'blocked') { + body = "Are you sure you want to clear all blocked IP addresses and allow visitors from those addresses to access the site again?"; + } else if (op == 'locked') { + body = "Are you sure you want to clear all locked IP addresses and allow visitors from those addresses to sign in again?"; + } else { + return; + } + this.colorbox('450px', "Please confirm", body + + '

' + + '
'); + }, + confirmClearAllBlocked: function(op) { + var self = this; + this.ajax('wordfence_clearAllBlocked', {op: op}, function(res) { + self.staticTabChanged(); + }); + }, + setOwnCountry: function(code) { + this.ownCountry = (code + "").toUpperCase(); + }, + loadBlockedCountries: function(str) { + var codes = str.split(','); + for (var i = 0; i < codes.length; i++) { + jQuery('#wfCountryCheckbox_' + codes[i]).prop('checked', true); + } + }, + saveCountryBlocking: function() { + var action = jQuery('#wfBlockAction').val(); + var redirURL = jQuery('#wfRedirURL').val(); + var bypassRedirURL = jQuery('#wfBypassRedirURL').val(); + var bypassRedirDest = jQuery('#wfBypassRedirDest').val(); + var bypassViewURL = jQuery('#wfBypassViewURL').val(); + + if (action == 'redir' && (!/^https?:\/\/[^\/]+/i.test(redirURL))) { + this.colorbox('400px', "Please enter a URL for redirection", "You have chosen to redirect blocked countries to a specific page. You need to enter a URL in the text box provided that starts with http:// or https://"); + return; + } + if (bypassRedirURL || bypassRedirDest) { + if (!(bypassRedirURL && bypassRedirDest)) { + this.colorbox('400px', "Missing data from form", "If you want to set up a URL that will bypass country blocking, you must enter a URL that a visitor can hit and the destination they will be redirected to. You have only entered one of these components. Please enter both."); + return; + } + if (bypassRedirURL == bypassRedirDest) { + this.colorbox('400px', "URLs are the same", "The URL that a user hits to bypass country blocking and the URL they are redirected to are the same. This would cause a circular redirect. Please fix this."); + return; + } + } + if (bypassRedirURL && (!/^(?:\/|http:\/\/)/.test(bypassRedirURL))) { + this.invalidCountryURLMsg(bypassRedirURL); + return; + } + if (bypassRedirDest && (!/^(?:\/|http:\/\/)/.test(bypassRedirDest))) { + this.invalidCountryURLMsg(bypassRedirDest); + return; + } + if (bypassViewURL && (!/^(?:\/|http:\/\/)/.test(bypassViewURL))) { + this.invalidCountryURLMsg(bypassViewURL); + return; + } + + var codesArr = []; + var ownCountryBlocked = false; + var self = this; + jQuery('.wfCountryCheckbox').each(function(idx, elem) { + if (jQuery(elem).is(':checked')) { + var code = jQuery(elem).val(); + codesArr.push(code); + if (code == self.ownCountry) { + ownCountryBlocked = true; + } + } + }); + this.countryCodesToSave = codesArr.join(','); + if (ownCountryBlocked) { + this.colorbox('400px', "Please confirm blocking yourself", "You are about to block your own country. This could lead to you being locked out. Please make sure that your user profile on this machine has a current and valid email address and make sure you know what it is. That way if you are locked out, you can send yourself an unlock email. If you're sure you want to block your own country, click 'Confirm' below, otherwise click 'Cancel'.
" + + ' '); + } else { + this.confirmSaveCountryBlocking(); + } + }, + invalidCountryURLMsg: function(URL) { + this.colorbox('400px', "Invalid URL", "URL's that you provide for bypassing country blocking must start with '/' or 'http://' without quotes. The URL that is invalid is: " + this.htmlEscape(URL)); + return; + }, + confirmSaveCountryBlocking: function() { + var action = jQuery('#wfBlockAction').val(); + var redirURL = jQuery('#wfRedirURL').val(); + var loggedInBlocked = jQuery('#wfLoggedInBlocked').is(':checked') ? '1' : '0'; + var loginFormBlocked = jQuery('#wfLoginFormBlocked').is(':checked') ? '1' : '0'; + var restOfSiteBlocked = jQuery('#wfRestOfSiteBlocked').is(':checked') ? '1' : '0'; + var bypassRedirURL = jQuery('#wfBypassRedirURL').val(); + var bypassRedirDest = jQuery('#wfBypassRedirDest').val(); + var bypassViewURL = jQuery('#wfBypassViewURL').val(); + + jQuery('.wfAjax24').show(); + var self = this; + this.ajax('wordfence_saveCountryBlocking', { + blockAction: action, + redirURL: redirURL, + loggedInBlocked: loggedInBlocked, + loginFormBlocked: loginFormBlocked, + restOfSiteBlocked: restOfSiteBlocked, + bypassRedirURL: bypassRedirURL, + bypassRedirDest: bypassRedirDest, + bypassViewURL: bypassViewURL, + codes: this.countryCodesToSave + }, function(res) { + jQuery('.wfAjax24').hide(); + self.pulse('.wfSavedMsg'); + }); + }, + paidUsersOnly: function(msg) { + var pos = jQuery('#paidWrap').position(); + var width = jQuery('#paidWrap').width(); + var height = jQuery('#paidWrap').height(); + jQuery('

' + msg + ' Click here to upgrade and gain access to this feature.

' + jQuery('#wfTwoFacUserTmpl').tmpl(res).html() + '

').prependTo(jQuery('#wfTwoFacUsers')); + } + }); + }, + twoFacActivate: function(userID, code) { + var self = this; + this.ajax('wordfence_twoFacActivate', { + userID: userID, + code: code + }, function(res) { + if (res.ok) { + jQuery('#twoFacCont_' + res.userID).html( + jQuery('#wfTwoFacUserTmpl').tmpl(res) + ); + self.twoFacStatus('Cellphone Sign-in activated for user.'); + } + }); + }, + delTwoFac: function(userID) { + this.ajax('wordfence_twoFacDel', { + userID: userID + }, function(res) { + if (res.ok) { + jQuery('#twoFacCont_' + res.userID).fadeOut(function() { + jQuery(this).remove(); + }); + } + }); + }, + loadTwoFactor: function() { + this.ajax('wordfence_loadTwoFactor', {}, function(res) { + if (res.users && res.users.length > 0) { + for (var i = 0; i < res.users.length; i++) { + jQuery('

' + + jQuery('#wfTwoFacUserTmpl').tmpl(res.users[i]).html() + '

').appendTo(jQuery('#wfTwoFacUsers')); + } + } + }); + }, + getQueryParam: function(name) { + name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]"); + var regexS = "[\\?&]" + name + "=([^&#]*)"; + var regex = new RegExp(regexS); + var results = regex.exec(window.location.search); + if (results == null) { + return ""; + } else { + return decodeURIComponent(results[1].replace(/\+/g, " ")); + } + }, + inet_aton: function(dot) { + var d = dot.split('.'); + return ((((((+d[0]) * 256) + (+d[1])) * 256) + (+d[2])) * 256) + (+d[3]); + }, + inet_ntoa: function(num) { + var d = num % 256; + for (var i = 3; i > 0; i--) { + num = Math.floor(num / 256); + d = num % 256 + '.' + d; + } + return d; + }, + + inet_pton: function(a) { + // discuss at: http://phpjs.org/functions/inet_pton/ + // original by: Theriault + // example 1: inet_pton('::'); + // returns 1: '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0' + // example 2: inet_pton('127.0.0.1'); + // returns 2: '\x7F\x00\x00\x01' + + var r, m, x, i, j, f = String.fromCharCode; + m = a.match(/^(?:\d{1,3}(?:\.|$)){4}/); // IPv4 + if (m) { + m = m[0].split('.'); + m = f(m[0]) + f(m[1]) + f(m[2]) + f(m[3]); + // Return if 4 bytes, otherwise false. + return m.length === 4 ? m : false; + } + r = /^((?:[\da-f]{1,4}(?::|)){0,8})(::)?((?:[\da-f]{1,4}(?::|)){0,8})$/; + m = a.match(r); // IPv6 + if (m) { + // Translate each hexadecimal value. + for (j = 1; j < 4; j++) { + // Indice 2 is :: and if no length, continue. + if (j === 2 || m[j].length === 0) { + continue; + } + m[j] = m[j].split(':'); + for (i = 0; i < m[j].length; i++) { + m[j][i] = parseInt(m[j][i], 16); + // Would be NaN if it was blank, return false. + if (isNaN(m[j][i])) { + return false; // Invalid IP. + } + m[j][i] = f(m[j][i] >> 8) + f(m[j][i] & 0xFF); + } + m[j] = m[j].join(''); + } + x = m[1].length + m[3].length; + if (x === 16) { + return m[1] + m[3]; + } else if (x < 16 && m[2].length > 0) { + return m[1] + (new Array(16 - x + 1)) + .join('\x00') + m[3]; + } + } + return false; // Invalid IP. + }, + inet_ntop: function(a) { + // discuss at: http://phpjs.org/functions/inet_ntop/ + // original by: Theriault + // example 1: inet_ntop('\x7F\x00\x00\x01'); + // returns 1: '127.0.0.1' + // example 2: inet_ntop('\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1'); + // returns 2: '::1' + + var i = 0, + m = '', + c = []; + a += ''; + if (a.length === 4) { // IPv4 + return [ + a.charCodeAt(0), a.charCodeAt(1), a.charCodeAt(2), a.charCodeAt(3)].join('.'); + } else if (a.length === 16) { // IPv6 + for (i = 0; i < 16; i++) { + c.push(((a.charCodeAt(i++) << 8) + a.charCodeAt(i)) + .toString(16)); + } + return c.join(':') + .replace(/((^|:)0(?=:|$))+:?/g, function(t) { + m = (t.length > m.length) ? t : m; + return t; + }) + .replace(m || ' ', '::'); + } else { // Invalid length + return false; + } + }, + + removeCacheExclusion: function(id) { + this.ajax('wordfence_removeCacheExclusion', {id: id}, function(res) { + window.location.reload(true); + }); + }, + addCacheExclusion: function(patternType, pattern) { + if (/^https?:\/\//.test(pattern)) { + this.colorbox('400px', "Incorrect pattern for exclusion", "You can not enter full URL's for exclusion from caching. You entered a full URL that started with http:// or https://. You must enter relative URL's e.g. /exclude/this/page/. You can also enter text that might be contained in the path part of a URL or at the end of the path part of a URL."); + return; + } + + this.ajax('wordfence_addCacheExclusion', { + patternType: patternType, + pattern: pattern + }, function(res) { + if (res.ok) { //Otherwise errorMsg will get caught + window.location.reload(true); + } + }); + }, + loadCacheExclusions: function() { + this.ajax('wordfence_loadCacheExclusions', {}, function(res) { + if (res.ex instanceof Array && res.ex.length > 0) { + for (var i = 0; i < res.ex.length; i++) { + var newElem = jQuery('#wfCacheExclusionTmpl').tmpl(res.ex[i]); + newElem.prependTo('#wfCacheExclusions').fadeIn(); + } + jQuery('

Cache Exclusions

').prependTo('#wfCacheExclusions'); + } else { + jQuery('

Cache Exclusions

There are not currently any exclusions. If you have a site that does not change often, it is perfectly normal to not have any pages you want to exclude from the cache.

Wordfence Cron Viewer

This page is used for debugging and shows a list of scheduled jobs on your system. Our staff may ask you to send them the +data on this page as part of a troubleshooting process.

+ $values ) { + if ( is_array( $values ) ) { + foreach ( $values as $cron_job => $v ) { + if (is_numeric($timestamp)) { + echo date( 'r', $timestamp ) . " : " . $cron_job . "
"; + } + } + } +} +?> + +

+ + +||||||| .r0 +======= $values ) {

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/email_newIssues.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/email_newIssues.php index 26d6499b..7f864f59 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/email_newIssues.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/email_newIssues.php @@ -1,3 +1,56 @@ +<<<<<<< .mine +

This email was sent from your website "" by the Wordfence plugin.

+ +

Wordfence found the following new issues on "".

+ +

Alert generated at

+ + + +

+ HIGH SENSITIVITY scanning is enabled, it may produce false positives +

+ + + 0){ ?> +

Critical Problems:

+ + +

+ +

" alt="" />

+ + + + + 0){ ?> +

Warnings:

+ + +

+ + + + + +

NOTE: You are using the free version of Wordfence. Upgrading to the paid version of Wordfence gives you +two factor authentication (sign-in via cellphone) and country blocking which are both effective methods to block attacks. +A Premium Wordfence license also includes remote scanning with each scan of your site which can detect +several additional website infections. Premium members can also schedule when website scans occur and +can scan more than once per day.

+ +

As a Premium member you also get access to our priority support system located at http://support.wordfence.com/ and can file +priority support tickets using our ticketing system.

+ +

Click here to sign-up for the Premium version of Wordfence now.
+https://www.wordfence.com/zz2/wordfence-signup/

+ + + + + +||||||| .r0 +=======

This email was sent from your website "" by the Wordfence plugin.

Wordfence found the following new issues on "".

@@ -41,3 +94,4 @@ priority support tickets using our ticketing system.

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_options.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_options.php index 5872a811..6f03fd85 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_options.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_options.php @@ -1,3 +1,1220 @@ +<<<<<<< .mine + + +

+ + +

+ + + + + +

Wordfence Live Activity:

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

License

Your Wordfence API Key:

Key type currently active:

+ + The currently active API Key is a Premium Key. Premium scanning enabled! + + The currently active API Key is a Free Key. Click Here to Upgrade to + Wordfence Premium now. + +

+ + + + + + + +

+ + + +

Basic Options

Enable firewall

cb( 'firewallEnabled' ); ?> /> NOTE: This checkbox enables ALL firewall functions including IP, + country and advanced blocking and the "Firewall Rules" below. +

Enable login security

cb( 'loginSecurityEnabled' ); ?> /> This option enables all "Login + Security" options. You can modify individual options further down this page. +

Enable Live Traffic View

cb( 'liveTrafficEnabled' ); ?> + onclick="WFAD.reloadConfigPage = true; return true;"/> This option enables live traffic + logging. +

Advanced Comment Spam Filter

cbp( 'advancedCommentScanning' ); + if ( ! wfConfig::get( 'isPaid' )){ ?>onclick="alert('This is a paid feature because it places significant additional load on our servers.'); jQuery('#advancedCommentScanning').attr('checked', false); return false;" /> Premium Feature In addition to free comment filtering (see below) + this option filters comments against several additional real-time lists of known spammers and + infected hosts. +

Check if this website is being "Spamvertised"

cbp( 'spamvertizeCheck' ); + if ( ! wfConfig::get( 'isPaid' )){ ?>onclick="alert('This is a paid feature because it places significant additional load on our servers.'); jQuery('#spamvertizeCheck').attr('checked', false); return false;" /> Premium Feature When doing a scan, Wordfence will check with spam + services if your site domain name is appearing as a link in spam emails. +

Check if this website IP is generating spam

cbp( 'checkSpamIP' ); + if ( ! wfConfig::get( 'isPaid' )){ ?>onclick="alert('This is a paid feature because it places significant additional load on our servers.'); jQuery('#checkSpamIP').attr('checked', false); return false;" /> Premium Feature When doing a scan, Wordfence will check with spam + services if your website IP address is listed as a known source of spam email. +

Enable Performance Monitoring

cb('perfLoggingEnabled'); ?> onclick="WFAD.reloadConfigPage = true; return true;" /> This option enables performance monitoring.

Enable automatic scheduled scans

cb( 'scheduledScansEnabled' ); ?> /> Regular scans ensure your site + stays secure. +

Update Wordfence automatically when a new version is released?

cb( 'autoUpdate' ); ?> /> Automatically updates Wordfence to the + newest version within 24 hours of a new release.
+ + Warning: You are running LiteSpeed web server and you don't have + the "noabort" variable set in your .htaccess.
+ Please read this article in our FAQ to make an important change that will ensure + your site stability during an update.
+ +

Where to email alerts:

Separate multiple emails with commas

Security Level:

+ +

How does Wordfence get IPs:

+ +

+ + + + + +
+
+ Your changes have been saved!
+

Advanced Options:

+ +

+ Wordfence works great out of the box for most websites. Simply install Wordfence and your site and + content is protected. For finer granularity of control, we have provided advanced options. +

+ + + + + \n"; + } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

You have not configured an email to receive alerts yet. Set this up under \"Basic Options\" above.
Alerts
Email me when Wordfence is automatically updated	cb( 'alertOn_update' ); ?>/> If you have automatic updates + enabled (see above), you'll get an email when an update occurs. +
Alert on critical problems	cb( 'alertOn_critical' ); ?>/>
Alert on warnings	cb( 'alertOn_warnings' ); ?>/>
Alert when an IP address is blocked	cb( 'alertOn_block' ); ?>/>
Alert when someone is locked out from login	cb( 'alertOn_loginLockout' ); ?>/>
Alert when the "lost password" form is used for a valid user	cb( 'alertOn_lostPasswdForm' ); ?>/> +
Alert me when someone with administrator access signs in	cb( 'alertOn_adminLogin' ); ?>/>
Alert me when a non-admin user signs in	cb( 'alertOn_nonAdminLogin' ); ?>/>
Maximum email alerts to send per hour	0 or empty means unlimited + alerts will be sent. +
+ + Email Summary +
Enable email summary:	cb('email_summary_enabled'); ?> /> +
Email summary frequency:	+ +
Comma-separated list of directories to exclude from recently modified file list:	+ +
Send test email:	+ + Send Email +
Enable activity report widget on dashboard:	cb('email_summary_dashboard_widget_enabled'); ?> /> +
+ + Live Traffic View +
Don't log signed-in users with publishing access:	cb( 'liveTraf_ignorePublishers' ); ?> />
List of comma separated usernames to ignore:
List of comma separated IP addresses to ignore:
Browser user-agent to ignore:
+ + Scans to include
Scan public facing site for vulnerabilities?	cb( 'scansEnabled_public' ); ?> />
Scan public facing site for vulnerabilities?(Paid members only) +
Scan for the HeartBleed vulnerability?	cb( 'scansEnabled_heartbleed' ); ?> /> +
Scan core files against repository versions for changes	cb( 'scansEnabled_core' ); ?>/>
Scan theme files against repository versions for changes	cb( 'scansEnabled_themes' ); ?>/>
Scan plugin files against repository versions for changes	cb( 'scansEnabled_plugins' ); ?>/>
Scan for signatures of known malicious files	cb( 'scansEnabled_malware' ); ?>/>
Scan file contents for backdoors, trojans and suspicious code	cb( 'scansEnabled_fileContents' ); ?>/>
Scan database for backdoors, trojans and suspicious code	cb( 'scansEnabled_database' ); ?>/>
Scan posts for known dangerous URLs and suspicious content	cb( 'scansEnabled_posts' ); ?>/>
Scan comments for known dangerous URLs and suspicious content	cb( 'scansEnabled_comments' ); ?>/>
Scan for out of date plugins, themes and WordPress versions	cb( 'scansEnabled_oldVersions' ); ?>/>
Check the strength of passwords	cb( 'scansEnabled_passwds' ); ?>/>
Monitor disk space	cb( 'scansEnabled_diskSpace' ); ?>/> +
Scan for unauthorized DNS changes	cb( 'scansEnabled_dns' ); ?>/>
Scan files outside your WordPress installation	cb( 'other_scanOutside' ); ?> />
Scan images and binary files as if they were executable	cb( 'scansEnabled_scanImages' ); ?> /> +
Enable HIGH SENSITIVITY scanning. May give false positives.	cb( 'scansEnabled_highSense' ); ?> /> +
Exclude files from scan that match these wildcard patterns. (One per line).	+ <?php echo wfUtils::cleanupOneEntryPerLine($w->getHTML( 'scan_exclude' )); ?> +
+ + Firewall Rules +
Immediately block fake Google crawlers:	cb( 'blockFakeBots' ); ?>/>
How should we treat Google's crawlers	+
If anyone's requests exceed:	then
If a crawler's page views exceed:	then
If a crawler's pages not found (404s) exceed:	then
If a human's page views exceed:	then
If a human's pages not found (404s) exceed:	then
If 404's for known vulnerable URL's exceed:	then
How long is an IP address blocked when it breaks a rule:	+
+ + Login Security Options +
Enforce strong passwords?	+ +
Lock out after how many login failures	+ +
Lock out after how many forgot password attempts	+ +
Count failures over what time period	+ +
Amount of time a user is locked out	+ +
Immediately lock out invalid usernames	cb( 'loginSec_lockInvalidUsers' ); ?> />
Don't let WordPress reveal valid users in login errors	cb( 'loginSec_maskLoginErrors' ); ?> />
Prevent users registering 'admin' username if it doesn't exist	cb( 'loginSec_blockAdminReg' ); ?> />
Prevent discovery of usernames through '/?author=N' scans	cb( 'loginSec_disableAuthorScan' ); ?> /> +
Immediately block the IP of users who try to sign in as these usernames	(Comma + separated. Existing users won't be blocked.) +
+ + Other Options +
Whitelisted IP addresses that bypass all rules:
Whitelisted IP's must be separated by commas. You can specify + ranges using the following format: 123.23.34.[1-50] Wordfence automatically whitelists private networks + because these are not routable on the public Internet.
Immediately block IP's that access these URLs:
Separate multiple URL's with commas. If you see an attacker + repeatedly probing your site for a known vulnerability you can use this to immediately block + them. + All URL's must start with a '/' without quotes and must be relative. e.g. /badURLone/, + /bannedPage.html, /dont-access/this/URL/ +
Whitelisted 404 URLs (one per line).	<?php echo $w->getHTML( 'allowed404s' ); ?>
These URL patterns will be excluded from + the throttling rules used to limit crawlers. +
Hide WordPress version	cb( 'other_hideWPVersion' ); ?> />
Block IP's who send POST requests with blank User-Agent and Referer	cb( 'other_blockBadPOST' ); ?> />
Hold anonymous comments using member emails for moderation	cb( 'other_noAnonMemberComments' ); ?> />
Filter comments for malware and phishing URL's	cb( 'other_scanComments' ); ?> />
Check password strength on profile update	cb( 'other_pwStrengthOnUpdate' ); ?> />
Participate in the Real-Time WordPress Security Network	cb( 'other_WFNet' ); ?> />
How much memory should Wordfence request when scanning	Megabytes +
Maximum execution time for each scan stage	Blank for default. Must be + greater than 9. +
Update interval in seconds (2 is default)	Setting higher will reduce + browser traffic but slow scan starts, live traffic & status updates. +
Enable debugging mode (increases database load)	cb( 'debugOn' ); ?> />
Delete Wordfence tables and data on deactivation?	cb( 'deleteTablesOnDeact' ); ?> />
Disable Wordfence Cookies	cb( 'disableCookies' ); ?> />(when enabled all visits in live traffic + will appear to be new visits) +
Start all scans remotely	cb( 'startScansRemotely' ); ?> />(Try this if your scans aren't + starting and your site is publicly accessible) +
Disable config caching	cb( 'disableConfigCaching' ); ?> />(Try + this if your options aren't saving) +
Add a debugging comment to HTML source of cached pages.	cb( 'addCacheComment' ); ?> /> + get('allowHTTPSCaching')): ?> + + +
Disable Code Execution for Uploads directory	cb( 'disableCodeExecutionUploads' ); ?> />
Enable SSL Verification +	cb( 'ssl_verify' ); ?> /> + (Disable this if you are *consistently* unable to connect to the Wordfence servers.) +
Click to test connectivity to the Wordfence API servers
Click to view your system's configuration in a new window
Click to view your systems scheduled jobs in a new window
Click to see a list of your system's database tables in a new window
Test your WordPress host's available memory
Send a test email from this WordPress server to an email address:	+
+ + Exporting and Importing Wordfence Settings +
Export this site's Wordfence settings for import on another site:
Import Wordfence settings from another site using a token:	+

+ + + + + +
+
+ Your changes have been saved!
+

+ + + + + + + +||||||| .r0 +======= @@ -1211,3 +2428,4 @@ $w = new wfConfig();

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_rangeBlocking.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_rangeBlocking.php index a0ebb5cb..00f4979f 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_rangeBlocking.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_rangeBlocking.php @@ -1,3 +1,110 @@ +<<<<<<< .mine +

+ + +

Firewall is disabled. You can enable it on the Wordfence Options page at the top.

+ + + + + + + + + + + + +

IP address range:
	Examples: 192.168.200.200 - 192.168.200.220
Hostname:
+ Using this setting will make a DNS query + per unique IP address (per visitor), + and can add additional load. High traffic sites may not want to use this feature. +	Examples: .amazonaws.com, .linode.com
User-Agent (browser) that matches:	(Case insensitive)
	Examples: badRobot, AnotherBadRobot, someBrowserSuffix
Referer (website visitor arrived from) that matches:	(Case insensitive)
	Examples: badWebsite, AnotherBadWebsite, someWebsiteSuffix
Enter a reason you're blocking this visitor pattern:
	Why a reason: The reason you specify above is for your own record keeping.
+ +

Current list of ranges and patterns you've blocked

+ + +||||||| .r0 +=======

@@ -91,3 +198,4 @@

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_scan.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_scan.php index 88df93c0..583445c5 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_scan.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/menu_scan.php @@ -1,3 +1,865 @@ +<<<<<<< .mine +

+ + +

+ + + + + +

+
+ Click to kill the current scan. +

+ Read our scanning documentation. You can also start the tour again, subscribe to get WordPress Security Alerts and Product News or visit our support website help. Love Wordfence? You can help by doing two simple things: Go to WordPress.org now and give this plugin a 5★ rating. Blog about Wordfence and link to the plugin page or www.wordfence.com. Spreading the word helps us keep the best features free. +

+ Scan Summary +

+ getStatusEvents(0); + ?> +

+ +

+ Welcome to Wordfence!

+ To get started, simply click the "Scan" button at the top of this page to start your first scan. +

+ +

+ Premium scanning enabled. +

+ +

+ How to upgrade: If you would like access to our Premium Support help system and features like Cellphone Sign-in, Country Blocking, external site scanning and the ability to schedule scans, simply visit our Wordfence Premium sign-up page and sign up for a Premium Wordfence API key. Then go to the Wordfence options page on this site and replace your free API key with your new premium key. You will immediately be upgraded to Wordfence Premium with all the features it includes and you will have instant access to our ticketing system on support.wordfence.com. +

+ + +

+ Scan Detailed Activity + Email activity log +

+ 0){ + $debugOn = wfConfig::get('debugOn', false); + $newestItem = 0; + $sumEvents = array(); + $timeOffset = 3600 * get_option('gmt_offset'); + foreach($events as $e){ + if(strpos($e['msg'], 'SUM_') !== 0){ + if( $debugOn || $e['level'] < 4){ + $typeClass = ''; + if($debugOn){ + $typeClass = ' wf' . $e['type']; + } + echo '

[' . date('M d H:i:s', $e['ctime'] + $timeOffset) . '] ' . $e['msg'] . '

'; + } + } + $newestItem = $e['ctime']; + } + + echo ''; + } else { ?> + A live stream of what Wordfence is busy with right now will appear in this box. + + +

+ + View activity log +

+ Docs: Our Support Site can answer many common (and some less common) questions. It also includes our priority support ticketing system for Premium Wordfence users. + +

+ +

+ New Issues + Ignored Issues +

New Issues

+ +

+ HIGH SENSITIVITY scanning is enabled, it may produce false positives +

+ +

+ The list below shows new problems or warnings that Wordfence found with your site. + If you have fixed all the issues below, you can click here to mark all new issues as fixed. + You can also ignore all new issues which will exclude all issues listed below from future scans. +

+ Bulk operation»» +

+ +

Ignored Issues

+ The list below shows issues that you know about and have chosen to ignore. + You can click here to clear all ignored issues + which will cause all issues below to be re-scanned by Wordfence in the next scan. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +||||||| .r0 +=======

@@ -852,3 +1714,4 @@

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfAPI.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfAPI.php index f154078e..1338d2d4 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfAPI.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfAPI.php @@ -1,3 +1,155 @@ +<<<<<<< .mine +APIKey = $apiKey; + $this->wordpressVersion = $wordpressVersion; + } + + public function getStaticURL($url) { // In the form '/something.bin' without quotes + return $this->getURL($this->getAPIURL() . $url); + } + + public function call($action, $getParams = array(), $postParams = array(), $forceSSL = false) { + $apiURL = $this->getAPIURL(); + //Sanity check. Developer should call wfAPI::SSLEnabled() to check if SSL is enabled before forcing SSL and return a user friendly msg if it's not. + if ($forceSSL && (!preg_match('/^https:/i', $apiURL))) { + //User's should never see this message unless we aren't calling SSLEnabled() to check if SSL is enabled before using call() with forceSSL + throw new Exception("SSL is not supported by your web server and is required to use this function. Please ask your hosting provider or site admin to install cURL with openSSL to use this feature."); + } + $json = $this->getURL($apiURL . '/v' . WORDFENCE_API_VERSION . '/?' . $this->makeAPIQueryString() . '&' . self::buildQuery( + array_merge( + array('action' => $action), + $getParams + )), $postParams); + if (!$json) { + throw new Exception("We received an empty data response from the Wordfence scanning servers when calling the '$action' function."); + } + + $dat = json_decode($json, true); + if (isset($dat['_isPaidKey'])) { + wfConfig::set('keyExpDays', $dat['_keyExpDays']); + if ($dat['_keyExpDays'] > -1) { + wfConfig::set('isPaid', 1); + } else if ($dat['_keyExpDays'] < 0) { + wfConfig::set('isPaid', ''); + } + } + + if (!is_array($dat)) { + throw new Exception("We received a data structure that is not the expected array when contacting the Wordfence scanning servers and calling the '$action' function."); + } + if (is_array($dat) && isset($dat['errorMsg'])) { + throw new Exception($dat['errorMsg']); + } + return $dat; + } + + protected function getURL($url, $postParams = array()) { + wordfence::status(4, 'info', "Calling Wordfence API v" . WORDFENCE_API_VERSION . ":" . $url); + + if (!function_exists('wp_remote_post')) { + require_once ABSPATH . WPINC . 'http.php'; + } + + $ssl_verify = (bool) wfConfig::get('ssl_verify'); + $args = array( + 'timeout' => 900, + 'user-agent' => "Wordfence.com UA " . (defined('WORDFENCE_VERSION') ? WORDFENCE_VERSION : '[Unknown version]'), + 'body' => $postParams, + 'sslverify' => $ssl_verify, + ); + if (!$ssl_verify) { + // Some versions of cURL will complain that SSL verification is disabled but the CA bundle was supplied. + $args['sslcertificates'] = false; + } + + $response = wp_remote_post($url, $args); + + $this->lastHTTPStatus = (int) wp_remote_retrieve_response_code($response); + + if (is_wp_error($response)) { + $error_message = $response->get_error_message(); + throw new Exception("There was an " . ($error_message ? '' : 'unknown ') . "error connecting to the the Wordfence scanning servers" . ($error_message ? ": $error_message" : '.')); + } + + if (!empty($response['response']['code'])) { + $this->lastHTTPStatus = (int) $response['response']['code']; + } + + if (200 != $this->lastHTTPStatus) { + throw new Exception("We received an error response when trying to contact the Wordfence scanning servers. The HTTP status code was [$this->lastHTTPStatus]"); + } + + $this->curlContent = wp_remote_retrieve_body($response); + return $this->curlContent; + } + + public function binCall($func, $postData) { + $url = $this->getAPIURL() . '/v' . WORDFENCE_API_VERSION . '/?' . $this->makeAPIQueryString() . '&action=' . $func; + + $data = $this->getURL($url, $postData); + + if (preg_match('/\{.*errorMsg/', $data)) { + $jdat = @json_decode($data, true); + if (is_array($jdat) && $jdat['errorMsg']) { + throw new Exception($jdat['errorMsg']); + } + } + return array('code' => $this->lastHTTPStatus, 'data' => $data); + } + + public function makeAPIQueryString() { + $siteurl = ''; + if (function_exists('get_bloginfo')) { + if (is_multisite()) { + $siteurl = network_home_url(); + $siteurl = rtrim($siteurl, '/'); //Because previously we used get_bloginfo and it returns http://example.com without a '/' char. + } else { + $siteurl = home_url(); + } + } + return self::buildQuery(array( + 'v' => $this->wordpressVersion, + 's' => $siteurl, + 'k' => $this->APIKey, + 'openssl' => function_exists('openssl_verify') && defined('OPENSSL_VERSION_NUMBER') ? OPENSSL_VERSION_NUMBER : '0.0.0', + 'phpv' => phpversion(), + )); + } + + private function buildQuery($data) { + if (version_compare(phpversion(), '5.1.2', '>=')) { + return http_build_query($data, '', '&'); //arg_separator parameter was only added in PHP 5.1.2. We do this because some PHP.ini's have arg_separator.output set to '&' + } else { + return http_build_query($data); + } + } + + private function getAPIURL() { + return self::SSLEnabled() ? WORDFENCE_API_URL_SEC : WORDFENCE_API_URL_NONSEC; + } + + public static function SSLEnabled() { + if (!function_exists('wp_http_supports')) { + require_once ABSPATH . WPINC . 'http.php'; + } + return wp_http_supports(array('ssl')); + } +} + +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfBrowscapCache.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfBrowscapCache.php index 4f138277..d199a973 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfBrowscapCache.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfBrowscapCache.php @@ -1,3 +1,2710 @@ +<<<<<<< .mine +'Android Browser 4.0', +2207=>'Chromium 36.0', +2214=>'Chromium 35.0', +2283=>'Edge 12.0', +2211=>'Chromium 38.0', +2208=>'Chromium 37.0', +2198=>'Chromium 33.0', +2204=>'Chromium 30.0', +2200=>'Chromium 39.0', +2199=>'Chromium 32.0', +2213=>'Chromium 28.0', +2201=>'Chromium 31.0', +2194=>'Chromium 34.0', +2196=>'Chromium 29.0', +2210=>'Chromium 43.0', +2206=>'Chromium 41.0', +2202=>'Chromium 48.0', +2205=>'Chromium 42.0', +2203=>'Chromium 47.0', +2197=>'Chromium 46.0', +2195=>'Chromium 45.0', +2212=>'Chromium 44.0', +2209=>'Chromium 40.0', +2158=>'Android WebView 1.5', +2165=>'Android WebView 4.2', +2171=>'Android WebView 5.0', +2174=>'Android WebView 4.3', +2163=>'Android WebView 1.6', +2159=>'Android WebView 2.0', +2173=>'Android WebView 4.4', +2164=>'Android WebView 4.1', +2157=>'Android WebView 4.0', +2154=>'Android WebView 2.1', +2153=>'Android WebView 1.0', +2239=>'Chrome 47.0', +2247=>'Chrome 30.0', +2244=>'Chrome 44.0', +2234=>'Chrome 42.0', +2242=>'Chrome 48.0', +2238=>'Chrome 46.0', +2241=>'Chrome 38.0', +2232=>'Chrome 32.0', +2236=>'Chrome 43.0', +2237=>'Chrome 45.0', +2250=>'Chrome 41.0', +2235=>'Chrome 36.0', +2249=>'Chrome 31.0', +2246=>'Chrome 33.0', +2233=>'Chrome 37.0', +2243=>'Chrome 40.0', +2248=>'Chrome 34.0', +2245=>'Chrome 39.0', +2240=>'Chrome 35.0', +2180=>'Mobile Safari 9.0', +2182=>'Mobile Safari 8.0', +2188=>'Mobile Safari 6.1', +2181=>'Mobile Safari 8.1', +2185=>'Mobile Safari 7.1', +2184=>'Mobile Safari 7.0', +2183=>'Mobile Safari 6.0', +2193=>'Chrome Generic', +2149=>'Chrome 47.0 for iOS', +2169=>'Chrome 30.0 for iOS', +2152=>'Chrome 36.0 for iOS', +2172=>'Chrome 40.0 for iOS', +2155=>'Chrome 39.0 for iOS', +2160=>'Chrome 34.0 for iOS', +2138=>'Chrome 46.0 for iOS', +2162=>'Chrome 38.0 for iOS', +2170=>'Chrome 41.0 for iOS', +2139=>'Chrome 42.0 for iOS', +2148=>'Chrome 45.0 for iOS', +2168=>'Chrome 35.0 for iOS', +2161=>'Chrome 31.0 for iOS', +2141=>'Chrome 44.0 for iOS', +2167=>'Chrome 37.0 for iOS', +2166=>'Chrome 32.0 for iOS', +2146=>'Chrome 43.0 for iOS', +2156=>'Chrome 48.0 for iOS', +2143=>'Chrome 33.0 for iOS', +2112=>'Android WebView Generic', +2137=>'Mobile Safari Generic', +2280=>'Edge 13.0', +2136=>'Chrome Generic for iOS', +2252=>'Opera 32.0', +2271=>'Opera 25.0', +2255=>'Opera 31.0', +2278=>'Opera 22.0', +2269=>'Opera 17.0', +2254=>'Opera 34.0', +2259=>'Opera 35.0', +2275=>'Opera 19.0', +2270=>'Opera 18.0', +2256=>'Opera 30.0', +2274=>'Opera 20.0', +2276=>'Opera 24.0', +2258=>'Opera 28.0', +2257=>'Opera 27.0', +2273=>'Opera 15.0', +2253=>'Opera 33.0', +2272=>'Opera 16.0', +2268=>'Opera 29.0', +2277=>'Opera 23.0', +2279=>'Opera 21.0', +2267=>'Opera 26.0', +2286=>'IE 7.0', +2118=>'Mobile Safari UIWebView', +2192=>'Safari Generic', +2126=>'Chrome 44.0 for Android', +2131=>'Chrome 48.0 for Android', +2115=>'Chrome 34.0 for Android', +2130=>'Chrome 38.0 for Android', +2124=>'Chrome 32.0 for Android', +2123=>'Chrome 39.0 for Android', +2125=>'Chrome 47.0 for Android', +2140=>'Android Browser 4.2', +2147=>'Android Browser 4.1', +2116=>'Chrome 30.0 for Android', +2121=>'Chrome 46.0 for Android', +2119=>'Chrome 31.0 for Android', +2122=>'Chrome 45.0 for Android', +2117=>'Chrome 36.0 for Android', +2128=>'Chrome 40.0 for Android', +2114=>'Chrome 37.0 for Android', +2120=>'Chrome 42.0 for Android', +2127=>'Chrome 35.0 for Android', +2113=>'Chrome 33.0 for Android', +2129=>'Chrome 41.0 for Android', +2132=>'Chrome 43.0 for Android', +2145=>'Android Browser 4.4', +2150=>'Android Browser 4.3', +2144=>'IE 10.0 for Desktop', +2251=>'Safari 6.0', +2262=>'Safari 6.1', +2261=>'Safari 6.2', +2266=>'Safari 8.0', +2264=>'Safari 7.1', +2260=>'Safari 9.0', +2265=>'Safari 8.1', +2263=>'Safari 7.0', +2085=>'Chrome Generic for Android', +2227=>'Firefox 31.0', +2225=>'Firefox 32.0', +2231=>'Firefox 41.0', +2229=>'Firefox 45.0', +2219=>'Firefox 43.0', +2220=>'Firefox 34.0', +2215=>'Firefox 35.0', +2226=>'Firefox 39.0', +2216=>'Firefox 30.0', +2218=>'Firefox 37.0', +2230=>'Firefox 36.0', +2223=>'Firefox 42.0', +2217=>'Firefox 38.0', +2228=>'Firefox 46.0', +2224=>'Firefox 40.0', +2221=>'Firefox 33.0', +2222=>'Firefox 44.0', +2191=>'Firefox Generic', +2084=>'Firefox Generic for Android', +2288=>'IE 9.0', +2142=>'IE 11.0 for Desktop', +2287=>'IE 8.0', +2176=>'IE 10.0 for Tablet', +2177=>'IE 11.0 for Tablet', +2175=>'IE 6.0 for Desktop', +2095=>'Firefox 42.0 for Android', +2090=>'Firefox 31.0 for Android', +2104=>'Firefox 37.0 for Android', +2103=>'Firefox 38.0 for Android', +2089=>'Firefox 30.0 for Android', +2110=>'Firefox 35.0 for Android', +2100=>'Firefox 46.0 for Android', +2092=>'Firefox 33.0 for Android', +2107=>'Firefox 40.0 for Android', +2091=>'Firefox 34.0 for Android', +2102=>'Firefox 39.0 for Android', +2088=>'Firefox 32.0 for Android', +2106=>'Firefox 41.0 for Android', +2097=>'Firefox 36.0 for Android', +2098=>'Firefox 43.0 for Android', +2096=>'Firefox 45.0 for Android', +2111=>'Firefox 44.0 for Android', +2186=>'DefaultProperties' +); +$patterns=array( +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_SensationXL_Beats_X315e; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0 Safari.*$@'=>0, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_IncredibleS_S710e; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>1, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Flyer_P510e Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>2, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Sensation_Z710e; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>3, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_DesireHD_A9191; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>4, +'@^Mozilla/5\.(\d) $Macintosh; .*Mac OS X.*; HTC_EVO3D_X515m; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.(\d).*Safari.*$@'=>'a:3:{s:4:"@2|2";i:5;s:4:"@0|1";i:6;s:4:"@0|0";i:7;}', +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Flyer_P510e; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>8, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Flyer_P512; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>9, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Runnymede; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0 Safari.*$@'=>10, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC_Sensation; .*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>11, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC/WildfireS/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>12, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC/Sensation/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/5\.0.*Safari.*$@'=>13, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC/DesireHD/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>14, +'@^Mozilla/5\.0 $SMART\-TV; X11; Linux armv7l$ AppleWebkit/.* $KHTML, like Gecko$ Chromium/(\d)(\d)\..*Chrome/.*Safari/.*$@'=>'a:21:{s:4:"@3|6";i:15;s:4:"@3|5";i:16;s:4:"@3|8";i:18;s:4:"@3|7";i:19;s:4:"@3|3";i:20;s:4:"@3|0";i:21;s:4:"@3|9";i:22;s:4:"@3|2";i:23;s:4:"@2|8";i:24;s:4:"@3|1";i:25;s:4:"@3|4";i:26;s:4:"@2|9";i:27;s:4:"@4|3";i:28;s:4:"@4|1";i:29;s:4:"@4|8";i:30;s:4:"@4|2";i:31;s:4:"@4|7";i:32;s:4:"@4|6";i:33;s:4:"@4|5";i:34;s:4:"@4|4";i:35;s:4:"@4|0";i:36;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*Trident/8\.0; rv\:550$ AppleWebKit/.* $KHTML, like Gecko$ Version/7\.0 Safari/.*$@'=>17, +'@^Mozilla/5\.0 $Macintosh; .*Mac OS X.*; HTC/DesireS/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>37, +'@^Mozilla/5\.0 $.*Windows NT 6\.4.*Trident/8\.0; rv\:550$ AppleWebKit/.* $KHTML, like Gecko$ Version/7\.0 Safari/.*$@'=>38, +'@^Mozilla/5\.0 $.*Linux.*Android.* Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/(\d)\.(\d).*Safari.*Chrome.*$@'=>'a:10:{s:4:"@1|5";i:39;s:4:"@5|0";i:42;s:4:"@2|0";i:45;s:4:"@4|3";i:46;s:4:"@4|2";i:47;s:4:"@4|4";i:48;s:4:"@4|1";i:50;s:4:"@1|6";i:52;s:4:"@4|0";i:56;s:4:"@2|1";i:58;}', +'@^Mozilla/5\.0 $.*Linux.*Android.* Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:10:{s:4:"@4|2";i:40;s:4:"@5|0";i:41;s:4:"@4|3";i:43;s:4:"@1|6";i:44;s:4:"@4|1";i:49;s:4:"@4|4";i:51;s:4:"@1|5";i:53;s:4:"@2|0";i:54;s:4:"@4|0";i:55;s:4:"@2|1";i:57;}', +'@^Mozilla/5\.0 $.*Linux.*Android.* Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$.*Version/1\.0.*Chrome.*Safari.*$@'=>59, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Chrome anonymized by.*$@'=>'a:19:{s:4:"@4|7";i:60;s:4:"@3|0";i:61;s:4:"@4|4";i:62;s:4:"@4|2";i:63;s:4:"@4|8";i:64;s:4:"@4|6";i:65;s:4:"@3|8";i:66;s:4:"@3|2";i:67;s:4:"@4|3";i:68;s:4:"@4|5";i:69;s:4:"@4|1";i:70;s:4:"@3|6";i:71;s:4:"@3|1";i:72;s:4:"@3|3";i:73;s:4:"@3|7";i:74;s:4:"@4|0";i:75;s:4:"@3|4";i:76;s:4:"@3|9";i:77;s:4:"@3|5";i:78;}', +'@^Mozilla/5\.0.*$iPhone.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Safari/.*$@'=>'a:7:{s:4:"@9|0";i:79;s:4:"@8|0";i:80;s:4:"@6|1";i:81;s:4:"@8|1";i:82;s:4:"@7|1";i:83;s:4:"@7|0";i:84;s:4:"@6|0";i:85;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Chrome anonymized by.*$@'=>'a:95:{s:6:"@4|3|7";i:86;s:6:"@3|3|7";i:87;s:6:"@3|4|8";i:88;s:6:"@2|3|7";i:89;s:6:"@4|4|8";i:90;s:6:"@1|3|7";i:91;s:6:"@0|3|7";i:92;s:6:"@3|3|4";i:93;s:6:"@4|3|6";i:94;s:6:"@0|3|4";i:95;s:6:"@1|3|4";i:96;s:6:"@0|3|2";i:97;s:6:"@0|3|6";i:98;s:6:"@0|4|7";i:99;s:6:"@4|3|3";i:100;s:6:"@1|4|7";i:101;s:6:"@2|4|7";i:102;s:6:"@3|4|7";i:103;s:6:"@4|4|7";i:104;s:6:"@1|3|2";i:105;s:6:"@2|3|2";i:106;s:6:"@1|4|6";i:107;s:6:"@0|4|6";i:108;s:6:"@2|4|6";i:109;s:6:"@3|4|6";i:110;s:6:"@4|4|6";i:111;s:6:"@2|3|6";i:112;s:6:"@4|3|2";i:113;s:6:"@0|4|5";i:114;s:6:"@2|3|4";i:115;s:6:"@1|3|6";i:116;s:6:"@3|3|2";i:117;s:6:"@4|3|4";i:118;s:6:"@4|3|8";i:119;s:6:"@3|3|9";i:120;s:6:"@4|3|9";i:121;s:6:"@3|3|5";i:122;s:6:"@2|3|9";i:123;s:6:"@1|3|3";i:124;s:6:"@0|4|1";i:125;s:6:"@0|3|3";i:126;s:6:"@2|3|5";i:127;s:6:"@1|3|5";i:128;s:6:"@3|4|2";i:129;s:6:"@2|4|2";i:130;s:6:"@3|3|3";i:131;s:6:"@4|4|2";i:132;s:6:"@0|3|5";i:133;s:6:"@2|3|3";i:134;s:6:"@1|4|1";i:135;s:6:"@2|4|1";i:136;s:6:"@0|4|0";i:137;s:6:"@3|3|1";i:138;s:6:"@1|4|0";i:139;s:6:"@2|4|0";i:140;s:6:"@4|4|0";i:141;s:6:"@3|4|0";i:142;s:6:"@2|3|1";i:143;s:6:"@1|3|1";i:144;s:6:"@4|4|1";i:145;s:6:"@3|4|1";i:146;s:6:"@4|3|5";i:147;s:6:"@1|3|9";i:148;s:6:"@0|3|1";i:149;s:6:"@0|3|9";i:150;s:6:"@1|4|5";i:151;s:6:"@1|4|2";i:152;s:6:"@2|4|4";i:153;s:6:"@1|4|4";i:154;s:6:"@3|4|4";i:155;s:6:"@4|4|4";i:156;s:6:"@0|4|2";i:157;s:6:"@4|3|1";i:158;s:6:"@0|4|4";i:159;s:6:"@0|4|8";i:160;s:6:"@3|4|5";i:161;s:6:"@2|4|5";i:162;s:6:"@4|4|5";i:163;s:6:"@2|4|8";i:164;s:6:"@1|4|8";i:165;s:6:"@3|3|8";i:166;s:6:"@3|3|6";i:167;s:6:"@4|3|0";i:168;s:6:"@0|3|8";i:169;s:6:"@3|3|0";i:170;s:6:"@2|3|0";i:171;s:6:"@0|3|0";i:172;s:6:"@1|3|0";i:173;s:6:"@2|3|8";i:174;s:6:"@1|3|8";i:175;s:6:"@4|4|3";i:176;s:6:"@0|4|3";i:177;s:6:"@2|4|3";i:178;s:6:"@3|4|3";i:179;s:6:"@1|4|3";i:180;}', +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$.*Chrome/.* Large Screen Safari/.* GoogleTV/.*$@'=>181, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Anonymisiert durch.*$@'=>'a:19:{s:4:"@3|3";i:182;s:4:"@3|5";i:183;s:4:"@3|6";i:184;s:4:"@4|8";i:185;s:4:"@3|2";i:186;s:4:"@3|4";i:187;s:4:"@4|3";i:188;s:4:"@4|7";i:189;s:4:"@3|8";i:190;s:4:"@4|2";i:191;s:4:"@3|9";i:192;s:4:"@4|0";i:193;s:4:"@3|1";i:194;s:4:"@4|1";i:195;s:4:"@4|4";i:196;s:4:"@3|0";i:197;s:4:"@3|7";i:198;s:4:"@4|5";i:199;s:4:"@4|6";i:200;}', +'@^Mozilla/5\.0 $iPhone.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|7";i:201;s:4:"@3|0";i:202;s:4:"@3|6";i:203;s:4:"@4|0";i:204;s:4:"@3|9";i:206;s:4:"@3|4";i:207;s:4:"@4|6";i:208;s:4:"@3|8";i:209;s:4:"@4|1";i:210;s:4:"@4|2";i:211;s:4:"@4|5";i:212;s:4:"@3|5";i:213;s:4:"@3|1";i:214;s:4:"@4|4";i:215;s:4:"@3|7";i:216;s:4:"@3|2";i:217;s:4:"@4|3";i:218;s:4:"@4|8";i:219;s:4:"@3|3";i:220;}', +'@^Mozilla/5\.0 $Linux.*; Android Eclair.*Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/.*Safari.*$@'=>205, +'@^Mozilla/5\.0 $.*Linux.*Android.*A5000 Build/.*$ AppleWebKit.* $KHTML,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>221, +'@^Mozilla/5\.0 $.*Linux.*Android.* Build/.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$ Version/.*Chrome.*Safari.*$@'=>222, +'@^Mozilla/5\.0.*$iPod.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Safari/.*$@'=>'a:7:{s:4:"@9|0";i:223;s:4:"@7|0";i:225;s:4:"@6|1";i:227;s:4:"@7|1";i:230;s:4:"@8|0";i:231;s:4:"@6|0";i:235;s:4:"@8|1";i:236;}', +'@^Mozilla/5\.0.*$iPad.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Safari/.*$@'=>'a:7:{s:4:"@8|1";i:224;s:4:"@6|0";i:226;s:4:"@7|0";i:228;s:4:"@9|0";i:229;s:4:"@7|1";i:232;s:4:"@8|0";i:233;s:4:"@6|1";i:234;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Anonymisiert durch.*$@'=>'a:95:{s:6:"@3|3|9";i:237;s:6:"@0|3|3";i:238;s:6:"@0|4|1";i:239;s:6:"@1|3|3";i:240;s:6:"@1|4|1";i:241;s:6:"@0|3|6";i:242;s:6:"@0|4|7";i:243;s:6:"@2|4|7";i:244;s:6:"@0|3|9";i:245;s:6:"@1|3|9";i:246;s:6:"@2|3|9";i:247;s:6:"@4|3|9";i:248;s:6:"@3|4|7";i:249;s:6:"@4|4|7";i:250;s:6:"@1|4|7";i:251;s:6:"@4|4|8";i:252;s:6:"@4|3|1";i:253;s:6:"@4|4|1";i:254;s:6:"@3|4|1";i:255;s:6:"@4|3|6";i:256;s:6:"@3|3|1";i:257;s:6:"@2|3|1";i:258;s:6:"@0|3|1";i:259;s:6:"@1|3|1";i:260;s:6:"@4|3|3";i:261;s:6:"@3|3|3";i:262;s:6:"@2|3|3";i:263;s:6:"@2|4|1";i:264;s:6:"@4|3|0";i:265;s:6:"@2|3|6";i:266;s:6:"@4|4|2";i:267;s:6:"@3|4|8";i:268;s:6:"@0|4|8";i:269;s:6:"@1|4|8";i:270;s:6:"@2|4|8";i:271;s:6:"@1|3|6";i:272;s:6:"@1|4|6";i:273;s:6:"@1|3|4";i:274;s:6:"@0|4|3";i:275;s:6:"@0|4|4";i:276;s:6:"@1|4|4";i:277;s:6:"@2|4|4";i:278;s:6:"@1|4|3";i:279;s:6:"@2|4|3";i:280;s:6:"@0|3|4";i:281;s:6:"@0|3|0";i:282;s:6:"@4|4|3";i:283;s:6:"@3|4|3";i:284;s:6:"@3|4|4";i:285;s:6:"@4|4|4";i:286;s:6:"@1|3|0";i:287;s:6:"@2|3|0";i:288;s:6:"@2|3|4";i:289;s:6:"@3|3|0";i:290;s:6:"@0|3|8";i:291;s:6:"@1|3|8";i:292;s:6:"@3|3|4";i:293;s:6:"@4|3|8";i:294;s:6:"@3|3|8";i:295;s:6:"@2|3|8";i:296;s:6:"@4|3|2";i:297;s:6:"@3|3|2";i:298;s:6:"@0|4|2";i:299;s:6:"@4|3|7";i:300;s:6:"@3|3|7";i:301;s:6:"@2|3|7";i:302;s:6:"@1|4|2";i:303;s:6:"@2|4|2";i:304;s:6:"@0|4|6";i:305;s:6:"@2|4|6";i:306;s:6:"@3|4|6";i:307;s:6:"@4|4|6";i:308;s:6:"@1|3|7";i:309;s:6:"@0|3|7";i:310;s:6:"@0|3|2";i:311;s:6:"@1|3|2";i:312;s:6:"@2|3|2";i:313;s:6:"@4|4|5";i:315;s:6:"@3|4|5";i:316;s:6:"@4|3|4";i:317;s:6:"@0|4|5";i:318;s:6:"@1|4|5";i:319;s:6:"@2|4|5";i:320;s:6:"@3|4|2";i:321;s:6:"@3|3|6";i:322;s:6:"@4|3|5";i:323;s:6:"@2|3|5";i:324;s:6:"@0|4|0";i:325;s:6:"@3|4|0";i:326;s:6:"@1|4|0";i:327;s:6:"@4|4|0";i:328;s:6:"@3|3|5";i:329;s:6:"@2|4|0";i:330;s:6:"@1|3|5";i:331;s:6:"@0|3|5";i:332;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Chrome anonymized by.*$@'=>314, +'@^Mozilla/5\.0 $.*Linux.*Velocitymicro/T408.*$ AppleWebKit/.*$KHTML, like Gecko$ .*Version/4\.0.*Safari/.*$@'=>333, +'@^Mozilla/5\.0.*$iPhone.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Safari/.*$@'=>334, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Chrome anonymized by.*$@'=>'a:5:{s:2:"@4";i:335;s:2:"@1";i:336;s:2:"@2";i:337;s:2:"@3";i:338;s:2:"@0";i:339;}', +'@^Mozilla/5\.0 $iPod.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|0";i:340;s:4:"@3|0";i:342;s:4:"@4|8";i:345;s:4:"@4|1";i:347;s:4:"@4|4";i:348;s:4:"@4|2";i:350;s:4:"@3|5";i:351;s:4:"@3|8";i:352;s:4:"@4|7";i:353;s:4:"@4|5";i:354;s:4:"@3|1";i:356;s:4:"@3|6";i:359;s:4:"@3|4";i:366;s:4:"@3|9";i:367;s:4:"@3|3";i:368;s:4:"@3|2";i:371;s:4:"@4|3";i:373;s:4:"@3|7";i:374;s:4:"@4|6";i:376;}', +'@^Mozilla/5\.0 $iPad.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@3|4";i:341;s:4:"@4|1";i:343;s:4:"@3|0";i:344;s:4:"@4|8";i:346;s:4:"@4|4";i:349;s:4:"@4|7";i:355;s:4:"@3|8";i:357;s:4:"@4|5";i:358;s:4:"@3|5";i:360;s:4:"@3|6";i:361;s:4:"@3|3";i:362;s:4:"@3|9";i:363;s:4:"@4|0";i:364;s:4:"@3|7";i:365;s:4:"@4|6";i:369;s:4:"@4|2";i:370;s:4:"@4|3";i:372;s:4:"@3|1";i:375;s:4:"@3|2";i:377;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*NookColor.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/4\..*Safari/.*$@'=>378, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Anonymisiert durch.*$@'=>379, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.* Safari/.* Edge/1(\d)\..*$@'=>'a:2:{s:2:"@2";i:380;s:2:"@3";i:381;}', +'@^Mozilla/5\.0 $iPhone.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/.*Safari/.*$@'=>382, +'@^Mozilla/5\.0.*$iPod.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Safari/.*$@'=>383, +'@^Mozilla/5\.0.*$iPad.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Safari/.*$@'=>384, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Anonymisiert durch.*$@'=>'a:5:{s:2:"@3";i:385;s:2:"@4";i:386;s:2:"@1";i:387;s:2:"@2";i:388;s:2:"@0";i:389;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.4.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.* Safari/.* Edge/1(\d)\..*$@'=>'a:2:{s:2:"@2";i:390;s:2:"@3";i:391;}', +'@^Mozilla/5\.0 $.*Linux.*Android.* Build/.*$.*AppleWebKit/.*$.*KHTML,.*like Gecko.*$.*Version/4\.0.*Safari.*$@'=>392, +'@^Mozilla/5\.0.*$.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Safari/.*$@'=>'a:7:{s:4:"@7|1";i:393;s:4:"@6|0";i:394;s:4:"@8|0";i:395;s:4:"@6|1";i:396;s:4:"@9|0";i:397;s:4:"@8|1";i:398;s:4:"@7|0";i:399;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$.*Chrome/.*Safari/.*OPR/(\d)(\d)\.0.*$@'=>'a:21:{s:4:"@3|2";i:400;s:4:"@2|5";i:401;s:4:"@3|1";i:402;s:4:"@2|2";i:403;s:4:"@1|7";i:404;s:4:"@3|4";i:405;s:4:"@3|5";i:406;s:4:"@1|9";i:407;s:4:"@1|8";i:408;s:4:"@3|0";i:409;s:4:"@2|0";i:410;s:4:"@2|4";i:411;s:4:"@2|8";i:412;s:4:"@2|7";i:413;s:4:"@1|5";i:414;s:4:"@3|3";i:415;s:4:"@1|6";i:416;s:4:"@2|9";i:417;s:4:"@2|3";i:418;s:4:"@2|1";i:419;s:4:"@2|6";i:420;}', +'@^Mozilla/5\.0 $iPad.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/.*Safari/.*$@'=>421, +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Safari.*Chrome.*$@'=>'a:10:{s:4:"@2|1";i:422;s:4:"@4|0";i:425;s:4:"@4|3";i:428;s:4:"@1|5";i:430;s:4:"@1|6";i:431;s:4:"@5|0";i:432;s:4:"@2|0";i:433;s:4:"@4|1";i:434;s:4:"@4|4";i:435;s:4:"@4|2";i:438;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:11:{s:4:"@4|1";i:423;s:4:"@1|5";i:424;s:4:"@4|4";i:426;s:4:"@4|3";i:427;s:4:"@1|0";i:429;s:4:"@2|1";i:436;s:4:"@2|0";i:437;s:4:"@4|2";i:439;s:4:"@1|6";i:440;s:4:"@4|0";i:441;s:4:"@5|0";i:442;}', +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Chrome anonymized by.*$@'=>'a:19:{s:4:"@3|8";i:443;s:4:"@3|0";i:444;s:4:"@4|3";i:445;s:4:"@4|4";i:446;s:4:"@4|5";i:447;s:4:"@3|4";i:448;s:4:"@4|2";i:449;s:4:"@3|7";i:450;s:4:"@3|2";i:451;s:4:"@4|6";i:452;s:4:"@3|9";i:453;s:4:"@4|1";i:454;s:4:"@4|0";i:455;s:4:"@3|3";i:456;s:4:"@3|6";i:457;s:4:"@4|8";i:458;s:4:"@3|5";i:459;s:4:"@4|7";i:460;s:4:"@3|1";i:461;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$.*Chrome/.*Safari/.*OPR/(\d)(\d)\.0.*$@'=>'a:105:{s:6:"@0|1|9";i:462;s:6:"@1|1|9";i:463;s:6:"@3|3|0";i:464;s:6:"@0|2|6";i:465;s:6:"@2|2|6";i:466;s:6:"@1|2|6";i:467;s:6:"@2|1|9";i:468;s:6:"@4|1|8";i:469;s:6:"@3|3|1";i:470;s:6:"@4|1|5";i:471;s:6:"@0|3|1";i:472;s:6:"@4|1|9";i:473;s:6:"@3|1|9";i:474;s:6:"@4|3|1";i:475;s:6:"@3|1|8";i:476;s:6:"@2|2|0";i:477;s:6:"@3|2|0";i:478;s:6:"@2|3|2";i:479;s:6:"@2|1|8";i:480;s:6:"@1|3|2";i:481;s:6:"@4|2|0";i:482;s:6:"@0|2|5";i:483;s:6:"@4|2|6";i:484;s:6:"@3|2|6";i:485;s:6:"@4|3|2";i:486;s:6:"@4|2|9";i:487;s:6:"@3|3|2";i:488;s:6:"@3|1|5";i:489;s:6:"@2|1|5";i:490;s:6:"@4|1|7";i:491;s:6:"@3|1|7";i:492;s:6:"@1|3|1";i:493;s:6:"@0|1|8";i:494;s:6:"@0|1|6";i:495;s:6:"@4|2|8";i:496;s:6:"@3|2|8";i:497;s:6:"@2|1|7";i:498;s:6:"@1|1|7";i:499;s:6:"@1|2|8";i:500;s:6:"@0|2|8";i:501;s:6:"@2|2|8";i:502;s:6:"@4|3|0";i:503;s:6:"@2|3|1";i:504;s:6:"@0|3|2";i:505;s:6:"@4|1|6";i:506;s:6:"@4|2|7";i:507;s:6:"@0|1|5";i:508;s:6:"@1|1|5";i:509;s:6:"@3|1|6";i:510;s:6:"@3|2|7";i:511;s:6:"@1|1|6";i:512;s:6:"@0|2|7";i:513;s:6:"@2|1|6";i:514;s:6:"@1|2|7";i:515;s:6:"@2|2|7";i:516;s:6:"@0|1|7";i:517;s:6:"@1|2|0";i:518;s:6:"@4|3|4";i:519;s:6:"@2|2|2";i:520;s:6:"@3|3|4";i:521;s:6:"@1|2|9";i:522;s:6:"@1|3|4";i:523;s:6:"@2|3|4";i:524;s:6:"@3|2|2";i:525;s:6:"@4|2|2";i:526;s:6:"@1|2|4";i:527;s:6:"@0|2|4";i:528;s:6:"@2|2|4";i:529;s:6:"@0|2|0";i:530;s:6:"@4|2|4";i:531;s:6:"@0|3|4";i:532;s:6:"@4|3|5";i:533;s:6:"@0|2|2";i:534;s:6:"@1|2|3";i:535;s:6:"@1|1|8";i:536;s:6:"@2|2|3";i:537;s:6:"@4|2|3";i:538;s:6:"@3|2|3";i:539;s:6:"@0|2|3";i:540;s:6:"@1|2|2";i:541;s:6:"@3|3|5";i:542;s:6:"@0|2|9";i:543;s:6:"@2|3|5";i:544;s:6:"@1|3|5";i:545;s:6:"@0|3|5";i:546;s:6:"@0|3|3";i:547;s:6:"@3|2|4";i:548;s:6:"@1|2|1";i:549;s:6:"@0|2|1";i:550;s:6:"@1|3|0";i:551;s:6:"@0|3|0";i:552;s:6:"@2|2|1";i:553;s:6:"@3|2|9";i:554;s:6:"@4|2|1";i:555;s:6:"@3|2|1";i:556;s:6:"@4|3|3";i:557;s:6:"@1|2|5";i:558;s:6:"@2|2|9";i:559;s:6:"@3|2|5";i:560;s:6:"@4|2|5";i:561;s:6:"@3|3|3";i:562;s:6:"@1|3|3";i:563;s:6:"@2|3|3";i:564;s:6:"@2|2|5";i:565;s:6:"@2|3|0";i:566;}', +'@^Mozilla/5\.0 $.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@3|1";i:567;s:4:"@4|6";i:568;s:4:"@4|3";i:569;s:4:"@3|3";i:570;s:4:"@3|0";i:571;s:4:"@4|1";i:572;s:4:"@4|4";i:573;s:4:"@4|7";i:574;s:4:"@4|8";i:575;s:4:"@3|8";i:576;s:4:"@4|2";i:577;s:4:"@3|7";i:578;s:4:"@4|5";i:579;s:4:"@3|4";i:580;s:4:"@3|6";i:581;s:4:"@4|0";i:582;s:4:"@3|2";i:583;s:4:"@3|5";i:584;s:4:"@3|9";i:585;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.* $KHMTL,.*like Gecko.*$.*Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:11:{s:4:"@4|3";i:586;s:4:"@2|0";i:588;s:4:"@5|0";i:589;s:4:"@1|6";i:590;s:4:"@1|5";i:591;s:4:"@1|0";i:592;s:4:"@4|2";i:593;s:4:"@2|1";i:594;s:4:"@4|0";i:595;s:4:"@4|1";i:596;s:4:"@4|4";i:597;}', +'@^Mozilla/5\.0$.*Linux.*Android.*$ AppleWebKit/.* $KHTML,.*like Gecko.*$.*Version/1\.0.*Chrome.*Safari.*$@'=>587, +'@^.*Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.*KHTML, like Gecko\) Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:10:{s:4:"@4|3";i:598;s:4:"@4|4";i:599;s:4:"@5|0";i:600;s:4:"@1|6";i:601;s:4:"@2|1";i:602;s:4:"@4|0";i:603;s:4:"@2|0";i:604;s:4:"@1|5";i:605;s:4:"@4|1";i:606;s:4:"@4|2";i:607;}', +'@^Mozilla/5\.0$.*Linux.*Android.*$.*AppleWebKit/.*$KHTML,.*like Gecko.*$.*Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:10:{s:4:"@4|4";i:608;s:4:"@5|0";i:610;s:4:"@4|3";i:611;s:4:"@2|1";i:612;s:4:"@4|0";i:613;s:4:"@4|1";i:614;s:4:"@4|2";i:615;s:4:"@1|5";i:616;s:4:"@2|0";i:617;s:4:"@1|6";i:618;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*NOOK.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/4\..*Safari/.*$@'=>609, +'@^Mozilla/5\.0.*$.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Safari/.*$@'=>619, +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Anonymisiert durch.*$@'=>'a:19:{s:4:"@4|1";i:620;s:4:"@3|6";i:621;s:4:"@3|5";i:622;s:4:"@4|6";i:623;s:4:"@3|9";i:624;s:4:"@4|2";i:625;s:4:"@3|7";i:626;s:4:"@3|0";i:627;s:4:"@3|1";i:628;s:4:"@3|4";i:629;s:4:"@4|7";i:630;s:4:"@3|2";i:631;s:4:"@3|3";i:632;s:4:"@4|3";i:633;s:4:"@4|0";i:634;s:4:"@4|4";i:635;s:4:"@4|8";i:636;s:4:"@3|8";i:637;s:4:"@4|5";i:638;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Chrome.*Safari.*$@'=>639, +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/.*Safari.*Chrome.*$@'=>640, +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Chrome anonymized by.*$@'=>641, +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.*$KTHML,like Gecko$.*Version/(\d)\.(\d).*Chrome.*Safari.*$@'=>'a:11:{s:4:"@4|2";i:642;s:4:"@4|0";i:643;s:4:"@2|0";i:644;s:4:"@4|1";i:645;s:4:"@1|6";i:646;s:4:"@4|4";i:647;s:4:"@4|3";i:648;s:4:"@1|5";i:649;s:4:"@5|0";i:651;s:4:"@1|0";i:652;s:4:"@2|1";i:653;}', +'@^Mozilla/5\.0 $.*CPU.*OS.*like Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*CriOS/.*Safari/.*$@'=>650, +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.* $KHMTL,.*like Gecko.*$.*Version/.*Chrome.*Safari.*$@'=>654, +'@^Mozilla/(\d)\.0 $compatible; MSIE 7\.0.*; .*Windows NT 6\.(\d).*Mozilla/4\.0 \(compatible; MSIE 6\.0.*$@'=>'a:6:{s:4:"@5|1";i:655;s:4:"@4|0";i:656;s:4:"@5|2";i:657;s:4:"@4|1";i:658;s:4:"@4|2";i:659;s:4:"@5|0";i:660;}', +'@^.*Mozilla/5\.0 \(.*Linux.*Android.*$ AppleWebKit/.*KHTML, like Gecko\) Version/.*Chrome.*Safari.*$@'=>661, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|8";i:662;s:4:"@3|6";i:663;s:4:"@4|6";i:664;s:4:"@3|2";i:665;s:4:"@4|1";i:666;s:4:"@4|7";i:667;s:4:"@3|0";i:668;s:4:"@3|5";i:669;s:4:"@3|7";i:670;s:4:"@4|4";i:671;s:4:"@3|8";i:673;s:4:"@4|5";i:674;s:4:"@3|4";i:675;s:4:"@4|2";i:676;s:4:"@3|9";i:677;s:4:"@3|1";i:678;s:4:"@4|3";i:679;s:4:"@3|3";i:680;s:4:"@4|0";i:681;}', +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Anonymisiert durch.*$@'=>672, +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$.*Chromium/(\d)(\d)\..*Chrome/.*Safari/.*$@'=>'a:21:{s:4:"@4|7";i:682;s:4:"@4|8";i:683;s:4:"@4|5";i:684;s:4:"@4|3";i:685;s:4:"@4|1";i:686;s:4:"@4|4";i:687;s:4:"@3|9";i:688;s:4:"@4|2";i:689;s:4:"@4|0";i:690;s:4:"@4|6";i:691;s:4:"@3|3";i:692;s:4:"@3|2";i:693;s:4:"@3|4";i:694;s:4:"@3|0";i:695;s:4:"@2|9";i:696;s:4:"@2|8";i:697;s:4:"@3|5";i:698;s:4:"@3|1";i:699;s:4:"@3|6";i:700;s:4:"@3|7";i:701;s:4:"@3|8";i:702;}', +'@^Mozilla/5\.0.*$iPhone.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Mobile.*$@'=>703, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:95:{s:6:"@4|3|8";i:704;s:6:"@3|3|1";i:705;s:6:"@2|3|1";i:706;s:6:"@1|3|1";i:707;s:6:"@3|3|8";i:708;s:6:"@4|3|3";i:709;s:6:"@2|3|8";i:710;s:6:"@2|3|2";i:711;s:6:"@1|3|2";i:712;s:6:"@0|3|2";i:713;s:6:"@1|3|8";i:714;s:6:"@4|3|4";i:715;s:6:"@2|3|7";i:716;s:6:"@1|3|7";i:717;s:6:"@0|3|7";i:718;s:6:"@1|3|4";i:719;s:6:"@3|3|7";i:720;s:6:"@0|3|4";i:721;s:6:"@3|3|4";i:722;s:6:"@0|3|1";i:723;s:6:"@4|3|7";i:724;s:6:"@4|3|5";i:725;s:6:"@2|3|5";i:726;s:6:"@3|3|2";i:727;s:6:"@0|3|5";i:728;s:6:"@0|3|8";i:729;s:6:"@4|3|9";i:730;s:6:"@4|3|1";i:731;s:6:"@4|3|2";i:732;s:6:"@2|3|6";i:733;s:6:"@3|3|3";i:734;s:6:"@1|3|6";i:735;s:6:"@0|3|6";i:736;s:6:"@3|3|9";i:737;s:6:"@2|3|9";i:738;s:6:"@1|3|5";i:739;s:6:"@2|3|3";i:740;s:6:"@4|3|6";i:741;s:6:"@3|3|6";i:742;s:6:"@0|3|3";i:743;s:6:"@1|3|3";i:744;s:6:"@1|3|9";i:745;s:6:"@0|3|9";i:746;s:6:"@2|3|4";i:747;s:6:"@3|3|5";i:748;s:6:"@4|4|5";i:749;s:6:"@0|4|3";i:750;s:6:"@1|4|3";i:751;s:6:"@2|4|3";i:752;s:6:"@4|4|4";i:753;s:6:"@3|4|4";i:754;s:6:"@0|4|4";i:755;s:6:"@1|4|4";i:756;s:6:"@2|4|4";i:757;s:6:"@3|4|3";i:758;s:6:"@4|4|3";i:759;s:6:"@4|4|2";i:760;s:6:"@0|4|1";i:761;s:6:"@1|4|1";i:762;s:6:"@3|4|2";i:763;s:6:"@2|4|2";i:764;s:6:"@0|4|2";i:765;s:6:"@1|4|2";i:766;s:6:"@3|4|5";i:767;s:6:"@2|4|5";i:768;s:6:"@4|4|8";i:769;s:6:"@0|4|7";i:770;s:6:"@1|4|7";i:771;s:6:"@3|4|8";i:772;s:6:"@2|4|8";i:773;s:6:"@0|4|8";i:774;s:6:"@1|4|8";i:775;s:6:"@2|4|7";i:776;s:6:"@3|4|7";i:777;s:6:"@4|4|6";i:778;s:6:"@0|4|5";i:779;s:6:"@1|4|5";i:780;s:6:"@3|4|6";i:781;s:6:"@1|4|6";i:782;s:6:"@4|4|7";i:783;s:6:"@0|4|6";i:784;s:6:"@2|4|1";i:785;s:6:"@2|4|6";i:786;s:6:"@0|3|0";i:787;s:6:"@1|3|0";i:788;s:6:"@2|3|0";i:789;s:6:"@3|3|0";i:790;s:6:"@3|4|1";i:791;s:6:"@1|4|0";i:792;s:6:"@4|4|0";i:793;s:6:"@3|4|0";i:794;s:6:"@2|4|0";i:795;s:6:"@4|3|0";i:796;s:6:"@0|4|0";i:797;s:6:"@4|4|1";i:798;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/.* Safari/.*$@'=>'a:4:{s:2:"@1";i:799;s:2:"@2";i:800;s:2:"@0";i:801;s:2:"@3";i:802;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$.*Chrome/.*Safari/.*OPR/(\d)(\d)\.0.*$@'=>'a:21:{s:4:"@2|7";i:803;s:4:"@2|6";i:809;s:4:"@3|2";i:812;s:4:"@1|8";i:813;s:4:"@3|0";i:814;s:4:"@2|9";i:815;s:4:"@2|8";i:817;s:4:"@2|1";i:820;s:4:"@2|0";i:822;s:4:"@1|9";i:823;s:4:"@1|7";i:824;s:4:"@1|6";i:825;s:4:"@2|2";i:826;s:4:"@2|4";i:830;s:4:"@2|3";i:831;s:4:"@1|5";i:832;s:4:"@2|5";i:833;s:4:"@3|1";i:834;s:4:"@3|4";i:836;s:4:"@3|3";i:837;s:4:"@3|5";i:839;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.* $KHTML, like Gecko.*$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|4";i:804;s:4:"@4|8";i:805;s:4:"@3|4";i:806;s:4:"@3|8";i:807;s:4:"@3|2";i:808;s:4:"@3|9";i:810;s:4:"@4|7";i:811;s:4:"@3|0";i:819;s:4:"@4|6";i:821;s:4:"@3|1";i:827;s:4:"@4|5";i:828;s:4:"@3|6";i:829;s:4:"@4|0";i:835;s:4:"@3|7";i:838;s:4:"@4|2";i:840;s:4:"@3|5";i:841;s:4:"@3|3";i:842;s:4:"@4|1";i:843;s:4:"@4|3";i:844;}', +'@^.*Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.* $KHTML, like Gecko$ Version/4\.(\d).*Safari.*$@'=>'a:2:{s:2:"@2";i:816;s:2:"@1";i:818;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.*$KTHML,like Gecko$.*Version/.*Chrome.*Safari.*$@'=>845, +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Version/4\.(\d).*Safari.*$@'=>'a:4:{s:2:"@1";i:846;s:2:"@2";i:847;s:2:"@4";i:848;s:2:"@3";i:849;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|1";i:850;s:4:"@4|2";i:851;s:4:"@4|5";i:852;s:4:"@4|8";i:853;s:4:"@3|0";i:854;s:4:"@4|6";i:855;s:4:"@3|3";i:856;s:4:"@4|7";i:857;s:4:"@3|4";i:858;s:4:"@3|6";i:859;s:4:"@3|1";i:860;s:4:"@4|0";i:861;s:4:"@4|4";i:862;s:4:"@3|8";i:863;s:4:"@4|3";i:864;s:4:"@3|7";i:865;s:4:"@3|5";i:866;s:4:"@3|9";i:867;s:4:"@3|2";i:868;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.* $KHTML,.*like Gecko.*$ Version/4\.(\d).*Safari.*$@'=>'a:2:{s:2:"@2";i:869;s:2:"@1";i:870;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.* $KHMTL,.*like Gecko.*$ Version/4\.0.*Safari.*$@'=>871, +'@^Mozilla/5\.0 $iPad.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Mobile.*$@'=>872, +'@^Mozilla/5\.0.*$iPod.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Mobile.*$@'=>873, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>874, +'@^Mozilla/5\.0 $compatible; MSIE 10\.0.*; .*Windows NT 6\.2.*Trident/6\.0; Xbox; Xbox One.*$@'=>875, +'@^Mozilla/5\.0 \(.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>'a:5:{s:2:"@0";i:876;s:2:"@1";i:877;s:2:"@4";i:878;s:2:"@3";i:879;s:2:"@2";i:880;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/(\d)\.(\d).* Safari/.*$@'=>'a:8:{s:4:"@6|0";i:881;s:4:"@6|1";i:882;s:4:"@6|2";i:883;s:4:"@8|0";i:884;s:4:"@7|1";i:885;s:4:"@9|0";i:886;s:4:"@8|1";i:887;s:4:"@7|0";i:888;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.* $KHTML, like Gecko$.*CrMo/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|8";i:889;s:4:"@3|5";i:891;s:4:"@3|3";i:901;s:4:"@3|4";i:905;s:4:"@3|2";i:908;s:4:"@4|7";i:915;s:4:"@4|0";i:916;s:4:"@4|1";i:917;s:4:"@3|8";i:918;s:4:"@3|0";i:919;s:4:"@4|5";i:920;s:4:"@4|2";i:921;s:4:"@3|6";i:922;s:4:"@4|3";i:923;s:4:"@4|4";i:924;s:4:"@3|7";i:925;s:4:"@4|6";i:926;s:4:"@3|1";i:927;s:4:"@3|9";i:928;}', +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$.*Chrome/.*Safari/.*OPR/(\d)(\d)\.0.*$@'=>'a:21:{s:4:"@1|7";i:890;s:4:"@1|5";i:892;s:4:"@1|6";i:893;s:4:"@2|6";i:894;s:4:"@3|1";i:895;s:4:"@3|0";i:896;s:4:"@2|9";i:897;s:4:"@2|8";i:898;s:4:"@3|2";i:899;s:4:"@3|3";i:900;s:4:"@3|5";i:902;s:4:"@3|4";i:903;s:4:"@2|7";i:904;s:4:"@2|0";i:906;s:4:"@1|9";i:907;s:4:"@2|1";i:909;s:4:"@2|2";i:910;s:4:"@2|5";i:911;s:4:"@2|4";i:912;s:4:"@2|3";i:913;s:4:"@1|8";i:914;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit.*$KTHML,like Gecko$ Version/4\.0.*Safari.*$@'=>929, +'@^Mozilla/5\.0 $.*Linux.*Android.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>930, +'@^Mozilla/(\d)\.0 $compatible; MSIE 7\.0.*; .*Windows.*Mozilla/4\.0 \(compatible; MSIE 6\.0.*$@'=>'a:2:{s:2:"@5";i:931;s:2:"@4";i:932;}', +'@^Mozilla/5\.0\(.*Linux.*Android.*$AppleWebKit/.*$KHTML,.*like Gecko$Version/4\.0.*Safari.*$@'=>933, +'@^Mozilla/5\.0.*$.*CPU.*OS.*like Mac OS X.*$.*AppleWebKit/.*$.*KHTML, like Gecko.*$.*Mobile.*$@'=>934, +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@3|9";i:935;s:4:"@3|0";i:936;s:4:"@4|5";i:937;s:4:"@4|4";i:938;s:4:"@3|7";i:939;s:4:"@4|3";i:940;s:4:"@3|4";i:941;s:4:"@4|6";i:942;s:4:"@3|6";i:943;s:4:"@4|2";i:944;s:4:"@3|8";i:945;s:4:"@3|2";i:946;s:4:"@3|5";i:947;s:4:"@4|7";i:948;s:4:"@3|1";i:949;s:4:"@4|8";i:950;s:4:"@3|3";i:951;s:4:"@4|0";i:952;s:4:"@4|1";i:953;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/.* Safari/.*$@'=>954, +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/(\d)\.(\d).* Safari/.*$@'=>'a:9:{s:4:"@6|0";i:955;s:4:"@8|0";i:956;s:4:"@9|0";i:957;s:4:"@8|1";i:958;s:4:"@7|0";i:959;s:4:"@7|1";i:960;s:4:"@6|1";i:961;s:4:"@6|2";i:962;s:4:"@4|1";i:963;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*$@'=>'a:19:{s:4:"@3|8";i:964;s:4:"@4|4";i:965;s:4:"@3|3";i:966;s:4:"@4|3";i:967;s:4:"@3|4";i:968;s:4:"@4|1";i:969;s:4:"@3|0";i:970;s:4:"@4|2";i:971;s:4:"@3|9";i:972;s:4:"@3|2";i:973;s:4:"@4|6";i:974;s:4:"@3|1";i:975;s:4:"@3|6";i:976;s:4:"@4|7";i:977;s:4:"@4|8";i:978;s:4:"@4|0";i:979;s:4:"@4|5";i:980;s:4:"@3|5";i:981;s:4:"@3|7";i:982;}', +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@3|8";i:983;s:4:"@3|5";i:984;s:4:"@3|7";i:985;s:4:"@3|0";i:986;s:4:"@4|1";i:987;s:4:"@4|7";i:988;s:4:"@3|1";i:989;s:4:"@4|4";i:990;s:4:"@4|8";i:991;s:4:"@3|3";i:992;s:4:"@4|0";i:993;s:4:"@3|4";i:994;s:4:"@4|2";i:995;s:4:"@3|6";i:996;s:4:"@3|9";i:997;s:4:"@4|6";i:998;s:4:"@3|2";i:999;s:4:"@4|5";i:1000;s:4:"@4|3";i:1001;}', +'@^Mozilla/5\.0 $.*Linux.*Android.*$.*AppleWebKit/.*$.*KHTML,.*like Gecko.*$.*Version/4\.0.*$@'=>1002, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*$@'=>'a:95:{s:6:"@0|3|1";i:1003;s:6:"@0|3|0";i:1004;s:6:"@4|3|1";i:1005;s:6:"@3|3|3";i:1006;s:6:"@1|3|0";i:1007;s:6:"@2|3|3";i:1008;s:6:"@4|3|3";i:1009;s:6:"@4|3|0";i:1010;s:6:"@4|3|2";i:1011;s:6:"@1|3|2";i:1012;s:6:"@2|3|2";i:1013;s:6:"@0|3|2";i:1014;s:6:"@1|3|1";i:1015;s:6:"@3|3|1";i:1016;s:6:"@3|3|2";i:1017;s:6:"@2|3|1";i:1018;s:6:"@3|3|0";i:1019;s:6:"@2|3|0";i:1020;s:6:"@2|3|8";i:1021;s:6:"@2|4|6";i:1022;s:6:"@3|3|8";i:1023;s:6:"@4|3|8";i:1024;s:6:"@1|3|8";i:1025;s:6:"@0|3|8";i:1026;s:6:"@1|4|1";i:1027;s:6:"@0|4|1";i:1028;s:6:"@1|3|3";i:1029;s:6:"@1|4|6";i:1030;s:6:"@0|4|8";i:1031;s:6:"@3|4|6";i:1032;s:6:"@3|3|7";i:1033;s:6:"@3|4|2";i:1034;s:6:"@2|4|2";i:1035;s:6:"@1|4|2";i:1036;s:6:"@2|3|7";i:1037;s:6:"@1|3|7";i:1038;s:6:"@4|4|6";i:1039;s:6:"@4|4|2";i:1040;s:6:"@0|3|7";i:1041;s:6:"@2|4|1";i:1042;s:6:"@4|3|9";i:1043;s:6:"@0|4|7";i:1044;s:6:"@0|4|0";i:1045;s:6:"@1|4|0";i:1046;s:6:"@2|4|0";i:1047;s:6:"@1|4|7";i:1048;s:6:"@2|4|7";i:1049;s:6:"@4|4|7";i:1050;s:6:"@3|4|7";i:1051;s:6:"@4|4|1";i:1052;s:6:"@0|4|6";i:1053;s:6:"@3|4|0";i:1054;s:6:"@4|4|0";i:1055;s:6:"@1|4|8";i:1056;s:6:"@1|3|9";i:1057;s:6:"@2|3|9";i:1058;s:6:"@3|3|9";i:1059;s:6:"@0|3|9";i:1060;s:6:"@2|4|8";i:1061;s:6:"@4|4|8";i:1062;s:6:"@3|4|8";i:1063;s:6:"@3|4|1";i:1064;s:6:"@0|4|2";i:1065;s:6:"@4|3|7";i:1066;s:6:"@4|3|5";i:1067;s:6:"@0|4|3";i:1068;s:6:"@0|3|4";i:1069;s:6:"@3|3|5";i:1070;s:6:"@1|4|3";i:1071;s:6:"@2|4|3";i:1072;s:6:"@0|3|5";i:1073;s:6:"@1|3|5";i:1074;s:6:"@1|3|4";i:1075;s:6:"@2|3|4";i:1076;s:6:"@3|4|4";i:1077;s:6:"@2|4|4";i:1078;s:6:"@0|3|3";i:1079;s:6:"@4|4|4";i:1080;s:6:"@1|4|4";i:1081;s:6:"@3|3|4";i:1082;s:6:"@4|3|4";i:1083;s:6:"@0|4|4";i:1084;s:6:"@3|4|3";i:1085;s:6:"@2|3|5";i:1086;s:6:"@3|3|6";i:1087;s:6:"@4|3|6";i:1088;s:6:"@1|4|5";i:1089;s:6:"@2|4|5";i:1090;s:6:"@2|3|6";i:1091;s:6:"@1|3|6";i:1092;s:6:"@4|4|3";i:1093;s:6:"@0|4|5";i:1094;s:6:"@4|4|5";i:1095;s:6:"@0|3|6";i:1096;s:6:"@3|4|5";i:1097;}', +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.*$KHTML, like Gecko$ .*Version/4\.0.*Safari/.*$@'=>1098, +'@^Mozilla/5\.0 $compatible; MSIE 10\.0; Windows 95; Anonymisiert.*Trident/6\.0.*$.*$@'=>1099, +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*Safari/.*$@'=>'a:19:{s:4:"@4|1";i:1100;s:4:"@3|9";i:1101;s:4:"@3|1";i:1102;s:4:"@3|7";i:1103;s:4:"@3|2";i:1104;s:4:"@3|3";i:1105;s:4:"@4|6";i:1106;s:4:"@4|7";i:1107;s:4:"@3|0";i:1108;s:4:"@3|4";i:1109;s:4:"@4|4";i:1110;s:4:"@3|8";i:1111;s:4:"@4|2";i:1112;s:4:"@3|5";i:1114;s:4:"@3|6";i:1115;s:4:"@4|8";i:1116;s:4:"@4|5";i:1117;s:4:"@4|3";i:1118;s:4:"@4|0";i:1119;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>1113, +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/.* Safari/.*$@'=>1120, +'@^Mozilla/5\.0 $compatible; MSIE 10\.0.*; .*Windows.*Trident/6\.0; Xbox; Xbox One.*$@'=>1121, +'@^Mozilla/5\.0 \(.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>1122, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*; rv\:(\d)(\d).*$ Gecko/.* Firefox/(\d)(\d).*anonymized by .*$@'=>'a:34:{s:10:"@1|3|1|3|1";i:1123;s:10:"@0|3|2|3|2";i:1124;s:10:"@0|4|1|4|1";i:1125;s:10:"@1|4|1|4|1";i:1126;s:10:"@1|4|5|4|5";i:1127;s:10:"@0|4|5|4|5";i:1128;s:10:"@0|3|1|3|1";i:1129;s:10:"@1|3|2|3|2";i:1130;s:10:"@0|4|3|4|3";i:1131;s:10:"@0|3|4|3|4";i:1132;s:10:"@1|3|5|3|5";i:1133;s:10:"@1|3|4|3|4";i:1134;s:10:"@1|3|9|3|9";i:1135;s:10:"@1|3|0|3|0";i:1136;s:10:"@0|3|5|3|5";i:1137;s:10:"@0|3|7|3|7";i:1138;s:10:"@0|3|6|3|6";i:1139;s:10:"@1|3|6|3|6";i:1140;s:10:"@1|4|2|4|2";i:1141;s:10:"@1|3|7|3|7";i:1142;s:10:"@1|3|8|3|8";i:1143;s:10:"@0|3|9|3|9";i:1144;s:10:"@1|4|6|4|6";i:1145;s:10:"@0|3|0|3|0";i:1146;s:10:"@1|4|3|4|3";i:1147;s:10:"@0|3|8|3|8";i:1148;s:10:"@0|4|2|4|2";i:1149;s:10:"@0|4|0|4|0";i:1150;s:10:"@0|4|6|4|6";i:1151;s:10:"@1|3|3|3|3";i:1152;s:10:"@0|3|3|3|3";i:1153;s:10:"@1|4|4|4|4";i:1154;s:10:"@1|4|0|4|0";i:1155;s:10:"@0|4|4|4|4";i:1156;}', +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$ Sabayon Chrome/.*$@'=>1157, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>1158, +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/(\d)\.(\d).*$@'=>'a:8:{s:4:"@6|1";i:1159;s:4:"@6|2";i:1161;s:4:"@6|0";i:1162;s:4:"@8|0";i:1163;s:4:"@7|0";i:1164;s:4:"@7|1";i:1165;s:4:"@8|1";i:1166;s:4:"@9|0";i:1167;}', +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/.*Safari/.*$@'=>1160, +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>'a:5:{s:2:"@0";i:1168;s:2:"@4";i:1169;s:2:"@3";i:1170;s:2:"@1";i:1171;s:2:"@2";i:1172;}', +'@^Mozilla/5\.0 $.*Android.*Mobile.*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>1173, +'@^Mozilla/5\.0 $.*Android.*Tablet.*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>1174, +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*$@'=>'a:19:{s:4:"@4|6";i:1175;s:4:"@4|8";i:1176;s:4:"@4|5";i:1178;s:4:"@4|7";i:1181;s:4:"@3|0";i:1182;s:4:"@3|8";i:1183;s:4:"@3|3";i:1184;s:4:"@4|3";i:1185;s:4:"@3|9";i:1186;s:4:"@3|1";i:1187;s:4:"@4|1";i:1188;s:4:"@4|2";i:1189;s:4:"@4|0";i:1190;s:4:"@3|7";i:1191;s:4:"@3|4";i:1192;s:4:"@3|2";i:1193;s:4:"@3|5";i:1194;s:4:"@4|4";i:1195;s:4:"@3|6";i:1196;}', +'@^Mozilla/5\.0 $compatible; MSIE 9\.0.*; .*Windows NT 6\.(\d).*Trident/5\.0; Xbox.*$@'=>'a:3:{s:2:"@2";i:1177;s:2:"@0";i:1179;s:2:"@1";i:1180;}', +'@^Mozilla/5\.0 \(.*Windows NT 6\.0.*; rv\:(\d)(\d).*$ Gecko/.* Firefox anonymized by .*$@'=>'a:17:{s:4:"@4|3";i:1197;s:4:"@4|6";i:1198;s:4:"@3|1";i:1199;s:4:"@3|7";i:1200;s:4:"@3|6";i:1201;s:4:"@3|8";i:1202;s:4:"@4|1";i:1203;s:4:"@3|4";i:1204;s:4:"@3|0";i:1205;s:4:"@4|4";i:1206;s:4:"@4|0";i:1207;s:4:"@3|3";i:1208;s:4:"@3|5";i:1209;s:4:"@3|9";i:1210;s:4:"@4|5";i:1211;s:4:"@4|2";i:1212;s:4:"@3|2";i:1213;}', +'@^Mozilla/5\.0 $.*Windows.*$ AppleWebKit/.* $KHTML, like Gecko$ Chrome/(\d)(\d)\..*$@'=>'a:19:{s:4:"@4|8";i:1214;s:4:"@3|0";i:1215;s:4:"@4|4";i:1216;s:4:"@4|2";i:1217;s:4:"@3|8";i:1218;s:4:"@3|7";i:1219;s:4:"@3|9";i:1220;s:4:"@3|1";i:1221;s:4:"@3|2";i:1222;s:4:"@4|5";i:1223;s:4:"@4|3";i:1224;s:4:"@4|0";i:1225;s:4:"@4|7";i:1226;s:4:"@4|1";i:1227;s:4:"@3|5";i:1228;s:4:"@3|3";i:1229;s:4:"@4|6";i:1230;s:4:"@3|4";i:1231;s:4:"@3|6";i:1232;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$ .*Version/.*$@'=>1233, +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows NT 6\.(\d).*Trident/6\.0.*Xbox; Xbox One.*$.*$@'=>'a:2:{s:2:"@3";i:1234;s:2:"@2";i:1235;}', +'@^Mozilla/5\.0 $compatible; MSIE 10\.0; .*Windows NT 10\.0.*Trident/7\.0.*$.*$@'=>1236, +'@^Mozilla/5\.0 $.*Linux.*$ AppleWebKit/.* $KHTML,.*like Gecko$ Chrome/(\d)(\d)\..*$@'=>'a:19:{s:4:"@3|7";i:1237;s:4:"@4|2";i:1238;s:4:"@4|4";i:1239;s:4:"@3|4";i:1240;s:4:"@3|6";i:1241;s:4:"@3|5";i:1242;s:4:"@3|2";i:1243;s:4:"@4|5";i:1244;s:4:"@4|3";i:1245;s:4:"@3|3";i:1246;s:4:"@4|8";i:1247;s:4:"@4|0";i:1248;s:4:"@4|7";i:1249;s:4:"@3|8";i:1250;s:4:"@4|6";i:1251;s:4:"@3|9";i:1252;s:4:"@4|1";i:1253;s:4:"@3|0";i:1254;s:4:"@3|1";i:1255;}', +'@^Mozilla/5\.0 $compatible; MSIE 10\.0; .*Windows NT 6\.(\d).*Trident/7\.0.*$.*$@'=>'a:5:{s:2:"@3";i:1256;s:2:"@1";i:1257;s:2:"@4";i:1259;s:2:"@2";i:1260;s:2:"@0";i:1264;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0; .*Windows NT 10\.0.*Trident/7\.0.*$.*$@'=>'a:5:{s:4:"@5|7";i:1258;s:4:"@5|8";i:1261;s:4:"@4|7";i:1262;s:4:"@5|9";i:1263;s:4:"@4|8";i:1265;}', +'@^Mozilla/5\.0 $compatible; MSIE 10\.0.*; .*Windows NT 10\.0.*Trident/8\.0.*$@'=>1266, +'@^Mozilla/5\.0 \(.*Mac OS X.*$ AppleWebKit/.* $KHTML, like Gecko$.*Safari.*$@'=>1267, +'@^Mozilla/5\.0 $.*Windows.*; rv\:(\d)(\d).*$ Gecko/.* Firefox/(\d)(\d).*anonymized by .*$@'=>'a:17:{s:8:"@3|6|3|6";i:1268;s:8:"@4|5|4|5";i:1269;s:8:"@3|5|3|5";i:1270;s:8:"@3|1|3|1";i:1271;s:8:"@4|6|4|6";i:1272;s:8:"@4|3|4|3";i:1273;s:8:"@3|2|3|2";i:1274;s:8:"@3|0|3|0";i:1275;s:8:"@3|8|3|8";i:1276;s:8:"@4|1|4|1";i:1277;s:8:"@3|3|3|3";i:1278;s:8:"@4|4|4|4";i:1279;s:8:"@3|9|3|9";i:1280;s:8:"@4|0|4|0";i:1281;s:8:"@3|4|3|4";i:1282;s:8:"@4|2|4|2";i:1283;s:8:"@3|7|3|7";i:1284;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0; .*Windows NT 6\.(\d).*Trident/(\d)\.0.*$.*$@'=>'a:37:{s:8:"@5|9|2|7";i:1285;s:8:"@5|9|3|7";i:1286;s:8:"@4|7|0|5";i:1287;s:8:"@5|9|1|7";i:1288;s:8:"@5|7|0|7";i:1289;s:8:"@5|9|0|7";i:1290;s:8:"@4|7|4|7";i:1291;s:8:"@4|7|3|7";i:1292;s:8:"@5|8|4|7";i:1294;s:8:"@4|7|2|7";i:1295;s:8:"@4|7|0|7";i:1296;s:8:"@5|8|1|7";i:1299;s:8:"@4|7|1|5";i:1300;s:8:"@5|8|2|7";i:1301;s:8:"@5|8|3|7";i:1302;s:8:"@5|9|4|7";i:1303;s:8:"@5|7|1|7";i:1304;s:8:"@4|8|0|7";i:1305;s:8:"@5|8|0|7";i:1306;s:8:"@4|8|4|7";i:1307;s:8:"@4|7|1|7";i:1308;s:8:"@4|8|2|5";i:1309;s:8:"@4|8|1|7";i:1310;s:8:"@4|8|2|7";i:1311;s:8:"@5|8|2|5";i:1312;s:8:"@5|8|1|5";i:1313;s:8:"@5|8|0|5";i:1314;s:8:"@5|7|4|7";i:1315;s:8:"@4|8|3|7";i:1316;s:8:"@5|7|0|5";i:1317;s:8:"@4|8|1|5";i:1318;s:8:"@4|7|2|5";i:1319;s:8:"@5|7|2|7";i:1320;s:8:"@5|7|1|5";i:1321;s:8:"@4|8|0|5";i:1322;s:8:"@5|7|2|5";i:1323;s:8:"@5|7|3|7";i:1324;}', +'@^Mozilla/5\.0 $compatible; MSIE 10\.0.*; .*Windows NT 6\.(\d).*Trident/8\.0.*$@'=>'a:3:{s:2:"@2";i:1293;s:2:"@3";i:1297;s:2:"@4";i:1298;}', +'@^Mozilla/5\.0 \(.*Mac OS X.*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>1325, +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0.*; .*Windows NT 6\.(\d).*Trident/(\d)\.0.*$@'=>'a:12:{s:8:"@5|8|1|4";i:1326;s:8:"@4|8|0|4";i:1327;s:8:"@4|8|2|4";i:1328;s:8:"@5|8|0|4";i:1329;s:8:"@4|8|1|4";i:1330;s:8:"@5|9|1|5";i:1331;s:8:"@4|9|2|5";i:1332;s:8:"@5|9|0|5";i:1333;s:8:"@4|9|1|5";i:1334;s:8:"@4|9|0|5";i:1335;s:8:"@5|9|2|5";i:1336;s:8:"@5|8|2|4";i:1337;}', +'@^Mozilla/(\d)\.0 \(compatible; MSIE 7\.0; .*Windows NT 6\.(\d).*Trident/4\.0.*$@'=>'a:6:{s:4:"@5|1";i:1338;s:4:"@5|2";i:1339;s:4:"@5|0";i:1340;s:4:"@4|2";i:1341;s:4:"@4|0";i:1342;s:4:"@4|1";i:1343;}', +'@^Mozilla/5\.0 \(compatible; MSIE 9\.0.*; .*Windows.*Trident/5\.0; Xbox.*$@'=>1344, +'@^Mozilla/5\.0 \(.*Windows.*; rv\:(\d)(\d).*$ Gecko/.* Firefox anonymized by .*$@'=>'a:17:{s:4:"@3|8";i:1345;s:4:"@3|0";i:1346;s:4:"@4|0";i:1347;s:4:"@3|3";i:1348;s:4:"@3|9";i:1349;s:4:"@3|5";i:1350;s:4:"@4|4";i:1351;s:4:"@3|6";i:1352;s:4:"@4|6";i:1353;s:4:"@4|3";i:1354;s:4:"@4|5";i:1355;s:4:"@4|2";i:1356;s:4:"@3|2";i:1357;s:4:"@3|1";i:1358;s:4:"@4|1";i:1359;s:4:"@3|7";i:1360;s:4:"@3|4";i:1361;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\..*Windows NT 6\.(\d).*Trident/6\.0.*$.*$@'=>'a:20:{s:6:"@4|7|0";i:1362;s:6:"@4|7|1";i:1363;s:6:"@5|9|1";i:1364;s:6:"@5|8|3";i:1365;s:6:"@5|8|0";i:1366;s:6:"@5|8|1";i:1367;s:6:"@5|9|2";i:1368;s:6:"@4|7|2";i:1369;s:6:"@5|7|0";i:1370;s:6:"@4|8|0";i:1371;s:6:"@4|8|1";i:1372;s:6:"@4|8|2";i:1373;s:6:"@4|7|3";i:1374;s:6:"@5|7|2";i:1375;s:6:"@5|9|0";i:1376;s:6:"@5|8|2";i:1377;s:6:"@5|9|3";i:1378;s:6:"@4|8|3";i:1379;s:6:"@5|7|1";i:1380;s:6:"@5|7|3";i:1381;}', +'@^Mozilla/5\.0 $.*Linux.*$.*Gecko/.*Firefox/ anonymized by Abelssoft.*$@'=>1382, +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows.*Trident/6\.0.*Xbox; Xbox One.*$.*$@'=>1383, +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows NT 10\.0.*Trident/6\.0.*Touch.*$.*$@'=>1384, +'@^Mozilla/5\.0 $compatible; MSIE 10\.0; .*Windows.*Trident/7\.0.*$.*$@'=>1385, +'@^Mozilla/5\.0 $.*Windows.*$ Gecko/.* Firefox/(\d)(\d)\.0.* Anonymisiert.*$@'=>'a:17:{s:4:"@3|2";i:1386;s:4:"@3|0";i:1387;s:4:"@4|5";i:1388;s:4:"@3|6";i:1389;s:4:"@4|4";i:1390;s:4:"@3|8";i:1391;s:4:"@4|2";i:1392;s:4:"@4|1";i:1393;s:4:"@3|3";i:1394;s:4:"@3|7";i:1395;s:4:"@4|0";i:1396;s:4:"@3|4";i:1397;s:4:"@3|5";i:1398;s:4:"@4|3";i:1399;s:4:"@4|6";i:1400;s:4:"@3|9";i:1401;s:4:"@3|1";i:1402;}', +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows NT 6\.(\d).*Trident/6\.0.*Touch.*$.*$@'=>'a:3:{s:2:"@2";i:1403;s:2:"@4";i:1404;s:2:"@3";i:1405;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0; .*Windows.*Trident/(\d)\.0.*$.*$@'=>'a:9:{s:6:"@4|7|5";i:1406;s:6:"@4|7|7";i:1407;s:6:"@5|9|7";i:1408;s:6:"@4|8|5";i:1409;s:6:"@5|8|5";i:1410;s:6:"@5|7|7";i:1411;s:6:"@5|8|7";i:1412;s:6:"@4|8|7";i:1413;s:6:"@5|7|5";i:1414;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*Trident/7\.0.*Touch.*rv\:11\.0.*$.*$@'=>1415, +'@^Mozilla/5\.0; TOB.* $.*Windows NT 10\.0.*Trident/7\.0.*rv\:11\.0.*$.*$@'=>1416, +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0.*; .*Windows.*Trident/(\d)\.0.*$@'=>'a:4:{s:6:"@5|8|4";i:1417;s:6:"@4|8|4";i:1418;s:6:"@5|9|5";i:1419;s:6:"@4|9|5";i:1420;}', +'@^Mozilla/5\.0 \(.*Windows NT 6\.(\d).*Trident/7\.0.*Touch.*rv\:11\.0.*$.*$@'=>'a:3:{s:2:"@2";i:1421;s:2:"@3";i:1424;s:2:"@4";i:1425;}', +'@^Mozilla/5\.0; TOB.* $.*Windows NT 6\.(\d).*Trident/7\.0.*rv\:11\.0.*$.*$@'=>'a:5:{s:2:"@2";i:1422;s:2:"@1";i:1423;s:2:"@3";i:1426;s:2:"@0";i:1427;s:2:"@4";i:1428;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE 7\.0; .*Windows.*Trident/4\.0.*$@'=>'a:2:{s:2:"@4";i:1429;s:2:"@5";i:1430;}', +'@^Mozilla/5\.0 \(masking\-agent; rv\:.*$ Gecko/.* Firefox/(\d)(\d)\.0.*$@'=>'a:17:{s:4:"@3|5";i:1431;s:4:"@4|1";i:1432;s:4:"@4|5";i:1433;s:4:"@3|7";i:1434;s:4:"@4|2";i:1435;s:4:"@3|3";i:1436;s:4:"@3|1";i:1437;s:4:"@3|4";i:1438;s:4:"@3|6";i:1439;s:4:"@4|0";i:1440;s:4:"@3|9";i:1441;s:4:"@4|6";i:1442;s:4:"@3|2";i:1443;s:4:"@3|0";i:1444;s:4:"@3|8";i:1445;s:4:"@4|3";i:1446;s:4:"@4|4";i:1447;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\..*Windows.*Trident/6\.0.*$.*$@'=>'a:5:{s:4:"@5|8";i:1448;s:4:"@4|8";i:1449;s:4:"@4|7";i:1450;s:4:"@5|7";i:1451;s:4:"@5|9";i:1452;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*rv\:4(\d)\.0.*$ Gecko.* Firefox.*$@'=>'a:6:{s:2:"@4";i:1453;s:2:"@5";i:1454;s:2:"@3";i:1455;s:2:"@6";i:1456;s:2:"@1";i:1457;s:2:"@2";i:1458;}', +'@^Mozilla/(\d)\.0 $.*MSIE 9\.0.*; .*Windows NT 6\.(\d).*Trident/5\.0.*$.*$@'=>'a:6:{s:4:"@4|0";i:1459;s:4:"@5|1";i:1460;s:4:"@5|2";i:1461;s:4:"@4|1";i:1462;s:4:"@4|2";i:1463;s:4:"@5|0";i:1464;}', +'@^Mozilla/5\.0 $Windows 95; Anonymisiert.*; Trident/7\.0.*$.*$@'=>1465, +'@^Mozilla/5\.0 $.*Windows NT 6\.4.*rv\:4(\d)\.0.*$ Gecko.* Firefox.*$@'=>'a:6:{s:2:"@2";i:1466;s:2:"@3";i:1467;s:2:"@6";i:1468;s:2:"@4";i:1469;s:2:"@1";i:1470;s:2:"@5";i:1471;}', +'@^Mozilla/5\.0 $iPhone.*CPU like Mac OS X.*$.*AppleWebKit/.*$@'=>1472, +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows NT 6\.(\d).*Trident/6\.0.*$.*$@'=>'a:4:{s:2:"@2";i:1473;s:2:"@1";i:1474;s:2:"@0";i:1475;s:2:"@3";i:1476;}', +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0.*; .*Windows NT 6\.(\d).*$@'=>'a:18:{s:6:"@5|8|0";i:1477;s:6:"@4|8|1";i:1478;s:6:"@4|8|0";i:1479;s:6:"@5|8|1";i:1480;s:6:"@4|8|2";i:1481;s:6:"@4|6|2";i:1482;s:6:"@4|6|1";i:1483;s:6:"@5|6|0";i:1484;s:6:"@5|6|1";i:1485;s:6:"@5|6|2";i:1486;s:6:"@5|7|2";i:1487;s:6:"@5|7|1";i:1488;s:6:"@4|7|0";i:1489;s:6:"@4|7|1";i:1490;s:6:"@4|7|2";i:1491;s:6:"@5|7|0";i:1492;s:6:"@5|8|2";i:1493;s:6:"@4|6|0";i:1494;}', +'@^Mozilla/(\d)\.0 \(.*Windows NT 10\.0.*$ Gecko.* Firefox/(\d)(\d)\.0.*$@'=>'a:34:{s:6:"@5|3|3";i:1495;s:6:"@5|4|0";i:1496;s:6:"@4|4|6";i:1497;s:6:"@4|3|9";i:1498;s:6:"@5|3|2";i:1499;s:6:"@4|3|1";i:1500;s:6:"@5|4|5";i:1501;s:6:"@5|3|5";i:1502;s:6:"@4|4|3";i:1503;s:6:"@5|4|4";i:1504;s:6:"@5|3|7";i:1505;s:6:"@4|4|5";i:1506;s:6:"@5|3|9";i:1507;s:6:"@4|4|2";i:1508;s:6:"@5|3|6";i:1509;s:6:"@4|3|3";i:1510;s:6:"@5|4|6";i:1511;s:6:"@5|4|2";i:1512;s:6:"@4|3|6";i:1513;s:6:"@4|4|0";i:1514;s:6:"@5|3|1";i:1515;s:6:"@4|3|4";i:1516;s:6:"@5|3|0";i:1517;s:6:"@4|3|5";i:1518;s:6:"@4|4|1";i:1519;s:6:"@4|3|2";i:1520;s:6:"@5|3|8";i:1521;s:6:"@4|3|0";i:1522;s:6:"@5|4|3";i:1523;s:6:"@5|3|4";i:1524;s:6:"@4|3|7";i:1525;s:6:"@4|3|8";i:1526;s:6:"@5|4|1";i:1527;s:6:"@4|4|4";i:1528;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*Trident/(\d)\.0.*rv\:1(\d)\.0.*$.*$@'=>'a:2:{s:4:"@8|2";i:1529;s:4:"@7|1";i:1530;}', +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows.*Trident/6\.0.*Touch.*$.*$@'=>1531, +'@^Mozilla/5\.0 $masking\-agent; rv\:.*$ Gecko/.* Firefox/.*$@'=>1532, +'@^Mozilla/(\d)\.0 $.*Windows NT 6\.(\d).*$ Gecko.* Firefox/(\d)(\d)\.0.*$@'=>'a:170:{s:8:"@4|4|4|1";i:1533;s:8:"@4|0|3|1";i:1534;s:8:"@4|2|3|1";i:1535;s:8:"@4|4|3|1";i:1536;s:8:"@4|3|3|1";i:1537;s:8:"@4|4|3|7";i:1538;s:8:"@4|3|3|8";i:1539;s:8:"@4|1|3|1";i:1540;s:8:"@5|3|3|1";i:1541;s:8:"@4|4|3|8";i:1542;s:8:"@4|0|4|1";i:1543;s:8:"@5|0|4|1";i:1544;s:8:"@5|4|4|1";i:1545;s:8:"@5|3|4|1";i:1546;s:8:"@5|1|4|1";i:1547;s:8:"@4|3|3|7";i:1548;s:8:"@4|1|4|1";i:1549;s:8:"@5|2|4|1";i:1550;s:8:"@4|3|4|1";i:1551;s:8:"@5|2|3|1";i:1552;s:8:"@4|2|3|7";i:1553;s:8:"@4|2|4|1";i:1554;s:8:"@5|4|3|1";i:1555;s:8:"@4|0|4|2";i:1556;s:8:"@4|1|3|0";i:1557;s:8:"@4|0|4|3";i:1558;s:8:"@4|2|3|0";i:1559;s:8:"@4|1|4|3";i:1560;s:8:"@4|2|4|3";i:1561;s:8:"@4|0|3|0";i:1562;s:8:"@4|4|4|3";i:1563;s:8:"@4|3|4|3";i:1564;s:8:"@4|3|3|0";i:1565;s:8:"@4|4|3|0";i:1566;s:8:"@5|2|4|3";i:1567;s:8:"@5|1|4|3";i:1568;s:8:"@5|0|4|3";i:1569;s:8:"@5|3|4|3";i:1570;s:8:"@5|0|3|7";i:1571;s:8:"@5|1|3|7";i:1572;s:8:"@5|4|4|3";i:1573;s:8:"@5|4|3|0";i:1574;s:8:"@5|3|3|0";i:1575;s:8:"@4|1|4|2";i:1576;s:8:"@5|1|3|1";i:1577;s:8:"@5|4|4|2";i:1578;s:8:"@4|2|4|2";i:1579;s:8:"@4|3|4|2";i:1580;s:8:"@4|0|3|7";i:1581;s:8:"@5|0|3|0";i:1582;s:8:"@4|4|4|2";i:1583;s:8:"@5|3|4|2";i:1584;s:8:"@5|2|4|2";i:1585;s:8:"@5|2|3|7";i:1586;s:8:"@5|1|3|0";i:1587;s:8:"@5|2|3|0";i:1588;s:8:"@5|3|3|7";i:1589;s:8:"@5|0|4|2";i:1590;s:8:"@5|1|4|2";i:1591;s:8:"@5|4|3|7";i:1592;s:8:"@4|1|3|7";i:1593;s:8:"@5|2|4|0";i:1594;s:8:"@5|0|3|8";i:1595;s:8:"@5|3|3|5";i:1596;s:8:"@4|0|3|3";i:1597;s:8:"@5|4|3|5";i:1598;s:8:"@5|4|3|3";i:1599;s:8:"@5|1|3|3";i:1600;s:8:"@5|2|3|3";i:1601;s:8:"@5|3|3|3";i:1602;s:8:"@4|1|3|3";i:1603;s:8:"@4|2|3|3";i:1604;s:8:"@4|4|3|9";i:1605;s:8:"@4|4|3|6";i:1606;s:8:"@4|3|3|6";i:1607;s:8:"@5|0|3|5";i:1608;s:8:"@5|1|3|5";i:1609;s:8:"@4|3|3|3";i:1610;s:8:"@4|4|3|3";i:1611;s:8:"@5|2|3|5";i:1612;s:8:"@5|0|3|3";i:1613;s:8:"@4|0|3|5";i:1614;s:8:"@5|0|3|4";i:1615;s:8:"@4|4|3|5";i:1616;s:8:"@5|2|3|8";i:1617;s:8:"@5|3|3|8";i:1618;s:8:"@5|4|3|8";i:1619;s:8:"@5|3|3|4";i:1620;s:8:"@5|2|3|4";i:1621;s:8:"@5|1|3|4";i:1622;s:8:"@4|3|3|5";i:1623;s:8:"@4|2|3|5";i:1624;s:8:"@4|2|3|4";i:1625;s:8:"@4|3|3|4";i:1626;s:8:"@4|4|3|4";i:1627;s:8:"@4|1|3|4";i:1628;s:8:"@4|0|3|4";i:1629;s:8:"@4|1|3|5";i:1630;s:8:"@5|1|3|8";i:1631;s:8:"@5|4|3|4";i:1632;s:8:"@4|3|3|9";i:1633;s:8:"@4|2|3|9";i:1634;s:8:"@4|1|3|2";i:1635;s:8:"@4|2|3|2";i:1636;s:8:"@5|4|4|0";i:1637;s:8:"@4|0|3|2";i:1638;s:8:"@5|4|3|2";i:1639;s:8:"@4|1|4|0";i:1640;s:8:"@4|0|4|0";i:1641;s:8:"@5|3|3|2";i:1642;s:8:"@5|2|3|6";i:1643;s:8:"@5|3|4|0";i:1644;s:8:"@4|3|3|2";i:1645;s:8:"@4|4|3|2";i:1646;s:8:"@4|2|3|8";i:1647;s:8:"@5|0|3|6";i:1648;s:8:"@5|1|3|6";i:1649;s:8:"@4|0|3|8";i:1650;s:8:"@5|1|4|0";i:1651;s:8:"@5|0|4|0";i:1652;s:8:"@4|2|4|0";i:1653;s:8:"@4|3|4|0";i:1654;s:8:"@4|0|3|6";i:1655;s:8:"@5|4|3|6";i:1656;s:8:"@5|3|3|9";i:1657;s:8:"@5|4|3|9";i:1658;s:8:"@4|1|3|6";i:1659;s:8:"@4|1|3|9";i:1660;s:8:"@4|0|3|9";i:1661;s:8:"@4|2|3|6";i:1662;s:8:"@5|2|3|9";i:1663;s:8:"@5|1|3|9";i:1664;s:8:"@5|1|3|2";i:1665;s:8:"@5|2|3|2";i:1666;s:8:"@4|4|4|0";i:1667;s:8:"@5|0|3|2";i:1668;s:8:"@4|1|3|8";i:1669;s:8:"@5|0|3|9";i:1670;s:8:"@5|3|3|6";i:1671;s:8:"@5|0|3|1";i:1672;s:8:"@4|3|4|4";i:1673;s:8:"@5|0|4|4";i:1674;s:8:"@5|1|4|4";i:1675;s:8:"@4|1|4|6";i:1676;s:8:"@4|2|4|6";i:1677;s:8:"@4|3|4|6";i:1678;s:8:"@5|2|4|4";i:1679;s:8:"@5|4|4|4";i:1680;s:8:"@4|0|4|4";i:1681;s:8:"@5|3|4|6";i:1682;s:8:"@5|4|4|6";i:1683;s:8:"@4|0|4|6";i:1684;s:8:"@4|4|4|6";i:1685;s:8:"@5|0|4|5";i:1686;s:8:"@4|2|4|5";i:1687;s:8:"@4|3|4|5";i:1689;s:8:"@4|4|4|5";i:1690;s:8:"@4|1|4|5";i:1691;s:8:"@4|0|4|5";i:1692;s:8:"@5|1|4|5";i:1693;s:8:"@5|2|4|5";i:1694;s:8:"@5|3|4|5";i:1695;s:8:"@5|4|4|5";i:1696;s:8:"@4|1|4|4";i:1697;s:8:"@5|3|4|4";i:1698;s:8:"@4|2|4|4";i:1699;s:8:"@5|0|4|6";i:1700;s:8:"@5|1|4|6";i:1701;s:8:"@4|4|4|4";i:1702;s:8:"@5|2|4|6";i:1703;}', +'@^Mozilla/5\.0 $iPod.*CPU like Mac OS X.*$.*AppleWebKit/.*$@'=>1688, +'@^Mozilla/5\.0 $.*Android.*Tablet.*$ Gecko/.* Firefox/(\d)(\d)\..*$@'=>'a:17:{s:4:"@4|2";i:1704;s:4:"@3|1";i:1708;s:4:"@3|5";i:1714;s:4:"@3|7";i:1718;s:4:"@3|8";i:1719;s:4:"@4|6";i:1720;s:4:"@3|3";i:1722;s:4:"@4|0";i:1724;s:4:"@3|4";i:1725;s:4:"@3|9";i:1728;s:4:"@3|2";i:1730;s:4:"@3|6";i:1734;s:4:"@4|1";i:1736;s:4:"@4|3";i:1737;s:4:"@3|0";i:1738;s:4:"@4|5";i:1741;s:4:"@4|4";i:1745;}', +'@^Mozilla/5\.0 $.*Android.*Mobile.*$ Gecko/.* Firefox/(\d)(\d)\..*$@'=>'a:17:{s:4:"@4|2";i:1705;s:4:"@3|1";i:1706;s:4:"@3|7";i:1707;s:4:"@3|8";i:1709;s:4:"@3|0";i:1710;s:4:"@3|5";i:1713;s:4:"@3|3";i:1721;s:4:"@4|0";i:1726;s:4:"@3|9";i:1727;s:4:"@4|6";i:1729;s:4:"@4|1";i:1732;s:4:"@3|6";i:1733;s:4:"@3|2";i:1735;s:4:"@4|3";i:1739;s:4:"@4|5";i:1740;s:4:"@3|4";i:1743;s:4:"@4|4";i:1744;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*Trident/(\d)\.0.*rv\:1(\d)\.0.*$.*$@'=>'a:6:{s:6:"@3|7|1";i:1711;s:6:"@0|7|1";i:1712;s:6:"@1|7|1";i:1715;s:6:"@2|7|1";i:1716;s:6:"@4|7|1";i:1717;s:6:"@4|8|2";i:1731;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*rv\:.*$ Gecko.* Firefox.*$@'=>1723, +'@^Mozilla/5\.0.*$iPad.*CPU like Mac OS X.*$.*AppleWebKit/.*$@'=>1742, +'@^Mozilla/5\.0 $.*Windows NT 6\.4.*rv\:.*$ Gecko.* Firefox.*$@'=>1746, +'@^Mozilla/5\.0; TOB.* $.*Windows.*Trident/7\.0.*rv\:11\.0.*$.*$@'=>1747, +'@^Mozilla/5\.0 $.*Windows.*Trident/7\.0.*Touch.*rv\:11\.0.*$.*$@'=>1748, +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*rv\:(\d)(\d)\.0.*$ Gecko/.*/$@'=>'a:17:{s:4:"@4|4";i:1749;s:4:"@3|6";i:1750;s:4:"@4|6";i:1751;s:4:"@4|2";i:1752;s:4:"@3|8";i:1753;s:4:"@3|0";i:1754;s:4:"@3|7";i:1755;s:4:"@3|2";i:1756;s:4:"@4|3";i:1757;s:4:"@3|5";i:1758;s:4:"@3|9";i:1759;s:4:"@3|4";i:1760;s:4:"@4|5";i:1761;s:4:"@3|3";i:1762;s:4:"@4|1";i:1763;s:4:"@4|0";i:1764;s:4:"@3|1";i:1765;}', +'@^Mozilla/5\.0 $.*Windows NT 10\.0.*$.*Gecko/.*Firefox/.*$@'=>1766, +'@^Mozilla/(\d)\.0 $.*MSIE 9\.0.*; .*Windows.*Trident/5\.0.*$.*$@'=>'a:2:{s:2:"@4";i:1767;s:2:"@5";i:1768;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*rv\:(\d)(\d)\.0.*$ Gecko/.*/$@'=>'a:85:{s:6:"@4|3|4";i:1769;s:6:"@4|4|1";i:1770;s:6:"@3|3|9";i:1771;s:6:"@3|3|2";i:1772;s:6:"@2|3|7";i:1773;s:6:"@4|3|2";i:1774;s:6:"@0|3|7";i:1775;s:6:"@3|3|7";i:1776;s:6:"@1|3|7";i:1777;s:6:"@4|3|1";i:1778;s:6:"@2|3|2";i:1779;s:6:"@4|3|9";i:1780;s:6:"@0|4|4";i:1781;s:6:"@3|3|6";i:1782;s:6:"@4|4|0";i:1783;s:6:"@3|4|0";i:1784;s:6:"@2|4|0";i:1785;s:6:"@1|4|0";i:1786;s:6:"@0|3|1";i:1787;s:6:"@3|3|1";i:1788;s:6:"@1|3|1";i:1789;s:6:"@2|3|1";i:1790;s:6:"@2|3|4";i:1791;s:6:"@3|3|4";i:1792;s:6:"@0|4|0";i:1793;s:6:"@0|3|6";i:1794;s:6:"@2|3|6";i:1795;s:6:"@3|3|3";i:1796;s:6:"@4|3|7";i:1797;s:6:"@4|3|6";i:1798;s:6:"@2|3|3";i:1799;s:6:"@1|3|3";i:1800;s:6:"@1|3|6";i:1801;s:6:"@0|3|3";i:1802;s:6:"@3|4|1";i:1803;s:6:"@4|3|3";i:1804;s:6:"@0|4|1";i:1805;s:6:"@0|4|2";i:1806;s:6:"@1|4|2";i:1807;s:6:"@3|4|4";i:1808;s:6:"@2|4|4";i:1809;s:6:"@1|3|9";i:1810;s:6:"@2|4|2";i:1811;s:6:"@3|4|2";i:1812;s:6:"@2|4|1";i:1813;s:6:"@4|4|3";i:1814;s:6:"@0|3|2";i:1815;s:6:"@4|4|4";i:1816;s:6:"@4|4|2";i:1817;s:6:"@1|4|4";i:1818;s:6:"@0|3|9";i:1819;s:6:"@1|3|4";i:1820;s:6:"@3|4|5";i:1821;s:6:"@0|4|5";i:1822;s:6:"@1|4|5";i:1823;s:6:"@2|4|5";i:1824;s:6:"@4|4|5";i:1825;s:6:"@4|3|5";i:1826;s:6:"@0|3|5";i:1827;s:6:"@1|3|5";i:1828;s:6:"@2|3|5";i:1829;s:6:"@3|3|5";i:1830;s:6:"@3|4|3";i:1831;s:6:"@0|3|4";i:1832;s:6:"@1|4|6";i:1833;s:6:"@2|3|0";i:1834;s:6:"@2|4|3";i:1835;s:6:"@3|4|6";i:1836;s:6:"@4|4|6";i:1837;s:6:"@0|4|6";i:1838;s:6:"@1|3|0";i:1839;s:6:"@0|3|8";i:1840;s:6:"@1|4|1";i:1841;s:6:"@1|3|8";i:1842;s:6:"@2|3|8";i:1843;s:6:"@0|3|0";i:1844;s:6:"@3|3|0";i:1845;s:6:"@2|4|6";i:1846;s:6:"@1|3|2";i:1847;s:6:"@4|3|0";i:1848;s:6:"@3|3|8";i:1849;s:6:"@2|3|9";i:1850;s:6:"@1|4|3";i:1851;s:6:"@0|4|3";i:1852;s:6:"@4|3|8";i:1853;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$.*Gecko/.*Firefox/.*$@'=>'a:5:{s:2:"@4";i:1854;s:2:"@3";i:1855;s:2:"@0";i:1856;s:2:"@1";i:1857;s:2:"@2";i:1858;}', +'@^Mozilla/5\.0.*$.*CPU like Mac OS X.*$.*AppleWebKit/.*$@'=>1859, +'@^Mozilla/5\.0 $.*Android.*Mobile.*$.*Gecko/.*Firefox/.*$@'=>1860, +'@^Mozilla/5\.0 $.*Android.*Tablet.*$.*Gecko/.*Firefox/.*$@'=>1861, +'@^Mozilla/5\.0 $.*MSIE 10\.0.*Windows.*Trident/6\.0.*$.*$@'=>1862, +'@^Mozilla/(\d)\.0 $compatible; MSIE (\d)\.0.*; .*Windows.*$@'=>'a:6:{s:4:"@4|6";i:1863;s:4:"@5|7";i:1864;s:4:"@4|7";i:1865;s:4:"@4|8";i:1866;s:4:"@5|8";i:1867;s:4:"@5|6";i:1868;}', +'@^Mozilla/5\.0 \(.*Windows NT 10\.0.*$ Gecko/.*/(\d)(\d)\.0.*$@'=>'a:17:{s:4:"@3|9";i:1869;s:4:"@3|7";i:1870;s:4:"@3|2";i:1873;s:4:"@4|4";i:1876;s:4:"@3|8";i:1877;s:4:"@3|4";i:1879;s:4:"@4|0";i:1884;s:4:"@3|3";i:1887;s:4:"@3|0";i:1888;s:4:"@4|6";i:1896;s:4:"@4|3";i:1900;s:4:"@4|1";i:1902;s:4:"@3|1";i:1908;s:4:"@3|6";i:1911;s:4:"@3|5";i:1914;s:4:"@4|5";i:1918;s:4:"@4|2";i:1922;}', +'@^Mozilla/(\d)\.0 $.*Mac OS X.*$ Gecko.* Firefox/(\d)(\d)\.0.*$@'=>'a:34:{s:6:"@5|3|7";i:1871;s:6:"@4|3|2";i:1874;s:6:"@4|3|7";i:1875;s:6:"@5|3|2";i:1878;s:6:"@4|3|8";i:1880;s:6:"@5|3|8";i:1883;s:6:"@5|4|0";i:1885;s:6:"@4|4|6";i:1886;s:6:"@4|3|0";i:1889;s:6:"@4|3|4";i:1890;s:6:"@5|4|4";i:1891;s:6:"@5|4|6";i:1892;s:6:"@4|4|0";i:1893;s:6:"@4|4|3";i:1894;s:6:"@5|3|4";i:1895;s:6:"@4|3|3";i:1897;s:6:"@4|4|1";i:1898;s:6:"@4|3|5";i:1899;s:6:"@5|3|5";i:1901;s:6:"@5|4|5";i:1903;s:6:"@5|4|1";i:1904;s:6:"@5|3|3";i:1905;s:6:"@4|4|4";i:1906;s:6:"@5|4|3";i:1907;s:6:"@4|3|6";i:1909;s:6:"@5|3|9";i:1910;s:6:"@4|3|9";i:1912;s:6:"@4|4|5";i:1913;s:6:"@4|4|2";i:1915;s:6:"@4|3|1";i:1916;s:6:"@5|3|0";i:1917;s:6:"@5|3|6";i:1919;s:6:"@5|4|2";i:1920;s:6:"@5|3|1";i:1921;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*; Trident/7\.0.*$.*$@'=>'a:3:{s:2:"@1";i:1872;s:2:"@3";i:1881;s:2:"@2";i:1882;}', +'@^Mozilla/5\.0 $.*Windows NT 6\.(\d).*$ Gecko/.*/(\d)(\d)\.0.*$@'=>'a:85:{s:6:"@0|3|2";i:1923;s:6:"@1|3|2";i:1924;s:6:"@0|3|7";i:1925;s:6:"@2|3|5";i:1926;s:6:"@1|3|5";i:1927;s:6:"@2|3|7";i:1928;s:6:"@3|3|5";i:1929;s:6:"@1|3|0";i:1930;s:6:"@0|3|5";i:1931;s:6:"@4|3|5";i:1932;s:6:"@1|3|7";i:1933;s:6:"@4|3|3";i:1934;s:6:"@3|3|4";i:1935;s:6:"@2|3|0";i:1936;s:6:"@0|3|6";i:1937;s:6:"@1|3|6";i:1938;s:6:"@2|3|4";i:1939;s:6:"@3|3|0";i:1940;s:6:"@1|3|4";i:1941;s:6:"@0|3|4";i:1942;s:6:"@4|3|0";i:1943;s:6:"@2|3|6";i:1944;s:6:"@4|3|4";i:1945;s:6:"@1|3|3";i:1946;s:6:"@4|3|7";i:1947;s:6:"@3|3|7";i:1948;s:6:"@2|3|2";i:1949;s:6:"@2|3|3";i:1950;s:6:"@3|3|6";i:1951;s:6:"@4|3|6";i:1952;s:6:"@3|3|3";i:1953;s:6:"@0|3|3";i:1954;s:6:"@2|3|9";i:1955;s:6:"@4|4|1";i:1956;s:6:"@3|4|6";i:1957;s:6:"@2|4|6";i:1958;s:6:"@1|4|6";i:1959;s:6:"@3|4|1";i:1960;s:6:"@2|4|1";i:1961;s:6:"@4|4|2";i:1962;s:6:"@0|4|1";i:1963;s:6:"@1|4|1";i:1964;s:6:"@0|4|6";i:1965;s:6:"@0|4|0";i:1966;s:6:"@3|3|1";i:1967;s:6:"@2|3|1";i:1968;s:6:"@1|3|1";i:1969;s:6:"@4|3|1";i:1970;s:6:"@4|4|0";i:1971;s:6:"@1|4|0";i:1972;s:6:"@2|4|0";i:1973;s:6:"@3|4|0";i:1974;s:6:"@3|4|2";i:1975;s:6:"@2|4|2";i:1976;s:6:"@0|4|4";i:1977;s:6:"@0|4|3";i:1978;s:6:"@1|4|3";i:1979;s:6:"@1|4|4";i:1980;s:6:"@2|4|4";i:1981;s:6:"@4|4|4";i:1982;s:6:"@0|3|0";i:1983;s:6:"@3|4|4";i:1984;s:6:"@2|4|3";i:1985;s:6:"@3|4|3";i:1986;s:6:"@0|4|5";i:1987;s:6:"@0|4|2";i:1988;s:6:"@1|4|2";i:1989;s:6:"@1|4|5";i:1990;s:6:"@2|4|5";i:1991;s:6:"@4|4|3";i:1992;s:6:"@4|4|5";i:1993;s:6:"@3|4|5";i:1994;s:6:"@0|3|1";i:1995;s:6:"@4|4|6";i:1996;s:6:"@4|3|9";i:1997;s:6:"@3|3|8";i:1998;s:6:"@2|3|8";i:1999;s:6:"@0|3|8";i:2000;s:6:"@0|3|9";i:2001;s:6:"@3|3|9";i:2002;s:6:"@3|3|2";i:2003;s:6:"@1|3|9";i:2004;s:6:"@4|3|2";i:2005;s:6:"@1|3|8";i:2006;s:6:"@4|3|8";i:2007;}', +'@^Mozilla/5\.0 $.*Windows.*Trident/7\.0.*rv\:11\.0.*$.*$@'=>2008, +'@^Mozilla/(\d)\.0 $.*Linux.*$ Gecko.* Firefox/(\d)(\d)\.0.*$@'=>'a:34:{s:6:"@4|3|3";i:2009;s:6:"@5|3|8";i:2010;s:6:"@5|4|5";i:2011;s:6:"@5|3|3";i:2012;s:6:"@5|4|1";i:2013;s:6:"@4|4|1";i:2014;s:6:"@4|3|8";i:2015;s:6:"@5|4|2";i:2016;s:6:"@4|4|3";i:2017;s:6:"@4|4|4";i:2018;s:6:"@4|3|7";i:2019;s:6:"@4|3|2";i:2020;s:6:"@5|4|3";i:2021;s:6:"@5|4|4";i:2022;s:6:"@5|3|7";i:2023;s:6:"@5|3|0";i:2024;s:6:"@5|3|4";i:2025;s:6:"@5|3|6";i:2026;s:6:"@4|3|0";i:2027;s:6:"@4|3|4";i:2028;s:6:"@4|4|2";i:2029;s:6:"@4|4|5";i:2030;s:6:"@4|4|0";i:2031;s:6:"@5|3|2";i:2032;s:6:"@4|3|1";i:2033;s:6:"@4|4|6";i:2034;s:6:"@4|3|6";i:2035;s:6:"@5|3|1";i:2036;s:6:"@5|3|9";i:2037;s:6:"@4|3|5";i:2038;s:6:"@5|4|0";i:2039;s:6:"@5|3|5";i:2040;s:6:"@4|3|9";i:2041;s:6:"@5|4|6";i:2042;}', +'@^Mozilla/5\.0 $.*Mac OS X.*$.*Gecko/.*Firefox/.*$@'=>2043, +'@^Mozilla/5\.0 $.*Mac OS X.*$ Gecko/.*/(\d)(\d)\.0.*$@'=>'a:17:{s:4:"@3|3";i:2044;s:4:"@3|5";i:2045;s:4:"@4|4";i:2046;s:4:"@4|0";i:2047;s:4:"@3|8";i:2048;s:4:"@4|3";i:2049;s:4:"@4|5";i:2051;s:4:"@3|4";i:2052;s:4:"@3|6";i:2053;s:4:"@4|1";i:2054;s:4:"@3|1";i:2055;s:4:"@3|9";i:2056;s:4:"@3|0";i:2057;s:4:"@4|2";i:2058;s:4:"@3|2";i:2059;s:4:"@3|7";i:2060;s:4:"@4|6";i:2061;}', +'@^Mozilla/5\.0 $.*Windows.*; Trident/7\.0.*$.*$@'=>2050, +'@^Mozilla/5\.0 $.*Linux.*$.*Gecko/.*Firefox/.*$@'=>2062, +'@^Firefox/(\d)(\d)\.0.*anonymized by Abelssoft.*$@'=>'a:17:{s:4:"@4|1";i:2063;s:4:"@4|3";i:2064;s:4:"@3|2";i:2065;s:4:"@3|0";i:2066;s:4:"@4|4";i:2067;s:4:"@3|4";i:2068;s:4:"@4|5";i:2069;s:4:"@3|6";i:2070;s:4:"@3|7";i:2071;s:4:"@3|3";i:2072;s:4:"@3|9";i:2073;s:4:"@4|6";i:2074;s:4:"@4|2";i:2075;s:4:"@3|8";i:2076;s:4:"@3|1";i:2077;s:4:"@4|0";i:2078;s:4:"@3|5";i:2079;}', +'@^Mozilla/(\d)\.0 $.*MSIE 7\..*Trident/6\.0.*$.*$@'=>'a:2:{s:2:"@5";i:2080;s:2:"@4";i:2081;}', +'@^Firefox/.*anonymized by Abelssoft.*$@'=>2082, +'@^Mozilla/(\d)\.0 $.*MSIE 6\.0.*$.*$@'=>'a:2:{s:2:"@4";i:2086;s:2:"@5";i:2087;}', +'@^Mozilla/(\d)\.0 \(.*MSIE (\d)\.0.*$@'=>'a:3:{s:4:"@5|9";i:2133;s:4:"@5|7";i:2134;s:4:"@4|7";i:2135;}', +'@^.*iPhone.*$@'=>2285, +'@^.*iPod.*$@'=>2289, +'@^.*iPad.*$@'=>2290, +'@^.*$@'=>2292 +); +||||||| .r0 +======= 'a:3:{s:4:"@5|9";i:1673;s:4:"@4|7";i:1674;s:4:"@5|7";i:1675;}', '@^.*$@'=>1812 ); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCache.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCache.php index d78d9387..23591d69 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCache.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCache.php @@ -1,3 +1,738 @@ +<<<<<<< .mine + 0 && (! preg_match('/^\d+=\d+$/', $_SERVER['QUERY_STRING'])) ){ //Don't cache query strings unless they are /?123132423=123123234 DDoS style. + return false; + } + //wordpress_logged_in_[hash] cookies indicates logged in + if(is_array($_COOKIE)){ + foreach(array_keys($_COOKIE) as $c){ + foreach(array('comment_author','wp-postpass','wf_logout','wordpress_logged_in','wptouch_switch_toggle','wpmp_switcher') as $b){ + if(strpos($c, $b) !== false){ return false; } //contains a cookie which indicates user must not be cached + } + } + } + $ex = wfConfig::get('cacheExclusions', false); + if($ex){ + $ex = unserialize($ex); + foreach($ex as $v){ + if($v['pt'] == 'eq'){ if(strtolower($uri) == strtolower($v['p'])){ return false; } } + if($v['pt'] == 's'){ if(stripos($uri, $v['p']) === 0){ return false; } } + if($v['pt'] == 'e'){ if(stripos($uri, $v['p']) === (strlen($uri) - strlen($v['p'])) ){ return false; } } + if($v['pt'] == 'c'){ if(stripos($uri, $v['p']) !== false){ return false; } } + if($v['pt'] == 'uac'){ if(stripos($_SERVER['HTTP_USER_AGENT'], $v['p']) !== false){ return false; } } //User-agent contains + if($v['pt'] == 'uaeq'){ if(strtolower($_SERVER['HTTP_USER_AGENT']) == strtolower($v['p'])){ return false; } } //user-agent equals + if($v['pt'] == 'cc'){ + foreach($_COOKIE as $cookieName){ + if(stripos($cookieName, $v['p']) !== false){ //Cookie name contains pattern + return false; + } + } + } + } + } + return true; + } + public static function isHTTPSPage(){ + if( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != 'off'){ + return true; + } + if( !empty( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ){ //In case we're behind a proxy and user used HTTPS. + return true; + } + return false; + } + public static function obComplete($buffer = ''){ + if(function_exists('is_404') && is_404()){ + return false; + } + + if(defined('WFDONOTCACHE') || defined('DONOTCACHEPAGE') || defined('DONOTCACHEDB') || defined('DONOTCACHEOBJECT')){ + //These constants may have been set after we did the initial isCachable check by e.g. wp_redirect filter. If they're set then just return the buffer and don't cache. + return $buffer; + } + if(strlen($buffer) < 1000){ //The average web page size is 1246,000 bytes. If web page is less than 1000 bytes, don't cache it. + return $buffer; + } + + $file = self::fileFromRequest( ($_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']), $_SERVER['REQUEST_URI']); + self::makeDirIfNeeded($file); + // self::writeCacheDirectoryHtaccess(); + $append = ""; + $appendGzip = ""; + if(wfConfig::get('addCacheComment', false)){ + $append = "\n\n"; + $append .= " Encoding: Uncompressed -->\n"; + } + + @file_put_contents($file, $buffer . $append, LOCK_EX); + chmod($file, 0644); + if(self::$cacheType == 'falcon'){ //create gzipped files so we can send precompressed files + $file .= '_gzip'; + @file_put_contents($file, gzencode($buffer . $appendGzip, 9), LOCK_EX); + chmod($file, 0644); + } + return $buffer; + } + public static function fileFromRequest($host, $URI){ + return self::fileFromURI($host, $URI, self::isHTTPSPage()); + } + public static function fileFromURI($host, $URI, $isHTTPS){ + $key = $host . $URI . ($isHTTPS ? '_HTTPS' : ''); + if(isset(self::$fileCache[$key])){ return self::$fileCache[$key]; } + $host = preg_replace('/[^a-zA-Z0-9\-\.]+/', '', $host); + $URI = preg_replace('/(?:[^a-zA-Z0-9\-\_\.\~\/]+|\.{2,})/', '', $URI); //Strip out bad chars and multiple dots + if(preg_match('/\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)(.*)$/', $URI, $matches)){ + $URI = $matches[1] . '/'; + for($i = 2; $i <= 6; $i++){ + $URI .= strlen($matches[$i]) > 0 ? $matches[$i] : ''; + $URI .= $i < 6 ? '~' : ''; + } + } + $ext = ''; + if($isHTTPS){ $ext = '_https'; } + $file = WP_CONTENT_DIR . '/wfcache/' . $host . '_' . $URI . '_wfcache' . $ext . '.html'; + self::$fileCache[$key] = $file; + return $file; + } + public static function makeDirIfNeeded($file){ + $file = preg_replace('/\/[^\/]*$/', '', $file); + if(! is_dir($file)){ + @mkdir($file, 0755, true); + } + } + public static function logout(){ + wfUtils::setcookie('wf_logout', '1', 0, null, null, null, true); + } + public static function cacheDirectoryTest(){ + $cacheDir = WP_CONTENT_DIR . '/wfcache/'; + if(! is_dir($cacheDir)){ + if(! @mkdir($cacheDir, 0755, true)){ + $err = error_get_last(); + $msg = "The directory $cacheDir does not exist and we could not create it."; + if($err){ + $msg .= ' The error we received was: ' . $err['message']; + } + return $msg; + } + } + if(! @file_put_contents($cacheDir . 'test.php', 'test')){ + $err = error_get_last(); + $msg = "We could not write to the file $cacheDir" . "test.php when testing if the cache directory is writable."; + if($err){ + $msg .= " The error was: " . $err['message']; + } + return $msg; + } + self::removeCacheDirectoryHtaccess(); + return false; + // return self::writeCacheDirectoryHtaccess(); //Everything is OK + } + + /** + * Returns false on success to match wfCache::cacheDirectoryTest + * + * @see wfCache::cacheDirectoryTest + * + * @return bool|string + */ + public static function writeCacheDirectoryHtaccess() { + $cacheDir = WP_CONTENT_DIR . '/wfcache/'; + if (!file_exists($cacheDir . '.htaccess') && !@file_put_contents($cacheDir . '.htaccess', 'Deny from all', LOCK_EX)) { + $err = error_get_last(); + $msg = "We could not write to the file $cacheDir" . ".htaccess."; + if($err){ + $msg .= " The error was: " . $err['message']; + } + return $msg; + } + return false; + } + + public static function removeCacheDirectoryHtaccess() { + $cacheDir = WP_CONTENT_DIR . '/wfcache/'; + if (file_exists($cacheDir . '.htaccess')) { + unlink($cacheDir . '.htaccess'); + } + } + + public static function action_publishPost($id){ + $perm = get_permalink($id); + self::deleteFileFromPermalink($perm); + self::scheduleCacheClear(); + } + public static function action_commentPost($commentID){ + $c = get_comment($commentID, ARRAY_A); + $perm = get_permalink($c['comment_post_ID']); + self::deleteFileFromPermalink($perm); + self::scheduleCacheClear(); + } + public static function action_clearPageCache(){ //Can safely call this as many times as we like because it'll only schedule one clear + self::scheduleCacheClear(); + } + public static function scheduleCacheClear(){ + if(self::$clearScheduledThisRequest){ return; } + self::$clearScheduledThisRequest = true; + wp_schedule_single_event(time() - 15, 'wordfence_cache_clear', array( rand(0,999999999) )); //rand makes sure this is called every time and isn't subject to the 10 minute window where the same event won't be run twice with wp_schedule_single_event + $url = admin_url('admin-ajax.php'); + wp_remote_get($url); + } + public static function scheduledCacheClear($random){ + self::clearPageCacheSafe(); //Will only run if clearPageCache() has not run this request + } + public static function deleteFileFromPermalink($perm){ + if(preg_match('/\/\/([^\/]+)(\/.*)$/', $perm, $matches)){ + $host = $matches[1]; + $uri = $matches[2]; + $file = self::fileFromRequest($host, $uri); + if(is_file($file)){ + @unlink($file); + } + } + } + public static function getCacheStats(){ + self::$cacheStats = array( + 'files' => 0, + 'dirs' => 0, + 'data' => 0, + 'compressedFiles' => 0, + 'compressedKBytes' => 0, + 'uncompressedFiles' => 0, + 'uncompressedKBytes' => 0, + 'oldestFile' => false, + 'newestFile' => false, + 'largestFile' => 0, + ); + self::recursiveStats(WP_CONTENT_DIR . '/wfcache/'); + return self::$cacheStats; + } + private static function recursiveStats($dir){ + $files = array_diff(scandir($dir), array('.','..')); + foreach($files as $file){ + $fullPath = $dir . '/' . $file; + if(is_dir($fullPath)){ + self::$cacheStats['dirs']++; + self::recursiveStats($fullPath); + } else { + if($file == 'clear.lock'){ continue; } + self::$cacheStats['files']++; + $stat = stat($fullPath); + if(is_array($stat)){ + $size = $stat[7]; + if($size){ + $size = round($size / 1024); + self::$cacheStats['data'] += $size; + if(strrpos($file, '_gzip') == strlen($file) - 6){ + self::$cacheStats['compressedFiles']++; + self::$cacheStats['compressedKBytes'] += $size; + } else { + self::$cacheStats['uncompressedFiles']++; + self::$cacheStats['uncompressedKBytes'] += $size; + } + if(self::$cacheStats['largestFile'] < $size){ + self::$cacheStats['largestFile'] = $size; + } + } + + $ctime = $stat[10]; + if(self::$cacheStats['oldestFile'] > $ctime || self::$cacheStats['oldestFile'] === false){ + self::$cacheStats['oldestFile'] = $ctime; + } + if(self::$cacheStats['newestFile'] === false || self::$cacheStats['newestFile'] < $ctime){ + self::$cacheStats['newestFile'] = $ctime; + } + } + } + } + } + public static function clearPageCacheSafe(){ + if(self::$cacheClearedThisRequest){ return; } + self::$cacheClearedThisRequest = true; + self::clearPageCache(); + } + public static function clearPageCache(){ //If a clear is in progress this does nothing. + self::$cacheStats = array( + 'dirsDeleted' => 0, + 'filesDeleted' => 0, + 'totalData' => 0, + 'totalErrors' => 0, + 'error' => '', + ); + $cacheClearLock = WP_CONTENT_DIR . '/wfcache/clear.lock'; + if(! is_file($cacheClearLock)){ + if(! touch($cacheClearLock)){ + self::$cacheStats['error'] = "Could not create a lock file $cacheClearLock to clear the cache."; + self::$cacheStats['totalErrors']++; + return self::$cacheStats; + } + } + $fp = fopen($cacheClearLock, 'w'); + if(! $fp){ + self::$cacheStats['error'] = "Could not open the lock file $cacheClearLock to clear the cache. Please make sure the directory is writable by your web server."; + self::$cacheStats['totalErrors']++; + return self::$cacheStats; + } + if(flock($fp, LOCK_EX | LOCK_NB)){ //non blocking exclusive flock attempt. If we get a lock then it continues and returns true. If we don't lock, then return false, don't block and don't clear the cache. + // This logic means that if a cache clear is currently in progress we don't try to clear the cache. + // This prevents web server children from being queued up waiting to be able to also clear the cache. + self::$lastRecursiveDeleteError = false; + self::recursiveDelete(WP_CONTENT_DIR . '/wfcache/'); + if(self::$lastRecursiveDeleteError){ + self::$cacheStats['error'] = self::$lastRecursiveDeleteError; + self::$cacheStats['totalErrors']++; + } + flock($fp, LOCK_UN); + } + fclose($fp); + + return self::$cacheStats; + } + public static function recursiveDelete($dir){ + $files = array_diff(scandir($dir), array('.','..')); + foreach ($files as $file) { + if(is_dir($dir . '/' . $file)){ + if(! self::recursiveDelete($dir . '/' . $file)){ + return false; + } + } else { + if($file == 'clear.lock'){ continue; } //Don't delete our lock file + $size = filesize($dir . '/' . $file); + if($size){ + self::$cacheStats['totalData'] += round($size / 1024); + } + if(strpos($dir, 'wfcache/') === false){ + self::$lastRecursiveDeleteError = "Not deleting file in directory $dir because it appears to be in the wrong path."; + self::$cacheStats['totalErrors']++; + return false; //Safety check that we're in a subdir of the cache + } + if(@unlink($dir . '/' . $file)){ + self::$cacheStats['filesDeleted']++; + } else { + self::$lastRecursiveDeleteError = "Could not delete file " . $dir . "/" . $file . " : " . wfUtils::getLastError(); + self::$cacheStats['totalErrors']++; + return false; + } + } + } + if($dir != WP_CONTENT_DIR . '/wfcache/'){ + if(strpos($dir, 'wfcache/') === false){ + self::$lastRecursiveDeleteError = "Not deleting directory $dir because it appears to be in the wrong path."; + self::$cacheStats['totalErrors']++; + return false; //Safety check that we're in a subdir of the cache + } + if(@rmdir($dir)){ + self::$cacheStats['dirsDeleted']++; + } else { + self::$lastRecursiveDeleteError = "Could not delete directory $dir : " . wfUtils::getLastError(); + self::$cacheStats['totalErrors']++; + return false; + } + return true; + } else { + return true; + } + } + public static function addHtaccessCode($action){ + if($action != 'add' && $action != 'remove'){ + die("Error: addHtaccessCode must be called with 'add' or 'remove' as param"); + } + $htaccessPath = self::getHtaccessPath(); + if(! $htaccessPath){ + return "Wordfence could not find your .htaccess file."; + } + $fh = @fopen($htaccessPath, 'r+'); + if(! $fh){ + $err = error_get_last(); + return $err['message']; + } + flock($fh, LOCK_EX); + fseek($fh, 0, SEEK_SET); //start of file + clearstatcache(); + $contents = fread($fh, filesize($htaccessPath)); + if(! $contents){ + fclose($fh); + return "Could not read from $htaccessPath"; + } + $contents = preg_replace('/#WFCACHECODE.*WFCACHECODE[r\s\n\t]*/s', '', $contents); + if($action == 'add'){ + $code = self::getHtaccessCode(); + $contents = $code . "\n" . $contents; + } + ftruncate($fh, 0); + fflush($fh); + fseek($fh, 0, SEEK_SET); + fwrite($fh, $contents); + flock($fh, LOCK_UN); + fclose($fh); + return false; + } + public static function getHtaccessCode(){ + $siteURL = site_url(); + $homeURL = home_url(); + $pathPrefix = ""; + if(preg_match('/^https?:\/\/[^\/]+\/(.+)$/i', $siteURL, $matches)){ + $path = $matches[1]; + $path = preg_replace('/^\//', '', $path); + $path = preg_replace('/\/$/', '', $path); + $pathPrefix = '/' . $path; // Which is: /my/path + } + $matchCaps = '$1/$2~$3~$4~$5~$6'; + if(preg_match('/^https?:\/\/[^\/]+\/(.+)$/i', $homeURL, $matches)){ + $path = $matches[1]; + $path = preg_replace('/^\//', '', $path); + $path = preg_replace('/\/$/', '', $path); + $pieces = explode('/', $path); + if(count($pieces) == 1){ + # No path: "/wp-content/wfcache/%{HTTP_HOST}_$1/$2~$3~$4~$5~$6_wfcache%{ENV:WRDFNC_HTTPS}.html%{ENV:WRDFNC_ENC}" [L] + # One path: "/mdm/wp-content/wfcache/%{HTTP_HOST}_mdm/$1~$2~$3~$4~$5_wfcache%{ENV:WRDFNC_HTTPS}.html%{ENV:WRDFNC_ENC}" [L] + $matchCaps = $pieces[0] . '/$1~$2~$3~$4~$5'; + } else if(count($pieces) == 2){ + $matchCaps = $pieces[0] . '/' . $pieces[1] . '/$1~$2~$3~$4'; + } else { + $matchCaps = '$1/$2~$3~$4~$5~$6'; #defaults to the regular setting but this won't work. However user should already have gotten a warning that we don't support sites more than 2 dirs deep with falcon. + } + } + $sslString = "RewriteCond %{HTTPS} off"; + if(wfConfig::get('allowHTTPSCaching')){ + $sslString = ""; + } + $otherRewriteConds = ""; + $ex = wfConfig::get('cacheExclusions', false); + if($ex){ + $ex = unserialize($ex); + foreach($ex as $v){ + if($v['pt'] == 'uac'){ + $otherRewriteConds .= "\n\tRewriteCond %{HTTP_USER_AGENT} !" . self::regexSpaceFix(preg_quote($v['p'])) . " [NC]"; + } + if($v['pt'] == 'uaeq'){ + $otherRewriteConds .= "\n\tRewriteCond %{HTTP_USER_AGENT} !^" . self::regexSpaceFix(preg_quote($v['p'])) . "$ [NC]"; + } + if($v['pt'] == 'cc'){ + $otherRewriteConds .= "\n\tRewriteCond %{HTTP_COOKIE} !" . self::regexSpaceFix(preg_quote($v['p'])) . " [NC]"; + } + } + } + + //We exclude URLs that are banned so that Wordfence PHP code can catch the IP address, then ban that IP and the ban is added to .htaccess. + $excludedURLs = ""; + if(wfConfig::get('bannedURLs', false)){ + foreach(explode(',', wfConfig::get('bannedURLs', false)) as $URL){ + $excludedURLs .= "RewriteCond %{REQUEST_URI} !^" . self::regexSpaceFix(preg_quote(trim($URL))) . "$\n\t"; + } + } + + $code = << + AddOutputFilterByType DEFLATE text/css text/x-component application/x-javascript application/javascript text/javascript text/x-js text/html text/richtext image/svg+xml text/plain text/xsd text/xsl text/xml image/x-icon application/json + + Header append Vary User-Agent env=!dont-vary + + + AddOutputFilter DEFLATE js css htm html xml + + + + AddType text/html .html_gzip + AddEncoding gzip .html_gzip + AddType text/xml .xml_gzip + AddEncoding gzip .xml_gzip + + + SetEnvIfNoCase Request_URI \.html_gzip$ no-gzip + SetEnvIfNoCase Request_URI \.xml_gzip$ no-gzip + + + Header set Vary "Accept-Encoding, Cookie" + + + #Prevents garbled chars in cached files if there is no default charset. + AddDefaultCharset utf-8 + + #Cache rules: + RewriteEngine On + RewriteBase / + RewriteCond %{HTTPS} on + RewriteRule .* - [E=WRDFNC_HTTPS:_https] + RewriteCond %{HTTP:Accept-Encoding} gzip + RewriteRule .* - [E=WRDFNC_ENC:_gzip] + RewriteCond %{REQUEST_METHOD} !=POST + {$sslString} + RewriteCond %{QUERY_STRING} ^(?:\d+=\d+)?$ + RewriteCond %{REQUEST_URI} (?:\/|\.html)$ [NC] + {$excludedURLs} + RewriteCond %{HTTP_COOKIE} !(comment_author|wp\-postpass|wf_logout|wordpress_logged_in|wptouch_switch_toggle|wpmp_switcher) [NC] + {$otherRewriteConds} + RewriteCond %{REQUEST_URI} \/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)(.*)$ + RewriteCond "%{DOCUMENT_ROOT}{$pathPrefix}/wp-content/wfcache/%{HTTP_HOST}_%1/%2~%3~%4~%5~%6_wfcache%{ENV:WRDFNC_HTTPS}.html%{ENV:WRDFNC_ENC}" -f + RewriteRule \/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)\/*([^\/]*)(.*)$ "{$pathPrefix}/wp-content/wfcache/%{HTTP_HOST}_{$matchCaps}_wfcache%{ENV:WRDFNC_HTTPS}.html%{ENV:WRDFNC_ENC}" [L] + +#Do not remove this line. Disable Web caching in Wordfence to remove this data - WFCACHECODE +EOT; + return $code; + } + private static function regexSpaceFix($str){ + return str_replace(' ', '\\s', $str); + } + public static function scheduleUpdateBlockedIPs(){ + wp_clear_scheduled_hook('wordfence_update_blocked_IPs'); + if(wfConfig::get('cacheType') != 'falcon'){ + self::updateBlockedIPs('remove'); //Fail silently if .htaccess is not readable. Will fall back to old blocking via WP + return; + } + self::updateBlockedIPs('add'); //Fail silently if .htaccess is not readable. Will fall back to old blocking via WP + wp_schedule_single_event(time() + 300, 'wordfence_update_blocked_IPs'); + } + + /** + * @param $action + * @return bool|string|void + */ + public static function updateBlockedIPs($action){ //'add' or 'remove' + if(wfConfig::get('cacheType') != 'falcon'){ return; } + + $htaccessPath = self::getHtaccessPath(); + if(! $htaccessPath){ + return "Wordfence could not find your .htaccess file."; + } + if($action == 'remove'){ + $fh = @fopen($htaccessPath, 'r+'); + if(! $fh){ + $err = error_get_last(); + return $err['message']; + } + flock($fh, LOCK_EX); + fseek($fh, 0, SEEK_SET); //start of file + clearstatcache(); + $contents = @fread($fh, filesize($htaccessPath)); + if(! $contents){ + fclose($fh); + return "Could not read from $htaccessPath"; + } + + $contents = preg_replace('/#WFIPBLOCKS.*WFIPBLOCKS[r\s\n\t]*/s', '', $contents); + + ftruncate($fh, 0); + fflush($fh); + fseek($fh, 0, SEEK_SET); + @fwrite($fh, $contents); + flock($fh, LOCK_UN); + fclose($fh); + return false; + } else if($action == 'add'){ + $fh = @fopen($htaccessPath, 'r+'); + if(! $fh){ + $err = error_get_last(); + return $err['message']; + } + + $lines = array(); + $wfLog = new wfLog(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $IPs = $wfLog->getBlockedIPsAddrOnly(); + if(sizeof($IPs) > 0){ + foreach($IPs as $IP){ + $lines[] = "Deny from $IP\n"; + } + } + $ranges = $wfLog->getRangesBasic(); + $browserAdded = false; + $browserLines = array(); + if($ranges){ + foreach($ranges as $r){ + $arr = explode('|', $r); + $range = isset($arr[0]) ? $arr[0] : false; + $browser = isset($arr[1]) ? $arr[1] : false; + $referer = isset($arr[2]) ? $arr[2] : false; + + if($range){ + if($browser || $referer){ continue; } //We don't allow combos in falcon + + list($start_range, $end_range) = explode('-', $range); + if (preg_match('/[\.:]/', $start_range)) { + $start_range = wfUtils::inet_pton($start_range); + $end_range = wfUtils::inet_pton($end_range); + } else { + $start_range = wfUtils::inet_pton(long2ip($start_range)); + $end_range = wfUtils::inet_pton(long2ip($end_range)); + } + + $cidrs = wfUtils::rangeToCIDRs($start_range, $end_range); + + $hIPs = wfUtils::inet_ntop($start_range) . ' - ' . wfUtils::inet_ntop($end_range); + if(sizeof($cidrs) > 0){ + $lines[] = '#Start of blocking code for IP range: ' . $hIPs . "\n"; + foreach($cidrs as $c){ + $lines[] = "Deny from $c\n"; + } + $lines[] = '#End of blocking code for IP range: ' . $hIPs . "\n"; + } + } else if($browser){ + if($range || $referer){ continue; } + $browserLines[] = "\t#Blocking code for browser pattern: $browser\n"; + $browser = preg_replace('/([\-\_\.\+\!\@\#\$\%\^\&\[\]\{\}\/])/', "\\\\$1", $browser); + $browser = preg_replace('/\*/', '.*', $browser); + $browserLines[] = "\tSetEnvIf User-Agent " . $browser . " WordfenceBadBrowser=1\n"; + $browserAdded = true; + } else if($referer){ + if($browser || $range){ continue; } + $browserLines[] = "\t#Blocking code for referer pattern: $referer\n"; + $referer = preg_replace('/([\-\_\.\+\!\@\#\$\%\^\&\[\]\{\}\/])/', "\\\\$1", $referer); + $referer = preg_replace('/\*/', '.*', $referer); + $browserLines[] = "\tSetEnvIf Referer " . $referer . " WordfenceBadBrowser=1\n"; + $browserAdded = true; + } + } + } + if($browserAdded){ + $lines[] = "\n"; + foreach($browserLines as $l){ + $lines[] = $l; + } + $lines[] = "\tDeny from env=WordfenceBadBrowser\n"; + $lines[] = "\n"; + } + } + $blockCode = "#WFIPBLOCKS - Do not remove this line. Disable Web Caching in Wordfence to remove this data.\nOrder Deny,Allow\n"; + $blockCode .= implode('', $lines); + $blockCode .= "#Do not remove this line. Disable Web Caching in Wordfence to remove this data - WFIPBLOCKS\n"; + + + //Minimize time between lock/unlock + flock($fh, LOCK_EX); + fseek($fh, 0, SEEK_SET); //start of file + clearstatcache(); //Or we get the wrong size from a cached entry and corrupt the file + $contents = @fread($fh, filesize($htaccessPath)); + if(! $contents){ + fclose($fh); + return "Could not read from $htaccessPath"; + } + $contents = preg_replace('/#WFIPBLOCKS.*WFIPBLOCKS[r\s\n\t]*/s', '', $contents); + $contents = $blockCode . $contents; + ftruncate($fh, 0); + fflush($fh); + fseek($fh, 0, SEEK_SET); + @fwrite($fh, $contents); + flock($fh, LOCK_UN); + fclose($fh); + return false; + } + public static function getHtaccessPath(){ + if (!function_exists('get_home_path')) { + include_once ABSPATH . 'wp-admin/includes/file.php'; + } + + $homePath = get_home_path(); + $htaccessFile = $homePath.'.htaccess'; + if (file_exists($htaccessFile)) { + return $htaccessFile; + } + return false; + } + public static function doNotCache(){ + if(! defined('WFDONOTCACHE')){ + define('WFDONOTCACHE', true); + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfConfig.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfConfig.php index 2f3d0411..a1252c47 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfConfig.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfConfig.php @@ -1,3 +1,939 @@ +<<<<<<< .mine +"; + private static $tmpDirCache = false; + public static $securityLevels = array( + array( //level 0 + "checkboxes" => array( + "alertOn_critical" => false, + "alertOn_update" => false, + "alertOn_warnings" => false, + "alertOn_throttle" => false, + "alertOn_block" => false, + "alertOn_loginLockout" => false, + "alertOn_lostPasswdForm" => false, + "alertOn_adminLogin" => false, + "alertOn_nonAdminLogin" => false, + "liveTrafficEnabled" => true, + "advancedCommentScanning" => false, + "checkSpamIP" => false, + "spamvertizeCheck" => false, + "liveTraf_ignorePublishers" => true, + //"perfLoggingEnabled" => false, + "scheduledScansEnabled" => false, + "scansEnabled_public" => false, + "scansEnabled_heartbleed" => true, + "scansEnabled_core" => false, + "scansEnabled_themes" => false, + "scansEnabled_plugins" => false, + "scansEnabled_malware" => false, + "scansEnabled_fileContents" => false, + "scansEnabled_database" => false, + "scansEnabled_posts" => false, + "scansEnabled_comments" => false, + "scansEnabled_passwds" => false, + "scansEnabled_diskSpace" => false, + "scansEnabled_options" => false, + "scansEnabled_dns" => false, + "scansEnabled_scanImages" => false, + "scansEnabled_highSense" => false, + "scansEnabled_oldVersions" => false, + "firewallEnabled" => false, + "blockFakeBots" => false, + "autoBlockScanners" => false, + "loginSecurityEnabled" => false, + "loginSec_lockInvalidUsers" => false, + "loginSec_maskLoginErrors" => false, + "loginSec_blockAdminReg" => false, + "loginSec_disableAuthorScan" => false, + "other_hideWPVersion" => false, + "other_noAnonMemberComments" => false, + "other_blockBadPOST" => false, + "other_scanComments" => false, + "other_pwStrengthOnUpdate" => false, + "other_WFNet" => true, + "other_scanOutside" => false, + "deleteTablesOnDeact" => false, + "autoUpdate" => false, + "disableCookies" => false, + "startScansRemotely" => false, + "disableConfigCaching" => false, + "addCacheComment" => false, + "disableCodeExecutionUploads" => false, + "allowHTTPSCaching" => false, + "debugOn" => false, + 'email_summary_enabled' => true, + 'email_summary_dashboard_widget_enabled' => true, + 'ssl_verify' => true, + ), + "otherParams" => array( + 'securityLevel' => '0', + "alertEmails" => "", "liveTraf_ignoreUsers" => "", "liveTraf_ignoreIPs" => "", "liveTraf_ignoreUA" => "", "apiKey" => "", "maxMem" => '256', 'scan_exclude' => '', 'whitelisted' => '', 'bannedURLs' => '', 'maxExecutionTime' => '', 'howGetIPs' => '', 'actUpdateInterval' => '', 'alert_maxHourly' => 0, 'loginSec_userBlacklist' => '', + "neverBlockBG" => "neverBlockVerified", + "loginSec_countFailMins" => "5", + "loginSec_lockoutMins" => "5", + 'loginSec_strongPasswds' => '', + 'loginSec_maxFailures' => "500", + 'loginSec_maxForgotPasswd' => "500", + 'maxGlobalRequests' => "DISABLED", + 'maxGlobalRequests_action' => "throttle", + 'maxRequestsCrawlers' => "DISABLED", + 'maxRequestsCrawlers_action' => "throttle", + 'maxRequestsHumans' => "DISABLED", + 'maxRequestsHumans_action' => "throttle", + 'max404Crawlers' => "DISABLED", + 'max404Crawlers_action' => "throttle", + 'max404Humans' => "DISABLED", + 'max404Humans_action' => "throttle", + 'maxScanHits' => "DISABLED", + 'maxScanHits_action' => "throttle", + 'blockedTime' => "300", + 'email_summary_interval' => 'biweekly', + 'email_summary_excluded_directories' => 'wp-content/cache,wp-content/wfcache,wp-content/plugins/wordfence/tmp', + 'allowed404s' => "/favicon.ico\n/apple-touch-icon*.png\n/*@2x.png", + ) + ), + array( //level 1 + "checkboxes" => array( + "alertOn_critical" => true, + "alertOn_update" => false, + "alertOn_warnings" => false, + "alertOn_throttle" => false, + "alertOn_block" => true, + "alertOn_loginLockout" => true, + "alertOn_lostPasswdForm" => false, + "alertOn_adminLogin" => true, + "alertOn_nonAdminLogin" => false, + "liveTrafficEnabled" => true, + "advancedCommentScanning" => false, + "checkSpamIP" => false, + "spamvertizeCheck" => false, + "liveTraf_ignorePublishers" => true, + //"perfLoggingEnabled" => false, + "scheduledScansEnabled" => true, + "scansEnabled_public" => false, + "scansEnabled_heartbleed" => true, + "scansEnabled_core" => true, + "scansEnabled_themes" => false, + "scansEnabled_plugins" => false, + "scansEnabled_malware" => true, + "scansEnabled_fileContents" => true, + "scansEnabled_database" => true, + "scansEnabled_posts" => true, + "scansEnabled_comments" => true, + "scansEnabled_passwds" => true, + "scansEnabled_diskSpace" => true, + "scansEnabled_options" => true, + "scansEnabled_dns" => true, + "scansEnabled_scanImages" => false, + "scansEnabled_highSense" => false, + "scansEnabled_oldVersions" => true, + "firewallEnabled" => true, + "blockFakeBots" => false, + "autoBlockScanners" => true, + "loginSecurityEnabled" => true, + "loginSec_lockInvalidUsers" => false, + "loginSec_maskLoginErrors" => true, + "loginSec_blockAdminReg" => true, + "loginSec_disableAuthorScan" => true, + "other_hideWPVersion" => true, + "other_noAnonMemberComments" => true, + "other_blockBadPOST" => false, + "other_scanComments" => true, + "other_pwStrengthOnUpdate" => true, + "other_WFNet" => true, + "other_scanOutside" => false, + "deleteTablesOnDeact" => false, + "autoUpdate" => false, + "disableCookies" => false, + "startScansRemotely" => false, + "disableConfigCaching" => false, + "addCacheComment" => false, + "disableCodeExecutionUploads" => false, + "allowHTTPSCaching" => false, + "debugOn" => false, + 'email_summary_enabled' => true, + 'email_summary_dashboard_widget_enabled' => true, + 'ssl_verify' => true, + ), + "otherParams" => array( + 'securityLevel' => '1', + "alertEmails" => "", "liveTraf_ignoreUsers" => "", "liveTraf_ignoreIPs" => "", "liveTraf_ignoreUA" => "", "apiKey" => "", "maxMem" => '256', 'scan_exclude' => '', 'whitelisted' => '', 'bannedURLs' => '', 'maxExecutionTime' => '', 'howGetIPs' => '', 'actUpdateInterval' => '', 'alert_maxHourly' => 0, 'loginSec_userBlacklist' => '', + "neverBlockBG" => "neverBlockVerified", + "loginSec_countFailMins" => "5", + "loginSec_lockoutMins" => "5", + 'loginSec_strongPasswds' => 'pubs', + 'loginSec_maxFailures' => "50", + 'loginSec_maxForgotPasswd' => "50", + 'maxGlobalRequests' => "DISABLED", + 'maxGlobalRequests_action' => "throttle", + 'maxRequestsCrawlers' => "DISABLED", + 'maxRequestsCrawlers_action' => "throttle", + 'maxRequestsHumans' => "DISABLED", + 'maxRequestsHumans_action' => "throttle", + 'max404Crawlers' => "DISABLED", + 'max404Crawlers_action' => "throttle", + 'max404Humans' => "DISABLED", + 'max404Humans_action' => "throttle", + 'maxScanHits' => "DISABLED", + 'maxScanHits_action' => "throttle", + 'blockedTime' => "300", + 'email_summary_interval' => 'biweekly', + 'email_summary_excluded_directories' => 'wp-content/cache,wp-content/wfcache,wp-content/plugins/wordfence/tmp', + 'allowed404s' => "/favicon.ico\n/apple-touch-icon*.png\n/*@2x.png", + ) + ), + array( //level 2 + "checkboxes" => array( + "alertOn_critical" => true, + "alertOn_update" => false, + "alertOn_warnings" => true, + "alertOn_throttle" => false, + "alertOn_block" => true, + "alertOn_loginLockout" => true, + "alertOn_lostPasswdForm" => true, + "alertOn_adminLogin" => true, + "alertOn_nonAdminLogin" => false, + "liveTrafficEnabled" => true, + "advancedCommentScanning" => false, + "checkSpamIP" => false, + "spamvertizeCheck" => false, + "liveTraf_ignorePublishers" => true, + //"perfLoggingEnabled" => false, + "scheduledScansEnabled" => true, + "scansEnabled_public" => false, + "scansEnabled_heartbleed" => true, + "scansEnabled_core" => true, + "scansEnabled_themes" => false, + "scansEnabled_plugins" => false, + "scansEnabled_malware" => true, + "scansEnabled_fileContents" => true, + "scansEnabled_database" => true, + "scansEnabled_posts" => true, + "scansEnabled_comments" => true, + "scansEnabled_passwds" => true, + "scansEnabled_diskSpace" => true, + "scansEnabled_options" => true, + "scansEnabled_dns" => true, + "scansEnabled_scanImages" => false, + "scansEnabled_highSense" => false, + "scansEnabled_oldVersions" => true, + "firewallEnabled" => true, + "blockFakeBots" => false, + "autoBlockScanners" => true, + "loginSecurityEnabled" => true, + "loginSec_lockInvalidUsers" => false, + "loginSec_maskLoginErrors" => true, + "loginSec_blockAdminReg" => true, + "loginSec_disableAuthorScan" => true, + "other_hideWPVersion" => true, + "other_noAnonMemberComments" => true, + "other_blockBadPOST" => false, + "other_scanComments" => true, + "other_pwStrengthOnUpdate" => true, + "other_WFNet" => true, + "other_scanOutside" => false, + "deleteTablesOnDeact" => false, + "autoUpdate" => false, + "disableCookies" => false, + "startScansRemotely" => false, + "disableConfigCaching" => false, + "addCacheComment" => false, + "disableCodeExecutionUploads" => false, + "allowHTTPSCaching" => false, + "debugOn" => false, + 'email_summary_enabled' => true, + 'email_summary_dashboard_widget_enabled' => true, + 'ssl_verify' => true, + ), + "otherParams" => array( + 'securityLevel' => '2', + "alertEmails" => "", "liveTraf_ignoreUsers" => "", "liveTraf_ignoreIPs" => "", "liveTraf_ignoreUA" => "", "apiKey" => "", "maxMem" => '256', 'scan_exclude' => '', 'whitelisted' => '', 'bannedURLs' => '', 'maxExecutionTime' => '', 'howGetIPs' => '', 'actUpdateInterval' => '', 'alert_maxHourly' => 0, 'loginSec_userBlacklist' => '', + "neverBlockBG" => "neverBlockVerified", + "loginSec_countFailMins" => "240", + "loginSec_lockoutMins" => "240", + 'loginSec_strongPasswds' => 'pubs', + 'loginSec_maxFailures' => "20", + 'loginSec_maxForgotPasswd' => "20", + 'maxGlobalRequests' => "DISABLED", + 'maxGlobalRequests_action' => "throttle", + 'maxRequestsCrawlers' => "DISABLED", + 'maxRequestsCrawlers_action' => "throttle", + 'maxRequestsHumans' => "DISABLED", + 'maxRequestsHumans_action' => "throttle", + 'max404Crawlers' => "DISABLED", + 'max404Crawlers_action' => "throttle", + 'max404Humans' => "DISABLED", + 'max404Humans_action' => "throttle", + 'maxScanHits' => "DISABLED", + 'maxScanHits_action' => "throttle", + 'blockedTime' => "300", + 'email_summary_interval' => 'biweekly', + 'email_summary_excluded_directories' => 'wp-content/cache,wp-content/wfcache,wp-content/plugins/wordfence/tmp', + 'allowed404s' => "/favicon.ico\n/apple-touch-icon*.png\n/*@2x.png", + ) + ), + array( //level 3 + "checkboxes" => array( + "alertOn_critical" => true, + "alertOn_update" => false, + "alertOn_warnings" => true, + "alertOn_throttle" => false, + "alertOn_block" => true, + "alertOn_loginLockout" => true, + "alertOn_lostPasswdForm" => true, + "alertOn_adminLogin" => true, + "alertOn_nonAdminLogin" => false, + "liveTrafficEnabled" => true, + "advancedCommentScanning" => false, + "checkSpamIP" => false, + "spamvertizeCheck" => false, + "liveTraf_ignorePublishers" => true, + //"perfLoggingEnabled" => false, + "scheduledScansEnabled" => true, + "scansEnabled_public" => false, + "scansEnabled_heartbleed" => true, + "scansEnabled_core" => true, + "scansEnabled_themes" => false, + "scansEnabled_plugins" => false, + "scansEnabled_malware" => true, + "scansEnabled_fileContents" => true, + "scansEnabled_database" => true, + "scansEnabled_posts" => true, + "scansEnabled_comments" => true, + "scansEnabled_passwds" => true, + "scansEnabled_diskSpace" => true, + "scansEnabled_options" => true, + "scansEnabled_dns" => true, + "scansEnabled_scanImages" => false, + "scansEnabled_highSense" => false, + "scansEnabled_oldVersions" => true, + "firewallEnabled" => true, + "blockFakeBots" => false, + "autoBlockScanners" => true, + "loginSecurityEnabled" => true, + "loginSec_lockInvalidUsers" => false, + "loginSec_maskLoginErrors" => true, + "loginSec_blockAdminReg" => true, + "loginSec_disableAuthorScan" => true, + "other_hideWPVersion" => true, + "other_noAnonMemberComments" => true, + "other_blockBadPOST" => false, + "other_scanComments" => true, + "other_pwStrengthOnUpdate" => true, + "other_WFNet" => true, + "other_scanOutside" => false, + "deleteTablesOnDeact" => false, + "autoUpdate" => false, + "disableCookies" => false, + "startScansRemotely" => false, + "disableConfigCaching" => false, + "addCacheComment" => false, + "disableCodeExecutionUploads" => false, + "allowHTTPSCaching" => false, + "debugOn" => false, + 'email_summary_enabled' => true, + 'email_summary_dashboard_widget_enabled' => true, + 'ssl_verify' => true, + ), + "otherParams" => array( + 'securityLevel' => '3', + "alertEmails" => "", "liveTraf_ignoreUsers" => "", "liveTraf_ignoreIPs" => "", "liveTraf_ignoreUA" => "", "apiKey" => "", "maxMem" => '256', 'scan_exclude' => '', 'whitelisted' => '', 'bannedURLs' => '', 'maxExecutionTime' => '', 'howGetIPs' => '', 'actUpdateInterval' => '', 'alert_maxHourly' => 0, 'loginSec_userBlacklist' => '', + "neverBlockBG" => "neverBlockVerified", + "loginSec_countFailMins" => "1440", + "loginSec_lockoutMins" => "1440", + 'loginSec_strongPasswds' => 'all', + 'loginSec_maxFailures' => "10", + 'loginSec_maxForgotPasswd' => "10", + 'maxGlobalRequests' => "960", + 'maxGlobalRequests_action' => "throttle", + 'maxRequestsCrawlers' => "960", + 'maxRequestsCrawlers_action' => "throttle", + 'maxRequestsHumans' => "60", + 'maxRequestsHumans_action' => "throttle", + 'max404Crawlers' => "60", + 'max404Crawlers_action' => "throttle", + 'max404Humans' => "60", + 'max404Humans_action' => "throttle", + 'maxScanHits' => "30", + 'maxScanHits_action' => "throttle", + 'blockedTime' => "1800", + 'email_summary_interval' => 'biweekly', + 'email_summary_excluded_directories' => 'wp-content/cache,wp-content/wfcache,wp-content/plugins/wordfence/tmp', + 'allowed404s' => "/favicon.ico\n/apple-touch-icon*.png\n/*@2x.png", + ) + ), + array( //level 4 + "checkboxes" => array( + "alertOn_critical" => true, + "alertOn_update" => false, + "alertOn_warnings" => true, + "alertOn_throttle" => false, + "alertOn_block" => true, + "alertOn_loginLockout" => true, + "alertOn_lostPasswdForm" => true, + "alertOn_adminLogin" => true, + "alertOn_nonAdminLogin" => false, + "liveTrafficEnabled" => true, + "advancedCommentScanning" => false, + "checkSpamIP" => false, + "spamvertizeCheck" => false, + "liveTraf_ignorePublishers" => true, + //"perfLoggingEnabled" => false, + "scheduledScansEnabled" => true, + "scansEnabled_public" => false, + "scansEnabled_heartbleed" => true, + "scansEnabled_core" => true, + "scansEnabled_themes" => false, + "scansEnabled_plugins" => false, + "scansEnabled_malware" => true, + "scansEnabled_fileContents" => true, + "scansEnabled_database" => true, + "scansEnabled_posts" => true, + "scansEnabled_comments" => true, + "scansEnabled_passwds" => true, + "scansEnabled_diskSpace" => true, + "scansEnabled_options" => true, + "scansEnabled_dns" => true, + "scansEnabled_scanImages" => false, + "scansEnabled_highSense" => false, + "scansEnabled_oldVersions" => true, + "firewallEnabled" => true, + "blockFakeBots" => true, + "autoBlockScanners" => true, + "loginSecurityEnabled" => true, + "loginSec_lockInvalidUsers" => true, + "loginSec_maskLoginErrors" => true, + "loginSec_blockAdminReg" => true, + "loginSec_disableAuthorScan" => true, + "other_hideWPVersion" => true, + "other_noAnonMemberComments" => true, + "other_blockBadPOST" => false, + "other_scanComments" => true, + "other_pwStrengthOnUpdate" => true, + "other_WFNet" => true, + "other_scanOutside" => false, + "deleteTablesOnDeact" => false, + "autoUpdate" => false, + "disableCookies" => false, + "startScansRemotely" => false, + "disableConfigCaching" => false, + "addCacheComment" => false, + "disableCodeExecutionUploads" => false, + "allowHTTPSCaching" => false, + "debugOn" => false, + 'email_summary_enabled' => true, + 'email_summary_dashboard_widget_enabled' => true, + 'ssl_verify' => true, + ), + "otherParams" => array( + 'securityLevel' => '4', + "alertEmails" => "", "liveTraf_ignoreUsers" => "", "liveTraf_ignoreIPs" => "", "liveTraf_ignoreUA" => "", "apiKey" => "", "maxMem" => '256', 'scan_exclude' => '', 'whitelisted' => '', 'bannedURLs' => '', 'maxExecutionTime' => '', 'howGetIPs' => '', 'actUpdateInterval' => '', 'alert_maxHourly' => 0, 'loginSec_userBlacklist' => '', + "neverBlockBG" => "neverBlockVerified", + "loginSec_countFailMins" => "1440", + "loginSec_lockoutMins" => "1440", + 'loginSec_strongPasswds' => 'all', + 'loginSec_maxFailures' => "5", + 'loginSec_maxForgotPasswd' => "5", + 'maxGlobalRequests' => "960", + 'maxGlobalRequests_action' => "throttle", + 'maxRequestsCrawlers' => "960", + 'maxRequestsCrawlers_action' => "throttle", + 'maxRequestsHumans' => "30", + 'maxRequestsHumans_action' => "block", + 'max404Crawlers' => "30", + 'max404Crawlers_action' => "block", + 'max404Humans' => "60", + 'max404Humans_action' => "block", + 'maxScanHits' => "10", + 'maxScanHits_action' => "block", + 'blockedTime' => "7200", + 'email_summary_interval' => 'biweekly', + 'email_summary_excluded_directories' => 'wp-content/cache,wp-content/wfcache,wp-content/plugins/wordfence/tmp', + 'allowed404s' => "/favicon.ico\n/apple-touch-icon*.png\n/*@2x.png", + ) + ) + ); + public static function setDefaults(){ + foreach(self::$securityLevels[2]['checkboxes'] as $key => $val){ + if(self::get($key) === false){ + self::set($key, $val ? '1' : '0'); + } + } + foreach(self::$securityLevels[2]['otherParams'] as $key => $val){ + if(self::get($key) === false){ + self::set($key, $val); + } + } + self::set('encKey', substr(wfUtils::bigRandomHex(),0 ,16) ); + if(self::get('maxMem', false) === false ){ + self::set('maxMem', '256'); + } + if(self::get('other_scanOutside', false) === false){ + self::set('other_scanOutside', 0); + } + + if (self::get('email_summary_enabled')) { + wfActivityReport::scheduleCronJob(); + } else { + wfActivityReport::disableCronJob(); + } + } + public static function getExportableOptionsKeys(){ + $ret = array(); + foreach(self::$securityLevels[2]['checkboxes'] as $key => $val){ + $ret[] = $key; + } + foreach(self::$securityLevels[2]['otherParams'] as $key => $val){ + if($key != 'apiKey'){ + $ret[] = $key; + } + } + foreach(array('cbl_action', 'cbl_countries', 'cbl_redirURL', 'cbl_loggedInBlocked', 'cbl_loginFormBlocked', 'cbl_restOfSiteBlocked', 'cbl_bypassRedirURL', 'cbl_bypassRedirDest', 'cbl_bypassViewURL') as $key){ + $ret[] = $key; + } + return $ret; + } + public static function parseOptions(){ + $ret = array(); + foreach(self::$securityLevels[2]['checkboxes'] as $key => $val){ //value is not used. We just need the keys for validation + $ret[$key] = isset($_POST[$key]) ? '1' : '0'; + } + foreach(self::$securityLevels[2]['otherParams'] as $key => $val){ + if(isset($_POST[$key])){ + $ret[$key] = stripslashes($_POST[$key]); + } else { + error_log("Missing options param \"$key\" when parsing parameters."); + } + } + /* for debugging only: + foreach($_POST as $key => $val){ + if($key != 'action' && $key != 'nonce' && (! array_key_exists($key, self::$checkboxes)) && (! array_key_exists($key, self::$otherParams)) ){ + error_log("Unrecognized option: $key"); + } + } + */ + return $ret; + } + public static function setArray($arr){ + foreach($arr as $key => $val){ + self::set($key, $val); + } + } + public static function clearCache(){ + self::$cache = array(); + } + public static function getHTML($key){ + return esc_html(self::get($key)); + } + public static function inc($key){ + $val = self::get($key, false); + if(! $val){ + $val = 0; + } + self::set($key, $val + 1); + } + public static function set($key, $val){ + if($key == 'disableConfigCaching'){ + self::getDB()->queryWrite("insert into " . self::table() . " (name, val) values ('%s', '%s') ON DUPLICATE KEY UPDATE val='%s'", $key, $val, $val); + return; + } + + if(is_array($val)){ + $msg = "wfConfig::set() got an array as second param with key: $key and value: " . var_export($val, true); + wordfence::status(1, 'error', $msg); + return; + } + + self::getDB()->queryWrite("insert into " . self::table() . " (name, val) values ('%s', '%s') ON DUPLICATE KEY UPDATE val='%s'", $key, $val, $val); + self::$cache[$key] = $val; + self::clearDiskCache(); + } + private static function getCacheFile(){ + return wfUtils::getPluginBaseDir() . 'wordfence/tmp/configCache.php'; + } + public static function clearDiskCache(){ + //When we write to the cache we just trash the whole cache on the first write. Second write won't get called because we've disabled the cache. + // Neither will anything be loaded from the cache for the rest of this request and it also won't be updated. + // On the next request presumably we won't be doing a set() and so the cache will be populated again and continue to be used + // for each request as long as set() isn't called which would start the whole process over again. + if(! self::$diskCacheDisabled){ //We haven't had a write error to cache (so the cache is working) and clearDiskCache has not been called already + $cacheFile = self::getCacheFile(); + @unlink($cacheFile); + wfConfig::$diskCache = array(); + } + self::$diskCacheDisabled = true; + } + public static function get($key, $default = false){ + if($key == 'disableConfigCaching'){ + $val = self::getDB()->querySingle("select val from " . self::table() . " where name='%s'", $key); + return $val; + } + + if(! self::$cacheDisableCheckDone){ + self::$cacheDisableCheckDone = true; + $cachingDisabledSetting = self::getDB()->querySingle("select val from " . self::table() . " where name='%s'", 'disableConfigCaching'); + if($cachingDisabledSetting == '1'){ + self::$diskCacheDisabled = true; + } + } + + if(!array_key_exists($key, self::$cache)){ + $val = self::loadFromDiskCache($key); + //$val = self::getDB()->querySingle("select val from " . self::table() . " where name='%s'", $key); + self::$cache[$key] = $val; + } + $val = self::$cache[$key]; + return $val !== null ? $val : $default; + } + public static function loadFromDiskCache($key){ + if(! self::$diskCacheDisabled){ + if(isset(wfConfig::$diskCache[$key])){ + return wfConfig::$diskCache[$key]; + } + + $cacheFile = self::getCacheFile(); + if(is_file($cacheFile)){ + //require($cacheFile); //will only require the file on first parse through this code. But we dynamically update the var and update the file with each get + try { + $cont = @file_get_contents($cacheFile); + if(strpos($cont, 'querySingle("select val from " . self::table() . " where name='%s'", $key); + if(self::$diskCacheDisabled){ + return $val; + } + wfConfig::$diskCache[$key] = isset($val) ? $val : ''; + try { + $bytesWritten = @file_put_contents($cacheFile, self::$tmpFileHeader . serialize(wfConfig::$diskCache), LOCK_EX); + } catch(Exception $err2){} + if(! $bytesWritten){ + self::$diskCacheDisabled = true; + } + return $val; + } + public static function get_ser($key, $default, $canUseDisk = false){ //When using disk, reading a value deletes it. + //If we can use disk, check if there are any values stored on disk first and read them instead of the DB if there are values + if($canUseDisk){ + $filename = 'wordfence_tmpfile_' . $key . '.php'; + $dir = self::getTempDir(); + if($dir){ + $obj = false; + $fullFile = $dir . $filename; + if(file_exists($fullFile)){ + wordfence::status(4, 'info', "Loading serialized data from file $fullFile"); + $obj = unserialize(substr(file_get_contents($fullFile), strlen(self::$tmpFileHeader))); //Strip off security header and unserialize + if(! $obj){ + wordfence::status(2, 'error', "Could not unserialize file $fullFile"); + } + self::deleteOldTempFile($fullFile); + } + if($obj){ //If we managed to deserialize something, clean ALL tmp dirs of this file and return obj + return $obj; + } + } + } + + $res = self::getDB()->querySingle("select val from " . self::table() . " where name=%s", $key); + self::getDB()->flush(); //clear cache + if($res){ + return unserialize($res); + } + return $default; + } + public static function set_ser($key, $val, $canUseDisk = false){ + //We serialize some very big values so this is memory efficient. We don't make any copies of $val and don't use ON DUPLICATE KEY UPDATE + // because we would have to concatenate $val twice into the query which could also exceed max packet for the mysql server + $serialized = serialize($val); + $tempFilename = 'wordfence_tmpfile_' . $key . '.php'; + if((strlen($serialized) * 1.1) > self::getDB()->getMaxAllowedPacketBytes()){ //If it's greater than max_allowed_packet + 10% for escaping and SQL + if($canUseDisk){ + $dir = self::getTempDir(); + $potentialDirs = self::getPotentialTempDirs(); + if($dir){ + $fullFile = $dir . $tempFilename; + self::deleteOldTempFile($fullFile); + $fh = fopen($fullFile, 'w'); + if($fh){ + wordfence::status(4, 'info', "Serialized data for $key is " . strlen($serialized) . " bytes and is greater than max_allowed packet so writing it to disk file: " . $fullFile); + } else { + wordfence::status(1, 'error', "Your database doesn't allow big packets so we have to use files to store temporary data and Wordfence can't find a place to write them. Either ask your admin to increase max_allowed_packet on your MySQL database, or make one of the following directories writable by your web server: " . implode(', ', $potentialDirs)); + return false; + } + fwrite($fh, self::$tmpFileHeader); + fwrite($fh, $serialized); + fclose($fh); + return true; + } else { + wordfence::status(1, 'error', "Your database doesn't allow big packets so we have to use files to store temporary data and Wordfence can't find a place to write them. Either ask your admin to increase max_allowed_packet on your MySQL database, or make one of the following directories writable by your web server: " . implode(', ', $potentialDirs)); + return false; + } + + } else { + wordfence::status(1, 'error', "Wordfence tried to save a variable with name '$key' and your database max_allowed_packet is set to be too small. This particular variable can't be saved to disk. Please ask your administrator to increase max_allowed_packet. Thanks."); + return false; + } + } else { + //Delete temp files on disk or else the DB will be written to but get_ser will see files on disk and read them instead + $tempDir = self::getTempDir(); + if($tempDir){ + self::deleteOldTempFile($tempDir . $tempFilename); + } + $exists = self::getDB()->querySingle("select name from " . self::table() . " where name='%s'", $key); + if($exists){ + self::getDB()->queryWrite("update " . self::table() . " set val=%s where name=%s", $serialized, $key); + } else { + self::getDB()->queryWrite("insert IGNORE into " . self::table() . " (name, val) values (%s, %s)", $key, $serialized); + } + } + self::getDB()->flush(); + return true; + } + private static function deleteOldTempFile($filename){ + if(file_exists($filename)){ + @unlink($filename); + } + } + public static function getTempDir(){ + if(! self::$tmpDirCache){ + $dirs = self::getPotentialTempDirs(); + $finalDir = 'notmp'; + wfUtils::errorsOff(); + foreach($dirs as $dir){ + $dir = rtrim($dir, '/') . '/'; + $fh = @fopen($dir . 'wftmptest.txt', 'w'); + if(! $fh){ continue; } + $bytes = @fwrite($fh, 'test'); + if($bytes != 4){ @fclose($fh); continue; } + @fclose($fh); + if(! @unlink($dir . 'wftmptest.txt')){ continue; } + $finalDir = $dir; + break; + } + wfUtils::errorsOn(); + self::$tmpDirCache = $finalDir; + } + if(self::$tmpDirCache == 'notmp'){ + return false; + } else { + return self::$tmpDirCache; + } + } + private static function getPotentialTempDirs() { + return array(wfUtils::getPluginBaseDir() . 'wordfence/tmp/', sys_get_temp_dir(), ABSPATH . 'wp-content/uploads/'); + } + public static function f($key){ + echo esc_attr(self::get($key)); + } + public static function cbp($key){ + if(self::get('isPaid') && self::get($key)){ + echo ' checked '; + } + } + public static function cb($key){ + if(self::get($key)){ + echo ' checked '; + } + } + public static function sel($key, $val, $isDefault = false){ + if((! self::get($key)) && $isDefault){ echo ' selected '; } + if(self::get($key) == $val){ echo ' selected '; } + } + public static function getArray(){ + $q = self::getDB()->querySelect("select name, val from " . self::table()); + foreach($q as $row){ + self::$cache[$row['name']] = $row['val']; + } + return self::$cache; + } + private static function getDB(){ + if(! self::$DB){ + self::$DB = new wfDB(); + } + return self::$DB; + } + private static function table(){ + if(! self::$table){ + global $wpdb; + self::$table = $wpdb->base_prefix . 'wfConfig'; + } + return self::$table; + } + public static function haveAlertEmails(){ + $emails = self::getAlertEmails(); + return sizeof($emails) > 0 ? true : false; + } + public static function getAlertEmails(){ + $dat = explode(',', self::get('alertEmails')); + $emails = array(); + foreach($dat as $email){ + if(preg_match('/\@/', $email)){ + $emails[] = trim($email); + } + } + return $emails; + } + public static function getAlertLevel(){ + if(self::get('alertOn_warnings')){ + return 2; + } else if(self::get('alertOn_critical')){ + return 1; + } else { + return 0; + } + } + public static function liveTrafficEnabled(){ + if( (! self::get('liveTrafficEnabled')) || self::get('cacheType') == 'falcon' || self::get('cacheType') == 'php'){ return false; } + return true; + } + public static function enableAutoUpdate(){ + wfConfig::set('autoUpdate', '1'); + wp_clear_scheduled_hook('wordfence_daily_autoUpdate'); + if (is_main_site()) { + wp_schedule_event(time(), 'daily', 'wordfence_daily_autoUpdate'); + } + } + public static function disableAutoUpdate(){ + wfConfig::set('autoUpdate', '0'); + wp_clear_scheduled_hook('wordfence_daily_autoUpdate'); + } + public static function autoUpdate(){ + try { + if(getenv('noabort') != '1' && stristr($_SERVER['SERVER_SOFTWARE'], 'litespeed') !== false){ + $lastEmail = self::get('lastLiteSpdEmail', false); + if( (! $lastEmail) || (time() - (int)$lastEmail > (86400 * 30))){ + self::set('lastLiteSpdEmail', time()); + wordfence::alert("Wordfence Upgrade not run. Please modify your .htaccess", "To preserve the integrity of your website we are not running Wordfence auto-update.\n" . + "You are running the LiteSpeed web server which has been known to cause a problem with Wordfence auto-update.\n" . + "Please go to your website now and make a minor change to your .htaccess to fix this.\n" . + "You can find out how to make this change at:\n" . + "https://support.wordfence.com/solution/articles/1000129050-running-wordfence-under-litespeed-web-server-and-preventing-process-killing-or\n" . + "\nAlternatively you can disable auto-update on your website to stop receiving this message and upgrade Wordfence manually.\n", + '127.0.0.1' + ); + } + return; + } + require_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'); + require_once(ABSPATH . 'wp-admin/includes/misc.php'); + /* We were creating show_message here so that WP did not write to STDOUT. This had the strange effect of throwing an error about redeclaring show_message function, but only when a crawler hit the site and triggered the cron job. Not a human. So we're now just require'ing misc.php which does generate output, but that's OK because it is a loopback cron request. + if(! function_exists('show_message')){ + function show_message($msg = 'null'){} + } + */ + if(! defined('FS_METHOD')){ + define('FS_METHOD', 'direct'); //May be defined already and might not be 'direct' so this could cause problems. But we were getting reports of a warning that this is already defined, so this check added. + } + require_once(ABSPATH . 'wp-includes/update.php'); + require_once(ABSPATH . 'wp-admin/includes/file.php'); + wp_update_plugins(); + ob_start(); + $upgrader = new Plugin_Upgrader(); + $upret = $upgrader->upgrade('wordfence/wordfence.php'); + if($upret){ + $cont = file_get_contents(WP_PLUGIN_DIR . '/wordfence/wordfence.php'); + if(wfConfig::get('alertOn_update') == '1' && preg_match('/Version: (\d+\.\d+\.\d+)/', $cont, $matches) ){ + wordfence::alert("Wordfence Upgraded to version " . $matches[1], "Your Wordfence installation has been upgraded to version " . $matches[1], '127.0.0.1'); + } + } + $output = @ob_get_contents(); + @ob_end_clean(); + } catch(Exception $e){} + } + + /** + * .htaccess file contents to disable all script execution in a given directory. + */ + private static $_disable_scripts_htaccess = '# BEGIN Wordfence code execution protection + +php_flag engine 0 + + +AddHandler cgi-script .php .phtml .php3 .pl .py .jsp .asp .htm .shtml .sh .cgi +Options -ExecCGI +# END Wordfence code execution protection +'; + + private static function _uploadsHtaccessFilePath() { + $upload_dir = wp_upload_dir(); + return $upload_dir['basedir'] . '/.htaccess'; + } + + /** + * Add/Merge .htaccess file in the uploads directory to prevent code execution. + * + * @return bool + * @throws wfConfigException + */ + public static function disableCodeExecutionForUploads() { + $uploads_htaccess_file_path = self::_uploadsHtaccessFilePath(); + $uploads_htaccess_has_content = false; + if (file_exists($uploads_htaccess_file_path)) { + $htaccess_contents = file_get_contents($uploads_htaccess_file_path); + + // htaccess exists and contains our htaccess code to disable script execution, nothing more to do + if (strpos($htaccess_contents, self::$_disable_scripts_htaccess) !== false) { + return true; + } + $uploads_htaccess_has_content = strlen(trim($htaccess_contents)) > 0; + } + if (@file_put_contents($uploads_htaccess_file_path, ($uploads_htaccess_has_content ? "\n\n" : "") . self::$_disable_scripts_htaccess, FILE_APPEND | LOCK_EX) === false) { + throw new wfConfigException("Unable to save the .htaccess file needed to disable script execution in the uploads directory. Please check your permissions on that directory."); + } + return true; + } + + /** + * Remove script execution protections for our the .htaccess file in the uploads directory. + * + * @return bool + * @throws wfConfigException + */ + public static function removeCodeExecutionProtectionForUploads() { + $uploads_htaccess_file_path = self::_uploadsHtaccessFilePath(); + if (file_exists($uploads_htaccess_file_path)) { + $htaccess_contents = file_get_contents($uploads_htaccess_file_path); + + // Check that it is in the file + if (strpos($htaccess_contents, self::$_disable_scripts_htaccess) !== false) { + $htaccess_contents = str_replace(self::$_disable_scripts_htaccess, '', $htaccess_contents); + + $error_message = "Unable to remove code execution protections applied to the .htaccess file in the uploads directory. Please check your permissions on that file."; + if (strlen(trim($htaccess_contents)) === 0) { + // empty file, remove it + if (!@unlink($uploads_htaccess_file_path)) { + throw new wfConfigException($error_message); + } + + } elseif (@file_put_contents($uploads_htaccess_file_path, $htaccess_contents, LOCK_EX) === false) { + throw new wfConfigException($error_message); + } + } + } + return true; + } +} + +class wfConfigException extends Exception {} + +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCrawl.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCrawl.php index e3a1866c..f82ac3a6 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCrawl.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfCrawl.php @@ -1,3 +1,184 @@ +<<<<<<< .mine +getBrowser($UA); + if($b && isset($b['Crawler']) && $b['Crawler']){ + return true; + } + return false; + } + public static function verifyCrawlerPTR($hostPattern, $IP){ + global $wpdb; $table = $wpdb->base_prefix . 'wfCrawlers'; + $db = new wfDB(); + $IPn = wfUtils::inet_pton($IP); + $status = $db->querySingle("select status from $table where IP=%s and patternSig=UNHEX(MD5('%s')) and lastUpdate > unix_timestamp() - %d", $IPn, $hostPattern, WORDFENCE_CRAWLER_VERIFY_CACHE_TIME); + if($status){ + if($status == 'verified'){ + return true; + } else { + return false; + } + } + $host = wfUtils::reverseLookup($IP); + if(! $host){ + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate, PTR) values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp(), '%s') ON DUPLICATE KEY UPDATE status='%s', lastUpdate=unix_timestamp(), PTR='%s'", $IPn, $hostPattern, 'noPTR', '', 'noPTR', ''); + return false; + } + if(preg_match($hostPattern, $host)){ + $resultIPs = wfUtils::resolveDomainName($host); + $addrsMatch = false; + foreach($resultIPs as $resultIP){ + if($resultIP == $IP){ + $addrsMatch = true; + break; + } + } + if($addrsMatch){ + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate, PTR) values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp(), '%s') ON DUPLICATE KEY UPDATE status='%s', lastUpdate=unix_timestamp(), PTR='%s'", $IPn, $hostPattern, 'verified', $host, 'verified', $host); + return true; + } else { + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate, PTR) values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp(), '%s') ON DUPLICATE KEY UPDATE status='%s', lastUpdate=unix_timestamp(), PTR='%s'", $IPn, $hostPattern, 'fwdFail', $host, 'fwdFail', $host); + return false; + } + } else { + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate, PTR) values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp(), '%s') ON DUPLICATE KEY UPDATE status='%s', lastUpdate=unix_timestamp(), PTR='%s'", $IPn, $hostPattern, 'badPTR', $host, 'badPTR', $host); + return false; + } + } + public static function isGooglebot(){ + $UA = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''); + if(preg_match('/Googlebot\/\d\.\d/', $UA)){ // UA: Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html) or (rarely used): Googlebot/2.1 (+http://www.google.com/bot.html) + return true; + } + return false; + } + public static function isGoogleCrawler($UA = null){ + if ($UA === null) { + $UA = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''); + } + + foreach(self::$googPat as $pat){ + if(preg_match($pat . 'i', $UA)){ + return true; + } + } + return false; + } + private static $googPat = array( +'@^Mozilla/5\\.0 \$.*Google Keyword Tool.*\$$@', +'@^Mozilla/5\\.0 \$.*Feedfetcher\\-Google.*\$$@', +'@^Feedfetcher\\-Google\\-iGoogleGadgets.*$@', +'@^searchbot admin\\@google\\.com$@', +'@^Google\\-Site\\-Verification.*$@', +'@^Google OpenSocial agent.*$@', +'@^.*Googlebot\\-Mobile/2\\..*$@', +'@^AdsBot\\-Google\\-Mobile.*$@', +'@^google \$.*Enterprise.*\$$@', +'@^Mediapartners\\-Google.*$@', +'@^GoogleFriendConnect.*$@', +'@^googlebot\\-urlconsole$@', +'@^.*Google Web Preview.*$@', +'@^Feedfetcher\\-Google.*$@', +'@^AppEngine\\-Google.*$@', +'@^Googlebot\\-Video.*$@', +'@^Googlebot\\-Image.*$@', +'@^Google\\-Sitemaps.*$@', +'@^Googlebot/Test.*$@', +'@^Googlebot\\-News.*$@', +'@^.*Googlebot/2\\.1.*$@', +'@^AdsBot\\-Google.*$@', +'@^Google$@' + ); + + + /** + * Has correct user agent and PTR record points to .googlebot.com domain. + * + * @param string|null $ip + * @param string|null $ua + * @return bool + */ + public static function isVerifiedGoogleCrawler($ip = null, $ua = null) { + static $verified; + if (!isset($verified)) { + $verified = array(); + } + if ($ip === null) { + $ip = wfUtils::getIP(); + } + if (array_key_exists($ip, $verified)) { + return $verified[$ip]; + } + if (self::isGoogleCrawler($ua)) { + if (self::verifyCrawlerPTR(wordfence::getLog()->getGooglePattern(), $ip)) { + $verified[$ip] = true; + return $verified[$ip]; + } + if (self::verifyGooglebotViaNOC1($ip)) { + $verified[$ip] = true; + return $verified[$ip]; + } + } + $verified[$ip] = false; + return $verified[$ip]; + } + + /** + * @param string|null $ip + * @return bool + */ + public static function verifyGooglebotViaNOC1($ip = null) { + global $wpdb; + $table = $wpdb->base_prefix . 'wfCrawlers'; + if ($ip === null) { + $ip = wfUtils::getIP(); + } + $db = new wfDB(); + $IPn = wfUtils::inet_pton($ip); + $patternSig = 'googlenoc1'; + $status = $db->querySingle("select status from $table + where IP=%s + and patternSig=UNHEX(MD5('%s')) + and lastUpdate > unix_timestamp() - %d", + $IPn, + $patternSig, + WORDFENCE_CRAWLER_VERIFY_CACHE_TIME); + if ($status === 'verified') { + return true; + } else if ($status === 'fakeBot') { + return false; + } + + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $data = $api->call('verify_googlebot', array( + 'ip' => $ip, + )); + if (is_array($data) && !empty($data['verified'])) { + // Cache results + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate) +values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp()) +ON DUPLICATE KEY UPDATE status='%3\$s', lastUpdate=unix_timestamp()", + $IPn, $patternSig, 'verified'); + return true; + } else { + $db->queryWrite("insert into $table (IP, patternSig, status, lastUpdate) +values (%s, UNHEX(MD5('%s')), '%s', unix_timestamp()) +ON DUPLICATE KEY UPDATE status='%3\$s', lastUpdate=unix_timestamp()", + $IPn, $patternSig, 'fakeBot'); + } + } catch (Exception $e) { + // Do nothing, bail + } + return false; + } +} +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfGeoIP.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfGeoIP.php index d545304b..09f916a9 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfGeoIP.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfGeoIP.php @@ -1,3 +1,771 @@ +<<<<<<< .mine + 0, "AP" => 1, "EU" => 2, "AD" => 3, "AE" => 4, "AF" => 5, +"AG" => 6, "AI" => 7, "AL" => 8, "AM" => 9, "CW" => 10, "AO" => 11, +"AQ" => 12, "AR" => 13, "AS" => 14, "AT" => 15, "AU" => 16, "AW" => 17, +"AZ" => 18, "BA" => 19, "BB" => 20, "BD" => 21, "BE" => 22, "BF" => 23, +"BG" => 24, "BH" => 25, "BI" => 26, "BJ" => 27, "BM" => 28, "BN" => 29, +"BO" => 30, "BR" => 31, "BS" => 32, "BT" => 33, "BV" => 34, "BW" => 35, +"BY" => 36, "BZ" => 37, "CA" => 38, "CC" => 39, "CD" => 40, "CF" => 41, +"CG" => 42, "CH" => 43, "CI" => 44, "CK" => 45, "CL" => 46, "CM" => 47, +"CN" => 48, "CO" => 49, "CR" => 50, "CU" => 51, "CV" => 52, "CX" => 53, +"CY" => 54, "CZ" => 55, "DE" => 56, "DJ" => 57, "DK" => 58, "DM" => 59, +"DO" => 60, "DZ" => 61, "EC" => 62, "EE" => 63, "EG" => 64, "EH" => 65, +"ER" => 66, "ES" => 67, "ET" => 68, "FI" => 69, "FJ" => 70, "FK" => 71, +"FM" => 72, "FO" => 73, "FR" => 74, "SX" => 75, "GA" => 76, "GB" => 77, +"GD" => 78, "GE" => 79, "GF" => 80, "GH" => 81, "GI" => 82, "GL" => 83, +"GM" => 84, "GN" => 85, "GP" => 86, "GQ" => 87, "GR" => 88, "GS" => 89, +"GT" => 90, "GU" => 91, "GW" => 92, "GY" => 93, "HK" => 94, "HM" => 95, +"HN" => 96, "HR" => 97, "HT" => 98, "HU" => 99, "ID" => 100, "IE" => 101, +"IL" => 102, "IN" => 103, "IO" => 104, "IQ" => 105, "IR" => 106, "IS" => 107, +"IT" => 108, "JM" => 109, "JO" => 110, "JP" => 111, "KE" => 112, "KG" => 113, +"KH" => 114, "KI" => 115, "KM" => 116, "KN" => 117, "KP" => 118, "KR" => 119, +"KW" => 120, "KY" => 121, "KZ" => 122, "LA" => 123, "LB" => 124, "LC" => 125, +"LI" => 126, "LK" => 127, "LR" => 128, "LS" => 129, "LT" => 130, "LU" => 131, +"LV" => 132, "LY" => 133, "MA" => 134, "MC" => 135, "MD" => 136, "MG" => 137, +"MH" => 138, "MK" => 139, "ML" => 140, "MM" => 141, "MN" => 142, "MO" => 143, +"MP" => 144, "MQ" => 145, "MR" => 146, "MS" => 147, "MT" => 148, "MU" => 149, +"MV" => 150, "MW" => 151, "MX" => 152, "MY" => 153, "MZ" => 154, "NA" => 155, +"NC" => 156, "NE" => 157, "NF" => 158, "NG" => 159, "NI" => 160, "NL" => 161, +"NO" => 162, "NP" => 163, "NR" => 164, "NU" => 165, "NZ" => 166, "OM" => 167, +"PA" => 168, "PE" => 169, "PF" => 170, "PG" => 171, "PH" => 172, "PK" => 173, +"PL" => 174, "PM" => 175, "PN" => 176, "PR" => 177, "PS" => 178, "PT" => 179, +"PW" => 180, "PY" => 181, "QA" => 182, "RE" => 183, "RO" => 184, "RU" => 185, +"RW" => 186, "SA" => 187, "SB" => 188, "SC" => 189, "SD" => 190, "SE" => 191, +"SG" => 192, "SH" => 193, "SI" => 194, "SJ" => 195, "SK" => 196, "SL" => 197, +"SM" => 198, "SN" => 199, "SO" => 200, "SR" => 201, "ST" => 202, "SV" => 203, +"SY" => 204, "SZ" => 205, "TC" => 206, "TD" => 207, "TF" => 208, "TG" => 209, +"TH" => 210, "TJ" => 211, "TK" => 212, "TM" => 213, "TN" => 214, "TO" => 215, +"TL" => 216, "TR" => 217, "TT" => 218, "TV" => 219, "TW" => 220, "TZ" => 221, +"UA" => 222, "UG" => 223, "UM" => 224, "US" => 225, "UY" => 226, "UZ" => 227, +"VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233, +"VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239, +"ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245, +"O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250, "BL" => 251, +"MF" => 252, "BQ" => 253, +); + var $GEOIP_COUNTRY_CODES = array( + "","AP","EU","AD","AE","AF","AG","AI","AL","AM","CW", + "AO","AQ","AR","AS","AT","AU","AW","AZ","BA","BB", + "BD","BE","BF","BG","BH","BI","BJ","BM","BN","BO", + "BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD", + "CF","CG","CH","CI","CK","CL","CM","CN","CO","CR", + "CU","CV","CX","CY","CZ","DE","DJ","DK","DM","DO", + "DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ", + "FK","FM","FO","FR","SX","GA","GB","GD","GE","GF", + "GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT", + "GU","GW","GY","HK","HM","HN","HR","HT","HU","ID", + "IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO", + "JP","KE","KG","KH","KI","KM","KN","KP","KR","KW", + "KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT", + "LU","LV","LY","MA","MC","MD","MG","MH","MK","ML", + "MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV", + "MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI", + "NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF", + "PG","PH","PK","PL","PM","PN","PR","PS","PT","PW", + "PY","QA","RE","RO","RU","RW","SA","SB","SC","SD", + "SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO", + "SR","ST","SV","SY","SZ","TC","TD","TF","TG","TH", + "TJ","TK","TM","TN","TO","TL","TR","TT","TV","TW", + "TZ","UA","UG","UM","US","UY","UZ","VA","VC","VE", + "VG","VI","VN","VU","WF","WS","YE","YT","RS","ZA", + "ZM","ME","ZW","A1","A2","O1","AX","GG","IM","JE", + "BL","MF", "BQ"); + var $GEOIP_COUNTRY_CODES3 = array( + "","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","CUW", + "AGO","ATA","ARG","ASM","AUT","AUS","ABW","AZE","BIH","BRB", + "BGD","BEL","BFA","BGR","BHR","BDI","BEN","BMU","BRN","BOL", + "BRA","BHS","BTN","BVT","BWA","BLR","BLZ","CAN","CCK","COD", + "CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI", + "CUB","CPV","CXR","CYP","CZE","DEU","DJI","DNK","DMA","DOM", + "DZA","ECU","EST","EGY","ESH","ERI","ESP","ETH","FIN","FJI", + "FLK","FSM","FRO","FRA","SXM","GAB","GBR","GRD","GEO","GUF", + "GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","SGS","GTM", + "GUM","GNB","GUY","HKG","HMD","HND","HRV","HTI","HUN","IDN", + "IRL","ISR","IND","IOT","IRQ","IRN","ISL","ITA","JAM","JOR", + "JPN","KEN","KGZ","KHM","KIR","COM","KNA","PRK","KOR","KWT", + "CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU", + "LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI", + "MMR","MNG","MAC","MNP","MTQ","MRT","MSR","MLT","MUS","MDV", + "MWI","MEX","MYS","MOZ","NAM","NCL","NER","NFK","NGA","NIC", + "NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER","PYF", + "PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW", + "PRY","QAT","REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN", + "SWE","SGP","SHN","SVN","SJM","SVK","SLE","SMR","SEN","SOM", + "SUR","STP","SLV","SYR","SWZ","TCA","TCD","ATF","TGO","THA", + "TJK","TKL","TKM","TUN","TON","TLS","TUR","TTO","TUV","TWN", + "TZA","UKR","UGA","UMI","USA","URY","UZB","VAT","VCT","VEN", + "VGB","VIR","VNM","VUT","WLF","WSM","YEM","MYT","SRB","ZAF", + "ZMB","MNE","ZWE","A1","A2","O1","ALA","GGY","IMN","JEY", + "BLM","MAF", "BES" + ); + var $GEOIP_COUNTRY_NAMES = array( + "","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Curacao", + "Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados", + "Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia", + "Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the", + "Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica", + "Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic", + "Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji", + "Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","Sint Maarten (Dutch part)","Gabon","United Kingdom","Grenada","Georgia","French Guiana", + "Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala", + "Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia", + "Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan", + "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait", + "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania", + "Luxembourg","Latvia","Libya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali", + "Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives", + "Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua", + "Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia", + "Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau", + "Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan", + "Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname", + "Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand", + "Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan", + "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela", + "Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa", + "Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey", + "Saint Barthelemy","Saint Martin", "Bonaire, Saint Eustatius and Saba" +); + + var $GEOIP_CONTINENT_CODES = array( + "--", "AS","EU","EU","AS","AS","NA","NA","EU","AS","NA", + "AF","AN","SA","OC","EU","OC","NA","AS","EU","NA", + "AS","EU","AF","EU","AS","AF","AF","NA","AS","SA", + "SA","NA","AS","AN","AF","EU","NA","NA","AS","AF", + "AF","AF","EU","AF","OC","SA","AF","AS","SA","NA", + "NA","AF","AS","AS","EU","EU","AF","EU","NA","NA", + "AF","SA","EU","AF","AF","AF","EU","AF","EU","OC", + "SA","OC","EU","EU","NA","AF","EU","NA","AS","SA", + "AF","EU","NA","AF","AF","NA","AF","EU","AN","NA", + "OC","AF","SA","AS","AN","NA","EU","NA","EU","AS", + "EU","AS","AS","AS","AS","AS","EU","EU","NA","AS", + "AS","AF","AS","AS","OC","AF","NA","AS","AS","AS", + "NA","AS","AS","AS","NA","EU","AS","AF","AF","EU", + "EU","EU","AF","AF","EU","EU","AF","OC","EU","AF", + "AS","AS","AS","OC","NA","AF","NA","EU","AF","AS", + "AF","NA","AS","AF","AF","OC","AF","OC","AF","NA", + "EU","EU","AS","OC","OC","OC","AS","NA","SA","OC", + "OC","AS","AS","EU","NA","OC","NA","AS","EU","OC", + "SA","AS","AF","EU","EU","AF","AS","OC","AF","AF", + "EU","AS","AF","EU","EU","EU","AF","EU","AF","AF", + "SA","AF","NA","AS","AF","NA","AF","AN","AF","AS", + "AS","OC","AS","AF","OC","AS","EU","NA","OC","AS", + "AF","EU","AF","OC","NA","SA","AS","EU","NA","SA", + "NA","NA","AS","OC","OC","OC","AS","AF","EU","AF", + "AF","EU","AF","--","--","--","EU","EU","EU","EU", + "NA","NA","NA" +); + +} +if(! function_exists('geoip_load_shared_mem')){ + function geoip_load_shared_mem ($file) { + + $fp = fopen($file, "rb"); + if (!$fp) { + print "error opening $file: $php_errormsg\n"; + exit; + } + $s_array = fstat($fp); + $size = $s_array['size']; + if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) { + shmop_delete ($shmid); + shmop_close ($shmid); + } + $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size); + shmop_write ($shmid, fread($fp, $size), 0); + shmop_close ($shmid); + } +} + +if(! function_exists('')){ + function _setup_segments($gi){ + $gi->databaseType = GEOIP_COUNTRY_EDITION; + $gi->record_length = STANDARD_RECORD_LENGTH; + if ($gi->flags & GEOIP_SHARED_MEMORY) { + $offset = @shmop_size ($gi->shmid) - 3; + for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) { + $delim = @shmop_read ($gi->shmid, $offset, 3); + $offset += 3; + if ($delim == (chr(255).chr(255).chr(255))) { + $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1)); + $offset++; + + if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){ + $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0; + } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){ + $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1; + } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)|| + ($gi->databaseType == GEOIP_CITY_EDITION_REV1) + || ($gi->databaseType == GEOIP_ORG_EDITION) + || ($gi->databaseType == GEOIP_ORG_EDITION_V6) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6) + || ($gi->databaseType == GEOIP_ISP_EDITION) + || ($gi->databaseType == GEOIP_ISP_EDITION_V6) + || ($gi->databaseType == GEOIP_USERTYPE_EDITION) + || ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6) + || ($gi->databaseType == GEOIP_LOCATIONA_EDITION) + || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6) + || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1) + || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6) + || ($gi->databaseType == GEOIP_ASNUM_EDITION) + || ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)){ + $gi->databaseSegments = 0; + $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH); + for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){ + $gi->databaseSegments += (ord($buf[$j]) << ($j * 8)); + } + if (($gi->databaseType == GEOIP_ORG_EDITION) + || ($gi->databaseType == GEOIP_ORG_EDITION_V6) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6) + || ($gi->databaseType == GEOIP_ISP_EDITION) + || ($gi->databaseType == GEOIP_ISP_EDITION_V6)) { + $gi->record_length = ORG_RECORD_LENGTH; + } + } + break; + } else { + $offset -= 4; + } + } + if (($gi->databaseType == GEOIP_COUNTRY_EDITION)|| + ($gi->databaseType == GEOIP_COUNTRY_EDITION_V6)|| + ($gi->databaseType == GEOIP_PROXY_EDITION)|| + ($gi->databaseType == GEOIP_NETSPEED_EDITION)){ + $gi->databaseSegments = GEOIP_COUNTRY_BEGIN; + } + } else { + $filepos = ftell($gi->filehandle); + fseek($gi->filehandle, -3, SEEK_END); + for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) { + $delim = fread($gi->filehandle,3); + if ($delim == (chr(255).chr(255).chr(255))){ + $gi->databaseType = ord(fread($gi->filehandle,1)); + if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){ + $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0; + } + else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){ + $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1; + } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV1) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6) + || ($gi->databaseType == GEOIP_ORG_EDITION) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION) + || ($gi->databaseType == GEOIP_ISP_EDITION) + || ($gi->databaseType == GEOIP_ORG_EDITION_V6) + || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6) + || ($gi->databaseType == GEOIP_ISP_EDITION_V6) + || ($gi->databaseType == GEOIP_LOCATIONA_EDITION) + || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6) + || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6) + || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1) + || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6) + || ($gi->databaseType == GEOIP_USERTYPE_EDITION) + || ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6) + || ($gi->databaseType == GEOIP_ASNUM_EDITION) + || ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)){ + $gi->databaseSegments = 0; + $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH); + for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){ + $gi->databaseSegments += (ord($buf[$j]) << ($j * 8)); + } + if ( ( $gi->databaseType == GEOIP_ORG_EDITION ) + || ( $gi->databaseType == GEOIP_DOMAIN_EDITION ) + || ( $gi->databaseType == GEOIP_ISP_EDITION ) + || ( $gi->databaseType == GEOIP_ORG_EDITION_V6 ) + || ( $gi->databaseType == GEOIP_DOMAIN_EDITION_V6 ) + || ( $gi->databaseType == GEOIP_ISP_EDITION_V6 )) { + $gi->record_length = ORG_RECORD_LENGTH; + } + } + break; + } else { + fseek($gi->filehandle, -4, SEEK_CUR); + } + } + if (($gi->databaseType == GEOIP_COUNTRY_EDITION)|| + ($gi->databaseType == GEOIP_COUNTRY_EDITION_V6)|| + ($gi->databaseType == GEOIP_PROXY_EDITION)|| + ($gi->databaseType == GEOIP_NETSPEED_EDITION)){ + $gi->databaseSegments = GEOIP_COUNTRY_BEGIN; + } + fseek($gi->filehandle,$filepos,SEEK_SET); + } + return $gi; + } +} + +if(! function_exists('geoip_open')){ + function geoip_open($filename, $flags) { + $gi = new wfGeoIP; + $gi->flags = $flags; + if ($gi->flags & GEOIP_SHARED_MEMORY) { + $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0); + } else { + $gi->filehandle = fopen($filename,"rb") or die( "Can not open $filename\n" ); + if ($gi->flags & GEOIP_MEMORY_CACHE) { + $s_array = fstat($gi->filehandle); + $gi->memory_buffer = fread($gi->filehandle, $s_array['size']); + } + } + + $gi = _setup_segments($gi); + return $gi; + } +} + +if(! function_exists('geoip_close')){ + function geoip_close($gi) { + if ($gi->flags & GEOIP_SHARED_MEMORY) { + return true; + } + + return fclose($gi->filehandle); + } +} + +if(! function_exists('geoip_country_id_by_name_v6')){ + function geoip_country_id_by_name_v6($gi, $name) { + $rec = dns_get_record($name, DNS_AAAA); + if ( !$rec ) { + return false; + } + $addr = $rec[0]["ipv6"]; + if (!$addr || $addr == $name) { + return false; + } + return geoip_country_id_by_addr_v6($gi, $addr); + } +} + +if(! function_exists('geoip_country_id_by_name')){ + function geoip_country_id_by_name($gi, $name) { + $addr = gethostbyname($name); + if (!$addr || $addr == $name) { + return false; + } + return geoip_country_id_by_addr($gi, $addr); + } +} + +if(! function_exists('geoip_country_id_by_name')){ + function geoip_country_code_by_name_v6($gi, $name) { + $country_id = geoip_country_id_by_name_v6($gi,$name); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_CODES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_code_by_name')){ + function geoip_country_code_by_name($gi, $name) { + $country_id = geoip_country_id_by_name($gi,$name); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_CODES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_name_by_name_v6')){ + function geoip_country_name_by_name_v6($gi, $name) { + $country_id = geoip_country_id_by_name_v6($gi,$name); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_NAMES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_name_by_name')){ + function geoip_country_name_by_name($gi, $name) { + $country_id = geoip_country_id_by_name($gi,$name); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_NAMES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_id_by_addr_v6')){ + function geoip_country_id_by_addr_v6($gi, $addr) { + $ipnum = wfUtils::inet_pton($addr); + return _geoip_seek_country_v6($gi, $ipnum) - GEOIP_COUNTRY_BEGIN; + } +} + +if(! function_exists('geoip_country_id_by_addr')){ + function geoip_country_id_by_addr($gi, $addr) { + $ipnum = ip2long($addr); + return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN; + } +} + +if(! function_exists('geoip_country_code_by_addr_v6')){ + function geoip_country_code_by_addr_v6($gi, $addr) { + $country_id = geoip_country_id_by_addr_v6($gi,$addr); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_CODES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_code_by_addr')){ + function geoip_country_code_by_addr($gi, $addr) { + if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) { + $record = geoip_record_by_addr($gi,$addr); + if ( $record !== false ) { + return $record->country_code; + } + } else { + $country_id = geoip_country_id_by_addr($gi,$addr); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_CODES[$country_id]; + } + } + return false; + } +} + +if(! function_exists('geoip_country_name_by_addr_v6')){ + function geoip_country_name_by_addr_v6($gi, $addr) { + $country_id = geoip_country_id_by_addr_v6($gi,$addr); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_NAMES[$country_id]; + } + return false; + } +} + +if(! function_exists('geoip_country_name_by_addr')){ + function geoip_country_name_by_addr($gi, $addr) { + if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) { + $record = geoip_record_by_addr($gi,$addr); + return $record->country_name; + } else { + $country_id = geoip_country_id_by_addr($gi,$addr); + if ($country_id !== false) { + return $gi->GEOIP_COUNTRY_NAMES[$country_id]; + } + } + return false; + } +} + +if(! function_exists('_geoip_seek_country_v6')){ + function _geoip_seek_country_v6($gi, $ipnum) { + + # arrays from unpack start with offset 1 + # yet another php mystery. array_merge work around + # this broken behaviour + $v6vec = array_merge(unpack( "C16", $ipnum)); + + $offset = 0; + for ($depth = 127; $depth >= 0; --$depth) { + if ($gi->flags & GEOIP_MEMORY_CACHE) { + // workaround php's broken substr, strpos, etc handling with + // mbstring.func_overload and mbstring.internal_encoding + $enc = mb_internal_encoding(); + mb_internal_encoding('ISO-8859-1'); + + $buf = substr($gi->memory_buffer, + 2 * $gi->record_length * $offset, + 2 * $gi->record_length); + + mb_internal_encoding($enc); + } elseif ($gi->flags & GEOIP_SHARED_MEMORY) { + $buf = @shmop_read ($gi->shmid, + 2 * $gi->record_length * $offset, + 2 * $gi->record_length ); + } else { + fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0 + or die("fseek failed"); + $buf = fread($gi->filehandle, 2 * $gi->record_length); + } + $x = array(0,0); + for ($i = 0; $i < 2; ++$i) { + for ($j = 0; $j < $gi->record_length; ++$j) { + $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8); + } + } + + $bnum = 127 - $depth; + $idx = $bnum >> 3; + $b_mask = 1 << ( $bnum & 7 ^ 7 ); + if (($v6vec[$idx] & $b_mask) > 0) { + if ($x[1] >= $gi->databaseSegments) { + return $x[1]; + } + $offset = $x[1]; + } else { + if ($x[0] >= $gi->databaseSegments) { + return $x[0]; + } + $offset = $x[0]; + } + } + trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR); + return false; + } +} + +if(! function_exists('_geoip_seek_country')){ + function _geoip_seek_country($gi, $ipnum) { + $offset = 0; + for ($depth = 31; $depth >= 0; --$depth) { + if ($gi->flags & GEOIP_MEMORY_CACHE) { + // workaround php's broken substr, strpos, etc handling with + // mbstring.func_overload and mbstring.internal_encoding + $enc = mb_internal_encoding(); + mb_internal_encoding('ISO-8859-1'); + + $buf = substr($gi->memory_buffer, + 2 * $gi->record_length * $offset, + 2 * $gi->record_length); + + mb_internal_encoding($enc); + } elseif ($gi->flags & GEOIP_SHARED_MEMORY) { + $buf = @shmop_read ($gi->shmid, + 2 * $gi->record_length * $offset, + 2 * $gi->record_length ); + } else { + fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0 + or die("fseek failed"); + $buf = fread($gi->filehandle, 2 * $gi->record_length); + } + $x = array(0,0); + for ($i = 0; $i < 2; ++$i) { + for ($j = 0; $j < $gi->record_length; ++$j) { + $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8); + } + } + if ($ipnum & (1 << $depth)) { + if ($x[1] >= $gi->databaseSegments) { + return $x[1]; + } + $offset = $x[1]; + } else { + if ($x[0] >= $gi->databaseSegments) { + return $x[0]; + } + $offset = $x[0]; + } + } + trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR); + return false; + } +} + +if(! function_exists('_common_get_org')){ + function _common_get_org($gi, $seek_org){ + $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments; + if ($gi->flags & GEOIP_SHARED_MEMORY) { + $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH); + } else { + fseek($gi->filehandle, $record_pointer, SEEK_SET); + $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH); + } + // workaround php's broken substr, strpos, etc handling with + // mbstring.func_overload and mbstring.internal_encoding + $enc = mb_internal_encoding(); + mb_internal_encoding('ISO-8859-1'); + $org_buf = substr($org_buf, 0, strpos($org_buf, "\0")); + mb_internal_encoding($enc); + return $org_buf; + } +} + +if(! function_exists('_get_org_v6')){ + function _get_org_v6($gi,$ipnum){ + $seek_org = _geoip_seek_country_v6($gi,$ipnum); + if ($seek_org == $gi->databaseSegments) { + return NULL; + } + return _common_get_org($gi, $seek_org); + } +} + +if(! function_exists('_get_org')){ + function _get_org($gi,$ipnum){ + $seek_org = _geoip_seek_country($gi,$ipnum); + if ($seek_org == $gi->databaseSegments) { + return NULL; + } + return _common_get_org($gi, $seek_org); + } +} + +if(! function_exists('geoip_name_by_addr_v6')){ + function geoip_name_by_addr_v6 ($gi,$addr) { + if ($addr == NULL) { + return 0; + } + $ipnum = wfUtils::inet_pton($addr); + return _get_org_v6($gi, $ipnum); + } +} + +if(! function_exists('geoip_name_by_addr')){ + function geoip_name_by_addr ($gi,$addr) { + if ($addr == NULL) { + return 0; + } + $ipnum = ip2long($addr); + return _get_org($gi, $ipnum); + } +} + +if(! function_exists('geoip_org_by_addr')){ + function geoip_org_by_addr ($gi,$addr) { + return geoip_name_by_addr($gi, $addr); + } +} + +if(! function_exists('_get_region')){ + function _get_region($gi,$ipnum){ + if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){ + $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0; + if ($seek_region >= 1000){ + $country_code = "US"; + $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65); + } else { + $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region]; + $region = ""; + } + return array ($country_code,$region); + } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) { + $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1; + //print $seek_region; + if ($seek_region < US_OFFSET){ + $country_code = ""; + $region = ""; + } else if ($seek_region < CANADA_OFFSET) { + $country_code = "US"; + $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65); + } else if ($seek_region < WORLD_OFFSET) { + $country_code = "CA"; + $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65); + } else { + $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE]; + $region = ""; + } + return array ($country_code,$region); + } + } +} + +if(! function_exists('geoip_region_by_addr')){ + function geoip_region_by_addr ($gi,$addr) { + if ($addr == NULL) { + return 0; + } + $ipnum = ip2long($addr); + return _get_region($gi, $ipnum); + } +} + +if(! function_exists('getdnsattributes')){ + function getdnsattributes ($l,$ip){ + $r = new Net_DNS_Resolver(); + $r->nameservers = array("ws1.maxmind.com"); + $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN"); + $str = is_object($p->answer[0])?$p->answer[0]->string():''; + $str = substr( $str, 1, -1 ); + return $str; + } +} +} +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfLog.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfLog.php index 931255a4..de5e0a6c 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfLog.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfLog.php @@ -1,3 +1,1268 @@ +<<<<<<< .mine +apiKey = $apiKey; + $this->wp_version = $wp_version; + global $wpdb; + $this->hitsTable = $wpdb->base_prefix . 'wfHits'; + $this->loginsTable = $wpdb->base_prefix . 'wfLogins'; + $this->blocksTable = $wpdb->base_prefix . 'wfBlocks'; + $this->lockOutTable = $wpdb->base_prefix . 'wfLockedOut'; + $this->leechTable = $wpdb->base_prefix . 'wfLeechers'; + $this->badLeechersTable = $wpdb->base_prefix . 'wfBadLeechers'; + $this->scanTable = $wpdb->base_prefix . 'wfScanners'; + $this->throttleTable = $wpdb->base_prefix . 'wfThrottleLog'; + $this->statusTable = $wpdb->base_prefix . 'wfStatus'; + $this->ipRangesTable = $wpdb->base_prefix . 'wfBlocksAdv'; + $this->perfTable = $wpdb->base_prefix . 'wfPerfLog'; + } + public function logPerf($IP, $UA, $URL, $data){ + $IP = wfUtils::inet_pton($IP); + $this->getDB()->queryWrite("insert into " . $this->perfTable . " (IP, userID, UA, URL, ctime, fetchStart, domainLookupStart, domainLookupEnd, connectStart, connectEnd, requestStart, responseStart, responseEnd, domReady, loaded) values (%s, %d, '%s', '%s', unix_timestamp(), %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", + $IP, + $this->getCurrentUserID(), + $UA, + $URL, + $data['fetchStart'], + $data['domainLookupStart'], + $data['domainLookupEnd'], + $data['connectStart'], + $data['connectEnd'], + $data['requestStart'], + $data['responseStart'], + $data['responseEnd'], + $data['domReady'], + $data['loaded'] + ); + } + public function logLogin($action, $fail, $username){ + if(! $username){ + return; + } + $user = get_user_by('login', $username); + $userID = 0; + if($user){ + $userID = $user->ID; + if(! $userID){ + return; + } + } + // change the action flag here if the user does not exist. + if ($action == 'loginFailValidUsername' && $userID == 0) { + $action = 'loginFailInvalidUsername'; + } + //Else userID stays 0 but we do log this even though the user doesn't exist. + $this->getDB()->queryWrite("insert into " . $this->loginsTable . " (ctime, fail, action, username, userID, IP, UA) values (%f, %d, '%s', '%s', %s, %s, '%s')", + sprintf('%.6f', microtime(true)), + $fail, + $action, + $username, + $userID, + wfUtils::inet_pton(wfUtils::getIP()), + (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '') + ); + } + private function getCurrentUserID(){ + $id = get_current_user_id(); + return $id ? $id : 0; + } + public function logLeechAndBlock($type){ //404 or hit + if(wfConfig::get('firewallEnabled')){ + //Moved the following block into the "is fw enabled section" for optimization. + $IP = wfUtils::getIP(); + $IPnum = wfUtils::inet_pton($IP); + if($this->isWhitelisted($IP)){ + return; + } + if (wfConfig::get('neverBlockBG') == 'neverBlockUA' && wfCrawl::isGoogleCrawler()) { + return; + } + if (wfConfig::get('neverBlockBG') == 'neverBlockVerified' && wfCrawl::isVerifiedGoogleCrawler()) { + return; + } + + if ($type == '404') { + $allowed404s = wfConfig::get('allowed404s'); + if (is_string($allowed404s)) { + $allowed404s = array_filter(explode("\n", $allowed404s)); + $allowed404sPattern = ''; + foreach ($allowed404s as $allowed404) { + $allowed404sPattern .= preg_replace('/\\\\\*/', '.*?', preg_quote($allowed404, '/')) . '|'; + } + $uri = $_SERVER['REQUEST_URI']; + if (($index = strpos($uri, '?')) !== false) { + $uri = substr($uri, 0, $index); + } + if ($allowed404sPattern && preg_match('/^' . substr($allowed404sPattern, 0, -1) . '$/i', $uri)) { + return; + } + } + } + + + if($type == '404'){ + $table = $this->scanTable; + } else if($type == 'hit'){ + $table = $this->leechTable; + } else { + wordfence::status(1, 'error', "Invalid type to logLeechAndBlock(): $type"); + return; + } + $this->getDB()->queryWrite("insert into $table (eMin, IP, hits) values (floor(unix_timestamp() / 60), %s, 1) ON DUPLICATE KEY update hits = IF(@wfcurrenthits := hits + 1, hits + 1, hits + 1)", wfUtils::inet_pton($IP)); + $hitsPerMinute = $this->getDB()->querySingle("select @wfcurrenthits"); + //end block moved into "is fw enabled" section + + //Range blocking was here. Moved to wordfenceClass::veryFirstAction + + if(wfConfig::get('maxGlobalRequests') != 'DISABLED' && $hitsPerMinute > wfConfig::get('maxGlobalRequests')){ //Applies to 404 or pageview + $this->takeBlockingAction('maxGlobalRequests', "Exceeded the maximum global requests per minute for crawlers or humans."); + } + if($type == '404'){ + global $wpdb; $p = $wpdb->base_prefix; + if(wfConfig::get('other_WFNet')){ + $this->getDB()->queryWrite("insert IGNORE into $p"."wfNet404s (sig, ctime, URI) values (UNHEX(MD5('%s')), unix_timestamp(), '%s')", $_SERVER['REQUEST_URI'], $_SERVER['REQUEST_URI']); + } + $pat = wfConfig::get('vulnRegex'); + if($pat){ + $URL = wfUtils::getRequestedURL(); + if(preg_match($pat, $URL)){ + $this->getDB()->queryWrite("insert IGNORE into $p"."wfVulnScanners (IP, ctime, hits) values (%s, unix_timestamp(), 1) ON DUPLICATE KEY UPDATE ctime = unix_timestamp(), hits = hits + 1", wfUtils::inet_pton($IP)); + if(wfConfig::get('maxScanHits') != 'DISABLED'){ + if( empty($_SERVER['HTTP_REFERER'] )){ + $this->getDB()->queryWrite("insert into " . $this->badLeechersTable . " (eMin, IP, hits) values (floor(unix_timestamp() / 60), %s, 1) ON DUPLICATE KEY update hits = IF(@wfblcurrenthits := hits + 1, hits + 1, hits + 1)", $IPnum); + $BL_hitsPerMinute = $this->getDB()->querySingle("select @wfblcurrenthits"); + if($BL_hitsPerMinute > wfConfig::get('maxScanHits')){ + $this->takeBlockingAction('maxScanHits', "Exceeded the maximum number of 404 requests per minute for a known security vulnerability."); + } + } + } + } + } + } + if(isset($_SERVER['HTTP_USER_AGENT']) && wfCrawl::isCrawler($_SERVER['HTTP_USER_AGENT'])){ + if($type == 'hit' && wfConfig::get('maxRequestsCrawlers') != 'DISABLED' && $hitsPerMinute > wfConfig::get('maxRequestsCrawlers')){ + $this->takeBlockingAction('maxRequestsCrawlers', "Exceeded the maximum number of requests per minute for crawlers."); //may not exit + } else if($type == '404' && wfConfig::get('max404Crawlers') != 'DISABLED' && $hitsPerMinute > wfConfig::get('max404Crawlers')){ + $this->takeBlockingAction('max404Crawlers', "Exceeded the maximum number of page not found errors per minute for a crawler."); + } + } else { + if($type == 'hit' && wfConfig::get('maxRequestsHumans') != 'DISABLED' && $hitsPerMinute > wfConfig::get('maxRequestsHumans')){ + $this->takeBlockingAction('maxRequestsHumans', "Exceeded the maximum number of page requests per minute for humans."); + } else if($type == '404' && wfConfig::get('max404Humans') != 'DISABLED' && $hitsPerMinute > wfConfig::get('max404Humans')){ + $this->takeBlockingAction('max404Humans', "Exceeded the maximum number of page not found errors per minute for humans."); + } + } + } + } + + /** + * @param string $IP Should be in dot or colon notation (127.0.0.1 or ::1) + * @return bool + */ + public function isWhitelisted($IP) { + $wfIPBlock = new wfUserIPRange('69.46.36.[1-32]'); + if ($wfIPBlock->isIPInRange($IP)) { //IP is in Wordfence's IP block which would prevent our scanning server manually kicking off scans that are stuck + return true; + } + //We now whitelist all private addrs + if (wfUtils::isPrivateAddress($IP)) { + return true; + } + //These belong to sucuri's scanning servers which will get blocked by Wordfence as a false positive if you try a scan. So we whitelisted them. + $externalWhite = array('97.74.127.171', '69.164.203.172', '173.230.128.135', '66.228.34.49', '66.228.40.185', '50.116.36.92', '50.116.36.93', '50.116.3.171', '198.58.96.212', '50.116.63.221', '192.155.92.112', '192.81.128.31', '198.58.106.244', '192.155.95.139', '23.239.9.227', '198.58.112.103', '192.155.94.43', '162.216.16.33', '173.255.233.124', '173.255.233.124', '192.155.90.179', '50.116.41.217', '192.81.129.227', '198.58.111.80'); + if (in_array($IP, $externalWhite)) { + return true; + } + $list = wfConfig::get('whitelisted'); + if (!$list) { + return false; + } + $list = explode(',', $list); + if (sizeof($list) < 1) { + return false; + } + foreach ($list as $whiteIP) { + $white_ip_block = new wfUserIPRange($whiteIP); + if ($white_ip_block->isIPInRange($IP)) { + return true; + } + } + return false; + } + + /** + * Get an array of static IPs, tuple for a numeric IP range, or a wfUserIPRange object to define and test a range + * like [127-128].0.0.[1-40] + * + * @see wfUserIPRange + * @param null $user_whitelisted + * @return array + */ + public function getWhitelistedIPs($user_whitelisted = null) { + $white_listed_ips = array(); + // Wordfence's IP block which would prevent our scanning server manually kicking off scans that are stuck + $white_listed_ips[] = array(1160651777, 1160651808); + + // Private range + $private_range = wfUtils::getPrivateAddrs(); + foreach ($private_range as $ip_range) { + $white_listed_ips[] = array($ip_range[1], $ip_range[2]); + } + + // These belong to sucuri's scanning servers which will get blocked by Wordfence as a false positive if you try a scan. So we whitelisted them. + $white_listed_ips = array_merge($white_listed_ips, array_map(array('wfUtils', 'inet_pton'), array('97.74.127.171', '69.164.203.172', '173.230.128.135', '66.228.34.49', '66.228.40.185', '50.116.36.92', '50.116.36.93', '50.116.3.171', '198.58.96.212', '50.116.63.221', '192.155.92.112', '192.81.128.31', '198.58.106.244', '192.155.95.139', '23.239.9.227', '198.58.112.103', '192.155.94.43', '162.216.16.33', '173.255.233.124', '173.255.233.124', '192.155.90.179', '50.116.41.217', '192.81.129.227', '198.58.111.80'))); + + if ($user_whitelisted === null) { + $user_whitelisted = wfConfig::get('whitelisted'); + } + + if ($user_whitelisted) { + $user_whitelisted = explode(',', $user_whitelisted); + foreach ($user_whitelisted as $whiteIP) { + $white_listed_ips[] = new wfUserIPRange($whiteIP); + } + } + + return $white_listed_ips; + } + + public function unblockAllIPs(){ + $this->getDB()->queryWrite("delete from " . $this->blocksTable); + wfCache::updateBlockedIPs('add'); + } + public function unlockAllIPs(){ + $this->getDB()->queryWrite("delete from " . $this->lockOutTable); + } + public function unblockIP($IP){ + $this->getDB()->queryWrite("delete from " . $this->blocksTable . " where IP=%s", wfUtils::inet_pton($IP)); + wfCache::updateBlockedIPs('add'); + } + public function unblockRange($id){ + $this->getDB()->queryWrite("delete from " . $this->ipRangesTable . " where id=%d", $id); + wfCache::updateBlockedIPs('add'); + } + + /** + * + * @param string $blockType + * @param string $range + * @param string $reason + * @return bool + */ + public function blockRange($blockType, $range, $reason){ + $reason = stripslashes($reason); + $this->getDB()->queryWrite("insert IGNORE into " . $this->ipRangesTable . " (blockType, blockString, ctime, reason, totalBlocked, lastBlocked) values ('%s', '%s', unix_timestamp(), '%s', 0, 0)", $blockType, $range, $reason); + wfCache::updateBlockedIPs('add'); + return true; + } + public function getRangesBasic(){ + $results = $this->getDB()->querySelect("select blockString from " . $this->ipRangesTable); + if(is_array($results) && sizeof($results) > 0){ + $ret = array(); + foreach($results as $r){ + $ret[] = $r['blockString']; + } + return $ret; + } else { + return false; + } + } + public function getRanges(){ + $results = $this->getDB()->querySelect("select id, blockType, blockString, unix_timestamp() - ctime as ctimeAgo, reason, totalBlocked, unix_timestamp() - lastBlocked as lastBlockedAgo, lastBlocked from " . $this->ipRangesTable . " order by ctime desc"); + foreach($results as &$elem){ + if($elem['blockType'] != 'IU'){ continue; } //We only use IU type for now, but have this for future different block types. + $elem['ctimeAgo'] = wfUtils::makeTimeAgo($elem['ctimeAgo']); + if($elem['lastBlocked'] > 0){ + $elem['lastBlockedAgo'] = wfUtils::makeTimeAgo($elem['lastBlockedAgo']) . ' ago'; + } else { + $elem['lastBlockedAgo'] = 'Never'; + } + $blockDat = explode('|', $elem['blockString']); + $elem['ipPattern'] = ""; + $numBlockElements = 0; + if($blockDat[0]){ + $numBlockElements++; + list($start_range, $end_range) = explode('-', $blockDat[0]); + if (!preg_match('/[\.:]/', $start_range)) { + $start_range = long2ip($start_range); + $end_range = long2ip($end_range); + } + $elem['ipPattern'] = "Block visitors with IP addresses in the range: " . $start_range . ' - ' . $end_range; + } else { + $elem['ipPattern'] = 'Allow all IP addresses'; + } + if($blockDat[1]){ + $numBlockElements++; + $elem['browserPattern'] = "Block visitors whos browsers match the pattern: " . $blockDat[1]; + } else { + $elem['browserPattern'] = 'Allow all browsers'; + } + if($blockDat[2]){ + $numBlockElements++; + $elem['refererPattern'] = "Block visitors from websites that match the pattern: " . $blockDat[2]; + } else { + $elem['refererPattern'] = "Allow visitors arriving from all websites"; + } + if (! empty($blockDat[3])) { + $elem['hostnamePattern'] = $blockDat[3]; + } + $elem['patternDisabled'] = (wfConfig::get('cacheType') == 'falcon' && $numBlockElements > 1) ? true : false; + } + return $results; + } + public function blockIP($IP, $reason, $wfsn = false, $permanent = false, $maxTimeBlocked = false){ //wfsn indicates it comes from Wordfence secure network + if($this->isWhitelisted($IP)){ return false; } + $wfsn = $wfsn ? 1 : 0; + $timeBlockOccurred = $this->getDB()->querySingle("select unix_timestamp() as ctime"); + $durationOfBlocks = wfConfig::get('blockedTime'); + if($maxTimeBlocked && $durationOfBlocks > $maxTimeBlocked){ + $timeBlockOccurred -= ($durationOfBlocks - $maxTimeBlocked); + } + if($permanent){ + //Insert permanent=1 or update existing perm or non-per block to be permanent + $this->getDB()->queryWrite("insert into " . $this->blocksTable . " (IP, blockedTime, reason, wfsn, permanent) values (%s, %d, '%s', %d, %d) ON DUPLICATE KEY update blockedTime=%d, reason='%s', wfsn=%d, permanent=%d", + wfUtils::inet_pton($IP), + $timeBlockOccurred, + $reason, + $wfsn, + 1, + $timeBlockOccurred, + $reason, + $wfsn, + 1 + ); + } else { + //insert perm=0 but don't update and make perm blocks non-perm. + $this->getDB()->queryWrite("insert into " . $this->blocksTable . " (IP, blockedTime, reason, wfsn, permanent) values (%s, %d, '%s', %d, %d) ON DUPLICATE KEY update blockedTime=%d, reason='%s', wfsn=%d", + wfUtils::inet_pton($IP), + $timeBlockOccurred, + $reason, + $wfsn, + 0, + $timeBlockOccurred, + $reason, + $wfsn + ); + } + + wfActivityReport::logBlockedIP($IP); + + wfCache::updateBlockedIPs('add'); + wfConfig::inc('totalIPsBlocked'); + return true; + } + public function lockOutIP($IP, $reason){ + if($this->isWhitelisted($IP)){ return false; } + $reason = stripslashes($reason); + $this->getDB()->queryWrite("insert into " . $this->lockOutTable . " (IP, blockedTime, reason) values (%s, unix_timestamp(), '%s') ON DUPLICATE KEY update blockedTime=unix_timestamp(), reason='%s'", + wfUtils::inet_pton($IP), + $reason, + $reason + ); + + wfActivityReport::logBlockedIP($IP); + + wfConfig::inc('totalIPsLocked'); + return true; + } + public function unlockOutIP($IP){ + $this->getDB()->queryWrite("delete from " . $this->lockOutTable . " where IP=%s", wfUtils::inet_pton($IP)); + } + public function isIPLockedOut($IP){ + if($this->getDB()->querySingle("select IP from " . $this->lockOutTable . " where IP=%s and blockedTime + %s > unix_timestamp()", wfUtils::inet_pton($IP), wfConfig::get('loginSec_lockoutMins') * 60)){ + $this->getDB()->queryWrite("update " . $this->lockOutTable . " set blockedHits = blockedHits + 1, lastAttempt = unix_timestamp() where IP=%s", wfUtils::inet_pton($IP)); + return true; + } else { + return false; + } + } + public function getThrottledIPs(){ + $results = $this->getDB()->querySelect("select IP, startTime, endTime, timesThrottled, lastReason, unix_timestamp() - startTime as startTimeAgo, unix_timestamp() - endTime as endTimeAgo from " . $this->throttleTable . " order by endTime desc limit 50"); + foreach($results as &$elem){ + $elem['startTimeAgo'] = wfUtils::makeTimeAgo($elem['startTimeAgo']); + $elem['endTimeAgo'] = wfUtils::makeTimeAgo($elem['endTimeAgo']); + } + $this->resolveIPs($results); + foreach($results as &$elem){ + $elem['IP'] = wfUtils::inet_ntop($elem['IP']); + } + return $results; + } + public function getLockedOutIPs(){ + $lockoutSecs = wfConfig::get('loginSec_lockoutMins') * 60; + $results = $this->getDB()->querySelect("select IP, unix_timestamp() - blockedTime as createdAgo, reason, unix_timestamp() - lastAttempt as lastAttemptAgo, lastAttempt, blockedHits, (blockedTime + %s) - unix_timestamp() as blockedFor from " . $this->lockOutTable . " where blockedTime + %s > unix_timestamp() order by blockedTime desc", $lockoutSecs, $lockoutSecs); + foreach($results as &$elem){ + $elem['lastAttemptAgo'] = $elem['lastAttempt'] ? wfUtils::makeTimeAgo($elem['lastAttemptAgo']) : ''; + $elem['blockedForAgo'] = wfUtils::makeTimeAgo($elem['blockedFor']); + } + $this->resolveIPs($results); + foreach($results as &$elem){ + $elem['IP'] = wfUtils::inet_ntop($elem['IP']); + } + return $results; + } + public function getBlockedIPsAddrOnly(){ + $results = $this->getDB()->querySelect("select IP from " . $this->blocksTable . " where (permanent=1 OR (blockedTime + %s > unix_timestamp()))", wfConfig::get('blockedTime'), wfConfig::get('blockedTime')); + $ret = array(); + foreach($results as $elem){ + $ret[] = wfUtils::inet_ntop($elem['IP']); + } + return $ret; + } + public function getBlockedIPs(){ + $results = $this->getDB()->querySelect("select IP, unix_timestamp() - blockedTime as createdAgo, reason, unix_timestamp() - lastAttempt as lastAttemptAgo, lastAttempt, blockedHits, (blockedTime + %s) - unix_timestamp() as blockedFor, permanent from " . $this->blocksTable . " where (permanent=1 OR (blockedTime + %s > unix_timestamp())) order by blockedTime desc", wfConfig::get('blockedTime'), wfConfig::get('blockedTime')); + foreach($results as &$elem){ + $lastHitAgo = 0; + $totalHits = 0; + $serverTime = $this->getDB()->querySingle("select unix_timestamp()"); + $lastLeech = $this->getDB()->querySingleRec("select max(eMin) * 60 as lastHit, sum(hits) as totalHits from " . $this->leechTable . " where IP=%s", $elem['IP']); + //$lastLeech will be true because we use aggregation functions, so check actual values + if($lastLeech['lastHit']){ + $totalHits += $lastLeech['totalHits']; + $lastHitAgo = $serverTime - $lastLeech['lastHit']; + $elem['lastHit'] = $lastLeech['lastHit']; + } + $lastScan = $this->getDB()->querySingleRec("select max(eMin) * 60 as lastHit, sum(hits) as totalHits from " . $this->scanTable . " where IP=%s", $elem['IP']); + if($lastScan['lastHit']){ //Checking actual value because we will get a row back from aggregation funcs + $totalHits += $lastScan['totalHits']; + $lastScanAgo = $serverTime - $lastScan['lastHit']; + if($lastScanAgo < $lastHitAgo){ + $lastHitAgo = $lastScanAgo; + $elem['lastHit'] = $lastScan['lastHit']; + } + } + $elem['totalHits'] = $totalHits; + $elem['lastHitAgo'] = $lastHitAgo ? wfUtils::makeTimeAgo($lastHitAgo) : ''; + $elem['lastAttemptAgo'] = $elem['lastAttempt'] ? wfUtils::makeTimeAgo($elem['lastAttemptAgo']) : ''; + $elem['blockedForAgo'] = wfUtils::makeTimeAgo($elem['blockedFor']); + } + $this->resolveIPs($results); + foreach($results as &$elem){ + $elem['blocked'] = 1; + $elem['IP'] = wfUtils::inet_ntop($elem['IP']); + } + return $results; + } + public function getLeechers($type){ + if($type == 'topScanners'){ + $table = $this->scanTable; + } else if($type == 'topLeechers'){ + $table = $this->leechTable; + } else { + wordfence::status(1, 'error', "Invalid type to getLeechers(): $type"); + return false; + } + $results = $this->getDB()->querySelect("select IP, sum(hits) as totalHits, eMin * 60 as timestamp, (UNIX_TIMESTAMP() - (eMin * 60)) as timeAgo from $table where eMin > ((unix_timestamp() - 86400) / 60) group by IP order by totalHits desc limit 20"); + $this->resolveIPs($results); + foreach($results as &$elem){ + $elem['timeAgo'] = wfUtils::makeTimeAgo($elem['timeAgo']); + $elem['blocked'] = $this->getDB()->querySingle("select blockedTime from " . $this->blocksTable . " where IP=%s and ((blockedTime + %s > unix_timestamp()) OR permanent = 1)", $elem['IP'], wfConfig::get('blockedTime')); + //take action + $elem['IP'] = wfUtils::inet_ntop($elem['IP']); + } + return $results; + } + public function logHit(){ + if(! wfConfig::liveTrafficEnabled()){ return; } + $headers = array(); + foreach($_SERVER as $h=>$v){ + if(preg_match('/^HTTP_(.+)$/', $h, $matches) ){ + $headers[$matches[1]] = $v; + } + } + $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''; + $this->getDB()->queryWrite("insert into " . $this->hitsTable . " (ctime, is404, isGoogle, IP, userID, newVisit, URL, referer, UA, jsRun) values (%f, %d, %d, %s, %s, %d, '%s', '%s', '%s', %d)", + sprintf('%.6f', microtime(true)), + (is_404() ? 1 : 0), + (wfCrawl::isGoogleCrawler() ? 1 : 0), + wfUtils::inet_pton(wfUtils::getIP()), + $this->getCurrentUserID(), + (wordfence::$newVisit ? 1 : 0), + wfUtils::getRequestedURL(), + (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''), + $ua, + (int) (isset($_COOKIE['wordfence_verifiedHuman']) && wp_verify_nonce($_COOKIE['wordfence_verifiedHuman'], 'wordfence_verifiedHuman' . $ua . wfUtils::getIP())) + ); + return $this->getDB()->querySingle("select last_insert_id()"); + } + public function getPerfStats($afterTime, $limit = 50){ + $serverTime = $this->getDB()->querySingle("select unix_timestamp()"); + $results = $this->getDB()->querySelect("select * from " . $this->perfTable . " where ctime > %f order by ctime desc limit %d", $afterTime, $limit); + $this->resolveIPs($results); + $browscap = new wfBrowscap(); + foreach($results as &$res){ + $res['timeAgo'] = wfUtils::makeTimeAgo($serverTime - $res['ctime']); + $res['IP'] = wfUtils::inet_ntop($res['IP']); + $res['browser'] = false; + if($res['UA']){ + $b = $browscap->getBrowser($res['UA']); + if($b){ + $res['browser'] = array( + 'browser' => $b['Browser'], + 'version' => $b['Version'], + 'platform' => $b['Platform'], + 'isMobile' => $b['isMobileDevice'], + 'isCrawler' => $b['Crawler'] + ); + } + } + if($res['userID']){ + $ud = get_userdata($res['userID']); + if($ud){ + $res['user'] = array( + 'editLink' => wfUtils::editUserLink($res['userID']), + 'display_name' => $ud->display_name, + 'ID' => $res['userID'] + ); + $res['user']['avatar'] = get_avatar($res['userID'], 16); + } + } else { + $res['user'] = false; + } + } + return $results; + } + public function getHits($hitType /* 'hits' or 'logins' */, $type, $afterTime, $limit = 50, $IP = false){ + $serverTime = $this->getDB()->querySingle("select unix_timestamp()"); + $IPSQL = ""; + if($IP){ + $IPSQL = " and IP=%s "; + $sqlArgs = array($afterTime, wfUtils::inet_pton($IP), $limit); + } else { + $sqlArgs = array($afterTime, $limit); + } + if($hitType == 'hits'){ + if($type == 'hit'){ + $typeSQL = " "; + } else if($type == 'crawler'){ + $now = time(); + $typeSQL = " and jsRun = 0 and $now - ctime > 30 "; + } else if($type == 'gCrawler'){ + $typeSQL = " and isGoogle = 1 "; + } else if($type == '404'){ + $typeSQL = " and is404 = 1 "; + } else if($type == 'human'){ + $typeSQL = " and jsRun = 1 "; + } else if($type == 'ruser'){ + $typeSQL = " and userID > 0 "; + } else { + wordfence::status(1, 'error', "Invalid log type to wfLog: $type"); + return false; + } + array_unshift($sqlArgs, "select * from " . $this->hitsTable . " where ctime > %f $IPSQL $typeSQL order by ctime desc limit %d"); + $results = call_user_func_array(array($this->getDB(), 'querySelect'), $sqlArgs); + + } else if($hitType == 'logins'){ + array_unshift($sqlArgs, "select * from " . $this->loginsTable . " where ctime > %f $IPSQL order by ctime desc limit %d"); + $results = call_user_func_array(array($this->getDB(), 'querySelect'), $sqlArgs ); + + } else { + wordfence::status(1, 'error', "getHits got invalid hitType: $hitType"); + return false; + } + $this->resolveIPs($results); + $ourURL = parse_url(site_url()); + $ourHost = strtolower($ourURL['host']); + $ourHost = preg_replace('/^www\./i', '', $ourHost); + $browscap = new wfBrowscap(); + + $advanced_blocking_results = $this->getDB()->querySelect('SELECT * FROM ' . $this->ipRangesTable); + $advanced_blocking = array(); + foreach ($advanced_blocking_results as $advanced_blocking_row) { + list($blocked_range) = explode('|', $advanced_blocking_row['blockString']); + $blocked_range = explode('-', $blocked_range); + if (count($blocked_range) == 2) { + // Still using v5 32 bit int style format. + if (!preg_match('/[\.:]/', $blocked_range[0])) { + $blocked_range[0] = long2ip($blocked_range[0]); + $blocked_range[1] = long2ip($blocked_range[1]); + } + $advanced_blocking[] = array(wfUtils::inet_pton($blocked_range[0]), wfUtils::inet_pton($blocked_range[1]), $advanced_blocking_row['id']); + } + } + + foreach($results as &$res){ + $res['type'] = $type; + $res['timeAgo'] = wfUtils::makeTimeAgo($serverTime - $res['ctime']); + $res['blocked'] = $this->getDB()->querySingle("select blockedTime from " . $this->blocksTable . " where IP=%s and (permanent = 1 OR (blockedTime + %s > unix_timestamp()))", $res['IP'], wfConfig::get('blockedTime')); + $res['rangeBlocked'] = false; + $res['ipRangeID'] = -1; + foreach ($advanced_blocking as $advanced_blocking_row) { + if (strcmp($res['IP'], $advanced_blocking_row[0]) >= 0 && strcmp($res['IP'], $advanced_blocking_row[1]) <= 0) { + $res['rangeBlocked'] = true; + $res['ipRangeID'] = $advanced_blocking_row[2]; + break; + } + } + $res['IP'] = wfUtils::inet_ntop($res['IP']); + $res['extReferer'] = false; + if(isset( $res['referer'] ) && $res['referer']){ + if(wfUtils::hasXSS($res['referer'] )){ //filtering out XSS + $res['referer'] = ''; + } + } + if( isset( $res['referer'] ) && $res['referer']){ + $refURL = parse_url($res['referer']); + if(is_array($refURL) && isset($refURL['host']) && $refURL['host']){ + $refHost = strtolower(preg_replace('/^www\./i', '', $refURL['host'])); + if($refHost != $ourHost){ + $res['extReferer'] = true; + //now extract search terms + $q = false; + if(preg_match('/(?:google|bing|alltheweb|aol|ask)\./i', $refURL['host'])){ + $q = 'q'; + } else if(stristr($refURL['host'], 'yahoo.')){ + $q = 'p'; + } else if(stristr($refURL['host'], 'baidu.')){ + $q = 'wd'; + } + if($q){ + $queryVars = array(); + if( isset( $refURL['query'] ) ) { + parse_str($refURL['query'], $queryVars); + if(isset($queryVars[$q])){ + $res['searchTerms'] = $queryVars[$q]; + } + } + } + } + } + if($res['extReferer']){ + if ( isset( $referringPage ) && stristr( $referringPage['host'], 'google.' ) ) + { + parse_str( $referringPage['query'], $queryVars ); + echo $queryVars['q']; // This is the search term used + } + } + } + $res['browser'] = false; + if($res['UA']){ + $b = $browscap->getBrowser($res['UA']); + if($b){ + $res['browser'] = array( + 'browser' => !empty($b['Browser']) ? $b['Browser'] : "", + 'version' => !empty($b['Version']) ? $b['Version'] : "", + 'platform' => !empty($b['Platform']) ? $b['Platform'] : "", + 'isMobile' => !empty($b['isMobileDevice']) ? $b['isMobileDevice'] : "", + 'isCrawler' => !empty($b['Crawler']) ? $b['Crawler'] : "", + ); + } + } + + + if($res['userID']){ + $ud = get_userdata($res['userID']); + if($ud){ + $res['user'] = array( + 'editLink' => wfUtils::editUserLink($res['userID']), + 'display_name' => $ud->display_name, + 'ID' => $res['userID'] + ); + $res['user']['avatar'] = get_avatar($res['userID'], 16); + } + } else { + $res['user'] = false; + } + } + return $results; + } + public function resolveIPs(&$results){ + if(sizeof($results) < 1){ return; } + $IPs = array(); + foreach($results as &$res){ + if($res['IP']){ //Can also be zero in case of non IP events + $IPs[] = $res['IP']; + } + } + $IPLocs = wfUtils::getIPsGeo($IPs); //Creates an array with IP as key and data as value + + foreach($results as &$res){ + $ip_printable = wfUtils::inet_ntop($res['IP']); + if(isset($IPLocs[$ip_printable])){ + $res['loc'] = $IPLocs[$ip_printable]; + } else { + $res['loc'] = false; + } + } + } + public function logHitOK(){ + if(is_admin()){ return false; } //Don't log admin pageviews + if(isset($_SERVER['HTTP_USER_AGENT'])){ + if(preg_match('/WordPress\/' . $this->wp_version . '/i', $_SERVER['HTTP_USER_AGENT'])){ return false; } //Ignore requests generated by WP UA. + } + if($userID = get_current_user_id()){ + if(wfConfig::get('liveTraf_ignorePublishers') && (current_user_can('publish_posts') || current_user_can('publish_pages')) ){ return false; } //User is logged in and can publish, so we don't log them. + $user = get_userdata($userID); + if($user){ + if(wfConfig::get('liveTraf_ignoreUsers')){ + foreach(explode(',', wfConfig::get('liveTraf_ignoreUsers')) as $ignoreLogin){ + if($user->user_login == $ignoreLogin){ + return false; + } + } + } + } + } + if(wfConfig::get('liveTraf_ignoreIPs')){ + $IPs = explode(',', wfConfig::get('liveTraf_ignoreIPs')); + $IP = wfUtils::getIP(); + foreach($IPs as $ignoreIP){ + if($ignoreIP == $IP){ + return false; + } + } + } + if( isset($_SERVER['HTTP_USER_AGENT']) && wfConfig::get('liveTraf_ignoreUA') ){ + if($_SERVER['HTTP_USER_AGENT'] == wfConfig::get('liveTraf_ignoreUA')){ + return false; + } + } + + return true; + } + private function getDB(){ + if(! $this->db){ + $this->db = new wfDB(); + } + return $this->db; + } + public function firewallBadIPs(){ + $IP = wfUtils::getIP(); + if($this->isWhitelisted($IP)){ + return; + } + $IPnum = wfUtils::inet_pton($IP); + $hostname = null; + + //New range and UA pattern blocking: + $r1 = $this->getDB()->querySelect("select id, blockType, blockString from " . $this->ipRangesTable); + foreach($r1 as $blockRec){ + if($blockRec['blockType'] == 'IU'){ + $ipRangeBlocked = false; + $uaPatternBlocked = false; + $refBlocked = false; + + $bDat = explode('|', $blockRec['blockString']); + $ipRange = $bDat[0]; + $uaPattern = $bDat[1]; + $refPattern = isset($bDat[2]) ? $bDat[2] : ''; + if($ipRange){ + list($start_range, $end_range) = explode('-', $ipRange); + if (preg_match('/[\.:]/', $start_range)) { + $start_range = wfUtils::inet_pton($start_range); + $end_range = wfUtils::inet_pton($end_range); + } else { + $start_range = wfUtils::inet_pton(long2ip($start_range)); + $end_range = wfUtils::inet_pton(long2ip($end_range)); + } + + if (strcmp($IPnum, $start_range) >= 0 && strcmp($IPnum, $end_range) <= 0) { + $ipRangeBlocked = true; + } + } + if (! empty($bDat[3])) { + $ipRange = true; /* We reuse the ipRangeBlocked variable */ + if ($hostname === null) { + $hostname = wfUtils::reverseLookup($IP); + } + if (preg_match(wfUtils::patternToRegex($bDat[3]), $hostname)) { + $ipRangeBlocked = true; + } + } + if($uaPattern){ + if(wfUtils::isUABlocked($uaPattern)){ + $uaPatternBlocked = true; + } + } + if($refPattern){ + if(wfUtils::isRefererBlocked($refPattern)){ + $refBlocked = true; + } + } + $doBlock = false; + if($uaPattern && $ipRange && $refPattern){ + if($uaPatternBlocked && $ipRangeBlocked && $refBlocked){ + $doBlock = true; + } + } + if($uaPattern && $ipRange){ + if($uaPatternBlocked && $ipRangeBlocked){ + $doBlock = true; + } + } + if($uaPattern && $refPattern){ + if($uaPatternBlocked && $refBlocked){ + $doBlock = true; + } + } + if($ipRange && $refPattern){ + if($ipRangeBlocked && $refBlocked){ + $doBlock = true; + } + } else if($uaPattern){ + if($uaPatternBlocked){ + $doBlock = true; + } + } else if($ipRange){ + if($ipRangeBlocked){ + $doBlock = true; + } + } else if($refPattern){ + if($refBlocked){ + $doBlock = true; + } + } + if($doBlock){ + $this->getDB()->queryWrite("update " . $this->ipRangesTable . " set totalBlocked = totalBlocked + 1, lastBlocked = unix_timestamp() where id=%d", $blockRec['id']); + wfActivityReport::logBlockedIP($IP); + $this->do503(3600, "Advanced blocking in effect."); + } + } + } + //End range/UA blocking + + // Country blocking + if (wfConfig::get('isPaid')) { + $blockedCountries = wfConfig::get('cbl_countries', false); + $bareRequestURI = wfUtils::extractBareURI($_SERVER['REQUEST_URI']); + $bareBypassRedirURI = wfUtils::extractBareURI(wfConfig::get('cbl_bypassRedirURL', '')); + $skipCountryBlocking = false; + + if($bareBypassRedirURI && $bareRequestURI == $bareBypassRedirURI){ //Run this before country blocking because even if the user isn't blocked we need to set the bypass cookie so they can bypass future blocks. + $bypassRedirDest = wfConfig::get('cbl_bypassRedirDest', ''); + if($bypassRedirDest){ + self::setCBLCookieBypass(); + $this->redirect($bypassRedirDest); //exits + } + } + $bareBypassViewURI = wfUtils::extractBareURI(wfConfig::get('cbl_bypassViewURL', '')); + if($bareBypassViewURI && $bareBypassViewURI == $bareRequestURI){ + self::setCBLCookieBypass(); + $skipCountryBlocking = true; + } + + if((! $skipCountryBlocking) && $blockedCountries && (! self::isCBLBypassCookieSet()) ){ + if(is_user_logged_in() && (! wfConfig::get('cbl_loggedInBlocked', false)) ){ //User is logged in and we're allowing logins + //Do nothing + } else if(strpos($_SERVER['REQUEST_URI'], '/wp-login.php') !== false && (! wfConfig::get('cbl_loginFormBlocked', false)) ){ //It's the login form and we're allowing that + //Do nothing + } else if(strpos($_SERVER['REQUEST_URI'], '/wp-login.php') === false && (! wfConfig::get('cbl_restOfSiteBlocked', false)) ){ //It's the rest of the site and we're allowing that + //Do nothing + } else { + if($country = wfUtils::IP2Country($IP) ){ + foreach(explode(',', $blockedCountries) as $blocked){ + if(strtoupper($blocked) == strtoupper($country)){ //At this point we know the user has been blocked + if(wfConfig::get('cbl_action') == 'redir'){ + $redirURL = wfConfig::get('cbl_redirURL'); + $eRedirHost = wfUtils::extractHostname($redirURL); + $isExternalRedir = false; + if($eRedirHost && $eRedirHost != wfUtils::extractHostname(home_url())){ //It's an external redirect... + $isExternalRedir = true; + } + if( (! $isExternalRedir) && wfUtils::extractBareURI($redirURL) == $bareRequestURI){ //Is this the URI we want to redirect to, then don't block it + //Do nothing + /* Uncomment the following if page components aren't loading for the page we redirect to. + Uncommenting is not recommended because it means that anyone from a blocked country + can crawl your site by sending the page blocked users are redirected to as the referer for every request. + But it's your call. + } else if(wfUtils::extractBareURI($_SERVER['HTTP_REFERER']) == $redirURL){ //If the referer the page we want to redirect to? Then this might be loading as a component so don't block. + //Do nothing + */ + } else { + $this->redirect(wfConfig::get('cbl_redirURL')); + } + } else { + $this->do503(3600, "Access from your area has been temporarily limited for security reasons"); + wfConfig::inc('totalCountryBlocked'); + } + } + } + } + } + } + } + + if($rec = $this->getDB()->querySingleRec("select blockedTime, reason from " . $this->blocksTable . " where IP=%s and (permanent=1 OR (blockedTime + %s > unix_timestamp()))", $IPnum, wfConfig::get('blockedTime'))){ + $this->getDB()->queryWrite("update " . $this->blocksTable . " set lastAttempt=unix_timestamp(), blockedHits = blockedHits + 1 where IP=%s", $IPnum); + $now = $this->getDB()->querySingle("select unix_timestamp()"); + $secsToGo = ($rec['blockedTime'] + wfConfig::get('blockedTime')) - $now; + if(wfConfig::get('other_WFNet') && strpos($_SERVER['REQUEST_URI'], '/wp-login.php') !== false){ //We're on the login page and this IP has been blocked + wordfence::wfsnReportBlockedAttempt($IP, 'login'); + } + $this->do503($secsToGo, $rec['reason']); + } + } + public function getCBLCookieVal(){ + $val = wfConfig::get('cbl_cookieVal', false); + if(! $val){ + $val = uniqid(); + wfConfig::set('cbl_cookieVal', $val); + } + return $val; + } + public function setCBLCookieBypass(){ + wfUtils::setcookie('wfCBLBypass', self::getCBLCookieVal(), time() + (86400 * 365), '/', null, null, true); + } + public function isCBLBypassCookieSet(){ + if(isset($_COOKIE['wfCBLBypass']) && $_COOKIE['wfCBLBypass'] == wfConfig::get('cbl_cookieVal')){ + return true; + } + return false; + } + private function takeBlockingAction($configVar, $reason){ + if($this->googleSafetyCheckOK()){ + $action = wfConfig::get($configVar . '_action'); + if(! $action){ + //error_log("Wordfence action missing for configVar: $configVar"); + return; + } + $secsToGo = 0; + if($action == 'block'){ + $IP = wfUtils::getIP(); + $this->blockIP($IP, $reason); + $secsToGo = wfConfig::get('blockedTime'); + //Moved the following code AFTER the block to prevent multiple emails. + if(wfConfig::get('alertOn_block')){ + wordfence::alert("Blocking IP $IP", "Wordfence has blocked IP address $IP.\nThe reason is: \"$reason\".", $IP); + } + wordfence::status(2, 'info', "Blocking IP $IP. $reason"); + } else if($action == 'throttle'){ + $IP = wfUtils::getIP(); + $this->getDB()->queryWrite("insert into " . $this->throttleTable . " (IP, startTime, endTime, timesThrottled, lastReason) values (%s, unix_timestamp(), unix_timestamp(), 1, '%s') ON DUPLICATE KEY UPDATE endTime=unix_timestamp(), timesThrottled = timesThrottled + 1, lastReason='%s'", wfUtils::inet_pton($IP), $reason, $reason); + wordfence::status(2, 'info', "Throttling IP $IP. $reason"); + wfConfig::inc('totalIPsThrottled'); + $secsToGo = 60; + } + $this->do503($secsToGo, $reason); + } else { + return; + } + } + public function do503($secsToGo, $reason){ + wfConfig::inc('total503s'); + wfUtils::doNotCache(); + header('HTTP/1.1 503 Service Temporarily Unavailable'); + header('Status: 503 Service Temporarily Unavailable'); + if($secsToGo){ + header('Retry-After: ' . $secsToGo); + } + require_once('wf503.php'); + exit(); + } + private function redirect($URL){ + wp_redirect($URL, 302); + exit(); + } + private function googleSafetyCheckOK(){ //returns true if OK to block. Returns false if we must not block. + $cacheKey = md5( (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '') . ' ' . wfUtils::getIP()); + //Cache so we can call this multiple times in one request + if(! isset(self::$gbSafeCache[$cacheKey])){ + $nb = wfConfig::get('neverBlockBG'); + if($nb == 'treatAsOtherCrawlers'){ + self::$gbSafeCache[$cacheKey] = true; //OK to block because we're treating google like everyone else + } else if($nb == 'neverBlockUA' || $nb == 'neverBlockVerified'){ + if(wfCrawl::isGoogleCrawler()){ //Check the UA using regex + if($nb == 'neverBlockVerified'){ + if(wfCrawl::isVerifiedGoogleCrawler($this->googlePattern, wfUtils::getIP())){ //UA check passed, now verify using PTR if configured to + self::$gbSafeCache[$cacheKey] = false; //This is a verified Google crawler, so no we can't block it + } else { + self::$gbSafeCache[$cacheKey] = true; //This is a crawler claiming to be Google but it did not verify + } + } else { //neverBlockUA + self::$gbSafeCache[$cacheKey] = false; //User configured us to only do a UA check and this claims to be google so don't block + } + } else { + self::$gbSafeCache[$cacheKey] = true; //This isn't a Google UA, so it's OK to block + } + } else { + //error_log("Wordfence error: neverBlockBG option is not set."); + self::$gbSafeCache[$cacheKey] = false; //Oops the config option is not set. This should never happen because it's set on install. So we return false to indicate it's not OK to block just for safety. + } + } + if(! isset(self::$gbSafeCache[$cacheKey])){ + //error_log("Wordfence assertion fail in googleSafetyCheckOK: cached value is not set."); + return false; //for safety + } + return self::$gbSafeCache[$cacheKey]; //return cached value + } + public function addStatus($level, $type, $msg){ + //$msg = '[' . sprintf('%.2f', memory_get_usage(true) / (1024 * 1024)) . '] ' . $msg; + $this->getDB()->queryWrite("insert into " . $this->statusTable . " (ctime, level, type, msg) values (%s, %d, '%s', '%s')", sprintf('%.6f', microtime(true)), $level, $type, $msg); + } + public function getStatusEvents($lastCtime){ + if($lastCtime < 1){ + $lastCtime = $this->getDB()->querySingle("select ctime from " . $this->statusTable . " order by ctime desc limit 1000,1"); + if(! $lastCtime){ + $lastCtime = 0; + } + } + $results = $this->getDB()->querySelect("select ctime, level, type, msg from " . $this->statusTable . " where ctime > %f order by ctime asc", $lastCtime); + $timeOffset = 3600 * get_option('gmt_offset'); + foreach($results as &$rec){ + //$rec['timeAgo'] = wfUtils::makeTimeAgo(time() - $rec['ctime']); + $rec['date'] = date('M d H:i:s', $rec['ctime'] + $timeOffset); + $rec['msg'] = wp_kses_data( (string) $rec['msg']); + } + return $results; + } + public function getSummaryEvents(){ + $results = $this->getDB()->querySelect("select ctime, level, type, msg from " . $this->statusTable . " where level = 10 order by ctime desc limit 100"); + $timeOffset = 3600 * get_option('gmt_offset'); + foreach($results as &$rec){ + $rec['date'] = date('M d H:i:s', $rec['ctime'] + $timeOffset); + if(strpos($rec['msg'], 'SUM_PREP:') === 0){ + break; + } + } + return array_reverse($results); + } + + /** + * @return string + */ + public function getGooglePattern() { + return $this->googlePattern; + } + +} + +/** + * + */ +class wfUserIPRange { + + /** + * @var string|null + */ + private $ip_string; + + /** + * @param string|null $ip_string + */ + public function __construct($ip_string = null) { + $this->setIPString($ip_string); + } + + /** + * Check if the supplied IP address is within the user supplied range. + * + * @param string $ip + * @return bool + */ + public function isIPInRange($ip) { + $ip_string = $this->getIPString(); + + // IPv4 range + if (strpos($ip_string, '.') !== false && strpos($ip, '.') !== false) { + if (preg_match('/\[\d+\-\d+\]/', $ip_string)) { + $IPparts = explode('.', $ip); + $whiteParts = explode('.', $ip_string); + $mismatch = false; + for ($i = 0; $i <= 3; $i++) { + if (preg_match('/^\[(\d+)\-(\d+)\]$/', $whiteParts[$i], $m)) { + if ($IPparts[$i] < $m[1] || $IPparts[$i] > $m[2]) { + $mismatch = true; + } + } else if ($whiteParts[$i] != $IPparts[$i]) { + $mismatch = true; + } + } + if ($mismatch === false) { + return true; // Is whitelisted because we did not get a mismatch + } + } else if ($ip_string == $ip) { + return true; + } + + // IPv6 range + } else if (strpos($ip_string, ':') !== false && strpos($ip, ':') !== false) { + if (preg_match('/\[[a-f0-9]+\-[a-f0-9]+\]/', $ip_string)) { + $IPparts = explode(':', strtolower(wfUtils::expandIPv6Address($ip))); + $whiteParts = explode(':', strtolower(self::expandIPv6Range($ip_string))); + $mismatch = false; + for ($i = 0; $i <= 7; $i++) { + if (preg_match('/^\[([a-f0-9]+)\-([a-f0-9]+)\]$/i', $whiteParts[$i], $m)) { + $ip_group = hexdec($IPparts[$i]); + $range_group_from = hexdec($m[1]); + $range_group_to = hexdec($m[2]); + if ($ip_group < $range_group_from || $ip_group > $range_group_to) { + $mismatch = true; + break; + } + } else if ($whiteParts[$i] != $IPparts[$i]) { + $mismatch = true; + break; + } + } + if ($mismatch === false) { + return true; // Is whitelisted because we did not get a mismatch + } + } else if ($ip_string == $ip) { + return true; + } + } + + return false; + } + + /** + * Return a set of where clauses to use in MySQL. + * + * @param string $column + * @return false|null|string + */ + public function toSQL($column = 'ip') { + /** @var wpdb $wpdb */ + global $wpdb; + $ip_string = $this->getIPString(); + + if (strpos($ip_string, '.') !== false && preg_match('/\[\d+\-\d+\]/', $ip_string)) { + $whiteParts = explode('.', $ip_string); + $sql = "(SUBSTR($column, 1, 12) = LPAD(CHAR(0xff, 0xff), 12, CHAR(0)) AND "; + + for ($i = 0, $j = 24; $i <= 3; $i++, $j -= 8) { + // MySQL can only perform bitwise operations on integers + $conv = sprintf('CAST(CONV(HEX(SUBSTR(%s, 13, 8)), 16, 10) as UNSIGNED INTEGER)', $column); + if (preg_match('/^\[(\d+)\-(\d+)\]$/', $whiteParts[$i], $m)) { + $sql .= $wpdb->prepare("$conv >> $j & 0xFF BETWEEN %d AND %d", $m[1], $m[2]); + } else { + $sql .= $wpdb->prepare("$conv >> $j & 0xFF = %d", $whiteParts[$i]); + } + $sql .= ' AND '; + } + $sql = substr($sql, 0, -5) . ')'; + return $sql; + + } else if (strpos($ip_string, ':') !== false && preg_match('/\[[a-f0-9]+\-[a-f0-9]+\]/', $ip_string)) { + $whiteParts = explode(':', strtolower(self::expandIPv6Range($ip_string))); + $sql = '('; + + for ($i = 0; $i <= 7; $i++) { + // MySQL can only perform bitwise operations on integers + $conv = sprintf('CAST(CONV(HEX(SUBSTR(%s, %d, 8)), 16, 10) as UNSIGNED INTEGER)', $column, $i < 4 ? 1 : 9); + $j = 16 * (3 - ($i % 4)); + if (preg_match('/^\[([a-f0-9]+)\-([a-f0-9]+)\]$/', $whiteParts[$i], $m)) { + $sql .= $wpdb->prepare("$conv >> $j & 0xFFFF BETWEEN 0x%x AND 0x%x", hexdec($m[1]), hexdec($m[2])); + } else { + $sql .= $wpdb->prepare("$conv >> $j & 0xFFFF = 0x%x", hexdec($whiteParts[$i])); + } + $sql .= ' AND '; + } + $sql = substr($sql, 0, -5) . ')'; + return $sql; + } + return $wpdb->prepare("($column = %s)", wfUtils::inet_pton($ip_string)); + } + + /** + * Expand a compressed printable range representation of an IPv6 address. + * + * @todo Hook up exceptions for better error handling. + * @todo Allow IPv4 mapped IPv6 addresses (::ffff:192.168.1.1). + * @param string $ip_range + * @return string + */ + public static function expandIPv6Range($ip_range) { + $colon_count = substr_count($ip_range, ':'); + $dbl_colon_count = substr_count($ip_range, '::'); + if ($dbl_colon_count > 1) { + return false; + } + $dbl_colon_pos = strpos($ip_range, '::'); + if ($dbl_colon_pos !== false) { + $ip_range = str_replace('::', str_repeat(':0000', + (($dbl_colon_pos === 0 || $dbl_colon_pos === strlen($ip_range) - 2) ? 9 : 8) - $colon_count) . ':', $ip_range); + $ip_range = trim($ip_range, ':'); + } + $colon_count = substr_count($ip_range, ':'); + if ($colon_count != 7) { + return false; + } + + $groups = explode(':', $ip_range); + $expanded = ''; + foreach ($groups as $group) { + if (preg_match('/\[([a-f0-9]{1,4})\-([a-f0-9]{1,4})\]/i', $group, $matches)) { + $expanded .= sprintf('[%s-%s]', str_pad(strtolower($matches[1]), 4, '0', STR_PAD_LEFT), str_pad(strtolower($matches[2]), 4, '0', STR_PAD_LEFT)) . ':'; + } else if (preg_match('/[a-f0-9]{1,4}/i', $group)) { + $expanded .= str_pad(strtolower($group), 4, '0', STR_PAD_LEFT) . ':'; + } else { + return false; + } + } + return trim($expanded, ':'); + } + + /** + * @return bool + */ + public function isValidRange() { + return $this->isValidIPv4Range() || $this->isValidIPv6Range(); + } + + /** + * @return bool + */ + public function isValidIPv4Range() { + $ip_string = $this->getIPString(); + if (preg_match_all('/(\d+)/', $ip_string, $matches) > 0) { + foreach ($matches[1] as $match) { + $group = (int) $match; + if ($group > 255 || $group < 0) { + return false; + } + } + } + + $group_regex = '([0-9]{1,3}|\[[0-9]{1,3}\-[0-9]{1,3}\])'; + return preg_match('/^' . str_repeat("$group_regex.", 3) . $group_regex . '$/i', $ip_string) > 0; + } + + /** + * @return bool + */ + public function isValidIPv6Range() { + $ip_string = $this->getIPString(); + if (strpos($ip_string, '::') !== false) { + $ip_string = self::expandIPv6Range($ip_string); + } + if (!$ip_string) { + return false; + } + $group_regex = '([a-f0-9]{1,4}|\[[a-f0-9]{1,4}\-[a-f0-9]{1,4}\])'; + return preg_match('/^' . str_repeat("$group_regex:", 7) . $group_regex . '$/i', $ip_string) > 0; + } + + + + /** + * @return string|null + */ + public function getIPString() { + return $this->ip_string; + } + + /** + * @param string|null $ip_string + */ + public function setIPString($ip_string) { + $this->ip_string = $ip_string; + } +} + +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfScanEngine.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfScanEngine.php index ef3e454f..7680ce22 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfScanEngine.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfScanEngine.php @@ -1,3 +1,4 @@ +<<<<<<< .mine +||||||| .r0 +======= + false, + 'plugin' => false, + 'theme' => false, + 'unknown' => false + ); + private $userPasswdQueue = ""; + private $passwdHasIssues = false; + + /** + * @var array + */ + private $databaseResults; + + /** + * @var wordfenceDBScanner + */ + private $dbScanner; + + public function __sleep(){ //Same order here as above for properties that are included in serialization + return array('hasher', 'jobList', 'i', 'wp_version', 'apiKey', 'startTime', 'maxExecTime', 'publicScanEnabled', 'fileContentsResults', 'scanner', 'scanQueue', 'hoover', 'scanData', 'statusIDX', 'userPasswdQueue', 'passwdHasIssues', 'databaseResults', 'dbScanner'); + } + public function __construct(){ + $this->startTime = time(); + $this->maxExecTime = self::getMaxExecutionTime(); + $this->i = new wfIssues(); + $this->cycleStartTime = time(); + $this->wp_version = wfUtils::getWPVersion(); + $this->apiKey = wfConfig::get('apiKey'); + $this->api = new wfAPI($this->apiKey, $this->wp_version); + include('wfDict.php'); //$dictWords + $this->dictWords = $dictWords; + $this->jobList[] = 'publicSite'; + $this->jobList[] = 'checkSpamvertized'; + $this->jobList[] = 'checkSpamIP'; + $this->jobList[] = 'heartbleed'; + $this->jobList[] = 'knownFiles_init'; + $this->jobList[] = 'knownFiles_main'; + $this->jobList[] = 'knownFiles_finish'; + foreach (array('knownFiles', 'fileContents', 'database', 'posts', 'comments', 'passwds', 'dns', 'diskSpace', 'oldVersions') as $scanType) { + if (wfConfig::get('scansEnabled_' . $scanType)) { + if (method_exists($this, 'scan_' . $scanType . '_init')) { + foreach (array('init', 'main', 'finish') as $op) { + $this->jobList[] = $scanType . '_' . $op; + }; + } else if (method_exists($this, 'scan_' . $scanType)) { + $this->jobList[] = $scanType; + } + } + } + } + public function deleteNewIssues(){ + $this->i->deleteNew(); + } + public function __wakeup(){ + $this->cycleStartTime = time(); + $this->api = new wfAPI($this->apiKey, $this->wp_version); + include('wfDict.php'); //$dictWords + $this->dictWords = $dictWords; + } + public function go(){ + try { + self::checkForKill(); + $this->doScan(); + wfConfig::set('lastScanCompleted', 'ok'); + self::checkForKill(); + //updating this scan ID will trigger the scan page to load/reload the results. + $this->i->setScanTimeNow(); + //scan ID only incremented at end of scan to make UI load new results + $this->emailNewIssues(); + } catch(Exception $e){ + wfConfig::set('lastScanCompleted', $e->getMessage()); + throw $e; + } + } + public function forkIfNeeded(){ + self::checkForKill(); + if(time() - $this->cycleStartTime > $this->maxExecTime){ + wordfence::status(4, 'info', "Forking during hash scan to ensure continuity."); + $this->fork(); + } + } + public function fork(){ + wordfence::status(4, 'info', "Entered fork()"); + if(wfConfig::set_ser('wfsd_engine', $this, true)){ + wordfence::status(4, 'info', "Calling startScan(true)"); + self::startScan(true); + } //Otherwise there was an error so don't start another scan. + exit(0); + } + public function emailNewIssues(){ + $this->i->emailNewIssues(); + } + private function doScan(){ + while(sizeof($this->jobList) > 0){ + self::checkForKill(); + $jobName = $this->jobList[0]; + $callback = array($this, 'scan_' . $jobName); + if (is_callable($callback)) { + call_user_func($callback); + } + array_shift($this->jobList); //only shift once we're done because we may pause halfway through a job and need to pick up where we left off + self::checkForKill(); + if($this->forkRequested){ + $this->fork(); + } else { + $this->forkIfNeeded(); + } + } + $summary = $this->i->getSummaryItems(); + $this->status(1, 'info', '-------------------'); + $this->status(1, 'info', "Scan Complete. Scanned " . $summary['totalFiles'] . " files, " . $summary['totalPlugins'] . " plugins, " . $summary['totalThemes'] . " themes, " . ($summary['totalPages'] + $summary['totalPosts']) . " pages, " . $summary['totalComments'] . " comments and " . $summary['totalRows'] . " records in " . (time() - $this->startTime) . " seconds."); + if($this->i->totalIssues > 0){ + $this->status(10, 'info', "SUM_FINAL:Scan complete. You have " . $this->i->totalIssues . " new issues to fix. See below."); + } else { + $this->status(10, 'info', "SUM_FINAL:Scan complete. Congratulations, no problems found."); + } + return; + } + public function getCurrentJob(){ + return $this->jobList[0]; + } + private function scan_heartbleed(){ + if(wfConfig::get('scansEnabled_heartbleed')){ + $this->statusIDX['heartbleed'] = wordfence::statusStart("Scanning your site for the HeartBleed vulnerability"); + $result = $this->api->call('scan_heartbleed', array(), array( + 'siteURL' => site_url() + )); + $haveIssues = false; + if($result['haveIssues'] && is_array($result['issues']) ){ + foreach($result['issues'] as $issue){ + $this->addIssue($issue['type'], $issue['level'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data']); + $haveIssues = true; + } + } + wordfence::statusEnd($this->statusIDX['heartbleed'], $haveIssues); + } else { + wordfence::statusDisabled("Skipping HeartBleed scan"); + } + } + private function scan_publicSite(){ + if(wfConfig::get('isPaid')){ + if(wfConfig::get('scansEnabled_public')){ + $this->publicScanEnabled = true; + $this->statusIDX['public'] = wordfence::statusStart("Doing Remote Scan of public site for problems"); + $result = $this->api->call('scan_public_site', array(), array( + 'siteURL' => site_url() + )); + $haveIssues = false; + if($result['haveIssues'] && is_array($result['issues']) ){ + foreach($result['issues'] as $issue){ + $this->addIssue($issue['type'], $issue['level'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data']); + $haveIssues = true; + } + } + wordfence::statusEnd($this->statusIDX['public'], $haveIssues); + } else { + wordfence::statusDisabled("Skipping remote scan of public site for problems"); + } + } else { + wordfence::statusPaidOnly("Remote scan of public facing site only available to paid members"); + sleep(2); //enough time to read the message before it scrolls off. + } + } + private function scan_checkSpamIP(){ + if(wfConfig::get('isPaid')){ + if(wfConfig::get('checkSpamIP')){ + $this->statusIDX['checkSpamIP'] = wordfence::statusStart("Checking if your site IP is generating spam"); + $result = $this->api->call('check_spam_ip', array(), array( + 'siteURL' => site_url() + )); + $haveIssues = false; + if(!empty($result['haveIssues']) && is_array($result['issues']) ){ + foreach($result['issues'] as $issue){ + $this->addIssue($issue['type'], $issue['level'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data']); + $haveIssues = true; + } + } + wordfence::statusEnd($this->statusIDX['checkSpamIP'], $haveIssues); + } else { + wordfence::statusDisabled("Skipping check if your IP is generating spam"); + } + + } else { + wordfence::statusPaidOnly("Checking if your IP is generating spam is for paid members only"); + sleep(2); + } + } + private function scan_checkSpamvertized(){ + if(wfConfig::get('isPaid')){ + if(wfConfig::get('spamvertizeCheck')){ + $this->statusIDX['spamvertizeCheck'] = wordfence::statusStart("Checking if your site is being Spamvertised"); + $result = $this->api->call('spamvertize_check', array(), array( + 'siteURL' => site_url() + )); + $haveIssues = false; + if($result['haveIssues'] && is_array($result['issues']) ){ + foreach($result['issues'] as $issue){ + $this->addIssue($issue['type'], $issue['level'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data']); + $haveIssues = true; + } + } + wordfence::statusEnd($this->statusIDX['spamvertizeCheck'], $haveIssues); + } else { + wordfence::statusDisabled("Skipping check if your site is being spamvertized"); + } + + } else { + wordfence::statusPaidOnly("Check if your site is being Spamvertized is for paid members only"); + sleep(2); + } + } + private function scan_knownFiles_init(){ + $this->status(1, 'info', "Contacting Wordfence to initiate scan"); + $this->api->call('log_scan', array(), array()); + $baseWPStuff = array( '.htaccess', 'index.php', 'license.txt', 'readme.html', 'wp-activate.php', 'wp-admin', 'wp-app.php', 'wp-blog-header.php', 'wp-comments-post.php', 'wp-config-sample.php', 'wp-content', 'wp-cron.php', 'wp-includes', 'wp-links-opml.php', 'wp-load.php', 'wp-login.php', 'wp-mail.php', 'wp-pass.php', 'wp-register.php', 'wp-settings.php', 'wp-signup.php', 'wp-trackback.php', 'xmlrpc.php'); + $baseContents = scandir(ABSPATH); + if(! is_array($baseContents)){ + throw new Exception("Wordfence could not read the contents of your base WordPress directory. This usually indicates your permissions are so strict that your web server can't read your WordPress directory."); + } + $scanOutside = wfConfig::get('other_scanOutside'); + if($scanOutside){ + wordfence::status(2, 'info', "Including files that are outside the WordPress installation in the scan."); + } + $includeInKnownFilesScan = array(); + foreach($baseContents as $file){ //Only include base files less than a meg that are files. + if($file == '.' || $file == '..'){ continue; } + $fullFile = rtrim(ABSPATH, '/') . '/' . $file; + if($scanOutside){ + $includeInKnownFilesScan[] = $file; + } else if(in_array($file, $baseWPStuff) || (@is_file($fullFile) && @is_readable($fullFile) && (! wfUtils::fileTooBig($fullFile)) ) ){ + $includeInKnownFilesScan[] = $file; + } + } + + if(! function_exists( 'get_plugins')){ + require_once ABSPATH . '/wp-admin/includes/plugin.php'; + } + $this->status(2, 'info', "Getting plugin list from WordPress"); + $pluginData = get_plugins(); + $knownFilesPlugins = array(); + foreach($pluginData as $key => $data){ + if(preg_match('/^([^\/]+)\//', $key, $matches)){ + $pluginDir = $matches[1]; + $pluginFullDir = "wp-content/plugins/" . $pluginDir; + $knownFilesPlugins[$key] = array( + 'Name' => $data['Name'], + 'Version' => $data['Version'], + 'ShortDir' => $pluginDir, + 'FullDir' => $pluginFullDir + ); + } + } + + $this->status(2, 'info', "Found " . sizeof($knownFilesPlugins) . " plugins"); + $this->i->updateSummaryItem('totalPlugins', sizeof($knownFilesPlugins)); + + if (!function_exists('wp_get_themes')) { + require_once ABSPATH . '/wp-includes/theme.php'; + } + $this->status(2, 'info', "Getting theme list from WordPress"); + $themes = wp_get_themes(); + foreach ($themes as $themeName => $themeVal) { + if (preg_match('/\/([^\/]+)$/', $themeVal['Stylesheet Dir'], $matches)) { + $shortDir = $matches[1]; //e.g. evo4cms + $fullDir = substr($themeVal['Stylesheet Dir'], strlen(ABSPATH)); //e.g. wp-content/themes/evo4cms + $knownFilesThemes[$themeName] = array( + 'Name' => $themeVal['Name'], + 'Version' => $themeVal['Version'], + 'ShortDir' => $shortDir, + 'FullDir' => $fullDir + ); + } + } + + $this->status(2, 'info', "Found " . sizeof($knownFilesThemes) . " themes"); + $this->i->updateSummaryItem('totalThemes', sizeof($knownFilesThemes)); + + $this->hasher = new wordfenceHash(strlen(ABSPATH), ABSPATH, $includeInKnownFilesScan, $knownFilesThemes, $knownFilesPlugins, $this); + } + private function scan_knownFiles_main(){ + $this->hasher->run($this); //Include this so we can call addIssue and ->api-> + $this->i->updateSummaryItem('totalData', wfUtils::formatBytes($this->hasher->totalData)); + $this->i->updateSummaryItem('totalFiles', $this->hasher->totalFiles); + $this->i->updateSummaryItem('totalDirs', $this->hasher->totalDirs); + $this->i->updateSummaryItem('linesOfPHP', $this->hasher->linesOfPHP); + $this->i->updateSummaryItem('linesOfJCH', $this->hasher->linesOfJCH); + $this->hasher = false; + } + private function scan_knownFiles_finish(){ + } + private function scan_fileContents_init(){ + $this->statusIDX['infect'] = wordfence::statusStart('Scanning file contents for infections and vulnerabilities'); + $this->statusIDX['GSB'] = wordfence::statusStart('Scanning files for URLs in Google\'s Safe Browsing List'); + $this->scanner = new wordfenceScanner($this->apiKey, $this->wp_version, ABSPATH); + $this->status(2, 'info', "Starting scan of file contents"); + } + private function scan_fileContents_main(){ + $this->fileContentsResults = $this->scanner->scan($this); + } + private function scan_fileContents_finish(){ + $this->status(2, 'info', "Done file contents scan"); + if($this->scanner->errorMsg){ + throw new Exception($this->scanner->errorMsg); + } + $this->scanner = null; + $haveIssues = false; + $haveIssuesGSB = false; + foreach($this->fileContentsResults as $issue){ + $this->status(2, 'info', "Adding issue: " . $issue['shortMsg']); + if($this->addIssue($issue['type'], $issue['severity'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data'])){ + if(empty($issue['data']['gsb']) === false){ + $haveIssuesGSB = true; + } else { + $haveIssues = true; + } + } + } + $this->fileContentsResults = null; + wordfence::statusEnd($this->statusIDX['infect'], $haveIssues); + wordfence::statusEnd($this->statusIDX['GSB'], $haveIssuesGSB); + } + + private function scan_database_init() { + $this->statusIDX['db_infect'] = wordfence::statusStart('Scanning database for infections and vulnerabilities'); + $this->dbScanner = new wordfenceDBScanner($this->apiKey, $this->wp_version, ABSPATH); + $this->status(2, 'info', "Starting scan of database"); + } + + private function scan_database_main() { + if (!$this->dbScanner) { + $this->dbScanner = new wordfenceDBScanner($this->apiKey, $this->wp_version, ABSPATH); + } + $this->databaseResults = $this->dbScanner->scan($this); + } + + private function scan_database_finish() { + $this->status(2, 'info', "Done database scan"); + if ($this->dbScanner->errorMsg) { + throw new Exception($this->dbScanner->errorMsg); + } + $this->dbScanner = null; + $haveIssues = false; + foreach ($this->databaseResults as $issue) { + $this->status(2, 'info', "Adding issue: " . $issue['shortMsg']); + $issue_success = $this->addIssue($issue['type'], $issue['severity'], $issue['ignoreP'], $issue['ignoreC'], $issue['shortMsg'], $issue['longMsg'], $issue['data']); + if ($issue_success) { + $haveIssues = true; + } + } + $this->databaseResults = null; + + $blogsToScan = self::getBlogsToScan('options'); + $wfdb = new wfDB(); + foreach ($blogsToScan as $blog) { + $charset = $wfdb->querySingle("SELECT option_value FROM " . $blog['table'] . " WHERE option_name='blog_charset'"); + if (strtolower($charset) == 'utf-7') { + $this->addIssue('database', 1, $blog['blog_id'] . 'blog_charset', $blog['blog_id'] . 'blog_charset', "An option was found in your site that indicates it may have been hacked.", "The 'blog_charset' option in your database is set to '" . $charset . "' which indicates your site may have been hacked. If hackers can gain access to your database via phpMyAdmin for example, they will change this value in order to inject malicious code into other parts of your site or allow XSS attacks. The 'badi' hack does this.", array( + 'isMultisite' => $blog['isMultisite'], + 'domain' => $blog['domain'], + 'path' => $blog['path'], + 'blog_id' => $blog['blog_id'] + )); + $haveIssues = true; + } + } + + wordfence::statusEnd($this->statusIDX['db_infect'], $haveIssues); + } + private function scan_posts_init(){ + $this->statusIDX['posts'] = wordfence::statusStart('Scanning posts for URL\'s in Google\'s Safe Browsing List'); + $blogsToScan = self::getBlogsToScan('posts'); + $wfdb = new wfDB(); + $this->hoover = new wordfenceURLHoover($this->apiKey, $this->wp_version); + foreach($blogsToScan as $blog){ + $q1 = $wfdb->querySelect("select ID from " . $blog['table'] . " where post_type IN ('page', 'post') and post_status = 'publish'"); + foreach($q1 as $idRow){ + $this->scanQueue[] = array($blog, $idRow['ID']); + } + } + } + private function scan_posts_main(){ + $wfdb = new wfDB(); + while($elem = array_shift($this->scanQueue)){ + $blog = $elem[0]; + $postID = $elem[1]; + $row = $wfdb->querySingleRec("select ID, post_title, post_type, post_date, post_content from " . $blog['table'] . " where ID=%d", $postID); + $this->hoover->hoover($blog['blog_id'] . '-' . $row['ID'], $row['post_title'] . ' ' . $row['post_content']); + if(preg_match('/(?:<[\s\n\r\t]*script[\r\s\n\t]+.*>|<[\s\n\r\t]*meta.*refresh)/i', $row['post_title'])){ + $postID = $row['ID']; + $this->addIssue('postBadTitle', 1, $row['ID'], md5($row['post_title']), "Post title contains suspicious code", "This post contains code that is suspicious. Please check the title of the post and confirm that the code in the title is not malicious.", array( + 'postID' => $postID, + 'postTitle' => $row['post_title'], + 'permalink' => get_permalink($postID), + 'editPostLink' => get_edit_post_link($postID), + 'type' => $row['post_type'], + 'postDate' => $row['post_date'], + 'isMultisite' => $blog['isMultisite'], + 'domain' => $blog['domain'], + 'path' => $blog['path'], + 'blog_id' => $blog['blog_id'] + )); + } + + + $this->scanData[$blog['blog_id'] . '-' . $row['ID']] = array( + 'contentMD5' => md5($row['post_content']), + 'title' => $row['post_title'], + 'type' => $row['post_type'], + 'postDate' => $row['post_date'], + 'isMultisite' => $blog['isMultisite'], + 'domain' => $blog['domain'], + 'path' => $blog['path'], + 'blog_id' => $blog['blog_id'] + ); + $this->forkIfNeeded(); + } + } + private function scan_posts_finish(){ + $this->status(2, 'info', "Examining URLs found in posts we scanned for dangerous websites"); + $hooverResults = $this->hoover->getBaddies(); + $this->status(2, 'info', "Done examining URLs"); + if($this->hoover->errorMsg){ + wordfence::statusEndErr(); + throw new Exception($this->hoover->errorMsg); + + } + $this->hoover->cleanup(); + $haveIssues = false; + foreach($hooverResults as $idString => $hresults){ + $arr = explode('-', $idString); + $blogID = $arr[0]; + $postID = $arr[1]; + $uctype = ucfirst($this->scanData[$idString]['type']); + $type = $this->scanData[$idString]['type']; + foreach($hresults as $result){ + if($result['badList'] == 'goog-malware-shavar'){ + $shortMsg = "$uctype contains a suspected malware URL: " . $this->scanData[$idString]['title']; + $longMsg = "This $type contains a suspected malware URL listed on Google's list of malware sites. The URL is: " . $result['URL'] . " - More info available at Google Safe Browsing diagnostic page."; + } else if($result['badList'] == 'googpub-phish-shavar'){ + $shortMsg = "$uctype contains a suspected phishing site URL: " . $this->scanData[$idString]['title']; + $longMsg = "This $type contains a URL that is a suspected phishing site that is currently listed on Google's list of known phishing sites. The URL is: " . $result['URL']; + } else { + //A list type that may be new and the plugin has not been upgraded yet. + continue; + } + $this->status(2, 'info', "Adding issue: $shortMsg"); + if(is_multisite()){ + switch_to_blog($blogID); + } + $ignoreP = $idString; + $ignoreC = $idString . $this->scanData[$idString]['contentMD5']; + if($this->addIssue('postBadURL', 1, $ignoreP, $ignoreC, $shortMsg, $longMsg, array( + 'postID' => $postID, + 'badURL' => $result['URL'], + 'postTitle' => $this->scanData[$idString]['title'], + 'type' => $this->scanData[$idString]['type'], + 'uctype' => $uctype, + 'permalink' => get_permalink($postID), + 'editPostLink' => get_edit_post_link($postID), + 'postDate' => $this->scanData[$idString]['postDate'], + 'isMultisite' => $this->scanData[$idString]['isMultisite'], + 'domain' => $this->scanData[$idString]['domain'], + 'path' => $this->scanData[$idString]['path'], + 'blog_id' => $blogID + ))){ + $haveIssues = true; + } + if(is_multisite()){ + restore_current_blog(); + } + } + } + $this->scanData = array(); + wordfence::statusEnd($this->statusIDX['posts'], $haveIssues); + } + private function scan_comments_init(){ + $this->statusIDX['comments'] = wordfence::statusStart('Scanning comments for URL\'s in Google\'s Safe Browsing List'); + $this->scanData = array(); + $this->scanQueue = array(); + $this->hoover = new wordfenceURLHoover($this->apiKey, $this->wp_version); + $blogsToScan = self::getBlogsToScan('comments'); + $wfdb = new wfDB(); + foreach($blogsToScan as $blog){ + $q1 = $wfdb->querySelect("select comment_ID from " . $blog['table'] . " where comment_approved=1"); + foreach($q1 as $idRow){ + $this->scanQueue[] = array($blog, $idRow['comment_ID']); + } + } + } + private function scan_comments_main(){ + $wfdb = new wfDB(); + while($elem = array_shift($this->scanQueue)){ + $queueSize = sizeof($this->scanQueue); + if($queueSize > 0 && $queueSize % 1000 == 0){ + wordfence::status(2, 'info', "Scanning comments with $queueSize left to scan."); + } + $blog = $elem[0]; + $commentID = $elem[1]; + $row = $wfdb->querySingleRec("select comment_ID, comment_date, comment_type, comment_author, comment_author_url, comment_content from " . $blog['table'] . " where comment_ID=%d", $commentID); + $this->hoover->hoover($blog['blog_id'] . '-' . $row['comment_ID'], $row['comment_author_url'] . ' ' . $row['comment_author'] . ' ' . $row['comment_content']); + $this->scanData[$blog['blog_id'] . '-' . $row['comment_ID']] = array( + 'contentMD5' => md5($row['comment_content'] . $row['comment_author'] . $row['comment_author_url']), + 'author' => $row['comment_author'], + 'type' => ($row['comment_type'] ? $row['comment_type'] : 'comment'), + 'date' => $row['comment_date'], + 'isMultisite' => $blog['isMultisite'], + 'domain' => $blog['domain'], + 'path' => $blog['path'], + 'blog_id' => $blog['blog_id'] + ); + $this->forkIfNeeded(); + } + } + private function scan_comments_finish(){ + $hooverResults = $this->hoover->getBaddies(); + if($this->hoover->errorMsg){ + wordfence::statusEndErr(); + throw new Exception($this->hoover->errorMsg); + } + $this->hoover->cleanup(); + $haveIssues = false; + foreach($hooverResults as $idString => $hresults){ + $arr = explode('-', $idString); + $blogID = $arr[0]; + $commentID = $arr[1]; + $uctype = ucfirst($this->scanData[$idString]['type']); + $type = $this->scanData[$idString]['type']; + foreach($hresults as $result){ + if($result['badList'] == 'goog-malware-shavar'){ + $shortMsg = "$uctype with author " . $this->scanData[$idString]['author'] . " contains a suspected malware URL."; + $longMsg = "This $type contains a suspected malware URL listed on Google's list of malware sites. The URL is: " . $result['URL'] . " - More info available at Google Safe Browsing diagnostic page."; + } else if($result['badList'] == 'googpub-phish-shavar'){ + $shortMsg = "$uctype contains a suspected phishing site URL."; + $longMsg = "This $type contains a URL that is a suspected phishing site that is currently listed on Google's list of known phishing sites. The URL is: " . $result['URL']; + } else { + //A list type that may be new and the plugin has not been upgraded yet. + continue; + } + if(is_multisite()){ + switch_to_blog($blogID); + } + $ignoreP = $idString; + $ignoreC = $idString . '-' . $this->scanData[$idString]['contentMD5']; + if($this->addIssue('commentBadURL', 1, $ignoreP, $ignoreC, $shortMsg, $longMsg, array( + 'commentID' => $commentID, + 'badURL' => $result['URL'], + 'author' => $this->scanData[$idString]['author'], + 'type' => $type, + 'uctype' => $uctype, + 'editCommentLink' => get_edit_comment_link($commentID), + 'commentDate' => $this->scanData[$idString]['date'], + 'isMultisite' => $this->scanData[$idString]['isMultisite'], + 'domain' => $this->scanData[$idString]['domain'], + 'path' => $this->scanData[$idString]['path'], + 'blog_id' => $blogID + ))){ + $haveIssues = true; + } + if(is_multisite()){ + restore_current_blog(); + } + } + } + wordfence::statusEnd($this->statusIDX['comments'], $haveIssues); + } + public function isBadComment($author, $email, $url, $IP, $content){ + $content = $author . ' ' . $email . ' ' . $url . ' ' . $IP . ' ' . $content; + $cDesc = ''; + if($author){ + $cDesc = "Author: $author "; + } + if($email){ + $cDesc .= "Email: $email "; + } + $cDesc .= "Source IP: $IP "; + $this->status(2, 'info', "Scanning comment with $cDesc"); + + $h = new wordfenceURLHoover($this->apiKey, $this->wp_version); + $h->hoover(1, $content); + $hooverResults = $h->getBaddies(); + if($h->errorMsg){ + return false; + } + $h->cleanup(); + if(sizeof($hooverResults) > 0 && isset($hooverResults[1])){ + $hresults = $hooverResults[1]; + foreach($hresults as $result){ + if($result['badList'] == 'goog-malware-shavar'){ + $this->status(2, 'info', "Marking comment as spam for containing a malware URL. Comment has $cDesc"); + return true; + } else if($result['badList'] == 'googpub-phish-shavar'){ + $this->status(2, 'info', "Marking comment as spam for containing a phishing URL. Comment has $cDesc"); + return true; + } else { + //A list type that may be new and the plugin has not been upgraded yet. + continue; + } + } + } + $this->status(2, 'info', "Scanned comment with $cDesc"); + return false; + } + public static function getBlogsToScan($table){ + $wfdb = new wfDB(); + global $wpdb; + $prefix = $wpdb->base_prefix; + $blogsToScan = array(); + if(is_multisite()){ + $q1 = $wfdb->querySelect("select blog_id, domain, path from $prefix"."blogs where deleted=0 order by blog_id asc"); + foreach($q1 as $row){ + $row['isMultisite'] = true; + if($row['blog_id'] == 1){ + $row['table'] = $prefix . $table; + } else { + $row['table'] = $prefix . $row['blog_id'] . '_' . $table; + } + $blogsToScan[] = $row; + } + } else { + $blogsToScan[] = array( + 'isMultisite' => false, + 'table' => $prefix . $table, + 'blog_id' => '1', + 'domain' => '', + 'path' => '', + ); + } + return $blogsToScan; + } + private function highestCap($caps){ + foreach(array('administrator', 'editor', 'author', 'contributor', 'subscriber') as $cap){ + if(empty($caps[$cap]) === false && $caps[$cap]){ + return $cap; + } + } + return ''; + } + private function isEditor($caps){ + foreach(array('contributor', 'author', 'editor', 'administrator') as $cap){ + if(empty($caps[$cap]) === false && $caps[$cap]){ + return true; + } + } + return false; + } + private function scan_passwds_init(){ + $this->statusIDX['passwds'] = wordfence::statusStart('Scanning for weak passwords'); + global $wpdb; + $wfdb = new wfDB(); + $res1 = $wfdb->querySelect("select ID from " . $wpdb->users); + $counter = 0; + foreach($res1 as $rec){ + $this->userPasswdQueue .= pack('N', $rec['ID']); + $counter++; + } + wordfence::status(2, 'info', "Starting password strength check on $counter users."); + } + private function scan_passwds_main(){ + global $wpdb; + $wfdb = new wfDB(); + while(strlen($this->userPasswdQueue) > 3){ + $usersLeft = strlen($this->userPasswdQueue) / 4; //4 byte ints + if($usersLeft % 100 == 0){ + wordfence::status(2, 'info', "Total of $usersLeft users left to process in password strength check."); + } + $userID = unpack('N', substr($this->userPasswdQueue, 0, 4)); + $userID = $userID[1]; + $this->userPasswdQueue = substr($this->userPasswdQueue, 4); + $userLogin = $wfdb->querySingle("select user_login from $wpdb->users where ID=%s", $userID); + if(! $userLogin){ + wordfence::status(2, 'error', "Could not get username for user with ID $userID when checking password strenght."); + continue; + } + wordfence::status(4, 'info', "Checking password strength for user $userLogin with ID $userID"); + if($this->scanUserPassword($userID)){ + $this->passwdHasIssues = true; + } + $this->forkIfNeeded(); + } + } + private function scan_passwds_finish(){ + wordfence::statusEnd($this->statusIDX['passwds'], $this->passwdHasIssues); + } + public function scanUserPassword($userID){ + require_once( ABSPATH . 'wp-includes/class-phpass.php'); + $passwdHasher = new PasswordHash(8, TRUE); + $userDat = get_userdata($userID); + $this->status(4, 'info', "Checking password strength of user '" . $userDat->user_login . "'"); + $highCap = $this->highestCap($userDat->wp_capabilities); + if($this->isEditor($userDat->wp_capabilities)){ + $shortMsg = "User \"" . $userDat->user_login . "\" with \"" . $highCap . "\" access has an easy password."; + $longMsg = "A user with the a role of '" . $highCap . "' has a password that is easy to guess. Please change this password yourself or ask the user to change it."; + $level = 1; + $words = $this->dictWords; + } else { + $shortMsg = "User \"" . $userDat->user_login . "\" with 'subscriber' access has a very easy password."; + $longMsg = "A user with 'subscriber' access has a password that is very easy to guess. Please either change it or ask the user to change their password."; + $level = 2; + $words = array($userDat->user_login); + } + $haveIssue = false; + for($i = 0; $i < sizeof($words); $i++){ + if($passwdHasher->CheckPassword($words[$i], $userDat->user_pass)){ + $this->status(2, 'info', "Adding issue " . $shortMsg); + if($this->addIssue('easyPassword', $level, $userDat->ID, $userDat->ID . '-' . $userDat->user_pass, $shortMsg, $longMsg, array( + 'ID' => $userDat->ID, + 'user_login' => $userDat->user_login, + 'user_email' => $userDat->user_email, + 'first_name' => $userDat->first_name, + 'last_name' => $userDat->last_name, + 'editUserLink' => wfUtils::editUserLink($userDat->ID) + ))){ + $haveIssue = true; + } + break; + } + } + $this->status(4, 'info', "Completed checking password strength of user '" . $userDat->user_login . "'"); + return $haveIssue; + } + /* + private function scan_sitePages(){ + if(is_multisite()){ return; } //Multisite not supported by this function yet + $this->statusIDX['sitePages'] = wordfence::statusStart("Scanning externally for malware"); + $resp = wp_remote_get(site_url()); + if(is_array($resp) && isset($resp['body']) && strlen($rep['body']) > 0){ + $this->hoover = new wordfenceURLHoover($this->apiKey, $this->wp_version); + $this->hoover->hoover(1, $rep['body']); + $hooverResults = $this->hoover->getBaddies(); + if($this->hoover->errorMsg){ + wordfence::statusEndErr(); + throw new Exception($this->hoover->errorMsg); + } + $badURLs = array(); + foreach($hooverResults as $idString => $hresults){ + foreach($hresults as $result){ + if(! in_array($result['URL'], $badURLs)){ + $badURLs[] = $result['URL']; + } + } + } + if(sizeof($badURLs) > 0){ + $this->addIssue('badSitePage', 1, 'badSitePage1', 'badSitePage1', "Your home page contains a malware URL"); + } + } + } + */ + private function scan_diskSpace(){ + $this->statusIDX['diskSpace'] = wordfence::statusStart("Scanning to check available disk space"); + wfUtils::errorsOff(); + $total = @disk_total_space('.'); + $free = @disk_free_space('.'); + wfUtils::errorsOn(); + if( (! $total) || (! $free )){ //If we get zeros it's probably not reading right. If free is zero then we're out of space and already in trouble. + wordfence::statusEnd($this->statusIDX['diskSpace'], false); + return; + } + $this->status(2, 'info', "Total disk space: " . sprintf('%.4f', ($total / 1024 / 1024 / 1024)) . "GB -- Free disk space: " . sprintf('%.4f', ($free / 1024 / 1024 / 1024)) . "GB"); + $freeMegs = sprintf('%.2f', $free / 1024 / 1024); + $this->status(2, 'info', "The disk has $freeMegs MB space available"); + if($freeMegs < 5){ + $level = 1; + } else if($freeMegs < 20){ + $level = 2; + } else { + wordfence::statusEnd($this->statusIDX['diskSpace'], false); + return; + } + if($this->addIssue('diskSpace', $level, 'diskSpace' . $level, 'diskSpace' . $level, "You have $freeMegs" . "MB disk space remaining", "You only have $freeMegs" . " Megabytes of your disk space remaining. Please free up disk space or your website may stop serving requests.", array( + 'spaceLeft' => $freeMegs . "MB" ))){ + wordfence::statusEnd($this->statusIDX['diskSpace'], true); + } else { + wordfence::statusEnd($this->statusIDX['diskSpace'], false); + } + } + private function scan_dns(){ + if(! function_exists('dns_get_record')){ + $this->status(1, 'info', "Skipping DNS scan because this system does not support dns_get_record()"); + return; + } + $this->statusIDX['dns'] = wordfence::statusStart("Scanning DNS for unauthorized changes"); + $haveIssues = false; + $home = get_home_url(); + if(preg_match('/https?:\/\/([^\/]+)/i', $home, $matches)){ + $host = strtolower($matches[1]); + $this->status(2, 'info', "Starting DNS scan for $host"); + + $cnameArrRec = @dns_get_record($host, DNS_CNAME); + $cnameArr = array(); + $cnamesWeMustTrack = array(); + if ($cnameArrRec) { + foreach($cnameArrRec as $elem){ + $this->status(2, 'info', "Scanning CNAME DNS record for " . $elem['host']); + if($elem['host'] == $host){ + $cnameArr[] = $elem; + $cnamesWeMustTrack[] = $elem['target']; + } + } + } + + function wfAnonFunc1($a){ return $a['host'] . ' points to ' . $a['target']; } + $cnameArr = array_map('wfAnonFunc1', $cnameArr); + sort($cnameArr, SORT_STRING); + $currentCNAME = implode(', ', $cnameArr); + $loggedCNAME = wfConfig::get('wf_dnsCNAME'); + $dnsLogged = wfConfig::get('wf_dnsLogged', false); + $msg = "A change in your DNS records may indicate that a hacker has hacked into your DNS administration system and has pointed your email or website to their own server for malicious purposes. It could also indicate that your domain has expired. If you made this change yourself you can mark it 'resolved' and safely ignore it."; + if($dnsLogged && $loggedCNAME != $currentCNAME){ + if($this->addIssue('dnsChange', 2, 'dnsChanges', 'dnsChanges', "Your DNS records have changed", "We have detected a change in the CNAME records of your DNS configuration for the domain $host. A CNAME record is an alias that is used to point a domain name to another domain name. For example foo.example.com can point to bar.example.com which then points to an IP address of 10.1.1.1. $msg", array( + 'type' => 'CNAME', + 'host' => $host, + 'oldDNS' => $loggedCNAME, + 'newDNS' => $currentCNAME + ))){ + $haveIssues = true; + } + } + wfConfig::set('wf_dnsCNAME', $currentCNAME); + + $aArrRec = dns_get_record($host, DNS_A); + $aArr = array(); + foreach($aArrRec as $elem){ + $this->status(2, 'info', "Scanning DNS A record for " . $elem['host']); + if($elem['host'] == $host || in_array($elem['host'], $cnamesWeMustTrack) ){ + $aArr[] = $elem; + } + } + function wfAnonFunc2($a){ return $a['host'] . ' points to ' . $a['ip']; } + $aArr = array_map('wfAnonFunc2', $aArr); + sort($aArr, SORT_STRING); + $currentA = implode(', ', $aArr); + $loggedA = wfConfig::get('wf_dnsA'); + $dnsLogged = wfConfig::get('wf_dnsLogged', false); + if($dnsLogged && $loggedA != $currentA){ + if($this->addIssue('dnsChange', 2, 'dnsChanges', 'dnsChanges', "Your DNS records have changed", "We have detected a change in the A records of your DNS configuration that may affect the domain $host. An A record is a record in DNS that points a domain name to an IP address. $msg", array( + 'type' => 'A', + 'host' => $host, + 'oldDNS' => $loggedA, + 'newDNS' => $currentA + ))){ + $haveIssues = true; + } + } + wfConfig::set('wf_dnsA', $currentA); + + + + $mxArrRec = dns_get_record($host, DNS_MX); + $mxArr = array(); + foreach($mxArrRec as $elem){ + $this->status(2, 'info', "Scanning DNS MX record for " . $elem['host']); + if($elem['host'] == $host){ + $mxArr[] = $elem; + } + } + function wfAnonFunc3($a){ return $a['target']; } + $mxArr = array_map('wfAnonFunc3', $mxArr); + sort($mxArr, SORT_STRING); + $currentMX = implode(', ', $mxArr); + $loggedMX = wfConfig::get('wf_dnsMX'); + if($dnsLogged && $loggedMX != $currentMX){ + if($this->addIssue('dnsChange', 2, 'dnsChanges', 'dnsChanges', "Your DNS records have changed", "We have detected a change in the email server (MX) records of your DNS configuration for the domain $host. $msg", array( + 'type' => 'MX', + 'host' => $host, + 'oldDNS' => $loggedMX, + 'newDNS' => $currentMX + ))){ + $haveIssues = true; + } + + } + wfConfig::set('wf_dnsMX', $currentMX); + + wfConfig::set('wf_dnsLogged', 1); + } + wordfence::statusEnd($this->statusIDX['dns'], $haveIssues); + } + + /** + * + */ + private function scan_oldVersions(){ + $this->statusIDX['oldVersions'] = wordfence::statusStart("Scanning for old themes, plugins and core files"); + $haveIssues = false; + + $update_check = new wfUpdateCheck(); + $update_check->checkAllUpdates(); + + // WordPress core updates needed + if ($update_check->needsCoreUpdate()) { + if ($this->addIssue('wfUpgrade', 1, 'wfUpgrade' . $update_check->getCoreUpdateVersion(), 'wfUpgrade' . $update_check->getCoreUpdateVersion(), "Your WordPress version is out of date", "WordPress version " . $update_check->getCoreUpdateVersion() . " is now available. Please upgrade immediately to get the latest security updates from WordPress.", array( + 'currentVersion' => $this->wp_version, + 'newVersion' => $update_check->getCoreUpdateVersion(), + )) + ) { + $haveIssues = true; + } + } + + // Plugin updates needed + if (count($update_check->getPluginUpdates()) > 0) { + foreach ($update_check->getPluginUpdates() as $plugin) { + $key = 'wfPluginUpgrade' . ' ' . $plugin['pluginFile'] . ' ' . $plugin['newVersion'] . ' ' . $plugin['Version']; + if ($this->addIssue('wfPluginUpgrade', 1, $key, $key, "The Plugin \"" . $plugin['Name'] . "\" needs an upgrade.", "You need to upgrade \"" . $plugin['Name'] . "\" to the newest version to ensure you have any security fixes the developer has released.", $plugin)) { + $haveIssues = true; + } + } + } + + // Theme updates needed + if (count($update_check->getThemeUpdates()) > 0) { + foreach ($update_check->getThemeUpdates() as $theme) { + $key = 'wfThemeUpgrade' . ' ' . $theme['Name'] . ' ' . $theme['version'] . ' ' . $theme['newVersion']; + if ($this->addIssue('wfThemeUpgrade', 1, $key, $key, "The Theme \"" . $theme['Name'] . "\" needs an upgrade.", "You need to upgrade \"" . $theme['Name'] . "\" to the newest version to ensure you have any security fixes the developer has released.", $theme)) { + $haveIssues = true; + } + } + } + + wordfence::statusEnd($this->statusIDX['oldVersions'], $haveIssues); + } + public function status($level, $type, $msg){ + wordfence::status($level, $type, $msg); + } + public function addIssue($type, $severity, $ignoreP, $ignoreC, $shortMsg, $longMsg, $templateData){ + return $this->i->addIssue($type, $severity, $ignoreP, $ignoreC, $shortMsg, $longMsg, $templateData); + } + public static function requestKill(){ + wfConfig::set('wfKillRequested', time()); + } + public static function checkForKill(){ + $kill = wfConfig::get('wfKillRequested', 0); + if($kill && time() - $kill < 600){ //Kill lasts for 10 minutes + wordfence::status(10, 'info', "SUM_KILLED:Previous scan was killed successfully."); + throw new Exception("Scan was killed on administrator request."); + } + } + public static function startScan($isFork = false){ + if(! $isFork){ //beginning of scan + wfConfig::inc('totalScansRun'); + wfConfig::set('wfKillRequested', 0); + wordfence::status(4, 'info', "Entering start scan routine"); + if(wfUtils::isScanRunning()){ + return "A scan is already running. Use the kill link if you would like to terminate the current scan."; + } + } + $timeout = self::getMaxExecutionTime() - 2; //2 seconds shorter than max execution time which ensures that only 2 HTTP processes are ever occupied + $testURL = admin_url('admin-ajax.php?action=wordfence_testAjax'); + if(! wfConfig::get('startScansRemotely', false)){ + $testResult = wp_remote_post($testURL, array( + 'timeout' => $timeout, + 'blocking' => true, + 'sslverify' => false, + 'headers' => array() + )); + wordfence::status(4, 'info', "Test result of scan start URL fetch: " . var_export($testResult, true)); + } + $cronKey = wfUtils::bigRandomHex(); + wfConfig::set('currentCronKey', time() . ',' . $cronKey); + if( (! wfConfig::get('startScansRemotely', false)) && (! is_wp_error($testResult)) && is_array($testResult) && strstr($testResult['body'], 'WFSCANTESTOK') !== false){ + //ajax requests can be sent by the server to itself + $cronURL = 'admin-ajax.php?action=wordfence_doScan&isFork=' . ($isFork ? '1' : '0') . '&cronKey=' . $cronKey; + $cronURL = admin_url($cronURL); + $headers = array(); + wordfence::status(4, 'info', "Starting cron with normal ajax at URL $cronURL"); + wp_remote_get( $cronURL, array( + 'timeout' => $timeout, //Must be less than max execution time or more than 2 HTTP children will be occupied by scan + 'blocking' => true, //Non-blocking seems to block anyway, so we use blocking + 'sslverify' => false, + 'headers' => $headers + ) ); + wordfence::status(4, 'info', "Scan process ended after forking."); + } else { + $cronURL = admin_url('admin-ajax.php'); + $cronURL = preg_replace('/^(https?:\/\/)/i', '$1noc1.wordfence.com/scanp/', $cronURL); + $cronURL .= '?action=wordfence_doScan&isFork=' . ($isFork ? '1' : '0') . '&cronKey=' . $cronKey; + $headers = array(); + wordfence::status(4, 'info', "Starting cron via proxy at URL $cronURL"); + + wp_remote_get( $cronURL, array( + 'timeout' => $timeout, //Must be less than max execution time or more than 2 HTTP children will be occupied by scan + 'blocking' => true, //Non-blocking seems to block anyway, so we use blocking + 'sslverify' => false, + 'headers' => $headers + ) ); + wordfence::status(4, 'info', "Scan process ended after forking."); + } + return false; //No error + } + public function processResponse($result){ + return false; + } + public static function getMaxExecutionTime(){ + $config = wfConfig::get('maxExecutionTime'); + wordfence::status(4, 'info', "Got value from wf config maxExecutionTime: $config"); + if(is_numeric($config) && $config >= 10){ + wordfence::status(4, 'info', "getMaxExecutionTime() returning config value: $config"); + return $config; + } + $ini = @ini_get('max_execution_time'); + wordfence::status(4, 'info', "Got max_execution_time value from ini: $ini"); + if(is_numeric($ini) && $ini >= 10){ + $ini = floor($ini / 2); + wordfence::status(4, 'info', "getMaxExecutionTime() returning half ini value: $ini"); + return $ini; + } + wordfence::status(4, 'info', "getMaxExecutionTime() returning default of: 15"); + return 15; + } +} + +?> +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfUtils.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfUtils.php index 3cd23481..256f0386 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfUtils.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wfUtils.php @@ -1,3 +1,1002 @@ +<<<<<<< .mine + $group) { + if ($group == '0000' && !$done_collapse) { + if (!$collapse) { + $groups[$index] = ':'; + } else { + $groups[$index] = ''; + } + $collapse = true; + } else if ($collapse) { + $done_collapse = true; + $collapse = false; + } + $groups[$index] = ltrim($groups[$index], '0'); + } + $ip = join(':', array_filter($groups)); + $ip = str_replace(':::', '::', $ip); + return $ip == ':' ? '::' : $ip; + } + + return false; + } + + /** + * Verify PHP was compiled with IPv6 support. + * + * Some hosts appear to not have inet_ntop, and others appear to have inet_ntop but are unable to process IPv6 addresses. + * + * @return bool + */ + public static function hasIPv6Support() { + return defined('AF_INET6'); + } + + public static function hasLoginCookie(){ + if(isset($_COOKIE)){ + if(is_array($_COOKIE)){ + foreach($_COOKIE as $key => $val){ + if(strpos($key, 'wordpress_logged_in') == 0){ + return true; + } + } + } + } + return false; + } + public static function getBaseURL(){ + return plugins_url() . '/wordfence/'; + } + public static function getPluginBaseDir(){ + if(function_exists('wp_normalize_path')){ //Older WP versions don't have this func and we had many complaints before this check. + if(defined('WP_PLUGIN_DIR')) { + return wp_normalize_path(WP_PLUGIN_DIR . '/'); + } + return wp_normalize_path(WP_CONTENT_DIR . '/plugins/'); + } else { + if(defined('WP_PLUGIN_DIR')) { + return WP_PLUGIN_DIR . '/'; + } + return WP_CONTENT_DIR . '/plugins/'; + } + } + public static function makeRandomIP(){ + return rand(11,230) . '.' . rand(0,255) . '.' . rand(0,255) . '.' . rand(0,255); + } + + /** + * @param string $addr Should be in dot or colon notation (127.0.0.1 or ::1) + * @return bool + */ + public static function isPrivateAddress($addr) { + // Run this through the preset list for IPv4 addresses. + if (filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false) { + $num = self::inet_aton($addr); + foreach (self::$privateAddrs as $a) { + if ($num >= $a[1] && $num <= $a[2]) { + return true; + } + } + } + + return filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6) !== false + && filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false; + } + + /** + * Expects an array of items. The items are either IP's or IP's separated by comma, space or tab. Or an array of IP's. + * We then examine all IP's looking for a public IP and storing private IP's in an array. If we find no public IPs we return the first private addr we found. + * + * @param array $arr + * @return bool|mixed + */ + private static function getCleanIP($arr){ + $privates = array(); //Store private addrs until end as last resort. + for($i = 0; $i < count($arr); $i++){ + $item = $arr[$i]; + if(is_array($item)){ + foreach($item as $j){ + // try verifying the IP is valid before stripping the port off + if (!self::isValidIP($j)) { + $j = preg_replace('/:\d+$/', '', $j); //Strip off port + } + if (self::isValidIP($j)) { + if (self::isPrivateAddress($j)) { + $privates[] = $j; + } else { + return $j; + } + } + } + continue; //This was an array so we can skip to the next item + } + $skipToNext = false; + foreach(array(',', ' ', "\t") as $char){ + if(strpos($item, $char) !== false){ + $sp = explode($char, $item); + foreach($sp as $j){ + if (!self::isValidIP($j)) { + $j = preg_replace('/:\d+$/', '', $j); //Strip off port + } + if(self::isValidIP($j)){ + if(self::isPrivateAddress($j)){ + $privates[] = $j; + } else { + return $j; + } + } + } + $skipToNext = true; + break; + } + } + if($skipToNext){ continue; } //Skip to next item because this one had a comma, space or tab so was delimited and we didn't find anything. + + if (!self::isValidIP($item)) { + $item = preg_replace('/:\d+$/', '', $item); //Strip off port + } + if(self::isValidIP($item)){ + if(self::isPrivateAddress($item)){ + $privates[] = $item; + } else { + return $item; + } + } + } + if(sizeof($privates) > 0){ + return $privates[0]; //Return the first private we found so that we respect the order the IP's were passed to this function. + } else { + return false; + } + } + public static function extractHostname($str){ + if(preg_match('/https?:\/\/([a-zA-Z0-9\.\-]+)(?:\/|$)/i', $str, $matches)){ + return strtolower($matches[1]); + } else { + return false; + } + } + public static function getIP(){ + //For debugging. + //return '54.232.205.132'; + //return self::makeRandomIP(); + + // if no REMOTE_ADDR, it's probably running from the command line + $connection_ip = array_key_exists('REMOTE_ADDR', $_SERVER) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1'; + + $howGet = wfConfig::get('howGetIPs', false); + if($howGet){ + if($howGet == 'REMOTE_ADDR'){ + $IP = self::getCleanIP(array($connection_ip)); + } else { + $IP = self::getCleanIP(array($_SERVER[$howGet], $connection_ip)); + } + } else { + $IPs = array($connection_ip); + if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])){ $IPs[] = $_SERVER['HTTP_X_FORWARDED_FOR']; } + if(isset($_SERVER['HTTP_X_REAL_IP'])){ $IPs[] = $_SERVER['HTTP_X_REAL_IP']; } + $IP = self::getCleanIP($IPs); + } + return $IP; //Returns a valid IP or false. + } + public static function isValidIP($IP){ + return filter_var($IP, FILTER_VALIDATE_IP) !== false; + } + public static function getRequestedURL(){ + if(isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST']){ + $host = $_SERVER['HTTP_HOST']; + } else { + $host = $_SERVER['SERVER_NAME']; + } + $prefix = 'http'; + if( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ){ + $prefix = 'https'; + } + return $prefix . '://' . $host . $_SERVER['REQUEST_URI']; + } + + public static function editUserLink($userID){ + return get_admin_url() . 'user-edit.php?user_id=' . $userID; + } + public static function tmpl($file, $data){ + extract($data); + ob_start(); + include $file; + return ob_get_contents() . (ob_end_clean() ? "" : ""); + } + public static function bigRandomHex(){ + return dechex(rand(0, 2147483647)) . dechex(rand(0, 2147483647)) . dechex(rand(0, 2147483647)); + } + public static function encrypt($str){ + $key = wfConfig::get('encKey'); + if(! $key){ + wordfence::status(1, 'error', "Wordfence error: No encryption key found!"); + return false; + } + $db = new wfDB(); + return $db->querySingle("select HEX(AES_ENCRYPT('%s', '%s')) as val", $str, $key); + } + public static function decrypt($str){ + $key = wfConfig::get('encKey'); + if(! $key){ + wordfence::status(1, 'error', "Wordfence error: No encryption key found!"); + return false; + } + $db = new wfDB(); + return $db->querySingle("select AES_DECRYPT(UNHEX('%s'), '%s') as val", $str, $key); + } + public static function lcmem(){ + $trace=debug_backtrace(); + $caller=array_shift($trace); + $mem = memory_get_usage(true); + error_log("$mem at " . $caller['file'] . " line " . $caller['line']); + } + public static function logCaller(){ + $trace=debug_backtrace(); + $caller=array_shift($trace); + $c2 = array_shift($trace); + error_log("Caller for " . $caller['file'] . " line " . $caller['line'] . " is " . $c2['file'] . ' line ' . $c2['line']); + } + public static function getWPVersion(){ + if(wordfence::$wordfence_wp_version){ + return wordfence::$wordfence_wp_version; + } else { + global $wp_version; + return $wp_version; + } + } + public static function isAdminPageMU(){ + if(preg_match('/^[\/a-zA-Z0-9\-\_\s\+\~\!\^\.]*\/wp-admin\/network\//', $_SERVER['REQUEST_URI'])){ + return true; + } + return false; + } + public static function getSiteBaseURL(){ + return rtrim(site_url(), '/') . '/'; + } + public static function longestLine($data){ + $lines = preg_split('/[\r\n]+/', $data); + $max = 0; + foreach($lines as $line){ + $len = strlen($line); + if($len > $max){ + $max = $len; + } + } + return $max; + } + public static function longestNospace($data){ + $lines = preg_split('/[\r\n\s\t]+/', $data); + $max = 0; + foreach($lines as $line){ + $len = strlen($line); + if($len > $max){ + $max = $len; + } + } + return $max; + } + public static function requestMaxMemory(){ + if(wfConfig::get('maxMem', false) && (int) wfConfig::get('maxMem') > 0){ + $maxMem = (int) wfConfig::get('maxMem'); + } else { + $maxMem = 256; + } + if( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < $maxMem ) ){ + self::iniSet('memory_limit', $maxMem . 'M'); + } + } + public static function isAdmin($user = false){ + if($user){ + if(is_multisite()){ + if(user_can($user, 'manage_network')){ + return true; + } + } else { + if(user_can($user, 'manage_options')){ + return true; + } + } + } else { + if(is_multisite()){ + if(current_user_can('manage_network')){ + return true; + } + } else { + if(current_user_can('manage_options')){ + return true; + } + } + } + return false; + } + public static function isWindows(){ + if(! self::$isWindows){ + if(preg_match('/^win/i', PHP_OS)){ + self::$isWindows = 'yes'; + } else { + self::$isWindows = 'no'; + } + } + return self::$isWindows == 'yes' ? true : false; + } + public static function cleanupOneEntryPerLine($string) { + $string = str_replace(",", "\n", $string); // fix old format + return implode("\n", array_unique(array_filter(array_map('trim', explode("\n", $string))))); + } + public static function getScanFileError() { + $fileTime = wfConfig::get('scanFileProcessing'); + if (! $fileTime) { + return; + } + list($file, $time) = unserialize($fileTime); + if ($time+10 < time()) { + $files = wfConfig::get('scan_exclude') . "\n" . $file; + wfConfig::set('scan_exclude', self::cleanupOneEntryPerLine($files)); + self::endProcessingFile(); + } + } + + public static function beginProcessingFile($file) { + wfConfig::set('scanFileProcessing', serialize(array($file, time()))); + } + + public static function endProcessingFile() { + wfConfig::set('scanFileProcessing', null); + } + + public static function getScanLock(){ + //Windows does not support non-blocking flock, so we use time. + $scanRunning = wfConfig::get('wf_scanRunning'); + if($scanRunning && time() - $scanRunning < WORDFENCE_MAX_SCAN_TIME){ + return false; + } + wfConfig::set('wf_scanRunning', time()); + return true; + } + public static function clearScanLock(){ + global $wpdb; + $wfdb = new wfDB(); + $wfdb->truncate($wpdb->base_prefix . 'wfHoover'); + + wfConfig::set('wf_scanRunning', ''); + } + public static function isScanRunning(){ + $scanRunning = wfConfig::get('wf_scanRunning'); + if($scanRunning && time() - $scanRunning < WORDFENCE_MAX_SCAN_TIME){ + return true; + } else { + return false; + } + } + public static function getIPGeo($IP){ //Works with int or dotted + + $locs = self::getIPsGeo(array($IP)); + if(isset($locs[$IP])){ + return $locs[$IP]; + } else { + return false; + } + } + public static function getIPsGeo($IPs){ //works with int or dotted. Outputs same format it receives. + $IPs = array_unique($IPs); + $toResolve = array(); + $db = new wfDB(); + global $wpdb; + $locsTable = $wpdb->base_prefix . 'wfLocs'; + $IPLocs = array(); + foreach($IPs as $IP){ + $isBinaryIP = !self::isValidIP($IP); + if ($isBinaryIP) { + $ip_printable = wfUtils::inet_ntop($IP); + $ip_bin = $IP; + } else { + $ip_printable = $IP; + $ip_bin = wfUtils::inet_pton($IP); + } + + $row = $db->querySingleRec("select IP, ctime, failed, city, region, countryName, countryCode, lat, lon, unix_timestamp() - ctime as age from " . $locsTable . " where IP=%s", $ip_bin); + if($row){ + if($row['age'] > WORDFENCE_MAX_IPLOC_AGE){ + $db->queryWrite("delete from " . $locsTable . " where IP=%s", $row['IP']); + } else { + if($row['failed'] == 1){ + $IPLocs[$ip_printable] = false; + } else { + $row['IP'] = self::inet_ntop($row['IP']); + $IPLocs[$ip_printable] = $row; + } + } + } + if(! isset($IPLocs[$ip_printable])){ + $toResolve[] = $ip_printable; + } + } + if(sizeof($toResolve) > 0){ + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $freshIPs = $api->call('resolve_ips', array(), array( + 'ips' => implode(',', $toResolve) + )); + if(is_array($freshIPs)){ + foreach($freshIPs as $IP => $value){ + $IP_bin = wfUtils::inet_pton($IP); + if($value == 'failed'){ + $db->queryWrite("insert IGNORE into " . $locsTable . " (IP, ctime, failed) values (%s, unix_timestamp(), 1)", $IP_bin); + $IPLocs[$IP] = false; + } else if(is_array($value)){ + for($i = 0; $i <= 5; $i++){ + //Prevent warnings in debug mode about uninitialized values + if(! isset($value[$i])){ $value[$i] = ''; } + } + $db->queryWrite("insert IGNORE into " . $locsTable . " (IP, ctime, failed, city, region, countryName, countryCode, lat, lon) values (%s, unix_timestamp(), 0, '%s', '%s', '%s', '%s', %s, %s)", + $IP_bin, + $value[3], //city + $value[2], //region + $value[1], //countryName + $value[0],//countryCode + $value[4],//lat + $value[5]//lon + ); + $IPLocs[$IP] = array( + 'IP' => $IP, + 'city' => $value[3], + 'region' => $value[2], + 'countryName' => $value[1], + 'countryCode' => $value[0], + 'lat' => $value[4], + 'lon' => $value[5] + ); + } + } + } + } catch(Exception $e){ + wordfence::status(2, 'error', "Call to Wordfence API to resolve IPs failed: " . $e->getMessage()); + return array(); + } + } + return $IPLocs; + } + + public static function reverseLookup($IP) { + $db = new wfDB(); + global $wpdb; + $reverseTable = $wpdb->base_prefix . 'wfReverseCache'; + $IPn = wfUtils::inet_pton($IP); + $host = $db->querySingle("select host from " . $reverseTable . " where IP=%s and unix_timestamp() - lastUpdate < %d", $IPn, WORDFENCE_REVERSE_LOOKUP_CACHE_TIME); + if (!$host) { + // This function works for IPv4 or IPv6 + if (function_exists('gethostbyaddr')) { + $host = gethostbyaddr($IP); + } + if (!$host) { + $ptr = false; + if (filter_var($IP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false) { + $ptr = implode(".", array_reverse(explode(".", $IP))) . ".in-addr.arpa"; + } else if (filter_var($IP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false) { + $ptr = implode(".", array_reverse(str_split(bin2hex($IPn)))) . ".ip6.arpa"; + } + + if ($ptr && function_exists('dns_get_record')) { + $host = @dns_get_record($ptr, DNS_PTR); + if ($host) { + $host = $host[0]['target']; + } + } + } + if (!$host) { + $host = 'NONE'; + } + $db->queryWrite("insert into " . $reverseTable . " (IP, host, lastUpdate) values (%s, '%s', unix_timestamp()) ON DUPLICATE KEY UPDATE host='%s', lastUpdate=unix_timestamp()", $IPn, $host, $host); + } + if ($host == 'NONE') { + return ''; + } else { + return $host; + } + } + public static function errorsOff(){ + self::$lastErrorReporting = @ini_get('error_reporting'); + @error_reporting(0); + self::$lastDisplayErrors = @ini_get('display_errors'); + self::iniSet('display_errors', 0); + if(class_exists('wfScan')){ wfScan::$errorHandlingOn = false; } + } + public static function errorsOn(){ + @error_reporting(self::$lastErrorReporting); + self::iniSet('display_errors', self::$lastDisplayErrors); + if(class_exists('wfScan')){ wfScan::$errorHandlingOn = true; } + } + //Note this function may report files that are too big which actually are not too big but are unseekable and throw an error on fseek(). But that's intentional + public static function fileTooBig($file){ //Deals with files > 2 gigs on 32 bit systems which are reported with the wrong size due to integer overflow + wfUtils::errorsOff(); + $fh = @fopen($file, 'r'); + wfUtils::errorsOn(); + if(! $fh){ return false; } + $offset = WORDFENCE_MAX_FILE_SIZE_TO_PROCESS + 1; + $tooBig = false; + try { + if(@fseek($fh, $offset, SEEK_SET) === 0){ + if(strlen(fread($fh, 1)) === 1){ + $tooBig = true; + } + } //Otherwise we couldn't seek there so it must be smaller + fclose($fh); + return $tooBig; + } catch(Exception $e){ return true; } //If we get an error don't scan this file, report it's too big. + } + public static function fileOver2Gigs($file){ //Surround calls to this func with try/catch because fseek may throw error. + $fh = @fopen($file, 'r'); + if(! $fh){ return false; } + $offset = 2147483647; + $tooBig = false; + //My throw an error so surround calls to this func with try/catch + if(@fseek($fh, $offset, SEEK_SET) === 0){ + if(strlen(fread($fh, 1)) === 1){ + $tooBig = true; + } + } //Otherwise we couldn't seek there so it must be smaller + @fclose($fh); + return $tooBig; + } + public static function countryCode2Name($code){ + if(isset(wfCountryMap::$map[$code])){ + return wfCountryMap::$map[$code]; + } else { + return ''; + } + } + public static function extractBareURI($URL){ + $URL = preg_replace('/^https?:\/\/[^\/]+/i', '', $URL); //strip of method and host + $URL = preg_replace('/\#.*$/', '', $URL); //strip off fragment + $URL = preg_replace('/\?.*$/', '', $URL); //strip off query string + return $URL; + } + public static function IP2Country($IP){ + if(! (function_exists('geoip_open') && function_exists('geoip_country_code_by_addr') && function_exists('geoip_country_code_by_addr_v6'))){ + require_once('wfGeoIP.php'); + } + $gi = geoip_open(dirname(__FILE__) . "/GeoIP.dat",GEOIP_STANDARD); + if (filter_var($IP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false) { + $country = geoip_country_code_by_addr_v6($gi, $IP); + } else { + $country = geoip_country_code_by_addr($gi, $IP); + } + geoip_close($gi); + return $country ? $country : ''; + } + public static function siteURLRelative(){ + if(is_multisite()){ + $URL = network_site_url(); + } else { + $URL = site_url(); + } + $URL = preg_replace('/^https?:\/\/[^\/]+/i', '', $URL); + $URL = rtrim($URL, '/') . '/'; + return $URL; + } + public static function localHumanDate(){ + return date('l jS \of F Y \a\t h:i:s A', time() + (3600 * get_option('gmt_offset'))); + } + public static function localHumanDateShort(){ + return date('D jS F \@ h:i:sA', time() + (3600 * get_option('gmt_offset'))); + } + public static function funcEnabled($func){ + if(! function_exists($func)){ return false; } + $disabled = explode(',', ini_get('disable_functions')); + foreach($disabled as $f){ + if($func == $f){ return false; } + } + return true; + } + public static function iniSet($key, $val){ + if(self::funcEnabled('ini_set')){ + @ini_set($key, $val); + } + } + public static function doNotCache(){ + header("Cache-Control: no-cache, must-revalidate"); + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); //In the past + if(! defined('DONOTCACHEPAGE')){ define('DONOTCACHEPAGE', true); } + if(! defined('DONOTCACHEDB')){ define('DONOTCACHEDB', true); } + if(! defined('DONOTCDN')){ define('DONOTCDN', true); } + if(! defined('DONOTCACHEOBJECT')){ define('DONOTCACHEOBJECT', true); } + wfCache::doNotCache(); + } + public static function isUABlocked($uaPattern){ // takes a pattern using asterisks as wildcards, turns it into regex and checks it against the visitor UA returning true if blocked + return fnmatch($uaPattern, !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '', FNM_CASEFOLD); + } + public static function isRefererBlocked($refPattern){ + return fnmatch($refPattern, !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '', FNM_CASEFOLD); + } + + /** + * @param $startIP + * @param $endIP + * @return array + */ + public static function rangeToCIDRs($startIP, $endIP){ + $start_ip_printable = wfUtils::inet_ntop($startIP); + if (filter_var($start_ip_printable, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + return self::rangeToCIDRsIPv4(current(unpack('N', substr($startIP, 12, 4))), current(unpack('N', substr($endIP, 12, 4)))); + } + $startIPBin = str_pad(wfHelperBin::bin2str($startIP), 128, '0', STR_PAD_LEFT); + $endIPBin = str_pad(wfHelperBin::bin2str($endIP), 128, '0', STR_PAD_LEFT); + $IPIncBin = $startIPBin; + $CIDRs = array(); + while (strcmp($IPIncBin, $endIPBin) <= 0) { + $longNetwork = 128; + $IPNetBin = $IPIncBin; + while (($IPIncBin[$longNetwork - 1] == '0') && (strcmp(substr_replace($IPNetBin, '1', $longNetwork - 1, 1), $endIPBin) <= 0)) { + $IPNetBin[$longNetwork - 1] = '1'; + $longNetwork--; + } + $CIDRs[] = self::inet_ntop(str_pad(wfHelperBin::str2bin($IPIncBin), 16, "\x00", STR_PAD_LEFT)) . ($longNetwork < 128 ? '/' . $longNetwork : ''); + $IPIncBin = str_pad(wfHelperBin::bin2str(wfHelperBin::addbin2bin(chr(1), wfHelperBin::str2bin($IPNetBin))), 128, '0', STR_PAD_LEFT); + } + return $CIDRs; + } + + public static function rangeToCIDRsIPv4($startIP, $endIP){ + $startIPBin = sprintf('%032b', $startIP); + $endIPBin = sprintf('%032b', $endIP); + $IPIncBin = $startIPBin; + $CIDRs = array(); + while(strcmp($IPIncBin, $endIPBin) <= 0){ + $longNetwork = 32; + $IPNetBin = $IPIncBin; + while(($IPIncBin[$longNetwork - 1] == '0') && (strcmp(substr_replace($IPNetBin, '1', $longNetwork - 1, 1), $endIPBin) <= 0)){ + $IPNetBin[$longNetwork - 1] = '1'; + $longNetwork--; + } + $CIDRs[] = long2ip(bindec($IPIncBin)) . ($longNetwork < 32 ? '/' . $longNetwork : ''); + $IPIncBin = sprintf('%032b', bindec($IPNetBin) + 1); + } + return $CIDRs; + } + + public static function setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly){ + if(version_compare(PHP_VERSION, '5.2.0') >= 0){ + @setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly); + } else { + @setcookie($name, $value, $expire, $path); + } + } + public static function isNginx(){ + $sapi = php_sapi_name(); + $serverSoft = $_SERVER['SERVER_SOFTWARE']; + if($sapi == 'fpm-fcgi' && stripos($serverSoft, 'nginx') !== false){ + return true; + } + } + public static function getLastError(){ + $err = error_get_last(); + if(is_array($err)){ + return $err['message']; + } + return ''; + } + public static function hostNotExcludedFromProxy($url){ + if(! defined('WP_PROXY_BYPASS_HOSTS')){ + return true; //No hosts are excluded + } + $hosts = explode(',', WP_PROXY_BYPASS_HOSTS); + $url = preg_replace('/^https?:\/\//i', '', $url); + $url = preg_replace('/\/.*$/', '', $url); + $url = strtolower($url); + foreach($hosts as $h){ + if(strtolower(trim($h)) == $url){ + return false; + } + } + return true; + } + public static function hasXSS($URL){ + if(! preg_match('/^https?:\/\/[a-z0-9\.\-]+\/[^\':<>\"\\\]*$/i', $URL)){ + return true; + } else { + return false; + } + } + + /** + * @return array + */ + public static function getPrivateAddrs() { + return self::$privateAddrs; + } + + /** + * @param string $host + * @return array + */ + public static function resolveDomainName($host) { + // Fallback if this function is not available + if (!function_exists('dns_get_record')) { + return gethostbynamel($host); + } + + $ips = array_merge((array) dns_get_record($host, DNS_AAAA), (array) dns_get_record($host, DNS_A)); + $return = array(); + + foreach ($ips as $record) { + if ($record['type'] === 'A') { + $return[] = $record['ip']; + } + if ($record['type'] === 'AAAA') { + $return[] = $record['ipv6']; + } + } + return $return; + } + + /** + * Expand a compressed printable representation of an IPv6 address. + * + * @param string $ip + * @return string + */ + public static function expandIPv6Address($ip) { + $hex = bin2hex(self::inet_pton($ip)); + $ip = substr(preg_replace("/([a-f0-9]{4})/i", "$1:", $hex), 0, -1); + return $ip; + } + + /** + * @param string $readmePath + * @return bool + */ + public static function hideReadme($readmePath = null) { + if ($readmePath === null) { + $readmePath = ABSPATH . 'readme.html'; + } + + if (file_exists($readmePath)) { + $readmePathInfo = pathinfo($readmePath); + require_once ABSPATH . WPINC . '/pluggable.php'; + $hiddenReadmeFile = $readmePathInfo['filename'] . '.' . wp_hash('readme') . '.' . $readmePathInfo['extension']; + return @rename($readmePath, $readmePathInfo['dirname'] . '/' . $hiddenReadmeFile); + } + return false; + } + + /** + * @param string $readmePath + * @return bool + */ + public static function showReadme($readmePath = null) { + if ($readmePath === null) { + $readmePath = ABSPATH . 'readme.html'; + } + $readmePathInfo = pathinfo($readmePath); + require_once ABSPATH . WPINC . '/pluggable.php'; + $hiddenReadmeFile = $readmePathInfo['dirname'] . '/' . $readmePathInfo['filename'] . '.' . wp_hash('readme') . '.' . $readmePathInfo['extension']; + if (file_exists($hiddenReadmeFile)) { + return @rename($hiddenReadmeFile, $readmePath); + } + return false; + } +} + +// GeoIP lib uses these as well +if (!function_exists('inet_ntop')) { + function inet_ntop($ip) { + return wfUtils::_inet_ntop($ip); + } +} +if (!function_exists('inet_pton')) { + function inet_pton($ip) { + return wfUtils::_inet_pton($ip); + } +} + + +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceClass.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceClass.php index 4c2ea4d3..87a48e72 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceClass.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceClass.php @@ -1,3 +1,3613 @@ +<<<<<<< .mine +dropAll(); + foreach(array('wordfence_version', 'wordfenceActivated') as $opt){ + delete_option($opt); + } + } + } + public static function hourlyCron(){ + global $wpdb; $p = $wpdb->base_prefix; + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + + if(wfConfig::get('other_WFNet')){ + $wfdb = new wfDB(); + $q1 = $wfdb->querySelect("select URI from $p"."wfNet404s where ctime > unix_timestamp() - 3600 limit 1000"); + $URIs = array(); + foreach($q1 as $rec){ + $URIs[] = $rec['URI']; + } + $wfdb->truncate($p . "wfNet404s"); + if(sizeof($URIs) > 0){ + try { + $api->call('send_net_404s', array(), array( 'URIs' => json_encode($URIs) )); + } catch(Exception $e){ + //Ignore + } + } + + $q2 = $wfdb->querySelect("select IP from $p"."wfVulnScanners where ctime > unix_timestamp() - 3600"); + $scanCont = ""; + foreach($q2 as $rec){ + $scanCont .= $rec['IP']; + } + $wfdb->truncate($p . "wfVulnScanners"); + + $q3 = $wfdb->querySelect("select IP from $p"."wfLockedOut where blockedTime > unix_timestamp() - 3600"); + $lockCont = ""; + foreach($q3 as $rec){ + $lockCont .= $rec['IP']; + } + if(strlen($lockCont) > 0 || strlen($scanCont) > 0){ + $cont = pack('N', strlen($lockCont) / 16) . $lockCont . + pack('N', strlen($scanCont) / 16) . $scanCont; + try { + $resp = $api->binCall('get_net_bad_ips', $cont); + if($resp['code'] == 200){ + $len = strlen($resp['data']); + $reason = "WFSN: Blocked by Wordfence Security Network"; + $wfdb->queryWrite("delete from $p"."wfBlocks where wfsn=1 and permanent=0"); + if($len > 0 && $len % 16 == 0){ + for($i = 0; $i < $len; $i += 16){ + $ip_bin = substr($resp['data'], $i, 16); + $IPStr = wfUtils::inet_ntop($ip_bin); + if(! self::getLog()->isWhitelisted($IPStr)){ + self::getLog()->blockIP($IPStr, $reason, true); + } + } + } + } + } catch(Exception $e){ + //Ignore + } + } + } + } + private static function keyAlert($msg){ + self::alert($msg, $msg . " To ensure uninterrupted Premium Wordfence protection on your site,\nplease renew your API key by visiting http://www.wordfence.com/ Sign in, go to your dashboard,\nselect the key about to expire and click the button to renew that API key.", false); + } + public static function dailyCron(){ + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $keyData = $api->call('ping_api_key'); + if(isset($keyData['_isPaidKey']) && $keyData['_isPaidKey']){ + $keyExpDays = $keyData['_keyExpDays']; + $keyIsExpired = $keyData['_expired']; + if (!empty($keyData['_autoRenew'])) { + if ($keyExpDays > 12) { + wfConfig::set('keyAutoRenew10Sent', ''); + } else if ($keyExpDays <= 12 && $keyExpDays > 0 && !wfConfig::get('keyAutoRenew10Sent')) { + wfConfig::set('keyAutoRenew10Sent', 1); + $email = "Your Premium Wordfence API Key is set to auto-renew in 10 days."; + self::alert($email, "$email To update your API key settings please visit http://www.wordfence.com/zz9/dashboard", false); + } + } else { + if($keyExpDays > 15){ + wfConfig::set('keyExp15Sent', ''); + wfConfig::set('keyExp7Sent', ''); + wfConfig::set('keyExp2Sent', ''); + wfConfig::set('keyExp1Sent', ''); + wfConfig::set('keyExpFinalSent', ''); + } else if($keyExpDays <= 15 && $keyExpDays > 0){ + if($keyExpDays <= 15 && $keyExpDays >= 11 && (! wfConfig::get('keyExp15Sent'))){ + wfConfig::set('keyExp15Sent', 1); + self::keyAlert("Your Premium Wordfence API Key expires in less than 2 weeks."); + } else if($keyExpDays <= 7 && $keyExpDays >= 4 && (! wfConfig::get('keyExp7Sent'))){ + wfConfig::set('keyExp7Sent', 1); + self::keyAlert("Your Premium Wordfence API Key expires in less than a week."); + } else if($keyExpDays == 2 && (! wfConfig::get('keyExp2Sent'))){ + wfConfig::set('keyExp2Sent', 1); + self::keyAlert("Your Premium Wordfence API Key expires in 2 days."); + } else if($keyExpDays == 1 && (! wfConfig::get('keyExp1Sent'))){ + wfConfig::set('keyExp1Sent', 1); + self::keyAlert("Your Premium Wordfence API Key expires in 1 day."); + } + } else if($keyIsExpired && (! wfConfig::get('keyExpFinalSent')) ){ + wfConfig::set('keyExpFinalSent', 1); + self::keyAlert("Your Wordfence Premium API Key has Expired!"); + } + } + } + + $wfdb = new wfDB(); + global $wpdb; $p = $wpdb->base_prefix; + try { + $patData = $api->call('get_known_vuln_pattern'); + if(is_array($patData) && $patData['pat']){ + if(@preg_match($patData['pat'], 'wordfence_test_vuln_match')){ + wfConfig::set('vulnRegex', $patData['pat']); + } + } + } catch(Exception $e){ + wordfence::status(4, 'error', "Could not fetch vulnerability patterns in scheduled job: " . $e->getMessage()); + } + + $wfdb->queryWrite("delete from $p"."wfLocs where ctime < unix_timestamp() - %d", WORDFENCE_MAX_IPLOC_AGE); + $wfdb->truncate($p . "wfBadLeechers"); //only uses date that's less than 1 minute old + $wfdb->queryWrite("delete from $p"."wfBlocks where (blockedTime + %s < unix_timestamp()) and permanent=0", wfConfig::get('blockedTime')); + $wfdb->queryWrite("delete from $p"."wfCrawlers where lastUpdate < unix_timestamp() - (86400 * 7)"); + + $wfdb->truncate($p . "wfVulnScanners"); //We only report data within the last hour in hourlyCron. + // So if we do a once a day truncate to be safe, we'll only potentially lose the hour right before the truncate. + // Worth it to clean out the table completely once a day. + + + $count = $wfdb->querySingle("select count(*) as cnt from $p"."wfHits"); + if($count > 20000){ + $wfdb->truncate($p . "wfHits"); //So we don't slow down sites that have very large wfHits tables + } else if($count > 2000){ + $wfdb->queryWrite("delete from $p"."wfHits order by id asc limit %d", ($count - 100)); + } + +/* + $count6 = $wfdb->querySingle("select count(*) as cnt from $p"."wfPerfLog"); + if($count6 > 20000){ + $wfdb->truncate($p . "wfPerfLog"); //So we don't slow down sites that have very large wfHits tables + } else if($count6 > 2000){ + $wfdb->queryWrite("delete from $p"."wfPerfLog order by id asc limit %d", ($count6 - 100)); + } +*/ + $maxRows = 1000; //affects stuff further down too + foreach(array('wfLeechers', 'wfScanners') as $table){ + //This is time based per IP so shouldn't get too big + $wfdb->queryWrite("delete from $p"."$table where eMin < ((unix_timestamp() - (86400 * 2)) / 60)"); + } + $wfdb->queryWrite("delete from $p"."wfLockedOut where blockedTime + %s < unix_timestamp()", wfConfig::get('loginSec_lockoutMins') * 60); + $count2 = $wfdb->querySingle("select count(*) as cnt from $p"."wfLogins"); + if($count2 > 20000){ + $wfdb->truncate($p . "wfLogins"); //in case of Dos + } else if($count2 > $maxRows){ + $wfdb->queryWrite("delete from $p"."wfLogins order by ctime asc limit %d", ($count2 - 100)); + } + $wfdb->queryWrite("delete from $p"."wfReverseCache where unix_timestamp() - lastUpdate > 86400"); + $count3 = $wfdb->querySingle("select count(*) as cnt from $p"."wfThrottleLog"); + if($count3 > 20000){ + $wfdb->truncate($p . "wfThrottleLog"); //in case of DoS + } else if($count3 > $maxRows){ + $wfdb->queryWrite("delete from $p"."wfThrottleLog order by endTime asc limit %d", ($count3 - 100)); + } + $count4 = $wfdb->querySingle("select count(*) as cnt from $p"."wfStatus"); + if($count4 > 100000){ + $wfdb->truncate($p . "wfStatus"); + } else if($count4 > 1000){ //max status events we keep. This determines how much gets emailed to us when users sends us a debug report. + $wfdb->queryWrite("delete from $p"."wfStatus where level != 10 order by ctime asc limit %d", ($count4 - 1000)); + $count5 = $wfdb->querySingle("select count(*) as cnt from $p"."wfStatus where level=10"); + if($count5 > 100){ + $wfdb->queryWrite("delete from $p"."wfStatus where level = 10 order by ctime asc limit %d", ($count5 - 100) ); + } + } + + $report = new wfActivityReport(); + $report->rotateIPLog(); + } + public static function runInstall(){ + if(self::$runInstallCalled){ return; } + self::$runInstallCalled = true; + if (function_exists('ignore_user_abort')) { + ignore_user_abort(true); + } + $previous_version = get_option('wordfence_version', '0.0.0'); + update_option('wordfence_version', WORDFENCE_VERSION); //In case we have a fatal error we don't want to keep running install. + //EVERYTHING HERE MUST BE IDEMPOTENT + + //Remove old legacy cron job if exists + wp_clear_scheduled_hook('wordfence_scheduled_scan'); + + $schema = new wfSchema(); + $schema->createAll(); //if not exists + wfConfig::setDefaults(); //If not set + + $restOfSite = wfConfig::get('cbl_restOfSiteBlocked', 'notset'); + if($restOfSite == 'notset'){ + wfConfig::set('cbl_restOfSiteBlocked', '1'); + } + + //Install new schedule. If schedule config is blank it will install the default 'auto' schedule. + wordfence::scheduleScans(); + + if(wfConfig::get('autoUpdate') == '1'){ + wfConfig::enableAutoUpdate(); //Sets up the cron + } + + if(! wfConfig::get('apiKey')){ + $api = new wfAPI('', wfUtils::getWPVersion()); + try { + $keyData = $api->call('get_anon_api_key'); + if($keyData['ok'] && $keyData['apiKey']){ + wfConfig::set('apiKey', $keyData['apiKey']); + } else { + throw new Exception("Could not understand the response we received from the Wordfence servers when applying for a free API key."); + } + } catch(Exception $e){ + error_log("Could not fetch free API key from Wordfence: " . $e->getMessage()); + return; + } + } + wp_clear_scheduled_hook('wordfence_daily_cron'); + wp_clear_scheduled_hook('wordfence_hourly_cron'); + if (is_main_site()) { + wp_schedule_event(time(), 'daily', 'wordfence_daily_cron'); //'daily' + wp_schedule_event(time(), 'hourly', 'wordfence_hourly_cron'); + } + + $db = new wfDB(); + + if($db->columnExists('wfHits', 'HTTPHeaders')){ //Upgrade from 3.0.4 + global $wpdb; + $prefix = $wpdb->base_prefix; + $count = $db->querySingle("select count(*) as cnt from $prefix"."wfHits"); + if($count > 20000){ + $db->queryWrite("delete from $prefix"."wfHits order by id asc limit " . ($count - 20000)); + } + $db->dropColumn('wfHits', 'HTTPHeaders'); + } + + //Upgrading from 1.5.6 or earlier needs: + $db->createKeyIfNotExists('wfStatus', 'level', 'k2'); + if(wfConfig::get('isPaid') == 'free'){ + wfConfig::set('isPaid', ''); + } + //End upgrade from 1.5.6 + + /** @var wpdb $wpdb */ + global $wpdb; + $prefix = $wpdb->base_prefix; + $db->queryWriteIgnoreError("alter table $prefix"."wfConfig modify column val longblob"); + $db->queryWriteIgnoreError("alter table $prefix"."wfBlocks add column permanent tinyint UNSIGNED default 0"); + $db->queryWriteIgnoreError("alter table $prefix"."wfStatus modify column msg varchar(1000) NOT NULL"); + //3.1.2 to 3.1.4 + $db->queryWriteIgnoreError("alter table $prefix"."wfBlocks modify column blockedTime bigint signed NOT NULL"); + //3.2.1 to 3.2.2 + $db->queryWriteIgnoreError("alter table $prefix"."wfLockedOut modify column blockedTime bigint signed NOT NULL"); + $db->queryWriteIgnoreError("drop table if exists $prefix"."wfFileQueue"); + $db->queryWriteIgnoreError("drop table if exists $prefix"."wfFileChanges"); + + $result = $wpdb->get_row("SHOW FIELDS FROM {$prefix}wfStatus where field = 'id'"); + if (!$result || strtolower($result->Key) != 'pri') { + //Adding primary key to this table because some backup apps use primary key during backup. + $db->queryWriteIgnoreError("alter table {$prefix}wfStatus add id bigint UNSIGNED NOT NULL auto_increment PRIMARY KEY"); + } + + $optScanEnabled = $db->querySingle("select val from $prefix"."wfConfig where name='scansEnabled_options'"); + if($optScanEnabled != '0' && $optScanEnabled != '1'){ + $db->queryWrite("update $prefix"."wfConfig set val='1' where name='scansEnabled_options'"); + } + + $optScanEnabled = $db->querySingle("select val from $prefix"."wfConfig where name='scansEnabled_heartbleed'"); + if($optScanEnabled != '0' && $optScanEnabled != '1'){ //Enable heartbleed if no value is set. + wfConfig::set('scansEnabled_heartbleed', 1); + } + + if (wfConfig::get('cacheType') == 'php' || wfConfig::get('cacheType') == 'falcon') { + wfCache::removeCacheDirectoryHtaccess(); + } + + // IPv6 schema changes for 6.0.1 + $tables_with_ips = array( + 'wfCrawlers', + 'wfBadLeechers', + 'wfBlockedIPLog', + 'wfBlocks', + 'wfHits', + 'wfLeechers', + 'wfLockedOut', + 'wfLocs', + 'wfLogins', + 'wfReverseCache', + 'wfScanners', + 'wfThrottleLog', + 'wfVulnScanners', + ); + + foreach ($tables_with_ips as $ip_table) { + $result = $wpdb->get_row("SHOW FIELDS FROM {$prefix}{$ip_table} where field = 'IP'"); + if (!$result || strtolower($result->Type) == 'binary(16)') { + continue; + } + + $db->queryWriteIgnoreError("ALTER TABLE {$prefix}{$ip_table} MODIFY IP BINARY(16)"); + + // Just to be sure we don't corrupt the data if the alter fails. + $result = $wpdb->get_row("SHOW FIELDS FROM {$prefix}{$ip_table} where field = 'IP'"); + if (!$result || strtolower($result->Type) != 'binary(16)') { + continue; + } + $db->queryWriteIgnoreError("UPDATE {$prefix}{$ip_table} SET IP = CONCAT(LPAD(CHAR(0xff, 0xff), 12, CHAR(0)), LPAD( + CHAR( + CAST(IP as UNSIGNED) >> 24 & 0xFF, + CAST(IP as UNSIGNED) >> 16 & 0xFF, + CAST(IP as UNSIGNED) >> 8 & 0xFF, + CAST(IP as UNSIGNED) & 0xFF + ), + 4, + CHAR(0) +))"); + } + + // Fix the data in the country column. + // TODO: add version check so this doesn't run on every update. + $ip_results = $wpdb->get_results("SELECT * FROM `{$prefix}wfBlockedIPLog` GROUP BY IP"); + if ($ip_results) { + foreach ($ip_results as $ip_row) { + $wpdb->query($wpdb->prepare("UPDATE `{$prefix}wfBlockedIPLog` SET countryCode = %s WHERE IP = %s", wfUtils::IP2Country(wfUtils::inet_ntop($ip_row->IP)), $ip_row->IP)); + } + } + + if (wfConfig::get('other_hideWPVersion')) { + wfUtils::hideReadme(); + } + + //Must be the final line + } + private static function doEarlyAccessLogging(){ + $wfLog = self::getLog(); + if($wfLog->logHitOK()){ + if( empty($wfFunc) && is_404() ){ + $wfLog->logLeechAndBlock('404'); + } else { + $wfLog->logLeechAndBlock('hit'); + } + if(wfConfig::liveTrafficEnabled()){ + self::$hitID = $wfLog->logHit(); + add_action('wp_head', 'wordfence::wfLogHumanHeader'); + } + /* + if(wfConfig::get('perfLoggingEnabled', false)){ + add_action('wp_head', 'wordfence::wfLogPerfHeader'); + } + */ + } + } + public static function initProtection(){ + if(preg_match('/\/wp\-admin\/admin\-ajax\.php/', $_SERVER['REQUEST_URI'])){ + if( + (isset($_GET['action']) && $_GET['action'] == 'revslider_show_image' && isset($_GET['img']) && preg_match('/\.php$/i', $_GET['img'])) || + (isset($_POST['action']) && $_POST['action'] == 'revslider_show_image' && isset($_POST['img']) && preg_match('/\.php$/i', $_POST['img'])) + ){ + self::getLog()->do503(86400, "URL not allowed. Slider Revolution Hack attempt detected. #2"); + exit(); //function above exits anyway + } + } + } + public static function install_actions(){ + self::initProtection(); + if(wfUtils::hasLoginCookie()){ //Fast way of checking if user may be logged in. Not secure, but these are only available if you're signed in. + register_activation_hook(WP_PLUGIN_DIR . '/wordfence/wordfence.php', 'wordfence::installPlugin'); + register_deactivation_hook(WP_PLUGIN_DIR . '/wordfence/wordfence.php', 'wordfence::uninstallPlugin'); + } + + $versionInOptions = get_option('wordfence_version', false); + if( (! $versionInOptions) || version_compare(WORDFENCE_VERSION, $versionInOptions, '>')){ + //Either there is no version in options or the version in options is greater and we need to run the upgrade + self::runInstall(); + } + //These access wfConfig::get('apiKey') and will fail if runInstall hasn't executed. + wfCache::setupCaching(); + + if(defined('MULTISITE') && MULTISITE === true){ + global $blog_id; + if($blog_id == 1 && get_option('wordfenceActivated') != 1){ return; } //Because the plugin is active once installed, even before it's network activated, for site 1 (WordPress team, why?!) + } + //User may be logged in or not, so register both handlers + add_action('wp_ajax_nopriv_wordfence_logHuman', 'wordfence::ajax_logHuman_callback'); + add_action('wp_ajax_nopriv_wordfence_doScan', 'wordfence::ajax_doScan_callback'); + add_action('wp_ajax_nopriv_wordfence_testAjax', 'wordfence::ajax_testAjax_callback'); + add_action('wp_ajax_nopriv_wordfence_perfLog', 'wordfence::ajax_perfLog_callback'); + if(wfUtils::hasLoginCookie()){ //may be logged in. Fast way to check. These aren't secure functions, this is just a perf optimization, along with every other use of hasLoginCookie() + add_action('wp_ajax_wordfence_perfLog', 'wordfence::ajax_perfLog_callback'); + add_action('wp_ajax_wordfence_logHuman', 'wordfence::ajax_logHuman_callback'); + add_action('wp_ajax_wordfence_doScan', 'wordfence::ajax_doScan_callback'); + add_action('wp_ajax_wordfence_testAjax', 'wordfence::ajax_testAjax_callback'); + + if (is_multisite()) { + add_action('wp_network_dashboard_setup', 'wordfence::addDashboardWidget'); + } else { + add_action('wp_dashboard_setup', 'wordfence::addDashboardWidget'); + } + } + + + add_action('wordfence_start_scheduled_scan', 'wordfence::wordfenceStartScheduledScan'); + add_action('wordfence_daily_cron', 'wordfence::dailyCron'); + add_action('wordfence_daily_autoUpdate', 'wfConfig::autoUpdate'); + add_action('wordfence_hourly_cron', 'wordfence::hourlyCron'); + add_action('plugins_loaded', 'wordfence::veryFirstAction'); + add_action('init', 'wordfence::initAction'); + add_action('template_redirect', 'wordfence::templateRedir', 1001); + add_action('shutdown', 'wordfence::shutdownAction'); + + if(version_compare(PHP_VERSION, '5.4.0') >= 0){ + add_action('wp_authenticate','wordfence::authActionNew', 1, 2); + } else { + add_action('wp_authenticate','wordfence::authActionOld', 1, 2); + } + add_filter('authenticate', 'wordfence::authenticateFilter', 99, 3); + if (self::isLockedOut(wfUtils::getIP())) { + add_filter('xmlrpc_enabled', '__return_false'); + } + + add_action('login_init','wordfence::loginInitAction'); + add_action('wp_login','wordfence::loginAction'); + add_action('wp_logout','wordfence::logoutAction'); + add_action('lostpassword_post', 'wordfence::lostPasswordPost', '1'); + if(wfUtils::hasLoginCookie()){ + add_action('user_profile_update_errors', 'wordfence::validateProfileUpdate', 0, 3 ); + add_action('profile_update', 'wordfence::profileUpdateAction', '99', 2); + add_action('validate_password_reset', 'wordfence::validatePassword', 10, 2 ); + } + add_action('publish_future_post', 'wordfence::publishFuturePost'); + add_action('mobile_setup', 'wordfence::jetpackMobileSetup'); //Action called in Jetpack Mobile Theme: modules/minileven/minileven.php + + // Add actions for the email summary + add_action('wordfence_email_activity_report', array('wfActivityReport', 'executeCronJob')); + + //For debugging + //add_filter( 'cron_schedules', 'wordfence::cronAddSchedules' ); + + add_filter('wp_redirect', 'wordfence::wpRedirectFilter', 99, 2); + add_filter('pre_comment_approved', 'wordfence::preCommentApprovedFilter', '99', 2); + //html|xhtml|atom|rss2|rdf|comment|export + if(wfConfig::get('other_hideWPVersion')){ + add_filter('style_loader_src', 'wordfence::replaceVersion'); + add_filter('script_loader_src', 'wordfence::replaceVersion'); + + add_action('upgrader_process_complete', 'wordfence::hideReadme'); + } + add_filter('get_the_generator_html', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_xhtml', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_atom', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_rss2', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_rdf', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_comment', 'wordfence::genFilter', 99, 2); + add_filter('get_the_generator_export', 'wordfence::genFilter', 99, 2); + add_filter('registration_errors', 'wordfence::registrationFilter', 99, 3); + + // Change GoDaddy's limit login mu-plugin since it can interfere with the two factor auth message. + if (self::hasGDLimitLoginsMUPlugin()) { + add_action('login_errors', array('wordfence', 'fixGDLimitLoginsErrors'), 11); + } + + if(is_admin()){ + add_action('admin_init', 'wordfence::admin_init'); + if(is_multisite()){ + if(wfUtils::isAdminPageMU()){ + add_action('network_admin_menu', 'wordfence::admin_menus'); + } //else don't show menu + } else { + add_action('admin_menu', 'wordfence::admin_menus'); + } + add_filter('pre_update_option_permalink_structure', 'wordfence::disablePermalinksFilter', 10, 2); + if( preg_match('/^(?:falcon|php)$/', wfConfig::get('cacheType')) ){ + add_filter('post_row_actions', 'wordfence::postRowActions', 0, 2); + add_filter('page_row_actions', 'wordfence::pageRowActions', 0, 2); + add_action('post_submitbox_start', 'wordfence::postSubmitboxStart'); + } + } + + add_action('request', 'wordfence::preventAuthorNScans'); + } + /* + public static function cronAddSchedules($schedules){ + $schedules['wfEachMinute'] = array( + 'interval' => 60, + 'display' => __( 'Once a Minute' ) + ); + return $schedules; + } + */ + /* + public static function addDashboardWidget(){ + wp_add_dashboard_widget('wordfenceDashboardWidget', 'Wordfence Security Status', 'wordfence::displayDashboardWidget'); + } + public static function displayDashboardWidget(){ + require('dashboard.php'); + } + */ + public static function jetpackMobileSetup(){ + define('WFDONOTCACHE', true); //Don't cache jetpack mobile theme pages. + } + public static function wpRedirectFilter($URL, $status){ + return $URL; + } + public static function ajax_testAjax_callback(){ + die("WFSCANTESTOK"); + } + public static function ajax_doScan_callback(){ + ignore_user_abort(true); + self::$wordfence_wp_version = false; + //This is messy, but not sure of a better way to do this without gauranteeing we get $wp_version + require(ABSPATH . 'wp-includes/version.php'); + self::$wordfence_wp_version = $wp_version; + require('wfScan.php'); + wfScan::wfScanMain(); + + } //END doScan + public static function ajax_perfLog_callback(){ + $wfLog = self::getLog(); + $fields = array('fetchStart', 'domainLookupStart', 'domainLookupEnd', 'connectStart', 'connectEnd', 'requestStart', 'responseStart', 'responseEnd', 'domReady', 'loaded'); + foreach($fields as $f){ + if(preg_match('/^\d+$/', $_POST[$f])){ + $data[$f] = $_POST[$f]; + } + } + $UA = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''; + $URL = $_POST['URL']; + $wfLog->logPerf(wfUtils::getIP(), $UA, $URL, $data); + die(json_encode(array('ok' => 1))); + } + public static function ajax_logHuman_callback(){ + $browscap = new wfBrowscap(); + $UA = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''; + $isCrawler = false; + if($UA){ + $b = $browscap->getBrowser($UA); + if(!empty($b['Crawler']) || wfCrawl::isGoogleCrawler()){ + $isCrawler = true; + } + } + + @ob_end_clean(); + if(! headers_sent()){ + header('Content-type: text/javascript'); + header("Connection: close"); + header("Content-Length: 0"); + header("X-Robots-Tag: noindex"); + if (!$isCrawler) { + setcookie('wordfence_verifiedHuman', wp_create_nonce('wordfence_verifiedHuman' . $UA . wfUtils::getIP()), time() + 86400, '/'); + } + } + flush(); + if(! $isCrawler){ + $hid = $_GET['hid']; + $hid = wfUtils::decrypt($hid); + if(! preg_match('/^\d+$/', $hid)){ exit(); } + $db = new wfDB(); + global $wpdb; $p = $wpdb->base_prefix; + $db->queryWrite("update $p"."wfHits set jsRun=1 where id=%d", $hid); + } + die(""); + } + public static function ajaxReceiver(){ + if(! wfUtils::isAdmin()){ + die(json_encode(array('errorMsg' => "You appear to have logged out or you are not an admin. Please sign-out and sign-in again."))); + } + $func = (isset($_POST['action']) && $_POST['action']) ? $_POST['action'] : $_GET['action']; + $nonce = (isset($_POST['nonce']) && $_POST['nonce']) ? $_POST['nonce'] : $_GET['nonce']; + if(! wp_verify_nonce($nonce, 'wp-ajax')){ + die(json_encode(array('errorMsg' => "Your browser sent an invalid security token to Wordfence. Please try reloading this page or signing out and in again."))); + } + //func is e.g. wordfence_ticker so need to munge it + $func = str_replace('wordfence_', '', $func); + $returnArr = call_user_func('wordfence::ajax_' . $func . '_callback'); + if($returnArr === false){ + $returnArr = array('errorMsg' => "Wordfence encountered an internal error executing that request."); + } + + if(! is_array($returnArr)){ + error_log("Function " . wp_kses($func, array()) . " did not return an array and did not generate an error."); + $returnArr = array(); + } + if(isset($returnArr['nonce'])){ + error_log("Wordfence ajax function return an array with 'nonce' already set. This could be a bug."); + } + $returnArr['nonce'] = wp_create_nonce('wp-ajax'); + die(json_encode($returnArr)); + } + public static function publishFuturePost($id){ + if(wfConfig::get('clearCacheSched')){ + wfCache::scheduleCacheClear(); + } + } + public static function validateProfileUpdate($errors, $update, $userData){ + wordfence::validatePassword($errors, $userData); + } + public static function validatePassword($errors, $userData){ + $password = ( isset( $_POST[ 'pass1' ] ) && trim( $_POST[ 'pass1' ] ) ) ? $_POST[ 'pass1' ] : false; + $user_id = isset( $userData->ID ) ? $userData->ID : false; + $username = isset( $_POST["user_login"] ) ? $_POST["user_login"] : $userData->user_login; + if($password == false){ return $errors; } + if($errors->get_error_data("pass") ){ return $errors; } + $enforce = false; + if(wfConfig::get('loginSec_strongPasswds') == 'pubs'){ + if(user_can($user_id, 'publish_posts')){ + $enforce = true; + } + } else if(wfConfig::get('loginSec_strongPasswds') == 'all'){ + $enforce = true; + } + if($enforce){ + if(! wordfence::isStrongPasswd($password, $username)){ + $errors->add('pass', "Please choose a stronger password. Try including numbers, symbols and a mix of upper and lower case letters and remove common words."); + return $errors; + } + } + $twoFactorUsers = wfConfig::get_ser('twoFactorUsers', array()); + if(preg_match(self::$passwordCodePattern, $password) && isset($twoFactorUsers) && is_array($twoFactorUsers) && sizeof($twoFactorUsers) > 0){ + $errors->add('pass', "Passwords containing a space followed by 'wf' without quotes are not allowed."); + return $errors; + } + return $errors; + } + public static function isStrongPasswd($passwd, $username ) { + $strength = 0; + if(strlen( trim( $passwd ) ) < 5) + return false; + if(strtolower( $passwd ) == strtolower( $username ) ) + return false; + if(preg_match('/(?:password|passwd|mypass|wordpress)/i', $passwd)){ + return false; + } + if($num = preg_match_all( "/\d/", $passwd, $matches) ){ + $strength += ((int)$num * 10); + } + if ( preg_match( "/[a-z]/", $passwd ) ) + $strength += 26; + if ( preg_match( "/[A-Z]/", $passwd ) ) + $strength += 26; + if ($num = preg_match_all( "/[^a-zA-Z0-9]/", $passwd, $matches)){ + $strength += (31 * (int)$num); + + } + if($strength > 60){ + return true; + } + } + public static function lostPasswordPost(){ + $IP = wfUtils::getIP(); + if(self::getLog()->isWhitelisted($IP)){ + return; + } + if(self::isLockedOut($IP)){ + require('wfLockedOut.php'); + } + if(empty($_POST['user_login'])){ return; } + $value = trim($_POST['user_login']); + $user = get_user_by('login', $value); + if (!$user) { + $user = get_user_by('email', $value); + } + + if($user){ + if(wfConfig::get('alertOn_lostPasswdForm')){ + wordfence::alert("Password recovery attempted", "Someone tried to recover the password for user with email address: " . wp_kses($user->user_email, array()), $IP); + } + } + if(wfConfig::get('loginSecurityEnabled')){ + $tKey = 'wffgt_' . bin2hex(wfUtils::inet_pton($IP)); + $forgotAttempts = get_transient($tKey); + if($forgotAttempts){ + $forgotAttempts++; + } else { + $forgotAttempts = 1; + } + if($forgotAttempts >= wfConfig::get('loginSec_maxForgotPasswd')){ + self::lockOutIP($IP, "Exceeded the maximum number of tries to recover their password which is set at: " . wfConfig::get('loginSec_maxForgotPasswd') . ". The last username or email they entered before getting locked out was: '" . $_POST['user_login'] . "'"); + require('wfLockedOut.php'); + } + set_transient($tKey, $forgotAttempts, wfConfig::get('loginSec_countFailMins') * 60); + } + } + public static function lockOutIP($IP, $reason){ + //First we lock out IP + self::getLog()->lockOutIP(wfUtils::getIP(), $reason); + //Then we send the email because email sending takes time and we want to block the baddie asap. If we don't users can get a lot of emails about a single attacker getting locked out. + if(wfConfig::get('alertOn_loginLockout')){ + wordfence::alert("User locked out from signing in", "A user with IP address $IP has been locked out from the signing in or using the password recovery form for the following reason: $reason", $IP); + } + } + public static function isLockedOut($IP){ + return self::getLog()->isIPLockedOut($IP); + } + public static function veryFirstAction(){ + $wfFunc = isset($_GET['_wfsf']) ? @$_GET['_wfsf'] : false; + if($wfFunc == 'unlockEmail'){ + if(! wp_verify_nonce(@$_POST['nonce'], 'wf-form')){ + die("Sorry but your browser sent an invalid security token when trying to use this form."); + } + $numTries = get_transient('wordfenceUnlockTries'); + if($numTries > 10){ + echo "

Please wait 3 minutes and try again

You have used this form too much. Please wait 3 minutes and try again.

"; + exit(); + } + if(! $numTries){ $numTries = 1; } else { $numTries = $numTries + 1; } + set_transient('wordfenceUnlockTries', $numTries, 180); + + $email = trim($_POST['email']); + global $wpdb; + $ws = $wpdb->get_results($wpdb->prepare("SELECT ID, user_login FROM $wpdb->users WHERE user_email = %s", $email)); + foreach($ws as $user){ + $userDat = get_userdata($user->ID); + if(wfUtils::isAdmin($userDat)){ + if($email == $userDat->user_email){ + $found = true; + break; + } + } + } + if(! $found){ + foreach(wfConfig::getAlertEmails() as $alertEmail){ + if($alertEmail == $email){ + $found = true; + break; + } + } + } + if($found){ + $key = wfUtils::bigRandomHex(); + $IP = wfUtils::getIP(); + set_transient('wfunlock_' . $key, $IP, 1800); + $content = wfUtils::tmpl('email_unlockRequest.php', array( + 'siteName' => get_bloginfo('name', 'raw'), + 'siteURL' => wfUtils::getSiteBaseURL(), + 'unlockHref' => wfUtils::getSiteBaseURL() . '?_wfsf=unlockAccess&key=' . $key, + 'key' => $key, + 'IP' => $IP + )); + wp_mail($email, "Unlock email requested", $content, "Content-Type: text/html"); + } + echo "

Your request was received

We received a request to email \"" . wp_kses($email, array()) . "\" instructions to unlock their access. If that is the email address of a site administrator or someone on the Wordfence alert list, then they have been emailed instructions on how to regain access to this sytem. The instructions we sent will expire 30 minutes from now."; + exit(); + } else if($wfFunc == 'unlockAccess'){ + if(! preg_match('/^\d+\.\d+\.\d+\.\d+$/', get_transient('wfunlock_' . $_GET['key']))){ + echo "Invalid key provided for authentication."; + exit(); + } + /* You can enable this for paranoid security leve. + if(get_transient('wfunlock_' . $_GET['key']) != wfUtils::getIP()){ + echo "You can only use this link from the IP address you used to generate the unlock email."; + exit(); + } + */ + $wfLog = new wfLog(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + if($_GET['func'] == 'unlockMyIP'){ + $wfLog->unblockIP(wfUtils::getIP()); + $wfLog->unlockOutIP(wfUtils::getIP()); + delete_transient('wflginfl_' . bin2hex(wfUtils::inet_pton(wfUtils::getIP()))); //Reset login failure counter + header('Location: ' . wp_login_url()); + exit(); + } else if($_GET['func'] == 'unlockAllIPs'){ + wordfence::status(1, 'info', "Request received via unlock email link to unblock all IP's."); + $wfLog->unblockAllIPs(); + $wfLog->unlockAllIPs(); + delete_transient('wflginfl_' . bin2hex(wfUtils::inet_pton(wfUtils::getIP()))); //Reset login failure counter + header('Location: ' . wp_login_url()); + exit(); + } else if($_GET['func'] == 'disableRules'){ + wfConfig::set('firewallEnabled', 0); + wfConfig::set('loginSecurityEnabled', 0); + wordfence::status(1, 'info', "Request received via unlock email link to unblock all IP's via disabling firewall rules."); + $wfLog->unblockAllIPs(); + $wfLog->unlockAllIPs(); + delete_transient('wflginfl_' . bin2hex(wfUtils::inet_pton(wfUtils::getIP()))); //Reset login failure counter + wfConfig::set('cbl_countries', ''); //unblock all countries + header('Location: ' . wp_login_url()); + exit(); + } else { + echo "Invalid function specified. Please check the link we emailed you and make sure it was not cut-off by your email reader."; + exit(); + } + } + + if(wfConfig::get('firewallEnabled')){ + $wfLog = self::getLog(); + $wfLog->firewallBadIPs(); + + $IP = wfUtils::getIP(); + if($wfLog->isWhitelisted($IP)){ + return; + } + if (wfConfig::get('neverBlockBG') == 'neverBlockUA' && wfCrawl::isGoogleCrawler()) { + return; + } + if (wfConfig::get('neverBlockBG') == 'neverBlockVerified' && wfCrawl::isVerifiedGoogleCrawler()) { + return; + } + + if(wfConfig::get('blockFakeBots')){ + if(wfCrawl::isGooglebot() && !wfCrawl::isVerifiedGoogleCrawler()){ + $wfLog->blockIP($IP, "Fake Google crawler automatically blocked"); + wordfence::status(2, 'info', "Blocking fake Googlebot at IP $IP"); + $wfLog->do503(3600, "Fake Google crawler automatically blocked."); + } + } + if(wfConfig::get('bannedURLs', false)){ + $URLs = explode(',', wfConfig::get('bannedURLs')); + foreach($URLs as $URL){ + if($_SERVER['REQUEST_URI'] == trim($URL)){ + $wfLog->blockIP($IP, "Accessed a banned URL."); + $wfLog->do503(3600, "Accessed a banned URL."); + //exits + } + } + } + + if(wfConfig::get('other_blockBadPOST') == '1' && $_SERVER['REQUEST_METHOD'] == 'POST' && empty($_SERVER['HTTP_USER_AGENT']) && empty($_SERVER['HTTP_REFERER'])){ + $wfLog->blockIP($IP, "POST received with blank user-agent and referer"); + $wfLog->do503(3600, "POST received with blank user-agent and referer"); + //exits + } + } + } + public static function loginAction($username){ + if(sizeof($_POST) < 1){ return; } //only execute if login form is posted + if(! $username){ return; } + wfConfig::inc('totalLogins'); + $user = get_user_by('login', $username); + $userID = $user ? $user->ID : 0; + self::getLog()->logLogin('loginOK', 0, $username); + if(wfUtils::isAdmin($user)){ + wfConfig::set_ser('lastAdminLogin', array( + 'userID' => $userID, + 'username' => $username, + 'firstName' => $user->first_name, + 'lastName' => $user->last_name, + 'time' => wfUtils::localHumanDateShort(), + 'IP' => wfUtils::getIP() + )); + } + + if(user_can($userID, 'update_core')){ + if(wfConfig::get('alertOn_adminLogin')){ + wordfence::alert("Admin Login", "A user with username \"$username\" who has administrator access signed in to your WordPress site.", wfUtils::getIP()); + } + } else { + if(wfConfig::get('alertOn_nonAdminLogin')){ + wordfence::alert("User login", "A non-admin user with username \"$username\" signed in to your WordPress site.", wfUtils::getIP()); + } + } + } + public static function registrationFilter($errors, $santizedLogin, $userEmail){ + if(wfConfig::get('loginSec_blockAdminReg') && $santizedLogin == 'admin'){ + $errors->add('user_login_error', 'ERROR: You can\'t register using that username'); + } + return $errors; + } + public static function authenticateFilter($authUser, $username, $passwd){ + wfConfig::inc('totalLoginHits'); //The total hits to wp-login.php including logins, logouts and just hits. + $IP = wfUtils::getIP(); + $secEnabled = wfConfig::get('loginSecurityEnabled'); + if($secEnabled && (! self::getLog()->isWhitelisted($IP)) && wfConfig::get('isPaid') ){ + $twoFactorUsers = wfConfig::get_ser('twoFactorUsers', array()); + if(isset($twoFactorUsers) && is_array($twoFactorUsers) && sizeof($twoFactorUsers) > 0){ + $userDat = (isset($_POST['wordfence_userDat']) ? $_POST['wordfence_userDat'] : false); + if(is_object($userDat) && get_class($authUser) == 'WP_User'){ //Valid username and password either with or without the 'wf...' code. Users is now logged in at this point. + if(isset($_POST['wordfence_authFactor']) && $_POST['wordfence_authFactor']){ //user entered a valid user and password with ' wf....' appended + foreach($twoFactorUsers as &$t){ + if($t[0] == $userDat->ID && $t[3] == 'activated'){ + if($_POST['wordfence_authFactor'] == $t[2] && $t[4] > time()){ + //Do nothing and allow user to sign in. Their passwd has already been modified to be the passwd without the code. + } else if($_POST['wordfence_authFactor'] == $t[2]){ + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $codeResult = $api->call('twoFactor_verification', array(), array('phone' => $t[1]) ); + + if(isset($codeResult['notPaid']) && $codeResult['notPaid']){ + break; //Let them sign in without two factor + } + if(isset($codeResult['ok']) && $codeResult['ok']){ + $t[2] = $codeResult['code']; + $t[4] = time() + 1800; //30 minutes until code expires + wfConfig::set_ser('twoFactorUsers', $twoFactorUsers); //save the code the user needs to enter and return an error. + self::$authError = new WP_Error('twofactor_required', __('CODE EXPIRED. CHECK YOUR PHONE: The code you entered has expired. Codes are only valid for 30 minutes for security reasons. We have sent you a new code. Please sign in using your username and your password followed by a space and the new code we sent you.')); + return self::$authError; + } else { + break; //No new code was received. Let them sign in with the expired code. + } + + } catch (Exception $e) { + // Couldn't connect to noc1, let them sign in since the password was correct. + break; + } + } else { //Bad code, so cancel the login and return an error to user. + self::$authError = new WP_Error( 'twofactor_required', __( 'INVALID CODE: You need to enter your password followed by a space and the code we sent to your phone. The code should start with \'wf\' and should be four characters. e.g. wfAB12. In this case you would enter your password as: \'mypassword wfAB12\' without quotes.')); + return self::$authError; + } + } //No user matches and has TF activated so let user sign in. + } + } else { //valid login with no code entered + foreach($twoFactorUsers as &$t){ + if($t[0] == $userDat->ID && $t[3] == 'activated'){ //Yup, enabled, so lets send the code + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $codeResult = $api->call('twoFactor_verification', array(), array('phone' => $t[1]) ); + if(isset($codeResult['notPaid']) && $codeResult['notPaid']){ + break; //Let them sign in without two factor if their API key has expired or they're not paid and for some reason they have this set up. + } + } catch (Exception $e) { + // Couldn't connect to noc1, let them sign in since the password was correct. + break; + } + if(isset($codeResult['ok']) && $codeResult['ok']){ + $t[2] = $codeResult['code']; + $t[4] = time() + 1800; //30 minutes until code expires + wfConfig::set_ser('twoFactorUsers', $twoFactorUsers); //save the code the user needs to enter and return an error. + + if (self::hasGDLimitLoginsMUPlugin() && function_exists('limit_login_get_address')) { + $retries = get_option('limit_login_retries', array()); + $ip = limit_login_get_address(); + + if (!is_array($retries)) { + $retries = array(); + } + if (isset($retries[$ip]) && is_int($retries[$ip])) { + $retries[$ip]--; + } else { + $retries[$ip] = 0; + } + update_option('limit_login_retries', $retries); + } + + self::$authError = new WP_Error( 'twofactor_required', __( 'CHECK YOUR PHONE: A code has been sent to your phone and will arrive within 30 seconds. Please sign in again and add a space and the code to the end of your password.' ) ); + return self::$authError; + } else { //oops, our API returned an error. + break; //Let them sign in without two factor because the API is broken and we don't want to lock users out of their own systems. + } + } //User is not present in two factor list or is not activated. Sign in without twofactor. + } //Two facto users is empty. Sign in without two factor. + } + } + } + } + + if(self::getLog()->isWhitelisted($IP)){ + return $authUser; + } + if(wfConfig::get('other_WFNet') && is_wp_error($authUser) && ($authUser->get_error_code() == 'invalid_username' || $authUser->get_error_code() == 'incorrect_password') ){ + if($maxBlockTime = self::wfsnIsBlocked($IP, 'brute')){ + self::getLog()->blockIP($IP, "Blocked by Wordfence Security Network", true, false, $maxBlockTime); + } + + } + if($secEnabled){ + if(is_wp_error($authUser) && $authUser->get_error_code() == 'invalid_username'){ + if($blacklist = wfConfig::get('loginSec_userBlacklist')){ + $users = explode(',', $blacklist); + foreach($users as $user){ + if(strtolower($username) == strtolower($user)){ + self::getLog()->blockIP($IP, "Blocked by login security setting."); + $secsToGo = wfConfig::get('blockedTime'); + self::getLog()->do503($secsToGo, "Blocked by login security setting."); + break; + } + } + } + if(wfConfig::get('loginSec_lockInvalidUsers')){ + if(strlen($username) > 0 && preg_match('/[^\r\s\n\t]+/', $username)){ + self::lockOutIP($IP, "Used an invalid username '" . $username . "' to try to sign in."); + } + require('wfLockedOut.php'); + } + } + $tKey = 'wflginfl_' . bin2hex(wfUtils::inet_pton($IP)); + if(is_wp_error($authUser) && ($authUser->get_error_code() == 'invalid_username' || $authUser->get_error_code() == 'incorrect_password') ){ + $tries = get_transient($tKey); + if($tries){ + $tries++; + } else { + $tries = 1; + } + if($tries >= wfConfig::get('loginSec_maxFailures')){ + self::lockOutIP($IP, "Exceeded the maximum number of login failures which is: " . wfConfig::get('loginSec_maxFailures') . ". The last username they tried to sign in with was: '" . $username . "'"); + require('wfLockedOut.php'); + } + set_transient($tKey, $tries, wfConfig::get('loginSec_countFailMins') * 60); + } else if(get_class($authUser) == 'WP_User'){ + delete_transient($tKey); //reset counter on success + } + } + if(is_wp_error($authUser)){ + if($authUser->get_error_code() == 'invalid_username'){ + self::getLog()->logLogin('loginFailInvalidUsername', 1, $username); + } else { + self::getLog()->logLogin('loginFailValidUsername', 1, $username); + } + } + + if(is_wp_error($authUser) && ($authUser->get_error_code() == 'invalid_username' || $authUser->get_error_code() == 'incorrect_password') && wfConfig::get('loginSec_maskLoginErrors')){ + return new WP_Error( 'incorrect_password', sprintf( __( 'ERROR: The username or password you entered is incorrect. Lost your password?' ), $username, wp_lostpassword_url() ) ); + } + return $authUser; + } + public static function wfsnReportBlockedAttempt($IP, $type){ + try { + $result = wp_remote_get(WORDFENCE_HACKATTEMPT_URL . 'hackAttempt/?blocked=1&k=' . rawurlencode(wfConfig::get('apiKey')) . '&IP=' . rawurlencode(wfUtils::inet_pton($IP)) . '&t=' . rawurlencode($type), array( + 'timeout' => 1, + 'user-agent' => "Wordfence.com UA " . (defined('WORDFENCE_VERSION') ? WORDFENCE_VERSION : '[Unknown version]'), + )); + if (is_wp_error($result)) { + return false; + } + } catch(Exception $err){ + return false; + } + } + public static function wfsnIsBlocked($IP, $type){ + try { + $result = wp_remote_get(WORDFENCE_HACKATTEMPT_URL . 'hackAttempt/?k=' . rawurlencode(wfConfig::get('apiKey')) . '&IP=' . rawurlencode(filter_var($IP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? wfUtils::inet_aton($IP) : wfUtils::inet_pton($IP)) . '&t=' . rawurlencode($type), array( + 'timeout' => 3, + 'user-agent' => "Wordfence.com UA " . (defined('WORDFENCE_VERSION') ? WORDFENCE_VERSION : '[Unknown version]'), + )); + if (is_wp_error($result)) { + return false; + } + if (preg_match('/BLOCKED:(\d+)/', $result['body'], $matches) && (!self::getLog()->isWhitelisted($IP))) { + return $matches[1]; + } + return false; + } catch (Exception $err) { + return false; + } + } + public static function logoutAction(){ + $userID = get_current_user_id(); + $userDat = get_user_by('id', $userID); + if(is_object($userDat)){ + self::getLog()->logLogin('logout', 0, $userDat->user_login); + } + } + public static function loginInitAction(){ + if(self::isLockedOut(wfUtils::getIP())){ + require('wfLockedOut.php'); + } + } + public static function authActionNew($username, &$passwd){ //As of php 5.4 we must denote passing by ref in the function definition, not the function call (as WordPress core does, which is a bug in WordPress). + if(self::isLockedOut(wfUtils::getIP())){ + require('wfLockedOut.php'); + } + if(! $username){ return; } + $userDat = get_user_by('login', $username); + $_POST['wordfence_userDat'] = $userDat; + if(preg_match(self::$passwordCodePattern, $passwd, $matches)){ + $_POST['wordfence_authFactor'] = $matches[1]; + $passwd = preg_replace('/^(.+)\s+(wf[a-z0-9]+)$/i', '$1', $passwd); + $_POST['pwd'] = $passwd; + } + } + public static function authActionOld($username, $passwd){ //Code is identical to Newer function above except passing by ref ampersand. Some versions of PHP are throwing an error if we include the ampersand in PHP prior to 5.4. + if(self::isLockedOut(wfUtils::getIP())){ + require('wfLockedOut.php'); + } + if(! $username){ return; } + $userDat = get_user_by('login', $username); + $_POST['wordfence_userDat'] = $userDat; + if(preg_match(self::$passwordCodePattern, $passwd, $matches)){ + $_POST['wordfence_authFactor'] = $matches[1]; + $passwd = preg_replace('/^(.+)\s+(wf[a-z0-9]+)$/i', '$1', $passwd); + $_POST['pwd'] = $passwd; + } + } + public static function getWPFileContent($file, $cType, $cName, $cVersion){ + if($cType == 'plugin'){ + if(preg_match('#^/?wp-content/plugins/[^/]+/#', $file)){ + $file = preg_replace('#^/?wp-content/plugins/[^/]+/#', '', $file); + } else { + //If user is using non-standard wp-content dir, then use /plugins/ in pattern to figure out what to strip off + $file = preg_replace('#^.*[^/]+/plugins/[^/]+/#', '', $file); + } + } else if($cType == 'theme'){ + if(preg_match('#/?wp-content/themes/[^/]+/#', $file)){ + $file = preg_replace('#/?wp-content/themes/[^/]+/#', '', $file); + } else { + $file = preg_replace('#^.*[^/]+/themes/[^/]+/#', '', $file); + } + } else if($cType == 'core'){ + + } else { + return array('errorMsg' => "An invalid type was specified to get file."); + } + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $contResult = $api->binCall('get_wp_file_content', array( + 'v' => wfUtils::getWPVersion(), + 'file' => $file, + 'cType' => $cType, + 'cName' => $cName, + 'cVersion' => $cVersion + )); + if($contResult['data']){ + return array('fileContent' => $contResult['data']); + } else { + throw new Exception("We could not fetch a core WordPress file from the Wordfence API."); + } + } catch (Exception $e){ + return array('errorMsg' => wp_kses($e->getMessage(), array())); + } + } + public static function ajax_sendTestEmail_callback(){ + $result = wp_mail($_POST['email'], "Wordfence Test Email", "This is a test email from " . site_url() . ".\nThe IP address that requested this was: " . wfUtils::getIP()); + $result = $result ? 'True' : 'False'; + return array('result' => $result); + } + public static function ajax_loadAvgSitePerf_callback(){ + $limit = preg_match('/^\d+$/', $_POST['limit']) ? $_POST['limit'] : 10; + $wfdb = new wfDB(); + global $wpdb; + $p = $wpdb->base_prefix; + $rec = $wfdb->querySingleRec("select round(avg(domainLookupEnd),0) as domainLookupEnd, round(avg(connectEnd),0) as connectEnd, round(avg(responseStart),0) as responseStart, round(avg(responseEnd),0) as responseEnd, round(avg(domReady),0) as domReady, round(avg(loaded),0) as loaded from (select domainLookupEnd, connectEnd, responseStart, responseEnd, domReady, loaded from $p"."wfPerfLog order by ctime desc limit %d) as T", $limit); + return $rec; + } + public static function ajax_addTwoFactor_callback(){ + if(! wfConfig::get('isPaid')){ + return array('errorMsg' => 'Cellphone Sign-in is only available to paid members. Click here to upgrade now.'); + } + $username = sanitize_text_field($_POST['username']); + $phone = sanitize_text_field($_POST['phone']); + $user = get_user_by('login', $username); + if(! $user){ + return array('errorMsg' => "The username you specified does not exist."); + } + if(! preg_match('/^\+\d[\d\-]+$/', $phone)){ + return array('errorMsg' => "The phone number you entered must start with a '+', then country code and then area code and number. It can only contain the starting plus sign and then numbers and dashes. It can not contain spaces. For example, a number in the United States with country code '1' would look like this: +1-123-555-1234"); + } + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $codeResult = $api->call('twoFactor_verification', array(), array('phone' => $phone)); + } catch(Exception $e){ + return array('errorMsg' => "Could not contact Wordfence servers to generate a verification code: " . wp_kses($e->getMessage(), array()) ); + } + if(isset($codeResult['ok']) && $codeResult['ok']){ + $code = $codeResult['code']; + } else if(isset($codeResult['errorMsg']) && $codeResult['errorMsg']){ + return array('errorMsg' => wp_kses($codeResult['errorMsg'], array())); + } else { + wordfence::status(4, 'info', "Could not gen verification code: " . var_export($codeResult, true)); + return array('errorMsg' => "We could not generate a verification code."); + } + self::twoFactorAdd($user->ID, $phone, $code); + return array( + 'ok' => 1, + 'userID' => $user->ID, + 'username' => $username, + 'phone' => $phone + ); + } + public static function ajax_twoFacActivate_callback(){ + $userID = sanitize_text_field($_POST['userID']); + $code = sanitize_text_field($_POST['code']); + $twoFactorUsers = wfConfig::get_ser('twoFactorUsers', array()); + if(! is_array($twoFactorUsers)){ + $twoFactorUsers = array(); + } + $found = false; + $user = false; + for($i = 0; $i < sizeof($twoFactorUsers); $i++){ + if($twoFactorUsers[$i][0] == $userID){ + if($twoFactorUsers[$i][2] == $code){ + $twoFactorUsers[$i][3] = 'activated'; + $found = true; + $user = $twoFactorUsers[$i]; + break; + } else { + return array('errorMsg' => "That is not the correct code. Please look for an SMS containing an activation code on the phone with number: " . wp_kses($twoFactorUsers[$i][1], array()) ); + } + } + } + if(! $found){ + return array('errorMsg' => "We could not find the user you are trying to activate. They may have been removed from the list of Cellphone Sign-in users. Please reload this page."); + } + wfConfig::set_ser('twoFactorUsers', $twoFactorUsers); + $WPuser = get_userdata($userID); + return array( + 'ok' => 1, + 'userID' => $userID, + 'username' => $WPuser->user_login, + 'phone' => $user[1], + 'status' => 'activated' + ); + } + private static function twoFactorAdd($ID, $phone, $code){ + $twoFactorUsers = wfConfig::get_ser('twoFactorUsers', array()); + if(! is_array($twoFactorUsers)){ + $twoFactorUsers = array(); + } + for($i = 0; $i < sizeof($twoFactorUsers); $i++){ + if($twoFactorUsers[$i][0] == $ID || (! $twoFactorUsers[$i][0]) ){ + array_splice($twoFactorUsers, $i, 1); + $i--; + } + } + $twoFactorUsers[] = array($ID, $phone, $code, 'notActivated', time() + (86400 * 100)); //expiry of code is 100 days in future + wfConfig::set_ser('twoFactorUsers', $twoFactorUsers); + } + public static function ajax_loadTwoFactor_callback(){ + $users = wfConfig::get_ser('twoFactorUsers', array()); + $ret = array(); + foreach($users as $user){ + $WPuser = get_userdata($user[0]); + if($user){ + $ret[] = array( + 'userID' => $user[0], + 'username' => $WPuser->user_login, + 'phone' => $user[1], + 'status' => $user[3] + ); + } + } + return array('ok' => 1, 'users' => $ret); + } + public static function ajax_twoFacDel_callback(){ + $ID = $_POST['userID']; + $twoFactorUsers = wfConfig::get_ser('twoFactorUsers', array()); + if(! is_array($twoFactorUsers)){ + $twoFactorUsers = array(); + } + $deleted = false; + for($i = 0; $i < sizeof($twoFactorUsers); $i++){ + if($twoFactorUsers[$i][0] == $ID){ + array_splice($twoFactorUsers, $i, 1); + $deleted = true; + $i--; + } + } + wfConfig::set_ser('twoFactorUsers', $twoFactorUsers); + if($deleted){ + return array('ok' => 1, 'userID' => $ID); + } else { + return array('errorMsg' => "That user has already been removed from the list."); + } + } + public static function ajax_saveScanSchedule_callback(){ + if(! wfConfig::get('isPaid')){ + return array('errorMsg' => "Sorry but this feature is only available for paid customers."); + } + $schedDays = explode('|', $_POST['schedTxt']); + $schedule = array(); + for($day = 0; $day <= 6; $day++){ + $schedule[$day] = explode(',', $schedDays[$day]); + } + $schedMode = $_POST['schedMode']; + wfConfig::set_ser('scanSched', $schedule); + wfConfig::set('schedMode', $schedMode); + wordfence::scheduleScans(); + $nextTime = self::getNextScanStartTime(); + return array( + 'ok' => 1, + 'nextStart' => ($nextTime ? $nextTime : '') + ); + } + public static function getNextScanStartTime(){ + $nextTime = false; + $cron = _get_cron_array(); + foreach($cron as $key => $val){ + if(isset($val['wordfence_start_scheduled_scan'])){ + $nextTime = $key; + break; + } + } + return ($nextTime ? date('l jS \of F Y H:i:s A', $nextTime + (3600 * get_option('gmt_offset'))) : ''); + } + public static function wordfenceStartScheduledScan(){ + + //If scheduled scans are not enabled in the global config option, then don't run a scheduled scan. + if(wfConfig::get('scheduledScansEnabled') != '1'){ + return; + } + + //This prevents scheduled scans from piling up on low traffic blogs and all being run at once. + //Only one scheduled scan runs within a given 60 min window. Won't run if another scan has run within 30 mins. + $lastScanStart = wfConfig::get('lastScheduledScanStart', 0); + if($lastScanStart && (time() - $lastScanStart) < 1800){ + //A scheduled scan was started in the last 30 mins, so skip this one. + return; + } + wfConfig::set('lastScheduledScanStart', time()); + wordfence::status(1, 'info', "Scheduled Wordfence scan starting at " . date('l jS \of F Y h:i:s A', current_time('timestamp')) ); + + //We call this before the scan actually starts to advance the schedule for the next week. + //This ensures that if the scan crashes for some reason, the schedule will hold. + wordfence::scheduleScans(); + + wfScanEngine::startScan(); + } + public static function scheduleScans(){ //Idempotent. Deschedules everything and schedules the following week. + self::unscheduleAllScans(); + $sched = wfConfig::get_ser('scanSched', array()); + $mode = wfConfig::get('schedMode'); + if($mode == 'manual' && is_array($sched) && is_array($sched[0]) ){ + //Use sched as it is + } else { //Default to setting scans to run once a day at a randomly selected time. + $sched = array(); + $runAt = rand(0,23); + for($day = 0; $day <= 6; $day++){ + $sched[$day] = array(); + for($hour = 0; $hour <= 23; $hour++){ + if($hour == $runAt){ + $sched[$day][$hour] = 1; + } else { + $sched[$day][$hour] = 0; + } + } + } + } + for($scheduledDay = 0; $scheduledDay <= 6; $scheduledDay++){ + //0 is sunday + //6 is Saturday + for($scheduledHour = 0; $scheduledHour <= 23; $scheduledHour++){ + if($sched[$scheduledDay][$scheduledHour]){ + $wpTime = current_time('timestamp'); + $currentDayOfWeek = date('w', $wpTime); + $daysInFuture = $scheduledDay - $currentDayOfWeek; //It's monday and scheduledDay is Wed (3) then result is 2 days in future. It's Wed and sched day is monday, then result is 3 - 1 = -2 + if($daysInFuture < 0){ $daysInFuture += 7; } //Turns -2 into 5 days in future + $currentHour = date('G', $wpTime); + $secsOffset = ($scheduledHour - $currentHour) * 3600; //Offset from current hour, can be negative + $secondsInFuture = ($daysInFuture * 86400) + $secsOffset; //Can be negative, so we schedule those 1 week ahead + if($secondsInFuture < 1){ + $secondsInFuture += (86400 * 7); //Add a week + } + $futureTime = time() - (time() % 3600) + $secondsInFuture; //Modulo rounds down to top of the hour + $futureTime += rand(0,3600); //Prevent a stampede of scans on our scanning server + wordfence::status(4, 'info', "Scheduled time for day $scheduledDay hour $scheduledHour is: " . date('l jS \of F Y h:i:s A', $futureTime)); + self::scheduleSingleScan($futureTime); + } + } + } + } + private static function scheduleSingleScan($futureTime){ + // Removed ability to activate on network site in v5.3.12 + if (is_main_site()) { + wp_schedule_single_event($futureTime, 'wordfence_start_scheduled_scan'); + } + } + private static function unscheduleAllScans(){ + wp_clear_scheduled_hook('wordfence_start_scheduled_scan'); + } + public static function ajax_saveCountryBlocking_callback(){ + if(! wfConfig::get('isPaid')){ + return array('errorMsg' => "Sorry but this feature is only available for paid customers."); + } + wfConfig::set('cbl_action', $_POST['blockAction']); + wfConfig::set('cbl_countries', $_POST['codes']); + wfConfig::set('cbl_redirURL', $_POST['redirURL']); + wfConfig::set('cbl_loggedInBlocked', $_POST['loggedInBlocked']); + wfConfig::set('cbl_loginFormBlocked', $_POST['loginFormBlocked']); + wfConfig::set('cbl_restOfSiteBlocked', $_POST['restOfSiteBlocked']); + wfConfig::set('cbl_bypassRedirURL', $_POST['bypassRedirURL']); + wfConfig::set('cbl_bypassRedirDest', $_POST['bypassRedirDest']); + wfConfig::set('cbl_bypassViewURL', $_POST['bypassViewURL']); + return array('ok' => 1); + } + public static function ajax_sendActivityLog_callback(){ + $content = "SITE: " . site_url() . "\nPLUGIN VERSION: " . WORDFENCE_VERSION . "\nWP VERSION: " . wfUtils::getWPVersion() . "\nAPI KEY: " . wfConfig::get('apiKey') . "\nADMIN EMAIL: " . get_option('admin_email') . "\nLOG:\n\n"; + $wfdb = new wfDB(); + global $wpdb; + $p = $wpdb->base_prefix; + $q = $wfdb->querySelect("select ctime, level, type, msg from $p"."wfStatus order by ctime desc limit 10000"); + $timeOffset = 3600 * get_option('gmt_offset'); + foreach($q as $r){ + if($r['type'] == 'error'){ + $content .= "\n"; + } + $content .= date(DATE_RFC822, $r['ctime'] + $timeOffset) . '::' . sprintf('%.4f', $r['ctime']) . ':' . $r['level'] . ':' . $r['type'] . '::' . wp_kses_data( (string) $r['msg']) . "\n"; + } + $content .= "\n\n"; + + ob_start(); + phpinfo(); + $phpinfo = ob_get_contents(); + ob_get_clean(); + + $content .= $phpinfo; + + wp_mail($_POST['email'], "Wordfence Activity Log", $content); + return array('ok' => 1); + } + public static function ajax_startTourAgain_callback(){ + wfConfig::set('tourClosed', 0); + return array('ok' => 1); + } + public static function ajax_downgradeLicense_callback(){ + $api = new wfAPI('', wfUtils::getWPVersion()); + try { + $keyData = $api->call('get_anon_api_key'); + if($keyData['ok'] && $keyData['apiKey']){ + wfConfig::set('apiKey', $keyData['apiKey']); + wfConfig::set('isPaid', 0); + //When downgrading we must disable all two factor authentication because it can lock an admin out if we don't. + wfConfig::set_ser('twoFactorUsers', array()); + } else { + throw new Exception("Could not understand the response we received from the Wordfence servers when applying for a free API key."); + } + } catch(Exception $e){ + return array('errorMsg' => "Could not fetch free API key from Wordfence: " . wp_kses($e->getMessage(), array())); + } + return array('ok' => 1); + } + public static function ajax_tourClosed_callback(){ + wfConfig::set('tourClosed', 1); + return array('ok' => 1); + } + public static function ajax_welcomeClosed_callback(){ + wfConfig::set('welcomeClosed', 1); + return array('ok' => 1); + } + public static function postRowActions($actions, $post){ + if(wfUtils::isAdmin()){ + $actions = array_merge($actions, array( + 'wfCachePurge' => 'Remove from Wordfence cache' + )); + } + return $actions; + } + public static function pageRowActions($actions, $post){ + if(wfUtils::isAdmin()){ + $actions = array_merge($actions, array( + 'wfCachePurge' => 'Remove from Wordfence cache' + )); + } + return $actions; + } + public static function postSubmitboxStart(){ + if(wfUtils::isAdmin()){ + global $post; + echo '

Remove from Wordfence cache

'; + } + } + public static function disablePermalinksFilter($newVal, $oldVal){ + if(wfConfig::get('cacheType', false) == 'falcon' && $oldVal && (! $newVal) ){ //Falcon is enabled and admin is disabling permalinks + wfCache::addHtaccessCode('remove'); + //if($err){ return $oldVal; } //We might want to not allow the user to disable permalinks if we can't disable falcon. Allowing it for now. + wfCache::updateBlockedIPs('remove'); + //if($err){ return $oldVal; } //We might want to not allow the user to disable permalinks if we can't disable falcon. Allowing it for now. + wfConfig::set('cacheType', false); + } + return $newVal; + } + public static function ajax_autoUpdateChoice_callback(){ + $choice = $_POST['choice']; + wfConfig::set('autoUpdateChoice', '1'); + if($choice == 'yes'){ + wfConfig::set('autoUpdate', '1'); + } else { + wfConfig::set('autoUpdate', '0'); + } + return array('ok' => 1); + } + public static function ajax_removeFromCache_callback(){ + $id = $_POST['id']; + $link = get_permalink($id); + if(preg_match('/^https?:\/\/([^\/]+)(.*)$/i', $link, $matches)){ + $host = $matches[1]; + $URI = $matches[2]; + if(! $URI){ + $URI = '/'; + } + $sslFile = wfCache::fileFromURI($host, $URI, true); //SSL + $normalFile = wfCache::fileFromURI($host, $URI, false); //non-SSL + @unlink($sslFile); + @unlink($sslFile . '_gzip'); + @unlink($normalFile); + @unlink($normalFile . '_gzip'); + } + return array('ok' => 1); + } + public static function ajax_saveCacheOptions_callback(){ + $changed = false; + if($_POST['allowHTTPSCaching'] != wfConfig::get('allowHTTPSCaching', false)){ + $changed = true; + } + wfConfig::set('allowHTTPSCaching', $_POST['allowHTTPSCaching'] == '1' ? 1 : 0); + wfConfig::set('addCacheComment', $_POST['addCacheComment'] == 1 ? '1' : 0); + wfConfig::set('clearCacheSched', $_POST['clearCacheSched'] == 1 ? '1' : 0); + if($changed && wfConfig::get('cacheType', false) == 'falcon'){ + $err = wfCache::addHtaccessCode('add'); + if($err){ + return array('updateErr' => "Wordfence could not edit your .htaccess file. The error was: " . $err, 'code' => wfCache::getHtaccessCode() ); + } + } + wfCache::scheduleCacheClear(); + return array('ok' => 1); + } + public static function ajax_saveCacheConfig_callback(){ + $cacheType = $_POST['cacheType']; + if($cacheType == 'falcon' || $cacheType == 'php'){ + $plugins = get_plugins(); + $badPlugins = array(); + foreach($plugins as $pluginFile => $data){ + if(is_plugin_active($pluginFile)){ + if($pluginFile == 'w3-total-cache/w3-total-cache.php'){ + $badPlugins[] = "W3 Total Cache"; + } else if($pluginFile == 'quick-cache/quick-cache.php'){ + $badPlugins[] = "Quick Cache"; + } else if($pluginFile == "wp-super-cache/wp-cache.php"){ + $badPlugins[] = "WP Super Cache"; + } else if($pluginFile == "wp-fast-cache/wp-fast-cache.php"){ + $badPlugins[] = "WP Fast Cache"; + } else if($pluginFile == "wp-fastest-cache/wpFastestCache.php"){ + $badPlugins[] = "WP Fastest Cache"; + } + } + } + if(count($badPlugins) > 0){ + return array('errorMsg' => "You can not enable caching in Wordfence with other caching plugins enabled. This may cause conflicts. You need to disable other caching plugins first. Wordfence caching is very fast and does not require other caching plugins to be active. The plugins you have that conflict are: " . implode(', ', $badPlugins) . ". Disable these plugins, then return to this page and enable Wordfence caching."); + } + $siteURL = site_url(); + if(preg_match('/^https?:\/\/[^\/]+\/[^\/]+\/[^\/]+\/.+/i', $siteURL)){ + return array('errorMsg' => "Wordfence caching currently does not support sites that are installed in a subdirectory and have a home page that is more than 2 directory levels deep. e.g. we don't support sites who's home page is http://example.com/levelOne/levelTwo/levelThree"); + } + } + if($cacheType == 'falcon'){ + if(! get_option('permalink_structure', '')){ + return array('errorMsg' => "You need to enable Permalinks for your site to use Falcon Engine. You can enable Permalinks in WordPress by going to the Settings - Permalinks menu and enabling it there. Permalinks change your site URL structure from something that looks like /p=123 to pretty URLs like /my-new-post-today/ that are generally more search engine friendly."); + } + } + $warnHtaccess = false; + if($cacheType == 'disable' || $cacheType == 'php'){ + $removeError = wfCache::addHtaccessCode('remove'); + $removeError2 = wfCache::updateBlockedIPs('remove'); + if($removeError || $removeError2){ + $warnHtaccess = true; + } + } + if($cacheType == 'php' || $cacheType == 'falcon'){ + $err = wfCache::cacheDirectoryTest(); + if($err){ + return array('ok' => 1, 'heading' => "Could not write to cache directory", 'body' => "To enable caching, Wordfence needs to be able to create and write to the /wp-content/wfcache/ directory. We did some tests that indicate this is not possible. You need to manually create the /wp-content/wfcache/ directory and make it writable by Wordfence. The error we encountered was during our tests was: $err"); + } + } + + //Mainly we clear the cache here so that any footer cache diagnostic comments are rebuilt. We could just leave it intact unless caching is being disabled. + if($cacheType != wfConfig::get('cacheType', false)){ + wfCache::scheduleCacheClear(); + } + $htMsg = ""; + if($warnHtaccess){ + $htMsg = " Warning: We could not remove the caching code from your .htaccess file. you need to remove this manually yourself. "; + } + if($cacheType == 'disable'){ + wfConfig::set('cacheType', false); + return array('ok' => 1, 'heading' => "Caching successfully disabled.", 'body' => "{$htMsg}Caching has been disabled on your system.

"); + } else if($cacheType == 'php'){ + wfConfig::set('cacheType', 'php'); + return array('ok' => 1, 'heading' => "Wordfence Basic Caching Enabled", 'body' => "{$htMsg}Wordfence basic caching has been enabled on your system.

"); + } else if($cacheType == 'falcon'){ + if($_POST['noEditHtaccess'] != '1'){ + $err = wfCache::addHtaccessCode('add'); + if($err){ + return array('ok' => 1, 'heading' => "Wordfence could not edit .htaccess", 'body' => "Wordfence could not edit your .htaccess code. The error was: " . $err); + } + } + wfConfig::set('cacheType', 'falcon'); + wfCache::scheduleUpdateBlockedIPs(); //Runs every 5 mins until we change cachetype + return array('ok' => 1, 'heading' => "Wordfence Falcon Engine Activated!", 'body' => "Wordfence Falcon Engine has been activated on your system. You will see this icon appear on the Wordfence admin pages as long as Falcon is active indicating your site is running in high performance mode:

"); + } + return array('errorMsg' => "An error occurred."); + } + public static function ajax_getCacheStats_callback(){ + $s = wfCache::getCacheStats(); + if($s['files'] == 0){ + return array('ok' => 1, 'heading' => 'Cache Stats', 'body' => "The cache is currently empty. It may be disabled or it may have been recently cleared."); + } + $body = 'Total files in cache: ' . $s['files'] . + '
Total directories in cache: ' . $s['dirs'] . + '
Total data: ' . $s['data'] . 'KB'; + if($s['compressedFiles'] > 0){ + $body .= '
Files: ' . $s['uncompressedFiles'] . + '
Data: ' . $s['uncompressedKBytes'] . 'KB' . + '
Compressed files: ' . $s['compressedFiles'] . + '
Compressed data: ' . $s['compressedKBytes'] . 'KB'; + } + if($s['largestFile'] > 0){ + $body .= '
Largest file: ' . $s['largestFile'] . 'KB'; + } + if($s['oldestFile'] !== false){ + $body .= '
Oldest file in cache created '; + if(time() - $s['oldestFile'] < 300){ + $body .= (time() - $s['oldestFile']) . ' seconds ago'; + } else { + $body .= human_time_diff($s['oldestFile']) . ' ago.'; + } + } + if($s['newestFile'] !== false){ + $body .= '
Newest file in cache created '; + if(time() - $s['newestFile'] < 300){ + $body .= (time() - $s['newestFile']) . ' seconds ago'; + } else { + $body .= human_time_diff($s['newestFile']) . ' ago.'; + } + } + + return array('ok' => 1, 'heading' => 'Cache Stats', 'body' => $body); + } + public static function ajax_clearPageCache_callback(){ + $stats = wfCache::clearPageCache(); + if($stats['error']){ + $body = "A total of " . $stats['totalErrors'] . " errors occurred while trying to clear your cache. The last error was: " . $stats['error']; + return array('ok' => 1, 'heading' => 'Error occurred while clearing cache', 'body' => $body ); + } + $body = "A total of " . $stats['filesDeleted'] . ' files were deleted and ' . $stats['dirsDeleted'] . ' directories were removed. We cleared a total of ' . $stats['totalData'] . 'KB of data in the cache.'; + if($stats['totalErrors'] > 0){ + $body .= ' A total of ' . $stats['totalErrors'] . ' errors were encountered. This probably means that we could not remove some of the files or directories in the cache. Please use your CPanel or file manager to remove the rest of the files in the directory: ' . WP_CONTENT_DIR . '/wfcache/'; + } + return array('ok' => 1, 'heading' => 'Page Cache Cleared', 'body' => $body ); + } + public static function ajax_updateConfig_callback(){ + $key = $_POST['key']; + $val = $_POST['val']; + wfConfig::set($key, $val); + return array('ok' => 1); + } + public static function ajax_checkFalconHtaccess_callback(){ + if(wfUtils::isNginx()){ + return array('nginx' => 1); + } + $file = wfCache::getHtaccessPath(); + if(! $file){ + return array('err' => "We could not find your .htaccess file to modify it.", 'code' => wfCache::getHtaccessCode() ); + } + $fh = @fopen($file, 'r+'); + if(! $fh){ + $err = error_get_last(); + return array('err' => "We found your .htaccess file but could not open it for writing: " . $err['message'], 'code' => wfCache::getHtaccessCode() ); + } + return array('ok' => 1); + } + public static function ajax_downloadHtaccess_callback(){ + $url = site_url(); + $url = preg_replace('/^https?:\/\//i', '', $url); + $url = preg_replace('/[^a-zA-Z0-9\.]+/', '_', $url); + $url = preg_replace('/^_+/', '', $url); + $url = preg_replace('/_+$/', '', $url); + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename="htaccess_Backup_for_' . $url . '.txt"'); + $file = wfCache::getHtaccessPath(); + readfile($file); + die(); + } + public static function ajax_addCacheExclusion_callback(){ + $ex = wfConfig::get('cacheExclusions', false); + if($ex){ + $ex = unserialize($ex); + } else { + $ex = array(); + } + $ex[] = array( + 'pt' => $_POST['patternType'], + 'p' => $_POST['pattern'], + 'id' => microtime(true) + ); + wfConfig::set('cacheExclusions', serialize($ex)); + wfCache::scheduleCacheClear(); + if(wfConfig::get('cacheType', false) == 'falcon' && preg_match('/^(?:uac|uaeq|cc)$/', $_POST['patternType'])){ + if(wfCache::addHtaccessCode('add')){ //rewrites htaccess rules + return array('errorMsg' => "We added the rule you requested but could not modify your .htaccess file. Please delete this rule, check the permissions on your .htaccess file and then try again."); + } + } + return array('ok' => 1); + } + public static function ajax_removeCacheExclusion_callback(){ + $id = $_POST['id']; + $ex = wfConfig::get('cacheExclusions', false); + if(! $ex){ + return array('ok' => 1); + } + $ex = unserialize($ex); + $rewriteHtaccess = false; + for($i = 0; $i < sizeof($ex); $i++){ + if((string)$ex[$i]['id'] == (string)$id){ + if(wfConfig::get('cacheType', false) == 'falcon' && preg_match('/^(?:uac|uaeq|cc)$/', $ex[$i]['pt'])){ + $rewriteHtaccess = true; + } + array_splice($ex, $i, 1); + //Dont break in case of dups + } + } + wfConfig::set('cacheExclusions', serialize($ex)); + if($rewriteHtaccess && wfCache::addHtaccessCode('add')){ //rewrites htaccess rules + return array('errorMsg', "We removed that rule but could not rewrite your .htaccess file. You're going to have to manually remove this rule from your .htaccess file. Please reload this page now."); + } + return array('ok' => 1); + } + public static function ajax_loadCacheExclusions_callback(){ + $ex = wfConfig::get('cacheExclusions', false); + if(! $ex){ + return array('ex' => false); + } + $ex = unserialize($ex); + return array('ex' => $ex); + } + public static function ajax_saveConfig_callback(){ + $reload = ''; + $opts = wfConfig::parseOptions(); + $emails = array(); + foreach(explode(',', preg_replace('/[\r\n\s\t]+/', '', $opts['alertEmails'])) as $email){ + if(strlen($email) > 0){ + $emails[] = $email; + } + } + if(sizeof($emails) > 0){ + $badEmails = array(); + foreach($emails as $email){ + if(! preg_match('/^[^@]+@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,11})$/i', $email)){ + $badEmails[] = $email; + } + } + if(sizeof($badEmails) > 0){ + return array('errorMsg' => "The following emails are invalid: " . wp_kses(implode(', ', $badEmails), array()) ); + } + $opts['alertEmails'] = implode(',', $emails); + } else { + $opts['alertEmails'] = ''; + } + $opts['scan_exclude'] = wfUtils::cleanupOneEntryPerLine($opts['scan_exclude']); + $whiteIPs = array(); + foreach(explode(',', preg_replace('/[\r\n\s\t]+/', '', $opts['whitelisted'])) as $whiteIP){ + if(strlen($whiteIP) > 0){ + $whiteIPs[] = $whiteIP; + } + } + if(sizeof($whiteIPs) > 0){ + $badWhiteIPs = array(); + $range = new wfUserIPRange(); + foreach($whiteIPs as $whiteIP){ + $range->setIPString($whiteIP); + if (!$range->isValidRange()) { + $badWhiteIPs[] = $whiteIP; + } + } + if(sizeof($badWhiteIPs) > 0){ + return array('errorMsg' => "Please make sure you separate your IP addresses with commas. The following whitelisted IP addresses are invalid: " . wp_kses(implode(', ', $badWhiteIPs), array()) ); + } + $opts['whitelisted'] = implode(',', $whiteIPs); + } else { + $opts['whitelisted'] = ''; + } + $validUsers = array(); + $invalidUsers = array(); + foreach(explode(',', $opts['liveTraf_ignoreUsers']) as $val){ + $val = trim($val); + if(strlen($val) > 0){ + if(get_user_by('login', $val)){ + $validUsers[] = $val; + } else { + $invalidUsers[] = $val; + } + } + } + $userBlacklist = array(); + foreach(explode(',', $opts['loginSec_userBlacklist']) as $user){ + $user = trim($user); + if(strlen($user) > 0){ + $userBlacklist[] = $user; + } + } + if(sizeof($userBlacklist) > 0){ + $opts['loginSec_userBlacklist'] = implode(',', $userBlacklist); + } else { + $opts['loginSec_userBlacklist'] = ''; + } + + $opts['apiKey'] = trim($opts['apiKey']); + if($opts['apiKey'] && (! preg_match('/^[a-fA-F0-9]+$/', $opts['apiKey'])) ){ //User entered something but it's garbage. + return array('errorMsg' => "You entered an API key but it is not in a valid format. It must consist only of characters A to F and 0 to 9."); + } + + if(sizeof($invalidUsers) > 0){ + return array('errorMsg' => "The following users you selected to ignore in live traffic reports are not valid on this system: " . wp_kses(implode(', ', $invalidUsers), array()) ); + } + if(sizeof($validUsers) > 0){ + $opts['liveTraf_ignoreUsers'] = implode(',', $validUsers); + } else { + $opts['liveTraf_ignoreUsers'] = ''; + } + + $validIPs = array(); + $invalidIPs = array(); + foreach(explode(',', preg_replace('/[\r\n\s\t]+/', '', $opts['liveTraf_ignoreIPs'])) as $val){ + if(strlen($val) > 0){ + if(wfUtils::isValidIP($val)){ + $validIPs[] = $val; + } else { + $invalidIPs[] = $val; + } + } + } + if(sizeof($invalidIPs) > 0){ + return array('errorMsg' => "The following IPs you selected to ignore in live traffic reports are not valid: " . wp_kses(implode(', ', $invalidIPs), array()) ); + } + if(sizeof($validIPs) > 0){ + $opts['liveTraf_ignoreIPs'] = implode(',', $validIPs); + } + + if(preg_match('/[a-zA-Z0-9\d]+/', $opts['liveTraf_ignoreUA'])){ + $opts['liveTraf_ignoreUA'] = trim($opts['liveTraf_ignoreUA']); + } else { + $opts['liveTraf_ignoreUA'] = ''; + } + if(! $opts['other_WFNet']){ + $wfdb = new wfDB(); + global $wpdb; + $p = $wpdb->base_prefix; + $wfdb->queryWrite("delete from $p"."wfBlocks where wfsn=1 and permanent=0"); + } + if($opts['howGetIPs'] != wfConfig::get('howGetIPs', '')){ + $reload = 'reload'; + } + $regenerateHtaccess = false; + if(wfConfig::get('bannedURLs', false) != $opts['bannedURLs']){ + $regenerateHtaccess = true; + } + + foreach($opts as $key => $val){ + if($key != 'apiKey'){ //Don't save API key yet + wfConfig::set($key, $val); + } + } + if($regenerateHtaccess && wfConfig::get('cacheType') == 'falcon'){ + wfCache::addHtaccessCode('add'); + } + + if($opts['autoUpdate'] == '1'){ + wfConfig::enableAutoUpdate(); + } else if($opts['autoUpdate'] == '0'){ + wfConfig::disableAutoUpdate(); + } + + try { + if ($opts['disableCodeExecutionUploads']) { + wfConfig::disableCodeExecutionForUploads(); + } else { + wfConfig::removeCodeExecutionProtectionForUploads(); + } + } catch (wfConfigException $e) { + return array('errorMsg' => $e->getMessage()); + } + + if (!empty($opts['email_summary_enabled'])) { + wfConfig::set('email_summary_enabled', 1); + wfConfig::set('email_summary_interval', $opts['email_summary_interval']); + wfConfig::set('email_summary_excluded_directories', $opts['email_summary_excluded_directories']); + wfActivityReport::scheduleCronJob(); + } else { + wfConfig::set('email_summary_enabled', 0); + wfActivityReport::disableCronJob(); + } + + if (wfConfig::get('other_hideWPVersion')) { + wfUtils::hideReadme(); + } else { + wfUtils::showReadme(); + } + + $paidKeyMsg = false; + + + if(! $opts['apiKey']){ //Empty API key (after trim above), then try to get one. + $api = new wfAPI('', wfUtils::getWPVersion()); + try { + $keyData = $api->call('get_anon_api_key'); + if($keyData['ok'] && $keyData['apiKey']){ + wfConfig::set('apiKey', $keyData['apiKey']); + wfConfig::set('isPaid', 0); + $reload = 'reload'; + } else { + throw new Exception("We could not understand the Wordfence server's response because it did not contain an 'ok' and 'apiKey' element."); + } + } catch(Exception $e){ + return array('errorMsg' => "Your options have been saved, but we encountered a problem. You left your API key blank, so we tried to get you a free API key from the Wordfence servers. However we encountered a problem fetching the free key: " . wp_kses($e->getMessage(), array()) ); + } + } else if($opts['apiKey'] != wfConfig::get('apiKey')){ + $api = new wfAPI($opts['apiKey'], wfUtils::getWPVersion()); + try { + $res = $api->call('check_api_key', array(), array()); + if($res['ok'] && isset($res['isPaid'])){ + wfConfig::set('apiKey', $opts['apiKey']); + $reload = 'reload'; + wfConfig::set('isPaid', $res['isPaid']); //res['isPaid'] is boolean coming back as JSON and turned back into PHP struct. Assuming JSON to PHP handles bools. + if($res['isPaid']){ + $paidKeyMsg = true; + } + } else { + throw new Exception("We could not understand the Wordfence API server reply when updating your API key."); + } + } catch (Exception $e){ + return array('errorMsg' => "Your options have been saved. However we noticed you changed your API key and we tried to verify it with the Wordfence servers and received an error: " . wp_kses($e->getMessage(), array()) ); + } + } else { + $api = new wfAPI($opts['apiKey'], wfUtils::getWPVersion()); + $api->call('ping_api_key', array(), array()); + } + return array('ok' => 1, 'reload' => $reload, 'paidKeyMsg' => $paidKeyMsg ); + } + public static function ajax_clearAllBlocked_callback(){ + $op = $_POST['op']; + $wfLog = self::getLog(); + if($op == 'blocked'){ + wordfence::status(1, 'info', "Ajax request received to unblock All IP's including permanent blocks."); + $wfLog->unblockAllIPs(); + } else if($op == 'locked'){ + $wfLog->unlockAllIPs(); + } + return array('ok' => 1); + } + public static function ajax_unlockOutIP_callback(){ + $IP = $_POST['IP']; + self::getLog()->unlockOutIP($IP); + return array('ok' => 1); + } + public static function ajax_unblockIP_callback(){ + $IP = $_POST['IP']; + self::getLog()->unblockIP($IP); + return array('ok' => 1); + } + public static function ajax_permBlockIP_callback(){ + $IP = $_POST['IP']; + self::getLog()->blockIP($IP, "Manual permanent block by admin", false, true); + return array('ok' => 1); + } + public static function ajax_loadStaticPanel_callback(){ + $mode = $_POST['mode']; + $wfLog = self::getLog(); + if($mode == 'topScanners' || $mode == 'topLeechers'){ + $results = $wfLog->getLeechers($mode); + } else if($mode == 'blockedIPs'){ + $results = $wfLog->getBlockedIPs(); + } else if($mode == 'lockedOutIPs'){ + $results = $wfLog->getLockedOutIPs(); + } else if($mode == 'throttledIPs'){ + $results = $wfLog->getThrottledIPs(); + } + return array('ok' => 1, 'results' => $results); + } + public static function ajax_loadBlockRanges_callback(){ + $results = self::getLog()->getRanges(); + return array('ok' => 1, 'results' => $results); + } + public static function ajax_unblockRange_callback(){ + $id = trim($_POST['id']); + self::getLog()->unblockRange($id); + return array('ok' => 1); + } + + /** + * @return array + */ + public static function ajax_blockIPUARange_callback(){ + $ipRange = trim($_POST['ipRange']); + $hostname = trim($_POST['hostname']); + $uaRange = trim($_POST['uaRange']); + $referer = trim($_POST['referer']); + $reason = trim($_POST['reason']); + if (preg_match('/\|+/', $ipRange . $uaRange . $referer . $hostname)) { + return array('err' => 1, 'errorMsg' => "You are not allowed to include a pipe character \"|\" in your IP range, browser pattern or referer"); + } + if ((!$ipRange) && wfUtils::isUABlocked($uaRange)) { + return array('err' => 1, 'errorMsg' => "The browser pattern you specified will block you from your own website. We have not accepted this pattern to protect you from being blocked."); + } + if (fnmatch($referer, site_url(), FNM_CASEFOLD)) { + return array('err' => 1, 'errorMsg' => "The referer pattern you specified matches your own website and will block visitors as they surf from one page to another on your site. You can't enter this pattern."); + } + + if ($ipRange) { + list($start_range, $end_range) = explode('-', $ipRange); + if (!wfUtils::isValidIP($start_range) || !wfUtils::isValidIP($end_range)) { + return array('err' => 1, 'errorMsg' => "The IP range you specified is not valid. Please specify an IP range like the following example: \"1.2.3.4 - 1.2.3.8\" without quotes."); + } + $ip1 = wfUtils::inet_pton($start_range); + $ip2 = wfUtils::inet_pton($end_range); + if (strcmp($ip1, $ip2) >= 0) { + return array('err' => 1, 'errorMsg' => "The first IP address in your range must be less than the second IP address in your range."); + } + $clientIP = wfUtils::inet_pton(wfUtils::getIP()); + if (strcmp($ip1, $clientIP) <= 0 && strcmp($ip2, $clientIP) >= 0) { + return array('err' => 1, 'errorMsg' => "You are trying to block yourself. Your IP address is " . wp_kses(wfUtils::getIP(), array()) . " which falls into the range " . wp_kses($ipRange, array()) . ". This blocking action has been cancelled so that you don't block yourself from your website."); + } + $ipRange = wfUtils::inet_ntop($ip1) . '-' . wfUtils::inet_ntop($ip2); + } + if ($hostname && !preg_match('/^[a-z0-9\.\*\-]+$/i', $hostname)) { + return array('err' => 1, 'errorMsg' => 'The Hostname you specified is not valid'); + } + $range = $ipRange . '|' . $uaRange . '|' . $referer . '|' . $hostname; + self::getLog()->blockRange('IU', $range, $reason); + return array('ok' => 1); + } + public static function ajax_whois_callback(){ + $val = trim($_POST['val']); + $val = preg_replace('/[^a-zA-Z0-9\.\-:]+/', '', $val); + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $result = $api->call('whois', array(), array( + 'val' => $val, + )); + return array('ok' => 1, 'result' => $result['result']); + } + public static function ajax_blockIP_callback(){ + $IP = trim($_POST['IP']); + $perm = (isset($_POST['perm']) && $_POST['perm'] == '1') ? true : false; + if (!wfUtils::isValidIP($IP)) { + return array('err' => 1, 'errorMsg' => "Please enter a valid IP address to block."); + } + if ($IP == wfUtils::getIP()) { + return array('err' => 1, 'errorMsg' => "You can't block your own IP address."); + } + if (self::getLog()->isWhitelisted($IP)) { + return array('err' => 1, 'errorMsg' => "The IP address " . wp_kses($IP, array()) . " is whitelisted and can't be blocked or it is in a range of internal IP addresses that Wordfence does not block. You can remove this IP from the whitelist on the Wordfence options page."); + } + if (wfConfig::get('neverBlockBG') != 'treatAsOtherCrawlers') { //Either neverBlockVerified or neverBlockUA is selected which means the user doesn't want to block google + if (wfCrawl::isVerifiedGoogleCrawler($IP)) { + return array('err' => 1, 'errorMsg' => "The IP address you're trying to block belongs to Google. Your options are currently set to not block these crawlers. Change this in Wordfence options if you want to manually block Google."); + } + } + self::getLog()->blockIP($IP, $_POST['reason'], false, $perm); + return array('ok' => 1); + } + public static function ajax_reverseLookup_callback(){ + $ips = explode(',', $_POST['ips']); + $res = array(); + foreach($ips as $ip){ + $res[$ip] = wfUtils::reverseLookup($ip); + } + return array('ok' => 1, 'ips' => $res); + } + public static function ajax_deleteIssue_callback(){ + $wfIssues = new wfIssues(); + $issueID = $_POST['id']; + $wfIssues->deleteIssue($issueID); + return array('ok' => 1); + } + public static function ajax_updateAllIssues_callback(){ + $op = $_POST['op']; + $i = new wfIssues(); + if($op == 'deleteIgnored'){ + $i->deleteIgnored(); + } else if($op == 'deleteNew'){ + $i->deleteNew(); + } else if($op == 'ignoreAllNew'){ + $i->ignoreAllNew(); + } else { + return array('errorMsg' => "An invalid operation was called."); + } + return array('ok' => 1); + } + public static function ajax_updateIssueStatus_callback(){ + $wfIssues = new wfIssues(); + $status = $_POST['status']; + $issueID = $_POST['id']; + if(! preg_match('/^(?:new|delete|ignoreP|ignoreC)$/', $status)){ + return array('errorMsg' => "An invalid status was specified when trying to update that issue."); + } + $wfIssues->updateIssue($issueID, $status); + return array('ok' => 1); + } + public static function ajax_killScan_callback(){ + wordfence::status(1, 'info', "Scan kill request received."); + wordfence::status(10, 'info', "SUM_KILLED:A request was received to kill the previous scan."); + wfUtils::clearScanLock(); //Clear the lock now because there may not be a scan running to pick up the kill request and clear the lock + wfScanEngine::requestKill(); + return array( + 'ok' => 1, + ); + } + public static function ajax_loadIssues_callback(){ + $i = new wfIssues(); + $iss = $i->getIssues(); + return array( + 'issuesLists' => $iss, + 'summary' => $i->getSummaryItems(), + 'lastScanCompleted' => wfConfig::get('lastScanCompleted') + ); + } + public static function ajax_ticker_callback(){ + $wfdb = new wfDB(); + global $wpdb; + $p = $wpdb->base_prefix; + + $serverTime = $wfdb->querySingle("select unix_timestamp()"); + $jsonData = array( + 'serverTime' => $serverTime, + 'msg' => wp_kses_data( (string) $wfdb->querySingle("select msg from $p"."wfStatus where level < 3 order by ctime desc limit 1")) + ); + $events = array(); + $alsoGet = $_POST['alsoGet']; + if(preg_match('/^logList_(404|hit|human|ruser|crawler|gCrawler|loginLogout)$/', $alsoGet, $m)){ + $type = $m[1]; + $newestEventTime = $_POST['otherParams']; + $listType = 'hits'; + if($type == 'loginLogout'){ + $listType = 'logins'; + } + $events = self::getLog()->getHits($listType, $type, $newestEventTime); + } else if($alsoGet == 'perfStats'){ + $newestEventTime = $_POST['otherParams']; + $events = self::getLog()->getPerfStats($newestEventTime); + } + /* + $longest = 0; + foreach($events as $e){ + $length = $e['domainLookupEnd'] + $e['connectEnd'] + $e['responseStart'] + $e['responseEnd'] + $e['domReady'] + $e['loaded']; + $longest = $length > $longest ? $length : $longest; + } + */ + $jsonData['events'] = $events; + $jsonData['alsoGet'] = $alsoGet; //send it back so we don't load data if panel has changed + //$jsonData['longestLine'] = $longest; + return $jsonData; + } + public static function ajax_activityLogUpdate_callback(){ + $issues = new wfIssues(); + return array( + 'ok' => 1, + 'items' => self::getLog()->getStatusEvents($_POST['lastctime']), + 'currentScanID' => $issues->getScanTime() + ); + } + public static function ajax_updateAlertEmail_callback(){ + $email = trim($_POST['email']); + if(! preg_match('/[^\@]+\@[^\.]+\.[^\.]+/', $email)){ + return array( 'err' => "Invalid email address given."); + } + wfConfig::set('alertEmails', $email); + return array('ok' => 1, 'email' => $email); + } + public static function ajax_bulkOperation_callback(){ + $op = sanitize_text_field($_POST['op']); + if($op == 'del' || $op == 'repair'){ + $ids = $_POST['ids']; + $filesWorkedOn = 0; + $errors = array(); + $issues = new wfIssues(); + foreach($ids as $id){ + $id = intval($id); //Make sure input is a number. + $issue = $issues->getIssueByID($id); + if(! $issue){ + $errors[] = "Could not delete one of the files because we could not find the issue. Perhaps it's been resolved?"; + continue; + } + $file = $issue['data']['file']; + $localFile = ABSPATH . '/' . preg_replace('/^[\.\/]+/', '', $file); + $localFile = realpath($localFile); + if(strpos($localFile, ABSPATH) !== 0){ + $errors[] = "An invalid file was requested: " . wp_kses($file, array()); + continue; + } + if($op == 'del'){ + if(@unlink($localFile)){ + $issues->updateIssue($id, 'delete'); + $filesWorkedOn++; + } else { + $err = error_get_last(); + $errors[] = "Could not delete file " . wp_kses($file, array()) . ". Error was: " . wp_kses($err['message'], array()); + } + } else if($op == 'repair'){ + $dat = $issue['data']; + $result = self::getWPFileContent($dat['file'], $dat['cType'], $dat['cName'], $dat['cVersion']); + if($result['cerrorMsg']){ + $errors[] = $result['cerrorMsg']; + continue; + } else if(! $result['fileContent']){ + $errors[] = "We could not get the original file of " . wp_kses($file, array()) . " to do a repair."; + continue; + } + + if(preg_match('/\.\./', $file)){ + $errors[] = "An invalid file " . wp_kses($file, array()) . " was specified for repair."; + continue; + } + $fh = fopen($localFile, 'w'); + if(! $fh){ + $err = error_get_last(); + if(preg_match('/Permission denied/i', $err['message'])){ + $errMsg = "You don't have permission to repair " . wp_kses($file, array()) . ". You need to either fix the file manually using FTP or change the file permissions and ownership so that your web server has write access to repair the file."; + } else { + $errMsg = "We could not write to " . wp_kses($file, array()) . ". The error was: " . $err['message']; + } + $errors[] = $errMsg; + continue; + } + flock($fh, LOCK_EX); + $bytes = fwrite($fh, $result['fileContent']); + flock($fh, LOCK_UN); + fclose($fh); + if($bytes < 1){ + $errors[] = "We could not write to " . wp_kses($file, array()) . ". ($bytes bytes written) You may not have permission to modify files on your WordPress server."; + continue; + } + $filesWorkedOn++; + $issues->updateIssue($id, 'delete'); + } + } + $verb = $op == 'del' ? 'Deleted' : 'Repaired'; + $verb2 = $op == 'del' ? 'delete' : 'repair'; + if($filesWorkedOn > 0 && sizeof($errors) > 0){ + $headMsg = "$verb some files with errors"; + $bodyMsg = "$verb $filesWorkedOn files but we encountered the following errors with other files: " . implode('
', $errors); + } else if($filesWorkedOn > 0){ + $headMsg = "$verb $filesWorkedOn files successfully"; + $bodyMsg = "$verb $filesWorkedOn files successfully. No errors were encountered."; + } else if(sizeof($errors) > 0){ + $headMsg = "Could not $verb2 files"; + $bodyMsg = "We could not $verb2 any of the files you selected. We encountered the following errors: " . implode('
', $errors); + } else { + $headMsg = "Nothing done"; + $bodyMsg = "We didn't $verb2 anything and no errors were found."; + } + + return array('ok' => 1, 'bulkHeading' => $headMsg, 'bulkBody' => $bodyMsg); + } else { + return array('errorMsg' => "Invalid bulk operation selected"); + } + } + public static function ajax_deleteFile_callback(){ + $issueID = intval($_POST['issueID']); + $wfIssues = new wfIssues(); + $issue = $wfIssues->getIssueByID($issueID); + if(! $issue){ + return array('errorMsg' => "Could not delete file because we could not find that issue."); + } + if(! $issue['data']['file']){ + return array('errorMsg' => "Could not delete file because that issue does not appear to be a file related issue."); + } + $file = $issue['data']['file']; + $localFile = ABSPATH . '/' . preg_replace('/^[\.\/]+/', '', $file); + $localFile = realpath($localFile); + if(strpos($localFile, ABSPATH) !== 0){ + return array('errorMsg' => "An invalid file was requested for deletion."); + } + if ($localFile === ABSPATH . 'wp-config.php' && file_exists(ABSPATH . 'wp-config.php') && empty($_POST['forceDelete'])) { + return array( + 'errorMsg' => "You must first download a backup copy of your wp-config.php prior to deleting the infected file. + The wp-config.php file contains your database credentials which you will need to restore normal site operations. + Your site will NOT function once the wp-config.php has been deleted. +

+ Download a backup copy + Delete wp-config.php +

", + ); + } + if(@unlink($localFile)){ + $wfIssues->updateIssue($issueID, 'delete'); + return array( + 'ok' => 1, + 'localFile' => $localFile, + 'file' => $file + ); + } else { + $err = error_get_last(); + return array('errorMsg' => "Could not delete file " . wp_kses($file, array()) . ". The error was: " . wp_kses($err['message'], array())); + } + } + public static function ajax_deleteDatabaseOption_callback(){ + /** @var wpdb $wpdb */ + global $wpdb; + $issueID = intval($_POST['issueID']); + $wfIssues = new wfIssues(); + $issue = $wfIssues->getIssueByID($issueID); + if (!$issue) { + return array('errorMsg' => "Could not remove the option because we could not find that issue."); + } + if (empty($issue['data']['option_name'])) { + return array('errorMsg' => "Could not remove the option because that issue does not appear to be a database related issue."); + } + $prefix = $wpdb->get_blog_prefix($issue['data']['site_id']); + if ($wpdb->query($wpdb->prepare("DELETE FROM {$prefix}options WHERE option_name = %s", $issue['data']['option_name']))) { + $wfIssues->updateIssue($issueID, 'delete'); + return array( + 'ok' => 1, + 'option_name' => $issue['data']['option_name'], + ); + } else { + return array('errorMsg' => "Could not remove the option " . esc_html($issue['data']['option_name']) . ". The error was: " . esc_html($wpdb->last_error)); + } + } + public static function ajax_restoreFile_callback(){ + $issueID = intval($_POST['issueID']); + $wfIssues = new wfIssues(); + $issue = $wfIssues->getIssueByID($issueID); + if(! $issue){ + return array('cerrorMsg' => "We could not find that issue in our database."); + } + $dat = $issue['data']; + $result = self::getWPFileContent($dat['file'], $dat['cType'], (isset($dat['cName']) ? $dat['cName'] : ''), (isset($dat['cVersion']) ? $dat['cVersion'] : '')); + $file = $dat['file']; + if(isset($result['cerrorMsg']) && $result['cerrorMsg']){ + return $result; + } else if(! $result['fileContent']){ + return array('cerrorMsg' => "We could not get the original file to do a repair."); + } + + if(preg_match('/\.\./', $file)){ + return array('cerrorMsg' => "An invalid file was specified for repair."); + } + $localFile = ABSPATH . '/' . preg_replace('/^[\.\/]+/', '', $file); + $fh = fopen($localFile, 'w'); + if(! $fh){ + $err = error_get_last(); + if(preg_match('/Permission denied/i', $err['message'])){ + $errMsg = "You don't have permission to repair that file. You need to either fix the file manually using FTP or change the file permissions and ownership so that your web server has write access to repair the file."; + } else { + $errMsg = "We could not write to that file. The error was: " . $err['message']; + } + return array('cerrorMsg' => $errMsg); + } + flock($fh, LOCK_EX); + $bytes = fwrite($fh, $result['fileContent']); + flock($fh, LOCK_UN); + fclose($fh); + if($bytes < 1){ + return array('cerrorMsg' => "We could not write to that file. ($bytes bytes written) You may not have permission to modify files on your WordPress server."); + } + $wfIssues->updateIssue($issueID, 'delete'); + return array( + 'ok' => 1, + 'file' => $localFile + ); + } + public static function ajax_scan_callback(){ + self::status(4, 'info', "Ajax request received to start scan."); + $err = wfScanEngine::startScan(); + if($err){ + return array('errorMsg' => wp_kses($err, array())); + } else { + return array("ok" => 1); + } + } + public static function ajax_exportSettings_callback(){ + /** @var wpdb $wpdb */ + global $wpdb; + + $keys = wfConfig::getExportableOptionsKeys(); + $export = array(); + foreach($keys as $key){ + $export[$key] = wfConfig::get($key, ''); + } + $export['scanScheduleJSON'] = json_encode(wfConfig::get_ser('scanSched', array())); + $export['schedMode'] = wfConfig::get('schedMode', ''); + + // Any user supplied blocked IPs. + $export['_blockedIPs'] = $wpdb->get_results('SELECT *, HEX(IP) as IP FROM ' . $wpdb->base_prefix . 'wfBlocks WHERE wfsn = 0 AND permanent = 1'); + + // Any advanced blocking stuff too. + $export['_advancedBlocking'] = $wpdb->get_results('SELECT * FROM ' . $wpdb->base_prefix . 'wfBlocksAdv'); + + try { + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $res = $api->call('export_options', array(), $export); + if($res['ok'] && $res['token']){ + return array( + 'ok' => 1, + 'token' => $res['token'], + ); + } else { + throw new Exception("Invalid response: " . var_export($res, true)); + } + } catch(Exception $e){ + return array('err' => "An error occurred: " . $e->getMessage()); + } + } + public static function importSettings($token){ + /** @var wpdb $wpdb */ + global $wpdb; + + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $res = $api->call('import_options', array(), array('token' => $token)); + $totalSet = 0; + if($res['ok'] && $res['options']){ + $keys = wfConfig::getExportableOptionsKeys(); + foreach($keys as $key){ + if(isset($res['options'][$key])){ + wfConfig::set($key, $res['options'][$key]); + $totalSet++; + } + } + if(isset($res['options']['scanScheduleJSON']) && isset($res['options']['schedMode'])){ + $scanSched = json_decode($res['options']['scanScheduleJSON']); + wfConfig::set_ser('scanSched', $scanSched); + wfConfig::set('schedMode', $res['options']['schedMode']); + $totalSet += 2; + } + + if (!empty($res['options']['_blockedIPs']) && is_array($res['options']['_blockedIPs'])) { + foreach ($res['options']['_blockedIPs'] as $row) { + if (!empty($row['IP'])) { + $row['IP'] = pack('H*', $row['IP']); + if (!$wpdb->get_var($wpdb->prepare('SELECT COUNT(*) FROM ' . $wpdb->base_prefix . 'wfBlocks WHERE IP = %s', $row['IP']))) { + $wpdb->insert($wpdb->base_prefix . 'wfBlocks', $row); + } + } + } + } + + if (!empty($res['options']['_advancedBlocking']) && is_array($res['options']['_advancedBlocking'])) { + foreach ($res['options']['_advancedBlocking'] as $row) { + if (!empty($row['blockString']) && !$wpdb->get_var($wpdb->prepare('SELECT COUNT(*) FROM ' . $wpdb->base_prefix . 'wfBlocksAdv WHERE blockString = %s', $row['blockString']))) { + unset($row['id']); + $wpdb->insert($wpdb->base_prefix . 'wfBlocksAdv', $row); + } + } + } + + return $totalSet; + } else if($res['err']){ + throw new Exception($res['err']); + } else { + throw new Exception("Invalid response from Wordfence servers during import."); + } + } + public static function ajax_startPasswdAudit_callback(){ + if(! wfAPI::SSLEnabled()){ + return array('errorMsg' => "Your server does not support SSL via cURL. To use this feature you need to make sure you have the PHP cURL library installed and enabled and have openSSL enabled so that you can communicate securely with our servers. This ensures that your password hashes remain secure and are double-encrypted when this feature is used. To fix this, please contact your hosting provider or site admin and ask him or her to install and enable cURL and openssl."); + } + if(! function_exists('openssl_public_encrypt')){ + return array('errorMsg' => "Your server does not have openssl installed. Specifically we require the openssl_public_encrypt() function to use this feature. Please ask your site admin or hosting provider to install 'openssl' and the openssl PHP libraries. We use these for public key encryption to securely send your password hashes to our server for auditing."); + } + global $wpdb; $p = $wpdb->base_prefix; + $email = $_POST['emailAddr']; + if(!filter_var($email, FILTER_VALIDATE_EMAIL)){ + return array( + 'errorMsg' => "Please enter a valid email address.", + ); + } + $auditType = $_POST['auditType']; + $symKey = wfCrypt::makeSymHexKey(32); #hex digits which is 128 bits + $wfdb = new wfDB(); + $q1 = $wfdb->querySelect("select ID, AES_ENCRYPT(user_pass, '%s') as crypt_pass from $p"."users", $symKey); + $admins = ""; + $users = ""; + foreach($q1 as $rec) { + $isAdmin = user_can($rec['ID'], 'manage_options'); + if($isAdmin && ($auditType == 'admin' || $auditType == 'both') ) { + $admins .= $rec['ID'] . ':' . base64_encode($rec['crypt_pass']) . '|'; + } else if($auditType == 'user' || $auditType == 'both') { + $users .= $rec['ID'] . ':' . base64_encode($rec['crypt_pass']) . '|'; + } + + } + $admins = rtrim($admins,'|'); + $users = rtrim($users,'|'); + //error_log($admins); + //error_log($users); + + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $res = $api->call('password_audit', array(), array( + 'auditType' => $auditType, + 'email' => $email, + 'pubCryptSymKey' => wfCrypt::pubCrypt($symKey), + 'users' => $users, + 'admins' => $admins + ), true); //Force SSL + if(is_array($res)){ + if(isset($res['ok']) && $res['ok'] == '1'){ + return array( + 'ok' => 1 + ); + } else if(isset($res['notPaid']) && $res['notPaid'] == '1'){ + return array( + 'errorMsg' => "You are not using a Premium version of Wordfence. This feature is available to Premium Wordfence members only.", + ); + } else if(isset($res['tooManyJobs']) && $res['tooManyJobs'] == '1'){ + return array( + 'errorMsg' => "You already have a password audit running. Please wait until it finishes before starting another.", + ); + } else { + throw new Exception("An unrecognized response was received from the Wordfence servers."); + } + } else { + return array( + 'errorMsg' => "We received an invalid response when trying to submit your password audit.", + ); + } + } catch(Exception $e){ + return array( + 'errMsg' => "We could not submit your password audit: " . $e, + ); + } + } + public static function ajax_weakPasswordsFix_callback(){ + $mode = $_POST['mode']; + $ids = explode(',', $_POST['ids']); + $homeURL = home_url(); + $count = 0; + if($mode == 'fix'){ + foreach($ids as $userID){ + $user = get_user_by('id', $userID); + if($user){ + $passwd = wp_generate_password(); + $count++; + wp_set_password($passwd, $userID); + wp_mail($user->user_email, "Your Password on $homeURL Has Been Changed.", wfUtils::tmpl('email_passwdChanged.php', array( + 'siteURL' => site_url(), + 'homeURL' => home_url(), + 'loginURL' => wp_login_url(), + 'username' => $user->user_login, + 'passwd' => $passwd, + ))); + } + } + return array( + 'ok' => 1, + 'title' => "Fixed $count Weak Passwords", + 'msg' => "We created new passwords for $count site members and emailed them the new password with instructions." + ); + + } else if($mode == 'email'){ + foreach($ids as $userID){ + $user = get_user_by('id', $userID); + if($user){ + $count++; + wp_mail($user->user_email, "Please Change Your Password on $homeURL", wfUtils::tmpl('email_pleaseChangePasswd.php', array( + 'siteURL' => site_url(), + 'homeURL' => home_url(), + 'username' => $user->user_login, + 'loginURL' => wp_login_url() + ))); + } + } + return array( + 'ok' => 1, + 'title' => "Notified $count Users", + 'msg' => "We sent an email to $count site members letting them know that they have a weak password and suggesting that they sign in and change their password to a stronger one." + ); + } + } + public static function ajax_passwdLoadResults_callback(){ + if(! wfAPI::SSLEnabled()){ return array('ok' => 1); } //If user hits start passwd audit they will get a helpful message. We don't want an error popping up for every ajax call if SSL is not supported. + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $res = $api->call('password_load_results', array(), array(), true); + } catch(Exception $e){ + return array('errorMsg' => "Could not load password audit results: " . $e); + } + $finalResults = array(); + if(is_array($res) && $res['ok']){ + if(is_array($res['results'])){ + for($i = 0; $i < sizeof($res['results']); $i++){ + //$meta = get_user_meta($res['results'][$i]['userID'], 'wp_capabilities', true); + //$res['results'][$i]['isAdmin'] = (isset($meta['administrator']) && $meta['administrator']) ? '1' : ''; + $user = new WP_User($res['results'][$i]['wpUserID']); + if(is_object($user)){ + $passMD5 = strtoupper(md5($user->user_pass)); + if($passMD5 != $res['results'][$i]['hashMD5']){ //Password has changed, so exclude this result + continue; + } + $item = $res['results'][$i]; + $item['username'] = $user->user_login; + $item['email'] = $user->user_email; + $item['firstName'] = $user->first_name; + $item['lastName'] = $user->last_name; + $item['starredPassword'] = $res['results'][$i]['pwFirstLetter'] . str_repeat('*', $res['results'][$i]['pwLength'] - 1); + //crackTime and crackDifficulty are fields too. + $finalResults[] = $item; + } + } + } + + return array( + 'ok' => 1, + 'results' => $finalResults, + ); + } else { + return array('ok' => 1); //fail silently + } + } + public static function ajax_passwdLoadJobs_callback(){ + if(! wfAPI::SSLEnabled()){ return array('ok' => 1); } //If user hits start passwd audit they will get a helpful message. We don't want an error popping up for every ajax call if SSL is not supported. + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $res = $api->call('password_load_jobs', array(), array(), true); + } catch(Exception $e){ + return array('errorMsg' => "Could not load password audit jobs: " . $e); + } + if(is_array($res) && $res['ok']){ + return array( + 'ok' => 1, + 'results' => $res['results'], + ); + } else { + return array('ok' => 1); //fail silently + } + } + public static function ajax_killPasswdAudit_callback(){ + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $res = $api->call('password_kill_job', array(), array( 'jobID' => $_POST['jobID'] ), true); + } catch(Exception $e){ + return array('errorMsg' => "Could not stop requested audit: " . $e); + } + if(is_array($res) && $res['ok']){ + return array( + 'ok' => 1, + ); + } else { + return array('errorMsg' => "We could not stop the requested password audit."); //fail silently + } + } + public static function ajax_deletePasswdAudit_callback(){ + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + try { + $res = $api->call('password_delete_job', array(), array( 'jobID' => $_POST['jobID'])); + } catch(Exception $e){ + return array('errorMsg' => "Could not delete the job you specified: " . $e); + } + return array('ok' => 1); + } + public static function ajax_importSettings_callback(){ + $token = $_POST['token']; + try { + $totalSet = self::importSettings($token); + return array( + 'ok' => 1, + 'totalSet' => $totalSet, + ); + } catch(Exception $e){ + return array('err' => "An error occurred: " . $e->getMessage()); + } + } + public static function startScan(){ + wfScanEngine::startScan(); + } + public static function templateRedir(){ + if (!empty($_GET['wordfence_logHuman'])) { + self::ajax_logHuman_callback(); + exit; + } + + $wfFunc = !empty($_GET['_wfsf']) && is_string($_GET['_wfsf']) ? $_GET['_wfsf'] : ''; + + //Logging + self::doEarlyAccessLogging(); + //End logging + + + if(! ($wfFunc == 'diff' || $wfFunc == 'view' || $wfFunc == 'viewOption' || $wfFunc == 'sysinfo' || $wfFunc == 'cronview' || $wfFunc == 'dbview' || $wfFunc == 'conntest' || $wfFunc == 'unknownFiles' || $wfFunc == 'IPTraf' || $wfFunc == 'viewActivityLog' || $wfFunc == 'testmem' || $wfFunc == 'testtime' || $wfFunc == 'download')){ + return; + } + if(! wfUtils::isAdmin()){ + return; + } + + $nonce = $_GET['nonce']; + if(! wp_verify_nonce($nonce, 'wp-ajax')){ + echo "Bad security token. It may have been more than 12 hours since you reloaded the page you came from. Try reloading the page you came from. If that doesn't work, please sign out and sign-in again."; + exit(0); + } + if($wfFunc == 'diff'){ + self::wfFunc_diff(); + } else if($wfFunc == 'view'){ + self::wfFunc_view(); + } else if($wfFunc == 'viewOption'){ + self::wfFunc_viewOption(); + } else if($wfFunc == 'sysinfo') { + require( 'sysinfo.php' ); + } else if($wfFunc == 'dbview'){ + require('dbview.php'); + } else if($wfFunc == 'cronview') { + require('cronview.php'); + } else if($wfFunc == 'conntest'){ + require('conntest.php'); + } else if($wfFunc == 'unknownFiles'){ + require('unknownFiles.php'); + } else if($wfFunc == 'IPTraf'){ + self::wfFunc_IPTraf(); + } else if($wfFunc == 'viewActivityLog'){ + self::wfFunc_viewActivityLog(); + } else if($wfFunc == 'testmem'){ + self::wfFunc_testmem(); + } else if($wfFunc == 'testtime'){ + self::wfFunc_testtime(); + } else if($wfFunc == 'download'){ + self::wfFunc_download(); + } + exit(0); + } + public static function memtest_error_handler($errno, $errstr, $errfile, $errline){ + echo "Error received: $errstr\n"; + } + private static function wfFunc_testtime(){ + header('Content-Type: text/plain'); + @error_reporting(E_ALL); + wfUtils::iniSet('display_errors','On'); + set_error_handler('wordfence::memtest_error_handler', E_ALL); + + echo "Wordfence process duration benchmarking utility version " . WORDFENCE_VERSION . ".\n"; + echo "This utility tests how long your WordPress host allows a process to run.\n\n--Starting test--\n"; + echo "Starting timed test. This will take at least three minutes. Seconds elapsed are printed below.\nAn error after this line is not unusual. Read it and the elapsed seconds to determine max process running time on your host.\n"; + for($i = 1; $i <= 180; $i++){ + echo "\n$i:"; + for($j = 0; $j < 1000; $j++){ + echo '.'; + } + flush(); + sleep(1); + } + echo "\n--Test complete.--\n\nCongratulations, your web host allows your PHP processes to run at least 3 minutes.\n"; + exit(); + } + private static function wfFunc_testmem(){ + header('Content-Type: text/plain'); + @error_reporting(E_ALL); + wfUtils::iniSet('display_errors','On'); + set_error_handler('wordfence::memtest_error_handler', E_ALL); + + echo "Wordfence Memory benchmarking utility version " . WORDFENCE_VERSION . ".\n"; + echo "This utility tests if your WordPress host respects the maximum memory configured\nin their php.ini file, or if they are using other methods to limit your access to memory.\n\n--Starting test--\n"; + echo "Current maximum memory configured in php.ini: " . ini_get('memory_limit') . "\n"; + echo "Current memory usage: " . sprintf('%.2f', memory_get_usage(true) / (1024 * 1024)) . "M\n"; + echo "Setting max memory to 90M.\n"; + wfUtils::iniSet('memory_limit', '90M'); + echo "Starting memory benchmark. Seeing an error after this line is not unusual. Read the error carefully\nto determine how much memory your host allows. We have requested 90 megabytes.\n"; + if(memory_get_usage(true) < 1){ + echo "Exiting test because memory_get_usage() returned a negative number\n"; + } + if(memory_get_usage(true) > (1024 * 1024 * 1024)){ + echo "Exiting because current memory usage is greater than a gigabyte.\n"; + } + $arr = array(); + //256 bytes + $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345678900000000000000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111222222222222222222233333333333333334444444444444444444444444555555555555666666666666666666"; + $finalUsage = '0'; + while(true){ + if(memory_get_usage(true) > 80 * 1024 * 1024){ + $finalUsage = sprintf('%.2f', (memory_get_usage(true) / 1024 / 1024)); + echo "Completing test after benchmarking up to " . $finalUsage . " megabytes.\n"; + break; + } + for($i = 0; $i < 1024; $i++){ //Roughly 1 megabyte if it's 256K and actual array size is 4x data size + $arr[] = $chars; + } + } + echo "--Test complete.--\n\nCongratulations, your web host allows you to use at least $finalUsage megabytes of memory for each PHP process hosting your WordPress site.\n"; + exit(); + } + public static function wfLogPerfHeader(){ + $ajaxURL = admin_url('admin-ajax.php'); + $ajaxURL = preg_replace('/^https?:/i', '', $ajaxURL); + $scriptURL = wfUtils::getBaseURL() . '/js/perf.js?v=' . WORDFENCE_VERSION; + $scriptURL = preg_replace('/^https?:/i', '', $scriptURL); + #Load as external script async so we don't slow page down. + echo << +window['wordfenceAjaxURL'] = "$ajaxURL"; +(function(url){ +if(/(?:Chrome\/26\.0\.1410\.63 Safari\/537\.31|WordfenceTestMonBot)/.test(navigator.userAgent)){ return; } +var wfscr = document.createElement('script'); +wfscr.type = 'text/javascript'; +wfscr.async = true; +wfscr.src = url; +(document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(wfscr); +})('$scriptURL'); + +EOL; + } + public static function wfLogHumanHeader(){ + $URL = home_url('/?wordfence_logHuman=1&hid=' . wfUtils::encrypt(self::$hitID)); + $URL = addslashes(preg_replace('/^https?:/i', '', $URL)); + #Load as external script async so we don't slow page down. + echo << +(function(url){ + if(/(?:Chrome\/26\.0\.1410\.63 Safari\/537\.31|WordfenceTestMonBot)/.test(navigator.userAgent)){ return; } + var addEvent = function(evt, handler) { + if (window.addEventListener) { + document.addEventListener(evt, handler, false); + } else if (window.attachEvent) { + document.attachEvent('on' + evt, handler); + } + }; + var removeEvent = function(evt, handler) { + if (window.removeEventListener) { + document.removeEventListener(evt, handler, false); + } else if (window.detachEvent) { + document.detachEvent('on' + evt, handler); + } + }; + var evts = 'contextmenu dblclick drag dragend dragenter dragleave dragover dragstart drop keydown keypress keyup mousedown mousemove mouseout mouseover mouseup mousewheel scroll'.split(' '); + var logHuman = function() { + var wfscr = document.createElement('script'); + wfscr.type = 'text/javascript'; + wfscr.async = true; + wfscr.src = url + '&r=' + Math.random(); + (document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(wfscr); + for (var i = 0; i < evts.length; i++) { + removeEvent(evts[i], logHuman); + } + }; + for (var i = 0; i < evts.length; i++) { + addEvent(evts[i], logHuman); + } +})('$URL'); + +HTML; + } + public static function shutdownAction(){ + } + public static function wfFunc_viewActivityLog(){ + require('viewFullActivityLog.php'); + exit(0); + } + public static function wfFunc_IPTraf(){ + $IP = $_GET['IP']; + if(!wfUtils::isValidIP($IP)){ + echo "An invalid IP address was specified."; + exit(0); + } + $reverseLookup = wfUtils::reverseLookup($IP); + $wfLog = new wfLog(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $results = array_merge( + $wfLog->getHits('hits', 'hit', 0, 10000, $IP), + $wfLog->getHits('hits', '404', 0, 10000, $IP) + ); + usort($results, 'wordfence::iptrafsort'); + for($i = 0; $i < sizeof($results); $i++){ + if(array_key_exists($i + 1, $results)){ + $results[$i]['timeSinceLastHit'] = sprintf('%.4f', $results[$i]['ctime'] - $results[$i + 1]['ctime']); + } else { + $results[$i]['timeSinceLastHit'] = ''; + } + } + require('IPTraf.php'); + exit(0); + } + public static function iptrafsort($b, $a){ + if($a['ctime'] == $b['ctime']){ return 0; } + return ($a['ctime'] < $b['ctime']) ? -1 : 1; + } + + public static function wfFunc_viewOption() { + /** @var wpdb $wpdb */ + global $wpdb; + $site_id = !empty($_GET['site_id']) ? absint($_GET['site_id']) : get_current_blog_id(); + $option_name = !empty($_GET['option']) ? $_GET['option'] : false; + + $prefix = $wpdb->get_blog_prefix($site_id); + + $option_value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM {$prefix}options WHERE option_name = %s", $option_name)); + + header('Content-type: text/plain'); + exit($option_value); + } + + public static function wfFunc_view(){ + $localFile = ABSPATH . preg_replace('/^(?:\.\.|[\/]+)/', '', sanitize_text_field($_GET['file'])); + if(strpos($localFile, '..') !== false){ + echo "Invalid file requested. (Relative paths not allowed)"; + exit(); + } + if(preg_match('/[\'\"<>\!\{\}\&\@\%\$\*\+\[\]\?]+/', $localFile)){ + echo "File contains illegal characters."; + exit(); + } + $cont = @file_get_contents($localFile); + $isEmpty = false; + if(! $cont){ + if(file_exists($localFile) && filesize($localFile) === 0){ //There's a remote possibility that very large files on 32 bit systems will return 0 here, but it's about 1 in 2 billion + $isEmpty = true; + } else { + $err = error_get_last(); + echo "We could not open the requested file for reading. The error was: " . $err['message']; + exit(0); + } + } + $fileMTime = @filemtime($localFile); + $fileMTime = date('l jS \of F Y h:i:s A', $fileMTime); + try { + if(wfUtils::fileOver2Gigs($localFile)){ + $fileSize = "Greater than 2 Gigs"; + } else { + $fileSize = @filesize($localFile); //Checked if over 2 gigs above + $fileSize = number_format($fileSize, 0, '', ',') . ' bytes'; + } + } catch(Exception $e){ $fileSize = 'Unknown file size.'; } + + require 'wfViewResult.php'; + exit(0); + } + public static function wfFunc_diff(){ + if(preg_match('/[\'\"<>\!\{\}\&\@\%\$\*\+\[\]\?]+/', $_GET['file'])){ + echo "File contains illegal characters."; + exit(); + } + + $result = self::getWPFileContent($_GET['file'], $_GET['cType'], $_GET['cName'], $_GET['cVersion']); + if( isset( $result['errorMsg'] ) && $result['errorMsg']){ + echo wp_kses($result['errorMsg'], array()); + exit(0); + } else if(! $result['fileContent']){ + echo "We could not get the contents of the original file to do a comparison."; + exit(0); + } + + $localFile = realpath(ABSPATH . '/' . preg_replace('/^[\.\/]+/', '', $_GET['file'])); + $localContents = file_get_contents($localFile); + if($localContents == $result['fileContent']){ + $diffResult = ''; + } else { + $diff = new Diff( + //Treat DOS and Unix files the same + preg_split("/(?:\r\n|\n)/", $result['fileContent']), + preg_split("/(?:\r\n|\n)/", $localContents), + array() + ); + $renderer = new Diff_Renderer_Html_SideBySide; + $diffResult = $diff->Render($renderer); + } + require 'diffResult.php'; + exit(0); + } + + public static function wfFunc_download() { + $localFile = ABSPATH . preg_replace('/^(?:\.\.|[\/]+)/', '', sanitize_text_field($_GET['file'])); + if (strpos($localFile, '..') !== false) { + echo "Invalid file requested. (Relative paths not allowed)"; + exit(); + } + if (preg_match('/[\'\"<>\!\{\}\&\@\%\$\*\+\[\]\?]+/', $localFile)) { + echo "File contains illegal characters."; + exit(); + } + if (!file_exists($localFile)) { + exit('File does not exist.'); + } + + $filename = basename($localFile); + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename="' . $filename . '"'); + header('Content-Length: ' . filesize($localFile)); + readfile($localFile); + exit; + } + + public static function initAction(){ + if(wfConfig::liveTrafficEnabled() && (! wfConfig::get('disableCookies', false)) ){ + self::setCookie(); + } + } + private static function setCookie(){ + $cookieName = 'wfvt_' . crc32(site_url()); + $c = isset($_COOKIE[$cookieName]) ? isset($_COOKIE[$cookieName]) : false; + if($c){ + self::$newVisit = false; + } else { + self::$newVisit = true; + } + wfUtils::setcookie($cookieName, uniqid(), time() + 1800, '/', null, null, true); + } + public static function admin_init(){ + if(! wfUtils::isAdmin()){ return; } + foreach(array( + 'activate', 'scan', 'updateAlertEmail', 'sendActivityLog', 'restoreFile', 'startPasswdAudit', + 'deletePasswdAudit', 'weakPasswordsFix', 'passwdLoadResults', 'killPasswdAudit', 'passwdLoadJobs', + 'exportSettings', 'importSettings', 'bulkOperation', 'deleteFile', 'deleteDatabaseOption', 'removeExclusion', + 'activityLogUpdate', 'ticker', 'loadIssues', 'updateIssueStatus', 'deleteIssue', 'updateAllIssues', + 'reverseLookup', 'unlockOutIP', 'loadBlockRanges', 'unblockRange', 'blockIPUARange', 'whois', 'unblockIP', + 'blockIP', 'permBlockIP', 'loadStaticPanel', 'saveConfig', 'downloadHtaccess', 'checkFalconHtaccess', + 'updateConfig', 'saveCacheConfig', 'removeFromCache', 'autoUpdateChoice', 'saveCacheOptions', 'clearPageCache', + 'getCacheStats', 'clearAllBlocked', 'killScan', 'saveCountryBlocking', 'saveScanSchedule', 'tourClosed', + 'welcomeClosed', 'startTourAgain', 'downgradeLicense', 'addTwoFactor', 'twoFacActivate', 'twoFacDel', + 'loadTwoFactor', 'loadAvgSitePerf', 'sendTestEmail', 'addCacheExclusion', 'removeCacheExclusion', + 'loadCacheExclusions', 'email_summary_email_address_debug', 'unblockNetwork', 'permanentlyBlockAllIPs', + ) as $func){ + add_action('wp_ajax_wordfence_' . $func, 'wordfence::ajaxReceiver'); + } + + if(isset($_GET['page']) && preg_match('/^Wordfence/', @$_GET['page']) ){ + wp_enqueue_style('wp-pointer'); + wp_enqueue_script('wp-pointer'); + wp_enqueue_style('wordfence-main-style', wfUtils::getBaseURL() . 'css/main.css', '', WORDFENCE_VERSION); + wp_enqueue_style('wordfence-colorbox-style', wfUtils::getBaseURL() . 'css/colorbox.css', '', WORDFENCE_VERSION); + wp_enqueue_style('wordfence-dttable-style', wfUtils::getBaseURL() . 'css/dt_table.css', '', WORDFENCE_VERSION); + + + wp_enqueue_script('json2'); + wp_enqueue_script('jquery.wftmpl', wfUtils::getBaseURL() . 'js/jquery.tmpl.min.js', array('jquery'), WORDFENCE_VERSION); + wp_enqueue_script('jquery.wfcolorbox', wfUtils::getBaseURL() . 'js/jquery.colorbox-min.js', array('jquery'), WORDFENCE_VERSION); + wp_enqueue_script('jquery.wfdataTables', wfUtils::getBaseURL() . 'js/jquery.dataTables.min.js', array('jquery'), WORDFENCE_VERSION); + //wp_enqueue_script('jquery.tools', wfUtils::getBaseURL() . 'js/jquery.tools.min.js', array('jquery')); + wp_enqueue_script('wordfenceAdminjs', wfUtils::getBaseURL() . 'js/admin.js', array('jquery'), WORDFENCE_VERSION); + wp_enqueue_script('wordfenceAdminExtjs', wfUtils::getBaseURL() . 'js/tourTip.js', array('jquery'), WORDFENCE_VERSION); + self::setupAdminVars(); + } else { + wp_enqueue_style('wp-pointer'); + wp_enqueue_script('wp-pointer'); + wp_enqueue_script('wordfenceAdminjs', wfUtils::getBaseURL() . 'js/tourTip.js', array('jquery'), WORDFENCE_VERSION); + self::setupAdminVars(); + } + + } + private static function setupAdminVars(){ + $updateInt = wfConfig::get('actUpdateInterval', 2); + if(! preg_match('/^\d+$/', $updateInt)){ + $updateInt = 2; + } + $updateInt *= 1000; + + wp_localize_script('wordfenceAdminjs', 'WordfenceAdminVars', array( + 'ajaxURL' => admin_url('admin-ajax.php'), + 'firstNonce' => wp_create_nonce('wp-ajax'), + 'siteBaseURL' => wfUtils::getSiteBaseURL(), + 'debugOn' => wfConfig::get('debugOn', 0), + 'actUpdateInterval' => $updateInt, + 'tourClosed' => wfConfig::get('tourClosed', 0), + 'welcomeClosed' => wfConfig::get('welcomeClosed', 0), + 'cacheType' => wfConfig::get('cacheType'), + 'liveTrafficEnabled' => wfConfig::liveTrafficEnabled() + )); + } + public static function activation_warning(){ + $activationError = get_option('wf_plugin_act_error', ''); + if(strlen($activationError) > 400){ + $activationError = substr($activationError, 0, 400) . '...[output truncated]'; + } + if($activationError){ + echo '

Wordfence generated an error on activation. The output we received during activation was: ' . wp_kses($activationError, array()) . '

'; + } + delete_option('wf_plugin_act_error'); + } + public static function noKeyError(){ + echo '

Wordfence could not get an API key from the Wordfence scanning servers when it activated. You can try to fix this by going to the Wordfence "options" page and hitting "Save Changes". This will cause Wordfence to retry fetching an API key for you. If you keep seeing this error it usually means your WordPress server can\'t connect to our scanning servers. You can try asking your WordPress host to allow your WordPress server to connect to noc1.wordfence.com.

'; + } + public static function adminEmailWarning(){ + echo '

You have not set an administrator email address to receive alerts for Wordfence. Please click here to go to the Wordfence Options Page and set an email address where you will receive security alerts from this site.

'; + } + public static function autoUpdateNotice(){ + echo '

Do you want Wordfence to stay up-to-date automatically? Yes, enable auto-update. | No thanks.

'; + } + public static function admin_menus(){ + if(! wfUtils::isAdmin()){ return; } + $warningAdded = false; + if(get_option('wf_plugin_act_error', false)){ + if(wfUtils::isAdminPageMU()){ + add_action('network_admin_notices', 'wordfence::activation_warning'); + } else { + add_action('admin_notices', 'wordfence::activation_warning'); + } + $warningAdded = true; + } + if(! wfConfig::get('apiKey')){ + if(wfUtils::isAdminPageMU()){ + add_action('network_admin_notices', 'wordfence::noKeyError'); + } else { + add_action('admin_notices', 'wordfence::noKeyError'); + } + $warningAdded = true; + } + if(! $warningAdded){ + if(wfConfig::get('tourClosed') == '1' && (! wfConfig::get('autoUpdate')) && (! wfConfig::get('autoUpdateChoice'))){ + $warningAdded = true; + if(wfUtils::isAdminPageMU()){ + add_action('network_admin_notices', 'wordfence::autoUpdateNotice'); + } else { + add_action('admin_notices', 'wordfence::autoUpdateNotice'); + } + } + } + if(! $warningAdded){ + if(wfConfig::get('tourClosed') == '1' && (! wfConfig::get('alertEmails')) ){ + $warningAdded = true; + if(wfUtils::isAdminPageMU()){ + add_action('network_admin_notices', 'wordfence::adminEmailWarning'); + } else { + add_action('admin_notices', 'wordfence::adminEmailWarning'); + } + } + } + + add_submenu_page("Wordfence", "Scan", "Scan", "activate_plugins", "Wordfence", 'wordfence::menu_scan'); + add_menu_page('Wordfence', 'Wordfence', 'activate_plugins', 'Wordfence', 'wordfence::menu_scan', wfUtils::getBaseURL() . 'images/wordfence-logo-16x16.png'); + add_submenu_page("Wordfence", "Live Traffic", "Live Traffic", "activate_plugins", "WordfenceActivity", 'wordfence::menu_activity'); + /* add_submenu_page('Wordfence', 'Site Performance', 'Site Performance', 'activate_plugins', 'WordfenceSitePerfStats', 'wordfence::menu_sitePerfStats'); */ + add_submenu_page('Wordfence', 'Performance Setup', 'Performance Setup', 'activate_plugins', 'WordfenceSitePerf', 'wordfence::menu_sitePerf'); + add_submenu_page('Wordfence', 'Blocked IPs', 'Blocked IPs', 'activate_plugins', 'WordfenceBlockedIPs', 'wordfence::menu_blockedIPs'); + add_submenu_page('Wordfence', 'Password Audit', 'Password Audit', 'activate_plugins', 'WordfencePasswdAudit', 'wordfence::menu_passwd'); + + add_submenu_page("Wordfence", "Cellphone Sign-in", "Cellphone Sign-in", "activate_plugins", "WordfenceTwoFactor", 'wordfence::menu_twoFactor'); + add_submenu_page("Wordfence", "Country Blocking", "Country Blocking", "activate_plugins", "WordfenceCountryBlocking", 'wordfence::menu_countryBlocking'); + add_submenu_page("Wordfence", "Scan Schedule", "Scan Schedule", "activate_plugins", "WordfenceScanSchedule", 'wordfence::menu_scanSchedule'); + add_submenu_page("Wordfence", "Whois Lookup", "Whois Lookup", "activate_plugins", "WordfenceWhois", 'wordfence::menu_whois'); + add_submenu_page("Wordfence", "Advanced Blocking", "Advanced Blocking", "activate_plugins", "WordfenceRangeBlocking", 'wordfence::menu_rangeBlocking'); + add_submenu_page("Wordfence", "Options", "Options", "activate_plugins", "WordfenceSecOpt", 'wordfence::menu_options'); + } + public static function menu_options(){ + require 'menu_options.php'; + } + public static function menu_sitePerf(){ + require 'menu_sitePerf.php'; + } + public static function menu_sitePerfStats(){ + require 'menu_sitePerfStats.php'; + } + public static function menu_blockedIPs(){ + require 'menu_blockedIPs.php'; + } + public static function menu_passwd() + { + require 'menu_passwd.php'; + } + public static function menu_scanSchedule(){ + require 'menu_scanSchedule.php'; + } + public static function menu_twoFactor(){ + require 'menu_twoFactor.php'; + } + public static function menu_countryBlocking(){ + require 'menu_countryBlocking.php'; + } + public static function menu_whois(){ + require 'menu_whois.php'; + } + public static function menu_rangeBlocking(){ + require 'menu_rangeBlocking.php'; + } + public static function liveTrafficW3TCWarning(){ + echo self::cachingWarning("W3 Total Cache"); + } + public static function liveTrafficSuperCacheWarning(){ + echo self::cachingWarning("WP Super Cache"); + } + public static function cachingWarning($plugin){ + return '

The Wordfence Live Traffic feature has been disabled because you have ' . $plugin . ' active which is not compatible with Wordfence Live Traffic. If you want to reenable Wordfence Live Traffic, you need to deactivate ' . $plugin . ' and then go to the Wordfence options page and reenable Live Traffic there. Wordfence does work with ' . $plugin . ', however Live Traffic will be disabled and the Wordfence firewall will also count less hits per visitor because of the ' . $plugin . ' caching function. All other functions should work correctly.

'; + } + public static function menu_activity(){ + require 'menu_activity.php'; + } + public static function menu_scan(){ + require 'menu_scan.php'; + } + public static function status($level /* 1 has highest visibility */, $type /* info|error */, $msg){ + if($level > 3 && $level < 10 && (! self::isDebugOn())){ //level 10 and higher is for summary messages + return false; + } + if($type != 'info' && $type != 'error'){ error_log("Invalid status type: $type"); return; } + if(self::$printStatus){ + echo "STATUS: $level : $type : $msg\n"; + } else { + self::getLog()->addStatus($level, $type, $msg); + } + } + public static function profileUpdateAction($userID, $newDat = false){ + if(! $newDat){ return; } + if(wfConfig::get('other_pwStrengthOnUpdate')){ + $oldDat = get_userdata($userID); + if($newDat->user_pass != $oldDat->user_pass){ + $wf = new wfScanEngine(); + $wf->scanUserPassword($userID); + $wf->emailNewIssues(); + } + } + } + public static function replaceVersion($url) + { + global $wp_version; + static $version = null; + if ($version === null) { + $version = wp_hash($wp_version . WORDFENCE_VERSION); + } + return preg_replace("/([&;\?]ver)=[0-9\.]+/", "$1={$version}", $url); + } + public static function genFilter($gen, $type){ + if(wfConfig::get('other_hideWPVersion')){ + return ''; + } else { + return $gen; + } + } + public static function pushCommentSpamIP($m){ + if(wfUtils::isValidIP($m[1]) && strpos($m[1], '127.0.0') !== 0 ){ + self::$commentSpamItems[] = trim($m[1]); + } + } + public static function pushCommentSpamHost($m){ + self::$commentSpamItems[] = trim($m[1]); + } + public static function preCommentApprovedFilter($approved, $cData){ + if( $approved == 1 && (! is_user_logged_in()) && wfConfig::get('other_noAnonMemberComments') ){ + $user = get_user_by('email', trim($cData['comment_author_email'])); + if($user){ + wfConfig::inc('totalSpamStopped'); + return 0; //hold for moderation if the user is not signed in but used a members email + } + } + + if(($approved == 1 || $approved == 0) && wfConfig::get('other_scanComments')){ + $wf = new wfScanEngine(); + try { + if($wf->isBadComment($cData['comment_author'], $cData['comment_author_email'], $cData['comment_author_url'], $cData['comment_author_IP'], $cData['comment_content'])){ + wfConfig::inc('totalSpamStopped'); + return 'spam'; + } + } catch(Exception $e){ + //This will most likely be an API exception because we can't contact the API, so we ignore it and let the normal comment mechanisms run. + } + } + if(wfConfig::get('isPaid') && ($approved == 1 || $approved == 0) && wfConfig::get('advancedCommentScanning')){ + self::$commentSpamItems = array(); + preg_replace_callback('/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/', 'wordfence::pushCommentSpamIP', $cData['comment_content']); + $IPs = self::$commentSpamItems; + self::$commentSpamItems = array(); + preg_replace_callback('/https?:\/\/([a-zA-Z0-9\-]+\.[a-zA-Z0-9\-\.]+[a-zA-Z0-9])/i', 'wordfence::pushCommentSpamHost', $cData['comment_content']); + $hosts = self::$commentSpamItems; + self::$commentSpamItems = array(); + try { + $api = new wfAPI(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + $res = $api->call('advanced_comment_scan', array(), array( + 'author' => $cData['comment_author'], + 'email' => $cData['comment_author_email'], + 'URL' => $cData['comment_author_url'], + 'commentIP' => $cData['comment_author_IP'], + 'wfIP' => wfUtils::getIP(), + 'hosts' => (sizeof($hosts) > 0 ? implode(',', $hosts) : ''), + 'IPs' => (sizeof($IPs) > 0 ? implode(',', $IPs) : '') + )); + if(is_array($res) && isset($res['spam']) && $res['spam'] == 1){ + wfConfig::inc('totalSpamStopped'); + return 'spam'; + } + } catch(Exception $e){ + //API server is probably down + } + } + wfConfig::inc('totalCommentsFiltered'); + return $approved; + } + public static function getMyHomeURL(){ + return network_admin_url('admin.php?page=Wordfence', 'http'); + } + public static function getMyOptionsURL(){ + return network_admin_url('admin.php?page=WordfenceSecOpt', 'http'); + } + + public static function alert($subject, $alertMsg, $IP){ + wfConfig::inc('totalAlertsSent'); + $emails = wfConfig::getAlertEmails(); + if(sizeof($emails) < 1){ return; } + + $IPMsg = ""; + if($IP){ + $IPMsg = "User IP: $IP\n"; + $reverse = wfUtils::reverseLookup($IP); + if($reverse){ + $IPMsg .= "User hostname: " . $reverse . "\n"; + } + $userLoc = wfUtils::getIPGeo($IP); + if($userLoc){ + $IPMsg .= "User location: "; + if($userLoc['city']){ + $IPMsg .= $userLoc['city'] . ', '; + } + $IPMsg .= $userLoc['countryName'] . "\n"; + } + } + $content = wfUtils::tmpl('email_genericAlert.php', array( + 'isPaid' => wfConfig::get('isPaid'), + 'subject' => $subject, + 'blogName' => get_bloginfo('name', 'raw'), + 'adminURL' => get_admin_url(), + 'alertMsg' => $alertMsg, + 'IPMsg' => $IPMsg, + 'date' => wfUtils::localHumanDate(), + 'myHomeURL' => self::getMyHomeURL(), + 'myOptionsURL' => self::getMyOptionsURL() + )); + $shortSiteURL = preg_replace('/^https?:\/\//i', '', site_url()); + $subject = "[Wordfence Alert] $shortSiteURL " . $subject; + + $sendMax = wfConfig::get('alert_maxHourly', 0); + if($sendMax > 0){ + $sendArr = wfConfig::get_ser('alertFreqTrack', array()); + if(! is_array($sendArr)){ + $sendArr = array(); + } + $minuteTime = floor(time() / 60); + $totalSent = 0; + for($i = $minuteTime; $i > $minuteTime - 60; $i--){ + $totalSent += isset($sendArr[$i]) ? $sendArr[$i] : 0; + } + if($totalSent >= $sendMax){ + return; + } + $sendArr[$minuteTime] = isset($sendArr[$minuteTime]) ? $sendArr[$minuteTime] + 1 : 1; + wfConfig::set_ser('alertFreqTrack', $sendArr); + } + //Prevent duplicate emails within 1 hour: + $hash = md5(implode(',', $emails) . ':' . $subject . ':' . $alertMsg . ':' . $IP); //Hex + $lastHash = wfConfig::get('lastEmailHash', false); + if($lastHash){ + $lastHashDat = explode(':', $lastHash); //[time, hash] + if(time() - $lastHashDat[0] < 3600){ + if($lastHashDat[1] == $hash){ + return; //Don't send because this email is identical to the previous email which was sent within the last hour. + } + } + } + wfConfig::set('lastEmailHash', time() . ':' . $hash); + wp_mail(implode(',', $emails), $subject, $content); + } + public static function getLog(){ + if(! self::$wfLog){ + $wfLog = new wfLog(wfConfig::get('apiKey'), wfUtils::getWPVersion()); + self::$wfLog = $wfLog; + } + return self::$wfLog; + } + public static function statusPrep(){ + wfConfig::set_ser('wfStatusStartMsgs', array()); + wordfence::status(10, 'info', "SUM_PREP:Preparing a new scan."); + } + //In the following functions statusStartMsgs is serialized into the DB so it persists between forks + public static function statusStart($msg){ + $statusStartMsgs = wfConfig::get_ser('wfStatusStartMsgs', array()); + $statusStartMsgs[] = $msg; + wfConfig::set_ser('wfStatusStartMsgs', $statusStartMsgs); + self::status(10, 'info', 'SUM_START:' . $msg); + return sizeof($statusStartMsgs) - 1; + } + public static function statusEnd($idx, $haveIssues, $successFailed = false){ + $statusStartMsgs = wfConfig::get_ser('wfStatusStartMsgs', array()); + if($haveIssues){ + if($successFailed){ + self::status(10, 'info', 'SUM_ENDFAILED:' . $statusStartMsgs[$idx]); + } else { + self::status(10, 'info', 'SUM_ENDBAD:' . $statusStartMsgs[$idx]); + } + } else { + if($successFailed){ + self::status(10, 'info', 'SUM_ENDSUCCESS:' . $statusStartMsgs[$idx]); + } else { + self::status(10, 'info', 'SUM_ENDOK:' . $statusStartMsgs[$idx]); + } + } + $statusStartMsgs[$idx] = ''; + wfConfig::set_ser('wfStatusStartMsgs', $statusStartMsgs); + } + public static function statusEndErr(){ + $statusStartMsgs = wfConfig::get_ser('wfStatusStartMsgs', array()); + for($i = 0; $i < sizeof($statusStartMsgs); $i++){ + if(empty($statusStartMsgs[$i]) === false){ + self::status(10, 'info', 'SUM_ENDERR:' . $statusStartMsgs[$i]); + $statusStartMsgs[$i] = ''; + } + } + } + public static function statusDisabled($msg){ + self::status(10, 'info', "SUM_DISABLED:" . $msg); + } + public static function statusPaidOnly($msg){ + self::status(10, 'info', "SUM_PAIDONLY:" . $msg); + } + public static function wfSchemaExists(){ + $db = new wfDB(); + global $wpdb; $prefix = $wpdb->base_prefix; + $exists = $db->querySingle("show tables like '$prefix"."wfConfig'"); + return $exists ? true : false; + } + public static function isDebugOn(){ + if(is_null(self::$debugOn)){ + if(wfConfig::get('debugOn')){ + self::$debugOn = true; + } else { + self::$debugOn = false; + } + } + return self::$debugOn; + } + //PUBLIC API + public static function doNotCache(){ //Call this to prevent Wordfence from caching the current page. + wfCache::doNotCache(); + return true; + } + public static function whitelistIP($IP){ //IP as a string in dotted quad notation e.g. '10.11.12.13' + $IP = trim($IP); + $user_range = new wfUserIPRange($IP); + if (!$user_range->isValidRange()) { + throw new Exception("The IP you provided must be in dotted quad notation or use ranges with square brackets. e.g. 10.11.12.13 or 10.11.12.[1-50]"); + } + $whites = wfConfig::get('whitelisted', ''); + $arr = explode(',', $whites); + $arr2 = array(); + foreach($arr as $e){ + if($e == $IP){ + return false; + } + $arr2[] = trim($e); + } + $arr2[] = $IP; + wfConfig::set('whitelisted', implode(',', $arr2)); + return true; + } + + public static function ajax_email_summary_email_address_debug_callback() { + $email = !empty($_REQUEST['email']) ? $_REQUEST['email'] : null; + $report = new wfActivityReport(); + return $report->sendReportViaEmail($email) ? + array('ok' => 1, 'result' => 'Test email sent successfully') : + array('err' => "Test email failed to send."); + } + + public static function addDashboardWidget() { + if (wfUtils::isAdmin() && (is_network_admin() || !is_multisite()) && wfConfig::get('email_summary_dashboard_widget_enabled')) { + wp_enqueue_style('wordfence-activity-report-widget', wfUtils::getBaseURL() . 'css/activity-report-widget.css', '', WORDFENCE_VERSION); + $report_date_range = 'week'; + switch (wfConfig::get('email_summary_interval')) { + case 'biweekly': + $report_date_range = '2 weeks'; + break; + + case 'monthly': + $report_date_range = 'month'; + break; + } + wp_add_dashboard_widget( + 'wordfence_activity_report_widget', + 'Wordfence activity in the past ' . $report_date_range, + array('wfActivityReport', 'outputDashboardWidget') + ); + } + } + + /** + * @return bool + */ + public static function hasGDLimitLoginsMUPlugin() { + return defined('GD_SYSTEM_PLUGIN_DIR') && file_exists(GD_SYSTEM_PLUGIN_DIR . 'limit-login-attempts/limit-login-attempts.php') + && defined('LIMIT_LOGIN_DIRECT_ADDR'); + } + + /** + * @param string $content + * @return string + */ + public static function fixGDLimitLoginsErrors($content) { + if (self::$authError) { + $content = str_replace(__('ERROR: Incorrect username or password.', 'limit-login-attempts') . "
\n", '', $content); + $content .= '
' . self::$authError->get_error_message(); + } + return $content; + } + + /** + * Permanently blocks all temporarily locked out IPs. + */ + public static function ajax_permanentlyBlockAllIPs_callback() { + /** @var wpdb $wpdb */ + global $wpdb; + $IPs = array(); + $type = !empty($_REQUEST['type']) ? $_REQUEST['type'] : null; + $reason = !empty($_REQUEST['reason']) ? $_REQUEST['reason'] : 'Manual block by administrator'; + switch ($type) { + case 'throttled': + $IPs = $wpdb->get_col('SELECT DISTINCT IP FROM ' . $wpdb->base_prefix . 'wfThrottleLog'); + break; + case 'lockedOut': + $lockoutSecs = wfConfig::get('loginSec_lockoutMins') * 60; + $IPs = $wpdb->get_col($wpdb->prepare('SELECT DISTINCT IP FROM ' . $wpdb->base_prefix . 'wfLockedOut + WHERE blockedTime + %d > UNIX_TIMESTAMP()', $lockoutSecs)); + break; + case 'blocked': + $blockedTime = wfConfig::get('blockedTime'); + $IPs = $wpdb->get_col($wpdb->prepare('SELECT DISTINCT IP FROM ' . $wpdb->base_prefix . 'wfBlocks + WHERE wfsn = 0 + AND permanent = 0 + AND blockedTime + %d > UNIX_TIMESTAMP()', $blockedTime)); + break; + } + if ($IPs && is_array($IPs)) { + foreach ($IPs as $IP) { + self::getLog()->blockIP(wfUtils::inet_ntop($IP), $reason, false, true); + } + } + switch ($type) { + case 'lockedOut': + if ($IPs) { + foreach ($IPs as &$IP) { + $IP = $wpdb->prepare('%s', $IP); + } + $wpdb->query('DELETE FROM ' . $wpdb->base_prefix . 'wfLockedOut WHERE IP IN ('. join(', ', $IPs).')'); + } + break; + } + return array('ok' => 1); + } + + + /** + * Modify the query to prevent username enumeration. + * + * @param array $query_vars + * @return array + */ + public static function preventAuthorNScans($query_vars) { + if (wfConfig::get('loginSec_disableAuthorScan') && !is_admin() && + !empty($query_vars['author']) && is_numeric(preg_replace('/[^0-9]/', '', $query_vars['author'])) && + ( + (isset($_GET['author']) && is_numeric(preg_replace('/[^0-9]/', '', $_GET['author']))) || + (isset($_POST['author']) && is_numeric(preg_replace('/[^0-9]/', '', $_POST['author']))) + ) + ) { + $query_vars['author'] = -1; + } + return $query_vars; + } + + + /** + * @param WP_Upgrader $updater + * @param array $hook_extra + */ + public static function hideReadme($updater, $hook_extra = null) { + if (wfConfig::get('other_hideWPVersion')) { + wfUtils::hideReadme(); + } + } +} +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceConstants.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceConstants.php index b046a0e2..1a750adc 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceConstants.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceConstants.php @@ -1,3 +1,18 @@ +<<<<<<< .mine + +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceHash.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceHash.php index 3346b166..13f0f5ae 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceHash.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceHash.php @@ -1,3 +1,392 @@ +<<<<<<< .mine +striplen = $striplen; + $this->path = $path; + $this->only = $only; + + $this->startTime = microtime(true); + + if(wfConfig::get('scansEnabled_core')){ + $this->coreEnabled = true; + } + if(wfConfig::get('scansEnabled_plugins')){ + $this->pluginsEnabled = true; + } + if(wfConfig::get('scansEnabled_themes')){ + $this->themesEnabled = true; + } + if(wfConfig::get('scansEnabled_malware')){ + $this->malwareEnabled = true; + } + $this->db = new wfDB(); + + //Doing a delete for now. Later we can optimize this to only scan modified files. + //$this->db->queryWrite("update " . $this->db->prefix() . "wfFileMods set oldMD5 = newMD5"); + $this->db->queryWrite("delete from " . $this->db->prefix() . "wfFileMods"); + $fetchCoreHashesStatus = wordfence::statusStart("Fetching core, theme and plugin file signatures from Wordfence"); + $dataArr = $engine->api->binCall('get_known_files', json_encode(array( + 'plugins' => $plugins, + 'themes' => $themes + )) ); + if($dataArr['code'] != 200){ + wordfence::statusEndErr(); + throw new Exception("Got error response from Wordfence servers: " . $dataArr['code']); + } + $this->knownFiles = @json_decode($dataArr['data'], true); + if(! is_array($this->knownFiles)){ + wordfence::statusEndErr(); + throw new Exception("Invalid response from Wordfence servers."); + } + wordfence::statusEnd($fetchCoreHashesStatus, false, true); + if($this->malwareEnabled){ + $malwarePrefixStatus = wordfence::statusStart("Fetching list of known malware files from Wordfence"); + $malwareData = $engine->api->getStaticURL('/malwarePrefixes.bin'); + if(! $malwareData){ + wordfence::statusEndErr(); + throw new Exception("Could not fetch malware signatures from Wordfence servers."); + } + if(strlen($malwareData) % 4 != 0){ + wordfence::statusEndErr(); + throw new Exception("Malware data received from Wordfence servers was not valid."); + } + $this->malwareData = array(); + for($i = 0; $i < strlen($malwareData); $i += 4){ + $this->malwareData[substr($malwareData, $i, 4)] = '1'; + } + wordfence::statusEnd($malwarePrefixStatus, false, true); + } + + if($this->path[strlen($this->path) - 1] != '/'){ + $this->path .= '/'; + } + if(! is_readable($path)){ + throw new Exception("Could not read directory " . $this->path . " to do scan."); + } + $this->haveIssues = array( + 'core' => false, + 'themes' => false, + 'plugins' => false, + 'malware' => false + ); + if($this->coreEnabled){ $this->status['core'] = wordfence::statusStart("Comparing core WordPress files against originals in repository"); } else { wordfence::statusDisabled("Skipping core scan"); } + if($this->themesEnabled){ $this->status['themes'] = wordfence::statusStart("Comparing open source themes against WordPress.org originals"); } else { wordfence::statusDisabled("Skipping theme scan"); } + if($this->pluginsEnabled){ $this->status['plugins'] = wordfence::statusStart("Comparing plugins against WordPress.org originals"); } else { wordfence::statusDisabled("Skipping plugin scan"); } + if($this->malwareEnabled){ $this->status['malware'] = wordfence::statusStart("Scanning for known malware files"); } else { wordfence::statusDisabled("Skipping malware scan"); } + } + public function __sleep(){ + return array('striplen', 'totalFiles', 'totalDirs', 'totalData', 'linesOfPHP', 'linesOfJCH', 'stoppedOnFile', 'coreEnabled', 'pluginsEnabled', 'themesEnabled', 'malwareEnabled', 'knownFiles', 'malwareData', 'haveIssues', 'status', 'possibleMalware', 'path', 'only', 'totalForks'); + } + public function __wakeup(){ + $this->db = new wfDB(); + $this->startTime = microtime(true); + $this->totalForks++; + } + public function run($engine){ //base path and 'only' is a list of files and dirs in the bast that are the only ones that should be processed. Everything else in base is ignored. If only is empty then everything is processed. + if($this->totalForks > 1000){ + throw new Exception("Wordfence file scanner detected a possible infinite loop. Exiting on file: " . $this->stoppedOnFile); + } + $this->engine = $engine; + $files = scandir($this->path); + foreach($files as $file){ + if($file == '.' || $file == '..'){ continue; } + if(sizeof($this->only) > 0 && (! in_array($file, $this->only))){ + continue; + } + $file = $this->path . $file; + wordfence::status(4, 'info', "Hashing item in base dir: $file"); + $this->_dirHash($file); + } + wordfence::status(2, 'info', "Analyzed " . $this->totalFiles . " files containing " . wfUtils::formatBytes($this->totalData) . " of data."); + if($this->coreEnabled){ wordfence::statusEnd($this->status['core'], $this->haveIssues['core']); } + if($this->themesEnabled){ wordfence::statusEnd($this->status['themes'], $this->haveIssues['themes']); } + if($this->pluginsEnabled){ wordfence::statusEnd($this->status['plugins'], $this->haveIssues['plugins']); } + if(sizeof($this->possibleMalware) > 0){ + $malwareResp = $engine->api->binCall('check_possible_malware', json_encode($this->possibleMalware)); + if($malwareResp['code'] != 200){ + wordfence::statusEndErr(); + throw new Exception("Invalid response from Wordfence API during check_possible_malware"); + } + $malwareList = json_decode($malwareResp['data'], true); + if(is_array($malwareList) && sizeof($malwareList) > 0){ + for($i = 0; $i < sizeof($malwareList); $i++){ + $file = $malwareList[$i][0]; + $md5 = $malwareList[$i][1]; + $name = $malwareList[$i][2]; + $this->haveIssues['malware'] = true; + $this->engine->addIssue( + 'file', + 1, + $this->path . $file, + $md5, + 'This file is suspected malware: ' . $file, + "This file's signature matches a known malware file. The title of the malware is '" . $name . "'. Immediately inspect this file using the 'View' option below and consider deleting it from your server.", + array( + 'file' => $file, + 'cType' => 'unknown', + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true + ) + ); + } + } + } + if($this->malwareEnabled){ wordfence::statusEnd($this->status['malware'], $this->haveIssues['malware']); } + } + private function _dirHash($path){ + if(substr($path, -3, 3) == '/..' || substr($path, -2, 2) == '/.'){ + return; + } + if(! is_readable($path)){ return; } //Applies to files and dirs + if(is_dir($path)){ + $this->totalDirs++; + if($path[strlen($path) - 1] != '/'){ + $path .= '/'; + } + $cont = scandir($path); + for($i = 0; $i < sizeof($cont); $i++){ + if($cont[$i] == '.' || $cont[$i] == '..'){ continue; } + $file = $path . $cont[$i]; + if(is_file($file)){ + $this->processFile($file); + } else if(is_dir($file)) { + $this->_dirHash($file); + } + } + } else { + if(is_file($path)){ + $this->processFile($path); + } + } + } + private function processFile($realFile){ + $file = substr($realFile, $this->striplen); + if( (! $this->stoppedOnFile) && microtime(true) - $this->startTime > $this->engine->maxExecTime){ //max X seconds but don't allow fork if we're looking for the file we stopped on. Search mode is VERY fast. + $this->stoppedOnFile = $file; + wordfence::status(4, 'info', "Calling fork() from wordfenceHash::processFile with maxExecTime: " . $this->engine->maxExecTime); + $this->engine->fork(); + //exits + } + + $exclude = WordfenceScanner::getExcludeFilePattern(); + if ($exclude && preg_match($exclude, $realFile)) { + return; + } + + + //Put this after the fork, that way we will at least scan one more file after we fork if it takes us more than 10 seconds to search for the stoppedOnFile + if($this->stoppedOnFile && $file != $this->stoppedOnFile){ + return; + } else if($this->stoppedOnFile && $file == $this->stoppedOnFile){ + $this->stoppedOnFile = false; //Continue scanning + } + + if(wfUtils::fileTooBig($realFile)){ + wordfence::status(4, 'info', "Skipping file larger than max size: $realFile"); + return; + } + if (function_exists('memory_get_usage')) { + wordfence::status(4, 'info', "Scanning: $realFile (Mem:" . sprintf('%.1f', memory_get_usage(true) / (1024 * 1024)) . "M)"); + } else { + wordfence::status(4, 'info', "Scanning: $realFile"); + } + wfUtils::beginProcessingFile($file); + $wfHash = self::wfHash($realFile); + if($wfHash){ + $md5 = strtoupper($wfHash[0]); + $shac = strtoupper($wfHash[1]); + $knownFile = 0; + if($this->malwareEnabled && $this->isMalwarePrefix($md5)){ + $this->possibleMalware[] = array($file, $md5); + } + if(isset($this->knownFiles['core'][$file])){ + if(strtoupper($this->knownFiles['core'][$file]) == $shac){ + $knownFile = 1; + } else { + if($this->coreEnabled){ + $localFile = ABSPATH . '/' . preg_replace('/^[\.\/]+/', '', $file); + $fileContents = @file_get_contents($localFile); + if($fileContents && (! preg_match('/<\?' . 'php[\r\n\s\t]*\/\/[\r\n\s\t]*Silence is golden\.[\r\n\s\t]*(?:\?>)?[\r\n\s\t]*$/s', $fileContents))){ //isSafeFile($shac)){ + + $this->haveIssues['core'] = true; + $this->engine->addIssue( + 'file', + 1, + 'coreModified' . $file . $md5, + 'coreModified' . $file, + 'WordPress core file modified: ' . $file, + "This WordPress core file has been modified and differs from the original file distributed with this version of WordPress.", + array( + 'file' => $file, + 'cType' => 'core', + 'canDiff' => true, + 'canFix' => true, + 'canDelete' => false + ) + ); + } + } + } + } + } else if(isset($this->knownFiles['plugins'][$file])){ + if(in_array($shac, $this->knownFiles['plugins'][$file])){ + $knownFile = 1; + } else { + if($this->pluginsEnabled){ + if(! $this->isSafeFile($shac)){ + $itemName = $this->knownFiles['plugins'][$file][0]; + $itemVersion = $this->knownFiles['plugins'][$file][1]; + $cKey = $this->knownFiles['plugins'][$file][2]; + $this->haveIssues['plugins'] = true; + $this->engine->addIssue( + 'file', + 2, + 'modifiedplugin' . $file . $md5, + 'modifiedplugin' . $file, + 'Modified plugin file: ' . $file, + "This file belongs to plugin \"$itemName\" version \"$itemVersion\" and has been modified from the file that is distributed by WordPress.org for this version. Please use the link to see how the file has changed. If you have modified this file yourself, you can safely ignore this warning. If you see a lot of changed files in a plugin that have been made by the author, then try uninstalling and reinstalling the plugin to force an upgrade. Doing this is a workaround for plugin authors who don't manage their code correctly. [See our FAQ on www.wordfence.com for more info]", + array( + 'file' => $file, + 'cType' => 'plugin', + 'canDiff' => true, + 'canFix' => true, + 'canDelete' => false, + 'cName' => $itemName, + 'cVersion' => $itemVersion, + 'cKey' => $cKey + ) + ); + } + } + + } + } else if(isset($this->knownFiles['themes'][$file])){ + if(in_array($shac, $this->knownFiles['themes'][$file])){ + $knownFile = 1; + } else { + if($this->themesEnabled){ + if(! $this->isSafeFile($shac)){ + $itemName = $this->knownFiles['themes'][$file][0]; + $itemVersion = $this->knownFiles['themes'][$file][1]; + $cKey = $this->knownFiles['themes'][$file][2]; + $this->haveIssues['themes'] = true; + $this->engine->addIssue( + 'file', + 2, + 'modifiedtheme' . $file . $md5, + 'modifiedtheme' . $file, + 'Modified theme file: ' . $file, + "This file belongs to theme \"$itemName\" version \"$itemVersion\" and has been modified from the original distribution. It is common for site owners to modify their theme files, so if you have modified this file yourself you can safely ignore this warning.", + array( + 'file' => $file, + 'cType' => 'theme', + 'canDiff' => true, + 'canFix' => true, + 'canDelete' => false, + 'cName' => $itemName, + 'cVersion' => $itemVersion, + 'cKey' => $cKey + ) + ); + } + } + + } + } + // knownFile means that the file is both part of core or a known plugin or theme AND that we recognize the file's hash. + // we could split this into files who's path we recognize and file's who's path we recognize AND who have a valid sig. + // But because we want to scan files who's sig we don't recognize, regardless of known path or not, we only need one "knownFile" field. + $this->db->queryWrite("insert into " . $this->db->prefix() . "wfFileMods (filename, filenameMD5, knownFile, oldMD5, newMD5) values ('%s', unhex(md5('%s')), %d, '', unhex('%s')) ON DUPLICATE KEY UPDATE newMD5=unhex('%s'), knownFile=%d", $file, $file, $knownFile, $md5, $md5, $knownFile); + + //Now that we know we can open the file, lets update stats + if(preg_match('/\.(?:js|html|htm|css)$/i', $realFile)){ + $this->linesOfJCH += sizeof(file($realFile)); + } else if(preg_match('/\.php$/i', $realFile)){ + $this->linesOfPHP += sizeof(file($realFile)); + } + $this->totalFiles++; + $this->totalData += filesize($realFile); //We already checked if file overflows int in the fileTooBig routine above + if($this->totalFiles % 100 === 0){ + wordfence::status(2, 'info', "Analyzed " . $this->totalFiles . " files containing " . wfUtils::formatBytes($this->totalData) . " of data so far"); + } + } else { + //wordfence::status(2, 'error', "Could not gen hash for file (probably because we don't have permission to access the file): $realFile"); + } + wfUtils::endProcessingFile(); + } + public static function wfHash($file){ + wfUtils::errorsOff(); + $md5 = @md5_file($file, false); + wfUtils::errorsOn(); + + if(! $md5){ return false; } + $fp = @fopen($file, "rb"); + if(! $fp){ + return false; + } + $ctx = hash_init('sha256'); + while (!feof($fp)) { + hash_update($ctx, str_replace( array("\n","\r","\t"," ") ,"",fread($fp, 65536))); + } + $shac = hash_final($ctx, false); + return array($md5, $shac); + } + private function isMalwarePrefix($hexMD5){ + $binPrefix = pack("H*", substr($hexMD5, 0, 8)); + if(isset($this->malwareData[$binPrefix])){ + return true; + } + return false; + } + private function isSafeFile($shac){ + $result = $this->engine->api->call('is_safe_file', array(), array('shac' => strtoupper($shac))); + if(isset($result['isSafe']) && $result['isSafe'] == 1){ + return true; + } + return false; + } +} +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceScanner.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceScanner.php index 4efd8fb2..280da4df 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceScanner.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/lib/wordfenceScanner.php @@ -1,3 +1,410 @@ +<<<<<<< .mine +apiKey = $apiKey; + $this->wordpressVersion = $wordpressVersion; + $this->api = new wfAPI($this->apiKey, $this->wordpressVersion); + if($path[strlen($path) - 1] != '/'){ + $path .= '/'; + } + $this->path = $path; + + + $this->results = array(); + $this->errorMsg = false; + //First extract hosts or IP's and their URL's into $this->hostsFound and URL's into $this->urlsFound + $this->urlHoover = new wordfenceURLHoover($this->apiKey, $this->wordpressVersion); + $this->setupSigs(); + } + + /** + * @todo add caching to this. + * @throws Exception + */ + protected function setupSigs() { + $this->api = new wfAPI($this->apiKey, $this->wordpressVersion); + $sigData = $this->api->call('get_patterns', array(), array()); + //For testing, comment out above two, include server sig file and get local sigs + //$sigData = wfSigs::getSigData(); + if(! (is_array($sigData) && isset($sigData['sigPattern'])) ){ + throw new Exception("Wordfence could not get the attack signature patterns from the scanning server."); + } + $this->patterns = $sigData; + } + + /** + * Return regular expression to exclude files or false if + * there is no pattern + * + * @return string|boolean + */ + public static function getExcludeFilePattern() { + if (self::$excludePattern !== NULL) { + return self::$excludePattern; + } + if(wfConfig::get('scan_exclude', false)){ + $exParts = explode("\n", wfUtils::cleanupOneEntryPerLine(wfConfig::get('scan_exclude'))); + foreach($exParts as &$exPart){ + $exPart = preg_quote(trim($exPart), '/'); + $exPart = preg_replace('/\\\\\*/', '.*', $exPart); + } + + self::$excludePattern = '/^(?:' . implode('|', array_filter($exParts)) . ')$/i'; + self::$excludePattern = '/(?:' . implode('|', array_filter($exParts)) . ')$/i'; + } else { + self::$excludePattern = false; + } + + return self::$excludePattern; + } + + public function scan($forkObj){ + if(! $this->startTime){ + $this->startTime = microtime(true); + } + if(! $this->lastStatusTime){ + $this->lastStatusTime = microtime(true); + } + $db = new wfDB(); + $lastCount = 'whatever'; + $excludePattern = self::getExcludeFilePattern(); + while(true){ + $thisCount = $db->querySingle("select count(*) from " . $db->prefix() . "wfFileMods where oldMD5 != newMD5 and knownFile=0"); + if($thisCount == $lastCount){ + //count should always be decreasing. If not, we're in an infinite loop so lets catch it early + break; + } + $lastCount = $thisCount; + $res1 = $db->querySelect("select filename, filenameMD5, hex(newMD5) as newMD5 from " . $db->prefix() . "wfFileMods where oldMD5 != newMD5 and knownFile=0 limit 500"); + if(sizeof($res1) < 1){ + break; + } + foreach($res1 as $rec1){ + $db->queryWrite("update " . $db->prefix() . "wfFileMods set oldMD5 = newMD5 where filenameMD5='%s'", $rec1['filenameMD5']); //A way to mark as scanned so that if we come back from a sleep we don't rescan this one. + $file = $rec1['filename']; + if($excludePattern && preg_match($excludePattern, $file)){ + continue; + } + $fileSum = $rec1['newMD5']; + + if(! file_exists($this->path . $file)){ + continue; + } + $fileExt = ''; + if(preg_match('/\.([a-zA-Z\d\-]{1,7})$/', $file, $matches)){ + $fileExt = strtolower($matches[1]); + } + $isPHP = false; + if(preg_match('/\.(?:php(?:\d+)?|phtml)(\.|$)/i', $file)) { + $isPHP = true; + } + $dontScanForURLs = false; + if( (! wfConfig::get('scansEnabled_highSense')) && preg_match('/^(?:\.htaccess|wp\-config\.php)$/', $file)) { + $dontScanForURLs = true; + } + if(! $isPHP && preg_match('/^(?:jpg|jpeg|mp3|avi|m4v|gif|png|sql|tbz2?|bz2?|xz|zip|tgz|gz|tar|log|err\d+)$/', $fileExt) && (! wfConfig::get('scansEnabled_scanImages')) ){ + continue; + } + if( (! wfConfig::get('scansEnabled_highSense')) && strtolower($fileExt) == 'sql'){ // + continue; + } + if(wfUtils::fileTooBig($this->path . $file)){ //We can't use filesize on 32 bit systems for files > 2 gigs + //We should not need this check because files > 2 gigs are not hashed and therefore won't be received back as unknowns from the API server + //But we do it anyway to be safe. + wordfence::status(2, 'error', "Encountered file that is too large: $file - Skipping."); + continue; + } + wfUtils::beginProcessingFile($file); + + $fsize = filesize($this->path . $file); //Checked if too big above + if($fsize > 1000000){ + $fsize = sprintf('%.2f', ($fsize / 1000000)) . "M"; + } else { + $fsize = $fsize . "B"; + } + if (function_exists('memory_get_usage')) { + wordfence::status(4, 'info', "Scanning contents: $file (Size:$fsize Mem:" . sprintf('%.1f', memory_get_usage(true) / (1024 * 1024)) . "M)"); + } else { + wordfence::status(4, 'info', "Scanning contents: $file (Size: $fsize)"); + } + + $stime = microtime(true); + $fh = @fopen($this->path . $file, 'r'); + if(! $fh){ + continue; + } + $totalRead = 0; + while(! feof($fh)){ + $data = fread($fh, 1 * 1024 * 1024); //read 1 megs max per chunk + $totalRead += strlen($data); + if($totalRead < 1){ + break; + } + if($isPHP || wfConfig::get('scansEnabled_scanImages') ){ + if(strpos($data, '$allowed'.'Sites') !== false && strpos($data, "define ('VER"."SION', '1.") !== false && strpos($data, "TimThum"."b script created by") !== false){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => $fileSum, + 'shortMsg' => "File is an old version of TimThumb which is vulnerable.", + 'longMsg' => "This file appears to be an old version of the TimThumb script which makes your system vulnerable to attackers. Please upgrade the theme or plugin that uses this or remove it.", + 'data' => array( + 'file' => $file, + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true + ) + )); + break; + } + } else if(strpos($file, 'lib/wordfenceScanner.php') === false && preg_match($this->patterns['sigPattern'], $data, $matches)){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => $fileSum, + 'shortMsg' => "File appears to be malicious: " . $file, + 'longMsg' => "This file appears to be installed by a hacker to perform malicious activity. If you know about this file you can choose to ignore it to exclude it from future scans. The text we found in this file that matches a known malicious file is: \"" . $matches[1] . "\".", + 'data' => array( + 'file' => $file, + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true + ) + )); + break; + } + + } + if(preg_match($this->patterns['pat2'], $data)){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => $fileSum, + 'shortMsg' => "This file may contain malicious executable code: " . $this->path . $file, + 'longMsg' => "This file is a PHP executable file and contains an " . $this->patterns['word1'] . " function and " . $this->patterns['word2'] . " decoding function on the same line. This is a common technique used by hackers to hide and execute code. If you know about this file you can choose to ignore it to exclude it from future scans.", + 'data' => array( + 'file' => $file, + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true + ) + )); + break; + } + } + if(wfConfig::get('scansEnabled_highSense')){ + $badStringFound = false; + if(strpos($data, $this->patterns['badstrings'][0]) !== false){ + for($i = 1; $i < sizeof($this->patterns['badstrings']); $i++){ + if(strpos($data, $this->patterns['badstrings'][$i]) !== false){ + $badStringFound = $this->patterns['badstrings'][$i]; + break; + } + } + } + if($badStringFound){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => $fileSum, + 'shortMsg' => "This file may contain malicious executable code: " . $this->path . $file, + 'longMsg' => "This file is a PHP executable file and contains the word 'eval' (without quotes) and the word '" . $badStringFound . "' (without quotes). The eval() function along with an encoding function like the one mentioned are commonly used by hackers to hide their code. If you know about this file you can choose to ignore it to exclude it from future scans.", + 'data' => array( + 'file' => $file, + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true + ) + )); + break; + } + } + } + if(! $dontScanForURLs){ + $this->urlHoover->hoover($file, $data); + } + } else { + if(! $dontScanForURLs){ + $this->urlHoover->hoover($file, $data); + } + } + + if($totalRead > 2 * 1024 * 1024){ + break; + } + } + fclose($fh); + $this->totalFilesScanned++; + if(microtime(true) - $this->lastStatusTime > 1){ + $this->lastStatusTime = microtime(true); + $this->writeScanningStatus(); + } + $forkObj->forkIfNeeded(); + } + } + $this->writeScanningStatus(); + wordfence::status(2, 'info', "Asking Wordfence to check URL's against malware list."); + $hooverResults = $this->urlHoover->getBaddies(); + if($this->urlHoover->errorMsg){ + $this->errorMsg = $this->urlHoover->errorMsg; + return false; + } + $this->urlHoover->cleanup(); + foreach($hooverResults as $file => $hresults){ + foreach($hresults as $result){ + if(preg_match('/wfBrowscapCache\.php$/', $file)){ + continue; + } + if($result['badList'] == 'goog-malware-shavar'){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => md5_file($this->path . $file), + 'shortMsg' => "File contains suspected malware URL: " . $this->path . $file, + 'longMsg' => "This file contains a suspected malware URL listed on Google's list of malware sites. Wordfence decodes " . $this->patterns['word3'] . " when scanning files so the URL may not be visible if you view this file. The URL is: " . $result['URL'] . " - More info available at Google Safe Browsing diagnostic page.", + 'data' => array( + 'file' => $file, + 'badURL' => $result['URL'], + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true, + 'gsb' => 'goog-malware-shavar' + ) + )); + } + } else if($result['badList'] == 'googpub-phish-shavar'){ + if(! $this->isSafeFile($this->path . $file)){ + $this->addResult(array( + 'type' => 'file', + 'severity' => 1, + 'ignoreP' => $this->path . $file, + 'ignoreC' => md5_file($this->path . $file), + 'shortMsg' => "File contains suspected phishing URL: " . $this->path . $file, + 'longMsg' => "This file contains a URL that is a suspected phishing site that is currently listed on Google's list of known phishing sites. The URL is: " . $result['URL'], + 'data' => array( + 'file' => $file, + 'badURL' => $result['URL'], + 'canDiff' => false, + 'canFix' => false, + 'canDelete' => true, + 'gsb' => 'googpub-phish-shavar' + ) + )); + } + } + } + } + wfUtils::endProcessingFile(); + + return $this->results; + } + + protected function writeScanningStatus() { + wordfence::status(2, 'info', "Scanned contents of " . $this->totalFilesScanned . " additional files at " . sprintf('%.2f', ($this->totalFilesScanned / (microtime(true) - $this->startTime))) . " per second"); + } + + protected function addResult($result) { + for ($i = 0; $i < sizeof($this->results); $i++) { + if ($this->results[$i]['type'] == 'file' && $this->results[$i]['data']['file'] == $result['data']['file']) { + if ($this->results[$i]['severity'] > $result['severity']) { + $this->results[$i] = $result; //Overwrite with more severe results + } + return; + } + } + //We don't have a results for this file so append + $this->results[] = $result; + } + private function isSafeFile($file){ + if(! $this->api){ + $this->api = new wfAPI($this->apiKey, $this->wordpressVersion); + } + + $wfHash = wordfenceHash::wfHash($file); + $result = $this->api->call('is_safe_file', array(), array('shac' => strtoupper($wfHash[1]))); + if(isset($result['isSafe']) && $result['isSafe'] == 1){ + return true; + } + return false; + } +} + +class wordfenceDBScanner extends wordfenceScanner { + + // protected $patterns = '/QGV4dHJhY3QoJF9SRVFVRVNUKTs=/i'; + + public function scan($forkObj) { + /** @var wpdb */ + global $wpdb; + if (!$this->startTime) { + $this->startTime = microtime(true); + } + if (!$this->lastStatusTime) { + $this->lastStatusTime = microtime(true); + } + $db = new wfDB(); + + $blogsToScan = wfScanEngine::getBlogsToScan('options'); + foreach ($blogsToScan as $blog) { + // Check the options table for known shells + $results = $db->querySelect("SELECT * FROM {$blog['table']} WHERE option_value REGEXP %s", trim(rtrim($this->patterns['dbSigPattern'], 'imsxeADSUXJu'), '/')); + + foreach ($results as $row) { + preg_match($this->patterns['dbSigPattern'], $row['option_value'], $matches); + $this->addResult(array( + 'type' => 'database', + 'severity' => 1, + 'ignoreP' => "{$db->prefix()}option.{$row['option_name']}", + 'ignoreC' => md5($row['option_value']), + 'shortMsg' => "This option may contain malicious executable code: {$row['option_name']}", + 'longMsg' => "This option appears to be inserted by a hacker to perform malicious activity. If you know about this option you can choose to ignore it to exclude it from future scans. The text we found in this file that matches a known malicious file is: \"{$matches[1]}\".", + 'data' => array( + 'option_name' => $row['option_name'], + 'site_id' => $blog['blog_id'], + 'canDelete' => true, + ), + )); + } + } + + return $this->results; + } +} + +?> +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/readme.txt b/pavillonmadeleine.fr/wp-content/plugins/wordfence/readme.txt index 19ac6532..e14c6fed 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/readme.txt +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/readme.txt @@ -1,3 +1,1297 @@ +<<<<<<< .mine +=== Wordfence Security === +Contributors: mmaunder +Tags: wordpress, security, performance, speed, caching, cache, caching plugin, wordpress cache, wordpress caching, wordpress security, security plugin, secure, anti-virus, malware, firewall, antivirus, virus, google safe browsing, phishing, scrapers, hacking, wordfence, securty, secrity, secure, two factor, cellphone sign-in, cellphone signin, cellphone, twofactor, security, secure, htaccess, login, log, users, login alerts, lock, chmod, maintenance, plugin, private, privacy, protection, permissions, 503, base64, injection, code, encode, script, attack, hack, hackers, block, blocked, prevent, prevention, RFI, XSS, CRLF, CSRF, SQL Injection, vulnerability, website security, WordPress security, security log, logging, HTTP log, error log, login security, personal security, infrastructure security, firewall security, front-end security, web server security, proxy security, reverse proxy security, secure website, secure login, two factor security, maximum login security, heartbleed, heart bleed, heartbleed vulnerability, openssl vulnerability, nginx, litespeed, php5-fpm, woocommerce support, woocommerce caching, IPv6, IP version 6 +Requires at least: 3.9 +Tested up to: 4.3.1 +Stable tag: 6.0.21 + +The Wordfence WordPress security plugin provides free enterprise-class WordPress security, protecting your website from hacks and malware. +== Description == += THE MOST DOWNLOADED WORDPRESS SECURITY PLUGIN = + +Wordfence starts by checking if your site is already infected. We do a deep server-side scan of your source code comparing it to the Official WordPress repository for core, themes and plugins. Then Wordfence secures your site and makes it up to 50 times faster. + +Wordfence Security is 100% free and open source. We also offer a Premium API key that gives you Premium Support, Country Blocking, Scheduled Scans, Password Auditing and we even check if your website IP address is being used to Spamvertize. [Click here to sign-up for Wordfence Premium now](http://www.wordfence.com/?utm_source=repo&utm_medium=web&utm_campaign=pluginDescCTA) or simply install Wordfence free and start protecting your website. + +You can find our official documentation at [docs.wordfence.com](http://docs.wordfence.com/?utm_source=repo&utm_medium=web&utm_campaign=pluginDesc) and our Frequently Asked Questions on our support portal at [support.wordfence.com](https://support.wordfence.com/solution/categories/1000023037/folders/1000035543?utm_source=repo&utm_medium=web&utm_campaign=pluginDesc). We are also active in our community support forums on [wordpress.org](https://wordpress.org/support/plugin/wordfence) if you are one of our free users. Our Premium Support Ticket System is at [support.wordfence.com](https://support.wordfence.com/?utm_source=repo&utm_medium=web&utm_campaign=pluginDesc). + +This is a brief introductory video for Wordfence: + +[vimeo http://vimeo.com/134150724] + +Wordfence Security is now Multi-Site compatible and includes Cellphone Sign-in which permanently secures your website from brute force hacks. + += WORDFENCE WORDPRESS SECURITY FEATURES = + += Blocking Features = +* Real-time blocking of known attackers. If another site using Wordfence is attacked and blocks the attacker, your site is automatically protected. +* Block entire malicious networks. Includes advanced IP and Domain WHOIS to report malicious IP's or networks and block entire networks using the firewall. Report security threats to network owner. +* Rate limit or block security threats like aggressive crawlers, scrapers and bots doing security scans for vulnerabilities in your site. +* Choose whether you want to block or throttle users and robots who break your security rules. +* Premium users can also block countries and schedule scans for specific times and a higher frequency. + += Login Security = +* Sign-in using your password and your cellphone to vastly improve login security. This is called Two Factor Authentication and is used by banks, government agencies and military world-wide for highest security authentication. +* Includes two-factor authentication, also referred to as cellphone sign-in. +* Enforce strong passwords among your administrators, publishers and users. Improve login security. +* Checks the strength of all user and admin passwords to enhance login security. +* Includes login security to lock out brute force hacks and to stop WordPress from revealing info that will compromise security. + += Security Scanning = +* Scans for the HeartBleed vulnerability - included in the free scan for all users. +* Scans core files, themes and plugins against WordPress.org repository versions to check their integrity. Verify security of your source. +* See how files have changed. Optionally repair changed files that are security threats. +* Scans for signatures of over 44,000 known malware variants that are known security threats. +* Scans for many known backdoors that create security holes including C99, R57, RootShell, Crystal Shell, Matamu, Cybershell, W4cking, Sniper, Predator, Jackal, Phantasma, GFS, Dive, Dx and many many more. +* Continuously scans for malware and phishing URL's including all URL's on the Google Safe Browsing List in all your comments, posts and files that are security threats. +* Scans for heuristics of backdoors, trojans, suspicious code and other security issues. + += WordPress Firewall = +* Includes a firewall to block common security threats like fake Googlebots, malicious scans from hackers and botnets. + += Monitoring Features = +* See all your traffic in real-time, including robots, humans, 404 errors, logins and logouts and who is consuming most of your content. Enhances your situational awareness of which security threats your site is facing. +* A real-time view of all traffic including automated bots that often constitute security threats that Javascript analytics packages never show you. +* Real-time traffic includes reverse DNS and city-level geolocation. Know which geographic area security threats originate from. +* Monitor your DNS security for unauthorized DNS changes. +* Monitors disk space which is related to security because many DDoS attacks attempt to consume all disk space to create denial of service. + += Multi-Site Security = +* Wordfence Security for multi-site also scans all posts and comments across all blogs from one admin panel. +* WordPress Multi-Site (or WordPress MU in the older parlance) compatible. + += Caching Features = +* Includes Falcon Engine, the fastest WordPress caching engine available today. Falcon is faster because it reduces your web server disk and database activity to a minimum. +* Wordfence includes two caching modes for compatability and has cache management features like the ability to clear the cache and monitor cache usage. + += IPv6 Compatible = +* Fully IPv6 compatible including all whois lookup, location, blocking and security functions. + += Major Theme and Plugins Supported = +* Includes support for other major plugins and themes like WooCommerce. + +The Wordfence WordPress security plugin is full-featured and constantly updated by our team to incorporate the latest security features and to hunt for the newest security threats to your WordPress website. + +== Installation == + +To install the Wordfence WordPress security plugin and start protecting your WordPress website: + +1. Install Wordfence Security automatically or by uploading the ZIP file. +1. Activate the security plugin through the 'Plugins' menu in WordPress. +1. Wordfence WordPress Security is now activated. Go to the scan menu and start your first security scan. Scheduled security scanning will also be enabled. +1. Once your first scan has completed a list of security threats will appear. Go through them one by one to secure your site. +1. Visit the Wordfence Security options page to enter your email address so that you can receive email security alerts. +1. Optionally change your security level or adjust the advanced options to set individual security scanning and protection options for your site. +1. Click the "Live Traffic" menu option to watch your site activity in real-time. Situational awareness is an important part of website security. + +To install the Wordfence WordPress security plugin on WordPress Multi-Site installations: + +1. Install Wordfence Security via the plugin directory or by uploading the ZIP file. +1. Network Activate Wordfence Security. This step is important because until you network activate it, your sites will see the plugin option on their plugins menu. Once activated that option dissapears. +1. Now that Wordfence is network activated it will appear on your Network Admin menu. Wordfence Security will not appear on any individual site's menu. +1. Go to the "Scan" menu and start your first security scan. +1. Wordfence Security will do a security scan of all files in your WordPress installation including those in the blogs.dir directory of your individual sites. +1. Live Traffic will appear for ALL sites in your network. If you have a heavily trafficked system you may want to disable live traffic which will stop logging to the DB. +1. Firewall rules and login rules apply to the WHOLE system. So if you fail a login on site1.example.com and site2.example.com it counts as 2 failures. Crawler traffic is counted between blogs, so if you hit three sites in the network, all the hits are totalled and that counts as the rate you're accessing the system. + +== Frequently Asked Questions == + +[Visit our support website which contains a FAQ and knowledgebase which is more comprehensive and updated frequently.](http://support.wordfence.com/?utm_source=repo&utm_medium=web&utm_campaign=pluginDesc) + += What does Wordfence Security do that other WordPress security plugins don't do? = + +* Wordfence Security is the only WordPress security plugin that is fully integrated with it's own high speed caching engine to avoid security and caching conflicts. +* Wordfence Security actually verifies your website source code integrity against the official WordPress repository and shows you the changes. We are the only plugin to do this. +* Wordfence Security provides two-factor authentication (Cellphone Sign-in) for paid members. We're the first plugin to offer this. +* Wordfence Security fully supports IPv6 including giving you the ability to look up the location of IPv6 addresses, block IPv6 ranges, detect IPv6 country and do a whois lookup on IPv6 addresses and more. +* Wordfence Security includes protection against DDoS attacks by giving you a performance boost up to 50X. +* Wordfence Security scans check all your files, comments and posts for URL's in Google's Safe Browsing list. We are the only plugin to offer this very important security enhancement. +* Wordfence Security scans do not consume large amounts of your precious bandwidth because all security scans happen on your web server which makes them very fast. +* Wordfence Security fully supports WordPress Multi-Site which means you can security scan every blog in your Multi-Site installation with one click. +* Wordfence Security includes Two-Factor authentication, the most secure way to stop brute force attackers in their tracks. + += Does Wordfence Security support Multi-Site installations? = + +Yes. WordPress MU or Multi-Site as it's called now is fully supported. Using Wordfence Security you can security scan every blog in your network with one click. If one of your customers posts a page or post with a known malware URL that threatens your whole domain with being blacklisted by Google, we will tell you within a maximum of one hour which is how often scans occur. + += Will Wordfence Security slow my site down? = + +No. Actually it will make your site up to 50X faster when Falcon Engine is enabled, up to 30 times faster with our PHP caching engine and even +without caching Wordfence is extremely fast and uses techniques like caching it's own configuration data to avoid database lookups. Older +versions of Wordfence did incur a slight performance penalty, but we have not only fixed this issue but knocked it out of the park. Wordfence +now makes your site faster than any other caching plugin available!! + += How often is Wordfence Security updated? = + +The Wordfence Security plugin is frequently updated and we update the code on our security scanning servers +more frequently. Our cloud servers are continually updated with the latest known security threats and vulnerabilities so +that we can blog any security threat as soon as it emerges in the wild. + += What if I need support? = + +All our paid customers receive priority support. Excellent customer service is a key part +of being a Wordfence Security member. As free or Premium member can visit [support.wordfence.com](http://support.wordfence.com/?utm_source=repo&utm_medium=web&utm_campaign=pluginDesc) and where you will find out knowledgebase. If you're a Premium member you can also open a support ticket. + += Can I disable certain security features of Wordfence Security? = + +Yes! Simply visit the Options page, click on advanced options and enable or disable the security features you want. + += What if my site security has already been compromised by a hacker? = + +Wordfence Security is the only WordPress security plugin that is able to repair core files, themes and plugins on sites where security is already compromised. +However, please note that site security can not be assured unless you do a full reinstall if your site has been hacked. We recommend you only +use Wordfence Security to get your site into a running state in order to recover the data you need to do a full reinstall. A full reinstall is the only +way to ensure site security once you have been hacked. + += How will I be alerted that my site has a security problem? = + +Wordfence Security sends security alerts via email. Once you install Wordfence Security, you will configure a list of email addresses where security alerts will be sent. +When you receive a security alert, make sure you deal with it promptly to ensure your site stays secure. + += My WordPress site is behind a firewall. Doesn't that make it secure? = + +If your site is accessible from the web, it means that people you don't know can execute PHP code on your site. +They have to be able to execute PHP code, like the core WordPress code, in order for your site to work. +Most WordPress security threats allow a hacker to execute PHP code on your website. The challenge hackers +face is how to get their malicious PHP code onto your site to compromise your security. There +are many upload mechanisms that WordPress itself, themes and plugins offer and the vast majority of these +are secure. However, every now and then a hacker discovers an upload mechanism that is not secure or +a way of fooling your site into allowing an upload. That is usually when security is compromised. Even +though your site is behind a commercial firewall, it still accepts web requests that include uploads and executes PHP code +and as long as it does that, it may become face a security vulnerability at some point. + += Will Wordfence Security protect me against the Timthumb security problem? = + +The timthumb security exploit occurred in 2011 and all good plugins and themes now use an updated +version of timthumb (which the creator of Wordfence Security wrote and donated to the timthumb author) which closes the security hole that +caused the problem. However we do scan for old version of timthumb for good measure to make sure they don't +cause a security hole on your site. + += Does Wordfence Security support IPv6? = + +Most definitely! As of Wordfence version 6.0.1 we fully support IPv6 with all security functions including country blocking, range blocking, +city lookup, whois lookup and all other security functions. If you are not running IPv6 Wordfence will work great on your site too. We are +fully compatible with both IPv4 and IPv6 whether you run both or only one addressing scheme. + +== Screenshots == + +1. The home screen of Wordfence Security where you can see a summary, manage security issues and do a manual security scan. +2. The Live Traffic view of Wordfence Security where you can see real-time activity on your site. +3. The "Blocked IPs" page where you can manage blocked IP's, locked out IP's and see recently throttled IPs that violated security rules. +4. The basic view of Wordfence Security options. There is very little to configure other than your alert email address and security level. +5. If you're technically minded, this is the under-the-hood view of Wordfence Security options where you can fine-tune your security settings. + +== Changelog == + += 6.0.21 = +* Enhancement: Added better handling of Googlebot verification. + += 6.0.20 = +* Fix: Fixed bug with options that are enabled by default but disabled by the user are reset to defaults. + += 6.0.19 = +* Fix: Added check to verify pluggable.php is included before calling wp_hash. + += 6.0.18 = +* Fix: Resolved issue with some admin links not using the network admin URL. +* Fix: Resolved issue with slashes not being stripped from Advanced Blocking usernames, reasons. +* Enhancement: Added ability to Block any requests from IPs matching a PTR record. +* Fix: Updated the GeoIP lib to use the wfUtils::inet_pton functions instead of the PHP default for installs that do not have IPv6 support. +* Fix: Added help link for whitelisted 404's entry on options page. +* Fix: Automatically exclude files that crash the scan. +* Fix: Clear the wfHoover database table after scan is killed. +* Enhancement: Added notice about false positives when running a scan with HIGH SENSITIVITY enabled. +* Fix: Removed WordPress version from style and script loaders. Hid the readme.html. +* Fix: Alert email for "lost password" did not send when the user used their username. +* Enhancement: Exclude zip files from scans by default, and add that as option under 'Scan image and binary files'. +* Fix: Fixed edge case where .htaccess became garbled when using Falcon cache. + += 6.0.17 = +* Fix: Resolved issue where 301 redirects count as 404s with throttling applied. +* Fix: Fixed Falcon .htaccess code writing to .htaccess when 'Immediately block IP's that access these URLs' option is modified. +* Fix: Fixed issue where filtering posts by author in wp-admin no longer works due to change in /?author=N scan prevention logic. +* Fix: Fixed issue in Live Traffic where 404s display as 200s. +* Fix: Resolved issue with throttling logins via XMLRPC are not applied. + += 6.0.16 = +* Fix: Resolved issue with some variations of author=N scans not being caught. Thanks James Golovich. +* Fix: Updated typo in author=N option. +* Fix: Resolved issue with Falcon not writing to .htaccess with WP installed in subdirectory. +* Fix: Added width to logo in activity report email. +* Fix: Resolved issue with Live Traffic endpoint in cases where WordPress is installed into a subdirectory. +* Improvement: Optimized database query with in unlocking user email routine. +* Improvement: Moved firewall logic into 'wp_loaded' hook. + += 6.0.15 = +* Fix: Resolved issue with GoogleBot being erroneously flagged as human in Live Traffic. +* Fix: Added better handling of human/bot detection. +* Improvement: Verified humans are flagged via cookie to prevent false positives. + += 6.0.14 = +* Fix: Live Traffic endpoint moved to site root to prevent issues with GoogleBot. + += 6.0.12 = +* Improvement: Updated local GeoIP database. +* Improvement: Updated local browser data cache to support newer browsers and user-agents. +* Improvement: Added option to exclude URLs from 404 throttling, and included some common 404s. +* Improvement: Added new branded logos. +* Fix: Fixed bug with live traffic ajax call being indexed by Google. + += 6.0.11 = +* Improvement: Updated local GeoIP database to July version. +* Improvement: Updated local browser data cache to support newer browsers and user-agents. +* Fix: Hooked up network ranges in CIDR format (192.168.0.0/16) in Whois to support data coming back from whois that includes CIDR network format. +* Fix: Fixed 2 PHP notices in wfUtils. + += 6.0.10 = +* Improvement: Removed locked out IPs from locked out list when permanently blocking all locked out IPs. +* Improvement: Added admin-configured blocked IPs and blocked network ranges to import/export. +* Fix: Fixed PHP warnings in activity report where an array is not returned. +* Fix: Fixed PHP notice in IP spam check portion of scan. + += 6.0.9 = +* Fix: Fixed bug in Live Traffic where v5 style blocked ranges generated PHP warning breaking the JSON response. +* Fix: Fixed invalid date bug in Live Traffic: Top Consumers and Top 404s. +* Fix: Fixed edge case bug with author=N scans redirecting to author archives page. + += 6.0.8 = +* Improvement: Added the local time stamp to 'time since' labels in Live Traffic and Blocked IPs pages. +* Improvement: Added a check to prompt the admin to download a backup copy of the wp-config.php in the event it's flagged as containing malware. +* Improvement: Added option in Live Traffic to remove a blocked network range defined in Advanced Blocking in the Live Traffic feed for IPs within that range. +* Improvement: Added option to permanently block all IPs that are currently temporarily blocked or locked out from the Blocked IPs page. +* Improvement: Updated local GeoIP database. +* Fix: Fixed double forward slash in file path in the 'View the File' action of malicious code scan. +* Fix: Fixed notice in block IP JSON callback. + += 6.0.7 = +* Fix: Fixed bug with Top 5 Logins displaying all failed logins opposed to timeframe set by email frequency. +* Fix: Fixed bug with /?author=N scan protection not working for authors with no published posts. +* Improvement: Fixed Wordfence logo width in dashboard widget on smaller screens. +* Improvement: Added country names to flag icons in widget dashboard. +* Improvement: Updated issues email to use WordPress' charset instead of ISO-8859-1. +* Improvement: Added check to see if premium API key is set to auto-renew and send email reminder prior to renewal. +* Improvement: Updated to API version 2.17. +* Improvement: Changed auto-renew reminder email to go out 10 days before renewal, 12 days before expiration. + += 6.0.6 = +* Improvement: Handled uncaught exception when noc1 is not available in 2FA. +* Improvement: Fixed issue with limit-logins mu-plugin on GoDaddy counting first login attempt in 2FA against total allowed login attempts. +* Fix: Fixed bug with IPs not resolving to countries when printable IP passed to logBlockedIP. +* Fix: Fixed issue with free users country blocking redirects working after downgrade. +* Fix: Encoded URL field in country blocking options. +* Fix: Added a check to verify field has not already been altered prior to calling ALTER in runInstall. +* Fix: Fixed issue with scan_options method being called after method has been removed. +* Fix: Fixed bug in scan when dns_get_record fails and error condition was not handled. +* Fix: Fixed PHP notice when 'Crawler' not included in browser pcap result. + += 6.0.5 = +* Fix: Removed anonymous function to ensure PHP 5.2 compatability. + += 6.0.4 = +* Improvement: Added option to disable SSL verification for hosts that have outdated versions cURL. +* Improvement: Added default of 127.0.0.1 when $_SERVER['REMOTE_ADDR'] is not set. Helps if you're running WordPress cron from Linux cron. +* Improvement: Added compatability with Godaddy's MU (must use) limit login plugin and our two factor. Change makes sure you can see the message from Wordfence to enter your cellphone code. +* Improvement: Added direction: ltr; to admin pages. +* Improvement: Added focus/blur events to scan activity log ajax to improve server performance. +* Improvement: Merged wp_option charset and database vulnerability scans to improve performance and make UI more intuitive. +* Improvement: Opened 'See recent traffic' in a new window from the Live Traffic page. +* Improvement: Updated browser pcap cache file for compatibility with detecting newer Firefox browsers. +* Fix: Fixed bug in directories excluded from scans (escaped directory separator). +* Fix: Updated known files and outdated plugins/themes to use wp_get_themes. +* Fix: Fixed bug with wfScanEngine where scans forked between scan_database_main and scan_database_finish would not display results of database scan. +* Fix: Added return false; to wfScan::error_handler to allow default error handler to process error. +* Fix: Fixed notice with wfUserIPRange::isValidIPv4Range. +* Fix: Fixed bug with 'Allow HTTPS pages to be cached' setting being unset after saving options. +* Fix: Fixed a couple of typos and spelling. +* Fix: Fixed errors upon plugin activation where wfConfig was queried before it was created. +* Fix: Fixed issue with notices from serializing wordfenceDBScanner and private properties belonging to parent class. + += 6.0.3 = +* Fix: Fix for hosts that don't have IPv6 compiled into PHP (which is rare) we not manually define certain functions. + += 6.0.2 = +* Fix: Fixed an issue with the schema not updating when customers migrate to IPv6 schema to store IP's. +* Improvement: Added additional safety checks during the schema update. + += 6.0.1 = +* Feature: IPv6 fully supported. This includes whois, range blocking, IPv6 city lookup in live traffic, country blocking and all other security functions. See www.wordfence.com/blog/ for more info. +* Feature: New scanning routine examines the wp_options table for executable code based on a new infection we are seeing that is well hidden. +* Improvement: Prevent Googlebot from being blocked if user has configured a banned URL and Google tries to crawl it. +* Improvement: Improved detection for additional Google crawlers especially if an IP PTR resolves to a .googlebot.com domain. +* Fix: Fixed bug with https:// URLs not allowed in country blocking. +* Fix: Fixed typos. + += 5.3.12 = +* Fix: Wordfence no longer can appear on sub-sites on multi-site installs, only on the network admin panel. +* Fix: Wordfence dashboard widget only can appear on network admin dashboard in multi-site installs. +* Fix: No more multiple scheduled scans on multi-site. +* Fix: Fixed mixed-protocol warning if you're using SSL and Wordfence - our static assets are loaded without specifying protocol now. +* Fix: Fixed issue where non-existent users were shown in dashboard widget and email summary as valid users. +* Fix: Removed /e modifier in preg_replace for Diff_Renderer_Html_Array::formatLines since it is deprecated in PHP 5.5. +* Fix: Removed ssl_verify => false from wp_remote_post connectivity test since some versions of cURL will throw an error since WordPress uses their own certificate bundle. +* Fix: Fixed bug with activity report email date range (was one week ahead). +* Fix: Removed email summary report from cron on deactivation. +* Fix: Fixed an off-by-one bug in wfDirectoryIterator for maximum total files and max files per directory. +* Fix: Updated our browser data to fix an issue that caused newer browsers to appear in live traffic with version 0.0. +* Improvement: Updated the country database used for country blocking to April 2015 version. +* Improvement: Added an additional check for disabling script execution in the uploads directory that the .htaccess file actually contains our protection code before removing it. +* Improvement: Paused Live Traffic ajax request when the window/document loses focus to reduce server load. +* Improvement: Better error handling when making API calls to noc1 to help our support personell help you. +* Improvement: Added locked out IP's and IP's restricted through advanced blocking to the blocked IP log for dashboard and email summary. +* Improvement: Excluded whitelisted IP's from dashboard and widget email summary. + += 5.3.11 = +* Fix: Dasboard widget no longer appearing for all users. + += 5.3.10 = +* Fix: Removed .htaccess file the previous release created in wfcache directory that caused problems. + += 5.3.9 = +* Premium Feature: Password Auditing. Audit the strength of your admin and user-level passwords against our GPU based auditing cluster. Easily alert users to weak passwords or force a password change. +* Feature: Activity email summary. See options page to enable a weekly, bi-weekly or monthly activity summary. +* Feature: Activity summary dashboard widget. +* Fix: Fixed bug on plugin activation where the configuration table was being queried before it was created. +* Improvement: Added .htaccess to wfcache directory. +* Improvement: Switched to using wp_remote_post for Wordfence cloud API calls to improved SSL support and a more standards based approach. + += 5.3.8 = +* Customers running WP versions older than 3.9 don't support wp_normalize_path(). Added support for older WP versions to fix an error being thrown. + += 5.3.7 = +* Improvement: Updated country blocking database to the newest version (March 2015) +* Improvement: Added detection for many new samples we received (thanks all!) including a nasty polymorphic infection. +* Fix: Changed the way we find the plugin directory to fix a possible issue that would cause alerts to return blank plugin names. +* Fix: Improved Nginx detection so that we don't accidentally detect Nginx if you're running Apache. + += 5.3.6 = +* Feature: You can now block POST requests to your WordPress site that have an empty User-Agent and Referer header. This is a common pattern among badly written brute force bots. +* Feature: Added cron viewer at bottom of Wordfence options page. The plugin we were using to help diagnose customer issues is broken. Use this instead. +* Feature: Added DB table viewer at bottom of Wordfence options page. This is a read-only utility to view table names and detailed status. Also for customer diagnostic purposes. +* Improvement: Code cleanup after in-depth code analysis. Removed unused functions and variables and re-indented selected code. +* Fix: Fixed issue that appeared after last release where raw HTML tags were appearing in email alerts. +* Fix: Tour behaved inconsistently under some conditions. Fixed. +* Fix: Mismatched HTML tags in some presentation code. Fixed. +* Fix: When fetching theme list the interator had the same name as the array. Fixed. +* Fix: Detection for malware URLs in comments had a partial description in the issue. Was being overwritten when it should have been appended. Fixed. +* Fix: Check if dns_get_record() exists before using it to avoid warnings. +* Fix: If you have the wordfence security network disabled, the _wfVulnScanners table may have grown indefinitely. Fixed so it's regularly truncated. +* Fix: wordfence::getLog() was private and should be public. Fixed. +* Fix: Removed warning about _wfsf not being an element of GET params. Usually hidden, but in case something checks error_get_last() + += 5.3.5 = +* Update: Upgraded the geoIP country database to Jan 2015 version. +* Improvement: Added an option to disable execution of PHP code in the uploads directory as an added level of protection. Under "Other Options" on the Wordfence options page. +* Improvement: We now email you any malware URLs encountered and they won't be filtered by your spam filter because the URL is included in the alert email as an image. +* Fix: Fixed an issue that would cause multiple scans to be scheduled if the plugin was disabled and then reenabled. +* Fix: The name of malicious files detected are now included in the alert email sent containing the issues. + += 5.3.4 = +* Changed FAQ link when locked out and email unlock doesn't work to correct link. +* Falcon cache now creates files as mode 0644 for improved security. +* Updated GeoIP database to December 2014 version. + += 5.3.3 = +* Security fix. Thanks Matt Barry. +* Changed what we consider to be private addresses to a smaller range of addresses. See current range at: http://docs.wordfence.com/en/How_Wordfence_handles_Private_Addresses +* Fixed a warning about an undefined value which appeared after we added referer blocking in 5.3.2. + += 5.3.2 = +* Feature: Advanced blocking now includes referer blocking. i.e. you can block visitors arriving from certain websites or pretending to. See updated http://docs.wordfence.com/en/Advanced_Blocking +* Feature: Developers, you can now ask Wordfence to whitelist your server IP by calling wordfence::whitelistIP(). See http://docs.wordfence.com/en/WhitelistIP + += 5.3.1 = +* IP to Country database updated to November 4th 2014 version. +* Options export and import now also exports Country Blocking and Scan Schedule configuration. +* Scans fully documented at docs.wordfence.com. Link on 'Scan' page under heading. +* Live Traffic fully documented at docs.wordfence.com. Link on Live Traffic page. +* Falcon Engine/Wordfence Caching fully documented. Link on Performance Setup page. +* Blocked IPs, locking and throttling fully documented. Link on Blocked IPs page. +* Cellphone Sign-in fully documented. Link under title on Cellphone sign-in page. +* Country blocking fully documented. Link on Country blocking page. +* Scan Scheduling fully documented. Link on Scan Scheduling page under title. +* Whois and Advanced Blocking documented including how Live Traffic, Whois and Advanced blocking work together. +* Removed unnecessary text from several menu items and moved into official docs where needed. + += 5.2.9 = +* Added ability to export Wordfence settings and reimport on one or many sites using secure token. +* Added API function to programatically import Wordfence settings from another WordPress site. +* Upgraded to Wordfence API version 2.14. + += 5.2.8 = +* Detailed documentation for all options on the Wordfence options page. Launching docs.wordfence.com wiki. +* Fixed server-side issue where diff'ing certain files would give a blank page or an API error. +* Removed now unused whois library because we're now using Wordfence API server to get around whois port blocking. + += 5.2.7 = +* Fixed issue that would cause infected files with identical content to only have the first file found show up in scans and the rest would not appear. +* Whois queries now go via our own server as a workaround for hosting providers who block your web server's access to port 43 preventing you from making a direct whois query. +* Fixed issue that caused litespeed users to receive multiple warnings about the noabort issue. +* Added detection for 5 new malware variants. Thanks to Dave M. and others for the samples. Keep them coming folks! +* Updated Wordfence server API to version 2.12. +* Added facility at bottom of Wordfence options page to send a test email from your WordPress sytem to check if email sending is working. +* Suppress LOCK_EX flock() warnings in falcon engine that were being generated by sites that use NFS and don't support flock() or reliable file locking. +* Updated to the October 2014 version of the Geo IP country DB. (newest edition) + += 5.2.6 = +* Fixed bug that caused country blocking and redirecting to an external URL to not work if the external URL's relative path matched the current page's relative path. +* Made it clear that country blocking URL's require absolute URL's. + += 5.2.5 = +* Security release. Update immediately. Thanks to Julio Potier. +* Code hardening including improved sanitization and an additional nonce for unlock email form. Special thanks to Ryan Satterfield for the hard work. +* Stability of auto-update improved for LiteSpeed customers. We auto-detect if you don't have E=noabort:1 in your .htaccess and give you instructions. +* Auto-update also disabled now for LiteSpeed customers who don't have E=noabort:1 and you will get an email alert with an explanation. +* Fixed a bug that may cause you to have advanced blocking patterns disabled with falcon engine enabled that should not be disabled. +* Removed a benign warning in wfCache.php. +* Added clarity to the banned URL option on the options page. All URL's must be relative. +* Added a primary key to the wp_wfStatus table which is required for certain incremental backup plugins and utilities. +* Fixed advanced country blocking which was not correctly displaying advanced options. +* Migrated to using wp_kses() for sanitization. +* Prevent IP spoofing in default Wordfence IP configuration. +* Change explanations of how Wordfence gets IP's to make it clear which to use to prevent spoofing. +* Make it clear that the option to have IP's immediately blocked when they access a URL requires relative URL's starting with a forward slash. +* Whitelist Sucuri's scanning IP addresses which were getting blocked because they triggered Wordfence blocking during a scan. +* Improved Wordfence's code that acquires the visitor IP to block certain spoofing attacks, be more platform agnostic and deal with visits from private IP's more elegantly. + += 5.2.4 = +* Security release. Upgrade immediately. +* This release fixes an XSS vunlerability on Wordfence "view all traffic from IP" page. +* Also fixes a hard to exploit XSS which exists if you have your site as the default site on your web server, falcon enabled and debugging comments enabled. +* Improves Revolution Slider proteciton. +* Fixed bypass for fake googlebot blocking. + += 5.2.3 = +* Updated Geo IP country database to newest version (September 2014 edition) +* Security fix. Improved referrer sanitization in live traffic. +* Changed scan success messaging for clarity. +* Fixed minor bug in IP validation which manifested when users use IPv6 to IPv4 translation which produces 255.x.x.x addrs. + += 5.2.2 = +* Protection from the Slider Revolution Plugin arbitrary file download vulnerability announced today. Attempts to download any .php file including wp-config.php are denied. +* Changed the Wordfence Memory config option's label to make it clearer what the option does. +* Moved screenshots out of plugin distro directory to reduce plugin payload size. + += 5.2.1 = +* Fix: Users with large lists of blocked IP's (over 2,100) would receive a browser error "Uncaught RangeError: Maximum call stack size exceeded". Fixed. +* Improvement: Added detection for FOPO obfuscation often used by hackers to obfuscate PHP code. Will detect a range of newer infections. (Server-side code change) + += 5.1.9 = +* Fix: Crawler triggering update cron job threw error about show_message() being redeclared at end of update. Fixed. +* Fix: Live traffic cities were incorrect and did not match country blocking block effects under certain conditions. Fixed. +* Fix: If a site database contained a table with dashes in the table name, we would throw an error at the end of every scan. Fixed. +* Improvement: Upgraded country DB to newest version. +* Improvement: Changed live traffic geo location caching to be 24 hours instead of a week so that geo DB updates for live traffic on our servers take effect sooner. +* Improvement: Ignoring .sql files in scans which are usually backups and contain many false positives, unless high sensitivity scanning is enabled. + += 5.1.8 = +* Fix: Option to disable config caching. You can find this new option at the bottom of the Wordfence options page. +* Note: If you are seeing the "cron key does not match the saved key" error, check the box to disable config caching at the bottom of the Wordfence options page, save and this will fix it. +* Note: If you are trying to save your Wordfence options and the options keep reverting, enable the "disable config caching" at the bottom of your Wordfence options page, save and this will fix it. + += 5.1.7 = +* Improvement: Wordfence now supports websites behind proxy servers when communicating with the Wordfence API servers. +* Fix: Removed old image files that were unused. + += 5.1.6 = +* Feature: Country blocking now lets you block login page OR rest of site or any combination. So you can now block the login page only for example. +* Improvement: Upgraded the country blocking database to the newest version which is July 2014. +* Improvement: Improved server-side performance for Wordfence scanning. +* Improvement: Offer the option to keep Wordfence up-to-date automatically. +* Improvement: If file contains malicious code, include filename in email alert summary info. +* Fix: Removed strings in readme.txt that were causing false positives in hosts own scanning software. +* Fix: Prevent lockout email alerts being sent for blank usernames. + += 5.1.5 = +* Fix: Bing crawler was being misidentified as human. Fixed. +* Fix: Escaping HTML on whois records. Thanks Nikhil Srivastava, TechDefencelabs (http://techdefencelabs.com) + += 5.1.4 = +* Feature: Auto updates for Wordfence! This is a much-requested feature by our power admin's. Enable the "Update Wordfence automatically when a new version is released" option on the Wordfence options page. +* Fix: Security fix. Thanks to Narendra Bhati from Suma Soft. + += 5.1.2 = +* Feature: You can now specify one or more URL's that if accessed will cause the IP to immediately be blocked. See below "Other Options" for the new feature. +* Improvement: Added additional debugging info when cron key does not match saved key to help diagnose any problems. +* Improvement: New Issues email now contains site URL rather than just hostname to help identify subdirectory sites. +* Improvement: Upgraded the country blocking database to the newest version which is June 2014. +* Fix: Some browser versions were being reported as 0.0. Updated browser detection. + += 5.1.1 = +* Improvement: WooCommerce now officially supported out of the box. +* Feature: Added the wordfence:doNotCache() function that you can call in your themes and plugins to prevent caching of items. +* Fix: Fixed the warning appearing in lib/wfUtils.php about a scalar being treated as an array which appeared in 5.0.9. +* Fix: Failed logins were not being logged for non-existent usernames that were set to immediatelly block. Fixed. +* Fix: Removed several warnings/notices that would appear when WP_DEBUG is enabled. +* Fix: Added default character set to .htaccess which fixes garbled international characters being served from cache on sites with no default apache charset. + += 5.0.9 = +* Feature: (Premium) Advanced Comment Spam Filter. Checks comment source IP, author URL and hosts and IP's in body against additional spam lists. +* Feature: (Premium) Check if your site is being Spamvertised i.e. your domain is being included in spam emails. Usually indicates you've been hacked. +* Feature: (Premium) Check if your website IP is generating spam. Checks against spam lists if your IP is a known source of spam. +* Improvement: Cache clearing errors are nown shown with clear explanations. +* Improvement: Added lightweight stats logging internally in preparation for displaying them on the admin UI in the next release. +* Fix: If a non-existent user tries to sign in it is not logged in the live logins tab. Fixed. +* Fix: Removed warning "Trying to get property of non-object" that would occur under certain conditions. +* Fix: Removed call to is_404() which was not having any effect and would issue a warning if debug mode is enabled. +* Fix: Check if CURL is installed as part of connectivity test. + += 5.0.8 = +* Feature: Support for Jetpack Mobile Theme in Falcon Caching engine. Regular pages are cached, mobile pages are served direct to browser. +* Improvement: Pages that are less than 1000 bytes will not be cached. The avg web page size in 2014 is 1246,000 bytes. Anything less than 1000 bytes is usually an error. +* Improvement: Wordfence will now request 128M on hosts instead of 64M where memory in php.ini is set too low. +* Fix: Wordfence was caching 404's under certain conditions. Fixed. +* Fix: Nginx/FastCGI users would sometimes receive an error about not being able to edit .htaccess. Fixed. + += 5.0.7 = +* Feature: Immediately block IP if hacker tries any of the following usernames. (Comma separated list that you can specify on the Wordfence options page) +* Feature: Exclude exact URL's from caching. Specifically, this allows you to exclude the home page which was not possible before. +* Feature: Exclude browsers or partial browser matches and specific cookies from caching. +* Fix: Fixed issue where /.. dirs would be included in certain scandir operations. +* Fix: logHuman function was not analyzing user-agent strings correctly which would allow some crawlers that execute JS to be logged as humans. +* Fix: Removed ob_end_clean warnings about empty buffers when a human is being logged. +* Fix: Removed warning in lib/wfCache.php caused by unset $_SERVER['QUERY_STRING'] when we check it. +* Fix: Fixed "logged out as ''" blank username logout messages. +* Fix: Improved security of config cache by adding a PHP header to file that we strip. Already secure because we have a .htaccess denying access, but more is better. +* Fix: Falcon Engine option to clear Falcon cache when a post scheduled to be published in future is published. +* Fix: Fixed Heartbleed scans hanging. + += 5.0.6 = +* Feature: Prevent discovery of usernames through '?/author=N' scans. New option under login security which you can enable. +* Fix: Introduced new global hash whitelist on our servers that drastically reduces false positives in all scans especially theme and plugin scans. +* Fix: Fixed issue that corrupted .htaccess because stat cache would store file size and cause filesize() to report incorrect size when reading/writing .htaccess. +* Fix: Fixed LiteSpeed issue where Falcon Engine would not serve cached pages under LiteSpeed and LiteSpeed warned about unknown server variable in .htaccess. +* Fix: Fixed issue where Wordfence Security Network won't block known bad IP after first login attempt if "Don't let WordPress reveal valid users in login errors" option is not enabled. +* Fix: Sites installed under a directory would sometimes see Falcon not serving cached docs. +* Fix: If you are a premium customer and you have 2FA enabled and your key expires, fixed issue that may have caused you to get locked out. +* Improvement: If your Premium API key now expires, we simply downgrade you to free scanning and continue rather than disabling Wordfence. +* Improvement: Email warnings a few days before your Premium key expires so you have a chance to upgrade for uninterrupted service. + += 5.0.5 = +* Fix: Removed mysql_real_escape_string because itâs deprecated. Using WPâs internal escape. +* Fix: Wordfence issues list would be deleted halfway through scan under certain conditions. +* Fix: Connection tester would generate php error under certain conditions. + += 5.0.4 = +* Feature: We now scan for the infamous heartbleed openssl vulnerability using a non-intrusive scan method safe for production servers. +* Improvement: We now check if .htaccess is writable and if not we give you rules to manually enable Falcon. +* Improvement: Once Falcon is enabled, if we canât write to .htaccess, we fall back to PHP based IP blocking. +* Feature: You can now clear pages and posts from the cache on the list-posts page under each item or on their edit pages next to the Update button. +* Fix: We now support sites who use a root URI but store their files and .htaccess in a subdirectory of the web root. +* Fix: Added an additional filter to prevent crawlers like Bing who execute javascript from being logged as humans. +* Fix: Changed the extension of the backup .htaccess to be .txt to avoid anti-virus software alerting on a download with .com extension. [Props to Scott N. for catching this] + += 5.0.3 = +* Removed ability to disable XML-RPC. The feature broke many mobile apps and other remote services. + += 5.0.2 = +* Fix: Issue that caused users running WordPress in debug mode to see a is_404 warning message. +* Fix: Issue that caused Call to undefined function wp_get_current_user warning. +* Fix: Issue that caused caching to not work on sites using subdirectories. +* Fix: Issue that caused SQL errors to periodically appear about wfPerfLog table. +* Fix: Issue that caused warnings about array elements not being declared. + += 5.0.1 = +* To see a video introduction of Falcon Engine included with Wordfence 5, [please watch this video](https://vimeo.com/91217997) +* SUMMARY: This is a major release which includes Falcon Engine which provides the fastest WordPress caching available today. It also includes many other improvements and fixes. Upgrade immediatelly to get a massive performance boost for your site, many new features and fixes. +* Feature: Falcon Engine provides the fastest caching algorithm for WordPress. Get up to a 50x site speedup now when you use Wordfence. +* Feature: PHP based caching as an alternative to Falcon. +* Feature: IP, browser and IP range blocking is now done using .htaccess if Falcon Engine is enabled providing a big performance boost. +* Feature: Falcon and PHP caching includes ability to exclude URL patterns from cache along with cache management. +* Feature: Disable XML-RPC in WordPress to prevent your site from being used as a drone in a DDoS attack. +* Feature: Option to disable Wordfence cookies from being sent. +* Feature: Option to start all scans using the remote start-scan option. This may fix some customers who canât start scans. +* Feature: Falcon Engine includes the ability to block IP ranges using .htaccess. We take your ranges and convert them into CIDR compatible .htaccess lines that very efficiently block the ranges youâve specified. Another great performance improvement. +* Feature: If user disables permalinks we automatically disable Falcon Engine caching. +* Feature: Before you enable Falcon Engine we make you download a backup of your .htaccess file just in case. +* Improvement: Real-time traffic monitoring loads asynchronously to provide a faster user experience. +* Improvement: All Wordfence configuration variables are now cached on disk rather than repeatedly looked up on the database providing a big performance improvement. +* Improvement: Updated browser detection algorithms for new browsers. +* Improvement: Updated country GeoIP database to the April edition. +* Improvement: Improved performance by only loading routines required for logged in users if they have a login cookie. No DB lookup required. +* Improvement: Added on-off switches to top of live traffic to make it easy to turn on/off. +* Improvement: Removed marketing message from Wordfence email alerts. +* Improvement: Added ability to exclude files from scan that match patterns. Multiple excludes using wildcards allowed. +* Improvement: Improved performance by moving all actions that would only be used by a logged in user to be set up using add_action if the user actually has a login cookie. +* Fix: Added a throttle to prevent identical email alerts being sent repeatedly. +* Fix: Changed order of IP blocking and alerting code to prevent multiple email alerts being sent in a race condition. +* Fix: Cleaned up legacy code including removing all array_push statements. +* Fix: Added try/catch block to fileTooBig() function when we encounter files that we canât seek on and that throw an IO error to prevent scans from crashing. +* Fix: Resolved issue that may have caused wfhits table to grow continuously on some sites. +* Fix: Ensured that runInstall() isnât called multiple times. +* Fix: Moved register_activation_hook to only be called if the user has a login cookie and has a likelihood of being actually logged in as admin. Performance improvement. +* Fix: Added doEarlyAccessLogging routine to move logging before caching so we can have both. +* Fix: Removed the âupdate LOW_PRIORITYâ sql statement when updating wfHits which was intended to speed up MySQL performance but may have actually caused queries to queue up and slow things down. +* Fix: Whitelisted IPâs are no longer put through two factor authentication as one would expect. +* Fix: Changed our wp_enqueue_script calls to add a âwfâ prefix to our script names so that another plugin doesnât cause our scripts to not load. +* Fix: Removed code that would cause all alerts to be turned on for some users under certain conditions. +* Fix: Automatically excluding backup files and log files from URL scans to reduce false positives on referring URLs in logs and backups. + += 4.0.3 = +* Improvement: Added "high sensitivity" scanning which catches evals with other bad functions but may give false positives. Not enabled by default. +* Fix: Removed code that caused error message during scan initialization. +* Fix: IP to number conversation code had a problem with IP's with a single 0 in them. Bug was introduced in 4.0.2. +* Fix: Very fast attacks would generate a lot of email alerts due to race condition. Fixed. + + += 4.0.2 = +* Feature: Ability to bulk repair or delete files when cleaning a site. +* Feature: You can now limit the number of emails per hour that Wordfence sends. +* Feature: You can now scan image files as if they are executables when cleaning a site. See the option under scanning options. +* Feature: New connectivity test for wp_remote_post to our servers. +* Feature: New detection for backdoors that were previously missed in scans. +* Improvement: Added a link to the Wordfence admin URL for a site when an email alert is received. +* Improvement: Removed "buy premium" message from the alert emails which was causing confusion and irritation. +* Improvement: Improved private address detection by making it faster and adding all private subnets, not just RFC1918 nets. +* Improvement: Switched to wp_remote_get for triggering scans instead of wp_remote_post() +* Improvement: Added some more verbose debugging for scan starts when in debug mode. +* Improvement: No longer include private addresses when checking malware URL's and scanning IP's. +* Improvement: Added code to disable Wordfence if WordPress is installing. +* Fix: Text change because not all "scan" buttons are blue. +* Fix: Removed URL from wfBrowscapCache.php which was causing false positives during scans. +* Fix: Fixed SQL bug that triggered when we logged a vulnerability scan. +* Fix: IP range blocks where a digit is preceded by a '0' char will no longer generate an error. +* Fix: The getIP() routine will no longer use the IP closest to a visitor in network topology if that IP is a private address and behind a proxy. + + += 4.0.1 = +* Real-time WordPress Security Network Launched. +* If another site is attacked and blocks the attacker, your site also blocks the attacker. Shared data among Wordfence sites. +* See our home page on www.wordfence.com for a live map of attacks being blocked. Then blog about us!! +* Fixed bug where wfBrowscapCache.php is reported as malicious. +* Big improvement in scanning speed and efficiency of URL's and IP addresses. +* Fixed preg_replace() warning by using newer preg_replace_callback() func. + + += 3.9.1 = +* Fixed issue that caused Wordfence security to not log 404's. +* Made 404's more visible on the live traffic page. +* Fixed panel width that was too narrow for WP 3.8 on live traffic and issues pages. +* Report hack attempts to Wordfence Security scanning server for DDoS protection. +* Remind admin if security alert email is blank and tour is closed. +* Updated links to new Wordfence Security support website at support.wordfence.com. +* Made Wordfence Security paid-users-only message a little more user friendly. + += 3.8.9 = +* Fix: Fixed issue that caused certain Wordfence Security login functions to not work. Was a PHP 5.4 vs older version incompatability issue. +* Updated GeoIP location database to new version for country blocking. +* Fix: Resolved issue that caused the Issues that Wordfence Security found to not be displayed in some cases. +* Updated Wordfence Security to WordPress 3.8 Compatability. + += 3.8.8 = +* Fix: We now truncate the wfHoover table after scans to save disk space on servers with huge numbers of URLs in files. +* Fix: isStrongPasswd function was being called statically but not declared as static. +* Fix: Improved error reporting when we can't connect to Wordfence Security API servers. +* Fix: Fixed code that was causing an error log warning when we read the requested URL. +* Fix: Disable and clear cellphone sign-in if you downgrade to free from paid to prevent lockouts. + += 3.8.7 = +* Fixed issue that caused cellphone sign-in to not work with PHP version 5.4 or greater. +* Fixed conflict with other plugins that also use the Whois PHP library. +* Fixed an unsanitized user-agent string. +* Added new malware signatures for string rot13 heuristics. +* Updated compatibility to 3.7. + += 3.8.6 = +* Fixed issue that caused scheduled scans to run even if disabled. +* Fixed display bug when signin fails. + += 3.8.5 = +* Fixed issue that caused Human traffic to not be logged in Wordfence Security live traffic view. + += 3.8.4 = +* Removed Wordfence Security .htaccess because it doesn't offer any security functionality and increases incompatibility. +* Fixed spelling errors. +* Added check to see if HTTP_USER_AGENT server variable is defined before using it to suppress large number of warnings on some sites. +* Changed the way we call admin_url to the correct syntax. +* Correctly escaped HTML on error messages. +* Fixed issue that generated non-compliant query string. +* Updated GeoIP database to newest version. + += 3.8.3 = +* Updated GeoIP database for country blocking security. +* Fixed bug in Wordfence Security where we called reverseLookup in wfUtils statically and it's a non-static method. Thanks Juliette. +* Removed characters that are invalid in an IP address or domain from the Whois facility to improve security. +* Prevent users from creating 1 character passwords to improve security. +* Fixed issue that caused an invalid variable to be used in an error message and improved Wordfence Security temporary file implementation for get_ser/ser_ser functions. Thanks R.P. +* Fixed issue that caused IP to output as integer in status msg. Not security related but display issue. +* Declared Wordfence Security reverseLookup function as static to remove warning. +* Fixed returnARr syntax error in Wordfence Security class. +* Note, there is no Wordfence Security version 3.8.2. + += 3.8.1 = +* Added Cellphone Sign-in (Two Factor Authentication) for paid Wordfence Security members. Stop brute-force attacks permanently! See new "Cellphone Sign-in" menu option. +* Added ability to enforce strong passwords using Wordfence Security when accounts are created or users change their password. See Wordfence Security 'options' page under 'Login Security Options'. +* Added new backdoor/malware signatures to Wordfence Security scanning including detection for spamming scripts, youtube spam scripts and a new attack shell. +* Fixed issue: Under some conditions, files not part of core or a known theme or plugin would be excluded from a Wordfence Security scan. +* Fixes from Juliette R. F. Remove warnings for unset variables. Fix options 'save' spinner spinning infinitely on some platforms. Removed redundant error handling code in Wordfence Security. +* Added ability to downgrade a paid Wordfence Security license to free. + += 3.7.2 = +* Fixed issue that caused locked out IP's to not appear, or to appear with incorrect "locked out until" time. + += 3.7.1 = +* Moved global firewall, login security and live traffic options to top of options page. +* Made it clear that if you have Wordfence Security firewall disabled, IP's won't be blocked, country blocking won't work and advanced blocking won't work with warnings on each page. + += 3.6.9 = +* Fixed JS error in Wordfence Security that occurs occasionally when users are viewing Wordfence Security activity log in real-time. +* New Feature: Prevent users registering 'admin' username if it doesn't exist to improve security. Recommended if you've deleted 'admin'. Enable on 'options' page. +* Check if Wordfence Security GeoIP library is already declared for all functions. Fixes Fatal error: Cannot redeclare geoip_country_code_by_name. +* Fixed a Wordfence Security compatibility issue with sites and hosts using Varnish front-end cache to ensure legit users don't get blocked. Added two HTTP no-cache and Expires headers. +* Fixed bug when using Wordfence Security Advanced User-Agent blocking with certain patterns this would appear: Warning: preg_match() [function.preg-match]: Unknown modifier +* Vastly improved speed of Wordfence Security Advanced User-Agent blocking security feature. No longer using regex but still support wildcards using fnmatch() +* We now support usernames with spaces in the list of users to ignore in the live traffic config on 'options' page. +* Improved language in status messages to avoid confusion. Changed "unrecognized files" to "additional files" to describe non-core/theme/plugin files. + += 3.6.8 = +* Fixed bug in Wordfence Security that caused IP range blocking to not block. +* Fixed bug that caused unblocking a permanently blocked IP to work, but not refresh the list. +* Added usernames to the email you receive when a user is locked out. +* Added a few more status messages for Wordfence Security URL malware scanning. +* Removed the sockets function call from connection testing because some hosts don't allow calls to socket_create() +* Added detection in the Wordfence Security Whois page to check if the server has the fsockopen() function available with helpful message if it's disabled. +* Whitelisted IP's now override Wordfence Security country blocking and range blocking. +* Removed Bluehost affiliate links for free customers +* Fixed issue that caused scans to crash when checking URLs for malware. +* Fixed issue that caused scans with large numbers of posts that contain the same URL to crash. +* Updated the Wordfence Security GeoIP database for country blocking to newest version. + += 3.6.7 = +* Improved security for Cloudflare customers to prevent spoofing attacks and protect when a hacker bypasses Cloudflare proxies. +* Added clear explanation of what increasing AJAX polling time does on options page. +* Fixed issue with Wordfence Security detecting itself as malware. We messed up the version number in previous release. + += 3.6.6 = +* Added option to change AJAX polling frequency +* Fixed issue that caused whitelisted IP's to not be whitelisted. +* Added code that prevents blocking of Wordfence's API server (or Wordfence Security will cease to function) +* Added link at bottom of 'options' page to test connectivity to our API servers. +* Include any CURL error numbers in error reporting. +* Fixed issue that caused IP range blocking to not block access to login page. +* Fixed issue that caused cache files to be flagged as malicious. + += 3.6.5 = +* Fixed Fatal error: func_get_args(): Can't be used as a function parameter. +* This bug affected users using PHP older than 5.3.0 + += 3.6.4 = +* Fixed a major javascript bug that snuck in 2 releases ago and has disabled many features for Internet Explorer browsers. +* Clarified range blocking examples. + += 3.6.3 = +* Fixed 'max_user_connections' issue. +* Wordfence Security now uses WordPress's WPDB and this halves the number of DB connections Wordfence Security establishes to your DB. +* Wordfence Security is now HyperDB compatible. +* Advanced blocking i.e. Browser and IP Range blocking is now a free feature. +* We no longer disable Live Traffic if we detect a caching plugin. Based on user feedback, apparently live traffic actually works with those plugins. +* Fixed issue that causes site to crash if a conflicting GeoIP library is installed. +* Changed logHuman routine to do a LOW_PRIORITY MySQL update to speed things up. +* Login failure counter is now reset if you send yourself an unlock email so you're not locked out again after 1 failure. +* The free version of Wordfence Security is now supported with ads at the top of the admin pages. Please visit our sponsors and help keep Wordfence Security free! +* Fixed issue that may cause scans to not be scheduled using the default schedule for new users. +* There was no 3.6.2 release, in case you're wondering about the version skip. + += 3.6.1 = +* Major new release that includes the much asked for IP Range blocking with ISP blocking ability and browser blocking. +* Added Wordfence Security feature: WHOIS for IP's and Domains. Supports all registries and local rWhois +* Added Wordfence Security feature: Advanced Blocking to block IP ranges and browser patterns. +* Added Wordfence Security feature: WHOIS on live traffic pages. +* Added Wordfence Security feature: network blocking links on live traffic pages. +* Fixed bug where W3 Total Cache and WP Super Cache cache blocked Wordfence Security pages. +* Added explanation of how caching affects live traffic logging if we detect a caching plugin. +* Fixed AJAX loading to deal with multiple parallel ajax requests. +* Updated tour to include info on new WHOIS and Advanced Blocking features. +* Changed manual IP blocks to be permanent by default. +* Fixed issue in Wordfence Security that caused live traffic page not to reload when IP is unblocked. +* Modified "How does your site get IP's" config to avoid confusing new users. +* Changed 503 block message to be more helpful with link to FAQ on how to unblock. +* Removed redundant code in wfAPI.php +* Optimized code by moving firewall specific code to execute only if firewall is enabled. +* Fixed issue that caused "last attempted access" to show over 500 months ago. +* Fixed issue that was causing warning in getIP() code. +* Upgraded to Wordfence Security API version 2.6. + += 3.5.3 = +* This is the dev version. Stable is 3.5.2. +* Added detection for "hacked by badi" hack. Check if wp_options has been changed to UTF-7. + += 3.5.2 = +* IP detection is now much more robust. Admins must specify how their site gets IP addresses. +* Fixed issue that would throw Ajax ticker into a hard loop and put load on a server if user is on "options" page and WF can't detect IPs. +* Added support for Cloudflare proxies when getting client's real IP address. +* If we fail to get an IP and then get an IP succesfully, we update the activity log. +* Activity log update in case of successful IP acquisition will warn if we're getting internal RFC1918 IP's e.g. the IP of your firewall. + += 3.5.1 = +* Fixed issue with twentyten, twentyeleven, twentytwelve themes showing up as modified in 3.5. +* Fixed issue with wpdb->prepare throwing warnings. WordPress changed their code and we have now caught up. +* Fixed issue of files containing "silence is golden" showing up as being changed with no executable content. + += 3.4.5 = +* Fixed security issue of being able to list wordfence Security's own virtual dir on some server configurations. +* Fixed issue of WF using deprecated function which caused warnings or errors on install. +* Added link to security alert mailing list on "Scan" page next to manual start scan button and in tour. + += 3.4.4 = +* Fixed issue that caused scans to not complete. +* Fixed issue that caused scans to launch a large number of child processes due to very short scan timeout. +* Fixed issue that caused websites that don't know their own hostname to not be able to scan. +* Added workaround for a bug in Better WP Security breaking Wordfence Security due to their code overwriting the WP version. +* Optimized the way we calculate max execution time for each process while scanning. + += 3.4.1 = +* Removed wfscan.php script and now using pseudo-ajax calls to fire off scans. Much more reliable. +* Removed visitor.php script and now using pseudo-ajax calls to log human visits. +* Added config option to allow admin to specify max execution time (advanced only!!). +* Fixed issue that caused API calls to fail on MultiSite installs. +* Fixed issue that caused comments to break on MultiSite installs under certain conditions. +* Fixed issue that caused incorrect domain to be shown in live traffic view on multi-site installs. +* Fixed issue where some proxies/firewalls send space delimited IP addresses in HTTP headers and Wordfence Security now handles that. +* Fixed issue that caused Wordfence Security to capture activation errors of other plugins. +* Geo IP database update to November 7th edition. + += 3.3.7 = +* Upgrade immediately. Fixes possible XSS vulnerability in Wordfence Security "firewall unlock" form. +* Also added rate limiting to max of 10 requests per second to the unlock form. + += 3.3.5 = +* Re-releasing to try and fix an issue with the WordPress plugin distro system. + += 3.3.4 = +* Fixed bug that caused malformed URLs to be sent to scanning server which caused errors on some installations. +* Fixed issue that caused scans to "hang" or stall on larger sites during "Analyzing" phase when we hash files. Sites of arbitrary size can now be scanned. +* Fixed issue that caused "plugin generated X characters of unexpected output" error during install or upgrade. + += 3.3.3 = +* Fixed errors caused by ini_set being disabled on certain servers. +* Removed error logging messages in certain cases because some badly configured hosts write these errors to the web browser. +* Fixed getIP code that was evaluating arrays as strings in some cases. +* Added error logging so that if there is an activation error, the Wordfence Security will display the actual error to you. +* Fixed issue that caused scan to output "Could not get the administrator's user ID." when a user has changed their table prefixes under certain conditions. + += 3.3.2 = +* A complete rearchitecture of Wordfence Security scanning to massively improve performance. +* Our free customers are now 100% back in business. Apologies for the delay, but this was worth the wait. +* Wordfence Security is now 4X faster for both free and paid customers. +* Significantly reduced CPU and memory overhead. +* Significantly reduced network througput when communicating with Wordfence Security scanning servers. +* Big performance improvement on our own scanning servers which allows us to continue to provide Wordfence Security free for the forseeable future. +* Upgraded scanning API to version 2.4 +* Upgraded Geo IP database to October version. +* Moved core, theme, plugin and malware scanning into hashing recursive routine for big performance gain. +* Removed need for fileQ in hashing routine for reduction in memory usage and reduction in DB write size. +* Removed send-packet architecture and now processing files locally by fetching comparison data from scanning server instead. +* Removed wfModTracker - old module that is no longer used. +* Malware is now scanned by fetching hash prefixes from WF server instead of sending hashes of every file to our server. Much more efficient. +* Made status messages in summary console a little more user friendly. + += 3.2.7 = +* Fixed dates and times in activity log alert emails and other emails to be in site's local timezone. +* Added advanced country blocking options which allow bypass if a special URL is hit. +* Added warning in options page if alert email is not configured under alert checkboxes. +* Modified scan times to be within 60 minute window after scheduled time to prevent stampede at the top of the hour on our scanning server. +* Fixed bug on Godaddy and a few other hosts where viewing list of files not in the repo caused error. This was caused by posix functions not being supported on Godaddy and some other hosts. + += 3.2.6 = +* Paid feature: Remote site vulnerability and infection scanning. + += 3.2.5 = +* Moved all attack signatures out of the plugin to prevent Wordfence Security being detected as malicious in a false positive. + += 3.2.4 = +* Improved country blocking to make bulk adding/deleting of countries much easier. +* Fixed bug that caused Google feed fetcher and other Google UA bots to get blocked if blocking of unverified Googlebots was enabled. +* Fixed issue where Locked out users were shown having the same expiry time as Blocked IP's. +* Fixed issue where Locked out users were not shown in the locked out list, but were still locked out if Blocked IP and Locked out expiry was different. +* Improved performance of whitelisting so if whitelisted, all rules are bypassed. +* Fixed issue that caused twentyten and twentyeleven themes to be shown as missing core files if they have been removed and theme scanning is enabled. +* Fixed issue that made it impossible to end the tour for Firefox users. + += 3.2.1 = +* Theme and plugin scanning is now free. Woohoo! +* Added introductory tour for Wordfence Security. +* Upgraded to Wordfence Security scanning API version 2.0 to allow free theme and plugin scanning. +* Fixed two issue with scheduled scanning for premium users that would cause scans to not run or run at wrong times under certain conditions. +* Added feature to view unknown files on system to help clean badly infected systems. See on scanning page in "Tools" under yellow box. +* Fixed blocked countries overflowing their container in the user interface. +* Fixed case where if user is using MySQL >= 5.1.16 and doesn't have the "drop" privilege, they can't truncate the wfFileQueue table and it could grow uncontrollably. +* Updated to the new Libyan flag. +* Fixed mysql_ping() reconnection to DB generating warnings. +* Fixed issue that caused scans to hang. Wordfence Security now processes smaller batches of files before checking if it needs to fork. +* NOTE: We removed a list of shells we're scanning for because they were yielding false positives on some host scanning software. +* DNS fix from previous release backed out because it's no longer needed. (We temporarily hardcoded an IP) + += 3.1.6 = +* Emergency release to deal with DNS issue. + += 3.1.4 = +* Fixed SQL error in code that checks if IP blockedTime has expired. Changed column type to signed. +* Added detection of malicious injected titles with scripts or meta redirects. +* Fixed bug introduced in previous release that prevents blocked IP's from being blocked. + += 3.1.2 = +* Fixed permanent IP blocking bug which caused permanently blocked IP's to no longer display in the list after some time, even though there were still blocked. (Incorrect SQL query) +* Fixed "Can't get admin ID" on scan starts for both MU and single site installs. +* Improved status messages for sites with very large numbers of comments. +* Fixed bug that caused sites in subdirectories to not be able to view site config or run the memory test on the Wordfence Security "options" page. +* Fixed database disconnect bug (mysql server has gone away). An additional fix was required to finally squash this bug. +* Removed the code that prevented you from installing Wordfence Security on Windows. Sorry Windows customers! +* Improved scheduling so that it is now more reliable. +* Fixed bug that caused a loop for customers who could not contact the Wordfence Security servers on install. +* Added helpful message if you get the "can't connect to itself" error message with some additional documentation to help solve this issue. +* Improved error reporting when Wordfence Security can't connect to the scanning servers. Now features a helpful explanation rather than a generic message. +* Added Country Geo-Blocking feature for paid customers. +* Added Scan Scheduling feature for paid customers. + += 3.1.1 = +* Added another fix for "mysql server has gone away" error. Wordfence Security now makes sure the DB is still connected and reconnects if not. +* Added new detection for encoded malicious code in files. +* Fixed bug introduced yesterday that prevented permanent blocking of IP's. +* Improved ability to detect if we're running on Windows (but we don't support Windows yet). +* Issue intelligent warning if Wordfence Security can't read base WordPress directory. +* Don't activate Wordfence Security if user is running Windows. +* Cleaned up errors if a file can't be scanned due to permission restrictions. +* Improved reporting of which user scan is running as and how we determined who the admin user is. + += 3.1.0 = +* Changed the way we monitor disk space from % to warning on 20 megs and critical on 5 megs remaining. This deals with very large disks in a more rational way. (Thanks Yael M. and Ola A.) +* We now deal with cases where the $_SERVER variable contains an array instead of string for IP address. It seems that some installations modify the value into an array. (Thanks S.S.) +* The Wordfence Security DB connection now more reliably changes the mysql timeout for the session to prevent "mysql server has gone away" errors. (Thanks Peter A.) + += 3.0.9 = +* Fixed problem where scan process can't get admin ID. +* Fixed issue that caused permanent IP's to not be permanent. +* Fixed SQL error when calculating if IP block has expired. +* Fixed incorrect calling of is_404 that caused intermittent issues. +* Fixed basedir warnings when scan tries to scan files it does not have access to. +* Fixed warning and incorrect calculation of rows in DB. +* Added ability to get IP from "HTTP_X_REAL_IP" header of a front-end proxy is sending it. +* Fixed warning about HTTPS element not existing in getRequestedURL() +* Fixed problem with paid vs free keys getting confused. +* Fixed error with fetching vulnerability patterns. + += 3.0.8 = +* Fixed bug that caused "Could not get the administratorâs user ID. Scan canât continue." + += 3.0.7 = +* Fixed bug that caused scan to loop, stop halfway or not start for many sites. +* Fix bug that caused scan to not start on sites with thousands (over 20,000 in one case) users. +* Scan start is now faster for sites with large numbers of users. +* Fix bug that caused scan to get killed when checking passwords on sites with thousands of users. +* Wordfence Security now intelligently determines how to do a loopback request to kick off a scan. +* Scan is no longer called with a cron key in HTTP header but uses a query string value to authenticate itself which is more reliable. + += 3.0.6 = +* Improved malware and phishing URL detection. +* Upgraded to Wordfence Security API version 1.9 +* Fixed issue that caused large files to slow or crash a scan. +* Added workaround for PHP's broken filesize() function on 32 bit systems. +* Added an improved test mode for URL scanner for better unit testing on our end. +* Suppressed warnings issued when a reverse DNS lookup fails. +* Added improved debug output to becomeAdmin() function in scans to help diagnose scans not starting. + += 3.0.5 = +* Fixed "The key used to start a scan has expired." error and added data to help diagnose future issues like this. +* Removed HTTPHeaders from wfHits table which was using a lot of disk space and not used much. +* Removed limiting wfHits table size because it was unreliable. +* We're now limiting wfHits to 20,000 rows and the rows are much smaller. About 2 to 8 megs. +* Fixed bug that could have caused install routine to run repeatedly. +* Fixed typo bug in blocking code that didn't have any impact but was sloppy. +* Changed wfscan.php message when accessed directly to be more helpful. + += 3.0.4 = +* Detects if the Wordfence Security app (not scanner) is short on memory and requests more +* Fixes an issue where scan breaks if all scanning options are disabled + += 3.0.3 = +* Issue that caused all core files to show as missing has been fixed. +* We now handle all API server errors gracefully using exceptions. +* If your installation didn't activate correctly you now get a friendly message. +* Removed unused menu_config.php code. +* The 503 message now tells you why your access to the site has been limited so that admin's can tune firewall rules better. +* We no longer reuse the WordPress wpdb handle because we get better stability with our own connection. + += 3.0.2 = +* Overall this release is a very important upgrade. It drastically reduces memory usage on systems with large files from hundreds of megs to around 8 megs max memory used per scan. +* Moved queue of files that get processed to a new DB table to save memory. +* Reduced max size of tables before we truncate to avoid long DB queries. +* Reduced max size of wfStatus table from 100,000 rows to 1,000 rows. +* Introduced feature to kill hung or crashed scans reliably. +* Made scan locking much more reliable to avoid multiple concurrent scans hogging resources. +* Debug status messages are no longer written to the DB in non-debug mode. +* Modified the list of unknown files we receive back from the WF scanning servers to be a packed string rather than an array which is more memory efficient. +* Added summary at the end of scans to show the peak memory that Wordfence Security used along with server peak memory. +* Hashes are now progressively sent to Wordfence Security servers during scan to drastically reduce memory usage. +* Upgraded to Wordfence Security server API version 1.8 +* List of hosts that Wordfence Security URL scanner compiles now uses wfArray which is a very memory efficient packed binary structure. +* Writes that WF URL scanner makes to the DB are now batched into bulk inserts to reduce load on DB. +* Fixed bug in wfscan.php (scanning script) that could have caused scans to loop or pick up old data. +* Massively reduced the number of status messages we log, but kept very verbose logging for debug mode with a warning about DB load. +* Added summary messages instead of individual file scanning status messages which show files scanned and scan rate. +* Removed bin2hex and hex2bin conversions for scanning data which were slow, memory heavy and unneeded. +* Wordfence Security database class will now reuse the WordPress database handle from $wpdb if it can to reduce DB connections. + += 2.1.5 = +* Fixed bug that caused WF to not work when certain DB caching plugins are used and override wpdb object. +* Fixed Wordfence Security so activity log only shows our own errors unless in debug mode. +* Wordfence Security now deletes all it's tables and deletes all saved options when you deactivate the plugin. +* Removed all exit() on error statements. Critical errors are handled more gracefully by writing to the log instead. +* Fixed a bug that would cause a database loop until running out of memory under certain error conditions. +* Suppressed useless warnings that occur in environments with basedir set or where functions are disabled for security reasons. +* Removed redundant check that executed on every request and put it in activation instead. +* If serialization during scan breaks, exit gracefully instead of looping. +* Disk space in log is now shown as Gigabytes and formatted nicely. +* Removed wdie() function which is a little obnoxious. Writing to WF error log instead. +* Fixed bug where a non-empty but useless HTTP header can break getIP() function. +* Added useful data to error output if getIP() tells you it can't work on your system. +* Removed option to start scan in debug because it's no longer possible with a forked scan. +* Removed option to test process running time on a system because it breaks on most systems and confuses customers. +* Database connection errors no longer call die() but log an error instead in a way that removes the risk of a logging loop. +* Removed dropAll.php script because we now clean up tables on deactivate and it's not needed. +* Updated readme to show that we support 3.4. + += 2.1.4 = +* Fixed registered users not appearing in live traffic. +* Fixed temp file deletion bug that caused warnings and loops. +* Fixed issue that caused warning about WORDFENCE_VERSION +* Fixed Wordfence Security admin area not working under SSL +* Fixed bug that caused IP addresses of clients to be misinterpreted if there are multiple addresses from chained proxies. +* Now stripping port numbers from IP's which we weren't doing before. +* Added check for validity of IP's and report fatal error if it fails because this could lock users out. +* Improved error reporting including fixing an out of memory error when a specific error condition arose in wfConfig::set() +* Changed order of tmp dirs to be wordfence/lib protected dir first and then system temp dir. Added uploads as tmp dir for last resort. +* Malware URL's are now marked in red in alerts so it's obvious what the offending URL in a file is. + += 2.1.3 = +* Added fix for hosts that have max_allowed_packet set too small. We will write a temp file to disk instead if possible. +* Increased size of status column to 1000 chars + += 2.1.2 = +* Fixed issue with scan scheduling that caused a loop +* Fixed issue that caused version constant to not be included in scans + += 2.1.1 = +* Added ability to permanently block IP's +* Added ability to manually block IP's +* Made Wordfence Security more memory efficient, particularly the forking process. +* Fixed issue that caused WF to not work on databases with blank passwords. +* Wordfence Security now stops execution of a DB connection error is encountered. +* Clear cron jobs if Wordfence Security is uninstalled. +* Enabled hourly cron for Wordfence security network. +* Wordfence Security now works if your server doesn't have openssl installed +* Wordfence Security now works even if you don't have CURL +* Fixed visitor logging so it works with HTTPS websites. +* Alert emails now contain filenames in each alert description. +* Users with weak passwords alerts now contain the username in the email. +* Upgraded API to 1.7. +* Fixed issue that caused DISALLOW_FILE_MODS to make WF menu disappear. +* Modified wfDB to deal with very large queries without exceeding max_allowed_packet +* Fixed issue that broke ability to see file changes and repair files in security scan results. + += 2.1.0 = +* Fixed scans hanging on Dreamhost and other hosts. +* Made Wordfence Security more memory efficient. +* Wordfence Security scans are now broken into steps so we can scan a huge number of files, posts and comments. +* Alert emails now include IP address, hostname lookup and geographic location (city if available). +* Improved security scan locking. No longer time based but uses flock() if on unix or time on Windows. +* Suppressed warnings that WF was generating. +* Improve handling of non-standard wp-content directories. +* Fix restored files were still showing as changed if they contained international characters. +* Improve permission denied message if attempting to repair a file. +* Fixed problem that caused scans to not start because some hosts take too long to look up their own name. +* Fixed issue with Wordfence Security menu that caused it to not appear or conflict with other menus under certain conditions. +* Upgraded to security API version 1.6 +* Improved geo lookup code for IP's to improve security. +* Fixed debug mode output in live status box - coloring was wrong. +* Added ajax status message to WF admin pages. +* Fixed colorbox popup so that it doesn't jump around on refresh. + += 2.0.7 = +* Fixed CSS bug that changed plugins page layout in admin area +* Added memory benchmark utility. +* Added process runtime benchmark utility. +* Added ability to security scan in debug mode which accesses the scan app directly. + += 2.0.6 = +* Added IP whitelisting including ability to whitelist ranges that are excluded from firewall and login security measures. +* RFC1918 private networks and loopback address is automatically whitelisted to prevent firewall or login security blocking internal routers and proxy servers, internal firewalls and internal users. +* Added WORDFENCE_VERSION constant to improve version lookup performance. +* Fixed issue that caused security scans to not start and humans to not be logged in live traffic. Wordfence Security makes security scan script and visitors script executable on install or upgrade now. +* Fixed bug that caused disk space scanning to still show an issue found in security scan summary even when user chooses to ignore the security issue. +* Made disk space thresholds 1 and 1.5% space remaining because many hosts have very large disks where 1% is gigabytes. +* Made wordfence Security database handle cache deal with concurrent connections to different databases. +* Improved Wordfence Security database library's error reporting. +* Improved performance when Wordfence Security looks up it's own version during security scans and other operations. +* Removed three rules in base wordfence Security htaccess that could cause 500 errors on servers that don't allow these options to be overridden. Does not affect htaccess security because we inherit the base htaccess and still protect our lib/ directory with our own htaccess. + += 2.0.5 = +* If your plugin PHP files are viewable by the world, we now give you a detailed warning on the seriousness of this security threat with ability to view the offending .htaccess files. +* Added a debug mode in options for very verbose logging and marking errors in red. +* Added more logging for the process that starts the security scan. +* Ability to securely view the entire activity log added. +* Using plugin version in all CSS URL's instead of API version. +* Activity log microtime is more accurate now. +* Fixed bug that would cause security scanning of PHP files with base64 content to stop. + += 2.0.4 = +* Now security scanning all comments, posts and pages on multi-site installation for malware and phishing URL's. Significant security enhancement. +* Improved messages on multisite when a bad comment or post is found. +* Fixed bug that caused paid users to not be able to activate their premium key. +* Made upgrade process much friendlier. +* Got rid of GeSHi syntax highlighting because it segfaults and is resource intensive. Using built in PHP highlighting instead. +* Message asking you to configure an alert email address only appears for 3 pageviews after plugin activation so it's less irritating. +* Fixed bug for MU users that caused WF to tell you that your WF schema is missing and you need to reactivate. +* Fixed bug that caused malware URL security scanner to not work for MU users. + += 2.0.3 = +* Removed unbuffered queries and switched to conventional queries that are memory efficient for better stability. +* Made security scanning large numbers of URL's contained in things like awstats log files extremely memory efficient and way faster. +* Removed alerts about unknown files in core directory if they belong to an older wordpress version and are unchanged. +* Other performance improvements like using strpos instead of strstr. +* Moved "scan files outside base dir" option to be in correct place on config page. + += 2.0.2 = +* Fixed plugin upgrades so that css and scripts are not cached across versions. + += 2.0.1 = +* Improved security scanning for specific attacks being used in the PHP-CGI vulnerability ( CVE-2012-1823) +* API keys no longer required. WF fetches a temporary anonymous API key for you on activation. +* Added real-time activity log on scan page. +* Added real-time summary updates on scan page. +* Fixed ability to view files that have symlinks in path. +* Added message to configure alert email address for multi-site and single site installs on activation. +* Disabled firewall security rules by default because most sites don't need them. +* Disabled blocking of fake googlebots except for high security levels to prevent users who like to pretend they're googlebot from blocking themselves. +* Geshi the syntax highlighter now asks for more memory before running. +* Fixed bug that caused scan to hang on very large files. +* Added an index to wfStatus to make it faster for summary statuses +* Removed multisite pre-activation check to make activation more reliable on multisite installs. +* Better problem reporting if you trashed your Wordfence Security schema but the plugin is still installed. + += 1.5.6 = +* Removed use of nonces and purely using 30 minute key for unlocking emails. +* Fixed bug that caused admin emails to not get emailed when requesting unlocking email. +* Fixed minor issue with undefined array in issues loop. + += 1.5.5 = +* Added ability for admin's to unlock login and unblock their IP addresses if they're accidentally locked out by the firewall or login security. Uses two security tokens to prevent abuse. +* Admins can now also disable firewall and login security from the unlock-me email, just in case of emergency. +* Made advanced security options visible so you know they exist. +* Fixed dns_get_record() function not existing bug on Windows sytems pre PHP 5.3.0. Was causing scans to hang. +* Increased login lockout defaults to be much higher which still protects against brute force hacks. +* Removed CURLOPT_MAXREDIRS in curl to avoid safe mode warnings. +* Fixed ability to view and diff files on blogs installed in subdirectories. +* Fixed ability to see individual IP hits on subdir sites. +* Plugin and theme update messages now include links to the upgrade page. +* Removed the link on the login form that mentions the site is protected by Wordfence Security. +* Changed lockout defaults to be much higher. +* Added options for higher number of failures before lockout in options page for configurable login security. +* Now including plugin version in the activity log when the admin chooses to email it to us for debugging. + += 1.5.4 = +* Admin can now select to scan outside the WordPress base dir and standard WordPress directories. +* Max memory size for scans is now configurable for larger installations. 256M is the default. +* Changed maximum scan time to 10 minutes. + += 1.5.3 = +* A harmless cosmetic error was being thrown up when some security scans started. Fixed that. + += 1.5.2 = +* Changed max scan time to 30 mins. + += 1.5.1 = +* Fixed a bug that caused scans to crash when permissions don't allow a directory to be read. + += 1.4.8 = +* WP repo didn't deploy the zip file correctly so recreating the version tag. + += 1.4.7 = +* Vastly improved error logging including catching fatal PHP errors and logging them to status log. +* Fixed accidental preg_replace variable interpolation. +* Syntax fixes (various) + += 1.4.6 = +* Increased memory available to Wordfence Security to 256M during security scans, configurable in wordfenceConstants.php +* Improved memory logging during security scans. Current memory usage is now shown on the far right of filenames while scans occur. + += 1.4.5 = +* Bugfix - fixed bug that caused Wordfence Security menu to dissapear. + += 1.4.4 = +* WordPress Multi-site support added. Currently in Beta. Tested with subdomains, not subdirectories, but it should work great on both. +* Main changes are moving menus to the Network Admin area, preventing individual blogs from enabling the plugin and dealing with database prefix issues. + += 1.4.3 = +* Improved diagnistic information on binary and regular API calls for better debugging. +* Changed ticker to only show activity with level < 3 + += 1.4.2 = +* Email to send security alerts to is now configured at the same time an API key is entered. +* phpinfo is emailed along with activity log when user requests to send us activity log so that we can see things like PHP max execution time and other relevant data +* Now writing individual files to activity log during security scans for better diagnostics. +* Login security message. +* Updated readme.txt FAQ and description. +* Fixed bug where sites with self signed SSL security certificate never start scan because cert fails security check. +* Increased API curl timeout to 300 for slower hosts that seem affected during URL security scans. + += 1.4.1 = +* This is a major release of Wordfence Security, please upgrade immediately. +* Only scan files in the WordPress ABSPATH root directory and known WordPress subdirectories. Prevents potentially massive scans on hosts that have large dirs off their wordpress root. +* Don't generate plain SHA hashes anymore because we don't currently use them on the server side for scanning. (Still generates md5's and SHAC) +* No longer do change tracking on files before scans because the change tracking does almost the same amount of work when generating hashes as the actual scan. So just do the scan, which is now faster. +* Updated internal version to 1.2 to use new code on the server side which sends back a list of unknown files rather than known files, which is usually smaller and more network efficient. +* Improved logging in activity log. +* Removed SSL peer verification because some hosts have bad cert config. Connection to our servers is still via SSL to enhance security. +* Fixed a few minor issues. Overall you should notice that scans are much faster now. + += 1.3.3 = +* Made real-time server polling more efficient. +* Entering your API key now automatically starts your first scan. Was causing some confusion. + += 1.3.2 = +* Reduced the number of database connections that Wordfence Security makes to one. +* Modified the memory efficient unbuffered queries we use to only use a single DB connection. +* Removed status updates during post and comment scans which prevents interference with unbuffered queries and makes the scans even faster. + += 1.3.1 = +* Fixed a bug where if you have the plugin "secure-wordpress" installed, you can't do a Wordfence Security scan because it says you have the wrong version. This is because secure-wordpress trashes the $wp_version global variable to hide your version rather than using the filters provided by WordPress. So coded a workaround so that your Wordfence Security scans will work with that plugin installed. + += 1.3 = +* Minor fix to point to the correct binary API URL on the Wordfence Security cloud servers. + += 1.2 = +* It is now free to get a Wordfence Security API key. +* Premium keys include theme and plugin file security verification which consumes resources on the Wordfence Security servers. +* Various bugfixes and performance enhancements. + += 1.1 = +* Initial public release of Wordfence Security Plugin. + +== Upgrade Notice == += 3.1.1 = +Upgrade immediately. Fixes bug introduced in last release that broke permenent IP blocking. + += 3.0.9 = +Upgrade immediately. Fixes two security critical bugs: Could not get admin ID bug and permanent IP blocks not staying permanent. + += 3.0.6 = +Upgrade immediately. Improves malware URL detection by 20% or more to improve security. + += 3.0.3 = +Upgrade immediately. This release fixes an issue that caused Wordfence Security to show all your core files +missing under certain conditions. It was usually caused by high load on our scanning server and the +plugin not handling an error condition halfway through the scan correctly. + += 3.0.2 = +Upgrade immediately. This release drastically reduces memory, reduces new DB connections created by +Wordfence Security to zero (we simply reuse the WordPress DB handle), reduces the number of DB queries to +about 1% of the previous version by removing unneeded status messages and fixes a bug that +could cause Wordfence Security to launch multiple concurrent scans that can put high load on your system. +This is a critical release. Upgrade immediately. + +||||||| .r0 +======= === Wordfence Security === Contributors: mmaunder Tags: wordpress, security, performance, speed, caching, cache, caching plugin, wordpress cache, wordpress caching, wordpress security, security plugin, secure, anti-virus, malware, firewall, antivirus, virus, google safe browsing, phishing, scrapers, hacking, wordfence, securty, secrity, secure, two factor, cellphone sign-in, cellphone signin, cellphone, twofactor, security, secure, htaccess, login, log, users, login alerts, lock, chmod, maintenance, plugin, private, privacy, protection, permissions, 503, base64, injection, code, encode, script, attack, hack, hackers, block, blocked, prevent, prevention, RFI, XSS, CRLF, CSRF, SQL Injection, vulnerability, website security, WordPress security, security log, logging, HTTP log, error log, login security, personal security, infrastructure security, firewall security, front-end security, web server security, proxy security, reverse proxy security, secure website, secure login, two factor security, maximum login security, heartbleed, heart bleed, heartbleed vulnerability, openssl vulnerability, nginx, litespeed, php5-fpm, woocommerce support, woocommerce caching, IPv6, IP version 6 @@ -1250,3 +2544,4 @@ about 1% of the previous version by removing unneeded status messages and fixes could cause Wordfence Security to launch multiple concurrent scans that can put high load on your system. This is a critical release. Upgrade immediately. +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/tmp/configCache.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/tmp/configCache.php index 78af6712..6fa94888 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/tmp/configCache.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/tmp/configCache.php @@ -1,4 +1,10 @@ +<<<<<<< .mine a:16:{s:9:"cacheType";s:0:"";s:15:"firewallEnabled";s:1:"1";s:6:"apiKey";s:160:"d45f5f2f42eaac0be6c3c722cc945eba21997fc51939ef3a56eb943f2c782b2b3b49a9f704c120f70c15944ac4f2fe8bdb7b8a6efd50f08861665c3f324a801382953624571ec6a99b5becadeb782475";s:9:"howGetIPs";s:0:"";s:18:"liveTrafficEnabled";s:1:"1";s:14:"disableCookies";s:1:"0";s:26:"loginSec_disableAuthorScan";s:1:"1";s:25:"liveTraf_ignorePublishers";s:1:"1";s:19:"other_hideWPVersion";s:1:"1";s:10:"tourClosed";s:0:"";s:17:"actUpdateInterval";s:0:"";s:7:"debugOn";s:1:"0";s:13:"welcomeClosed";s:1:"1";s:38:"email_summary_dashboard_widget_enabled";s:1:"1";s:22:"email_summary_interval";s:8:"biweekly";s:11:"whitelisted";s:0:"";} \ No newline at end of file +?>a:27:{s:9:"cacheType";s:0:"";s:9:"howGetIPs";s:0:"";s:6:"apiKey";s:160:"39772cda7687ebf11c5ac11e91d5acf12c8e8cd0385aa1855ec379bd4cd5b9b8d725891c199356e4fccabde3e21f59bb5134b72f33c46680ad30d6cf3531d8d8a64957380db8f97c8728654983c03f87";s:20:"loginSec_lockoutMins";s:1:"5";s:19:"other_hideWPVersion";s:1:"1";s:15:"firewallEnabled";s:1:"1";s:11:"whitelisted";s:0:"";s:6:"isPaid";s:0:"";s:11:"blockedTime";s:3:"300";s:12:"neverBlockBG";s:18:"neverBlockVerified";s:13:"blockFakeBots";s:1:"0";s:10:"bannedURLs";s:0:"";s:18:"other_blockBadPOST";s:1:"0";s:18:"liveTrafficEnabled";s:1:"1";s:14:"disableCookies";s:1:"0";s:17:"actUpdateInterval";s:1:"2";s:7:"debugOn";s:1:"0";s:10:"tourClosed";s:1:"1";s:13:"welcomeClosed";s:1:"1";s:10:"autoUpdate";s:1:"1";s:11:"alertEmails";s:40:"test+pavillonmadeleine@cubedesigners.com";s:26:"loginSec_disableAuthorScan";s:1:"1";s:18:"liveTraf_ignoreIPs";s:0:"";s:17:"liveTraf_ignoreUA";s:0:"";s:17:"maxGlobalRequests";s:8:"DISABLED";s:17:"maxRequestsHumans";s:8:"DISABLED";s:6:"encKey";s:16:"2d12ad07b66ecd65";}||||||| .r0 +======= +a:16:{s:9:"cacheType";s:0:"";s:15:"firewallEnabled";s:1:"1";s:6:"apiKey";s:160:"d45f5f2f42eaac0be6c3c722cc945eba21997fc51939ef3a56eb943f2c782b2b3b49a9f704c120f70c15944ac4f2fe8bdb7b8a6efd50f08861665c3f324a801382953624571ec6a99b5becadeb782475";s:9:"howGetIPs";s:0:"";s:18:"liveTrafficEnabled";s:1:"1";s:14:"disableCookies";s:1:"0";s:26:"loginSec_disableAuthorScan";s:1:"1";s:25:"liveTraf_ignorePublishers";s:1:"1";s:19:"other_hideWPVersion";s:1:"1";s:10:"tourClosed";s:0:"";s:17:"actUpdateInterval";s:0:"";s:7:"debugOn";s:1:"0";s:13:"welcomeClosed";s:1:"1";s:38:"email_summary_dashboard_widget_enabled";s:1:"1";s:22:"email_summary_interval";s:8:"biweekly";s:11:"whitelisted";s:0:"";}>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email-inline.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email-inline.php index 64a92e62..55184c96 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email-inline.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email-inline.php @@ -1,3 +1,344 @@ +<<<<<<< .mine +%s to %s', $report_start, $report_end); +$bg_colors = array( + 'even' => 'background-color: #eeeeee;', + 'odd' => '', +); +?> + + + + + + <?php echo esc_html(strip_tags($title)) ?> + + + + + + + + + + + + + +

+ +

+ This email was sent from your website and is a summary of security related activity that Wordfence monitors for the period . NOTE: You are using the free version of Wordfence and are missing out on features like cellphone sign-in, country blocking and detecting if your site IP is sending spam. Click here to upgrade to Wordfence Premium now. +

+ +

+ Top 10 IP's Blocked +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

IP	Country	Block Count
`IP) ?>`	+ countryCode): ?> + + + countryCode) ?> + + (Unknown) + +	blockCount ?>
+ No data currently. +

+ +

+ Update Blocked IPs +

+ + + +

Top 10 Countries Blocked

+ + + + + + + + + + + + + + + + + + + + + + + + + +

Country	Total IPs Blocked	Block Count
+ countryCode): ?> + + + countryCode) ?> + + (Unknown) + +	totalIPs) ?>	totalBlockCount ?>
+ No data currently. +

+ +

+ Update Blocked Countries +

+ + + +

Top 10 Failed Logins

+ + + + + + + + + + + + + + + + + + + + + + + + + +

Username	Login Attempts	Existing User
username) ?>	fail_count) ?>	is_valid_user ? 'Yes' : 'No' ?>
+ No failed logins yet. +

+ +

+ Update Login Security Options +

+ + + +

Recently Modified Files

+ + + + + + + + + + + + + + + + + +

Modified	File
modTime($mod_time) ?>	+ displayFile($file)) ?> +

+ + + +

Updates Needed

+ + +

Core

A new version of WordPress (v) is available.

+ + +

Plugins

+ A new version of the plugin "" is available. +

+ + +

Themes

+ A new version of the theme "" is available. +

+ + + +

+ Update Now +

+ +

+ No updates are available at this time. +

+ + +

+ If you would like to sign-in to please click here now. You can change the frequency of this email or turn it on and off by visiting your Wordfence options page. +

+ + + +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email.php index 61bfad41..d819fcf1 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/views/reports/activity-report-email.php @@ -1,3 +1,471 @@ +<<<<<<< .mine + + + + + + + <?php echo esc_html($title) ?> + + + + + + + + + + + + + + + + + +

+ Activity for week of
+

+ +

Top 10 IP's Blocked

+ + + + + + + + + + + + + + + + + + + + +

IP	Country	Block Count
`IP) ?>`	+ countryCode): ?> + + + countryCode) ?> + + (Unknown) + +	blockCount ?>

+ +

+ Update Blocked IPs +

+ + + +

Top 10 Countries Blocked

+ + + + + + + + + + + + + + + + + + +

Country	Total IPs Blocked	Block Count
+ countryCode): ?> + + + countryCode) ?> + + (Unknown) + +	totalIPs) ?>	totalBlockCount ?>

+ +

+ Update Blocked Countries +

+ + + +

Top 10 Failed Logins

+ + + + + + + + + + + + + + + + + + +

Username	Login Attempts	Existing User
username) ?>	fail_count) ?>	is_valid_user ? 'Yes' : 'No' ?>

+ +

+ Update Login Security Options +

+ + + +

Recently Modified Files

+ + + + + + + + + + + + + + + + +

Modified	File
modTime($mod_time) ?>	+ displayFile($file)) ?> +

+ + + +

Updates Needed

+ + +

Core

A new version of WordPress (v) is available.

+ + +

Plugins

+ A new version of the plugin "" is available. +

+ + +

Themes

+ A new version of the theme "" is available. +

+ + + +

Update Now

+ + + + +

+ + + +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordfence/wordfence.php b/pavillonmadeleine.fr/wp-content/plugins/wordfence/wordfence.php index 4b53095f..6b18cc6c 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordfence/wordfence.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordfence/wordfence.php @@ -1,3 +1,35 @@ +<<<<<<< .mine + +||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/.codeclimate.yml b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/.codeclimate.yml new file mode 100644 index 00000000..a48b566a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/.codeclimate.yml @@ -0,0 +1,10 @@ +# Save as .codeclimate.yml (note leading .) in project root directory +languages: + JavaScript: true + PHP: true +exclude_paths: +- "tests/*" +- "grunt/*" +- "grunt/**/*" +- "js/jquery.qtip*" +- "js/dist/**/*" \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/README.md b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/README.md index 942b616d..2e81557e 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/README.md +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/README.md @@ -54,3 +54,4 @@ There are various ways you can contribute: * Send us a Pull Request with your bug fixes and/or new features. * [Translate Yoast SEO into different languages](http://translate.yoast.com/projects/wordpress-seo/). * Provide feedback and [suggestions on enhancements](https://github.com/yoast/wordpress-seo/issues?direction=desc&labels=Enhancement&page=1&sort=created&state=open). + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax.php index 6b354a63..daaddddd 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax.php @@ -10,6 +10,23 @@ if ( ! defined( 'WPSEO_VERSION' ) ) { } /** +<<<<<<< .mine + * @todo this whole thing should probably be a proper class. + */ + +/** + * Convenience function to JSON encode and echo results and then die + * + * @param array $results Results array for encoding. + */ +function wpseo_ajax_json_echo_die( $results ) { + echo WPSEO_Utils::json_encode( $results ); + die(); +} + +/** +||||||| .r11156 +======= * @todo this whole thing should probably be a proper class. */ @@ -24,6 +41,7 @@ function wpseo_ajax_json_echo_die( $results ) { } /** +>>>>>>> .r12027 * Function used from AJAX calls, takes it variables from $_POST, dies on exit. */ function wpseo_set_option() { @@ -140,7 +158,16 @@ function wpseo_ajax_replace_vars() { global $post; check_ajax_referer( 'wpseo-replace-vars' ); +<<<<<<< .mine + $post = get_post( intval( filter_input( INPUT_POST, 'post_id' ) ) ); + global $wp_query; + $wp_query->queried_object = $post; + $wp_query->queried_object_id = $post->ID; +||||||| .r11156 + $post = get_post( $_POST['post_id'] ); +======= $post = get_post( intval( filter_input( INPUT_POST, 'post_id' ) ) ); +>>>>>>> .r12027 $omit = array( 'excerpt', 'excerpt_only', 'title' ); echo wpseo_replace_vars( stripslashes( filter_input( INPUT_POST, 'string' ) ), $post, $omit ); die; @@ -167,9 +194,18 @@ function wpseo_save_description() { add_action( 'wp_ajax_wpseo_save_metadesc', 'wpseo_save_description' ); /** +<<<<<<< .mine + * Save titles & descriptions + * + * @param string $what Type of item to save (title, description). +||||||| .r11156 + * Helper function for updating an existing seo title or create a new one + * if it doesn't already exist. +======= * Save titles & descriptions * * @param string $what +>>>>>>> .r12027 */ function wpseo_save_what( $what ) { check_ajax_referer( 'wpseo-bulk-editor' ); @@ -186,6 +222,17 @@ function wpseo_save_what( $what ) { /** * Helper function to update a post's meta data, returning relevant information * about the information updated and the results or the meta update. +<<<<<<< .mine + * + * @param int $post_id Post ID. + * @param string $new_meta_value New meta value to record. + * @param string $orig_meta_value Original meta value. + * @param string $meta_key Meta key string. + * @param string $return_key Return key string to use in results. + * + * @return string +||||||| .r11156 +======= * * @param int $post_id * @param string $new_meta_value @@ -194,6 +241,7 @@ function wpseo_save_what( $what ) { * @param string $return_key * * @return string +>>>>>>> .r12027 */ function wpseo_upsert_meta( $post_id, $new_meta_value, $orig_meta_value, $meta_key, $return_key ) { @@ -262,6 +310,29 @@ function wpseo_upsert_meta( $post_id, $new_meta_value, $orig_meta_value, $meta_k * Save all titles sent from the Bulk Editor. */ function wpseo_save_all_titles() { +<<<<<<< .mine + wpseo_save_all( 'title' ); +} + +add_action( 'wp_ajax_wpseo_save_all_titles', 'wpseo_save_all_titles' ); + +/** + * Save all description sent from the Bulk Editor. + */ +function wpseo_save_all_descriptions() { + wpseo_save_all( 'metadesc' ); +} + +add_action( 'wp_ajax_wpseo_save_all_descriptions', 'wpseo_save_all_descriptions' ); + +/** + * Utility function to save values + * + * @param string $what Type of item so save. + */ +function wpseo_save_all( $what ) { +||||||| .r11156 +======= wpseo_save_all( 'title' ); } @@ -282,6 +353,7 @@ add_action( 'wp_ajax_wpseo_save_all_descriptions', 'wpseo_save_all_descriptions' * @param string $what */ function wpseo_save_all( $what ) { +>>>>>>> .r12027 check_ajax_referer( 'wpseo-bulk-editor' ); // @todo the WPSEO Utils class can't filter arrays in POST yet. @@ -300,6 +372,18 @@ function wpseo_save_all( $what ) { } /** +<<<<<<< .mine + * Insert a new value + * + * @param string $what Item type (such as title). + * @param int $post_id Post ID. + * @param string $new New value to record. + * @param string $original Original value. + * + * @return string +||||||| .r11156 + * Save an individual meta description from the Bulk Editor. +======= * Insert a new value * * @param string $what @@ -308,10 +392,12 @@ function wpseo_save_all( $what ) { * @param string $original * * @return string +>>>>>>> .r12027 */ function wpseo_upsert_new( $what, $post_id, $new, $original ) { $meta_key = WPSEO_Meta::$meta_prefix . $what; +<<<<<<< .mine return wpseo_upsert_meta( $post_id, $new, $original, $meta_key, $what ); } @@ -324,25 +410,166 @@ function wpseo_get_export() { $export = new WPSEO_Export( $include_taxonomy ); wpseo_ajax_json_echo_die( $export->get_results() ); +||||||| .r11156 + check_ajax_referer( 'wpseo-bulk-editor' ); + + $new_metadesc = $_POST['new_value']; + $id = intval( $_POST['wpseo_post_id'] ); + $original_metadesc = $_POST['existing_value']; + + $results = wpseo_upsert_new_description( $id, $new_metadesc, $original_metadesc ); + + echo json_encode( $results ); + die(); +======= + return wpseo_upsert_meta( $post_id, $new, $original, $meta_key, $what ); +>>>>>>> .r12027 } +<<<<<<< .mine add_action( 'wp_ajax_wpseo_export', 'wpseo_get_export' ); +||||||| .r11156 +add_action( 'wp_ajax_wpseo_save_metadesc', 'wpseo_save_description' ); + +======= +>>>>>>> .r12027 +/** +<<<<<<< .mine + * Handles the posting of a new FB admin. +||||||| .r11156 + * Helper function to create or update a post's meta description. +======= + * Create an export and return the URL +>>>>>>> .r12027 + */ +<<<<<<< .mine +function wpseo_add_fb_admin() { + check_ajax_referer( 'wpseo_fb_admin_nonce' ); +||||||| .r11156 +function wpseo_upsert_new_description( $post_id, $new_metadesc, $original_metadesc ) { +======= +function wpseo_get_export() { +>>>>>>> .r12027 + +<<<<<<< .mine + if ( ! current_user_can( 'manage_options' ) ) { + die( '-1' ); + } + + $facebook_social = new Yoast_Social_Facebook(); + + wp_die( $facebook_social->add_admin( filter_input( INPUT_POST, 'admin_name' ), filter_input( INPUT_POST, 'admin_id' ) ) ); +||||||| .r11156 + $meta_key = WPSEO_Meta::$meta_prefix . 'metadesc'; + $return_key = 'metadesc'; + return wpseo_upsert_meta( $post_id, $new_metadesc, $original_metadesc, $meta_key, $return_key ); +======= + $include_taxonomy = ( filter_input( INPUT_POST, 'include_taxonomy' ) === 'true' ); + $export = new WPSEO_Export( $include_taxonomy ); + + wpseo_ajax_json_echo_die( $export->get_results() ); +>>>>>>> .r12027 +} + +<<<<<<< .mine +add_action( 'wp_ajax_wpseo_add_fb_admin', 'wpseo_add_fb_admin' ); + +||||||| .r11156 +======= +add_action( 'wp_ajax_wpseo_export', 'wpseo_get_export' ); + +>>>>>>> .r12027 /** +<<<<<<< .mine + * Retrieves the keyword for the keyword doubles. +||||||| .r11156 + * Save all description sent from the Bulk Editor. +======= * Handles the posting of a new FB admin. +>>>>>>> .r12027 */ +<<<<<<< .mine +function ajax_get_keyword_usage() { + $post_id = filter_input( INPUT_POST, 'post_id' ); + $keyword = filter_input( INPUT_POST, 'keyword' ); +||||||| .r11156 +function wpseo_save_all_descriptions() { + check_ajax_referer( 'wpseo-bulk-editor' ); +======= function wpseo_add_fb_admin() { check_ajax_referer( 'wpseo_fb_admin_nonce' ); +>>>>>>> .r12027 +<<<<<<< .mine + wp_die( + WPSEO_Utils::json_encode( WPSEO_Meta::keyword_usage( $keyword, $post_id ) ) + ); +} +||||||| .r11156 + $new_metadescs = $_POST['items']; + $original_metadescs = $_POST['existing_items']; +======= if ( ! current_user_can( 'manage_options' ) ) { die( '-1' ); } +>>>>>>> .r12027 +<<<<<<< .mine +add_action( 'wp_ajax_get_focus_keyword_usage', 'ajax_get_keyword_usage' ); +||||||| .r11156 + $results = array(); +======= $facebook_social = new Yoast_Social_Facebook(); +>>>>>>> .r12027 + +<<<<<<< .mine +/** + * Retrieves the keyword for the keyword doubles of the termpages. + */ +function ajax_get_term_keyword_usage() { + $post_id = filter_input( INPUT_POST, 'post_id' ); + $keyword = filter_input( INPUT_POST, 'keyword' ); + $taxonomy = filter_input( INPUT_POST, 'taxonomy' ); + wp_die( + WPSEO_Utils::json_encode( WPSEO_Taxonomy_Meta::get_keyword_usage( $keyword, $post_id, $taxonomy ) ) + ); +||||||| .r11156 + if ( is_array( $new_metadescs ) && $new_metadescs !== array() ) { + foreach ( $new_metadescs as $id => $new_metadesc ) { + $original_metadesc = $original_metadescs[ $id ]; + $results[] = wpseo_upsert_new_description( $id, $new_metadesc, $original_metadesc ); + } + } + echo json_encode( $results ); + die(); +======= wp_die( $facebook_social->add_admin( filter_input( INPUT_POST, 'admin_name' ), filter_input( INPUT_POST, 'admin_id' ) ) ); +>>>>>>> .r12027 } +<<<<<<< .mine +add_action( 'wp_ajax_get_term_keyword_usage', 'ajax_get_term_keyword_usage' ); + +// Crawl Issue Manager AJAX hooks. +new WPSEO_GSC_Ajax; + +// SEO Score Recalculations. +new WPSEO_Recalculate_Scores_Ajax; + +new Yoast_Dashboard_Widget(); + +new Yoast_OnPage_Ajax(); + +new WPSEO_Shortcode_Filter(); + +// Setting the notice for the recalculate the posts. +new Yoast_Dismissable_Notice_Ajax( 'recalculate', Yoast_Dismissable_Notice_Ajax::FOR_SITE ); +||||||| .r11156 +add_action( 'wp_ajax_wpseo_save_all_descriptions', 'wpseo_save_all_descriptions' ); +======= add_action( 'wp_ajax_wpseo_add_fb_admin', 'wpseo_add_fb_admin' ); new Yoast_Dashboard_Widget(); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-recalculate-scores-ajax.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-recalculate-scores-ajax.php new file mode 100644 index 00000000..d5571995 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-recalculate-scores-ajax.php @@ -0,0 +1,192 @@ + 'any', + 'meta_key' => '_yoast_wpseo_focuskw', + ); + + /** + * @var array The options stored in the database + */ + private $options; + + /** + * Initialize the AJAX hooks + */ + public function __construct() { + add_action( 'wp_ajax_wpseo_recalculate_scores', array( $this, 'recalculate_scores' ) ); + add_action( 'wp_ajax_wpseo_update_score', array( $this, 'save_score' ) ); + } + + /** + * Start recalculation + */ + public function recalculate_scores() { + check_ajax_referer( 'wpseo_recalculate', 'nonce' ); + wp_die( + $this->get_posts( filter_input( INPUT_POST, 'paged', FILTER_VALIDATE_INT ) ) + ); + } + + /** + * Saving the new linkdex score for given post + */ + public function save_score() { + check_ajax_referer( 'wpseo_recalculate', 'nonce' ); + + $scores = filter_input( INPUT_POST, 'scores', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ); + foreach ( $scores as $score ) { + WPSEO_Meta::set_value( 'linkdex', $score['score'], $score['post_id'] ); + } + wp_die(); + } + + /** + * Getting the posts from the database by doing a WP_Query. + * + * @param integer $paged The page. + * + * @return string + */ + private function get_posts( $paged ) { + $post_query = new WP_Query( + array_merge( + $this->query_fields, + array( + 'posts_per_page' => $this->posts_per_page, + 'paged' => $paged, + 'posts' => array(), + ) + ) + ); + + if ( $posts = $post_query->get_posts() ) { + $this->options = WPSEO_Options::get_all(); + + $parsed_posts = $this->parse_posts( $posts ); + + $response = array( + 'posts' => $parsed_posts, + 'total_posts' => count( $parsed_posts ), + 'next_page' => ( $paged + 1 ), + ); + + return json_encode( $response ); + } + + return ''; + } + + /** + * Parsing the posts with the value we need + * + * @param array $posts The posts to parse. + * + * @return array + */ + private function parse_posts( array $posts ) { + $parsed_posts = array(); + foreach ( $posts as $post ) { + $parsed_posts[] = $this->post_to_response( $post ); + } + + return $parsed_posts; + } + + /** + * @param WP_Post $post The post for which to build the analyzer data. + * + * @return array + */ + private function post_to_response( WP_Post $post ) { + $focus_keyword = WPSEO_Meta::get_value( 'focuskw', $post->ID ); + + return array( + 'post_id' => $post->ID, + 'text' => $post->post_content, + 'keyword' => $focus_keyword, + 'url' => urldecode( $post->post_name ), + 'pageTitle' => apply_filters( 'wpseo_title', wpseo_replace_vars( $this->get_title( $post->ID, $post->post_type ), $post ) ), + 'meta' => apply_filters( 'wpseo_metadesc', wpseo_replace_vars( $this->get_meta_description( $post->ID, $post->post_type ), $post ) ), + 'keyword_usage' => array( + $focus_keyword => WPSEO_Meta::keyword_usage( $focus_keyword, $post->ID ), + ), + ); + } + + /** + * Getting the title for given post + * + * @param integer $post_id The ID of the post for which to get the title. + * @param string $post_type The post type. + * + * @return mixed|string + */ + private function get_title( $post_id, $post_type ) { + if ( ( $title = WPSEO_Meta::get_value( 'title', $post_id ) ) !== '' ) { + return $title; + } + + if ( $default_from_options = $this->default_from_options( 'title', $post_type ) ) { + return str_replace( ' %%page%% ', ' ', $default_from_options ); + } + + return '%%title%%'; + } + + /** + * Getting the meta description for given post + * + * @param integer $post_id The ID of the post for which to get the meta description. + * @param string $post_type The post type. + * + * @return bool|string + */ + private function get_meta_description( $post_id, $post_type ) { + if ( ( $meta_description = WPSEO_Meta::get_value( 'metadesc', $post_id ) ) !== '' ) { + return $meta_description; + } + + if ( $default_from_options = $this->default_from_options( 'metadesc', $post_type ) ) { + return $default_from_options; + } + + return ''; + } + + /** + * Getting default from the options for given field + * + * @param string $field The field for which to get the default options. + * @param string $post_type The post type. + * + * @return bool|string + */ + private function default_from_options( $field, $post_type ) { + $target_option_field = $field . '-' . $post_type; + if ( ! empty( $this->options[ $target_option_field ] ) ) { + return $this->options[ $target_option_field ]; + } + + return false; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-shortcode-filter.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-shortcode-filter.php new file mode 100644 index 00000000..834001fa --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-shortcode-filter.php @@ -0,0 +1,39 @@ + $shortcode, + 'output' => do_shortcode( $shortcode ), + ); + } + + wp_die( wp_json_encode( $parsed_shortcodes ) ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-dismissable-notice.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-dismissable-notice.php new file mode 100644 index 00000000..fb688c5f --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-dismissable-notice.php @@ -0,0 +1,69 @@ +notice_name = $notice_name; + $this->notice_type = $notice_type; + + add_action( 'wp_ajax_wpseo_dismiss_' . $notice_name, array( $this, 'dismiss_notice' ) ); + } + + /** + * Handles the dismiss notice request + */ + public function dismiss_notice() { + check_ajax_referer( 'wpseo-dismiss-' . $this->notice_name ); + + $this->save_dismissed(); + + wp_die( 'true' ); + } + + /** + * Storing the dismissed value in the database. The target location is based on the set notification type. + */ + private function save_dismissed() { + if ( $this->notice_type === self::FOR_SITE ) { + update_option( 'wpseo_dismiss_' . $this->notice_name, 1 ); + + return; + } + + if ( $this->notice_type === self::FOR_NETWORK ) { + update_site_option( 'wpseo_dismiss_' . $this->notice_name, 1 ); + + return; + } + + update_user_meta( get_current_user_id(), 'wpseo_dismiss_' . $this->notice_name, 1 ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-onpage-ajax.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-onpage-ajax.php new file mode 100644 index 00000000..9159fb3e --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-onpage-ajax.php @@ -0,0 +1,39 @@ +save_dismissed(); + + wp_die( 'true' ); + } + + /** + * Storing the the dismissed value as an user option in the database + */ + private function save_dismissed() { + update_user_meta( get_current_user_id(), WPSEO_OnPage::USER_META_KEY, 1 ); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-plugin-conflict-ajax.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-plugin-conflict-ajax.php index 24038451..c80ea749 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-plugin-conflict-ajax.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/ajax/class-yoast-plugin-conflict-ajax.php @@ -1,3 +1,111 @@ +<<<<<<< .mine +dismissed_conflicts = $this->get_dismissed_conflicts( $conflict_data['section'] ); + + $this->compare_plugins( $conflict_data['plugins'] ); + + $this->save_dismissed_conflicts( $conflict_data['section'] ); + + wp_die( 'true' ); + } + + /** + * Getting the user option from the database + * + * @return bool|array + */ + private function get_dismissed_option() { + return get_user_meta( get_current_user_id(), $this->option_name, true ); + } + + /** + * Getting the dismissed conflicts from the database + * + * @param string $plugin_section Type of conflict group (such as Open Graph or sitemap). + * + * @return array + */ + private function get_dismissed_conflicts( $plugin_section ) { + $dismissed_conflicts = $this->get_dismissed_option(); + + if ( is_array( $dismissed_conflicts ) && array_key_exists( $plugin_section, $dismissed_conflicts ) ) { + return $dismissed_conflicts[ $plugin_section ]; + } + + return array(); + } + + /** + * Storing the conflicting plugins as an user option in the database + * + * @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap). + */ + private function save_dismissed_conflicts( $plugin_section ) { + $dismissed_conflicts = $this->get_dismissed_option(); + + $dismissed_conflicts[ $plugin_section ] = $this->dismissed_conflicts; + + update_user_meta( get_current_user_id(), $this->option_name, $dismissed_conflicts ); + } + + /** + * Loop through the plugins to compare them with the already stored dismissed plugin conflicts + * + * @param array $posted_plugins Plugin set to check. + */ + public function compare_plugins( array $posted_plugins ) { + foreach ( $posted_plugins as $posted_plugin ) { + $this->compare_plugin( $posted_plugin ); + } + } + + /** + * Check if plugin is already dismissed, if not store it in the array that will be saved later + * + * @param string $posted_plugin Plugin to check against dismissed conflicts. + */ + private function compare_plugin( $posted_plugin ) { + if ( ! in_array( $posted_plugin, $this->dismissed_conflicts ) ) { + $this->dismissed_conflicts[] = $posted_plugin; + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-init.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-init.php index 9aec701f..bf0da6d1 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-init.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-init.php @@ -1,3 +1,389 @@ +<<<<<<< .mine +options = WPSEO_Options::get_all(); + + $GLOBALS['wpseo_admin'] = new WPSEO_Admin; + + $this->pagenow = $GLOBALS['pagenow']; + + add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_dismissible' ) ); + add_action( 'admin_init', array( $this, 'after_update_notice' ), 15 ); + add_action( 'admin_init', array( $this, 'tagline_notice' ), 15 ); + add_action( 'admin_init', array( $this, 'ga_compatibility_notice' ), 15 ); + add_action( 'admin_init', array( $this, 'recalculate_notice' ), 15 ); + add_action( 'admin_init', array( $this, 'ignore_tour' ) ); + add_action( 'admin_init', array( $this, 'load_tour' ) ); + add_action( 'admin_init', array( $this, 'show_hook_deprecation_warnings' ) ); + + $this->load_meta_boxes(); + $this->load_taxonomy_class(); + $this->load_admin_page_class(); + $this->load_admin_user_class(); + $this->load_xml_sitemaps_admin(); + } + + /** + * For WP versions older than 4.2, this includes styles and a script to make notices dismissible. + */ + public function enqueue_dismissible() { + if ( version_compare( $GLOBALS['wp_version'], '4.2', '<' ) ) { + wp_enqueue_style( 'wpseo-dismissible', plugins_url( 'css/wpseo-dismissible' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_script( 'wpseo-dismissible', plugins_url( 'js/wp-seo-dismissible' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); + } + } + /** + * Redirect first time or just upgraded users to the about screen. + */ + public function after_update_notice() { + + $can_access = is_multisite() ? WPSEO_Utils::grant_access() : current_user_can( 'manage_options' ); + + if ( $can_access && $this->has_ignored_tour() && ! $this->seen_about() ) { + + if ( filter_input( INPUT_GET, 'intro' ) === '1' ) { + update_user_meta( get_current_user_id(), 'wpseo_seen_about_version' , WPSEO_VERSION ); + + return; + } + /* translators: %1$s expands to Yoast SEO, $2%s to the version number, %3$s and %4$s to anchor tags with link to intro page */ + $info_message = sprintf( + __( '%1$s has been updated to version %2$s. %3$sClick here%4$s to find out what\'s new!', 'wordpress-seo' ), + 'Yoast SEO', + WPSEO_VERSION, + '', + '' + ); + + $notification_options = array( + 'type' => 'updated', + 'id' => 'wpseo-dismiss-about', + 'nonce' => wp_create_nonce( 'wpseo-dismiss-about' ), + ); + + Yoast_Notification_Center::get()->add_notification( new Yoast_Notification( $info_message, $notification_options ) ); + } + } + + /** + * Helper to verify if the current user has already seen the about page for the current version + * + * @return bool + */ + private function seen_about() { + return get_user_meta( get_current_user_id(), 'wpseo_seen_about_version', true ) === WPSEO_VERSION; + } + + /** + * Notify about the default tagline if the user hasn't changed it + */ + public function tagline_notice() { + if ( current_user_can( 'manage_options' ) && $this->has_default_tagline() && ! $this->seen_tagline_notice() ) { + + // Only add the notice on GET requests, not in the customizer, and not in "action" type submits to prevent faulty return url. + if ( 'GET' !== filter_input( INPUT_SERVER, 'REQUEST_METHOD' ) || is_customize_preview() || null !== filter_input( INPUT_GET, 'action' ) ) { + return; + } + + $current_url = ( is_ssl() ? 'https://' : 'http://' ); + $current_url .= sanitize_text_field( $_SERVER['SERVER_NAME'] ) . sanitize_text_field( $_SERVER['REQUEST_URI'] ); + $customize_url = add_query_arg( array( + 'url' => urlencode( $current_url ), + ), wp_customize_url() ); + + $info_message = sprintf( + __( 'You still have the default WordPress tagline, even an empty one is probably better. %1$sYou can fix this in the customizer%2$s.', 'wordpress-seo' ), + '', + '' + ); + + $notification_options = array( + 'type' => 'error', + 'id' => 'wpseo-dismiss-tagline-notice', + 'nonce' => wp_create_nonce( 'wpseo-dismiss-tagline-notice' ), + ); + + Yoast_Notification_Center::get()->add_notification( new Yoast_Notification( $info_message, $notification_options ) ); + } + } + + /** + * Returns whether or not the site has the default tagline + * + * @return bool + */ + public function has_default_tagline() { + return __( 'Just another WordPress site' ) === get_bloginfo( 'description' ); + } + + /** + * Returns whether or not the user has seen the tagline notice + * + * @return bool + */ + public function seen_tagline_notice() { + return 'seen' === get_user_meta( get_current_user_id(), 'wpseo_seen_tagline_notice', true ); + } + + /** + * Shows a notice to the user if they have Google Analytics for WordPress 5.4.3 installed because it causes an error + * on the google search console page. + */ + public function ga_compatibility_notice() { + if ( defined( 'GAWP_VERSION' ) && '5.4.3' === GAWP_VERSION ) { + + $info_message = sprintf( + /* translators: %1$s expands to Yoast SEO, %2$s expands to 5.4.3, %3$s expands to Google Analytics by Yoast */ + __( '%1$s detected you are using version %2$s of %3$s, please update to the latest version to prevent compatibility issues.', 'wordpress-seo' ), + 'Yoast SEO', + '5.4.3', + 'Google Analytics by Yoast' + ); + + $notification_options = array( + 'type' => 'error', + ); + + Yoast_Notification_Center::get()->add_notification( new Yoast_Notification( $info_message, $notification_options ) ); + } + } + + /** + * Shows the notice for recalculating the post. the Notice will only be shown if the user hasn't dismissed it before. + */ + public function recalculate_notice() { + if ( filter_input( INPUT_GET, 'recalculate' ) === '1' ) { + update_option( 'wpseo_dismiss_recalculate', '1' ); + return; + } + + $can_access = is_multisite() ? WPSEO_Utils::grant_access() : current_user_can( 'manage_options' ); + if ( $can_access && ! $this->is_site_notice_dismissed( 'wpseo_dismiss_recalculate' ) ) { + Yoast_Notification_Center::get()->add_notification( + new Yoast_Notification( + /* translators: 1: is a link to 'admin_url / admin.php?page=wpseo_tools&recalculate=1' 2: closing link tag */ + sprintf( + __( 'We\'ve updated our SEO score algorithm. %1$sClick here to recalculate the SEO scores%2$s for all posts and pages.', 'wordpress-seo' ), + '', + '' + ), + array( + 'type' => 'updated yoast-dismissible', + 'id' => 'wpseo-dismiss-recalculate', + 'nonce' => wp_create_nonce( 'wpseo-dismiss-recalculate' ), + ) + ) + ); + } + } + + /** + * Check if the user has dismissed the given notice (by $notice_name) + * + * @param string $notice_name The name of the notice that might be dismissed. + * + * @return bool + */ + private function is_site_notice_dismissed( $notice_name ) { + return '1' === get_option( $notice_name, true ); + } + + /** + * Helper to verify if the user is currently visiting one of our admin pages. + * + * @return bool + */ + private function on_wpseo_admin_page() { + return 'admin.php' === $this->pagenow && strpos( filter_input( INPUT_GET, 'page' ), 'wpseo' ) === 0; + } + + /** + * Determine whether we should load the meta box class and if so, load it. + */ + private function load_meta_boxes() { + + $is_editor = in_array( $this->pagenow, array( 'edit.php', 'post.php', 'post-new.php' ) ); + $is_inline_save = filter_input( INPUT_POST, 'action' ) === 'inline-save'; + + /** + * Filter: 'wpseo_always_register_metaboxes_on_admin' - Allow developers to change whether + * the WPSEO metaboxes are only registered on the typical pages (lean loading) or always + * registered when in admin. + * + * @api bool Whether to always register the metaboxes or not. Defaults to false. + */ + if ( $is_editor || $is_inline_save || in_array( $this->pagenow, array( + 'edit.php', + 'post.php', + 'post-new.php', + ) ) || apply_filters( 'wpseo_always_register_metaboxes_on_admin', false ) + ) { + $GLOBALS['wpseo_metabox'] = new WPSEO_Metabox; + $GLOBALS['wpseo_meta_columns'] = new WPSEO_Meta_Columns(); + } + } + + /** + * Determine if we should load our taxonomy edit class and if so, load it. + */ + private function load_taxonomy_class() { + if ( 'edit-tags.php' === $this->pagenow ) { + new WPSEO_Taxonomy; + } + } + + /** + * Determine if we should load our admin pages class and if so, load it. + * + * Loads admin page class for all admin pages starting with `wpseo_`. + */ + private function load_admin_user_class() { + if ( in_array( $this->pagenow, array( 'user-edit.php', 'profile.php' ) ) && current_user_can( 'edit_users' ) ) { + new WPSEO_Admin_User_Profile; + } + } + + /** + * Determine if we should load our admin pages class and if so, load it. + * + * Loads admin page class for all admin pages starting with `wpseo_`. + */ + private function load_admin_page_class() { + + if ( $this->on_wpseo_admin_page() ) { + // For backwards compatabilty, this still needs a global, for now... + $GLOBALS['wpseo_admin_pages'] = new WPSEO_Admin_Pages; + $this->register_i18n_promo_class(); + } + } + + /** + * Register the promotion class for our GlotPress instance + * + * @link https://github.com/Yoast/i18n-module + */ + private function register_i18n_promo_class() { + new yoast_i18n( + array( + 'textdomain' => 'wordpress-seo', + 'project_slug' => 'wordpress-seo', + 'plugin_name' => 'Yoast SEO', + 'hook' => 'wpseo_admin_footer', + 'glotpress_url' => 'https://translate.yoast.com/', + 'glotpress_name' => 'Yoast Translate', + 'glotpress_logo' => 'https://cdn.yoast.com/wp-content/uploads/i18n-images/Yoast_Translate.svg', + 'register_url' => 'https://translate.yoast.com/projects#utm_source=plugin&utm_medium=promo-box&utm_campaign=wpseo-i18n-promo', + ) + ); + } + + /** + * See if we should start our tour. + */ + public function load_tour() { + $restart_tour = filter_input( INPUT_GET, 'wpseo_restart_tour' ); + if ( $restart_tour ) { + delete_user_meta( get_current_user_id(), 'wpseo_ignore_tour' ); + } + + if ( ! $this->has_ignored_tour() ) { + add_action( 'admin_enqueue_scripts', array( 'WPSEO_Pointers', 'get_instance' ) ); + } + } + + /** + * See if we should start our XML Sitemaps Admin class + */ + private function load_xml_sitemaps_admin() { + if ( $this->options['enablexmlsitemap'] === true ) { + new WPSEO_Sitemaps_Admin; + } + } + + /** + * Returns the value of the ignore tour. + * + * @return bool + */ + private function has_ignored_tour() { + $user_meta = get_user_meta( get_current_user_id(), 'wpseo_ignore_tour' ); + + return ! empty( $user_meta ); + } + + /** + * Listener for the ignore tour GET value. If this one is set, just set the user meta to true. + */ + public function ignore_tour() { + if ( filter_input( INPUT_GET, 'wpseo_ignore_tour' ) && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), 'wpseo-ignore-tour' ) ) { + update_user_meta( get_current_user_id(), 'wpseo_ignore_tour', true ); + } + + } + + /** + * Shows deprecation warnings to the user if a plugin has registered a filter we have deprecated. + */ + public function show_hook_deprecation_warnings() { + global $wp_filter; + + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { + return false; + } + + // WordPress hooks that have been deprecated in Yoast SEO 3.0. + $deprecated_30 = array( + 'wpseo_pre_analysis_post_content', + 'wpseo_metadesc_length', + 'wpseo_metadesc_length_reason', + 'wpseo_body_length_score', + 'wpseo_linkdex_results', + 'wpseo_snippet', + ); + + $deprecated_notices = array_intersect( + $deprecated_30, + array_keys( $wp_filter ) + ); + + foreach ( $deprecated_notices as $deprecated_filter ) { + _deprecated_function( + /* %s expands to the actual filter/action that has been used. */ + sprintf( __( '%s filter/action', 'wordpress-seo' ), $deprecated_filter ), + 'WPSEO 3.0', + 'javascript' + ); + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-user-profile.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-user-profile.php index 732eda46..f2d9706c 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-user-profile.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin-user-profile.php @@ -1,3 +1,76 @@ +<<<<<<< .mine +filter_input_post( 'wpseo_nonce' ); + + if ( empty( $nonce_value ) ) { // Submit from alternate forms. + return; + } + + check_admin_referer( 'wpseo_user_profile_update', 'wpseo_nonce' ); + + update_user_meta( $user_id, 'wpseo_title', $this->filter_input_post( 'wpseo_author_title' ) ); + update_user_meta( $user_id, 'wpseo_metadesc', $this->filter_input_post( 'wpseo_author_metadesc' ) ); + update_user_meta( $user_id, 'wpseo_metakey', $this->filter_input_post( 'wpseo_author_metakey' ) ); + update_user_meta( $user_id, 'wpseo_excludeauthorsitemap', $this->filter_input_post( 'wpseo_author_exclude' ) ); + } + + /** + * Add the inputs needed for SEO values to the User Profile page + * + * @param WP_User $user User instance to output for. + */ + public function user_profile( $user ) { + $options = WPSEO_Options::get_all(); + + wp_nonce_field( 'wpseo_user_profile_update', 'wpseo_nonce' ); + + require_once( 'views/user-profile.php' ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin.php index 9e21737c..461950b3 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-admin.php @@ -39,27 +39,95 @@ class WPSEO_Admin { add_action( 'delete_category', array( $this, 'schedule_rewrite_flush' ) ); } +<<<<<<< .mine + $this->page_gsc = new WPSEO_GSC(); + $this->dashboard_widget = new Yoast_Dashboard_Widget(); +||||||| .r11156 + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); +======= $this->page_gsc = new WPSEO_GSC(); $this->dashboard_widget = new Yoast_Dashboard_Widget(); +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + if ( '0' == get_option( 'blog_public' ) ) { + add_action( 'admin_footer', array( $this, 'blog_public_warning' ) ); + } +======= // Needs the lower than default priority so other plugins can hook underneath it without issue. add_action( 'admin_menu', array( $this, 'register_settings_page' ), 5 ); add_action( 'network_admin_menu', array( $this, 'register_network_settings_page' ) ); +>>>>>>> .r12027 +<<<<<<< .mine + // Needs the lower than default priority so other plugins can hook underneath it without issue. + add_action( 'admin_menu', array( $this, 'register_settings_page' ), 5 ); + add_action( 'network_admin_menu', array( $this, 'register_network_settings_page' ) ); +||||||| .r11156 + if ( ( ( isset( $options['theme_has_description'] ) && $options['theme_has_description'] === true ) || $options['theme_description_found'] !== '' ) && $options['ignore_meta_description_warning'] !== true ) { + add_action( 'admin_footer', array( $this, 'meta_description_warning' ) ); + } +======= add_filter( 'plugin_action_links_' . WPSEO_BASENAME, array( $this, 'add_action_link' ), 10, 2 ); +>>>>>>> .r12027 +<<<<<<< .mine + add_filter( 'plugin_action_links_' . WPSEO_BASENAME, array( $this, 'add_action_link' ), 10, 2 ); +||||||| .r11156 + if ( $options['cleanslugs'] === true ) { + add_filter( 'name_save_pre', array( $this, 'remove_stopwords_from_slug' ), 0 ); + } +======= add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); +>>>>>>> .r12027 +<<<<<<< .mine + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); +||||||| .r11156 + add_action( 'show_user_profile', array( $this, 'user_profile' ) ); + add_action( 'edit_user_profile', array( $this, 'user_profile' ) ); + add_action( 'personal_options_update', array( $this, 'process_user_option_update' ) ); + add_action( 'edit_user_profile_update', array( $this, 'process_user_option_update' ) ); + add_action( 'personal_options_update', array( $this, 'update_user_profile' ) ); + add_action( 'edit_user_profile_update', array( $this, 'update_user_profile' ) ); +======= if ( '0' == get_option( 'blog_public' ) ) { add_action( 'admin_footer', array( $this, 'blog_public_warning' ) ); } +>>>>>>> .r12027 +<<<<<<< .mine + if ( '0' == get_option( 'blog_public' ) ) { + add_action( 'admin_footer', array( $this, 'blog_public_warning' ) ); + } +||||||| .r11156 + add_filter( 'user_contactmethods', array( $this, 'update_contactmethods' ), 10, 1 ); +======= if ( ( ( isset( $this->options['theme_has_description'] ) && $this->options['theme_has_description'] === true ) || $this->options['theme_description_found'] !== '' ) && $this->options['ignore_meta_description_warning'] !== true ) { add_action( 'admin_footer', array( $this, 'meta_description_warning' ) ); } +>>>>>>> .r12027 + +<<<<<<< .mine + if ( ( ( isset( $this->options['theme_has_description'] ) && $this->options['theme_has_description'] === true ) || + $this->options['theme_description_found'] !== '' ) && $this->options['ignore_meta_description_warning'] !== true + ) { + add_action( 'admin_footer', array( $this, 'meta_description_warning' ) ); + } +||||||| .r11156 + add_action( 'after_switch_theme', array( $this, 'switch_theme' ) ); + add_action( 'switch_theme', array( $this, 'switch_theme' ) ); + add_filter( 'set-screen-option', array( $this, 'save_bulk_edit_options' ), 10, 3 ); + + add_filter( 'upgrader_post_install', array( $this, 'remove_transients_on_update' ), 10, 1 ); + + add_action( 'activated_plugin', array( 'WPSEO_Plugin_Conflict', 'hook_check_for_plugin_conflicts' ), 10, 1 ); + } +======= if ( $this->options['cleanslugs'] === true ) { add_filter( 'name_save_pre', array( $this, 'remove_stopwords_from_slug' ), 0 ); } @@ -70,7 +138,18 @@ class WPSEO_Admin { add_action( 'switch_theme', array( $this, 'switch_theme' ) ); add_filter( 'set-screen-option', array( $this, 'save_bulk_edit_options' ), 10, 3 ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( $this->options['cleanslugs'] === true ) { + add_filter( 'name_save_pre', array( $this, 'remove_stopwords_from_slug' ), 0 ); +||||||| .r11156 + /** + * Schedules a rewrite flush to happen at shutdown + */ + function schedule_rewrite_flush() { + add_action( 'shutdown', 'flush_rewrite_rules' ); +======= add_action( 'admin_init', array( 'WPSEO_Plugin_Conflict', 'hook_check_for_plugin_conflicts' ), 10, 1 ); WPSEO_Utils::register_cache_clear_option( 'wpseo', '' ); @@ -91,11 +170,31 @@ class WPSEO_Admin { function register_settings_page() { if ( WPSEO_Utils::grant_access() !== true ) { return; +>>>>>>> .r12027 } +<<<<<<< .mine + add_filter( 'user_contactmethods', array( $this, 'update_contactmethods' ), 10, 1 ); +||||||| .r11156 +======= // Base 64 encoded SVG image. $icon_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCIgWw0KCTwhRU5USVRZIG5zX2Zsb3dzICJodHRwOi8vbnMuYWRvYmUuY29tL0Zsb3dzLzEuMC8iPg0KCTwhRU5USVRZIG5zX2V4dGVuZCAiaHR0cDovL25zLmFkb2JlLmNvbS9FeHRlbnNpYmlsaXR5LzEuMC8iPg0KCTwhRU5USVRZIG5zX2FpICJodHRwOi8vbnMuYWRvYmUuY29tL0Fkb2JlSWxsdXN0cmF0b3IvMTAuMC8iPg0KCTwhRU5USVRZIG5zX2dyYXBocyAiaHR0cDovL25zLmFkb2JlLmNvbS9HcmFwaHMvMS4wLyI+DQpdPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYWFnXzEiIHhtbG5zOng9IiZuc19leHRlbmQ7IiB4bWxuczppPSImbnNfYWk7IiB4bWxuczpncmFwaD0iJm5zX2dyYXBoczsiDQoJIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOmE9Imh0dHA6Ly9ucy5hZG9iZS5jb20vQWRvYmVTVkdWaWV3ZXJFeHRlbnNpb25zLzMuMC8iDQoJIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNDAgMzEuODkiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDQwIDMxLjg5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQwLDEyLjUyNEM0MCw1LjYwOCwzMS40NjksMCwyMCwwQzguNTMsMCwwLDUuNjA4LDAsMTIuNTI0YzAsNS41Niw1LjI0MywxMC4yNzIsMTMuNTU3LDExLjkwN3YtNC4wNjUNCgljMCwwLDAuMDQtMS0wLjI4LTEuOTJjLTAuMzItMC45MjEtMS43Ni0zLjAwMS0xLjc2LTUuMTIxYzAtMi4xMjEsMi41NjEtOS41NjMsNS4xMjItMTAuNDQ0Yy0wLjQsMS4yMDEtMC4zMiw3LjY4My0wLjMyLDcuNjgzDQoJczEuNCwyLjcyLDQuNjQxLDIuNzJjMy4yNDIsMCw0LjUxMS0xLjc2LDQuNzE1LTIuMmMwLjIwNi0wLjQ0LDAuODQ2LTguNzIzLDAuODQ2LTguNzIzczQuMDgyLDQuNDAyLDMuNjgyLDkuMzYzDQoJYy0wLjQwMSw0Ljk2Mi00LjQ4Miw3LjIwMy02LjEyMiw5LjEyM2MtMS4yODYsMS41MDUtMi4yMjQsMy4xMy0yLjYyOSw0LjE2OGMwLjgwMS0wLjAzNCwxLjU4Ny0wLjA5OCwyLjM2MS0wLjE4NGw5LjE1MSw3LjA1OQ0KCWwtNC44ODQtNy44M0MzNS41MzUsMjIuMTYxLDQwLDE3LjcxMyw0MCwxMi41MjR6Ii8+DQo8L2c+DQo8L3N2Zz4='; +>>>>>>> .r12027 +<<<<<<< .mine + add_action( 'after_switch_theme', array( $this, 'switch_theme' ) ); + add_action( 'switch_theme', array( $this, 'switch_theme' ) ); +||||||| .r11156 + /** + * Register the menu item and its sub menu's. + * + * @global array $submenu used to change the label on the first item. + */ + function register_settings_page() { + if ( WPSEO_Options::grant_access() !== true ) { + return; + } +======= // Add main page. $admin_page = add_menu_page( 'Yoast SEO: ' . __( 'General Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( $this, @@ -108,12 +207,176 @@ class WPSEO_Admin { * @api string unsigned The capability */ $manage_options_cap = apply_filters( 'wpseo_manage_options_capability', 'manage_options' ); +>>>>>>> .r12027 + +<<<<<<< .mine + add_filter( 'set-screen-option', array( $this, 'save_bulk_edit_options' ), 10, 3 ); + + add_action( 'admin_init', array( 'WPSEO_Plugin_Conflict', 'hook_check_for_plugin_conflicts' ), 10, 1 ); + add_action( 'admin_init', array( $this, 'import_plugin_hooks' ) ); + + WPSEO_Utils::register_cache_clear_option( 'wpseo', '' ); + } + + /** + * Setting the hooks for importing data from other plugins + */ + public function import_plugin_hooks() { + if ( current_user_can( $this->get_manage_options_cap() ) ) { + $plugin_imports = array( + 'wpSEO' => new WPSEO_Import_WPSEO_Hooks(), + 'aioseo' => new WPSEO_Import_AIOSEO_Hooks(), + 'robots_meta' => new WPSEO_Import_Robots_Meta_Hooks(), + ); + } + } + + /** + * Schedules a rewrite flush to happen at shutdown + */ + function schedule_rewrite_flush() { + add_action( 'shutdown', 'flush_rewrite_rules' ); + } + + /** + * Register the menu item and its sub menu's. + * + * @global array $submenu used to change the label on the first item. + */ + function register_settings_page() { + if ( WPSEO_Utils::grant_access() !== true ) { + return; + } + + // Base 64 encoded SVG image. + $icon_svg = $this->get_menu_svg(); + + $manage_options_cap = $this->get_manage_options_cap(); + + // Add main page. + $admin_page = add_menu_page( 'Yoast SEO: ' . __( 'General Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), $manage_options_cap, 'wpseo_dashboard', array( + $this, + 'load_page', + ), $icon_svg, '99.31337' ); // Sub menu pages. $submenu_pages = array( array( +||||||| .r11156 + // Base 64 encoded SVG image + $icon_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCIgWw0KCTwhRU5USVRZIG5zX2Zsb3dzICJodHRwOi8vbnMuYWRvYmUuY29tL0Zsb3dzLzEuMC8iPg0KCTwhRU5USVRZIG5zX2V4dGVuZCAiaHR0cDovL25zLmFkb2JlLmNvbS9FeHRlbnNpYmlsaXR5LzEuMC8iPg0KCTwhRU5USVRZIG5zX2FpICJodHRwOi8vbnMuYWRvYmUuY29tL0Fkb2JlSWxsdXN0cmF0b3IvMTAuMC8iPg0KCTwhRU5USVRZIG5zX2dyYXBocyAiaHR0cDovL25zLmFkb2JlLmNvbS9HcmFwaHMvMS4wLyI+DQpdPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYWFnXzEiIHhtbG5zOng9IiZuc19leHRlbmQ7IiB4bWxuczppPSImbnNfYWk7IiB4bWxuczpncmFwaD0iJm5zX2dyYXBoczsiDQoJIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOmE9Imh0dHA6Ly9ucy5hZG9iZS5jb20vQWRvYmVTVkdWaWV3ZXJFeHRlbnNpb25zLzMuMC8iDQoJIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNDAgMzEuODkiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDQwIDMxLjg5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQwLDEyLjUyNEM0MCw1LjYwOCwzMS40NjksMCwyMCwwQzguNTMsMCwwLDUuNjA4LDAsMTIuNTI0YzAsNS41Niw1LjI0MywxMC4yNzIsMTMuNTU3LDExLjkwN3YtNC4wNjUNCgljMCwwLDAuMDQtMS0wLjI4LTEuOTJjLTAuMzItMC45MjEtMS43Ni0zLjAwMS0xLjc2LTUuMTIxYzAtMi4xMjEsMi41NjEtOS41NjMsNS4xMjItMTAuNDQ0Yy0wLjQsMS4yMDEtMC4zMiw3LjY4My0wLjMyLDcuNjgzDQoJczEuNCwyLjcyLDQuNjQxLDIuNzJjMy4yNDIsMCw0LjUxMS0xLjc2LDQuNzE1LTIuMmMwLjIwNi0wLjQ0LDAuODQ2LTguNzIzLDAuODQ2LTguNzIzczQuMDgyLDQuNDAyLDMuNjgyLDkuMzYzDQoJYy0wLjQwMSw0Ljk2Mi00LjQ4Miw3LjIwMy02LjEyMiw5LjEyM2MtMS4yODYsMS41MDUtMi4yMjQsMy4xMy0yLjYyOSw0LjE2OGMwLjgwMS0wLjAzNCwxLjU4Ny0wLjA5OCwyLjM2MS0wLjE4NGw5LjE1MSw3LjA1OQ0KCWwtNC44ODQtNy44M0MzNS41MzUsMjIuMTYxLDQwLDE3LjcxMyw0MCwxMi41MjR6Ii8+DQo8L2c+DQo8L3N2Zz4='; + + // Add main page + $admin_page = add_menu_page( __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'General Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( + $this, + 'load_page', + ), $icon_svg, '99.31337' ); + + /** + * Filter: 'wpseo_manage_options_capability' - Allow changing the capability users need to view the settings pages + * + * @api string unsigned The capability + */ + $manage_options_cap = apply_filters( 'wpseo_manage_options_capability', 'manage_options' ); + + // Sub menu pages + $submenu_pages = array( + array( + 'wpseo_dashboard', + '', + __( 'Titles & Metas', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_titles', + array( $this, 'load_page' ), + array( array( $this, 'title_metas_help_tab' ) ), + ), + array( + 'wpseo_dashboard', + '', + __( 'Social', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_social', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'XML Sitemaps', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_xml', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Permalinks', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_permalinks', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Internal Links', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_internal-links', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'RSS', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_rss', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + esc_html__( 'Import & Export', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_import', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Bulk Editor', 'wordpress-seo' ), + 'wpseo_bulk_edit', + 'wpseo_bulk-editor', + array( $this, 'load_page' ), + array( array( $this, 'bulk_edit_options' ) ), + ), + ); + + // Check where to add the edit files page + if ( wpseo_allow_system_file_edit() === true && ! is_multisite() ) { + $submenu_pages[] = array( + 'wpseo_dashboard', + '', + __( 'Edit Files', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_files', + array( $this, 'load_page' ), + ); + } + + // Add Extension submenu page + $submenu_pages[] = array( +======= + // Sub menu pages. + $submenu_pages = array( + array( +>>>>>>> .r12027 'wpseo_dashboard', '', +<<<<<<< .mine __( 'Titles & Metas', 'wordpress-seo' ), $manage_options_cap, 'wpseo_titles', @@ -165,8 +428,79 @@ class WPSEO_Admin { array( $this->page_gsc, 'display' ), array( array( $this->page_gsc, 'set_help' ) ), ), + array( + 'wpseo_dashboard', + '', + '' . __( 'Extensions', 'wordpress-seo' ) . '', +||||||| .r11156 + '' . __( 'Extensions', 'wordpress-seo' ) . '', +======= + __( 'Titles & Metas', 'wordpress-seo' ), +>>>>>>> .r12027 + $manage_options_cap, + 'wpseo_titles', + array( $this, 'load_page' ), + array( array( $this, 'title_metas_help_tab' ) ), + ), + array( + 'wpseo_dashboard', + '', + __( 'Social', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_social', + array( $this, 'load_page' ), + null, +<<<<<<< .mine + ), + ); +||||||| .r11156 + ); +======= + ), + array( + 'wpseo_dashboard', + '', + __( 'XML Sitemaps', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_xml', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Advanced', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_advanced', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Tools', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_tools', + array( $this, 'load_page' ), + null, + ), + array( + 'wpseo_dashboard', + '', + __( 'Search Console', 'wordpress-seo' ), + $manage_options_cap, + 'wpseo_search_console', + array( $this->page_gsc, 'display' ), + array( array( $this->page_gsc, 'set_help' ) ), + ), ); +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + // Allow submenu pages manipulation + $submenu_pages = apply_filters( 'wpseo_submenu_pages', $submenu_pages ); +======= // Add Extension submenu page. $submenu_pages[] = array( 'wpseo_dashboard', @@ -177,6 +511,7 @@ class WPSEO_Admin { array( $this, 'load_page' ), null, ); +>>>>>>> .r12027 // Allow submenu pages manipulation. $submenu_pages = apply_filters( 'wpseo_submenu_pages', $submenu_pages ); @@ -203,18 +538,65 @@ class WPSEO_Admin { } } +<<<<<<< .mine + /** + * Returns the manage_options cap + * + * @return mixed|void + */ + private function get_manage_options_cap() { + /** + * Filter: 'wpseo_manage_options_capability' - Allow changing the capability users need to view the settings pages + * + * @api string unsigned The capability + */ + $manage_options_cap = apply_filters( 'wpseo_manage_options_capability', 'manage_options' ); +||||||| .r11156 + /** + * Adds contextual help to the titles & metas page. + */ + function title_metas_help_tab() { + $screen = get_current_screen(); +======= /** * Adds contextual help to the titles & metas page. */ function title_metas_help_tab() { $screen = get_current_screen(); +>>>>>>> .r12027 +<<<<<<< .mine + return $manage_options_cap; + } +||||||| .r11156 + $screen->set_help_sidebar( + '

' . __( 'For more information:', 'wordpress-seo' ) . '

' . + '

' . __( 'Title optimization', 'wordpress-seo' ) . '

' . + '

' . __( 'Why Google won\'t display the right page title', 'wordpress-seo' ) . '

' + ); +======= $screen->set_help_sidebar( '

' . __( 'For more information:', 'wordpress-seo' ) . '

' . __( 'Title optimization', 'wordpress-seo' ) . '

' . __( 'Why Google won\'t display the right page title', 'wordpress-seo' ) . '

' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Adds contextual help to the titles & metas page. + */ + function title_metas_help_tab() { + $screen = get_current_screen(); +||||||| .r11156 + $screen->add_help_tab( + array( + 'id' => 'basic-help', + 'title' => __( 'Template explanation', 'wordpress-seo' ), + 'content' => '

' . __( 'The title & metas settings for WordPress SEO are made up of variables that are replaced by specific values from the page when the page is displayed. The tabs on the left explain the available variables.', 'wordpress-seo' ) . '

', + ) + ); +======= $screen->add_help_tab( array( 'id' => 'basic-help', @@ -223,7 +605,16 @@ class WPSEO_Admin { 'content' => '

' . sprintf( __( 'The title & metas settings for %1$s are made up of variables that are replaced by specific values from the page when the page is displayed. The tabs on the left explain the available variables.', 'wordpress-seo' ), 'Yoast SEO' ) . '

' . '

' . __( 'Note that not all variables can be used in every template.', 'wordpress-seo' ) . '

', ) ); +>>>>>>> .r12027 +<<<<<<< .mine + $screen->set_help_sidebar( ' +

' . __( 'For more information:', 'wordpress-seo' ) . '

' . __( 'Title optimization', 'wordpress-seo' ) . '

' . __( 'Why Google won\'t display the right page title', 'wordpress-seo' ) . '

' + ); +||||||| .r11156 +======= $screen->add_help_tab( array( 'id' => 'title-vars', @@ -231,7 +622,26 @@ class WPSEO_Admin { 'content' => "\n\t\t

" . __( 'Basic Variables', 'wordpress-seo' ) . "

\n\t\t" . WPSEO_Replace_Vars::get_basic_help_texts(), ) ); +>>>>>>> .r12027 +<<<<<<< .mine + $screen->add_help_tab( + array( + 'id' => 'basic-help', + 'title' => __( 'Template explanation', 'wordpress-seo' ), + /* translators: %1$s expands to Yoast SEO */ + 'content' => '

' . '

' . __( 'Note that not all variables can be used in every template.', 'wordpress-seo' ) . '

', + ) + ); +||||||| .r11156 + $screen->add_help_tab( + array( + 'id' => 'title-vars', + 'title' => __( 'Basic Variables', 'wordpress-seo' ), + 'content' => "\n\t\t

" . __( 'Basic Variables', 'wordpress-seo' ) . "

\n\t\t" . WPSEO_Replace_Vars::get_basic_help_texts(), + ) + ); +======= $screen->add_help_tab( array( 'id' => 'title-vars-advanced', @@ -240,7 +650,26 @@ class WPSEO_Admin { ) ); } +>>>>>>> .r12027 +<<<<<<< .mine + $screen->add_help_tab( + array( + 'id' => 'title-vars', + 'title' => __( 'Basic Variables', 'wordpress-seo' ), + 'content' => "\n\t\t

" . __( 'Basic Variables', 'wordpress-seo' ) . "

\n\t\t" . WPSEO_Replace_Vars::get_basic_help_texts(), + ) + ); +||||||| .r11156 + $screen->add_help_tab( + array( + 'id' => 'title-vars-advanced', + 'title' => __( 'Advanced Variables', 'wordpress-seo' ), + 'content' => "\n\t\t

" . __( 'Advanced Variables', 'wordpress-seo' ) . "

\n\t\t" . WPSEO_Replace_Vars::get_advanced_help_texts(), + ) + ); + } +======= /** * Register the settings page for the Network settings. */ @@ -252,6 +681,50 @@ class WPSEO_Admin { $this, 'network_config_page', ), $icon_svg ); +>>>>>>> .r12027 + +<<<<<<< .mine + $screen->add_help_tab( + array( + 'id' => 'title-vars-advanced', + 'title' => __( 'Advanced Variables', 'wordpress-seo' ), + 'content' => "\n\t\t

" . __( 'Advanced Variables', 'wordpress-seo' ) . "

\n\t\t" . WPSEO_Replace_Vars::get_advanced_help_texts(), + ) + ); + } +||||||| .r11156 + /** + * Register the settings page for the Network settings. + */ + function register_network_settings_page() { + if ( WPSEO_Options::grant_access() ) { + // Base 64 encoded SVG image + $icon_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCIgWw0KCTwhRU5USVRZIG5zX2Zsb3dzICJodHRwOi8vbnMuYWRvYmUuY29tL0Zsb3dzLzEuMC8iPg0KCTwhRU5USVRZIG5zX2V4dGVuZCAiaHR0cDovL25zLmFkb2JlLmNvbS9FeHRlbnNpYmlsaXR5LzEuMC8iPg0KCTwhRU5USVRZIG5zX2FpICJodHRwOi8vbnMuYWRvYmUuY29tL0Fkb2JlSWxsdXN0cmF0b3IvMTAuMC8iPg0KCTwhRU5USVRZIG5zX2dyYXBocyAiaHR0cDovL25zLmFkb2JlLmNvbS9HcmFwaHMvMS4wLyI+DQpdPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYWFnXzEiIHhtbG5zOng9IiZuc19leHRlbmQ7IiB4bWxuczppPSImbnNfYWk7IiB4bWxuczpncmFwaD0iJm5zX2dyYXBoczsiDQoJIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOmE9Imh0dHA6Ly9ucy5hZG9iZS5jb20vQWRvYmVTVkdWaWV3ZXJFeHRlbnNpb25zLzMuMC8iDQoJIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNDAgMzEuODkiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDQwIDMxLjg5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQwLDEyLjUyNEM0MCw1LjYwOCwzMS40NjksMCwyMCwwQzguNTMsMCwwLDUuNjA4LDAsMTIuNTI0YzAsNS41Niw1LjI0MywxMC4yNzIsMTMuNTU3LDExLjkwN3YtNC4wNjUNCgljMCwwLDAuMDQtMS0wLjI4LTEuOTJjLTAuMzItMC45MjEtMS43Ni0zLjAwMS0xLjc2LTUuMTIxYzAtMi4xMjEsMi41NjEtOS41NjMsNS4xMjItMTAuNDQ0Yy0wLjQsMS4yMDEtMC4zMiw3LjY4My0wLjMyLDcuNjgzDQoJczEuNCwyLjcyLDQuNjQxLDIuNzJjMy4yNDIsMCw0LjUxMS0xLjc2LDQuNzE1LTIuMmMwLjIwNi0wLjQ0LDAuODQ2LTguNzIzLDAuODQ2LTguNzIzczQuMDgyLDQuNDAyLDMuNjgyLDkuMzYzDQoJYy0wLjQwMSw0Ljk2Mi00LjQ4Miw3LjIwMy02LjEyMiw5LjEyM2MtMS4yODYsMS41MDUtMi4yMjQsMy4xMy0yLjYyOSw0LjE2OGMwLjgwMS0wLjAzNCwxLjU4Ny0wLjA5OCwyLjM2MS0wLjE4NGw5LjE1MSw3LjA1OQ0KCWwtNC44ODQtNy44M0MzNS41MzUsMjIuMTYxLDQwLDE3LjcxMyw0MCwxMi41MjR6Ii8+DQo8L2c+DQo8L3N2Zz4='; + add_menu_page( __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'MultiSite Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'delete_users', 'wpseo_dashboard', array( + $this, + 'network_config_page', + ), $icon_svg ); +======= + if ( WPSEO_Utils::allow_system_file_edit() === true ) { + add_submenu_page( 'wpseo_dashboard', 'Yoast SEO: ' . __( 'Edit Files', 'wordpress-seo' ), __( 'Edit Files', 'wordpress-seo' ), 'delete_users', 'wpseo_files', array( + $this, + 'load_page', + ) ); + } +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * Register the settings page for the Network settings. + */ + function register_network_settings_page() { + if ( WPSEO_Utils::grant_access() ) { + // Base 64 encoded SVG image. + $icon_svg = $this->get_menu_svg(); + add_menu_page( 'Yoast SEO: ' . __( 'MultiSite Settings', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'delete_users', 'wpseo_dashboard', array( + $this, + 'network_config_page', + ), $icon_svg ); if ( WPSEO_Utils::allow_system_file_edit() === true ) { add_submenu_page( 'wpseo_dashboard', 'Yoast SEO: ' . __( 'Edit Files', 'wordpress-seo' ), __( 'Edit Files', 'wordpress-seo' ), 'delete_users', 'wpseo_files', array( @@ -259,6 +732,27 @@ class WPSEO_Admin { 'load_page', ) ); } +||||||| .r11156 + if ( wpseo_allow_system_file_edit() === true ) { + add_submenu_page( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Edit Files', 'wordpress-seo' ), __( 'Edit Files', 'wordpress-seo' ), 'delete_users', 'wpseo_files', array( + $this, + 'load_page', + ) ); + } + + // Add Extension submenu page + add_submenu_page( 'wpseo_dashboard', __( 'Yoast WordPress SEO:', 'wordpress-seo' ) . ' ' . __( 'Extensions', 'wordpress-seo' ), __( 'Extensions', 'wordpress-seo' ), 'delete_users', 'wpseo_licenses', array( + $this, + 'load_page', + ) ); + } +======= + // Add Extension submenu page. + add_submenu_page( 'wpseo_dashboard', 'Yoast SEO: ' . __( 'Extensions', 'wordpress-seo' ), __( 'Extensions', 'wordpress-seo' ), 'delete_users', 'wpseo_licenses', array( + $this, + 'load_page', + ) ); +>>>>>>> .r12027 // Add Extension submenu page. add_submenu_page( 'wpseo_dashboard', 'Yoast SEO: ' . __( 'Extensions', 'wordpress-seo' ), __( 'Extensions', 'wordpress-seo' ), 'delete_users', 'wpseo_licenses', array( @@ -304,6 +798,7 @@ class WPSEO_Admin { require_once( WPSEO_PATH . 'admin/views/tool-file-editor.php' ); break; +<<<<<<< .mine case 'wpseo_dashboard': default: require_once( WPSEO_PATH . 'admin/pages/dashboard.php' ); @@ -318,8 +813,33 @@ class WPSEO_Admin { function network_config_page() { require_once( WPSEO_PATH . 'admin/pages/network.php' ); } +||||||| .r11156 + case 'wpseo_bulk-editor': + require_once( WPSEO_PATH . 'admin/pages/bulk-editor.php' ); + break; + + case 'wpseo_licenses': + require_once( WPSEO_PATH . 'admin/pages/licenses.php' ); + break; + + case 'wpseo_dashboard': + default: + require_once( WPSEO_PATH . 'admin/pages/dashboard.php' ); + break; + } + } + } +======= + case 'wpseo_dashboard': + default: + require_once( WPSEO_PATH . 'admin/pages/dashboard.php' ); + break; + } +>>>>>>> .r12027 + } +<<<<<<< .mine /** * Adds the ability to choose how many posts are displayed per page * on the bulk edit pages. @@ -333,7 +853,89 @@ class WPSEO_Admin { ); add_screen_option( $option, $args ); } +||||||| .r11156 + /** + * Loads the form for the network configuration page. + */ + function network_config_page() { + require_once( WPSEO_PATH . 'admin/pages/network.php' ); + } +======= + /** + * Loads the form for the network configuration page. + */ + function network_config_page() { + require_once( WPSEO_PATH . 'admin/pages/network.php' ); + } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Saves the posts per page limit for bulk edit pages. + * + * @param int $status Status value to pass through. + * @param string $option Option name. + * @param int $value Count value to check. + * + * @return int + */ + function save_bulk_edit_options( $status, $option, $value ) { + if ( 'wpseo_posts_per_page' === $option && ( $value > 0 && $value < 1000 ) ) { + return $value; + } +||||||| .r11156 + + /** + * Adds the ability to choose how many posts are displayed per page + * on the bulk edit pages. + */ + function bulk_edit_options() { + $option = 'per_page'; + $args = array( + 'label' => __( 'Posts', 'wordpress-seo' ), + 'default' => 10, + 'option' => 'wpseo_posts_per_page', + ); + add_screen_option( $option, $args ); + } +======= + + /** + * Adds the ability to choose how many posts are displayed per page + * on the bulk edit pages. + */ + function bulk_edit_options() { + $option = 'per_page'; + $args = array( + 'label' => __( 'Posts', 'wordpress-seo' ), + 'default' => 10, + 'option' => 'wpseo_posts_per_page', + ); + add_screen_option( $option, $args ); + } +>>>>>>> .r12027 + +<<<<<<< .mine + return $status; + } + + /** + * Display an error message when the blog is set to private. + */ + function blog_public_warning() { + if ( ( function_exists( 'is_network_admin' ) && is_network_admin() ) || WPSEO_Utils::grant_access() !== true ) { + return; +||||||| .r11156 + /** + * Saves the posts per page limit for bulk edit pages. + */ + function save_bulk_edit_options( $status, $option, $value ) { + if ( 'wpseo_posts_per_page' === $option && ( $value > 0 && $value < 1000 ) ) { + return $value; + } + + return $status; +======= /** * Saves the posts per page limit for bulk edit pages. * @@ -346,8 +948,28 @@ class WPSEO_Admin { function save_bulk_edit_options( $status, $option, $value ) { if ( 'wpseo_posts_per_page' === $option && ( $value > 0 && $value < 1000 ) ) { return $value; +>>>>>>> .r12027 } +<<<<<<< .mine + if ( ! current_user_can( 'manage_options' ) ) { + return; +||||||| .r11156 + /** + * Display an error message when the blog is set to private. + */ + function blog_public_warning() { + if ( ( function_exists( 'is_network_admin' ) && is_network_admin() ) || WPSEO_Options::grant_access() !== true ) { + return; + } + + $options = get_option( 'wpseo' ); + if ( $options['ignore_blog_public_warning'] === true ) { + return; + } + echo '

'; + echo '

' . __( 'Huge SEO Issue: You\'re blocking access to robots.', 'wordpress-seo' ) . ' ' . sprintf( __( 'You must %sgo to your Reading Settings%s and uncheck the box for Search Engine Visibility.', 'wordpress-seo' ), '', '' ) . ' ' . __( 'I know, don\'t bug me.', 'wordpress-seo' ) . '

'; +======= return $status; } @@ -357,6 +979,7 @@ class WPSEO_Admin { function blog_public_warning() { if ( ( function_exists( 'is_network_admin' ) && is_network_admin() ) || WPSEO_Utils::grant_access() !== true ) { return; +>>>>>>> .r12027 } if ( $this->options['ignore_blog_public_warning'] === true ) { @@ -446,12 +1069,32 @@ class WPSEO_Admin { return $links; } +<<<<<<< .mine + /** + * Enqueues the (tiny) global JS needed for the plugin. + */ + function config_page_scripts() { + if ( WPSEO_Utils::grant_access() ) { + wp_enqueue_script( 'wpseo-admin-global-script', plugins_url( 'js/wp-seo-admin-global-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); +||||||| .r11156 + // Lowercase the slug and strip slashes + $clean_slug = sanitize_title( stripslashes( $_POST['post_title'] ) ); + + // Turn it to an array and strip stopwords by comparing against an array of stopwords + $clean_slug_array = array_diff( explode( '-', $clean_slug ), $this->stopwords() ); + + // Turn the sanitized array into a string + $clean_slug = join( '-', $clean_slug_array ); + + return $clean_slug; +======= /** * Enqueues the (tiny) global JS needed for the plugin. */ function config_page_scripts() { if ( WPSEO_Utils::grant_access() ) { wp_enqueue_script( 'wpseo-admin-global-script', plugins_url( 'js/wp-seo-admin-global' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); +>>>>>>> .r12027 } } @@ -475,6 +1118,23 @@ class WPSEO_Admin { return $contactmethods; } +<<<<<<< .mine + /** + * Cleans stopwords out of the slug, if the slug hasn't been set yet. + * + * @since 1.1.7 + * + * @param string $slug if this isn't empty, the function will return an unaltered slug. + * + * @return string $clean_slug cleaned slug + */ + function remove_stopwords_from_slug( $slug ) { + return $this->filter_stopwords_from_slug( $slug, filter_input( INPUT_POST, 'post_title' ) ); + } +||||||| .r11156 + return $stopwords; + } +======= /** * Cleans stopwords out of the slug, if the slug hasn't been set yet. * @@ -489,25 +1149,145 @@ class WPSEO_Admin { if ( isset( $slug ) && $slug !== '' ) { return $slug; } +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * Filter the stopwords from the slug + * + * @param string $slug The current slug, if not empty there will be done nothing. + * @param string $post_title The title which will be used in case of an empty slug. + * + * @return string + */ + public function filter_stopwords_from_slug( $slug, $post_title ) { + // Don't change an existing slug. + if ( isset( $slug ) && $slug !== '' ) { + return $slug; +||||||| .r11156 + + /** + * Check whether the stopword appears in the string + * + * @param string $haystack The string to be checked for the stopword + * @param bool $checkingUrl Whether or not we're checking a URL + * + * @return bool|mixed + */ + function stopwords_check( $haystack, $checkingUrl = false ) { + $stopWords = $this->stopwords(); + + if ( is_array( $stopWords ) && $stopWords !== array() ) { + foreach ( $stopWords as $stopWord ) { + // If checking a URL remove the single quotes + if ( $checkingUrl ) { + $stopWord = str_replace( "'", '', $stopWord ); + } + // Check whether the stopword appears as a whole word + // @todo [JRF => whomever] check whether the use of \b (=word boundary) would be more efficient ;-) + $res = preg_match( "`(^|[ \n\r\t\.,'\"\+;!?:])" . preg_quote( $stopWord, '`' ) . "($|[ \n\r\t\.,'\"\+;!?:])`iu", $haystack, $match ); + if ( $res > 0 ) { + return $stopWord; + } + } + } + + return false; +======= if ( ! filter_input( INPUT_POST, 'post_title' ) ) { return $slug; +>>>>>>> .r12027 } +<<<<<<< .mine + // When the post title is empty, just return the slug. + if ( empty( $post_title ) ) { + return $slug; +||||||| .r11156 + /** + * Log the timestamp when a user profile has been updated + */ + function update_user_profile( $user_id ) { + if ( current_user_can( 'edit_user', $user_id ) ) { + update_user_meta( $user_id, '_yoast_wpseo_profile_updated', time() ); + } +======= // Don't change slug if the post is a draft, this conflicts with polylang. if ( 'draft' == filter_input( INPUT_POST, 'post_status' ) ) { return $slug; +>>>>>>> .r12027 } +<<<<<<< .mine + // Don't change slug if the post is a draft, this conflicts with polylang. + // Doesn't work with filter_input() since need current value, not originally submitted one. + if ( 'draft' === $_POST['post_status'] ) { + return $slug; + } +||||||| .r11156 + /** + * Log the updated timestamp for user profiles when theme is changed + */ + function switch_theme() { + $users = get_users( array( 'who' => 'authors' ) ); + if ( is_array( $users ) && $users !== array() ) { + foreach ( $users as $user ) { + update_user_meta( $user->ID, '_yoast_wpseo_profile_updated', time() ); + } + } + } +======= // Lowercase the slug and strip slashes. $clean_slug = sanitize_title( stripslashes( filter_input( INPUT_POST, 'post_title' ) ) ); +>>>>>>> .r12027 +<<<<<<< .mine + // Lowercase the slug and strip slashes. + $clean_slug = sanitize_title( stripslashes( $post_title ) ); +||||||| .r11156 + /** + * This method will remove the sitemap transients on upgrade + * + * @param boolean $response + * + * @return boolean $response + */ + function remove_transients_on_update( $response ) { +======= + // Turn it to an array and strip stopwords by comparing against an array of stopwords. + $clean_slug_array = array_diff( explode( '-', $clean_slug ), $this->stopwords() ); +>>>>>>> .r12027 + +<<<<<<< .mine // Turn it to an array and strip stopwords by comparing against an array of stopwords. $clean_slug_array = array_diff( explode( '-', $clean_slug ), $this->stopwords() ); // Don't change the slug if there are less than 3 words left. if ( count( $clean_slug_array ) < 3 ) { return $clean_slug; +||||||| .r11156 + global $wpdb; + + $results = $wpdb->get_results( + " + SELECT option_name + FROM {$wpdb->options} + WHERE option_name LIKE '%_transient_wpseo_sitemap_cache%' + " + ); + + foreach ( $results as $result ) { + $transient_name = substr( $result->option_name, 11 ); + delete_transient( $transient_name ); + } + + return $response; +======= + // Don't change the slug if there are less than 3 words left. + if ( count( $clean_slug_array ) < 3 ) { + return $clean_slug; +>>>>>>> .r12027 } // Turn the sanitized array into a string. @@ -645,6 +1425,37 @@ class WPSEO_Admin { _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Option::register_setting()' ); } +<<<<<<< .mine + /** + * Returns a base64 URL for the svg for use in the menu + * + * @return string + */ + private function get_menu_svg() { + $icon_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIGZpbGw9Im5vbmUiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCA1MTIgNTEyIj48Zz48Zz48Zz48Zz48cGF0aCBzdHlsZT0iZmlsbDojMDAwIiBkPSJNMjAzLjYsMzk1YzYuOC0xNy40LDYuOC0zNi42LDAtNTRsLTc5LjQtMjA0aDcwLjlsNDcuNywxNDkuNGw3NC44LTIwNy42SDExNi40Yy00MS44LDAtNzYsMzQuMi03Niw3NlYzNTdjMCw0MS44LDM0LjIsNzYsNzYsNzZIMTczQzE4OSw0MjQuMSwxOTcuNiw0MTAuMywyMDMuNiwzOTV6Ii8+PC9nPjxnPjxwYXRoIHN0eWxlPSJmaWxsOiMwMDAiIGQ9Ik00NzEuNiwxNTQuOGMwLTQxLjgtMzQuMi03Ni03Ni03NmgtM0wyODUuNywzNjVjLTkuNiwyNi43LTE5LjQsNDkuMy0zMC4zLDY4aDIxNi4yVjE1NC44eiIvPjwvZz48L2c+PHBhdGggc3R5bGU9ImZpbGw6IzAwMCIgc3Ryb2tlLXdpZHRoPSIyLjk3NCIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBkPSJNMzM4LDEuM2wtOTMuMywyNTkuMWwtNDIuMS0xMzEuOWgtODkuMWw4My44LDIxNS4yYzYsMTUuNSw2LDMyLjUsMCw0OGMtNy40LDE5LTE5LDM3LjMtNTMsNDEuOWwtNy4yLDF2NzZoOC4zYzgxLjcsMCwxMTguOS01Ny4yLDE0OS42LTE0Mi45TDQzMS42LDEuM0gzMzh6IE0yNzkuNCwzNjJjLTMyLjksOTItNjcuNiwxMjguNy0xMjUuNywxMzEuOHYtNDVjMzcuNS03LjUsNTEuMy0zMSw1OS4xLTUxLjFjNy41LTE5LjMsNy41LTQwLjcsMC02MGwtNzUtMTkyLjdoNTIuOGw1My4zLDE2Ni44bDEwNS45LTI5NGg1OC4xTDI3OS40LDM2MnoiLz48L2c+PC9nPjwvc3ZnPg=='; +||||||| .r11156 + /** + * Loads the form for the Social Settings page. + * + * @deprecated 1.5.0 + * @deprecated use WPSEO_Admin::load_page() + */ + function social_page() { + _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Admin::load_page()' ); + $this->load_page(); + } +======= +>>>>>>> .r12027 + +<<<<<<< .mine + return $icon_svg; + } +} /* End of class */ +||||||| .r11156 + } /* End of class */ +} /* End of class-exists wrapper */ +======= } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php index d785eec9..f5bfd640 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-description-editor-list-table.php @@ -47,6 +47,37 @@ class WPSEO_Bulk_Description_List_Table extends WPSEO_Bulk_List_Table { return $this->merge_columns( $columns ); } +<<<<<<< .mine + /** + * Parse the metadescription + * + * @param string $column_name Column name. + * @param object $record Data object. + * @param string $attributes HTML attributes. + * + * @return string + */ + protected function parse_page_specific_column( $column_name, $record, $attributes ) { + switch ( $column_name ) { + case 'col_new_yoast_seo_metadesc': + return sprintf( + '', + 'wpseo-new-metadesc-' . $record->ID, + $record->ID + ); + break; +||||||| .r11156 + /** + * The columns shown on the table + * + * @return array + */ + public function get_columns() { + $columns = array( + 'col_existing_yoast_seo_metadesc' => __( 'Existing Yoast Meta Description', 'wordpress-seo' ), + 'col_new_yoast_seo_metadesc' => __( 'New Yoast Meta Description', 'wordpress-seo' ), + ); +======= /** * Parse the metadescription * @@ -65,12 +96,44 @@ class WPSEO_Bulk_Description_List_Table extends WPSEO_Bulk_List_Table { $record->ID ); break; +>>>>>>> .r12027 case 'col_existing_yoast_seo_metadesc': // TODO inconsistent return/echo behavior R. echo $this->parse_meta_data_field( $record->ID, $attributes ); break; } +<<<<<<< .mine + } +} /* End of class */ +||||||| .r11156 + + /** + * Parse the metadescription + * + * @param string $column_name + * @param object $record + * @param string $attributes + * + * @return string + */ + protected function parse_page_specific_column( $column_name, $record, $attributes ) { + switch ( $column_name ) { + case 'col_new_yoast_seo_metadesc' : + return sprintf( '', 'wpseo-new-metadesc-' . $record->ID, $record->ID ); + break; + + + case 'col_existing_yoast_seo_metadesc': + echo $this->parse_meta_data_field( $record->ID, $attributes ); + break; + } + } + + } /* End of class */ +} /* End of class-exists wrapper */ +======= } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-editor-list-table.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-editor-list-table.php index ffa9872c..2a5f4310 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-editor-list-table.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-editor-list-table.php @@ -195,6 +195,31 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } +<<<<<<< .mine + /** + * Will shown the navigation for the table like pagenavigation and pagefilter; + * + * @param string $which Table nav location (such as top). + */ + function display_tablenav( $which ) { + $post_status = sanitize_text_field( filter_input( INPUT_GET, 'post_status' ) ); + ?> +

+||||||| .r11156 + /** + * Will shown the navigation for the table like pagenavigation and pagefilter; + * + * + * @param $which + */ + function display_tablenav( $which ) { + $post_status = ''; + if ( ! empty( $_GET['post_status'] ) ) { + $post_status = sanitize_text_field( $_GET['post_status'] ); + } + ?> +

+======= /** * Will shown the navigation for the table like pagenavigation and pagefilter; * @@ -204,6 +229,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { $post_status = sanitize_text_field( filter_input( INPUT_GET, 'post_status' ) ); ?>

+>>>>>>> .r12027

@@ -340,10 +366,20 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } +<<<<<<< .mine + /** + * @param string $which Table nav location (such as top). + */ + function extra_tablenav( $which ) { +||||||| .r11156 + if ( 'top' === $which ) { + $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ) ); +======= /** * @param string $which */ function extra_tablenav( $which ) { +>>>>>>> .r12027 if ( 'top' === $which ) { $post_types = get_post_types( array( 'public' => true, 'exclude_from_search' => false ) ); @@ -486,6 +522,30 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { $this->_column_headers = array( $columns, $hidden, $sortable ); } +<<<<<<< .mine + /** + * Counting total items + * + * @param string $subquery SQL FROM part. + * @param string $all_states SQL IN part. + * @param string $post_type_clause SQL post type part. + * + * @return mixed + */ + protected function count_items( $subquery, $all_states, $post_type_clause ) { + global $wpdb; + $total_items = $wpdb->get_var( + " +||||||| .r11156 + /** + * Counting total items + * @return mixed + */ + protected function count_items( $subquery, $all_states, $post_type_clause ) { + global $wpdb; + $total_items = $wpdb->get_var( + " +======= /** * Counting total items * @@ -499,6 +559,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { global $wpdb; $total_items = $wpdb->get_var( " +>>>>>>> .r12027 SELECT COUNT(ID) FROM {$subquery} WHERE post_status IN ({$all_states}) $post_type_clause @@ -527,6 +588,19 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { return $post_type_clause; } +<<<<<<< .mine + /** + * Setting the pagination. + * + * Total items is the number of all visible items. + * + * @param int $total_items Total items counts. + */ + protected function set_pagination( $total_items ) { +||||||| .r11156 + // Calculate items per page + $per_page = $this->get_items_per_page( 'wpseo_posts_per_page', 10 ); +======= /** * Setting the pagination. * @@ -535,6 +609,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { * @param int $total_items */ protected function set_pagination( $total_items ) { +>>>>>>> .r12027 // Calculate items per page. $per_page = $this->get_items_per_page( 'wpseo_posts_per_page', 10 ); @@ -559,6 +634,37 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } +<<<<<<< .mine + /** + * Parse the query to get items from database. + * + * Based on given parameters there will be parse a query which will get all the pages/posts and other post_types + * from the database. + * + * @param string $subquery SQL FROM part. + * @param string $all_states SQL IN part. + * @param string $post_type_clause SQL post type part. + * + * @return string + */ + protected function parse_item_query( $subquery, $all_states, $post_type_clause ) { + // Order By block. + $orderby = filter_input( INPUT_GET, 'orderby' ); +||||||| .r11156 + /** + * Parse the query to get items from database + * + * Based on given parameters there will be parse a query which will get all the pages/posts and other post_types + * from the database + * + * @param $subquery + * @param $all_states + * @param $post_type_clause + * + * @return string + */ + protected function parse_item_query( $subquery, $all_states, $post_type_clause ) { +======= /** * Parse the query to get items from database. * @@ -574,6 +680,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { protected function parse_item_query( $subquery, $all_states, $post_type_clause ) { // Order By block. $orderby = filter_input( INPUT_GET, 'orderby' ); +>>>>>>> .r12027 $orderby = ! empty( $orderby ) ? esc_sql( sanitize_text_field( $orderby ) ) : 'post_title'; $orderby = $this->sanitize_orderby( $orderby ); @@ -616,6 +723,26 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { return 'post_title'; } +<<<<<<< .mine + /** + * Makes sure the order clause is always ASC or DESC for the bulk editor table, thereby preventing a possible CSRF vulnerability. + * + * @param string $order Whether we want to sort ascending or descending. + * + * @return string $order SQL order string (ASC, DESC). + */ + protected function sanitize_order( $order ) { + if ( in_array( strtoupper( $order ), array( 'ASC', 'DESC' ) ) ) { + return $order; +||||||| .r11156 + $this->items = $wpdb->get_results( + $wpdb->prepare( + $query, + $this->pagination['offset'], + $this->pagination['per_page'] + ) + ); +======= /** * Makes sure the order clause is always ASC or DESC for the bulk editor table, thereby preventing a possible CSRF vulnerability. * @@ -626,11 +753,28 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { protected function sanitize_order( $order ) { if ( in_array( strtoupper( $order ), array( 'ASC', 'DESC' ) ) ) { return $order; +>>>>>>> .r12027 } return 'ASC'; } +<<<<<<< .mine + /** + * Getting all the items. + * + * @param string $query SQL query to use. + */ + protected function get_items( $query ) { + global $wpdb; +||||||| .r11156 + if ( ! empty( $_GET['post_status'] ) ) { + $requested_state = sanitize_text_field( $_GET['post_status'] ); + if ( in_array( $requested_state, $states ) ) { + $states = array( $requested_state ); + } + } +======= /** * Getting all the items. * @@ -638,6 +782,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { */ protected function get_items( $query ) { global $wpdb; +>>>>>>> .r12027 $this->items = $wpdb->get_results( $wpdb->prepare( @@ -706,6 +851,27 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } } +<<<<<<< .mine + /** + * Getting the attributes for each table cell. + * + * @param string $column_name Column name string. + * @param array $hidden Set of hidden columns. + * + * @return string + */ + protected function column_attributes( $column_name, $hidden ) { +||||||| .r11156 + /** + * Getting the attributes for each table cell + * + * @param string $column_name + * @param string $hidden + * + * @return string + */ + protected function column_attributes( $column_name, $hidden ) { +======= /** * Getting the attributes for each table cell. * @@ -715,6 +881,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { * @return string */ protected function column_attributes( $column_name, $hidden ) { +>>>>>>> .r12027 $class = sprintf( 'class="%1$s column-%1$s"', $column_name ); $style = ''; @@ -728,6 +895,24 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { return $attributes; } +<<<<<<< .mine + /** + * Parsing the title. + * + * @param WP_Post $rec Post object. + * + * @return string + */ + protected function parse_page_title_column( $rec ) { +||||||| .r11156 + /** + * Parsing the title + * @param object $rec + * + * @return string + */ + protected function parse_page_title_column( $rec ) { +======= /** * Parsing the title. * @@ -736,6 +921,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { * @return string */ protected function parse_page_title_column( $rec ) { +>>>>>>> .r12027 $return = sprintf( '%1$s', stripslashes( wp_strip_all_tags( $rec->post_title ) ) ); @@ -765,6 +951,27 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } +<<<<<<< .mine + /** + * Parsing the column based on the $column_name. + * + * @param string $column_name Column name. + * @param WP_Post $rec Post object. + * + * @return string + */ + protected function parse_column( $column_name, $rec ) { +||||||| .r11156 + /** + * Parsing the column based on the $column_name + * + * @param string $column_name + * @param stdobject $rec + * + * @return string + */ + protected function parse_column( $column_name, $rec ) { +======= /** * Parsing the column based on the $column_name. * @@ -774,6 +981,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { * @return string */ protected function parse_column( $column_name, $rec ) { +>>>>>>> .r12027 static $date_format; @@ -816,6 +1024,29 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } } +<<<<<<< .mine + /** + * Parse the field where the existing meta-data value is displayed. + * + * @param integer $record_id Record ID. + * @param string $attributes HTML attributes. + * @param bool|array $values Optional values data array. + * + * @return string + */ + protected function parse_meta_data_field( $record_id, $attributes, $values = false ) { +||||||| .r11156 + /** + * Parse the field where the existing meta-data value is displayed + * + * @param integer $record_id + * @param string $attributes + * @param bool|array $values + * + * @return string + */ + protected function parse_meta_data_field( $record_id, $attributes, $values = false ) { +======= /** * Parse the field where the existing meta-data value is displayed. * @@ -826,6 +1057,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { * @return string */ protected function parse_meta_data_field( $record_id, $attributes, $values = false ) { +>>>>>>> .r12027 // Fill meta data if exists in $this->meta_data. $meta_data = ( ! empty( $this->meta_data[ $record_id ] ) ) ? $this->meta_data[ $record_id ] : array(); @@ -873,6 +1105,20 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { return $post_ids; } +<<<<<<< .mine + /** + * Getting the meta_data from database. + * + * @param string $post_ids Post IDs string for SQL IN part. + * + * @return mixed + */ + protected function get_meta_data_result( $post_ids ) { + global $wpdb; +||||||| .r11156 + return $post_ids; + } +======= /** * Getting the meta_data from database. * @@ -882,6 +1128,7 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { */ protected function get_meta_data_result( $post_ids ) { global $wpdb; +>>>>>>> .r12027 $meta_data = $wpdb->get_results( " @@ -894,12 +1141,28 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { return $meta_data; } +<<<<<<< .mine + /** + * Setting $this->meta_data. + * + * @param array $meta_data Meta data set. + */ + protected function parse_meta_data( $meta_data ) { +||||||| .r11156 + /** + * Setting $this->meta_data + * + * @param array $meta_data + */ + protected function parse_meta_data( $meta_data ) { +======= /** * Setting $this->meta_data. * * @param array $meta_data */ protected function parse_meta_data( $meta_data ) { +>>>>>>> .r12027 foreach ( $meta_data as $row ) { $this->meta_data[ $row->post_id ][ $row->meta_key ] = $row->meta_value; @@ -907,6 +1170,28 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { } +<<<<<<< .mine + /** + * This method will merge general array with given parameter $columns. + * + * @param array $columns Optional columns set. + * + * @return array + */ + protected function merge_columns( $columns = array() ) { + $columns = array_merge( + array( + 'col_page_title' => __( 'WP Page Title', 'wordpress-seo' ), + 'col_post_type' => __( 'Post Type', 'wordpress-seo' ), + 'col_post_status' => __( 'Post Status', 'wordpress-seo' ), + 'col_post_date' => __( 'Publication date', 'wordpress-seo' ), + 'col_page_slug' => __( 'Page URL/Slug', 'wordpress-seo' ), + ), + $columns + ); +||||||| .r11156 + $columns['col_row_action'] = __( 'Action', 'wordpress-seo' ); +======= /** * This method will merge general array with given parameter $columns. * @@ -925,10 +1210,22 @@ class WPSEO_Bulk_List_Table extends WP_List_Table { ), $columns ); +>>>>>>> .r12027 $columns['col_row_action'] = __( 'Action', 'wordpress-seo' ); +<<<<<<< .mine + return $columns; + } +} /* End of class */ +||||||| .r11156 + } + + } /* End of class */ +} /* End of class-exists wrapper */ +======= return $columns; } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php index 0df34ee0..9a647052 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-bulk-title-editor-list-table.php @@ -49,6 +49,25 @@ class WPSEO_Bulk_Title_Editor_List_Table extends WPSEO_Bulk_List_Table { return $this->merge_columns( $columns ); } +<<<<<<< .mine + /** + * Parse the title columns + * + * @param string $column_name Column name. + * @param object $record Data object. + * @param string $attributes HTML attributes. + * + * @return string + */ + protected function parse_page_specific_column( $column_name, $record, $attributes ) { +||||||| .r11156 + /** + * The columns shown on the table + * + * @return array + */ + public function get_columns() { +======= /** * Parse the title columns * @@ -59,10 +78,21 @@ class WPSEO_Bulk_Title_Editor_List_Table extends WPSEO_Bulk_List_Table { * @return string */ protected function parse_page_specific_column( $column_name, $record, $attributes ) { +>>>>>>> .r12027 // Fill meta data if exists in $this->meta_data. $meta_data = ( ! empty( $this->meta_data[ $record->ID ] ) ) ? $this->meta_data[ $record->ID ] : array(); +<<<<<<< .mine + switch ( $column_name ) { + case 'col_existing_yoast_seo_title': + // TODO inconsistent echo/return behavior R. + echo $this->parse_meta_data_field( $record->ID, $attributes ); + break; +||||||| .r11156 + return $this->merge_columns($columns); + } +======= switch ( $column_name ) { case 'col_existing_yoast_seo_title': // TODO inconsistent echo/return behavior R. @@ -77,9 +107,56 @@ class WPSEO_Bulk_Title_Editor_List_Table extends WPSEO_Bulk_List_Table { ); break; } +>>>>>>> .r12027 + +<<<<<<< .mine + case 'col_new_yoast_seo_title': + return sprintf( + '', + 'wpseo-new-title-' . $record->ID, + $record->ID + ); + break; + } + + unset( $meta_data ); + } +} /* End of class */ +||||||| .r11156 + /** + * Parse the title columns + * + * @param string $column_name + * @param object $record + * @param string $attributes + * + * @return string + */ + protected function parse_page_specific_column( $column_name, $record, $attributes ) { + + // Fill meta data if exists in $this->meta_data + $meta_data = ( ! empty( $this->meta_data[$record->ID] ) ) ? $this->meta_data[$record->ID] : array(); + + switch ( $column_name ) { + case 'col_existing_yoast_seo_title': + echo $this->parse_meta_data_field( $record->ID, $attributes ); + break; + + case 'col_new_yoast_seo_title': + return sprintf( '', 'wpseo-new-title-' . $record->ID, $record->ID ); + break; + } + + unset( $meta_data ); + } + + } /* End of class */ +} /* End of class-exists wrapper */ +======= unset( $meta_data ); } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-config.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-config.php index f8ac3deb..15c77b50 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-config.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-config.php @@ -22,6 +22,7 @@ class WPSEO_Admin_Pages { add_action( 'init', array( $this, 'init' ), 20 ); } +<<<<<<< .mine /** * Make sure the needed scripts are loaded for admin pages */ @@ -34,9 +35,103 @@ class WPSEO_Admin_Pages { if ( WPSEO_Utils::grant_access() ) { add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); add_action( 'admin_enqueue_scripts', array( $this, 'config_page_styles' ) ); +||||||| .r11156 + /** + * @var string $currentoption The option in use for the current admin page. + */ + var $currentoption = 'wpseo'; + + /** + * @var array $adminpages Array of admin pages that the plugin uses. + */ + var $adminpages = array( + 'wpseo_dashboard', + 'wpseo_rss', + 'wpseo_files', + 'wpseo_permalinks', + 'wpseo_internal-links', + 'wpseo_import', + 'wpseo_titles', + 'wpseo_xml', + 'wpseo_social', + 'wpseo_bulk-editor', + 'wpseo_licenses', + 'wpseo_network_licenses', + ); + + /** + * Class constructor, which basically only hooks the init function on the init hook + */ + function __construct() { + add_action( 'init', array( $this, 'init' ), 20 ); +======= + /** + * Make sure the needed scripts are loaded for admin pages + */ + function init() { + if ( filter_input( INPUT_GET, 'wpseo_reset_defaults' ) && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), 'wpseo_reset_defaults' ) && current_user_can( 'manage_options' ) ) { + WPSEO_Options::reset(); + wp_redirect( admin_url( 'admin.php?page=wpseo_dashboard' ) ); +>>>>>>> .r12027 } } +<<<<<<< .mine + /** + * Loads the required styles for the config page. + */ + function config_page_styles() { + wp_enqueue_style( 'dashboard' ); + wp_enqueue_style( 'thickbox' ); + wp_enqueue_style( 'global' ); + wp_enqueue_style( 'wp-admin' ); + wp_enqueue_style( 'yoast-admin-css', plugins_url( 'css/yst_plugin_tools-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + + if ( is_rtl() ) { + wp_enqueue_style( 'wpseo-rtl', plugins_url( 'css/wpseo-rtl' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); +||||||| .r11156 + /** + * Make sure the needed scripts are loaded for admin pages + */ + function init() { + if ( isset( $_GET['wpseo_reset_defaults'] ) && wp_verify_nonce( $_GET['nonce'], 'wpseo_reset_defaults' ) && current_user_can( 'manage_options' ) ) { + WPSEO_Options::reset(); + wp_redirect( admin_url( 'admin.php?page=wpseo_dashboard' ) ); + } + + $this->adminpages = apply_filters( 'wpseo_admin_pages', $this->adminpages ); + + if ( WPSEO_Options::grant_access() ) { + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_styles' ) ); + } +======= + if ( WPSEO_Utils::grant_access() ) { + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_scripts' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'config_page_styles' ) ); +>>>>>>> .r12027 + } + } + +<<<<<<< .mine + /** + * Loads the required scripts for the config page. + */ + function config_page_scripts() { + wp_enqueue_script( 'wpseo-admin-script', plugins_url( 'js/wp-seo-admin-' . '306' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + 'jquery-ui-progressbar', + ), WPSEO_VERSION, true ); + wp_localize_script( 'wpseo-admin-script', 'wpseoAdminL10n', $this->localize_admin_script() ); + wp_enqueue_script( 'dashboard' ); + wp_enqueue_script( 'thickbox' ); +||||||| .r11156 + /** + * Generates the sidebar for admin pages. + */ + function admin_sidebar() { +======= /** * Loads the required styles for the config page. */ @@ -46,12 +141,149 @@ class WPSEO_Admin_Pages { wp_enqueue_style( 'global' ); wp_enqueue_style( 'wp-admin' ); wp_enqueue_style( 'yoast-admin-css', plugins_url( 'css/yst_plugin_tools' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); +>>>>>>> .r12027 + +<<<<<<< .mine + + + $page = filter_input( INPUT_GET, 'page' ); + $tool = filter_input( INPUT_GET, 'tool' ); + + if ( in_array( $page, array( 'wpseo_social', 'wpseo_dashboard' ) ) ) { + wp_enqueue_media(); + wp_enqueue_script( 'wpseo-admin-media', plugins_url( 'js/wp-seo-admin-media-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION, true ); + wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() ); +||||||| .r11156 + // No banners in Premium + if ( class_exists( 'WPSEO_Product_Premium' ) ) { + $license_manager = new Yoast_Plugin_License_Manager( new WPSEO_Product_Premium() ); + if ( $license_manager->license_is_valid() ) { + return; + } + } + + $service_banners = array( + array( + 'url' => 'https://yoast.com/hire-us/website-review/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=website-review-banner', + 'img' => 'banner-website-review.png', + 'alt' => 'Website Review banner', + ), + ); + + $plugin_banners = array( + array( + 'url' => 'https://yoast.com/wordpress/plugins/seo-premium/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=premium-seo-banner', + 'img' => 'banner-premium-seo.png', + 'alt' => 'Banner WordPress SEO Premium', + ), + ); + + if ( ! class_exists( 'wpseo_Video_Sitemap' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/video-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=video-seo-banner', + 'img' => 'banner-video-seo.png', + 'alt' => 'Banner WordPress SEO Video SEO extension', + ); + } + + if ( class_exists( 'Woocommerce' ) && ! class_exists( 'Yoast_WooCommerce_SEO' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/yoast-woocommerce-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=woocommerce-seo-banner', + 'img' => 'banner-woocommerce-seo.png', + 'alt' => 'Banner WooCommerce SEO plugin', + ); + } + + if ( ! defined( 'WPSEO_LOCAL_VERSION' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/local-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=local-seo-banner', + 'img' => 'banner-local-seo.png', + 'alt' => 'Banner Local SEO plugin', + ); + } + + if ( ! class_exists( 'WPSEO_News' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/news-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=news-seo-banner', + 'img' => 'banner-news-seo.png', + 'alt' => 'Banner News SEO', + ); + } + + shuffle( $service_banners ); + shuffle( $plugin_banners ); + ?> +

+ +

+ >>>>>> .r12027 } } +<<<<<<< .mine + if ( 'wpseo_tools' === $page && empty( $tool ) ) { + wp_enqueue_script( 'yoast-seo', plugins_url( 'js/dist/yoast-seo/yoast-seo-' . '305' . '.min.js', WPSEO_FILE ), null, WPSEO_VERSION, true ); + } +||||||| .r11156 + /** + * Generates the header for admin pages + * + * @param bool $form Whether or not the form start tag should be included. + * @param string $option The long name of the option to use for the current page. + * @param string $optionshort The short name of the option to use for the current page. + * @param bool $contains_files Whether the form should allow for file uploads. + */ + function admin_header( $form = true, $option = 'yoast_wpseo_options', $optionshort = 'wpseo', $contains_files = false ) { + ?> +

+ +

+ '; + settings_fields( $option ); + } + $this->currentoption = $optionshort; + } +======= /** * Loads the required scripts for the config page. */ @@ -63,7 +295,70 @@ class WPSEO_Admin_Pages { wp_localize_script( 'wpseo-admin-script', 'wpseoAdminL10n', $this->localize_admin_script() ); wp_enqueue_script( 'dashboard' ); wp_enqueue_script( 'thickbox' ); +>>>>>>> .r12027 + +<<<<<<< .mine + if ( 'wpseo_tools' === $page && 'bulk-editor' === $tool ) { + wp_enqueue_script( 'wpseo-bulk-editor', plugins_url( 'js/wp-seo-bulk-editor' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); +||||||| .r11156 + /** + * Generates the footer for admin pages + * + * @param bool $submit Whether or not a submit button and form end tag should be shown. + * @param bool $show_sidebar Whether or not to show the banner sidebar - used by premium plugins to disable it + */ + function admin_footer( $submit = true, $show_sidebar = true ) { + if ( $submit ) { + submit_button(); + + echo ' + '; + } + do_action( 'wpseo_admin_footer' ); + + echo ' +

'; + + if ( $show_sidebar ) { + $this->admin_sidebar(); + } + + echo '

'; + + + /* Add the current settings array to the page for debugging purposes, + but not for a limited set of pages were it wouldn't make sense */ + $excluded = array( + 'wpseo_import', + 'wpseo_files', + 'bulk_title_editor_page', + 'bulk_description_editor_page', + ); + + if ( ( WP_DEBUG === true || ( defined( 'WPSEO_DEBUG' ) && WPSEO_DEBUG === true ) ) && isset( $_GET['page'] ) && ! in_array( $_GET['page'], $excluded, true ) ) { + $xdebug = ( extension_loaded( 'xdebug' ) ? true : false ); + echo ' +

+ +

' . __( 'Debug Information', 'wordpress-seo' ) . '

' . esc_html( __( 'Current option:', 'wordpress-seo' ) ) . ' ' . esc_html( $this->currentoption ) . '

+ ' . ( $xdebug ? '' : '

' );
+				var_dump( $this->get_option( $this->currentoption ) );
+				echo '
+					' . ( $xdebug ? '' : '

' ) . ' +

'; + } + + echo ' +

'; +======= $page = filter_input( INPUT_GET, 'page' ); $tool = filter_input( INPUT_GET, 'tool' ); @@ -74,17 +369,150 @@ class WPSEO_Admin_Pages { 'jquery-ui-core', ), WPSEO_VERSION, true ); wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() ); +>>>>>>> .r12027 } +<<<<<<< .mine + if ( 'wpseo_tools' === $page && 'import-export' === $tool ) { + wp_enqueue_script( 'wpseo-export', plugins_url( 'js/wp-seo-export-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); +||||||| .r11156 + /** + * Deletes all post meta values with a given meta key from the database + * + * @todo [JRF => whomever] This method does not seem to be used anywhere. Double-check before removal. + * + * @param string $meta_key Key to delete all meta values for. + */ + /*function delete_meta( $meta_key ) { + global $wpdb; + $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key ) ); + }*/ + + /** + * Exports the current site's WP SEO settings. + * + * @param bool $include_taxonomy Whether to include the taxonomy metadata the plugin creates. + * + * @return bool|string $return False when failed, the URL to the export file when succeeded. + */ + function export_settings( $include_taxonomy ) { + $content = '; ' . __( 'This is a settings export file for the WordPress SEO plugin by Yoast.com', 'wordpress-seo' ) . " - https://yoast.com/wordpress/plugins/seo/ \r\n"; + + $optarr = WPSEO_Options::get_option_names(); + + foreach ( $optarr as $optgroup ) { + $content .= "\n" . '[' . $optgroup . ']' . "\n"; + $options = get_option( $optgroup ); + if ( ! is_array( $options ) ) { + continue; + } + foreach ( $options as $key => $elem ) { + if ( is_array( $elem ) ) { + $elm_count = count( $elem ); + for ( $i = 0; $i < $elm_count; $i ++ ) { + $content .= $key . '[] = "' . $elem[ $i ] . "\"\n"; + } + } elseif ( is_string( $elem ) && $elem == '' ) { + $content .= $key . " = \n"; + } elseif ( is_bool( $elem ) ) { + $content .= $key . ' = "' . ( ( $elem === true ) ? 'on' : 'off' ) . "\"\n"; + } else { + $content .= $key . ' = "' . $elem . "\"\n"; + } + } + } + + if ( $include_taxonomy ) { + $content .= "\r\n\r\n[wpseo_taxonomy_meta]\r\n"; + $content .= 'wpseo_taxonomy_meta = "' . urlencode( json_encode( get_option( 'wpseo_taxonomy_meta' ) ) ) . '"'; + } + + $dir = wp_upload_dir(); + + if ( ! $handle = fopen( $dir['path'] . '/settings.ini', 'w' ) ) { + die(); + } + + if ( ! fwrite( $handle, $content ) ) { + die(); + } + + fclose( $handle ); + + chdir( $dir['path'] ); + $zip = new PclZip( './settings.zip' ); + if ( $zip->create( './settings.ini' ) == 0 ) { + return false; + } + + return $dir['url'] . '/settings.zip'; +======= if ( 'wpseo_tools' === $page && 'bulk-editor' === $tool ) { wp_enqueue_script( 'wpseo-bulk-editor', plugins_url( 'js/wp-seo-bulk-editor' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); +>>>>>>> .r12027 } + } + +<<<<<<< .mine + /** + * Pass some variables to js for upload module. + * + * @return array + */ + public function localize_media_script() { + return array( + 'choose_image' => __( 'Use Image', 'wordpress-seo' ), + ); + } + /** + * Pass some variables to js for the admin JS module. + * + * %s is replaced with %s and replaced again in the javascript with the actual variable. + * + * @return array + */ + public function localize_admin_script() { + return array( + /* translators: %s: '%%term_title%%' variable used in titles and meta's template that's not compatible with the given template */ + 'variable_warning' => sprintf( __( 'Warning: the variable %s cannot be used in this template.', 'wordpress-seo' ), '%s' ) . ' ' . __( 'See the help tab for more info.', 'wordpress-seo' ), + 'locale' => get_locale(), + ); + } +||||||| .r11156 + /** + * Loads the required styles for the config page. + */ + function config_page_styles() { + global $pagenow; + if ( $pagenow === 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) { + wp_enqueue_style( 'dashboard' ); + wp_enqueue_style( 'thickbox' ); + wp_enqueue_style( 'global' ); + wp_enqueue_style( 'wp-admin' ); + wp_enqueue_style( 'yoast-admin-css', plugins_url( 'css/yst_plugin_tools' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + + if ( is_rtl() ) { + wp_enqueue_style( 'wpseo-rtl', plugins_url( 'css/wpseo-rtl' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + } + } + } +======= if ( 'wpseo_tools' === $page && 'import-export' === $tool ) { wp_enqueue_script( 'wpseo-export', plugins_url( 'js/wp-seo-export' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); } +>>>>>>> .r12027 } +<<<<<<< .mine + /********************** DEPRECATED METHODS **********************/ +||||||| .r11156 + /** + * Loads the required scripts for the config page. + */ + function config_page_scripts() { + global $pagenow; +======= /** * Pass some variables to js for upload module. * @@ -95,7 +523,28 @@ class WPSEO_Admin_Pages { 'choose_image' => __( 'Use Image', 'wordpress-seo' ), ); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Exports the current site's Yoast SEO settings. + * + * @param bool $include_taxonomy Whether to include the taxonomy metadata the plugin creates. + * + * @return bool|string $return False when failed, the URL to the export file when succeeded. + */ + public function export_settings( $include_taxonomy ) { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the WPSEO_Export class.' ); +||||||| .r11156 + if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) { + wp_enqueue_script( 'wpseo-admin-script', plugins_url( 'js/wp-seo-admin' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION, true ); + wp_enqueue_script( 'dashboard' ); + wp_enqueue_script( 'thickbox' ); + } +======= /** * Pass some variables to js for the admin JS module. * @@ -109,7 +558,28 @@ class WPSEO_Admin_Pages { 'variable_warning' => sprintf( __( 'Warning: the variable %s cannot be used in this template.', 'wordpress-seo' ), '%s' ) . ' ' . __( 'See the help tab for more info.', 'wordpress-seo' ), ); } +>>>>>>> .r12027 +<<<<<<< .mine + $export = new WPSEO_Export( $include_taxonomy ); + if ( $export->success ) { + return $export->export_zip_url; + } +||||||| .r11156 + if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], array( 'wpseo_social' ) ) ) { + wp_enqueue_media(); + wp_enqueue_script( 'wpseo-admin-media', plugins_url( 'js/wp-seo-admin-media' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION, true ); + wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() ); + } + + if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], array( 'wpseo_bulk-editor' ) ) ) { + wp_enqueue_script( 'wpseo-bulk-editor', plugins_url( 'js/wp-seo-bulk-editor' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); + } + } +======= /********************** DEPRECATED METHODS **********************/ /** @@ -121,16 +591,87 @@ class WPSEO_Admin_Pages { */ public function export_settings( $include_taxonomy ) { _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the WPSEO_Export class.' ); +>>>>>>> .r12027 +<<<<<<< .mine + else { + return false; +||||||| .r11156 + + /** + * Pass some variables to js for upload module. + * + * @return array + */ + public function localize_media_script() { + return array( + 'choose_image' => __( 'Use Image', 'wordpress-seo' ), + ); +======= $export = new WPSEO_Export( $include_taxonomy ); if ( $export->success ) { return $export->export_zip_url; +>>>>>>> .r12027 + } +<<<<<<< .mine + } + + /** + * Generates the header for admin pages + * + * @deprecated 2.0 + * + * @param bool $form Whether or not the form start tag should be included. + * @param mixed $option_long_name The long name of the option to use for the current page. + * @param string $option The short name of the option to use for the current page. + * @param bool $contains_files Whether the form should allow for file uploads. + */ + public function admin_header( $form = true, $option_long_name = false, $option = 'wpseo', $contains_files = false ) { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +||||||| .r11156 + + /** + * Retrieve options based on whether we're on multisite or not. + * + * @since 1.2.4 + * + * @param string $option The option to retrieve. + * + * @return array + */ + function get_option( $option ) { + if ( is_network_admin() ) { + return get_site_option( $option ); + } else { + return get_option( $option ); + } } +======= else { return false; } +>>>>>>> .r12027 } +<<<<<<< .mine + Yoast_Form::get_instance()->admin_header( $form, $option, $contains_files, $option_long_name ); + } +||||||| .r11156 + /** + * Create a Checkbox input field. + * + * @param string $var The variable within the option to create the checkbox for. + * @param string $label The label to show for the variable. + * @param bool $label_left Whether the label should be left (true) or right (false). + * @param string $option The option the variable belongs to. + * + * @return string + */ + function checkbox( $var, $label, $label_left = false, $option = '' ) { + if ( empty( $option ) ) { + $option = $this->currentoption; + } +======= /** * Generates the header for admin pages * @@ -143,10 +684,34 @@ class WPSEO_Admin_Pages { */ public function admin_header( $form = true, $option_long_name = false, $option = 'wpseo', $contains_files = false ) { _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Generates the footer for admin pages + * + * @deprecated 2.0 + * + * @param bool $submit Whether or not a submit button and form end tag should be shown. + * @param bool $show_sidebar Whether or not to show the banner sidebar - used by premium plugins to disable it. + */ + public function admin_footer( $submit = true, $show_sidebar = true ) { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +||||||| .r11156 + $options = $this->get_option( $option ); +======= Yoast_Form::get_instance()->admin_header( $form, $option, $contains_files, $option_long_name ); } +>>>>>>> .r12027 +<<<<<<< .mine + Yoast_Form::get_instance()->admin_footer( $submit, $show_sidebar ); + } +||||||| .r11156 + if ( ! isset( $options[ $var ] ) ) { + $options[ $var ] = false; + } +======= /** * Generates the footer for admin pages * @@ -157,10 +722,40 @@ class WPSEO_Admin_Pages { */ public function admin_footer( $submit = true, $show_sidebar = true ) { _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Generates the sidebar for admin pages. + * + * @deprecated 2.0 + */ + public function admin_sidebar() { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +||||||| .r11156 + if ( $options[ $var ] === true ) { + $options[ $var ] = 'on'; + } +======= Yoast_Form::get_instance()->admin_footer( $submit, $show_sidebar ); } +>>>>>>> .r12027 +<<<<<<< .mine + Yoast_Form::get_instance()->admin_sidebar(); + } +||||||| .r11156 + if ( $label_left !== false ) { + if ( ! empty( $label_left ) ) { + $label_left .= ':'; + } + $output_label = '' . $label_left . ''; + $class = 'checkbox'; + } else { + $output_label = '' . $label . ''; + $class = 'checkbox double'; + } +======= /** * Generates the sidebar for admin pages. * @@ -168,10 +763,40 @@ class WPSEO_Admin_Pages { */ public function admin_sidebar() { _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Create a Checkbox input field. + * + * @deprecated 2.0 + * + * @param string $var The variable within the option to create the checkbox for. + * @param string $label The label to show for the variable. + * @param bool $label_left Whether the label should be left (true) or right (false). + * @param string $option The option the variable belongs to. + */ + public function checkbox( $var, $label, $label_left = false, $option = '' ) { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +||||||| .r11156 + $output_input = ''; +======= Yoast_Form::get_instance()->admin_sidebar(); } +>>>>>>> .r12027 + +<<<<<<< .mine + if ( $option !== '' ) { + Yoast_Form::get_instance()->set_option( $option ); +||||||| .r11156 + if ( $label_left !== false ) { + $output = $output_label . $output_input . '' . $label . ''; + } else { + $output = $output_input . $output_label; + } + return $output . '
'; +======= /** * Create a Checkbox input field. * @@ -187,6 +812,7 @@ class WPSEO_Admin_Pages { if ( $option !== '' ) { Yoast_Form::get_instance()->set_option( $option ); +>>>>>>> .r12027 } Yoast_Form::get_instance()->checkbox( $var, $label, $label_left ); @@ -287,6 +913,27 @@ class WPSEO_Admin_Pages { Yoast_Form::get_instance()->file_upload( $var, $label ); } +<<<<<<< .mine + /** + * Media input + * + * @deprecated 2.0 + * + * @param string $var Option name. + * @param string $label Label message. + * @param string $option Optional option key. + */ + function media_input( $var, $label, $option = '' ) { + _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +||||||| .r11156 + // Need to save separate array items in hidden inputs, because empty file inputs type will be deleted by settings API. + if ( ! empty( $options[ $var ] ) ) { + $output .= ''; + $output .= ''; + $output .= ''; + } + $output .= '
'; +======= /** * Media input * @@ -298,6 +945,7 @@ class WPSEO_Admin_Pages { */ function media_input( $var, $label, $option = '' ) { _deprecated_function( __METHOD__, 'WPSEO 2.0', 'This method is deprecated, please use the Yoast_Form class.' ); +>>>>>>> .r12027 if ( $option !== '' ) { Yoast_Form::get_instance()->set_option( $option ); @@ -340,7 +988,7 @@ class WPSEO_Admin_Pages { ?>

>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-customizer.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-customizer.php index 41f017ac..c587ee39 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-customizer.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-customizer.php @@ -1,3 +1,261 @@ +<<<<<<< .mine +wp_customize = $wp_customize; + + $this->breadcrumbs_section(); + $this->breadcrumbs_blog_remove_setting(); + $this->breadcrumbs_separator_setting(); + $this->breadcrumbs_home_setting(); + $this->breadcrumbs_prefix_setting(); + $this->breadcrumbs_archiveprefix_setting(); + $this->breadcrumbs_searchprefix_setting(); + $this->breadcrumbs_404_setting(); + } + + /** + * Add the breadcrumbs section to the customizer + */ + private function breadcrumbs_section() { + $this->wp_customize->add_section( + 'wpseo_breadcrumbs_customizer_section', array( + /* translators: %s is the name of the plugin */ + 'title' => sprintf( __( '%s Breadcrumbs', 'wordpress-seo' ), 'Yoast SEO' ), + 'priority' => 999, + 'active_callback' => array( $this, 'breadcrumbs_active_callback' ), + ) + ); + + } + + /** + * Returns whether or not the breadcrumbs are active + * + * @return bool + */ + public function breadcrumbs_active_callback() { + $options = WPSEO_Options::get_all(); + + return true === ( current_theme_supports( 'yoast-seo-breadcrumbs' ) || $options['breadcrumbs-enable'] ); + } + + /** + * Adds the breadcrumbs remove blog checkbox + */ + private function breadcrumbs_blog_remove_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-blog-remove]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-blog-remove', array( + 'label' => __( 'Remove blog page from breadcrumbs', 'wordpress-seo' ), + 'type' => 'checkbox', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-blog-remove]', + 'context' => '', + 'active_callback' => array( $this, 'breadcrumbs_blog_remove_active_cb' ), + ) + ) + ); + } + + /** + * Returns whether or not to show the breadcrumbs blog remove option + * + * @return bool + */ + public function breadcrumbs_blog_remove_active_cb() { + return 'page' === get_option( 'show_on_front' ); + } + + /** + * Adds the breadcrumbs separator text field + */ + private function breadcrumbs_separator_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-sep]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-separator', array( + 'label' => __( 'Breadcrumbs separator:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-sep]', + 'context' => '', + ) + ) + ); + } + + /** + * Adds the breadcrumbs home anchor text field + */ + private function breadcrumbs_home_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-home]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-home', array( + 'label' => __( 'Anchor text for the homepage:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-home]', + 'context' => '', + ) + ) + ); + } + + /** + * Adds the breadcrumbs prefix text field + */ + private function breadcrumbs_prefix_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-prefix]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-prefix', array( + 'label' => __( 'Prefix for breadcrumbs:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-prefix]', + 'context' => '', + ) + ) + ); + } + + /** + * Adds the breadcrumbs archive prefix text field + */ + private function breadcrumbs_archiveprefix_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-archiveprefix]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-archiveprefix', array( + 'label' => __( 'Prefix for archive pages:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-archiveprefix]', + 'context' => '', + ) + ) + ); + } + + /** + * Adds the breadcrumbs search prefix text field + */ + private function breadcrumbs_searchprefix_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-searchprefix]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-searchprefix', array( + 'label' => __( 'Prefix for search result pages:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-searchprefix]', + 'context' => '', + ) + ) + ); + } + + /** + * Adds the breadcrumb 404 prefix text field + */ + private function breadcrumbs_404_setting() { + $this->wp_customize->add_setting( + 'wpseo_internallinks[breadcrumbs-404crumb]', array( + 'default' => '', + 'type' => 'option', + 'transport' => 'refresh', + ) + ); + + $this->wp_customize->add_control( + new WP_Customize_Control( + $this->wp_customize, 'wpseo-breadcrumbs-404crumb', array( + 'label' => __( 'Breadcrumb for 404 pages:', 'wordpress-seo' ), + 'type' => 'text', + 'section' => 'wpseo_breadcrumbs_customizer_section', + 'settings' => 'wpseo_internallinks[breadcrumbs-404crumb]', + 'context' => '', + ) + ) + ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-export.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-export.php index e59863c8..14007070 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-export.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-export.php @@ -1,3 +1,229 @@ +<<<<<<< .mine +include_taxonomy = $include_taxonomy; + $this->dir = wp_upload_dir(); + $this->success = $this->export_settings(); + } + + /** + * Returns an array with status and output message. + * + * @return array $results + */ + public function get_results() { + $results = array(); + if ( $this->success ) { + $results['status'] = 'success'; + $results['msg'] = sprintf( __( 'Export created: %1$sdownload your export file here%2$s.', 'wordpress-seo' ), '', '' ); + } + else { + $results['status'] = 'failure'; + /* translators: %1$s expands to Yoast SEO */ + $results['msg'] = sprintf( __( 'Error creating %1$s export: ', 'wordpress-seo' ), 'Yoast SEO' ) . $this->error; + } + + return $results; + } + + /** + * Exports the current site's WP SEO settings. + * + * @return boolean|string $return true when success, error when failed. + */ + private function export_settings() { + + $this->export_header(); + + foreach ( WPSEO_Options::get_option_names() as $opt_group ) { + $this->write_opt_group( $opt_group, $this->export ); + } + + $this->taxonomy_metadata(); + + if ( $this->write_file() ) { + if ( $this->zip_file() ) { + return true; + } + else { + $this->error = __( 'Could not zip settings-file.', 'wordpress-seo' ); + + return false; + } + } + $this->error = __( 'Could not write settings to file.', 'wordpress-seo' ); + + return false; + } + + /** + * Writes the header of the export file. + */ + private function export_header() { + /* translators: %1$s expands to Yoast SEO */ + $this->write_line( '; ' . sprintf( __( 'This is a settings export file for the %1$s plugin by Yoast.com', 'wordpress-seo' ), 'Yoast SEO' ) . ' - https://yoast.com/wordpress/plugins/seo/' ); + if ( $this->include_taxonomy ) { + $this->write_line( '; ' . __( 'This export includes taxonomy metadata', 'wordpress-seo' ) ); + } + } + + /** + * Writes a line to the export + * + * @param string $line Line string. + * @param boolean $newline_first Boolean flag whether to prepend with new line. + */ + private function write_line( $line, $newline_first = false ) { + if ( $newline_first ) { + $this->export .= PHP_EOL; + } + $this->export .= $line . PHP_EOL; + } + + /** + * Writes an entire option group to the export + * + * @param string $opt_group Option group name. + */ + private function write_opt_group( $opt_group ) { + $this->write_line( '[' . $opt_group . ']', true ); + + $options = get_option( $opt_group ); + + if ( ! is_array( $options ) ) { + return; + } + + foreach ( $options as $key => $elem ) { + if ( is_array( $elem ) ) { + for ( $i = 0; $i < count( $elem ); $i ++ ) { + $this->write_setting( $key . '[]', $elem[ $i ] ); + } + } + else { + $this->write_setting( $key, $elem ); + } + } + } + + /** + * Writes a settings line to the export + * + * @param string $key Key string. + * @param string $val Value string. + */ + private function write_setting( $key, $val ) { + if ( is_string( $val ) ) { + $val = '"' . $val . '"'; + } + $this->write_line( $key . ' = ' . $val ); + } + + /** + * Adds the taxonomy meta data if there is any + */ + private function taxonomy_metadata() { + if ( $this->include_taxonomy ) { + $taxonomy_meta = get_option( 'wpseo_taxonomy_meta' ); + if ( is_array( $taxonomy_meta ) ) { + $this->write_line( '[wpseo_taxonomy_meta]', true ); + $this->write_setting( 'wpseo_taxonomy_meta', urlencode( WPSEO_Utils::json_encode( $taxonomy_meta ) ) ); + } + else { + $this->write_line( '; ' . __( 'No taxonomy metadata found', 'wordpress-seo' ), true ); + } + } + } + + /** + * Writes the settings to our temporary settings.ini file + * + * @return boolean unsigned + */ + private function write_file() { + $handle = fopen( $this->dir['path'] . '/settings.ini', 'w' ); + if ( ! $handle ) { + return false; + } + + $res = fwrite( $handle, $this->export ); + if ( ! $res ) { + return false; + } + + fclose( $handle ); + + return true; + } + + /** + * Zips the settings ini file + * + * @return boolean unsigned + */ + private function zip_file() { + chdir( $this->dir['path'] ); + $zip = new PclZip( './settings.zip' ); + if ( 0 === $zip->create( './settings.ini' ) ) { + return false; + } + + $this->export_zip_url = $this->dir['url'] . '/settings.zip'; + + return true; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-external.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-external.php index 41823531..cafa621d 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-external.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-external.php @@ -1,3 +1,201 @@ +<<<<<<< .mine +replace = $replace; + + WPSEO_Options::initialize(); + } + + /** + * Convenience function to set import message + * + * @param string $msg Message string. + */ + protected function set_msg( $msg ) { + if ( ! empty( $this->msg ) ) { + $this->msg .= PHP_EOL; + } + $this->msg .= $msg; + } + + /** + * Deletes an option depending on the class replace state + * + * @param string $option Option key. + */ + protected function perhaps_delete( $option ) { + if ( $this->replace ) { + delete_option( $option ); + } + } + + /** + * Import HeadSpace SEO settings + */ + public function import_headspace() { + global $wpdb; + + WPSEO_Meta::replace_meta( '_headspace_description', WPSEO_Meta::$meta_prefix . 'metadesc', $this->replace ); + WPSEO_Meta::replace_meta( '_headspace_keywords', WPSEO_Meta::$meta_prefix . 'metakeywords', $this->replace ); + WPSEO_Meta::replace_meta( '_headspace_page_title', WPSEO_Meta::$meta_prefix . 'title', $this->replace ); + + /** + * @todo [JRF => whomever] verify how headspace sets these metas ( 'noindex', 'nofollow', 'noarchive', 'noodp', 'noydir' ) + * and if the values saved are concurrent with the ones we use (i.e. 0/1/2) + */ + WPSEO_Meta::replace_meta( '_headspace_noindex', WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', $this->replace ); + WPSEO_Meta::replace_meta( '_headspace_nofollow', WPSEO_Meta::$meta_prefix . 'meta-robots-nofollow', $this->replace ); + + /* + * @todo - [JRF => whomever] check if this can be done more efficiently by querying only the meta table + * possibly directly changing it using concat on the existing values + */ + $posts = $wpdb->get_results( "SELECT ID FROM $wpdb->posts" ); + if ( is_array( $posts ) && $posts !== array() ) { + foreach ( $posts as $post ) { + $custom = get_post_custom( $post->ID ); + $robotsmeta_adv = ''; + if ( isset( $custom['_headspace_noarchive'] ) ) { + $robotsmeta_adv .= 'noarchive,'; + } + if ( isset( $custom['_headspace_noodp'] ) ) { + $robotsmeta_adv .= 'noodp,'; + } + if ( isset( $custom['_headspace_noydir'] ) ) { + $robotsmeta_adv .= 'noydir'; + } + $robotsmeta_adv = preg_replace( '`,$`', '', $robotsmeta_adv ); + WPSEO_Meta::set_value( 'meta-robots-adv', $robotsmeta_adv, $post->ID ); + } + } + + if ( $this->replace ) { + $hs_meta = array( 'noarchive', 'noodp', 'noydir' ); + foreach ( $hs_meta as $meta ) { + delete_post_meta_by_key( '_headspace_' . $meta ); + } + unset( $hs_meta, $meta ); + } + $this->set_msg( __( 'HeadSpace2 data successfully imported', 'wordpress-seo' ) ); + } + + /** + * Import from Joost's old robots meta plugin + */ + public function import_robots_meta() { + global $wpdb; + + $posts = $wpdb->get_results( "SELECT ID, robotsmeta FROM $wpdb->posts" ); + + if ( ! $posts ) { + $this->set_msg( __( 'Error: no Robots Meta data found to import.', 'wordpress-seo' ) ); + + return; + } + if ( is_array( $posts ) && $posts !== array() ) { + foreach ( $posts as $post ) { + // Sync all possible settings. + if ( $post->robotsmeta ) { + $pieces = explode( ',', $post->robotsmeta ); + foreach ( $pieces as $meta ) { + switch ( $meta ) { + case 'noindex': + WPSEO_Meta::set_value( 'meta-robots-noindex', '1', $post->ID ); + break; + + case 'index': + WPSEO_Meta::set_value( 'meta-robots-noindex', '2', $post->ID ); + break; + + case 'nofollow': + WPSEO_Meta::set_value( 'meta-robots-nofollow', '1', $post->ID ); + break; + } + } + } + } + } + $this->set_msg( __( sprintf( 'Robots Meta values imported. We recommend %sdisabling the Robots-Meta plugin%s to avoid any conflicts.', '', '' ), 'wordpress-seo' ) ); + } + + /** + * Import from old Yoast RSS Footer plugin + */ + public function import_rss_footer() { + $optold = get_option( 'RSSFooterOptions' ); + $optnew = get_option( 'wpseo_rss' ); + if ( $optold['position'] == 'after' ) { + if ( $optnew['rssafter'] === '' || $optnew['rssafter'] === WPSEO_Options::get_default( 'wpseo_rss', 'rssafter' ) ) { + $optnew['rssafter'] = $optold['footerstring']; + } + } + else { + /* @internal Uncomment the second part if a default would be given to the rssbefore value */ + if ( $optnew['rssbefore'] === '' /*|| $optnew['rssbefore'] === WPSEO_Options::get_default( 'wpseo_rss', 'rssbefore' )*/ ) { + $optnew['rssbefore'] = $optold['footerstring']; + } + } + update_option( 'wpseo_rss', $optnew ); + $this->set_msg( __( 'RSS Footer options imported successfully.', 'wordpress-seo' ) ); + } + + /** + * Import from Yoast Breadcrumbs plugin + */ + public function import_yoast_breadcrumbs() { + $optold = get_option( 'yoast_breadcrumbs' ); + $optnew = get_option( 'wpseo_internallinks' ); + + if ( is_array( $optold ) && $optold !== array() ) { + foreach ( $optold as $opt => $val ) { + if ( is_bool( $val ) && $val === true ) { + $optnew[ 'breadcrumbs-' . $opt ] = true; + } + else { + $optnew[ 'breadcrumbs-' . $opt ] = $val; + } + } + unset( $opt, $val ); + update_option( 'wpseo_internallinks', $optnew ); + $this->set_msg( __( 'Yoast Breadcrumbs options imported successfully.', 'wordpress-seo' ) ); + } + else { + $this->set_msg( __( 'Yoast Breadcrumbs options could not be found', 'wordpress-seo' ) ); + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-woothemes-seo.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-woothemes-seo.php index 04910430..8b0d908e 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-woothemes-seo.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-woothemes-seo.php @@ -1,3 +1,152 @@ +<<<<<<< .mine +import_home(); + $this->import_option( 'seo_woo_single_layout', 'post' ); + $this->import_option( 'seo_woo_page_layout', 'page' ); + $this->import_archive_option(); + $this->import_custom_values( 'seo_woo_meta_home_desc', 'metadesc-home-wpseo' ); + $this->import_custom_values( 'seo_woo_meta_home_key', 'metakey-home-wpseo' ); + $this->import_metas(); + + update_option( 'wpseo_titles', $this->options ); + + $this->set_msg( __( 'WooThemes SEO framework settings & data successfully imported.', 'wordpress-seo' ) ); + } + + /** + * Holds the WPSEO Title Options + * + * @var array + */ + private $options; + + /** + * Import options. + * + * @param string $option Option key. + * @param string $post_type Post type name to import for. + */ + private function import_option( $option, $post_type ) { + switch ( get_option( $option ) ) { + case 'a': + $this->options[ 'title-' . $post_type ] = '%%title%% %%sep%% %%sitename%%'; + break; + case 'b': + $this->options[ 'title-' . $post_type ] = '%%title%%'; + break; + case 'c': + $this->options[ 'title-' . $post_type ] = '%%sitename%% %%sep%% %%title%%'; + break; + case 'd': + $this->options[ 'title-' . $post_type ] = '%%title%% %%sep%% %%sitedesc%%'; + break; + case 'e': + $this->options[ 'title-' . $post_type ] = '%%sitename%% %%sep%% %%title%% %%sep%% %%sitedesc%%'; + break; + } + $this->perhaps_delete( $option ); + } + + /** + * Import the archive layout for all taxonomies + */ + private function import_archive_option() { + $reinstate_replace = false; + if ( $this->replace ) { + $this->replace = false; + $reinstate_replace = true; + } + $taxonomies = get_taxonomies( array( 'public' => true ), 'names' ); + if ( is_array( $taxonomies ) && $taxonomies !== array() ) { + foreach ( $taxonomies as $tax ) { + $this->import_option( 'seo_woo_archive_layout', 'tax-' . $tax ); + } + } + if ( $reinstate_replace ) { + $this->replace = true; + $this->perhaps_delete( 'seo_woo_archive_layout' ); + } + } + + /** + * Import custom descriptions and meta keys + * + * @param string $option Option key. + * @param string $key Internal key to import over. + */ + private function import_custom_values( $option, $key ) { + // Import the custom homepage description. + if ( 'c' == get_option( $option ) ) { + $this->options[ $key ] = get_option( $option . '_custom' ); + } + $this->perhaps_delete( $option ); + $this->perhaps_delete( $option . '_custom' ); + } + + /** + * Imports the WooThemes SEO homepage settings + */ + private function import_home() { + switch ( get_option( 'seo_woo_home_layout' ) ) { + case 'a': + $this->options['title-home-wpseo'] = '%%sitename%% %%sep%% %%sitedesc%%'; + break; + case 'b': + $this->options['title-home-wpseo'] = '%%sitename%% ' . get_option( 'seo_woo_paged_var' ) . ' %%pagenum%%'; + break; + case 'c': + $this->options['title-home-wpseo'] = '%%sitedesc%%'; + break; + } + $this->perhaps_delete( 'seo_woo_home_layout' ); + } + + /** + * Import meta values if they're applicable + */ + private function import_metas() { + WPSEO_Meta::replace_meta( 'seo_follow', WPSEO_Meta::$meta_prefix . 'meta-robots-nofollow', $this->replace ); + WPSEO_Meta::replace_meta( 'seo_noindex', WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', $this->replace ); + + // If WooSEO is set to use the Woo titles, import those. + if ( 'true' == get_option( 'seo_woo_wp_title' ) ) { + WPSEO_Meta::replace_meta( 'seo_title', WPSEO_Meta::$meta_prefix . 'title', $this->replace ); + } + + // If WooSEO is set to use the Woo meta descriptions, import those. + if ( 'b' == get_option( 'seo_woo_meta_single_desc' ) ) { + WPSEO_Meta::replace_meta( 'seo_description', WPSEO_Meta::$meta_prefix . 'metadesc', $this->replace ); + } + + // If WooSEO is set to use the Woo meta keywords, import those. + if ( 'b' == get_option( 'seo_woo_meta_single_key' ) ) { + WPSEO_Meta::replace_meta( 'seo_keywords', WPSEO_Meta::$meta_prefix . 'metakeywords', $this->replace ); + } + + foreach ( array( 'seo_woo_wp_title', 'seo_woo_meta_single_desc', 'seo_woo_meta_single_key' ) as $option ) { + $this->perhaps_delete( $option ); + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-wpseo.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-wpseo.php new file mode 100644 index 00000000..31579244 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import-wpseo.php @@ -0,0 +1,186 @@ +import_post_metas(); + $this->import_taxonomy_metas(); + + $this->set_msg( + __( + sprintf( + 'wpSEO data successfully imported. Would you like to %sdisable the wpSEO plugin%s?', + '', + '' + ), + 'wordpress-seo' + ) + ); + + } + + /** + * Import the post meta values to Yoast SEO by replacing the wpSEO fields by Yoast SEO fields + */ + private function import_post_metas() { + WPSEO_Meta::replace_meta( '_wpseo_edit_title', WPSEO_Meta::$meta_prefix . 'title', $this->replace ); + WPSEO_Meta::replace_meta( '_wpseo_edit_description', WPSEO_Meta::$meta_prefix . 'metadesc', $this->replace ); + WPSEO_Meta::replace_meta( '_wpseo_edit_keywords', WPSEO_Meta::$meta_prefix . 'keywords', $this->replace ); + WPSEO_Meta::replace_meta( '_wpseo_edit_canonical', WPSEO_Meta::$meta_prefix . 'canonical', $this->replace ); + + $this->import_post_robots(); + } + + /** + * Importing the robot values from WPSEO plugin. These have to be converted to the Yoast format. + */ + private function import_post_robots() { + $query_posts = new WP_Query( 'post_type=any&meta_key=_wpseo_edit_robots&order=ASC' ); + + if ( ! empty( $query_posts->posts ) ) { + foreach ( $query_posts->posts as $post ) { + $this->import_post_robot( $post->ID ); + } + } + } + + /** + * Getting the wpSEO robot value and map this to Yoast SEO values. + * + * @param integer $post_id The post id of the current post. + */ + private function import_post_robot( $post_id ) { + $wpseo_robots = get_post_meta( $post_id, '_wpseo_edit_robots', true ); + + // Does the value exists in our mapping. + if ( $robot_value = $this->get_robot_value( $wpseo_robots ) ) { + // Saving the new meta values for Yoast SEO. + WPSEO_Meta::set_value( $robot_value['index'], 'meta-robots-noindex', $post_id ); + WPSEO_Meta::set_value( $robot_value['follow'], 'meta-robots-nofollow', $post_id ); + } + + $this->delete_post_robot( $post_id ); + } + + /** + * Delete the wpSEO robot values, because they aren't needed anymore. + * + * @param integer $post_id The post id of the current post. + */ + private function delete_post_robot( $post_id ) { + if ( $this->replace ) { + delete_post_meta( $post_id, '_wpseo_edit_robots' ); + } + } + + /** + * Import the taxonomy metas from wpSEO + */ + private function import_taxonomy_metas() { + $terms = get_terms( get_taxonomies(), array( 'hide_empty' => false ) ); + $tax_meta = get_option( 'wpseo_taxonomy_meta' ); + + foreach ( $terms as $term ) { + $this->import_taxonomy_description( $tax_meta, $term->taxonomy, $term->term_id ); + $this->import_taxonomy_robots( $tax_meta, $term->taxonomy, $term->term_id ); + $this->delete_taxonomy_metas( $term->taxonomy, $term->term_id ); + } + + update_option( 'wpseo_taxonomy_meta', $tax_meta ); + } + + /** + * Import the meta description to Yoast SEO + * + * @param array $tax_meta The array with the current metadata. + * @param string $taxonomy String with the name of the taxonomy. + * @param string $term_id The ID of the current term. + */ + private function import_taxonomy_description( & $tax_meta, $taxonomy, $term_id ) { + $description = get_option( 'wpseo_' . $taxonomy . '_' . $term_id, false ); + if ( $description !== false ) { + // Import description. + $tax_meta[ $taxonomy ][ $term_id ]['wpseo_desc'] = $description; + } + } + + /** + * Import the robot value to Yoast SEO + * + * @param array $tax_meta The array with the current metadata. + * @param string $taxonomy String with the name of the taxonomy. + * @param string $term_id The ID of the current term. + */ + private function import_taxonomy_robots( & $tax_meta, $taxonomy, $term_id ) { + $wpseo_robots = get_option( 'wpseo_' . $taxonomy . '_' . $term_id . '_robots', false ); + if ( $wpseo_robots !== false ) { + // The value 1, 2 and 6 are the index values in wpSEO. + $new_robot_value = ( in_array( $wpseo_robots, array( 1, 2, 6 ) ) ) ? 'index' : 'noindex'; + + $tax_meta[ $taxonomy ][ $term_id ]['wpseo_noindex'] = $new_robot_value; + } + } + + /** + * Delete the wpSEO taxonomy meta data. + * + * @param string $taxonomy String with the name of the taxonomy. + * @param string $term_id The ID of the current term. + */ + private function delete_taxonomy_metas( $taxonomy, $term_id ) { + if ( $this->replace ) { + delete_option( 'wpseo_' . $taxonomy . '_' . $term_id ); + delete_option( 'wpseo_' . $taxonomy . '_' . $term_id . '_robots' ); + } + } + + /** + * Getting the robot config by given wpSEO robots value. + * + * @param string $wpseo_robots The value in wpSEO that needs to be converted to the Yoast format. + * + * @return array + */ + private function get_robot_value( $wpseo_robots ) { + static $robot_values; + + if ( $robot_values === null ) { + /** + * The values 1 - 6 are the configured values from wpSEO. This array will map the values of wpSEO to our values. + * + * There are some double array like 1-6 and 3-4. The reason is they only set the index value. The follow value is + * the default we use in the cases there isn't a follow value present. + * + * @var array + */ + $robot_values = array( + 1 => array( 'index' => 2, 'follow' => 0 ), // In wpSEO: index, follow. + 2 => array( 'index' => 2, 'follow' => 1 ), // In wpSEO: index, nofollow. + 3 => array( 'index' => 1, 'follow' => 0 ), // In wpSEO: noindex. + 4 => array( 'index' => 1, 'follow' => 0 ), // In wpSEO: noindex, follow. + 5 => array( 'index' => 1, 'follow' => 1 ), // In wpSEO: noindex, nofollow. + 6 => array( 'index' => 2, 'follow' => 0 ), // In wpSEO: index. + ); + } + + if ( array_key_exists( $wpseo_robots, $robot_values ) ) { + return $robot_values[ $wpseo_robots ]; + } + + return array( 'index' => 2, 'follow' => 0 ); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import.php index 3316bb74..ed0a3904 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-import.php @@ -1,3 +1,197 @@ +<<<<<<< .mine +handle_upload() ) { + return; + } + + $this->determine_path(); + + if ( ! $this->unzip_file() ) { + $this->clean_up(); + + return; + } + + $this->parse_options(); + + $this->clean_up(); + } + + /** + * Handle the file upload + * + * @return boolean + */ + private function handle_upload() { + $overrides = array( 'mimes' => array( 'zip' => 'application/zip' ) ); // Explicitly allow zip in multisite. + $this->file = wp_handle_upload( $_FILES['settings_import_file'], $overrides ); + + if ( is_wp_error( $this->file ) ) { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . $this->file->get_error_message(); + + return false; + } + + if ( is_array( $this->file ) && isset( $this->file['error'] ) ) { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . $this->file['error']; + + return false; + } + + if ( ! isset( $this->file['file'] ) ) { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . __( 'Upload failed.', 'wordpress-seo' ); + + return false; + } + + return true; + } + + /** + * Determine the path to the import file + */ + private function determine_path() { + $this->upload_dir = wp_upload_dir(); + + if ( ! defined( 'DIRECTORY_SEPARATOR' ) ) { + define( 'DIRECTORY_SEPARATOR', '/' ); + } + $this->path = $this->upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'wpseo-import' . DIRECTORY_SEPARATOR; + + if ( ! isset( $GLOBALS['wp_filesystem'] ) || ! is_object( $GLOBALS['wp_filesystem'] ) ) { + WP_Filesystem(); + } + } + + /** + * Unzip the file + * + * @return boolean + */ + private function unzip_file() { + $unzipped = unzip_file( $this->file['file'], $this->path ); + if ( is_wp_error( $unzipped ) ) { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . sprintf( __( 'Unzipping failed with error "%s".', 'wordpress-seo' ), $unzipped->get_error_message() ); + + return false; + } + + $this->filename = $this->path . 'settings.ini'; + if ( ! is_file( $this->filename ) || ! is_readable( $this->filename ) ) { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . __( 'Unzipping failed - file settings.ini not found.', 'wordpress-seo' ); + + return false; + } + + return true; + } + + /** + * Parse the option file + */ + private function parse_options() { + $options = parse_ini_file( $this->filename, true ); + + if ( is_array( $options ) && $options !== array() ) { + if ( isset( $options['wpseo']['version'] ) && $options['wpseo']['version'] !== '' ) { + $this->old_wpseo_version = $options['wpseo']['version']; + } + foreach ( $options as $name => $opt_group ) { + $this->parse_option_group( $name, $opt_group, $options ); + } + $this->msg = __( 'Settings successfully imported.', 'wordpress-seo' ); + } + else { + $this->msg = __( 'Settings could not be imported:', 'wordpress-seo' ) . ' ' . __( 'No settings found in file.', 'wordpress-seo' ); + } + } + + /** + * Parse the option group and import it + * + * @param string $name Name string. + * @param array $opt_group Option group data. + * @param array $options Options data. + */ + private function parse_option_group( $name, $opt_group, $options ) { + if ( $name === 'wpseo_taxonomy_meta' ) { + $opt_group = json_decode( urldecode( $opt_group['wpseo_taxonomy_meta'] ), true ); + } + + // Make sure that the imported options are cleaned/converted on import. + $option_instance = WPSEO_Options::get_option_instance( $name ); + if ( is_object( $option_instance ) && method_exists( $option_instance, 'import' ) ) { + $option_instance->import( $opt_group, $this->old_wpseo_version, $options ); + } + elseif ( WP_DEBUG === true || ( defined( 'WPSEO_DEBUG' ) && WPSEO_DEBUG === true ) ) { + $this->msg = sprintf( __( 'Setting "%s" is no longer used and has been discarded.', 'wordpress-seo' ), $name ); + } + } + + /** + * Remove the files + */ + private function clean_up() { + if ( file_exists( $this->filename ) && is_writable( $this->filename ) ) { + unlink( $this->filename ); + } + if ( file_exists( $this->file['file'] ) && is_writable( $this->file['file'] ) ) { + unlink( $this->file['file'] ); + } + if ( file_exists( $this->path ) && is_writable( $this->path ) ) { + rmdir( $this->path ); + } + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-meta-columns.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-meta-columns.php new file mode 100644 index 00000000..14ce98f9 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-meta-columns.php @@ -0,0 +1,430 @@ +set_post_type_hooks(); + + add_action( 'restrict_manage_posts', array( $this, 'posts_filter_dropdown' ) ); + add_filter( 'request', array( $this, 'column_sort_orderby' ) ); + } + + /** + * Adds the column headings for the SEO plugin for edit posts / pages overview + * + * @param array $columns Already existing columns. + * + * @return array + */ + public function column_heading( $columns ) { + if ( $this->is_metabox_hidden() === true ) { + return $columns; + } + + return array_merge( $columns, array( + 'wpseo-score' => __( 'SEO', 'wordpress-seo' ), + 'wpseo-title' => __( 'SEO Title', 'wordpress-seo' ), + 'wpseo-metadesc' => __( 'Meta Desc.', 'wordpress-seo' ), + 'wpseo-focuskw' => __( 'Focus KW', 'wordpress-seo' ), + ) ); + } + + /** + * Display the column content for the given column + * + * @param string $column_name Column to display the content for. + * @param int $post_id Post to display the column content for. + */ + public function column_content( $column_name, $post_id ) { + if ( $this->is_metabox_hidden() === true ) { + return; + } + + switch ( $column_name ) { + case 'wpseo-score' : + echo $this->parse_column_score( $post_id ); + break; + case 'wpseo-title' : + echo esc_html( apply_filters( 'wpseo_title', wpseo_replace_vars( $this->page_title( $post_id ), get_post( $post_id, ARRAY_A ) ) ) ); + break; + case 'wpseo-metadesc' : + echo esc_html( apply_filters( 'wpseo_metadesc', wpseo_replace_vars( WPSEO_Meta::get_value( 'metadesc', $post_id ), get_post( $post_id, ARRAY_A ) ) ) ); + break; + case 'wpseo-focuskw' : + $focuskw = WPSEO_Meta::get_value( 'focuskw', $post_id ); + echo esc_html( $focuskw ); + break; + } + } + + /** + * Indicate which of the SEO columns are sortable. + * + * @param array $columns appended with their orderby variable. + * + * @return array + */ + public function column_sort( $columns ) { + if ( $this->is_metabox_hidden() === true ) { + return $columns; + } + + $columns['wpseo-score'] = 'wpseo-score'; + $columns['wpseo-metadesc'] = 'wpseo-metadesc'; + $columns['wpseo-focuskw'] = 'wpseo-focuskw'; + + return $columns; + } + + /** + * Hide the SEO Title, Meta Desc and Focus KW columns if the user hasn't chosen which columns to hide + * + * @param array|false $result The hidden columns. + * @param string $option The option name used to set which columns should be hidden. + * @param WP_User $user The User. + * + * @return array|false $result + */ + public function column_hidden( $result, $option, $user ) { + global $wpdb; + + $prefix = $wpdb->get_blog_prefix(); + if ( ! $user->has_prop( $prefix . $option ) && ! $user->has_prop( $option ) ) { + + if ( ! is_array( $result ) ) { + $result = array(); + } + + array_push( $result, 'wpseo-title', 'wpseo-metadesc', 'wpseo-focuskw' ); + } + + return $result; + } + + /** + * Adds a dropdown that allows filtering on the posts SEO Quality. + * + * @return void + */ + public function posts_filter_dropdown() { + if ( $GLOBALS['pagenow'] === 'upload.php' || $this->is_metabox_hidden() === true ) { + return; + } + + $ranks = WPSEO_Rank::get_all_ranks(); + $current_seo_filter = filter_input( INPUT_GET, 'seo_filter' ); + + echo ' + '; + } + + /** + * Hacky way to get round the limitation that you can only have AND *or* OR relationship between + * meta key clauses and not a combination - which is what we need. + * + * @param string $where Where clause. + * + * @return string + */ + public function seo_score_posts_where( $where ) { + global $wpdb; + + /* Find the two mutually exclusive noindex clauses which should be changed from AND to OR relation */ + $find = '`([\s]+AND[\s]+)((?:' . $wpdb->prefix . 'postmeta|mt[0-9]|mt1)\.post_id IS NULL[\s]+)AND([\s]+$[\s]*(?:' . $wpdb->prefix . 'postmeta|mt[0-9])\.meta_key = \'' . WPSEO_Meta::$meta_prefix . 'meta-robots-noindex\' AND CAST\([^$]+\)[^\)]+\))`'; + + $replace = '$1( $2OR$3 )'; + + $new_where = preg_replace( $find, $replace, $where ); + + if ( $new_where ) { + return $new_where; + } + return $where; + } + + /** + * Modify the query based on the seo_filter variable in $_GET + * + * @param array $vars Query variables. + * + * @return array + */ + public function column_sort_orderby( $vars ) { + if ( $seo_filter = filter_input( INPUT_GET, 'seo_filter' ) ) { + $rank = new WPSEO_Rank( $seo_filter ); + + if ( WPSEO_Rank::NO_FOCUS === $seo_filter || WPSEO_Rank::NO_INDEX === $seo_filter ) { + $vars = $this->filter_other( $vars, $seo_filter ); + } + else { + $vars = array_merge( $vars, $this->filter_scored( $rank->get_starting_score(), $rank->get_end_score() ) ); + + add_filter( 'posts_where', array( $this, 'seo_score_posts_where' ) ); + } + } + + if ( $seo_kw_filter = filter_input( INPUT_GET, 'seo_kw_filter' ) ) { + $vars = array_merge( + $vars, array( + 'post_type' => get_query_var( 'post_type', 'post' ), + 'meta_key' => WPSEO_Meta::$meta_prefix . 'focuskw', + 'meta_value' => sanitize_text_field( $seo_kw_filter ), + ) + ); + } + + if ( isset( $vars['orderby'] ) ) { + $vars = array_merge( $vars, $this->filter_order_by( $vars['orderby'] ) ); + } + + return $vars; + } + + /** + * When there is a score just return this meta query array + * + * @param string $low The lowest number in the score range. + * @param string $high The highest number in the score range. + * + * @return array + */ + private function filter_scored( $low, $high ) { + /** + * @internal DON'T touch the order of these without double-checking/adjusting the seo_score_posts_where() method below! + */ + return array( + 'meta_query' => array( + 'relation' => 'AND', + array( + 'key' => WPSEO_Meta::$meta_prefix . 'linkdex', + 'value' => array( $low, $high ), + 'type' => 'numeric', + 'compare' => 'BETWEEN', + ), + array( + 'key' => WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', + 'value' => 'needs-a-value-anyway', + 'compare' => 'NOT EXISTS', + ), + array( + 'key' => WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', + 'value' => '1', + 'compare' => '!=', + ), + ), + ); + } + + /** + * Get vars for noindex or na filters + * + * @param array $vars The unmerged vars. + * @param string $seo_filter The SEO filter. + * + * @return array + */ + private function filter_other( $vars, $seo_filter ) { + switch ( $seo_filter ) { + case 'noindex': + $vars = array_merge( + $vars, + array( + 'meta_query' => array( + array( + 'key' => WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', + 'value' => '1', + 'compare' => '=', + ), + ), + ) + ); + break; + case 'na': + $vars = array_merge( + $vars, + array( + 'meta_query' => array( + 'relation' => 'OR', + array( + 'key' => WPSEO_Meta::$meta_prefix . 'linkdex', + 'value' => 'needs-a-value-anyway', + 'compare' => 'NOT EXISTS', + ) + ), + ) + ); + break; + } + + return $vars; + } + + /** + * Returning filters when $order_by is matched in the if-statement + * + * @param string $order_by The ID of the column by which to order the posts. + * + * @return array + */ + private function filter_order_by( $order_by ) { + switch ( $order_by ) { + case 'wpseo-score' : + return array( + 'meta_key' => WPSEO_Meta::$meta_prefix . 'linkdex', + 'orderby' => 'meta_value_num', + ); + break; + case 'wpseo-metadesc' : + return array( + 'meta_key' => WPSEO_Meta::$meta_prefix . 'metadesc', + 'orderby' => 'meta_value', + ); + break; + case 'wpseo-focuskw' : + return array( + 'meta_key' => WPSEO_Meta::$meta_prefix . 'focuskw', + 'orderby' => 'meta_value', + ); + break; + } + + return array(); + } + + /** + * Parsing the score column + * + * @param integer $post_id The ID of the post for which to show the score. + * + * @return string + */ + private function parse_column_score( $post_id ) { + if ( '1' === WPSEO_Meta::get_value( 'meta-robots-noindex', $post_id ) ) { + $rank = new WPSEO_Rank( WPSEO_Rank::NO_INDEX ); + $title = __( 'Post is set to noindex.', 'wordpress-seo' ); + WPSEO_Meta::set_value( 'linkdex', 0, $post_id ); + } + elseif ( '' === WPSEO_Meta::get_value( 'focuskw', $post_id ) ) { + $rank = new WPSEO_Rank( WPSEO_Rank::NO_FOCUS ); + $title = __( 'Focus keyword not set.', 'wordpress-seo' ); + } + else { + $score = (int) WPSEO_Meta::get_value( 'linkdex', $post_id ); + $rank = WPSEO_Rank::from_numeric_score( $score ); + $title = $rank->get_label(); + } + + return '

'; + + } + + /** + * Setting the hooks for the post_types + */ + private function set_post_type_hooks() { + $post_types = get_post_types( array( 'public' => true ), 'names' ); + + if ( is_array( $post_types ) && $post_types !== array() ) { + foreach ( $post_types as $pt ) { + if ( $this->is_metabox_hidden( $pt ) === false ) { + add_filter( 'manage_' . $pt . '_posts_columns', array( $this, 'column_heading' ), 10, 1 ); + add_action( 'manage_' . $pt . '_posts_custom_column', array( + $this, + 'column_content', + ), 10, 2 ); + add_action( 'manage_edit-' . $pt . '_sortable_columns', array( + $this, + 'column_sort', + ), 10, 2 ); + + /* + * Use the `get_user_option_{$option}` filter to change the output of the get_user_option + * function for the `manage{$screen}columnshidden` option, which is based on the current + * admin screen. The admin screen we want to target is the `edit-{$post_type}` screen. + */ + $filter = sprintf( 'get_user_option_%s', sprintf( 'manage%scolumnshidden', 'edit-' . $pt ) ); + add_filter( $filter, array( $this, 'column_hidden' ), 10, 3 ); + } + } + unset( $pt ); + } + } + + /** + * Test whether the metabox should be hidden either by choice of the admin or because + * the post type is not a public post type + * + * @since 1.5.0 + * + * @param string $post_type (optional) The post type to test, defaults to the current post post_type. + * + * @return bool Whether or not the meta box (and associated columns etc) should be hidden + */ + private function is_metabox_hidden( $post_type = null ) { + if ( ! isset( $post_type ) && $get_post_type = filter_input( INPUT_GET, 'post_type' ) ) { + $post_type = sanitize_text_field( $get_post_type ); + } + + if ( isset( $post_type ) ) { + // Don't make static as post_types may still be added during the run. + $cpts = get_post_types( array( 'public' => true ), 'names' ); + $options = get_option( 'wpseo_titles' ); + + return ( ( isset( $options[ 'hideeditbox-' . $post_type ] ) && $options[ 'hideeditbox-' . $post_type ] === true ) || in_array( $post_type, $cpts ) === false ); + } + + return false; + } + + /** + * Retrieve the page title. + * + * @param int $post_id Post to retrieve the title for. + * + * @return string + */ + private function page_title( $post_id ) { + $fixed_title = WPSEO_Meta::get_value( 'title', $post_id ); + if ( $fixed_title !== '' ) { + return $fixed_title; + } + + $post = get_post( $post_id ); + $options = WPSEO_Options::get_all(); + if ( is_object( $post ) && ( isset( $options[ 'title-' . $post->post_type ] ) && $options[ 'title-' . $post->post_type ] !== '' ) ) { + $title_template = $options[ 'title-' . $post->post_type ]; + $title_template = str_replace( ' %%page%% ', ' ', $title_template ); + + return wpseo_replace_vars( $title_template, $post ); + } + + return wpseo_replace_vars( '%%title%%', $post ); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-plugin-conflict.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-plugin-conflict.php index 2d623eaa..1d595c51 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-plugin-conflict.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-plugin-conflict.php @@ -95,6 +95,20 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict { ), ); +<<<<<<< .mine + /** + * Overrides instance to set with this class as class + * + * @param string $class_name Optional class name. + * + * @return Yoast_Plugin_Conflict + */ + public static function get_instance( $class_name = __CLASS__ ) { + return parent::get_instance( $class_name ); + } +||||||| .r11156 +if ( ! class_exists( 'WPSEO_Plugin_Conflict' ) ) { +======= /** * Overrides instance to set with this class as class * @@ -105,7 +119,22 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict { public static function get_instance( $class_name = __CLASS__ ) { return parent::get_instance( $class_name ); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * After activating any plugin, this method will be executed by a hook. + * + * If the activated plugin is conflicting with ours a notice will be shown. + * + * @param string|bool $plugin Optional plugin basename to check. + */ + public static function hook_check_for_plugin_conflicts( $plugin = false ) { + // The instance of itself. + $instance = self::get_instance(); +||||||| .r11156 + class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict { +======= /** * After activating any plugin, this method will be executed by a hook. * @@ -116,12 +145,33 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict { public static function hook_check_for_plugin_conflicts( $plugin = false ) { // The instance of itself. $instance = self::get_instance(); +>>>>>>> .r12027 +<<<<<<< .mine + // Only add plugin as active plugin if $plugin isn't false. + if ( $plugin && is_string( $plugin ) ) { + // Because it's just activated. + $instance->add_active_plugin( $instance->find_plugin_category( $plugin ), $plugin ); + } +||||||| .r11156 + /** + * The plugins must be grouped per section. + * + * It's possible to check for each section if there are conflicting plugin + * + * @var array + */ + protected $plugins = array( + // The plugin which are writing OG metadata + 'open_graph' => array( + '2-click-socialmedia-buttons/2-click-socialmedia-buttons.php', +======= // Only add plugin as active plugin if $plugin isn't false. if ( $plugin ) { // Because it's just activated. $instance->add_active_plugin( $instance->find_plugin_category( $plugin ), $plugin ); } +>>>>>>> .r12027 $plugin_sections = array( /* translators: %1$s expands to Yoast SEO, %2%s: 'Facebook' plugin name of possibly conflicting plugin with regard to creating OpenGraph output*/ @@ -142,5 +192,11 @@ class WPSEO_Plugin_Conflict extends Yoast_Plugin_Conflict { $instance->check_plugin_conflicts( $plugin_sections ); } +<<<<<<< .mine +} +||||||| .r11156 + +}======= } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-pointers.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-pointers.php index 624c62aa..d0ebdf37 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-pointers.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-pointers.php @@ -76,6 +76,41 @@ class WPSEO_Pointers { } } +<<<<<<< .mine + /** + * Prints the pointer script + * + * @param string $selector The CSS selector the pointer is attached to. + * @param array $options The options for the pointer. + */ + public function print_scripts( $selector, $options ) { + // Button1 is the close button, which always exists. + $button_array_defaults = array( + 'button2' => array( + 'text' => false, + 'function' => '', + ), + 'button3' => array( + 'text' => false, + 'function' => '', + ), + ); + $this->button_array = wp_parse_args( $this->button_array, $button_array_defaults ); + ?> + + array( + 'text' => __( 'Close', 'wordpress-seo' ), + 'function' => '', + ) + ); + $opt_arr = array(); + $id = '#wpseo-title'; + if ( 'admin.php' != $pagenow || ! array_key_exists( $page, $adminpages ) ) { + $id = 'li.toplevel_page_wpseo_dashboard'; + $content = '

' . __( 'Congratulations!', 'wordpress-seo' ) . '

'; + $content .= '

' . __( 'You’ve just installed WordPress SEO by Yoast! Click “Start Tour” to view a quick introduction of this plugin’s core functionality.', 'wordpress-seo' ) . '

'; + $opt_arr = array( + 'content' => $content, + 'position' => array( 'edge' => 'bottom', 'align' => 'center' ) + ); + $button_array['button2']['text'] = __( 'Start Tour', 'wordpress-seo' ); + $button_array['button2']['function'] = 'document.location="' . admin_url( 'admin.php?page=wpseo_dashboard' ) . '";'; + } else { + if ( '' != $page && in_array( $page, array_keys( $adminpages ) ) ) { + $align = ( is_rtl() ) ? 'left' : 'right'; + $opt_arr = array( + 'content' => $adminpages[$page]['content'], + 'position' => ( isset ( $adminpages[$page]['position'] ) ) ? ( $adminpages[$page]['position'] ) : array( 'edge' => 'top', 'align' => $align ), + 'pointerWidth' => 450, + ); + if ( isset( $adminpages[$page]['next'] ) && isset( $adminpages[$page]['next_function'] ) ) { + $button_array['button2'] = array( + 'text' => $adminpages[$page]['next'], + 'function' => $adminpages[$page]['next_function'], + ); + } + if ( isset( $adminpages[$page]['prev'] ) && isset( $adminpages[$page]['prev_function'] ) ) { + $button_array['button3'] = array( + 'text' => $adminpages[$page]['prev'], + 'function' => $adminpages[$page]['prev_function'], + ); + } + } + } +======= wpseo_pointer_options = $.extend(wpseo_pointer_options, { buttons: function (event, t) { var button = jQuery('' + '' + ''); @@ -127,7 +359,26 @@ class WPSEO_Pointers { close: function () { } }); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Render button 2, if needed + */ + private function button2() { + if ( $this->button_array['button2']['text'] ) { + ?> + lastOpenedPointer.find( '#pointer-close' ).after('' + + 'button_array['button2']['text']; ?>' + ''); + lastOpenedPointer.find('#pointer-primary').click(function () { + button_array['button2']['function']; ?> + }); + print_scripts( $id, $opt_arr, $button_array ); + } +======= setup = function () { $('').pointer(wpseo_pointer_options).pointer('open'); button3(); ?> }; +>>>>>>> .r12027 + } +<<<<<<< .mine + /** + * Render button 3, if needed. This is the previous button in most cases + */ + private function button3() { + if ( $this->button_array['button3']['text'] ) { +||||||| .r11156 + + /** + * Prints the pointer script + * + * @param string $selector The CSS selector the pointer is attached to. + * @param array $options The options for the pointer. + * @param array $button_array The options for the buttons. + */ + function print_scripts( $selector, $options, $button_array ) { + $button_array_defaults = array( + 'button1' => array( + 'text' => false, + 'function' => '', + ), + 'button2' => array( + 'text' => false, + 'function' => '', + ), + 'button3' => array( + 'text' => false, + 'function' => '', + ), + ); + $button_array = wp_parse_args( $button_array, $button_array_defaults ); +======= if (wpseo_pointer_options.position && wpseo_pointer_options.position.defer_loading) $(window).bind('load.wp-pointers', setup); else @@ -151,7 +436,25 @@ class WPSEO_Pointers { */ private function button2() { if ( $this->button_array['button2']['text'] ) { +>>>>>>> .r12027 ?> +<<<<<<< .mine + lastOpenedPointer.find('#pointer-primary').after('' + + 'button_array['button3']['text']; ?>' + ''); + lastOpenedPointer.find('#pointer-ternary').click(function () { + button_array['button3']['function']; ?> + }); + + //' + 'button_array['button2']['text']; ?>' + ''); jQuery('#pointer-primary').click(function () { @@ -160,7 +463,24 @@ class WPSEO_Pointers { >>>>>> .r12027 +<<<<<<< .mine + /** + * Show a pointer that starts the tour for Yoast SEO + */ + private function start_tour_pointer() { + $selector = 'li.toplevel_page_wpseo_dashboard'; + $content = '

' . __( 'Congratulations!', 'wordpress-seo' ) . '

' + /* translators: %1$s expands to Yoast SEO */ + .'

' . sprintf( __( 'You’ve just installed %1$s! Click “Start Tour” to view a quick introduction of this plugin’s core functionality.', 'wordpress-seo' ), 'Yoast SEO' ) . '

'; + $opt_arr = array( + 'content' => $content, + 'position' => array( 'edge' => 'bottom', 'align' => 'center' ), + ); +||||||| .r11156 + var wpseo_pointer_options = , setup; +======= /** * Render button 3, if needed. This is the previous button in most cases */ @@ -174,7 +494,23 @@ class WPSEO_Pointers { }); >>>>>> .r12027 +<<<<<<< .mine + $this->button_array['button2']['text'] = __( 'Start Tour', 'wordpress-seo' ); + $this->button_array['button2']['function'] = sprintf( 'document.location="%s";', admin_url( 'admin.php?page=wpseo_dashboard' ) ); +||||||| .r11156 + function wpseo_store_answer(input, nonce) { + var wpseo_tracking_data = { + action : 'wpseo_allow_tracking', + allow_tracking: input, + nonce : nonce + }; + jQuery.post(ajaxurl, wpseo_tracking_data, function () { + jQuery('#wp-pointer-0').remove(); + }); + } +======= /** * Show a pointer that starts the tour for Yoast SEO */ @@ -187,13 +523,95 @@ class WPSEO_Pointers { 'content' => $content, 'position' => array( 'edge' => 'bottom', 'align' => 'center' ), ); +>>>>>>> .r12027 +<<<<<<< .mine + $this->print_scripts( $selector, $opt_arr ); + } +||||||| .r11156 + wpseo_pointer_options = $.extend(wpseo_pointer_options, { + buttons: function (event, t) { + var button = jQuery('' + '' + ''); + button.bind('click.pointer', function () { + t.element.pointer('close'); + }); + return button; + }, + close : function () { + } + }); +======= $this->button_array['button2']['text'] = __( 'Start Tour', 'wordpress-seo' ); $this->button_array['button2']['function'] = sprintf( 'document.location="%s";', admin_url( 'admin.php?page=wpseo_dashboard' ) ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Shows a pointer on the proper pages + * + * @param string $page Admin page key. + */ + private function do_page_pointer( $page ) { + $selector = '#wpseo-title'; +||||||| .r11156 + setup = function () { + $('').pointer(wpseo_pointer_options).pointer('open'); + + jQuery('#pointer-close').after('' + '' + ''); + jQuery('#pointer-primary').click(function () { + + }); + + jQuery('#pointer-primary').after('' + '' + ''); + jQuery('#pointer-ternary').click(function () { + + }); + + jQuery('#pointer-close').click(function () { + + wpseo_setIgnore("tour", "wp-pointer-0", ""); + + + + }); + + jQuery('#pointer-close').after('' + '' + ''); + jQuery('#pointer-ternary').click(function () { + + }); + + }; +======= $this->print_scripts( $selector, $opt_arr ); } +>>>>>>> .r12027 + +<<<<<<< .mine + $pointer = call_user_func( array( $this, $this->admin_pages[ $page ] ) ); + $opt_arr = array( + 'content' => $pointer['content'], + 'position' => array( + 'edge' => 'top', + 'align' => ( is_rtl() ) ? 'left' : 'right', + ), + 'pointerWidth' => 450, + ); + if ( isset( $pointer['next_page'] ) ) { + $this->button_array['button2'] = array( + 'text' => __( 'Next', 'wordpress-seo' ), + 'function' => 'window.location="' . admin_url( 'admin.php?page=wpseo_' . $pointer['next_page'] ) . '";', + ); +||||||| .r11156 + if (wpseo_pointer_options.position && wpseo_pointer_options.position.defer_loading) + $(window).bind('load.wp-pointers', setup); + else + $(document).ready(setup); + })(jQuery); + //]]> + + __( 'Next', 'wordpress-seo' ), 'function' => 'window.location="' . admin_url( 'admin.php?page=wpseo_' . $pointer['next_page'] ) . '";', ); +>>>>>>> .r12027 } if ( isset( $pointer['prev_page'] ) ) { $this->button_array['button3'] = array( @@ -263,6 +682,113 @@ class WPSEO_Pointers { ); } +<<<<<<< .mine + /** + * Returns the content of the titles page pointer + * + * @return array + */ + private function titles_pointer() { + return array( + 'content' => '

' . __( 'Title & Metas settings', 'wordpress-seo' ) . '

' + . '

' . __( 'This is where you set the titles and meta-information for all your post types, taxonomies, archives, special pages and for your homepage. The page is divided into different tabs. Make sure you check ’em all out!', 'wordpress-seo' ) . '

' + . '

' . __( 'Sitewide settings', 'wordpress-seo' ) . '
' . __( 'The first tab will show you site-wide settings for titles, normally you\'ll only need to change the Title Separator.', 'wordpress-seo' ) . '

' + . '

' . __( 'Templates and settings', 'wordpress-seo' ) . '
' . sprintf( __( 'Now click on the ‘%1$sPost Types%2$s’-tab, as this will be our example.', 'wordpress-seo' ), '', '' ) . '
' . __( 'The templates are built using variables. You can find all these variables in the help tab (in the top-right corner of the page). The settings allow you to set specific behavior for the post types.', 'wordpress-seo' ) . '

' + . '

' . __( 'Archives', 'wordpress-seo' ) . '
' . __( 'On the archives tab you can set templates for specific pages like author archives, search results and more.', 'wordpress-seo' ) + . '

' . __( 'Other', 'wordpress-seo' ) . '
' . __( 'On the Other tab you can change sitewide meta settings, like enable meta keywords.', 'wordpress-seo' ), + 'next_page' => 'social', + 'prev_page' => 'dashboard', + ); + } + + /** + * Returns the content of the social page pointer + * + * @return array + */ + private function social_pointer() { + return array( + 'content' => '

' . __( 'Social settings', 'wordpress-seo' ) . '

' + . '

' . __( 'Facebook', 'wordpress-seo' ) . '
' . sprintf( __( 'On this tab you can enable the %1$sFacebook Open Graph%2$s functionality from this plugin, as well as assign a Facebook user or Application to be the admin of your site, so you can view the Facebook insights.', 'wordpress-seo' ), '', '' ) . '

' + . '

' . __( 'The frontpage settings allow you to set meta-data for your homepage, whereas the default settings allow you to set a fallback for all posts/pages without images. ', 'wordpress-seo' ) . '

' + . '

' . __( 'Twitter', 'wordpress-seo' ) . '
' . sprintf( __( 'With %1$sTwitter Cards%2$s, you can attach rich photos, videos and media experience to tweets that drive traffic to your website. Simply check the box, sign up for the service, and users who Tweet links to your content will have a “Card” added to the tweet that’s visible to all of their followers.', 'wordpress-seo' ), '', '' ) . '

' + . '

' . __( 'Pinterest', 'wordpress-seo' ) . '
' . __( 'On this tab you can verify your site with Pinterest and enter your Pinterest account.', 'wordpress-seo' ) . '

' + . '

' . __( 'Google+', 'wordpress-seo' ) . '
' . sprintf( __( 'This tab allows you to add specific post meta data for Google+. And if you have a Google+ page for your business, add that URL here and link it on your %1$sGoogle+%2$s page’s about page.', 'wordpress-seo' ), '', '' ) . '

', + 'next_page' => 'xml', + 'prev_page' => 'titles', + ); + } + + /** + * Returns the content of the social page pointer + * + * @return array + */ + private function xml_sitemaps_pointer() { + return array( + 'content' => '

' . __( 'XML Sitemaps', 'wordpress-seo' ) . '

' + . '

' . __( 'What are XML sitemaps?', 'wordpress-seo' ) . '
' . __( 'A Sitemap is an XML file that lists the URLs for a site. It allows webmasters to include additional information about each URL: when it was last updated, how often it changes, and how important it is in relation to other URLs in the site. This allows search engines to crawl the site more intelligently.', 'wordpress-seo' ) . '

' + . '

' . __( 'What does the plugin do with XML Sitemaps?', 'wordpress-seo' ) . '
' . __( 'This plugin adds XML sitemaps to your site. The sitemaps are automatically updated when you publish a new post, page or custom post and Google and Bing will be automatically notified.', 'wordpress-seo' ) . '

' + . '

' . __( 'If you want to exclude certain post types and/or taxonomies, you can also set that on this page.', 'wordpress-seo' ) . '

' + . '

' . __( 'Is your webserver low on memory? Decrease the entries per sitemap (default: 1000) to reduce load.', 'wordpress-seo' ) . '

', + 'next_page' => 'advanced', + 'prev_page' => 'social', + ); + } + + /** + * Returns the content of the advanced page pointer + * + * @return array + */ + private function advanced_pointer() { + return array( + 'content' => '

' . __( 'Advanced Settings', 'wordpress-seo' ) . '

' . __( 'All of the options on these tabs are for advanced users only, if you don’t know whether you should check any, don’t touch them.', 'wordpress-seo' ) . '

', + 'next_page' => 'licenses', + 'prev_page' => 'xml', + ); + } + + /** + * Returns the content of the extensions and licenses page pointer + * + * @return array + */ + private function licenses_pointer() { + return array( + 'content' => '

' . __( 'Extensions and Licenses', 'wordpress-seo' ) . '

' + . '

' . __( 'Extensions', 'wordpress-seo' ) . '
' + /* translators: %1$s expands to Yoast SEO, %2$s to Yoast SEO Premium, %3$s and %4$s to an anchor with link about our premium plugins */ + . sprintf( __( 'The powerful functions of %1$s can be extended with %3$sYoast premium plugins%4$s. These premium plugins require the installation of %1$s or %2$s and add specific functionality. You can read all about the Yoast Premium Plugins %3$shere%4$s.', 'wordpress-seo' ), 'Yoast SEO', 'Yoast SEO Premium', '', '' ) + . '

' + . '

' . __( 'Licenses', 'wordpress-seo' ) . '
' + /* translators: %1$s expands to Yoast SEO Premium */ + . sprintf( __( 'Once you’ve purchased %1$s or any other premium Yoast plugin, you’ll have to enter a license key. You can do so on the Licenses-tab. Once you’ve activated your premium plugin, you can use all its powerful features.', 'wordpress-seo' ), 'Yoast SEO Premium' ) + . '

' + . '

' . __( 'Like this plugin?', 'wordpress-seo' ) . '
' . sprintf( __( 'So, we’ve come to the end of the tour. If you like the plugin, please %srate it 5 stars on WordPress.org%s!', 'wordpress-seo' ), '', '' ) . '

' + . '

' . sprintf( __( 'Thank you for using our plugin and good luck with your SEO!

Best,
Team Yoast - %1$sYoast.com%2$s', 'wordpress-seo' ), '', '' ) . '

', + 'prev_page' => 'advanced', + ); + } + + /** + * Extending the current page URL with two params to be able to ignore the tour. + * + * @return mixed + */ + private function get_ignore_url() { + $arr_params = array( + 'wpseo_restart_tour' => false, + 'wpseo_ignore_tour' => '1', + 'nonce' => wp_create_nonce( 'wpseo-ignore-tour' ), + ); + + return esc_url( add_query_arg( $arr_params ) ); + } +} /* End of class */ +||||||| .r11156 +} /* End of class-exists wrapper */ +======= /** * Returns the content of the titles page pointer * @@ -367,3 +893,4 @@ class WPSEO_Pointers { return esc_url( add_query_arg( $arr_params ) ); } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-recalculate-scores.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-recalculate-scores.php new file mode 100644 index 00000000..b0582765 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-recalculate-scores.php @@ -0,0 +1,65 @@ + 'any', + 'meta_key' => '_yoast_wpseo_focuskw', + 'posts_per_page' => -1, + ); + + /** + * Constructing the object by setting the AJAX hooks + */ + public function __construct() { + // Loading the modal box. + $this->modal_box(); + } + + /** + * Initializing the modal box to be displayed when needed. + */ + private function modal_box() { + // Adding the thickbox. + add_thickbox(); + + $progress = sprintf( + /* translators: 1: expands to a containing the number of posts recalculated. 2: expands to a containing the total number of posts. */ + __( '%1$s of %2$s done.', 'wordpress-seo' ), + '0', + '' . $this->calculate_posts() . '' + ); + + ?> +
+
+ +
+
+
+ query_fields ); + + return $count_posts_query->found_posts; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-sitemaps-admin.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-sitemaps-admin.php index 77e5fab5..62e15034 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-sitemaps-admin.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-sitemaps-admin.php @@ -42,14 +42,87 @@ class WPSEO_Sitemaps_Admin { $new_files_found = true; } } +<<<<<<< .mine unset( $file ); if ( $new_files_found === true ) { update_option( 'wpseo', $options ); } } +||||||| .r11156 + } +======= + unset( $file ); +>>>>>>> .r12027 + } + +<<<<<<< .mine + /** + * Hooked into transition_post_status. Will initiate search engine pings + * if the post is being published, is a post type that a sitemap is built for + * and is a post that is included in sitemaps. + * + * @param string $new_status New post status. + * @param string $old_status Old post status. + * @param \WP_Post $post Post object. + */ + function status_transition( $new_status, $old_status, $post ) { + if ( $new_status != 'publish' ) { + return; + } + + wp_cache_delete( 'lastpostmodified:gmt:' . $post->post_type, 'timeinfo' ); // #17455. + + $options = WPSEO_Options::get_all(); + if ( isset( $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] ) && $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] === true ) { + return; + } + + if ( WP_CACHE ) { + wp_schedule_single_event( ( time() + 300 ), 'wpseo_hit_sitemap_index' ); + } + + /** + * Filter: 'wpseo_allow_xml_sitemap_ping' - Check if pinging is not allowed (allowed by default) + * + * @api boolean $allow_ping The boolean that is set to true by default. + */ + if ( apply_filters( 'wpseo_allow_xml_sitemap_ping', true ) === false ) { + return; + } +||||||| .r11156 + /** + * Hooked into transition_post_status. Will initiate search engine pings + * if the post is being published, is a post type that a sitemap is built for + * and is a post that is included in sitemaps. + */ + function status_transition( $new_status, $old_status, $post ) { + if ( $new_status != 'publish' ) { + return; + } +======= + if ( $new_files_found === true ) { + update_option( 'wpseo', $options ); + } +>>>>>>> .r12027 + } } +<<<<<<< .mine + // Allow the pinging to happen slightly after the hit sitemap index so the sitemap is fully regenerated when the ping happens. + $excluded_posts = explode( ',', $options['excluded-posts'] ); + if ( ! in_array( $post->ID, $excluded_posts ) ) { + if ( defined( 'YOAST_SEO_PING_IMMEDIATELY' ) && YOAST_SEO_PING_IMMEDIATELY ) { + wpseo_ping_search_engines(); + } +||||||| .r11156 + wp_cache_delete( 'lastpostmodified:gmt:' . $post->post_type, 'timeinfo' ); // #17455 + + $options = WPSEO_Options::get_all(); + if ( isset( $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] ) && $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] === true ) { + return; + } +======= /** * Hooked into transition_post_status. Will initiate search engine pings * if the post is being published, is a post type that a sitemap is built for @@ -65,11 +138,36 @@ class WPSEO_Sitemaps_Admin { } wp_cache_delete( 'lastpostmodified:gmt:' . $post->post_type, 'timeinfo' ); // #17455. +>>>>>>> .r12027 +<<<<<<< .mine + else { + wp_schedule_single_event( ( time() + 300 ), 'wpseo_ping_search_engines' ); + } +||||||| .r11156 + + if ( WP_CACHE ) { + wp_schedule_single_event( time() + 300, 'wpseo_hit_sitemap_index' ); + } +======= $options = WPSEO_Options::get_all(); if ( isset( $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] ) && $options[ 'post_types-' . $post->post_type . '-not_in_sitemap' ] === true ) { return; } +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + + // Allow the pinging to happen slightly after the hit sitemap index so the sitemap is fully regenerated when the ping happens. + if ( WPSEO_Meta::get_value( 'sitemap-include', $post->ID ) !== 'never' ) { + if ( defined( 'YOAST_SEO_PING_IMMEDIATELY' ) && YOAST_SEO_PING_IMMEDIATELY ) { + wpseo_ping_search_engines(); + } + else { + wp_schedule_single_event( ( time() + 300 ), 'wpseo_ping_search_engines' ); + } + } +======= if ( WP_CACHE ) { wp_schedule_single_event( ( time() + 300 ), 'wpseo_hit_sitemap_index' ); @@ -81,10 +179,20 @@ class WPSEO_Sitemaps_Admin { if ( defined( 'YOAST_SEO_PING_IMMEDIATELY' ) && YOAST_SEO_PING_IMMEDIATELY ) { wpseo_ping_search_engines(); } +>>>>>>> .r12027 else { wp_schedule_single_event( ( time() + 300 ), 'wpseo_ping_search_engines' ); } } +<<<<<<< .mine + } +} /* End of class */ +||||||| .r11156 + } /* End of class */ + +} /* End of class-exists wrapper */ +======= } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-admin.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-admin.php new file mode 100644 index 00000000..dc4c0b36 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-admin.php @@ -0,0 +1,249 @@ +options = WPSEO_Options::get_all(); + self::translate_meta_boxes(); + add_filter( 'wpseo_save_metaboxes', array( $this, 'save_meta_boxes' ), 10, 1 ); + add_action( 'wpseo_save_compare_data', array( $this, 'og_data_compare' ), 10, 1 ); + } + + /** + * Translate text strings for use in the meta box + * + * IMPORTANT: if you want to add a new string (option) somewhere, make sure you add that array key to + * the main meta box definition array in the class WPSEO_Meta() as well!!!! + */ + public static function translate_meta_boxes() { + /* translators: %s expands to the social network's name */ + $title_text = __( 'If you don\'t want to use the post title for sharing the post on %s but instead want another title there, write it here.', 'wordpress-seo' ); + /* translators: %s expands to the social network's name */ + $description_text = __( 'If you don\'t want to use the meta description for sharing the post on %s but want another description there, write it here.', 'wordpress-seo' ); + /* translators: %s expands to the social network's name */ + $image_text = __( 'If you want to override the image used on %s for this post, upload / choose an image or add the URL here.', 'wordpress-seo' ); + /* translators: %1$s expands to the social network, %2$s to the recommended image size */ + $image_size_text = __( 'The recommended image size for %1$s is %2$spx.', 'wordpress-seo' ); + + $options = WPSEO_Options::get_all(); + + $social_networks = array( + 'opengraph' => __( 'Facebook', 'wordpress-seo' ), + 'twitter' => __( 'Twitter', 'wordpress-seo' ), + 'googleplus' => __( 'Google+', 'wordpress-seo' ), + ); + + // Source: https://blog.bufferapp.com/ideal-image-sizes-social-media-posts. + $recommended_image_sizes = array( + 'opengraph' => '1200 x 628', + 'twitter' => '1024 x 512', + 'google-plus' => '800 x 1200', + ); + + foreach ( $social_networks as $network => $label ) { + if ( true === $options[ $network ] ) { + if ( 'googleplus' == $network ) { + $network = 'google-plus'; // Yuck, I know. + } + + self::$meta_fields['social'][ $network . '-title' ]['title'] = sprintf( __( '%s Title', 'wordpress-seo' ), $label ); + self::$meta_fields['social'][ $network . '-title' ]['description'] = sprintf( $title_text, $label ); + + self::$meta_fields['social'][ $network . '-description' ]['title'] = sprintf( __( '%s Description', 'wordpress-seo' ), $label ); + self::$meta_fields['social'][ $network . '-description' ]['description'] = sprintf( $description_text, $label ); + + self::$meta_fields['social'][ $network . '-image' ]['title'] = sprintf( __( '%s Image', 'wordpress-seo' ), $label ); + self::$meta_fields['social'][ $network . '-image' ]['description'] = sprintf( $image_text, $label ) . ' ' . sprintf( $image_size_text, $label, $recommended_image_sizes[ $network ] ); + } + } + } + + /** + * Returns the metabox section for the social settings. + * + * @return WPSEO_Metabox_Tab_Section + */ + public function get_meta_section() { + $tabs = array(); + $social_meta_fields = $this->get_meta_field_defs( 'social' ); + + if ( $this->options['opengraph'] === true ) { + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'facebook', + $this->get_social_tab_content( 'opengraph', $social_meta_fields ), + '', + array( + 'link_alt' => __( 'Facebook / Open Graph metadata', 'wordpress-seo' ), + 'link_title' => __( 'Facebook / Open Graph metadata', 'wordpress-seo' ), + ) + ); + } + + if ( $this->options['twitter'] === true ) { + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'twitter', + $this->get_social_tab_content( 'twitter', $social_meta_fields ), + '', + array( + 'link_alt' => __( 'Twitter metadata', 'wordpress-seo' ), + 'link_title' => __( 'Twitter metadata', 'wordpress-seo' ), + ) + ); + } + + if ( $this->options['googleplus'] === true ) { + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'googleplus', + $this->get_social_tab_content( 'google-plus', $social_meta_fields ), + '', + array( + 'link_alt' => __( 'Google+ metadata', 'wordpress-seo' ), + 'link_title' => __( 'Google+ metadata', 'wordpress-seo' ), + ) + ); + } + + return new WPSEO_Metabox_Tab_Section( + 'social', + '', + $tabs, + array( + 'link_alt' => __( 'Social', 'wordpress-seo' ), + 'link_title' => __( 'Social', 'wordpress-seo' ), + ) + ); + } + + /** + * Generates the html for a social settings tab for one of the supported social media. + * + * @param string $medium can be 'opengraph', 'twitter' or 'googleplus'. + * @param array $meta_field_defs The social meta field definitions. + * + * @return string + */ + private function get_social_tab_content( $medium, $meta_field_defs ) { + $field_names = array( + $medium . '-title', + $medium . '-description', + $medium . '-image', + ); + + $tab_content = ''; + + foreach ( $field_names as $field_name ) { + $tab_content .= $this->do_meta_box( $meta_field_defs[ $field_name ], $field_name ); + } + + return $tab_content; + } + + /** + * Filter over the meta boxes to save, this function adds the Social meta boxes. + * + * @param array $field_defs Array of metaboxes to save. + * + * @return array + */ + public function save_meta_boxes( $field_defs ) { + return array_merge( $field_defs, $this->get_meta_field_defs( 'social' ) ); + } + + /** + * This method will compare opengraph fields with the posted values. + * + * When fields are changed, the facebook cache will be purge. + * + * @param WP_Post $post Post instance. + */ + public function og_data_compare( $post ) { + + // Check if post data is available, if post_id is set and if original post_status is publish. + if ( + ! empty( $_POST ) && ! empty( $post->ID ) && $post->post_status == 'publish' && + isset( $_POST['original_post_status'] ) && $_POST['original_post_status'] === 'publish' + ) { + + $fields_to_compare = array( + 'opengraph-title', + 'opengraph-description', + 'opengraph-image', + ); + + $reset_facebook_cache = false; + + foreach ( $fields_to_compare as $field_to_compare ) { + $old_value = self::get_value( $field_to_compare, $post->ID ); + $new_value = self::get_post_value( self::$form_prefix . $field_to_compare ); + + if ( $old_value !== $new_value ) { + $reset_facebook_cache = true; + break; + } + } + unset( $field_to_compare, $old_value, $new_value ); + + if ( $reset_facebook_cache ) { + wp_remote_get( + 'https://graph.facebook.com/?id=' . get_permalink( $post->ID ) . '&scrape=true&method=post' + ); + } + } + } + + + /********************** DEPRECATED METHODS **********************/ + + /** + * Define the meta boxes for the Social tab + * + * @deprecated 1.5.0 + * @deprecated use WPSEO_Meta::get_meta_field_defs() + * @see WPSEO_Meta::get_meta_field_defs() + * + * @param string $post_type Optional post type string. + * + * @return array Array containing the meta boxes + */ + public function get_meta_boxes( $post_type = 'post' ) { + _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Meta::get_meta_field_defs()' ); + + return $this->get_meta_field_defs( 'social' ); + } + + /** + * @deprecated 3.0 Removed. + * + * @return string + */ + public function tab_header() { + _deprecated_function( 'WPSEO_Social_Admin::tab_header', 'WPSEO 3.0' ); + + return ''; + } + + /** + * @deprecated 3.0 Removed. + * + * @return string + */ + public function tab_content() { + _deprecated_function( 'WPSEO_Social_Admin::tab_content', 'WPSEO 3.0' ); + + return ''; + } +} /* End of class */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-facebook.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-facebook.php index d79a6c55..d3164271 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-facebook.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-social-facebook.php @@ -1,3 +1,489 @@ +<<<<<<< .mine +options = get_option( 'wpseo_social' ); + + $this->get_listener(); + + $this->form = new Yoast_Social_Facebook_Form(); + } + + /** + * Returns the output from the form class + */ + public function show_form() { + $this->form->show_form(); + } + + /** + * Adding a new admin + * + * @param string $admin_name Name string. + * @param string $admin_id ID string. + * + * @return string + */ + public function add_admin( $admin_name, $admin_id ) { + $success = 0; + + // If one of the fields is empty. + if ( empty( $admin_name ) || empty( $admin_id ) ) { + $response_body = $this->get_response_body( 'not_present' ); + } + else { + $admin_id = $this->parse_admin_id( $admin_id ); + + if ( ! isset( $this->options['fb_admins'][ $admin_id ] ) ) { + $name = sanitize_text_field( urldecode( $admin_name ) ); + $admin_id = sanitize_text_field( $admin_id ); + + if ( preg_match( '/[0-9]+?/', $admin_id ) && preg_match( '/[\w\s]+?/', $name ) ) { + $this->options['fb_admins'][ $admin_id ]['name'] = $name; + $this->options['fb_admins'][ $admin_id ]['link'] = urldecode( 'http://www.facebook.com/' . $admin_id ); + + $this->save_options(); + + $success = 1; + $response_body = $this->form->get_admin_link( $admin_id, $this->options['fb_admins'][ $admin_id ] ); + } + else { + $response_body = $this->get_response_body( 'invalid_format' ); + } + } + else { + $response_body = $this->get_response_body( 'already_exists' ); + } + } + + return WPSEO_Utils::json_encode( + array( + 'success' => $success, + 'html' => $response_body, + ) + ); + } + + /** + * Fetches the id if the full meta tag or a full url was given + * + * @param string $admin_id Admin ID input string to process. + * + * @return string + */ + private function parse_admin_id( $admin_id ) { + if ( preg_match( '/^\
'; + break; + case 'invalid_format': + $return = "
" . __( 'Your input contains invalid characters. Please make sure both fields are filled in correctly.', 'wordpress-seo' ) . '
'; + break; + case 'already_exists': + $return = "
" . __( 'This Facebook user has already been added as an admin.', 'wordpress-seo' ) . '
'; + break; + default: + $return = ''; + break; + } + + return $return; + } + + /** + * This method will hook into the defined get params + */ + private function get_listener() { + if ( $delfbadmin = filter_input( INPUT_GET, 'delfbadmin' ) ) { + $this->delete_admin( $delfbadmin ); + } + elseif ( filter_input( INPUT_GET, 'fbclearall' ) ) { + $this->clear_all(); + } + } + + /** + * Deletes the admin from the options + * + * @param string $delfbadmin Facebook admin ID. + */ + private function delete_admin( $delfbadmin ) { + $this->verify_nonce( 'delfbadmin' ); + + $admin_id = sanitize_text_field( $delfbadmin ); + if ( isset( $this->options['fb_admins'][ $admin_id ] ) ) { + $fbadmin = $this->options['fb_admins'][ $admin_id ]['name']; + unset( $this->options['fb_admins'][ $admin_id ] ); + + $this->save_options(); + $this->success_notice( sprintf( __( 'Successfully removed admin %s', 'wordpress-seo' ), $fbadmin ) ); + + unset( $fbadmin ); + } + + unset( $admin_id ); + + // Clean up the referrer url for later use. + if ( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ) { + $this->cleanup_referrer_url( 'nonce', 'delfbadmin' ); + } + } + + /** + * Clear all the facebook that has been set already + */ + private function clear_all() { + $this->verify_nonce( 'fbclearall' ); + + // Reset to defaults, don't unset as otherwise the old values will be retained. + $this->options['fb_admins'] = WPSEO_Options::get_default( 'wpseo_social', 'fb_admins' ); + + $this->save_options(); + $this->success_notice( __( 'Successfully cleared all Facebook Data', 'wordpress-seo' ) ); + + // Clean up the referrer url for later use. + if ( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ) { + $this->cleanup_referrer_url( 'nonce', 'fbclearall' ); + } + } + + /** + * Clean up the request_uri. The given params are the params that will be removed from the URL + */ + private function cleanup_referrer_url() { + $_SERVER['REQUEST_URI'] = remove_query_arg( + func_get_args(), + filter_input( + INPUT_SERVER, 'REQUEST_URI', FILTER_CALLBACK, array( 'options' => 'sanitize_text_field' ) + ) + ); + } + + /** + * When something is going well, show a success notice + * + * @param string $notice_text Message string. + */ + private function success_notice( $notice_text ) { + add_settings_error( 'yoast_wpseo_social_options', 'success', $notice_text, 'updated' ); + } + + /** + * Verify the nonce from the URL with the saved nonce + * + * @param string $nonce_name Nonce name string. + */ + private function verify_nonce( $nonce_name ) { + if ( wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ), $nonce_name ) != 1 ) { + die( "I don't think that's really nice of you!." ); + } + } + + /** + * Saving the options + */ + private function save_options() { + update_option( 'wpseo_social', $this->options ); + } +} + +/** + * This will display the HTML for the facebook insights part + */ +class Yoast_Social_Facebook_Form { + + /** + * @var array - The options for social + */ + private $options; + + /** + * @var array - The repository for the buttons that will be shown + */ + private $buttons = array(); + + /** + * @var string - The URL to link to + */ + private $admin_url = 'admin.php?page=wpseo_social'; + + /** + * Setting the options and call the methods to display everything + */ + public function __construct() { + $this->options = get_option( 'wpseo_social' ); + } + + /** + * Returns the output-property + */ + public function show_form() { + $this + ->form_head() + ->manage_user_admin() + ->form_thickbox() + ->show_buttons() + ->manage_app_as_admin(); + } + + /** + * Parses the admin_link + * + * @param string $admin_id Facebook admin ID string. + * @param array $admin Admin data array. + * @param string|bool $nonce Optional nonce string. + * + * @return string + */ + public function get_admin_link( $admin_id, $admin, $nonce = false ) { + if ( $nonce === false ) { + $nonce = $this->get_delete_nonce(); + } + + $return = '
' . esc_html( $admin['name'] ) . ''; + $return .= ' - X
'; + + return $return; + } + + /** + * SHow the top of the social insights part of the page + * + * @return $this + */ + private function form_head() { + echo '
' . esc_html__( 'Facebook Insights and Admins', 'wordpress-seo' ) . '
'; + echo sprintf( + esc_html__( + 'To be able to access %sFacebook Insights%s for your site, you need to specify a Facebook Admin. This can be a user. If you have an app for your site, you could use that as well.', 'wordpress-seo' + ), + '', + '' + ); + echo ' '; + /* translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base */ + printf( __( 'More info can be found %1$son our knowledge base%2$s.', 'wordpress-seo' ), '', '' ); + echo '
'; + + return $this; + } + + /** + * Show the form inside the thickbox + */ + private function form_thickbox() { + // Adding the thickbox. + add_thickbox(); + + echo '
'; + echo "
"; + echo '
'; + /* translators: %1$s and %2$s expand to a link to Facebook Insights */ + printf( __( 'To be able to access %1$sFacebook Insights%2$s, you need to add a user here. The name is used for reference only, the ID is used for verification.', 'wordpress-seo' ), '', '' ); + echo '
'; + echo '
'; + /* translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base */ + printf( __( 'If you don\'t know where to find the needed ID, see %1$sthis knowledge base article%2$s.', 'wordpress-seo' ), '', '' ); + echo '
'; + echo '
'; + echo '' . __( 'Admin\'s name:', 'wordpress-seo' ) . ''; + echo ''; + echo '
'; + echo '
'; + echo '' . __( 'Admin\'s Facebook user ID:', 'wordpress-seo' ) . ''; + echo ''; + echo '
'; + echo "
"; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo '
'; + + return $this; + } + + /** + * Display the buttons to add an admin or add another admin from Facebook and display the admin that has been added already. + * + * @return $this + */ + private function manage_user_admin() { + $button_text = __( 'Add Facebook admin', 'wordpress-seo' ); + $nonce = false; + $style = 'style="display:none"'; + + if ( is_array( $this->options['fb_admins'] ) && $this->options['fb_admins'] !== array() ) { + $nonce = $this->get_delete_nonce(); + $button_text = __( 'Add Another Facebook Admin', 'wordpress-seo' ); + $style = ''; + } + + echo "
"; + echo '
' . __( 'Currently connected Facebook admins:', 'wordpress-seo' ) . '
'; + echo '
'; + $this->show_user_admins( $nonce ); + echo '
'; + echo '
'; + + unset( $nonce ); + + $this->add_button( + array( + 'url' => '#TB_inline?width=600&height=350&inlineId=add_facebook_admin', + 'value' => $button_text, + 'class' => 'thickbox', + 'title' => $button_text, + ) + ); + + return $this; + } + + /** + * Show input field to set a facebook apps as an admin + * + * @return $this + */ + private function manage_app_as_admin() { + echo '

'; + Yoast_Form::get_instance()->textinput( 'fbadminapp', __( 'Facebook App ID', 'wordpress-seo' ) ); + + return $this; + } + + /** + * Loop through the fb-admins to parse the output for them + * + * @param string $nonce Nonce string. + */ + private function show_user_admins( $nonce ) { + foreach ( $this->options['fb_admins'] as $admin_id => $admin ) { + echo $this->get_admin_link( $admin_id, $admin, $nonce ); + } + } + + /** + * Parsing the link that directs to the admin removal + * + * @param string $admin_id Facebook admin ID. + * @param string $nonce Nonce string. + * + * @return string + */ + private function admin_delete_link( $admin_id, $nonce ) { + return esc_url( + add_query_arg( + array( + 'delfbadmin' => esc_attr( $admin_id ), + 'nonce' => $nonce, + ), + admin_url( $this->admin_url . '#top#facebook' ) + ) + ); + } + + /** + * Adding a button to the button property + * + * @param array $args Arguments data array. + */ + private function add_button( $args ) { + $args = wp_parse_args( + $args, + array( + 'url' => '', + 'value' => '', + 'class' => '', + 'id' => '', + 'title' => '', + + ) + ); + + $this->buttons[] = '' . esc_html( $args['value'] ) . ''; + } + + /** + * Showing the buttons + */ + private function show_buttons() { + if ( $this->get_clearall() ) { + $this->add_button( + array( + 'url' => add_query_arg( array( + 'nonce' => wp_create_nonce( 'fbclearall' ), + 'fbclearall' => 'true', + ), admin_url( $this->admin_url . '#top#facebook' ) ), + 'value' => __( 'Clear all Facebook Data', 'wordpress-seo' ), + ) + ); + } + + if ( is_array( $this->buttons ) && $this->buttons !== array() ) { + echo '
' . implode( '', $this->buttons ) . '
'; + } + + return $this; + } + + /** + * Check if the clear button should be displayed. This is based on the the set options + * + * @return bool + */ + private function get_clearall() { + return is_array( $this->options['fb_admins'] ) && $this->options['fb_admins'] !== array(); + } + + /** + * Creates nonce for removal link + * + * @return mixed + */ + private function get_delete_nonce() { + return wp_create_nonce( 'delfbadmin' ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-dashboard-widget.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-dashboard-widget.php index e96fc150..7bef898b 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-dashboard-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-dashboard-widget.php @@ -1,3 +1,180 @@ +<<<<<<< .mine +statistics = $statistics; + + add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_dashboard_stylesheet' ) ); + add_action( 'wp_dashboard_setup', array( $this, 'add_dashboard_widget' ) ); + add_action( 'wp_insert_post', array( $this, 'clear_cache' ) ); + add_action( 'delete_post', array( $this, 'clear_cache' ) ); + } + + /** + * Adds dashboard widget to WordPress + */ + public function add_dashboard_widget() { + wp_add_dashboard_widget( + 'wpseo-dashboard-overview', + /* translators: %s is the plugin name */ + sprintf( __( '%s Posts Overview', 'wordpress-seo' ), 'Yoast SEO' ), + array( $this, 'display_dashboard_widget' ) + ); + } + + /** + * Display the dashboard widget + */ + public function display_dashboard_widget() { + $statistics = $this->statistic_items(); + + $onpage_option = new WPSEO_OnPage_Option(); + $onpage = false; + if ( $onpage_option->is_enabled() ) { + $onpage = array( + 'indexable' => $onpage_option->get_status(), + 'can_fetch' => $onpage_option->should_be_fetched(), + ); + } + + include WPSEO_PATH . '/admin/views/dashboard-widget.php'; + } + + /** + * Enqueue's stylesheet for the dashboard if the current page is the dashboard + */ + public function enqueue_dashboard_stylesheet() { + if ( 'dashboard' === get_current_screen()->id ) { + wp_enqueue_style( 'wpseo-wp-dashboard', plugins_url( 'css/dashboard-' . '305' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + } + } + + /** + * Clears the dashboard widget items cache + */ + public function clear_cache() { + delete_transient( self::CACHE_TRANSIENT_KEY ); + } + + /** + * An array representing items to be added to the At a Glance dashboard widget + * + * @return array + */ + private function statistic_items() { + $transient = get_transient( self::CACHE_TRANSIENT_KEY ); + $user_id = get_current_user_id(); + + if ( isset( $transient[ $user_id ][1] ) ) { + return $transient[ $user_id ]; + } + + return $this->set_statistic_items_for_this_user( $transient ); + } + + /** + * Set the cache for a specific user + * + * @param array|boolean $transient The current stored transient with the cached data. + * + * @return mixed + */ + private function set_statistic_items_for_this_user( $transient ) { + if ( $transient === false ) { + $transient = array(); + } + + $user_id = get_current_user_id(); + $filtered_items[ $user_id ] = array_filter( $this->get_seo_scores_with_post_count(), array( $this, 'filter_items' ) ); + + set_transient( self::CACHE_TRANSIENT_KEY, array_merge( $filtered_items, $transient ), DAY_IN_SECONDS ); + + return $filtered_items[ $user_id ]; + } + + /** + * Set the SEO scores belonging to their SEO score result + * + * @return array + */ + private function get_seo_scores_with_post_count() { + $ranks = WPSEO_Rank::get_all_ranks(); + + return array_map( array( $this, 'map_rank_to_widget' ), $ranks ); + } + + /** + * Converts a rank to data usable in the dashboard widget + * + * @param WPSEO_Rank $rank The rank to map. + * + * @return array + */ + private function map_rank_to_widget( WPSEO_Rank $rank ) { + return array( + 'seo_rank' => $rank->get_rank(), + 'title' => $this->get_title_for_rank( $rank ), + 'class' => 'wpseo-glance-' . $rank->get_css_class(), + 'icon_class' => $rank->get_css_class(), + 'count' => $this->statistics->get_post_count( $rank ), + ); + } + + /** + * Returns a dashboard widget label to use for a certain rank + * + * @param WPSEO_Rank $rank The rank to return a label for. + * + * @return string + */ + private function get_title_for_rank( WPSEO_Rank $rank ) { + $labels = array( + WPSEO_Rank::NO_FOCUS => __( 'Posts without focus keyword', 'wordpress-seo' ), + WPSEO_Rank::BAD => __( 'Posts with bad SEO score', 'wordpress-seo' ), + WPSEO_Rank::OK => __( 'Posts with OK SEO score', 'wordpress-seo' ), + WPSEO_Rank::GOOD => __( 'Posts with good SEO score', 'wordpress-seo' ), + /* translators: %s expands to noindex */ + WPSEO_Rank::NO_INDEX => sprintf( __( 'Posts that are set to %s', 'wordpress-seo' ), 'noindex' ), + ); + + return $labels[ $rank->get_rank() ]; + } + + /** + * Filter items if they have a count of zero + * + * @param array $item Data array. + * + * @return bool + */ + private function filter_items( $item ) { + return 0 !== $item['count']; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-form.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-form.php index 2cc58c11..1faadf6a 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-form.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-form.php @@ -1,3 +1,469 @@ +<<<<<<< .mine + +
+ +
+
+
+ '; + settings_fields( $option_long_name ); + } + $this->set_option( $option ); + } + + /** + * Set the option used in output for form elements + * + * @param string $option_name Option key. + */ + public function set_option( $option_name ) { + $this->option_name = $option_name; + $this->options = $this->get_option(); + } + + /** + * Retrieve options based on whether we're on multisite or not. + * + * @since 1.2.4 + * + * @return array + */ + private function get_option() { + if ( is_network_admin() ) { + return get_site_option( $this->option_name ); + } + + return get_option( $this->option_name ); + } + + /** + * Generates the footer for admin pages + * + * @param bool $submit Whether or not a submit button and form end tag should be shown. + * @param bool $show_sidebar Whether or not to show the banner sidebar - used by premium plugins to disable it. + */ + public function admin_footer( $submit = true, $show_sidebar = true ) { + if ( $submit ) { + submit_button(); + + echo ' + '; + } + + do_action( 'wpseo_admin_footer' ); + + echo ' +
'; + + if ( $show_sidebar ) { + $this->admin_sidebar(); + } + + echo '
'; + + + if ( ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ) ) { + $xdebug = ( extension_loaded( 'xdebug' ) ? true : false ); + echo ' +
+
+ +
' . __( 'Debug Information', 'wordpress-seo' ) . '
+
+
' . esc_html( __( 'Current option:', 'wordpress-seo' ) ) . ' ' . esc_html( $this->option_name ) . '
+ ' . ( ( $xdebug ) ? '' : '
' ); + var_dump( $this->get_option() ); + echo ' + ' . ( ( $xdebug ) ? '' : '
' ) . ' +
+
+
'; + } + + echo ' +
'; + } + + /** + * Generates the sidebar for admin pages. + */ + public function admin_sidebar() { + + // No banners in Premium. + if ( class_exists( 'WPSEO_Product_Premium' ) ) { + $license_manager = new Yoast_Plugin_License_Manager( new WPSEO_Product_Premium() ); + if ( $license_manager->license_is_valid() ) { + return; + } + } + + $service_banners = array( + array( + 'url' => 'https://yoast.com/hire-us/website-review/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=website-review-banner', + 'img' => 'banner-website-review.png', + 'alt' => 'Website Review banner', + ), + ); + + $plugin_banners = array( + array( + 'url' => 'https://yoast.com/academy/course/basic-seo-training/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=basic-seo-training-banner', + 'img' => 'banner-seo-training.png', + 'alt' => 'Basic SEO Training banner', + ), + array( + 'url' => 'https://yoast.com/wordpress/plugins/seo-premium/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=premium-seo-banner', + 'img' => 'banner-premium-seo.png', + 'alt' => 'Banner Yoast SEO Premium', + ), + ); + + if ( ! class_exists( 'wpseo_Video_Sitemap' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/video-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=video-seo-banner', + 'img' => 'banner-video-seo.png', + 'alt' => 'Banner Yoast Video SEO plugin', + ); + } + + if ( class_exists( 'Woocommerce' ) && ! class_exists( 'Yoast_WooCommerce_SEO' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/yoast-woocommerce-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=woocommerce-seo-banner', + 'img' => 'banner-woocommerce-seo.png', + 'alt' => 'Banner Yoast WooCommerce SEO plugin', + ); + } + + if ( ! defined( 'WPSEO_LOCAL_VERSION' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/local-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=local-seo-banner', + 'img' => 'banner-local-seo.png', + 'alt' => 'Banner Yoast Local SEO plugin', + ); + } + + if ( ! class_exists( 'WPSEO_News' ) ) { + $plugin_banners[] = array( + 'url' => 'https://yoast.com/wordpress/plugins/news-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=news-seo-banner', + 'img' => 'banner-news-seo.png', + 'alt' => 'Banner Yoast News SEO plugin', + ); + } + + shuffle( $service_banners ); + shuffle( $plugin_banners ); + ?> +
+
+

'; + + $i = 0; + foreach ( $plugin_banners as $banner ) { + if ( $i == 2 ) { + break; + } + echo '

'; + $i ++; + } + ?> +
+

+
+
+ 'checkbox', + 'close' => true, + 'for' => '', + ) + ); + echo "$text"; + if ( $attr['close'] ) { + echo ''; + } + } + + /** + * Create a Checkbox input field. + * + * @param string $var The variable within the option to create the checkbox for. + * @param string $label The label to show for the variable. + * @param bool $label_left Whether the label should be left (true) or right (false). + */ + public function checkbox( $var, $label, $label_left = false ) { + if ( ! isset( $this->options[ $var ] ) ) { + $this->options[ $var ] = false; + } + + if ( $this->options[ $var ] === true ) { + $this->options[ $var ] = 'on'; + } + + $class = ''; + if ( $label_left !== false ) { + if ( ! empty( $label_left ) ) { + $label_left .= ':'; + } + $this->label( $label_left, array( 'for' => $var ) ); + } + else { + $class = 'double'; + } + + echo 'options[ $var ], 'on', false ), '/>'; + + if ( ! empty( $label ) ) { + $this->label( $label, array( 'for' => $var ) ); + } + + echo '
'; + } + + /** + * Create a Text input field. + * + * @param string $var The variable within the option to create the text input field for. + * @param string $label The label to show for the variable. + * @param array|string $attr Extra class to add to the input field. + */ + public function textinput( $var, $label, $attr = array() ) { + if ( ! is_array( $attr ) ) { + $attr = array( + 'class' => $attr, + ); + } + $attr = wp_parse_args( $attr, array( + 'placeholder' => '', + 'class' => '', + ) ); + $val = ( isset( $this->options[ $var ] ) ) ? $this->options[ $var ] : ''; + + $this->label( $label . ':', array( 'for' => $var ) ); + echo '', '
'; + } + + /** + * Create a textarea. + * + * @param string $var The variable within the option to create the textarea for. + * @param string $label The label to show for the variable. + * @param array $attr The CSS class to assign to the textarea. + */ + public function textarea( $var, $label, $attr = array() ) { + if ( ! is_array( $attr ) ) { + $attr = array( + 'class' => $attr, + ); + } + $attr = wp_parse_args( $attr, array( + 'cols' => '', + 'rows' => '', + 'class' => '', + ) ); + $val = ( isset( $this->options[ $var ] ) ) ? $this->options[ $var ] : ''; + + $this->label( $label . ':', array( 'for' => $var, 'class' => 'textinput' ) ); + echo '' . esc_textarea( $val ) . '' . '
'; + } + + /** + * Create a hidden input field. + * + * @param string $var The variable within the option to create the hidden input for. + * @param string $id The ID of the element. + */ + public function hidden( $var, $id = '' ) { + $val = ( isset( $this->options[ $var ] ) ) ? $this->options[ $var ] : ''; + if ( is_bool( $val ) ) { + $val = ( $val === true ) ? 'true' : 'false'; + } + + if ( '' === $id ) { + $id = 'hidden_' . $var; + } + + echo ''; + } + + /** + * Create a Select Box. + * + * @param string $var The variable within the option to create the select for. + * @param string $label The label to show for the variable. + * @param array $values The select options to choose from. + */ + public function select( $var, $label, $values ) { + if ( ! is_array( $values ) || $values === array() ) { + return; + } + $val = ( isset( $this->options[ $var ] ) ) ? $this->options[ $var ] : ''; + + $this->label( $label . ':', array( 'for' => $var, 'class' => 'select' ) ); + echo ''; + + echo '
'; + } + + /** + * Create a File upload field. + * + * @param string $var The variable within the option to create the file upload field for. + * @param string $label The label to show for the variable. + */ + public function file_upload( $var, $label ) { + $val = ''; + if ( isset( $this->options[ $var ] ) && is_array( $this->options[ $var ] ) ) { + $val = $this->options[ $var ]['url']; + } + + $var_esc = esc_attr( $var ); + $this->label( $label . ':', array( 'for' => $var, 'class' => 'select' ) ); + echo ''; + + // Need to save separate array items in hidden inputs, because empty file inputs type will be deleted by settings API. + if ( ! empty( $this->options[ $var ] ) ) { + $this->hidden( 'file', $this->option_name . '_file' ); + $this->hidden( 'url', $this->option_name . '_url' ); + $this->hidden( 'type', $this->option_name . '_type' ); + } + echo '
'; + } + + /** + * Media input + * + * @param string $var Option name. + * @param string $label Label message. + */ + public function media_input( $var, $label ) { + $val = ''; + if ( isset( $this->options[ $var ] ) ) { + $val = $this->options[ $var ]; + } + + $var_esc = esc_attr( $var ); + + $this->label( $label . ':', array( 'for' => 'wpseo_' . $var, 'class' => 'select' ) ); + echo ''; + echo ''; + echo '
'; + } + + /** + * Create a Radio input field. + * + * @param string $var The variable within the option to create the file upload field for. + * @param array $values The radio options to choose from. + * @param string $label The label to show for the variable. + */ + public function radio( $var, $values, $label ) { + if ( ! is_array( $values ) || $values === array() ) { + return; + } + if ( ! isset( $this->options[ $var ] ) ) { + $this->options[ $var ] = false; + } + + $var_esc = esc_attr( $var ); + + echo '
'; + if ( is_string( $label ) && $label !== '' ) { + $this->label( $label . ':', array( 'class' => 'select' ) ); + } + + foreach ( $values as $key => $value ) { + $key_esc = esc_attr( $key ); + echo 'options[ $var ], $key_esc, false ) . ' />'; + $this->label( $value, array( 'for' => $var_esc . '-' . $key_esc, 'class' => 'radio' ) ); + } + echo '
'; + echo '

'; + } +} +||||||| .r0 +=======
'; } } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification-center.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification-center.php index 738cba02..365de6ba 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification-center.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification-center.php @@ -17,9 +17,14 @@ class Yoast_Notification_Center { */ private static $instance = null; +<<<<<<< .mine + /** @var $notifications Yoast_Notification[] */ +||||||| .r11156 +======= /** * @var array */ +>>>>>>> .r12027 private $notifications = array(); /** @@ -121,15 +126,24 @@ class Yoast_Notification_Center { $arr_notifications[] = $notification->to_array(); } +<<<<<<< .mine + // Set the cookie with notifications. + set_transient( self::TRANSIENT_KEY, WPSEO_Utils::json_encode( $arr_notifications ), ( MINUTE_IN_SECONDS * 10 ) ); +||||||| .r11156 + // Set the cookie with notifications + set_transient( self::TRANSIENT_KEY, json_encode( $arr_notifications ), MINUTE_IN_SECONDS * 10 ); + +======= // Set the cookie with notifications. set_transient( self::TRANSIENT_KEY, json_encode( $arr_notifications ), ( MINUTE_IN_SECONDS * 10 ) ); +>>>>>>> .r12027 } } /** * Add notification to the cookie * - * @param Yoast_Notification $notification + * @param Yoast_Notification $notification Notification object instance. */ public function add_notification( Yoast_Notification $notification ) { $this->notifications[] = $notification; @@ -141,7 +155,29 @@ class Yoast_Notification_Center { public function display_notifications() { $this->notifications = array_unique( $this->notifications ); +<<<<<<< .mine + $ids = array(); + + foreach ( $this->notifications as $key => $notification ) { + + $id = $notification->get_id(); + + if ( in_array( $id, $ids ) ) { + unset( $this->notifications[ $key ] ); + continue; + } + + $ids[] = $id; + } + + $this->notifications = array_unique( $this->notifications ); + // Display notifications. +||||||| .r11156 + // Display notifications +======= + // Display notifications. +>>>>>>> .r12027 if ( count( $this->notifications ) > 0 ) { foreach ( $this->notifications as $notification ) { echo $notification; @@ -163,5 +199,11 @@ class Yoast_Notification_Center { // AJAX die. exit; } +<<<<<<< .mine +} +||||||| .r11156 + +}======= } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification.php index 2f462487..1372fc4d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-notification.php @@ -32,10 +32,18 @@ class Yoast_Notification { ); /** - * The Constructor + * Notification class constructor. * +<<<<<<< .mine + * @param string $message Message string. + * @param array $options Set of options. +||||||| .r11156 + * @param String $message + * @param String $type +======= * @param string $message * @param array $options +>>>>>>> .r12027 */ public function __construct( $message, $options = array() ) { $this->options = wp_parse_args( $options, $this->defaults ); @@ -43,59 +51,171 @@ class Yoast_Notification { } /** +<<<<<<< .mine + * Retrieve notification ID string. + * + * @return string +||||||| .r11156 + * @return String +======= * Return the object properties as an array * * @return array +>>>>>>> .r12027 */ +<<<<<<< .mine + public function get_id() { + return $this->options['id']; +||||||| .r11156 + public function get_message() { + return $this->message; +======= public function to_array() { return array( 'message' => $this->message, 'options' => $this->options, ); +>>>>>>> .r12027 } /** +<<<<<<< .mine + * Return the object properties as an array + * + * @return array +||||||| .r11156 + * @param String $message +======= * Adds string (view) behaviour to the Notification * * @return string +>>>>>>> .r12027 */ +<<<<<<< .mine + public function to_array() { + return array( + 'message' => $this->message, + 'options' => $this->options, + ); +||||||| .r11156 + public function set_message( $message ) { + $this->message = $message; +======= public function __toString() { return '
parse_data_attributes() . '>' . wpautop( $this->message ) . '
' . PHP_EOL; +>>>>>>> .r12027 } /** +<<<<<<< .mine + * Adds string (view) behaviour to the Notification + * + * @return string +||||||| .r11156 + * @return String +======= * Parsing the data attributes * * @return string +>>>>>>> .r12027 */ +<<<<<<< .mine + public function __toString() { + return '
parse_data_attributes() . '>' . wpautop( $this->message ) . '
' . PHP_EOL; +||||||| .r11156 + public function get_type() { + return $this->type; +======= private function parse_data_attributes() { return $this->parse_nonce_attribute() . '' . $this->parse_data_json_attribute(); +>>>>>>> .r12027 } /** +<<<<<<< .mine + * Parsing the data attributes + * + * @return string +||||||| .r11156 + * @param String $type +======= * Returns a data attribute containing the nonce if present * * @return string +>>>>>>> .r12027 */ +<<<<<<< .mine + private function parse_data_attributes() { + return $this->parse_nonce_attribute() . '' . $this->parse_data_json_attribute(); +||||||| .r11156 + public function set_type( $type ) { + $this->type = $type; +======= private function parse_nonce_attribute() { return ( ! empty( $this->options['nonce'] ) ? ' data-nonce="' . $this->options['nonce'] . '"' : '' ); +>>>>>>> .r12027 } /** +<<<<<<< .mine + * Returns a data attribute containing the nonce if present +||||||| .r11156 + * Return the object properties as an array +======= * Make it possible to pass some JSON data +>>>>>>> .r12027 * * @return string */ +<<<<<<< .mine + private function parse_nonce_attribute() { + return ( ! empty( $this->options['nonce'] ) ? ' data-nonce="' . $this->options['nonce'] . '"' : '' ); + } +||||||| .r11156 + public function to_array() { + return array( + 'message' => $this->get_message(), + 'type' => $this->get_type() + ); + } +======= private function parse_data_json_attribute() { if ( empty( $this->options['data_json'] ) ) { return ''; } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Make it possible to pass some JSON data + * + * @return string + */ + private function parse_data_json_attribute() { + if ( empty( $this->options['data_json'] ) ) { + return ''; + } + + return " data-json='" . WPSEO_Utils::json_encode( $this->options['data_json'] ) . "'"; +||||||| .r11156 + /** + * Output the message + */ + public function output() { + echo '
' . wpautop( $this->get_message() ) . '
' . PHP_EOL; +======= // @codingStandardsIgnoreStart $data = ( function_exists( 'wp_json_encode' ) ) ? wp_json_encode( $this->options['data_json'] ) : json_encode( $this->options['data_json'] ); // @codingStandardsIgnoreEnd return " data-json='" . $data . "'"; +>>>>>>> .r12027 } +<<<<<<< .mine +} +||||||| .r11156 + +}======= } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-plugin-conflict.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-plugin-conflict.php index cac071b1..75026d0d 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-plugin-conflict.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/class-yoast-plugin-conflict.php @@ -74,6 +74,27 @@ class Yoast_Plugin_Conflict { $this->remove_deactivated_plugin(); } +<<<<<<< .mine + // Search for active plugins. + $this->search_active_plugins(); + } + + /** + * Check if there are conflicting plugins for given $plugin_section + * + * @param string $plugin_section Type of plugin conflict (such as Open Graph or sitemap). + * + * @return bool + */ + public function check_for_conflicts( $plugin_section ) { + + static $sections_checked; + + if ( $sections_checked === null ) { + $sections_checked = array(); +||||||| .r11156 + return self::$instance; +======= // Search for active plugins. $this->search_active_plugins(); } @@ -91,6 +112,7 @@ class Yoast_Plugin_Conflict { if ( $sections_checked === null ) { $sections_checked = array(); +>>>>>>> .r12027 } if ( ! in_array( $plugin_section, $sections_checked ) ) { @@ -103,6 +125,24 @@ class Yoast_Plugin_Conflict { return false; } +<<<<<<< .mine + /** + * Getting all the conflicting plugins and return them as a string. + * + * This method will loop through all conflicting plugins to get the details of each plugin. The plugin name + * will be taken from the details to parse a comma separated string, which can be use for by example a notice + * + * @param string $plugin_section Plugin conflict type (such as Open Graph or sitemap). + * + * @return string + */ + public function get_conflicting_plugins_as_string( $plugin_section ) { + if ( ! function_exists( 'get_plugin_data' ) ) { + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + } +||||||| .r11156 + static $sections_checked; +======= /** * Getting all the conflicting plugins and return them as a string. * @@ -117,6 +157,7 @@ class Yoast_Plugin_Conflict { if ( ! function_exists( 'get_plugin_data' ) ) { require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); } +>>>>>>> .r12027 // Getting the active plugins by given section. $plugins = $this->active_plugins[ $plugin_section ]; @@ -134,6 +175,20 @@ class Yoast_Plugin_Conflict { } } +<<<<<<< .mine + /** + * Checks for given $plugin_sections for conflicts + * + * @param array $plugin_sections Set of sections. + */ + public function check_plugin_conflicts( $plugin_sections ) { + foreach ( $plugin_sections as $plugin_section => $readable_plugin_section ) { + // Check for conflicting plugins and show error if there are conflicts. + if ( $this->check_for_conflicts( $plugin_section ) ) { + $this->set_error( $plugin_section, $readable_plugin_section ); +||||||| .r11156 + return $has_conflicts; +======= /** * Checks for given $plugin_sections for conflicts * @@ -144,10 +199,35 @@ class Yoast_Plugin_Conflict { // Check for conflicting plugins and show error if there are conflicts. if ( $this->check_for_conflicts( $plugin_section ) ) { $this->set_error( $plugin_section, $readable_plugin_section ); +>>>>>>> .r12027 } } } +<<<<<<< .mine + /** + * Setting an error on the screen + * + * @param string $plugin_section Type of conflict group (such as Open Graph or sitemap). + * @param string $readable_plugin_section This is the value for the translation. + */ + protected function set_error( $plugin_section, $readable_plugin_section ) { +||||||| .r11156 + /** + * Getting all the conflicting plugins and return them as a string. + * + * This method will loop through all conflicting plugins to get the details of each plugin. The plugin name + * will be taken from the details to parse a comma separated string, which can be use for by example a notice + * + * @param string $plugin_section + * + * @return string + */ + public function get_conflicting_plugins_as_string( $plugin_section ) { + if ( ! function_exists( 'get_plugin_data' ) ) { + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + } +======= /** * Setting an error on the screen * @@ -155,6 +235,7 @@ class Yoast_Plugin_Conflict { * @param string $readable_plugin_section This is the value for the translation. */ protected function set_error( $plugin_section, $readable_plugin_section ) { +>>>>>>> .r12027 $plugins_as_string = $this->get_conflicting_plugins_as_string( $plugin_section ); $error_message = '
' . __( 'Warning!', 'wordpress-seo' ) . '
'; @@ -200,6 +281,28 @@ class Yoast_Plugin_Conflict { } } +<<<<<<< .mine + /** + * Loop through plugins and check if each plugin is active + * + * @param array $plugins Set of plugins. + * @param string $plugin_section Type of conflict group (such as Open Graph or sitemap). + */ + protected function check_plugins_active( $plugins, $plugin_section ) { + $plugins = $this->filter_already_dismissed( $plugin_section, $plugins ); + foreach ( $plugins as $plugin ) { + if ( $this->check_plugin_is_active( $plugin ) ) { + $this->add_active_plugin( $plugin_section, $plugin ); +||||||| .r11156 + /** + * Loop through the $this->plugins to check if one of the plugins is active. + * + * This method will store the active plugins in $this->active_plugins. + */ + protected function search_active_plugins() { + foreach ( $this->plugins AS $plugin_section => $plugins ) { + $this->check_plugins_active( $plugins, $plugin_section ); +======= /** * Loop through plugins and check if each plugin is active * @@ -211,10 +314,39 @@ class Yoast_Plugin_Conflict { foreach ( $plugins as $plugin ) { if ( $this->check_plugin_is_active( $plugin ) ) { $this->add_active_plugin( $plugin_section, $plugin ); +>>>>>>> .r12027 } } } +<<<<<<< .mine + /** + * Filter the already dismissed plugins + * + * @param string $plugin_section Type of conflict group (such as Open Graph or sitemap). + * @param array $plugins Set of plugins. + * + * @return array + */ + protected function filter_already_dismissed( $plugin_section, array $plugins ) { + $already_dismissed = get_user_option( 'wpseo_dismissed_conflicts', get_current_user_id() ); + + if ( ! empty( $already_dismissed[ $plugin_section ] ) ) { + foreach ( $plugins as $array_key => $plugin ) { + if ( in_array( $plugin, $already_dismissed[ $plugin_section ] ) ) { + unset( $plugins[ $array_key ] ); +||||||| .r11156 + /** + * Loop through plugins and check if each plugin is active + * + * @param array $plugins + * @param string $plugin_section + */ + protected function check_plugins_active( $plugins, $plugin_section ) { + foreach ( $plugins AS $plugin ) { + if ( $this->check_plugin_is_active( $plugin ) ) { + $this->add_active_plugin( $plugin_section, $plugin ); +======= /** * Filter the already dismissed plugins * @@ -230,6 +362,7 @@ class Yoast_Plugin_Conflict { foreach ( $plugins as $array_key => $plugin ) { if ( in_array( $plugin, $already_dismissed[ $plugin_section ] ) ) { unset( $plugins[ $array_key ] ); +>>>>>>> .r12027 } } } @@ -237,6 +370,20 @@ class Yoast_Plugin_Conflict { return $plugins; } +<<<<<<< .mine + /** + * Check if given plugin exists in array with all_active_plugins + * + * @param string $plugin Plugin basename string. + * + * @return bool + */ + protected function check_plugin_is_active( $plugin ) { + return in_array( $plugin, $this->all_active_plugins ); + } +||||||| .r11156 + $is_plugin_active = in_array( $plugin, $this->all_active_plugins ); +======= /** * Check if given plugin exists in array with all_active_plugins * @@ -247,7 +394,25 @@ class Yoast_Plugin_Conflict { protected function check_plugin_is_active( $plugin ) { return in_array( $plugin, $this->all_active_plugins ); } +>>>>>>> .r12027 + +<<<<<<< .mine + /** + * Add plugin to the list of active plugins. + * + * This method will check first if key $plugin_section exists, if not it will create an empty array + * If $plugin itself doesn't exist it will be added. + * + * @param string $plugin_section Type of conflict group (such as Open Graph or sitemap). + * @param string $plugin Plugin basename string. + */ + protected function add_active_plugin( $plugin_section, $plugin ) { + if ( ! array_key_exists( $plugin_section, $this->active_plugins ) ) { + $this->active_plugins[ $plugin_section ] = array(); +||||||| .r11156 + return $is_plugin_active; +======= /** * Add plugin to the list of active plugins. * @@ -261,6 +426,7 @@ class Yoast_Plugin_Conflict { if ( ! array_key_exists( $plugin_section, $this->active_plugins ) ) { $this->active_plugins[ $plugin_section ] = array(); +>>>>>>> .r12027 } if ( ! in_array( $plugin, $this->active_plugins[ $plugin_section ] ) ) { @@ -268,6 +434,22 @@ class Yoast_Plugin_Conflict { } } +<<<<<<< .mine + /** + * Search in $this->plugins for the given $plugin + * + * If there is a result it will return the plugin category + * + * @param string $plugin Plugin basename string. + * + * @return int|string + */ + protected function find_plugin_category( $plugin ) { +||||||| .r11156 + if ( ! array_key_exists( $plugin_section, $this->active_plugins ) ) { + $this->active_plugins[$plugin_section] = array(); + } +======= /** * Search in $this->plugins for the given $plugin * @@ -278,6 +460,7 @@ class Yoast_Plugin_Conflict { * @return int|string */ protected function find_plugin_category( $plugin ) { +>>>>>>> .r12027 foreach ( $this->plugins as $plugin_section => $plugins ) { if ( in_array( $plugin, $plugins ) ) { @@ -298,5 +481,11 @@ class Yoast_Plugin_Conflict { unset( $this->all_active_plugins[ $key_to_remove ] ); } } +<<<<<<< .mine +} +||||||| .r11156 + +}======= } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-ajax.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-ajax.php index 48313648..37eeb124 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-ajax.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-ajax.php @@ -1,3 +1,82 @@ +<<<<<<< .mine +valid_nonce() ) { + $marker = new WPSEO_GSC_Marker( filter_input( INPUT_POST, 'url' ) ); + + wp_die( $marker->get_response() ); + } + + wp_die( 'false' ); + } + + /** + * Handling the request to create a new redirect from the issued URL + */ + public function ajax_create_redirect() { + if ( $this->valid_nonce() && class_exists( 'WPSEO_URL_Redirect_Manager' ) && defined( 'WPSEO_PREMIUM_PATH' ) ) { + $redirect_manager = new WPSEO_URL_Redirect_Manager(); + + $old_url = filter_input( INPUT_POST, 'old_url' ); + + // Creates the redirect. + if ( $redirect_manager->create_redirect( $old_url, filter_input( INPUT_POST, 'new_url' ), filter_input( INPUT_POST, 'type' ) ) ) { + if ( filter_input( INPUT_POST, 'mark_as_fixed' ) === 'true' ) { + new WPSEO_GSC_Marker( $old_url ); + } + + wp_die( 'true' ); + } + } + + wp_die( 'false' ); + } + + /** + * Handle the AJAX request and dismiss the GSC notice + */ + public function dismiss_notice() { + check_ajax_referer( 'dismiss-gsc-notice' ); + + update_user_meta( get_current_user_id(), 'wpseo_dismissed_gsc_notice', true ); + + wp_die( 'true' ); + } + + /** + * Check if posted nonce is valid and return true if it is + * + * @return mixed + */ + private function valid_nonce() { + return wp_verify_nonce( filter_input( INPUT_POST, 'ajax_nonce' ), 'wpseo-gsc-ajax-security' ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-bulk-action.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-bulk-action.php index 14f192cf..7c63c323 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-bulk-action.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-bulk-action.php @@ -1,3 +1,98 @@ +<<<<<<< .mine +handle_bulk_action(); + } + } + + /** + * Handles the bulk action when there is an action posted + */ + private function handle_bulk_action() { + if ( $bulk_action = $this->determine_bulk_action() ) { + $this->run_bulk_action( $bulk_action, $this->posted_issues() ); + + wp_redirect( filter_input( INPUT_POST, '_wp_http_referer' ) ); + exit; + } + } + + /** + * Determine which bulk action is selected and return that value + * + * @return string|bool + */ + private function determine_bulk_action() { + // If posted action is the selected one above the table, return that value. + if ( ( $action = filter_input( INPUT_POST, 'action' ) ) && $action !== '-1' ) { + return $action; + } + + // If posted action is the selected one below the table, return that value. + if ( ( $action = filter_input( INPUT_POST, 'action2' ) ) && $action !== '-1' ) { + return $action; + } + + return false; + } + + /** + * Get the posted issues and return them + * + * @return array + */ + private function posted_issues() { + if ( $issues = filter_input( INPUT_POST, 'wpseo_crawl_issues', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ) ) { + return $issues; + } + + // Fallback if issues are empty. + return array(); + } + + /** + * Runs the bulk action + * + * @param string $bulk_action Action type. + * @param array $issues Set of issues to apply to. + */ + private function run_bulk_action( $bulk_action, $issues ) { + switch ( $bulk_action ) { + case 'mark_as_fixed' : + array_map( array( $this, 'action_mark_as_fixed' ), $issues ); + + break; + } + } + + /** + * Marks the issue as fixed + * + * @param string $issue Issue URL. + * + * @return string + */ + private function action_mark_as_fixed( $issue ) { + new WPSEO_GSC_Marker( $issue ); + + return $issue; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-category-filters.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-category-filters.php index fee02d25..fb02cf41 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-category-filters.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-category-filters.php @@ -1,3 +1,193 @@ +<<<<<<< .mine +set_counts( $platform_counts ); + } + + // Setting the filter values. + $this->set_filter_values(); + + $this->category = $this->get_current_category(); + } + + /** + * Returns the value of the current category + * + * @return mixed|string + */ + public function get_category() { + return $this->category; + } + + /** + * Returns the current filters as an array + * + * Only return categories with more than 0 issues + * + * @return array + */ + public function as_array() { + $new_views = array(); + + foreach ( $this->category_counts as $category_name => $category ) { + $new_views[] = $this->create_view_link( $category_name, $category['count'] ); + } + + return $new_views; + } + + /** + * Getting the current view + */ + private function get_current_category() { + if ( $current_category = filter_input( INPUT_GET, 'category' ) ) { + return $current_category; + } + + // Just prevent redirect loops. + if ( ! empty( $this->category_counts ) ) { + $current_category = 'not_found'; + if ( empty( $this->category_counts[ $current_category ] ) ) { + $current_category = key( $this->category_counts ); + } + + // Just redirect to set the category. + wp_redirect( add_query_arg( 'category', $current_category ) ); + exit; + } + } + + /** + * Setting the view counts based on the saved data. The info will be used to display the category filters + * + * @param array $platform_counts Set of counts by platform. + */ + private function set_counts( array $platform_counts ) { + $this->category_counts = $this->parse_counts( $platform_counts ); + } + + /** + * Setting the values for the filter + */ + private function set_filter_values() { + $this->set_filter_value( 'access_denied', __( 'Access denied', 'wordpress-seo' ), __( 'Server requires authentication or is blocking Googlebot from accessing the site.', 'wordpress-seo' ) ); + $this->set_filter_value( 'faulty_redirects', __( 'Faulty redirects', 'wordpress-seo' ) ); + $this->set_filter_value( 'not_followed',__( 'Not followed', 'wordpress-seo' ) ); + $this->set_filter_value( 'not_found', __( 'Not found', 'wordpress-seo' ), __( 'URL points to a non-existent page.', 'wordpress-seo' ) ); + $this->set_filter_value( 'other', __( 'Other', 'wordpress-seo' ), __( 'Google was unable to crawl this URL due to an undetermined issue.', 'wordpress-seo' ) ); + /* Translators: %1$s: expands to 'robots.txt'. */ + $this->set_filter_value( 'roboted', __( 'Blocked', 'wordpress-seo' ), sprintf( __( 'Googlebot could access your site, but certain URLs are blocked for Googlebot in your %1$s file. This block could either be for all Googlebots or even specifically for Googlebot-mobile.', 'wordpress-seo' ), 'robots.txt' ) ); + $this->set_filter_value( 'server_error', __( 'Server Error', 'wordpress-seo' ), __( 'Request timed out or site is blocking Google.', 'wordpress-seo' ) ); + $this->set_filter_value( 'soft_404', __( 'Soft 404', 'wordpress-seo' ), __( "The target URL doesn't exist, but your server is not returning a 404 (file not found) error.", 'wordpress-seo' ) ); + } + + /** + * Add new filter value to the filter_values + * + * @param string $key Filter key. + * @param string $value Filter value. + * @param string $description Optional description string. + */ + private function set_filter_value( $key, $value, $description = '' ) { + $this->filter_values[ $key ] = array( + 'value' => $value, + 'description' => $description, + ); + } + + /** + * Creates a filter link + * + * @param string $category Issue type. + * @param integer $count Count for the type. + * + * @return string + */ + private function create_view_link( $category, $count ) { + $href = add_query_arg( array( 'category' => $category, 'paged' => 1 ) ); + + $class = 'gsc_category'; + + if ( $this->category === $category ) { + $class .= ' current'; + } + + $title = ''; + if ( $this->filter_values[ $category ]['description'] !== '' ) { + $title = " title='" . esc_attr( $this->filter_values[ $category ]['description'] ) . "'"; + } + + return sprintf( + '%4$s (%6$s)', + esc_attr( $href ), + $class, + $title, + $this->filter_values[ $category ]['value'], + $category, + $count + ); + } + + /** + * Parsing the category counts. When there are 0 issues for a specific category, just remove that one from the array + * + * @param array $category_counts Set of counts for categories. + * + * @return mixed + */ + private function parse_counts( $category_counts ) { + foreach ( $category_counts as $category_name => $category ) { + if ( $category['count'] === '0' ) { + unset( $category_counts[ $category_name ] ); + } + } + + return $category_counts; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-count.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-count.php index 1a48894e..ccf9380e 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-count.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-count.php @@ -1,3 +1,227 @@ +<<<<<<< .mine +service = $service; + } + + /** + * Getting the counts for given platform and return them as an array + * + * @param string $platform Platform (desktop, mobile, feature phone). + * + * @return array + */ + public function get_platform_counts( $platform ) { + $counts = $this->get_counts(); + if ( array_key_exists( $platform, $counts ) ) { + return $counts[ $platform ]; + } + + return array(); + } + + /** + * Return the fetched issues + * + * @return array + */ + public function get_issues() { + return $this->issues; + } + + /** + * Listing the issues an gives them back as fetched issues + * + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue category. + */ + public function list_issues( $platform, $category ) { + $counts = $this->get_counts(); + + if ( array_key_exists( $platform, $counts ) ) { + $counts[ $platform ] = $this->list_category_issues( $counts[ $platform ], $platform, $category ); + + // Write the new counts value. + $this->set_counts( $counts ); + } + } + + /** + * Getting the counts for given platform and category. + * + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue type. + * + * @return integer + */ + public function get_issue_count( $platform, $category ) { + $counts = $this->get_counts(); + + if ( ! empty( $counts[ $platform ][ $category ]['count'] ) ) { + return $counts[ $platform ][ $category ]['count']; + } + + return 0; + } + + /** + * Update the count of the issues + * + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue type. + * @param integer $new_count Updated count. + */ + public function update_issue_count( $platform, $category, $new_count ) { + $counts = $this->get_counts(); + + if ( ! empty( $counts[ $platform ][ $category ] ) && is_array( $counts[ $platform ][ $category ] ) ) { + $counts[ $platform ][ $category ]['count'] = $new_count; + } + + $this->set_counts( $counts ); + } + + /** + * Fetching the counts from the GSC API + */ + public function fetch_counts() { + if ( WPSEO_GSC_Settings::get_profile() && $this->get_last_fetch() <= strtotime( '-12 hours' ) ) { + // Remove the timestamp. + $this->remove_last_fetch(); + + // Getting the counts and parse them. + $counts = $this->parse_counts( $this->service->get_crawl_issue_counts() ); + + // Fetching the counts by setting an option. + $this->set_counts( $counts ); + + // Saving the current timestamp. + $this->save_last_fetch(); + } + } + + /** + * Parsing the received counts from the API and map the keys to plugin friendly values + * + * @param array $fetched_counts Set of retrieved counts. + * + * @return array + */ + private function parse_counts( array $fetched_counts ) { + $counts = array(); + foreach ( $fetched_counts as $platform_name => $categories ) { + $new_platform = WPSEO_GSC_Mapper::platform_from_api( $platform_name ); + + foreach ( $categories as $category_name => $category ) { + $new_category = WPSEO_GSC_Mapper::category_from_api( $category_name ); + $counts[ $new_platform ][ $new_category ] = $category; + } + } + + return $counts; + } + + /** + * Listing the issues for current category. + * + * @param array $counts Set of counts. + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue type. + * + * @return array + */ + private function list_category_issues( array $counts, $platform, $category ) { + // When the issues have to be fetched. + if ( array_key_exists( $category, $counts ) && $counts[ $category ]['count'] > 0 && $counts[ $category ]['last_fetch'] <= strtotime( '-12 hours' ) ) { + if ( $issues = $this->service->fetch_category_issues( WPSEO_GSC_Mapper::platform_to_api( $platform ), WPSEO_GSC_Mapper::category_to_api( $category ) ) ) { + $this->issues = $issues; + } + + // Be sure the total count is correct. + $counts[ $category ]['count'] = count( $this->issues ); + + // Set last fetch. + $counts[ $category ]['last_fetch'] = time(); + } + + return $counts; + } + + /** + * Getting the counts from the options + * + * @return array + */ + private function get_counts() { + return get_option( self::OPTION_CI_COUNTS, array() ); + } + + /** + * Fetching the counts from the service and store them in an option + * + * @param array $counts Set of counts. + */ + private function set_counts( array $counts ) { + update_option( self::OPTION_CI_COUNTS, $counts ); + } + + /** + * Store the timestamp of when crawl errors were saved the last time. + */ + private function save_last_fetch() { + add_option( self::OPTION_CI_LAST_FETCH, time(), '', 'no' ); + } + + /** + * Remove the last checked option + */ + private function remove_last_fetch() { + delete_option( self::OPTION_CI_LAST_FETCH ); + } + + /** + * Get the timestamp of when the crawl errors were last saved + * + * @return int + */ + private function get_last_fetch() { + return get_option( self::OPTION_CI_LAST_FETCH, 0 ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issue.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issue.php index 0a396bd8..1b73df10 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issue.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issue.php @@ -1,3 +1,92 @@ +<<<<<<< .mine +url = $url; + $this->first_detected = $first_detected; + $this->last_crawled = $last_crawled; + $this->response_code = $response_code; + } + + /** + * Put the class properties in array + * + * @return array + */ + public function to_array() { + return array( + 'url' => $this->url, + 'first_detected' => $this->to_date_format( $this->first_detected ), + 'first_detected_raw' => $this->to_timestamp( $this->first_detected ), + 'last_crawled' => $this->to_date_format( $this->last_crawled ), + 'last_crawled_raw' => $this->to_timestamp( $this->last_crawled ), + 'response_code' => $this->response_code, + ); + } + + /** + * Converting the date to a date format + * + * @todo Should use WP locale functionality, PHP one is unreliable in WP environment. R. + * + * @param DateTime $date_to_convert Date instance. + * @param string $format Format string. + * + * @return string + */ + private function to_date_format( DateTime $date_to_convert, $format = 'Y-m-d H:i:s' ) { + return (string) strftime( '%x', strtotime( $date_to_convert->format( $format ) ) ); + } + + /** + * Converting the date to a timestamp + * + * @param DateTime $date_to_convert Date object instance. + * + * @return string + */ + private function to_timestamp( DateTime $date_to_convert ) { + return $date_to_convert->format( 'U' ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issues.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issues.php index 0516bd89..4f4ba8a6 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issues.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-issues.php @@ -1,3 +1,181 @@ +<<<<<<< .mine +option_name = strtolower( 'wpseo-gsc-issues-' . $platform . '-' . $category ); + $this->issues = $this->get_issues(); + + if ( ! empty( $fetched_issues ) && is_array( $fetched_issues ) ) { + $this->save_fetched_issues( $fetched_issues ); + } + } + /** + * Getting the issues from the options. + * + * @return array + */ + public function get_issues() { + return get_option( $this->option_name, array() ); + } + + /** + * Deleting the issue from the issues + * + * @param string $url URL to delete issues for. + * + * @return bool + */ + public function delete_issue( $url ) { + $target_issue = $this->get_issue_by_url( $url ); + if ( $target_issue !== false ) { + unset( $this->issues[ $target_issue ] ); + + $this->save_issues( $this->issues ); + + return true; + } + + return false; + } + + /** + * Fetching the issues for current category and compare them with the already existing issues. + * + * @param array $fetched_issues Set of retrieved issues. + */ + private function save_fetched_issues( array $fetched_issues ) { + $this->set_current_issues(); + + $crawl_issues = $this->get_issues(); + + // Walk through the issues to do the comparison. + foreach ( $fetched_issues as $issue ) { + $this->issue_compare( $crawl_issues, $issue ); + } + + $this->save_issues( $crawl_issues ); + + // Refresh the value of $this->issues. + $this->issues = $this->get_issues(); + } + + /** + * Comparing the issue with the list of current existing issues + * + * @param array $crawl_issues Set of issues by reference. + * @param stdClass $issue Issue object to check against the list. + */ + private function issue_compare( &$crawl_issues, $issue ) { + $issue->pageUrl = WPSEO_Utils::format_url( (string) $issue->pageUrl ); + + if ( ! in_array( $issue->pageUrl, $this->current_issues ) ) { + array_push( + $crawl_issues, + $this->get_issue( $this->create_issue( $issue ) ) + ); + } + } + + /** + * The fetched issue from the API will be parsed as an WPSEO_Crawl_Issue object. After initializing the issue as an + * object, the object will be returned + * + * @param stdClass $issue Issue data object. + * + * @return WPSEO_GSC_Issue + */ + private function create_issue( $issue ) { + return new WPSEO_GSC_Issue( + $issue->pageUrl, + new DateTime( (string) $issue->first_detected ), + new DateTime( (string) $issue->last_crawled ), + (string) ( ! empty( $issue->responseCode ) ) ? $issue->responseCode : null + ); + } + + /** + * Returns the crawl issue as an array. + * + * @param WPSEO_GSC_Issue $crawl_issue Issue object instance. + * + * @return array() + */ + private function get_issue( WPSEO_GSC_Issue $crawl_issue ) { + return $crawl_issue->to_array(); + } + + /** + * Saving the issues to the options. The target option is base on current platform and category. + * + * @param array $issues Set of issues. + */ + private function save_issues( array $issues ) { + update_option( $this->option_name, $issues, false ); + } + + /** + * Getting the issues from the options and get only the URL out of it. This is because there will be a comparison + * with the issues from the API. + */ + private function set_current_issues() { + if ( ! empty( $this->issues ) ) { + $this->current_issues = wp_list_pluck( $this->issues, 'url' ); + } + } + + /** + * Search in the issues for the given $url + * + * @param string $url Issue URL to search for. + * + * @return int|string + */ + private function get_issue_by_url( $url ) { + foreach ( $this->issues as $key => $issue ) { + if ( $url === $issue['url'] ) { + return $key; + } + } + + return false; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-mapper.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-mapper.php index 95c62758..ed5636a6 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-mapper.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-mapper.php @@ -1,3 +1,118 @@ +<<<<<<< .mine + 'web', + 'mobile' => 'mobile', + 'smartphone_only' => 'smartphoneOnly', + 'settings' => 'settings', // This one is basicly not a platform, but a tab. + ); + + /** + * The categories which can be mapped + * + * @var array + */ + private static $categories = array( + 'access_denied' => 'authPermissions', + 'faulty_redirects' => 'manyToOneRedirect', + 'not_followed' => 'notFollowed', + 'not_found' => 'notFound', + 'other' => 'other', + 'roboted' => 'roboted', + 'server_error' => 'serverError', + 'soft_404' => 'soft404', + ); + + /** + * If there is no platform, just get the first key out of the array and redirect to it. + * + * @param string $platform Platform (desktop, mobile, feature phone). + * + * @return mixed + */ + public static function get_current_platform( $platform ) { + if ( $current_platform = filter_input( INPUT_GET, $platform ) ) { + return $current_platform; + } + + wp_redirect( add_query_arg( $platform, key( self::$platforms ) ) ); + exit; + } + + /** + * Mapping the platform + * + * @param string $platform Platform (desktop, mobile, feature phone). + * + * @return mixed + */ + public static function platform_to_api( $platform ) { + if ( ! empty( $platform ) && array_key_exists( $platform, self::$platforms ) ) { + return self::$platforms[ $platform ]; + } + } + + /** + * Mapping the given platform by value and return its key + * + * @param string $platform Platform (desktop, mobile, feature phone). + * + * @return string + */ + public static function platform_from_api( $platform ) { + if ( ! empty( $platform ) && $platform = array_search( $platform, self::$platforms ) ) { + return $platform; + } + + return $platform; + } + + /** + * Mapping the given category by searching for its key. + * + * @param string $category Issue type. + * + * @return mixed + */ + public static function category_to_api( $category ) { + if ( ! empty( $category ) && array_key_exists( $category, self::$categories ) ) { + return self::$categories[ $category ]; + } + + return $category; + } + + /** + * Mapping the given category by value and return its key + * + * @param string $category Issue type. + * + * @return string + */ + public static function category_from_api( $category ) { + if ( ! empty( $category ) && $category = array_search( $category, self::$categories ) ) { + return $category; + } + + return $category; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-marker.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-marker.php index 82e66cfb..f7fbda91 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-marker.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-marker.php @@ -1,3 +1,148 @@ +<<<<<<< .mine +url = $url; + $this->result = $this->get_result(); + } + + /** + * Getting the response for the AJAX request + * @return string + */ + public function get_response() { + return $this->result; + } + + /** + * Setting the result, this method will check if current + * + * @return string + */ + private function get_result() { + if ( $this->can_be_marked_as_fixed() ) { + $service = new WPSEO_GSC_Service( WPSEO_GSC_Settings::get_profile() ); + + if ( $this->set_crawl_issues() && $this->send_mark_as_fixed( $service ) && $this->delete_crawl_issue() ) { + $this->update_issue_count( $service ); + + return 'true'; + } + } + + return 'false'; + } + + /** + * Check if request is valid by verifying the posted nonce and return the URL if this one is set + * + * @return bool|string + */ + private function can_be_marked_as_fixed() { + if ( $this->url !== '' ) { + return $this->url; + } + + return false; + } + + /** + * Storing the data belonging to the current issue, this data is needed in the 'mark as fixed' flow + * + * @return bool + */ + private function set_crawl_issues() { + $this->platform = filter_input( INPUT_POST, 'platform' ); + $this->category = filter_input( INPUT_POST, 'category' ); + if ( $this->platform && $this->category ) { + $this->crawl_issues = new WPSEO_GSC_Issues( $this->platform, $this->category ); + + return true; + } + + return false; + } + + /** + * Sending a request to the Google Search Console API to let them know we marked an issue as fixed. + * + * @param WPSEO_GSC_Service $service Service object instance. + * + * @return bool + */ + private function send_mark_as_fixed( WPSEO_GSC_Service $service ) { + return $service->mark_as_fixed( $this->url, $this->platform, $this->category ); + } + + /** + * Delete the crawl issue from the database + * + * @return bool + */ + private function delete_crawl_issue() { + return $this->crawl_issues->delete_issue( $this->url ); + } + + /** + * Getting the counts for current platform - category combination and update the score of it. + * + * @param WPSEO_GSC_Service $service Service object instance. + */ + private function update_issue_count( WPSEO_GSC_Service $service ) { + $counts = new WPSEO_GSC_Count( $service ); + + // Get the issues. + $total_issues = $counts->get_issue_count( $this->platform, $this->category ); + + // Lower the current count with 1. + $total_issues = ( $total_issues - 1 ); + + // And update the count. + $counts->update_issue_count( $this->platform, $this->category, $total_issues ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-platform-tabs.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-platform-tabs.php index 7ca9ce47..7078bc8c 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-platform-tabs.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-platform-tabs.php @@ -1,3 +1,100 @@ +<<<<<<< .mine +platform_tabs(); + } + + /** + * Getting the current_tab + * + * @return string + */ + public function current_tab() { + return $this->current_tab; + } + + /** + * Loops through the array with all the platforms and convert it into an array + * + * @return string + */ + private function platform_tabs() { + $tabs = array( 'settings' => __( 'Settings', 'wordpress-seo' ) ); + + $platforms = array( + 'web' => __( 'Desktop', 'wordpress-seo' ), + 'smartphone_only' => __( 'Smartphone', 'wordpress-seo' ), + 'mobile' => __( 'Feature phone', 'wordpress-seo' ), + ); + + if ( WPSEO_GSC_Settings::get_profile() !== '' ) { + $tabs = array_merge( $platforms, $tabs ); + } + + $admin_link = admin_url( 'admin.php?page=wpseo_search_console&tab=' ); + + $this->set_current_tab( $tabs ); + + $return = ''; + + foreach ( $tabs as $platform_target => $platform_value ) { + $return .= $this->platform_tab( $platform_target, $platform_value, $admin_link ); + } + + return $return; + } + + /** + * Setting the current tab + * + * @param array $platforms Set of platforms (desktop, mobile, feature phone). + */ + private function set_current_tab( array $platforms ) { + $this->current_tab = key( $platforms ); + if ( $current_platform = filter_input( INPUT_GET, 'tab' ) ) { + $this->current_tab = $current_platform; + } + } + + /** + * Parses the tab + * + * @param string $platform_target Platform (desktop, mobile, feature phone). + * @param string $platform_value Link anchor. + * @param string $admin_link Link URL admin base. + * + * @return string + */ + private function platform_tab( $platform_target, $platform_value, $admin_link ) { + $active = ''; + if ( $this->current_tab === $platform_target ) { + $active = ' nav-tab-active'; + } + + return '' . $platform_value . ''; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-service.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-service.php index 4e60a5e5..923fd096 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-service.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-service.php @@ -1,3 +1,198 @@ +<<<<<<< .mine +profile = $profile; + + $this->set_client(); + } + + /** + * Returns the client + * + * @return Yoast_Api_Google_Client + */ + public function get_client() { + return $this->client; + } + + /** + * Removes the option and calls the clients clear_data method to clear that one as well + */ + public function clear_data() { + // Clear client data. + $this->client->clear_data(); + } + + /** + * Get all sites that are registered in the GSC panel + * + * @return array + */ + public function get_sites() { + $sites = array(); + + $response_json = $this->client->do_request( 'sites', true ); + + // Do list sites request. + if ( ! empty( $response_json->siteEntry ) ) { + foreach ( $response_json->siteEntry as $entry ) { + $sites[ str_ireplace( 'sites/', '', (string) $entry->siteUrl ) ] = (string) $entry->siteUrl; + } + + // Sorting the retrieved sites. + asort( $sites ); + } + + return $sites; + } + + /** + * Get crawl issues + * + * @return array + */ + public function get_crawl_issue_counts() { + // Setup crawl error list. + $crawl_error_counts = $this->get_crawl_error_counts( $this->profile ); + + $return = array(); + if ( ! empty( $crawl_error_counts->countPerTypes ) ) { + foreach ( $crawl_error_counts->countPerTypes as $category ) { + $return[ $category->platform ][ $category->category ] = array( + 'count' => $category->entries[0]->count, + 'last_fetch' => null, + ); + } + } + + return $return; + } + + /** + * Sending request to mark issue as fixed + * + * @param string $url Issue URL. + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue type. + * + * @return bool + */ + public function mark_as_fixed( $url, $platform, $category ) { + $response = $this->client->do_request( 'sites/' . urlencode( $this->profile ) . '/urlCrawlErrorsSamples/' . urlencode( ltrim( $url, '/' ) ) . '?category=' . WPSEO_GSC_Mapper::category_to_api( $category ) . '&platform=' . WPSEO_GSC_Mapper::platform_to_api( $platform ) . '', false, 'DELETE' ); + return ( $response->getResponseHttpCode() === 204 ); + } + + /** + * Fetching the issues from the GSC API + * + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Issue type. + * + * @return mixed + */ + public function fetch_category_issues( $platform, $category ) { + $issues = $this->client->do_request( + 'sites/' . urlencode( $this->profile ) . '/urlCrawlErrorsSamples?category=' . $category . '&platform=' . $platform, + true + ); + + if ( ! empty( $issues->urlCrawlErrorSample ) ) { + return $issues->urlCrawlErrorSample; + } + } + + /** + * Setting the GSC client + */ + private function set_client() { + try { + new Yoast_Api_Libs( '2.0' ); + } + catch ( Exception $exception ) { + if ( $exception->getMessage() === 'required_version' ) { + $this->incompatible_api_libs( + __( 'Yoast plugins share some code between them to make your site faster. As a result of that, we need all Yoast plugins to be up to date. We\'ve detected this isn\'t the case, so please update the Yoast plugins that aren\'t up to date yet.', 'wordpress-seo' ) + ); + } + } + + if ( class_exists( 'Yoast_Api_Google_Client' ) === false ) { + $this->incompatible_api_libs( + /* translators: %1$s expands to Yoast SEO, %2$s expands to Google Analytics by Yoast */ + sprintf( + __( + '%1$s detected youâre using a version of %2$s which is not compatible with %1$s. Please update %2$s to the latest version to use this feature.', + 'wordpress-seo' + ), + 'Yoast SEO', + 'Google Analytics by Yoast' + ) + ); + + wp_redirect( admin_url( 'admin.php?page=wpseo_dashboard' ) ); + exit; + } + + $this->client = new Yoast_Api_Google_Client( WPSEO_GSC_Config::$gsc, 'wpseo-gsc', 'https://www.googleapis.com/webmasters/v3/' ); + } + + /** + * Adding notice that the api libs has the wrong version + * + * @param string $notice Message string. + */ + private function incompatible_api_libs( $notice ) { + Yoast_Notification_Center::get()->add_notification( + new Yoast_Notification( $notice, array( 'type' => 'error' ) ) + ); + } + + /** + * Getting the crawl error counts + * + * @param string $profile Profile name string. + * + * @return object|bool + */ + private function get_crawl_error_counts( $profile ) { + $crawl_error_counts = $this->client->do_request( + 'sites/' . urlencode( $profile ) . '/urlCrawlErrorsCounts/query', + true + ); + + if ( ! empty( $crawl_error_counts ) ) { + return $crawl_error_counts; + } + + return false; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-settings.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-settings.php index 1471f4bb..0f0606ad 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-settings.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-settings.php @@ -1,3 +1,108 @@ +<<<<<<< .mine +clear_data(); + } + + /** + * Reloading all the issues + */ + public static function reload_issues() { + // Remove issue and issue counts. + self::remove(); + } + + /** + * When authorization is successful return true, otherwise false + * + * @param string $authorization_code Code to validate. + * @param Yoast_Api_Google_Client $client Client object instance. + * + * @return bool + */ + public static function validate_authorization( $authorization_code, Yoast_Api_Google_Client $client ) { + return ( $authorization_code !== '' && $client->authenticate_client( $authorization_code ) ); + } + + /** + * Get the GSC profile + * + * @return string + */ + public static function get_profile() { + // Get option. + $option = get_option( WPSEO_GSC::OPTION_WPSEO_GSC, array( 'profile' => '' ) ); + + // Set the profile. + $profile = ''; + if ( ! empty( $option['profile'] ) ) { + $profile = $option['profile']; + } + + // Return the profile. + return trim( $profile, '/' ); + } + + /** + * Removes the issue counts and all the issues from the options + */ + private static function remove() { + // Remove the issue counts from the options. + self::remove_issue_counts(); + + // Removing all issues from the database. + self::remove_issues(); + } + + /** + * Remove the issue counts + */ + private static function remove_issue_counts() { + // Remove the options which are holding the counts. + delete_option( WPSEO_GSC_Count::OPTION_CI_COUNTS ); + delete_option( WPSEO_GSC_Count::OPTION_CI_LAST_FETCH ); + } + + /** + * Delete the issues and their meta data from the database + */ + private static function remove_issues() { + global $wpdb; + + // Remove local crawl issues by running a delete query. + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wpseo-gsc-issues-%'" ); + } + + /** + * Removes the options for GSC + */ + private static function remove_gsc_option() { + delete_option( WPSEO_GSC::OPTION_WPSEO_GSC ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-table.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-table.php index 668a95de..1919d91c 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-table.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc-table.php @@ -1,3 +1,390 @@ +<<<<<<< .mine + 350, + 'no_premium' => 125, + 'already_exists' => 150, + ); + + /** + * Search Console table class constructor (subclasses list table). + * + * @param string $platform Platform (desktop, mobile, feature phone). + * @param string $category Type of the issues. + * @param array $items Set of the issues to display. + */ + public function __construct( $platform, $category, array $items ) { + parent::__construct(); + + // Adding the thickbox. + add_thickbox(); + + // Set search string. + if ( ( $search_string = filter_input( INPUT_GET, 's' ) ) != '' ) { + $this->search_string = $search_string; + } + + $this->current_view = $category; + + // Set the crawl issue source. + $this->show_fields( $platform ); + + $this->items = $items; + } + + /** + * Getting the screen id from this table + * + * @return string + */ + public function get_screen_id() { + return $this->screen->id; + } + + /** + * Setup the table variables, fetch the items from the database, search, sort and format the items. + */ + public function prepare_items() { + // Get variables needed for pagination. + $this->per_page = $this->get_items_per_page( 'errors_per_page', $this->per_page ); + $this->current_page = intval( ( $paged = filter_input( INPUT_GET, 'paged' ) ) ? $paged : 1 ); + + $this->setup_columns(); + $this->views(); + $this->parse_items(); + } + + /** + * Set the table columns + * + * @return array + */ + public function get_columns() { + $columns = array( + 'cb' => '', + 'url' => __( 'URL', 'wordpress-seo' ), + 'last_crawled' => __( 'Last crawled', 'wordpress-seo' ), + 'first_detected' => __( 'First detected', 'wordpress-seo' ), + 'response_code' => __( 'Response code', 'wordpress-seo' ), + ); + + return $columns; + } + + /** + * Return the columns that are sortable + * + * @return array + */ + protected function get_sortable_columns() { + $sortable_columns = array( + 'url' => array( 'url', false ), + 'last_crawled' => array( 'last_crawled', false ), + 'first_detected' => array( 'first_detected', false ), + 'response_code' => array( 'response_code', false ), + ); + + return $sortable_columns; + } + + /** + * Return available bulk actions + * + * @return array + */ + protected function get_bulk_actions() { + return array( + 'mark_as_fixed' => __( 'Mark as fixed', 'wordpress-seo' ), + ); + } + + /** + * Default method to display a column + * + * @param array $item Data array. + * @param string $column_name Column name key. + * + * @return mixed + */ + protected function column_default( $item, $column_name ) { + return $item[ $column_name ]; + } + + /** + * Checkbox column + * + * @param array $item Item data array. + * + * @return string + */ + protected function column_cb( $item ) { + return sprintf( + '', $item['url'] + ); + } + + /** + * Formatting the output of the column last crawled into a dateformat + * + * @param array $item Item data array. + * + * @return string + */ + protected function column_last_crawled( $item ) { + return date_i18n( get_option( 'date_format' ), strtotime( $item['last_crawled'] ) ); + } + + /** + * Formatting the output of the column first detected into a dateformat + * + * @param array $item Item data array. + * + * @return string + */ + protected function column_first_detected( $item ) { + return date_i18n( get_option( 'date_format' ), strtotime( $item['first_detected'] ) ); + } + + /** + * URL column + * + * @param array $item Item data array. + * + * @return string + */ + protected function column_url( $item ) { + $actions = array(); + + if ( $this->can_create_redirect() ) { + /** + * Modal box + */ + $modal_height = $this->modal_box( $item['url'] ); + + $actions['create_redirect'] = '' . __( 'Create redirect', 'wordpress-seo' ) . ''; + } + + $actions['view'] = '' . __( 'View', 'wordpress-seo' ) . ''; + $actions['markasfixed'] = '' . __( 'Mark as fixed', 'wordpress-seo' ) . ''; + + return sprintf( + '%1$s %2$s', + $item['url'], + $this->row_actions( $actions ) + ); + } + + /** + * Running the setup of the columns + */ + private function setup_columns() { + $this->_column_headers = array( $this->get_columns(), array(), $this->get_sortable_columns() ); + } + + /** + * Check if the current category allow creating redirects + * @return bool + */ + private function can_create_redirect() { + return in_array( $this->current_view, array( 'soft_404', 'not_found', 'access_denied' ) ); + } + + /** + * Setting the table navigation + * + * @param int $total_items Total number of items. + * @param int $posts_per_page Number of items per page. + */ + private function set_pagination( $total_items, $posts_per_page ) { + $this->set_pagination_args( array( + 'total_items' => $total_items, + 'total_pages' => ceil( ( $total_items / $posts_per_page ) ), + 'per_page' => $posts_per_page, + ) ); + } + + /** + * Setting the items + */ + private function parse_items() { + if ( is_array( $this->items ) && count( $this->items ) > 0 ) { + if ( ! empty( $this->search_string ) ) { + $this->do_search(); + } + + $this->set_pagination( count( $this->items ), $this->per_page ); + + $this->sort_items(); + $this->paginate_items(); + } + } + + /** + * Search through the items + */ + private function do_search() { + $results = array(); + + foreach ( $this->items as $item ) { + foreach ( $item as $value ) { + if ( stristr( $value, $this->search_string ) !== false ) { + $results[] = $item; + continue; + } + } + } + + $this->items = $results; + } + + /** + * Running the pagination + */ + private function paginate_items() { + // Setting the starting point. If starting point is below 1, overwrite it with value 0, otherwise it will be sliced of at the back. + $slice_start = ( $this->current_page - 1 ); + if ( $slice_start < 0 ) { + $slice_start = 0; + } + + // Apply 'pagination'. + $this->items = array_slice( $this->items, ( $slice_start * $this->per_page ), $this->per_page ); + } + + /** + * Sort the items by callback + */ + private function sort_items() { + // Sort the results. + usort( $this->items, array( $this, 'do_reorder' ) ); + } + + /** + * Doing the sorting of the issues + * + * @param array $a First data set for comparison. + * @param array $b Second data set for comparison. + * + * @return int + */ + private function do_reorder( $a, $b ) { + // If no sort, default to title. + $orderby = ( $orderby = filter_input( INPUT_GET, 'orderby' ) ) ? $orderby : 'url'; + + // If no order, default to asc. + $order = ( $order = filter_input( INPUT_GET, 'order' ) ) ? $order : 'asc'; + + // When there is a raw field of it, sort by this field. + if ( array_key_exists( $orderby . '_raw', $a ) && array_key_exists( $orderby . '_raw', $b ) ) { + $orderby = $orderby . '_raw'; + } + + // Determine sort order. + $result = strcmp( $a[ $orderby ], $b[ $orderby ] ); + + // Send final sort direction to usort. + return ( $order === 'asc' ) ? $result : ( - $result ); + } + + /** + * Modal box + * + * @param string $url URL string. + * + * @return string + */ + private function modal_box( $url ) { + $current_redirect = false; + $view_type = $this->modal_box_type( $url, $current_redirect ); + + require WPSEO_PATH . '/admin/google_search_console/views/gsc-create-redirect.php'; + + return $view_type; + } + + /** + * Determine which model box type should be rendered + * + * @param string $url URL string. + * @param string $current_redirect Current redirect by reference. + * + * @return string + */ + private function modal_box_type( $url, &$current_redirect ) { + if ( defined( 'WPSEO_PREMIUM_FILE' ) && class_exists( 'WPSEO_URL_Redirect_Manager' ) ) { + static $redirect_manager; + + if ( ! $redirect_manager ) { + $redirect_manager = new WPSEO_URL_Redirect_Manager(); + } + + if ( $current_redirect = $redirect_manager->search_url( $url ) ) { + return 'already_exists'; + } + + return 'create'; + } + + return 'no_premium'; + } + + + /** + * Showing the hidden fields used by the AJAX requests + * + * @param string $platform Platform (desktop, mobile, feature phone). + */ + private function show_fields( $platform ) { + echo ""; + echo ""; + echo ""; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc.php index e906b4ae..b10f6468 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/class-gsc.php @@ -1,3 +1,293 @@ +<<<<<<< .mine +set_hooks(); + $this->set_dependencies(); + $this->request_handler(); + } + elseif ( WPSEO_Utils::is_yoast_seo_page() && current_user_can( 'manage_options' ) && WPSEO_GSC_Settings::get_profile() === '' && get_user_option( 'wpseo_dismissed_gsc_notice', get_current_user_id() ) !== '1' ) { + add_action( 'admin_init', array( $this, 'register_gsc_notification' ) ); + } + + add_action( 'admin_init', array( $this, 'register_settings' ) ); + } + + /** + * If the Google Search Console has no credentials, add a notification for the user to give him a heads up. This message is dismissable. + */ + public function register_gsc_notification() { + Yoast_Notification_Center::get()->add_notification( + new Yoast_Notification( + sprintf( + __( 'Don\'t miss your crawl errors: %1$sconnect with Google Search Console here%2$s.', 'wordpress-seo' ), + '', + '' + ), + array( + 'type' => 'updated yoast-dismissible', + 'id' => 'wpseo-dismiss-gsc', + 'nonce' => wp_create_nonce( 'dismiss-gsc-notice' ), + ) + ) + ); + } + + /** + * Be sure the settings will be registered, so data can be stored + */ + public function register_settings() { + register_setting( 'yoast_wpseo_gsc_options', self::OPTION_WPSEO_GSC ); + } + + /** + * Function that outputs the redirect page + */ + public function display() { + require_once WPSEO_PATH . '/admin/google_search_console/views/gsc-display.php'; + } + + /** + * Display the table + */ + public function display_table() { + // The list table. + $list_table = new WPSEO_GSC_Table( $this->platform, $this->category, $this->issue_fetch->get_issues() ); + + // Adding filter to display the category filters. + add_filter( 'views_' . $list_table->get_screen_id(), array( $this->category_filter, 'as_array' ) ); + + // Preparing and displaying the table. + $list_table->prepare_items(); + $list_table->search_box( __( 'Search', 'wordpress-seo' ), 'wpseo-crawl-issues-search' ); + $list_table->display(); + } + + /** + * Load the admin redirects scripts + */ + public function page_scripts() { + wp_enqueue_script( 'wp-seo-admin-gsc', plugin_dir_url( WPSEO_FILE ) . 'js/wp-seo-admin-gsc-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', array( 'jquery' ), WPSEO_VERSION ); + add_screen_option( 'per_page', array( + 'label' => __( 'Crawl errors per page', 'wordpress-seo' ), + 'default' => 50, + 'option' => 'errors_per_page', + ) ); + + wp_enqueue_style( 'jquery-qtip.js', plugins_url( 'css/jquery.qtip' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'metabox', plugins_url( 'css/metabox-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_script( 'jquery-qtip', plugins_url( 'js/jquery.qtip.min.js', WPSEO_FILE ), array( 'jquery' ), WPSEO_VERSION, true ); + } + + /** + * Set the screen options + * + * @param string $status Status string. + * @param string $option Option key. + * @param string $value Value to return. + * + * @return mixed + */ + public function set_screen_option( $status, $option, $value ) { + if ( 'errors_per_page' == $option ) { + return $value; + } + } + + /** + * Setting the hooks to be load on page request + */ + private function set_hooks() { + add_action( 'admin_enqueue_scripts', array( $this, 'page_scripts' ) ); + add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 11, 3 ); + } + + /** + * Handles the POST and GET requests + */ + private function request_handler() { + + // List the table search post to a get. + $this->list_table_search_post_to_get(); + + // Catch the authorization code POST. + $this->catch_authentication_post(); + + // Is there a reset post than we will remove the posts and data. + if ( filter_input( INPUT_GET, 'gsc_reset' ) ) { + // Clear the google data. + WPSEO_GSC_Settings::clear_data( $this->service ); + + // Adding notification to the notification center. + /* Translators: %1$s: expands to Google Search Console. */ + $this->add_notification( sprintf( __( 'The %1$s data has been removed. You will have to reauthenticate if you want to retrieve the data again.', 'wordpress-seo' ), 'Google Search Console' ), 'updated' ); + + // Directly output the notifications. + wp_redirect( remove_query_arg( 'gsc_reset' ) ); + exit; + } + + // Reloads al the issues. + if ( wp_verify_nonce( filter_input( INPUT_POST, 'reload-crawl-issues-nonce' ), 'reload-crawl-issues' ) && filter_input( INPUT_POST, 'reload-crawl-issues' ) ) { + // Reloading all the issues. + WPSEO_GSC_Settings::reload_issues(); + + // Adding the notification. + $this->add_notification( __( 'The issues have been successfully reloaded!', 'wordpress-seo' ), 'updated' ); + + // Directly output the notifications. + Yoast_Notification_Center::get()->display_notifications(); + } + + // Catch bulk action request. + new WPSEO_GSC_Bulk_Action(); + } + + /** + * Catch the redirects search post and redirect it to a search get + */ + private function list_table_search_post_to_get() { + if ( ( $search_string = filter_input( INPUT_POST, 's' ) ) !== null ) { + $url = ( $search_string !== '' ) ? add_query_arg( 's', $search_string ) : remove_query_arg( 's' ); + + // Do the redirect. + wp_redirect( $url ); + exit; + } + } + + /** + * Catch the authentication post + */ + private function catch_authentication_post() { + $gsc_values = filter_input( INPUT_POST, 'gsc', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ); + // Catch the authorization code POST. + if ( ! empty( $gsc_values['authorization_code'] ) && wp_verify_nonce( $gsc_values['gsc_nonce'], 'wpseo-gsc_nonce' ) ) { + if ( ! WPSEO_GSC_Settings::validate_authorization( trim( $gsc_values['authorization_code'] ), $this->service->get_client() ) ) { + $this->add_notification( __( 'Incorrect Google Authorization Code.', 'wordpress-seo' ), 'error' ); + } + + // Redirect user to prevent a post resubmission which causes an oauth error. + wp_redirect( admin_url( 'admin.php' ) . '?page=' . esc_attr( filter_input( INPUT_GET, 'page' ) ) . '&tab=settings' ); + exit; + } + } + + /** + * Adding notification to the yoast notification center + * + * @param string $message Message string. + * @param string $type Message type. + */ + private function add_notification( $message, $type ) { + Yoast_Notification_Center::get()->add_notification( + new Yoast_Notification( $message, array( 'type' => $type ) ) + ); + } + + /** + * Setting dependencies which will be used one this page + */ + private function set_dependencies() { + // Setting the service object. + $this->service = new WPSEO_GSC_Service( WPSEO_GSC_Settings::get_profile() ); + + // Setting the platform. + $this->platform = WPSEO_GSC_Mapper::get_current_platform( 'tab' ); + + // Loading the issue counter. + $issue_count = new WPSEO_GSC_Count( $this->service ); + $issue_count->fetch_counts(); + + // Loading the category filters. + $this->category_filter = new WPSEO_GSC_Category_Filters( $issue_count->get_platform_counts( $this->platform ) ); + + // Setting the current category. + $this->category = $this->category_filter->get_category(); + + // Listing the issues. + $issue_count->list_issues( $this->platform, $this->category ); + + // Fetching the issues. + $this->issue_fetch = new WPSEO_GSC_Issues( $this->platform, $this->category, $issue_count->get_issues() ); + } + + /** + * Setting the tab help on top of the screen + */ + public function set_help() { + $screen = get_current_screen(); + + $screen->add_help_tab( + array( + 'id' => 'basic-help', + 'title' => __( 'Issue categories', 'wordpress-seo' ), + 'content' => '
' .__( 'Desktop', 'wordpress-seo' ) . '
' . __( 'Errors that occurred when your site was crawled by Googlebot.', 'wordpress-seo' ) . '
' + . '
' .__( 'Smartphone', 'wordpress-seo' ) . '
' . __( 'Errors that occurred only when your site was crawled by Googlebot-Mobile (errors didn\'t appear for desktop).', 'wordpress-seo' ) . '
' + . '
' .__( 'Feature phone', 'wordpress-seo' ) . '
' . __( 'Errors that only occurred when your site was crawled by Googlebot for feature phones (errors didn\'t appear for desktop).', 'wordpress-seo' ) . '
', + ) + ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/views/gsc-create-redirect.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/views/gsc-create-redirect.php index ff710760..c5992042 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/views/gsc-create-redirect.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/google_search_console/views/gsc-create-redirect.php @@ -1,3 +1,80 @@ +<<<<<<< .mine + +
+
+
+ ', __( 'Redirect this broken URL and fix the error', 'wordpress-seo' ), ''; + ?> +
+ + +
+
+ + +
+
+ + +
+
+
+ ' onclick='wpseo_gsc_post_redirect( jQuery( this ) );' /> +
+ ', __( 'Error: a redirect for this URL already exists', 'wordpress-seo' ), ''; + echo '
'; + + /* Translators: %1$s: expands to the current url and %2$s expands to url the redirects points to. */ + echo sprintf( + __( 'You do not have to create a redirect for URL %1$s because a redirect already exists. The existing redirect points to %2$s. If this is fine you can mark this issue as fixed. If not, please go to the redirects page and change the target URL.', 'wordpress-seo' ), + $url, + $current_redirect + ); + echo '
'; + break; + + case 'no_premium' : + /* Translators: %s: expands to Yoast SEO Premium */ + echo '
', sprintf( __( 'Creating redirects is a %s feature', 'wordpress-seo' ), 'Yoast SEO Premium' ), '
'; + echo '
'; + /* Translators: %1$s: expands to 'Yoast SEO Premium', %2$s: links to Yoast SEO Premium plugin page. */ + echo sprintf( + __( 'To be able to create a redirect and fix this issue, you need %1$s. You can buy the plugin, including one year of support and updates, on %2$s.', 'wordpress-seo' ), + 'Yoast SEO Premium', + 'yoast.com' + ); + echo '
'; + break; + } + ?> +
+
+
+||||||| .r0 +=======

+>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-aioseo-hooks.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-aioseo-hooks.php new file mode 100644 index 00000000..739eccfc --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-aioseo-hooks.php @@ -0,0 +1,39 @@ + wp_create_nonce( 'wpseo-import' ) ), admin_url( 'admin.php?page=wpseo_tools&tool=import-export&import=1&importaioseo=1#top#import-seo' ) ); + echo '
', sprintf( esc_html__( 'The plugin All-In-One-SEO has been detected. Do you want to %simport its settings%s?', 'wordpress-seo' ), sprintf( '', esc_url( $url ) ), '' ), '
'; + } + + /** + * Throw a notice to inform the user that the plugin has been deactivated + * + * @since 3.0 + */ + public function show_deactivate_notice() { + echo '
', esc_html__( 'All-In-One-SEO has been deactivated', 'wordpress-seo' ), '
'; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-hooks.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-hooks.php new file mode 100644 index 00000000..8db29f0c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-hooks.php @@ -0,0 +1,90 @@ +is_active() ) { + $this->show_import_message(); + $this->show_deactivate_message(); + } + } + + /** + * Handle deactivation & import of the data data + * + * @since 3.0 + */ + public function show_import_message() { + if ( filter_input( INPUT_GET, 'tool' ) !== 'import-export' ) { + add_action( 'admin_notices', array( $this, 'show_import_settings_notice' ) ); + } + } + + /** + * Handle deactivation of the plugin + * + * @since 3.0 + */ + public function show_deactivate_message() { + if ( filter_input( INPUT_GET, $this->deactivation_listener ) === '1' ) { + // Deactivate AIO. + deactivate_plugins( $this->plugin_file ); + + // Show notice that aioseo has been deactivated. + add_action( 'admin_notices', array( $this, 'show_deactivate_notice' ) ); + + // Clean up the referrer url for later use. + if ( isset( $_SERVER['REQUEST_URI'] ) ) { + $_SERVER['REQUEST_URI'] = remove_query_arg( array( $this->deactivation_listener ), sanitize_text_field( $_SERVER['REQUEST_URI'] ) ); + } + } + } + + /** + * Check if the plugin is active. + * + * @return bool + */ + protected function is_active() { + return is_plugin_active( $this->plugin_file ); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-robots-meta-hooks.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-robots-meta-hooks.php new file mode 100644 index 00000000..90301be2 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-robots-meta-hooks.php @@ -0,0 +1,39 @@ + wp_create_nonce( 'wpseo-import' ) ), admin_url( 'admin.php?page=wpseo_tools&tool=import-export&import=1&importrobotsmeta=1#top#import-other' ) ); + echo '
', sprintf( esc_html__( 'The plugin Robots-Meta has been detected. Do you want to %simport its settings%s.', 'wordpress-seo' ), sprintf( '', esc_url( $url ) ), '' ), '
'; + } + + /** + * Throw a notice to inform the user that the plugin has been deactivated + * + * @since 3.0 + */ + public function show_deactivate_notice() { + echo '
', esc_html__( 'Robots-Meta has been deactivated', 'wordpress-seo' ), '
'; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-wpseo-hooks.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-wpseo-hooks.php new file mode 100644 index 00000000..d8e3d604 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/import/class-import-wpseo-hooks.php @@ -0,0 +1,40 @@ + wp_create_nonce( 'wpseo-import' ) ), admin_url( 'admin.php?page=wpseo_tools&tool=import-export&import=1&importwpseo=1#top#import-seo' ) ); + echo '
', sprintf( esc_html__( 'The plugin wpSEO has been detected. Do you want to %simport its settings%s?', 'wordpress-seo' ), sprintf( '', esc_url( $url ) ), '' ), '
'; + } + + /** + * Throw a notice to inform the user wpSEO has been deactivated + * + * @since 3.0 + */ + public function show_deactivate_notice() { + echo '
', esc_html__( 'wpSEO has been deactivated', 'wordpress-seo' ), '
'; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-add-keyword-tab.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-add-keyword-tab.php new file mode 100644 index 00000000..eddc3329 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-add-keyword-tab.php @@ -0,0 +1,57 @@ + +
+ +
+ + +
+ +
+
+ Yoast SEO Premium', + 'yoast.com' + ); + ?> +
+ +
+
+ + +
+
+
+ +
+
+ +
+ name = $name; + $this->content = $content; + $this->link_content = $link_content; + $this->link_class = isset( $options['link_class'] ) ? $options['link_class'] : ''; + $this->link_alt = isset( $options['link_alt'] ) ? $options['link_alt'] : ''; + $this->link_title = isset( $options['link_title'] ) ? $options['link_title'] : ''; + } + + /** + * Returns the html for the tab link. + * + * @return string + */ + public function link() { + return sprintf( + '
%5$s
', + esc_attr( $this->name ), + esc_attr( $this->link_class ), + esc_attr( $this->link_alt ), + esc_attr( $this->link_title ), + $this->link_content + ); + } + + /** + * Returns the html for the tab content. + * + * @return string + */ + public function content() { + return sprintf( + '
%2$s
', + esc_attr( $this->name ), + $this->content + ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-tab-section.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-tab-section.php new file mode 100644 index 00000000..d8c68318 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox-tab-section.php @@ -0,0 +1,126 @@ +name = $name; + foreach ( $tabs as $tab ) { + $this->add_tab( $tab ); + } + $this->link_content = $link_content; + $this->link_alt = isset( $options['link_alt'] ) ? $options['link_alt'] : ''; + $this->link_title = isset( $options['link_title'] ) ? $options['link_title'] : ''; + } + + /** + * Outputs the section link if any tab has been added. + */ + public function display_link() { + if ( $this->has_tabs() ) { + printf( + '
%4$s
', + esc_attr( $this->name ), + esc_attr( $this->link_alt ), + esc_attr( $this->link_title ), + $this->link_content + ); + } + } + + /** + * Outputs the section content if any tab has been added. + */ + public function display_content() { + if ( $this->has_tabs() ) { + $html = '
'; + $html .= '
'; + $html .= '
%2$s
%3$s'; + $html .= '
'; + + printf( $html, esc_attr( $this->name ), $this->tab_links(), $this->tab_content() ); + } + } + + /** + * Add a `WPSEO_Metabox_Tab` object to the tabs. + * + * @param WPSEO_Metabox_Tab $tab Tab to add. + */ + public function add_tab( WPSEO_Metabox_Tab $tab ) { + $this->tabs[] = $tab; + } + + /** + * Checks if any tabs have been added to the section. + * + * @return bool + */ + protected function has_tabs() { + return ! empty( $this->tabs ); + } + + /** + * Concatenates all tabs' links into one html string. + * + * @return string + */ + private function tab_links() { + $links = ''; + foreach ( $this->tabs as $tab ) { + $links .= $tab->link(); + } + return $links; + } + + /** + * Concatenates all tabs' content into one html string. + * + * @return string + */ + private function tab_content() { + $content = ''; + foreach ( $this->tabs as $tab ) { + $content .= $tab->content(); + } + return $content; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox.php new file mode 100644 index 00000000..860b65d0 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/class-metabox.php @@ -0,0 +1,1405 @@ +options = WPSEO_Options::get_all(); + + // Check if on of the social settings is checked in the options, if so, initialize the social_admin object. + if ( $this->options['opengraph'] === true || $this->options['twitter'] === true || $this->options['googleplus'] === true ) { + $this->social_admin = new WPSEO_Social_Admin( $this->options ); + } + } + + /** + * Translate text strings for use in the meta box + * + * IMPORTANT: if you want to add a new string (option) somewhere, make sure you add that array key to + * the main meta box definition array in the class WPSEO_Meta() as well!!!! + */ + public static function translate_meta_boxes() { + self::$meta_fields['general']['snippetpreview']['title'] = __( 'Snippet Editor', 'wordpress-seo' ); + self::$meta_fields['general']['snippetpreview']['help'] = sprintf( __( 'This is a rendering of what this post might look like in Google\'s search results.

Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ); + + self::$meta_fields['general']['pageanalysis']['title'] = __( 'Content Analysis', 'wordpress-seo' ); + self::$meta_fields['general']['pageanalysis']['help'] = sprintf( __( 'This is the content analysis, a collection of content checks that analyze the content of your page. Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ); + + self::$meta_fields['general']['focuskw_text_input']['title'] = __( 'Focus Keyword', 'wordpress-seo' ); + self::$meta_fields['general']['focuskw_text_input']['help'] = sprintf( __( 'Pick the main keyword or keyphrase that this post/page is about.

Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ); + + self::$meta_fields['general']['title']['title'] = __( 'SEO Title', 'wordpress-seo' ); + + self::$meta_fields['general']['metadesc']['title'] = __( 'Meta description', 'wordpress-seo' ); + + self::$meta_fields['general']['metakeywords']['title'] = __( 'Meta keywords', 'wordpress-seo' ); + self::$meta_fields['general']['metakeywords']['description'] = __( 'If you type something above it will override your %smeta keywords template%s.', 'wordpress-seo' ); + + + self::$meta_fields['advanced']['meta-robots-noindex']['title'] = __( 'Meta Robots Index', 'wordpress-seo' ); + if ( '0' == get_option( 'blog_public' ) ) { + self::$meta_fields['advanced']['meta-robots-noindex']['description'] = '
' . __( 'Warning: even though you can set the meta robots setting here, the entire site is set to noindex in the sitewide privacy settings, so these settings won\'t have an effect.', 'wordpress-seo' ) . '
'; + } + self::$meta_fields['advanced']['meta-robots-noindex']['options']['0'] = __( 'Default for post type, currently: %s', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-noindex']['options']['2'] = __( 'index', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-noindex']['options']['1'] = __( 'noindex', 'wordpress-seo' ); + + self::$meta_fields['advanced']['meta-robots-nofollow']['title'] = __( 'Meta Robots Follow', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-nofollow']['options']['0'] = __( 'Follow', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-nofollow']['options']['1'] = __( 'Nofollow', 'wordpress-seo' ); + + self::$meta_fields['advanced']['meta-robots-adv']['title'] = __( 'Meta Robots Advanced', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['description'] = __( 'Advanced meta robots settings for this page.', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['-'] = __( 'Site-wide default: %s', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['none'] = __( 'None', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['noodp'] = __( 'NO ODP', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['noydir'] = __( 'NO YDIR', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['noimageindex'] = __( 'No Image Index', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['noarchive'] = __( 'No Archive', 'wordpress-seo' ); + self::$meta_fields['advanced']['meta-robots-adv']['options']['nosnippet'] = __( 'No Snippet', 'wordpress-seo' ); + + self::$meta_fields['advanced']['bctitle']['title'] = __( 'Breadcrumbs Title', 'wordpress-seo' ); + self::$meta_fields['advanced']['bctitle']['description'] = __( 'Title to use for this page in breadcrumb paths', 'wordpress-seo' ); + + self::$meta_fields['advanced']['canonical']['title'] = __( 'Canonical URL', 'wordpress-seo' ); + self::$meta_fields['advanced']['canonical']['description'] = sprintf( __( 'The canonical URL that this page should point to, leave empty to default to permalink. %sCross domain canonical%s supported too.', 'wordpress-seo' ), '', '' ); + + self::$meta_fields['advanced']['redirect']['title'] = __( '301 Redirect', 'wordpress-seo' ); + self::$meta_fields['advanced']['redirect']['description'] = __( 'The URL that this page should redirect to.', 'wordpress-seo' ); + + do_action( 'wpseo_tab_translate' ); + } + + /** + * Test whether the metabox should be hidden either by choice of the admin or because + * the post type is not a public post type + * + * @since 1.5.0 + * + * @param string $post_type (optional) The post type to test, defaults to the current post post_type. + * + * @return bool Whether or not the meta box (and associated columns etc) should be hidden + */ + function is_metabox_hidden( $post_type = null ) { + if ( 'attachment' === $post_type ) { + return true; + } + + if ( ! isset( $post_type ) && ( isset( $GLOBALS['post'] ) && ( is_object( $GLOBALS['post'] ) && isset( $GLOBALS['post']->post_type ) ) ) ) { + $post_type = $GLOBALS['post']->post_type; + } + + if ( isset( $post_type ) ) { + // Don't make static as post_types may still be added during the run. + $cpts = get_post_types( array( 'public' => true ), 'names' ); + $options = get_option( 'wpseo_titles' ); + + return ( ( isset( $options[ 'hideeditbox-' . $post_type ] ) && $options[ 'hideeditbox-' . $post_type ] === true ) || in_array( $post_type, $cpts ) === false ); + } + return false; + } + + /** + * Sets up all the functionality related to the prominence of the page analysis functionality. + */ + public function setup_page_analysis() { + if ( apply_filters( 'wpseo_use_page_analysis', true ) === true ) { + add_action( 'post_submitbox_start', array( $this, 'publish_box' ) ); + } + } + + /** + * Outputs the page analysis score in the Publish Box. + */ + public function publish_box() { + if ( $this->is_metabox_hidden() === true ) { + return; + } + + $post = $this->get_metabox_post(); + if ( self::get_value( 'meta-robots-noindex', $post->ID ) === '1' ) { + $score_label = 'noindex'; + $title = __( 'Post is set to noindex.', 'wordpress-seo' ); + $score_title = $title; + } + else { + $score = self::get_value( 'linkdex', $post->ID ); + if ( $score === '' ) { + $score_label = 'na'; + $title = __( 'No focus keyword set.', 'wordpress-seo' ); + } + else { + $score_label = WPSEO_Utils::translate_score( $score ); + } + + $score_title = WPSEO_Utils::translate_score( $score, false ); + if ( ! isset( $title ) ) { + $title = $score_title; + } + } + + printf( ' +
+ ' . $this->traffic_light_svg() . ' +
', + __( 'SEO score', 'wordpress-seo' ), + esc_attr( 'wpseo-score-icon ' . $score_label ), + __( 'SEO:', 'wordpress-seo' ), + $score_title, + __( 'Check', 'wordpress-seo' ) + ); + } + + /** + * Adds the Yoast SEO meta box to the edit boxes in the edit post / page / cpt pages. + */ + public function add_meta_box() { + $post_types = get_post_types( array( 'public' => true ) ); + + if ( is_array( $post_types ) && $post_types !== array() ) { + foreach ( $post_types as $post_type ) { + if ( $this->is_metabox_hidden( $post_type ) === false ) { + $product_title = 'Yoast SEO'; + if ( file_exists( WPSEO_PATH . 'premium/' ) ) { + $product_title .= ' Premium'; + } + + add_meta_box( 'wpseo_meta', $product_title, array( + $this, + 'meta_box', + ), $post_type, 'normal', apply_filters( 'wpseo_metabox_prio', 'high' ) ); + } + } + } + } + + /** + * Pass variables to js for use with the post-scraper + * + * @return array + */ + public function localize_post_scraper_script() { + $post = $this->get_metabox_post(); + + $translations = $this->get_scraper_translations(); + + return array( + 'translations' => $translations, + 'keyword_usage' => $this->get_focus_keyword_usage(), + 'search_url' => admin_url( 'edit.php?seo_kw_filter={keyword}' ), + 'post_edit_url' => admin_url( 'post.php?post={id}&action=edit' ), + 'base_url' => $this->get_base_url_for_js(), + 'title_template' => WPSEO_Metabox::get_title_template( $post ), + 'metadesc_template' => WPSEO_Metabox::get_metadesc_template( $post ), + 'contentTab' => __( 'Content:' , 'wordpress-seo' ), + 'locale' => get_locale(), + ); + } + + /** + * Returns a base URL for use in the JS, takes permalink structure into account + * + * @return string + */ + private function get_base_url_for_js() { + global $pagenow; + + // The default base is the home_url. + $base_url = home_url( '/', null ); + + if ( 'post-new.php' === $pagenow ) { + return $base_url; + } + + $permalink = get_sample_permalink( null ); + $permalink = $permalink[0]; + + // If %postname% is the last tag, just strip it and use that as a base. + if ( 1 === preg_match( '#%postname%/?$#', $permalink ) ) { + $base_url = preg_replace( '#%postname%/?$#', '', $permalink ); + } + + return $base_url; + } + + /** + * Retrieves the title template. + * + * @param object $post metabox post. + * + * @return string + */ + public static function get_title_template( $post ) { + $title_template = ''; + + if ( is_a( $post, 'WP_Post' ) ) { + $needed_option = 'title-' . $post->post_type; + $options = get_option( 'wpseo_titles' ); + if ( isset( $options[ $needed_option ] ) && $options[ $needed_option ] !== '' ) { + $title_template = $options[ $needed_option ]; + } + } + return $title_template; + } + + /** + * Retrieves the metadesc template. + * + * @param object $post metabox post. + * + * @return string + */ + public static function get_metadesc_template( $post ) { + $metadesc_template = ''; + + if ( is_a( $post, 'WP_Post' ) ) { + $needed_option = 'metadesc-' . $post->post_type; + $options = get_option( 'wpseo_titles' ); + if ( isset( $options[ $needed_option ] ) && $options[ $needed_option ] !== '' ) { + $metadesc_template = $options[ $needed_option ]; + } + } + return $metadesc_template; + } + + /** + * Pass some variables to js for replacing variables. + */ + public function localize_replace_vars_script() { + return array( + 'no_parent_text' => __( '(no parent)', 'wordpress-seo' ), + 'replace_vars' => $this->get_replace_vars(), + ); + } + + /** + * Pass some variables to js for the edit / post page overview, snippet preview, etc. + * + * @return array + */ + public function localize_shortcode_plugin_script() { + return array( + 'wpseo_filter_shortcodes_nonce' => wp_create_nonce( 'wpseo-filter-shortcodes' ), + 'wpseo_shortcode_tags' => $this->get_valid_shortcode_tags(), + ); + } + + /** + * Output a tab in the Yoast SEO Metabox + * + * @param string $id CSS ID of the tab. + * @param string $heading Heading for the tab. + * @param string $content Content of the tab. This content should be escaped. + */ + public function do_tab( $id, $heading, $content ) { + ?> +
+
+ + +
+
+ get_content_sections(); + + echo '
'; + + foreach ( $content_sections as $content_section ) { + $content_section->display_link(); + } + + echo '
'; + + foreach ( $content_sections as $content_section ) { + $content_section->display_content(); + } + } + + /** + * Returns the relevant metabox sections for the current view. + * + * @return WPSEO_Metabox_Section[] + */ + private function get_content_sections() { + $content_sections = array( $this->get_content_meta_section() ); + + if ( current_user_can( 'manage_options' ) || $this->options['disableadvanced_meta'] === false ) { + $content_sections[] = $this->get_advanced_meta_section(); + } + + // Check if social_admin is an instance of WPSEO_Social_Admin. + if ( is_a( $this->social_admin, 'WPSEO_Social_Admin' ) ) { + $content_sections[] = $this->social_admin->get_meta_section(); + } + + if ( has_action( 'wpseo_tab_header' ) || has_action( 'wpseo_tab_content' ) ) { + $content_sections[] = $this->get_addons_meta_section(); + } + return $content_sections; + } + + /** + * Returns the metabox section for the content analysis. + * + * @return WPSEO_Metabox_Section + */ + private function get_content_meta_section() { + $content = $this->get_tab_content( 'general' ); + + $tabs = array(); + + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'content', + $content, + __( 'Content', 'wordpress-seo' ), + array( + 'link_class' => 'wpseo_keyword_tab', + 'link_title' => __( 'Content', 'wordpress-seo' ), + ) + ); + + $tabs[] = new Metabox_Add_Keyword_Tab(); + + return new WPSEO_Metabox_Tab_Section( + 'content', + '' . $this->traffic_light_svg() . '', + $tabs, + array( + 'link_alt' => __( 'Content', 'wordpress-seo' ), + 'link_title' => __( 'Content', 'wordpress-seo' ), + ) + ); + } + + /** + * Returns the metabox section for the advanced settings. + * + * @return WPSEO_Metabox_Section + */ + private function get_advanced_meta_section() { + $content = $this->get_tab_content( 'advanced' ); + + $tab = new WPSEO_Metabox_Form_Tab( + 'advanced', + $content, + __( 'Advanced', 'wordpress-seo' ), + array( + 'link_title' => __( 'Advanced', 'wordpress-seo' ), + ) + ); + + return new WPSEO_Metabox_Tab_Section( + 'advanced', + '', + array( $tab ), + array( + 'link_alt' => __( 'Advanced', 'wordpress-seo' ), + 'link_title' => __( 'Advanced', 'wordpress-seo' ), + ) + ); + } + + /** + * Returns a metabox section dedicated to hosting metabox tabs that have been added by other plugins through the + * `wpseo_tab_header` and `wpseo_tab_content` actions. + * + * @return WPSEO_Metabox_Section + */ + private function get_addons_meta_section() { + return new WPSEO_Metabox_Addon_Tab_Section( + 'addons', + '', + array(), + array( + 'link_alt' => __( 'Add-ons', 'wordpress-seo' ), + 'link_title' => __( 'Add-ons', 'wordpress-seo' ), + ) + ); + } + + /** + * Gets the table contents for the metabox tab. + * + * @param string $tab_name Tab for which to retrieve the field definitions. + * + * @return string + */ + private function get_tab_content( $tab_name ) { + $content = ''; + foreach ( $this->get_meta_field_defs( $tab_name ) as $key => $meta_field ) { + $content .= $this->do_meta_box( $meta_field, $key ); + } + unset( $key, $meta_field ); + + return $content; + } + + /** + * Adds a line in the meta box + * + * @todo [JRF] check if $class is added appropriately everywhere + * + * @param array $meta_field_def Contains the vars based on which output is generated. + * @param string $key Internal key (without prefix). + * + * @return string + */ + function do_meta_box( $meta_field_def, $key = '' ) { + $content = ''; + $esc_form_key = esc_attr( self::$form_prefix . $key ); + $meta_value = self::get_value( $key, $this->get_metabox_post()->ID ); + + $class = ''; + if ( isset( $meta_field_def['class'] ) && $meta_field_def['class'] !== '' ) { + $class = ' ' . $meta_field_def['class']; + } + + $placeholder = ''; + if ( isset( $meta_field_def['placeholder'] ) && $meta_field_def['placeholder'] !== '' ) { + $placeholder = $meta_field_def['placeholder']; + } + + switch ( $meta_field_def['type'] ) { + case 'pageanalysis': + $content .= '
'; + break; + case 'snippetpreview': + $content .= '
'; + break; + + case 'text': + $ac = ''; + if ( isset( $meta_field_def['autocomplete'] ) && $meta_field_def['autocomplete'] === false ) { + $ac = 'autocomplete="off" '; + } + if ( $placeholder !== '' ) { + $placeholder = ' placeholder="' . esc_attr( $placeholder ) . '"'; + } + $content .= '
'; + break; + + case 'textarea': + $rows = 3; + if ( isset( $meta_field_def['rows'] ) && $meta_field_def['rows'] > 0 ) { + $rows = $meta_field_def['rows']; + } + $content .= '' . esc_textarea( $meta_value ) . ''; + break; + + case 'hidden': + $content .= '
'; + break; + case 'select': + if ( isset( $meta_field_def['options'] ) && is_array( $meta_field_def['options'] ) && $meta_field_def['options'] !== array() ) { + $content .= ''; + } + break; + + case 'multiselect': + if ( isset( $meta_field_def['options'] ) && is_array( $meta_field_def['options'] ) && $meta_field_def['options'] !== array() ) { + + // Set $meta_value as $selected_arr. + $selected_arr = $meta_value; + + // If the multiselect field is 'meta-robots-adv' we should explode on ,. + if ( 'meta-robots-adv' === $key ) { + $selected_arr = explode( ',', $meta_value ); + } + + if ( ! is_array( $selected_arr ) ) { + $selected_arr = (array) $selected_arr; + } + + $options_count = count( $meta_field_def['options'] ); + + // @todo [JRF => whomever] verify height calculation for older WP versions, was 16x, for WP3.8 20x is more appropriate. + $content .= ''; + unset( $val, $option, $selected, $selected_arr, $options_count ); + } + break; + + case 'checkbox': + $checked = checked( $meta_value, 'on', false ); + $expl = ( isset( $meta_field_def['expl'] ) ) ? esc_html( $meta_field_def['expl'] ) : ''; + $content .= ' ' . $expl . '
'; + unset( $checked, $expl ); + break; + + case 'radio': + if ( isset( $meta_field_def['options'] ) && is_array( $meta_field_def['options'] ) && $meta_field_def['options'] !== array() ) { + foreach ( $meta_field_def['options'] as $val => $option ) { + $checked = checked( $meta_value, $val, false ); + $content .= ' ' . esc_html( $option ) . ' '; + } + unset( $val, $option, $checked ); + } + break; + + case 'upload': + $content .= ''; + $content .= ''; + break; + } + + + $html = ''; + if ( $content === '' ) { + $content = apply_filters( 'wpseo_do_meta_box_field_' . $key, $content, $meta_value, $esc_form_key, $meta_field_def, $key ); + } + + if ( $content !== '' ) { + + $label = esc_html( $meta_field_def['title'] ); + if ( in_array( $meta_field_def['type'], array( + 'snippetpreview', + 'pageanalysis', + 'radio', + 'checkbox', + ), true ) === false + ) { + $label = '' . $label . ''; + } + + $help = ''; + if ( isset( $meta_field_def['help'] ) && $meta_field_def['help'] !== '' ) { + $help = ''; + } + + if ( $meta_field_def['type'] === 'hidden' ) { + $html = '' . $content . ''; + } + else { + $html = ' + + ' . $label . $help . ' + '; + + $html .= $content; + + if ( isset( $meta_field_def['description'] ) ) { + $html .= '
' . $meta_field_def['description'] . '
'; + } + + $html .= ' + + '; + } + } + + return $html; + } + + /** + * Save the WP SEO metadata for posts. + * + * @internal $_POST parameters are validated via sanitize_post_meta() + * + * @param int $post_id Post ID. + * + * @return bool|void Boolean false if invalid save post request + */ + function save_postdata( $post_id ) { + if ( $post_id === null ) { + return false; + } + + if ( wp_is_post_revision( $post_id ) ) { + $post_id = wp_is_post_revision( $post_id ); + } + + clean_post_cache( $post_id ); + $post = get_post( $post_id ); + + if ( ! is_object( $post ) ) { + // Non-existent post. + return false; + } + + do_action( 'wpseo_save_compare_data', $post ); + + $meta_boxes = apply_filters( 'wpseo_save_metaboxes', array() ); + $meta_boxes = array_merge( $meta_boxes, $this->get_meta_field_defs( 'general', $post->post_type ), $this->get_meta_field_defs( 'advanced' ) ); + + foreach ( $meta_boxes as $key => $meta_box ) { + $data = null; + if ( 'checkbox' === $meta_box['type'] ) { + $data = isset( $_POST[ self::$form_prefix . $key ] ) ? 'on' : 'off'; + } + else { + if ( isset( $_POST[ self::$form_prefix . $key ] ) ) { + $data = $_POST[ self::$form_prefix . $key ]; + } + } + if ( isset( $data ) ) { + self::set_value( $key, $data, $post_id ); + } + } + + do_action( 'wpseo_saved_postdata' ); + } + + /** + * Enqueues all the needed JS and CSS. + * @todo [JRF => whomever] create css/metabox-mp6.css file and add it to the below allowed colors array when done + */ + public function enqueue() { + global $pagenow; + /* Filter 'wpseo_always_register_metaboxes_on_admin' documented in wpseo-main.php */ + if ( ( ! in_array( $pagenow, array( + 'post-new.php', + 'post.php', + 'edit.php', + ), true ) && apply_filters( 'wpseo_always_register_metaboxes_on_admin', false ) === false ) || $this->is_metabox_hidden() === true + ) { + return; + } + + if ( $pagenow == 'edit.php' ) { + wp_enqueue_style( 'edit-page', plugins_url( 'css/edit-page-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + } + else { + + if ( 0 != get_queried_object_id() ) { + wp_enqueue_media( array( 'post' => get_queried_object_id() ) ); // Enqueue files needed for upload functionality. + } + + wp_enqueue_style( 'wp-seo-metabox', plugins_url( 'css/metabox-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'wp-seo-scoring', plugins_url( 'css/yst_seo_score-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'wp-seo-snippet', plugins_url( 'css/snippet-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'yoast-seo', plugins_url( 'css/dist/yoast-seo/yoast-seo-' . '305' . '.min.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'jquery-qtip', plugins_url( 'css/jquery.qtip' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), '2.2.1' ); + + wp_enqueue_script( 'wp-seo-metabox', plugins_url( 'js/wp-seo-metabox-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION ); + + wp_enqueue_script( 'wpseo-admin-media', plugins_url( 'js/wp-seo-admin-media-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION, true ); + + wp_enqueue_script( 'yoast-seo', plugins_url( 'js/dist/yoast-seo/yoast-seo-' . '305' . '.min.js', WPSEO_FILE ), null, WPSEO_VERSION, true ); + wp_enqueue_script( 'wp-seo-post-scraper', plugins_url( 'js/wp-seo-post-scraper-' . '305' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'yoast-seo' ), WPSEO_VERSION, true ); + wp_enqueue_script( 'wp-seo-replacevar-plugin', plugins_url( 'js/wp-seo-replacevar-plugin-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'yoast-seo', 'wp-seo-post-scraper' ), WPSEO_VERSION, true ); + wp_enqueue_script( 'wp-seo-shortcode-plugin', plugins_url( 'js/wp-seo-shortcode-plugin-' . '305' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'yoast-seo', 'wp-seo-post-scraper' ), WPSEO_VERSION, true ); + wp_enqueue_script( 'jquery-ui-autocomplete' ); + wp_enqueue_script( 'jquery-qtip', plugins_url( 'js/jquery.qtip.min.js', WPSEO_FILE ), array( 'jquery' ), '2.2.1', true ); + + wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() ); + wp_localize_script( 'wp-seo-post-scraper', 'wpseoPostScraperL10n', $this->localize_post_scraper_script() ); + wp_localize_script( 'wp-seo-replacevar-plugin', 'wpseoReplaceVarsL10n', $this->localize_replace_vars_script() ); + wp_localize_script( 'wp-seo-shortcode-plugin', 'wpseoShortcodePluginL10n', $this->localize_shortcode_plugin_script() ); + + if ( post_type_supports( get_post_type(), 'thumbnail' ) ) { + wp_enqueue_style( 'featured-image', plugins_url( 'css/featured-image' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_script( 'wp-seo-featured-image', plugins_url( 'js/wp-seo-featured-image-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'jquery', 'yoast-seo' ), WPSEO_VERSION, true ); + + $featured_image_l10 = array( 'featured_image_notice' => __( 'The featured image should be at least 200x200 pixels to be picked up by Facebook and other social media sites.', 'wordpress-seo' ) ); + wp_localize_script( 'wp-seo-metabox', 'wpseoFeaturedImageL10n', $featured_image_l10 ); + } + } + } + + /** + * Pass some variables to js for upload module. + * + * @return array + */ + public function localize_media_script() { + return array( + 'choose_image' => __( 'Use Image', 'wordpress-seo' ), + ); + } + + /** + * Retrieve a post date when post is published, or return current date when it's not. + * + * @param WP_Post $post The post for which to retrieve the post date. + * + * @return string + */ + public function get_post_date( $post ) { + if ( isset( $post->post_date ) && $post->post_status === 'publish' ) { + $date = date_i18n( 'j M Y', strtotime( $post->post_date ) ); + } + else { + $date = date_i18n( 'j M Y' ); + } + + return (string) $date; + } + + /** + * Returns post in metabox context + * + * @returns WP_Post|array + */ + protected function get_metabox_post() { + if ( $post = filter_input( INPUT_GET, 'post' ) ) { + $post_id = (int) WPSEO_Utils::validate_int( $post ); + + return get_post( $post_id ); + } + + + if ( isset( $GLOBALS['post'] ) ) { + return $GLOBALS['post']; + } + + return array(); + } + + /** + * Counting the number of given keyword used for other posts than given post_id + * + * @return array + */ + private function get_focus_keyword_usage() { + $post = $this->get_metabox_post(); + if ( is_object( $post ) ) { + $keyword = WPSEO_Meta::get_value( 'focuskw', $post->ID ); + + return array( + $keyword => WPSEO_Meta::keyword_usage( $keyword, $post->ID ), + ); + } + + return array(); + } + + /** + * Returns an array with shortcode tags for all registered shortcodes. + * + * @return array + */ + private function get_valid_shortcode_tags() { + $shortcode_tags = array(); + + foreach ( $GLOBALS['shortcode_tags'] as $tag => $description ) { + array_push( $shortcode_tags, $tag ); + } + + return $shortcode_tags; + } + + /** + * Prepares the replace vars for localization. + * + * @return array replace vars + */ + private function get_replace_vars() { + $post = $this->get_metabox_post(); + + $cached_replacement_vars = array(); + + $vars_to_cache = array( + 'date', + 'id', + 'sitename', + 'sitedesc', + 'sep', + 'page', + 'currenttime', + 'currentdate', + 'currentday', + 'currentmonth', + 'currentyear', + ); + + foreach ( $vars_to_cache as $var ) { + $cached_replacement_vars[ $var ] = wpseo_replace_vars( '%%' . $var . '%%', $post ); + } + + return $cached_replacement_vars; + } + + /** + * Return the SVG for the traffic light in the metabox. + */ + public function traffic_light_svg() { + return << +SVG; + + } + + /** + * Keyword tab for enabling analysis of multiple keywords. + */ + public function template_keyword_tab() { + // Only do this on the edit post pages. + if ( 'post' !== get_current_screen()->base && 'post-new' !== get_current_screen()->base ) { + return; + } + + echo ''; + } + + /** + * Returns Jed compatible YoastSEO.js translations. + * + * @return array + */ + private function get_scraper_translations() { + $file = plugin_dir_path( WPSEO_FILE ) . 'languages/wordpress-seo-' . get_locale() . '.json'; + if ( file_exists( $file ) && $file = file_get_contents( $file ) ) { + return json_decode( $file, true ); + } + return array(); + } + + /********************** DEPRECATED METHODS **********************/ + + /** + * Adds the Yoast SEO box + * + * @deprecated 1.4.24 + * @deprecated use WPSEO_Metabox::add_meta_box() + * @see WPSEO_Meta::add_meta_box() + */ + public function add_custom_box() { + _deprecated_function( __METHOD__, 'WPSEO 1.4.24', 'WPSEO_Metabox::add_meta_box()' ); + $this->add_meta_box(); + } + + /** + * Retrieve the meta boxes for the given post type. + * + * @deprecated 1.5.0 + * @deprecated use WPSEO_Meta::get_meta_field_defs() + * @see WPSEO_Meta::get_meta_field_defs() + * + * @param string $post_type The post type for which to get the meta fields. + * + * @return array + */ + public function get_meta_boxes( $post_type = 'post' ) { + _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Meta::get_meta_field_defs()' ); + + return $this->get_meta_field_defs( 'general', $post_type ); + } + + /** + * Pass some variables to js + * + * @deprecated 1.5.0 + * @deprecated use WPSEO_Meta::localize_script() + * @see WPSEO_Meta::localize_script() + */ + public function script() { + _deprecated_function( __METHOD__, 'WPSEO 1.5.0', 'WPSEO_Meta::localize_script()' ); + + return $this->localize_script(); + } + + /** + * @deprecated 3.0 Removed, use javascript functions instead + * + * @param string $string Deprecated. + * + * @return string + */ + public function strtolower_utf8( $string ) { + _deprecated_function( 'WPSEO_Metabox::strtolower_utf8', 'WPSEO 3.0', 'use javascript instead' ); + + return $string; + } + + /** + * @deprecated 3.0 Removed. + * + * @return array + */ + public function localize_script() { + _deprecated_function( 'WPSEO_Metabox::localize_script', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 Removed, use javascript functions instead. + * + * @return string + */ + public function snippet() { + _deprecated_function( 'WPSEO_Metabox::snippet', 'WPSEO 3.0', 'use javascript instead' ); + + return ''; + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::posts_filter_dropdown instead. + */ + public function posts_filter_dropdown() { + _deprecated_function( 'WPSEO_Metabox::posts_filter_dropdown', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::posts_filter_dropdown' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + $meta_columns->posts_filter_dropdown(); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::column_heading instead. + * + * @param array $columns Already existing columns. + * + * @return array + */ + public function column_heading( $columns ) { + _deprecated_function( 'WPSEO_Metabox::column_heading', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::column_heading' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + return $meta_columns->column_heading( $columns ); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::column_content instead. + * + * @param string $column_name Column to display the content for. + * @param int $post_id Post to display the column content for. + */ + public function column_content( $column_name, $post_id ) { + _deprecated_function( 'WPSEO_Metabox::column_content', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::column_content' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + $meta_columns->column_content( $column_name, $post_id ); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::column_sort instead. + * + * @param array $columns appended with their orderby variable. + * + * @return array + */ + public function column_sort( $columns ) { + _deprecated_function( 'WPSEO_Metabox::column_sort', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::column_sort' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + return $meta_columns->column_sort( $columns ); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::column_sort_orderby instead. + * + * @param array $vars Query variables. + * + * @return array + */ + public function column_sort_orderby( $vars ) { + _deprecated_function( 'WPSEO_Metabox::column_sort_orderby', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::column_sort_orderby' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + return $meta_columns->column_sort_orderby( $vars ); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::column_hidden instead. + * + * @param array|false $result The hidden columns. + * @param string $option The option name used to set which columns should be hidden. + * @param WP_User $user The User. + * + * @return array|false $result + */ + public function column_hidden( $result, $option, $user ) { + _deprecated_function( 'WPSEO_Metabox::column_hidden', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::column_hidden' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + return $meta_columns->column_hidden( $result, $option, $user ); + } + + /** + * @deprecated 3.0 Use WPSEO_Meta_Columns::seo_score_posts_where instead. + * + * @param string $where Where clause. + * + * @return string + */ + public function seo_score_posts_where( $where ) { + _deprecated_function( 'WPSEO_Metabox::seo_score_posts_where', 'WPSEO 3.0', 'WPSEO_Metabox_Columns::seo_score_posts_where' ); + + /** @var WPSEO_Meta_Columns $meta_columns */ + $meta_columns = $GLOBALS['wpseo_meta_columns']; + return $meta_columns->seo_score_posts_where( $where ); + } + + /** + * @deprecated 3.0 Removed. + * + * @param int $post_id Post to retrieve the title for. + * + * @return string + */ + public function page_title( $post_id ) { + _deprecated_function( 'WPSEO_Metabox::page_title', 'WPSEO 3.0' ); + + return ''; + } + + /** + * @deprecated 3.0 + * + * @param array $array Array to sort, array is returned sorted. + * @param string $key Key to sort array by. + */ + public function aasort( &$array, $key ) { + _deprecated_function( 'WPSEO_Metabox::aasort', 'WPSEO 3.0' ); + + } + + /** + * @deprecated 3.0 + * + * @param object $post Post to output the page analysis results for. + * + * @return string + */ + public function linkdex_output( $post ) { + _deprecated_function( 'WPSEO_Metabox::linkdex_output', 'WPSEO 3.0' ); + + return ''; + + } + + /** + * @deprecated 3.0 + * + * @param object $post Post to calculate the results for. + * + * @return array|WP_Error + */ + public function calculate_results( $post ) { + _deprecated_function( 'WPSEO_Metabox::calculate_results', 'WPSEO 3.0' ); + + return array(); + + } + + /** + * @deprecated 3.0 + * + * @param WP_Post $post Post object instance. + * + * @return array + */ + public function get_sample_permalink( $post ) { + _deprecated_function( 'WPSEO_Metabox::get_sample_permalink', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 + * + * @param array $results The results array used to store results. + * @param int $scoreValue The score value. + * @param string $scoreMessage The score message. + * @param string $scoreLabel The label of the score to use in the results array. + * @param string $rawScore The raw score, to be used by other filters. + */ + public function save_score_result( &$results, $scoreValue, $scoreMessage, $scoreLabel, $rawScore = null ) { + _deprecated_function( 'WPSEO_Metabox::save_score_result', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param string $inputString String to clean up. + * @param bool $removeOptionalCharacters Whether or not to do a cleanup of optional chars too. + * + * @return string + */ + public function strip_separators_and_fold( $inputString, $removeOptionalCharacters ) { + _deprecated_function( 'WPSEO_Metabox::strip_separators_and_f', 'WPSEO 3.0' ); + + return ''; + } + + /** + * @deprecated 3.0 + * + * @param array $job Job data array. + * @param array $results Results set by reference. + */ + public function check_double_focus_keyword( $job, &$results ) { + _deprecated_function( 'WPSEO_Metabox::check_double_focus_key', 'WPSEO 3.0' ); + + } + + /** + * @deprecated 3.0 + * + * @param string $keyword The keyword to check for stopwords. + * @param array $results The results array. + */ + public function score_keyword( $keyword, &$results ) { + _deprecated_function( 'WPSEO_Metabox::score_keyword', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param array $job The job array holding both the keyword and the URLs. + * @param array $results The results array. + */ + public function score_url( $job, &$results ) { + _deprecated_function( 'WPSEO_Metabox::score_url', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param array $job The job array holding both the keyword versions. + * @param array $results The results array. + */ + public function score_title( $job, &$results ) { + _deprecated_function( 'WPSEO_Metabox::score_title', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param array $job The job array holding both the keyword versions. + * @param array $results The results array. + * @param array $anchor_texts The array holding all anchors in the document. + * @param array $count The number of anchors in the document, grouped by type. + */ + public function score_anchor_texts( $job, &$results, $anchor_texts, $count ) { + _deprecated_function( 'WPSEO_Metabox::score_anchor_texts', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param object $xpath An XPATH object of the current document. + * + * @return array + */ + public function get_anchor_texts( &$xpath ) { + _deprecated_function( 'WPSEO_Metabox::get_anchor_texts', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 + * + * @param object $xpath An XPATH object of the current document. + * + * @return array + */ + public function get_anchor_count( &$xpath ) { + _deprecated_function( 'WPSEO_Metabox::get_anchor_count', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 + * + * @param array $job The job array holding both the keyword versions. + * @param array $results The results array. + * @param array $imgs The array with images alt texts. + */ + public function score_images_alt_text( $job, &$results, $imgs ) { + _deprecated_function( 'WPSEO_Metabox::score_images_alt_text', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param int $post_id The post to find images in. + * @param string $body The post content to find images in. + * @param array $imgs The array holding the image information. + * + * @return array The updated images array. + */ + public function get_images_alt_text( $post_id, $body, $imgs ) { + _deprecated_function( 'WPSEO_Metabox::get_images_alt_text', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 + * + * @param array $job The array holding the keywords. + * @param array $results The results array. + * @param array $headings The headings found in the document. + */ + public function score_headings( $job, &$results, $headings ) { + _deprecated_function( 'WPSEO_Metabox::score_headings', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param string $postcontent Post content to find headings in. + * + * @return array Array of heading texts. + */ + public function get_headings( $postcontent ) { + _deprecated_function( 'WPSEO_Metabox::get_headings', 'WPSEO 3.0' ); + + return array(); + } + + /** + * @deprecated 3.0 + * + * @param array $job The array holding the keywords. + * @param array $results The results array. + * @param string $description The meta description. + * @param int $maxlength The maximum length of the meta description. + */ + public function score_description( $job, &$results, $description, $maxlength = 155 ) { + _deprecated_function( 'WPSEO_Metabox::score_description', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param array $job The array holding the keywords. + * @param array $results The results array. + * @param string $body The body. + * @param string $firstp The first paragraph. + */ + public function score_body( $job, &$results, $body, $firstp ) { + _deprecated_function( 'WPSEO_Metabox::score_body', 'WPSEO 3.0' ); + } + + /** + * @deprecated 3.0 + * + * @param object $post The post object. + * + * @return string The post content. + */ + public function get_body( $post ) { + _deprecated_function( 'WPSEO_Metabox::get_body', 'WPSEO 3.0' ); + + return ''; + } + + /** + * @deprecated 3.0 + * + * @param string $body The post content to retrieve the first paragraph from. + * + * @return string + */ + public function get_first_paragraph( $body ) { + _deprecated_function( 'WPSEO_Metabox::get_first_paragraph', 'WPSEO 3.0' ); + + return ''; + } +} /* End of class */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/interface-metabox-section.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/interface-metabox-section.php new file mode 100644 index 00000000..f2c5986b --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/metabox/interface-metabox-section.php @@ -0,0 +1,20 @@ +statuses = $statuses; + } + + /** + * Generates and returns the subject of the email. + * + * @return string + */ + public function get_subject() { + if ( $this->statuses['old_status'] !== null ) { + return $this->get_change_subject(); + } + + return $this->get_new_subject(); + } + + /** + * Generates and returns the message body of the email. + * + * @return string + */ + public function get_message() { + if ( $this->statuses['old_status'] !== null ) { + $message = $this->get_change_message(); + } + else { + $message = $this->get_new_message(); + } + + $powered_by = sprintf( + /* translators: 1: opens a link to yoast.com. 2: closes the link 3: opens a link to onpage.org */ + __( 'Indexing powered by %1$sYoast%2$s and %3$sOnPage.org%2$s.', 'wordpress-seo' ), + '', + '', + '' + ); + + return $message . '

' . $powered_by; + } + + /** + * In case the status has been changed + * + * @return string + */ + private function get_change_message() { + $subjects = array( + '0' => sprintf( + /* translators: 1: expands to get_option( 'home' ). 2: opens a link to a related knowledge base article. 3: closes the link */ + __( 'Yoast SEO has detected that %1$s can no longer be indexed. Please note that this will make it impossible for search engines like Google and Bing to index your site. %2$sRead more about this error on our knowledge base%3$s.', 'wordpress-seo' ), + get_option( 'home' ), + '', + '' + ), + '1' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO has detected that %1$s can be indexed again.', 'wordpress-seo' ), + get_option( 'home' ) + ), + ); + + return $subjects[ $this->statuses['new_status'] ]; + } + + /** + * The status is fetched for the first time + * + * @return string + */ + private function get_new_message() { + $subjects = array( + '0' => sprintf( + /* translators: 1: expands to get_option( 'home' ). 2: opens a link to a related knowledge base article. 3: closes the link */ + __( 'Yoast SEO has detected that %1$s can not be indexed. Please note that this will make it impossible for search engines like Google and Bing to index your site. %2$sRead more about this error on our knowledge base%3$s.', 'wordpress-seo' ), + get_option( 'home' ), + '', + '' + ), + '1' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO has detected that %1$s can be indexed.', 'wordpress-seo' ), + get_option( 'home' ) + ), + ); + + return $subjects[ $this->statuses['new_status'] ]; + } + + /** + * In case the status has been changed + * + * @return string + */ + private function get_change_subject() { + $subjects = array( + '0' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO alert: Search engines can no longer index %1$s!', 'wordpress-seo' ), + get_option( 'home' ) + ), + '1' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO alert fixed: Search engines can index %1$s again.', 'wordpress-seo' ), + get_option( 'home' ) + ), + ); + + return $subjects[ $this->statuses['new_status'] ]; + } + + /** + * The status is fetched for the first time + * + * @return string + */ + private function get_new_subject() { + $subjects = array( + '0' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO alert: Search engines cannot index %1$s!', 'wordpress-seo' ), + get_option( 'home' ) + ), + '1' => sprintf( + /* translators: 1: expands to get_option( 'home' ). */ + __( 'Yoast SEO alert fixed: Search engines can index %1$s.', 'wordpress-seo' ), + get_option( 'home' ) + ), + ); + + return $subjects[ $this->statuses['new_status'] ]; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-notifier.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-notifier.php new file mode 100644 index 00000000..b57b5355 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-notifier.php @@ -0,0 +1,53 @@ + $old_status, + 'new_status' => $new_status, + ) + ); + + add_filter( 'wp_mail_content_type', array( $this, 'set_content_type' ) ); + wp_mail( + get_option( 'admin_email' ), + $email_presenter->get_subject(), + $email_presenter->get_message() + ); + remove_filter( 'wp_mail_content_type', array( $this, 'set_content_type' ) ); + } + + /** + * Forces the MIME type of emails to text/html + * + * @param string $content_type The content type for the email containing the indexability check. + * + * @return string + */ + public function set_content_type( $content_type ) { + return 'text/html'; + } + + /** + * Let's start showing the notices to all admins by removing the hide-notice meta data for each admin resulting in + * popping up the notice again + */ + public function show_notices() { + delete_metadata( 'user', 0, WPSEO_OnPage::USER_META_KEY, '', true ); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-option.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-option.php new file mode 100644 index 00000000..9f6109f1 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-option.php @@ -0,0 +1,128 @@ +onpage_option = $this->get_option(); + } + + /** + * Getting the status from the option. + * + * @return string + */ + public function get_status() { + if ( array_key_exists( self::STATUS, $this->onpage_option ) ) { + return $this->onpage_option[ self::STATUS ]; + } + + return self::CANNOT_FETCH; + } + + /** + * Saving the status to the options. + * + * @param string $status The status to save. + */ + public function set_status( $status ) { + $this->onpage_option[ self::STATUS ] = $status; + } + + /** + * Saving the last fetch timestamp to the options. + * + * @param integer $timestamp Timestamp with the new value. + */ + public function set_last_fetch( $timestamp ) { + $this->onpage_option[ self::LAST_FETCH ] = $timestamp; + } + + /** + * Check if the last fetch is within the time of 60 minutes + * + * @return bool + */ + public function should_be_fetched() { + return ( ( time() - $this->onpage_option[ self::LAST_FETCH ] ) > self::FETCH_LIMIT ); + } + + /** + * Saving the option with the current data + */ + public function save_option() { + update_option( self::OPTION_NAME, $this->onpage_option ); + } + + /** + * Returns the value of the onpage_enabled status + * + * @return bool + */ + public function is_enabled() { + $options = get_option( 'wpseo' ); + + return ! empty( $options['onpage_indexability'] ); + } + + /** + * Getting the option with the OnPage.org data + * + * @return array + */ + private function get_option() { + return get_option( self::OPTION_NAME, array( self::STATUS => self::NOT_FETCHED, self::LAST_FETCH => 0 ) ); + } + + /** + * @deprecated 3.0.2 + * + * Returns the indexable status of the website. + * + * @return bool + */ + public function is_indexable() { + _deprecated_function( 'WPSEO_OnPage_Option::is_indexable', 'WPSEO 3.0.2' ); + + return self::IS_INDEXABLE === $this->get_status(); + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-request.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-request.php new file mode 100644 index 00000000..59159048 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage-request.php @@ -0,0 +1,78 @@ +response = $this->do_request( $target_url ); + } + + /** + * Returns the fetched response + * + * @return array + */ + public function get_response() { + return $this->response; + } + + /** + * Doing the remote get and returns the body + * + * @param string $target_url The home url. + * + * @return array + * @throws Exception The error message that can be used to show to the user. + */ + protected function get_remote( $target_url ) { + $response = wp_remote_get( $this->onpage_endpoint . '?url=' . $target_url ); + $response_code = wp_remote_retrieve_response_code( $response ); + + // When the request is successful, the response code will be 200. + if ( $response_code === 200 ) { + $response_body = wp_remote_retrieve_body( $response ); + + return json_decode( $response_body, true ); + } + } + + /** + * Sending a request to OnPage to check if the $home_url is indexable + * + * @param string $target_url The URL that will be send to the API. + * + * @return array + */ + private function do_request( $target_url ) { + $json_body = $this->get_remote( $target_url ); + + // OnPage.org recognized a redirect, fetch the data of that URL by calling this method with the value from OnPage.org. + if ( ! empty( $json_body['passes_juice_to'] ) ) { + return $this->do_request( $json_body['passes_juice_to'] ); + } + + return $json_body; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage.php new file mode 100644 index 00000000..dec22722 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/onpage/class-onpage.php @@ -0,0 +1,206 @@ +onpage_option = new WPSEO_OnPage_Option(); + + if ( $this->onpage_option->is_enabled() ) { + $this->set_hooks(); + $this->catch_redo_listener(); + } + } + } + + /** + * The hooks to run on plugin activation + */ + public function activate_hooks() { + $this->set_cron(); + } + + /** + * Adding a weekly schedule to the schedules array + * + * @param array $schedules Array with schedules. + * + * @return array + */ + public function add_weekly_schedule( array $schedules ) { + $schedules['weekly'] = array( 'interval' => WEEK_IN_SECONDS, 'display' => __( 'Once Weekly' ) ); + + return $schedules; + } + + /** + * Fetching the data from onpage. + * + * @return bool + */ + public function fetch_from_onpage() { + if ( $this->onpage_option->should_be_fetched() && false !== ( $new_status = $this->request_indexability() ) ) { + + // Updates the timestamp in the option. + $this->onpage_option->set_last_fetch( time() ); + + // The currently indexability status. + $old_status = $this->onpage_option->get_status(); + + // Saving the new status. + $this->onpage_option->set_status( $new_status ); + + // Saving the option. + $this->onpage_option->save_option(); + + // Check if the status has been changed. + if ( $old_status !== $new_status && $new_status !== WPSEO_OnPage_Option::CANNOT_FETCH ) { + $this->notify_admins( $old_status, $new_status ); + } + + return true; + } + + return false; + } + + /** + * Show a notice when the website is not indexable + */ + public function show_notice() { + if ( $this->should_show_notice() ) { + $notice = sprintf( + /* translators: 1: opens a link to a related knowledge base article. 2: closes the link */ + __( '%1$sYour homepage cannot be indexed by search engines%2$s. This is very bad for SEO and should be fixed.', 'wordpress-seo' ), + '', + '' + ); + + Yoast_Notification_Center::get()->add_notification( + new Yoast_Notification( + $notice, + array( + 'type' => 'error yoast-dismissible', + 'id' => 'wpseo-dismiss-onpageorg', + 'nonce' => wp_create_nonce( 'wpseo-dismiss-onpageorg' ), + ) + ) + ); + } + } + + /** + * Send a request to OnPage.org to get the indexability + * + * @return int(0)|int(1)|false + */ + protected function request_indexability() { + $request = new WPSEO_OnPage_Request( get_option( 'home' ) ); + $response = $request->get_response(); + + if ( isset( $response['is_indexable'] ) ) { + return (int) $response['is_indexable']; + } + + return WPSEO_OnPage_Option::CANNOT_FETCH; + } + + /** + * Should the notice being given? + * + * @return bool + */ + protected function should_show_notice() { + // If development note is on or the tagline notice is shown, just don't show this notice. + if ( WPSEO_Utils::is_development_mode() || ( '0' === get_option( 'blog_public' ) ) ) { + return false; + } + + return WPSEO_Utils::grant_access() && ! $this->user_has_dismissed() && $this->onpage_option->get_status() === WPSEO_OnPage_Option::IS_NOT_INDEXABLE; + } + + /** + * Notify the admins + * + * @param int|null $old_status The old indexable status. + * @param int $new_status The new indexable status. + */ + protected function notify_admins( $old_status, $new_status ) { + $notify = new WPSEO_OnPage_Notifier( $old_status, $new_status ); + + $notify->send_email( $old_status, $new_status ); + $notify->show_notices(); + } + + /** + * Setting up the hooks. + */ + private function set_hooks() { + // Schedule cronjob when it doesn't exists on activation. + register_activation_hook( WPSEO_FILE, array( $this, 'activate_hooks' ) ); + + // Add weekly schedule to the cron job schedules. + add_filter( 'cron_schedules', array( $this, 'add_weekly_schedule' ) ); + + // Adding admin notice if necessary. + add_filter( 'admin_init', array( $this, 'show_notice' ) ); + + // Setting the action for the OnPage fetch. + add_action( 'wpseo_onpage_fetch', array( $this, 'fetch_from_onpage' ) ); + } + + /** + * Setting the cronjob to get the new indexibility status. + */ + private function set_cron() { + if ( ! wp_next_scheduled( 'wpseo_onpage_fetch' ) ) { + wp_schedule_event( time(), 'weekly', 'wpseo_onpage_fetch' ); + } + } + + /** + * Get the state from the user to check if the current user has dismissed + * + * @return mixed + */ + private function user_has_dismissed() { + return '1' === get_user_meta( get_current_user_id(), WPSEO_OnPage::USER_META_KEY, true ); + } + + /** + * Redo the fetch request for onpage + */ + private function catch_redo_listener() { + if ( filter_input( INPUT_GET, 'wpseo-redo-onpage' ) === '1' ) { + $this->is_manual_request = true; + + add_action( 'admin_init', array( $this, 'fetch_from_onpage' ) ); + } + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php index 4036899f..40c7c13a 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php @@ -139,6 +139,7 @@ if ( get_option( 'page_comments' ) && $options['ignore_page_comments'] === false echo __( 'Paging comments is enabled, this is not needed in 999 out of 1000 cases, so the suggestion is to disable it, to do that, simply uncheck the box before "Break comments into pages..."', 'wordpress-seo' ), '
'; } +<<<<<<< .mine ?>
+ OnPage.org
+||||||| .r11156 +echo '
' . __( 'General', 'wordpress-seo' ) . '
'; +======= +?> +
+ + + + +
+>>>>>>> .r12027
@@ -186,6 +202,74 @@ if ( get_option( 'page_comments' ) && $options['ignore_page_comments'] === false ?>
+<<<<<<< .mine +
+ +
+ +
+
+
+
+ +
+ textinput( 'website_name', __( 'Website name', 'wordpress-seo' ), array( 'placeholder' => get_bloginfo( 'name' ) ) ); + $yform->textinput( 'alternate_website_name', __( 'Alternate name', 'wordpress-seo' ) ); + ?> +
+
+ +
+ select( 'company_or_person', __( 'Company or person', 'wordpress-seo' ), array( + '' => __( 'Choose whether you\'re a company or person', 'wordpress-seo' ), + 'company' => __( 'Company', 'wordpress-seo' ), + 'person' => __( 'Person', 'wordpress-seo' ), + ) ); + ?> +
+
+ textinput( 'company_name', __( 'Company Name', 'wordpress-seo' ) ); + $yform->media_input( 'company_logo', __( 'Company Logo', 'wordpress-seo' ) ); + ?> +
+
+
+ textinput( 'person_name', __( 'Your name', 'wordpress-seo' ) ); ?> +
+
+
+ ', __( 'You can use the boxes below to verify with the different Webmaster Tools, if your site is already verified, you can just forget about these. Enter the verify meta values for:', 'wordpress-seo' ), '
'; + $yform->textinput( 'alexaverify', '' . __( 'Alexa Verification ID', 'wordpress-seo' ) . '' ); + $yform->textinput( 'msverify', '' . __( 'Bing Webmaster Tools', 'wordpress-seo' ) . '' ); + $yform->textinput( 'googleverify', 'Google Search Console' ); + $yform->textinput( 'yandexverify', '' . __( 'Yandex Webmaster Tools', 'wordpress-seo' ) . '' ); + ?> +
+
+ ', __( 'Unchecking this box allows authors and editors to redirect posts, noindex them and do other things you might not want if you don\'t trust your authors.', 'wordpress-seo' ), '
'; + /* translators: %1$s expands to Yoast SEO */ + $yform->checkbox( 'disableadvanced_meta', sprintf( __( 'Disable the Advanced part of the %1$s meta box', 'wordpress-seo' ), 'Yoast SEO' ) ); + ?> +
+
+ checkbox( 'onpage_indexability', sprintf( __( 'Enable %1$s indexability check', 'wordpress-seo' ), 'OnPage.org' ) ); + ?> +
+
@@ -244,6 +328,7 @@ if ( get_option( 'page_comments' ) && $options['ignore_page_comments'] === false ?>

>>>>>> .r12027 do_action( 'wpseo_dashboard' ); $yform->admin_footer(); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/licenses.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/licenses.php index 56d8bf2c..fb1b1db8 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/licenses.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/licenses.php @@ -68,10 +68,19 @@ elseif ( class_exists( 'Yoast_WooCommerce_SEO' ) ) {

+<<<<<<< .mine +
+||||||| .r11156 +
+=======
+>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/metas.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/metas.php index 41bfa8e5..847cd679 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/metas.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/metas.php @@ -25,6 +25,80 @@ $yform->admin_header( true, 'wpseo_titles' );
+<<<<<<< .mine +

+
+ + + + + + + + + + + +
+ + + checkbox( 'forcerewritetitle', __( 'Enable force rewrite titles', 'wordpress-seo' ) ); + /* translators: %1$s expands to Yoast SEO */ + echo '
', sprintf( __( '%1$s has auto-detected whether it needs to force rewrite the titles for your pages, if you think it\'s wrong and you know what you\'re doing, you can change the setting here.', 'wordpress-seo' ), 'Yoast SEO' ) . '
'; + ?> +
+ + + radio( 'separator', WPSEO_Option_Titles::get_instance()->get_separator_options(), '' ); + echo '
', __( 'Choose the symbol to use as your title separator. This will display, for instance, between your post title and site name.', 'wordpress-seo' ), ' ', __( 'Symbols are shown in the size they\'ll appear in in search results.', 'wordpress-seo' ), '
'; + ?> +
+
+
+ ', __( 'Homepage', 'wordpress-seo' ), '
'; + $yform->textinput( 'title-home-wpseo', __( 'Title template', 'wordpress-seo' ), 'template homepage-template' ); + $yform->textarea( 'metadesc-home-wpseo', __( 'Meta description template', 'wordpress-seo' ), array( 'class' => 'template homepage-template' ) ); + if ( $options['usemetakeywords'] === true ) { + $yform->textinput( 'metakey-home-wpseo', __( 'Meta keywords template', 'wordpress-seo' ) ); + } + echo '
'; + } + else { + echo '
', __( 'Homepage & Front page', 'wordpress-seo' ), '
'; + printf( __( 'You can determine the title and description for the front page by %sediting the front page itself »%s', 'wordpress-seo' ), '', '' ); + echo '
'; + if ( get_option( 'page_for_posts' ) > 0 ) { + echo '
', sprintf( __( 'You can determine the title and description for the blog page by %sediting the blog page itself »%s', 'wordpress-seo' ), '', '' ), '
'; + } + } + ?> +
+

+ true ), 'objects' ); + if ( is_array( $post_types ) && $post_types !== array() ) { + foreach ( $post_types as $pt ) { + $warn = false; + if ( $options['redirectattachment'] === true && $pt->name == 'attachment' ) { + echo '

'; + $warn = true; + } +||||||| .r11156 +

+ ' . __( 'Title settings', 'wordpress-seo' ) . ''; + echo $wpseo_admin_pages->checkbox( 'forcerewritetitle', __( 'Force rewrite titles', 'wordpress-seo' ) ); + echo '
' . __( 'WordPress SEO has auto-detected whether it needs to force rewrite the titles for your pages, if you think it\'s wrong and you know what you\'re doing, you can change the setting here.', 'wordpress-seo' ) . '
'; +=======

@@ -84,6 +158,7 @@ $yform->admin_header( true, 'wpseo_titles' ); echo '
'; $warn = true; } +>>>>>>> .r12027 $name = $pt->name; echo '' . esc_html( ucfirst( $pt->labels->name ) ) . '
'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/tools.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/tools.php index a787ee74..0c5a2687 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/tools.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/pages/tools.php @@ -1,3 +1,80 @@ +<<<<<<< .mine +admin_header( false ); + +if ( '' === $tool_page ) { + + new WPSEO_Recalculate_Scores(); + + $tools = array( + 'bulk-editor' => array( + 'title' => __( 'Bulk editor', 'wordpress-seo' ), + 'desc' => __( 'This tool allows you to quickly change titles and descriptions of your posts and pages without having to go into the editor for each page.', 'wordpress-seo' ), + ), + 'import-export' => array( + 'title' => __( 'Import and Export', 'wordpress-seo' ), + 'desc' => __( 'Import settings from other SEO plugins and export your settings for re-use on (another) blog.', 'wordpress-seo' ), + ), + ); + if ( WPSEO_Utils::allow_system_file_edit() === true && ! is_multisite() ) { + $tools['file-editor'] = array( + 'title' => __( 'File editor', 'wordpress-seo' ), + 'desc' => __( 'This tool allows you to quickly change important files for your SEO, like your robots.txt and, if you have one, your .htaccess file.', 'wordpress-seo' ), + ); + } + + $tools['recalculate'] = array( + 'href' => '#TB_inline?width=300&height=150&inlineId=wpseo_recalculate', + 'attr' => "id='wpseo_recalculate_link' class='thickbox'", + 'title' => __( 'Recalculate SEO scores', 'wordpress-seo' ), + 'desc' => __( 'Recalculate SEO scores for all pieces of content with a focus keyword.', 'wordpress-seo' ), + ); + + if ( filter_input( INPUT_GET, 'recalculate' ) === '1' ) { + $tools['recalculate']['attr'] .= "data-open='open'"; + } + + /* translators: %1$s expands to Yoast SEO */ + echo '
', sprintf( __( '%1$s comes with some very powerful built-in tools:', 'wordpress-seo' ), 'Yoast SEO' ), '
'; + + asort( $tools ); + + echo '
'; + foreach ( $tools as $slug => $tool ) { + $href = ( ! empty( $tool['href'] ) ) ? esc_attr( $tool['href'] ) : '&tool=' . $slug; + $attr = ( ! empty( $tool['attr'] ) ) ? $tool['attr'] : ''; + echo '
'; + echo '', $tool['title'], '
'; + echo $tool['desc']; + echo '
'; + } + echo '
'; + + echo ''; + +} +else { + echo '', __( '« Back to Tools page', 'wordpress-seo' ), ''; + require_once WPSEO_PATH . 'admin/views/tool-' . $tool_page . '.php'; +} + +$yform->admin_footer( false ); +||||||| .r0 +======= admin_footer( false ); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-content-fields.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-content-fields.php new file mode 100644 index 00000000..9efec84a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-content-fields.php @@ -0,0 +1,54 @@ + $this->get_field_config( + __( 'Snippet Editor', 'wordpress-seo' ), + sprintf( __( 'This is a rendering of what this post might look like in Google\'s search results.

Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ), + 'div' + ), + 'focuskw' => $this->get_field_config( + __( 'Focus Keyword', 'wordpress-seo' ), + sprintf( __( 'Pick the main keyword or keyphrase that this post/page is about.

Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ) + ), + 'analysis' => $this->get_field_config( + __( 'Content Analysis', 'wordpress-seo' ), + sprintf( __( 'This is the content analysis, a collection of content checks that analyze the content of your page. Read %sthis post%s for more info.', 'wordpress-seo' ), '', '' ), + 'div' + ), + 'title' => $this->get_field_config( + '', + '', + 'hidden', + '' + ), + 'desc' => $this->get_field_config( + '', + '', + 'hidden', + '' + ), + 'linkdex' => $this->get_field_config( + '', + '', + 'hidden', + '' + ), + ); + + return $this->filter_hidden_fields( $fields ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields-presenter.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields-presenter.php new file mode 100644 index 00000000..81b79a0d --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields-presenter.php @@ -0,0 +1,219 @@ +tax_meta = WPSEO_Taxonomy_Meta::get_term_meta( (int) $term->term_id, $term->taxonomy ); + } + + /** + * Displaying the form fields + * + * @param array $fields Array with the fields that will be displayed. + */ + public function html( array $fields ) { + $content = ''; + foreach ( $fields as $field_name => $field_options ) { + $content .= $this->form_row( 'wpseo_' . $field_name, $field_options ); + } + return $content; + } + + /** + * Create a row in the form table. + * + * @param string $field_name Variable the row controls. + * @param array $field_options Array with the field configuration. + */ + private function form_row( $field_name, array $field_options ) { + $esc_field_name = esc_attr( $field_name ); + + $label = $this->get_label( $field_options['label'], $esc_field_name ); + $field = $this->get_field( $field_options['type'], $esc_field_name, $this->get_field_value( $field_name ) , (array) $field_options['options'] ); + $help = $this->get_help( $field, $field_options['description'], $esc_field_name ); + + return $this->parse_row( $label, $help, $field ); + } + + /** + * Generates the html for the the given field config + * + * @param string $field_type The fieldtype, e.g: text, checkbox, etc. + * @param string $field_name The name of the field. + * @param string $field_value The value of the field. + * @param array $options Array with additional options. + * + * @return string + */ + private function get_field($field_type, $field_name, $field_value, array $options) { + + $class = $this->get_class( $options ); + $field = ''; + + switch ( $field_type ) { + case 'div' : + $field .= '
'; + break; + case 'text' : + $field .= ''; + break; + case 'checkbox' : + $field .= ''; + break; + case 'textarea' : + $rows = 3; + if ( ! empty( $options['rows'] ) ) { + $rows = $options['rows']; + } + $field .= '' . esc_textarea( $field_value ) . ''; + break; + case 'upload' : + $field .= ''; + $field .= ''; + break; + case 'select' : + if ( is_array( $options ) && $options !== array() ) { + $field .= ''; + } + break; + case 'hidden' : + $field .= ''; + break; + } + + if ( $field !== '' && ( ! empty( $options['description'] ) && is_string( $options['description'] ) ) ) { + $field .= '
' . $options['description'] . '
'; + } + + return $field; + } + + /** + * Getting the value for given field_name + * + * @param string $field_name The fieldname to get the value for. + * + * @return string + */ + private function get_field_value( $field_name ) { + if ( isset( $this->tax_meta[ $field_name ] ) && $this->tax_meta[ $field_name ] !== '' ) { + return $this->tax_meta[ $field_name ]; + } + + return ''; + } + + /** + * Getting the class attributes if $options contains a class key + * + * @param array $options The array with field options. + * + * @return string + */ + private function get_class( array $options ) { + if ( ! empty( $options['class'] ) ) { + return ' class="' . esc_attr( $options['class'] ) . '"'; + } + + return ''; + } + + /** + * Getting the label HTML + * + * @param string $label The label value. + * @param string $field_name The target field. + * + * @return string + */ + private function get_label( $label, $field_name ) { + if ( $label !== '' ) { + return '' . esc_html( $label ) . ''; + } + + return ''; + } + + /** + * Returns the help text + * + * @param string $field_html The generated HTML for the field. + * @param string $help_text The help text that will be displayed. + * @param string $field_name The field name. + * + * @return string + */ + private function get_help( $field_html, $help_text, $field_name ) { + if ( $field_html !== '' && ( is_string( $help_text ) && $help_text !== '' ) ) { + return $this->parse_help( $field_name, $help_text ); + } + + return ''; + } + + /** + * Parsing question mark with the help-text + * + * @param string $field_name The name of the field where the helptext is generated for. + * @param string $help_text The help text itself. + * + * @return string + */ + private function parse_help( $field_name, $help_text ) { + static $image_src; + + if ( $image_src === null ) { + $image_src = plugins_url( 'images/question-mark.png', WPSEO_FILE ); + } + + return sprintf( + '', + $image_src, + esc_attr( $field_name . 'help' ), + esc_attr( $help_text ) + ); + } + + /** + * Returns the HTML for the row which contains label, help and the field. + * + * @param string $label The html for the label if there was a label set. + * @param string $help The html for the help, when it's there. + * @param string $field The html for the field. + * + * @return string + */ + private function parse_row( $label, $help, $field ) { + if ( $label !== '' || $help !== '' ) { + return '
'; + } + + return $field; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields.php new file mode 100644 index 00000000..9d4567a5 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-fields.php @@ -0,0 +1,83 @@ +term = $term; + $this->options = ! empty( $options ) ? $options : WPSEO_Options::get_all(); + } + + /** + * This method should return the fields + * + * @return array + */ + abstract public function get(); + + /** + * Returns array with the field data + * + * @param string $label The label displayed before the field. + * @param string $description Description which will explain the field. + * @param string $type The field type, for example: input, select. + * @param string|array $options Optional array with additional attributes for the field. + * @param bool $hide Should the field be hidden. + * + * @return array + */ + protected function get_field_config( $label, $description, $type = 'text', $options = '', $hide = false ) { + return array( + 'label' => $label, + 'description' => $description, + 'type' => $type, + 'options' => $options, + 'hide' => $hide, + ); + } + + /** + * Filter the hidden fields. + * + * @param array $fields Array with the form fields that has will be filtered. + * + * @return array + */ + protected function filter_hidden_fields( array $fields ) { + foreach ( $fields as $field_name => $field_options ) { + if ( ! empty( $field_options['hide'] ) ) { + unset( $fields[ $field_name ] ); + } + } + + return $fields; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-metabox.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-metabox.php new file mode 100644 index 00000000..b3dcfa40 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-metabox.php @@ -0,0 +1,297 @@ +term = $term; + $this->taxonomy = $taxonomy; + $this->taxonomy_tab_content = new WPSEO_Taxonomy_Fields_Presenter( $this->term ); + + add_action( 'admin_footer', array( $this, 'template_keyword_tab' ) ); + } + + /** + * Shows the Yoast SEO metabox for the term. + */ + public function display() { + if ( $this->tax_is_public() === false ) { + return; + } + + $content_sections = $this->get_content_sections(); + + $product_title = 'Yoast SEO'; + if ( file_exists( WPSEO_PATH . 'premium/' ) ) { + $product_title .= ' Premium'; + } + /* translators: %1$s expands to Yoast SEO */ + $metabox_heading = sprintf( __( '%1$s Settings', 'wordpress-seo' ), $product_title ); + + printf( '
%1$s
' , $metabox_heading ); + echo '
'; + + foreach ( $content_sections as $content_section ) { + $content_section->display_link(); + } + + echo '
'; + + foreach ( $content_sections as $content_section ) { + $content_section->display_content(); + } + echo '
'; + } + + /** + * Returns the relevant metabox sections for the current view. + * + * @return WPSEO_Metabox_Section[] + */ + private function get_content_sections() { + $content_sections = array( + $this->get_content_meta_section(), + $this->get_settings_meta_section(), + $this->get_social_meta_section(), + ); + + return $content_sections; + } + + /** + * Returns the metabox section for the content analysis. + * + * @return WPSEO_Metabox_Section + */ + private function get_content_meta_section() { + $taxonomy_content_fields = new WPSEO_Taxonomy_Content_Fields( $this->term ); + $content = $this->taxonomy_tab_content->html( $taxonomy_content_fields->get() ); + + $tab = new WPSEO_Metabox_Form_Tab( + 'content', + $content, + __( 'Content', 'wordpress-seo' ), + array( + 'link_class' => 'wpseo_keyword_tab', + 'link_title' => __( 'Content', 'wordpress-seo' ), + ) + ); + + return new WPSEO_Metabox_Tab_Section( + 'content', + '' . $this->traffic_light_svg() . '', + array( $tab ), + array( + 'link_alt' => __( 'Content', 'wordpress-seo' ), + 'link_title' => __( 'Content', 'wordpress-seo' ), + ) + ); + } + + /** + * Returns the metabox section for the settings. + * + * @return WPSEO_Metabox_Section + */ + private function get_settings_meta_section() { + $taxonomy_settings_fields = new WPSEO_Taxonomy_Settings_Fields( $this->term ); + $content = $this->taxonomy_tab_content->html( $taxonomy_settings_fields->get() ); + + $tab = new WPSEO_Metabox_Form_Tab( + 'settings', + $content, + __( 'Settings', 'wordpress-seo' ), + array( + 'link_title' => __( 'Settings', 'wordpress-seo' ), + ) + ); + + return new WPSEO_Metabox_Tab_Section( + 'settings', + '', + array( $tab ), + array( + 'link_alt' => __( 'Settings', 'wordpress-seo' ), + 'link_title' => __( 'Settings', 'wordpress-seo' ), + ) + ); + } + + /** + * Returns the metabox section for the social settings. + * + * @return WPSEO_Metabox_Section + */ + private function get_social_meta_section() { + $options = WPSEO_Options::get_all(); + $taxonomy_social_fields = new WPSEO_Taxonomy_Social_Fields( $this->term ); + + $tabs = array(); + if ( $options['opengraph'] === true ) { + $facebook_meta_fields = $taxonomy_social_fields->get_by_network( 'opengraph' ); + + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'facebook', + $this->taxonomy_tab_content->html( $facebook_meta_fields ), + '', + array( + 'link_alt' => __( 'Facebook / Opengraph metadata', 'wordpress-seo' ), + 'link_title' => __( 'Facebook / Opengraph metadata', 'wordpress-seo' ), + ) + ); + } + + if ( $options['twitter'] === true ) { + $twitter_meta_fields = $taxonomy_social_fields->get_by_network( 'twitter' ); + + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'twitter', + $this->taxonomy_tab_content->html( $twitter_meta_fields ), + '', + array( + 'link_alt' => __( 'Twitter metadata', 'wordpress-seo' ), + 'link_title' => __( 'Twitter metadata', 'wordpress-seo' ), + ) + ); + } + + if ( $options['googleplus'] === true ) { + $googleplus_meta_fields = $taxonomy_social_fields->get_by_network( 'googleplus' ); + + $tabs[] = new WPSEO_Metabox_Form_Tab( + 'googleplus', + $this->taxonomy_tab_content->html( $googleplus_meta_fields ), + '', + array( + 'link_alt' => __( 'Google+ metadata', 'wordpress-seo' ), + 'link_title' => __( 'Google+ metadata', 'wordpress-seo' ), + ) + ); + } + + return new WPSEO_Metabox_Tab_Section( + 'social', + '', + $tabs, + array( + 'link_alt' => __( 'Social', 'wordpress-seo' ), + 'link_title' => __( 'Social', 'wordpress-seo' ), + ) + ); + } + + /** + * Test whether we are on a public taxonomy - no metabox actions needed if we are not + * Unfortunately we have to hook most everything in before the point where all taxonomies are registered and + * we know which taxonomy is being requested, so we need to use this check in nearly every hooked in function. + * + * @since 1.5.0 + */ + private function tax_is_public() { + // Don't make static as taxonomies may still be added during the run. + $taxonomy = get_taxonomy( $this->taxonomy ); + + return $taxonomy->public; + } + + /** + * Return the SVG for the traffic light in the metabox. + */ + public function traffic_light_svg() { + return << +SVG; + } + + /** + * Keyword tab for enabling analysis of multiple keywords. + */ + public function template_keyword_tab() { + // Only do this on the taxonomy pages. + if ( 'edit-tags' !== get_current_screen()->base ) { + return; + } + + echo ''; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-settings-fields.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-settings-fields.php new file mode 100644 index 00000000..122cafc7 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-settings-fields.php @@ -0,0 +1,126 @@ +translate_meta_options(); + } + + /** + * Returns array with the fields for the general tab + * + * @return array + */ + public function get() { + $fields = array( + 'metakey' => $this->get_field_config( + __( 'Meta keywords', 'wordpress-seo' ), + esc_html__( 'Meta keywords used on the archive page for this term.', 'wordpress-seo' ), + 'text', + '', + $this->options['usemetakeywords'] !== true + ), + 'canonical' => $this->get_field_config( + __( 'Canonical', 'wordpress-seo' ), + esc_html__( 'The canonical link is shown on the archive page for this term.', 'wordpress-seo' ) + ), + 'bctitle' => $this->get_field_config( + __( 'Breadcrumbs title', 'wordpress-seo' ), + /* translators: %s expands to the taxonomy name */ + sprintf( esc_html__( 'The Breadcrumbs title is used in the breadcrumbs where this %s appears.', 'wordpress-seo' ), $this->term->taxonomy ), + 'text', + '', + $this->options['breadcrumbs-enable'] !== true + ), + 'noindex' => $this->get_field_config( + /* translators: %s expands to taxonomy name */ + sprintf( __( 'Noindex this %s', 'wordpress-seo' ), $this->term->taxonomy ), + /* translators: %s expands to taxonomy name */ + sprintf( esc_html__( 'This %s follows the indexation rules set under Metas and Titles, you can override it here.', 'wordpress-seo' ), $this->term->taxonomy ), + 'select', + $this->get_noindex_options() + ), + 'sitemap_include' => $this->get_field_config( + /* translators: %1$s expands to the taxonomy name */ + sprintf( __( 'Include %1$s in sitemap?', 'wordpress-seo' ), $this->term->taxonomy ), + '', + 'select', + $this->sitemap_include_options + ), + ); + + return $this->filter_hidden_fields( $fields ); + } + + /** + * Translate options text strings for use in the select fields + * + * @internal IMPORTANT: if you want to add a new string (option) somewhere, make sure you add + * that array key to the main options definition array in the class WPSEO_Taxonomy_Meta() as well!!!! + */ + private function translate_meta_options() { + $this->no_index_options = WPSEO_Taxonomy_Meta::$no_index_options; + $this->sitemap_include_options = WPSEO_Taxonomy_Meta::$sitemap_include_options; + + /* translators: %s$s expands to the taxonomy name and %2$s to the current index value */ + $this->no_index_options['default'] = __( 'Use %1$s default (Currently: %2$s)', 'wordpress-seo' ); + $this->no_index_options['index'] = __( 'Always index', 'wordpress-seo' ); + $this->no_index_options['noindex'] = __( 'Always noindex', 'wordpress-seo' ); + + $this->sitemap_include_options['-'] = __( 'Auto detect', 'wordpress-seo' ); + $this->sitemap_include_options['always'] = __( 'Always include', 'wordpress-seo' ); + $this->sitemap_include_options['never'] = __( 'Never include', 'wordpress-seo' ); + } + + /** + * Getting the data for the noindex fields + * + * @return array + */ + private function get_noindex_options() { + $noindex_options['options'] = $this->no_index_options; + $noindex_options['options']['default'] = sprintf( $noindex_options['options']['default'], $this->term->taxonomy, $this->get_robot_index() ); + + if ( get_option( 'blog_public' ) === '0' ) { + $noindex_options['description'] = '
' . esc_html__( 'Warning: even though you can set the meta robots setting here, the entire site is set to noindex in the sitewide privacy settings, so these settings won\'t have an effect.', 'wordpress-seo' ) . ''; + } + + return $noindex_options; + } + + /** + * Returns the current robot index value for the taxonomy + * + * @return string + */ + private function get_robot_index() { + $robot_index = 'index'; + $index_option = 'noindex-tax-' . $this->term->taxonomy; + if ( isset( $this->options[ $index_option ] ) && $this->options[ $index_option ] === true ) { + $robot_index = 'noindex'; + } + + return $robot_index; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-social-fields.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-social-fields.php new file mode 100644 index 00000000..c4739967 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy-social-fields.php @@ -0,0 +1,136 @@ +networks = $this->get_social_networks(); + } + + /** + * When this method returns false, the social tab in the meta box will be hidden + * + * @return bool + */ + public function show_social() { + return ( $this->options['opengraph'] === true || $this->options['twitter'] === true || $this->options['googleplus'] === true ); + } + + /** + * Gets the social meta fields by social network for the taxonomy. + * + * @param string $network The social network for which to fetch the fields. + * + * @return array + */ + public function get_by_network( $network ) { + $settings = $this->networks[ $network ]; + + return array( + $settings['network'] . '-title' => $this->get_field_config( + /* translators: %s expands to the social network name */ + sprintf( __( '%s Title', 'wordpress-seo' ), $settings['label'] ), + /* translators: %1$s expands to the social network name */ + sprintf( esc_html__( 'If you don\'t want to use the title for sharing on %1$s but instead want another title there, write it here.', 'wordpress-seo' ), $settings['label'] ), + 'text', + array( 'class' => 'large-text' ) + ), + $settings['network'] . '-description' => $this->get_field_config( + /* translators: %s expands to the social network name */ + sprintf( __( '%s Description', 'wordpress-seo' ), $settings['label'] ), + /* translators: %1$s expands to the social network name */ + sprintf( esc_html__( 'If you don\'t want to use the meta description for sharing on %1$s but want another description there, write it here.', 'wordpress-seo' ), $settings['label'] ), + 'textarea' + ), + $settings['network'] . '-image' => $this->get_field_config( + /* translators: %s expands to the social network name */ + sprintf( __( '%s Image', 'wordpress-seo' ), $settings['label'] ), + /* translators: %1$s expands to the social network name */ + sprintf( esc_html__( 'If you want to use an image for sharing on %1$s, you can upload / choose an image or add the image URL here.', 'wordpress-seo' ), $settings['label'] ) . '
' . + /* translators: %1$s expands to the social network name, %2$s expands to the image size */ + sprintf( __( 'The recommended image size for %1$s is %2$spx.', 'wordpress-seo' ), $settings['label'], $settings['size'] ), + 'upload' + ), + ); + } + + /** + * Returning the fields for the social media tab + * + * @return array + */ + public function get() { + $fields = array(); + foreach ( $this->networks as $option => $settings ) { + $fields_to_push = $this->get_by_network( $option ); + + $fields = array_merge( $fields, $fields_to_push ); + } + + return $this->filter_hidden_fields( $fields ); + } + + /** + * Getting array with the social networks + * + * @return array + */ + private function get_social_networks() { + $social_networks = array( + 'opengraph' => $this->social_network( 'opengraph', __( 'Facebook', 'wordpress-seo' ), '1200 x 628' ), + 'twitter' => $this->social_network( 'twitter', __( 'Twitter', 'wordpress-seo' ), '1024 x 512' ), + 'googleplus' => $this->social_network( 'google-plus', __( 'Google+', 'wordpress-seo' ), '800 x 1200' ), + ); + + $social_networks = $this->filter_social_networks( $social_networks ); + + return $social_networks; + } + + /** + * Returns array with the config fields for the social network + * + * @param string $network The name of the social network. + * @param string $label The label for the social network. + * @param string $image_size The image dimensions. + * + * @return array + */ + private function social_network( $network, $label, $image_size ) { + return array( + 'network' => $network, + 'label' => $label, + 'size' => $image_size, + ); + } + + /** + * Filter the social networks which are disabled in the configuration + * + * @param array $social_networks Array with the social networks that have to be filtered. + * + * @return array + */ + private function filter_social_networks( array $social_networks ) { + foreach ( $social_networks as $social_network => $settings ) { + if ( empty( $this->options[ $social_network ] ) ) { + unset( $social_networks[ $social_network ] ); + } + } + + return $social_networks; + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy.php new file mode 100644 index 00000000..c834d509 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/taxonomy/class-taxonomy.php @@ -0,0 +1,312 @@ +taxonomy = $this->get_taxonomy(); + + if ( is_admin() && $this->taxonomy !== '' && $this->show_metabox( ) ) { + add_action( sanitize_text_field( $this->taxonomy ) . '_edit_form', array( $this, 'term_metabox' ), 90, 1 ); + } + + add_action( 'edit_term', array( $this, 'update_term' ), 99, 3 ); + + add_action( 'init', array( $this, 'custom_category_descriptions_allow_html' ) ); + add_filter( 'category_description', array( $this, 'custom_category_descriptions_add_shortcode_support' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); + } + + /** + * Show the SEO inputs for term. + * + * @param stdClass|WP_Term $term Term to show the edit boxes for. + */ + public function term_metabox( $term ) { + $metabox = new WPSEO_Taxonomy_Metabox( $this->taxonomy, $term ); + $metabox->display(); + } + + /** + * Translate options text strings for use in the select fields + * + * @internal IMPORTANT: if you want to add a new string (option) somewhere, make sure you add + * that array key to the main options definition array in the class WPSEO_Taxonomy_Meta() as well!!!! + */ + public function translate_meta_options() { + $this->no_index_options = WPSEO_Taxonomy_Meta::$no_index_options; + $this->sitemap_include_options = WPSEO_Taxonomy_Meta::$sitemap_include_options; + + $this->no_index_options['default'] = __( 'Use %s default (Currently: %s)', 'wordpress-seo' ); + $this->no_index_options['index'] = __( 'Always index', 'wordpress-seo' ); + $this->no_index_options['noindex'] = __( 'Always noindex', 'wordpress-seo' ); + + $this->sitemap_include_options['-'] = __( 'Auto detect', 'wordpress-seo' ); + $this->sitemap_include_options['always'] = __( 'Always include', 'wordpress-seo' ); + $this->sitemap_include_options['never'] = __( 'Never include', 'wordpress-seo' ); + } + + + /** + * Test whether we are on a public taxonomy - no metabox actions needed if we are not + * Unfortunately we have to hook most everything in before the point where all taxonomies are registered and + * we know which taxonomy is being requested, so we need to use this check in nearly every hooked in function. + * + * @since 1.5.0 + */ + public function admin_enqueue_scripts() { + if ( $GLOBALS['pagenow'] === 'edit-tags.php' && filter_input( INPUT_GET, 'action' ) === 'edit' ) { + wp_enqueue_media(); // Enqueue files needed for upload functionality. + + wp_enqueue_style( 'yoast-seo', plugins_url( 'css/dist/yoast-seo/yoast-seo-' . '305' . '.min.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'yoast-metabox-css', plugins_url( 'css/metabox-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'snippet', plugins_url( 'css/snippet-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'seo_score', plugins_url( 'css/yst_seo_score-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_editor( '', 'description' ); + wp_enqueue_script( 'wp-seo-metabox', plugins_url( 'js/wp-seo-metabox-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + 'jquery-ui-autocomplete', + ), WPSEO_VERSION, true ); + wp_enqueue_script( 'yoast-seo', plugins_url( 'js/dist/yoast-seo/yoast-seo-' . '305' . '.min.js', WPSEO_FILE ), null, WPSEO_VERSION, true ); + wp_enqueue_script( 'wp-seo-term-scraper', plugins_url( 'js/wp-seo-term-scraper-' . '305' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'yoast-seo' ), WPSEO_VERSION, true ); + wp_enqueue_script( 'wp-seo-replacevar-plugin', plugins_url( 'js/wp-seo-replacevar-plugin-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( 'yoast-seo', 'wp-seo-term-scraper' ), WPSEO_VERSION, true ); + wp_localize_script( 'wp-seo-term-scraper', 'wpseoTermScraperL10n', $this->localize_term_scraper_script() ); + wp_localize_script( 'wp-seo-replacevar-plugin', 'wpseoReplaceVarsL10n', $this->localize_replace_vars_script() ); + + // Always enqueue minified as it's not our code. + wp_enqueue_style( 'jquery-qtip.js', plugins_url( 'css/jquery.qtip' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), '2.2.1' ); + wp_enqueue_script( 'jquery-qtip', plugins_url( 'js/jquery.qtip.min.js', WPSEO_FILE ), array( 'jquery' ), '2.2.1', true ); + + wp_enqueue_script( 'wpseo-admin-media', plugins_url( 'js/wp-seo-admin-media-' . '302' . WPSEO_CSSJS_SUFFIX . '.js', WPSEO_FILE ), array( + 'jquery', + 'jquery-ui-core', + ), WPSEO_VERSION, true ); + wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', array( + 'choose_image' => __( 'Use Image', 'wordpress-seo' ), + ) ); + } + } + + /** + * Update the taxonomy meta data on save. + * + * @param int $term_id ID of the term to save data for. + * @param int $tt_id The taxonomy_term_id for the term. + * @param string $taxonomy The taxonomy the term belongs to. + */ + public function update_term( $term_id, $tt_id, $taxonomy ) { + /* Create post array with only our values */ + $new_meta_data = array(); + foreach ( WPSEO_Taxonomy_Meta::$defaults_per_term as $key => $default ) { + if ( $posted_value = filter_input( INPUT_POST, $key ) ) { + $new_meta_data[ $key ] = $posted_value; + } + } + unset( $key, $default ); + + // Saving the values. + WPSEO_Taxonomy_Meta::set_values( $term_id, $taxonomy, $new_meta_data ); + } + + /** + * Allows HTML in descriptions + */ + public function custom_category_descriptions_allow_html() { + $filters = array( + 'pre_term_description', + 'pre_link_description', + 'pre_link_notes', + 'pre_user_description', + ); + + foreach ( $filters as $filter ) { + remove_filter( $filter, 'wp_filter_kses' ); + } + remove_filter( 'term_description', 'wp_kses_data' ); + } + + /** + * Adds shortcode support to category descriptions. + * + * @param string $desc String to add shortcodes in. + * + * @return string + */ + public function custom_category_descriptions_add_shortcode_support( $desc ) { + // Wrap in output buffering to prevent shortcodes that echo stuff instead of return from breaking things. + ob_start(); + $desc = do_shortcode( $desc ); + ob_end_clean(); + + return $desc; + } + + /** + * Check if metabox for current taxonomy should be displayed. + * + * @return bool + */ + private function show_metabox() { + $options = WPSEO_Options::get_all(); + $option_key = 'hideeditbox-tax-' . $this->taxonomy; + + return ( empty( $options[ $option_key ] ) ); + } + + /** + * Getting the taxonomy from the URL + * + * @return string + */ + private function get_taxonomy() { + return filter_input( INPUT_GET, 'taxonomy', FILTER_DEFAULT, array( 'options' => array( 'default' => '' ) ) ); + } + + /** + * Pass variables to js for use with the term-scraper + * + * @return array + */ + public function localize_term_scraper_script() { + $translations = $this->get_scraper_translations(); + + $term_id = filter_input( INPUT_GET, 'tag_ID' ); + $term = get_term_by( 'id', $term_id, $this->get_taxonomy() ); + $focuskw = WPSEO_Taxonomy_Meta::get_term_meta( $term, $term->taxonomy, 'focuskw' ); + $taxonomy = get_taxonomy( $term->taxonomy ); + $options = WPSEO_Options::get_all(); + + $base_url = home_url( '/', null ); + if ( ! $options['stripcategorybase'] ) { + $base_url = trailingslashit( $base_url . $taxonomy->rewrite['slug'] ); + } + + return array( + 'translations' => $translations, + 'base_url' => $base_url, + 'taxonomy' => $term->taxonomy, + 'keyword_usage' => WPSEO_Taxonomy_Meta::get_keyword_usage( $focuskw, $term->term_id, $term->taxonomy ), + // Todo: a column needs to be added on the termpages to add a filter for the keyword, so this can be used in the focus kw doubles. + 'search_url' => admin_url( 'edit-tags.php?taxonomy=' . $term->taxonomy . '&seo_kw_filter={keyword}' ), + 'post_edit_url' => admin_url( 'edit-tags.php?action=edit&taxonomy=' . $term->taxonomy . '&tag_ID={id}' ), + 'title_template' => WPSEO_Taxonomy::get_title_template( $term ), + 'metadesc_template' => WPSEO_Taxonomy::get_metadesc_template( $term ), + 'contentTab' => __( 'Content:', 'wordpress-seo' ), + 'locale' => get_locale(), + ); + } + + /** + * Retrieves the title template. + * + * @param object $term taxonomy term. + * + * @return string + */ + public static function get_title_template( $term ) { + $options = get_option( 'wpseo_titles' ); + $title_template = ''; + if ( is_object( $term ) && property_exists( $term, 'taxonomy' ) ) { + $needed_option = 'title-tax-' . $term->taxonomy; + if ( isset( $options[ $needed_option ] ) && $options[ $needed_option ] !== '' ) { + $title_template = $options[ $needed_option ]; + } + } + return $title_template; + } + + /** + * Retrieves the metadesc template. + * + * @param object $term taxonomy term. + * + * @return string + */ + public static function get_metadesc_template( $term ) { + $options = get_option( 'wpseo_titles' ); + $metadesc_template = ''; + if ( is_object( $term ) && property_exists( $term, 'taxonomy' ) ) { + $needed_option = 'metadesc-tax-' . $term->taxonomy; + if ( isset( $options[ $needed_option ] ) && $options[ $needed_option ] !== '' ) { + $metadesc_template = $options[ $needed_option ]; + } + } + return $metadesc_template; + } + + /** + * Pass some variables to js for replacing variables. + */ + public function localize_replace_vars_script() { + return array( + 'no_parent_text' => __( '(no parent)', 'wordpress-seo' ), + 'replace_vars' => $this->get_replace_vars(), + ); + } + + /** + * Prepares the replace vars for localization. + * + * @return array replace vars. + */ + private function get_replace_vars() { + $term_id = filter_input( INPUT_GET, 'tag_ID' ); + $term = get_term_by( 'id', $term_id, $this->get_taxonomy() ); + $cached_replacement_vars = array(); + + $vars_to_cache = array( + 'date', + 'id', + 'sitename', + 'sitedesc', + 'sep', + 'page', + 'currenttime', + 'currentdate', + 'currentday', + 'currentmonth', + 'currentyear', + 'term_title', + 'term_description', + 'category_description', + 'tag_description', + 'searchphrase', + ); + + foreach ( $vars_to_cache as $var ) { + $cached_replacement_vars[ $var ] = wpseo_replace_vars( '%%' . $var . '%%', $term ); + } + + return $cached_replacement_vars; + } + + /** + * Returns Jed compatible YoastSEO.js translations. + * + * @return array + */ + private function get_scraper_translations() { + $file = plugin_dir_path( WPSEO_FILE ) . 'languages/wordpress-seo-' . get_locale() . '.json'; + if ( file_exists( $file ) && $file = file_get_contents( $file ) ) { + return json_decode( $file, true ); + } + return array(); + } + +} /* End of class */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/about.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/about.php index fa898880..9a7a6fdb 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/about.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/about.php @@ -1,3 +1,234 @@ +<<<<<<< .mine + $dev ) { + echo '
'; + echo ''; + echo '', $dev->name, ''; + echo '', $dev->role, '
'; + } +} + +?> + +
+ +
+ +
+ Yoast SEO 3.0 is about feedback. Feedback on what you can do to improve your site and your post(s). + Feedback when you are doing what you should be doing: writing awesome content. +
+ +
+ +
+ + + + +
+ +
+ +
Real time content analysis
+ +
No longer will you have to save your post or page for the content analysis to update, it'll be there in real + time. Which is also why it's now in plain sight all the time.
+ +
+ + + +
+
+
+
+
+
+
+ +
+
+
+ +
+
A snippet editor
+ +
Our snippet preview got turned into a snippet editor. Click it, modify it, make it work. With instant + inline feedback when it's too long and the content analysis updating straight away too.
+
+
+
+ +
+
Is your site indexable?
+ +
in collaboration with our friends at OnPage.org + we now give you an indexability check for your site. It automatically tells you whether your site + can be indexed by search engines and will alert you when that changes.
+
+
+
+ +
+
Supercharged categories
+ +
We've supercharged categories and tags: we've given them a snippet editor, social meta fields, etc. + The entire post experience in Yoast SEO is now available for categories and tags too. Using custom + taxonomies? Cool, we support those too!
+
+
+
+ +
+
WordPress 4.4? We're ready!
+ +
+ WordPress 4.4 is nearing completion. We've tested Yoast SEO extensively with it, and we're ready. + With the new embeds functionality, our canonical URLs just work. Without you needing to do anything. +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ ', '', 'Yoast SEO' ); + echo ' '; + printf( __( 'Want to help us develop? Read our %1$scontribution guidelines%2$s!', 'wordpress-seo' ), '', '' ); + ?> +
+ +
+
+ (object) array( + 'name' => 'Joost de Valk', + 'role' => __( 'Project Lead', 'wordpress-seo' ), + 'gravatar' => 'f08c3c3253bf14b5616b4db53cea6b78', + ), + 'omarreiss' => (object) array( + 'name' => 'Omar Reiss', + 'role' => __( 'Lead Architect', 'wordpress-seo' ), + 'gravatar' => '86aaa606a1904e7e0cf9857a663c376e', + ), + 'atimmer' => (object) array( + 'name' => 'Anton Timmermans', + 'role' => __( 'Architect', 'wordpress-seo' ), + 'gravatar' => 'b3acbabfdd208ecbf950d864b86fe968', + ), + 'tacoverdo' => (object) array( + 'name' => 'Taco Verdonschot', + 'role' => __( 'QA & Translations Manager', 'wordpress-seo' ), + 'gravatar' => 'd2d3ecb38cacd521926979b5c678297b', + ), + ); + + wpseo_display_contributors( $leaders ); + ?> +
+
+
+ (object) array( + 'name' => 'Caroline Geven', + 'role' => __( 'Developer', 'wordpress-seo' ), + 'gravatar' => 'f2596a568c3974e35f051266a63d791f', + ), + 'jrfnl' => (object) array( + 'name' => 'Juliette Reinders Folmer', + 'role' => __( 'Developer', 'wordpress-seo' ), + 'gravatar' => 'cbbac3e529102364dc3b026af3cc2988', + ), + 'terw-dan' => (object) array( + 'name' => 'Danny Terwindt', + 'role' => __( 'Developer', 'wordpress-seo' ), + 'gravatar' => '20a04b0736e630e80ce2dbefe3f1d62f', + ), + 'garyjones' => (object) array( + 'name' => 'Gary Jones', + 'role' => 'Developer, QA & Accessibility', + 'gravatar' => 'f00cf4e7f02e10152f60ec3507fa8ba8', + ), + 'andizer' => (object) array( + 'name' => 'Andy Meerwaldt', + 'role' => __( 'Developer', 'wordpress-seo' ), + 'gravatar' => 'a9b43e766915b48031eab78f9916ca8e', + ), + 'rarst' => (object) array( + 'name' => 'Andrey Savchenko', + 'role' => 'For the 100+ fixes that didn\'t make the about page', + 'gravatar' => 'c445c2491f9f55409b2e4dccee357961', + ), + 'boblinthorst' => (object) array( + 'name' => 'Bob Linthorst', + 'role' => 'For testing ridiculously hard', + 'gravatar' => '8063b1955f54681ef3a2deb21972faa1', + ), + 'diedexx' => (object) array( + 'name' => 'Diede Exterkate', + 'role' => 'For testing ridiculously hard', + 'gravatar' => '59908788f406037240ee011388db29f8', + ), + + ); + + wpseo_display_contributors( $contributors ); + ?> +
+
+ 'https://github.com/danielhomer', + ); + ?> +
We're always grateful for patches from non-regular contributors, in Yoast SEO 3.0, patches from + the + following people made it in:
+
+ $link ) { + echo '
', $patcher, '
'; + } + ?> +
+
+
+||||||| .r0 +======= +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/dashboard-widget.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/dashboard-widget.php index 8b582da4..a61875ad 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/dashboard-widget.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/dashboard-widget.php @@ -1,3 +1,108 @@ +<<<<<<< .mine + +
+
' . $label . $help . ' ' . $field . '

+ + + + + + +
+
+ + + + + +
+ +
+
+ +
+
'; + _e( 'Your homepage can be indexed by search engines.', 'wordpress-seo' ); + + break; + case WPSEO_OnPage_Option::IS_NOT_INDEXABLE : + echo '
'; + printf( + /* translators: 1: opens a link to a related knowledge base article. 2: closes the link */ + __( '%1$sYour homepage cannot be indexed by search engines%2$s. This is very bad for SEO and should be fixed.', 'wordpress-seo' ), + '', + '' + ); + break; + case WPSEO_OnPage_Option::CANNOT_FETCH : + echo '
'; + printf( + /* translators: 1: opens a link to a related knowledge base article. 2: closes the link */ + __( 'Yoast SEO has %1$snot been able to fetch your siteâs indexability status%2$s from OnPage.org', 'wordpress-seo' ), + '', + '' + ); + break; + case WPSEO_OnPage_Option::NOT_FETCHED : + echo '
'; + printf( + /* translators: 1: opens a link to a related knowledge base article. 2: closes the link */ + __( 'Yoast SEO has %1$snot fetched your siteâs indexability status%2$s yet from OnPage.org', 'wordpress-seo' ), + '', + '' + ); + break; + endswitch; + + echo '
'; + + if ( $onpage['indexable'] !== WPSEO_OnPage_Option::IS_INDEXABLE && $onpage['can_fetch'] ) : + echo '' . __( 'Fetch the current status', 'wordpress-seo' ) . ' '; + endif; + + + echo '' . __( 'Analyze entire site', 'wordpress-seo' ) . ' '; + ?> +
+
+ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tab-permalinks.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tab-permalinks.php index cf046177..e021eb2d 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tab-permalinks.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tab-permalinks.php @@ -1,3 +1,62 @@ +<<<<<<< .mine +currentoption = 'wpseo_permalinks'; + +echo '
', __( 'Change URLs', 'wordpress-seo' ), '
'; + +/* translators: %s expands to /category/ */ +$yform->checkbox( 'stripcategorybase', sprintf( __( 'Strip the category base (usually %s) from the category URL.', 'wordpress-seo' ), '/category/' ) ); + +echo '
' . __( 'Attachments to posts are stored in the database as posts, this means they\'re accessible under their own URL\'s if you do not redirect them, enabling this will redirect them to the post they were attached to.', 'wordpress-seo' ) . '
'; +$yform->checkbox( 'redirectattachment', __( 'Redirect attachment URL\'s to parent post URL.', 'wordpress-seo' ) ); + +echo '
', __( 'Clean up permalinks', 'wordpress-seo' ), '
'; +echo '
' . __( 'This helps you to create cleaner URLs by automatically removing the stopwords from them.', 'wordpress-seo' ) . '
'; +$yform->checkbox( 'cleanslugs', __( 'Remove stop words from slugs.', 'wordpress-seo' ) ); + +echo '
' . __( 'This prevents threaded replies from working when the user has JavaScript disabled, but on a large site can mean a huge improvement in crawl efficiency for search engines when you have a lot of comments.', 'wordpress-seo' ) . '
'; + +/* translators: %s expands to ?replytocom */ +$yform->checkbox( 'cleanreplytocom', sprintf( __( 'Remove the %s variables.', 'wordpress-seo' ), '?replytocom' ) ); + +/* translators: %s expands to .html */ +echo '
' . sprintf( __( 'If you choose a permalink for your posts with %1$s, or anything else but a %2$s at the end, this will force WordPress to add a trailing slash to non-post pages nonetheless.', 'wordpress-seo' ), '.html', '/' ) . '
'; +$yform->checkbox( 'trailingslash', __( 'Enforce a trailing slash on all category and tag URL\'s', 'wordpress-seo' ) ); + +echo '
' . __( 'People make mistakes in their links towards you sometimes, or unwanted parameters are added to the end of your URLs, this allows you to redirect them all away. Please note that while this is a feature that is actively maintained, it is known to break several plugins, and should for that reason be the first feature you disable when you encounter issues after installing this plugin.', 'wordpress-seo' ) . '
'; +$yform->checkbox( 'cleanpermalinks', __( 'Redirect ugly URL\'s to clean permalinks. (Not recommended in many cases!)', 'wordpress-seo' ) ); + +echo '
'; +echo '
' . __( 'Google Site Search URL\'s look weird, and ugly, but if you\'re using Google Site Search, you probably do not want them cleaned out.', 'wordpress-seo' ) . '
'; +$yform->checkbox( 'cleanpermalink-googlesitesearch', __( 'Prevent cleaning out Google Site Search URL\'s.', 'wordpress-seo' ) ); + +/* translators: %s expands to ?utm_ */ +echo '
' . sprintf( __( 'If you use Google Analytics campaign parameters starting with %s, check this box. However, you\'re advised not to use these. Instead, use the version with a hash.', 'wordpress-seo' ), '?utm_' ) . '
'; +$yform->checkbox( 'cleanpermalink-googlecampaign', __( 'Prevent cleaning out Google Analytics Campaign & Google AdWords Parameters.', 'wordpress-seo' ) ); + +echo '
' . __( 'You might have extra variables you want to prevent from cleaning out, add them here, comma separated.', 'wordpress-seo' ) . '
'; +$yform->textinput( 'cleanpermalink-extravars', __( 'Other variables not to clean', 'wordpress-seo' ) ); +echo '
'; + +/* translators: %s expands to <head> */ +echo '
', sprintf( __( 'Clean up the %s', 'wordpress-seo' ), '<head>' ), '
'; +$yform->checkbox( 'hide-rsdlink', __( 'Hide RSD Links', 'wordpress-seo' ) ); +$yform->checkbox( 'hide-wlwmanifest', __( 'Hide WLW Manifest Links', 'wordpress-seo' ) ); +$yform->checkbox( 'hide-shortlink', __( 'Hide Shortlink for posts', 'wordpress-seo' ) ); +$yform->checkbox( 'hide-feedlinks', __( 'Hide RSS Links', 'wordpress-seo' ) ); +||||||| .r0 +======= checkbox( 'hide-rsdlink', __( 'Hide RSD Links', 'wordpress-seo' ) ); $yform->checkbox( 'hide-wlwmanifest', __( 'Hide WLW Manifest Links', 'wordpress-seo' ) ); $yform->checkbox( 'hide-shortlink', __( 'Hide Shortlink for posts', 'wordpress-seo' ) ); $yform->checkbox( 'hide-feedlinks', __( 'Hide RSS Links', 'wordpress-seo' ) ); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-file-editor.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-file-editor.php index 3bd13710..ee512837 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-file-editor.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-file-editor.php @@ -1,3 +1,148 @@ +<<<<<<< .mine +
', esc_html( $msg ), '
'; +} + +if ( is_multisite() ) { + $action_url = network_admin_url( 'admin.php?page=wpseo_files' ); +} +else { + $action_url = admin_url( 'admin.php?page=wpseo_tools&tool=file-editor' ); +} + +echo '
', __( 'Robots.txt', 'wordpress-seo' ), '
'; + +if ( ! file_exists( $robots_file ) ) { + if ( is_writable( get_home_path() ) ) { + echo '
'; + wp_nonce_field( 'wpseo_create_robots', '_wpnonce', true, true ); + echo '
', __( 'You don\'t have a robots.txt file, create one here:', 'wordpress-seo' ), '
'; + echo ''; + echo '
'; + } + else { + echo '
', __( 'If you had a robots.txt file and it was editable, you could edit it from here.', 'wordpress-seo' ), '
'; + } +} +else { + $f = fopen( $robots_file, 'r' ); + + $content = ''; + if ( filesize( $robots_file ) > 0 ) { + $content = fread( $f, filesize( $robots_file ) ); + } + $robots_txt_content = esc_textarea( $content ); + + if ( ! is_writable( $robots_file ) ) { + echo '
', __( 'If your robots.txt were writable, you could edit it from here.', 'wordpress-seo' ), '
'; + echo '', $robots_txt_content, '
'; + } + else { + echo '
'; + wp_nonce_field( 'wpseo-robotstxt', '_wpnonce', true, true ); + echo '
', __( 'Edit the content of your robots.txt:', 'wordpress-seo' ), '
'; + echo '', $robots_txt_content, '
'; + echo '
'; + echo '
'; + } +} +if ( ( isset( $_SERVER['SERVER_SOFTWARE'] ) && stristr( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) === false ) ) { + + echo '
', __( '.htaccess file', 'wordpress-seo' ), '
'; + + if ( file_exists( $ht_access_file ) ) { + $f = fopen( $ht_access_file, 'r' ); + + $contentht = ''; + if ( filesize( $ht_access_file ) > 0 ) { + $contentht = fread( $f, filesize( $ht_access_file ) ); + } + $contentht = esc_textarea( $contentht ); + + if ( ! is_writable( $ht_access_file ) ) { + echo '
', __( 'If your .htaccess were writable, you could edit it from here.', 'wordpress-seo' ), '
'; + echo '', $contentht, '
'; + } + else { + echo '
'; + wp_nonce_field( 'wpseo-htaccess', '_wpnonce', true, true ); + echo '
', __( 'Edit the content of your .htaccess:', 'wordpress-seo' ), '
'; + echo '', $contentht, '
'; + echo '
'; + echo '
'; + } + } + else { + echo '
', __( 'If you had a .htaccess file and it was editable, you could edit it from here.', 'wordpress-seo' ), '
'; + } +} +||||||| .r0 +======= ', __( 'If you had a .htaccess file and it was editable, you could edit it from here.', 'wordpress-seo' ), '
'; } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-import-export.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-import-export.php index ac32a5e6..f4c926d3 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-import-export.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/admin/views/tool-import-export.php @@ -1,3 +1,207 @@ +<<<<<<< .mine + testers] Extensively test the export & import of the (new) settings! + * If that all works fine, getting testers to export before and after upgrade will make testing easier. + * + * @todo [Yoast] The import for the RSS Footer plugin checks for data already entered via Yoast SEO, + * the other import routines should do that too. + */ + +$yform = Yoast_Form::get_instance(); + +$replace = false; + +/** + * The import method is used to dermine if there should be something imported. + * + * In case of POST the user is on the Yoast SEO import page and in case of the GET the user sees a notice from + * Yoast SEO that we can import stuff for that plugin. + */ +if ( filter_input( INPUT_POST, 'import' ) || filter_input( INPUT_GET, 'import' ) ) { + + check_admin_referer( 'wpseo-import' ); + + $post_wpseo = filter_input( INPUT_POST, 'wpseo', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY ); + $replace = ( ! empty( $post_wpseo['deleteolddata'] ) && $post_wpseo['deleteolddata'] === 'on' ); + + if ( ! empty( $post_wpseo['importwoo'] ) ) { + $import = new WPSEO_Import_WooThemes_SEO( $replace ); + } + + if ( ! empty( $post_wpseo['importaioseo'] ) || filter_input( INPUT_GET, 'importaioseo' ) ) { + $import = new WPSEO_Import_AIOSEO( $replace ); + } + + if ( ! empty( $post_wpseo['importheadspace'] ) ) { + $import = new WPSEO_Import_External( $replace ); + $import->import_headspace(); + } + + if ( ! empty( $post_wpseo['importwpseo'] ) || filter_input( INPUT_GET, 'importwpseo' ) ) { + $import = new WPSEO_Import_WPSEO( $replace ); + } + + if ( ! empty( $post_wpseo['importrobotsmeta'] ) || filter_input( INPUT_GET, 'importrobotsmeta' ) ) { + $import = new WPSEO_Import_External( $replace ); + $import->import_robots_meta(); + } + + if ( ! empty( $post_wpseo['importrssfooter'] ) ) { + $import = new WPSEO_Import_External( $replace ); + $import->import_rss_footer(); + } + + if ( ! empty( $post_wpseo['importbreadcrumbs'] ) ) { + $import = new WPSEO_Import_External( $replace ); + $import->import_yoast_breadcrumbs(); + } + + // Allow custom import actions. + do_action( 'wpseo_handle_import' ); + +} + +if ( isset( $_FILES['settings_import_file'] ) ) { + check_admin_referer( 'wpseo-import-file' ); + + $import = new WPSEO_Import(); +} + +if ( isset( $import ) ) { + /** + * Allow customization of import&export message + * @api string $msg The message. + */ + $msg = apply_filters( 'wpseo_import_message', $import->msg ); + + // Check if we've deleted old data and adjust message to match it. + if ( $replace ) { + $msg .= ' ' . __( 'The old data of the imported plugin was deleted successfully.', 'wordpress-seo' ); + } + + if ( $msg != '' ) { + echo '
', $msg, '
'; + } +} + +?> +

+
+ + + + + +
+ +
+
settings.zip and clicking "Import settings"', 'wordpress-seo' ); ?>
+ +
+ + +
+
+ +
+
+ +
+
+ checkbox( 'include_taxonomy_meta', __( 'Include Taxonomy Metadata', 'wordpress-seo' ) ); ?>
+ + +
+ +
+
+ +
', '' ); ?>
+ +
+ checkbox( 'importheadspace', __( 'Import from HeadSpace2?', 'wordpress-seo' ) ); + $yform->checkbox( 'importaioseo', __( 'Import from All-in-One SEO?', 'wordpress-seo' ) ); + $yform->checkbox( 'importwoo', __( 'Import from WooThemes SEO framework?', 'wordpress-seo' ) ); + $yform->checkbox( 'importwpseo', __( 'Import from wpSEO', 'wordpress-seo' ) ); + ?> +
+ checkbox( 'deleteolddata', __( 'Delete the old data after import? (recommended)', 'wordpress-seo' ) ); + ?> +
+ +
+
+
+
+ +
+
+ +
+ checkbox( 'importrobotsmeta', __( 'Import from Robots Meta (by Yoast)?', 'wordpress-seo' ) ); + $yform->checkbox( 'importrssfooter', __( 'Import from RSS Footer (by Yoast)?', 'wordpress-seo' ) ); + $yform->checkbox( 'importbreadcrumbs', __( 'Import from Yoast Breadcrumbs?', 'wordpress-seo' ) ); + + /** + * Allow option of importing from other 'other' plugins + * @api string $content The content containing all import and export methods + */ + echo apply_filters( 'wpseo_import_other_plugins', '' ); + + ?> +
+ +
+
+
+>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/bower.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/bower.json new file mode 100644 index 00000000..dcc63740 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/bower.json @@ -0,0 +1,34 @@ +{ + "name": "yoast-wordpress-seo", + "version": "3.0.5", + "homepage": "https://github.com/Yoast/wordpress-seo", + "authors": [ + "Yoast.com" + ], + "dependencies": { + "yoast-seo": "https://github.com/Yoast/YoastSEO.js.git#master" + }, + "install": { + "path": { + "css": "css/dist", + "js": "js/dist", + "png": "css/dist" + }, + "sources": { + "yoast-seo": { + "mapping": [ + {"bower_components/yoast-seo/dist/yoast-seo.min.css": "yoast-seo-305.min.css"}, + {"bower_components/yoast-seo/dist/images/editicon.png": "editicon.png"}, + {"bower_components/yoast-seo/dist/yoast-seo.min.js": "yoast-seo-305.min.js"} + ] + } + } + }, + "description": "Yoast SEO for WordPress", + "keywords": [ + "SEO", + "WordPress", + "Text analysis" + ], + "license": "GPLv3" +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.css new file mode 100644 index 00000000..c705f60a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.css @@ -0,0 +1,33 @@ +.wpseo-score-icon { + display: inline-block !important; + float: left; + width: 12px !important; + height: 12px !important; + margin: 10px 10px 0 4px !important; + border-radius: 50% !important; + background-color: #999; +} + +.wpseo-score-icon.good { + background-color: #7ad03a; +} + +.wpseo-score-icon.ok { + background-color: #ee7c1b; +} + +.wpseo-score-icon.bad { + background-color: #dd3d36; +} + +.wpseo-score-icon.na { + background-color: #999; +} + +.wpseo-score-icon.noindex { + background-color: #1e8cbe; +} + +#wp-admin-bar-wpseo-menu:hover .wpseo-score-icon { + background-color: #2ea2cc; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.min.css new file mode 100644 index 00000000..e93fbd29 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/adminbar-302.min.css @@ -0,0 +1 @@ +.wpseo-score-icon{display:inline-block!important;float:left;width:12px!important;height:12px!important;margin:10px 10px 0 4px!important;border-radius:50%!important;background-color:#999}.wpseo-score-icon.good{background-color:#7ad03a}.wpseo-score-icon.ok{background-color:#ee7c1b}.wpseo-score-icon.bad{background-color:#dd3d36}.wpseo-score-icon.na{background-color:#999}.wpseo-score-icon.noindex{background-color:#1e8cbe}#wp-admin-bar-wpseo-menu:hover .wpseo-score-icon{background-color:#2ea2cc} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.css new file mode 100644 index 00000000..6802cbe9 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.css @@ -0,0 +1,74 @@ +.wpseo-score-icon { + display: inline-block; + width: 12px; + height: 12px; + margin: 3px 10px 0 3px; + border-radius: 50%; + background: #888; + vertical-align: top; +} + +.wpseo-score-icon.good { + background-color: #7ad03a; +} + +.wpseo-score-icon.ok { + background-color: #ee7c1b; +} + +.wpseo-score-icon.bad { + background-color: #dd3d36; +} + +.wpseo-score-icon.na { + background-color: #888; +} + +.wpseo-score-icon.noindex { + background-color: #1e8cbe; +} + +#wpseo-dashboard-overview th { + font-weight: 400; + text-align: left; +} + +#wpseo-dashboard-overview th:after { + color: #0073aa; + /* » */ + content: "\bb"; +} + +#wpseo-dashboard-overview .post-count { + padding: 0 0 0 10px; + text-align: right; +} + +#wpseo-dashboard-overview .onpage { + margin: 5px 0 0; + padding: 10px 0 0; + border-top: 1px solid #eee; +} + +#wpseo-dashboard-overview .onpage > div { + margin-top: 5px; +} + +#wpseo-dashboard-overview .onpage .button { + clear: both; + margin-top: 5px; +} + +#wpseo-dashboard-overview .onpage .button.landing-page { + border-color: #658435; + color: #fff; + background: #81a844; + box-shadow: inset 0 1px 0 #a5c672, 0 1px 0 rgba(0, 0, 0, 0.15); +} + +#wpseo-dashboard-overview .onpage .button.landing-page:hover { + border-color: #57722e; + color: #fff; + background: #73963d; + box-shadow: inset 0 1px 0 #9abf60; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.min.css new file mode 100644 index 00000000..c76c638c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dashboard-305.min.css @@ -0,0 +1 @@ +.wpseo-score-icon{display:inline-block;width:12px;height:12px;margin:3px 10px 0 3px;border-radius:50%;background:#888;vertical-align:top}.wpseo-score-icon.good{background-color:#7ad03a}.wpseo-score-icon.ok{background-color:#ee7c1b}.wpseo-score-icon.bad{background-color:#dd3d36}.wpseo-score-icon.na{background-color:#888}.wpseo-score-icon.noindex{background-color:#1e8cbe}#wpseo-dashboard-overview th{font-weight:400;text-align:left}#wpseo-dashboard-overview th:after{color:#0073aa;content:"\bb"}#wpseo-dashboard-overview .post-count{padding:0 0 0 10px;text-align:right}#wpseo-dashboard-overview .onpage{margin:5px 0 0;padding:10px 0 0;border-top:1px solid #eee}#wpseo-dashboard-overview .onpage>div{margin-top:5px}#wpseo-dashboard-overview .onpage .button{clear:both;margin-top:5px}#wpseo-dashboard-overview .onpage .button.landing-page{border-color:#658435;color:#fff;background:#81a844;box-shadow:inset 0 1px 0 #a5c672,0 1px 0 rgba(0,0,0,.15)}#wpseo-dashboard-overview .onpage .button.landing-page:hover{border-color:#57722e;color:#fff;background:#73963d;box-shadow:inset 0 1px 0 #9abf60} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/editicon.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/editicon.png new file mode 100644 index 00000000..2463f1b2 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/editicon.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/yoast-seo-305.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/yoast-seo-305.min.css new file mode 100644 index 00000000..175a9a69 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/dist/yoast-seo/yoast-seo-305.min.css @@ -0,0 +1 @@ +#snippet_preview [contenteditable=true]:hover{background:url(editicon.png) right top no-repeat #bbdefb;cursor:pointer}#snippet_preview [contenteditable=false]:hover{cursor:auto}#snippet_preview [contenteditable=true]:focus{background:#bbdefb;cursor:text}#snippet_cite{min-width:20px}#meta_container{clear:both}.snippet_container .title{color:#1e0fbe;display:block;overflow:hidden;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;width:512px;font-size:18px;line-height:1.2;font-weight:400;margin:0}.desc,.snippet_container .url{font-size:13px;line-height:1.4;display:block}.snippet_container .url{font-size:14px;line-height:16px;color:#006621;font-style:normal}.snippet_container .urlBase{float:left}.snippet_container .desc-default{color:#333}.snippet_container .desc-render{color:#777}.snippet_container .tooLong{color:red!important}.wpseoanalysis{padding-right:0}.wpseo-score-text{display:inline-block;width:90%}.wpseo-score-icon{display:inline-block;width:12px;height:12px;margin:3px 10px 0 3px;border-radius:50%;background:#888;vertical-align:top}.wpseo-score-icon.good{background-color:#7ad03a}.wpseo-score-icon.ok{background-color:#ee7c1b}.wpseo-score-icon.bad{background-color:#dd3d36}.wpseo-score-icon.na{background-color:#999}.wpseo-score-icon.noindex{background-color:#1e8cbe}li.score{list-style-type:none!important}.screen-reader-text{clip:rect(1px,1px,1px,1px);position:absolute!important;height:1px;width:1px;overflow:hidden}#overallScore #score_circle{fill:#999}#overallScore #score_circle_shadow{fill:#777}#overallScore.good #score_circle{fill:#9fda4f}#overallScore.good #score_circle_shadow{fill:#77b227}#overallScore.ok #score_circle{fill:#ffb81e}#overallScore.ok #score_circle_shadow{fill:#f49a00}#overallScore.bad #score_circle{fill:#ff4e47}#overallScore.bad #score_circle_shadow{fill:#ed261f}.YoastSEO_msg .left,.YoastSEO_msg .right{display:none}@keyframes animatedBackground{from{background-position:0 0}to{background-position:100% 0}}.YoastSEO_msg .bufferbar{display:block;width:100%;height:12px;background-image:-webkit-linear-gradient(left,#fff,#0063ff,#fff,#0063ff);background-image:-moz-linear-gradient(left,#fff,#0063ff,#fff,#0063ff);background-image:-ms-linear-gradient(left,#fff,#0063ff,#fff,#0063ff);background-image:-o-linear-gradient(left,#fff,#0063ff,#fff,#0063ff);background-size:300% 100%;background-position:0 0;margin:10px 0;border:1px solid #dfdfdf;animation:animatedBackground 5s linear infinite} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.css new file mode 100644 index 00000000..d3d9d357 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.css @@ -0,0 +1,42 @@ +.wpseo-score-icon { + display: inline-block; + width: 12px; + height: 12px; + margin-left: 6px; + border-radius: 50%; + background: #888; + line-height: 16px; +} + +.wpseo-score-icon.good { + background-color: #7ad03a; +} + +.wpseo-score-icon.ok { + background-color: #ee7c1b; +} + +.wpseo-score-icon.bad { + background-color: #dd3d36; +} + +.wpseo-score-icon.na { + background-color: #888; +} + +.wpseo-score-icon.noindex { + background-color: #1e8cbe; +} + +th#wpseo-score { + width: 63px; +} + +@media screen and ( max-width: 782px ) { + .column-wpseo-title, + .column-wpseo-score, + .column-wpseo-metadesc, + .column-wpseo-focuskw { + display: none; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.min.css new file mode 100644 index 00000000..daa9c695 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/edit-page-302.min.css @@ -0,0 +1 @@ +.wpseo-score-icon{display:inline-block;width:12px;height:12px;margin-left:6px;border-radius:50%;background:#888;line-height:16px}.wpseo-score-icon.good{background-color:#7ad03a}.wpseo-score-icon.ok{background-color:#ee7c1b}.wpseo-score-icon.bad{background-color:#dd3d36}.wpseo-score-icon.na{background-color:#888}.wpseo-score-icon.noindex{background-color:#1e8cbe}th#wpseo-score{width:63px}@media screen and (max-width:782px){.column-wpseo-focuskw,.column-wpseo-metadesc,.column-wpseo-score,.column-wpseo-title{display:none}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.css new file mode 100644 index 00000000..bb4caec7 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.css @@ -0,0 +1,420 @@ +/** + * Lines below came from metabox-tabs.css + * + * Metabox Tabs + */ + +ul.wpseo-metabox-tabs { + display: none; + margin-top: 12px; + margin-bottom: 3px; +} + +.wpseo-metabox-tabs-div ul { + list-style: none; +} + +ul.wpseo-metabox-tabs li.active { + background-color: #fdfdfd; +} + +.wpseo-meta-section { + display: none; + width: 90%; +} + +.wpseo-meta-section.active { + display: inline-block; +} + +.wpseo-metabox-sidebar { + display: inline-block; + width: 40px; + padding: 5px; + background-color: #fff; + vertical-align: top; +} + +.wpseo-metabox-sidebar li span { + margin-left: -5px; + padding-left: 5px; + border-width: 0 0 0 3px; + border-style: solid; + border-color: transparent; + border-radius: 3px; +} + +.wpseo-metabox-sidebar li.active span { + border-color: #333; + color: #333; +} + +ul.wpseo-metabox-tabs li { + display: inline; + margin-right: 5px; + padding: 5px; + border-width: 1px 1px 0; + border-style: solid solid none; + border-color: #dfdfdf; +} + +.wpseotab.active { + display: block; + overflow: auto; + padding: 0.5em 0.9em; + border: 1px solid #ddd; + background-color: #fdfdfd; +} + +.wpseo-metabox-tabs a { + text-decoration: none; +} + +.wpseo-metabox-tabs a .dashicons { + width: 16px; + height: 16px; + font-size: 16px; +} + +.wpseo-metabox-sidebar .dashicons { + width: 30px; + height: 30px; + font-size: 30px; +} + +.wpseo-metabox-sidebar a { + font-size: 20px; + line-height: 30px; + text-decoration: none; +} + +.wpseo-metabox-sidebar li { + padding: 5px; +} + +.wpseo-metabox-tabs-div div.wpseo-tabs-panel { + overflow: auto; + padding: 0.5em 0.9em; + border: 1px solid; +} + +.wpseo-heading { + padding-left: 10px; +} + +.wpseotab { + display: none; +} + +#wpseo_meta .postbox .inside .wpseotab { + font-size: 13px !important; +} + +.inside .wpseotab .form-table th { + width: 140px !important; + font-size: 13px; +} + +.inside .wpseotab .form-table td { + padding-top: 20px; +} + +.inside .wpseotab .form-table td input, +.inside .wpseotab .form-table td select { + margin-top: -5px; +} + +.inside .wpseotab .form-table td select[multiple] { + margin-top: 0; +} + +.wpseotab .wpseoanalysis { + margin-top: 0; +} + +.good, +.warn, +.wrong { + font-weight: bold; +} + +.good { + color: green; +} + +.warn { + color: maroon; +} + +.wrong { + color: red; +} + +#current_seo_title span { + padding: 2px 5px; + background-color: lightyellow; +} + +#focuskwresults ul { + margin: 0; +} + +#focuskwresults p, +#focuskwresults li { + font-size: 13px; +} + +#focuskwresults li { + margin: 0 0 0 20px; + list-style-type: disc; +} + +.wpseo_hidden { + display: none; +} + +/* Linkdex analysis block */ + +table.wpseoanalysis th { + padding: 15px 0 5px 0; + font-size: 14px; + text-align: left; +} + +table.wpseoanalysis th.first { + padding-top: 0; +} + +table.wpseoanalysis td { + margin: 5px 0; + font-size: 13px; + line-height: 16px; +} + +table.wpseoanalysis td.score { + width: 20px; + height: 18px; + padding-left: 10px; +} + +.wpseo_msg { + margin: 5px 0 10px 0; + padding: 0 5px; + border: 1px solid #e6db55; + background-color: lightYellow; +} + +ul.wpseo-metabox-tabs li.wpseo-tab-add-keyword { + border: none; +} + +.wpseo-add-keyword { + padding: 0 3px; + border: 1px solid #ccc; + color: #000; + background: transparent; + font-size: 10px; + text-decoration: none; + cursor: pointer; +} + +/* + * jQuery UI CSS Framework 1.8.12 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + + +/* Component containers +----------------------------------*/ + +#wpseotab .ui-widget-content { + border: 1px solid #ddd; + color: #333; + background: #f1f1f1; +} + +#wpseotab .ui-widget-content a { + color: #333; +} + +/* + * jQuery UI Autocomplete 1.8.12 + * http://docs.jquery.com/UI/Autocomplete#theming + */ +#wpseotab .ui-autocomplete { + position: absolute; + cursor: default; +} + +/* workarounds */ +* html #wpseotab .ui-autocomplete { + width: 1px; +} + +/* without this, the menu expands to 100% in IE6 */ + +/* + * jQuery UI Menu 1.8.12 + * + * http://docs.jquery.com/UI/Menu#theming + */ +.ui-menu { + display: block; + float: left; + margin: 0; + padding: 2px; + list-style: none; +} + +.ui-menu .ui-menu { + margin-top: -3px; +} + +.ui-menu .ui-menu-item { + float: left; + clear: left; + zoom: 1; + width: 100%; + margin: 0; + padding: 0; +} + +.ui-menu .ui-menu-item a { + display: block; + zoom: 1; + padding: 0.2em 0.4em; + line-height: 1.5; + text-decoration: none; +} + +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + margin: -1px; + color: #000; +} + +.wpseo-score-icon { + display: inline-block; + width: 12px; + height: 12px; + margin: 3px 10px 0 3px; + border-radius: 50%; + background: #888; + vertical-align: top; +} + +.wpseo-score-icon.good { + background-color: #7ad03a; +} + +.wpseo-score-icon.ok { + background-color: #ee7c1b; +} + +.wpseo-score-icon.bad { + background-color: #dd3d36; +} + +.wpseo-score-icon.na { + background-color: #888; +} + +.wpseo-score-icon.noindex { + background-color: #1e8cbe; +} + +.wpseo-score-title { + font-weight: 600; +} + +img.yoast_help { + cursor: pointer; +} + +.yoast-qtip { + font-size: 14px !important; + line-height: 18px !important; +} + +.wpseo_content_wrapper p.search-box { + margin: 10px 0 5px 0; +} + +.wpseo-metabox-tabs .active a { + color: #333; +} + +#wpseotab .ui-widget-content .ui-state-hover { + border: 1px solid #dfdfdf; + color: #333; + background: #f1f1f1; +} + +/** + * Lines below came from taxonomy-meta.css + */ +.wpseo-taxonomy-form tr, +.wpseo-taxonomy-form th, +.wpseo-taxonomy-form td { + vertical-align: top; +} + +.inside .wpseotab .form-table.wpseo-taxonomy-form th { + width: 200px !important; +} + +.yst-traffic-light-container { + display: block; + height: 30px; +} + +.yst-traffic-light { + height: 30px; + margin: 0 0 0 5px; +} + +.yst-traffic-light .traffic-light-color { + display: none; +} + +.yst-traffic-light.init .traffic-light-init { + display: inline; +} + +.yst-traffic-light.bad .traffic-light-red { + display: inline; +} + +.yst-traffic-light.ok .traffic-light-orange { + display: inline; +} + +.yst-traffic-light.good .traffic-light-green { + display: inline; +} + +.yst-traffic-light.na .traffic-light-empty { + display: inline; +} + +/** + * Traffic light in publish box + */ +#wpseo-score { + float: left; + margin: 0 5px 0 -5px; +} + +body.rtl #wpseo-score { + float: right; + margin: 0 -5px 0 5px; +} + +body.edit-tags-php .postbox h3 { + margin-left: 20px; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.min.css new file mode 100644 index 00000000..8fa3bc21 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/metabox-302.min.css @@ -0,0 +1 @@ +ul.wpseo-metabox-tabs{display:none;margin-top:12px;margin-bottom:3px}.wpseo-metabox-tabs-div ul{list-style:none}ul.wpseo-metabox-tabs li.active{background-color:#fdfdfd}.wpseo-meta-section{display:none;width:90%}.wpseo-meta-section.active{display:inline-block}.wpseo-metabox-sidebar{display:inline-block;width:40px;padding:5px;background-color:#fff;vertical-align:top}.wpseo-metabox-sidebar li span{margin-left:-5px;padding-left:5px;border-width:0 0 0 3px;border-style:solid;border-color:transparent;border-radius:3px}.wpseo-metabox-sidebar li.active span{border-color:#333;color:#333}ul.wpseo-metabox-tabs li{display:inline;margin-right:5px;padding:5px;border-width:1px 1px 0;border-style:solid solid none;border-color:#dfdfdf}.wpseotab.active{display:block;overflow:auto;padding:.5em .9em;border:1px solid #ddd;background-color:#fdfdfd}.wpseo-metabox-tabs a{text-decoration:none}.wpseo-metabox-tabs a .dashicons{width:16px;height:16px;font-size:16px}.wpseo-metabox-sidebar .dashicons{width:30px;height:30px;font-size:30px}.wpseo-metabox-sidebar a{font-size:20px;line-height:30px;text-decoration:none}.wpseo-metabox-sidebar li{padding:5px}.wpseo-metabox-tabs-div div.wpseo-tabs-panel{overflow:auto;padding:.5em .9em;border:1px solid}.wpseo-heading{padding-left:10px}.wpseotab{display:none}#wpseo_meta .postbox .inside .wpseotab{font-size:13px!important}.inside .wpseotab .form-table th{width:140px!important;font-size:13px}.inside .wpseotab .form-table td{padding-top:20px}.inside .wpseotab .form-table td input,.inside .wpseotab .form-table td select{margin-top:-5px}.inside .wpseotab .form-table td select[multiple],.wpseotab .wpseoanalysis{margin-top:0}.good,.warn,.wrong{font-weight:700}.good{color:green}.warn{color:maroon}.wrong{color:red}#current_seo_title span{padding:2px 5px;background-color:#ffffe0}#focuskwresults ul{margin:0}#focuskwresults li,#focuskwresults p{font-size:13px}#focuskwresults li{margin:0 0 0 20px;list-style-type:disc}.wpseo_hidden{display:none}table.wpseoanalysis th{padding:15px 0 5px;font-size:14px;text-align:left}table.wpseoanalysis th.first{padding-top:0}table.wpseoanalysis td{margin:5px 0;font-size:13px;line-height:16px}table.wpseoanalysis td.score{width:20px;height:18px;padding-left:10px}.wpseo_msg{margin:5px 0 10px;padding:0 5px;border:1px solid #e6db55;background-color:#ffffe0}ul.wpseo-metabox-tabs li.wpseo-tab-add-keyword{border:none}.wpseo-add-keyword{padding:0 3px;border:1px solid #ccc;color:#000;background:0 0;font-size:10px;text-decoration:none;cursor:pointer}#wpseotab .ui-widget-content{border:1px solid #ddd;color:#333;background:#f1f1f1}#wpseotab .ui-widget-content a{color:#333}#wpseotab .ui-autocomplete{position:absolute;cursor:default}* html #wpseotab .ui-autocomplete{width:1px}.ui-menu{display:block;float:left;margin:0;padding:2px;list-style:none}.ui-menu .ui-menu{margin-top:-3px}.ui-menu .ui-menu-item{float:left;clear:left;zoom:1;width:100%;margin:0;padding:0}.ui-menu .ui-menu-item a{display:block;zoom:1;padding:.2em .4em;line-height:1.5;text-decoration:none}.ui-menu .ui-menu-item a.ui-state-active,.ui-menu .ui-menu-item a.ui-state-hover{margin:-1px;color:#000}.wpseo-score-icon{display:inline-block;width:12px;height:12px;margin:3px 10px 0 3px;border-radius:50%;background:#888;vertical-align:top}.wpseo-score-icon.good{background-color:#7ad03a}.wpseo-score-icon.ok{background-color:#ee7c1b}.wpseo-score-icon.bad{background-color:#dd3d36}.wpseo-score-icon.na{background-color:#888}.wpseo-score-icon.noindex{background-color:#1e8cbe}.wpseo-score-title{font-weight:600}img.yoast_help{cursor:pointer}.yoast-qtip{font-size:14px!important;line-height:18px!important}.wpseo_content_wrapper p.search-box{margin:10px 0 5px}.wpseo-metabox-tabs .active a{color:#333}#wpseotab .ui-widget-content .ui-state-hover{border:1px solid #dfdfdf;color:#333;background:#f1f1f1}.wpseo-taxonomy-form td,.wpseo-taxonomy-form th,.wpseo-taxonomy-form tr{vertical-align:top}.inside .wpseotab .form-table.wpseo-taxonomy-form th{width:200px!important}.yst-traffic-light-container{display:block;height:30px}.yst-traffic-light{height:30px;margin:0 0 0 5px}.yst-traffic-light .traffic-light-color{display:none}.yst-traffic-light.bad .traffic-light-red,.yst-traffic-light.good .traffic-light-green,.yst-traffic-light.init .traffic-light-init,.yst-traffic-light.na .traffic-light-empty,.yst-traffic-light.ok .traffic-light-orange{display:inline}#wpseo-score{float:left;margin:0 5px 0 -5px}body.rtl #wpseo-score{float:right;margin:0 -5px 0 5px}body.edit-tags-php .postbox h3{margin-left:20px} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.css new file mode 100644 index 00000000..a7a1eb6d --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.css @@ -0,0 +1,9 @@ +.wpseosnippet, +#wpseo_snippet { + width: auto; + max-width: 512px; + margin: 0 0 10px; + padding: 0 5px; + font-family: Arial, Helvetica, sans-serif; + font-style: normal; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.min.css new file mode 100644 index 00000000..c2ba9143 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/snippet-302.min.css @@ -0,0 +1 @@ +#wpseo_snippet,.wpseosnippet{width:auto;max-width:512px;margin:0 0 10px;padding:0 5px;font-family:Arial,Helvetica,sans-serif;font-style:normal} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.css new file mode 100644 index 00000000..24af1cea --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.css @@ -0,0 +1,466 @@ +h4 { + clear: both; + margin: 2em 0 0 0; +} + +p.desc { + margin: 6px 0 10px 0; + padding: 0 0 8px 25px; +} + +p.desc.label { + margin-bottom: 20px; + padding: 2px 0 10px 185px; +} + +tr.yst_row { + margin: 5px 0 0 0; + padding: 5px 0 0 0; +} + +tr.yst_row.even { + background-color: #f6f6f6; +} + +div.yoastbox ul { + margin-left: 20px; +} + +.postbox { + margin: 10px 10px 0 0; +} + +label { + float: left; + margin-left: 6px; +} + +label.radio { + float: none; +} + +input.textinput, +textarea, +select { + width: 400px; +} + +input.checkbox + label.checkbox { + width: auto; +} + +input.textinput, +textarea.textinput, +select.select, +input.checkbox { + float: left; + margin: 5px 3px 5px 0; + padding: 5px; +} + +select.select { + padding: 3px; +} + +input.checkbox.double { + margin: 5px 10px 0 0; +} + +.textinput.metadesc { + height: 50px; +} + +textarea.import { + width: 500px; + height: 100px; +} + +label.textinput, +label.select, +label.checkbox { + width: 180px; + margin: 5px 0 5px 0; + background-color: transparent; +} + +table.wpseo th { + text-align: left; +} + +label.radio { + margin-right: 20px; +} + +.wpseo_content_wrapper { + display: table; + width: 100%; +} + +.wpseo_content_cell { + display: table-cell; + height: 500px; + margin: 0; + padding: 0; + vertical-align: top; +} + +#wpseo_content_top { + min-width: 800px; +} + +div.wpseo_variable_warning { + margin: 5px 0 0 0; + padding: 5px; + color: red; +} + +input.wpseo_variable_warning, +textarea.wpseo_variable_warning { + border: 1px solid red; +} + +.wpseo_variable_warning a { + color: red; +} + +.wpseo_content_wrapper div.wpseo-warning { + margin: 2em 0 0 0; + padding-right: 10px; + padding-left: 10px; + border: 2px solid red; + background-color: #dedede; +} + +.wpseo_content_wrapper div.wpseo-warning h4 { + margin: 1em 0 0 0; +} + +.wpseo_content_wrapper div.wpseo-warning p.error-message { + font-weight: normal; +} + +#sidebar-container { + width: 261px; + padding: 0 0 0 20px; +} + +@media (max-width: 1020px) { + #wpseo_content_top { + margin-left: 0; + padding-left: 0; + } +} + +.wpseo-admin-page .form-table tr, +.wpseo-admin-page .form-table th, +.wpseo-admin-page .form-table td { + vertical-align: top; +} + +.postbox form { + line-height: 150%; +} + +div.yoastbox ul li { + font-size: 11px; + line-height: 16px; + list-style: square; +} + +div.yoastbox a { + font-family: sans-serif; + font-size: 12px; +} + +div.yoastbox a:hover { + text-decoration: underline; +} + +.text { + width: 250px; +} + +div.yoastbox .button:hover, +div.yoastbox .button-primary:hover { + text-decoration: none; +} + +/*.button, .button-primary {*/ +/*margin-top: 10px;*/ +/*}*/ + +table.yoast_help, +table.yoast_help th, +table.yoast_help td { + border: 1px solid #ddd; + border-collapse: collapse; + font-size: 12px; +} + +table.yoast_help th, +table.yoast_help td { + padding: 5px 10px; + text-align: left; + vertical-align: text-top; +} + +table.yoast_help tr:nth-child(2n) { + background-color: #fbfbfe; +} + +table.yoast_help tr:hover { + background-color: #ddd; +} + +.correct { + padding: 5px; + color: white; + background-color: green; +} + +.wrong { + padding: 5px; + color: white; + background-color: red; +} + +.wrong code { + padding: 3px 8px; + color: #000; +} + +.button.fixit { + float: right; + margin: 0 5px; +} + +.button.checkit { + float: right; + margin: 0 5px; + padding: 5px 8px; +} + +.fb-buttons .button-primary, +.fb-buttons .button { + margin-right: 8px; +} + +.button { + color: #000 !important; +} + +.button#submit { + color: #fff !important; +} + +.postbox#donate { + border: 2px green; +} + +.wpseotab { + display: none; + margin-top: 15px; +} + +.wpseotab.active { + display: block; +} + +.wpseotab strong { + font-size: 115%; +} + +#sidebar .yoastbox { + margin: 0 0 10px 0; + padding: 10px 15px; + border: 1px solid #ccc; + border-radius: 5px 25px; +} + +#sidebar .yoastbox h2 { + font-size: 16px; +} + +#sidebar .promo { + color: #000; +} + +#donate.yoastbox, +#sitereview.yoastbox { + border-color: green; + background-color: #cfc; +} + +h2 { + margin-bottom: 20px; +} + +h2 code { + font-size: 23px; +} + +#wpseo-conf { + /*max-width: 600px;*/ + ; +} + +#pointer-primary { + margin: 0 5px 0 0; +} + +#wpseo-debug-info { + clear: both; +} + +#wpseo-debug-info .hndle { + cursor: auto; +} + +#wpseo-debug-info h3 span:last-child { + padding-left: 16px; +} + +#wpseo-debug-info .wpseo-debug { + display: inline-block; + padding-left: 20px; + color: #c00; +} + +input.wpseo-new-title, +textarea.wpseo-new-metadesc { + width: 100%; + max-width: 100%; +} + +.wpseotab .extension { + float: left; + box-sizing: border-box; + width: 300px; + height: 230px; + margin: 10px 20px 10px 0; + border: 1px solid #ccc; +} + +.wpseotab .extension p { + margin: 0; + padding: 10px; +} + +.wpseotab .extension h3 { + box-sizing: border-box; + height: 110px; + margin: 0; + padding: 20px 10px 0 120px; + border-bottom: 1px solid #ccc; + background: #fff no-repeat left 10px; + background-size: 130px 100px; +} + +.wpseotab .extension a { + text-decoration: none; +} + +.wpseotab .extension button.installed { + border-color: #00a000; + background-color: #00a000; + cursor: default; +} + +.wpseotab .seo-premium h3 { + background-image: url(../images/Premium_130x100.png); +} + +.wpseotab .video-seo h3 { + background-image: url(../images/Video_130x100.png); +} + +.wpseotab .local-seo h3 { + background-image: url(../images/Local_130x100.png); +} + +.wpseotab .woocommerce-seo h3 { + background-image: url(../images/Woo_130x100.png); +} + +.wpseotab .news-seo h3 { + background-image: url(../images/News_SEO.png); + background-size: 115px 100px; +} + +div#separator { + clear: right; + margin: 0 0 0 25px; +} + +div#separator input.radio { + display: none; + float: left; + width: 0 !important; + min-width: 0 !important; + opacity: 0; +} + +div#separator input.radio + label { + float: left; + width: 30px !important; + margin: 3px 3px 0 0; + padding: 5px 8px; + border: 1px solid #ccc; + /* Don't change: these mimic Google's font and font size for titles */ + font-family: Arial, Helvetica, sans-serif !important; + font-size: 18px !important; + line-height: 25px; + text-align: center; + cursor: pointer; +} + +div#separator input.radio:checked + label { + border: 1px solid green; + background-color: #fff; + box-shadow: 1px 1px 1px green; +} + +.svg-container { + text-align: center; +} + +.svg-container .dashicons { + width: 200px; + height: 100px; + font-size: 100px; +} + +body.toplevel_page_wpseo_dashboard .wp-badge { + border: none; + background: url(../images/Yoast_SEO_Icon.svg); + background-size: 150px 160px; + box-shadow: none; +} + +.nav-tab .dashicons { + width: 18px; + height: 18px; + font-size: 18px; + line-height: 24px; +} + +#wpseo_progressbar { + height: 25px; + border: 1px solid #006691; +} + +#wpseo_progressbar .ui-progressbar-value { + height: 25px; + background: #006691; +} + +#TB_window .wpseo_content_wrapper p { + font-size: 14px; + font-style: normal; +} + +#TB_window .wpseo_content_wrapper label { + margin: 0 10px 0 0; + font-size: 14px; + font-weight: bold; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.min.css new file mode 100644 index 00000000..23ba690a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_plugin_tools-302.min.css @@ -0,0 +1 @@ +h4{clear:both;margin:2em 0 0}p.desc{margin:6px 0 10px;padding:0 0 8px 25px}p.desc.label{margin-bottom:20px;padding:2px 0 10px 185px}tr.yst_row{margin:5px 0 0;padding:5px 0 0}tr.yst_row.even{background-color:#f6f6f6}div.yoastbox ul{margin-left:20px}.postbox{margin:10px 10px 0 0}label{float:left;margin-left:6px}label.radio{float:none}input.textinput,select,textarea{width:400px}input.checkbox+label.checkbox{width:auto}input.checkbox,input.textinput,select.select,textarea.textinput{float:left;margin:5px 3px 5px 0;padding:5px}select.select{padding:3px}input.checkbox.double{margin:5px 10px 0 0}.textinput.metadesc{height:50px}textarea.import{width:500px;height:100px}label.checkbox,label.select,label.textinput{width:180px;margin:5px 0;background-color:transparent}table.wpseo th{text-align:left}label.radio{margin-right:20px}.wpseo_content_wrapper{display:table;width:100%}.wpseo_content_cell{display:table-cell;height:500px;margin:0;padding:0;vertical-align:top}#wpseo_content_top{min-width:800px}div.wpseo_variable_warning{margin:5px 0 0;padding:5px;color:red}input.wpseo_variable_warning,textarea.wpseo_variable_warning{border:1px solid red}.wpseo_variable_warning a{color:red}.wpseo_content_wrapper div.wpseo-warning{margin:2em 0 0;padding-right:10px;padding-left:10px;border:2px solid red;background-color:#dedede}.wpseo_content_wrapper div.wpseo-warning h4{margin:1em 0 0}.wpseo_content_wrapper div.wpseo-warning p.error-message{font-weight:400}#sidebar-container{width:261px;padding:0 0 0 20px}@media (max-width:1020px){#wpseo_content_top{margin-left:0;padding-left:0}}.wpseo-admin-page .form-table td,.wpseo-admin-page .form-table th,.wpseo-admin-page .form-table tr{vertical-align:top}.postbox form{line-height:150%}div.yoastbox ul li{font-size:11px;line-height:16px;list-style:square}div.yoastbox a{font-family:sans-serif;font-size:12px}div.yoastbox a:hover{text-decoration:underline}.text{width:250px}div.yoastbox .button-primary:hover,div.yoastbox .button:hover{text-decoration:none}table.yoast_help,table.yoast_help td,table.yoast_help th{border:1px solid #ddd;border-collapse:collapse;font-size:12px}table.yoast_help td,table.yoast_help th{padding:5px 10px;text-align:left;vertical-align:text-top}table.yoast_help tr:nth-child(2n){background-color:#fbfbfe}table.yoast_help tr:hover{background-color:#ddd}.correct{padding:5px;color:#fff;background-color:green}.wrong{padding:5px;color:#fff;background-color:red}.wrong code{padding:3px 8px;color:#000}.button.fixit{float:right;margin:0 5px}.button.checkit{float:right;margin:0 5px;padding:5px 8px}.fb-buttons .button,.fb-buttons .button-primary{margin-right:8px}.button{color:#000!important}.button#submit{color:#fff!important}.postbox#donate{border:2px green}.wpseotab{display:none;margin-top:15px}.wpseotab.active{display:block}.wpseotab strong{font-size:115%}#sidebar .yoastbox{margin:0 0 10px;padding:10px 15px;border:1px solid #ccc;border-radius:5px 25px}#sidebar .yoastbox h2{font-size:16px}#sidebar .promo{color:#000}#donate.yoastbox,#sitereview.yoastbox{border-color:green;background-color:#cfc}h2{margin-bottom:20px}h2 code{font-size:23px}#pointer-primary{margin:0 5px 0 0}#wpseo-debug-info{clear:both}#wpseo-debug-info .hndle{cursor:auto}#wpseo-debug-info h3 span:last-child{padding-left:16px}#wpseo-debug-info .wpseo-debug{display:inline-block;padding-left:20px;color:#c00}input.wpseo-new-title,textarea.wpseo-new-metadesc{width:100%;max-width:100%}.wpseotab .extension{float:left;box-sizing:border-box;width:300px;height:230px;margin:10px 20px 10px 0;border:1px solid #ccc}.wpseotab .extension p{margin:0;padding:10px}.wpseotab .extension h3{box-sizing:border-box;height:110px;margin:0;padding:20px 10px 0 120px;border-bottom:1px solid #ccc;background:left 10px/130px 100px no-repeat #fff}.wpseotab .extension a{text-decoration:none}.wpseotab .extension button.installed{border-color:#00a000;background-color:#00a000;cursor:default}.wpseotab .seo-premium h3{background-image:url(../images/Premium_130x100.png)}.wpseotab .video-seo h3{background-image:url(../images/Video_130x100.png)}.wpseotab .local-seo h3{background-image:url(../images/Local_130x100.png)}.wpseotab .woocommerce-seo h3{background-image:url(../images/Woo_130x100.png)}.wpseotab .news-seo h3{background-image:url(../images/News_SEO.png);background-size:115px 100px}div#separator{clear:right;margin:0 0 0 25px}div#separator input.radio{display:none;float:left;width:0!important;min-width:0!important;opacity:0}div#separator input.radio+label{float:left;width:30px!important;margin:3px 3px 0 0;padding:5px 8px;border:1px solid #ccc;font-family:Arial,Helvetica,sans-serif!important;font-size:18px!important;line-height:25px;text-align:center;cursor:pointer}div#separator input.radio:checked+label{border:1px solid green;background-color:#fff;box-shadow:1px 1px 1px green}.svg-container{text-align:center}.svg-container .dashicons{width:200px;height:100px;font-size:100px}body.toplevel_page_wpseo_dashboard .wp-badge{border:none;background:url(../images/Yoast_SEO_Icon.svg) 0 0/150px 160px;box-shadow:none}.nav-tab .dashicons{width:18px;height:18px;font-size:18px;line-height:24px}#wpseo_progressbar{height:25px;border:1px solid #006691}#wpseo_progressbar .ui-progressbar-value{height:25px;background:#006691}#TB_window .wpseo_content_wrapper p{font-size:14px;font-style:normal}#TB_window .wpseo_content_wrapper label{margin:0 10px 0 0;font-size:14px;font-weight:700} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.css new file mode 100644 index 00000000..57a06761 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.css @@ -0,0 +1,45 @@ +.overallScore #score_circle { + fill: #999; +} + +.overallScore #score_circle_shadow { + fill: #777; +} + +.overallScore.good #score_circle { + fill: #9fda4f; +} + +.overallScore.good #score_circle_shadow { + fill: #77b227; +} + +.overallScore.ok #score_circle { + fill: #ffb81e; +} + +.overallScore.ok #score_circle_shadow { + fill: #f49a00; +} + +.overallScore.bad #score_circle { + fill: #ff4e47; +} + +.overallScore.bad #score_circle_shadow { + fill: #ed261f; +} + +.overallScore.na #score_circle_shadow { + fill: #999; +} + +.overallScore svg { + margin: 10px; +} + +#taxonomy_overall { + position: absolute; + top: 0; + margin-left: 87.5%; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.min.css b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.min.css new file mode 100644 index 00000000..58a849a3 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/css/yst_seo_score-302.min.css @@ -0,0 +1 @@ +.overallScore #score_circle{fill:#999}.overallScore #score_circle_shadow{fill:#777}.overallScore.good #score_circle{fill:#9fda4f}.overallScore.good #score_circle_shadow{fill:#77b227}.overallScore.ok #score_circle{fill:#ffb81e}.overallScore.ok #score_circle_shadow{fill:#f49a00}.overallScore.bad #score_circle{fill:#ff4e47}.overallScore.bad #score_circle_shadow{fill:#ed261f}.overallScore.na #score_circle_shadow{fill:#999}.overallScore svg{margin:10px}#taxonomy_overall{position:absolute;top:0;margin-left:87.5%} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-snippet-preview.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-snippet-preview.php new file mode 100644 index 00000000..1f6e9375 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-snippet-preview.php @@ -0,0 +1,161 @@ +content + * + * @return string html for snippet preview + * + * @deprecated 3.0 Removed, use javascript instead. + */ + public function get_content() { + _deprecated_function( 'WPSEO_Snippet_Preview::get_content', 'WPSEO 3.0', 'javascript' ); + return $this->content; + } + + /** + * Sets date if available + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function set_date() { + _deprecated_function( 'WPSEO_Snippet_Preview::set_date', 'WPSEO 3.0', 'javascript' ); + } + + /** + * Retrieves a post date when post is published, or return current date when it's not. + * + * @return string + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function get_post_date() { + _deprecated_function( 'WPSEO_Snippet_Preview::get_post_date', 'WPSEO 3.0', 'javascript' ); + return ''; + } + + /** + * Generates the url that is displayed in the snippet preview. + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function set_url() { + _deprecated_function( 'WPSEO_Snippet_Preview::set_url', 'WPSEO 3.0', 'javascript' ); + } + + /** + * Sets the slug and adds it to the url if the post has been published and the post name exists. + * + * If the post is set to be the homepage the slug is also not included. + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function set_slug() { + _deprecated_function( 'WPSEO_Snippet_Preview::set_slug', 'WPSEO 3.0', 'javascript' ); + } + + /** + * Generates the html for the snippet preview and assign it to $this->content. + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function set_content() { + _deprecated_function( 'WPSEO_Snippet_Preview::set_content', 'WPSEO 3.0', 'javascript' ); + } + + /** + * Sets the html for the snippet preview through a filter + * + * @param string $content Content string. + * + * @deprecated 3.0 Removed, use javascript instead. + */ + protected function set_content_through_filter( $content ) { + _deprecated_function( 'WPSEO_Snippet_Preview::set_content_through_filter', 'WPSEO 3.0', 'javascript' ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-yoast-textstatistics.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-yoast-textstatistics.php new file mode 100644 index 00000000..b882ac28 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/deprecated/class-yoast-textstatistics.php @@ -0,0 +1,196 @@ +wrap_breadcrumb(); } +<<<<<<< .mine + /** + * Get breadcrumb string using the singleton instance of this class + * + * @param string $before Optional string to prepend. + * @param string $after Optional string to append. + * @param bool $display Echo or return flag. + * + * @return object + */ + public static function breadcrumb( $before = '', $after = '', $display = true ) { + if ( ! ( self::$instance instanceof self ) ) { + self::$instance = new self(); +||||||| .r11156 + $this->set_crumbs(); + $this->prepare_links(); + $this->links_to_string(); + $this->wrap_breadcrumb( ); +======= /** * Get breadcrumb string using the singleton instance of this class * @@ -119,6 +138,7 @@ class WPSEO_Breadcrumbs { public static function breadcrumb( $before = '', $after = '', $display = true ) { if ( ! ( self::$instance instanceof self ) ) { self::$instance = new self(); +>>>>>>> .r12027 } // Remember the last used before/after for use in case the object goes __toString(). self::$before = $before; @@ -197,6 +217,38 @@ class WPSEO_Breadcrumbs { return array_reverse( $parents ); } +<<<<<<< .mine + /** + * Find the deepest term in an array of term objects + * + * @param array $terms Terms set. + * + * @return object + */ + private function find_deepest_term( $terms ) { + /* + Let's find the deepest term in this array, by looping through and then + unsetting every term that is used as a parent by another one in the array. + */ + $terms_by_id = array(); + foreach ( $terms as $term ) { + $terms_by_id[ $term->term_id ] = $term; +||||||| .r11156 + /** + * Get a term's parents. + * + * @param object $term Term to get the parents for + * @return array + */ + private function get_term_parents( $term ) { + $tax = $term->taxonomy; + $parents = array(); + while ( $term->parent != 0 ) { + $term = get_term( $term->parent, $tax ); + $parents[] = $term; + } + return array_reverse( $parents ); +======= /** * Find the deepest term in an array of term objects * @@ -212,6 +264,7 @@ class WPSEO_Breadcrumbs { $terms_by_id = array(); foreach ( $terms as $term ) { $terms_by_id[ $term->term_id ] = $term; +>>>>>>> .r12027 } foreach ( $terms as $term ) { unset( $terms_by_id[ $term->parent ] ); @@ -329,9 +382,18 @@ class WPSEO_Breadcrumbs { if ( is_post_type_archive() ) { $post_type = $wp_query->get( 'post_type' ); +<<<<<<< .mine + if ( $post_type && is_string( $post_type ) ) { + $this->add_ptarchive_crumb( $post_type ); + } +||||||| .r11156 + if ( ( $this->show_on_front === 'page' && is_front_page() ) || ( $this->show_on_front === 'posts' && is_home() ) ) { + // do nothing +======= if ( $post_type ) { $this->add_ptarchive_crumb( $post_type ); } +>>>>>>> .r12027 } elseif ( is_tax() || is_tag() || is_category() ) { $this->add_crumbs_for_taxonomy(); @@ -406,6 +468,29 @@ class WPSEO_Breadcrumbs { } +<<<<<<< .mine + /** + * Add a single id based crumb to the crumbs property + * + * @param int $id Post ID. + */ + private function add_single_post_crumb( $id ) { + $this->crumbs[] = array( + 'id' => $id, + ); + } +||||||| .r11156 + /** + * Add a predefined crumb to the crumbs property + */ + private function add_predefined_crumb( $text, $url = '', $allow_html = false ) { + $this->crumbs[] = array( + 'text' => $text, + 'url' => $url, + 'allow_html' => $allow_html, + ); + } +======= /** * Add a single id based crumb to the crumbs property * @@ -416,7 +501,31 @@ class WPSEO_Breadcrumbs { 'id' => $id, ); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Add a term based crumb to the crumbs property + * + * @param object $term Term data object. + */ + private function add_term_crumb( $term ) { + $this->crumbs[] = array( + 'term' => $term, + ); + } +||||||| .r11156 + /** + * Add Homepage crumb to the crumbs property + */ + private function add_home_crumb() { + $this->add_predefined_crumb( + $this->options['breadcrumbs-home'], + get_home_url(), + true + ); + } +======= /** * Add a term based crumb to the crumbs property * @@ -427,6 +536,7 @@ class WPSEO_Breadcrumbs { 'term' => $term, ); } +>>>>>>> .r12027 /** * Add a ptarchive based crumb to the crumbs property @@ -439,6 +549,57 @@ class WPSEO_Breadcrumbs { ); } +<<<<<<< .mine + /** + * Add a predefined crumb to the crumbs property + * + * @param string $text Text string. + * @param string $url URL string. + * @param bool $allow_html Flag to allow HTML. + */ + private function add_predefined_crumb( $text, $url = '', $allow_html = false ) { + $this->crumbs[] = array( + 'text' => $text, + 'url' => $url, + 'allow_html' => $allow_html, + ); + } + + /** + * Add Homepage crumb to the crumbs property + */ + private function add_home_crumb() { + $this->add_predefined_crumb( + $this->options['breadcrumbs-home'], + get_home_url(), + true + ); + } + + /** + * Add Blog crumb to the crumbs property + */ + private function add_blog_crumb() { + $this->add_single_post_crumb( $this->page_for_posts ); + } + + /** + * Add Blog crumb to the crumbs property for single posts where Home != blogpage + */ + private function maybe_add_blog_crumb() { + if ( ( 'page' === $this->show_on_front && 'post' === get_post_type() ) && ( ! is_home() && ! is_search() ) ) { + if ( $this->page_for_posts && $this->options['breadcrumbs-blog-remove'] === false ) { + $this->add_blog_crumb(); +||||||| .r11156 + /** + * Add Blog crumb to the crumbs property for single posts where Home != blogpage + */ + private function maybe_add_blog_crumb() { + if ( ( 'page' === $this->show_on_front && 'post' === get_post_type() ) && ( ! is_home() && ! is_search() ) ) { + if ( $this->page_for_posts && $this->options['breadcrumbs-blog-remove'] === false ) { + $this->add_blog_crumb(); + } +======= /** * Add a predefined crumb to the crumbs property * @@ -479,6 +640,7 @@ class WPSEO_Breadcrumbs { if ( ( 'page' === $this->show_on_front && 'post' === get_post_type() ) && ( ! is_home() && ! is_search() ) ) { if ( $this->page_for_posts && $this->options['breadcrumbs-blog-remove'] === false ) { $this->add_blog_crumb(); +>>>>>>> .r12027 } } } @@ -544,6 +706,31 @@ class WPSEO_Breadcrumbs { $this->add_term_crumb( $term ); } +<<<<<<< .mine + /** + * Add parent taxonomy crumb based on user defined preference + * + * @param object $term Term data object. + */ + private function maybe_add_preferred_term_parent_crumb( $term ) { + if ( isset( $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] ) && $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] != '0' ) { + if ( 'post' == $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] && $this->show_on_front == 'page' ) { + if ( $this->page_for_posts ) { + $this->add_blog_crumb(); +||||||| .r11156 + $this->add_term_crumb( $term ); + } + + /** + * Add parent taxonomy crumb based on user defined preference + */ + private function maybe_add_preferred_term_parent_crumb( $term ) { + if ( isset( $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] ) && $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] != '0' ) { + if ( 'post' == $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] && $this->show_on_front == 'page' ) { + if ( $this->page_for_posts ) { + $this->add_blog_crumb(); + } +======= /** * Add parent taxonomy crumb based on user defined preference * @@ -554,6 +741,7 @@ class WPSEO_Breadcrumbs { if ( 'post' == $this->options[ 'taxonomy-' . $term->taxonomy . '-ptparent' ] && $this->show_on_front == 'page' ) { if ( $this->page_for_posts ) { $this->add_blog_crumb(); +>>>>>>> .r12027 } } else { @@ -562,6 +750,26 @@ class WPSEO_Breadcrumbs { } } +<<<<<<< .mine + /** + * Add parent taxonomy crumbs to the crumb property for hierachical taxonomy + * + * @param object $term Term data object. + */ + private function maybe_add_term_parent_crumbs( $term ) { + if ( is_taxonomy_hierarchical( $term->taxonomy ) && $term->parent != 0 ) { + foreach ( $this->get_term_parents( $term ) as $parent_term ) { + $this->add_term_crumb( $parent_term ); +||||||| .r11156 + /** + * Add parent taxonomy crumbs to the crumb property for hierachical taxonomy + */ + private function maybe_add_term_parent_crumbs( $term ) { + if ( is_taxonomy_hierarchical( $term->taxonomy ) && $term->parent != 0 ) { + foreach ( $this->get_term_parents( $term ) as $parent_term ) { + $this->add_term_crumb( $parent_term ); + } +======= /** * Add parent taxonomy crumbs to the crumb property for hierachical taxonomy * @@ -571,6 +779,7 @@ class WPSEO_Breadcrumbs { if ( is_taxonomy_hierarchical( $term->taxonomy ) && $term->parent != 0 ) { foreach ( $this->get_term_parents( $term ) as $parent_term ) { $this->add_term_crumb( $parent_term ); +>>>>>>> .r12027 } } } @@ -607,6 +816,26 @@ class WPSEO_Breadcrumbs { ); } +<<<<<<< .mine + /** + * Add (non-link) date crumb to crumbs property + * + * @param string $date Optional date string, defaults to post's date. + */ + private function add_date_crumb( $date = null ) { + if ( is_null( $date ) ) { + $date = get_the_date(); +||||||| .r11156 + /** + * Add (non-link) year crumb to crumbs property + */ + private function add_year_crumb() { + $this->add_predefined_crumb( + $this->options['breadcrumbs-archiveprefix'] . ' ' . esc_html( get_query_var( 'year' ) ), + null, + true + ); +======= /** * Add (non-link) date crumb to crumbs property * @@ -615,6 +844,7 @@ class WPSEO_Breadcrumbs { private function add_date_crumb( $date = null ) { if ( is_null( $date ) ) { $date = get_the_date(); +>>>>>>> .r12027 } else { $date = mysql2date( get_option( 'date_format' ), $date, true ); @@ -883,6 +1113,33 @@ class WPSEO_Breadcrumbs { self::breadcrumb( '
', '
' ); } +<<<<<<< .mine + /** + * Take the links array and return a full breadcrumb string. + * + * @deprecated 1.5.2.3 + * + * @param string $links Unused. + * @param string $wrapper Unused. + * @param string $element Unused. + * + * @return void + */ + public function create_breadcrumbs_string( $links, $wrapper = 'span', $element = 'span' ) { + _deprecated_function( __METHOD__, 'WPSEO 1.5.2.3', 'yoast_breadcrumbs' ); + } +||||||| .r11156 + /** + * Take the links array and return a full breadcrumb string. + * + * @deprecated 1.5.2.3 + * + * @return string + */ + public function create_breadcrumbs_string( $links, $wrapper = 'span', $element = 'span' ) { + _deprecated_function( __METHOD__, 'WPSEO 1.5.2.3', 'yoast_breadcrumbs' ); + } +======= /** * Take the links array and return a full breadcrumb string. * @@ -897,6 +1154,7 @@ class WPSEO_Breadcrumbs { public function create_breadcrumbs_string( $links, $wrapper = 'span', $element = 'span' ) { _deprecated_function( __METHOD__, 'WPSEO 1.5.2.3', 'yoast_breadcrumbs' ); } +>>>>>>> .r12027 } /* End of class */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-frontend.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-frontend.php index 621f3dce..e2b2a59a 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-frontend.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-frontend.php @@ -71,6 +71,19 @@ class WPSEO_Frontend { add_action( 'wp_head', array( $this, 'front_page_specific_init' ), 0 ); add_action( 'wp_head', array( $this, 'head' ), 1 ); +<<<<<<< .mine + // The head function here calls action wpseo_head, to which we hook all our functionality. + add_action( 'wpseo_head', array( $this, 'debug_marker' ), 2 ); + add_action( 'wpseo_head', array( $this, 'metadesc' ), 6 ); + add_action( 'wpseo_head', array( $this, 'robots' ), 10 ); + add_action( 'wpseo_head', array( $this, 'metakeywords' ), 11 ); + add_action( 'wpseo_head', array( $this, 'canonical' ), 20 ); + add_action( 'wpseo_head', array( $this, 'adjacent_rel_links' ), 21 ); + add_action( 'wpseo_head', array( $this, 'publisher' ), 22 ); +||||||| .r11156 + add_filter( 'wp_title', array( $this, 'title' ), 15, 3 ); + add_filter( 'thematic_doctitle', array( $this, 'title' ), 15 ); +======= // The head function here calls action wpseo_head, to which we hook all our functionality. add_action( 'wpseo_head', array( $this, 'debug_marker' ), 2 ); add_action( 'wpseo_head', array( $this, 'robots' ), 6 ); @@ -79,6 +92,7 @@ class WPSEO_Frontend { add_action( 'wpseo_head', array( $this, 'canonical' ), 20 ); add_action( 'wpseo_head', array( $this, 'adjacent_rel_links' ), 21 ); add_action( 'wpseo_head', array( $this, 'publisher' ), 22 ); +>>>>>>> .r12027 // Remove actions that we will handle through our wpseo_head call, and probably change the output of. remove_action( 'wp_head', 'rel_canonical' ); @@ -87,21 +101,107 @@ class WPSEO_Frontend { remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' ); remove_action( 'wp_head', 'noindex', 1 ); +<<<<<<< .mine + // When using WP 4.4, just use the new hook. + add_filter( 'pre_get_document_title', array( $this, 'title' ), 15 ); add_filter( 'wp_title', array( $this, 'title' ), 15, 3 ); +||||||| .r11156 + add_action( 'template_redirect', array( $this, 'noindex_feed' ) ); +======= + add_filter( 'wp_title', array( $this, 'title' ), 15, 3 ); + add_filter( 'thematic_doctitle', array( $this, 'title' ), 15 ); +>>>>>>> .r12027 + +<<<<<<< .mine add_filter( 'thematic_doctitle', array( $this, 'title' ), 15 ); +||||||| .r11156 + add_filter( 'loginout', array( $this, 'nofollow_link' ) ); + add_filter( 'register', array( $this, 'nofollow_link' ) ); +======= + add_action( 'wp', array( $this, 'page_redirect' ), 99 ); +>>>>>>> .r12027 +<<<<<<< .mine add_action( 'wp', array( $this, 'page_redirect' ), 99 ); +||||||| .r11156 + // Fix the WooThemes woo_title() output + add_filter( 'woo_title', array( $this, 'fix_woo_title' ), 99 ); +======= + add_action( 'template_redirect', array( $this, 'noindex_feed' ) ); +>>>>>>> .r12027 +<<<<<<< .mine add_action( 'template_redirect', array( $this, 'noindex_feed' ) ); +||||||| .r11156 + if ( $this->options['hide-rsdlink'] === true ) { + remove_action( 'wp_head', 'rsd_link' ); + } + if ( $this->options['hide-wlwmanifest'] === true ) { + remove_action( 'wp_head', 'wlwmanifest_link' ); + } + if ( $this->options['hide-shortlink'] === true ) { + remove_action( 'wp_head', 'wp_shortlink_wp_head' ); + remove_action( 'template_redirect', 'wp_shortlink_header', 11 ); + } + if ( $this->options['hide-feedlinks'] === true ) { + // @todo: add option to display just normal feed and hide comment feed. + remove_action( 'wp_head', 'feed_links', 2 ); + remove_action( 'wp_head', 'feed_links_extra', 3 ); + } +======= + add_filter( 'loginout', array( $this, 'nofollow_link' ) ); + add_filter( 'register', array( $this, 'nofollow_link' ) ); +>>>>>>> .r12027 +<<<<<<< .mine add_filter( 'loginout', array( $this, 'nofollow_link' ) ); add_filter( 'register', array( $this, 'nofollow_link' ) ); +||||||| .r11156 + if ( ( $this->options['disable-date'] === true || + $this->options['disable-author'] === true ) || + ( isset( $this->options['disable-post_formats'] ) && $this->options['disable-post_formats'] ) + ) { + add_action( 'wp', array( $this, 'archive_redirect' ) ); + } + if ( $this->options['redirectattachment'] === true ) { + add_action( 'template_redirect', array( $this, 'attachment_redirect' ), 1 ); + } + if ( $this->options['trailingslash'] === true ) { + add_filter( 'user_trailingslashit', array( $this, 'add_trailingslash' ), 10, 2 ); + } + if ( $this->options['cleanpermalinks'] === true ) { + add_action( 'template_redirect', array( $this, 'clean_permalink' ), 1 ); + } + if ( $this->options['cleanreplytocom'] === true ) { + add_filter( 'comment_reply_link', array( $this, 'remove_reply_to_com' ) ); + add_action( 'template_redirect', array( $this, 'replytocom_redirect' ), 1 ); + } + add_filter( 'the_content_feed', array( $this, 'embed_rssfooter' ) ); + add_filter( 'the_excerpt_rss', array( $this, 'embed_rssfooter_excerpt' ) ); +======= + // Fix the WooThemes woo_title() output. + add_filter( 'woo_title', array( $this, 'fix_woo_title' ), 99 ); +>>>>>>> .r12027 +<<<<<<< .mine // Fix the WooThemes woo_title() output. add_filter( 'woo_title', array( $this, 'fix_woo_title' ), 99 ); if ( $this->options['hide-rsdlink'] === true ) { remove_action( 'wp_head', 'rsd_link' ); +||||||| .r11156 + if ( $this->options['forcerewritetitle'] === true ) { + add_action( 'template_redirect', array( $this, 'force_rewrite_output_buffer' ), 99999 ); + add_action( 'wp_footer', array( $this, 'flush_cache' ), -1 ); + } + + if ( $this->options['title_test'] > 0 ) { + add_filter( 'wpseo_title', array( $this, 'title_test_helper' ) ); + } +======= + if ( $this->options['hide-rsdlink'] === true ) { + remove_action( 'wp_head', 'rsd_link' ); +>>>>>>> .r12027 } if ( $this->options['hide-wlwmanifest'] === true ) { remove_action( 'wp_head', 'wlwmanifest_link' ); @@ -138,9 +238,24 @@ class WPSEO_Frontend { add_filter( 'the_content_feed', array( $this, 'embed_rssfooter' ) ); add_filter( 'the_excerpt_rss', array( $this, 'embed_rssfooter_excerpt' ) ); +<<<<<<< .mine + // For WordPress functions below 4.4. + if ( ! current_theme_supports( 'title-tag' ) && $this->options['forcerewritetitle'] === true ) { + add_action( 'template_redirect', array( $this, 'force_rewrite_output_buffer' ), 99999 ); + add_action( 'wp_footer', array( $this, 'flush_cache' ), - 1 ); +||||||| .r11156 + /** + * Determine whether the current page is the homepage and shows posts. + * + * @return bool + */ + function is_home_posts_page() { + return ( is_home() && 'posts' == get_option( 'show_on_front' ) ); +======= if ( $this->options['forcerewritetitle'] === true ) { add_action( 'template_redirect', array( $this, 'force_rewrite_output_buffer' ), 99999 ); add_action( 'wp_footer', array( $this, 'flush_cache' ), - 1 ); +>>>>>>> .r12027 } if ( $this->options['title_test'] > 0 ) { @@ -188,6 +303,20 @@ class WPSEO_Frontend { return self::$instance; } +<<<<<<< .mine + /** + * Override Woo's title with our own. + * + * @param string $title Title string. + * + * @return string + */ + public function fix_woo_title( $title ) { + return $this->title( $title ); + } +||||||| .r11156 + $post_type = ( isset( $object->post_type ) ? $object->post_type : $object->query_var ); +======= /** * Override Woo's title with our own. * @@ -198,6 +327,7 @@ class WPSEO_Frontend { public function fix_woo_title( $title ) { return $this->title( $title ); } +>>>>>>> .r12027 /** * Determine whether this is the homepage and shows posts. @@ -621,8 +751,15 @@ class WPSEO_Frontend { * * @api bool */ +<<<<<<< .mine + ( ( apply_filters( 'wpseo_hide_version', false ) && $this->is_premium() ) ? '' : ' v' . WPSEO_VERSION ) + ); +||||||| .r11156 + $search_url = apply_filters( 'wpseo_json_ld_search_url', $home_url . '?s={search_term}' ); +======= ( ( apply_filters( 'wpseo_hide_version', false ) && $this->is_premium() ) ? '' : ' v' . WPSEO_VERSION ) ); +>>>>>>> .r12027 if ( $echo === false ) { return $marker; @@ -806,6 +943,45 @@ class WPSEO_Frontend { return $robotsstr; } +<<<<<<< .mine + /** + * Determine $robots values for a single post + * + * @param array $robots Robots data array. + * @param int $post_id The post ID for which to determine the $robots values, defaults to current post. + * + * @return array + */ + public function robots_for_single_post( $robots, $post_id = 0 ) { + $noindex = WPSEO_Meta::get_value( 'meta-robots-noindex', $post_id ); + if ( $noindex === '1' ) { + $robots['index'] = 'noindex'; + } + elseif ( $noindex === '2' ) { + $robots['index'] = 'index'; + } + + if ( WPSEO_Meta::get_value( 'meta-robots-nofollow', $post_id ) === '1' ) { + $robots['follow'] = 'nofollow'; + } + + $meta_robots_adv = WPSEO_Meta::get_value( 'meta-robots-adv', $post_id ); + + if ( $meta_robots_adv !== '' && ( $meta_robots_adv !== '-' && $meta_robots_adv !== 'none' ) ) { + $meta_robots_adv = explode( ',', $meta_robots_adv ); + foreach ( $meta_robots_adv as $robot ) { + $robots['other'][] = $robot; + } + unset( $robot ); + } + elseif ( $meta_robots_adv === '' || $meta_robots_adv === '-' ) { + foreach ( array( 'noodp', 'noydir' ) as $robot ) { + if ( $this->options[ $robot ] === true ) { +||||||| .r11156 + if ( $meta_robots_adv !== '' && ( $meta_robots_adv !== '-' && $meta_robots_adv !== 'none' ) ) { + $meta_robots_adv = explode( ',', $meta_robots_adv ); + foreach ( $meta_robots_adv as $robot ) { +======= /** * Determine $robots values for a single post * @@ -839,6 +1015,7 @@ class WPSEO_Frontend { elseif ( $meta_robots_adv === '' || $meta_robots_adv === '-' ) { foreach ( array( 'noodp', 'noydir' ) as $robot ) { if ( $this->options[ $robot ] === true ) { +>>>>>>> .r12027 $robots['other'][] = $robot; } } @@ -998,6 +1175,19 @@ class WPSEO_Frontend { } } +<<<<<<< .mine + /** + * Parse the home URL setting to find the base URL for relative URLs. + * + * @param string $path Optional path string. + * + * @return string + */ + private function base_url( $path = null ) { + $url = get_option( 'home' ); +||||||| .r11156 + $base_url = trailingslashit( $parts['scheme'] . '://' . $parts['host'] ); +======= /** * Parse the home URL setting to find the base URL for relative URLs. * @@ -1007,6 +1197,7 @@ class WPSEO_Frontend { */ private function base_url( $path = null ) { $url = get_option( 'home' ); +>>>>>>> .r12027 $parts = parse_url( $url ); @@ -1182,9 +1373,29 @@ class WPSEO_Frontend { if ( $keywords === '' && ( is_object( $post ) && ( isset( $this->options[ 'metakey-' . $post->post_type ] ) && $this->options[ 'metakey-' . $post->post_type ] !== '' ) ) ) { $keywords = wpseo_replace_vars( $this->options[ 'metakey-' . $post->post_type ], $post ); } +<<<<<<< .mine + } + elseif ( $this->is_posts_page() ) { + $keywords = $this->get_keywords( get_post( get_option( 'page_for_posts' ) ) ); + } + elseif ( is_category() || is_tag() || is_tax() ) { + $term = $wp_query->get_queried_object(); +||||||| .r11156 + } else { + if ( $this->is_home_posts_page() && $this->options['metakey-home-wpseo'] !== '' ) { + $keywords = wpseo_replace_vars( $this->options['metakey-home-wpseo'], array() ); + } elseif ( $this->is_home_static_page() ) { + $keywords = WPSEO_Meta::get_value( 'metakeywords' ); + if ( $keywords === '' && ( is_object( $post ) && ( isset( $this->options[ 'metakey-' . $post->post_type ] ) && $this->options[ 'metakey-' . $post->post_type ] !== '' ) ) ) { + $keywords = wpseo_replace_vars( $this->options[ 'metakey-' . $post->post_type ], $post ); + } + } elseif ( is_category() || is_tag() || is_tax() ) { + $term = $wp_query->get_queried_object(); +======= } elseif ( is_category() || is_tag() || is_tax() ) { $term = $wp_query->get_queried_object(); +>>>>>>> .r12027 if ( is_object( $term ) ) { $keywords = WPSEO_Taxonomy_Meta::get_term_meta( $term, $term->taxonomy, 'metakey' ); @@ -1225,6 +1436,27 @@ class WPSEO_Frontend { } } +<<<<<<< .mine + /** + * Outputs the meta description element or returns the description text. + * + * @param bool $echo Echo or return output flag. + * + * @return string + */ + public function metadesc( $echo = true ) { + if ( is_null( $this->metadesc ) ) { + $this->generate_metadesc(); + } + + if ( $echo !== false ) { + if ( is_string( $this->metadesc ) && $this->metadesc !== '' ) { + echo '', "\n"; + $this->add_robot_content_noodp( $this->metadesc ); +||||||| .r11156 + if ( is_object( $post ) && ( isset( $post->post_type ) && $post->post_type !== '' ) ) { + $post_type = $post->post_type; +======= /** * Outputs the meta description element or returns the description text. * @@ -1240,6 +1472,7 @@ class WPSEO_Frontend { if ( $echo !== false ) { if ( is_string( $this->metadesc ) && $this->metadesc !== '' ) { echo '', "\n"; +>>>>>>> .r12027 } elseif ( current_user_can( 'manage_options' ) && is_singular() ) { echo '', "\n"; @@ -1451,6 +1684,36 @@ class WPSEO_Frontend { exit; } +<<<<<<< .mine + return false; + } + + /** + * Trailing slashes for everything except is_single(). + * + * Thanks to Mark Jaquith for this code. + * + * @param string $url URL string. + * @param string $type Context (such as single). + * + * @return string + */ + function add_trailingslash( $url, $type ) { + if ( 'single' === $type || 'single_paged' === $type ) { + return $url; +||||||| .r11156 + /** + * Removes the ?replytocom variable from the link, replacing it with a #comment- anchor. + * + * @todo Should this function also allow for relative urls ? + * + * @param string $link The comment link as a string. + * + * @return string + */ + public function remove_reply_to_com( $link ) { + return preg_replace( '`href=(["\'])(?:.*(?:\?|&|&)replytocom=(\d+)#respond)`', 'href=$1#comment-$2', $link ); +======= return false; } @@ -1467,6 +1730,7 @@ class WPSEO_Frontend { function add_trailingslash( $url, $type ) { if ( 'single' === $type || 'single_paged' === $type ) { return $url; +>>>>>>> .r12027 } else { return trailingslashit( $url ); @@ -1744,8 +2008,21 @@ class WPSEO_Frontend { /** * Filter: 'wpseo_include_rss_footer' - Allow the the RSS footer to be dynamically shown/hidden * +<<<<<<< .mine * @api boolean $show_embed Indicates if the RSS footer should be shown or not + * * @param string $context The context of the RSS content - 'full' or 'excerpt'. +||||||| .r11156 + * @since 1.4.14 + * + * @param string $content Feed item content. + * @param string $context Feed item context, either 'excerpt' or 'full'. + * + * @return string +======= + * @api boolean $show_embed Indicates if the RSS footer should be shown or not + * @param string $context The context of the RSS content - 'full' or 'excerpt'. +>>>>>>> .r12027 */ if ( ! apply_filters( 'wpseo_include_rss_footer', true, $context ) ) { return $content; @@ -1767,44 +2044,213 @@ class WPSEO_Frontend { } $content = $before . $content . $after; } +<<<<<<< .mine + } + + return $content; + } + + + /** + * Used in the force rewrite functionality this retrieves the output, replaces the title with the proper SEO + * title and then flushes the output. + */ + function flush_cache() { + + global $wp_query; + + if ( $this->ob_started !== true ) { + return false; +||||||| .r11156 + + return $content; +======= +>>>>>>> .r12027 } +<<<<<<< .mine + $content = ob_get_clean(); +||||||| .r11156 +======= return $content; } +>>>>>>> .r12027 +<<<<<<< .mine + $old_wp_query = $wp_query; +||||||| .r11156 + /** + * Used in the force rewrite functionality this retrieves the output, replaces the title with the proper SEO + * title and then flushes the output. + */ + function flush_cache() { +======= +>>>>>>> .r12027 +<<<<<<< .mine + wp_reset_query(); +||||||| .r11156 + global $wp_query; +======= /** * Used in the force rewrite functionality this retrieves the output, replaces the title with the proper SEO * title and then flushes the output. */ function flush_cache() { +>>>>>>> .r12027 +<<<<<<< .mine + $title = $this->title( '' ); +||||||| .r11156 + if ( $this->ob_started !== true ) { + return false; + } +======= global $wp_query; +>>>>>>> .r12027 +<<<<<<< .mine + // Find all titles, strip them out and add the new one in within the debug marker, so it's easily identified whether a site uses force rewrite. + $content = preg_replace( '//i', '', $content ); + $content = str_replace( $this->debug_marker( false ), $this->debug_marker( false ) . "\n" . '' . $title . '', $content ); +||||||| .r11156 + $content = ob_get_contents(); + ob_end_clean(); +======= if ( $this->ob_started !== true ) { return false; } +>>>>>>> .r12027 +<<<<<<< .mine + $GLOBALS['wp_query'] = $old_wp_query; +||||||| .r11156 + $old_wp_query = $wp_query; +======= $content = ob_get_contents(); ob_end_clean(); +>>>>>>> .r12027 +<<<<<<< .mine + echo $content; +||||||| .r11156 + wp_reset_query(); +======= $old_wp_query = $wp_query; +>>>>>>> .r12027 +<<<<<<< .mine + return true; + } +||||||| .r11156 + $title = $this->title( '' ); +======= wp_reset_query(); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Starts the output buffer so it can later be fixed by flush_cache() + */ + function force_rewrite_output_buffer() { + $this->ob_started = true; + ob_start(); + } +||||||| .r11156 + // Find all titles, strip them out and add the new one in within the debug marker, so it's easily identified whether a site uses force rewrite. + $content = preg_replace( '//i', '', $content ); + $content = str_replace( $this->debug_marker( false ), $this->debug_marker( false ) . "\n" . '' . $title . '', $content ); +======= $title = $this->title( '' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Function used in testing whether the title should be force rewritten or not. + * + * @param string $title Title string. + * + * @return string + */ + function title_test_helper( $title ) { + $wpseo_titles = get_option( 'wpseo_titles' ); +||||||| .r11156 + $GLOBALS['wp_query'] = $old_wp_query; +======= // Find all titles, strip them out and add the new one in within the debug marker, so it's easily identified whether a site uses force rewrite. $content = preg_replace( '//i', '', $content ); $content = str_replace( $this->debug_marker( false ), $this->debug_marker( false ) . "\n" . '' . $title . '', $content ); +>>>>>>> .r12027 + +<<<<<<< .mine + $wpseo_titles['title_test'] ++; + update_option( 'wpseo_titles', $wpseo_titles ); + // Prevent this setting from being on forever when something breaks, as it breaks caching. + if ( $wpseo_titles['title_test'] > 5 ) { + $wpseo_titles['title_test'] = 0; + update_option( 'wpseo_titles', $wpseo_titles ); + + remove_filter( 'wpseo_title', array( $this, 'title_test_helper' ) ); + + return $title; + } +||||||| .r11156 + echo $content; + return true; + } +======= $GLOBALS['wp_query'] = $old_wp_query; +>>>>>>> .r12027 +<<<<<<< .mine + if ( ! defined( 'DONOTCACHEPAGE' ) ) { + define( 'DONOTCACHEPAGE', true ); + } +||||||| .r11156 + /** + * Starts the output buffer so it can later be fixed by flush_cache() + */ + function force_rewrite_output_buffer() { + $this->ob_started = true; + ob_start(); + } +======= echo $content; +>>>>>>> .r12027 + if ( ! defined( 'DONOTCACHCEOBJECT' ) ) { + define( 'DONOTCACHCEOBJECT', true ); + } + if ( ! defined( 'DONOTMINIFY' ) ) { + define( 'DONOTMINIFY', true ); + } +<<<<<<< .mine + if ( $_SERVER['HTTP_USER_AGENT'] === "WordPress/{$GLOBALS['wp_version']}; " . get_bloginfo( 'url' ) . ' - Yoast' ) { + return 'This is a Yoast Test Title'; + } +||||||| .r11156 + /** + * Function used in testing whether the title should be force rewritten or not. + * + * @param string $title + * + * @return string + */ + function title_test_helper( $title ) { + $wpseo_titles = get_option( 'wpseo_titles' ); +======= return true; } +>>>>>>> .r12027 +<<<<<<< .mine + return $title; + } +||||||| .r11156 + $wpseo_titles['title_test']++; + update_option( 'wpseo_titles', $wpseo_titles ); +======= /** * Starts the output buffer so it can later be fixed by flush_cache() */ @@ -1812,7 +2258,28 @@ class WPSEO_Frontend { $this->ob_started = true; ob_start(); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Get the product name in the head section + * + * @return string + */ + private function head_product_name() { + if ( $this->is_premium() ) { + return 'Yoast SEO Premium plugin'; + } + else { + return 'Yoast SEO plugin'; + } + } +||||||| .r11156 + // Prevent this setting from being on forever when something breaks, as it breaks caching. + if ( $wpseo_titles['title_test'] > 5 ) { + $wpseo_titles['title_test'] = 0; + update_option( 'wpseo_titles', $wpseo_titles ); +======= /** * Function used in testing whether the title should be force rewritten or not. * @@ -1822,20 +2289,87 @@ class WPSEO_Frontend { */ function title_test_helper( $title ) { $wpseo_titles = get_option( 'wpseo_titles' ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Check if this plugin is the premium version of WPSEO + * + * @return bool + */ + private function is_premium() { + return file_exists( WPSEO_PATH . 'premium/' ); + } +||||||| .r11156 + remove_filter( 'wpseo_title', array( $this, 'title_test_helper' ) ); + return $title; + } +======= $wpseo_titles['title_test'] ++; update_option( 'wpseo_titles', $wpseo_titles ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Checks whether the user has written a meta-description. If written, makes sure meta robots content is noodp. + * + * @param String $description The content of the meta description. + */ + private function add_robot_content_noodp( $description ) { + if ( ! ( empty( $description ) ) && $this->options['noodp'] === false ) { + $this->options['noodp'] = true; + } + } +||||||| .r11156 + if ( ! defined( 'DONOTCACHEPAGE' ) ) { + define( 'DONOTCACHEPAGE', true ); + } + if ( ! defined( 'DONOTCACHCEOBJECT' ) ) { + define( 'DONOTCACHCEOBJECT', true ); + } + if ( ! defined( 'DONOTMINIFY' ) ) { + define( 'DONOTMINIFY', true ); + } +======= // Prevent this setting from being on forever when something breaks, as it breaks caching. if ( $wpseo_titles['title_test'] > 5 ) { $wpseo_titles['title_test'] = 0; update_option( 'wpseo_titles', $wpseo_titles ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Getting the keywords + * + * @param WP_Post $post The post object with the values. + * + * @return string + */ + private function get_keywords( $post ) { + $keywords = WPSEO_Meta::get_value( 'metakeywords', $post->ID ); + $option_meta_key = 'metakey-' . $post->post_type; +||||||| .r11156 + global $wp_version; + if ( $_SERVER['HTTP_USER_AGENT'] == "WordPress/${wp_version}; " . get_bloginfo( 'url' ) . ' - Yoast' ) { + return 'This is a Yoast Test Title'; + } +======= remove_filter( 'wpseo_title', array( $this, 'title_test_helper' ) ); +>>>>>>> .r12027 - return $title; + if ( $keywords === '' && ( is_object( $post ) && ( isset( $this->options[ $option_meta_key ] ) && $this->options[ $option_meta_key ] !== '' ) ) ) { + $keywords = wpseo_replace_vars( $this->options[ $option_meta_key ], $post ); } +<<<<<<< .mine + return $keywords; + } +} /* End of class */ +||||||| .r11156 + } /* End of class */ + +} /* End of class-exists wrapper */ +======= if ( ! defined( 'DONOTCACHEPAGE' ) ) { define( 'DONOTCACHEPAGE', true ); } @@ -1877,3 +2411,4 @@ class WPSEO_Frontend { } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-googleplus.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-googleplus.php index fd8b2253..52d8dd3c 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-googleplus.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-googleplus.php @@ -47,65 +47,227 @@ class WPSEO_GooglePlus { do_action( 'wpseo_googleplus' ); } +<<<<<<< .mine + /** + * Output the Google+ specific description + */ + public function description() { + $desc = $this->get_meta_value( 'google-plus-description' ); +||||||| .r11156 + return self::$instance; + } +======= /** * Output the Google+ specific description */ public function description() { if ( is_singular() ) { $desc = WPSEO_Meta::get_value( 'google-plus-description' ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_string( $desc ) ) { +||||||| .r11156 + /** + * Output the Google+ specific content + */ + public function output() { +======= +>>>>>>> .r12027 /** * Filter: 'wpseo_googleplus_desc' - Allow developers to change the Google+ specific description output * * @api string $desc The description string */ +<<<<<<< .mine $desc = trim( apply_filters( 'wpseo_googleplus_desc', $desc ) ); + if ( is_string( $desc ) && $desc !== '' ) { + echo '', "\n"; + } + } +||||||| .r11156 + do_action( 'wpseo_googleplus' ); + } +======= + $desc = trim( apply_filters( 'wpseo_googleplus_desc', $desc ) ); +>>>>>>> .r12027 + } + +<<<<<<< .mine + /** + * Output the Google+ specific title + */ + public function google_plus_title() { + $title = $this->get_meta_value( 'google-plus-title' ); + + if ( is_string( $title ) ) { + /** + * Filter: 'wpseo_googleplus_title' - Allow developers to change the Google+ specific title + * + * @api string $title The title string + */ + $title = trim( apply_filters( 'wpseo_googleplus_title', $title ) ); + + if ( is_string( $title ) && $title !== '' ) { + $title = wpseo_replace_vars( $title, get_post() ); + + echo '', "\n"; +||||||| .r11156 + /** + * Output the Google+ specific description + */ + public function description() { + if ( is_singular() ) { + $desc = WPSEO_Meta::get_value( 'google-plus-description' ); + + /** + * Filter: 'wpseo_googleplus_desc' - Allow developers to change the Google+ specific description output + * + * @api string $desc The description string + */ + $desc = trim( apply_filters( 'wpseo_googleplus_desc', $desc ) ); + + if ( is_string( $desc ) && '' !== $desc ) { + echo '' . "\n"; + } +======= if ( is_string( $desc ) && '' !== $desc ) { echo '', "\n"; +>>>>>>> .r12027 } } } +<<<<<<< .mine + /** + * Output the Google+ specific image + */ + public function google_plus_image() { + $image = $this->get_meta_value( 'google-plus-image' ); +||||||| .r11156 + /** + * Output the Google+ specific title + */ + public function google_plus_title() { + if ( is_singular() ) { + $title = WPSEO_Meta::get_value( 'google-plus-title' ); +======= /** * Output the Google+ specific title */ public function google_plus_title() { if ( is_singular() ) { $title = WPSEO_Meta::get_value( 'google-plus-title' ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_string( $image ) ) { +||||||| .r11156 + /** + * Filter: 'wpseo_googleplus_title' - Allow developers to change the Google+ specific title + * + * @api string $title The title string + */ + $title = trim( apply_filters( 'wpseo_googleplus_title', $title ) ); +======= /** * Filter: 'wpseo_googleplus_title' - Allow developers to change the Google+ specific title * * @api string $title The title string */ $title = trim( apply_filters( 'wpseo_googleplus_title', $title ) ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Filter: 'wpseo_googleplus_image' - Allow changing the Google+ image + * + * @api string $img Image URL string + */ + $image = trim( apply_filters( 'wpseo_googleplus_image', $image ) ); +||||||| .r11156 + if ( is_string( $title ) && $title !== '' ) { + $title = wpseo_replace_vars( $title, get_post() ); +======= if ( is_string( $title ) && $title !== '' ) { $title = wpseo_replace_vars( $title, get_post() ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_string( $image ) && $image !== '' ) { + echo '', "\n"; +||||||| .r11156 + echo '' . "\n"; + } +======= echo '', "\n"; +>>>>>>> .r12027 } } } +<<<<<<< .mine + /** + * Returns the meta value for the given $meta_key. + * + * @param string $meta_key The target key that will be fetched. + * + * @return string + */ + private function get_meta_value( $meta_key ) { + if ( is_singular() ) { + return WPSEO_Meta::get_value( $meta_key ); + } +||||||| .r11156 + /** + * Output the Google+ specific image + */ + public function google_plus_image() { + if ( is_singular() ) { + $image = WPSEO_Meta::get_value( 'google-plus-image' ); +======= /** * Output the Google+ specific image */ public function google_plus_image() { if ( is_singular() ) { $image = WPSEO_Meta::get_value( 'google-plus-image' ); +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_category() || is_tag() || is_tax() ) { + return WPSEO_Taxonomy_Meta::get_meta_without_term( $meta_key ); + } +||||||| .r11156 + /** + * Filter: 'wpseo_googleplus_image' - Allow changing the Google+ image + * + * @api string $img Image URL string + */ + $image = trim( apply_filters( 'wpseo_googleplus_image', $image ) ); +======= /** * Filter: 'wpseo_googleplus_image' - Allow changing the Google+ image * * @api string $img Image URL string */ $image = trim( apply_filters( 'wpseo_googleplus_image', $image ) ); +>>>>>>> .r12027 +<<<<<<< .mine + return ''; +||||||| .r11156 + if ( is_string( $image ) && $image !== '' ) { + echo '' . "\n"; + } + } + } +======= if ( is_string( $image ) && $image !== '' ) { echo '', "\n"; } } +>>>>>>> .r12027 } } diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-json-ld.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-json-ld.php index 3dab41b2..a8211d98 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-json-ld.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-json-ld.php @@ -1,3 +1,271 @@ +<<<<<<< .mine +options = WPSEO_Options::get_all(); + + add_action( 'wpseo_head', array( $this, 'json_ld' ), 90 ); + add_action( 'wpseo_json_ld', array( $this, 'website' ), 10 ); + add_action( 'wpseo_json_ld', array( $this, 'organization_or_person' ), 20 ); + } + + /** + * JSON LD output function that the functions for specific code can hook into + * + * @since 1.8 + */ + public function json_ld() { + do_action( 'wpseo_json_ld' ); + } + + /** + * Outputs code to allow Google to recognize social profiles for use in the Knowledge graph + * + * @since 1.8 + */ + public function organization_or_person() { + if ( '' === $this->options['company_or_person'] ) { + return; + } + + $this->prepare_organization_person_markup(); + + switch ( $this->options['company_or_person'] ) { + case 'company': + $this->organization(); + break; + case 'person': + $this->person(); + break; + } + + $this->output( $this->options['company_or_person'] ); + } + + /** + * Outputs code to allow recognition of the internal search engine + * + * @since 1.5.7 + * + * @link https://developers.google.com/structured-data/site-name + */ + public function website() { + $this->data = array( + '@context' => 'http://schema.org', + '@type' => 'WebSite', + 'url' => $this->get_home_url(), + 'name' => $this->get_website_name(), + ); + + $this->add_alternate_name(); + $this->internal_search_section(); + + $this->output( 'website' ); + } + + /** + * Outputs the JSON LD code in a valid JSON+LD wrapper + * + * @since 1.8 + * + * @param string $context The context of the output, useful for filtering. + */ + private function output( $context ) { + /** + * Filter: 'wpseo_json_ld_output' - Allows filtering of the JSON+LD output + * + * @api array $output The output array, before its JSON encoded + * + * @param string $context The context of the output, useful to determine whether to filter or not. + */ + $this->data = apply_filters( 'wpseo_json_ld_output', $this->data, $context ); + + if ( is_array( $this->data ) && ! empty( $this->data ) ) { + $json_data = WPSEO_Utils::json_encode( $this->data ); + + echo "', "\n"; + } + + // Empty the $data array so we don't output it twice. + $this->data = array(); + } + + /** + * Schema for Organization + */ + private function organization() { + if ( '' !== $this->options['company_name'] ) { + $this->data['@type'] = 'Organization'; + $this->data['name'] = $this->options['company_name']; + $this->data['logo'] = $this->options['company_logo']; + return; + } + $this->data = false; + } + + /** + * Schema for Person + */ + private function person() { + if ( '' !== $this->options['person_name'] ) { + $this->data['@type'] = 'Person'; + $this->data['name'] = $this->options['person_name']; + return; + } + $this->data = false; + } + + /** + * Prepares the organization or person markup + */ + private function prepare_organization_person_markup() { + $this->fetch_social_profiles(); + + $this->data = array( + '@context' => 'http://schema.org', + '@type' => '', + 'url' => WPSEO_Frontend::get_instance()->canonical( false, true ), + 'sameAs' => $this->profiles, + ); + } + + /** + * Retrieve the social profiles to display in the organization output. + * + * @since 1.8 + * + * @link https://developers.google.com/webmasters/structured-data/customize/social-profiles + */ + private function fetch_social_profiles() { + $social_profiles = array( + 'facebook_site', + 'instagram_url', + 'linkedin_url', + 'plus-publisher', + 'myspace_url', + 'youtube_url', + 'pinterest_url', + ); + foreach ( $social_profiles as $profile ) { + if ( $this->options[ $profile ] !== '' ) { + $this->profiles[] = $this->options[ $profile ]; + } + } + + if ( ! empty( $this->options['twitter_site'] ) ) { + $this->profiles[] = 'https://twitter.com/' . $this->options['twitter_site']; + } + } + + /** + * Retrieves the home URL + * + * @return string + */ + private function get_home_url() { + /** + * Filter: 'wpseo_json_home_url' - Allows filtering of the home URL for Yoast SEO's JSON+LD output + * + * @api unsigned string + */ + return apply_filters( 'wpseo_json_home_url', trailingslashit( home_url() ) ); + } + + /** + * Returns an alternate name if one was specified in the Yoast SEO settings + */ + private function add_alternate_name() { + if ( '' !== $this->options['alternate_website_name'] ) { + $this->data['alternateName'] = $this->options['alternate_website_name']; + } + } + + /** + * Adds the internal search JSON LD code if it's not disabled + * + * @link https://developers.google.com/structured-data/slsb-overview + */ + private function internal_search_section() { + /** + * Filter: 'disable_wpseo_json_ld_search' - Allow disabling of the json+ld output + * + * @api bool $display_search Whether or not to display json+ld search on the frontend + */ + if ( ! apply_filters( 'disable_wpseo_json_ld_search', false ) ) { + /** + * Filter: 'wpseo_json_ld_search_url' - Allows filtering of the search URL for Yoast SEO + * + * @api string $search_url The search URL for this site with a `{search_term_string}` variable. + */ + $search_url = apply_filters( 'wpseo_json_ld_search_url', $this->get_home_url() . '?s={search_term_string}' ); + + $this->data['potentialAction'] = array( + '@type' => 'SearchAction', + 'target' => $search_url, + 'query-input' => 'required name=search_term_string', + ); + } + } + + /** + * Returns the website name either from Yoast SEO's options or from the site settings + * + * @since 2.1 + * + * @return string + */ + private function get_website_name() { + if ( '' !== $this->options['website_name'] ) { + return $this->options['website_name']; + } + + return get_bloginfo( 'name' ); + } + + /** + * Renders internal search schema markup + * + * @deprecated 2.1 + * @deprecated use WPSEO_JSON_LD::website() + */ + public function internal_search() { + _deprecated_function( __METHOD__, 'WPSEO 2.1', 'WPSEO_JSON_LD::website()' ); + + $this->website(); + } +} +||||||| .r0 +======= website(); } } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php index 4307314e..37bcdac2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php @@ -57,6 +57,19 @@ class WPSEO_OpenGraph { do_action( 'wpseo_opengraph' ); } +<<<<<<< .mine + /** + * Internal function to output FB tags. This also adds an output filter to each bit of output based on the property. + * + * @param string $property Property attribute value. + * @param string $content Content attribute value. + * + * @return boolean + */ + public function og_tag( $property, $content ) { + $og_property = str_replace( ':', '_', $property ); +||||||| .r11156 +======= /** * Internal function to output FB tags. This also adds an output filter to each bit of output based on the property. * @@ -67,6 +80,7 @@ class WPSEO_OpenGraph { */ public function og_tag( $property, $content ) { $og_property = str_replace( ':', '_', $property ); +>>>>>>> .r12027 /** * Filter: 'wpseo_og_' . $og_property - Allow developers to change the content of specific OG meta tags. * @@ -183,10 +197,29 @@ class WPSEO_OpenGraph { * * @api string $adminstr The admin string */ +<<<<<<< .mine + $adminstr = apply_filters( 'wpseo_opengraph_admin', $adminstr ); + if ( is_string( $adminstr ) && $adminstr !== '' ) { +||||||| .r11156 + $facebook = apply_filters( 'wpseo_opengraph_author_facebook', get_the_author_meta( 'facebook', $post->post_author ) ); +======= $adminstr = apply_filters( 'wpseo_opengraph_admin', $adminstr ); if ( is_string( $adminstr ) && $adminstr !== '' ) { $this->og_tag( 'fb:admins', $adminstr ); +>>>>>>> .r12027 + +<<<<<<< .mine + $admins = explode( ',', $adminstr ); + + foreach ( $admins as $admin_id ) { + $this->og_tag( 'fb:admins', $admin_id ); + } +||||||| .r11156 + if ( $facebook && ( is_string( $facebook ) && $facebook !== '' ) ) { + $this->og_tag( 'article:author', $facebook ); +======= +>>>>>>> .r12027 return true; } } @@ -222,12 +255,32 @@ class WPSEO_OpenGraph { $title = wpseo_replace_vars( $title, $post ); } } +<<<<<<< .mine else if ( is_front_page() ) { $title = ( isset( $this->options['og_frontpage_title'] ) && $this->options['og_frontpage_title'] !== '' ) ? $this->options['og_frontpage_title'] : $frontend->title( '' ); } + elseif ( is_category() || is_tax() || is_tag() ) { + $title = WPSEO_Taxonomy_Meta::get_meta_without_term( 'opengraph-title' ); + if ( $title === '' ) { + $title = $frontend->get_taxonomy_title( '' ); + } + else { + // Replace Yoast SEO Variables. + $title = wpseo_replace_vars( $title, $GLOBALS['wp_query']->get_queried_object() ); + } + } else { $title = $frontend->title( '' ); } +||||||| .r11156 +======= + else if ( is_front_page() ) { + $title = ( isset( $this->options['og_frontpage_title'] ) && $this->options['og_frontpage_title'] !== '' ) ? $this->options['og_frontpage_title'] : $frontend->title( '' ); + } + else { + $title = $frontend->title( '' ); + } +>>>>>>> .r12027 /** * Filter: 'wpseo_opengraph_title' - Allow changing the title specifically for OpenGraph @@ -470,6 +523,23 @@ class WPSEO_OpenGraph { } } +<<<<<<< .mine + return ''; + } + + /** + * Create new WPSEO_OpenGraph_Image class and get the images to set the og:image + * + * @param string|boolean $image Optional image URL. + */ + public function image( $image = false ) { + $opengraph_images = new WPSEO_OpenGraph_Image( $this->options, $image ); + + foreach ( $opengraph_images->get_images() as $img ) { + $this->og_tag( 'og:image', esc_url( $img ) ); +||||||| .r11156 + return false; +======= return ''; } @@ -483,9 +553,41 @@ class WPSEO_OpenGraph { foreach ( $opengraph_images->get_images() as $img ) { $this->og_tag( 'og:image', esc_url( $img ) ); +>>>>>>> .r12027 } } +<<<<<<< .mine + /** + * Fallback method for plugins using image_output + * + * @param string $image Image URL. + */ + public function image_output( $image ) { + $this->image( $image ); + } +||||||| .r11156 + /** + * Output the locale, doing some conversions to make sure the proper Facebook locale is outputted. + * + * Last update/compare with FB list done on July 14, 2013 by JRF + * Results: 1 new locale added, found 32 in the below list which are not in the FB list (not removed), 76 OK. + * @see http://www.facebook.com/translations/FacebookLocales.xml for the list of supported locales + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * + * @param bool $echo Whether to echo or return the locale + * + * @return string $locale + */ + public function locale( $echo = true ) { + /** + * Filter: 'wpseo_locale' - Allow changing the locale output + * + * @api string $unsigned Locale string + */ + $locale = apply_filters( 'wpseo_locale', get_locale() ); +======= /** * Fallback method for plugins using image_output * @@ -494,6 +596,7 @@ class WPSEO_OpenGraph { public function image_output( $image ) { $this->image( $image ); } +>>>>>>> .r12027 /** * Output the OpenGraph description, specific OG description first, if not, grab the meta description. @@ -510,6 +613,7 @@ class WPSEO_OpenGraph { if ( isset( $this->options['og_frontpage_desc'] ) && $this->options['og_frontpage_desc'] !== '' ) { $ogdesc = wpseo_replace_vars( $this->options['og_frontpage_desc'], null ); } +<<<<<<< .mine else { $ogdesc = $frontend->metadesc( false ); } @@ -528,31 +632,211 @@ class WPSEO_OpenGraph { // Use metadesc if $ogdesc is empty. if ( $ogdesc === '' ) { $ogdesc = $frontend->metadesc( false ); +||||||| .r11156 + + // convert locales like "es" to "es_ES", in case that works for the given locale (sometimes it does) + if ( strlen( $locale ) == 2 ) { + $locale = strtolower( $locale ) . '_' . strtoupper( $locale ); +======= + else { + $ogdesc = $frontend->metadesc( false ); +>>>>>>> .r12027 } + } +<<<<<<< .mine // Tag og:description is still blank so grab it from get_the_excerpt(). if ( ! is_string( $ogdesc ) || ( is_string( $ogdesc ) && $ogdesc === '' ) ) { $ogdesc = str_replace( '[…]', '…', strip_tags( get_the_excerpt() ) ); } } +||||||| .r11156 + // These are the locales FB supports + $fb_valid_fb_locales = array( + 'ca_ES', 'cs_CZ', 'cy_GB', 'da_DK', 'de_DE', 'eu_ES', 'en_PI', 'en_UD', 'ck_US', 'en_US', 'es_LA', 'es_CL', 'es_CO', 'es_ES', 'es_MX', + 'es_VE', 'fb_FI', 'fi_FI', 'fr_FR', 'gl_ES', 'hu_HU', 'it_IT', 'ja_JP', 'ko_KR', 'nb_NO', 'nn_NO', 'nl_NL', 'pl_PL', 'pt_BR', 'pt_PT', + 'ro_RO', 'ru_RU', 'sk_SK', 'sl_SI', 'sv_SE', 'th_TH', 'tr_TR', 'ku_TR', 'zh_CN', 'zh_HK', 'zh_TW', 'fb_LT', 'af_ZA', 'sq_AL', 'hy_AM', + 'az_AZ', 'be_BY', 'bn_IN', 'bs_BA', 'bg_BG', 'hr_HR', 'nl_BE', 'en_GB', 'eo_EO', 'et_EE', 'fo_FO', 'fr_CA', 'ka_GE', 'el_GR', 'gu_IN', + 'hi_IN', 'is_IS', 'id_ID', 'ga_IE', 'jv_ID', 'kn_IN', 'kk_KZ', 'la_VA', 'lv_LV', 'li_NL', 'lt_LT', 'mk_MK', 'mg_MG', 'ms_MY', 'mt_MT', + 'mr_IN', 'mn_MN', 'ne_NP', 'pa_IN', 'rm_CH', 'sa_IN', 'sr_RS', 'so_SO', 'sw_KE', 'tl_PH', 'ta_IN', 'tt_RU', 'te_IN', 'ml_IN', 'uk_UA', + 'uz_UZ', 'vi_VN', 'xh_ZA', 'zu_ZA', 'km_KH', 'tg_TJ', 'ar_AR', 'he_IL', 'ur_PK', 'fa_IR', 'sy_SY', 'yi_DE', 'gn_PY', 'qu_PE', 'ay_BO', + 'se_NO', 'ps_AF', 'tl_ST', 'fy_NL', + ); +======= + $is_posts_page = $frontend->is_posts_page(); +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_category() || is_tag() || is_tax() ) { + $ogdesc = WPSEO_Taxonomy_Meta::get_meta_without_term( 'opengraph-description' ); + if ( $ogdesc === '' ) { + $ogdesc = $frontend->metadesc( false ); +||||||| .r11156 + // check to see if the locale is a valid FB one, if not, use en_US as a fallback + // check to see if the locale is a valid FB one, if not, use en_US as a fallback + if ( ! in_array( $locale, $fb_valid_fb_locales ) ) { + $locale = strtolower( substr( $locale, 0, 2 ) ) . '_' . strtoupper( substr( $locale, 0, 2 ) ); + if ( ! in_array( $locale, $fb_valid_fb_locales ) ) { + $locale = 'en_US'; + } +======= + if ( is_singular() || $is_posts_page ) { + $post_id = ( $is_posts_page ) ? get_option( 'page_for_posts' ) : get_the_ID(); + $post = get_post( $post_id ); + $ogdesc = WPSEO_Meta::get_value( 'opengraph-description', $post_id ); + + // Replace Yoast SEO Variables. + $ogdesc = wpseo_replace_vars( $ogdesc, $post ); + + // Use metadesc if $ogdesc is empty. + if ( $ogdesc === '' ) { + $ogdesc = $frontend->metadesc( false ); +>>>>>>> .r12027 + } + +<<<<<<< .mine + if ( $ogdesc === '' ) { + $ogdesc = trim( strip_tags( term_description() ) ); +||||||| .r11156 + if ( $echo !== false ) { + $this->og_tag( 'og:locale', $locale ); +======= + // Tag og:description is still blank so grab it from get_the_excerpt(). + if ( ! is_string( $ogdesc ) || ( is_string( $ogdesc ) && $ogdesc === '' ) ) { + $ogdesc = str_replace( '[…]', '…', strip_tags( get_the_excerpt() ) ); +>>>>>>> .r12027 + } +<<<<<<< .mine + + if ( $ogdesc === '' ) { + $ogdesc = WPSEO_Taxonomy_Meta::get_meta_without_term( 'desc' ); + } +||||||| .r11156 + + return $locale; +======= +>>>>>>> .r12027 + } + +<<<<<<< .mine + // Strip shortcodes if any. + $ogdesc = strip_shortcodes( $ogdesc ); + + /** + * Filter: 'wpseo_opengraph_desc' - Allow changing the OpenGraph description + * + * @api string $ogdesc The description string. + */ + $ogdesc = trim( apply_filters( 'wpseo_opengraph_desc', $ogdesc ) ); +||||||| .r11156 + /** + * Output the OpenGraph type. + * + * @param boolean $echo Whether to echo or return the type + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/object/ + * + * @return string $type + */ + public function type( $echo = true ) { +======= if ( is_category() || is_tag() || is_tax() ) { +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_string( $ogdesc ) && $ogdesc !== '' ) { + if ( $echo !== false ) { + $this->og_tag( 'og:description', $ogdesc ); + } + } +||||||| .r11156 + if ( is_front_page() || is_home() ) { + $type = 'website'; + } elseif ( is_singular() ) { +======= $ogdesc = $frontend->metadesc( false ); +>>>>>>> .r12027 +<<<<<<< .mine + return $ogdesc; + } +||||||| .r11156 + // This'll usually only be changed by plugins right now. + $type = WPSEO_Meta::get_value( 'og_type' ); +======= if ( '' == $ogdesc ) { $ogdesc = trim( strip_tags( term_description() ) ); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Output the site name straight from the blog info. + */ + public function site_name() { + /** + * Filter: 'wpseo_opengraph_site_name' - Allow changing the OpenGraph site name + * + * @api string $unsigned Blog name string + */ + $name = apply_filters( 'wpseo_opengraph_site_name', get_bloginfo( 'name' ) ); + if ( is_string( $name ) && $name !== '' ) { + $this->og_tag( 'og:site_name', $name ); + } + } +||||||| .r11156 + if ( $type === '' ) { + $type = 'article'; + } + } else { + // We use "object" for archives etc. as article doesn't apply there + $type = 'object'; + } +======= if ( '' == $ogdesc ) { $term = $GLOBALS['wp_query']->get_queried_object(); $ogdesc = WPSEO_Taxonomy_Meta::get_term_meta( $term, $term->taxonomy, 'desc' ); } +>>>>>>> .r12027 } +<<<<<<< .mine + /** + * Output the article tags as article:tag tags. + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * @return boolean + */ + public function tags() { + if ( ! is_singular() ) { + return false; + } +||||||| .r11156 + /** + * Filter: 'wpseo_opengraph_type' - Allow changing the OpenGraph type of the page + * + * @api string $type The OpenGraph type string. + */ + $type = apply_filters( 'wpseo_opengraph_type', $type ); +======= // Strip shortcodes if any. $ogdesc = strip_shortcodes( $ogdesc ); +>>>>>>> .r12027 + +<<<<<<< .mine + $tags = get_the_tags(); + if ( ! is_wp_error( $tags ) && ( is_array( $tags ) && $tags !== array() ) ) { + foreach ( $tags as $tag ) { + $this->og_tag( 'article:tag', $tag->name ); +||||||| .r11156 + if ( is_string( $type ) && $type !== '' ) { + if ( $echo !== false ) { + $this->og_tag( 'og:type', $type ); + } else { + return $type; + } +======= /** * Filter: 'wpseo_opengraph_desc' - Allow changing the OpenGraph description * @@ -563,9 +847,37 @@ class WPSEO_OpenGraph { if ( is_string( $ogdesc ) && $ogdesc !== '' ) { if ( $echo !== false ) { $this->og_tag( 'og:description', $ogdesc ); +>>>>>>> .r12027 } +<<<<<<< .mine + + return true; +||||||| .r11156 + + return ''; +======= +>>>>>>> .r12027 } +<<<<<<< .mine + return false; + } +||||||| .r11156 + /** + * Display an OpenGraph image tag + * + * @param string $img Source URL to the image + * + * @return bool + */ + function image_output( $img ) { + /** + * Filter: 'wpseo_opengraph_image' - Allow changing the OpenGraph image + * + * @api string $img Image URL string + */ + $img = trim( apply_filters( 'wpseo_opengraph_image', $img ) ); +======= return $ogdesc; } @@ -583,7 +895,21 @@ class WPSEO_OpenGraph { $this->og_tag( 'og:site_name', $name ); } } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Output the article category as an article:section tag. + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * @return boolean; + */ + public function category() { +||||||| .r11156 + if ( empty( $img ) ) { + return false; + } +======= /** * Output the article tags as article:tag tags. * @@ -594,20 +920,62 @@ class WPSEO_OpenGraph { if ( ! is_singular() ) { return false; } +>>>>>>> .r12027 +<<<<<<< .mine + if ( ! is_singular() ) { + return false; + } +||||||| .r11156 + if ( wpseo_is_url_relative( $img ) === true ) { + if ( $img[0] != '/' ) { + return false; + } +======= $tags = get_the_tags(); if ( ! is_wp_error( $tags ) && ( is_array( $tags ) && $tags !== array() ) ) { +>>>>>>> .r12027 +<<<<<<< .mine + $terms = get_the_category(); +||||||| .r11156 + // If it's a relative URL, it's relative to the domain, not necessarily to the WordPress install, we + // want to preserve domain name and URL scheme (http / https) though. + $parsed_url = parse_url( home_url() ); + $img = $parsed_url['scheme'] . '://' . $parsed_url['host'] . $img; + } +======= foreach ( $tags as $tag ) { $this->og_tag( 'article:tag', $tag->name ); } +>>>>>>> .r12027 +<<<<<<< .mine + if ( ! is_wp_error( $terms ) && ( is_array( $terms ) && $terms !== array() ) ) { +||||||| .r11156 + if ( in_array( $img, $this->shown_images ) ) { + return false; + } +======= return true; } +>>>>>>> .r12027 +<<<<<<< .mine + // We can only show one section here, so we take the first one. + $this->og_tag( 'article:section', $terms[0]->name ); +||||||| .r11156 + array_push( $this->shown_images, $img ); +======= return false; } +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 + $this->og_tag( 'og:image', esc_url( $img ) ); +======= /** * Output the article category as an article:section tag. * @@ -616,6 +984,7 @@ class WPSEO_OpenGraph { */ public function category() { +>>>>>>> .r12027 if ( ! is_singular() ) { return false; } @@ -678,11 +1047,58 @@ class WPSEO_OpenGraph_Image { */ private $options; +<<<<<<< .mine + /** + * @var array $images Holds the images that have been put out as OG image. + */ + private $images = array(); + + /** + * Constructor + * + * @param array $options Options set. + * @param string|boolean $image Optional image URL. + */ + public function __construct( $options, $image = false ) { + $this->options = $options; + $this->set_images(); + + if ( ! empty( $image ) ) { + $this->add_image( $image ); + } +||||||| .r11156 + if ( count( $this->shown_images ) == 0 && $this->options['og_default_image'] !== '' ) { + $this->image_output( $this->options['og_default_image'] ); + } + } +======= /** * @var array $images Holds the images that have been put out as OG image. */ private $images = array(); +>>>>>>> .r12027 + } +<<<<<<< .mine + /** + * Return the images array + * + * @return array + */ + public function get_images() { + return $this->images; + } +||||||| .r11156 + /** + * Output the OpenGraph description, specific OG description first, if not, grab the meta description. + * + * @param bool $echo Whether to echo or return the description + * + * @return string $ogdesc + */ + public function description( $echo = true ) { + $ogdesc = ''; +======= /** * Constructor * @@ -692,12 +1108,35 @@ class WPSEO_OpenGraph_Image { public function __construct( $options, $image = false ) { $this->options = $options; $this->set_images(); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Check if page is front page or singular and call the corresponding functions. If not, call get_default_image. + */ + private function set_images() { + if ( is_front_page() ) { + $this->get_front_page_image(); + } +||||||| .r11156 + if ( is_front_page() ) { + $ogdesc = ( $this->options['og_frontpage_desc'] !== '' ) ? $this->options['og_frontpage_desc'] : $this->metadesc( false ); + } +======= if ( ! empty( $image ) ) { $this->add_image( $image ); } } +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_singular() ) { + $this->get_singular_image(); + } +||||||| .r11156 + if ( is_singular() ) { + $ogdesc = WPSEO_Meta::get_value( 'opengraph-description' ); +======= /** * Return the images array * @@ -706,7 +1145,16 @@ class WPSEO_OpenGraph_Image { public function get_images() { return $this->images; } +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_category() || is_tax() || is_tag() ) { + $this->get_opengraph_image_taxonomy(); + } +||||||| .r11156 + // Replace WP SEO Variables + $ogdesc = wpseo_replace_vars( $ogdesc, get_post() ); +======= /** * Check if page is front page or singular and call the corresponding functions. If not, call get_default_image. */ @@ -714,14 +1162,51 @@ class WPSEO_OpenGraph_Image { if ( is_front_page() ) { $this->get_front_page_image(); } +>>>>>>> .r12027 +<<<<<<< .mine + $this->get_default_image(); + } +||||||| .r11156 + // Use metadesc if $ogdesc is empty + if ( $ogdesc === '' ) { + $ogdesc = $this->metadesc( false ); + } +======= if ( is_singular() ) { $this->get_singular_image(); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * If the frontpage image exists, call add_image + */ + private function get_front_page_image() { + if ( $this->options['og_frontpage_image'] !== '' ) { + $this->add_image( $this->options['og_frontpage_image'] ); + } + } +||||||| .r11156 + // og:description is still blank so grab it from get_the_excerpt() + if ( ! is_string( $ogdesc ) || ( is_string( $ogdesc ) && $ogdesc === '' ) ) { + $ogdesc = str_replace( '[…]', '…', strip_tags( get_the_excerpt() ) ); + } + } +======= $this->get_default_image(); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Get the images of the singular post. + */ + private function get_singular_image() { + global $post; +||||||| .r11156 + if ( is_category() || is_tag() || is_tax() ) { +======= /** * If the frontpage image exists, call add_image */ @@ -730,24 +1215,87 @@ class WPSEO_OpenGraph_Image { $this->add_image( $this->options['og_frontpage_image'] ); } } +>>>>>>> .r12027 +<<<<<<< .mine + if ( $this->get_opengraph_image_post() ) { + return; + } +||||||| .r11156 + $ogdesc = $this->metadesc( false ); +======= /** * Get the images of the singular post. */ private function get_singular_image() { global $post; +>>>>>>> .r12027 +<<<<<<< .mine + if ( $this->get_featured_image( $post->ID ) ) { + return; + } +||||||| .r11156 + if ( '' == $ogdesc ) { + $ogdesc = trim( strip_tags( term_description() ) ); + } +======= if ( $this->get_opengraph_image() ) { return; } +>>>>>>> .r12027 +<<<<<<< .mine + $this->get_content_images( $post ); + } +||||||| .r11156 + if ( '' == $ogdesc ) { + global $wp_query; + $term = $wp_query->get_queried_object(); + $ogdesc = WPSEO_Taxonomy_Meta::get_term_meta( $term, $term->taxonomy, 'desc' ); + } + } +======= if ( $this->get_featured_image( $post->ID ) ) { return; } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Get default image and call add_image + */ + private function get_default_image() { + if ( count( $this->images ) == 0 && isset( $this->options['og_default_image'] ) && $this->options['og_default_image'] !== '' ) { + $this->add_image( $this->options['og_default_image'] ); + } + } +||||||| .r11156 + // Strip shortcodes if any + $ogdesc = strip_shortcodes( $ogdesc ); +======= $this->get_content_images( $post ); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * If opengraph-image is set, call add_image and return true + * + * @return bool + */ + private function get_opengraph_image_post() { + $ogimg = WPSEO_Meta::get_value( 'opengraph-image' ); + if ( $ogimg !== '' ) { + $this->add_image( $ogimg ); +||||||| .r11156 + /** + * Filter: 'wpseo_opengraph_desc' - Allow changing the OpenGraph description + * + * @api string $ogdesc The description string. + */ + $ogdesc = trim( apply_filters( 'wpseo_opengraph_desc', $ogdesc ) ); +======= /** * Get default image and call add_image */ @@ -756,7 +1304,18 @@ class WPSEO_OpenGraph_Image { $this->add_image( $this->options['og_default_image'] ); } } +>>>>>>> .r12027 +<<<<<<< .mine + return true; + } +||||||| .r11156 + if ( is_string( $ogdesc ) && $ogdesc !== '' ) { + if ( $echo !== false ) { + $this->og_tag( 'og:description', $ogdesc ); + } + } +======= /** * If opengraph-image is set, call add_image and return true * @@ -766,8 +1325,23 @@ class WPSEO_OpenGraph_Image { $ogimg = WPSEO_Meta::get_value( 'opengraph-image' ); if ( $ogimg !== '' ) { $this->add_image( $ogimg ); +>>>>>>> .r12027 + +<<<<<<< .mine + return false; + } + /** + * Check if taxonomy has an image and add this image + */ + private function get_opengraph_image_taxonomy() { + if ( ( $ogimg = WPSEO_Taxonomy_Meta::get_meta_without_term( 'opengraph-image' ) ) !== '' ) { + $this->add_image( $ogimg ); +||||||| .r11156 + return $ogdesc; +======= return true; +>>>>>>> .r12027 } } @@ -793,6 +1367,33 @@ class WPSEO_OpenGraph_Image { } } +<<<<<<< .mine + return false; + } +||||||| .r11156 + /** + * Output the article tags as article:tag tags. + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * @return boolean + */ + public function tags() { + if ( ! is_singular() ) { + return false; + } +======= + /** + * Filter: 'wpseo_pre_analysis_post_content' - Allow filtering the content before analysis + * + * @api string $post_content The Post content string + * + * @param object $post - The post object. + */ + private function get_content_images( $post ) { + $content = apply_filters( 'wpseo_pre_analysis_post_content', $post->post_content, $post ); +>>>>>>> .r12027 + +<<<<<<< .mine /** * Filter: 'wpseo_pre_analysis_post_content' - Allow filtering the content before analysis * @@ -807,11 +1408,36 @@ class WPSEO_OpenGraph_Image { foreach ( $matches[0] as $img ) { if ( preg_match( '`src=(["\'])(.*?)\1`', $img, $match ) ) { $this->add_image( $match[2] ); +||||||| .r11156 + $tags = get_the_tags(); + if ( ! is_wp_error( $tags ) && ( is_array( $tags ) && $tags !== array() ) ) { + + foreach ( $tags as $tag ) { + $this->og_tag( 'article:tag', $tag->name ); +======= + if ( preg_match_all( '`]+>`', $content, $matches ) ) { + foreach ( $matches[0] as $img ) { + if ( preg_match( '`src=(["\'])(.*?)\1`', $img, $match ) ) { + $this->add_image( $match[2] ); +>>>>>>> .r12027 } } } } +<<<<<<< .mine + /** + * Check size of featured image. If image is too small, return false, else return true + * + * @param array $img_data wp_get_attachment_image_src: url, width, height, icon. + * + * @return bool + */ + private function check_featured_image_size( $img_data ) { + + if ( ! is_array( $img_data ) ) { +||||||| .r11156 +======= /** * Check size of featured image. If image is too small, return false, else return true * @@ -822,12 +1448,36 @@ class WPSEO_OpenGraph_Image { private function check_featured_image_size( $img_data ) { // Get the width and height of the image. if ( $img_data[1] < 200 || $img_data[2] < 200 ) { +>>>>>>> .r12027 return false; } +<<<<<<< .mine + // Get the width and height of the image. + if ( $img_data[1] < 200 || $img_data[2] < 200 ) { + return false; + } +||||||| .r11156 + /** + * Output the article category as an article:section tag. + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * @return boolean; + */ + public function category() { +======= return true; } +>>>>>>> .r12027 +<<<<<<< .mine + return true; + } +||||||| .r11156 + if ( ! is_singular() ) { + return false; + } +======= /** * Display an OpenGraph image tag * @@ -838,23 +1488,65 @@ class WPSEO_OpenGraph_Image { private function add_image( $img ) { // Filter: 'wpseo_opengraph_image' - Allow changing the OpenGraph image. $img = trim( apply_filters( 'wpseo_opengraph_image', $img ) ); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Display an OpenGraph image tag + * + * @param string $img - Source URL to the image. + * + * @return bool + */ + private function add_image( $img ) { + // Filter: 'wpseo_opengraph_image' - Allow changing the OpenGraph image. + $img = trim( apply_filters( 'wpseo_opengraph_image', $img ) ); +||||||| .r11156 + $terms = get_the_category(); +======= if ( empty( $img ) ) { return false; } +>>>>>>> .r12027 +<<<<<<< .mine + if ( empty( $img ) ) { + return false; + } +||||||| .r11156 + if ( ! is_wp_error( $terms ) && ( is_array( $terms ) && $terms !== array() ) ) { +======= if ( WPSEO_Utils::is_url_relative( $img ) === true ) { $img = $this->get_relative_path( $img ); } +>>>>>>> .r12027 +<<<<<<< .mine + if ( WPSEO_Utils::is_url_relative( $img ) === true ) { + $img = $this->get_relative_path( $img ); + } +||||||| .r11156 + foreach ( $terms as $term ) { + $this->og_tag( 'article:section', $term->name ); + } +======= if ( in_array( $img, $this->images ) ) { return false; } array_push( $this->images, $img ); +>>>>>>> .r12027 + +<<<<<<< .mine + if ( in_array( $img, $this->images ) ) { +||||||| .r11156 + return true; + } +======= return true; } +>>>>>>> .r12027 /** * Get the relative path of the image * @@ -866,13 +1558,82 @@ class WPSEO_OpenGraph_Image { if ( $img[0] != '/' ) { return false; } + array_push( $this->images, $img ); +<<<<<<< .mine + return true; + } +||||||| .r11156 + /** + * Output the article publish and last modification date + * + * @link https://developers.facebook.com/docs/reference/opengraph/object-type/article/ + * @return boolean; + */ + public function publish_date() { +======= // If it's a relative URL, it's relative to the domain, not necessarily to the WordPress install, we // want to preserve domain name and URL scheme (http / https) though. $parsed_url = parse_url( home_url() ); $img = $parsed_url['scheme'] . '://' . $parsed_url['host'] . $img; +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Get the relative path of the image + * + * @param array $img Image data array. + * + * @return bool|string + */ + private function get_relative_path( $img ) { + if ( $img[0] != '/' ) { + return false; + } +||||||| .r11156 + if ( ! is_singular( 'post' ) ) { + /** + * Filter: 'wpseo_opengraph_show_publish_date' - Allow showing publication date for other post types + * + * @api bool $unsigned Whether or not to show publish date + * + * @param string $post_type The current URL's post type. + */ + if ( false === apply_filters( 'wpseo_opengraph_show_publish_date', false, get_post_type() ) ) { + return false; + } + } +======= return $img; } +>>>>>>> .r12027 + +<<<<<<< .mine + // If it's a relative URL, it's relative to the domain, not necessarily to the WordPress install, we + // want to preserve domain name and URL scheme (http / https) though. + $parsed_url = parse_url( home_url() ); + $img = $parsed_url['scheme'] . '://' . $parsed_url['host'] . $img; + + return $img; + } + +} +||||||| .r11156 + $pub = get_the_date( 'c' ); + $this->og_tag( 'article:published_time', $pub ); + + $mod = get_the_modified_date( 'c' ); + if ( $mod != $pub ) { + $this->og_tag( 'article:modified_time', $mod ); + $this->og_tag( 'og:updated_time', $mod ); + } + + return true; + } + + } /* End of class */ +} /* End of class-exists wrapper */ +======= } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-twitter.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-twitter.php index 6d586e6b..ef40bf10 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-twitter.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/frontend/class-twitter.php @@ -51,6 +51,21 @@ class WPSEO_Twitter { public function twitter() { wp_reset_query(); +<<<<<<< .mine + $this->type(); + $this->description(); + $this->title(); + $this->site_twitter(); + $this->image(); + if ( is_singular() ) { + $this->author(); + } +||||||| .r11156 + /** + * @var array $options Holds the options for the Twitter Card functionality + */ + public $options; +======= $this->type(); $this->description(); $this->title(); @@ -60,6 +75,7 @@ class WPSEO_Twitter { if ( is_singular() ) { $this->author(); } +>>>>>>> .r12027 /** * Action: 'wpseo_twitter' - Hook to add all Yoast SEO Twitter output to so they're close together. @@ -67,6 +83,43 @@ class WPSEO_Twitter { do_action( 'wpseo_twitter' ); } +<<<<<<< .mine + /** + * Display the Twitter card type. + * + * This defaults to summary but can be filtered using the wpseo_twitter_card_type filter. + * + * @link https://dev.twitter.com/docs/cards + */ + protected function type() { + $this->determine_card_type(); + $this->sanitize_card_type(); + + $this->output_metatag( 'card', $this->type ); + } + + /** + * Determines the twitter card type for the current page + */ + private function determine_card_type() { + $this->type = $this->options['twitter_card_type']; + + if ( is_singular() && has_shortcode( $GLOBALS['post']->post_content, 'gallery' ) ) { + + $this->images = get_post_gallery_images(); + + if ( count( $this->images ) > 0 ) { + $this->type = 'summary_large_image'; +||||||| .r11156 + /** + * Get the singleton instance of this class + * + * @return object + */ + public static function get_instance() { + if ( ! ( self::$instance instanceof self ) ) { + self::$instance = new self(); +======= /** * Display the Twitter card type. * @@ -93,6 +146,7 @@ class WPSEO_Twitter { if ( count( $this->images ) > 3 ) { $this->type = 'gallery'; } +>>>>>>> .r12027 } } @@ -104,6 +158,29 @@ class WPSEO_Twitter { $this->type = apply_filters( 'wpseo_twitter_card_type', $this->type ); } +<<<<<<< .mine + /** + * Determines whether the card type is of a type currently allowed by Twitter + * + * @link https://dev.twitter.com/cards/types + */ + private function sanitize_card_type() { + if ( ! in_array( $this->type, array( + 'summary', + 'summary_large_image', + 'app', + 'player', + ) ) + ) { + $this->type = 'summary'; + } + } +||||||| .r11156 + // Escape the value if not escaped + if ( false === $escaped ) { + $value = esc_attr( $value ); + } +======= /** * Determines whether the card type is of a type currently allowed by Twitter * @@ -123,7 +200,25 @@ class WPSEO_Twitter { $this->type = 'summary'; } } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Output the metatag + * + * @param string $name Tag name string. + * @param string $value Tag value string. + * @param bool $escaped Force escape flag. + */ + private function output_metatag( $name, $value, $escaped = false ) { +||||||| .r11156 + /** + * Filter: 'wpseo_twitter_metatag_key' - Make the Twitter metatag key filterable + * + * @api string $key The Twitter metatag key + */ + $metatag_key = apply_filters( 'wpseo_twitter_metatag_key', 'name' ); +======= /** * Output the metatag * @@ -132,6 +227,7 @@ class WPSEO_Twitter { * @param bool $escaped */ private function output_metatag( $name, $value, $escaped = false ) { +>>>>>>> .r12027 // Escape the value if not escaped. if ( false === $escaped ) { @@ -158,24 +254,89 @@ class WPSEO_Twitter { if ( is_singular() ) { $meta_desc = $this->single_description(); } +<<<<<<< .mine + elseif ( WPSEO_Frontend::get_instance()->is_posts_page() ) { + $meta_desc = $this->single_description( get_option( 'page_for_posts' ) ); + } + elseif ( is_category() || is_tax() || is_tag() ) { + $meta_desc = $this->taxonomy_description(); + } + else { + $meta_desc = $this->fallback_description(); + } +||||||| .r11156 +======= elseif ( WPSEO_Frontend::get_instance()->is_posts_page() ) { $meta_desc = $this->single_description( get_option( 'page_for_posts' ) ); } else { $meta_desc = $this->fallback_description(); } +>>>>>>> .r12027 /** * Filter: 'wpseo_twitter_description' - Allow changing the Twitter description as output in the Twitter card by Yoast SEO * * @api string $twitter The description string */ +<<<<<<< .mine + $meta_desc = apply_filters( 'wpseo_twitter_description', $meta_desc ); + if ( is_string( $meta_desc ) && $meta_desc !== '' ) { + $this->output_metatag( 'description', $meta_desc ); + } + } + + /** + * Returns the description for a singular page + * + * @param int $post_id Post ID. + * + * @return string + */ + private function single_description( $post_id = 0 ) { + $meta_desc = trim( WPSEO_Meta::get_value( 'twitter-description', $post_id ) ); + + if ( is_string( $meta_desc ) && '' !== $meta_desc ) { + return $meta_desc; +||||||| .r11156 + public function type() { + /** + * Filter: 'wpseo_twitter_card_type' - Allow changing the Twitter Card type as output in the Twitter card by WP SEO + * + * @api string $unsigned The type string + */ + $type = apply_filters( 'wpseo_twitter_card_type', $this->options['twitter_card_type'] ); + if ( ! in_array( $type, array( 'summary', 'summary_large_image', 'photo', 'gallery', 'app', 'player', 'product' ) ) ) { + $type = 'summary'; + } + + $this->output_metatag( 'card', $type ); +======= $meta_desc = apply_filters( 'wpseo_twitter_description', $meta_desc ); if ( is_string( $meta_desc ) && $meta_desc !== '' ) { $this->output_metatag( 'description', $meta_desc ); +>>>>>>> .r12027 } } +<<<<<<< .mine + $meta_desc = $this->fallback_description(); + if ( is_string( $meta_desc ) && '' !== $meta_desc ) { + return $meta_desc; + } +||||||| .r11156 + /** + * Displays the Twitter account for the site. + */ + public function site_twitter() { + /** + * Filter: 'wpseo_twitter_site' - Allow changing the Twitter site account as output in the Twitter card by WP SEO + * + * @api string $unsigned Twitter site account string + */ + $site = apply_filters( 'wpseo_twitter_site', $this->options['twitter_site'] ); + $site = $this->get_twitter_id( $site ); +======= /** * Returns the description for a singular page * @@ -185,18 +346,79 @@ class WPSEO_Twitter { */ private function single_description( $post_id = 0 ) { $meta_desc = trim( WPSEO_Meta::get_value( 'twitter-description', $post_id ) ); +>>>>>>> .r12027 + +<<<<<<< .mine + return strip_tags( get_the_excerpt() ); + } + + /** + * Getting the description for the taxonomy + * + * @return bool|mixed|string + */ + private function taxonomy_description() { + $meta_desc = WPSEO_Taxonomy_Meta::get_meta_without_term( 'twitter-description' ); + + if ( ! is_string( $meta_desc ) || $meta_desc === '' ) { + $meta_desc = $this->fallback_description(); +||||||| .r11156 + if ( is_string( $site ) && $site !== '' ) { + $this->output_metatag( 'site', '@' . $site ); + } +======= if ( is_string( $meta_desc ) && '' !== $meta_desc ) { return $meta_desc; +>>>>>>> .r12027 } +<<<<<<< .mine + if ( is_string( $meta_desc ) || $meta_desc !== '' ) { + return $meta_desc; +||||||| .r11156 + /** + * Displays the domain tag for the site. + */ + public function site_domain() { + /** + * Filter: 'wpseo_twitter_domain' - Allow changing the Twitter domain as output in the Twitter card by WP SEO + * + * @api string $unsigned Name string + */ + $domain = apply_filters( 'wpseo_twitter_domain', get_bloginfo( 'name' ) ); + if ( is_string( $domain ) && $domain !== '' ) { + $this->output_metatag( 'domain', $domain ); + } +======= $meta_desc = $this->fallback_description(); if ( is_string( $meta_desc ) && '' !== $meta_desc ) { return $meta_desc; +>>>>>>> .r12027 } +<<<<<<< .mine + return trim( strip_tags( term_description() ) ); +||||||| .r11156 + /** + * Displays the authors Twitter account. + */ + public function author_twitter() { + $twitter = ltrim( trim( get_the_author_meta( 'twitter' ) ), '@' ); + /** + * Filter: 'wpseo_twitter_creator_account' - Allow changing the Twitter account as output in the Twitter card by WP SEO + * + * @api string $twitter The twitter account name string + */ + $twitter = apply_filters( 'wpseo_twitter_creator_account', $twitter ); + $twitter = $this->get_twitter_id( $twitter ); +======= return strip_tags( get_the_excerpt() ); } +>>>>>>> .r12027 + +<<<<<<< .mine + } /** * Returns a fallback description @@ -215,13 +437,54 @@ class WPSEO_Twitter { protected function title() { if ( is_singular() ) { $title = $this->single_title(); +||||||| .r11156 + if ( is_string( $twitter ) && $twitter !== '' ) { + $this->output_metatag( 'creator', '@' . $twitter ); + } + elseif ( $this->options['twitter_site'] !== '' ) { + if ( is_string( $this->options['twitter_site'] ) && $this->options['twitter_site'] !== '' ) { + $this->output_metatag( 'creator', '@' . $this->options['twitter_site'] ); + } + } +======= + /** + * Returns a fallback description + * + * @return string + */ + private function fallback_description() { + return trim( WPSEO_Frontend::get_instance()->metadesc( false ) ); + } + + /** + * Displays the title for Twitter. + * + * Only used when OpenGraph is inactive. + */ + protected function title() { + if ( is_singular() ) { + $title = $this->single_title(); +>>>>>>> .r12027 } +<<<<<<< .mine elseif ( WPSEO_Frontend::get_instance()->is_posts_page() ) { $title = $this->single_title( get_option( 'page_for_posts' ) ); } + elseif ( is_category() || is_tax() || is_tag() ) { + $title = $this->taxonomy_title(); + } else { $title = $this->fallback_title(); } +||||||| .r11156 +======= + elseif ( WPSEO_Frontend::get_instance()->is_posts_page() ) { + $title = $this->single_title( get_option( 'page_for_posts' ) ); + } + else { + $title = $this->fallback_title(); + } +>>>>>>> .r12027 /** * Filter: 'wpseo_twitter_title' - Allow changing the Twitter title as output in the Twitter card by Yoast SEO @@ -234,6 +497,29 @@ class WPSEO_Twitter { } } +<<<<<<< .mine + /** + * Returns the Twitter title for a single post + * + * @param int $post_id Post ID. + * + * @return string + */ + private function single_title( $post_id = 0 ) { + $title = WPSEO_Meta::get_value( 'twitter-title', $post_id ); + if ( ! is_string( $title ) || $title === '' ) { + return $this->fallback_title(); +||||||| .r11156 + /** + * Filter: 'wpseo_twitter_title' - Allow changing the Twitter title as output in the Twitter card by WP SEO + * + * @api string $twitter The title string + */ + $title = apply_filters( 'wpseo_twitter_title', $title ); + if ( is_string( $title ) && $title !== '' ) { + $this->output_metatag( 'title', $title ); + } +======= /** * Returns the Twitter title for a single post * @@ -245,12 +531,32 @@ class WPSEO_Twitter { $title = WPSEO_Meta::get_value( 'twitter-title', $post_id ); if ( ! is_string( $title ) || '' === $title ) { return $this->fallback_title(); +>>>>>>> .r12027 } else { return $title; } } +<<<<<<< .mine + return $title; + } + + /** + * Getting the title for the taxonomy + * + * @return bool|mixed|string + */ + private function taxonomy_title() { + $title = WPSEO_Taxonomy_Meta::get_meta_without_term( 'twitter-title' ); + + if ( ! is_string( $title ) || $title === '' ) { + return $this->fallback_title(); + } + + return $title; + } + /** * Returns the Twitter title for any page * @@ -264,6 +570,22 @@ class WPSEO_Twitter { * Displays the Twitter account for the site. */ protected function site_twitter() { +||||||| .r11156 +======= + /** + * Returns the Twitter title for any page + * + * @return string + */ + private function fallback_title() { + return WPSEO_Frontend::get_instance()->title( '' ); + } + + /** + * Displays the Twitter account for the site. + */ + protected function site_twitter() { +>>>>>>> .r12027 /** * Filter: 'wpseo_twitter_site' - Allow changing the Twitter site account as output in the Twitter card by Yoast SEO * @@ -277,6 +599,7 @@ class WPSEO_Twitter { } } +<<<<<<< .mine /** * Checks if the given id is actually an id or a url and if url, distills the id from it. * @@ -296,6 +619,79 @@ class WPSEO_Twitter { } } + /** + * Displays the image for Twitter + * + * Only used when OpenGraph is inactive or Summary Large Image card is chosen. + */ + protected function image() { + if ( count( $this->images ) > 0 ) { + $this->gallery_images_output(); +||||||| .r11156 + if ( ! $meta_desc ) { + $meta_desc = strip_tags( get_the_excerpt() ); + } + + /** + * Filter: 'wpseo_twitter_description' - Allow changing the Twitter description as output in the Twitter card by WP SEO + * + * @api string $twitter The description string + */ + $meta_desc = apply_filters( 'wpseo_twitter_description', $meta_desc ); + if ( is_string( $meta_desc ) && $meta_desc !== '' ) { + $this->output_metatag( 'description', $meta_desc ); + } +======= + /** + * Checks if the given id is actually an id or a url and if url, distills the id from it. + * + * Solves issues with filters returning urls and theme's/other plugins also adding a user meta + * twitter field which expects url rather than an id (which is what we expect). + * + * @param string $id Twitter ID or url. + * + * @return string|bool Twitter ID or false if it failed to get a valid Twitter ID. + */ + private function get_twitter_id( $id ) { + if ( preg_match( '`([A-Za-z0-9_]{1,25})$`', $id, $match ) ) { + return $match[1]; +>>>>>>> .r12027 + } +<<<<<<< .mine + elseif ( is_category() || is_tax() || is_tag() ) { + $this->taxonomy_image_output(); + } + else { + $this->single_image_output(); + } +||||||| .r11156 +======= + else { + return false; + } + } +>>>>>>> .r12027 + +<<<<<<< .mine + if ( count( $this->shown_images ) === 0 && $this->options['og_default_image'] !== '' ) { + $this->image_output( $this->options['og_default_image'] ); +||||||| .r11156 + /** + * Displays the URL for Twitter. + * + * Only used when OpenGraph is inactive. + */ + public function twitter_url() { + /** + * Filter: 'wpseo_twitter_url' - Allow changing the URL as output in the Twitter card by WP SEO + * + * @api string $unsigned Canonical URL + */ + $url = apply_filters( 'wpseo_twitter_url', $this->canonical( false ) ); + if ( is_string( $url ) && $url !== '' ) { + $this->output_metatag( 'url', esc_url( $url ), true ); + } +======= /** * Displays the domain tag for the site. */ @@ -308,9 +704,24 @@ class WPSEO_Twitter { $domain = apply_filters( 'wpseo_twitter_domain', get_bloginfo( 'name' ) ); if ( is_string( $domain ) && $domain !== '' ) { $this->output_metatag( 'domain', $domain ); +>>>>>>> .r12027 } } +<<<<<<< .mine + /** + * Outputs the first image of a gallery. + */ + private function gallery_images_output() { +||||||| .r11156 + /** + * Outputs a Twitter image tag for a given image + * + * @param string $img + * @return bool + */ + public function image_output( $img ) { +======= /** * Displays the image for Twitter * @@ -323,12 +734,37 @@ class WPSEO_Twitter { else { $this->single_image_output(); } +>>>>>>> .r12027 +<<<<<<< .mine + $this->image_output( reset( $this->images ) ); + } +||||||| .r11156 + /** + * Filter: 'wpseo_twitter_image' - Allow changing the Twitter Card image + * + * @api string $img Image URL string + */ + $img = apply_filters( 'wpseo_twitter_image', $img ); +======= if ( count( $this->shown_images ) == 0 && $this->options['og_default_image'] !== '' ) { $this->image_output( $this->options['og_default_image'] ); } } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * @return bool + */ + private function taxonomy_image_output() { + foreach ( array( 'twitter-image', 'opengraph-image' ) as $tag ) { + $img = WPSEO_Taxonomy_Meta::get_meta_without_term( $tag ); + if ( $img !== '' ) { + $this->image_output( $img ); +||||||| .r11156 + $escaped_img = esc_url( $img ); +======= /** * Outputs the first 4 images of a gallery as the posts gallery images */ @@ -342,7 +778,59 @@ class WPSEO_Twitter { $image_counter ++; } } +>>>>>>> .r12027 + +<<<<<<< .mine + return true; +||||||| .r11156 + if ( in_array( $escaped_img, $this->shown_images ) ) { + return false; +======= + /** + * Takes care of image output when we only need to display a single image. + */ + private function single_image_output() { + if ( $this->homepage_image_output() ) { + return; + } + if ( is_singular() ) { + if ( $this->image_from_meta_values_output() ) { + return; +>>>>>>> .r12027 + } +<<<<<<< .mine + } +||||||| .r11156 +======= + if ( $this->image_thumbnail_output() ) { + return; + } + if ( $this->image_from_content_output() ) { + return; + } + } + } +>>>>>>> .r12027 + +<<<<<<< .mine + return false; + } +||||||| .r11156 + if ( is_string( $escaped_img ) && $escaped_img !== '' ) { + $this->output_metatag( 'image:src', $escaped_img, true ); +======= + /** + * Show the front page image + * + * @return bool + */ + private function homepage_image_output() { + if ( is_front_page() ) { + if ( $this->options['og_frontpage_image'] !== '' ) { + $this->image_output( $this->options['og_frontpage_image'] ); +>>>>>>> .r12027 +<<<<<<< .mine /** * Takes care of image output when we only need to display a single image. */ @@ -373,8 +861,35 @@ class WPSEO_Twitter { if ( $this->options['og_frontpage_image'] !== '' ) { $this->image_output( $this->options['og_frontpage_image'] ); +||||||| .r11156 + array_push( $this->shown_images, $escaped_img ); +======= +>>>>>>> .r12027 return true; } +<<<<<<< .mine + } + + return false; + } + + /** + * Outputs a Twitter image tag for a given image + * + * @param string $img The source URL to the image. + * @param boolean $tag Deprecated argument, previously used for gallery images. + * + * @return bool + */ + protected function image_output( $img, $tag = false ) { + + if ( $tag ) { + _deprecated_argument( __METHOD__, 'WPSEO 2.4' ); +||||||| .r11156 + + return false; +======= +>>>>>>> .r12027 } return false; @@ -402,9 +917,21 @@ class WPSEO_Twitter { return false; } +<<<<<<< .mine + if ( is_string( $escaped_img ) && $escaped_img !== '' ) { + $this->output_metatag( 'image', $escaped_img, true ); + array_push( $this->shown_images, $escaped_img ); +||||||| .r11156 + $open_graph_image = WPSEO_Meta::get_value( 'opengraph-image' ); + if ( $open_graph_image !== '' ) { + $this->image_output( $open_graph_image ); + return; + } +======= if ( is_string( $escaped_img ) && $escaped_img !== '' ) { $this->output_metatag( $tag, $escaped_img, true ); array_push( $this->shown_images, $escaped_img ); +>>>>>>> .r12027 return true; } @@ -516,7 +1043,24 @@ class WPSEO_Twitter { self::$instance = new self(); } +<<<<<<< .mine + return self::$instance; + } + + /** + * Displays the domain tag for the site. + * + * @deprecated 3.0 + */ + protected function site_domain() { + _deprecated_function( __METHOD__, 'WPSEO 3.0' ); + } +} /* End of class */ +||||||| .r11156 +} /* End of class-exists wrapper */ +======= return self::$instance; } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/Yoast_SEO_Icon.svg b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/Yoast_SEO_Icon.svg new file mode 100644 index 00000000..523983eb --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/Yoast_SEO_Icon.svg @@ -0,0 +1,45 @@ + + + + + + +]> + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-local-seo.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-local-seo.png index d02bf1d1..bc785c6d 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-local-seo.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-local-seo.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-news-seo.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-news-seo.png index da746478..25cef8fe 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-news-seo.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-news-seo.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-premium-seo.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-premium-seo.png index 3a555e18..e7ca12a3 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-premium-seo.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-premium-seo.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-seo-training.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-seo-training.png new file mode 100644 index 00000000..57bce527 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-seo-training.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-video-seo.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-video-seo.png index 76bb70f0..ca89e982 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-video-seo.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-video-seo.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-website-review.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-website-review.png index dcf5ba3d..0354160e 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-website-review.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-website-review.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-woocommerce-seo.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-woocommerce-seo.png index 9722addd..0889c21c 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-woocommerce-seo.png and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/banner-woocommerce-seo.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/editicon.png b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/editicon.png new file mode 100644 index 00000000..2463f1b2 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/images/editicon.png differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-rewrite.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-rewrite.php index 7176edb4..63d857ff 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-rewrite.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-rewrite.php @@ -75,6 +75,22 @@ class WPSEO_Rewrite { return preg_replace( '`' . preg_quote( $category_base, '`' ) . '`u', '', $link, 1 ); } +<<<<<<< .mine + /** + * Update the query vars with the redirect var when stripcategorybase is active + * + * @param array $query_vars Main query vars to filter. + * + * @return array + */ + function query_vars( $query_vars ) { + $options = WPSEO_Options::get_all(); +||||||| .r11156 + // Remove initial slash, if there is one (we remove the trailing slash in the regex replacement and don't want to end up short a slash) + if ( '/' == substr( $category_base, 0, 1 ) ) { + $category_base = substr( $category_base, 1 ); + } +======= /** * Update the query vars with the redirect var when stripcategorybase is active * @@ -84,6 +100,7 @@ class WPSEO_Rewrite { */ function query_vars( $query_vars ) { $options = WPSEO_Options::get_all(); +>>>>>>> .r12027 if ( $options['stripcategorybase'] === true ) { $query_vars[] = 'wpseo_category_redirect'; diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemap-timezone.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemap-timezone.php index 1216a531..f1808fd3 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemap-timezone.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemap-timezone.php @@ -1,3 +1,108 @@ +<<<<<<< .mine +get_timezone_string() ); + } + + if ( ! empty( $datetime_string ) && WPSEO_Utils::is_valid_datetime( $datetime_string ) ) { + $datetime = new DateTime( $datetime_string, $utc_timezone ); + $datetime->setTimezone( $local_timezone ); + + return $datetime->format( $format ); + } + + return null; + } + + /** + * Returns the timezone string for a site, even if it's set to a UTC offset + * + * Adapted from http://www.php.net/manual/en/function.timezone-name-from-abbr.php#89155 + * + * @return string valid PHP timezone string + */ + private function determine_timezone_string() { + + // If site timezone string exists, return it. + if ( $timezone = get_option( 'timezone_string' ) ) { + return $timezone; + } + + // Get UTC offset, if it isn't set then return UTC. + if ( 0 === ( $utc_offset = get_option( 'gmt_offset', 0 ) ) ) { + return 'UTC'; + } + + // Adjust UTC offset from hours to seconds. + $utc_offset *= HOUR_IN_SECONDS; + + // Attempt to guess the timezone string from the UTC offset. + $timezone = timezone_name_from_abbr( '', $utc_offset ); + + // Last try, guess timezone string manually. + if ( false === $timezone ) { + + $is_dst = date( 'I' ); + + foreach ( timezone_abbreviations_list() as $abbr ) { + foreach ( $abbr as $city ) { + if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) { + return $city['timezone_id']; + } + } + } + } + + // Fallback to UTC. + return 'UTC'; + } + + /** + * Returns the correct timezone string + * + * @return string + */ + private function get_timezone_string() { + if ( '' == $this->timezone_string ) { + $this->timezone_string = $this->determine_timezone_string(); + } + + return $this->timezone_string; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php index 63d3e322..fb979268 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php @@ -129,6 +129,29 @@ class WPSEO_Sitemaps { } } +<<<<<<< .mine + /** + * This query invalidates the main query on purpose so it returns nice and quickly + * + * @param string $where SQL strong for WHERE part. + * + * @deprecated The relevant sitemap code now hijacks main query before this filter can act on it. + * + * @todo Should be safe to drop now. R. + * + * @return string + */ + function invalidate_main_query( $where ) { +||||||| .r11156 + /** + * This query invalidates the main query on purpose so it returns nice and quickly + * + * @param string $where + * + * @return string + */ + function invalidate_main_query( $where ) { +======= /** * This query invalidates the main query on purpose so it returns nice and quickly * @@ -139,6 +162,7 @@ class WPSEO_Sitemaps { * @return string */ function invalidate_main_query( $where ) { +>>>>>>> .r12027 return $where; } @@ -232,12 +256,24 @@ class WPSEO_Sitemaps { die(); } +<<<<<<< .mine + /** + * Hijack requests for potential sitemaps and XSL files. + * + * @param \WP_Query $query Main query instance. + */ + function redirect( $query ) { +||||||| .r11156 + // attempt to guess the timezone string from the UTC offset + $timezone = timezone_name_from_abbr( '', $utc_offset ); +======= /** * Hijack requests for potential sitemaps and XSL files. * * @param \WP_Query $query */ function redirect( $query ) { +>>>>>>> .r12027 if ( ! $query->is_main_query() ) { return; @@ -674,6 +710,42 @@ class WPSEO_Sitemaps { $status = ( $post_type == 'attachment' ) ? 'inherit' : 'publish'; +<<<<<<< .mine + $parsed_home = parse_url( $this->home_url ); + $host = ''; + $scheme = 'http'; + if ( isset( $parsed_home['host'] ) && ! empty( $parsed_home['host'] ) ) { + $host = str_replace( 'www.', '', $parsed_home['host'] ); + } + if ( isset( $parsed_home['scheme'] ) && ! empty( $parsed_home['scheme'] ) ) { + $scheme = $parsed_home['scheme']; + } + + + /** + * We grab post_date, post_name and post_status too so we can throw these objects + * into get_permalink, which saves a get_post call for each permalink. + */ + while ( $total > $offset ) { + + // Optimized query per this thread: http://wordpress.org/support/topic/plugin-wordpress-seo-by-yoast-performance-suggestion. + // Also see http://explainextended.com/2009/10/23/mysql-order-by-limit-performance-late-row-lookups/. + $query = $wpdb->prepare( "SELECT l.ID, post_title, post_content, post_name, post_parent, post_author, post_modified_gmt, post_date, post_date_gmt FROM ( SELECT ID FROM $wpdb->posts {$join_filter} WHERE post_status = '%s' AND post_password = '' AND post_type = '%s' AND post_date != '0000-00-00 00:00:00' {$where_filter} ORDER BY post_modified ASC LIMIT %d OFFSET %d ) o JOIN $wpdb->posts l ON l.ID = o.ID ORDER BY l.ID", + $status, $post_type, $steps, $offset + ); + + $posts = $wpdb->get_results( $query ); + + $post_ids = array(); + foreach ( $posts as $p ) { + $post_ids[] = $p->ID; +||||||| .r11156 + $parsed_home = parse_url( $this->home_url ); + $host = ''; + $scheme = 'http'; + if ( isset( $parsed_home['host'] ) && ! empty( $parsed_home['host'] ) ) { + $host = str_replace( 'www.', '', $parsed_home['host'] ); +======= $parsed_home = parse_url( $this->home_url ); $host = ''; $scheme = 'http'; @@ -702,6 +774,7 @@ class WPSEO_Sitemaps { $post_ids = array(); foreach ( $posts as $p ) { $post_ids[] = $p->ID; +>>>>>>> .r12027 } unset( $p ); @@ -847,6 +920,23 @@ class WPSEO_Sitemaps { $this->sitemap .= ''; } +<<<<<<< .mine + /** + * Parsing the matched images + * + * @param array $matches Set of matches. + * @param object $p Post object. + * @param string $scheme URL scheme. + * @param string $host URL host. + * + * @return array + */ + private function parse_matched_images( $matches, $p, $scheme, $host ) { +||||||| .r11156 + $image = array( + 'src' => apply_filters( 'wpseo_xml_sitemap_img_src', $src, $p ) + ); +======= /** * Parsing the matched images * @@ -858,6 +948,7 @@ class WPSEO_Sitemaps { * @return array */ private function parse_matched_images( $matches, $p, $scheme, $host ) { +>>>>>>> .r12027 $return = array(); @@ -1128,6 +1219,27 @@ class WPSEO_Sitemaps { $this->sitemap .= ''; } +<<<<<<< .mine + /** + * Spits out the XSL for the XML sitemap. + * + * @param string $type Type to output. + * + * @since 1.4.13 + */ + function xsl_output( $type ) { + if ( $type == 'main' ) { + header( $this->http_protocol() . ' 200 OK', true, 200 ); + // Prevent the search engines from indexing the XML Sitemap. + header( 'X-Robots-Tag: noindex, follow', true ); + header( 'Content-Type: text/xml' ); +||||||| .r11156 + // Make the browser cache this file properly. + $expires = YEAR_IN_SECONDS; + header( 'Pragma: public' ); + header( 'Cache-Control: maxage=' . $expires ); + header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires ) . ' GMT' ); +======= /** * Spits out the XSL for the XML sitemap. * @@ -1141,6 +1253,7 @@ class WPSEO_Sitemaps { // Prevent the search engines from indexing the XML Sitemap. header( 'X-Robots-Tag: noindex, follow', true ); header( 'Content-Type: text/xml' ); +>>>>>>> .r12027 // Make the browser cache this file properly. $expires = YEAR_IN_SECONDS; @@ -1331,6 +1444,21 @@ class WPSEO_Sitemaps { return ( ( $a->_yoast_wpseo_profile_updated > $b->_yoast_wpseo_profile_updated ) ? 1 : -1 ); } +<<<<<<< .mine + /** + * Filter users that should be excluded from the sitemap (by author metatag: wpseo_excludeauthorsitemap). + * + * Also filtering users that should be exclude by excluded role. + * + * @param array $users Set of users to filter. + * + * @return array all the user that aren't excluded from the sitemap + */ + public function user_sitemap_remove_excluded_authors( $users ) { +||||||| .r11156 + if ( is_array( $users ) && $users !== array() ) { + $options = get_option( 'wpseo_xml' ); +======= /** * Filter users that should be excluded from the sitemap (by author metatag: wpseo_excludeauthorsitemap). * @@ -1341,6 +1469,7 @@ class WPSEO_Sitemaps { * @return array all the user that aren't excluded from the sitemap */ public function user_sitemap_remove_excluded_authors( $users ) { +>>>>>>> .r12027 if ( is_array( $users ) && $users !== array() ) { $options = get_option( 'wpseo_xml' ); @@ -1370,6 +1499,26 @@ class WPSEO_Sitemaps { } } +<<<<<<< .mine + return $users; + } + + /** + * Get attached image URL - Adapted from core for speed + * + * @param int $post_id ID of the post. + * + * @return string + */ + private function image_url( $post_id ) { + + static $uploads; + + if ( empty( $uploads ) ) { + $uploads = wp_upload_dir(); +||||||| .r11156 + return $users; +======= return $users; } @@ -1386,6 +1535,7 @@ class WPSEO_Sitemaps { if ( empty( $uploads ) ) { $uploads = wp_upload_dir(); +>>>>>>> .r12027 } if ( false !== $uploads['error'] ) { @@ -1412,6 +1562,23 @@ class WPSEO_Sitemaps { } +<<<<<<< .mine + /** + * Getting the attachments from database + * + * @param string $post_ids Set of post IDs. + * + * @return mixed + */ + private function get_attachments( $post_ids ) { + global $wpdb; + $child_query = "SELECT ID, post_title, post_parent FROM $wpdb->posts WHERE post_status = 'inherit' AND post_type = 'attachment' AND post_parent IN (" . $post_ids . ')'; + $wpdb->query( $child_query ); + $attachments = $wpdb->get_results( $child_query ); +||||||| .r11156 + return $url; + } +======= /** * Getting the attachments from database * @@ -1424,10 +1591,35 @@ class WPSEO_Sitemaps { $child_query = "SELECT ID, post_title, post_parent FROM $wpdb->posts WHERE post_status = 'inherit' AND post_type = 'attachment' AND post_parent IN (" . $post_ids . ')'; $wpdb->query( $child_query ); $attachments = $wpdb->get_results( $child_query ); +>>>>>>> .r12027 return $attachments; } +<<<<<<< .mine + /** + * Getting thumbnails + * + * @param array $post_ids Set of post IDs. + * + * @return mixed + */ + private function get_thumbnails( $post_ids ) { + global $wpdb; +||||||| .r11156 + /** + * Getting the attachments from database + * + * @param $post_ids + * + * @return mixed + */ + private function get_attachments( $post_ids ) { + global $wpdb; + $child_query = "SELECT ID, post_title, post_parent FROM $wpdb->posts WHERE post_status = 'inherit' AND post_type = 'attachment' AND post_parent IN (" . $post_ids . ')'; + $wpdb->query( $child_query ); + $attachments = $wpdb->get_results( $child_query ); +======= /** * Getting thumbnails * @@ -1437,6 +1629,7 @@ class WPSEO_Sitemaps { */ private function get_thumbnails( $post_ids ) { global $wpdb; +>>>>>>> .r12027 $thumbnail_query = "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_thumbnail_id' AND post_id IN (" . $post_ids . ')'; $wpdb->query( $thumbnail_query ); @@ -1445,6 +1638,24 @@ class WPSEO_Sitemaps { return $thumbnails; } +<<<<<<< .mine + /** + * Parsing attachment_ids and do the caching + * + * Function will pluck ID from attachments and meta_value from thumbnails and marge them into one array. This + * array will be used to do the caching + * + * @param array $attachments Set of attachments data. + * @param array $thumbnails Set of thumbnail IDs. + */ + private function do_attachment_ids_caching( $attachments, $thumbnails ) { + $attachment_ids = wp_list_pluck( $attachments, 'ID' ); + $thumbnail_ids = wp_list_pluck( $thumbnails, 'meta_value' ); +||||||| .r11156 + $thumbnail_query = "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_thumbnail_id' AND post_id IN (" . $post_ids . ')'; + $wpdb->query( $thumbnail_query ); + $thumbnails = $wpdb->get_results( $thumbnail_query ); +======= /** * Parsing attachment_ids and do the caching * @@ -1457,6 +1668,7 @@ class WPSEO_Sitemaps { private function do_attachment_ids_caching( $attachments, $thumbnails ) { $attachment_ids = wp_list_pluck( $attachments, 'ID' ); $thumbnail_ids = wp_list_pluck( $thumbnails, 'meta_value' ); +>>>>>>> .r12027 $attachment_ids = array_unique( array_merge( $thumbnail_ids, $attachment_ids ) ); @@ -1464,6 +1676,19 @@ class WPSEO_Sitemaps { update_meta_cache( 'post', $attachment_ids ); } +<<<<<<< .mine + /** + * Parses the given attachments + * + * @param array $attachments Set of attachments. + * @param WP_Post $post Post object. + * + * @return array + */ + private function parse_attachments( $attachments, $post ) { +||||||| .r11156 + $attachment_ids = array_unique( array_merge( $thumbnail_ids, $attachment_ids ) ); +======= /** * Parses the given attachments * @@ -1473,6 +1698,7 @@ class WPSEO_Sitemaps { * @return array */ private function parse_attachments( $attachments, $post ) { +>>>>>>> .r12027 $return = array(); @@ -1502,6 +1728,19 @@ class WPSEO_Sitemaps { return $return; } +<<<<<<< .mine + /** + * Calculate the priority of the post + * + * @param WP_Post $post Post object. + * + * @return float|mixed + */ + private function calculate_priority( $post ) { +||||||| .r11156 + $return[] = $image; + } +======= /** * Calculate the priority of the post * @@ -1510,6 +1749,7 @@ class WPSEO_Sitemaps { * @return float|mixed */ private function calculate_priority( $post ) { +>>>>>>> .r12027 $return = 0.6; if ( $post->post_parent == 0 && $post->post_type == 'page' ) { @@ -1533,7 +1773,34 @@ class WPSEO_Sitemaps { */ $return = apply_filters( 'wpseo_xml_sitemap_post_priority', $return, $post->post_type, $post ); +<<<<<<< .mine + return $return; + } +} /* End of class */ +||||||| .r11156 + if ( isset( $front_id ) && $post->ID == $front_id ) { + $return = 1.0; + } + + /** + * Filter: 'wpseo_xml_post_type_archive_priority' - Allow changing the priority of the URL WordPress SEO uses in the XML sitemap. + * + * @api float $priority The priority for this URL, ranging from 0 to 1 + * + * @param string $post_type The post type this archive is for + * @param object $p The post object + */ + $return = apply_filters( 'wpseo_xml_sitemap_post_priority', $return, $post->post_type, $post ); + + return $return; + } + + } /* End of class */ + +} /* End of class-exists wrapper */ +======= return $return; } } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-upgrade.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-upgrade.php index fefefd84..2eff72d7 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-upgrade.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-upgrade.php @@ -1,3 +1,233 @@ +<<<<<<< .mine +options = WPSEO_Options::get_all(); + + WPSEO_Options::maybe_set_multisite_defaults( false ); + + $this->init(); + + if ( version_compare( $this->options['version'], '1.5.0', '<' ) ) { + $this->upgrade_15( $this->options['version'] ); + } + + if ( version_compare( $this->options['version'], '2.0', '<' ) ) { + $this->upgrade_20(); + } + + if ( version_compare( $this->options['version'], '2.1', '<' ) ) { + $this->upgrade_21(); + } + + if ( version_compare( $this->options['version'], '2.2', '<' ) ) { + $this->upgrade_22(); + } + + if ( version_compare( $this->options['version'], '2.3', '<' ) ) { + $this->upgrade_23(); + } + + if ( version_compare( $this->options['version'], '3.0', '<' ) ) { + $this->upgrade_30(); + } + + /** + * Filter: 'wpseo_run_upgrade' - Runs the upgrade hook which are dependent on Yoast SEO + * + * @api string - The current version of Yoast SEO + */ + do_action( 'wpseo_run_upgrade', $this->options['version'] ); + + $this->finish_up(); + } + + /** + * Run some functions that run when we first run or when we upgrade Yoast SEO from < 1.4.13 + */ + private function init() { + if ( $this->options['version'] === '' || version_compare( $this->options['version'], '1.4.13', '<' ) ) { + /* Make sure title_test and description_test functions are available */ + require_once( WPSEO_PATH . 'inc/wpseo-non-ajax-functions.php' ); + + // Run description test once theme has loaded. + add_action( 'init', 'wpseo_description_test' ); + } + } + + /** + * Run the Yoast SEO 1.5 upgrade routine + * + * @param string $version Current plugin version. + */ + private function upgrade_15( $version ) { + // Clean up options and meta. + WPSEO_Options::clean_up( null, $version ); + WPSEO_Meta::clean_up(); + + // Add new capabilities on upgrade. + wpseo_add_capabilities(); + } + + /** + * Moves options that moved position in WPSEO 2.0 + */ + private function upgrade_20() { + /** + * Clean up stray wpseo_ms options from the options table, option should only exist in the sitemeta table. + * This could have been caused in many version of Yoast SEO, so deleting it for everything below 2.0 + */ + delete_option( 'wpseo_ms' ); + + $this->move_hide_links_options(); + $this->move_pinterest_option(); + } + + /** + * Detects if taxonomy terms were split and updates the corresponding taxonomy meta's accordingly. + */ + private function upgrade_21() { + $taxonomies = get_option( 'wpseo_taxonomy_meta', array() ); + + if ( ! empty( $taxonomies ) ) { + foreach ( $taxonomies as $taxonomy => $tax_metas ) { + foreach ( $tax_metas as $term_id => $tax_meta ) { + if ( function_exists( 'wp_get_split_term' ) && $new_term_id = wp_get_split_term( $term_id, $taxonomy ) ) { + $taxonomies[ $taxonomy ][ $new_term_id ] = $taxonomies[ $taxonomy ][ $term_id ]; + unset( $taxonomies[ $taxonomy ][ $term_id ] ); + } + } + } + + update_option( 'wpseo_taxonomy_meta', $taxonomies ); + } + } + + /** + * Performs upgrade functions to Yoast SEO 2.2 + */ + private function upgrade_22() { + // Unschedule our tracking. + wp_clear_scheduled_hook( 'yoast_tracking' ); + + // Clear the tracking settings, the seen about setting and the ignore tour setting. + $options = get_option( 'wpseo' ); + unset( $options['tracking_popup_done'], $options['yoast_tracking'], $options['seen_about'], $options['ignore_tour'] ); + update_option( 'wpseo', $options ); + } + + /** + * Schedules upgrade function to Yoast SEO 2.3 + */ + private function upgrade_23() { + add_action( 'wp', array( $this, 'upgrade_23_query' ), 90 ); + add_action( 'admin_head', array( $this, 'upgrade_23_query' ), 90 ); + } + + /** + * Performs upgrade query to Yoast SEO 2.3 + */ + public function upgrade_23_query() { + $wp_query = new WP_Query( 'post_type=any&meta_key=_yoast_wpseo_sitemap-include&meta_value=never&order=ASC' ); + + if ( ! empty( $wp_query->posts ) ) { + $options = get_option( 'wpseo_xml' ); + + $excluded_posts = array(); + if ( $options['excluded-posts'] !== '' ) { + $excluded_posts = explode( ',', $options['excluded-posts'] ); + } + + foreach ( $wp_query->posts as $post ) { + if ( ! in_array( $post->ID, $excluded_posts ) ) { + $excluded_posts[] = $post->ID; + } + } + + // Updates the meta value. + $options['excluded-posts'] = implode( ',', $excluded_posts ); + + // Update the option. + update_option( 'wpseo_xml', $options ); + } + + // Remove the meta fields. + delete_post_meta_by_key( '_yoast_wpseo_sitemap-include' ); + } + + /** + * Performs upgrade functions to Yoast SEO 3.0 + */ + private function upgrade_30() { + // Remove the meta fields for sitemap prio. + delete_post_meta_by_key( '_yoast_wpseo_sitemap-prio' ); + } + + /** + * Moves the hide- links options from the permalinks option to the titles option + */ + private function move_hide_links_options() { + $options_titles = get_option( 'wpseo_titles' ); + $options_permalinks = get_option( 'wpseo_permalinks' ); + + foreach ( array( 'hide-feedlinks', 'hide-rsdlink', 'hide-shortlink', 'hide-wlwmanifest' ) as $hide ) { + if ( isset( $options_titles[ $hide ] ) ) { + $options_permalinks[ $hide ] = $options_titles[ $hide ]; + unset( $options_titles[ $hide ] ); + update_option( 'wpseo_permalinks', $options_permalinks ); + update_option( 'wpseo_titles', $options_titles ); + } + } + } + + /** + * Move the pinterest verification option from the wpseo option to the wpseo_social option + */ + private function move_pinterest_option() { + $options_social = get_option( 'wpseo_social' ); + + if ( isset( $option_wpseo['pinterestverify'] ) ) { + $options_social['pinterestverify'] = $option_wpseo['pinterestverify']; + unset( $option_wpseo['pinterestverify'] ); + update_option( 'wpseo_social', $options_social ); + update_option( 'wpseo', $option_wpseo ); + } + } + + /** + * Runs the needed cleanup after an update, setting the DB version to latest version, flushing caches etc. + */ + private function finish_up() { + $this->options = get_option( 'wpseo' ); // Re-get to make sure we have the latest version. + update_option( 'wpseo', $this->options ); // This also ensures the DB version is equal to WPSEO_VERSION. + + add_action( 'shutdown', 'flush_rewrite_rules' ); // Just flush rewrites, always, to at least make them work after an upgrade. + WPSEO_Utils::clear_sitemap_cache(); // Flush the sitemap cache. + + WPSEO_Options::ensure_options_exist(); // Make sure all our options always exist - issue #1245. + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-meta.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-meta.php index 0c77ef85..6a4acc6f 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-meta.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-meta.php @@ -58,6 +58,157 @@ class WPSEO_Meta { public static $meta_length_reason = ''; +<<<<<<< .mine + /** + * @var array $meta_fields Meta box field definitions for the meta box form + * Array format: + * (required) 'type' => (string) field type. i.e. text / textarea / checkbox / + * radio / select / multiselect / upload / snippetpreview etc + * (required) 'title' => (string) table row title + * (recommended) 'default_value' => (string|array) default value for the field + * IMPORTANT: + * - if the field has options, the default has to be the + * key of one of the options + * - if the field is a text field, the default **has** to be + * an empty string as otherwise the user can't save + * an empty value/delete the meta value + * - if the field is a checkbox, the only valid values + * are 'on' or 'off' + * (semi-required) 'options' => (array) options for used with (multi-)select and radio + * fields, required if that's the field type + * key = (string) value which will be saved to db + * value = (string) text label for the option + * (optional) 'autocomplete' => (bool) whether autocomplete is on for text fields, + * defaults to true + * (optional) 'class' => (string) classname(s) to add to the actual tag + * (optional) 'description' => (string) description to show underneath the field + * (optional) 'expl' => (string) label for a checkbox + * (optional) 'help' => (string) help text to show on mouse over ? image + * (optional) 'rows' => (int) number of rows for a textarea, defaults to 3 + * + * (optional) 'placeholder' => (string) Currently only used by add-on plugins + * (optional) 'serialized' => (bool) whether the value is expected to be serialized, + * i.e. an array or object, defaults to false + * Currently only used by add-on plugins + * + * @static + * + * @internal + * - Titles, help texts, description text and option labels are added via a translate_meta_boxes() method + * in the relevant child classes (WPSEO_Metabox and WPSEO_Social_admin) as they are only needed there. + * - Beware: even though the meta keys are divided into subsets, they still have to be uniquely named! + */ + public static $meta_fields = array( + 'general' => array( + 'snippetpreview' => array( + 'type' => 'snippetpreview', + 'title' => '', // Translation added later. + 'help' => '', // Translation added later. + ), + 'focuskw_text_input' => array( + 'type' => 'text', + 'title' => '', // Translation added later. + 'default_value' => '', + 'autocomplete' => false, + 'help' => '', // Translation added later. + 'description' => '
', + ), + 'focuskw' => array( + 'type' => 'hidden', + 'title' => '', + ), + 'title' => array( + 'type' => 'hidden', + 'title' => '', // Translation added later. + 'default_value' => '', + 'description' => '', // Translation added later. + 'help' => '', // Translation added later. + ), + 'metadesc' => array( + 'type' => 'hidden', + 'title' => '', // Translation added later. + 'default_value' => '', + 'class' => 'metadesc', + 'rows' => 2, + 'description' => '', // Translation added later. + 'help' => '', // Translation added later. + ), + 'linkdex' => array( + 'type' => 'hidden', + 'title' => 'linkdex', + 'default_value' => '0', + 'description' => '', + ), + 'metakeywords' => array( + 'type' => 'text', + 'title' => '', // Translation added later. + 'default_value' => '', + 'class' => 'metakeywords', + 'description' => '', // Translation added later. + ), + 'pageanalysis' => array( + 'type' => 'pageanalysis', + 'title' => '', // Translation added later. + 'help' => '', // Translation added later. + ), + ), + 'advanced' => array( + 'meta-robots-noindex' => array( + 'type' => 'select', + 'title' => '', // Translation added later. + 'default_value' => '0', // = post-type default. + 'options' => array( + '0' => '', // Post type default - translation added later. + '2' => '', // Index - translation added later. + '1' => '', // No-index - translation added later. +||||||| .r11156 + + /** + * @static + * @var array $meta_fields Meta box field definitions for the meta box form + * + * Array format: + * (required) 'type' => (string) field type. i.e. text / textarea / checkbox / + * radio / select / multiselect / upload / snippetpreview etc + * (required) 'title' => (string) table row title + * (recommended) 'default_value' => (string|array) default value for the field + * IMPORTANT: + * - if the field has options, the default has to be the + * key of one of the options + * - if the field is a text field, the default **has** to be + * an empty string as otherwise the user can't save + * an empty value/delete the meta value + * - if the field is a checkbox, the only valid values + * are 'on' or 'off' + * (semi-required) 'options' => (array) options for used with (multi-)select and radio + * fields, required if that's the field type + * key = (string) value which will be saved to db + * value = (string) text label for the option + * (optional) 'autocomplete' => (bool) whether autocomplete is on for text fields, + * defaults to true + * (optional) 'class' => (string) classname(s) to add to the actual tag + * (optional) 'description' => (string) description to show underneath the field + * (optional) 'expl' => (string) label for a checkbox + * (optional) 'help' => (string) help text to show on mouse over ? image + * (optional) 'rows' => (int) number of rows for a textarea, defaults to 3 + * + * (optional) 'placeholder' => (string) Currently only used by add-on plugins + * (optional) 'serialized' => (bool) whether the value is expected to be serialized, + * i.e. an array or object, defaults to false + * Currently only used by add-on plugins + * + * @internal + * - Titles, help texts, description text and option labels are added via a translate_meta_boxes() method + * in the relevant child classes (WPSEO_Metabox and WPSEO_Social_admin) as they are only needed there. + * - Beware: even though the meta keys are divided into subsets, they still have to be uniquely named! + */ + public static $meta_fields = array( + 'general' => array( + 'snippetpreview' => array( + 'type' => 'snippetpreview', + 'title' => '', // translation added later + 'help' => '', // translation added later +======= /** * @var array $meta_fields Meta box field definitions for the meta box form * Array format: @@ -145,6 +296,7 @@ class WPSEO_Meta { '0' => '', // Post type default - translation added later. '2' => '', // Index - translation added later. '1' => '', // No-index - translation added later. +>>>>>>> .r12027 ), ), 'meta-robots-nofollow' => array( @@ -984,6 +1136,58 @@ class WPSEO_Meta { unset( $key, $value ); } +<<<<<<< .mine + return $merged; + } + + /** + * Get a value from $_POST for a given key + * Returns the $_POST value if exists, returns an empty string if key does not exist + * + * @static + * + * @param string $key Key of the value to get from $_POST. + * + * @return string Returns $_POST value, which will be a string the majority of the time + * Will return empty string if key does not exists in $_POST + */ + public static function get_post_value( $key ) { + return ( array_key_exists( $key, $_POST ) ) ? $_POST[ $key ] : ''; + } + + /** + * Counts the total of all the keywords being used for posts except the given one + * + * @param string $keyword The keyword to be counted. + * @param integer $post_id The is of the post to which the keyword belongs. + * + * @return array + */ + public static function keyword_usage( $keyword, $post_id ) { + $get_posts = new WP_Query( + array( + 'meta_key' => '_yoast_wpseo_focuskw', + 'meta_value' => $keyword, + 'post__not_in' => array( $post_id ), + 'fields' => 'ids', + 'post_type' => 'any', + + /* + * We only need to return zero, one or two results: + * - Zero: keyword hasn't been used before + * - One: Keyword has been used once before + * - Two or more: Keyword has been used twice before + */ + 'posts_per_page' => 2, + ) + ); + + return $get_posts->posts; + } +} /* End of class */ +||||||| .r11156 +} /* End of class-exists wrapper */ +======= return $merged; } @@ -1004,3 +1208,4 @@ class WPSEO_Meta { } /* End of class */ +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-rank.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-rank.php new file mode 100644 index 00000000..cb7f7ce2 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-rank.php @@ -0,0 +1,192 @@ + array( + 'start' => 0, + 'end' => 0, + ), + self::BAD => array( + 'start' => 1, + 'end' => 40, + ), + self::OK => array( + 'start' => 41, + 'end' => 70, + ), + self::GOOD => array( + 'start' => 71, + 'end' => 100, + ), + ); + + /** + * @var int + */ + protected $rank; + + /** + * @param int $rank The actual rank. + */ + public function __construct( $rank ) { + if ( ! in_array( $rank, self::$ranks ) ) { + $rank = self::BAD; + } + + $this->rank = $rank; + } + + /** + * Returns the saved rank for this rank. + * + * @return string + */ + public function get_rank() { + return $this->rank; + } + + /** + * Returns a CSS class for this rank + * + * @return string + */ + public function get_css_class() { + $labels = array( + self::NO_FOCUS => 'na', + self::NO_INDEX => 'noindex', + self::BAD => 'bad', + self::OK => 'ok', + self::GOOD => 'good', + ); + + return $labels[ $this->rank ]; + } + + /** + * Returns a label for this rank + * + * @return string + */ + public function get_label() { + $labels = array( + self::NO_FOCUS => __( 'N/A', 'wordpress-seo' ), + self::NO_INDEX => __( 'No index', 'wordpress-seo' ), + self::BAD => __( 'Bad', 'wordpress-seo' ), + self::OK => __( 'OK', 'wordpress-seo' ), + self::GOOD => __( 'Good', 'wordpress-seo' ), + ); + + return $labels[ $this->rank ]; + } + + /** + * Returns a label for use in a drop down + * + * @return mixed + */ + public function get_drop_down_label() { + $labels = array( + self::NO_FOCUS => __( 'SEO: No Focus Keyword', 'wordpress-seo' ), + self::BAD => __( 'SEO: Bad', 'wordpress-seo' ), + self::OK => __( 'SEO: OK', 'wordpress-seo' ), + self::GOOD => __( 'SEO: Good', 'wordpress-seo' ), + self::NO_INDEX => __( 'SEO: Post Noindexed', 'wordpress-seo' ), + ); + + return $labels[ $this->rank ]; + } + + /** + * @return int The starting score for this rank. + */ + public function get_starting_score() { + // No index does not have a starting score. + if ( self::NO_INDEX === $this->rank ) { + return -1; + } + + return self::$ranges[ $this->rank ]['start']; + } + + /** + * @return int The end score for this rank. + */ + public function get_end_score() { + // No index does not have an end score. + if ( self::NO_INDEX === $this->rank ) { + return -1; + } + + return self::$ranges[ $this->rank ]['end']; + } + + /** + * Returns a rank for a specific numeric score + * + * @param int $score The score to determine a rank for. + * + * @return self + */ + public static function from_numeric_score( $score ) { + // Set up the default value. + $rank = new self( self::BAD ); + + foreach ( self::$ranges as $rank_index => $range ) { + if ( $range['start'] <= $score && $score <= $range['end'] ) { + $rank = new self( $rank_index ); + break; + } + } + + return $rank; + } + + /** + * Returns a list of all possible SEO Ranks + * + * @return WPSEO_Rank[] + */ + public static function get_all_ranks() { + return array_map( array( 'WPSEO_Rank', 'create_rank' ), self::$ranks ); + } + + /** + * Converts a numeric rank into a WPSEO_Rank object, for use in functional array_* functions + * + * @param string $rank SEO Rank. + * + * @return WPSEO_Rank + */ + private static function create_rank( $rank ) { + return new self( $rank ); + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-replace-vars.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-replace-vars.php index d31410c8..2bd72b56 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-replace-vars.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-replace-vars.php @@ -60,6 +60,16 @@ class WPSEO_Replace_Vars { public function __construct() { } +<<<<<<< .mine +||||||| .r11156 + /** + * Constructor + * + * @return \WPSEO_Replace_Vars + */ + public function __construct() { + } +======= /** * Setup the help texts and external replacements as statics so they will be available to all instances @@ -69,7 +79,36 @@ class WPSEO_Replace_Vars { self::set_basic_help_texts(); self::set_advanced_help_texts(); } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Setup the help texts and external replacements as statics so they will be available to all instances + */ + public static function setup_statics_once() { + if ( self::$help_texts === array() ) { + self::set_basic_help_texts(); + self::set_advanced_help_texts(); +||||||| .r11156 + + /** + * Setup the help texts and external replacements as statics so they will be available to all instances + */ + public static function setup_statics_once() { + // + if ( self::$help_texts === array() ) { + self::set_basic_help_texts(); + self::set_advanced_help_texts(); + } + + if ( self::$external_replacements === array() ) { + /** + * Action: 'wpseo_register_extra_replacements' - Allows for registration of additional + * variables to replace + */ + do_action( 'wpseo_register_extra_replacements' ); + } +======= if ( self::$external_replacements === array() ) { /** * Action: 'wpseo_register_extra_replacements' - Allows for registration of additional @@ -105,6 +144,7 @@ class WPSEO_Replace_Vars { if ( preg_match( '`^[A-Z0-9_-]+$`i', $var ) === false ) { trigger_error( __( 'A replacement variable can only contain alphanumeric characters, an underscore or a dash. Try renaming your variable.', 'wordpress-seo' ), E_USER_WARNING ); } +>>>>>>> .r12027 elseif ( strpos( $var, 'cf_' ) === 0 || strpos( $var, 'ct_' ) === 0 ) { trigger_error( __( 'A replacement variable can not start with "%%cf_" or "%%ct_" as these are reserved for the WPSEO standard variable variables for custom fields and custom taxonomies. Try making your variable name unique.', 'wordpress-seo' ), E_USER_WARNING ); } @@ -123,6 +163,56 @@ class WPSEO_Replace_Vars { } } +<<<<<<< .mine + if ( self::$external_replacements === array() ) { + /** + * Action: 'wpseo_register_extra_replacements' - Allows for registration of additional + * variables to replace + */ + do_action( 'wpseo_register_extra_replacements' ); +||||||| .r11156 + + /** + * Register new replacement %%variables%% + * For use by other plugins/themes to register extra variables + * + * @see wpseo_register_var_replacement() for a usage example + * + * @param string $var The name of the variable to replace, i.e. '%%var%%' + * - the surrounding %% are optional + * @param mixed $replace_function Function or method to call to retrieve the replacement value for the variable + * Uses the same format as add_filter/add_action function parameter and + * should *return* the replacement value. DON'T echo it! + * @param string $type Type of variable: 'basic' or 'advanced', defaults to 'advanced' + * @param string $help_text Help text to be added to the help tab for this variable + * + * @return bool Whether the replacement function was succesfully registered + */ + public static function register_replacement( $var, $replace_function, $type = 'advanced', $help_text = '' ) { + $success = false; + + if ( is_string( $var ) && $var !== '' ) { + $var = self::remove_var_delimiter( $var ); + + if ( preg_match( '`^[A-Z0-9_-]+$`i', $var ) === false ) { + trigger_error( __( 'A replacement variable can only contain alphanumeric characters, an underscore or a dash. Try renaming your variable.', 'wordpress-seo' ), E_USER_WARNING ); + } elseif ( strpos( $var, 'cf_' ) === 0 || strpos( $var, 'ct_' ) === 0 ) { + trigger_error( __( 'A replacement variable can not start with "%%cf_" or "%%ct_" as these are reserved for the WPSEO standard variable variables for custom fields and custom taxonomies. Try making your variable name unique.', 'wordpress-seo' ), E_USER_WARNING ); + } elseif ( ! method_exists( __CLASS__, 'retrieve_' . $var ) ) { + if ( ! isset( self::$external_replacements[ $var ] ) ) { + self::$external_replacements[ $var ] = $replace_function; + self::register_help_text( $type, $var, $help_text ); + $success = true; + } else { + trigger_error( __( 'A replacement variable with the same name has already been registered. Try making your variable name more unique.', 'wordpress-seo' ), E_USER_WARNING ); + } + } else { + trigger_error( __( 'You cannot overrule a WPSEO standard variable replacement by registering a variable with the same name. Use the "wpseo_replacements" filter instead to adjust the replacement value.', 'wordpress-seo' ), E_USER_WARNING ); + } + } + + return $success; +======= return $success; } @@ -144,7 +234,9 @@ class WPSEO_Replace_Vars { // Let's see if we can bail super early. if ( strpos( $string, '%%' ) === false ) { return WPSEO_Utils::standardize_whitespace( $string ); +>>>>>>> .r12027 } + } $args = (array) $args; if ( isset( $args['post_content'] ) && ! empty( $args['post_content'] ) ) { @@ -155,6 +247,38 @@ class WPSEO_Replace_Vars { } $this->args = (object) wp_parse_args( $args, $this->defaults ); +<<<<<<< .mine + /** + * Register new replacement %%variables%% + * For use by other plugins/themes to register extra variables + * + * @see wpseo_register_var_replacement() for a usage example + * + * @param string $var The name of the variable to replace, i.e. '%%var%%' + * - the surrounding %% are optional. + * @param mixed $replace_function Function or method to call to retrieve the replacement value for the variable + * Uses the same format as add_filter/add_action function parameter and + * should *return* the replacement value. DON'T echo it. + * @param string $type Type of variable: 'basic' or 'advanced', defaults to 'advanced'. + * @param string $help_text Help text to be added to the help tab for this variable. + * + * @return bool Whether the replacement function was succesfully registered + */ + public static function register_replacement( $var, $replace_function, $type = 'advanced', $help_text = '' ) { + $success = false; +||||||| .r11156 + /** + * Replace `%%variable_placeholders%%` with their real value based on the current requested page/post/cpt/etc + * + * @param string $string the string to replace the variables in. + * @param array $args the object some of the replacement values might come from, + * could be a post, taxonomy or term. + * @param array $omit variables that should not be replaced by this function. + * + * @return string + */ + public function replace( $string, $args, $omit = array() ) { +======= // Clean $omit array. if ( is_array( $omit ) && $omit !== array() ) { $omit = array_map( array( __CLASS__, 'remove_var_delimiter' ), $omit ); @@ -191,20 +315,83 @@ class WPSEO_Replace_Vars { $remove = array_map( array( __CLASS__, 'add_var_delimiter' ), $remove ); $string = str_replace( $remove, '', $string ); } +>>>>>>> .r12027 +<<<<<<< .mine + if ( is_string( $var ) && $var !== '' ) { + $var = self::remove_var_delimiter( $var ); +||||||| .r11156 + $string = strip_tags( $string ); +======= // Undouble separators which have nothing between them, i.e. where a non-replaced variable was removed. if ( isset( $replacements['%%sep%%'] ) && ( is_string( $replacements['%%sep%%'] ) && $replacements['%%sep%%'] !== '' ) ) { $q_sep = preg_quote( $replacements['%%sep%%'], '`' ); $string = preg_replace( '`' . $q_sep . '(?:\s*' . $q_sep . ')*`u', $replacements['%%sep%%'], $string ); } +>>>>>>> .r12027 +<<<<<<< .mine + if ( preg_match( '`^[A-Z0-9_-]+$`i', $var ) === false ) { + trigger_error( __( 'A replacement variable can only contain alphanumeric characters, an underscore or a dash. Try renaming your variable.', 'wordpress-seo' ), E_USER_WARNING ); + } +||||||| .r11156 + // Let's see if we can bail super early. + if ( strpos( $string, '%%' ) === false ) { + return wpseo_standardize_whitespace( $string ); + } +======= // Remove superfluous whitespace. $string = WPSEO_Utils::standardize_whitespace( $string ); +>>>>>>> .r12027 +<<<<<<< .mine + elseif ( strpos( $var, 'cf_' ) === 0 || strpos( $var, 'ct_' ) === 0 ) { + trigger_error( __( 'A replacement variable can not start with "%%cf_" or "%%ct_" as these are reserved for the WPSEO standard variable variables for custom fields and custom taxonomies. Try making your variable name unique.', 'wordpress-seo' ), E_USER_WARNING ); + } + elseif ( ! method_exists( __CLASS__, 'retrieve_' . $var ) ) { + if ( ! isset( self::$external_replacements[ $var ] ) ) { + self::$external_replacements[ $var ] = $replace_function; + self::register_help_text( $type, $var, $help_text ); + $success = true; + } + else { + trigger_error( __( 'A replacement variable with the same name has already been registered. Try making your variable name more unique.', 'wordpress-seo' ), E_USER_WARNING ); + } + } + else { + trigger_error( __( 'You cannot overrule a WPSEO standard variable replacement by registering a variable with the same name. Use the "wpseo_replacements" filter instead to adjust the replacement value.', 'wordpress-seo' ), E_USER_WARNING ); + } +||||||| .r11156 + + $args = (array) $args; + if ( isset( $args['post_content'] ) && ! empty( $args['post_content'] ) ) { + $args['post_content'] = wpseo_strip_shortcode( $args['post_content'] ); + } + if ( isset( $args['post_excerpt'] ) && ! empty( $args['post_excerpt'] ) ) { + $args['post_excerpt'] = wpseo_strip_shortcode( $args['post_excerpt'] ); + } + $this->args = (object) wp_parse_args( $args, $this->defaults ); + + // Clean $omit array + if ( is_array( $omit ) && $omit !== array() ) { + $omit = array_map( array( __CLASS__, 'remove_var_delimiter' ), $omit ); + } +======= return trim( $string ); } +>>>>>>> .r12027 + } +<<<<<<< .mine + return $success; + } +||||||| .r11156 + $replacements = array(); + if ( preg_match_all( '`%%([^%]+(%%single)?)%%?`iu', $string, $matches ) ) { + $replacements = $this->set_up_replacements( $matches, $omit ); + } +======= /** * Retrieve the replacements for the variables found. * @@ -215,9 +402,38 @@ class WPSEO_Replace_Vars { * may not yield a replacement in certain contexts. */ private function set_up_replacements( $matches, $omit ) { +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + /** + * Filter: 'wpseo_replacements' - Allow customization of the replacements before they are applied + * + * @api array $replacements The replacements + */ + $replacements = apply_filters( 'wpseo_replacements', $replacements ); +======= $replacements = array(); +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Replace `%%variable_placeholders%%` with their real value based on the current requested page/post/cpt/etc + * + * @param string $string the string to replace the variables in. + * @param array $args the object some of the replacement values might come from, + * could be a post, taxonomy or term. + * @param array $omit variables that should not be replaced by this function. + * + * @return string + */ + public function replace( $string, $args, $omit = array() ) { +||||||| .r11156 + // Do the actual replacements + if ( is_array( $replacements ) && $replacements !== array() ) { + $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string ); + } +======= // @todo -> figure out a way to deal with external functions starting with cf_/ct_. foreach ( $matches[1] as $k => $var ) { @@ -225,11 +441,31 @@ class WPSEO_Replace_Vars { if ( in_array( $var, $omit, true ) ) { continue; } +>>>>>>> .r12027 +<<<<<<< .mine + $string = strip_tags( $string ); +||||||| .r11156 + /** + * Filter: 'wpseo_replacements_final' - Allow overruling of whether or not to remove placeholders + * which didn't yield a replacement + * + * @example add_filter( 'wpseo_replacements_final', '__return_false' ); + * + * @api bool $final + */ + if ( apply_filters( 'wpseo_replacements_final', true ) === true && ( isset( $matches[1] ) && is_array( $matches[1] ) ) ) { + // Remove non-replaced variables + $remove = array_diff( $matches[1], $omit ); // Make sure the $omit variables do not get removed + $remove = array_map( array( __CLASS__, 'add_var_delimiter' ), $remove ); + $string = str_replace( $remove, '', $string ); + } +======= // Deal with variable variable names first. if ( strpos( $var, 'cf_' ) === 0 ) { $replacement = $this->retrieve_cf_custom_field_name( $var ); } +>>>>>>> .r12027 elseif ( strpos( $var, 'ct_desc_' ) === 0 ) { $replacement = $this->retrieve_ct_desc_custom_tax_name( $var ); } @@ -245,21 +481,131 @@ class WPSEO_Replace_Vars { $replacement = call_user_func( self::$external_replacements[ $var ], $var, $this->args ); } +<<<<<<< .mine + // Let's see if we can bail super early. + if ( strpos( $string, '%%' ) === false ) { + return WPSEO_Utils::standardize_whitespace( $string ); + } +||||||| .r11156 + // Undouble separators which have nothing between them, i.e. where a non-replaced variable was removed + if ( isset( $replacements['%%sep%%'] ) && ( is_string( $replacements['%%sep%%'] ) && $replacements['%%sep%%'] !== '' ) ) { + $q_sep = preg_quote( $replacements['%%sep%%'], '`' ); + $string = preg_replace( '`' . $q_sep . '(?:\s*' . $q_sep . ')*`u', $replacements['%%sep%%'], $string ); + } +======= // Replacement retrievals can return null if no replacement can be determined, root those outs. if ( isset( $replacement ) ) { $var = self::add_var_delimiter( $var ); $replacements[ $var ] = $replacement; } +>>>>>>> .r12027 +<<<<<<< .mine + + $args = (array) $args; + if ( isset( $args['post_content'] ) && ! empty( $args['post_content'] ) ) { + $args['post_content'] = WPSEO_Utils::strip_shortcode( $args['post_content'] ); + } + if ( isset( $args['post_excerpt'] ) && ! empty( $args['post_excerpt'] ) ) { + $args['post_excerpt'] = WPSEO_Utils::strip_shortcode( $args['post_excerpt'] ); + } + $this->args = (object) wp_parse_args( $args, $this->defaults ); + + // Clean $omit array. + if ( is_array( $omit ) && $omit !== array() ) { + $omit = array_map( array( __CLASS__, 'remove_var_delimiter' ), $omit ); +||||||| .r11156 + + // Remove superfluous whitespace + $string = wpseo_standardize_whitespace( $string ); + + return trim( $string ); +======= unset( $replacement, $single, $method_name ); +>>>>>>> .r12027 } +<<<<<<< .mine + $replacements = array(); + if ( preg_match_all( '`%%([^%]+(%%single)?)%%?`iu', $string, $matches ) ) { + $replacements = $this->set_up_replacements( $matches, $omit ); + } +||||||| .r11156 +======= return $replacements; } +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Filter: 'wpseo_replacements' - Allow customization of the replacements before they are applied + * + * @api array $replacements The replacements + */ + $replacements = apply_filters( 'wpseo_replacements', $replacements ); + // Do the actual replacements. + if ( is_array( $replacements ) && $replacements !== array() ) { + $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string ); + } + /** + * Filter: 'wpseo_replacements_final' - Allow overruling of whether or not to remove placeholders + * which didn't yield a replacement + * + * @example add_filter( 'wpseo_replacements_final', '__return_false' ); + * + * @api bool $final + */ + if ( apply_filters( 'wpseo_replacements_final', true ) === true && ( isset( $matches[1] ) && is_array( $matches[1] ) ) ) { + // Remove non-replaced variables. + $remove = array_diff( $matches[1], $omit ); // Make sure the $omit variables do not get removed. + $remove = array_map( array( __CLASS__, 'add_var_delimiter' ), $remove ); + $string = str_replace( $remove, '', $string ); + } +||||||| .r11156 + /** + * Retrieve the replacements for the variables found. + * + * @param array $matches variables found in the original string - regex result. + * @param array $omit variables that should not be replaced by this function. + * + * @return array retrieved replacements - this might be a smaller array as some variables + * may not yield a replacement in certain contexts. + */ + private function set_up_replacements( $matches, $omit ) { +======= +>>>>>>> .r12027 + +<<<<<<< .mine + // Undouble separators which have nothing between them, i.e. where a non-replaced variable was removed. + if ( isset( $replacements['%%sep%%'] ) && ( is_string( $replacements['%%sep%%'] ) && $replacements['%%sep%%'] !== '' ) ) { + $q_sep = preg_quote( $replacements['%%sep%%'], '`' ); + $string = preg_replace( '`' . $q_sep . '(?:\s*' . $q_sep . ')*`u', $replacements['%%sep%%'], $string ); + } +||||||| .r11156 + $replacements = array(); +======= +>>>>>>> .r12027 + +<<<<<<< .mine + // Remove superfluous whitespace. + $string = WPSEO_Utils::standardize_whitespace( $string ); +||||||| .r11156 + // @todo -> figure out a way to deal with external functions starting with cf_/ct_ + foreach ( $matches[1] as $k => $var ) { +======= /* *********************** BASIC VARIABLES ************************** */ +>>>>>>> .r12027 +<<<<<<< .mine + return trim( $string ); + } +||||||| .r11156 + // Don't set up replacements which should be omitted + if ( in_array( $var, $omit, true ) ) { + continue; + } +======= /** * Retrieve the post/cpt categories (comma separated) for use as replacement string. * @@ -267,21 +613,227 @@ class WPSEO_Replace_Vars { */ private function retrieve_category() { $replacement = null; +>>>>>>> .r12027 +<<<<<<< .mine + + /** + * Retrieve the replacements for the variables found. + * + * @param array $matches variables found in the original string - regex result. + * @param array $omit variables that should not be replaced by this function. + * + * @return array retrieved replacements - this might be a smaller array as some variables + * may not yield a replacement in certain contexts. + */ + private function set_up_replacements( $matches, $omit ) { + + $replacements = array(); + + // @todo -> figure out a way to deal with external functions starting with cf_/ct_. + foreach ( $matches[1] as $k => $var ) { + + // Don't set up replacements which should be omitted. + if ( in_array( $var, $omit, true ) ) { + continue; +||||||| .r11156 + // Deal with variable variable names first + if ( strpos( $var, 'cf_' ) === 0 ) { + $replacement = $this->retrieve_cf_custom_field_name( $var ); + } elseif ( strpos( $var, 'ct_desc_' ) === 0 ) { + $replacement = $this->retrieve_ct_desc_custom_tax_name( $var ); + } elseif ( strpos( $var, 'ct_' ) === 0 ) { + $single = ( isset( $matches[2][ $k ] ) && $matches[2][ $k ] !== '' ) ? true : false; + $replacement = $this->retrieve_ct_custom_tax_name( $var, $single ); + } // Deal with non-variable variable names + elseif ( method_exists( $this, 'retrieve_' . $var ) ) { + $method_name = 'retrieve_' . $var; + $replacement = $this->$method_name(); + } // Deal with externally defined variable names + elseif ( isset( self::$external_replacements[ $var ] ) && ! is_null( self::$external_replacements[ $var ] ) ) { + $replacement = call_user_func( self::$external_replacements[ $var ], $var, $this->args ); + } + + // Replacement retrievals can return null if no replacement can be determined, root those outs + if ( isset( $replacement ) ) { + $var = self::add_var_delimiter( $var ); + $replacements[ $var ] = $replacement; + } +======= if ( ! empty( $this->args->ID ) ) { $cat = $this->get_terms( $this->args->ID, 'category' ); if ( $cat !== '' ) { $replacement = $cat; +>>>>>>> .r12027 } } +<<<<<<< .mine + // Deal with variable variable names first. + if ( strpos( $var, 'cf_' ) === 0 ) { + $replacement = $this->retrieve_cf_custom_field_name( $var ); + } + elseif ( strpos( $var, 'ct_desc_' ) === 0 ) { + $replacement = $this->retrieve_ct_desc_custom_tax_name( $var ); + } + elseif ( strpos( $var, 'ct_' ) === 0 ) { + $single = ( isset( $matches[2][ $k ] ) && $matches[2][ $k ] !== '' ) ? true : false; + $replacement = $this->retrieve_ct_custom_tax_name( $var, $single ); + } // Deal with non-variable variable names. + elseif ( method_exists( $this, 'retrieve_' . $var ) ) { + $method_name = 'retrieve_' . $var; + $replacement = $this->$method_name(); + } // Deal with externally defined variable names. + elseif ( isset( self::$external_replacements[ $var ] ) && ! is_null( self::$external_replacements[ $var ] ) ) { + $replacement = call_user_func( self::$external_replacements[ $var ], $var, $this->args ); + } + + // Replacement retrievals can return null if no replacement can be determined, root those outs. + if ( isset( $replacement ) ) { + $var = self::add_var_delimiter( $var ); + $replacements[ $var ] = $replacement; + } + unset( $replacement, $single, $method_name ); +||||||| .r11156 + return $replacements; +======= if ( ( ! isset( $replacement ) || $replacement === '' ) && ( isset( $this->args->cat_name ) && ! empty( $this->args->cat_name ) ) ) { $replacement = $this->args->cat_name; +>>>>>>> .r12027 } +<<<<<<< .mine + return $replacements; + } +||||||| .r11156 +======= return $replacement; } +>>>>>>> .r12027 + + /** + * Retrieve the category description for use as replacement string. + * + * @return string|null + */ + private function retrieve_category_description() { + return $this->retrieve_term_description(); + } + +<<<<<<< .mine +||||||| .r11156 + /* *********************** BASIC VARIABLES ************************** */ +======= + /** + * Retrieve the date of the post/page/cpt for use as replacement string. + * + * @return string|null + */ + private function retrieve_date() { + $replacement = null; +>>>>>>> .r12027 + +<<<<<<< .mine + /* *********************** BASIC VARIABLES ************************** */ + + /** + * Retrieve the post/cpt categories (comma separated) for use as replacement string. + * + * @return string|null + */ + private function retrieve_category() { + $replacement = null; +||||||| .r11156 + /** + * Retrieve the post/cpt categories (comma separated) for use as replacement string. + * + * @return string|null + */ + private function retrieve_category() { + $replacement = null; + + if ( ! empty( $this->args->ID ) ) { + $cat = $this->get_terms( $this->args->ID, 'category' ); + if ( $cat !== '' ) { + $replacement = $cat; + } + } +======= + if ( $this->args->post_date != '' ) { + $replacement = mysql2date( get_option( 'date_format' ), $this->args->post_date, true ); + } + else { + if ( get_query_var( 'day' ) && get_query_var( 'day' ) != '' ) { + $replacement = get_the_date(); + } + else { + if ( single_month_title( ' ', false ) && single_month_title( ' ', false ) != '' ) { + $replacement = single_month_title( ' ', false ); + } + elseif ( get_query_var( 'year' ) != '' ) { + $replacement = get_query_var( 'year' ); + } + } +>>>>>>> .r12027 +<<<<<<< .mine + + if ( ! empty( $this->args->ID ) ) { + $cat = $this->get_terms( $this->args->ID, 'category' ); + if ( $cat !== '' ) { + $replacement = $cat; + } +||||||| .r11156 + + if ( ( ! isset( $replacement ) || $replacement === '' ) && ( isset( $this->args->cat_name ) && ! empty( $this->args->cat_name ) ) ) { + $replacement = $this->args->cat_name; + } + + return $replacement; +======= +>>>>>>> .r12027 + } + +<<<<<<< .mine + if ( ( ! isset( $replacement ) || $replacement === '' ) && ( isset( $this->args->cat_name ) && ! empty( $this->args->cat_name ) ) ) { + $replacement = $this->args->cat_name; + } +||||||| .r11156 + /** + * Retrieve the category description for use as replacement string. + * + * @return string|null + */ + private function retrieve_category_description() { + return $this->retrieve_term_description(); + } +======= + return $replacement; + } +>>>>>>> .r12027 + +<<<<<<< .mine + return $replacement; + } +||||||| .r11156 + /** + * Retrieve the date of the post/page/cpt for use as replacement string. + * + * @return string|null + */ + private function retrieve_date() { + $replacement = null; +======= + /** + * Retrieve the post/page/cpt excerpt for use as replacement string. + * The excerpt will be auto-generated if it does not exist. + * + * @return string|null + */ + private function retrieve_excerpt() { + $replacement = null; +>>>>>>> .r12027 +<<<<<<< .mine /** * Retrieve the category description for use as replacement string. * @@ -290,6 +842,27 @@ class WPSEO_Replace_Vars { private function retrieve_category_description() { return $this->retrieve_term_description(); } +||||||| .r11156 + if ( $this->args->post_date != '' ) { + $replacement = mysql2date( get_option( 'date_format' ), $this->args->post_date, true ); + } else { + if ( get_query_var( 'day' ) && get_query_var( 'day' ) != '' ) { + $replacement = get_the_date(); + } else { + if ( single_month_title( ' ', false ) && single_month_title( ' ', false ) != '' ) { + $replacement = single_month_title( ' ', false ); + } elseif ( get_query_var( 'year' ) != '' ) { + $replacement = get_query_var( 'year' ); + } + } + } +======= + if ( ! empty( $this->args->ID ) ) { + if ( $this->args->post_excerpt !== '' ) { + $replacement = strip_tags( $this->args->post_excerpt ); + } +>>>>>>> .r12027 +<<<<<<< .mine /** * Retrieve the date of the post/page/cpt for use as replacement string. @@ -301,7 +874,16 @@ class WPSEO_Replace_Vars { if ( $this->args->post_date != '' ) { $replacement = mysql2date( get_option( 'date_format' ), $this->args->post_date, true ); +||||||| .r11156 + + return $replacement; +======= + elseif ( $this->args->post_content !== '' ) { + $replacement = wp_html_excerpt( strip_shortcodes( $this->args->post_content ), 155 ); + } +>>>>>>> .r12027 } +<<<<<<< .mine else { if ( get_query_var( 'day' ) && get_query_var( 'day' ) != '' ) { $replacement = get_the_date(); @@ -314,11 +896,52 @@ class WPSEO_Replace_Vars { $replacement = get_query_var( 'year' ); } } +||||||| .r11156 + + /** + * Retrieve the post/page/cpt excerpt for use as replacement string. + * The excerpt will be auto-generated if it does not exist. + * + * @return string|null + */ + private function retrieve_excerpt() { + $replacement = null; + + if ( ! empty( $this->args->ID ) ) { + if ( $this->args->post_excerpt !== '' ) { + $replacement = strip_tags( $this->args->post_excerpt ); + } elseif ( $this->args->post_content !== '' ) { + $replacement = wp_html_excerpt( strip_shortcodes( $this->args->post_content ), 155 ); + } + } +======= + + return $replacement; + } + + /** + * Retrieve the post/page/cpt excerpt for use as replacement string (without auto-generation). + * + * @return string|null + */ + private function retrieve_excerpt_only() { + $replacement = null; +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + + return $replacement; +======= + + if ( ! empty( $this->args->ID ) && $this->args->post_excerpt !== '' ) { + $replacement = strip_tags( $this->args->post_excerpt ); +>>>>>>> .r12027 } return $replacement; } +<<<<<<< .mine /** * Retrieve the post/page/cpt excerpt for use as replacement string. * The excerpt will be auto-generated if it does not exist. @@ -331,15 +954,41 @@ class WPSEO_Replace_Vars { if ( ! empty( $this->args->ID ) ) { if ( $this->args->post_excerpt !== '' ) { $replacement = strip_tags( $this->args->post_excerpt ); +||||||| .r11156 + if ( ! empty( $this->args->ID ) && $this->args->post_excerpt !== '' ) { + $replacement = strip_tags( $this->args->post_excerpt ); +======= + /** + * Retrieve the title of the parent page of the current page/cpt for use as replacement string. + * Only applicable for hierarchical post types. + * + * @todo - check: shouldn't this use $this->args as well ? + * + * @return string|null + */ + private function retrieve_parent_title() { + $replacement = null; + + if ( ! isset( $replacement ) && ( ( is_singular() || is_admin() ) && isset( $GLOBALS['post'] ) ) ) { + if ( isset( $GLOBALS['post']->post_parent ) && 0 != $GLOBALS['post']->post_parent ) { + $replacement = get_the_title( $GLOBALS['post']->post_parent ); +>>>>>>> .r12027 } +<<<<<<< .mine elseif ( $this->args->post_content !== '' ) { $replacement = wp_html_excerpt( strip_shortcodes( $this->args->post_content ), 155 ); } +||||||| .r11156 + + return $replacement; +======= +>>>>>>> .r12027 } return $replacement; } +<<<<<<< .mine /** * Retrieve the post/page/cpt excerpt for use as replacement string (without auto-generation). * @@ -347,14 +996,42 @@ class WPSEO_Replace_Vars { */ private function retrieve_excerpt_only() { $replacement = null; +||||||| .r11156 + if ( ! isset( $replacement ) && ( ( is_singular() || is_admin() ) && isset( $GLOBALS['post'] ) ) ) { + if ( isset( $GLOBALS['post']->post_parent ) && 0 != $GLOBALS['post']->post_parent ) { + $replacement = get_the_title( $GLOBALS['post']->post_parent ); + } + } +======= + /** + * Retrieve the current search phrase for use as replacement string. + * + * @return string|null + */ + private function retrieve_searchphrase() { + $replacement = null; + + if ( ! isset( $replacement ) ) { + $search = get_query_var( 's' ); + if ( $search !== '' ) { + $replacement = esc_html( $search ); + } +>>>>>>> .r12027 +<<<<<<< .mine if ( ! empty( $this->args->ID ) && $this->args->post_excerpt !== '' ) { $replacement = strip_tags( $this->args->post_excerpt ); +||||||| .r11156 + + return $replacement; +======= +>>>>>>> .r12027 } return $replacement; } +<<<<<<< .mine /** * Retrieve the title of the parent page of the current page/cpt for use as replacement string. * Only applicable for hierarchical post types. @@ -370,11 +1047,59 @@ class WPSEO_Replace_Vars { if ( isset( $GLOBALS['post']->post_parent ) && 0 != $GLOBALS['post']->post_parent ) { $replacement = get_the_title( $GLOBALS['post']->post_parent ); } +||||||| .r11156 + if ( ! isset( $replacement ) ) { + $search = get_query_var( 's' ); + if ( $search !== '' ) { + $replacement = esc_html( $search ); + } + } +======= + /** + * Retrieve the separator for use as replacement string. + * + * @return string + */ + private function retrieve_sep() { + $replacement = WPSEO_Options::get_default( 'wpseo_titles', 'separator' ); +>>>>>>> .r12027 +<<<<<<< .mine +||||||| .r11156 + + return $replacement; +======= + + // Get the titles option and the separator options. + $titles_options = get_option( 'wpseo_titles' ); + $seperator_options = WPSEO_Option_Titles::get_instance()->get_separator_options(); + + // This should always be set, but just to be sure. + if ( isset( $seperator_options[ $titles_options['separator'] ] ) ) { + // Set the new replacement. + $replacement = $seperator_options[ $titles_options['separator'] ]; +>>>>>>> .r12027 } +<<<<<<< .mine return $replacement; } +||||||| .r11156 + /** + * Retrieve the separator for use as replacement string. + * + * @return string + */ + private function retrieve_sep() { + $replacement = WPSEO_Options::get_default( 'wpseo_titles', 'separator' ); +======= + /** + * Filter: 'wpseo_replacements_filter_sep' - Allow customization of the separator character(s) + * + * @api string $replacement The current separator + */ +>>>>>>> .r12027 +<<<<<<< .mine /** * Retrieve the current search phrase for use as replacement string. * @@ -382,63 +1107,129 @@ class WPSEO_Replace_Vars { */ private function retrieve_searchphrase() { $replacement = null; +||||||| .r11156 + // Get the titles option and the separator options + $titles_options = get_option( 'wpseo_titles' ); + $seperator_options = WPSEO_Option_Titles::get_instance()->get_separator_options(); +======= + return apply_filters( 'wpseo_replacements_filter_sep', $replacement ); + } +>>>>>>> .r12027 +<<<<<<< .mine if ( ! isset( $replacement ) ) { $search = get_query_var( 's' ); if ( $search !== '' ) { $replacement = esc_html( $search ); +||||||| .r11156 + // This should always be set, but just to be sure + if ( isset( $seperator_options[ $titles_options['separator'] ] ) ) { + // Set the new replacement + $replacement = $seperator_options[ $titles_options['separator'] ]; +======= + /** + * Retrieve the site's tag line / description for use as replacement string. + * + * @return string|null + */ + private function retrieve_sitedesc() { + static $replacement; + + if ( ! isset( $replacement ) ) { + $description = trim( strip_tags( get_bloginfo( 'description' ) ) ); + if ( $description !== '' ) { + $replacement = $description; +>>>>>>> .r12027 } } return $replacement; } +<<<<<<< .mine /** * Retrieve the separator for use as replacement string. * * @return string */ private function retrieve_sep() { - $replacement = WPSEO_Options::get_default( 'wpseo_titles', 'separator' ); - - // Get the titles option and the separator options. - $titles_options = get_option( 'wpseo_titles' ); - $seperator_options = WPSEO_Option_Titles::get_instance()->get_separator_options(); - - // This should always be set, but just to be sure. - if ( isset( $seperator_options[ $titles_options['separator'] ] ) ) { - // Set the new replacement. - $replacement = $seperator_options[ $titles_options['separator'] ]; + return WPSEO_Utils::get_title_separator(); + } +||||||| .r11156 + return apply_filters( 'wpseo_replacements_filter_sep', $replacement ); } +======= +>>>>>>> .r12027 +<<<<<<< .mine + /** + * Retrieve the site's tag line / description for use as replacement string. + * + * @return string|null + */ + private function retrieve_sitedesc() { + static $replacement; +||||||| .r11156 /** - * Filter: 'wpseo_replacements_filter_sep' - Allow customization of the separator character(s) + * Retrieve the site's tag line / description for use as replacement string. * - * @api string $replacement The current separator + * @return string|null */ - - return apply_filters( 'wpseo_replacements_filter_sep', $replacement ); - } - + private function retrieve_sitedesc() { + static $replacement; +======= /** - * Retrieve the site's tag line / description for use as replacement string. + * Retrieve the site's name for use as replacement string. * * @return string|null */ - private function retrieve_sitedesc() { + private function retrieve_sitename() { static $replacement; +>>>>>>> .r12027 +<<<<<<< .mine if ( ! isset( $replacement ) ) { $description = trim( strip_tags( get_bloginfo( 'description' ) ) ); if ( $description !== '' ) { $replacement = $description; +||||||| .r11156 + if ( ! isset( $replacement ) ) { + $description = trim( strip_tags( get_bloginfo( 'description' ) ) ); + if ( $description !== '' ) { + $replacement = $description; + } +======= + if ( ! isset( $replacement ) ) { + $sitename = trim( strip_tags( get_bloginfo( 'name' ) ) ); + if ( $sitename !== '' ) { + $replacement = $sitename; +>>>>>>> .r12027 } } return $replacement; } +<<<<<<< .mine +||||||| .r11156 + /** + * Retrieve the site's name for use as replacement string. + * + * @return string|null + */ + private function retrieve_sitename() { + static $replacement; +======= + /** + * Retrieve the current tag/tags for use as replacement string. + * + * @return string|null + */ + private function retrieve_tag() { + $replacement = null; +>>>>>>> .r12027 +<<<<<<< .mine /** * Retrieve the site's name for use as replacement string. * @@ -448,15 +1239,28 @@ class WPSEO_Replace_Vars { static $replacement; if ( ! isset( $replacement ) ) { - $sitename = trim( strip_tags( get_bloginfo( 'name' ) ) ); + $sitename = WPSEO_Utils::get_site_name(); if ( $sitename !== '' ) { $replacement = $sitename; +||||||| .r11156 + if ( ! isset( $replacement ) ) { + $sitename = trim( strip_tags( get_bloginfo( 'name' ) ) ); + if ( $sitename !== '' ) { + $replacement = $sitename; + } +======= + if ( isset( $this->args->ID ) ) { + $tags = $this->get_terms( $this->args->ID, 'post_tag' ); + if ( $tags !== '' ) { + $replacement = $tags; +>>>>>>> .r12027 } } return $replacement; } +<<<<<<< .mine /** * Retrieve the current tag/tags for use as replacement string. * @@ -470,8 +1274,41 @@ class WPSEO_Replace_Vars { if ( $tags !== '' ) { $replacement = $tags; } +||||||| .r11156 + if ( isset( $this->args->ID ) ) { + $tags = $this->get_terms( $this->args->ID, 'post_tag' ); + if ( $tags !== '' ) { + $replacement = $tags; + } + } +======= + /** + * Retrieve the tag description for use as replacement string. + * + * @return string|null + */ + private function retrieve_tag_description() { + return $this->retrieve_term_description(); + } +>>>>>>> .r12027 +<<<<<<< .mine + } +||||||| .r11156 + + return $replacement; } +======= + + /** + * Retrieve the term description for use as replacement string. + * + * @return string|null + */ + private function retrieve_term_description() { + $replacement = null; +>>>>>>> .r12027 +<<<<<<< .mine return $replacement; } @@ -496,6 +1333,35 @@ class WPSEO_Replace_Vars { $term_desc = get_term_field( 'description', $this->args->term_id, $this->args->taxonomy ); if ( $term_desc !== '' ) { $replacement = trim( strip_tags( $term_desc ) ); +||||||| .r11156 + /** + * Retrieve the tag description for use as replacement string. + * + * @return string|null + */ + private function retrieve_tag_description() { + return $this->retrieve_term_description(); + } + + /** + * Retrieve the term description for use as replacement string. + * + * @return string|null + */ + private function retrieve_term_description() { + $replacement = null; + + if ( isset( $this->args->term_id ) && ! empty( $this->args->taxonomy ) ) { + $term_desc = get_term_field( 'description', $this->args->term_id, $this->args->taxonomy ); + if ( $term_desc !== '' ) { + $replacement = trim( strip_tags( $term_desc ) ); + } +======= + if ( isset( $this->args->term_id ) && ! empty( $this->args->taxonomy ) ) { + $term_desc = get_term_field( 'description', $this->args->term_id, $this->args->taxonomy ); + if ( $term_desc !== '' ) { + $replacement = trim( strip_tags( $term_desc ) ); +>>>>>>> .r12027 } } @@ -695,6 +1561,40 @@ class WPSEO_Replace_Vars { } +<<<<<<< .mine + /** + * Retrieve a post/page/cpt's custom taxonomies description for use as replacement string + * + * @param string $var The complete variable to replace which includes the name of + * the custom taxonomy which description is to be retrieved. + * + * @return string|null + */ + private function retrieve_ct_desc_custom_tax_name( $var ) { + global $post; + $replacement = null; + + if ( is_string( $var ) && $var !== '' ) { + $tax = substr( $var, 8 ); + if ( is_object( $post ) && isset( $post->ID ) ) { + $terms = get_the_terms( $post->ID, $tax ); + if ( is_array( $terms ) && $terms !== array() ) { + $term = current( $terms ); + $term_desc = get_term_field( 'description', $term->term_id, $tax ); + if ( $term_desc !== '' ) { + $replacement = trim( strip_tags( $term_desc ) ); +||||||| .r11156 + if ( is_string( $var ) && $var !== '' ) { + $tax = substr( $var, 8 ); + if ( is_object( $post ) && isset( $post->ID ) ) { + $terms = get_the_terms( $post->ID, $tax ); + if ( is_array( $terms ) && $terms !== array() ) { + $term = current( $terms ); + $term_desc = get_term_field( 'description', $term->term_id, $tax ); + if ( $term_desc !== '' ) { + $replacement = $term_desc; + } +======= /** * Retrieve a post/page/cpt's custom taxonomies description for use as replacement string * @@ -716,6 +1616,7 @@ class WPSEO_Replace_Vars { $term_desc = get_term_field( 'description', $term->term_id, $tax ); if ( $term_desc !== '' ) { $replacement = $term_desc; +>>>>>>> .r12027 } } } @@ -1077,6 +1978,57 @@ class WPSEO_Replace_Vars { } +<<<<<<< .mine + /** + * Set/translate the help texts for the WPSEO standard basic variables. + */ + private static function set_basic_help_texts() { + self::$help_texts['basic'] = array( + 'date' => __( 'Replaced with the date of the post/page', 'wordpress-seo' ), + 'title' => __( 'Replaced with the title of the post/page', 'wordpress-seo' ), + 'parent_title' => __( 'Replaced with the title of the parent page of the current page', 'wordpress-seo' ), + 'sitename' => __( 'The site\'s name', 'wordpress-seo' ), + 'sitedesc' => __( 'The site\'s tag line / description', 'wordpress-seo' ), + 'excerpt' => __( 'Replaced with the post/page excerpt (or auto-generated if it does not exist)', 'wordpress-seo' ), + 'excerpt_only' => __( 'Replaced with the post/page excerpt (without auto-generation)', 'wordpress-seo' ), + 'tag' => __( 'Replaced with the current tag/tags', 'wordpress-seo' ), + 'category' => __( 'Replaced with the post categories (comma separated)', 'wordpress-seo' ), + 'category_description' => __( 'Replaced with the category description', 'wordpress-seo' ), + 'tag_description' => __( 'Replaced with the tag description', 'wordpress-seo' ), + 'term_description' => __( 'Replaced with the term description', 'wordpress-seo' ), + 'term_title' => __( 'Replaced with the term name', 'wordpress-seo' ), + 'searchphrase' => __( 'Replaced with the current search phrase', 'wordpress-seo' ), + 'sep' => sprintf( + /* translators: %s: wp_title() function */ + __( 'The separator defined in your theme\'s %s tag.', 'wordpress-seo' ), + 'wp_title()' + ), + ); + } +||||||| .r11156 + /** + * Set/translate the help texts for the WPSEO standard basic variables. + */ + private static function set_basic_help_texts() { + self::$help_texts['basic'] = array( + 'date' => __( 'Replaced with the date of the post/page', 'wordpress-seo' ), + 'title' => __( 'Replaced with the title of the post/page', 'wordpress-seo' ), + 'parent_title' => __( 'Replaced with the title of the parent page of the current page', 'wordpress-seo' ), + 'sitename' => __( 'The site\'s name', 'wordpress-seo' ), + 'sitedesc' => __( 'The site\'s tag line / description', 'wordpress-seo' ), + 'excerpt' => __( 'Replaced with the post/page excerpt (or auto-generated if it does not exist)', 'wordpress-seo' ), + 'excerpt_only' => __( 'Replaced with the post/page excerpt (without auto-generation)', 'wordpress-seo' ), + 'tag' => __( 'Replaced with the current tag/tags', 'wordpress-seo' ), + 'category' => __( 'Replaced with the post categories (comma separated)', 'wordpress-seo' ), + 'category_description' => __( 'Replaced with the category description', 'wordpress-seo' ), + 'tag_description' => __( 'Replaced with the tag description', 'wordpress-seo' ), + 'term_description' => __( 'Replaced with the term description', 'wordpress-seo' ), + 'term_title' => __( 'Replaced with the term name', 'wordpress-seo' ), + 'searchphrase' => __( 'Replaced with the current search phrase', 'wordpress-seo' ), + 'sep' => __( 'The separator defined in your theme\'s wp_title() tag.', 'wordpress-seo' ), + ); + } +======= /** * Set/translate the help texts for the WPSEO standard basic variables. */ @@ -1099,6 +2051,7 @@ class WPSEO_Replace_Vars { 'sep' => __( 'The separator defined in your theme\'s wp_title() tag.', 'wordpress-seo' ), ); } +>>>>>>> .r12027 /** * Set/translate the help texts for the WPSEO standard advanced variables. @@ -1188,6 +2141,18 @@ class WPSEO_Replace_Vars { } $output = rtrim( trim( $output ), ',' ); } +<<<<<<< .mine + } +||||||| .r11156 + + /** + * Allows filtering of the terms list used to replace %%category%%, %%tag%% and %%ct_%% variables + * @api string $output Comma-delimited string containing the terms + */ + + return apply_filters( 'wpseo_terms', $output ); + } +======= } unset( $terms, $term ); @@ -1198,11 +2163,40 @@ class WPSEO_Replace_Vars { return apply_filters( 'wpseo_terms', $output ); } +>>>>>>> .r12027 + unset( $terms, $term ); + +<<<<<<< .mine + /** + * Allows filtering of the terms list used to replace %%category%%, %%tag%% and %%ct_%% variables + * @api string $output Comma-delimited string containing the terms + */ +||||||| .r11156 + } /* End of class WPSEO_Replace_Vars */ +======= +} /* End of class WPSEO_Replace_Vars */ +>>>>>>> .r12027 + return apply_filters( 'wpseo_terms', $output ); + } } /* End of class WPSEO_Replace_Vars */ +<<<<<<< .mine + +/** + * Setup the class statics when the file is first loaded + */ +WPSEO_Replace_Vars::setup_statics_once(); +||||||| .r11156 + /** + * Setup the class statics when the file is first loaded + */ + WPSEO_Replace_Vars::setup_statics_once(); +} /* End of class-exists wrapper */ +======= /** * Setup the class statics when the file is first loaded */ WPSEO_Replace_Vars::setup_statics_once(); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-statistics.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-statistics.php index acda9f11..791876e4 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-statistics.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-statistics.php @@ -1,3 +1,144 @@ +<<<<<<< .mine +get_rank() ) { + $posts = array( + 'meta_query' => array( + 'relation' => 'OR', + array( + 'key' => WPSEO_Meta::$meta_prefix . 'linkdex', + 'value' => 'needs-a-value-anyway', + 'compare' => 'NOT EXISTS', + ) + ), + ); + } + elseif ( WPSEO_Rank::NO_INDEX === $rank->get_rank() ) { + $posts = array( + 'meta_key' => WPSEO_Meta::$meta_prefix . 'meta-robots-noindex', + 'meta_value' => '1', + 'compare' => '=', + ); + } + else { + $posts = array( + 'meta_key' => WPSEO_Meta::$meta_prefix . 'linkdex', + 'meta_value' => array( $rank->get_starting_score(), $rank->get_end_score() ), + 'meta_compare' => 'BETWEEN', + 'meta_type' => 'NUMERIC', + ); + } + + $posts['fields'] = 'ids'; + $posts['post_status'] = 'publish'; + + if ( current_user_can( 'edit_others_posts' ) === false ) { + $posts['author'] = get_current_user_id(); + } + + $posts = new WP_Query( $posts ); + + return $posts->found_posts; + } + + /** + * Returns the amount of posts that have no focus keyword + * + * @deprecated + * + * @return int + */ + public function get_no_focus_post_count() { + _deprecated_function( 'get_no_focus_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( WPSEO_Rank::NO_FOCUS ) ); + } + + /** + * Returns the amount of posts that have a bad SEO ranking + * + * @deprecated + * + * @return int + */ + public function get_bad_seo_post_count() { + _deprecated_function( 'get_bad_seo_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( WPSEO_Rank::BAD ) ); + } + + /** + * Returns the amount of posts that have a poor SEO ranking + * + * @deprecated + * + * @return int + */ + public function get_poor_seo_post_count() { + _deprecated_function( 'get_poor_seo_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( 'poor' ) ); + } + + /** + * Returns the amount of posts that have an ok SEO ranking + * + * @deprecated + * + * @return int + */ + public function get_ok_seo_post_count() { + _deprecated_function( 'get_ok_seo_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( WPSEO_Rank::OK ) ); + } + + /** + * Returns the amount of posts that have a good SEO ranking + * + * @deprecated + * + * @return int + */ + public function get_good_seo_post_count() { + _deprecated_function( 'get_good_seo_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( WPSEO_Rank::GOOD ) ); + } + + /** + * Returns the amount of posts that have no SEO ranking + * + * @deprecated + * + * @return int + */ + public function get_no_index_post_count() { + _deprecated_function( 'get_no_index_post_count', 'WPSEO 3.0', 'WPSEO_Statistics::get_post_count' ); + + return $this->get_post_count( new WPSEO_Rank( WPSEO_Rank::NO_INDEX ) ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-utils.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-utils.php index c449c75f..19449b25 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-utils.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/class-wpseo-utils.php @@ -1,3 +1,865 @@ +<<<<<<< .mine +get_names(); + + return $roles; + } + + /** + * Standardize whitespace in a string + * + * Replace line breaks, carriage returns, tabs with a space, then remove double spaces. + * + * @param string $string String input to standardize. + * + * @return string + */ + public static function standardize_whitespace( $string ) { + return trim( str_replace( ' ', ' ', str_replace( array( "\t", "\n", "\r", "\f" ), ' ', $string ) ) ); + } + + /** + * Strip out the shortcodes with a filthy regex, because people don't properly register their shortcodes. + * + * @static + * + * @param string $text Input string that might contain shortcodes. + * + * @return string $text string without shortcodes + */ + public static function strip_shortcode( $text ) { + return preg_replace( '`\[[^\]]+\]`s', '', $text ); + } + + /** + * Recursively trim whitespace round a string value or of string values within an array + * Only trims strings to avoid typecasting a variable (to string) + * + * @static + * + * @param mixed $value Value to trim or array of values to trim. + * + * @return mixed Trimmed value or array of trimmed values + */ + public static function trim_recursive( $value ) { + if ( is_string( $value ) ) { + $value = trim( $value ); + } + elseif ( is_array( $value ) ) { + $value = array_map( array( __CLASS__, 'trim_recursive' ), $value ); + } + + return $value; + } + + /** + * Translates a decimal analysis score into a textual one. + * + * @static + * + * @param int $val The decimal score to translate. + * @param bool $css_value Whether to return the i18n translated score or the CSS class value. + * + * @return string + */ + public static function translate_score( $val, $css_value = true ) { + $seo_rank = WPSEO_Rank::from_numeric_score( $val ); + + if ( $css_value ) { + return $seo_rank->get_css_class(); + } + + return $seo_rank->get_label(); + } + + /** + * Emulate the WP native sanitize_text_field function in a %%variable%% safe way + * + * @see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php for the original + * + * Sanitize a string from user input or from the db + * + * check for invalid UTF-8, + * Convert single < characters to entity, + * strip all tags, + * remove line breaks, tabs and extra white space, + * strip octets - BUT DO NOT REMOVE (part of) VARIABLES WHICH WILL BE REPLACED. + * + * @param string $value String value to sanitize. + * + * @return string + */ + public static function sanitize_text_field( $value ) { + $filtered = wp_check_invalid_utf8( $value ); + + if ( strpos( $filtered, '<' ) !== false ) { + $filtered = wp_pre_kses_less_than( $filtered ); + // This will strip extra whitespace for us. + $filtered = wp_strip_all_tags( $filtered, true ); + } + else { + $filtered = trim( preg_replace( '`[\r\n\t ]+`', ' ', $filtered ) ); + } + + $found = false; + while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) { + $filtered = str_replace( $match[1], '', $filtered ); + $found = true; + } + unset( $match ); + + if ( $found ) { + // Strip out the whitespace that may now exist after removing the octets. + $filtered = trim( preg_replace( '` +`', ' ', $filtered ) ); + } + + /** + * Filter a sanitized text field string. + * + * @since WP 2.9.0 + * + * @param string $filtered The sanitized string. + * @param string $str The string prior to being sanitized. + */ + + return apply_filters( 'sanitize_text_field', $filtered, $value ); + } + + /** + * Sanitize a url for saving to the database + * Not to be confused with the old native WP function + * + * @todo [JRF => whomever] check/improve url verification + * + * @param string $value String URL value to sanitize. + * @param array $allowed_protocols Optional set of allowed protocols. + * + * @return string + */ + public static function sanitize_url( $value, $allowed_protocols = array( 'http', 'https' ) ) { + return esc_url_raw( sanitize_text_field( rawurldecode( $value ) ), $allowed_protocols ); + } + + /** + * Validate a value as boolean + * + * @static + * + * @param mixed $value Value to validate. + * + * @return bool + */ + public static function validate_bool( $value ) { + if ( ! isset( self::$has_filters ) ) { + self::$has_filters = extension_loaded( 'filter' ); + } + + if ( self::$has_filters ) { + return filter_var( $value, FILTER_VALIDATE_BOOLEAN ); + } + else { + return self::emulate_filter_bool( $value ); + } + } + + /** + * Cast a value to bool + * + * @static + * + * @param mixed $value Value to cast. + * + * @return bool + */ + public static function emulate_filter_bool( $value ) { + $true = array( + '1', + 'true', + 'True', + 'TRUE', + 'y', + 'Y', + 'yes', + 'Yes', + 'YES', + 'on', + 'On', + 'ON', + + ); + $false = array( + '0', + 'false', + 'False', + 'FALSE', + 'n', + 'N', + 'no', + 'No', + 'NO', + 'off', + 'Off', + 'OFF', + ); + + if ( is_bool( $value ) ) { + return $value; + } + else if ( is_int( $value ) && ( $value === 0 || $value === 1 ) ) { + return (bool) $value; + } + else if ( ( is_float( $value ) && ! is_nan( $value ) ) && ( $value === (float) 0 || $value === (float) 1 ) ) { + return (bool) $value; + } + else if ( is_string( $value ) ) { + $value = trim( $value ); + if ( in_array( $value, $true, true ) ) { + return true; + } + else if ( in_array( $value, $false, true ) ) { + return false; + } + else { + return false; + } + } + + return false; + } + + /** + * Validate a value as integer + * + * @static + * + * @param mixed $value Value to validate. + * + * @return int|bool int or false in case of failure to convert to int + */ + public static function validate_int( $value ) { + if ( ! isset( self::$has_filters ) ) { + self::$has_filters = extension_loaded( 'filter' ); + } + + if ( self::$has_filters ) { + return filter_var( $value, FILTER_VALIDATE_INT ); + } + else { + return self::emulate_filter_int( $value ); + } + } + + /** + * Cast a value to integer + * + * @static + * + * @param mixed $value Value to cast. + * + * @return int|bool + */ + public static function emulate_filter_int( $value ) { + if ( is_int( $value ) ) { + return $value; + } + else if ( is_float( $value ) ) { + if ( (int) $value == $value && ! is_nan( $value ) ) { + return (int) $value; + } + else { + return false; + } + } + else if ( is_string( $value ) ) { + $value = trim( $value ); + if ( $value === '' ) { + return false; + } + else if ( ctype_digit( $value ) ) { + return (int) $value; + } + else if ( strpos( $value, '-' ) === 0 && ctype_digit( substr( $value, 1 ) ) ) { + return (int) $value; + } + else { + return false; + } + } + + return false; + } + + /** + * Clears the WP or W3TC cache depending on which is used + * + * @static + */ + public static function clear_cache() { + if ( function_exists( 'w3tc_pgcache_flush' ) ) { + w3tc_pgcache_flush(); + } + elseif ( function_exists( 'wp_cache_clear_cache' ) ) { + wp_cache_clear_cache(); + } + } + + /** + * Flush W3TC cache after succesfull update/add of taxonomy meta option + * + * @todo [JRF => whomever] check the above and this function to see if they should be combined or really + * do something significantly different + * + * @static + */ + public static function flush_w3tc_cache() { + if ( defined( 'W3TC_DIR' ) && function_exists( 'w3tc_objectcache_flush' ) ) { + w3tc_objectcache_flush(); + } + } + + /** + * Clear rewrite rules + * + * @static + */ + public static function clear_rewrites() { + delete_option( 'rewrite_rules' ); + } + + /** + * Adds a hook that when given option is updated, the XML sitemap transient cache is cleared + * + * @param string $option Option name. + * @param string $type Sitemap type. + */ + public static function register_cache_clear_option( $option, $type = '' ) { + self::$cache_clear[ $option ] = $type; + add_action( 'update_option', array( 'WPSEO_Utils', 'clear_transient_cache' ) ); + } + + /** + * Clears the transient cache when a given option is updated, if that option has been registered before + * + * @param string $option The option that's being updated. + */ + public static function clear_transient_cache( $option ) { + if ( isset( self::$cache_clear[ $option ] ) ) { + if ( '' !== self::$cache_clear[ $option ] ) { + wpseo_invalidate_sitemap_cache( self::$cache_clear[ $option ] ); + } + else { + self::clear_sitemap_cache(); + } + } + } + + /** + * Clear entire XML sitemap cache + * + * @param array $types Set of sitemap types to invalidate cache for. + */ + public static function clear_sitemap_cache( $types = array() ) { + global $wpdb; + + if ( wp_using_ext_object_cache() ) { + return; + } + + if ( ! apply_filters( 'wpseo_enable_xml_sitemap_transient_caching', true ) ) { + return; + } + + // Not sure about efficiency, but that's what code elsewhere does R. + $options = WPSEO_Options::get_all(); + + if ( true !== $options['enablexmlsitemap'] ) { + return; + } + + $query = "DELETE FROM $wpdb->options WHERE"; + + if ( ! empty( $types ) ) { + $first = true; + + foreach ( $types as $sitemap_type ) { + if ( ! $first ) { + $query .= ' OR '; + } + + $query .= " option_name LIKE '_transient_wpseo_sitemap_cache_" . $sitemap_type . "_%' OR option_name LIKE '_transient_timeout_wpseo_sitemap_cache_" . $sitemap_type . "_%'"; + + $first = false; + } + } + else { + $query .= " option_name LIKE '_transient_wpseo_sitemap_%' OR option_name LIKE '_transient_timeout_wpseo_sitemap_%'"; + } + + $wpdb->query( $query ); + } + + /** + * Do simple reliable math calculations without the risk of wrong results + * + * @see http://floating-point-gui.de/ + * @see the big red warning on http://php.net/language.types.float.php + * + * In the rare case that the bcmath extension would not be loaded, it will return the normal calculation results + * + * @static + * + * @since 1.5.0 + * + * @param mixed $number1 Scalar (string/int/float/bool). + * @param string $action Calculation action to execute. Valid input: + * '+' or 'add' or 'addition', + * '-' or 'sub' or 'subtract', + * '*' or 'mul' or 'multiply', + * '/' or 'div' or 'divide', + * '%' or 'mod' or 'modulus' + * '=' or 'comp' or 'compare'. + * @param mixed $number2 Scalar (string/int/float/bool). + * @param bool $round Whether or not to round the result. Defaults to false. + * Will be disregarded for a compare operation. + * @param int $decimals Decimals for rounding operation. Defaults to 0. + * @param int $precision Calculation precision. Defaults to 10. + * + * @return mixed Calculation Result or false if either or the numbers isn't scalar or + * an invalid operation was passed + * - for compare the result will always be an integer + * - for all other operations, the result will either be an integer (preferred) + * or a float + */ + public static function calc( $number1, $action, $number2, $round = false, $decimals = 0, $precision = 10 ) { + static $bc; + + if ( ! is_scalar( $number1 ) || ! is_scalar( $number2 ) ) { + return false; + } + + if ( ! isset( $bc ) ) { + $bc = extension_loaded( 'bcmath' ); + } + + if ( $bc ) { + $number1 = number_format( $number1, 10, '.', '' ); + $number2 = number_format( $number2, 10, '.', '' ); + } + + $result = null; + $compare = false; + + switch ( $action ) { + case '+': + case 'add': + case 'addition': + $result = ( $bc ) ? bcadd( $number1, $number2, $precision ) /* string */ : ( $number1 + $number2 ); + break; + + case '-': + case 'sub': + case 'subtract': + $result = ( $bc ) ? bcsub( $number1, $number2, $precision ) /* string */ : ( $number1 - $number2 ); + break; + + case '*': + case 'mul': + case 'multiply': + $result = ( $bc ) ? bcmul( $number1, $number2, $precision ) /* string */ : ( $number1 * $number2 ); + break; + + case '/': + case 'div': + case 'divide': + if ( $bc ) { + $result = bcdiv( $number1, $number2, $precision ); // String, or NULL if right_operand is 0. + } + elseif ( $number2 != 0 ) { + $result = ( $number1 / $number2 ); + } + + if ( ! isset( $result ) ) { + $result = 0; + } + break; + + case '%': + case 'mod': + case 'modulus': + if ( $bc ) { + $result = bcmod( $number1, $number2, $precision ); // String, or NULL if modulus is 0. + } + elseif ( $number2 != 0 ) { + $result = ( $number1 % $number2 ); + } + + if ( ! isset( $result ) ) { + $result = 0; + } + break; + + case '=': + case 'comp': + case 'compare': + $compare = true; + if ( $bc ) { + $result = bccomp( $number1, $number2, $precision ); // Returns int 0, 1 or -1. + } + else { + $result = ( $number1 == $number2 ) ? 0 : ( ( $number1 > $number2 ) ? 1 : - 1 ); + } + break; + } + + if ( isset( $result ) ) { + if ( $compare === false ) { + if ( $round === true ) { + $result = round( floatval( $result ), $decimals ); + if ( $decimals === 0 ) { + $result = (int) $result; + } + } + else { + $result = ( intval( $result ) == $result ) ? intval( $result ) : floatval( $result ); + } + } + + return $result; + } + + return false; + } + + /** + * Wrapper for the PHP filter input function. + * + * This is used because stupidly enough, the `filter_input` function is not available on all hosts... + * + * @deprecated Passes through to PHP call, no longer used in code. + * + * @param int $type Input type constant. + * @param string $variable_name Variable name to get. + * @param int $filter Filter to apply. + * + * @return mixed + */ + public static function filter_input( $type, $variable_name, $filter = FILTER_DEFAULT ) { + return filter_input( $type, $variable_name, $filter ); + } + + /** + * Trim whitespace and NBSP (Non-breaking space) from string + * + * @param string $string String input to trim. + * + * @return string + */ + public static function trim_nbsp_from_string( $string ) { + $find = array( ' ', chr( 0xC2 ) . chr( 0xA0 ) ); + $string = str_replace( $find, ' ', $string ); + $string = trim( $string ); + + return $string; + } + + /** + * Check if a string is a valid datetime + * + * @param string $datetime String input to check as valid input for DateTime class. + * + * @return bool + */ + public static function is_valid_datetime( $datetime ) { + if ( substr( $datetime, 0, 1 ) != '-' ) { + try { + // Use the DateTime class ( PHP 5.2 > ) to check if the string is a valid datetime. + if ( new DateTime( $datetime ) !== false ) { + return true; + } + } + catch ( Exception $exc ) { + return false; + } + } + + return false; + } + + /** + * Format the URL to be sure it is okay for using as a redirect url. + * + * This method will parse the URL and combine them in one string. + * + * @param string $url URL string. + * + * @return mixed + */ + public static function format_url( $url ) { + $parsed_url = parse_url( $url ); + + $formatted_url = ''; + if ( ! empty( $parsed_url['path'] ) ) { + $formatted_url = $parsed_url['path']; + } + + // Prepend a slash if first char != slash. + if ( stripos( $formatted_url, '/' ) !== 0 ) { + $formatted_url = '/' . $formatted_url; + } + + // Append 'query' string if it exists. + if ( isset( $parsed_url['query'] ) && '' != $parsed_url['query'] ) { + $formatted_url .= '?' . $parsed_url['query']; + } + + return apply_filters( 'wpseo_format_admin_url', $formatted_url ); + } + + + /** + * Get plugin name from file + * + * @param string $plugin Plugin path relative to plugins directory. + * + * @return string|bool + */ + public static function get_plugin_name( $plugin ) { + $plugin_details = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); + + if ( $plugin_details['Name'] != '' ) { + return $plugin_details['Name']; + } + + return false; + } + + /** + * Retrieves the sitename. + * + * @return string + */ + public static function get_site_name() { + return trim( strip_tags( get_bloginfo( 'name' ) ) ); + } + + /** + * Retrieves the title separator. + * + * @return string + */ + public static function get_title_separator() { + $replacement = WPSEO_Options::get_default( 'wpseo_titles', 'separator' ); + + // Get the titles option and the separator options. + $titles_options = get_option( 'wpseo_titles' ); + $seperator_options = WPSEO_Option_Titles::get_instance()->get_separator_options(); + + // This should always be set, but just to be sure. + if ( isset( $seperator_options[ $titles_options['separator'] ] ) ) { + // Set the new replacement. + $replacement = $seperator_options[ $titles_options['separator'] ]; + } + + /** + * Filter: 'wpseo_replacements_filter_sep' - Allow customization of the separator character(s) + * + * @api string $replacement The current separator + */ + return apply_filters( 'wpseo_replacements_filter_sep', $replacement ); + } + + /** + * Wrapper for encoding the array as a json string. Includes a fallback if wp_json_encode doesn't exists + * + * @param array $array_to_encode The array which will be encoded. + * @param int $options Optional. Array with options which will be passed in to the encoding methods. + * @param int $depth Optional. Maximum depth to walk through $data. Must be greater than 0. Default 512. + * + * @return false|string + */ + public static function json_encode( array $array_to_encode, $options = 0, $depth = 512 ) { + if ( function_exists( 'wp_json_encode' ) ) { + return wp_json_encode( $array_to_encode, $options, $depth ); + } + + // @codingStandardsIgnoreStart + return json_encode( $array_to_encode ); + // @codingStandardsIgnoreEnd + } + + /** + * Check if the current opened page is a Yoast SEO page. + * + * @return bool + */ + public static function is_yoast_seo_page() { + static $is_yoast_seo; + + if ( $is_yoast_seo === null ) { + $current_page = filter_input( INPUT_GET, 'page' ); + $is_yoast_seo = ( substr( $current_page, 0, 6 ) === 'wpseo_' ); + } + + return $is_yoast_seo; + } + + /** + * Determine if Yoast SEO is in development mode? + * + * Inspired by JetPack (https://github.com/Automattic/jetpack/blob/master/class.jetpack.php#L1383-L1406). + * + * @return bool + */ + public static function is_development_mode() { + $development_mode = false; + + if ( defined( 'WPSEO_DEBUG' ) ) { + $development_mode = WPSEO_DEBUG; + } + elseif ( site_url() && false === strpos( site_url(), '.' ) ) { + $development_mode = true; + } + + /** + * Filter the Yoast SEO development mode. + * + * @since 3.0 + * + * @param bool $development_mode Is Yoast SEOs development mode active. + */ + + return apply_filters( 'yoast_seo_development_mode', $development_mode ); + } + +} /* End of class WPSEO_Utils */ +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-wpseo.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-wpseo.php index 88ffc84c..e9d290e5 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-wpseo.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option-wpseo.php @@ -1,3 +1,4 @@ +<<<<<<< .mine '', 'company_or_person' => '', 'disableadvanced_meta' => true, + 'onpage_indexability' => true, 'googleverify' => '', // Text field. 'msverify' => '', // Text field. 'person_name' => '', @@ -287,3 +289,295 @@ class WPSEO_Option_Wpseo extends WPSEO_Option { return $option_value; } } +||||||| .r0 +======= +get_defaults(); + */ + protected $defaults = array( + // Non-form fields, set via (ajax) function. + 'blocking_files' => array(), + 'ignore_blog_public_warning' => false, + 'ignore_meta_description_warning' => null, // Overwrite in __construct(). + 'ignore_page_comments' => false, + 'ignore_permalink' => false, + 'ms_defaults_set' => false, + 'theme_description_found' => null, // Overwrite in __construct(). + 'theme_has_description' => null, // Overwrite in __construct(). + // Non-form field, should only be set via validation routine. + 'version' => '', // Leave default as empty to ensure activation/upgrade works. + // Form fields: + 'alexaverify' => '', // Text field. + 'company_logo' => '', + 'company_name' => '', + 'company_or_person' => '', + 'disableadvanced_meta' => true, + 'googleverify' => '', // Text field. + 'msverify' => '', // Text field. + 'person_name' => '', + 'website_name' => '', + 'alternate_website_name' => '', + 'yandexverify' => '', + ); + + /** + * @var array Array of description related defaults + */ + public static $desc_defaults = array( + 'ignore_meta_description_warning' => false, + 'theme_description_found' => '', // Text string description. + 'theme_has_description' => null, + ); + + /** + * @var array Array of sub-options which should not be overloaded with multi-site defaults + */ + public $ms_exclude = array( + 'ignore_blog_public_warning', + 'ignore_meta_description_warning', + 'ignore_page_comments', + 'ignore_permalink', + /* theme dependent */ + 'theme_description_found', + 'theme_has_description', + /* privacy */ + 'alexaverify', + 'googleverify', + 'msverify', + 'yandexverify', + ); + + + /** + * Add the actions and filters for the option + * + * @todo [JRF => testers] Check if the extra actions below would run into problems if an option + * is updated early on and if so, change the call to schedule these for a later action on add/update + * instead of running them straight away + * + * @return \WPSEO_Option_Wpseo + */ + protected function __construct() { + /* + Dirty fix for making certain defaults available during activation while still only + defining them once + */ + foreach ( self::$desc_defaults as $key => $value ) { + $this->defaults[ $key ] = $value; + } + + parent::__construct(); + + /* Clear the cache on update/add */ + add_action( 'add_option_' . $this->option_name, array( 'WPSEO_Utils', 'clear_cache' ) ); + add_action( 'update_option_' . $this->option_name, array( 'WPSEO_Utils', 'clear_cache' ) ); + } + + + /** + * Get the singleton instance of this class + * + * @return object + */ + public static function get_instance() { + if ( ! ( self::$instance instanceof self ) ) { + self::$instance = new self(); + } + + return self::$instance; + } + + /** + * Validate the option + * + * @param array $dirty New value for the option. + * @param array $clean Clean value for the option, normally the defaults. + * @param array $old Old value of the option. + * + * @return array Validated clean value for the option to be saved to the database + */ + protected function validate_option( $dirty, $clean, $old ) { + + foreach ( $clean as $key => $value ) { + switch ( $key ) { + case 'version': + $clean[ $key ] = WPSEO_VERSION; + break; + + + case 'blocking_files': + /** + * @internal [JRF] to really validate this we should also do a file_exists() + * on each array entry and remove files which no longer exist, but that might be overkill + */ + if ( isset( $dirty[ $key ] ) && is_array( $dirty[ $key ] ) ) { + $clean[ $key ] = array_unique( $dirty[ $key ] ); + } + elseif ( isset( $old[ $key ] ) && is_array( $old[ $key ] ) ) { + $clean[ $key ] = array_unique( $old[ $key ] ); + } + break; + + + case 'theme_description_found': + if ( isset( $dirty[ $key ] ) && is_string( $dirty[ $key ] ) ) { + $clean[ $key ] = $dirty[ $key ]; // @todo [JRF/whomever] maybe do wp_kses ? + } + elseif ( isset( $old[ $key ] ) && is_string( $old[ $key ] ) ) { + $clean[ $key ] = $old[ $key ]; + } + break; + + case 'company_or_person': + if ( isset( $dirty[ $key ] ) && $dirty[ $key ] !== '' ) { + if ( in_array( $dirty[ $key ], array( 'company', 'person' ) ) ) { + $clean[ $key ] = $dirty[ $key ]; + } + } + break; + + /* text fields */ + case 'company_name': + case 'person_name': + case 'website_name': + case 'alternate_website_name': + if ( isset( $dirty[ $key ] ) && $dirty[ $key ] !== '' ) { + $clean[ $key ] = sanitize_text_field( $dirty[ $key ] ); + } + break; + + case 'company_logo': + $this->validate_url( $key, $dirty, $old, $clean ); + break; + + /* verification strings */ + case 'alexaverify': + case 'googleverify': + case 'msverify': + case 'yandexverify': + $this->validate_verification_string( $key, $dirty, $old, $clean ); + break; + + + /* boolean|null fields - if set a check was done, if null, it hasn't */ + case 'theme_has_description': + if ( isset( $dirty[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::validate_bool( $dirty[ $key ] ); + } + elseif ( isset( $old[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::validate_bool( $old[ $key ] ); + } + break; + + + /* + Boolean dismiss warnings - not fields - may not be in form + (and don't need to be either as long as the default is false) + */ + case 'ignore_blog_public_warning': + case 'ignore_meta_description_warning': + case 'ignore_page_comments': + case 'ignore_permalink': + case 'ms_defaults_set': + if ( isset( $dirty[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::validate_bool( $dirty[ $key ] ); + } + elseif ( isset( $old[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::validate_bool( $old[ $key ] ); + } + break; + + + /* + Boolean (checkbox) fields + */ + + /* + Covers + * 'disableadvanced_meta' + * 'yoast_tracking' + */ + default: + $clean[ $key ] = ( isset( $dirty[ $key ] ) ? WPSEO_Utils::validate_bool( $dirty[ $key ] ) : false ); + break; + } + } + + return $clean; + } + + + /** + * Clean a given option value + * + * @param array $option_value Old (not merged with defaults or filtered) option value to + * clean according to the rules for this option. + * @param string $current_version (optional) Version from which to upgrade, if not set, + * version specific upgrades will be disregarded. + * @param array $all_old_option_values (optional) Only used when importing old options to have + * access to the real old values, in contrast to the saved ones. + * + * @return array Cleaned option + */ + protected function clean_option( $option_value, $current_version = null, $all_old_option_values = null ) { + // Deal with renaming of some options without losing the settings. + $rename = array( + 'meta_description_warning' => 'ignore_meta_description_warning', + ); + foreach ( $rename as $old => $new ) { + if ( isset( $option_value[ $old ] ) && ! isset( $option_value[ $new ] ) ) { + $option_value[ $new ] = $option_value[ $old ]; + unset( $option_value[ $old ] ); + } + } + unset( $rename, $old, $new ); + + + // Change a array sub-option to two straight sub-options. + if ( isset( $option_value['theme_check']['description'] ) && ! isset( $option_value['theme_has_description'] ) ) { + // @internal the negate is by design! + $option_value['theme_has_description'] = ! $option_value['theme_check']['description']; + } + if ( isset( $option_values['theme_check']['description_found'] ) && ! isset( $option_value['theme_description_found'] ) ) { + $option_value['theme_description_found'] = $option_value['theme_check']['description_found']; + } + + + // Deal with value change from text string to boolean. + $value_change = array( + 'ignore_blog_public_warning', + 'ignore_meta_description_warning', + 'ignore_page_comments', + 'ignore_permalink', + // 'disableadvanced_meta', => not needed as is 'on' which will auto-convert to true. + ); + foreach ( $value_change as $key ) { + if ( isset( $option_value[ $key ] ) && in_array( $option_value[ $key ], array( + 'ignore', + 'done', + ), true ) + ) { + $option_value[ $key ] = true; + } + } + + return $option_value; + } +} +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option.php index 986c80c1..255e126d 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-option.php @@ -1,3 +1,865 @@ +<<<<<<< .mine +'theme_has_description' + * + * [Updating/Adding options] + * - For multisite site_options, please use the WPSEO_Options::update_site_option() method. + * - For normal options, use the normal add/update_option() functions. As long a the classes here + * are instantiated, validation for all options and their subkeys will be automatic. + * - On (succesfull) update of a couple of options, certain related actions will be run automatically. + * Some examples: + * - on change of wpseo[yoast_tracking], the cron schedule will be adjusted accordingly + * - on change of wpseo_permalinks and wpseo_xml, the rewrite rules will be flushed + * - on change of wpseo and wpseo_title, some caches will be cleared + * + * + * [Important information about add/updating/changing these classes] + * - Make sure that option array key names are unique across options. The WPSEO_Options::get_all() + * method merges most options together. If any of them have non-unique names, even if they + * are in a different option, they *will* overwrite each other. + * - When you add a new array key in an option: make sure you add proper defaults and add the key + * to the validation routine in the proper place or add a new validation case. + * You don't need to do any upgrading as any option returned will always be merged with the + * defaults, so new options will automatically be available. + * If the default value is a string which need translating, add this to the concrete class + * translate_defaults() method. + * - When you remove an array key from an option: if it's important that the option is really removed, + * add the WPSEO_Option::clean_up( $option_name ) method to the upgrade run. + * This will re-save the option and automatically remove the array key no longer in existance. + * - When you rename a sub-option: add it to the clean_option() routine and run that in the upgrade run. + * - When you change the default for an option sub-key, make sure you verify that the validation routine will + * still work the way it should. + * Example: changing a default from '' (empty string) to 'text' with a validation routine with tests + * for an empty string will prevent a user from saving an empty string as the real value. So the + * test for '' with the validation routine would have to be removed in that case. + * - If an option needs specific actions different from defined in this abstract class, you can just overrule + * a method by defining it in the concrete class. + * + * @todo - [JRF => testers] double check that validation will not cause errors when called + * from upgrade routine (some of the WP functions may not yet be available) + */ +abstract class WPSEO_Option { + + /** + * @var string Option name - MUST be set in concrete class and set to public. + */ + protected $option_name; + + /** + * @var string Option group name for use in settings forms + * - will be set automagically if not set in concrete class + * (i.e. if it confirm to the normal pattern 'yoast' . $option_name . 'options', + * only set in conrete class if it doesn't) + */ + public $group_name; + + /** + * @var bool Whether to include the option in the return for WPSEO_Options::get_all(). + * Also determines which options are copied over for ms_(re)set_blog(). + */ + public $include_in_all = true; + + /** + * @var bool Whether this option is only for when the install is multisite. + */ + public $multisite_only = false; + + /** + * @var array Array of defaults for the option - MUST be set in concrete class. + * Shouldn't be requested directly, use $this->get_defaults(); + */ + protected $defaults; + + /** + * @var array Array of variable option name patterns for the option - if any - + * Set this when the option contains array keys which vary based on post_type + * or taxonomy + */ + protected $variable_array_key_patterns; + + /** + * @var array Array of sub-options which should not be overloaded with multi-site defaults + */ + public $ms_exclude = array(); + + /** + * @var object Instance of this class + */ + protected static $instance; + + + /* *********** INSTANTIATION METHODS *********** */ + + /** + * Add all the actions and filters for the option + * + * @return \WPSEO_Option + */ + protected function __construct() { + + /* Add filters which get applied to the get_options() results */ + $this->add_default_filters(); // Return defaults if option not set. + $this->add_option_filters(); // Merge with defaults if option *is* set. + + + if ( $this->multisite_only !== true ) { + /** + * The option validation routines remove the default filters to prevent failing + * to insert an option if it's new. Let's add them back afterwards. + */ + add_action( 'add_option', array( $this, 'add_default_filters' ) ); // Adding back after INSERT. + + if ( version_compare( $GLOBALS['wp_version'], '3.7', '!=' ) ) { // Adding back after non-WP 3.7 UPDATE. + add_action( 'update_option', array( $this, 'add_default_filters' ) ); + } + else { // Adding back after WP 3.7 UPDATE. + add_filter( 'pre_update_option_' . $this->option_name, array( $this, 'wp37_add_default_filters' ) ); + } + } + else if ( is_multisite() ) { + /* + The option validation routines remove the default filters to prevent failing + to insert an option if it's new. Let's add them back afterwards. + + For site_options, this method is not foolproof as these actions are not fired + on an insert/update failure. Please use the WPSEO_Options::update_site_option() method + for updating site options to make sure the filters are in place. + */ + add_action( 'add_site_option_' . $this->option_name, array( $this, 'add_default_filters' ) ); + add_action( 'update_site_option_' . $this->option_name, array( $this, 'add_default_filters' ) ); + + } + + + /* + Make sure the option will always get validated, independently of register_setting() + (only available on back-end) + */ + add_filter( 'sanitize_option_' . $this->option_name, array( $this, 'validate' ) ); + + /* Register our option for the admin pages */ + add_action( 'admin_init', array( $this, 'register_setting' ) ); + + + /* Set option group name if not given */ + if ( ! isset( $this->group_name ) || $this->group_name === '' ) { + $this->group_name = 'yoast_' . $this->option_name . '_options'; + } + + /* Translate some defaults as early as possible - textdomain is loaded in init on priority 1 */ + if ( method_exists( $this, 'translate_defaults' ) ) { + add_action( 'init', array( $this, 'translate_defaults' ), 2 ); + } + + /** + * Enrich defaults once custom post types and taxonomies have been registered + * which is normally done on the init action. + * + * @todo - [JRF/testers] verify that none of the options which are only available after + * enrichment are used before the enriching + */ + if ( method_exists( $this, 'enrich_defaults' ) ) { + add_action( 'init', array( $this, 'enrich_defaults' ), 99 ); + } + } + +// @codingStandardsIgnoreStart + + /** + * All concrete classes *must* contain the get_instance method + * @internal Unfortunately I can't define it as an abstract as it also *has* to be static.... + */ + // abstract protected static function get_instance(); + + + /** + * Concrete classes *may* contain a translate_defaults method + */ + // abstract public function translate_defaults(); + + + /** + * Concrete classes *may* contain a enrich_defaults method to add additional defaults once + * all post_types and taxonomies have been registered + */ + // abstract public function enrich_defaults(); + +// @codingStandardsIgnoreEnd + + /* *********** METHODS INFLUENCING get_option() *********** */ + + /** + * Add filters to make sure that the option default is returned if the option is not set + * + * @return void + */ + public function add_default_filters() { + // Don't change, needs to check for false as could return prio 0 which would evaluate to false. + if ( has_filter( 'default_option_' . $this->option_name, array( $this, 'get_defaults' ) ) === false ) { + add_filter( 'default_option_' . $this->option_name, array( $this, 'get_defaults' ) ); + } + } + + + /** + * Abusing a filter to re-add our default filters + * WP 3.7 specific as update_option action hook was in the wrong place temporarily + * + * @see http://core.trac.wordpress.org/ticket/25705 + * + * @param mixed $new_value Pass through value in filter. + * + * @deprecated 3.7 version no longer supported. + * + * @todo Drop this and logic adding it. R. + * + * @return mixed unchanged value + */ + public function wp37_add_default_filters( $new_value ) { + $this->add_default_filters(); + + return $new_value; + } + + /** + * Validate webmaster tools & Pinterest verification strings + * + * @param string $key Key to check, by type of service. + * @param array $dirty Dirty data. + * @param array $old Old data. + * @param array $clean Clean data by reference. + */ + public function validate_verification_string( $key, $dirty, $old, &$clean ) { + if ( isset( $dirty[ $key ] ) && $dirty[ $key ] !== '' ) { + $meta = $dirty[ $key ]; + if ( strpos( $meta, 'content=' ) ) { + // Make sure we only have the real key, not a complete meta tag. + preg_match( '`content=([\'"])?([^\'"> ]+)(?:\1|[ />])`', $meta, $match ); + if ( isset( $match[2] ) ) { + $meta = $match[2]; + } + unset( $match ); + } + + $meta = sanitize_text_field( $meta ); + if ( $meta !== '' ) { + $regex = '`^[A-Fa-f0-9_-]+$`'; + $service = ''; + + switch ( $key ) { + case 'googleverify': + $regex = '`^[A-Za-z0-9_-]+$`'; + $service = 'Google Webmaster tools'; + break; + + case 'msverify': + $service = 'Bing Webmaster tools'; + break; + + case 'pinterestverify': + $service = 'Pinterest'; + break; + + case 'yandexverify': + $service = 'Yandex Webmaster tools'; + break; + + case 'alexaverify': + $regex = '`^[A-Za-z0-9_-]{20,}$`'; + $service = 'Alexa ID'; + } + + if ( preg_match( $regex, $meta ) ) { + $clean[ $key ] = $meta; + } + else { + if ( isset( $old[ $key ] ) && preg_match( $regex, $old[ $key ] ) ) { + $clean[ $key ] = $old[ $key ]; + } + if ( function_exists( 'add_settings_error' ) ) { + add_settings_error( + $this->group_name, // Slug title of the setting. + '_' . $key, // Suffix-id for the error message box. + sprintf( __( '%s does not seem to be a valid %s verification string. Please correct.', 'wordpress-seo' ), '' . esc_html( $meta ) . '', $service ), // The error message. + 'error' // Error type, either 'error' or 'updated'. + ); + } + } + } + } + } + + /** + * @param string $key Key to check, by type of service. + * @param array $dirty Dirty data. + * @param array $old Old data. + * @param array $clean Clean data by reference. + */ + public function validate_url( $key, $dirty, $old, &$clean ) { + if ( isset( $dirty[ $key ] ) && $dirty[ $key ] !== '' ) { + $url = WPSEO_Utils::sanitize_url( $dirty[ $key ] ); + if ( $url !== '' ) { + $clean[ $key ] = $url; + } + else { + if ( isset( $old[ $key ] ) && $old[ $key ] !== '' ) { + $url = WPSEO_Utils::sanitize_url( $old[ $key ] ); + if ( $url !== '' ) { + $clean[ $key ] = $url; + } + } + if ( function_exists( 'add_settings_error' ) ) { + $url = WPSEO_Utils::sanitize_url( $dirty[ $key ] ); + add_settings_error( + $this->group_name, // Slug title of the setting. + '_' . $key, // Suffix-id for the error message box. + sprintf( __( '%s does not seem to be a valid url. Please correct.', 'wordpress-seo' ), '' . esc_html( $url ) . '' ), // The error message. + 'error' // Error type, either 'error' or 'updated'. + ); + } + } + } + } + + /** + * Remove the default filters. + * Called from the validate() method to prevent failure to add new options + * + * @return void + */ + public function remove_default_filters() { + remove_filter( 'default_option_' . $this->option_name, array( $this, 'get_defaults' ) ); + } + + + /** + * Get the enriched default value for an option + * + * Checks if the concrete class contains an enrich_defaults() method and if so, runs it. + * + * @internal the enrich_defaults method is used to set defaults for variable array keys in an option, + * such as array keys depending on post_types and/or taxonomies + * + * @return array + */ + public function get_defaults() { + if ( method_exists( $this, 'translate_defaults' ) ) { + $this->translate_defaults(); + } + + if ( method_exists( $this, 'enrich_defaults' ) ) { + $this->enrich_defaults(); + } + + return apply_filters( 'wpseo_defaults', $this->defaults, $this->option_name ); + } + + + /** + * Add filters to make sure that the option is merged with its defaults before being returned + * + * @return void + */ + public function add_option_filters() { + // Don't change, needs to check for false as could return prio 0 which would evaluate to false. + if ( has_filter( 'option_' . $this->option_name, array( $this, 'get_option' ) ) === false ) { + add_filter( 'option_' . $this->option_name, array( $this, 'get_option' ) ); + } + } + + + /** + * Remove the option filters. + * Called from the clean_up methods to make sure we retrieve the original old option + * + * @return void + */ + public function remove_option_filters() { + remove_filter( 'option_' . $this->option_name, array( $this, 'get_option' ) ); + } + + + /** + * Merge an option with its default values + * + * This method should *not* be called directly!!! It is only meant to filter the get_option() results + * + * @param mixed $options Option value. + * + * @return mixed Option merged with the defaults for that option + */ + public function get_option( $options = null ) { + $filtered = $this->array_filter_merge( $options ); + + /* + If the option contains variable option keys, make sure we don't remove those settings + - even if the defaults are not complete yet. + Unfortunately this means we also won't be removing the settings for post types or taxonomies + which are no longer in the WP install, but rather that than the other way around + */ + if ( isset( $this->variable_array_key_patterns ) ) { + $filtered = $this->retain_variable_keys( $options, $filtered ); + } + + return $filtered; + } + + + /* *********** METHODS influencing add_uption(), update_option() and saving from admin pages *********** */ + + /** + * Register (whitelist) the option for the configuration pages. + * The validation callback is already registered separately on the sanitize_option hook, + * so no need to double register. + * + * @return void + */ + public function register_setting() { + if ( WPSEO_Utils::grant_access() ) { + register_setting( $this->group_name, $this->option_name ); + } + } + + + /** + * Validate the option + * + * @param mixed $option_value The unvalidated new value for the option. + * + * @return array Validated new value for the option + */ + public function validate( $option_value ) { + $clean = $this->get_defaults(); + + /* Return the defaults if the new value is empty */ + if ( ! is_array( $option_value ) || $option_value === array() ) { + return $clean; + } + + + $option_value = array_map( array( 'WPSEO_Utils', 'trim_recursive' ), $option_value ); + if ( $this->multisite_only !== true ) { + $old = get_option( $this->option_name ); + } + else { + $old = get_site_option( $this->option_name ); + } + $clean = $this->validate_option( $option_value, $clean, $old ); + + /* Retain the values for variable array keys even when the post type/taxonomy is not yet registered */ + if ( isset( $this->variable_array_key_patterns ) ) { + $clean = $this->retain_variable_keys( $option_value, $clean ); + } + + $this->remove_default_filters(); + + return $clean; + } + + + /** + * All concrete classes must contain a validate_option() method which validates all + * values within the option + * + * @param array $dirty New value for the option. + * @param array $clean Clean value for the option, normally the defaults. + * @param array $old Old value of the option. + */ + abstract protected function validate_option( $dirty, $clean, $old ); + + + /* *********** METHODS for ADDING/UPDATING/UPGRADING the option *********** */ + + /** + * Retrieve the real old value (unmerged with defaults) + * + * @return array|bool the original option value (which can be false if the option doesn't exist) + */ + protected function get_original_option() { + $this->remove_default_filters(); + $this->remove_option_filters(); + + // Get (unvalidated) array, NOT merged with defaults. + if ( $this->multisite_only !== true ) { + $option_value = get_option( $this->option_name ); + } + else { + $option_value = get_site_option( $this->option_name ); + } + + $this->add_option_filters(); + $this->add_default_filters(); + + return $option_value; + } + + /** + * Add the option if it doesn't exist for some strange reason + * + * @uses WPSEO_Option::get_original_option() + * + * @return void + */ + public function maybe_add_option() { + if ( $this->get_original_option() === false ) { + if ( $this->multisite_only !== true ) { + update_option( $this->option_name, $this->get_defaults() ); + } + else { + $this->update_site_option( $this->get_defaults() ); + } + } + } + + + /** + * Update a site_option + * + * @internal This special method is only needed for multisite options, but very needed indeed there. + * The order in which certain functions and hooks are run is different between get_option() and + * get_site_option() which means in practice that the removing of the default filters would be + * done too late and the re-adding of the default filters might not be done at all. + * Aka: use the WPSEO_Options::update_site_option() method (which calls this method) for + * safely adding/updating multisite options. + * + * @param mixed $value The new value for the option. + * + * @return bool whether the update was succesfull + */ + public function update_site_option( $value ) { + if ( $this->multisite_only === true && is_multisite() ) { + $this->remove_default_filters(); + $result = update_site_option( $this->option_name, $value ); + $this->add_default_filters(); + + return $result; + } + else { + return false; + } + } + + + /** + * Retrieve the real old value (unmerged with defaults), clean and re-save the option + * + * @uses WPSEO_Option::get_original_option() + * @uses WPSEO_Option::import() + * + * @param string $current_version (optional) Version from which to upgrade, if not set, version specific upgrades will be disregarded. + * + * @return void + */ + public function clean( $current_version = null ) { + $option_value = $this->get_original_option(); + $this->import( $option_value, $current_version ); + } + + + /** + * Clean and re-save the option + * + * @uses clean_option() method from concrete class if it exists + * + * @todo [JRF/whomever] Figure out a way to show settings error during/after the upgrade - maybe + * something along the lines of: + * -> add them to a property in this class + * -> if that property isset at the end of the routine and add_settings_error function does not exist, + * save as transient (or update the transient if one already exists) + * -> next time an admin is in the WP back-end, show the errors and delete the transient or only delete it + * once the admin has dismissed the message (add ajax function) + * Important: all validation routines which add_settings_errors would need to be changed for this to work + * + * @param array $option_value Option value to be imported. + * @param string $current_version (optional) Version from which to upgrade, if not set, version specific upgrades will be disregarded. + * @param array $all_old_option_values (optional) Only used when importing old options to have access to the real old values, in contrast to the saved ones. + * + * @return void + */ + public function import( $option_value, $current_version = null, $all_old_option_values = null ) { + if ( $option_value === false ) { + $option_value = $this->get_defaults(); + } + elseif ( is_array( $option_value ) && method_exists( $this, 'clean_option' ) ) { + $option_value = $this->clean_option( $option_value, $current_version, $all_old_option_values ); + } + + /* + Save the cleaned value - validation will take care of cleaning out array keys which + should no longer be there + */ + if ( $this->multisite_only !== true ) { + update_option( $this->option_name, $option_value ); + } + else { + $this->update_site_option( $this->option_name, $option_value ); + } + } + + + /** + * Concrete classes *may* contain a clean_option method which will clean out old/renamed + * values within the option + */ + // abstract public function clean_option( $option_value, $current_version = null, $all_old_option_values = null ); + /* *********** HELPER METHODS for internal use *********** */ + + /** + * Helper method - Combines a fixed array of default values with an options array + * while filtering out any keys which are not in the defaults array. + * + * @todo [JRF] - shouldn't this be a straight array merge ? at the end of the day, the validation + * removes any invalid keys on save + * + * @param array $options (Optional) Current options. If not set, the option defaults for the $option_key will be returned. + * + * @return array Combined and filtered options array. + */ + protected function array_filter_merge( $options = null ) { + + $defaults = $this->get_defaults(); + + if ( ! isset( $options ) || $options === false || $options === array() ) { + return $defaults; + } + + $options = (array) $options; + + /* + $filtered = array(); + + if ( $defaults !== array() ) { + foreach ( $defaults as $key => $default_value ) { + // @todo should this walk through array subkeys ? + $filtered[ $key ] = ( isset( $options[ $key ] ) ? $options[ $key ] : $default_value ); + } + } + */ + $filtered = array_merge( $defaults, $options ); + + return $filtered; + } + + + /** + * Make sure that any set option values relating to post_types and/or taxonomies are retained, + * even when that post_type or taxonomy may not yet have been registered. + * + * @internal The wpseo_titles concrete class overrules this method. Make sure that any changes + * applied here, also get ported to that version. + * + * @param array $dirty Original option as retrieved from the database. + * @param array $clean Filtered option where any options which shouldn't be in our option + * have already been removed and any options which weren't set + * have been set to their defaults. + * + * @return array + */ + protected function retain_variable_keys( $dirty, $clean ) { + if ( ( is_array( $this->variable_array_key_patterns ) && $this->variable_array_key_patterns !== array() ) && ( is_array( $dirty ) && $dirty !== array() ) ) { + foreach ( $dirty as $key => $value ) { + + // Do nothing if already in filtered options. + if ( isset( $clean[ $key ] ) ) { + continue; + } + + foreach ( $this->variable_array_key_patterns as $pattern ) { + + if ( strpos( $key, $pattern ) === 0 ) { + $clean[ $key ] = $value; + break; + } + } + } + } + + return $clean; + } + + + /** + * Check whether a given array key conforms to one of the variable array key patterns for this option + * + * @usedby validate_option() methods for options with variable array keys + * + * @param string $key Array key to check. + * + * @return string Pattern if it conforms, original array key if it doesn't or if the option + * does not have variable array keys + */ + protected function get_switch_key( $key ) { + if ( ! isset( $this->variable_array_key_patterns ) || ( ! is_array( $this->variable_array_key_patterns ) || $this->variable_array_key_patterns === array() ) ) { + return $key; + } + + foreach ( $this->variable_array_key_patterns as $pattern ) { + if ( strpos( $key, $pattern ) === 0 ) { + return $pattern; + } + } + + return $key; + } + + + /* *********** DEPRECATED METHODS *********** */ + + /** + * Emulate the WP native sanitize_text_field function in a %%variable%% safe way + * + * @see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php for the original + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::sanitize_text_field() + * @see WPSEO_Utils::sanitize_text_field() + * + * @param string $value String value to sanitize. + * + * @return string + */ + public static function sanitize_text_field( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::sanitize_text_field()' ); + + return WPSEO_Utils::sanitize_text_field( $value ); + } + + + /** + * Sanitize a url for saving to the database + * Not to be confused with the old native WP function + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::sanitize_url() + * @see WPSEO_Utils::sanitize_url() + * + * @param string $value URL string to sanitize. + * @param array $allowed_protocols Set of allowed protocols. + * + * @return string + */ + public static function sanitize_url( $value, $allowed_protocols = array( 'http', 'https' ) ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::sanitize_url()' ); + + return WPSEO_Utils::sanitize_url( $value, $allowed_protocols ); + } + + /** + * Validate a value as boolean + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::validate_bool() + * @see WPSEO_Utils::validate_bool() + * + * @static + * + * @param mixed $value Value to validate. + * + * @return bool + */ + public static function validate_bool( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::validate_bool()' ); + + return WPSEO_Utils::validate_bool( $value ); + } + + /** + * Cast a value to bool + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::emulate_filter_bool() + * @see WPSEO_Utils::emulate_filter_bool() + * + * @static + * + * @param mixed $value Value to cast. + * + * @return bool + */ + public static function emulate_filter_bool( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::emulate_filter_bool()' ); + + return WPSEO_Utils::emulate_filter_bool( $value ); + } + + + /** + * Validate a value as integer + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::validate_int() + * @see WPSEO_Utils::validate_int() + * + * @param mixed $value Value to validate. + * + * @return mixed int or false in case of failure to convert to int + */ + public static function validate_int( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::validate_int()' ); + + return WPSEO_Utils::validate_int( $value ); + } + + /** + * Cast a value to integer + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::emulate_filter_int() + * @see WPSEO_Utils::emulate_filter_int() + * + * @static + * + * @param mixed $value Value to cast. + * + * @return int|bool + */ + public static function emulate_filter_int( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::emulate_filter_int()' ); + + return WPSEO_Utils::emulate_filter_int( $value ); + } + + + /** + * Recursively trim whitespace round a string value or of string values within an array + * Only trims strings to avoid typecasting a variable (to string) + * + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::trim_recursive() + * @see WPSEO_Utils::trim_recursive() + * + * @static + * + * @param mixed $value Value to trim or array of values to trim. + * + * @return mixed Trimmed value or array of trimmed values + */ + public static function trim_recursive( $value ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::trim_recursive()' ); + + return WPSEO_Utils::trim_recursive( $value ); + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-taxonomy-meta.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-taxonomy-meta.php index 8443d1d1..cf2ea1fc 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-taxonomy-meta.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/options/class-wpseo-taxonomy-meta.php @@ -1,3 +1,593 @@ +<<<<<<< .mine +get_defaults(); + * @internal Important: in contrast to most defaults, the below array format is + * very bare. The real option is in the format [taxonomy_name][term_id][...] + * where [...] is any of the $defaults_per_term options shown below. + * This is of course taken into account in the below methods. + */ + protected $defaults = array(); + + + /** + * @var string Option name - same as $option_name property, but now also available to static methods + * @static + */ + public static $name; + + /** + * @var array Array of defaults for individual taxonomy meta entries + * @static + */ + public static $defaults_per_term = array( + 'wpseo_title' => '', + 'wpseo_desc' => '', + 'wpseo_metakey' => '', + 'wpseo_canonical' => '', + 'wpseo_bctitle' => '', + 'wpseo_noindex' => 'default', + 'wpseo_sitemap_include' => '-', + 'wpseo_focuskw' => '', + + // Social fields. + 'wpseo_opengraph-title' => '', + 'wpseo_opengraph-description' => '', + 'wpseo_opengraph-image' => '', + 'wpseo_twitter-title' => '', + 'wpseo_twitter-description' => '', + 'wpseo_twitter-image' => '', + 'wpseo_google-plus-title' => '', + 'wpseo_google-plus-description' => '', + 'wpseo_google-plus-image' => '', + + ); + + /** + * @var array Available index options + * Used for form generation and input validation + * + * @static + * + * @internal Labels (translation) added on admin_init via WPSEO_Taxonomy::translate_meta_options() + */ + public static $no_index_options = array( + 'default' => '', + 'index' => '', + 'noindex' => '', + ); + + /** + * @var array Available sitemap include options + * Used for form generation and input validation + * + * @static + * + * @internal Labels (translation) added on admin_init via WPSEO_Taxonomy::translate_meta_options() + */ + public static $sitemap_include_options = array( + '-' => '', + 'always' => '', + 'never' => '', + ); + + + /** + * Add the actions and filters for the option + * + * @todo [JRF => testers] Check if the extra actions below would run into problems if an option + * is updated early on and if so, change the call to schedule these for a later action on add/update + * instead of running them straight away + * + * @return \WPSEO_Taxonomy_Meta + */ + protected function __construct() { + parent::__construct(); + + self::$name = $this->option_name; + + /* On succesfull update/add of the option, flush the W3TC cache */ + add_action( 'add_option_' . $this->option_name, array( 'WPSEO_Utils', 'flush_w3tc_cache' ) ); + add_action( 'update_option_' . $this->option_name, array( 'WPSEO_Utils', 'flush_w3tc_cache' ) ); + } + + + /** + * Get the singleton instance of this class + * + * @return object + */ + public static function get_instance() { + if ( ! ( self::$instance instanceof self ) ) { + self::$instance = new self(); + self::$name = self::$instance->option_name; + } + + return self::$instance; + } + + + /** + * Add extra default options received from a filter + */ + public function enrich_defaults() { + $extra_defaults_per_term = apply_filters( 'wpseo_add_extra_taxmeta_term_defaults', array() ); + if ( is_array( $extra_defaults_per_term ) ) { + self::$defaults_per_term = array_merge( $extra_defaults_per_term, self::$defaults_per_term ); + } + } + + + /** + * Helper method - Combines a fixed array of default values with an options array + * while filtering out any keys which are not in the defaults array. + * + * @static + * + * @param string $option_key Option name of the option we're doing the merge for. + * @param array $options (Optional) Current options. If not set, the option defaults for the $option_key will be returned. + * + * @return array Combined and filtered options array. + */ + + /* + Public function array_filter_merge( $option_key, $options = null ) { + + $defaults = $this->get_defaults( $option_key ); + + if ( ! isset( $options ) || $options === false ) { + return $defaults; + } + + / * + @internal Adding the defaults to all taxonomy terms each time the option is retrieved + will be quite inefficient if there are a lot of taxonomy terms + As long as taxonomy_meta is only retrieved via methods in this class, we shouldn't need this + + $options = (array) $options; + $filtered = array(); + + if ( $options !== array() ) { + foreach ( $options as $taxonomy => $terms ) { + if ( is_array( $terms ) && $terms !== array() ) { + foreach ( $terms as $id => $term_meta ) { + foreach ( self::$defaults_per_term as $name => $default ) { + if ( isset( $options[ $taxonomy ][ $id ][ $name ] ) ) { + $filtered[ $taxonomy ][ $id ][ $name ] = $options[ $taxonomy ][ $id ][ $name ]; + } + else { + $filtered[ $name ] = $default; + } + } + } + } + } + unset( $taxonomy, $terms, $id, $term_meta, $name, $default ); + } + // end of may be remove. + + return $filtered; + * / + + return (array) $options; + } + */ + + + /** + * Validate the option + * + * @param array $dirty New value for the option. + * @param array $clean Clean value for the option, normally the defaults. + * @param array $old Old value of the option. + * + * @return array Validated clean value for the option to be saved to the database + */ + protected function validate_option( $dirty, $clean, $old ) { + /* + Prevent complete validation (which can be expensive when there are lots of terms) + if only one item has changed and has already been validated + */ + if ( isset( $dirty['wpseo_already_validated'] ) && $dirty['wpseo_already_validated'] === true ) { + unset( $dirty['wpseo_already_validated'] ); + + return $dirty; + } + + + foreach ( $dirty as $taxonomy => $terms ) { + /* Don't validate taxonomy - may not be registered yet and we don't want to remove valid ones */ + if ( is_array( $terms ) && $terms !== array() ) { + foreach ( $terms as $term_id => $meta_data ) { + /* Only validate term if the taxonomy exists */ + if ( taxonomy_exists( $taxonomy ) && get_term_by( 'id', $term_id, $taxonomy ) === false ) { + /* Is this term id a special case ? */ + if ( has_filter( 'wpseo_tax_meta_special_term_id_validation_' . $term_id ) !== false ) { + $clean[ $taxonomy ][ $term_id ] = apply_filters( 'wpseo_tax_meta_special_term_id_validation_' . $term_id, $meta_data, $taxonomy, $term_id ); + } + continue; + } + + if ( is_array( $meta_data ) && $meta_data !== array() ) { + /* Validate meta data */ + $old_meta = self::get_term_meta( $term_id, $taxonomy ); + $meta_data = self::validate_term_meta_data( $meta_data, $old_meta ); + if ( $meta_data !== array() ) { + $clean[ $taxonomy ][ $term_id ] = $meta_data; + } + } + + // Deal with special cases (for when taxonomy doesn't exist yet). + if ( ! isset( $clean[ $taxonomy ][ $term_id ] ) && has_filter( 'wpseo_tax_meta_special_term_id_validation_' . $term_id ) !== false ) { + $clean[ $taxonomy ][ $term_id ] = apply_filters( 'wpseo_tax_meta_special_term_id_validation_' . $term_id, $meta_data, $taxonomy, $term_id ); + } + } + } + } + + return $clean; + } + + + /** + * Validate the meta data for one individual term and removes default values (no need to save those) + * + * @static + * + * @param array $meta_data New values. + * @param array $old_meta The original values. + * + * @return array Validated and filtered value + */ + public static function validate_term_meta_data( $meta_data, $old_meta ) { + + $clean = self::$defaults_per_term; + $meta_data = array_map( array( 'WPSEO_Utils', 'trim_recursive' ), $meta_data ); + + if ( ! is_array( $meta_data ) || $meta_data === array() ) { + return $clean; + } + + foreach ( $clean as $key => $value ) { + switch ( $key ) { + + case 'wpseo_noindex': + if ( isset( $meta_data[ $key ] ) ) { + if ( isset( self::$no_index_options[ $meta_data[ $key ] ] ) ) { + $clean[ $key ] = $meta_data[ $key ]; + } + } + elseif ( isset( $old_meta[ $key ] ) ) { + // Retain old value if field currently not in use. + $clean[ $key ] = $old_meta[ $key ]; + } + break; + + case 'wpseo_sitemap_include': + if ( isset( $meta_data[ $key ], self::$sitemap_include_options[ $meta_data[ $key ] ] ) ) { + $clean[ $key ] = $meta_data[ $key ]; + } + break; + + case 'wpseo_canonical': + if ( isset( $meta_data[ $key ] ) && $meta_data[ $key ] !== '' ) { + $url = WPSEO_Utils::sanitize_url( $meta_data[ $key ] ); + if ( $url !== '' ) { + $clean[ $key ] = $url; + } + unset( $url ); + } + break; + + case 'wpseo_metakey': + case 'wpseo_bctitle': + if ( isset( $meta_data[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::sanitize_text_field( stripslashes( $meta_data[ $key ] ) ); + } + elseif ( isset( $old_meta[ $key ] ) ) { + // Retain old value if field currently not in use. + $clean[ $key ] = $old_meta[ $key ]; + } + break; + case 'wpseo_focuskw': + case 'wpseo_title': + case 'wpseo_desc': + default: + if ( isset( $meta_data[ $key ] ) && is_string( $meta_data[ $key ] ) ) { + $clean[ $key ] = WPSEO_Utils::sanitize_text_field( stripslashes( $meta_data[ $key ] ) ); + } + break; + } + + $clean[ $key ] = apply_filters( 'wpseo_sanitize_tax_meta_' . $key, $clean[ $key ], ( isset( $meta_data[ $key ] ) ? $meta_data[ $key ] : null ), ( isset( $old_meta[ $key ] ) ? $old_meta[ $key ] : null ) ); + } + + // Only save the non-default values. + return array_diff_assoc( $clean, self::$defaults_per_term ); + } + + + /** + * Clean a given option value + * - Convert old option values to new + * - Fixes strings which were escaped (should have been sanitized - escaping is for output) + * + * @param array $option_value Old (not merged with defaults or filtered) option value to + * clean according to the rules for this option. + * @param string $current_version (optional) Version from which to upgrade, if not set, + * version specific upgrades will be disregarded. + * @param array $all_old_option_values (optional) Only used when importing old options to have + * access to the real old values, in contrast to the saved ones. + * + * @return array Cleaned option + */ + protected function clean_option( $option_value, $current_version = null, $all_old_option_values = null ) { + + /* Clean up old values and remove empty arrays */ + if ( is_array( $option_value ) && $option_value !== array() ) { + + foreach ( $option_value as $taxonomy => $terms ) { + + if ( is_array( $terms ) && $terms !== array() ) { + + foreach ( $terms as $term_id => $meta_data ) { + if ( ! is_array( $meta_data ) || $meta_data === array() ) { + // Remove empty term arrays. + unset( $option_value[ $taxonomy ][ $term_id ] ); + } + else { + foreach ( $meta_data as $key => $value ) { + + switch ( $key ) { + case 'noindex': + if ( $value === 'on' ) { + // Convert 'on' to 'noindex'. + $option_value[ $taxonomy ][ $term_id ][ $key ] = 'noindex'; + } + break; + + case 'canonical': + case 'wpseo_metakey': + case 'wpseo_bctitle': + case 'wpseo_title': + case 'wpseo_desc': + // @todo [JRF => whomever] needs checking, I don't have example data [JRF]. + if ( $value !== '' ) { + // Fix incorrectly saved (encoded) canonical urls and texts. + $option_value[ $taxonomy ][ $term_id ][ $key ] = wp_specialchars_decode( stripslashes( $value ), ENT_QUOTES ); + } + break; + + default: + // @todo [JRF => whomever] needs checking, I don't have example data [JRF]. + if ( $value !== '' ) { + // Fix incorrectly saved (escaped) text strings. + $option_value[ $taxonomy ][ $term_id ][ $key ] = wp_specialchars_decode( $value, ENT_QUOTES ); + } + break; + } + } + } + } + } + else { + // Remove empty taxonomy arrays. + unset( $option_value[ $taxonomy ] ); + } + } + } + + return $option_value; + } + + + /** + * Retrieve a taxonomy term's meta value(s). + * + * @static + * + * @param mixed $term Term to get the meta value for + * either (string) term name, (int) term id or (object) term. + * @param string $taxonomy Name of the taxonomy to which the term is attached. + * @param string $meta (optional) Meta value to get (without prefix). + * + * @return mixed|bool Value for the $meta if one is given, might be the default. + * If no meta is given, an array of all the meta data for the term. + * False if the term does not exist or the $meta provided is invalid. + */ + public static function get_term_meta( $term, $taxonomy, $meta = null ) { + /* Figure out the term id */ + if ( is_int( $term ) ) { + $term = get_term_by( 'id', $term, $taxonomy ); + } + elseif ( is_string( $term ) ) { + $term = get_term_by( 'slug', $term, $taxonomy ); + } + + if ( is_object( $term ) && isset( $term->term_id ) ) { + $term_id = $term->term_id; + } + else { + return false; + } + + $tax_meta = self::get_term_tax_meta( $term_id, $taxonomy ); + + /* + Either return the complete array or a single value from it or false if the value does not exist + (shouldn't happen after merge with defaults, indicates typo in request) + */ + if ( ! isset( $meta ) ) { + return $tax_meta; + } + + + if ( isset( $tax_meta[ 'wpseo_' . $meta ] ) ) { + return $tax_meta[ 'wpseo_' . $meta ]; + } + + return false; + } + + /** + * Get the current queried object and return the meta value + * + * @param string $meta The meta field that is needed. + * + * @return bool|mixed + */ + public static function get_meta_without_term( $meta ) { + $term = $GLOBALS['wp_query']->get_queried_object(); + + return self::get_term_meta( $term, $term->taxonomy, $meta ); + + } + + /** + * Saving the values for the given term_id + * + * @param int $term_id ID of the term to save data for. + * @param string $taxonomy The taxonomy the term belongs to. + * @param array $meta_values The values that will be saved. + */ + public static function set_values( $term_id, $taxonomy, array $meta_values ) { + /* Validate the post values */ + $old = self::get_term_meta( $term_id, $taxonomy ); + $clean = self::validate_term_meta_data( $meta_values, $old ); + + self::save_clean_values( $term_id, $taxonomy, $clean ); + } + + /** + * Setting a single value to the term meta + * + * @param int $term_id ID of the term to save data for. + * @param string $taxonomy The taxonomy the term belongs to. + * @param string $meta_key The target meta key to store the value in. + * @param string $meta_value The value of the target meta key. + */ + public static function set_value( $term_id, $taxonomy, $meta_key, $meta_value ) { + + if ( substr( strtolower( $meta_key ), 0, 6 ) !== 'wpseo_' ) { + $meta_key = 'wpseo_' . $meta_key; + } + + self::set_values( $term_id, $taxonomy, array( $meta_key => $meta_value ) ); + } + + /** + * Find the keyword usages in the metas for the taxonomies/terms + * + * @param string $keyword The keyword to look for. + * @param string $current_term_id The current term id. + * @param string $current_taxonomy The current taxonomy name. + * + * @return array + */ + public static function get_keyword_usage( $keyword, $current_term_id, $current_taxonomy ) { + $tax_meta = self::get_tax_meta(); + + + $found = array(); + // Todo check for terms of all taxonomies, not only the current taxonomy. + foreach ( $tax_meta as $taxonomy_name => $terms ) { + foreach ( $terms as $term_id => $meta_values ) { + $is_current = ( $current_taxonomy === $taxonomy_name && (string) $current_term_id === (string) $term_id ); + if ( ! $is_current && ! empty( $meta_values['wpseo_focuskw'] ) && $meta_values['wpseo_focuskw'] === $keyword ) { + $found[] = $term_id; + } + } + } + + return array( $keyword => $found ); + } + + /** + * Saving the values for the given term_id + * + * @param int $term_id ID of the term to save data for. + * @param string $taxonomy The taxonomy the term belongs to. + * @param array $clean Array with clean values. + */ + private static function save_clean_values( $term_id, $taxonomy, array $clean ) { + $tax_meta = self::get_tax_meta(); + + /* Add/remove the result to/from the original option value */ + if ( $clean !== array() ) { + $tax_meta[ $taxonomy ][ $term_id ] = $clean; + } + else { + unset( $tax_meta[ $taxonomy ][ $term_id ] ); + if ( isset( $tax_meta[ $taxonomy ] ) && $tax_meta[ $taxonomy ] === array() ) { + unset( $tax_meta[ $taxonomy ] ); + } + } + + // Prevent complete array validation. + $tax_meta['wpseo_already_validated'] = true; + + self::save_tax_meta( $tax_meta ); + } + + /** + * Getting the meta from the options + * + * @return void|array + */ + private static function get_tax_meta() { + return get_option( self::$name ); + } + + /** + * Saving the tax meta values to the database + * + * @param array $tax_meta Array with the meta values for taxonomy. + */ + private static function save_tax_meta( $tax_meta ) { + update_option( self::$name, $tax_meta ); + } + + /** + * Getting the taxonomy meta for the given term_id and taxonomy + * + * @param int $term_id The id of the term. + * @param string $taxonomy Name of the taxonomy to which the term is attached. + * + * @return array + */ + private static function get_term_tax_meta( $term_id, $taxonomy ) { + $tax_meta = self::get_tax_meta(); + + /* If we have data for the term, merge with defaults for complete array, otherwise set defaults */ + if ( isset( $tax_meta[ $taxonomy ][ $term_id ] ) ) { + return array_merge( self::$defaults_per_term, $tax_meta[ $taxonomy ][ $term_id ] ); + } + + return self::$defaults_per_term; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php index 31580542..237ea6d2 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php @@ -181,7 +181,8 @@ function wpseo_xml_sitemaps_base_url( $page ) { */ $base = apply_filters( 'wpseo_sitemaps_base_url', $base ); - return home_url( $base . $page ); + // Get the scheme from the configured home url instead of letting WordPress determine the scheme based on the requested URI. + return home_url( $base . $page, parse_url( get_option( 'home' ), PHP_URL_SCHEME ) ); } /** @@ -212,11 +213,32 @@ add_action( 'init', 'wpseo_xml_sitemaps_init', 1 ); /** * Notify search engines of the updated sitemap. +<<<<<<< .mine + * + * @param string|null $sitemapurl Optional URL to make the ping for. +||||||| .r11156 +======= * * @param string|null $sitemapurl +>>>>>>> .r12027 */ function wpseo_ping_search_engines( $sitemapurl = null ) { +<<<<<<< .mine + /** + * Filter: 'wpseo_allow_xml_sitemap_ping' - Check if pinging is not allowed (allowed by default) + * + * @api boolean $allow_ping The boolean that is set to true by default. + */ + if ( apply_filters( 'wpseo_allow_xml_sitemap_ping', true ) === false ) { + return; + } + + // Don't ping if blog is not public. +||||||| .r11156 + // Don't ping if blog is not public +======= // Don't ping if blog is not public. +>>>>>>> .r12027 if ( '0' == get_option( 'blog_public' ) ) { return; } @@ -237,9 +259,19 @@ add_action( 'wpseo_ping_search_engines', 'wpseo_ping_search_engines' ); * It adds new keys to a wpml-config.xml file for a custom post type title, metadesc, title-ptarchive and metadesc-ptarchive fields translation. * Documentation: http://wpml.org/documentation/support/language-configuration-files/ * +<<<<<<< .mine + * @global $sitepress + * + * @param array $config WPML configuration data to filter. + * +||||||| .r11156 + * @global $sitepress + * @param array $config +======= * @global $sitepress * * @param array $config +>>>>>>> .r12027 * * @return array */ @@ -297,7 +329,13 @@ add_shortcode( 'wpseo_breadcrumb', 'wpseo_shortcode_yoast_breadcrumb' ); /** * This invalidates our XML Sitemaps cache. * +<<<<<<< .mine + * @param string $type Type of sitemap to invalidate. +||||||| .r11156 + * @param $type +======= * @param string $type +>>>>>>> .r12027 */ function wpseo_invalidate_sitemap_cache( $type ) { // Always delete the main index sitemaps cache, as that's always invalidated by any other change. @@ -312,8 +350,16 @@ add_action( 'deleted_term_relationships', 'wpseo_invalidate_sitemap_cache' ); /** * Invalidate XML sitemap cache for taxonomy / term actions * +<<<<<<< .mine + * @param int $unused Unused term ID value. + * @param string $type Taxonomy to invalidate. +||||||| .r11156 + * @param unsigned $unused + * @param string $type +======= * @param unsigned $unused * @param string $type +>>>>>>> .r12027 */ function wpseo_invalidate_sitemap_cache_terms( $unused, $type ) { wpseo_invalidate_sitemap_cache( $type ); @@ -326,7 +372,7 @@ add_action( 'clean_object_term_cache', 'wpseo_invalidate_sitemap_cache_terms', 1 /** * Invalidate the XML sitemap cache for a post type when publishing or updating a post * - * @param int $post_id + * @param int $post_id Post ID to determine post type for invalidation. */ function wpseo_invalidate_sitemap_cache_on_save_post( $post_id ) { @@ -349,12 +395,22 @@ add_action( 'save_post', 'wpseo_invalidate_sitemap_cache_on_save_post' ); * @return bool */ if ( ! extension_loaded( 'ctype' ) || ! function_exists( 'ctype_digit' ) ) { +<<<<<<< .mine + + /** + * @param string $string String input to validate. + * + * @return bool + */ +||||||| .r11156 +======= /** * @param string $string * * @return bool */ +>>>>>>> .r12027 function ctype_digit( $string ) { $return = false; if ( ( is_string( $string ) && $string !== '' ) && preg_match( '`^\d+$`', $string ) === 1 ) { @@ -365,6 +421,28 @@ if ( ! extension_loaded( 'ctype' ) || ! function_exists( 'ctype_digit' ) ) { } } +/** + * Makes sure the taxonomy meta is updated when a taxonomy term is split. + * + * @link https://make.wordpress.org/core/2015/02/16/taxonomy-term-splitting-in-4-2-a-developer-guide/ Article explaining the taxonomy term splitting in WP 4.2. + * + * @param string $old_term_id Old term id of the taxonomy term that was splitted. + * @param string $new_term_id New term id of the taxonomy term that was splitted. + * @param string $term_taxonomy_id Term taxonomy id for the taxonomy that was affected. + * @param string $taxonomy The taxonomy that the taxonomy term was splitted for. + */ +function wpseo_split_shared_term( $old_term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) { + $tax_meta = get_option( 'wpseo_taxonomy_meta', array() ); + + if ( ! empty( $tax_meta[ $taxonomy ][ $old_term_id ] ) ) { + $tax_meta[ $taxonomy ][ $new_term_id ] = $tax_meta[ $taxonomy ][ $old_term_id ]; + unset( $tax_meta[ $taxonomy ][ $old_term_id ] ); + update_option( 'wpseo_taxonomy_meta', $tax_meta ); + } +} + +add_action( 'split_shared_term', 'wpseo_split_shared_term', 10, 4 ); + /********************** DEPRECATED FUNCTIONS **********************/ @@ -523,6 +601,138 @@ function wpseo_sitemap_handler( $atts ) { } add_shortcode( 'wpseo_sitemap', 'wpseo_sitemap_handler' ); +<<<<<<< .mine + +/** + * Strip out the shortcodes with a filthy regex, because people don't properly register their shortcodes. + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::strip_shortcode() + * @see WPSEO_Utils::strip_shortcode() + * + * @param string $text Input string that might contain shortcodes. + * + * @return string $text string without shortcodes + */ +function wpseo_strip_shortcode( $text ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::strip_shortcode()' ); + + return WPSEO_Utils::strip_shortcode( $text ); +} + +/** + * Do simple reliable math calculations without the risk of wrong results + * + * @see http://floating-point-gui.de/ + * @see the big red warning on http://php.net/language.types.float.php + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::calc() + * @see WPSEO_Utils::calc() + * + * In the rare case that the bcmath extension would not be loaded, it will return the normal calculation results + * + * @since 1.5.0 + * + * @param mixed $number1 Scalar (string/int/float/bool). + * @param string $action Calculation action to execute. + * @param mixed $number2 Scalar (string/int/float/bool). + * @param bool $round Whether or not to round the result. Defaults to false. + * @param int $decimals Decimals for rounding operation. Defaults to 0. + * @param int $precision Calculation precision. Defaults to 10. + * + * @return mixed Calculation Result or false if either or the numbers isn't scalar or + * an invalid operation was passed + */ +function wpseo_calc( $number1, $action, $number2, $round = false, $decimals = 0, $precision = 10 ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::calc()' ); + + return WPSEO_Utils::calc( $number1, $action, $number2, $round, $decimals, $precision ); +} + +/** + * Check if the web server is running on Apache + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::is_apache() + * @see WPSEO_Utils::is_apache() + * + * @return bool + */ +function wpseo_is_apache() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::is_apache()' ); + + return WPSEO_Utils::is_apache(); +} + +/** + * Check if the web service is running on Nginx + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::is_nginx() + * @see WPSEO_Utils::is_nginx() + * + * @return bool + */ +function wpseo_is_nginx() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::is_nginx()' ); + + return WPSEO_Utils::is_nginx(); +} + +/** + * List all the available user roles + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::get_roles() + * @see WPSEO_Utils::get_roles() + * + * @return array $roles + */ +function wpseo_get_roles() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::get_roles()' ); + + return WPSEO_Utils::get_roles(); +} + +/** + * Check whether a url is relative + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::is_url_relative() + * @see WPSEO_Utils::is_url_relative() + * + * @param string $url URL input to check. + * + * @return bool + */ +function wpseo_is_url_relative( $url ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::is_url_relative()' ); + + return WPSEO_Utils::is_url_relative( $url ); +} + +/** + * Standardize whitespace in a string + * + * @deprecated 1.6.1 + * @deprecated use WPSEO_Utils::standardize_whitespace() + * @see WPSEO_Utils::standardize_whitespace() + * + * @since 1.6.0 + * + * @param string $string String input to standardize. + * + * @return string + */ +function wpseo_standardize_whitespace( $string ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.6.1', 'WPSEO_Utils::standardize_whitespace()' ); + + return WPSEO_Utils::standardize_whitespace( $string ); +} + +||||||| .r11156 +======= /** * Strip out the shortcodes with a filthy regex, because people don't properly register their shortcodes. @@ -652,3 +862,4 @@ function wpseo_standardize_whitespace( $string ) { return WPSEO_Utils::standardize_whitespace( $string ); } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php index 5dcfc5b6..11ea3200 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php @@ -136,9 +136,9 @@ else { * * @since 1.4.14 * - * @param object $upgrader_object - * @param array $context_array - * @param mixed $themes + * @param WP_Upgrader $upgrader_object Upgrader object instance. + * @param array $context_array Context data array. + * @param mixed $themes Optional themes set. * * @return void */ @@ -187,8 +187,8 @@ function wpseo_upgrader_process_complete( $upgrader_object, $context_array, $the * * @since 1.4.14 * - * @param array $update_actions - * @param mixed $updated_theme + * @param array $update_actions Updated actions set. + * @param WP_Theme|string $updated_theme Theme object instance or stylesheet name. * * @return array $update_actions Unchanged array */ @@ -245,15 +245,21 @@ function wpseo_admin_bar_menu() { ) { $focuskw = WPSEO_Meta::get_value( 'focuskw', $post->ID ); $perc_score = WPSEO_Meta::get_value( 'linkdex', $post->ID ); +<<<<<<< .mine + $txtscore = WPSEO_Utils::translate_score( $perc_score ); + $title = WPSEO_Utils::translate_score( $perc_score, false ); +||||||| .r11156 + $calc_score = wpseo_calc( $perc_score, '/', 10, true ); + $txtscore = wpseo_translate_score( $calc_score ); + $title = wpseo_translate_score( $calc_score, false ); +======= $calc_score = WPSEO_Utils::calc( $perc_score, '/', 10, true ); $txtscore = WPSEO_Utils::translate_score( $calc_score ); $title = WPSEO_Utils::translate_score( $calc_score, false ); +>>>>>>> .r12027 $score = '
'; $seo_url = get_edit_post_link( $post->ID ); - if ( $txtscore !== 'na' ) { - $seo_url .= '#wpseo_linkdex'; - } } $wp_admin_bar->add_menu( array( @@ -425,17 +431,86 @@ function wpseo_admin_bar_menu() { 'href' => admin_url( 'admin.php?page=wpseo_xml' ), ) ); $wp_admin_bar->add_menu( array( +<<<<<<< .mine + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-wpseo-advanced', + 'title' => __( 'Advanced', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_advanced' ), + ) ); +||||||| .r11156 + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-internal-links', + 'title' => __( 'Internal Links', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_internal-links' ), + ) ); +======= 'parent' => 'wpseo-settings', 'id' => 'wpseo-wpseo_advanced', 'title' => __( 'Advanced', 'wordpress-seo' ), 'href' => admin_url( 'admin.php?page=wpseo_advanced' ), ) ); +>>>>>>> .r12027 + $wp_admin_bar->add_menu( array( +<<<<<<< .mine + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-tools', + 'title' => __( 'Tools', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_tools' ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-search-console', + 'title' => __( 'Search Console', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_search_console' ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-licenses', + 'title' => '' . __( 'Extensions', 'wordpress-seo' ) . '', + 'href' => admin_url( 'admin.php?page=wpseo_licenses' ), + ) ); +||||||| .r11156 + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-rss', + 'title' => __( 'RSS', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_rss' ), + ) ); + $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-import', + 'title' => esc_html__( 'Import & Export', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_import' ), + ) ); $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo_bulk-editor', + 'title' => __( 'Bulk Editor', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_bulk-editor' ), + ) ); + + // Check where to add the edit files page + if ( wpseo_allow_system_file_edit() === true ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-files', + 'title' => __( 'Edit Files', 'wordpress-seo' ), + 'href' => network_admin_url( 'admin.php?page=wpseo_files' ), + ) ); // will auto-use admin_url if not in multi-site + } + + $wp_admin_bar->add_menu( array( + 'parent' => 'wpseo-settings', + 'id' => 'wpseo-licenses', + 'title' => __( 'Extensions', 'wordpress-seo' ), + 'href' => admin_url( 'admin.php?page=wpseo_licenses' ), + ) ); +======= 'parent' => 'wpseo-settings', 'id' => 'wpseo-licenses', 'title' => __( 'Extensions', 'wordpress-seo' ), 'href' => admin_url( 'admin.php?page=wpseo_licenses' ), ) ); +>>>>>>> .r12027 } } @@ -446,7 +521,7 @@ add_action( 'admin_bar_menu', 'wpseo_admin_bar_menu', 95 ); */ function wpseo_admin_bar_css() { if ( is_admin_bar_showing() && is_singular() ) { - wp_enqueue_style( 'boxes', plugins_url( 'css/adminbar' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); + wp_enqueue_style( 'boxes', plugins_url( 'css/adminbar-' . '302' . WPSEO_CSSJS_SUFFIX . '.css', WPSEO_FILE ), array(), WPSEO_VERSION ); } } @@ -480,6 +555,20 @@ function allow_custom_field_edits( $allcaps, $cap, $args ) { add_filter( 'user_has_cap', 'allow_custom_field_edits', 0, 3 ); +<<<<<<< .mine +||||||| .r11156 +/** + * Display an import message when robots-meta is active + * + * @since 1.5.0 + */ +function wpseo_robots_meta_message() { + // check if robots meta is running + if ( ( ! isset( $_GET['page'] ) || 'wpseo_import' !== $_GET['page'] ) && is_plugin_active( 'robots-meta/robots-meta.php' ) ) { + add_action( 'admin_notices', 'wpseo_import_robots_meta_notice' ); + } +} +======= /** * Display an import message when robots-meta is active * @@ -491,14 +580,36 @@ function wpseo_robots_meta_message() { add_action( 'admin_notices', 'wpseo_import_robots_meta_notice' ); } } +>>>>>>> .r12027 -add_action( 'admin_init', 'wpseo_robots_meta_message' ); +/********************** DEPRECATED FUNCTIONS **********************/ /** - * Handle deactivation Robots Meta + * Set the default settings. * - * @since 1.5.0 + * @deprecated 1.5.0 + * @deprecated use WPSEO_Options::initialize() + * @see WPSEO_Options::initialize() */ +<<<<<<< .mine +function wpseo_defaults() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.0', 'WPSEO_Options::initialize()' ); + WPSEO_Options::initialize(); +||||||| .r11156 +function wpseo_disable_robots_meta() { + if ( isset( $_GET['deactivate_robots_meta'] ) && $_GET['deactivate_robots_meta'] === '1' && is_plugin_active( 'robots-meta/robots-meta.php' ) ) { + // Deactivate the plugin + deactivate_plugins( 'robots-meta/robots-meta.php' ); + + // show notice that robots meta has been deactivated + add_action( 'admin_notices', 'wpseo_deactivate_robots_meta_notice' ); + + // Clean up the referrer url for later use + if ( isset( $_SERVER['REQUEST_URI'] ) ) { + $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deactivate_robots_meta' ), sanitize_text_field( $_SERVER['REQUEST_URI'] ) ); + } + } +======= function wpseo_disable_robots_meta() { if ( isset( $_GET['deactivate_robots_meta'] ) && $_GET['deactivate_robots_meta'] === '1' && is_plugin_active( 'robots-meta/robots-meta.php' ) ) { // Deactivate the plugin. @@ -512,13 +623,31 @@ function wpseo_disable_robots_meta() { $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deactivate_robots_meta' ), sanitize_text_field( $_SERVER['REQUEST_URI'] ) ); } } +>>>>>>> .r12027 } -add_action( 'admin_init', 'wpseo_disable_robots_meta' ); - /** - * Handle deactivation & import of AIOSEO data + * Translates a decimal analysis score into a textual one. * +<<<<<<< .mine + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::translate_score() + * @see WPSEO_Utils::translate_score() +||||||| .r11156 + * @since 1.5.0 + */ +function wpseo_aioseo_message() { + // check if aioseo is running + if ( ( ! isset( $_GET['page'] ) || 'wpseo_import' != $_GET['page'] ) && is_plugin_active( 'all-in-one-seo-pack/all_in_one_seo_pack.php' ) ) { + add_action( 'admin_notices', 'wpseo_import_aioseo_setting_notice' ); + } +} + +add_action( 'admin_init', 'wpseo_aioseo_message' ); + +/** + * Handle deactivation AIOSEO +======= * @since 1.5.0 */ function wpseo_aioseo_message() { @@ -532,14 +661,40 @@ add_action( 'admin_init', 'wpseo_aioseo_message' ); /** * Handle deactivation AIOSEO +>>>>>>> .r12027 * - * @since 1.5.0 + * @param int $val The decimal score to translate. + * @param bool $css_value Whether to return the i18n translated score or the CSS class value. + * + * @return string */ +<<<<<<< .mine +function wpseo_translate_score( $val, $css_value = true ) { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::translate_score()' ); +||||||| .r11156 +function wpseo_disable_aioseo() { + if ( isset( $_GET['deactivate_aioseo'] ) && $_GET['deactivate_aioseo'] === '1' && is_plugin_active( 'all-in-one-seo-pack/all_in_one_seo_pack.php' ) ) { + // Deactivate AIO + deactivate_plugins( 'all-in-one-seo-pack/all_in_one_seo_pack.php' ); +======= function wpseo_disable_aioseo() { if ( isset( $_GET['deactivate_aioseo'] ) && $_GET['deactivate_aioseo'] === '1' && is_plugin_active( 'all-in-one-seo-pack/all_in_one_seo_pack.php' ) ) { // Deactivate AIO. deactivate_plugins( 'all-in-one-seo-pack/all_in_one_seo_pack.php' ); +>>>>>>> .r12027 + +<<<<<<< .mine + return WPSEO_Utils::translate_score(); +||||||| .r11156 + // show notice that aioseo has been deactivated + add_action( 'admin_notices', 'wpseo_deactivate_aioseo_notice' ); + // Clean up the referrer url for later use + if ( isset( $_SERVER['REQUEST_URI'] ) ) { + $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deactivate_aioseo' ), sanitize_text_field( $_SERVER['REQUEST_URI'] ) ); + } + } +======= // Show notice that aioseo has been deactivated. add_action( 'admin_notices', 'wpseo_deactivate_aioseo_notice' ); @@ -548,13 +703,27 @@ function wpseo_disable_aioseo() { $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deactivate_aioseo' ), sanitize_text_field( $_SERVER['REQUEST_URI'] ) ); } } +>>>>>>> .r12027 } -add_action( 'admin_init', 'wpseo_disable_aioseo' ); /** - * Throw a notice to import AIOSEO. + * Check whether file editing is allowed for the .htaccess and robots.txt files * +<<<<<<< .mine + * @deprecated 1.5.6.1 + * @deprecated use WPSEO_Utils::allow_system_file_edit() + * @see WPSEO_Utils::allow_system_file_edit() +||||||| .r11156 + * @since 1.4.8 + */ +function wpseo_import_aioseo_setting_notice() { + echo '
' . sprintf( esc_html__( 'The plugin All-In-One-SEO has been detected. Do you want to %simport its settings%s.', 'wordpress-seo' ), '', '' ) . '
'; +} + +/** + * Throw a notice to inform the user AIOSEO has been deactivated +======= * @since 1.4.8 */ function wpseo_import_aioseo_setting_notice() { @@ -564,7 +733,20 @@ function wpseo_import_aioseo_setting_notice() { /** * Throw a notice to inform the user AIOSEO has been deactivated +>>>>>>> .r12027 * +<<<<<<< .mine + * @internal current_user_can() checks internally whether a user is on wp-ms and adjusts accordingly. +||||||| .r11156 + * @since 1.4.8 + */ +function wpseo_deactivate_aioseo_notice() { + echo '
' . esc_html__( 'All-In-One-SEO has been deactivated', 'wordpress-seo' ) . '
'; +} + +/** + * Throw a notice to import Robots Meta. +======= * @since 1.4.8 */ function wpseo_deactivate_aioseo_notice() { @@ -573,14 +755,35 @@ function wpseo_deactivate_aioseo_notice() { /** * Throw a notice to import Robots Meta. +>>>>>>> .r12027 * - * @since 1.4.8 + * @return bool */ +<<<<<<< .mine +function wpseo_allow_system_file_edit() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.6.1', 'WPSEO_Utils::allow_system_file_edit()' ); +||||||| .r11156 +function wpseo_import_robots_meta_notice() { + echo '
' . sprintf( esc_html__( 'The plugin Robots-Meta has been detected. Do you want to %simport its settings%s.', 'wordpress-seo' ), '', '' ) . '
'; +} +======= function wpseo_import_robots_meta_notice() { $url = add_query_arg( array( '_wpnonce' => wp_create_nonce( 'wpseo-import' ) ), admin_url( 'admin.php?page=wpseo_tools&tool=import-export&import=1&importrobotsmeta=1#top#import-other' ) ); echo '
', sprintf( esc_html__( 'The plugin Robots-Meta has been detected. Do you want to %simport its settings%s.', 'wordpress-seo' ), sprintf( '', esc_url( $url ) ), '' ), '
'; } +>>>>>>> .r12027 +<<<<<<< .mine + return WPSEO_Utils::allow_system_file_edit(); +||||||| .r11156 +/** + * Throw a notice to inform the user Robots Meta has been deactivated + * + * @since 1.4.8 + */ +function wpseo_deactivate_robots_meta_notice() { + echo '
' . esc_html__( 'Robots-Meta has been deactivated', 'wordpress-seo' ) . '
'; +======= /** * Throw a notice to inform the user Robots Meta has been deactivated * @@ -588,7 +791,25 @@ function wpseo_import_robots_meta_notice() { */ function wpseo_deactivate_robots_meta_notice() { echo '
', esc_html__( 'Robots-Meta has been deactivated', 'wordpress-seo' ), '
'; +>>>>>>> .r12027 +} +<<<<<<< .mine +||||||| .r11156 + +/********************** DEPRECATED FUNCTIONS **********************/ + +/** + * Set the default settings. + * + * @deprecated 1.5.0 + * @deprecated use WPSEO_Options::initialize() + * @see WPSEO_Options::initialize() + */ +function wpseo_defaults() { + _deprecated_function( __FUNCTION__, 'WPSEO 1.5.0', 'WPSEO_Options::initialize()' ); + WPSEO_Options::initialize(); } +======= /********************** DEPRECATED FUNCTIONS **********************/ @@ -639,3 +860,4 @@ function wpseo_allow_system_file_edit() { return WPSEO_Utils::allow_system_file_edit(); } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/dist/yoast-seo/yoast-seo-305.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/dist/yoast-seo/yoast-seo-305.min.js new file mode 100644 index 00000000..6646bd57 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/dist/yoast-seo/yoast-seo-305.min.js @@ -0,0 +1,6 @@ +YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.Analyzer=function(a){this.config=a,this.checkConfig(),this.init(a),this.analyses={}},YoastSEO.Analyzer.prototype.checkConfig=function(){"undefined"==typeof this.config.text&&(this.config.text="")},YoastSEO.Analyzer.prototype.init=function(a){this.config=a,this.initDependencies(),this.formatKeyword(),this.initQueue(),this.loadWordlists(),this.__output=[],this.__store={}},YoastSEO.Analyzer.prototype.formatKeyword=function(){if("undefined"!=typeof this.config.keyword&&""!==this.config.keyword){var a=this.stringHelper.sanitizeKeyword(this.config.keyword);this.keywordRegex=this.stringHelper.getWordBoundaryRegex(this.preProcessor.replaceDiacritics(a.replace(/[-_]/g," "))),this.keywordRegexInverse=this.stringHelper.getWordBoundaryRegex(this.preProcessor.replaceDiacritics(a.replace(/\s/g,"-")),"\\-")}},YoastSEO.Analyzer.prototype.initDependencies=function(){this.preProcessor=new YoastSEO.getPreProcessor(this.config.text),this.stringHelper=YoastSEO.getStringHelper(),this.analyzeScorer=new YoastSEO.AnalyzeScorer(this)},YoastSEO.Analyzer.prototype.initQueue=function(){var a;"undefined"!=typeof this.config.queue&&0!==this.config.queue.length?this.queue=this.config.queue.slice():this.queue=YoastSEO.analyzerConfig.queue.slice(),0!==this.config.locale.indexOf("en_")&&(a=this.queue.indexOf("fleschReading"))&&this.queue.splice(a,1)},YoastSEO.Analyzer.prototype.loadWordlists=function(){"undefined"==typeof this.config.wordsToRemove&&(this.config.wordsToRemove=YoastSEO.analyzerConfig.wordsToRemove),"undefined"==typeof this.config.stopWords&&(this.config.stopWords=YoastSEO.analyzerConfig.stopWords)},YoastSEO.Analyzer.prototype.runQueue=function(){var a,b;if(this.queue.length>0){var c=this.queue.shift();void 0!==this[c]?a=this[c]():this.analyses.hasOwnProperty(c)&&(b=this.analyses[c].callable(),a={test:this.analyses[c].name,result:b}),this.__output=this.__output.concat(a),this.runQueue()}else this.score()},YoastSEO.Analyzer.prototype.addAnalysis=function(a){this.analyses[a.name]=a,this.queue.push(a.name)},YoastSEO.Analyzer.prototype.wordCount=function(){return[{test:"wordCount",result:this.preProcessor.__store.wordcountNoTags}]},YoastSEO.Analyzer.prototype.keyphraseSizeCheck=function(){var a=[{test:"keyphraseSizeCheck",result:0}],b=this.stringHelper.sanitizeKeyword(this.config.keyword);return""!==b&&(a[0].result=b.split(/\s/g).length),a},YoastSEO.Analyzer.prototype.keywordDensity=function(){var a=[{test:"keywordDensity",result:0}];if(this.preProcessor.__store.wordcount>100){var b=this.keywordDensityCheck();return a[0].result=b.toFixed(1),a}},YoastSEO.Analyzer.prototype.keywordDensityCheck=function(){var a=this.keywordCount(),b=0;return 0!==a&&(b=100*(a/this.preProcessor.__store.wordcountNoTags-(a-1*a))),b},YoastSEO.Analyzer.prototype.keywordCount=function(){var a=this.preProcessor.__store.cleanTextSomeTags.match(this.keywordRegex),b=0;return null!==a&&(b=a.length),this.__store.keywordCount=b,b},YoastSEO.Analyzer.prototype.subHeadings=function(){var a=[{test:"subHeadings",result:{count:0,matches:0}}],b=this.preProcessor.__store.cleanTextSomeTags.match(/]+)?>(.*?)<\/h\1>/gi);return null!==b&&(a[0].result.count=b.length,a[0].result.matches=this.subHeadingsCheck(b)),a},YoastSEO.Analyzer.prototype.subHeadingsCheck=function(a){var b;if(null===a)b=-1;else{b=0;for(var c=0;c0){var a=(206.835-1.015*(this.preProcessor.__store.wordcountNoDigits/this.preProcessor.__store.sentenceCountNoTags)-84.6*(this.preProcessor.__store.syllablecount/this.preProcessor.__store.wordcountNoDigits)).toFixed(1);return 0>a?a=0:a>100&&(a=100),[{test:"fleschReading",result:a}]}},YoastSEO.Analyzer.prototype.linkCount=function(){var a=this.preProcessor.__store.originalText.match(/]+)?>(.*?)<\/a>/gi),b={total:0,totalNaKeyword:0,totalKeyword:0,internalTotal:0,internalDofollow:0,internalNofollow:0,externalTotal:0,externalDofollow:0,externalNofollow:0,otherTotal:0,otherDofollow:0,otherNofollow:0};if(null!==a){b.total=a.length;for(var c=0;c(.*)/gi);return null!==c&&(c=c[0].replace(/<.*?>\s?/gi,""),null!==c.match(this.keywordRegex)&&(b=!0)),b},YoastSEO.Analyzer.prototype.linkResult=function(a){var b=a;return b.externalHasNofollow=!1,b.externalAllNofollow=!1,b.externalAllDofollow=!1,b.internalAllDofollow=!1,b.noExternal=!1,b.externalTotal!==b.externalDofollow&&b.externalTotal>0&&(b.externalHasNofollow=!0),b.externalTotal===b.externalNofollow&&b.externalTotal>0&&(b.externalAllNofollow=!0),b.externalTotal===b.externalDofollow&&b.externalTotal>0&&(b.externalAllDofollow=!0),b.total===b.internalDofollow&&b.internalTotal>0&&(b.internalAllDofollow=!0),b.total===b.internalTotal+b.otherTotal&&(b.noExternal=!0),b},YoastSEO.Analyzer.prototype.imageCount=function(){var a={total:0,alt:0,noAlt:0,altKeyword:0,altNaKeyword:0},b=this.preProcessor.__store.originalText.match(/]+)?>/gi);if(null!==b){a.total=b.length;for(var c=0;c]+)?>(.*?)
","ig"));return 0===b&&(b=this.paragraphChecker(this.preProcessor.__store.originalText,new RegExp("[^]*?\n\n","ig")),0===b&&-1===this.preProcessor.__store.originalText.indexOf("\n\n")&&-1===this.preProcessor.__store.originalText.indexOf("
")&&(b=this.keywordCount())),a[0].result=b,a},YoastSEO.Analyzer.prototype.paragraphChecker=function(a,b){var c=a.match(b),d=0;return null!==c&&(d=this.stringHelper.countMatches(c[0],this.keywordRegex)),d},YoastSEO.Analyzer.prototype.metaDescriptionKeyword=function(){var a=[{test:"metaDescriptionKeyword",result:-1}];return"undefined"!=typeof this.config.meta&&this.config.meta.length>0&&""!==this.config.keyword&&(a[0].result=this.stringHelper.countMatches(this.config.meta,this.stringHelper.getWordBoundaryRegex(this.config.keyword))),a},YoastSEO.Analyzer.prototype.metaDescriptionLength=function(){var a=[{test:"metaDescriptionLength",result:0}];return"undefined"!=typeof this.config.meta&&(a[0].result=this.config.meta.length),a},YoastSEO.Analyzer.prototype.urlKeyword=function(){var a=[{test:"urlKeyword",result:0}];return"undefined"!=typeof this.config.url&&(a[0].result=this.stringHelper.countMatches(this.config.url,this.keywordRegexInverse)),a},YoastSEO.Analyzer.prototype.urlLength=function(){var a=[{test:"urlLength",result:{urlTooLong:!1}}];if("undefined"!=typeof this.config.url){var b=this.config.url.length;b>this.config.maxUrlLength&&b>this.config.maxSlugLength+this.config.keyword.length&&(a[0].result.urlTooLong=!0)}return a},YoastSEO.Analyzer.prototype.urlStopwords=function(){var a=[{test:"urlStopwords",result:0}];if("undefined"!=typeof this.config.url){var b=this.stringHelper.matchString(this.config.url,this.config.stopWords);null!==b&&(a[0].result=b.length)}return a},YoastSEO.Analyzer.prototype.keywordDoubles=function(){var a=[{test:"keywordDoubles",result:{count:0,id:0}}];return"undefined"!=typeof this.config.keyword&&"undefined"!=typeof this.config.usedKeywords&&"undefined"!=typeof this.config.usedKeywords[this.config.keyword]&&(a[0].result.count=this.config.usedKeywords[this.config.keyword].length,1===a[0].result.count&&(a[0].result.id=this.config.usedKeywords[this.config.keyword][0])),a},YoastSEO.Analyzer.prototype.score=function(){this.analyzeScorer.score(this.__output)},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.AnalyzeScorer=function(a){this.__score=[],this.refObj=a,this.i18n=a.config.i18n,this.init()},YoastSEO.AnalyzeScorer.prototype.init=function(){var a=new YoastSEO.AnalyzerScoring(this.i18n);this.scoring=a.analyzerScoring},YoastSEO.AnalyzeScorer.prototype.score=function(a){this.resultObj=a,this.runQueue()},YoastSEO.AnalyzeScorer.prototype.runQueue=function(){for(var a=0;a=b.scoreArray[d].min:return this.returnScore(c,b,d);case this.matcher>=b.scoreArray[d].min&&this.matcher<=b.scoreArray[d].max:return this.returnScore(c,b,d)}return c}},YoastSEO.AnalyzeScorer.prototype.setMatcher=function(a,b,c){this.matcher=parseFloat(a.result),this.result=a.result,"undefined"!=typeof b.scoreArray[c].matcher&&(this.matcher=parseFloat(this.result[b.scoreArray[c].matcher]))},YoastSEO.AnalyzeScorer.prototype.scoreLookup=function(a){for(var b=0;bthis.config.typeDelay&&this.config.typeDelay"+a[c].status+"
";b.innerHTML+=""},YoastSEO.App.prototype.removeLoadingDialog=function(){document.getElementById(this.config.targets.output).removeChild(document.getElementById("YoastSEO-plugin-loading"))},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.Pluggable=function(a){this.app=a,this.loaded=!1,this.preloadThreshold=3e3,this.plugins={},this.modifications={},this.customTests=[],setTimeout(this._pollLoadingPlugins.bind(this),1500)},YoastSEO.App.prototype.registerPlugin=function(a,b){return this.pluggable._registerPlugin(a,b)},YoastSEO.App.prototype.pluginReady=function(a){return this.pluggable._ready(a)},YoastSEO.App.prototype.pluginReloaded=function(a){return this.pluggable._reloaded(a)},YoastSEO.App.prototype.registerModification=function(a,b,c,d){return this.pluggable._registerModification(a,b,c,d)},YoastSEO.App.prototype.registerTest=function(a,b,c,d,e){return this.pluggable._registerTest(a,b,c,d,e)},YoastSEO.Pluggable.prototype._registerPlugin=function(a,b){return"string"!=typeof a?(console.error("Failed to register plugin. Expected parameter `pluginName` to be a string."),!1):"undefined"!=typeof b&&"object"!=typeof b?(console.error("Failed to register plugin "+a+". Expected parameters `options` to be a string."),!1):this._validateUniqueness(a)===!1?(console.error("Failed to register plugin. Plugin with name "+a+" already exists"),!1):(this.plugins[a]=b,this.app.updateLoadingDialog(this.plugins),!0)},YoastSEO.Pluggable.prototype._ready=function(a){return"string"!=typeof a?(console.error("Failed to modify status for plugin "+a+". Expected parameter `pluginName` to be a string."),!1):void 0===this.plugins[a]?(console.error("Failed to modify status for plugin "+a+". The plugin was not properly registered."),!1):(this.plugins[a].status="ready",this.app.updateLoadingDialog(this.plugins),!0)},YoastSEO.Pluggable.prototype._reloaded=function(a){return"string"!=typeof a?(console.error("Failed to reload Content Analysis for "+a+". Expected parameter `pluginName` to be a string."),!1):void 0===this.plugins[a]?(console.error("Failed to reload Content Analysis for plugin "+a+". The plugin was not properly registered."),!1):(this.app.analyzeTimer(),!0)},YoastSEO.Pluggable.prototype._registerModification=function(a,b,c,d){if("string"!=typeof a)return console.error("Failed to register modification for plugin "+c+". Expected parameter `modification` to be a string."),!1;if("function"!=typeof b)return console.error("Failed to register modification for plugin "+c+". Expected parameter `callable` to be a function."),!1;if("string"!=typeof c)return console.error("Failed to register modification for plugin "+c+". Expected parameter `pluginName` to be a string."),!1;if(this._validateOrigin(c)===!1)return console.error("Failed to register modification for plugin "+c+". The integration has not finished loading yet."),!1;var e="number"==typeof d?d:10,f={callable:b,origin:c,priority:e};return void 0===this.modifications[a]&&(this.modifications[a]=[]),this.modifications[a].push(f),!0},YoastSEO.Pluggable.prototype._registerTest=function(a,b,c,d,e){if("string"!=typeof a)return console.error("Failed to register test for plugin "+d+". Expected parameter `name` to be a string."),!1;if("function"!=typeof b)return console.error("Failed to register test for plugin "+d+". Expected parameter `analyzer` to be a function."),!1;if("string"!=typeof d)return console.error("Failed to register test for plugin "+d+". Expected parameter `pluginName` to be a string."),!1;if(this._validateOrigin(d)===!1)return console.error("Failed to register test for plugin "+d+". The integration has not finished loading yet."),!1;var f="number"==typeof e?e:10;return a=d+"-"+a,this.customTests.push({name:a,analysis:b,scoring:c,prio:f}),!0},YoastSEO.Pluggable.prototype._pollLoadingPlugins=function(a){a=void 0===a?0:a,this._allReady()===!0?(this.loaded=!0,this.app.pluginsLoaded()):a>=this.preloadThreshold?this._pollTimeExceeded():(a+=50,setTimeout(this._pollLoadingPlugins.bind(this,a),50))},YoastSEO.Pluggable.prototype._allReady=function(){for(var a in this.plugins)if("ready"!==this.plugins[a].status)return!1;return!0},YoastSEO.Pluggable.prototype._pollTimeExceeded=function(){for(var a in this.plugins)void 0!==this.plugins[a].options&&"ready"!==this.plugins[a].options.status&&(console.error("Error: Plugin "+a+". did not finish loading in time."),delete this.plugins[a]);this.loaded=!0,this.app.pluginsLoaded()},YoastSEO.Pluggable.prototype._applyModifications=function(a,b,c){var d=this.modifications[a];if(d instanceof Array&&d.length>0){d=this._stripIllegalModifications(d),d.sort(function(a,b){return a.priority-b.priority});for(var e in d){var f=d[e].callable,g=f(b,c);typeof g==typeof b?b=g:console.error("Modification with name "+a+" performed by plugin with name "+d[e].origin+" was ignored because the data that was returned by it was of a different type than the data we had passed it.")}}return b},YoastSEO.Pluggable.prototype._addPluginTests=function(a){this.customTests.map(function(b){this._addPluginTest(a,b)},this)},YoastSEO.Pluggable.prototype._addPluginTest=function(a,b){a.addAnalysis({name:b.name,callable:b.analysis}),a.analyzeScorer.addScoring({name:b.name,scoring:b.scoring})},YoastSEO.Pluggable.prototype._stripIllegalModifications=function(a){for(var b in a)this._validateOrigin(a[b].origin)===!1&&delete a[b];return a},YoastSEO.Pluggable.prototype._validateOrigin=function(a){return"ready"!==this.plugins[a].status?!1:!0},YoastSEO.Pluggable.prototype._validateUniqueness=function(a){return void 0!==this.plugins[a]?!1:!0},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.PreProcessor=function(a){this.__store={},this.__store.originalText=a,this.stringHelper=YoastSEO.getStringHelper(),this.init()},YoastSEO.PreProcessor.prototype.init=function(){this.textFormat(),this.countStore()},YoastSEO.PreProcessor.prototype.textFormat=function(){this.__store.cleanText=this.cleanText(this.__store.originalText),this.__store.cleanTextSomeTags=this.stringHelper.stripSomeTags(this.__store.cleanText),this.__store.cleanTextNoTags=this.stringHelper.stripAllTags(this.__store.cleanTextSomeTags),this.__store.cleanTextNoDigits=this.stringHelper.stripNonWords(this.__store.cleanTextNoTags)},YoastSEO.PreProcessor.prototype.countStore=function(){var a=this.__store.cleanText;this.__store.wordcount=""===a?0:a.split(/\s/g).length;var b=this.__store.cleanTextNoTags;this.__store.wordcountNoTags=""===b?0:b.split(/\s/g).length;var c=this.__store.cleanTextNoDigits;this.__store.wordcountNoDigits=""===c?0:c.split(/\s/g).length,this.__store.sentenceCountNoTags=this.sentenceCount(this.__store.cleanTextNoDigits),this.__store.syllablecount=this.syllableCount(this.__store.cleanTextNoDigits)},YoastSEO.PreProcessor.prototype.sentenceCount=function(a){for(var b=a.split("."),c=0,d=0;d0&&this.syllableCount++},YoastSEO.PreProcessor.prototype.advancedSyllableCount=function(a,b,c){var d=a.match(b);null!==d&&("subtract"===c?this.syllableCount-=d.length:"add"===c&&(this.syllableCount+=d.length))},YoastSEO.PreProcessor.prototype.removeWords=function(a){for(var b=YoastSEO.preprocessorConfig,c=0;c=a:b="bad";break;case a>4&&7>=a:b="ok";break;case a>7:b="good";break;default:case"na"===a:b="na"}return b},YoastSEO.ScoreFormatter.prototype.overallScoreRating=function(a){return"number"==typeof a&&(a/=10),this.scoreRating(a)},YoastSEO.ScoreFormatter.prototype.getSEOScoreText=function(a){var b="";switch(a){case"na":b=this.i18n.dgettext("js-text-analysis","No keyword");break;case"bad":b=this.i18n.dgettext("js-text-analysis","Bad SEO score");break;case"ok":b=this.i18n.dgettext("js-text-analysis","Ok SEO score");break;case"good":b=this.i18n.dgettext("js-text-analysis","Good SEO score")}return b},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.SnippetPreview=function(a){this.refObj=a,this.unformattedText={snippet_cite:this.refObj.rawData.snippetCite||"",snippet_meta:this.refObj.rawData.snippetMeta||"",snippet_title:this.refObj.rawData.snippetTitle||""},this.init()},YoastSEO.SnippetPreview.prototype.init=function(){null!==this.refObj.rawData.pageTitle&&null!==this.refObj.rawData.cite&&(this.output=this.htmlOutput(),this.renderOutput(),this.renderSnippetStyle())},YoastSEO.SnippetPreview.prototype.htmlOutput=function(){var a={};return a.title=this.formatTitle(),a.cite=this.formatCite(),a.meta=this.formatMeta(),a.url=this.formatUrl(),a},YoastSEO.SnippetPreview.prototype.formatTitle=function(){var a=this.refObj.rawData.pageTitle;return(""===a||"undefined"==typeof a)&&(a=this.refObj.config.sampleText.title),a=this.refObj.stringHelper.stripAllTags(a),""!==this.refObj.rawData.keyword?this.formatKeyword(a):a},YoastSEO.SnippetPreview.prototype.formatUrl=function(){var a=this.refObj.rawData.baseUrl;return a.replace(/https?:\/\//gi,"")},YoastSEO.SnippetPreview.prototype.formatCite=function(){var a=this.refObj.rawData.snippetCite;return a=this.refObj.stringHelper.stripAllTags(a),""===a&&(a=this.refObj.config.sampleText.snippetCite),this.formatKeywordUrl(a)},YoastSEO.SnippetPreview.prototype.formatMeta=function(){var a=this.refObj.rawData.meta;return a===this.refObj.config.sampleText.snippetMeta&&(a=""),""===a&&(a=this.getMetaText()),a=this.refObj.stringHelper.stripAllTags(a),a=a.substring(0,YoastSEO.analyzerConfig.maxMeta), +""!==this.refObj.rawData.keyword&&""!==a?this.formatKeyword(a):a},YoastSEO.SnippetPreview.prototype.getMetaText=function(){var a;if("undefined"!=typeof this.refObj.rawData.excerpt&&(a=this.refObj.rawData.excerpt),"undefined"!=typeof this.refObj.rawData.text&&(a=this.refObj.rawData.text),""===a&&(a=this.refObj.config.sampleText.meta),a=this.refObj.stringHelper.stripAllTags(a),""!==this.refObj.rawData.keyword&&""!==this.refObj.rawData.text){var b=this.getIndexMatches(),c=this.getPeriodMatches();a=a.substring(0,YoastSEO.analyzerConfig.maxMeta);var d=0;if(b.length>0)for(var e=0;e0&&(d+=2);break}d=c.shift()}}return""===this.refObj.stringHelper.stripAllTags(a)?this.refObj.config.sampleText.meta:a.substring(0,YoastSEO.analyzerConfig.maxMeta)},YoastSEO.SnippetPreview.prototype.getIndexMatches=function(){for(var a=[],b=0,c=this.refObj.rawData.text.indexOf(this.refObj.rawData.keyword,b);c>-1;)a.push(c),b=c+this.refObj.rawData.keyword.length,c=this.refObj.rawData.text.indexOf(this.refObj.rawData.keyword,b);return a},YoastSEO.SnippetPreview.prototype.getPeriodMatches=function(){for(var a,b=[0],c=0;(a=this.refObj.rawData.text.indexOf(".",c))>-1;)b.push(a),c=a+1;return b},YoastSEO.SnippetPreview.prototype.formatKeyword=function(a){var b=this.refObj.rawData.keyword.replace(/[\[\]\/\{\}\*\+\?\.\\\^\$\|]/g," "),c=YoastSEO.getStringHelper().getWordBoundaryRegex(b);return a.replace(c,function(a){return""+a+""})},YoastSEO.SnippetPreview.prototype.formatKeywordUrl=function(a){var b=this.refObj.stringHelper.sanitizeKeyword(this.refObj.rawData.keyword),c=b.replace(/\s/g,"-"),d=YoastSEO.getStringHelper().getWordBoundaryRegex(c);return a.replace(d,function(a){return""+a+""})},YoastSEO.SnippetPreview.prototype.renderOutput=function(){document.getElementById("snippet_title").innerHTML=this.output.title,document.getElementById("snippet_cite").innerHTML=this.output.cite,document.getElementById("snippet_citeBase").innerHTML=this.output.url,document.getElementById("snippet_meta").innerHTML=this.output.meta},YoastSEO.SnippetPreview.prototype.renderSnippetStyle=function(){var a="desc-default";""===this.refObj.rawData.meta&&(a="desc-render"),document.getElementById("snippet_meta").className="desc "+a},YoastSEO.SnippetPreview.prototype.reRender=function(){this.init()},YoastSEO.SnippetPreview.prototype.disableEnter=function(a){13===a.keyCode&&(a.returnValue=!1,a.cancelBubble=!0,a.preventDefault())},YoastSEO.SnippetPreview.prototype.checkTextLength=function(a){var b=a.currentTarget.textContent;switch(a.currentTarget.id){case"snippet_meta":a.currentTarget.className="desc",b.length>YoastSEO.analyzerConfig.maxMeta&&(YoastSEO.app.snippetPreview.unformattedText.snippet_meta=a.currentTarget.textContent,a.currentTarget.textContent=b.substring(0,YoastSEO.analyzerConfig.maxMeta));break;case"snippet_title":a.currentTarget.className="title",b.length>70&&(YoastSEO.app.snippetPreview.unformattedText.snippet_title=a.currentTarget.textContent,a.currentTarget.textContent=b.substring(0,70))}},YoastSEO.SnippetPreview.prototype.getUnformattedText=function(a){var b=a.currentTarget.id;"undefined"!=typeof this.unformattedText[b]&&(a.currentTarget.textContent=this.unformattedText[b])},YoastSEO.SnippetPreview.prototype.setUnformattedText=function(a){var b=a.currentTarget.id;this.unformattedText[b]=document.getElementById(b).textContent},YoastSEO.SnippetPreview.prototype.textFeedback=function(a){var b=a.currentTarget.textContent;switch(a.currentTarget.id){case"snippet_meta":b.length>YoastSEO.analyzerConfig.maxMeta?a.currentTarget.className="desc tooLong":a.currentTarget.className="desc";break;case"snippet_title":b.length>70?a.currentTarget.className="title tooLong":a.currentTarget.className="title"}},YoastSEO.SnippetPreview.prototype.showEditIcon=function(a){a.currentTarget.parentElement.className="editIcon snippet_container"},YoastSEO.SnippetPreview.prototype.hideEditIcon=function(){for(var a=document.getElementsByClassName("editIcon "),b=0;b]",e="($|"+c+")",d="(^|"+c+")",d+a+e},YoastSEO.StringHelper.prototype.getWordBoundaryRegex=function(a,b){return new RegExp(this.getWordBoundaryString(a,b),"ig")},YoastSEO.StringHelper.prototype.stripSpaces=function(a){return a=a.replace(/\s{2,}/g," "),a=a.replace(/\s\./g,"."),a=a.replace(/^\s+|\s+$/g,"")},YoastSEO.StringHelper.prototype.addEscapeChars=function(a){return a.replace(/[\-\[\]\/\{}\*\+\?\.\\\^\$\|]/g,"\\$&")},YoastSEO.StringHelper.prototype.stripSomeTags=function(a){return a=a.replace(/<(?!li|\/li|p|\/p|h1|\/h1|h2|\/h2|h3|\/h3|h4|\/h4|h5|\/h5|h6|\/h6|dd).*?\>/g," "),a=this.stripSpaces(a)},YoastSEO.StringHelper.prototype.stripAllTags=function(a){return a=a.replace(/(<([^>]+)>)/gi," "),a=a.replace(/[<>]/g,""),a=this.stripSpaces(a)},YoastSEO.StringHelper.prototype.stripNonWords=function(a){return a=a.replace(/[\-\;\:\,\"\'\|\â\â]/g," "),a=a.replace(/[\â]/g,""),a=a.replace(this.getWordBoundaryRegex("[0-9]+"),"$1$3"),a=this.stripSpaces(a),"."===a&&(a=""),a},YoastSEO.StringHelper.prototype.sanitizeKeyword=function(a){return a=a.replace(/[\[\]\/\{\}\*\+\?\\\^\$\|]/g,""),a=this.stripAllTags(a)},YoastSEO.StringHelper.prototype.escapeHTML=function(a){return"string"==typeof a&&(a=a.replace(/&/g,"&").replace(//g,">").replace(/\"/,""").replace(/\'/g,"'")),a},YoastSEO.getStringHelper=function(){return"object"!=typeof YoastSEO.cachedStringHelper&&(YoastSEO.cachedStringHelper=new YoastSEO.StringHelper),YoastSEO.cachedStringHelper},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,function(){/** + * @preserve jed.js https://github.com/SlexAxton/Jed + */ +!function(a,b){function c(a){return l.PF.compile(a||"nplurals=2; plural=(n != 1);")}function d(a,b){this._key=a,this._i18n=b}var e=Array.prototype,f=Object.prototype,g=e.slice,h=f.hasOwnProperty,i=e.forEach,j={},k={forEach:function(a,b,c){var d,e,f;if(null!==a)if(i&&a.forEach===i)a.forEach(b,c);else if(a.length===+a.length){for(d=0,e=a.length;e>d;d++)if(d in a&&b.call(c,a[d],d,a)===j)return}else for(f in a)if(h.call(a,f)&&b.call(c,a[f],f,a)===j)return},extend:function(a){return this.forEach(g.call(arguments,1),function(b){for(var c in b)a[c]=b[c]}),a}},l=function(a){if(this.defaults={locale_data:{messages:{"":{domain:"messages",lang:"en",plural_forms:"nplurals=2; plural=(n != 1);"}}},domain:"messages",debug:!1},this.options=k.extend({},this.defaults,a),this.textdomain(this.options.domain),a.domain&&!this.options.locale_data[this.options.domain])throw new Error("Text domain set to non-existent domain: `"+a.domain+"`")};l.context_delimiter=String.fromCharCode(4),k.extend(d.prototype,{onDomain:function(a){return this._domain=a,this},withContext:function(a){return this._context=a,this},ifPlural:function(a,b){return this._val=a,this._pkey=b,this},fetch:function(a){return"[object Array]"!={}.toString.call(a)&&(a=[].slice.call(arguments,0)),(a&&a.length?l.sprintf:function(a){return a})(this._i18n.dcnpgettext(this._domain,this._context,this._key,this._pkey,this._val),a)}}),k.extend(l.prototype,{translate:function(a){return new d(a,this)},textdomain:function(a){return a?void(this._textdomain=a):this._textdomain},gettext:function(a){return this.dcnpgettext.call(this,b,b,a)},dgettext:function(a,c){return this.dcnpgettext.call(this,a,b,c)},dcgettext:function(a,c){return this.dcnpgettext.call(this,a,b,c)},ngettext:function(a,c,d){return this.dcnpgettext.call(this,b,b,a,c,d)},dngettext:function(a,c,d,e){return this.dcnpgettext.call(this,a,b,c,d,e)},dcngettext:function(a,c,d,e){return this.dcnpgettext.call(this,a,b,c,d,e)},pgettext:function(a,c){return this.dcnpgettext.call(this,b,a,c)},dpgettext:function(a,b,c){return this.dcnpgettext.call(this,a,b,c)},dcpgettext:function(a,b,c){return this.dcnpgettext.call(this,a,b,c)},npgettext:function(a,c,d,e){return this.dcnpgettext.call(this,b,a,c,d,e)},dnpgettext:function(a,b,c,d,e){return this.dcnpgettext.call(this,a,b,c,d,e)},dcnpgettext:function(a,b,d,e,f){e=e||d,a=a||this._textdomain;var g;if(!this.options)return g=new l,g.dcnpgettext.call(g,void 0,void 0,d,e,f);if(!this.options.locale_data)throw new Error("No locale data provided.");if(!this.options.locale_data[a])throw new Error("Domain `"+a+"` was not found.");if(!this.options.locale_data[a][""])throw new Error("No locale meta information provided.");if(!d)throw new Error("No translation key found.");var h,i,j,k=b?b+l.context_delimiter+d:d,m=this.options.locale_data,n=m[a],o=(m.messages||this.defaults.locale_data.messages)[""],p=n[""].plural_forms||n[""]["Plural-Forms"]||n[""]["plural-forms"]||o.plural_forms||o["Plural-Forms"]||o["plural-forms"];if(void 0===f)j=0;else{if("number"!=typeof f&&(f=parseInt(f,10),isNaN(f)))throw new Error("The number that was passed in is not a number.");j=c(p)(f)}if(!n)throw new Error("No domain named `"+a+"` could be found.");return h=n[k],!h||j>h.length?(this.options.missing_key_callback&&this.options.missing_key_callback(k,a),i=[d,e],this.options.debug===!0&&console.log(i[c(p)(f)]),i[c()(f)]):(i=h[j],i?i:(i=[d,e],i[c()(f)]))}});var m=function(){function a(a){return Object.prototype.toString.call(a).slice(8,-1).toLowerCase()}function b(a,b){for(var c=[];b>0;c[--b]=a);return c.join("")}var c=function(){return c.cache.hasOwnProperty(arguments[0])||(c.cache[arguments[0]]=c.parse(arguments[0])),c.format.call(null,c.cache[arguments[0]],arguments)};return c.format=function(c,d){var e,f,g,h,i,j,k,l=1,n=c.length,o="",p=[];for(f=0;n>f;f++)if(o=a(c[f]),"string"===o)p.push(c[f]);else if("array"===o){if(h=c[f],h[2])for(e=d[l],g=0;g=0?"+"+e:e,j=h[4]?"0"==h[4]?"0":h[4].charAt(1):" ",k=h[6]-String(e).length,i=h[6]?b(j,k):"",p.push(h[5]?e+i:i+e)}return p.join("")},c.cache={},c.parse=function(a){for(var b=a,c=[],d=[],e=0;b;){if(null!==(c=/^[^\x25]+/.exec(b)))d.push(c[0]);else if(null!==(c=/^\x25{2}/.exec(b)))d.push("%");else{if(null===(c=/^\x25(?:([1-9]\d*)\$|$([^$]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(b)))throw"[sprintf] huh?";if(c[2]){e|=1;var f=[],g=c[2],h=[];if(null===(h=/^([a-z_][a-z_\d]*)/i.exec(g)))throw"[sprintf] huh?";for(f.push(h[1]);""!==(g=g.substring(h[0].length));)if(null!==(h=/^\.([a-z_][a-z_\d]*)/i.exec(g)))f.push(h[1]);else{if(null===(h=/^\[(\d+)\]/.exec(g)))throw"[sprintf] huh?";f.push(h[1])}c[2]=f}else e|=2;if(3===e)throw"[sprintf] mixing positional and named placeholders is not (yet) supported";d.push(c)}b=b.substring(c[0].length)}return d},c}(),n=function(a,b){return b.unshift(a),m.apply(null,b)};l.parse_plural=function(a,b){return a=a.replace(/n/g,b),l.parse_expression(a)},l.sprintf=function(a,b){return"[object Array]"=={}.toString.call(b)?n(a,[].slice.call(b)):m.apply(this,[].slice.call(arguments))},l.prototype.sprintf=function(){return l.sprintf.apply(this,arguments)},l.PF={},l.PF.parse=function(a){var b=l.PF.extractPluralExpr(a);return l.PF.parser.parse.call(l.PF.parser,b)},l.PF.compile=function(a){function b(a){return a===!0?1:a?a:0}var c=l.PF.parse(a);return function(a){return b(l.PF.interpreter(c)(a))}},l.PF.interpreter=function(a){return function(b){switch(a.type){case"GROUP":return l.PF.interpreter(a.expr)(b);case"TERNARY":return l.PF.interpreter(a.expr)(b)?l.PF.interpreter(a.truthy)(b):l.PF.interpreter(a.falsey)(b);case"OR":return l.PF.interpreter(a.left)(b)||l.PF.interpreter(a.right)(b);case"AND":return l.PF.interpreter(a.left)(b)&&l.PF.interpreter(a.right)(b);case"LT":return l.PF.interpreter(a.left)(b)l.PF.interpreter(a.right)(b);case"LTE":return l.PF.interpreter(a.left)(b)<=l.PF.interpreter(a.right)(b);case"GTE":return l.PF.interpreter(a.left)(b)>=l.PF.interpreter(a.right)(b);case"EQ":return l.PF.interpreter(a.left)(b)==l.PF.interpreter(a.right)(b);case"NEQ":return l.PF.interpreter(a.left)(b)!=l.PF.interpreter(a.right)(b);case"MOD":return l.PF.interpreter(a.left)(b)%l.PF.interpreter(a.right)(b);case"VAR":return b;case"NUM":return a.val;default:throw new Error("Invalid Token found.")}}},l.PF.extractPluralExpr=function(a){a=a.replace(/^\s\s*/,"").replace(/\s\s*$/,""),/;\s*$/.test(a)||(a=a.concat(";"));var b,c=/nplurals\=(\d+);/,d=/plural\=(.*);/,e=a.match(c),f={};if(!(e.length>1))throw new Error("nplurals not found in plural_forms string: "+a);if(f.nplurals=e[1],a=a.replace(c,""),b=a.match(d),!(b&&b.length>1))throw new Error("`plural` expression not found: "+a);return b[1]},l.PF.parser=function(){var a={trace:function(){},yy:{},symbols_:{error:2,expressions:3,e:4,EOF:5,"?":6,":":7,"||":8,"&&":9,"<":10,"<=":11,">":12,">=":13,"!=":14,"==":15,"%":16,"(":17,")":18,n:19,NUMBER:20,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",6:"?",7:":",8:"||",9:"&&",10:"<",11:"<=",12:">",13:">=",14:"!=",15:"==",16:"%",17:"(",18:")",19:"n",20:"NUMBER"},productions_:[0,[3,2],[4,5],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,1],[4,1]],performAction:function(a,b,c,d,e,f,g){var h=f.length-1;switch(e){case 1:return{type:"GROUP",expr:f[h-1]};case 2:this.$={type:"TERNARY",expr:f[h-4],truthy:f[h-2],falsey:f[h]};break;case 3:this.$={type:"OR",left:f[h-2],right:f[h]};break;case 4:this.$={type:"AND",left:f[h-2],right:f[h]};break;case 5:this.$={type:"LT",left:f[h-2],right:f[h]};break;case 6:this.$={type:"LTE",left:f[h-2],right:f[h]};break;case 7:this.$={type:"GT",left:f[h-2],right:f[h]};break;case 8:this.$={type:"GTE",left:f[h-2],right:f[h]};break;case 9:this.$={type:"NEQ",left:f[h-2],right:f[h]};break;case 10:this.$={type:"EQ",left:f[h-2],right:f[h]};break;case 11:this.$={type:"MOD",left:f[h-2],right:f[h]};break;case 12:this.$={type:"GROUP",expr:f[h-1]};break;case 13:this.$={type:"VAR"};break;case 14:this.$={type:"NUM",val:Number(a)}}},table:[{3:1,4:2,17:[1,3],19:[1,4],20:[1,5]},{1:[3]},{5:[1,6],6:[1,7],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16]},{4:17,17:[1,3],19:[1,4],20:[1,5]},{5:[2,13],6:[2,13],7:[2,13],8:[2,13],9:[2,13],10:[2,13],11:[2,13],12:[2,13],13:[2,13],14:[2,13],15:[2,13],16:[2,13],18:[2,13]},{5:[2,14],6:[2,14],7:[2,14],8:[2,14],9:[2,14],10:[2,14],11:[2,14],12:[2,14],13:[2,14],14:[2,14],15:[2,14],16:[2,14],18:[2,14]},{1:[2,1]},{4:18,17:[1,3],19:[1,4],20:[1,5]},{4:19,17:[1,3],19:[1,4],20:[1,5]},{4:20,17:[1,3],19:[1,4],20:[1,5]},{4:21,17:[1,3],19:[1,4],20:[1,5]},{4:22,17:[1,3],19:[1,4],20:[1,5]},{4:23,17:[1,3],19:[1,4],20:[1,5]},{4:24,17:[1,3],19:[1,4],20:[1,5]},{4:25,17:[1,3],19:[1,4],20:[1,5]},{4:26,17:[1,3],19:[1,4],20:[1,5]},{4:27,17:[1,3],19:[1,4],20:[1,5]},{6:[1,7],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[1,28]},{6:[1,7],7:[1,29],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16]},{5:[2,3],6:[2,3],7:[2,3],8:[2,3],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,3]},{5:[2,4],6:[2,4],7:[2,4],8:[2,4],9:[2,4],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,4]},{5:[2,5],6:[2,5],7:[2,5],8:[2,5],9:[2,5],10:[2,5],11:[2,5],12:[2,5],13:[2,5],14:[2,5],15:[2,5],16:[1,16],18:[2,5]},{5:[2,6],6:[2,6],7:[2,6],8:[2,6],9:[2,6],10:[2,6],11:[2,6],12:[2,6],13:[2,6],14:[2,6],15:[2,6],16:[1,16],18:[2,6]},{5:[2,7],6:[2,7],7:[2,7],8:[2,7],9:[2,7],10:[2,7],11:[2,7],12:[2,7],13:[2,7],14:[2,7],15:[2,7],16:[1,16],18:[2,7]},{5:[2,8],6:[2,8],7:[2,8],8:[2,8],9:[2,8],10:[2,8],11:[2,8],12:[2,8],13:[2,8],14:[2,8],15:[2,8],16:[1,16],18:[2,8]},{5:[2,9],6:[2,9],7:[2,9],8:[2,9],9:[2,9],10:[2,9],11:[2,9],12:[2,9],13:[2,9],14:[2,9],15:[2,9],16:[1,16],18:[2,9]},{5:[2,10],6:[2,10],7:[2,10],8:[2,10],9:[2,10],10:[2,10],11:[2,10],12:[2,10],13:[2,10],14:[2,10],15:[2,10],16:[1,16],18:[2,10]},{5:[2,11],6:[2,11],7:[2,11],8:[2,11],9:[2,11],10:[2,11],11:[2,11],12:[2,11],13:[2,11],14:[2,11],15:[2,11],16:[2,11],18:[2,11]},{5:[2,12],6:[2,12],7:[2,12],8:[2,12],9:[2,12],10:[2,12],11:[2,12],12:[2,12],13:[2,12],14:[2,12],15:[2,12],16:[2,12],18:[2,12]},{4:30,17:[1,3],19:[1,4],20:[1,5]},{5:[2,2],6:[1,7],7:[2,2],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,2]}],defaultActions:{6:[2,1]},parseError:function(a,b){throw new Error(a)},parse:function(a){function b(a){e.length=e.length-2*a,f.length=f.length-a,g.length=g.length-a}function c(){var a;return a=d.lexer.lex()||1,"number"!=typeof a&&(a=d.symbols_[a]||a),a}var d=this,e=[0],f=[null],g=[],h=this.table,i="",j=0,k=0,l=0,m=2,n=1;this.lexer.setInput(a),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var o=this.lexer.yylloc;g.push(o),"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var p,q,r,s,t,u,v,w,x,y={};;){if(r=e[e.length-1],this.defaultActions[r]?s=this.defaultActions[r]:(null==p&&(p=c()),s=h[r]&&h[r][p]),"undefined"==typeof s||!s.length||!s[0]){if(!l){x=[];for(u in h[r])this.terminals_[u]&&u>2&&x.push("'"+this.terminals_[u]+"'");var z="";z=this.lexer.showPosition?"Parse error on line "+(j+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+x.join(", ")+", got '"+this.terminals_[p]+"'":"Parse error on line "+(j+1)+": Unexpected "+(1==p?"end of input":"'"+(this.terminals_[p]||p)+"'"),this.parseError(z,{text:this.lexer.match,token:this.terminals_[p]||p,line:this.lexer.yylineno,loc:o,expected:x})}if(3==l){if(p==n)throw new Error(z||"Parsing halted.");k=this.lexer.yyleng,i=this.lexer.yytext,j=this.lexer.yylineno,o=this.lexer.yylloc,p=c()}for(;;){if(m.toString()in h[r])break;if(0==r)throw new Error(z||"Parsing halted.");b(1),r=e[e.length-1]}q=p,p=m,r=e[e.length-1],s=h[r]&&h[r][m],l=3}if(s[0]instanceof Array&&s.length>1)throw new Error("Parse Error: multiple actions possible at state: "+r+", token: "+p);switch(s[0]){case 1:e.push(p),f.push(this.lexer.yytext),g.push(this.lexer.yylloc),e.push(s[1]),p=null,q?(p=q,q=null):(k=this.lexer.yyleng,i=this.lexer.yytext,j=this.lexer.yylineno,o=this.lexer.yylloc,l>0&&l--);break;case 2:if(v=this.productions_[s[1]][1],y.$=f[f.length-v],y._$={first_line:g[g.length-(v||1)].first_line,last_line:g[g.length-1].last_line,first_column:g[g.length-(v||1)].first_column,last_column:g[g.length-1].last_column},t=this.performAction.call(y,i,k,j,this.yy,s[1],f,g),"undefined"!=typeof t)return t;v&&(e=e.slice(0,-1*v*2),f=f.slice(0,-1*v),g=g.slice(0,-1*v)),e.push(this.productions_[s[1]][0]),f.push(y.$),g.push(y._$),w=h[e[e.length-2]][e[e.length-1]],e.push(w);break;case 3:return!0}}return!0}},b=function(){var a={EOF:1,parseError:function(a,b){if(!this.yy.parseError)throw new Error(a);this.yy.parseError(a,b)},setInput:function(a){return this._input=a,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this},input:function(){var a=this._input[0];this.yytext+=a,this.yyleng++,this.match+=a,this.matched+=a;var b=a.match(/\n/);return b&&this.yylineno++,this._input=this._input.slice(1),a},unput:function(a){return this._input=a+this._input,this},more:function(){return this._more=!0,this},pastInput:function(){var a=this.matched.substr(0,this.matched.length-this.match.length);return(a.length>20?"...":"")+a.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var a=this.match;return a.length<20&&(a+=this._input.substr(0,20-a.length)),(a.substr(0,20)+(a.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var a=this.pastInput(),b=new Array(a.length+1).join("-");return a+this.upcomingInput()+"\n"+b+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var a,b,c;this._more||(this.yytext="",this.match="");for(var d=this._currentRules(),e=0;e=/,/^/,/^!=/,/^==/,/^%/,/^$/,/^$/,/^$/,/^./],a.conditions={INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17],inclusive:!0}},a}();return a.lexer=b,a}(),"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=l),exports.Jed=l):("function"==typeof define&&define.amd&&define("jed",function(){return l}),a.Jed=l)}(this)}.call(YoastSEO),YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.analyzerConfig={queue:["wordCount","keywordDensity","subHeadings","stopwords","fleschReading","linkCount","imageCount","urlKeyword","urlLength","metaDescriptionLength","metaDescriptionKeyword","pageTitleKeyword","pageTitleLength","firstParagraph","urlStopwords","keywordDoubles","keyphraseSizeCheck"],stopWords:["a","about","above","after","again","against","all","am","an","and","any","are","as","at","be","because","been","before","being","below","between","both","but","by","could","did","do","does","doing","down","during","each","few","for","from","further","had","has","have","having","he","he'd","he'll","he's","her","here","here's","hers","herself","him","himself","his","how","how's","i","i'd","i'll","i'm","i've","if","in","into","is","it","it's","its","itself","let's","me","more","most","my","myself","nor","of","on","once","only","or","other","ought","our","ours","ourselves","out","over","own","same","she","she'd","she'll","she's","should","so","some","such","than","that","that's","the","their","theirs","them","themselves","then","there","there's","these","they","they'd","they'll","they're","they've","this","those","through","to","too","under","until","up","very","was","we","we'd","we'll","we're","we've","were","what","what's","when","when's","where","where's","which","while","who","who's","whom","why","why's","with","would","you","you'd","you'll","you're","you've","your","yours","yourself","yourselves"],wordsToRemove:[" a"," in"," an"," on"," for"," the"," and"],maxSlugLength:20,maxUrlLength:40,maxMeta:156},YoastSEO.preprocessorConfig={syllables:{subtractSyllables:["cial","tia","cius","cious","giu","ion","iou","sia$","[^aeiuoyt]{2,}ed$","[aeiouy][^aeiuoyts]{1,}e\\b",".ely$","[cg]h?e[sd]","rved$","rved","[aeiouy][dt]es?$","[aeiouy][^aeiouydt]e[sd]?$","^[dr]e[aeiou][^aeiou]+$","[aeiouy]rse$"],addSyllables:["ia","riet","dien","iu","io","ii","[aeiouym][bdp]l","[aeiou]{3}","^mc","ism$","([^aeiouy])l$","[^l]lien","^coa[dglx].","[^gq]ua[^auieo]","dnt$","uity$","ie(r|st)","[aeiouy]ing","[aeiouw]y[aeiou]"],exclusionWords:[{word:"shoreline",syllables:2},{word:"simile",syllables:3}]},diacriticsRemovalMap:[{base:"a",letters:/[\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250]/g},{base:"aa",letters:/[\uA733]/g},{base:"ae",letters:/[\u00E6\u01FD\u01E3]/g},{base:"ao",letters:/[\uA735]/g},{base:"au",letters:/[\uA737]/g},{base:"av",letters:/[\uA739\uA73B]/g},{base:"ay",letters:/[\uA73D]/g},{base:"b",letters:/[\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253]/g},{base:"c",letters:/[\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184]/g},{base:"d",letters:/[\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A]/g},{base:"dz",letters:/[\u01F3\u01C6]/g},{base:"e",letters:/[\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD]/g},{base:"f",letters:/[\u0066\u24D5\uFF46\u1E1F\u0192\uA77C]/g},{base:"g",letters:/[\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F]/g},{base:"h",letters:/[\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265]/g},{base:"hv",letters:/[\u0195]/g},{base:"i",letters:/[\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131]/g},{base:"j",letters:/[\u006A\u24D9\uFF4A\u0135\u01F0\u0249]/g},{base:"k",letters:/[\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3]/g},{base:"l",letters:/[\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747]/g},{base:"lj",letters:/[\u01C9]/g},{base:"m",letters:/[\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F]/g},{base:"n",letters:/[\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5]/g},{base:"nj",letters:/[\u01CC]/g},{base:"o",letters:/[\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275]/g},{base:"oi",letters:/[\u01A3]/g},{base:"ou",letters:/[\u0223]/g},{base:"oo",letters:/[\uA74F]/g},{base:"p",letters:/[\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755]/g},{base:"q",letters:/[\u0071\u24E0\uFF51\u024B\uA757\uA759]/g},{base:"r",letters:/[\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783]/g},{base:"s",letters:/[\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B]/g},{base:"t",letters:/[\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787]/g},{base:"tz",letters:/[\uA729]/g},{base:"u",letters:/[\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289]/g},{base:"v",letters:/[\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C]/g},{base:"vy",letters:/[\uA761]/g},{base:"w",letters:/[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73]/g},{base:"x",letters:/[\u0078\u24E7\uFF58\u1E8B\u1E8D]/g},{base:"y",letters:/[\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF]/g},{base:"z",letters:/[\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763]/g}]},YoastSEO="undefined"==typeof YoastSEO?{}:YoastSEO,YoastSEO.analyzerScoreRating=9,YoastSEO.AnalyzerScoring=function(a){this.analyzerScoring=[{scoreName:"wordCount",scoreArray:[{min:300,score:9,text:a.dgettext("js-text-analysis","The text contains %1$d words, this is more than the %2$d word recommended minimum.")},{min:250,max:299,score:7,text:a.dgettext("js-text-analysis","The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.")},{min:200,max:249,score:5,text:a.dgettext("js-text-analysis","The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.")},{min:100,max:199,score:-10,text:a.dgettext("js-text-analysis","The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.")},{min:0,max:99,score:-20,text:a.dgettext("js-text-analysis","The text contains %1$d words. This is far too low and should be increased.")}],replaceArray:[{name:"wordCount",position:"%1$d",source:"matcher"},{name:"recommendedWordcount",position:"%2$d",value:300}]},{scoreName:"keyphraseSizeCheck",scoreArray:[{max:0,score:-999,text:a.dgettext("js-text-analysis","No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.")},{min:11,score:0,text:a.dgettext("js-text-analysis","Your keyphrase is over 10 words, a keyphrase should be shorter.")}]},{scoreName:"keywordDensity",scoreArray:[{min:3.5,score:-50,text:a.dgettext("js-text-analysis","The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.")},{min:2.51,max:3.49,score:-10,text:a.dgettext("js-text-analysis","The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.")},{min:.5,max:2.5,score:9,text:a.dgettext("js-text-analysis","The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.")},{min:0,max:.49,score:4,text:a.dgettext("js-text-analysis","The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.")}],replaceArray:[{name:"keywordDensity",position:"%1$f",source:"matcher"},{name:"keywordCount",position:"%2$d",sourceObj:".refObj.__store.keywordCount"}]},{scoreName:"linkCount",scoreArray:[{matcher:"total",min:0,max:0,score:6,text:a.dgettext("js-text-analysis","No outbound links appear in this page, consider adding some as appropriate.")},{type:"internalAllDofollow",score:6,text:a.dgettext("js-text-analysis","No outbound links appear in this page, consider adding some as appropriate.")},{type:"noExternal",score:6,text:a.dgettext("js-text-analysis","No outbound links appear in this page, consider adding some as appropriate.")},{matcher:"totalNaKeyword",min:1,score:2,text:a.dgettext("js-text-analysis","Outbound links appear in this page")},{matcher:"totalKeyword",min:1,score:2,text:a.dgettext("js-text-analysis","You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.")},{type:"externalAllNofollow",score:7,text:a.dgettext("js-text-analysis","This page has %2$s outbound link(s), all nofollowed.")},{type:"externalHasNofollow",score:8,text:a.dgettext("js-text-analysis","This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).")},{type:"externalAllDofollow",score:9,text:a.dgettext("js-text-analysis","This page has %1$s outbound link(s).")}],replaceArray:[{name:"links",position:"%1$s",sourceObj:".result.externalTotal"},{name:"nofollow",position:"%2$s",sourceObj:".result.externalNofollow"},{name:"dofollow",position:"%3$s",sourceObj:".result.externalDofollow"}]},{scoreName:"fleschReading",scoreArray:[{min:90,score:9,text:"{{text}}",resultText:"very easy",note:""},{min:80,max:89.9,score:9,text:"{{text}}",resultText:"easy",note:""},{min:70,max:79.9,score:8,text:"{{text}}",resultText:"fairly easy",note:""},{min:60,max:69.9,score:8,text:"{{text}}",resultText:"ok",note:""},{min:50,max:59.9,score:6,text:"{{text}}",resultText:a.dgettext("js-text-analysis","fairly difficult"),note:a.dgettext("js-text-analysis","Try to make shorter sentences to improve readability.")},{min:30,max:49.9,score:5,text:"{{text}}",resultText:a.dgettext("js-text-analysis","difficult"),note:a.dgettext("js-text-analysis","Try to make shorter sentences, using less difficult words to improve readability.")},{min:0,max:29.9,score:4,text:"{{text}}",resultText:a.dgettext("js-text-analysis","very difficult"),note:a.dgettext("js-text-analysis","Try to make shorter sentences, using less difficult words to improve readability.")}],replaceArray:[{name:"scoreText",position:"{{text}}",value:a.dgettext("js-text-analysis","The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s")},{name:"text",position:"%1$s",sourceObj:".result"},{name:"scoreUrl",position:"%2$s",value:"Flesch Reading Ease"},{name:"resultText",position:"%3$s",scoreObj:"resultText"},{name:"note",position:"%4$s",scoreObj:"note"}]},{scoreName:"metaDescriptionLength",metaMinLength:120,metaMaxLength:157,scoreArray:[{max:0,score:1,text:a.dgettext("js-text-analysis","No meta description has been specified, search engines will display copy from the page instead.")},{max:120,score:6,text:a.dgettext("js-text-analysis","The meta description is under %1$d characters, however up to %2$d characters are available.")},{min:157,score:6,text:a.dgettext("js-text-analysis","The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible")},{min:120,max:157,score:9,text:a.dgettext("js-text-analysis","In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?")}],replaceArray:[{name:"minCharacters",position:"%1$d",value:120},{name:"maxCharacters",position:"%2$d",value:156}]},{scoreName:"metaDescriptionKeyword",scoreArray:[{min:1,score:9,text:a.dgettext("js-text-analysis","The meta description contains the focus keyword.")},{max:0,min:0,score:3,text:a.dgettext("js-text-analysis","A meta description has been specified, but it does not contain the focus keyword.")}]},{scoreName:"firstParagraph",scoreArray:[{max:0,score:3,text:a.dgettext("js-text-analysis","The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.")},{min:1,score:9,text:a.dgettext("js-text-analysis","The focus keyword appears in the first paragraph of the copy.")}]},{scoreName:"stopwordKeywordCount",scoreArray:[{matcher:"count",min:1,score:5,text:a.dgettext("js-text-analysis","The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.")},{matcher:"count",max:0,score:0,text:""}],replaceArray:[{name:"scoreUrl",position:"%1$s",value:a.dgettext("js-text-analysis","stop words")},{name:"stopwords",position:"%2$s",sourceObj:".result.matches"}]},{scoreName:"subHeadings",scoreArray:[{matcher:"count",max:0,score:7,text:a.dgettext("js-text-analysis","No subheading tags (like an H2) appear in the copy.")},{matcher:"matches",max:0,score:3,text:a.dgettext("js-text-analysis","You have not used your focus keyword in any subheading (such as an H2) in your copy.")},{matcher:"matches",min:1,score:9,text:a.dgettext("js-text-analysis","The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.")}],replaceArray:[{name:"count",position:"%1$d",sourceObj:".result.count"},{name:"matches",position:"%2$d",sourceObj:".result.matches"}]},{scoreName:"pageTitleLength",scoreArray:[{max:0,score:1,text:a.dgettext("js-text-analysis","Please create a page title.")},{max:39,score:6,text:a.dgettext("js-text-analysis","The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.")},{min:71,score:6,text:a.dgettext("js-text-analysis","The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.")},{min:40,max:70,score:9,text:a.dgettext("js-text-analysis","The page title is between the %1$d character minimum and the recommended %2$d character maximum.")}],replaceArray:[{name:"minLength",position:"%1$d",value:40},{name:"maxLength",position:"%2$d",value:70},{name:"length",position:"%3$d",source:"matcher"}]},{scoreName:"pageTitleKeyword",scoreTitleKeywordLimit:0,scoreArray:[{matcher:"matches",max:0,score:2,text:a.dgettext("js-text-analysis","The focus keyword '%1$s' does not appear in the page title.")},{matcher:"position",max:1,score:9,text:a.dgettext("js-text-analysis","The page title contains the focus keyword, at the beginning which is considered to improve rankings.")},{matcher:"position",min:1,score:6,text:a.dgettext("js-text-analysis","The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.")}],replaceArray:[{name:"keyword",position:"%1$s",sourceObj:".refObj.config.keyword"}]},{scoreName:"urlKeyword",scoreArray:[{min:1,score:9,text:a.dgettext("js-text-analysis","The focus keyword appears in the URL for this page.")},{max:0,score:6,text:a.dgettext("js-text-analysis","The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!") +}]},{scoreName:"urlLength",scoreArray:[{type:"urlTooLong",score:5,text:a.dgettext("js-text-analysis","The slug for this page is a bit long, consider shortening it.")}]},{scoreName:"urlStopwords",scoreArray:[{min:1,score:5,text:a.dgettext("js-text-analysis","The slug for this page contains one or more %1$sstop words%2$s, consider removing them.")}],replaceArray:[{name:"url",position:"%1$s",value:""},{name:"urlClose",position:"%2$s",value:""}]},{scoreName:"imageCount",scoreArray:[{matcher:"total",max:0,score:3,text:a.dgettext("js-text-analysis","No images appear in this page, consider adding some as appropriate.")},{matcher:"noAlt",min:1,score:5,text:a.dgettext("js-text-analysis","The images on this page are missing alt tags.")},{matcher:"altNaKeyword",min:1,score:5,text:a.dgettext("js-text-analysis","The images on this page contain alt tags")},{matcher:"altKeyword",min:1,score:9,text:a.dgettext("js-text-analysis","The images on this page contain alt tags with the focus keyword.")},{matcher:"alt",min:1,score:5,text:a.dgettext("js-text-analysis","The images on this page do not have alt tags containing your focus keyword.")}]},{scoreName:"keywordDoubles",scoreArray:[{matcher:"count",max:0,score:9,text:a.dgettext("js-text-analysis","You've never used this focus keyword before, very good.")},{matcher:"count",max:1,score:6,text:a.dgettext("js-text-analysis","You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.")},{matcher:"count",min:1,score:1,text:a.dgettext("js-text-analysis","You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.")}],replaceArray:[{name:"singleUrl",position:"%1$s",sourceObj:".refObj.config.postUrl",rawOutput:!0},{name:"endTag",position:"%2$s",value:""},{name:"multiUrl",position:"%3$s",sourceObj:".refObj.config.searchUrl",rawOutput:!0},{name:"occurrences",position:"%4$d",sourceObj:".result.count"},{name:"endTag",position:"%5$s",value:""},{name:"cornerstone",position:"%6$s",value:""},{name:"id",position:"{id}",sourceObj:".result.id"},{name:"keyword",position:"{keyword}",sourceObj:".refObj.config.keyword"}]}]}; \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.js new file mode 100644 index 00000000..218b0244 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.js @@ -0,0 +1,390 @@ +/* global wpseoAdminL10n */ +/* global ajaxurl */ +/* global setWPOption */ +/* global tb_remove */ +/* global YoastSEO */ +/* jshint -W097 */ +/* jshint -W003 */ +/* jshint unused:false */ +'use strict'; +jQuery( document ).ready( function() { + /* Fix banner images overlapping help texts */ + jQuery( '.screen-meta-toggle a' ).click( function() { + jQuery( '#sidebar-container' ).toggle(); + } + ); + + // events + jQuery( '#enablexmlsitemap' ).change( function() { + jQuery( '#sitemapinfo' ).toggle( jQuery( this ).is( ':checked' ) ); + } + ).change(); + + jQuery( '#breadcrumbs-enable' ).change( function() { + jQuery( '#breadcrumbsinfo' ).toggle( jQuery( this ).is( ':checked' ) ); + } + ).change(); + + jQuery( '#disable_author_sitemap' ).change( function() { + jQuery( '#xml_user_block' ).toggle( !jQuery( this ).is( ':checked' ) ); + } + ).change(); + + jQuery( '#cleanpermalinks' ).change( function() { + jQuery( '#cleanpermalinksdiv' ).toggle( jQuery( this ).is( ':checked' ) ); + } + ).change(); + + jQuery( '#wpseo-tabs' ).find( 'a' ).click( function() { + jQuery( '#wpseo-tabs' ).find( 'a' ).removeClass( 'nav-tab-active' ); + jQuery( '.wpseotab' ).removeClass( 'active' ); + + var id = jQuery( this ).attr( 'id' ).replace( '-tab', '' ); + jQuery( '#' + id ).addClass( 'active' ); + jQuery( this ).addClass( 'nav-tab-active' ); + } + ); + + jQuery( '#company_or_person' ).change( function() { + var companyOrPerson = jQuery( this ).val(); + if ( 'company' === companyOrPerson ) { + jQuery( '#knowledge-graph-company' ).show(); + jQuery( '#knowledge-graph-person' ).hide(); + } + else if ( 'person' === companyOrPerson ) { + jQuery( '#knowledge-graph-company' ).hide(); + jQuery( '#knowledge-graph-person' ).show(); + } + else { + jQuery( '#knowledge-graph-company' ).hide(); + jQuery( '#knowledge-graph-person' ).hide(); + } + } + ).change(); + + jQuery( '.template' ).change( function() { + wpseoDetectWrongVariables( jQuery( this ) ); + } + ).change(); + + // init + var activeTab = window.location.hash.replace( '#top#', '' ); + + // default to first tab + if ( activeTab === '' || activeTab === '#_=_' ) { + activeTab = jQuery( '.wpseotab' ).attr( 'id' ); + } + + jQuery( '#' + activeTab ).addClass( 'active' ); + jQuery( '#' + activeTab + '-tab' ).addClass( 'nav-tab-active' ); + + jQuery( '.nav-tab-active' ).click(); + + // Initialize the recalculate. + var recalculate_link = jQuery('#wpseo_recalculate_link'); + if( recalculate_link !== undefined ) { + recalculate_link.click( + function() { + wpseo_recalculate_scores(1); + } + ); + + if ( recalculate_link.data( 'open' ) ) { + recalculate_link.trigger( 'click' ); + } + } + } +); + +/** + * Detects the wrong use of variables in title and description templates + * + * @param {element} e + */ +function wpseoDetectWrongVariables( e ) { + var warn = false; + var error_id = ''; + var wrongVariables = []; + var authorVariables = [ 'userid', 'name', 'user_description' ]; + var dateVariables = [ 'date' ]; + var postVariables = [ 'title', 'parent_title', 'excerpt', 'excerpt_only', 'caption', 'focuskw', 'pt_single', 'pt_plural', 'modified', 'id' ]; + var specialVariables = [ 'term404', 'searchphrase' ]; + var taxonomyVariables = [ 'term_title', 'term_description' ]; + var taxonomyPostVariables = [ 'category', 'category_description', 'tag', 'tag_description' ]; + if ( e.hasClass( 'posttype-template' ) ) { + wrongVariables = wrongVariables.concat( specialVariables, taxonomyVariables ); + } + else if ( e.hasClass( 'homepage-template' ) ) { + wrongVariables = wrongVariables.concat( authorVariables, dateVariables, postVariables, specialVariables, taxonomyVariables, taxonomyPostVariables ); + } + else if ( e.hasClass( 'taxonomy-template' ) ) { + wrongVariables = wrongVariables.concat( authorVariables, dateVariables, postVariables, specialVariables ); + } + else if ( e.hasClass( 'author-template' ) ) { + wrongVariables = wrongVariables.concat( postVariables, dateVariables, specialVariables, taxonomyVariables, taxonomyPostVariables ); + } + else if ( e.hasClass( 'date-template' ) ) { + wrongVariables = wrongVariables.concat( authorVariables, postVariables, specialVariables, taxonomyVariables, taxonomyPostVariables ); + } + else if ( e.hasClass( 'search-template' ) ) { + wrongVariables = wrongVariables.concat( authorVariables, dateVariables, postVariables, taxonomyVariables, taxonomyPostVariables, [ 'term404' ] ); + } + else if ( e.hasClass( 'error404-template' ) ) { + wrongVariables = wrongVariables.concat( authorVariables, dateVariables, postVariables, taxonomyVariables, taxonomyPostVariables, [ 'searchphrase' ] ); + } + jQuery.each( wrongVariables, function( index, variable ) { + error_id = e.attr( 'id' ) + '-' + variable + '-warning'; + if ( e.val().search( '%%' + variable + '%%' ) !== -1 ) { + e.addClass( 'wpseo_variable_warning' ); + var msg = wpseoAdminL10n.variable_warning.replace( '%s', '%%' + variable + '%%' ); + if ( jQuery( '#' + error_id ).length ) { + jQuery( '#' + error_id ).html( msg ); + } + else { + e.after( '
' + msg + '
' ); + } + warn = true; + } + else { + if ( jQuery( '#' + error_id ).length ) { + jQuery( '#' + error_id ).remove(); + } + } + } + ); + if ( warn === false ) { + e.removeClass( 'wpseo_variable_warning' ); + } +} + +/** + * Sets a specific WP option + * + * @param {string} option The option to update + * @param {string} newval The new value for the option + * @param {string} hide The ID of the element to hide on success + * @param {string} nonce The nonce for the action + */ +function setWPOption( option, newval, hide, nonce ) { + jQuery.post( ajaxurl, { + action: 'wpseo_set_option', + option: option, + newval: newval, + _wpnonce: nonce + }, function( data ) { + if ( data ) { + jQuery( '#' + hide ).hide(); + } + } + ); +} + +/** + * Do the kill blocking files action + * + * @param {string} nonce + */ +function wpseoKillBlockingFiles( nonce ) { + jQuery.post( ajaxurl, { + action: 'wpseo_kill_blocking_files', + _ajax_nonce: nonce + }, function( data ) { + if ( data === 'success' ) { + jQuery( '#blocking_files' ).hide(); + } + else { + jQuery( '#block_files' ).html( data ); + } + } + ); +} + +/** + * Copies the meta description for the homepage + */ +function wpseoCopyHomeMeta() { + jQuery( '#og_frontpage_desc' ).val( jQuery( '#meta_description' ).val() ); +} + +/** + * Makes sure we store the action hash so we can return to the right hash + */ +function wpseoSetTabHash() { + var conf = jQuery( '#wpseo-conf' ); + if ( conf.length ) { + var currentUrl = conf.attr( 'action' ).split( '#' )[ 0 ]; + conf.attr( 'action', currentUrl + window.location.hash ); + } +} + +/** + * When the hash changes, get the base url from the action and then add the current hash + */ +jQuery( window ).on( 'hashchange', wpseoSetTabHash ); + +/** + * When the hash changes, get the base url from the action and then add the current hash + */ +jQuery( document ).on( 'ready', wpseoSetTabHash ); + +function wpseo_add_fb_admin() { + var target_form = jQuery( '#TB_ajaxContent' ); + + jQuery.post( + ajaxurl, + { + _wpnonce: target_form.find( 'input[name=fb_admin_nonce]' ).val(), + admin_name: target_form.find( 'input[name=fb_admin_name]' ).val(), + admin_id: target_form.find( 'input[name=fb_admin_id]' ).val(), + action: 'wpseo_add_fb_admin' + }, + function( response ) { + var resp = jQuery.parseJSON( response ); + + target_form.find( 'p.notice' ).remove(); + + switch ( resp.success ) { + case 1: + + target_form.find( 'input[type=text]' ).val( '' ); + + jQuery( '#user_admin' ).append( resp.html ); + jQuery( '#connected_fb_admins' ).show(); + tb_remove(); + break; + case 0 : + jQuery( resp.html ).insertAfter( target_form.find( 'h3' ) ); + break; + } + } + ); +} + +function wpseo_recalculate_scores( current_page ) { + var total_count = parseInt( jQuery( '#wpseo_count_total' ).text(), 10 ); + var count_element = jQuery( '#wpseo_count' ); + var progress_bar = jQuery( '#wpseo_progressbar' ); + + // Reset the count element and the progressbar + count_element.text( 0 ); + progress_bar.progressbar( { value: 0 } ); + + var i18n = new YoastSEO.Jed( { + domain: 'js-text-analysis', + locale_data: { + 'js-text-analysis': { + '': {} + } + } + } ); + + /** + * Objects to do the recalculate stuff + * @type {{update_progressbar: Function, calculate_score: Function, parse_response: Function, get_posts_to_recalculate: Function}} + */ + var wpseo_recalculate = { + + /** + * Updates the progressbar and the sum of the posts below it. + * + * @param {int} total_posts + */ + update_progressbar: function( total_posts ) { + var current_value = count_element.text(); + var new_value = parseInt( current_value, 10 ) + total_posts; + var new_width = new_value * (100 / total_count); + + progress_bar.progressbar( 'value', new_width ); + + count_element.html( new_value ); + }, + + /** + * Calculate the scores + * + * @param {int} total_posts + * @param {array} posts + */ + calculate_scores: function( total_posts, posts ) { + var scores = []; + for ( var i = 0; i < total_posts; i++ ) { + var post = posts[ i ]; + var score = wpseo_recalculate.calculate_score( post ); + + scores.push({ post_id: post.post_id, score: score }); + } + + return scores; + }, + + /** + * Passing the post to the analyzer to calculates it's core + * + * @param {Object} post + */ + calculate_score: function( post ) { + post.i18n = i18n; + post.locale = wpseoAdminL10n.locale; + var tmpAnalyzer = new YoastSEO.Analyzer( post ); + tmpAnalyzer.runQueue(); + + return tmpAnalyzer.analyzeScorer.__totalScore; + }, + + /** + * Parse the response given by request in get_posts_to_recalculate. + * + * @param {Object} response + */ + parse_response: function( response ) { + if ( response !== '' && response !== null ) { + if ( response.total_posts !== undefined ) { + var scores = wpseo_recalculate.calculate_scores( response.total_posts, response.posts ); + + wpseo_recalculate.send_scores(scores); + wpseo_recalculate.update_progressbar( response.total_posts ); + } + + if ( response.next_page !== undefined ) { + wpseo_recalculate.get_posts_to_recalculate( response.next_page ); + } + } + }, + + /** + * Sending the scores to the backend + * + * @param {array} scores + */ + send_scores: function( scores ) { + jQuery.post( + ajaxurl, + { + action: 'wpseo_update_score', + nonce: jQuery( '#wpseo_recalculate_nonce' ).val(), + scores: scores + } + ); + }, + + /** + * Getting the posts which have to be recalculated. + * + * @param {int} current_page + */ + get_posts_to_recalculate: function( current_page ) { + jQuery.post( + ajaxurl, + { + action: 'wpseo_recalculate_scores', + nonce: jQuery( '#wpseo_recalculate_nonce' ).val(), + paged: current_page + }, + wpseo_recalculate.parse_response, + 'json' + ); + } + }; + + wpseo_recalculate.get_posts_to_recalculate( current_page ); +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.min.js new file mode 100644 index 00000000..d795d083 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-306.min.js @@ -0,0 +1 @@ +"use strict";function wpseoDetectWrongVariables(a){var b=!1,c="",d=[],e=["userid","name","user_description"],f=["date"],g=["title","parent_title","excerpt","excerpt_only","caption","focuskw","pt_single","pt_plural","modified","id"],h=["term404","searchphrase"],i=["term_title","term_description"],j=["category","category_description","tag","tag_description"];a.hasClass("posttype-template")?d=d.concat(h,i):a.hasClass("homepage-template")?d=d.concat(e,f,g,h,i,j):a.hasClass("taxonomy-template")?d=d.concat(e,f,g,h):a.hasClass("author-template")?d=d.concat(g,f,h,i,j):a.hasClass("date-template")?d=d.concat(e,g,h,i,j):a.hasClass("search-template")?d=d.concat(e,f,g,i,j,["term404"]):a.hasClass("error404-template")&&(d=d.concat(e,f,g,i,j,["searchphrase"])),jQuery.each(d,function(d,e){if(c=a.attr("id")+"-"+e+"-warning",-1!==a.val().search("%%"+e+"%%")){a.addClass("wpseo_variable_warning");var f=wpseoAdminL10n.variable_warning.replace("%s","%%"+e+"%%");jQuery("#"+c).length?jQuery("#"+c).html(f):a.after('
'+f+"
"),b=!0}else jQuery("#"+c).length&&jQuery("#"+c).remove()}),b===!1&&a.removeClass("wpseo_variable_warning")}function setWPOption(a,b,c,d){jQuery.post(ajaxurl,{action:"wpseo_set_option",option:a,newval:b,_wpnonce:d},function(a){a&&jQuery("#"+c).hide()})}function wpseoKillBlockingFiles(a){jQuery.post(ajaxurl,{action:"wpseo_kill_blocking_files",_ajax_nonce:a},function(a){"success"===a?jQuery("#blocking_files").hide():jQuery("#block_files").html(a)})}function wpseoCopyHomeMeta(){jQuery("#og_frontpage_desc").val(jQuery("#meta_description").val())}function wpseoSetTabHash(){var a=jQuery("#wpseo-conf");if(a.length){var b=a.attr("action").split("#")[0];a.attr("action",b+window.location.hash)}}function wpseo_add_fb_admin(){var a=jQuery("#TB_ajaxContent");jQuery.post(ajaxurl,{_wpnonce:a.find("input[name=fb_admin_nonce]").val(),admin_name:a.find("input[name=fb_admin_name]").val(),admin_id:a.find("input[name=fb_admin_id]").val(),action:"wpseo_add_fb_admin"},function(b){var c=jQuery.parseJSON(b);switch(a.find("p.notice").remove(),c.success){case 1:a.find("input[type=text]").val(""),jQuery("#user_admin").append(c.html),jQuery("#connected_fb_admins").show(),tb_remove();break;case 0:jQuery(c.html).insertAfter(a.find("h3"))}})}function wpseo_recalculate_scores(a){var b=parseInt(jQuery("#wpseo_count_total").text(),10),c=jQuery("#wpseo_count"),d=jQuery("#wpseo_progressbar");c.text(0),d.progressbar({value:0});var e=new YoastSEO.Jed({domain:"js-text-analysis",locale_data:{"js-text-analysis":{"":{}}}}),f={update_progressbar:function(a){var e=c.text(),f=parseInt(e,10)+a,g=f*(100/b);d.progressbar("value",g),c.html(f)},calculate_scores:function(a,b){for(var c=[],d=0;a>d;d++){var e=b[d],g=f.calculate_score(e);c.push({post_id:e.post_id,score:g})}return c},calculate_score:function(a){a.i18n=e,a.locale=wpseoAdminL10n.locale;var b=new YoastSEO.Analyzer(a);return b.runQueue(),b.analyzeScorer.__totalScore},parse_response:function(a){if(""!==a&&null!==a){if(void 0!==a.total_posts){var b=f.calculate_scores(a.total_posts,a.posts);f.send_scores(b),f.update_progressbar(a.total_posts)}void 0!==a.next_page&&f.get_posts_to_recalculate(a.next_page)}},send_scores:function(a){jQuery.post(ajaxurl,{action:"wpseo_update_score",nonce:jQuery("#wpseo_recalculate_nonce").val(),scores:a})},get_posts_to_recalculate:function(a){jQuery.post(ajaxurl,{action:"wpseo_recalculate_scores",nonce:jQuery("#wpseo_recalculate_nonce").val(),paged:a},f.parse_response,"json")}};f.get_posts_to_recalculate(a)}jQuery(document).ready(function(){jQuery(".screen-meta-toggle a").click(function(){jQuery("#sidebar-container").toggle()}),jQuery("#enablexmlsitemap").change(function(){jQuery("#sitemapinfo").toggle(jQuery(this).is(":checked"))}).change(),jQuery("#breadcrumbs-enable").change(function(){jQuery("#breadcrumbsinfo").toggle(jQuery(this).is(":checked"))}).change(),jQuery("#disable_author_sitemap").change(function(){jQuery("#xml_user_block").toggle(!jQuery(this).is(":checked"))}).change(),jQuery("#cleanpermalinks").change(function(){jQuery("#cleanpermalinksdiv").toggle(jQuery(this).is(":checked"))}).change(),jQuery("#wpseo-tabs").find("a").click(function(){jQuery("#wpseo-tabs").find("a").removeClass("nav-tab-active"),jQuery(".wpseotab").removeClass("active");var a=jQuery(this).attr("id").replace("-tab","");jQuery("#"+a).addClass("active"),jQuery(this).addClass("nav-tab-active")}),jQuery("#company_or_person").change(function(){var a=jQuery(this).val();"company"===a?(jQuery("#knowledge-graph-company").show(),jQuery("#knowledge-graph-person").hide()):"person"===a?(jQuery("#knowledge-graph-company").hide(),jQuery("#knowledge-graph-person").show()):(jQuery("#knowledge-graph-company").hide(),jQuery("#knowledge-graph-person").hide())}).change(),jQuery(".template").change(function(){wpseoDetectWrongVariables(jQuery(this))}).change();var a=window.location.hash.replace("#top#","");(""===a||"#_=_"===a)&&(a=jQuery(".wpseotab").attr("id")),jQuery("#"+a).addClass("active"),jQuery("#"+a+"-tab").addClass("nav-tab-active"),jQuery(".nav-tab-active").click();var b=jQuery("#wpseo_recalculate_link");void 0!==b&&(b.click(function(){wpseo_recalculate_scores(1)}),b.data("open")&&b.trigger("click"))}),jQuery(window).on("hashchange",wpseoSetTabHash),jQuery(document).on("ready",wpseoSetTabHash); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.js new file mode 100644 index 00000000..434bfe89 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.js @@ -0,0 +1,96 @@ +/* global ajaxurl */ +/* jshint -W097 */ +/* jshint unused:false */ +'use strict'; +/** + * Used to dismiss the after-update admin notice for a specific user until the next update. + * + * @param {string} nonce + */ +function wpseoDismissAbout( nonce ) { + jQuery.post( ajaxurl, { + action: 'wpseo_dismiss_about', + _wpnonce: nonce + } + ); +} + +/** + * Used to dismiss the tagline notice for a specific user. + * + * @param {string} nonce + */ +function wpseoDismissTaglineNotice( nonce ) { + jQuery.post( ajaxurl, { + action: 'wpseo_dismiss_tagline_notice', + _wpnonce: nonce + } + ); +} + +/** + * Used to remove the admin notices for several purposes, dies on exit. + * + * @param {string} option + * @param {string} hide + * @param {string} nonce + */ +function wpseoSetIgnore( option, hide, nonce ) { + jQuery.post( ajaxurl, { + action: 'wpseo_set_ignore', + option: option, + _wpnonce: nonce + }, function( data ) { + if ( data ) { + jQuery( '#' + hide ).hide(); + jQuery( '#hidden_ignore_' + option ).val( 'ignore' ); + } + } + ); +} + +/** + * Make the notices dismissible (again) + */ +function wpseoMakeDismissible() { + jQuery( '.notice.is-dismissible' ).each( function() { + var $notice = jQuery( this ); + if ( $notice.find( '.notice-dismiss').empty() ) { + var $button = jQuery( '' ); + + $notice.append( $button ); + + $button.on( 'click.wp-dismiss-notice', function( ev ) { + ev.preventDefault(); + $notice.fadeTo( 100 , 0, function() { + jQuery(this).slideUp( 100, function() { + jQuery(this).remove(); + }); + }); + }); + } + }); +} + +jQuery( document ).ready( function() { + jQuery( '#wpseo-dismiss-about > .notice-dismiss' ).click( function() { + wpseoDismissAbout( jQuery( '#wpseo-dismiss-about' ).data( 'nonce' ) ); + }); + + jQuery( '#wpseo-dismiss-tagline-notice > .notice-dismiss').click( function() { + wpseoDismissTaglineNotice( jQuery( '#wpseo-dismiss-tagline-notice').data( 'nonce' ) ); + }); + + jQuery( '.yoast-dismissible > .notice-dismiss').click( function() { + var parent_div = jQuery( this ).parent('.yoast-dismissible'); + + jQuery.post( + ajaxurl, + { + action: parent_div.attr( 'id').replace( /-/g, '_' ), + _wpnonce: parent_div.data( 'nonce' ), + data: parent_div.data( 'json' ) + } + ); + }); +}); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.min.js new file mode 100644 index 00000000..5196dd50 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-global-302.min.js @@ -0,0 +1 @@ +"use strict";function wpseoDismissAbout(a){jQuery.post(ajaxurl,{action:"wpseo_dismiss_about",_wpnonce:a})}function wpseoDismissTaglineNotice(a){jQuery.post(ajaxurl,{action:"wpseo_dismiss_tagline_notice",_wpnonce:a})}function wpseoSetIgnore(a,b,c){jQuery.post(ajaxurl,{action:"wpseo_set_ignore",option:a,_wpnonce:c},function(c){c&&(jQuery("#"+b).hide(),jQuery("#hidden_ignore_"+a).val("ignore"))})}function wpseoMakeDismissible(){jQuery(".notice.is-dismissible").each(function(){var a=jQuery(this);if(a.find(".notice-dismiss").empty()){var b=jQuery('');a.append(b),b.on("click.wp-dismiss-notice",function(b){b.preventDefault(),a.fadeTo(100,0,function(){jQuery(this).slideUp(100,function(){jQuery(this).remove()})})})}})}jQuery(document).ready(function(){jQuery("#wpseo-dismiss-about > .notice-dismiss").click(function(){wpseoDismissAbout(jQuery("#wpseo-dismiss-about").data("nonce"))}),jQuery("#wpseo-dismiss-tagline-notice > .notice-dismiss").click(function(){wpseoDismissTaglineNotice(jQuery("#wpseo-dismiss-tagline-notice").data("nonce"))}),jQuery(".yoast-dismissible > .notice-dismiss").click(function(){var a=jQuery(this).parent(".yoast-dismissible");jQuery.post(ajaxurl,{action:a.attr("id").replace(/-/g,"_"),_wpnonce:a.data("nonce"),data:a.data("json")})})}); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.js new file mode 100644 index 00000000..02122722 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.js @@ -0,0 +1,109 @@ +/* jshint unused:false */ +/* global ajaxurl */ +/* global tb_remove */ +jQuery( function() { + 'use strict'; + + jQuery('#gsc_auth_code').click( + function() { + var auth_url = jQuery('#gsc_auth_url').val(), + w = 600, + h = 500, + left = (screen.width / 2) - (w / 2), + top = (screen.height / 2) - (h / 2); + return window.open(auth_url, 'wpseogscauthcode', 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left); + } + ); +}); + +function wpseo_gsc_post_redirect() { + 'use strict'; + + var target_form = jQuery( '#TB_ajaxContent' ); + var old_url = jQuery( target_form ).find('input[name=current_url]').val(); + var is_checked = jQuery( target_form ).find('input[name=mark_as_fixed]').prop('checked'); + + jQuery.post( + ajaxurl, + { + action: 'wpseo_gsc_create_redirect_url', + ajax_nonce: jQuery('.wpseo-gsc-ajax-security').val(), + old_url: old_url, + new_url: jQuery( target_form ).find('input[name=new_url]').val(), + mark_as_fixed: is_checked, + platform: jQuery('#field_platform').val(), + category: jQuery('#field_category').val(), + type: '301' + }, + function() { + if( is_checked === true ) { + // Remove the row with old url + jQuery('span:contains("' + old_url + '")').closest('tr').remove(); + } + + // Remove the thickbox + tb_remove(); + } + ); + + return false; +} + +function wpseo_update_category_count(category) { + 'use strict'; + + var count_element = jQuery('#gsc_count_' + category + ''); + var new_count = parseInt( count_element.text() , 10) - 1; + if(new_count < 0) { + new_count = 0; + } + + count_element.text(new_count); +} + +function wpseo_mark_as_fixed(url) { + 'use strict'; + + jQuery.post( + ajaxurl, + { + action: 'wpseo_mark_fixed_crawl_issue', + ajax_nonce: jQuery('.wpseo-gsc-ajax-security').val(), + platform: jQuery('#field_platform').val(), + category: jQuery('#field_category').val(), + url: url + }, + function(response) { + if ('true' === response) { + wpseo_update_category_count(jQuery('#field_category').val()); + jQuery('span:contains("' + url + '")').closest('tr').remove(); + } + } + ); +} + +jQuery( document ).ready( function() { + 'use strict'; + jQuery('a.gsc_category').qtip( + { + content: { + attr: 'title' + }, + position: { + my: 'bottom left', + at: 'top center' + }, + style: { + tip: { + corner: true + }, + classes: 'yoast-qtip qtip-rounded qtip-blue' + }, + show: 'mouseenter', + hide: { + fixed: true, + delay: 500 + } + } + ); +}); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.min.js new file mode 100644 index 00000000..967da114 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-gsc-302.min.js @@ -0,0 +1 @@ +function wpseo_gsc_post_redirect(){"use strict";var a=jQuery("#TB_ajaxContent"),b=jQuery(a).find("input[name=current_url]").val(),c=jQuery(a).find("input[name=mark_as_fixed]").prop("checked");return jQuery.post(ajaxurl,{action:"wpseo_gsc_create_redirect_url",ajax_nonce:jQuery(".wpseo-gsc-ajax-security").val(),old_url:b,new_url:jQuery(a).find("input[name=new_url]").val(),mark_as_fixed:c,platform:jQuery("#field_platform").val(),category:jQuery("#field_category").val(),type:"301"},function(){c===!0&&jQuery('span:contains("'+b+'")').closest("tr").remove(),tb_remove()}),!1}function wpseo_update_category_count(a){"use strict";var b=jQuery("#gsc_count_"+a),c=parseInt(b.text(),10)-1;0>c&&(c=0),b.text(c)}function wpseo_mark_as_fixed(a){"use strict";jQuery.post(ajaxurl,{action:"wpseo_mark_fixed_crawl_issue",ajax_nonce:jQuery(".wpseo-gsc-ajax-security").val(),platform:jQuery("#field_platform").val(),category:jQuery("#field_category").val(),url:a},function(b){"true"===b&&(wpseo_update_category_count(jQuery("#field_category").val()),jQuery('span:contains("'+a+'")').closest("tr").remove())})}jQuery(function(){"use strict";jQuery("#gsc_auth_code").click(function(){var a=jQuery("#gsc_auth_url").val(),b=600,c=500,d=screen.width/2-b/2,e=screen.height/2-c/2;return window.open(a,"wpseogscauthcode","toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width="+b+", height="+c+", top="+e+", left="+d)})}),jQuery(document).ready(function(){"use strict";jQuery("a.gsc_category").qtip({content:{attr:"title"},position:{my:"bottom left",at:"top center"},style:{tip:{corner:!0},classes:"yoast-qtip qtip-rounded qtip-blue"},show:"mouseenter",hide:{fixed:!0,delay:500}})}); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.js new file mode 100644 index 00000000..4832a3aa --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.js @@ -0,0 +1,31 @@ +/* global wpseoMediaL10n */ +/* global ajaxurl */ +/* global wp */ +/* jshint -W097 */ +/* jshint -W003 */ +/* jshint unused:false */ +'use strict'; +// Taken and adapted from http://www.webmaster-source.com/2013/02/06/using-the-wordpress-3-5-media-uploader-in-your-plugin-or-theme/ +jQuery(document).ready( + function($) { + $('.wpseo_image_upload_button').each(function(index, element) { + var wpseo_target_id = $(element).attr('id').replace(/_button$/, ''); + var wpseo_custom_uploader = wp.media.frames.file_frame = wp.media({ + title: wpseoMediaL10n.choose_image, + button: { text: wpseoMediaL10n.choose_image }, + multiple: false + }); + + wpseo_custom_uploader.on( 'select', function() { + var attachment = wpseo_custom_uploader.state().get( 'selection' ).first().toJSON(); + $( '#' + wpseo_target_id ).val( attachment.url ); + } + ); + + $(element).click( function( e ) { + e.preventDefault(); + wpseo_custom_uploader.open(); + } ); + } ); + } +); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.min.js new file mode 100644 index 00000000..fdaf506a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-admin-media-302.min.js @@ -0,0 +1 @@ +"use strict";jQuery(document).ready(function(a){a(".wpseo_image_upload_button").each(function(b,c){var d=a(c).attr("id").replace(/_button$/,""),e=wp.media.frames.file_frame=wp.media({title:wpseoMediaL10n.choose_image,button:{text:wpseoMediaL10n.choose_image},multiple:!1});e.on("select",function(){var b=e.state().get("selection").first().toJSON();a("#"+d).val(b.url)}),a(c).click(function(a){a.preventDefault(),e.open()})})}); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-bulk-editor.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-bulk-editor.js index 2cca6879..04f47262 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-bulk-editor.js +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-bulk-editor.js @@ -57,8 +57,16 @@ var bulk_editor = function( current_table ) { } }, +<<<<<<< .mine + submit_all: function( ev ) { + ev.preventDefault(); +||||||| .r11156 + submit_all: function (event) { + event.preventDefault(); +======= submit_all: function( event ) { event.preventDefault(); +>>>>>>> .r12027 var data = { action: save_all_method, @@ -135,12 +143,28 @@ var bulk_editor = function( current_table ) { current_table.find( '.wpseo-save-all' ).click( instance.submit_all ); +<<<<<<< .mine + current_table.find( options.new_class ).keypress( + function( ev ) { + if ( ev.which === 13 ) { + ev.preventDefault(); + var id = jQuery( this ).data( 'id' ); + instance.submit_new( id, this ); +||||||| .r11156 + current_table.find(options.new_class).keypress( + function (event) { + if (event.which == 13) { + event.preventDefault(); + var id = jQuery(this).data('id'); + instance.submit_new(id, this); +======= current_table.find( options.new_class ).keypress( function( event ) { if ( event.which === 13 ) { event.preventDefault(); var id = jQuery( this ).data( 'id' ); instance.submit_new( id, this ); +>>>>>>> .r12027 } } ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.js new file mode 100644 index 00000000..9319b5a1 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.js @@ -0,0 +1,24 @@ +/* jshint strict:true */ +/* global ajaxurl */ +/* global wpseo_export_nonce */ +jQuery( document ).ready( function( $ ) { + 'use strict'; + $( '#export-button' ).click( function( ev ) { + $.post( ajaxurl, { + action: 'wpseo_export', + _wpnonce: wpseo_export_nonce, + include_taxonomy: $( '#include_taxonomy_meta' ).is( ':checked' ) + }, function( resp ) { + resp = JSON.parse( resp ); + var dclass = 'error'; + if ( resp.status === 'success' ) { + dclass = 'updated'; + } + $( '#wpseo-title' ).append( '
' + resp.msg + '
' ); + } + ); + ev.preventDefault(); + } + ); + } +); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.min.js new file mode 100644 index 00000000..1fa03c76 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-export-302.min.js @@ -0,0 +1 @@ +jQuery(document).ready(function(a){"use strict";a("#export-button").click(function(b){a.post(ajaxurl,{action:"wpseo_export",_wpnonce:wpseo_export_nonce,include_taxonomy:a("#include_taxonomy_meta").is(":checked")},function(b){b=JSON.parse(b);var c="error";"success"===b.status&&(c="updated"),a("#wpseo-title").append('
'+b.msg+"
")}),b.preventDefault()})}); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.js new file mode 100644 index 00000000..6ae61abb --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.js @@ -0,0 +1,161 @@ +/* global wp */ +/* global removeThumb:true */ +/* global wpseoFeaturedImageL10n */ +/* global YoastSEO */ +/* jshint -W097 */ +/* jshint -W003 */ +'use strict'; +(function( $ ) { + var featuredImagePlugin; + var featuredImageElement; + + var FeaturedImagePlugin = function() { + this.featuredImage = null; + this.pluginName = 'addFeaturedImagePlugin'; + }; + + /** + * Set's the featured image to use in the analysis + * + * @param {String} featuredImage + */ + FeaturedImagePlugin.prototype.setFeaturedImage = function( featuredImage ) { + this.featuredImage = featuredImage; + + YoastSEO.app.pluginReloaded( this.pluginName ); + }; + + /** + * Removes featured image and reloads analyzer + */ + FeaturedImagePlugin.prototype.removeFeaturedImage = function() { + this.setFeaturedImage( null ); + }; + + /** + * Registers this plugin to YoastSEO + */ + FeaturedImagePlugin.prototype.registerPlugin = function() { + YoastSEO.app.registerPlugin( this.pluginName, { status: 'ready' } ); + }; + + /** + * Registers modifications to YoastSEO + */ + FeaturedImagePlugin.prototype.registerModifications = function() { + YoastSEO.app.registerModification( 'content', this.addImageToContent.bind( this ), this.pluginName, 10 ); + }; + + /** + * Adds featured image to sort so it can be analyzed + * + * @param {String} content + * @returns {String} + */ + FeaturedImagePlugin.prototype.addImageToContent = function( content ) { + if ( null !== this.featuredImage ) { + content += this.featuredImage; + } + + return content; + }; + + $( document ).ready( function() { + var featuredImage = wp.media.featuredImage.frame(); + + featuredImagePlugin = new FeaturedImagePlugin(); + featuredImagePlugin.registerPlugin(); + featuredImagePlugin.registerModifications(); + + featuredImage.on( 'select', function() { + var selectedImageHTML, selectedImage, alt; + yst_checkFeaturedImage( featuredImage ); + + selectedImage = featuredImage.state().get( 'selection' ).first(); + + // WordPress falls back to the title for the alt attribute if no alt is present. + alt = selectedImage.get( 'alt' ); + if ( '' === alt ) { + alt = selectedImage.get( 'title' ); + } + + selectedImageHTML = ''; + + featuredImagePlugin.setFeaturedImage( selectedImageHTML ); + }); + + $( '#postimagediv' ).on( 'click', '#remove-post-thumbnail', function() { + featuredImagePlugin.removeFeaturedImage(); + }); + + featuredImageElement = $( '#set-post-thumbnail > img' ); + if ( 'undefined' !== typeof featuredImageElement.prop( 'src' ) ) { + featuredImagePlugin.setFeaturedImage( $( '#set-post-thumbnail ' ).html() ); + } + }); +}( jQuery )); + +/** + * Check if image is smaller than 200x200 pixels. If this is the case, show a warning + * @param {object} featuredImage + */ +function yst_checkFeaturedImage( featuredImage ) { + var attachment = featuredImage.state().get( 'selection' ).first().toJSON(); + + if ( attachment.width < 200 || attachment.height < 200 ) { + //Show warning to user and do not add image to OG + if ( !document.getElementById( 'yst_opengraph_image_warning' ) ) { + jQuery( '
' + wpseoFeaturedImageL10n.featured_image_notice + '
' ).insertBefore( '#postimagediv' ); + document.getElementById( 'postimagediv' ).style.border = 'solid #dd3d36'; + document.getElementById( 'postimagediv' ).style.borderWidth = '3px 4px 4px 4px'; + } + } + + yst_overrideElemFunction(); +} + +/** + * Counter to make sure we do not end up in an endless loop if there' no remove-post-thumbnail id + * @type {number} + */ +var thumbIdCounter = 0; + +/** + * Variable to hold the onclick function for remove-post-thumbnail. + * @type {function} + */ +var removeThumb; + +/** + * If there's a remove-post-thumbnail id, add an onclick. When this id is clicked, call yst_removeOpengraphWarning + * If not, check again after 100ms. Do not do this for more than 10 times so we do not end up in an endless loop + */ +function yst_overrideElemFunction() { + if ( document.getElementById( 'remove-post-thumbnail' ) != null ) { + thumbIdCounter = 0; + removeThumb = document.getElementById( 'remove-post-thumbnail' ).onclick; // This variable is needed for core functionality to work + document.getElementById( 'remove-post-thumbnail' ).onclick = yst_removeOpengraphWarning; + } + else { + thumbIdCounter++; + if ( thumbIdCounter < 10 ) { + setTimeout( yst_overrideElemFunction, 100 ); + } + } +} + +/** + * Remove error message + */ +function yst_removeOpengraphWarning() { + jQuery( '#yst_opengraph_image_warning' ).remove(); + document.getElementById( 'postimagediv' ).style.border = 'none'; + + //Make sure the original function does its work + removeThumb(); +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.min.js new file mode 100644 index 00000000..a5fc2395 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-featured-image-302.min.js @@ -0,0 +1 @@ +"use strict";function yst_checkFeaturedImage(a){var b=a.state().get("selection").first().toJSON();(b.width<200||b.height<200)&&(document.getElementById("yst_opengraph_image_warning")||(jQuery('
'+wpseoFeaturedImageL10n.featured_image_notice+"
").insertBefore("#postimagediv"),document.getElementById("postimagediv").style.border="solid #dd3d36",document.getElementById("postimagediv").style.borderWidth="3px 4px 4px 4px")),yst_overrideElemFunction()}function yst_overrideElemFunction(){null!=document.getElementById("remove-post-thumbnail")?(thumbIdCounter=0,removeThumb=document.getElementById("remove-post-thumbnail").onclick,document.getElementById("remove-post-thumbnail").onclick=yst_removeOpengraphWarning):(thumbIdCounter++,10>thumbIdCounter&&setTimeout(yst_overrideElemFunction,100))}function yst_removeOpengraphWarning(){jQuery("#yst_opengraph_image_warning").remove(),document.getElementById("postimagediv").style.border="none",removeThumb()}!function(a){var b,c,d=function(){this.featuredImage=null,this.pluginName="addFeaturedImagePlugin"};d.prototype.setFeaturedImage=function(a){this.featuredImage=a,YoastSEO.app.pluginReloaded(this.pluginName)},d.prototype.removeFeaturedImage=function(){this.setFeaturedImage(null)},d.prototype.registerPlugin=function(){YoastSEO.app.registerPlugin(this.pluginName,{status:"ready"})},d.prototype.registerModifications=function(){YoastSEO.app.registerModification("content",this.addImageToContent.bind(this),this.pluginName,10)},d.prototype.addImageToContent=function(a){return null!==this.featuredImage&&(a+=this.featuredImage),a},a(document).ready(function(){var e=wp.media.featuredImage.frame();b=new d,b.registerPlugin(),b.registerModifications(),e.on("select",function(){var a,c,d;yst_checkFeaturedImage(e),c=e.state().get("selection").first(),d=c.get("alt"),""===d&&(d=c.get("title")),a='',b.setFeaturedImage(a)}),a("#postimagediv").on("click","#remove-post-thumbnail",function(){b.removeFeaturedImage()}),c=a("#set-post-thumbnail > img"),"undefined"!=typeof c.prop("src")&&b.setFeaturedImage(a("#set-post-thumbnail ").html())})}(jQuery);var thumbIdCounter=0,removeThumb; \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.js new file mode 100644 index 00000000..57c8b1d7 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.js @@ -0,0 +1,323 @@ +/* browser:true */ +/* global tb_show */ +(function( $ ) { + 'use strict'; + + window.wpseo_init_tabs = function() { + if ( jQuery( '.wpseo-metabox-tabs-div' ).length > 0 ) { + var active_tab = window.location.hash; + if ( active_tab === '' || active_tab.search( 'wpseo' ) === -1 ) { + active_tab = 'content'; + } + else { + active_tab = active_tab.replace( '#wpseo_', '' ); + } + jQuery( '.' + active_tab ).addClass( 'active' ); + + jQuery( '.wpseo-metabox-tabs' ).on( 'click', 'a.wpseo_tablink', function( ev ) { + ev.preventDefault(); + + jQuery( '.wpseo-meta-section.active .wpseo-metabox-tabs li' ).removeClass( 'active' ); + jQuery( '.wpseo-meta-section.active .wpseotab' ).removeClass( 'active' ); + + var targetElem = jQuery( jQuery( this ).attr( 'href' ) ); + targetElem.addClass( 'active' ); + jQuery( this ).parent( 'li' ).addClass( 'active' ); + + if ( jQuery( this ).hasClass( 'scroll' ) ) { + jQuery( 'html, body' ).animate( { + scrollTop: jQuery( targetElem ).offset().top + }, 500 + ); + } + } + ); + } + + if ( jQuery( '.wpseo-meta-section' ).length > 0 ) { + var active_page = window.location.hash; + if ( active_page === '' || active_page.search( 'wpseo' ) === -1 ) { + active_page = 'content'; + } + else { + active_page = active_page.replace( '#wpseo-meta-section-', '' ); + } + jQuery( '#wpseo-meta-section-' + active_page ).addClass( 'active' ); + jQuery( '.wpseo-metabox-sidebar li').filter( function() { + return jQuery( this ).find('.wpseo-meta-section-link').attr( 'href' ) === '#wpseo-meta-section-' + active_page; + } ).addClass('active'); + + jQuery( 'a.wpseo-meta-section-link' ).click( function( ev ) { + ev.preventDefault(); + + jQuery( '.wpseo-metabox-sidebar li' ).removeClass( 'active' ); + jQuery( '.wpseo-meta-section' ).removeClass( 'active' ); + + var targetElem = jQuery( jQuery( this ).attr( 'href' ) ); + targetElem.addClass( 'active' ); + + jQuery( this ).parent( 'li' ).addClass( 'active' ); + } + ); + } + + jQuery( '.wpseo-heading' ).hide(); + jQuery( '.wpseo-metabox-tabs' ).show(); + // End Tabs code + + jQuery( '.yoast_help' ).qtip( + { + content: { + attr: 'alt' + }, + position: { + my: 'bottom left', + at: 'top center' + }, + style: { + tip: { + corner: true + }, + classes: 'yoast-qtip qtip-rounded qtip-blue' + }, + show: 'click', + hide: { + fixed: true, + delay: 500 + } + + } + ); + }; + + /** + * Adds keyword popup if the template for it is found + */ + function initAddKeywordPopup() { + // If add keyword popup exists bind it to the add keyword button + if ( 1 === $( '#wpseo-add-keyword-popup' ).length ) { + $( '.wpseo-add-keyword' ).on( 'click', addKeywordPopup ); + } + } + + /** + * Shows a informational popup if someone click the add keyword button + */ + function addKeywordPopup() { + var title = $( '#wpseo-add-keyword-popup' ).find( 'h3' ).html(); + + tb_show( title, '#TB_inline?width=650&height=350&inlineId=wpseo-add-keyword-popup', 'group' ); + + // The container window isn't the correct size, rectify this. + jQuery( '#TB_window' ).css( 'height', 235 ); + jQuery( '#TB_window' ).css( 'width', 680 ); + } + + jQuery( document ).ready( function() { + jQuery( '.wpseo-meta-section').each( function( _, el ) { + jQuery( el ).find( '.wpseo-metabox-tabs li:first' ).addClass( 'active' ); + jQuery( el ).find( '.wpseotab:first' ).addClass( 'active' ); + }); + window.wpseo_init_tabs(); + + initAddKeywordPopup(); + }); +}( jQuery )); + +/* jshint ignore:start */ +/** + * Cleans up a string, removing script tags etc. + * + * @deprecated since version 3.0 + * + * @param {string} str + * @returns {string} + */ +function ystClean( str ) { + console.error( 'ystClean is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return str; +} + +/** + * Tests whether given element `str` matches `p`. + * + * @deprecated since version 3.0 + * + * @param {string} str The string to match + * @param {RegExp} p The regex to match + * @returns {string} + */ +function ystFocusKwTest( str, p ) { + console.error( 'ystFocusKwTest is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return ''; +} + +/** + * The function name says it all, removes lower case diacritics + * + * @deprecated since version 3.0 + * + * @param {string} str + * @returns {string} + */ +function ystRemoveLowerCaseDiacritics( str ) { + console.error( 'ystRemoveLowerCaseDiacritics is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return str; +} + +/** + * Tests whether the focus keyword is used in title, body and description + * + * @deprecated since version 3.0 + */ +function ystTestFocusKw() { + console.error( 'ystTestFocusKw is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * This callback is used for variable replacement + * + * This is done through a callback as it _could_ be that `ystReplaceVariables` has to do an AJAX request. + * + * @callback replaceVariablesCallback + * @param {string} str The string with the replaced variables in it + */ + +/** + * Replaces variables either with values from wpseoMetaboxL10n, by grabbing them from the page or (ultimately) getting them through AJAX + * + * @deprecated since version 3.0 + * + * @param {string} str The string with variables to be replaced + * @param {replaceVariablesCallback} callback Callback function for when the + */ +function ystReplaceVariables( str, callback ) { + console.error( 'ystReplaceVariables is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + callback( str ); +} + +/** + * Replace a variable with a string, through an AJAX call to WP + * + * @deprecated since version 3.0 + * + * @param {string} replaceableVar + * @param {replaceVariablesCallback} callback + */ +function ystAjaxReplaceVariables( replaceableVar, callback ) { + console.error( 'ystAjaxReplaceVariables is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * Updates the title in the snippet preview + * + * @deprecated since version 3.0 + * + * @param {boolean} [force = false] + */ +function ystUpdateTitle( force ) { + console.error( 'ystUpdateTitle is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * Cleans the title before use + * + * @deprecated since version 3.0 + * + * @param {string} title + * @returns {string} + */ +function ystSanitizeTitle( title ) { + console.error( 'ystSanitizeTitle is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return title; +} + +/** + * Updates the meta description in the snippet preview + * + * @deprecated since version 3.0 + */ +function ystUpdateDesc() { + console.error( 'ystUpdateDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * Sanitized the description + * + * @deprecated since version 3.0 + * + * @param {string} desc + * @returns {string} + */ +function ystSanitizeDesc( desc ) { + console.error( 'ystSanitizeDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return desc; +} + +/** + * Trims the description to the desired length + * + * @deprecated since version 3.0 + * + * @param {string} desc + * @returns {string} + */ +function ystTrimDesc( desc ) { + console.error( 'ystTrimDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return desc; +} + +/** + * Updates the URL in the snippet preview + * + * @deprecated since version 3.0 + */ +function ystUpdateURL() { + console.error( 'ystUpdateURL is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * Bolds the keywords in a string + * + * @deprecated since version 3.0 + * + * @param {string} str + * @param {boolean} url + * @returns {string} + */ +function ystBoldKeywords( str, url ) { + console.error( 'ystBoldKeywords is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return str; +} + +/** + * Updates the entire snippet preview + * + * @deprecated since version 3.0 + */ +function ystUpdateSnippet() { + console.error( 'ystUpdateSnippet is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); +} + +/** + * Escapres the focus keyword + * + * @deprecated since version 3.0 + * + * @param {string} str + * @returns {string} + */ +function ystEscapeFocusKw( str ) { + console.error( 'ystEscapeFocusKw is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.' ); + + return str; +} +/* jshint ignore:end */ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.min.js new file mode 100644 index 00000000..c3b4a201 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-metabox-302.min.js @@ -0,0 +1 @@ +function ystClean(a){return console.error("ystClean is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystFocusKwTest(a,b){return console.error("ystFocusKwTest is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),""}function ystRemoveLowerCaseDiacritics(a){return console.error("ystRemoveLowerCaseDiacritics is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystTestFocusKw(){console.error("ystTestFocusKw is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystReplaceVariables(a,b){console.error("ystReplaceVariables is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),b(a)}function ystAjaxReplaceVariables(a,b){console.error("ystAjaxReplaceVariables is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystUpdateTitle(a){console.error("ystUpdateTitle is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystSanitizeTitle(a){return console.error("ystSanitizeTitle is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystUpdateDesc(){console.error("ystUpdateDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystSanitizeDesc(a){return console.error("ystSanitizeDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystTrimDesc(a){return console.error("ystTrimDesc is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystUpdateURL(){console.error("ystUpdateURL is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystBoldKeywords(a,b){return console.error("ystBoldKeywords is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}function ystUpdateSnippet(){console.error("ystUpdateSnippet is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead.")}function ystEscapeFocusKw(a){return console.error("ystEscapeFocusKw is deprecated since Yoast SEO 3.0, use YoastSEO.js functionality instead."),a}!function(a){"use strict";function b(){1===a("#wpseo-add-keyword-popup").length&&a(".wpseo-add-keyword").on("click",c)}function c(){var b=a("#wpseo-add-keyword-popup").find("h3").html();tb_show(b,"#TB_inline?width=650&height=350&inlineId=wpseo-add-keyword-popup","group"),jQuery("#TB_window").css("height",235),jQuery("#TB_window").css("width",680)}window.wpseo_init_tabs=function(){if(jQuery(".wpseo-metabox-tabs-div").length>0){var a=window.location.hash;a=""===a||-1===a.search("wpseo")?"content":a.replace("#wpseo_",""),jQuery("."+a).addClass("active"),jQuery(".wpseo-metabox-tabs").on("click","a.wpseo_tablink",function(a){a.preventDefault(),jQuery(".wpseo-meta-section.active .wpseo-metabox-tabs li").removeClass("active"),jQuery(".wpseo-meta-section.active .wpseotab").removeClass("active");var b=jQuery(jQuery(this).attr("href"));b.addClass("active"),jQuery(this).parent("li").addClass("active"),jQuery(this).hasClass("scroll")&&jQuery("html, body").animate({scrollTop:jQuery(b).offset().top},500)})}if(jQuery(".wpseo-meta-section").length>0){var b=window.location.hash;b=""===b||-1===b.search("wpseo")?"content":b.replace("#wpseo-meta-section-",""),jQuery("#wpseo-meta-section-"+b).addClass("active"),jQuery(".wpseo-metabox-sidebar li").filter(function(){return jQuery(this).find(".wpseo-meta-section-link").attr("href")==="#wpseo-meta-section-"+b}).addClass("active"),jQuery("a.wpseo-meta-section-link").click(function(a){a.preventDefault(),jQuery(".wpseo-metabox-sidebar li").removeClass("active"),jQuery(".wpseo-meta-section").removeClass("active");var b=jQuery(jQuery(this).attr("href"));b.addClass("active"),jQuery(this).parent("li").addClass("active")})}jQuery(".wpseo-heading").hide(),jQuery(".wpseo-metabox-tabs").show(),jQuery(".yoast_help").qtip({content:{attr:"alt"},position:{my:"bottom left",at:"top center"},style:{tip:{corner:!0},classes:"yoast-qtip qtip-rounded qtip-blue"},show:"click",hide:{fixed:!0,delay:500}})},jQuery(document).ready(function(){jQuery(".wpseo-meta-section").each(function(a,b){jQuery(b).find(".wpseo-metabox-tabs li:first").addClass("active"),jQuery(b).find(".wpseotab:first").addClass("active")}),window.wpseo_init_tabs(),b()})}(jQuery); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.js new file mode 100644 index 00000000..ef14d42e --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.js @@ -0,0 +1,530 @@ +/* global YoastSEO, tinyMCE, wp, ajaxurl, wpseoPostScraperL10n, YoastShortcodePlugin, YoastReplaceVarPlugin, console */ +(function( $ ) { + 'use strict'; + + var currentKeyword = ''; + + /** + * wordpress scraper to gather inputfields. + * @constructor + */ + var PostScraper = function() { + if ( typeof CKEDITOR === 'object' ) { + console.warn( 'YoastSEO currently doesn\'t support ckEditor. The content analysis currently only works with the HTML editor or TinyMCE.' ); + } + + this.prepareSlugBinding(); + }; + + /** + * On a new post, WordPress doesn't include the slug editor, since a post has not been given a slug yet. + * As soon as a title is chosen, an `after-autosave.update-post-slug` event fires that triggers an AJAX request + * to the server to generate a slug. On the response callback a slug editor is inserted into the page on which + * we can bind our Snippet Preview. + * + * On existing posts, the slug editor is already there and we can bind immediately. + */ + PostScraper.prototype.prepareSlugBinding = function() { + if ( document.getElementById( 'editable-post-name' ) === null ) { + var that = this; + jQuery( document ).on( 'after-autosave.update-post-slug', function() { + that.bindSnippetCiteEvents( 0 ); + }); + } else { + this.bindSlugEditor(); + } + }; + + /** + * When the `after-autosave.update-post-slug` event is triggered, this function checks to see if the slug editor has + * been inserted yet. If so, it does all of the necessary event binding. If not, it retries for a maximum of 5 seconds. + * + * @param {int} time + */ + PostScraper.prototype.bindSnippetCiteEvents = function( time ) { + time = time || 0; + var slugElem = document.getElementById( 'editable-post-name' ); + var postNameElem = document.getElementById('post_name'); + + if ( slugElem !== null ) { + this.bindSlugEditor(); + + // Always set the post name element. + postNameElem.value = document.getElementById('editable-post-name-full').textContent; + + YoastSEO.app.snippetPreview.unformattedText.snippet_cite = document.getElementById('editable-post-name-full').textContent; + YoastSEO.app.refresh(); + } else if ( time < 5000 ) { + time += 200; + setTimeout( this.bindSnippetCiteEvents.bind( this, time ), 200 ); + } + }; + + /** + * We want to trigger an update of the snippetPreview on a slug update. Because the save button is not available yet, we need to + * bind an event within the scope of a clickevent of the edit button. + */ + PostScraper.prototype.bindSlugEditor = function() { + $( '#titlediv' ).on( 'change', '#new-post-slug', function() { + YoastSEO.app.snippetPreview.unformattedText.snippet_cite = $( '#new-post-slug' ).val(); + YoastSEO.app.refresh(); + }); + }; + + /** + * Get data from inputfields and store them in an analyzerData object. This object will be used to fill + * the analyzer and the snippetpreview + */ + PostScraper.prototype.getData = function() { + return { + keyword: this.getDataFromInput( 'keyword' ), + meta: this.getDataFromInput( 'meta' ), + text: this.getDataFromInput( 'text' ), + pageTitle: this.getDataFromInput( 'pageTitle' ), + title: this.getDataFromInput( 'title' ), + url: this.getDataFromInput( 'url' ), + baseUrl: this.getDataFromInput( 'baseUrl' ), + excerpt: this.getDataFromInput( 'excerpt' ), + snippetTitle: this.getDataFromInput( 'snippetTitle' ), + snippetMeta: this.getDataFromInput( 'snippetMeta' ), + snippetCite: this.getDataFromInput( 'cite' ), + usedKeywords: wpseoPostScraperL10n.keyword_usage, + searchUrl: '', + postUrl: '' + }; + }; + + /** + * gets the values from the given input. Returns this value + * @param {String} inputType + * @returns {String} + */ + PostScraper.prototype.getDataFromInput = function( inputType ) { + var newPostSlug, val = ''; + switch ( inputType ) { + case 'text': + case 'content': + val = this.getContentTinyMCE(); + break; + case 'cite': + case 'url': + newPostSlug = $( '#new-post-slug' ); + if ( 0 < newPostSlug.length ) { + val = newPostSlug.val(); + } + else if ( document.getElementById( 'editable-post-name-full' ) !== null ) { + val = document.getElementById( 'editable-post-name-full' ).textContent; + } + break; + case 'baseUrl': + val = wpseoPostScraperL10n.base_url; + break; + case 'meta': + val = document.getElementById( 'yoast_wpseo_metadesc' ) && document.getElementById( 'yoast_wpseo_metadesc' ).value || ''; + if ( val === '' ) { + val = wpseoPostScraperL10n.metadesc_template; + } + break; + case 'snippetMeta': + val = document.getElementById( 'yoast_wpseo_metadesc' ) && document.getElementById( 'yoast_wpseo_metadesc' ).value || ''; + break; + case 'keyword': + val = document.getElementById( 'yoast_wpseo_focuskw_text_input' ) && document.getElementById( 'yoast_wpseo_focuskw_text_input' ).value || ''; + currentKeyword = val; + break; + case 'title': + val = document.getElementById( 'title' ) && document.getElementById( 'title' ).value || ''; + break; + case 'snippetTitle': + val = document.getElementById( 'yoast_wpseo_title' ) && document.getElementById( 'yoast_wpseo_title' ).value || ''; + break; + case 'pageTitle': + val = document.getElementById( 'yoast_wpseo_title' ) && document.getElementById( 'yoast_wpseo_title' ).value || ''; + if ( val === '' ) { + val = wpseoPostScraperL10n.title_template; + } + if (val === '' ) { + val = '%%title%% - %%sitename%%'; + } + break; + case 'excerpt': + if ( document.getElementById( 'excerpt' ) !== null ) { + val = document.getElementById('excerpt') && document.getElementById('excerpt').value || ''; + } + break; + default: + break; + } + return val; + }; + + /** + * When the snippet is updated, update the (hidden) fields on the page + * @param {Object} value + * @param {String} type + */ + PostScraper.prototype.setDataFromSnippet = function( value, type ) { + switch ( type ) { + case 'snippet_meta': + document.getElementById( 'yoast_wpseo_metadesc' ).value = value; + break; + case 'snippet_cite': + document.getElementById( 'post_name' ).value = value; + if ( document.getElementById( 'editable-post-name' ) !== null ) { + document.getElementById( 'editable-post-name' ).textContent = value; + document.getElementById( 'editable-post-name-full' ).textContent = value; + } + break; + case 'snippet_title': + document.getElementById( 'yoast_wpseo_title' ).value = value; + break; + default: + break; + } + }; + + /** + * Gets content from the content field, if tinyMCE is initialized, use the getContent function to get the data from tinyMCE + * If tiny is hidden, take the value from the contentfield, since tinyMCE isn't updated when it isn't visible. + * @returns {String} + */ + PostScraper.prototype.getContentTinyMCE = function() { + var val = document.getElementById( 'content' ) && document.getElementById( 'content' ).value || ''; + if ( typeof tinyMCE !== 'undefined' && typeof tinyMCE.editors !== 'undefined' && tinyMCE.editors.length !== 0) { + var tinyMceContent = tinyMCE.get( 'content' ); + val = tinyMceContent && tinyMceContent.hidden === false && tinyMceContent.getContent() || ''; + } + return val; + }; + + /** + * Calls the eventbinders. + */ + PostScraper.prototype.bindElementEvents = function( app ) { + this.snippetPreviewEventBinder( app.snippetPreview ); + this.inputElementEventBinder( app ); + document.getElementById( 'yoast_wpseo_focuskw_text_input' ).addEventListener( 'keydown', app.snippetPreview.disableEnter ); + document.getElementById( 'yoast_wpseo_focuskw_text_input' ).addEventListener( 'keyup', this.updateKeywordUsage ); + }; + + /** + * binds the getinputfieldsdata to the snippetelements. + * + * @param {YoastSEO.SnippetPreview} snippetPreview The snippet preview object to bind the events on. + */ + PostScraper.prototype.snippetPreviewEventBinder = function( snippetPreview ) { + var elems = [ 'snippet_meta', 'snippet_title', 'snippet_cite' ]; + + for ( var i = 0; i < elems.length; i++ ) { + this.bindSnippetEvents( document.getElementById( elems [ i ] ), snippetPreview ); + } + }; + + /** + * binds the snippetEvents to a snippet element. + * @param { HTMLElement } elem snippet_meta, snippet_title, snippet_cite + * @param { YoastSEO.SnippetPreview } snippetPreview + */ + PostScraper.prototype.bindSnippetEvents = function( elem, snippetPreview ) { + elem.addEventListener( 'keydown', snippetPreview.disableEnter.bind( snippetPreview ) ); + //textFeedback is given on input (when user types or pastests), but also on focus. If a string that is too long is being recalled + //from the saved values, it gets the correct classname right away. + elem.addEventListener( 'input', snippetPreview.textFeedback.bind( snippetPreview ) ); + elem.addEventListener( 'focus', snippetPreview.textFeedback.bind( snippetPreview ) ); + elem.addEventListener( 'blur', snippetPreview.textFeedback.bind( snippetPreview ) ); + //shows edit icon by hovering over element + elem.addEventListener( 'mouseover', snippetPreview.showEditIcon.bind( snippetPreview ) ); + //hides the edit icon onmouseout, on focus and on keyup. If user clicks or types AND moves his mouse, the edit icon could return while editting + //by binding to these 3 events + elem.addEventListener( 'mouseout', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + elem.addEventListener( 'focus', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + elem.addEventListener( 'keyup', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + + //adds 'paste' and 'cut' eventbindings to the snippetPreview to make sure event is triggered when c/p with mouse. + elem.addEventListener( 'focus', snippetPreview.getUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'keyup', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'paste', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'cut', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'click', snippetPreview.setFocus.bind( snippetPreview ) ); + + //adds the showIcon class to show the editIcon; + elem.className = elem.className + ' showIcon' ; + }; + + /** + * binds the renewData function on the change of inputelements. + */ + PostScraper.prototype.inputElementEventBinder = function( app ) { + var elems = [ 'excerpt', 'content', 'yoast_wpseo_focuskw_text_input', 'title' ]; + for ( var i = 0; i < elems.length; i++ ) { + var elem = document.getElementById( elems[ i ] ); + if ( elem !== null ) { + document.getElementById( elems[ i ] ).addEventListener( 'input', app.analyzeTimer.bind( app ) ); + } + } + + if( typeof tinyMCE !== 'undefined' && typeof tinyMCE.on === 'function' ) { + //binds the input, change, cut and paste event to tinyMCE. All events are needed, because sometimes tinyMCE doesn' + //trigger them, or takes up to ten seconds to fire an event. + var events = [ 'input', 'change', 'cut', 'paste' ]; + tinyMCE.on( 'addEditor', function( e ) { + for ( var i = 0; i < events.length; i++ ) { + e.editor.on( events[i], app.analyzeTimer.bind( app ) ); + } + }); + } + document.getElementById( 'yoast_wpseo_focuskw_text_input' ).addEventListener( 'blur', this.resetQueue ); + }; + + /** + * Resets the current queue if focus keyword is changed and not empty. + */ + PostScraper.prototype.resetQueue = function() { + if ( YoastSEO.app.rawData.keyword !== '' ) { + YoastSEO.app.runAnalyzer( this.rawData ); + } + }; + + /** + * Updates the snippet values, is bound by the loader when generating the elements for the snippet. + * calls the update snippet values to save snippet in the hidden fields + * calls checkTextLength to update the snippet editor fields (move too long texts) + * refreshes the app to run with new data. + * + * @param {Object} ev + */ + PostScraper.prototype.updateSnippet = function( ev ) { + this.updateSnippetValues( ev ); + YoastSEO.app.snippetPreview.checkTextLength( ev ); + YoastSEO.app.refresh(); + }; + + /** + * Uses the unformattedText object of the snippetpreview if the textFeedback function has put a string there (if text was too long). + * clears this after use. + * + * @param {Object} ev + */ + PostScraper.prototype.updateSnippetValues = function( ev ) { + var dataFromSnippet = ev.currentTarget.textContent; + var currentElement = ev.currentTarget.id; + if ( typeof YoastSEO.app.snippetPreview.unformattedText[ currentElement ] !== 'undefined' ) { + ev.currentTarget.textContent = YoastSEO.app.snippetPreview.unformattedText[ currentElement ]; + } + this.setDataFromSnippet( dataFromSnippet, ev.currentTarget.id ); + }; + + /** + * Saves the score to the linkdex. + * Outputs the score in the overall target. + * + * @param {string} score + */ + PostScraper.prototype.saveScores = function( score ) { + var alt; + var cssClass; + + if ( this.isMainKeyword( currentKeyword ) ) { + document.getElementById( 'yoast_wpseo_linkdex' ).value = score; + + if ( '' === currentKeyword ) { + cssClass = 'na'; + } else { + cssClass = YoastSEO.app.scoreFormatter.overallScoreRating( parseInt( score, 10 ) ); + } + alt = YoastSEO.app.scoreFormatter.getSEOScoreText( cssClass ); + + $( '.yst-traffic-light' ) + .attr( 'class', 'yst-traffic-light ' + cssClass ) + .attr( 'alt', alt ); + } + + // If multi keyword isn't available we need to update the first tab (content) + if ( ! YoastSEO.multiKeyword ) { + this.updateKeywordTabContent( currentKeyword, score ); + } + + jQuery( window ).trigger( 'YoastSEO:numericScore', score ); + }; + + /** + * Returns whether or not the keyword is the main keyword + * + * @param {string} keyword The keyword to check + * + * @returns {boolean} + */ + PostScraper.prototype.isMainKeyword = function( keyword ) { + var firstTab, mainKeyword; + + firstTab = $( '.wpseo_keyword_tab' ) + .first() + .find( '.wpseo_tablink' ); + + mainKeyword = firstTab.data( 'keyword' ); + + return keyword === mainKeyword; + }; + + /** + * Initializes keyword tab with the correct template if multi keyword isn't available + */ + PostScraper.prototype.initKeywordTabTemplate = function() { + var keyword, score; + + // If multi keyword is available we don't have to initialize this as multi keyword does this for us. + if ( YoastSEO.multiKeyword ) { + return; + } + + // Remove default functionality to prevent scrolling to top. + $( '.wpseo-metabox-tabs' ).on( 'click', '.wpseo_tablink', function( ev ) { + ev.preventDefault(); + }); + + keyword = $( '#yoast_wpseo_focuskw' ).val(); + score = $( '#yoast_wpseo_linkdex' ).val(); + + $( '#yoast_wpseo_focuskw_text_input' ).val( keyword ); + + this.updateKeywordTabContent( keyword, score ); + }; + + /** + * Updates keyword tab with new content + */ + PostScraper.prototype.updateKeywordTabContent = function( keyword, score ) { + var placeholder, keyword_tab; + + score = parseInt( score, 10 ); + + if ( typeof keyword === 'undefined' || keyword === '' ) { + score = 'na'; + } + placeholder = keyword && keyword.length > 0 ? keyword : '...'; + + score = YoastSEO.ScoreFormatter.prototype.overallScoreRating( score ); + + keyword_tab = wp.template( 'keyword_tab' )({ + keyword: keyword, + placeholder: placeholder, + score: score, + hideRemove: true, + prefix: wpseoPostScraperL10n.contentTab + ' ', + active: true + }); + + $( '#yoast_wpseo_focuskw' ).val( keyword ); + + $( '.wpseo_keyword_tab' ).replaceWith( keyword_tab ); + }; + + /** + * updates the focus keyword usage if it is not in the array yet. + */ + PostScraper.prototype.updateKeywordUsage = function() { + var keyword = this.value; + if ( typeof( wpseoPostScraperL10n.keyword_usage[ keyword ] === null ) ) { + jQuery.post(ajaxurl, { + action: 'get_focus_keyword_usage', + post_id: jQuery('#post_ID').val(), + keyword: keyword + }, function( data ) { + if ( data ) { + wpseoPostScraperL10n.keyword_usage[ keyword ] = data; + YoastSEO.app.refresh(); + } + }, 'json' + ); + } + }; + + /** + * binds to the WordPress jQuery function to put the permalink on the page. + * If the response matches with permalinkstring, the snippet can be rerendered. + */ + jQuery( document ).on( 'ajaxComplete', function( ev, response ) { + if ( response.responseText.match( 'Permalink:' ) !== null ) { + YoastSEO.app.callbacks.getData(); + YoastSEO.app.runAnalyzer(); + YoastSEO.app.snippetPreview.reRender(); + } + } ); + + jQuery( document ).ready(function() { + var postScraper = new PostScraper(); + + YoastSEO.analyzerArgs = { + //if it must run the analyzer + analyzer: true, + //if it uses ajax to get data + ajax: true, + //if it must generate snippetpreview + snippetPreview: true, + //element Target Array + elementTarget: ['content', 'yoast_wpseo_focuskw_text_input', 'yoast_wpseo_metadesc', 'excerpt', 'editable-post-name', 'editable-post-name-full'], + //replacement target array, elements that must trigger the replace variables function. + replaceTarget: ['yoast_wpseo_metadesc', 'excerpt', 'yoast_wpseo_title'], + //rest target array, elements that must be reset on focus + resetTarget: ['snippet_meta', 'snippet_title', 'snippet_cite'], + //typeDelay is used as the timeout between stopping with typing and triggering the analyzer + typeDelay: 300, + //Dynamic delay makes sure the delay is increased if the analyzer takes longer than the default, to prevent slow systems. + typeDelayStep: 100, + maxTypeDelay: 1500, + dynamicDelay: true, + //used for multiple keywords (future use) + multiKeyword: false, + //targets for the objects + targets: { + output: 'wpseo-pageanalysis', + snippet: 'wpseosnippet' + }, + translations: wpseoPostScraperL10n.translations, + queue: ['wordCount', + 'keywordDensity', + 'subHeadings', + 'stopwords', + 'fleschReading', + 'linkCount', + 'imageCount', + 'urlKeyword', + 'urlLength', + 'metaDescription', + 'pageTitleKeyword', + 'pageTitleLength', + 'firstParagraph', + 'keywordDoubles'], + usedKeywords: wpseoPostScraperL10n.keyword_usage, + searchUrl: '', + postUrl: '', + callbacks: { + getData: postScraper.getData.bind( postScraper ), + bindElementEvents: postScraper.bindElementEvents.bind( postScraper ), + updateSnippetValues: postScraper.updateSnippet.bind( postScraper ), + saveScores: postScraper.saveScores.bind( postScraper ) + }, + locale: wpseoPostScraperL10n.locale + }; + + // If there are no translations let the analyzer fallback onto the english translations. + if (0 === wpseoPostScraperL10n.translations.length) { + delete( YoastSEO.analyzerArgs.translations ); + } else { + // Make sure the correct text domain is set for analyzer. + var translations = wpseoPostScraperL10n.translations; + translations.domain = 'js-text-analysis'; + translations.locale_data['js-text-analysis'] = translations.locale_data['wordpress-seo']; + delete( translations.locale_data['wordpress-seo'] ); + YoastSEO.analyzerArgs.translations = translations; + } + window.YoastSEO.app = new YoastSEO.App( YoastSEO.analyzerArgs ); + jQuery( window).trigger( 'YoastSEO:ready' ); + + //Init Plugins + new YoastReplaceVarPlugin(); + new YoastShortcodePlugin(); + + postScraper.initKeywordTabTemplate(); + } ); +}( jQuery )); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.min.js new file mode 100644 index 00000000..6fc134c6 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-post-scraper-305.min.js @@ -0,0 +1 @@ +!function(a){"use strict";var b="",c=function(){"object"==typeof CKEDITOR&&console.warn("YoastSEO currently doesn't support ckEditor. The content analysis currently only works with the HTML editor or TinyMCE."),this.prepareSlugBinding()};c.prototype.prepareSlugBinding=function(){if(null===document.getElementById("editable-post-name")){var a=this;jQuery(document).on("after-autosave.update-post-slug",function(){a.bindSnippetCiteEvents(0)})}else this.bindSlugEditor()},c.prototype.bindSnippetCiteEvents=function(a){a=a||0;var b=document.getElementById("editable-post-name"),c=document.getElementById("post_name");null!==b?(this.bindSlugEditor(),c.value=document.getElementById("editable-post-name-full").textContent,YoastSEO.app.snippetPreview.unformattedText.snippet_cite=document.getElementById("editable-post-name-full").textContent,YoastSEO.app.refresh()):5e3>a&&(a+=200,setTimeout(this.bindSnippetCiteEvents.bind(this,a),200))},c.prototype.bindSlugEditor=function(){a("#titlediv").on("change","#new-post-slug",function(){YoastSEO.app.snippetPreview.unformattedText.snippet_cite=a("#new-post-slug").val(),YoastSEO.app.refresh()})},c.prototype.getData=function(){return{keyword:this.getDataFromInput("keyword"),meta:this.getDataFromInput("meta"),text:this.getDataFromInput("text"),pageTitle:this.getDataFromInput("pageTitle"),title:this.getDataFromInput("title"),url:this.getDataFromInput("url"),baseUrl:this.getDataFromInput("baseUrl"),excerpt:this.getDataFromInput("excerpt"),snippetTitle:this.getDataFromInput("snippetTitle"),snippetMeta:this.getDataFromInput("snippetMeta"),snippetCite:this.getDataFromInput("cite"),usedKeywords:wpseoPostScraperL10n.keyword_usage,searchUrl:' 0 ) { + for ( var i in parsedShortcodes ) { + data = data.replace( parsedShortcodes[ i ].shortcode, parsedShortcodes[ i ].output ); + } + } + return data; + }; + + /* DATA SOURCING */ + + /** + * Get data from inputfields and store them in an analyzerData object. This object will be used to fill + * the analyzer and the snippetpreview + * + * @param {function} callback To declare either ready or reloaded after parsing. + */ + YoastShortcodePlugin.prototype.loadShortcodes = function( callback ) { + var unparsedShortcodes = this.getUnparsedShortcodes( this.getShortcodes( this.getContentTinyMCE() ) ); + if ( unparsedShortcodes.length > 0 ) { + this.parseShortcodes( unparsedShortcodes, callback ); + } else { + callback(); + } + }; + + /** + * Bind elements to be able to reload the dataset if shortcodes get added. + */ + YoastShortcodePlugin.prototype.bindElementEvents = function() { + var contentElement = document.getElementById( 'content' ) || false; + var that = this; + + if (contentElement) { + contentElement.addEventListener( 'keydown', this.loadShortcodes.bind( this, this.declareReloaded.bind( this ) ) ); + contentElement.addEventListener( 'change', this.loadShortcodes.bind( this, this.declareReloaded.bind( this ) ) ); + } + + if( typeof tinyMCE !== 'undefined' && typeof tinyMCE.on === 'function' ) { + tinyMCE.on( 'addEditor', function( e ) { + e.editor.on( 'change', function() { + that.loadShortcodes.bind( that, that.declareReloaded.bind( that ) )(); + }); + e.editor.on('keydown', function() { + that.loadShortcodes.bind( that, that.declareReloaded.bind( that ) )(); + }); + }); + } + }; + + /** + * gets content from the content field, if tinyMCE is initialized, use the getContent function to get the data from tinyMCE + * @returns {String} + */ + YoastShortcodePlugin.prototype.getContentTinyMCE = function() { + var val = document.getElementById( 'content' ) && document.getElementById( 'content' ).value || ''; + if ( typeof tinyMCE !== 'undefined' && typeof tinyMCE.editors !== 'undefined' && tinyMCE.editors.length !== 0 ) { + val = tinyMCE.get( 'content' ) && tinyMCE.get( 'content' ).getContent() || ''; + } + + return val; + }; + + /* SHORTCODE PARSING */ + + /** + * Returns the unparsed shortcodes out of a collection of shortcodes. + * + * @param {Array} shortcodes + * @returns {Array} + */ + YoastShortcodePlugin.prototype.getUnparsedShortcodes = function( shortcodes ) { + if ( typeof shortcodes !== 'object') { + console.error( 'Failed to get unparsed shortcodes. Expected parameter to be an array, instead received ' + typeof shortcodes ); // jshint ignore:line + return false; + } + + var unparsedShortcodes = []; + + for ( var i in shortcodes ) { + var shortcode = shortcodes[ i ]; + if ( unparsedShortcodes.indexOf( shortcode ) === -1 && this.isUnparsedShortcode( shortcode ) ) { + unparsedShortcodes.push( shortcode ); + } + } + + return unparsedShortcodes; + }; + + /** + * Checks if a given shortcode was already parsed. + * + * @param {string} shortcode + * @returns {boolean} + */ + YoastShortcodePlugin.prototype.isUnparsedShortcode = function( shortcode ) { + var already_exists = false; + + for ( var i in this.parsedShortcodes ) { + if ( this.parsedShortcodes[ i ].shortcode === shortcode ) { + already_exists = true; + } + } + + return already_exists === false; + }; + + /** + * Gets the shortcodes from a given piece of text. + * + * @param {string} text + * @returns {array} The matched shortcodes + */ + YoastShortcodePlugin.prototype.getShortcodes = function( text ) { + if ( typeof text !== 'string') { + console.error( 'Failed to get shortcodes. Expected parameter to be a string, instead received' + typeof text ); // jshint ignore:line + return false; + } + + var captures = this.matchCapturingShortcodes( text ); + + // Remove the capturing shortcodes from the text before trying to match the capturing shortcodes. + for ( var i in captures ) { + text = text.replace(captures[ i ], ''); + } + + var nonCaptures = this.matchNonCapturingShortcodes( text ); + + return captures.concat( nonCaptures ); + }; + + /** + * Matches the capturing shortcodes from a given piece of text. + * + * @param {string} text + * @returns {Array} + */ + YoastShortcodePlugin.prototype.matchCapturingShortcodes = function( text ) { + var captures = []; + + // First identify which tags are being used in a capturing shortcode by looking for closing tags. + var captureKeywords = ( text.match( this.closingTagRegex ) || [] ).join(' ').match( this.keywordRegex ) || []; + + // Fetch the capturing shortcodes and strip them from the text so we can easily match the non capturing shortcodes. + for ( var i in captureKeywords ) { + var captureKeyword = captureKeywords[i]; + var captureRegex = '\\[' + captureKeyword + '[^\\]]*?\\].*?\\[\\/' + captureKeyword + '\\]'; + var matches = text.match( new RegExp(captureRegex, 'g') ) || []; + + captures = captures.concat( matches ); + } + return captures; + }; + + /** + * Matches the non capturing shortcodes from a given piece of text. + * + * @param {string} text + * @returns {Array} + */ + YoastShortcodePlugin.prototype.matchNonCapturingShortcodes = function( text ) { + return text.match( this.nonCaptureRegex ) || []; + }; + + /** + * Parses the unparsed shortcodes through AJAX and clears them. + * + * @param {Array} shortcodes shortcodes to be parsed. + * @param {function} callback function to be called in the context of the AJAX callback. + */ + YoastShortcodePlugin.prototype.parseShortcodes = function( shortcodes, callback ) { + if ( typeof callback !== 'function' ) { + console.error( 'Failed to parse shortcodes. Expected parameter to be a function, instead received ' + typeof callback ); // jshint ignore:line + return false; + } + + if ( typeof shortcodes === 'object' && shortcodes.length > 0 ) { + jQuery.post( ajaxurl, { + action: 'wpseo_filter_shortcodes', + _wpnonce: wpseoShortcodePluginL10n.wpseo_filter_shortcodes_nonce, + data: shortcodes + }, + function( shortcodeResults ) { + this.saveParsedShortcodes( shortcodeResults, callback ); + }.bind( this ) + ); + } + else { + callback(); + } + }; + + /** + * Saves the shortcodes that were parsed with AJAX to `this.parsedShortcodes` + * + * @param {Array} shortcodeResults + * @param {function} callback + */ + YoastShortcodePlugin.prototype.saveParsedShortcodes = function( shortcodeResults, callback ) { + shortcodeResults = JSON.parse( shortcodeResults); + for ( var i in shortcodeResults ) { + this.parsedShortcodes.push( shortcodeResults[ i ] ); + } + + callback(); + }; + + window.YoastShortcodePlugin = YoastShortcodePlugin; +}()); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-shortcode-plugin-305.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-shortcode-plugin-305.min.js new file mode 100644 index 00000000..ecb41830 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-shortcode-plugin-305.min.js @@ -0,0 +1 @@ +!function(){"use strict";var a=function(){YoastSEO.app.registerPlugin("YoastShortcodePlugin",{status:"loading"}),this.bindElementEvents();var a="("+wpseoShortcodePluginL10n.wpseo_shortcode_tags.join("|")+")";this.keywordRegex=new RegExp(a,"g"),this.closingTagRegex=new RegExp("\\[\\/"+a+"\\]","g"),this.nonCaptureRegex=new RegExp("\\["+a+"[^\\]]*?\\]","g"),this.parsedShortcodes=[],this.loadShortcodes(this.declareReady.bind(this))};a.prototype.declareReady=function(){YoastSEO.app.pluginReady("YoastShortcodePlugin"),this.registerModifications()},a.prototype.declareReloaded=function(){YoastSEO.app.pluginReloaded("YoastShortcodePlugin")},a.prototype.registerModifications=function(){YoastSEO.app.registerModification("content",this.replaceShortcodes.bind(this),"YoastShortcodePlugin")},a.prototype.replaceShortcodes=function(a){var b=this.parsedShortcodes;if("string"==typeof a&&b.length>0)for(var c in b)a=a.replace(b[c].shortcode,b[c].output);return a},a.prototype.loadShortcodes=function(a){var b=this.getUnparsedShortcodes(this.getShortcodes(this.getContentTinyMCE()));b.length>0?this.parseShortcodes(b,a):a()},a.prototype.bindElementEvents=function(){var a=document.getElementById("content")||!1,b=this;a&&(a.addEventListener("keydown",this.loadShortcodes.bind(this,this.declareReloaded.bind(this))),a.addEventListener("change",this.loadShortcodes.bind(this,this.declareReloaded.bind(this)))),"undefined"!=typeof tinyMCE&&"function"==typeof tinyMCE.on&&tinyMCE.on("addEditor",function(a){a.editor.on("change",function(){b.loadShortcodes.bind(b,b.declareReloaded.bind(b))()}),a.editor.on("keydown",function(){b.loadShortcodes.bind(b,b.declareReloaded.bind(b))()})})},a.prototype.getContentTinyMCE=function(){var a=document.getElementById("content")&&document.getElementById("content").value||"";return"undefined"!=typeof tinyMCE&&"undefined"!=typeof tinyMCE.editors&&0!==tinyMCE.editors.length&&(a=tinyMCE.get("content")&&tinyMCE.get("content").getContent()||""),a},a.prototype.getUnparsedShortcodes=function(a){if("object"!=typeof a)return console.error("Failed to get unparsed shortcodes. Expected parameter to be an array, instead received "+typeof a),!1;var b=[];for(var c in a){var d=a[c];-1===b.indexOf(d)&&this.isUnparsedShortcode(d)&&b.push(d)}return b},a.prototype.isUnparsedShortcode=function(a){var b=!1;for(var c in this.parsedShortcodes)this.parsedShortcodes[c].shortcode===a&&(b=!0);return b===!1},a.prototype.getShortcodes=function(a){if("string"!=typeof a)return console.error("Failed to get shortcodes. Expected parameter to be a string, instead received"+typeof a),!1;var b=this.matchCapturingShortcodes(a);for(var c in b)a=a.replace(b[c],"");var d=this.matchNonCapturingShortcodes(a);return b.concat(d)},a.prototype.matchCapturingShortcodes=function(a){var b=[],c=(a.match(this.closingTagRegex)||[]).join(" ").match(this.keywordRegex)||[];for(var d in c){var e=c[d],f="\\["+e+"[^\\]]*?\\].*?\\[\\/"+e+"\\]",g=a.match(new RegExp(f,"g"))||[];b=b.concat(g)}return b},a.prototype.matchNonCapturingShortcodes=function(a){return a.match(this.nonCaptureRegex)||[]},a.prototype.parseShortcodes=function(a,b){return"function"!=typeof b?(console.error("Failed to parse shortcodes. Expected parameter to be a function, instead received "+typeof b),!1):void("object"==typeof a&&a.length>0?jQuery.post(ajaxurl,{action:"wpseo_filter_shortcodes",_wpnonce:wpseoShortcodePluginL10n.wpseo_filter_shortcodes_nonce,data:a},function(a){this.saveParsedShortcodes(a,b)}.bind(this)):b())},a.prototype.saveParsedShortcodes=function(a,b){a=JSON.parse(a);for(var c in a)this.parsedShortcodes.push(a[c]);b()},window.YoastShortcodePlugin=a}(); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.js new file mode 100644 index 00000000..37be2412 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.js @@ -0,0 +1,410 @@ +/* global YoastSEO, wp, wpseoTermScraperL10n, ajaxurl, tinyMCE, YoastReplaceVarPlugin, console */ +(function( $ ) { + 'use strict'; + + var TermScraper = function() { + if ( typeof CKEDITOR === 'object' ) { + console.warn( 'YoastSEO currently doesn\'t support ckEditor. The content analysis currently only works with the HTML editor or TinyMCE.' ); + } + }; + + /** + * returns data fetched from inputfields. + * @returns {{keyword: *, meta: *, text: *, pageTitle: *, title: *, url: *, baseUrl: *, snippetTitle: *, snippetMeta: *, snippetCite: *}} + */ + TermScraper.prototype.getData = function() { + return { + title: this.getDataFromInput( 'title' ), + keyword: this.getDataFromInput( 'keyword' ), + text: this.getDataFromInput( 'text' ), + pageTitle: this.getDataFromInput( 'pageTitle' ), + url: this.getDataFromInput( 'url' ), + baseUrl: this.getDataFromInput( 'baseUrl' ), + snippetTitle: this.getDataFromInput( 'title' ), + meta: this.getDataFromInput( 'meta' ), + snippetMeta: this.getDataFromInput( 'snippetMeta' ), + snippetCite: this.getDataFromInput( 'cite' ) + }; + }; + + /** + * + * @param {string} inputType + */ + TermScraper.prototype.getDataFromInput = function( inputType ) { + var val = ''; + var elem; + switch( inputType ){ + case 'keyword': + elem = document.getElementById( 'wpseo_focuskw' ); + val = elem.value; + if ( val === '' ) { + val = document.getElementById( 'name' ).value; + elem.placeholder = val; + } + break; + case 'meta': + elem = document.getElementById( 'hidden_wpseo_desc' ); + if ( elem !== null ) { + val = elem.value; + } + if ( val === '' ) { + val = wpseoTermScraperL10n.metadesc_template; + } + break; + case 'snippetMeta': + elem = document.getElementById( 'hidden_wpseo_desc' ); + if ( elem !== null ) { + val = elem.value; + } + break; + case 'text': + val = this.getContentTinyMCE(); + break; + case 'pageTitle': + val = document.getElementById( 'hidden_wpseo_title' ).value; + if ( val === '' ) { + val = wpseoTermScraperL10n.title_template; + } + if (val === '' ) { + val = '%%title%% - %%sitename%%'; + } + break; + case 'title': + val = document.getElementById( 'hidden_wpseo_title' ).value; + break; + case 'url': + case 'cite': + val = document.getElementById( 'slug' ).value; + break; + case 'baseUrl': + val = wpseoTermScraperL10n.base_url; + break; + + case 'cite': + elem = document.getElementById( 'snippet_cite' ); + if ( elem !== null ) { + val = elem.textContent; + } + break; + } + return val; + }; + + /** + * gets content from the content field, if tinyMCE is initialized, use the getContent function to get the data from tinyMCE + * If tiny is hidden, take the value from the descriptionfield, since tinyMCE isn't updated when it isn't visible. + * @returns {String} + */ + TermScraper.prototype.getContentTinyMCE = function() { + var val = document.getElementById( 'description' ).value; + if ( typeof tinyMCE !== 'undefined' && typeof tinyMCE.editors !== 'undefined' && tinyMCE.editors.length !== 0 && tinyMCE.get( 'description' ).hidden === false ) { + val = tinyMCE.get( 'description' ).getContent(); + } + return val; + }; + + /** + * When the snippet is updated, update the (hidden) fields on the page + * @param {Object} value + * @param {String} type + */ + TermScraper.prototype.setDataFromSnippet = function( value, type ) { + switch ( type ) { + case 'snippet_meta': + document.getElementById( 'hidden_wpseo_desc' ).value = value; + break; + case 'snippet_cite': + document.getElementById( 'slug' ).value = value; + break; + case 'snippet_title': + document.getElementById( 'hidden_wpseo_title' ).value = value; + break; + default: + break; + } + }; + + /** + * binds elements + */ + TermScraper.prototype.bindElementEvents = function( app ) { + this.snippetPreviewEventBinder ( app.snippetPreview ); + this.inputElementEventBinder( app ); + document.getElementById( 'wpseo_focuskw' ).addEventListener( 'keydown', app.snippetPreview.disableEnter ); + }; + + /** + * binds the getinputfieldsdata to the snippetelements. + * + * @param {YoastSEO.SnippetPreview} snippetPreview The snippet preview object to bind the events on. + */ + TermScraper.prototype.snippetPreviewEventBinder = function( snippetPreview ) { + var elems = [ 'snippet_meta', 'snippet_title', 'snippet_cite' ]; + + for ( var i = 0; i < elems.length; i++ ) { + this.bindSnippetEvents( document.getElementById( elems [ i ] ), snippetPreview ); + } + }; + + /** + * binds the snippetEvents to a snippet element. + * @param { HTMLElement } elem snippet_meta, snippet_title, snippet_cite + * @param { YoastSEO.SnippetPreview } snippetPreview + */ + TermScraper.prototype.bindSnippetEvents = function( elem, snippetPreview ) { + elem.addEventListener( 'keydown', snippetPreview.disableEnter.bind( snippetPreview ) ); + //textFeedback is given on input (when user types or pastests), but also on focus. If a string that is too long is being recalled + //from the saved values, it gets the correct classname right away. + elem.addEventListener( 'input', snippetPreview.textFeedback.bind( snippetPreview ) ); + elem.addEventListener( 'focus', snippetPreview.textFeedback.bind( snippetPreview ) ); + elem.addEventListener( 'blur', snippetPreview.textFeedback.bind( snippetPreview ) ); + //shows edit icon by hovering over element + elem.addEventListener( 'mouseover', snippetPreview.showEditIcon.bind( snippetPreview ) ); + //hides the edit icon onmouseout, on focus and on keyup. If user clicks or types AND moves his mouse, the edit icon could return while editting + //by binding to these 3 events + elem.addEventListener( 'mouseout', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + elem.addEventListener( 'focus', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + elem.addEventListener( 'keyup', snippetPreview.hideEditIcon.bind( snippetPreview ) ); + + //adds 'paste' and 'cut' eventbindings to the snippetPreview to make sure event is triggered when c/p with mouse. + elem.addEventListener( 'focus', snippetPreview.getUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'keyup', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'paste', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'cut', snippetPreview.setUnformattedText.bind( snippetPreview ) ); + elem.addEventListener( 'click', snippetPreview.setFocus.bind( snippetPreview ) ); + + //adds the showIcon class to show the editIcon; + elem.className = elem.className + ' showIcon' ; + }; + + /** + * binds the renewData function on the change of inputelements. + */ + TermScraper.prototype.inputElementEventBinder = function( app ) { + var elems = [ 'name', 'description', 'slug', 'wpseo_focuskw' ]; + for (var i = 0; i < elems.length; i++) { + var elem = document.getElementById(elems[i]); + if (elem !== null) { + document.getElementById(elems[i]).addEventListener('input', app.analyzeTimer.bind(app)); + } + } + if( typeof tinyMCE !== 'undefined' && typeof tinyMCE.on === 'function' ) { + //binds the input, change, cut and paste event to tinyMCE. All events are needed, because sometimes tinyMCE doesn' + //trigger them, or takes up to ten seconds to fire an event. + var events = [ 'input', 'change', 'cut', 'paste' ]; + tinyMCE.on( 'addEditor', function( e ) { + for (var i = 0; i < events.length; i++ ) { + e.editor.on( events[i], app.analyzeTimer.bind( app ) ); + } + }); + } + }; + + /** + * creates SVG for the overall score. + */ + TermScraper.prototype.saveScores = function( score ) { + var cssClass, alt; + + document.getElementById( 'hidden_wpseo_linkdex' ).value = score; + jQuery( window ).trigger( 'YoastSEO:numericScore', score ); + + this.updateKeywordTabContent( $( '#wpseo_focuskw' ).val(), score ); + + cssClass = YoastSEO.app.scoreFormatter.overallScoreRating( parseInt( score, 10 ) ); + alt = YoastSEO.app.scoreFormatter.getSEOScoreText( cssClass ); + + $( '.yst-traffic-light' ) + .attr( 'class', 'yst-traffic-light ' + cssClass ) + .attr( 'alt', alt ); + }; + + /** + * Initializes keyword tab with the correct template + */ + TermScraper.prototype.initKeywordTabTemplate = function() { + var keyword, score; + + // Remove default functionality to prevent scrolling to top. + $( '.wpseo-metabox-tabs' ).on( 'click', '.wpseo_tablink', function( ev ) { + ev.preventDefault(); + }); + + keyword = $( '#wpseo_focuskw' ).val(); + score = $( '#hidden_wpseo_linkdex' ).val(); + + this.updateKeywordTabContent( keyword, score ); + }; + + /** + * Updates keyword tab with new content + */ + TermScraper.prototype.updateKeywordTabContent = function( keyword, score ) { + var placeholder, keyword_tab; + + placeholder = keyword.length > 0 ? keyword : '...'; + + score = parseInt( score, 10 ); + score = YoastSEO.ScoreFormatter.prototype.overallScoreRating( score ); + + keyword_tab = wp.template( 'keyword_tab' )({ + keyword: keyword, + placeholder: placeholder, + score: score, + hideRemove: true, + prefix: wpseoTermScraperL10n.contentTab + ' ', + active: true + }); + + $( '.wpseo_keyword_tab' ).replaceWith( keyword_tab ); + }; + + /** + * updates the focus keyword usage if it is not in the array yet. + */ + TermScraper.prototype.updateKeywordUsage = function() { + var keyword = this.value; + if ( typeof( wpseoTermScraperL10n.keyword_usage[ keyword ] === null ) ) { + jQuery.post(ajaxurl, { + action: 'get_term_keyword_usage', + post_id: jQuery('#post_ID').val(), + keyword: keyword, + taxonomy: wpseoTermScraperL10n.taxonomy + }, function( data ) { + if ( data ) { + wpseoTermScraperL10n.keyword_usage[ keyword ] = data; + YoastSEO.app.refresh(); + } + }, 'json' + ); + } + }; + + /** + * Updates the snippet values, is bound by the loader when generating the elements for the snippet. + * calls the update snippet values to save snippet in the hidden fields + * calls checkTextLength to update the snippet editor fields (move too long texts) + * refreshes the app to run with new data. + * + * @param {Object} ev + */ + TermScraper.prototype.updateSnippet = function( ev ) { + this.updateSnippetValues( ev ); + YoastSEO.app.snippetPreview.checkTextLength( ev ); + YoastSEO.app.refresh(); + }; + + /** + * Uses the unformattedText object of the snippetpreview if the textFeedback function has put a string there (if text was too long). + * clears this after use. + * + * @param {Object} ev + */ + TermScraper.prototype.updateSnippetValues = function( ev ) { + var dataFromSnippet = ev.currentTarget.textContent; + var currentElement = ev.currentTarget.id; + if ( typeof YoastSEO.app.snippetPreview.unformattedText[ currentElement ] !== 'undefined' ) { + ev.currentTarget.textContent = YoastSEO.app.snippetPreview.unformattedText[ currentElement ]; + } + this.setDataFromSnippet( dataFromSnippet, ev.currentTarget.id ); + }; + + /** + * add new descriptionfield to content, creates new element via wp_editor and appends this to the term-description-wrap + * this way we can use the wp tinyMCE editor on the descriptionfield. + */ + var tinyMCEReplacer = function() { + //gets the textNode from the original textField. + var textNode = jQuery( '.term-description-wrap' ).find( 'td' ).find( 'textarea' ).val(); + + var newEditor = document.getElementById( 'wp-description-wrap' ); + newEditor.style.display = 'none'; + var text = jQuery( '.term-description-wrap' ).find( 'td' ).find( 'p' ); + //empty the TD with the old description textarea + jQuery( '.term-description-wrap' ).find( 'td' ).html( '' ); + //append the editor and the helptext + jQuery( '.term-description-wrap' ).find( 'td' ).append( newEditor ).append( text ); + newEditor.style.display = 'block'; + document.getElementById('description').value = textNode; + }; + + jQuery( document ).ready(function() { + tinyMCEReplacer(); + var termScraper = new TermScraper(); + + YoastSEO.analyzerArgs = { + //if it must run the analyzer + analyzer: true, + //if it uses ajax to get data + ajax: true, + //if it must generate snippetpreview + snippetPreview: true, + //string to be added to the snippetTitle + snippetSuffix: ' ' + wpseoTermScraperL10n.sep + ' ' + wpseoTermScraperL10n.sitename, + //element Target Array + elementTarget: ['content', 'yoast_wpseo_focuskw', 'yoast_wpseo_metadesc', 'excerpt', 'editable-post-name', 'editable-post-name-full'], + //replacement target array, elements that must trigger the replace variables function. + replaceTarget: ['yoast_wpseo_metadesc', 'excerpt', 'yoast_wpseo_title'], + //rest target array, elements that must be reset on focus + resetTarget: ['snippet_meta', 'snippet_title', 'snippet_cite'], + //typeDelay is used as the timeout between stopping with typing and triggering the analyzer + typeDelay: 300, + //Dynamic delay makes sure the delay is increased if the analyzer takes longer than the default, to prevent slow systems. + typeDelayStep: 100, + maxTypeDelay: 1500, + dynamicDelay: true, + //used for multiple keywords (future use) + multiKeyword: false, + //targets for the objects + targets: { + output: 'wpseo_analysis', + snippet: 'wpseo_snippet' + }, + translations: wpseoTermScraperL10n.translations, + queue: ['wordCount', + 'keywordDensity', + 'subHeadings', + 'stopwords', + 'fleschReading', + 'linkCount', + 'imageCount', + 'urlKeyword', + 'urlLength', + 'metaDescription', + 'pageTitleKeyword', + 'pageTitleLength', + 'firstParagraph'], + usedKeywords: wpseoTermScraperL10n.keyword_usage, + searchUrl: '', + postUrl: '', + callbacks: { + getData: termScraper.getData.bind( termScraper ), + bindElementEvents: termScraper.bindElementEvents.bind( termScraper ), + updateSnippetValues: termScraper.updateSnippet.bind( termScraper ), + saveScores: termScraper.saveScores.bind( termScraper ) + }, + locale: wpseoTermScraperL10n.locale + }; + + // If there are no translations let the analyzer fallback onto the english translations. + if (0 === wpseoTermScraperL10n.translations.length) { + delete( YoastSEO.analyzerArgs.translations ); + } else { + // Make sure the correct text domain is set for analyzer. + var translations = wpseoTermScraperL10n.translations; + translations.domain = 'js-text-analysis'; + translations.locale_data['js-text-analysis'] = translations.locale_data['wordpress-seo']; + delete( translations.locale_data['wordpress-seo'] ); + + YoastSEO.analyzerArgs.translations = translations; + } + window.YoastSEO.app = new YoastSEO.App( YoastSEO.analyzerArgs ); + jQuery( window ).trigger( 'YoastSEO:ready' ); + + termScraper.initKeywordTabTemplate(); + + //init Plugins + new YoastReplaceVarPlugin(); + } ); +}( jQuery )); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.min.js b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.min.js new file mode 100644 index 00000000..e302b8e9 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/js/wp-seo-term-scraper-305.min.js @@ -0,0 +1 @@ +!function(a){"use strict";var b=function(){"object"==typeof CKEDITOR&&console.warn("YoastSEO currently doesn't support ckEditor. The content analysis currently only works with the HTML editor or TinyMCE.")};b.prototype.getData=function(){return{title:this.getDataFromInput("title"),keyword:this.getDataFromInput("keyword"),text:this.getDataFromInput("text"),pageTitle:this.getDataFromInput("pageTitle"),url:this.getDataFromInput("url"),baseUrl:this.getDataFromInput("baseUrl"),snippetTitle:this.getDataFromInput("title"),meta:this.getDataFromInput("meta"),snippetMeta:this.getDataFromInput("snippetMeta"),snippetCite:this.getDataFromInput("cite")}},b.prototype.getDataFromInput=function(a){var b,c="";switch(a){case"keyword":b=document.getElementById("wpseo_focuskw"),c=b.value,""===c&&(c=document.getElementById("name").value,b.placeholder=c);break;case"meta":b=document.getElementById("hidden_wpseo_desc"),null!==b&&(c=b.value),""===c&&(c=wpseoTermScraperL10n.metadesc_template);break;case"snippetMeta":b=document.getElementById("hidden_wpseo_desc"),null!==b&&(c=b.value);break;case"text":c=this.getContentTinyMCE();break;case"pageTitle":c=document.getElementById("hidden_wpseo_title").value,""===c&&(c=wpseoTermScraperL10n.title_template),""===c&&(c="%%title%% - %%sitename%%");break;case"title":c=document.getElementById("hidden_wpseo_title").value;break;case"url":case"cite":c=document.getElementById("slug").value;break;case"baseUrl":c=wpseoTermScraperL10n.base_url;break;case"cite":b=document.getElementById("snippet_cite"),null!==b&&(c=b.textContent)}return c},b.prototype.getContentTinyMCE=function(){var a=document.getElementById("description").value;return"undefined"!=typeof tinyMCE&&"undefined"!=typeof tinyMCE.editors&&0!==tinyMCE.editors.length&&tinyMCE.get("description").hidden===!1&&(a=tinyMCE.get("description").getContent()),a},b.prototype.setDataFromSnippet=function(a,b){switch(b){case"snippet_meta":document.getElementById("hidden_wpseo_desc").value=a;break;case"snippet_cite":document.getElementById("slug").value=a;break;case"snippet_title":document.getElementById("hidden_wpseo_title").value=a}},b.prototype.bindElementEvents=function(a){this.snippetPreviewEventBinder(a.snippetPreview),this.inputElementEventBinder(a),document.getElementById("wpseo_focuskw").addEventListener("keydown",a.snippetPreview.disableEnter)},b.prototype.snippetPreviewEventBinder=function(a){for(var b=["snippet_meta","snippet_title","snippet_cite"],c=0;c0?b:"...",c=parseInt(c,10),c=YoastSEO.ScoreFormatter.prototype.overallScoreRating(c),e=wp.template("keyword_tab")({keyword:b,placeholder:d,score:c,hideRemove:!0,prefix:wpseoTermScraperL10n.contentTab+" ",active:!0}),a(".wpseo_keyword_tab").replaceWith(e)},b.prototype.updateKeywordUsage=function(){var a=this.value;jQuery.post(ajaxurl,{action:"get_term_keyword_usage",post_id:jQuery("#post_ID").val(),keyword:a,taxonomy:wpseoTermScraperL10n.taxonomy},function(b){b&&(wpseoTermScraperL10n.keyword_usage[a]=b,YoastSEO.app.refresh())},"json")},b.prototype.updateSnippet=function(a){this.updateSnippetValues(a),YoastSEO.app.snippetPreview.checkTextLength(a),YoastSEO.app.refresh()},b.prototype.updateSnippetValues=function(a){var b=a.currentTarget.textContent,c=a.currentTarget.id;"undefined"!=typeof YoastSEO.app.snippetPreview.unformattedText[c]&&(a.currentTarget.textContent=YoastSEO.app.snippetPreview.unformattedText[c]),this.setDataFromSnippet(b,a.currentTarget.id)};var c=function(){var a=jQuery(".term-description-wrap").find("td").find("textarea").val(),b=document.getElementById("wp-description-wrap");b.style.display="none";var c=jQuery(".term-description-wrap").find("td").find("p");jQuery(".term-description-wrap").find("td").html(""),jQuery(".term-description-wrap").find("td").append(b).append(c),b.style.display="block",document.getElementById("description").value=a};jQuery(document).ready(function(){c();var a=new b;if(YoastSEO.analyzerArgs={analyzer:!0,ajax:!0,snippetPreview:!0,snippetSuffix:" "+wpseoTermScraperL10n.sep+" "+wpseoTermScraperL10n.sitename,elementTarget:["content","yoast_wpseo_focuskw","yoast_wpseo_metadesc","excerpt","editable-post-name","editable-post-name-full"],replaceTarget:["yoast_wpseo_metadesc","excerpt","yoast_wpseo_title"],resetTarget:["snippet_meta","snippet_title","snippet_cite"],typeDelay:300,typeDelayStep:100,maxTypeDelay:1500,dynamicDelay:!0,multiKeyword:!1,targets:{output:"wpseo_analysis",snippet:"wpseo_snippet"},translations:wpseoTermScraperL10n.translations,queue:["wordCount","keywordDensity","subHeadings","stopwords","fleschReading","linkCount","imageCount","urlKeyword","urlLength","metaDescription","pageTitleKeyword","pageTitleLength","firstParagraph"],usedKeywords:wpseoTermScraperL10n.keyword_usage,searchUrl:'stop words":["Ð¼Ð°Ð»Ð¾Ð²Ð°Ð¶Ð½Ð¸ Ð´ÑÐ¼Ð¸"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Ð¢ÐµÐºÑÑÑÑ ÑÑÐ´ÑÑÐ¶Ð° %1$d Ð´ÑÐ¼Ð¸, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¿Ð¾Ð²ÐµÑÐµ Ð¾Ñ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼ÑÐ¼ (%2$d)."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Ð¢ÐµÐºÑÑÑÑ ÑÑÐ´ÑÑÐ¶Ð° %1$d Ð´ÑÐ¼Ð¸, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¼Ð°Ð»ÐºÐ¾ Ð¿Ð¾-Ð¼Ð°Ð»ÐºÐ¾ Ð¾Ñ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼ÑÐ¼ (%2$d). ÐÐ¾Ð±Ð°Ð²ÐµÑÐµ Ð¾ÑÐµ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Ð¢ÐµÐºÑÑÑÑ ÑÑÐ´ÑÑÐ¶Ð° %1$d Ð´ÑÐ¼Ð¸, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¿Ð¾Ð´ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼ÑÐ¼ (%2$d). ÐÐ¾Ð±Ð°Ð²ÐµÑÐµ Ð¿Ð¾Ð²ÐµÑÐµ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð° Ð·Ð° ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸ÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ."],"The text contains %1$d words. This is far too low and should be increased.":["Ð¢ÐµÐºÑÑÑÑ ÑÑÐ´ÑÑÐ¶Ð° %1$d Ð´ÑÐ¼Ð¸. Ð¢Ð°Ð·Ð¸ Ð±ÑÐ¾Ð¹ÐºÐ° Ðµ Ð¿ÑÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð¼Ð°Ð»ÐºÐ° Ð¸ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð±ÑÐ´Ðµ ÑÐ²ÐµÐ»Ð¸ÑÐµÐ½Ð°."],"Outbound links appear in this page":["ÐÐ·ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸ Ð² ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ°"],"You've never used this focus keyword before, very good.":["ÐÐ¾ÑÐµÐ³Ð° Ð½Ðµ ÑÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸ ÑÐ°Ð·Ð¸ ÑÐµÐ»ÐµÐ²Ð° ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð°, ÑÐ¾Ð²Ð° Ðµ Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾Ð±ÑÐµ."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["ÐÐµÑÐµ ÑÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸ ÑÐ°Ð·Ð¸ ÑÐµÐ»ÐµÐ²Ð° ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð° %1$sÐ²ÐµÐ´Ð½ÑÐ¶%2$s. ÐÐµ Ð¿ÑÐ¾Ð¿ÑÑÐºÐ°Ð¹ÑÐµ Ð´Ð° Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÐµ Ð¼Ð½Ð¾Ð³Ð¾ ÑÑÐ½Ð¾ ÐºÐ¾Ð¹ URL Ð°Ð´ÑÐµÑ Ð²ÑÐ² Ð²Ð°ÑÐ¸Ñ ÑÐ°Ð¹Ñ Ðµ Ð½Ð°Ð¹-Ð²Ð°Ð¶Ð½Ð¸ÑÑ Ð·Ð° ÑÐ°Ð·Ð¸ ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð°."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["ÐÐµÑÐµ ÑÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸ ÑÐ°Ð·Ð¸ ÑÐµÐ»ÐµÐ²Ð° ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð° %3$s%4$dÐ¿ÑÑÐ¸%2$s. Ð¡ÑÐ²ÐµÑÐ²Ð°Ð¼Ðµ Ð²Ð¸ Ð´Ð° Ð¿ÑÐ¾ÑÐµÑÐµÑÐµ %1$sÑÐ°Ð·Ð¸ ÑÑÐ°ÑÐ¸Ñ Ð½Ð° ÑÐµÐ¼Ð° ÐºÐ»ÑÑÐ¾Ð²Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ%2$s Ð¸ Ð´Ð° Ð¿Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ ÑÐ²Ð¾ÑÑÐ° ÑÑÑÐ°ÑÐµÐ³Ð¸Ñ Ð·Ð° ÐºÐ»ÑÑÐ¾Ð²Ð¸ Ð´ÑÐ¼Ð¸."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["ÐÐ° ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð½Ðµ Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð° ÑÐµÐ»ÐµÐ²Ð° ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð°. ÐÐºÐ¾ Ð½Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÑÐµ ÑÐ°ÐºÐ°Ð²Ð° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð°, Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ ÐºÐ°Ð»ÐºÑÐ»Ð¸ÑÐ°Ð½Ð° Ð¾ÑÐµÐ½ÐºÐ°."],"No subheading tags (like an H2) appear in the copy.":["Ð ÑÐµÐºÑÑÐ° Ð½Ðµ ÑÐµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ ÑÐ°Ð³Ð¾Ð²Ðµ Ð·Ð° Ð¿Ð¾Ð´Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ñ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ H2)"],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["ÐÐ»ÑÑÐ½Ð¾ÑÑÑÐ° Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ðµ %1$f%, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð½Ð°Ð´ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ Ð¾Ñ 2.5%. ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ðµ Ð¾ÑÐºÑÐ¸ÑÐ° %2$d Ð¿ÑÑÐ¸."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð° ÑÐµ Ð¿Ð¾ÑÐ²ÑÐ²Ð° Ð² %2$d (Ð¾Ñ Ð¾Ð±ÑÐ¾ %1$d) Ð¿Ð¾Ð´Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ñ Ð² ÑÐµÐºÑÑÐ°. ÐÐ°ÐºÐ°Ñ Ð´Ð° Ð½Ðµ Ðµ Ð²Ð¾Ð´ÐµÑ ÑÐ°ÐºÑÐ¾Ñ Ð·Ð° ÐºÐ»Ð°ÑÐ¸ÑÐ°Ð½Ðµ, Ð¾Ñ ÑÐ¾Ð²Ð° Ð¸Ð¼Ð° Ð¿Ð¾Ð»Ð·Ð°."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð° Ð½Ðµ Ðµ ÑÐ¿Ð¾ÑÑÐµÐ±ÐµÐ½Ð° Ð½Ð¸ÑÐ¾ Ð²ÐµÐ´Ð½ÑÐ¶ Ð² Ð¿Ð¾Ð´Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÑÑÐ° (Ð½Ð°Ð¿Ñ. H2) Ð² ÑÐµÐºÑÑÐ°."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð·Ð° ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° ÑÑÐ´ÑÑÐ¶Ð° ÐµÐ´Ð½Ð° Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑÐµ %1$s. ÐÐ±Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð¸Ð¼. ÐÐ°Ð¼ÐµÑÐµÐ½Ð¸ '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð° Ð½Ðµ Ð¿ÑÐ¸ÑÑÑÑÐ²Ð° Ð² URL Ð°Ð´ÑÐµÑÐ° Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°. ÐÐºÐ¾ Ð¿Ð»Ð°Ð½Ð¸ÑÐ°ÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ URL Ð°Ð´ÑÐµÑÐ°, Ð½Ðµ Ð·Ð°Ð±ÑÐ°Ð²ÑÐ¹ÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÐµ Ð´Ð°Ð»Ð¸ ÑÑÐ°ÑÐ¸ÑÑ URL Ð¿ÑÐ°Ð²Ð¸ Ð¿ÑÐµÐ½Ð°ÑÐ¾ÑÐ²Ð°Ð½Ðµ ÑÐ¸Ð¿ 301 ÐºÑÐ¼ Ð½Ð¾Ð²Ð¸Ñ Ð°Ð´ÑÐµÑ!"],"The slug for this page is a bit long, consider shortening it.":["ÐÑÐ°ÑÐºÐ¾ÑÐ¾ Ð¸Ð¼Ðµ Ð½Ð° ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ° Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ²Ð°Ð½Ðµ Ðµ Ð´Ð° Ð³Ð¾ ÑÐºÑÑÐ¸ÑÐµ."],"Please create a page title.":["ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["ÐÐ°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° ÑÑÐ´ÑÑÐ¶Ð° %3$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¿Ð¾-Ð¼Ð°Ð»ÐºÐ¾ Ð¾Ñ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼ÑÐ¼ (%1$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°). ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÑÐµ Ð¾ÑÑÐ°Ð½Ð°Ð»Ð¾ÑÐ¾ Ð¼ÑÑÑÐ¾, Ð·Ð° Ð´Ð° Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÐµ Ð²Ð°ÑÐ¸Ð°ÑÐ¸Ð¸ Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð¸Ð»Ð¸ Ð´Ð° ÑÑÐ·Ð´Ð°Ð´ÐµÑÐµ Ð°Ð½Ð³Ð°Ð¶Ð¸ÑÐ°Ñ Ð¿ÑÐ¸Ð·Ð¸Ð² ÐºÑÐ¼ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["ÐÐ°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° ÑÑÐ´ÑÑÐ¶Ð° %3$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¿Ð¾Ð²ÐµÑÐµ Ð¾Ñ Ð»Ð¸Ð¼Ð¸ÑÐ° Ð·Ð° Ð²Ð¸Ð·ÑÐ°Ð»Ð¸Ð·Ð¸ÑÐ°Ð½Ðµ (%2$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°). ÐÑÐºÐ°ÐºÐ²Ð° ÑÐ°ÑÑ Ð¾Ñ Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð½ÑÐ¼Ð° Ð´Ð° ÑÐµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ Ð² Ð¸Ð·Ð²Ð°Ð´ÐºÐ°ÑÐ°, ÐºÐ¾ÑÑÐ¾ ÑÑÑÑÐ°ÑÐºÐ°ÑÐ° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð² ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ñ ÑÐµÐ·ÑÐ»ÑÐ°ÑÐ¸."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["ÐÐ°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð·Ð°Ð¿Ð¾ÑÐ²Ð° Ñ ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð°. Ð¡ÑÐ¸ÑÐ° ÑÐµ, ÑÐµ ÑÐ¾Ð²Ð° Ð¿Ð¾Ð´Ð¾Ð±ÑÑÐ²Ð° ÐºÐ»Ð°ÑÐ¸ÑÐ°Ð½ÐµÑÐ¾."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["ÐÐ°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° ÑÑÐ´ÑÑÐ¶Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð°, Ð½Ð¾ ÑÑ Ð½Ðµ ÑÐµ Ð¿Ð¾ÑÐ²ÑÐ²Ð° Ð² Ð½Ð°ÑÐ°Ð»Ð¾ÑÐ¾. ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ ÑÐµ Ð´Ð° Ñ Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ Ð² Ð½Ð°ÑÐ°Ð»Ð¾ÑÐ¾ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÐµÑÐ¾."],"No outbound links appear in this page, consider adding some as appropriate.":["Ð ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ ÑÐ¸Ð³ÑÑÐ¸ÑÐ°Ñ Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸ Ð¸Ð·ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸. ÐÑÐµÑÐµÐ½ÐµÑÐµ Ð´Ð°Ð»Ð¸ Ðµ Ð²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð° Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Ð¡ÑÐ·Ð´Ð°Ð»Ð¸ ÑÑÐµ Ð²ÑÑÐ·ÐºÐ° ÐºÑÐ¼ Ð´ÑÑÐ³Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°, Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÐºÐ¸ ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°, Ð·Ð° ÐºÐ¾ÑÑÐ¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° ÐºÐ»Ð°ÑÐ¸ÑÐ°ÑÐµ ÑÐµÐºÑÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°. ÐÑÐµÐ¿Ð¾ÑÑÑÐ²Ð°Ð¼Ðµ Ð²Ð¸ Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ ÑÐ¾Ð²Ð°, Ð°ÐºÐ¾ Ð½Ð°Ð¸ÑÑÐ¸Ð½Ð° Ð¸ÑÐºÐ°ÑÐµ Ð½Ð°ÑÑÐ¾ÑÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð´Ð° ÑÐµ ÐºÐ»Ð°ÑÐ¸ÑÐ° Ð·Ð° ÑÑÐ¾ÑÐ²ÐµÑÐ½Ð°ÑÐ° ÐºÐ»ÑÑÐ¾Ð²Ð° Ð´ÑÐ¼Ð°."],"This page has %1$s outbound link(s).":["Ð¢Ð°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¸Ð¼Ð° %1$s Ð¸Ð·ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸."],"This page has %2$s outbound link(s), all nofollowed.":["Ð¢Ð°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¸Ð¼Ð° %2$s Ð¸Ð·ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸, Ð²ÑÐ¸ÑÐºÐ¸ÑÐµ Ñ Ð°ÑÑÐ¸Ð±ÑÑ nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Ð¢Ð°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¸Ð¼Ð° %2$s nofollow Ð²ÑÑÐ·ÐºÐ¸ Ð¸ %3$s Ð½Ð¾ÑÐ¼Ð°Ð»Ð½Ð¸ Ð¸Ð·ÑÐ¾Ð´ÑÑÐ¸ Ð²ÑÑÐ·ÐºÐ¸."],"No images appear in this page, consider adding some as appropriate.":["Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ ÑÑÐ´ÑÑÐ¶Ð° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ. ÐÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¾ Ðµ Ð´Ð° Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÐµ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ Ð¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐ¸."],"The images on this page are missing alt tags.":["ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÑÑÐ° Ð½Ð° ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð½ÑÐ¼Ð°Ñ alt ÑÐ°Ð³Ð¾Ð²Ðµ."],"The images on this page do not have alt tags containing your focus keyword.":["ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÑÑÐ° Ð½Ð° ÑÐ°Ð·Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð½ÑÐ¼Ð°Ñ alt ÑÐ°Ð³Ð¾Ð²Ðµ, ÐºÐ¾Ð¸ÑÐ¾ Ð´Ð° ÑÑÐ´ÑÑÐ¶Ð°Ñ ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð°."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["ÐÐ¾Ð³Ð°ÑÐ¾ ÑÑÑÑÐ°Ð²ÑÑÐµ ÑÐµÐºÑÑÐ° Ð·Ð° Ð¿Ð¾Ð»ÐµÑÐ¾ meta description, Ð¿Ð¾Ð¼Ð¸ÑÐ»ÐµÑÐµ ÐºÐ°Ðº ÑÐµ Ð¿ÑÐµÐ´ÑÑÐ°Ð²ÑÑÐµ ÑÐ¿ÑÑÐ¼Ð¾ ÐºÐ¾Ð½ÐºÑÑÐµÐ½ÑÐ¸ÑÑÐ°. ÐÐ¾Ð¶ÐµÑÐµ Ð»Ð¸ Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÐµ ÑÐµÐºÑÑÐ° Ð¿Ð¾-Ð¿ÑÐ¸Ð²Ð»ÐµÐºÐ°ÑÐµÐ»ÐµÐ½?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["ÐÑÐ»Ð¶Ð¸Ð½Ð°ÑÐ° Ð½Ð° Ð¿Ð¾Ð»ÐµÑÐ¾ meta description Ðµ Ð¿Ð¾Ð´ %1$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°. ÐÐ¾Ð¿ÑÑÑÐ¸Ð¼Ð°ÑÐ° Ð´ÑÐ»Ð¶Ð¸Ð½Ð° Ðµ %2$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["ÐÐ°Ð´Ð°Ð´ÐµÐ½Ð¾ÑÐ¾ meta Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð½Ð°Ð´ÑÐ²ÑÑÐ»Ñ %2$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°. ÐÐºÐ¾ Ð³Ð¾ Ð½Ð°Ð¼Ð°Ð»Ð¸ÑÐµ, ÑÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð¸Ð¶Ð´Ð° Ð¸Ð·ÑÑÐ»Ð¾ Ð² ÑÐµÐ·ÑÐ»ÑÐ°ÑÐ¸ÑÐµ Ð½Ð° ÑÑÑÑÐ°ÑÐºÐ¸ÑÐµ."],"No meta description has been specified, search engines will display copy from the page instead.":["ÐÐµ Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¾ ÑÐ¿ÐµÑÐ¸ÑÐ¸ÑÐ½Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ Ð½Ð° Ð¿Ð¾Ð»ÐµÑÐ¾ meta description, Ð·Ð°ÑÐ°Ð´Ð¸ ÐºÐ¾ÐµÑÐ¾ ÑÑÑÑÐ°ÑÐºÐ¸ÑÐµ ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ ÑÐ°ÑÑ Ð¾Ñ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°."],"A meta description has been specified, but it does not contain the focus keyword.":["ÐÐ¼Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¾ meta Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ, Ð½Ð¾ Ð² Ð½ÐµÐ³Ð¾ Ð»Ð¸Ð¿ÑÐ²Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð°/ÑÑÐ°Ð·Ð°."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["ÐÐ»ÑÑÐ½Ð¾ÑÑÑÐ° Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ðµ %1$f%, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¼Ð°Ð»ÐºÐ¾ Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÑÑÐ½Ð¾. ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð±ÐµÑÐµ Ð¾ÑÐºÑÐ¸ÑÐ° %2$d Ð¿ÑÑÐ¸ Ð² ÑÐµÐºÑÑÐ°."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["ÐÐ»ÑÑÐ½Ð¾ÑÑÑÐ° Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ðµ %1$f%, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¼Ð½Ð¾Ð³Ð¾ Ð½Ð°Ð´ Ð¿ÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¸Ñ Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ Ð¾Ñ 2.5%. ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð¿ÑÐ¸ÑÑÑÑÐ²Ð° %2$d Ð¿ÑÑÐ¸ Ð² ÑÐµÐºÑÑÐ°."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["ÐÐ»ÑÑÐ½Ð¾ÑÑÑÐ° Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ðµ %1$f%, ÐºÐ¾ÐµÑÐ¾ Ðµ Ð¾ÑÐ»Ð¸ÑÐ½Ð¾. ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð±ÐµÑÐµ Ð½Ð°Ð¼ÐµÑÐµÐ½Ð° %2$d Ð¿ÑÑÐ¸ Ð² ÑÐµÐºÑÑÐ°."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° Ð½Ðµ Ð¿ÑÐ¸ÑÑÑÑÐ²Ð° Ð² Ð¿ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ°Ð³ÑÐ°Ñ Ð½Ð° ÑÐµÐºÑÑÐ°. ÐÑÐµÐ¿Ð¾ÑÑÑÐ¸ÑÐµÐ»Ð½Ð¾ Ðµ ÑÐµÐ¼Ð°ÑÐ° Ð½Ð° Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸ÑÑÐ° Ð´Ð° ÑÑÐ°Ð²Ð° ÑÑÐ½Ð° Ð½ÐµÐ·Ð°Ð±Ð°Ð²Ð½Ð¾."],"The focus keyword appears in the first paragraph of the copy.":["ÐÐ»ÑÑÐ¾Ð²Ð°ÑÐ° Ð´ÑÐ¼Ð° ÑÐµ ÑÑÐ´ÑÑÐ¶Ð° Ð² Ð¿ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ°Ð³ÑÐ°Ñ Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["Ð¢ÐµÐºÑÑÑÑ Ð¿Ð¾ÑÑÐ¸Ð³Ð° ÑÐµÐ·ÑÐ»ÑÐ°Ñ %1$s Ð² ÑÐµÑÑÐ° %2$s, ÐºÐ¾ÐµÑÐ¾ ÑÐµ Ð¿ÑÐ¸ÐµÐ¼Ð° %3$s Ð·Ð° ÑÐµÑÐµÐ½Ðµ. %4$s"],"fairly difficult":["ÑÑÐ°Ð²Ð½Ð¸ÑÐµÐ»Ð½Ð¾ ÑÑÑÐ´Ð½Ð¾"],"Try to make shorter sentences to improve readability.":["ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ ÑÐµ Ð´Ð° ÑÑÑÑÐ°Ð²ÑÑÐµ Ð¿Ð¾-ÐºÑÐ°ÑÐºÐ¸ Ð¸Ð·ÑÐµÑÐµÐ½Ð¸Ñ, Ð·Ð° Ð´Ð° Ð¿Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ Ð½Ð¸Ð²Ð¾ÑÐ¾ Ð½Ð° ÑÐµÑÐ¸Ð¼Ð¾ÑÑ Ð½Ð° Ð¿ÑÐ±Ð»Ð¸ÐºÐ°ÑÐ¸ÑÑÐ°."],"difficult":["ÑÑÑÐ´Ð½Ð¾"],"Try to make shorter sentences, using less difficult words to improve readability.":["ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ Ð´Ð° ÑÑÑÑÐ°Ð²ÑÑÐµ Ð¿Ð¾-ÐºÑÐ°ÑÐºÐ¸ Ð¸Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð¸ Ð´Ð° ÑÐ¿Ð¾ÑÑÐµÐ±ÑÐ²Ð°ÑÐµ Ð¿Ð¾-Ð»ÐµÑÐ½Ð¸ Ð´ÑÐ¼Ð¸, Ð·Ð° Ð´Ð° Ð¿Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ ÑÐµÑÐ¸Ð¼Ð¾ÑÑÑÐ°."],"very difficult":["Ð¼Ð½Ð¾Ð³Ð¾ ÑÑÑÐ´Ð½Ð¾"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-bg_BG.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-bg_BG.mo index a09c3399..d17944a9 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-bg_BG.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-bg_BG.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.json new file mode 100644 index 00000000..428d79d6 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["No hi ha paraula clau"],"Bad SEO score":["PuntuaciÃ³ SEO dolenta"],"Ok SEO score":["PuntuaciÃ³ SEO acceptable"],"Good SEO score":["Bona puntuaciÃ³ SEO"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["La vostra frase clau tÃ© mÃ©s de 10 paraules, una frase clau hauria de ser mÃ©s curta."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["L'URL d'aquesta pÃ gina contÃ© una o mÃ©s %1$sparaules buides%2$s, considereu eliminar-les."],"http://en.wikipedia.org/wiki/Stop_words":["https://ca.wikipedia.org/wiki/Paraules_buides"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["El tÃtol de la pÃ gina tÃ© una llargÃ ria entre %1$d carÃ cters recomanats com a mÃnim i %2$d carÃ cters recomanats com a mÃ xim."],"The images on this page contain alt tags":["Les imatges d'aquesta pÃ gina contenen etiquetes Â«altÂ»"],"The images on this page contain alt tags with the focus keyword.":["Les imatges d'aquesta pÃ gina contenen etiquetes Â«altÂ» amb la paraula clau."],"The focus keyword '%1$s' does not appear in the page title.":["La paraula clau Â«%1$sÂ» no apareix al tÃtol de la pÃ gina."],"The focus keyword appears in the URL for this page.":["La paraula clau apareix a l'URL de la pÃ gina."],"The meta description contains the focus keyword.":["La descripciÃ³ meta contÃ© la paraula clau."],"stop words":["paraules buides"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["El text contÃ© %1$d paraules, que sÃ³n mÃ©s que les %2$d mÃnimes recomanades."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["El text contÃ© %1$d paraules, que estÃ una mica per baix del mÃnim recomanat de %2$d. Considereu afegir una mica mÃ©s de text."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["El text contÃ© %1$d paraules, que estÃ per baix del mÃnim recomanat de %2$d. Afegiu mÃ©s contingut d'aquest tema relevant per als lectors."],"The text contains %1$d words. This is far too low and should be increased.":["El text contÃ© %1$d paraules. AixÃ² Ã©s molt poc de text, i haurÃeu d'ampliar-lo."],"Outbound links appear in this page":["En aquesta pÃ gina apareixen enllaÃ§os de sortida."],"You've never used this focus keyword before, very good.":["Mai heu utilitzat aquesta paraula clau principal abans, molt bÃ©!"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Heu utilitzat aquesta paraula clau principal %1$suna vegada abans%2$s; assegureu-vos de deixar ben clar quin URL del vostre lloc web Ã©s mÃ©s important per a aquesta paraula."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["Heu utilitzat aquesta paraula clau principal %3$s%4$d vegades abans%2$s; probablement Ã©s una bona idea llegir %6$saquesta entrada sobre contingut principal%5$s i millorar la vostra estratÃ¨gia de paraules clau."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["No s'ha definit cap paraula clau per a aquesta pÃ gina. Si no definiu cap paraula clau, no es podrÃ calcular cap puntuaciÃ³."],"No subheading tags (like an H2) appear in the copy.":["No hi ha cap etiqueta de capÃ§alera secundÃ ria (com un H2) en el contingut."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La densitat de la paraula clau Ã©s %1$f%, que es troba per damunt del mÃ xim recomanat (2,5%%); la paraula clau s'ha trobat %2$d vegades."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["La paraula clau / frase clau apareix en %2$d (de %1$d) capÃ§aleres secundÃ ries al text. Tot i que no es tracta d'un factor de posicionament important, Ã©s beneficiÃ³s."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["No heu utilitzat la paraula en cap capÃ§alera secundÃ ria (com un H2) al vostre text."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["La paraula clau per a aquesta pÃ gina contÃ© una o mÃ©s %1$s. HaurÃeu de considerar esborrar Â«%2$sÂ»"],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["La paraula clau no apareix a l'URL d'aquesta pÃ gina. Si decidiu reanomenar l'URL, assegureu-vos que l'URL vell redirigeixi amb un 301 a l'URL nou."],"The slug for this page is a bit long, consider shortening it.":["L'URL d'aquesta pÃ gina Ã©s una mica llarg; intenteu acurtar-lo."],"Please create a page title.":["Creeu un tÃtol per a la pÃ gina"],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["El tÃtol de la pÃ gina contÃ© %3$d carÃ cters, menys que la quantitat recomanada (%1$d). Utilitzeu l'espai per afegir variacions de la paraula clau o crear un text atractiu i que convidi a l'acciÃ³."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["El tÃtol de la pÃ gina contÃ© %3$d carÃ cters, mÃ©s que el lÃmit visible (%2$d): els usuaris no podran veure algunes paraules en els llistats."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["El tÃtol de la pÃ gina contÃ© la paraula clau al principi, cosa que es considera un factor positiu per tal de millorar el posicionament."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["El tÃtol de la pÃ gina contÃ© la paraula clau, perÃ² no apareix al principi: proveu de moure-la cap al principi del tÃtol."],"No outbound links appear in this page, consider adding some as appropriate.":["No hi ha enllaÃ§os de sortida en aquesta pÃ gina, considereu afegir-ne algun si Ã©s apropiat."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Esteu enllaÃ§ant una altra pÃ gina amb la paraula clau que voleu que es posicioni la pÃ gina actual. Considereu canviar-li si realment voleu que aquesta pÃ gina es posicioni correctament."],"This page has %1$s outbound link(s).":["Aquesta pÃ gina tÃ© %1$s enllaÃ§os sortints."],"This page has %2$s outbound link(s), all nofollowed.":["Aquesta pÃ gina contÃ© %2$s enllaÃ§os de sortida, tots etiquetats com a Â«nofollowÂ»."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Aquesta pÃ gina contÃ© %2$s enllaÃ§os Â«nofollowÂ» i %3$s enllaÃ§os normals de sortida."],"No images appear in this page, consider adding some as appropriate.":["Aquesta pÃ gina no contÃ© cap image, considereu afegir-ne alguna si Ã©s apropiat."],"The images on this page are missing alt tags.":["Les imatges d'aquesta pÃ gina no contenen texts alternatius."],"The images on this page do not have alt tags containing your focus keyword.":["Les imatges d'aquesta pÃ gina no tenen texts alternatius que continguin la paraula clau."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["En la descripciÃ³ meta especificada, consideri: Com es compara amb la competÃ¨ncia? Podria ser mÃ©s atractiva?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["La descripciÃ³ meta tÃ© menys de %1$d carÃ cters, no obstant hi ha %2$d carÃ cters disponibles."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["La descripciÃ³ meta tÃ© mÃ©s de %2$d carÃ cters. Reduir-la permetrÃ que la descripciÃ³ completa sigui visible."],"No meta description has been specified, search engines will display copy from the page instead.":["No s'ha especificat cap descripciÃ³ meta. En el seu lloc, els motors de cerca mostraran text de la pÃ gina."],"A meta description has been specified, but it does not contain the focus keyword.":["S'ha especificat una descripciÃ³ meta, perÃ² no contÃ© la paraula clau principal."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["La densitat de la paraula clau Ã©s %1$f%, que Ã©s un poc baixa; la paraula clau s'ha trobat %2$d vegades."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La densitat de la paraula clau Ã©s de %1$f, que estÃ molt per damunt del 2,5% recomanat: la paraula clau s'ha trobat %2$d vegades."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["La densitat de la paraula clau Ã©s %1$f%, perfecte! La paraula clau s'ha trobat %2$d vegades."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["La paraula clau no apareix al primer parÃ graf del text. Assegureu-vos que el tema principal s'exposa immediatament."],"The focus keyword appears in the first paragraph of the copy.":["La paraula clau apareix en el primer parÃ graf del text."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["El text puntua %1$s al test %2$s, el que es considerÃ %3$s de llegir. %4$s"],"fairly difficult":["prou difÃcil"],"Try to make shorter sentences to improve readability.":["Proveu de fer frases mÃ©s curtes per millorar la legibilitat."],"difficult":["difÃcil"],"Try to make shorter sentences, using less difficult words to improve readability.":["Proveu a fer frases mÃ©s curtes i amb paraules menys complexes per tal de millorar la legibilitat."],"very difficult":["molt difÃcil"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.mo index bac2c13f..5e28d6a1 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ca.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.json new file mode 100644 index 00000000..b533bf05 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["VÃ¡mi zvolenÃ© klÃÄovÃ© slovo jste jeÅ¡tÄ nepouÅ¾ili. Velmi dobÅe."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["PouÅ¾ili jste toto klÃÄovÃ© slovo %1$sonce before%2$s, rozmyslete si pro kterou URL na vaÅ¡ich strÃ¡nkÃ¡ch je toto klÃÄovÃ© slovo nejdÅ¯leÅ¾itÄjÅ¡Ã."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Å½Ã¡dnÃ© podnadpisy (jako H2) v kopii."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["ÄÃ¡st (the slug) na tÃ©to strÃ¡nce je to trochu dlouhÃ½, zvaÅ¾te jeho zkrÃ¡cenÃ."],"Please create a page title.":["VytvoÅte si prosÃm nÃ¡zev strÃ¡nky."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["StrÃ¡nka neobsahuje Å¾Ã¡dnÃ© odkazy mimo vÃ¡Å¡ web. Zkuste pÅidat nÄjakÃ© smysluplnÃ©"],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Na tÃ©to strÃ¡nce nejsou Å¾Ã¡dnÃ© obrÃ¡zky, zkuste pÅidat nÄjakÃ© smysluplnÃ©"],"The images on this page are missing alt tags.":["ObrÃ¡zkÅ¯m na tÃ©to strÃ¡nce chybÃ tag alt"],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["V zadanÃ©m meta popisu zvaÅ¾te: JakÃ½ je v porovnÃ¡nÃ s konkurencÃ? Nemohl by bÃ½t lÃ¡kavÄjÅ¡Ã?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Nebyl zadanÃ½ meta popis, vyhledÃ¡vaÄe budou zobrazovat popis strÃ¡nky."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["pomÄrnÄ obtÃÅ¾nÃ©"],"Try to make shorter sentences to improve readability.":["SnaÅ¾te se tvoÅit kratÅ¡Ã vÄty, aby se zlepÅ¡ila Äitelnost."],"difficult":["obtÃÅ¾nÃ©"],"Try to make shorter sentences, using less difficult words to improve readability.":["SnaÅ¾te se tvoÅit kratÅ¡Ã vÄty pouÅ¾itÃm mÃ©nÄ obtÃÅ¾nÃ½ch slov pro zlepÅ¡enÃ Äitelnosti."],"very difficult":["velmi obtÃÅ¾nÃ©"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.mo index a294b6ba..e2bb9ce1 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cs_CZ.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.json new file mode 100644 index 00000000..189666c5 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"},"You've never used this focus keyword before, very good.":["Dydych chi erioed wedi defnyddio'r allweddair ffocws yma o'r blaen, da iawn chi."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Rydych chi wedi defnyddio'r allweddair ffocws yma %1$sunwaith o'r blaen%2$s, gwnewch yn siÅµr eich bod yn nodi'n glir pa URL ar eich gwefan sydd fwyaf pwysig ar gyfer yr allweddair yma."],"No subheading tags (like an H2) appear in the copy.":["Nid oes tagiau is-bennawd (fel H2) yn y copi."],"The slug for this page is a bit long, consider shortening it.":["Mae bonyn y dudalen hon braidd yn hir. Dylech ystyried ei fyrhau."],"Please create a page title.":["Rhowch deitl i'r dudalen."],"No outbound links appear in this page, consider adding some as appropriate.":["Nid oes dolenni sy'n cyfeirio allan yn ymddangos yn y dudalen yma, ystyriwch ychwanegu rhai fel sy'n briodol."],"No images appear in this page, consider adding some as appropriate.":["Nid oes delweddau yn ymddangos ar y dudalen yma, ystyriwch ychwanegu rhai fel sy'n briodol."],"The images on this page are missing alt tags.":["Mae tagiau alt ar goll o ddelweddau'r dudalen yma."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Yn y disgrifiad meta penodol, ystyriwch: Sut mae'n cymharu Ã¢'r gystadleuaeth? A fyddai modd ei wneud yn fwy apelgar?"],"No meta description has been specified, search engines will display copy from the page instead.":["Ni nodwyd disgrifiad meta. Bydd peiriannau chwilio yn dangos copi o'r dudalen yn lle."],"fairly difficult":["eithaf anodd"],"Try to make shorter sentences to improve readability.":["Ceisiwch wneud brawddegau byrrach er mwyn eu gwneud yn haws i'w darllen."],"difficult":["anodd"],"Try to make shorter sentences, using less difficult words to improve readability.":["Ceisiwch wneud brawddegau byrrach, gan ddefnyddio geiriau haws er mwyn eu gwneud yn haws i'w darllen."],"very difficult":["anodd iawn"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.mo new file mode 100644 index 00000000..eff055e8 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-cy.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.json new file mode 100644 index 00000000..0147dbec --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Intet sÃ¸geord"],"Bad SEO score":["DÃ¥rlig SEO-score"],"Ok SEO score":["OK SEO-score"],"Good SEO score":["God SEO-score"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Din nÃ¸glefrase er over 10 ord, en nÃ¸glefrase burde vÃ¦re kortere."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["Korttitlen for denne side indeholder en eller flere %1$sstopord%2$s. Overvej at fjerne dem."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["Sidetitlen er mellem de %1$d tegn, der mindst skal vÃ¦re, og de anbefalede %2$d tegn, der hÃ¸jst mÃ¥ vÃ¦re."],"The images on this page contain alt tags":["Billederne pÃ¥ denne side har alt-tags."],"The images on this page contain alt tags with the focus keyword.":["Billederne pÃ¥ denne side har alt-tags med fokussÃ¸geord."],"The focus keyword '%1$s' does not appear in the page title.":["FokussÃ¸geordet '%1$s' forekommer ikke i sidens titel."],"The focus keyword appears in the URL for this page.":["FokussÃ¸geordet vises i URLÊ¼en for denne side."],"The meta description contains the focus keyword.":["Meta-beskrivelsen indeholder fokussÃ¸geordet."],"stop words":["stopord"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Teksten rummer %1$d ord, hvilket er mere end de %2$d ord, der som minimum anbefales."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Teksten rummer %1$d ord, hvilket er en smule under de %2$d ord, der som minimum anbefales. TilfÃ¸j lidt mere tekst."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Teksten rummer %1$d ord, som er under de %2$d ord, der anbefales som minimum. TilfÃ¸j mere indhold, som lÃ¦serne vil finde relevant for dette emne."],"The text contains %1$d words. This is far too low and should be increased.":["Teksten rummer %1$d ord. Dette er alt for lavt og bÃ¸r Ã¸ges."],"Outbound links appear in this page":["UdgÃ¥ende links forekommer pÃ¥ denne side."],"You've never used this focus keyword before, very good.":["Du har aldrig brugt dette fokusnÃ¸gle fÃ¸r. Rigtig godt!"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Du har brugt dette fokussÃ¸geord %1$sÃ©n gang fÃ¸r%2$s. VÃ¦r sikker pÃ¥ at gÃ¸re det helt klart hvilken URL pÃ¥ dit websted, der er den vigtigste for dette sÃ¸geord."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["Du har brugt dette fokussÃ¸geord %3$s%4$d gange fÃ¸r%2$s. Det er nok en god idÃ© at lÃ¦se %6$sdette indlÃ¦g om hjÃ¸rnestensindhold%5$s (cornerstone content) og forbedre din sÃ¸geordsstrategi. (indlÃ¦gget er pÃ¥ engelsk)"],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Intet fokussÃ¸geord blev angivet for denne side. Hvis du ikke har angivet et fokussÃ¸geord, kan en score ikke beregnes."],"No subheading tags (like an H2) appear in the copy.":["Ingen subheading tags (som en H2) vises i kopien."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["SÃ¸geordstÃ¦theden er %1$f%, hvilket er over det anbefalet maksimum pÃ¥ 2,5%; fokussÃ¸geordet blev fundet %2$d gange."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["FokussÃ¸geordet vises i %2$d (ud af %1$d) undertitler i brÃ¸dteksten. Selv om det ikke specielt pÃ¥virker placeringen i sÃ¸geresultatet, er det en fordel."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["Du har ikke brugt dit fokussÃ¸geord i nogen underoverskrifter (fx en H2) i din brÃ¸dtekst."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["FokussÃ¸geordet for denne side indeholder en eller flere %1$s. Overvej at fjerne dem. Fandt '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["FokussÃ¸geordet forekommer ikke i URLÊ¼en for denne side. Hvis du beslutter at omdÃ¸be URLÊ¼en, skal du sikre dig, at den gamle URL viderestilles med HTTP-fejl 301 til den nye."],"The slug for this page is a bit long, consider shortening it.":["Korttitlen for denne side er lidt for lang. Overvej at forkorte den."],"Please create a page title.":["Opret venligst en sidetitel."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["Sidetitlen indholder %3$d tegn, hvilket er mindre end det anbefalede minimum pÃ¥ %1$d tegn. Brug pladsen til at tilfÃ¸je variationer af sÃ¸geordet eller skriv en tekst med en overbevisende opfordring til handling (call to action)."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["Sidetitlen indeholder %3$d tegn, flere end de %2$d tegn, der kan vises. Nogle af ordene kan ikke ses af brugerne i de lister, dit site er med i."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["Sidetitlen indeholder fokussÃ¸geordet i begyndelsen, hvilket formodes at give bedre placeringer."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["Denne sidetitel indeholder fokussÃ¸geordet, men det bruges ikke i begyndelsen. PrÃ¸v at flytte det hen til begyndelsen."],"No outbound links appear in this page, consider adding some as appropriate.":["Der er ingen udgÃ¥ende links fra denne side. Overvej at tilfÃ¸je nogle, hvis det findes relevant. "],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Du linker til en anden side med det fokussÃ¸geord, som du Ã¸nsker, skal give denne side en god placering. Overvej at Ã¦ndre dette, hvis du virkelig Ã¸nsker en god placering for denne side."],"This page has %1$s outbound link(s).":["Denne side har %1$s udgÃ¥ende link(s)."],"This page has %2$s outbound link(s), all nofollowed.":["Denne side har %2$s udgÃ¥ende link(s), alle med nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Denne side har %2$s link(s) med nofollow og %3$s normale udgÃ¥ende link(s)."],"No images appear in this page, consider adding some as appropriate.":["Ingen billeder vises pÃ¥ denne side, overvej at tilfÃ¸je nogle hvis det er relevant."],"The images on this page are missing alt tags.":["Billederne pÃ¥ denne side mangler alt-tags."],"The images on this page do not have alt tags containing your focus keyword.":["Billederne pÃ¥ denne side har ikke alt-tags med dit fokussÃ¸geord."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Overvej angÃ¥ende den angivne metabeskrivelse: Hvordan klarer den sig i konkurrencen? Kunne den gÃ¸res mere indbydende?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["Din metabeskrivelse er pÃ¥ under %1$d tegn, men du har mulighed for at bruge op til %2$d tegn."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["Den angivne metabeskrivelse er over %2$d tegn. Ved at reducere lÃ¦ngden vil hele beskrivelsen blive synlig."],"No meta description has been specified, search engines will display copy from the page instead.":["Der er ikke angivet nogen metabeskrivelse. SÃ¸gemaskinerne vil vise brÃ¸dtekst fra siden i stedet for."],"A meta description has been specified, but it does not contain the focus keyword.":["En metabeskrivelse er blevet indtastet, men indeholder ikke fokussÃ¸geordet."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["SÃ¸geordstÃ¦theden er %1$f%, hvilket er i underkanten. FokussÃ¸geordet blev fundet %2$d gange."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["SÃ¸geordstÃ¦theden er %1$f%, hvilket langt overstiger det anbefalede maksimum pÃ¥ 2,5%; fokussÃ¸geordet blev fundet %2$d gange."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["SÃ¸geordstÃ¦theden er %1$f%, hvilket er fint. FokussÃ¸geordet blev fundet %2$d gange."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["FokussÃ¸geordet bruges ikke i det fÃ¸rste afsnit i teksten. SÃ¸rg for, at man straks kan se, hvad dit emne er."],"The focus keyword appears in the first paragraph of the copy.":["FokussÃ¸geordet forekommer i fÃ¸rste afsnit af brÃ¸dteksten."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["BrÃ¸dteksten scorer %1$s i %2$s-testen, som anses for %3$s at lÃ¦se. %4$s"],"fairly difficult":["lettere vanskelig"],"Try to make shorter sentences to improve readability.":["PrÃ¸v at lav kortere sÃ¦tninger for en lettere lÃ¦sning."],"difficult":["vanskelig"],"Try to make shorter sentences, using less difficult words to improve readability.":["PrÃ¸v at lav kortere sÃ¦tninger ved at benytte mindre vanskelige ord for en lettere lÃ¦sning."],"very difficult":["meget vanskelig"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo index 8585ce83..8311222e 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.json new file mode 100644 index 00000000..29fe937a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Toll gemacht: dieses Haupt-Keyword hast Du noch nie zuvor benutzt!"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Du hast das Fokus Keyword %1$sschon einmal vorher%2$s benutzt, versichere dich welche URL die wichtigste fÃ¼r dieses Keyword ist."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Es wurden keine UnterÃ¼berschriften (wie z.B. H2) im Text gefunden."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Die Titelform dieser Seite ist ein wenig lang, bitte ein wenig kÃ¼rzen."],"Please create a page title.":["Bitte vergeben Sie einen Seitentitel."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Diese Seite hat keine ausgehenden Links; fÃ¼gen Sie ggf. welche hinzu."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Diese Seite enthÃ¤lt keine Bilder; fÃ¼gen Sie ggf. welche hinzu."],"The images on this page are missing alt tags.":["Die Bilder auf dieser Seite besitzen kein alt-Attribut."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Bedenken Sie bei der angegebenen Meta-Beschreibung: Wie steht sie im Vergleich zu Mitbewerbern? KÃ¶nnte sie vielleicht noch attraktiver erscheinen?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Es wurde keine Meta-Beschreibung angegeben. Suchmaschinen werden versuchen, aus der Seite eine passende Beschreibung zu erstellen."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["ziemlich schwer"],"Try to make shorter sentences to improve readability.":["Versuchen Sie, kÃ¼rzere SÃ¤tze zu nutzen, um die Lesbarkeit zu erhÃ¶hen."],"difficult":["schwer"],"Try to make shorter sentences, using less difficult words to improve readability.":["Versuchen Sie, kÃ¼rzere SÃ¤tze und weniger komplizierte WÃ¶rter zu nutzen, um die Lesbarkeit zu erhÃ¶hen."],"very difficult":["sehr schwierig"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo index c301c3fa..dc641a7f 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.json new file mode 100644 index 00000000..1794d40c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["No keyword"],"Bad SEO score":["Bad SEO score"],"Ok SEO score":["Ok SEO score"],"Good SEO score":["Good SEO score"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Your keyphrase is over 10 words, a keyphrase should be shorter."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["The slug for this page contains one or more %1$sstop words%2$s, consider removing them."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["The page title is between the %1$d character minimum and the recommended %2$d character maximum."],"The images on this page contain alt tags":["The images on this page contain alt tags"],"The images on this page contain alt tags with the focus keyword.":["The images on this page contain alt tags with the focus keyword."],"The focus keyword '%1$s' does not appear in the page title.":["The focus keyword '%1$s' does not appear in the page title."],"The focus keyword appears in the URL for this page.":["The focus keyword appears in the URL for this page."],"The meta description contains the focus keyword.":["The meta description contains the focus keyword."],"stop words":["stop words"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["The text contains %1$d words, which is more than the %2$d word recommended minimum."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["The text contains %1$d words, which is slightly below the %2$d word recommended minimum, add a bit more copy."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["The text contains %1$d words, which is below the %2$d word recommended minimum. Add more useful content on this topic for readers."],"The text contains %1$d words. This is far too low and should be increased.":["The text contains %1$d words. This is far too low and should be increased."],"Outbound links appear in this page":["Outbound links appear in this page"],"You've never used this focus keyword before, very good.":["You've never used this focus keyword before, very good."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated."],"No subheading tags (like an H2) appear in the copy.":["No subheading tags (like an H2) appear in the copy."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is over the advised 2.5% maximum, the focus keyword was found %2$d times."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["You have not used your focus keyword in any subheading (such as an H2) in your copy."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!"],"The slug for this page is a bit long, consider shortening it.":["The slug for this page is a bit long, consider shortening it."],"Please create a page title.":["Please create a page title."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["The page title contains the focus keyword, at the beginning which is considered to improve rankings."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning."],"No outbound links appear in this page, consider adding some as appropriate.":["No outbound links appear in this page, consider adding some as appropriate."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank."],"This page has %1$s outbound link(s).":["This page has %1$s outbound link(s)."],"This page has %2$s outbound link(s), all nofollowed.":["This page has %2$s outbound link(s), all nofollowed."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["This page has %2$s nofollowed link(s) and %3$s normal outbound link(s)."],"No images appear in this page, consider adding some as appropriate.":["No images appear in this page, consider adding some as appropriate."],"The images on this page are missing alt tags.":["The images on this page are missing alt tags."],"The images on this page do not have alt tags containing your focus keyword.":["The images on this page do not have alt tags containing your focus keyword."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["The meta description is under %1$d characters, however up to %2$d characters are available."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible"],"No meta description has been specified, search engines will display copy from the page instead.":["No meta description has been specified, search engines will display copy from the page instead."],"A meta description has been specified, but it does not contain the focus keyword.":["A meta description has been specified, but it does not contain the focus keyword."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is way over the advised 2.5% maximum. The focus keyword was found %2$d times."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is great; the focus keyword was found %2$d times."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately."],"The focus keyword appears in the first paragraph of the copy.":["The focus keyword appears in the first paragraph of the copy."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s"],"fairly difficult":["fairly difficult"],"Try to make shorter sentences to improve readability.":["Try to make shorter sentences to improve readability."],"difficult":["difficult"],"Try to make shorter sentences, using less difficult words to improve readability.":["Try to make shorter sentences, using less difficult words to improve readability."],"very difficult":["very difficult"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.mo index ee11937f..f5cac79e 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_AU.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.json new file mode 100644 index 00000000..bb001a14 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["No keyword"],"Bad SEO score":["Bad SEO score"],"Ok SEO score":["OK SEO score"],"Good SEO score":["Good SEO score"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Your keyphrase is over 10 words. A keyphrase should be shorter."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["The slug for this page contains one or more %1$sstop words%2$s; consider removing them."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["The page title is between the %1$d character minimum and the recommended %2$d character maximum."],"The images on this page contain alt tags":["The images on this page contain alt attributes"],"The images on this page contain alt tags with the focus keyword.":["The images on this page contain alt attributes with the focus keyword."],"The focus keyword '%1$s' does not appear in the page title.":["The focus keyword '%1$s' does not appear in the page title."],"The focus keyword appears in the URL for this page.":["The focus keyword appears in the URL for this page."],"The meta description contains the focus keyword.":["The meta description contains the focus keyword."],"stop words":["stop words"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["The text contains %1$d words, this is more than the %2$d word recommended minimum."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers."],"The text contains %1$d words. This is far too low and should be increased.":["The text contains %1$d words. This is far too low and should be increased."],"Outbound links appear in this page":["Outbound links appear in this page"],"You've never used this focus keyword before, very good.":["You've never used this focus keyword before, very good."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["You've used this focus keyword %1$sonce before%2$s. Be sure to make very clear which URL on your site is the most important for this keyword."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["You've used this focus keyword %3$s%4$d times before%2$s. It's probably a good idea to read %1$sthis post on cornerstone content%2$s and improve your keyword strategy."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated."],"No subheading tags (like an H2) appear in the copy.":["No subheading elements, like an H2, appear in the copy."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["Keyword / keyphrase appears in %s (out of %s) subheadings in the copy. While not a major ranking factor, this is beneficial."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["You have not used your focus keyword in any subheading (such as an H2) in your copy."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["The keyword for this page contains one or more %sstop words%s, consider removing them. Found '%s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!"],"The slug for this page is a bit long, consider shortening it.":["The slug for this page is a bit long, consider shortening it."],"Please create a page title.":["Please create a page title."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["The page title contains %d characters, which is more than the viewable limit of 70 characters; some words will not be visible to users in your listing."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["The page title contains the focus keyword, at the beginning which is considered to improve rankings."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning."],"No outbound links appear in this page, consider adding some as appropriate.":["No outbound links appear in this page. Consider adding some as appropriate."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank."],"This page has %1$s outbound link(s).":["This page has %1$s outbound link(s)."],"This page has %2$s outbound link(s), all nofollowed.":["This page has %2$s outbound link(s), all nofollowed."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["This page has %2$s nofollowed link(s) and %3$s normal outbound link(s)."],"No images appear in this page, consider adding some as appropriate.":["No images appear in this page. Consider adding some as appropriate."],"The images on this page are missing alt tags.":["The images on this page are missing alt attributes."],"The images on this page do not have alt tags containing your focus keyword.":["The images on this page do not have alt attributes containing your focus keyword."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["The meta description is under %1$d characters, however up to %2$d characters are available."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible"],"No meta description has been specified, search engines will display copy from the page instead.":["No meta description has been specified. Search engines will display copy from the page instead."],"A meta description has been specified, but it does not contain the focus keyword.":["A meta description has been specified, but it does not contain the focus keyword."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["The keyword density is %1$f%, which is great; the focus keyword was found %2$d times."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately."],"The focus keyword appears in the first paragraph of the copy.":["The focus keyword appears in the first paragraph of the copy."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s"],"fairly difficult":["fairly difficult"],"Try to make shorter sentences to improve readability.":["Try to make shorter sentences to improve readability."],"difficult":["difficult"],"Try to make shorter sentences, using less difficult words to improve readability.":["Try to make shorter sentences, using fewer difficult words to improve readability."],"very difficult":["very difficult"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.mo index 8259cef4..3b3602a2 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-en_GB.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.json new file mode 100644 index 00000000..f584b136 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Nunca ha usado esta palabra clave antes, muy bien."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Ha utilizado esta palabra clave %1$santes%2$s, asegÃºrase de dejar muy claro quÃ© URL de su sitio web es la mÃ¡s importante para esta palabra clave."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["No aparecen etiquetas de subencabezado (algo como H2) en la copia."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["El slug para esta pÃ¡gina es un poco largo, considera reducirlo."],"Please create a page title.":["Por favor crea un tÃtulo para la pÃ¡gina."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["No hay ningÃºn link externo en esta pÃ¡gina, considera aÃ±adir alguno dentro del contexto."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Ninguna imagen aparece en esta pÃ¡gina, considera agregar algunas segÃºn corresponda."],"The images on this page are missing alt tags.":["A las imÃ¡genes de estÃ¡ pÃ¡gina les faltan los atributos alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["En la meta descripciÃ³n especificada, considera lo siguiente: Â¿CÃ³mo se compara con la competencia? Â¿Puede ser mÃ¡s atractivo?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["No se ha especificado ninguna meta descripciÃ³n, los motores de bÃºsqueda mostrarÃ¡n una copia de la pÃ¡gina en su lugar."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["bastante difÃcil"],"Try to make shorter sentences to improve readability.":["Prueba haciendo frases mÃ¡s cortas para mejorar la legibilidad. "],"difficult":["difÃcil"],"Try to make shorter sentences, using less difficult words to improve readability.":["Prueba haciendo frases mÃ¡s cortas, utilizando menos palabras difÃciles para mejorar la legibilidad."],"very difficult":["muy difÃcil"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo index 63d5964a..c2c3ab3f 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.json new file mode 100644 index 00000000..2d34b484 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Usted no ha usado esta palabra clave antes, muy bien."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Ha utilizado este palabra clave de foco %1$sonce before%2$s, asegurase de especificar claramente cual URL de su sitio es la mas importante para esta palabra clave."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["No aparecen etiquetas de subencabezado (algo como H2) en la copia."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["El slug para esta pÃ¡gina es un poco largo, considera reducirlo."],"Please create a page title.":["Por favor crea un tÃtulo para la pÃ¡gina."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["No hay ningÃºn link externo en esta pÃ¡gina, considera aÃ±adir alguno dentro del contexto."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Ninguna imagen aparece en esta pÃ¡gina, considera agregar algunas segÃºn corresponda."],"The images on this page are missing alt tags.":["A las imÃ¡genes de estÃ¡ pÃ¡gina les faltan los atributos alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["En la meta descripciÃ³n especificada, considera lo siguiente: Â¿CÃ³mo se compara con la competencia? Â¿Puede ser mÃ¡s atractivo?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["No se ha especificado ninguna meta descripciÃ³n, los motores de bÃºsqueda mostrarÃ¡n una copia de la pÃ¡gina en su lugar."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["bastante difÃcil"],"Try to make shorter sentences to improve readability.":["Tratar de hacer frases mÃ¡s cortas para mejorar la legibilidad."],"difficult":["difÃcil"],"Try to make shorter sentences, using less difficult words to improve readability.":["Tratar de hacer frases mÃ¡s cortas, utilizando menos palabras difÃciles para mejorar la legibilidad."],"very difficult":["muy difÃcil"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.mo index 8c59cb0a..e3486e45 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_MX.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.json new file mode 100644 index 00000000..8ae5220a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Giltz-hitzik ez"],"Bad SEO score":["SEO puntuazio txarra"],"Ok SEO score":["SEO puntuazioa OK"],"Good SEO score":["SEO puntuazio ona"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":["https://es.wikipedia.org/wiki/Palabra_vac%C3%ADa"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":["Orrialde honetako irudiak alt etiketak dituzte"],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":["hitz hutsak"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":[""],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":[""],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":[""],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":[""],"Please create a page title.":["Mesedez orrialde izenburu bat sortu."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":[""],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":[""],"The images on this page are missing alt tags.":[""],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":[""],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":[""],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["nahiko zaila"],"Try to make shorter sentences to improve readability.":[""],"difficult":["zailtasun"],"Try to make shorter sentences, using less difficult words to improve readability.":[""],"very difficult":["oso zaila"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.mo index aabd66f5..8425d284 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-eu.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.json new file mode 100644 index 00000000..89d0b89d --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=1; plural=0;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Ø´ÙØ§ Ù¾ÛØ´ØªØ± ÙØ±Ú¯Ø² Ø§Ø² Ø§ÛÙ Ø®ÛÙÛ ÙØ§ÚÙâÛ Ú©Ø§ÙÙÙÛ Ø§Ø³ØªÙØ§Ø¯Ù ÙÚ©Ø±Ø¯ÙâØ§ÛØ¯Ø Ø®ÛÙÛ Ø®ÙØ¨ Ø§Ø³Øª."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Ø´ÙØ§ Ø§Ø² Ú©ÙÛØ¯ÙØ§ÚÙâÛ Ú©Ø§ÙÙÙÛ %1$ Ù¾ÛØ´ØªØ± ÛÚ© Ø¨Ø§Ø± Ø§Ø³ØªÙØ§Ø¯Ù Ú©Ø±Ø¯Ù Ø§ÛØ¯ %2$Ø ÙØ·ÙØ¦Ù Ø´ÙÛØ¯ Ú©Ù ÙØ´Ø®Øµ Ø¨Ø§Ø´Ø¯ Ú©Ù Ú©Ø¯Ø§Ù Ø¢Ø¯Ø±Ø³ Ø¯Ø± Ø³Ø§ÛØª Ø´ÙØ§ Ø¨Ø±Ø§Û Ø§ÛÙ Ú©ÙÛØ¯ÙØ§ÚÙ ÙÙÙâØªØ±ÛÙ Ø§Ø³Øª."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["ÙÛÚ ØªÚ¯ Ø²ÛØ±ØªÛØªØ±Û (ÙØ§ÙÙØ¯ H2) Ø¯Ø± ÙÙØ´ØªÙâÛ Ø´ÙØ§ ÙÛØ³Øª."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["ÙØ§ÙÚ© Ø§ÛÙ Ø¨Ø±Ú¯Ù Ú©ÙÛ Ø¨ÙÙØ¯ Ø§Ø³ØªØ Ø¨Ù Ú©ÙØªØ§Ù Ú©Ø±Ø¯ÙØ´ ÙÚ©Ø± Ú©ÙÛØ¯."],"Please create a page title.":["ÙØ·ÙØ§ ÛÚ© Ø¹ÙÙØ§Ù ØµÙØÙ Ø§ÛØ¬Ø§Ø¯ Ú©ÙÛØ¯."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Ø¯Ø± Ø§ÛÙ ÙÙØ´ØªÙ Ù¾ÛÙÙØ¯ Ø®Ø§Ø±Ø¬Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯! ÛÚ© ÛØ§ ÚÙØ¯ØªØ§ Ù¾ÛÙÙØ¯ Ø®Ø§Ø±Ø¬Û ÙØ±ØªØ¨Ø· Ø¨Ø§ ÙØØªÙØ§Û ÙÙØ´ØªÙ Ø¨Ù Ø³Ø§ÛØªâÙØ§Û ÙØ¹ØªØ¨Ø± Ø§Ø¶Ø§ÙÙ Ú©ÙÛØ¯."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Ø¯Ø± Ø§ÛÙ ÙÙØ´ØªÙ Ø¹Ú©Ø³Û ÙØ´Ø§ÙØ¯Ù ÙÙÛ Ø´ÙØ¯. Ø´Ø§ÛØ¯ Ø¨ÙØªØ± Ø¨Ø§Ø´Ø¯ Ø¹Ú©Ø³Û Ø§Ø¶Ø§ÙÙ ÙÙØ§ÛÛØ¯."],"The images on this page are missing alt tags.":["Ø¨Ø±ÚØ³Ø¨ ÙØ§Û Ø¹Ú©Ø³ ÙØ§ Ø¯Ø± Ø§ÛÙ ØµÙØÙ Ú¯Ù Ø´Ø¯Ù Ø§Ø³Øª."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Ø¯Ø± ÙÙØ´ØªÙ ØªÙØ¶ÛØØ§Øª ÙØªØ§ Ø§ÛÙ ÙÙØ¶ÙØ¹ Ø±Ø§ Ø¯Ø± ÙØ¸Ø± Ø¯Ø§Ø´ØªÙ Ø¨Ø§Ø´ÛØ¯ Ú©Ù ÚÙ ØªÙØ§ÛØ²Û Ø¨Ø§ Ø±ÙØ¨Ø§ Ø¯Ø§Ø±ÛØ¯Ø Ø¢ÛØ§ ÙØ§Ù Ø´ÙØ§ Ø¬Ø°Ø§Ø¨âØªØ± Ø§Ø³ØªØ"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["ÙØªØ§Û ØªÙØ¶ÛØØ§Øª ÙØ´Ø®Øµ ÙØ´Ø¯Ù Ø§Ø³Øª. ÙÙØªÙØ± ÙØ§Û Ø¬Ø³ØªØ¬Ù ÙØ³ÙØªÛ Ø§Ø² ÙØªÙ ØµÙØÙ Ø±Ø§ Ø¨Ù Ø¬Ø§Û Ø¢Ù ÙØ´Ø§Ù Ø®ÙØ§ÙÙØ¯ Ø¯Ø§Ø¯."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["ÙØ§ÙØ¹Ø§ Ø³Ø®Øª"],"Try to make shorter sentences to improve readability.":["Ø³Ø¹Û Ú©ÙÛØ¯ Ø¨Ø±Ø§Û Ø®ÙØ§ÙØ§ÛÛ Ø¨ÛØ´ØªØ± Ø¬ÙÙÙ ÙØ§ Ø±Ù Ú©ÙØªØ§Ù ØªØ± Ú©ÙÛØ¯."],"difficult":["Ø³Ø®Øª"],"Try to make shorter sentences, using less difficult words to improve readability.":["Ø³Ø¹Û Ú©ÙÛØ¯ Ø¨Ø±Ø§Û Ø®ÙØ§ÙØ§ÛÛ Ø¨ÛØ´ØªØ± Ø¬ÙÙÙ ÙØ§ Ø±Ù Ú©ÙØªØ§Ù ØªØ±Ø Ø§Ø² Ú©ÙÙÙ ÙØ§Û Ø¨Ø§ Ø³Ø®ØªÛ Ú©ÙØªØ± Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯. "],"very difficult":["Ø®ÛÙÛ Ø³Ø®Øª"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo index a68f95c6..40f98512 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.json new file mode 100644 index 00000000..9d7d4bf3 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Et ole koskaan kÃ¤yttÃ¤nyt tÃ¤tÃ¤ avainsanaa aikaisemmin, erittÃ¤in hienoa."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Olet kÃ¤yttÃ¤nyt tÃ¤tÃ¤ kohdistusavainsanaa %1$skerran aikaisemmin%2$s, valitse mikÃ¤ nÃ¤istÃ¤ URL:istÃ¤ on sivustosi tÃ¤rkein sivu tÃ¤mÃ¤n avainsanan kannalta."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Alaotsikoita kuten (H2) ei lÃ¶ydy tekstistÃ¤."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Sivun nimi URL:ssÃ¤ on melko pitkÃ¤, voisiko sitÃ¤ lyhentÃ¤Ã¤?"],"Please create a page title.":["Ole hyvÃ¤ ja luo sivun otsikko."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Sivulla ei ole ulospÃ¤in suuntautuvia linkkejÃ¤. Sopivien lisÃ¤Ã¤minen voisi olla hyvÃ¤ idea."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Sivulla ei ole kuvia. NiitÃ¤ voisi mahdollisuuksien mukaan lisÃ¤tÃ¤."],"The images on this page are missing alt tags.":["TÃ¤llÃ¤Ã¤ sivulla olevista kuvista puuttuu vaihtoehtoinen teksti."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Metakuvauksen yhteydessÃ¤: harkitse miten se vertautuu kilpailijoihin? Voisiko se olla houkuttelevampi?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Meta-kuvausta ei ole asetettu, hakukoneet nÃ¤yttÃ¤vÃ¤t kopion sivusta sen sijasta."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["melko hankala"],"Try to make shorter sentences to improve readability.":["LyhyemmÃ¤t lauseet parantavat luettavuutta."],"difficult":["hankala"],"Try to make shorter sentences, using less difficult words to improve readability.":["LyhyemmÃ¤t lauseet ja vÃ¤hemmÃ¤n vaikeat sanat parantavat luettavuutta."],"very difficult":["erittÃ¤in hankala"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.mo index aa9553b5..966a7e43 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fi.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.json new file mode 100644 index 00000000..5c2bb33a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n > 1;"},"No keyword":["Aucun mot-clÃ©"],"Bad SEO score":["Mauvais score SEO"],"Ok SEO score":["Score SEO OK"],"Good SEO score":["Bon score SEO"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Votre phrase clÃ© fait plus de 10 mots, elle devrait Ãªtre plus courte."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["L'identifiant de cette page contient un ou plusieurs %1$smots d'arrÃªt%2$s. Pensez Ã les supprimer."],"http://en.wikipedia.org/wiki/Stop_words":["https://fr.wikipedia.org/wiki/Mot_vide"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["Le titre de page contient entre %1$d caractÃ¨res minimum et %2$d caractÃ¨res maximum recommandÃ©s."],"The images on this page contain alt tags":["Les images de cette page contiennent des balises alt."],"The images on this page contain alt tags with the focus keyword.":["Les images de cette page contiennent des balises alt correspondant au mot-clÃ© principal."],"The focus keyword '%1$s' does not appear in the page title.":["Le mot-clÃ© principal Â«Â %1$sÂ Â» n'apparaÃ®t pas dans le titre de la page."],"The focus keyword appears in the URL for this page.":["Le mot-clÃ© principal apparaÃ®t dans l’url de cette page."],"The meta description contains the focus keyword.":["La mÃ©ta description contient le mot-clÃ© principal."],"stop words":["mots d’arrÃªts"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Votre texte contient %1$d mots, c'est plus que le minimum recommandÃ© de %2$d mots."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Le texte contient %1$d mots, ce qui est lÃ©gÃ¨rement en dessous du minimum recommandÃ© de %2$d mots. Ajoutez-en un peu plus."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Le texte contient %1$d mots, ce qui est moins que le minimum recommandÃ© de %2$d mots. Ajouter plus de contenu utile sur ce sujet pour vos lecteurs."],"The text contains %1$d words. This is far too low and should be increased.":["Le texte contient %1$d mots. Ceci est bien trop faible et doit Ãªtre augmentÃ©."],"Outbound links appear in this page":["Des liens sortants apparaissent dans cette page"],"You've never used this focus keyword before, very good.":["Vous n'aviez jamais utilisÃ© ce mot-clÃ© principal, c'est trÃ¨s bien."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Vous avez dÃ©jÃ utilisÃ© ce mot-clÃ© principal %1$sune fois%2$s, assurez-vous d'indiquer trÃ¨s clairement quelle URL sur votre site est la plus importante pour ce mot-clÃ©."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["Vous avez dÃ©jÃ utilisÃ© ce mot-clÃ© principal %3$s%4$d fois%2$s, il est conseillÃ© de lire %5$scet article sur le contenu stratÃ©gique%6$s et amÃ©liorer la stratÃ©gie du choix de vos mots-clÃ©s."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Aucun mot-clef principal n'a Ã©tÃ© dÃ©fini pour cette page. Si vous n'en dÃ©finissez pas un, aucun score ne pourra Ãªtre calculÃ©."],"No subheading tags (like an H2) appear in the copy.":["Aucune balise d'en-tÃªte (comme un H2) n'apparaÃ®t dans votre contenu."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La densitÃ© de mot-clÃ© est de %1$f%, ce qui est supÃ©rieur au maximum conseillÃ© de 2,5%. Le mot-clÃ© a Ã©tÃ© trouvÃ© %2$d fois."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["Le mot-clÃ© / phrase-clÃ© principal apparaÃ®t dans %2$d (sur %1$d) sous-titres de votre texte. Bien que n'Ã©tant pas un facteur majeur pour le classement, cela est tout de mÃªme bÃ©nÃ©fique."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["Vous n'avez utilisÃ© votre mot-clÃ© / phrase-clÃ© dans aucun sous-titre (comme un H2) dans votre contenu."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["Le mot-clÃ© principal de cette page contient un ou plusieurs %1$s, que vous devriez envisager de retirer. Nous en avons trouvÃ© Â«Â %2$sÂ Â»."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["Ce mot-clÃ© n'apparaÃ®t pas dans l'URL de cette page. Si vous dÃ©cidez de renommer l'URL de cette page, assurez-vous de faire une redirection 301 vers la nouvelle !"],"The slug for this page is a bit long, consider shortening it.":["L'identifiant de cette page est un peu trop long, il serait prÃ©fÃ©rable de le raccourcir."],"Please create a page title.":["Veuillez saisir un titre pour cette page."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["Le titre de page contient %3$d caractÃ¨res, ce qui est moins que le minimum recommandÃ© de %1$d caractÃ¨res. Utilisez l'espace restant pour ajouter des variations de mots-clÃ©s ou rÃ©diger des appels Ã l'action convaincants."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["Le titre de page contient %3$d caractÃ¨res, ce qui est plus que la limite visible de %2$d caractÃ¨res; certains mots ne seront donc pas visibles par les internautes dans les rÃ©sultats de recherche."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["Le titre de la page contient le mot-clÃ© au dÃ©but ce qui devrait permettre d'amÃ©liorer votre classement."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["Le titre de la page contient le mot-clÃ©, mais il ne semble pas apparaÃ®tre au dÃ©but; essayez plutÃ´t de le mettre au dÃ©but."],"No outbound links appear in this page, consider adding some as appropriate.":["Aucun lien externe n'apparaÃ®t dans cette page, vous devriez envisager d'en ajouter."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Vous Ãªtes en train de faire un lien vers une page avec le mot-clÃ© pour lequel vous dÃ©sirez que cette page soit bien classÃ©e. Vous devriez envisager de changer cela si vous voulez vraiment que cette page soit bien classÃ©e dans les moteurs de recherche."],"This page has %1$s outbound link(s).":["Cette page a %1$s lien(s) externe(s). "],"This page has %2$s outbound link(s), all nofollowed.":["Cette page a %2$s lien(s) externe(s), tous en nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Cette page a %2$s lien(s) en nofollow et %3$s lien(s) externe(s) rÃ©gulier(s)."],"No images appear in this page, consider adding some as appropriate.":["Aucune image n'apparaÃ®t sur cette page, vous devriez en ajouter quelques unes."],"The images on this page are missing alt tags.":["Les images sur cette page ne contiennent pas de texte alternatif (attribut alt)."],"The images on this page do not have alt tags containing your focus keyword.":["Les images sur cette page n'ont pas de texte alternatif (attribut alt) contenant votre mot-clÃ©."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Pour cette balise mÃ©ta description, n'oubliez pas de considÃ©rer : Comment se compare-t-elle Ã la concurrence ? Pourrait-elle Ãªtre plus attrayante ?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["La mÃ©ta description compte moins de %1$d caractÃ¨res, vous pouvez encore ajouter %2$d caractÃ¨res."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["La mÃ©ta description spÃ©cifiÃ©e compte plus de %2$d caractÃ¨res. En la rÃ©duisant vous serez assurÃ© que la totalitÃ© de la description soit visible."],"No meta description has been specified, search engines will display copy from the page instead.":["Aucune meta description n'a Ã©tÃ© spÃ©cifiÃ©e, les moteurs de recherche vont donc utiliser le contenu de la page."],"A meta description has been specified, but it does not contain the focus keyword.":["Une mÃ©ta description a Ã©tÃ© spÃ©cifiÃ©e, mais elle ne contient pas le mot-clÃ© ciblÃ©."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["La densitÃ© du mot-clÃ© est de %1$f%, ce qui est un peu faible, le mot-clÃ© a Ã©tÃ© trouvÃ© %2$d fois."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La densitÃ© de ce mot-clÃ© est de %1$f%, ce qui est supÃ©rieur au maximum conseillÃ© de 2,5%. Le mot-clÃ© a Ã©tÃ© trouvÃ© %2$d fois."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["La densitÃ© du mot-clÃ© est de %1$f%, ce qui est trÃ¨s bien, le mot-clÃ© a Ã©tÃ© trouvÃ© %2$d fois."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["Le mot-clÃ© principal n'apparaÃ®t pas dans le premier paragraphe du texte. Assurez-vous que le sujet soit clair immÃ©diatement."],"The focus keyword appears in the first paragraph of the copy.":["Le mot-clÃ© apparaÃ®t dans le premier paragraphe du texte."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["Le texte a obtenu %1$s au test du %2$s, ce qui est considÃ©rÃ© comme %3$s Ã lire. %4$s"],"fairly difficult":["assez difficile"],"Try to make shorter sentences to improve readability.":["Essayez de faire des phrases plus courtes pour amÃ©liorer la lisibilitÃ©."],"difficult":["difficile"],"Try to make shorter sentences, using less difficult words to improve readability.":["Essayez de faire des phrases plus courtes, en utilisant des mots moins compliquÃ©s afin d'amÃ©liorer la lisibilitÃ©."],"very difficult":["trÃ¨s difficile"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo index 998dfac1..92ab4e1d 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.json new file mode 100644 index 00000000..8f61427b --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["××¢××× ×× × ×¢×©× ×©××××© ×××××× ×××§×× ××, ××× ××××."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["× ×¢×©× ×©××××© ×××××× ×××§×× ×× %1$×¤×¢× ×××ª ××¢××¨%2$s, ××© ×××××× ×××× ×¢××× ×××ª×¨ ×¨×××× ×× ×××××× ×××§×× ××."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["××× ×××ª×¨××ª ××©× × (×××××ª H2)"],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["×××× ×××£ ×§×¦×ª ××¨××, × ×¡× ××§×¦×¨ ×××ª×"],"Please create a page title.":["×××¡×£ ×××ª×¨×ª ×××£"],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["×¢××× ×× ××× × ×××× ×§××©××¨×× ×××¦×××, ××© ××©×§×× ××××¡××£ ×§××©××¨×× ×××¦××× ××ª×××××."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["×¢××× ×× ××× × ×××× ×ª××× ××ª, ×©×§×× ××××¡××£ ×ª××× ××ª ××ª×××××ª."],"The images on this page are missing alt tags.":["××ª××× ××ª ×××£ ×× ××¡×¨×× ×ª×× alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["××ª××××¨ ×¢××× ×× ××© ××©×§××: ××× ××× ××©×ª××× ××ª××¨××ª? ××× × ××ª× ×××¦××¨ ×ª××××¨ ×××©× ×××ª×¨?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["×× ×××××¨ ×ª××××¨ ×¢×××, ×× ××¢× ×××¤××© ××©×ª××©× ××ª××× ×××¢××× ×¢×¦×× ×¢× ×× ×ª ×××¦×× ×ª××××¨."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["×§×©× ××××"],"Try to make shorter sentences to improve readability.":["× ×¡× ×××¦××¨ ××©×¤××× ×§×¦×¨×× ×××ª×¨ ×¢× ×× ×ª ×××¤×©×¨ ×§×¨××× × ×¢××× ×××ª×¨."],"difficult":["×§×©×"],"Try to make shorter sentences, using less difficult words to improve readability.":["× ×¡× ×××¦××¨ ××©×¤××× ×§×¦×¨×× ×××ª×¨, ×¢× ××××× ×××ª×¨ ×¤×©××××ª, ×¢× ×× ×ª ×××¤×©×¨ ×§×¨××× × ×¢××× ×××ª×¨."],"very difficult":["×§×©× ××××"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo index 2e617d99..58a1a94a 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.json new file mode 100644 index 00000000..d6aa835b --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n > 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Anda belum pernah menggunakan kata kunci fokus ini, sangat bagus."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Anda telah menggunakan fokus kata kunci %1$s sekali sebelum %2$s, pastikan kembali agar lebih jelas URL mana di website Anda yang paling penting untuk kata kunci ini"],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Tidak ada tag subjudul (seperti H2) nampak di salinan."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Slug untuk halaman ini agak panjang, pertimbangkan memperpendeknya"],"Please create a page title.":["Silakan membuat judul halaman."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Tidak ada link outbound muncul di halaman ini, pertimbangkan untuk menambahkan beberapa yang sesuai."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Tidak ada gambar muncul di halaman ini, pertimbangkan untuk menambahkan beberapa yang sesuai."],"The images on this page are missing alt tags.":["Gambar-gambar di halaman ini tidak memiliki tag alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Dalam deskripsi meta yang ditetapkan, pertimbangkan: Bagaimana diperbandingkan untuk kompetisi? Mungkinkah dibuat lebih menarik?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Tidak ada deskripsi meta yang telah ditentukan, mesin pencari akan menampilkan salinan dari halaman pengganti."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["cukup sulit"],"Try to make shorter sentences to improve readability.":["Cobalah untuk membuat kalimat yang lebih pendek untuk meningkatkan keterbacaan."],"difficult":["sulit"],"Try to make shorter sentences, using less difficult words to improve readability.":["Cobalah untuk membuat kalimat lebih pendek, kurangi kata-kata terlalu sulit untuk meningkatkan keterbacaan."],"very difficult":["sangat sulit"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo index 09c467ba..eb0bf993 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.json new file mode 100644 index 00000000..599a72be --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Nessuna keyword"],"Bad SEO score":["Punteggio SEO basso"],"Ok SEO score":["Punteggio SEO Ok"],"Good SEO score":["Punteggio SEO buono"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["La tua frase chiave contiene piÃ¹ di 10 parole, una frase chiave dovrebbe essere piÃ¹ corta."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["Lo slug di questo articolo contiene una o piÃ¹ %1$sstop words%2$s, valuta se rimuoverle."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["La lunghezza del titolo della pagina Ã¨ inclusa fra i %1$d e i %2$d caratteri, rispettivamente il minimo e il massimo raccomandato."],"The images on this page contain alt tags":["Le immagini in questa pagina contengono alt tag"],"The images on this page contain alt tags with the focus keyword.":["Le immagini in questa pagina contengono alt tag con la keyword di riferimento."],"The focus keyword '%1$s' does not appear in the page title.":["La parola chiave di riferimento '%1$s' non appare nel titolo della pagina."],"The focus keyword appears in the URL for this page.":["La parola chiave di riferimento appare nell' URL di questa pagina."],"The meta description contains the focus keyword.":["La meta description contiene la parola chiave di riferimento."],"stop words":["stop word"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Il testo contiene %1$d parole, questo Ã¨ piÃ¹ del minimo raccomandato di %2$d parole."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Il testo contiene %1$d parole, Ã¨ leggermente al di sotto di %2$d minimo raccomandato di parole, aggiungi qualche copia in piÃ¹."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Il testo contiene %1$d parole, sotto il minimo raccomandato di %2$d parole. Aggiungi a questo topic dell'altro contenuto utile per i lettori."],"The text contains %1$d words. This is far too low and should be increased.":["Il testo contiene %1$d parole. Queste sono davvero troppo poche e bisogna aumentarle."],"Outbound links appear in this page":["In questa pagina appaiono link in uscita"],"You've never used this focus keyword before, very good.":["Non hai mai usato questa parola chiave prima d'ora, molto bene."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Hai giÃ usato questa parola chiave %1$sun'altra volta%2$s, fai attenzione ad evidenziare l'URL piÃ¹ importante per questa parola chiave all'interno del tuo sito."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["Hai giÃ usato questa parola chiave %3$s%4$d volte prima%2$s, ti suggerisco di leggere %6$squesto articolo su cornerstone content%5$s e migliorare la tua strategia di scelta delle parole chiave."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Non Ã¨ stata impostata alcuna parola chiave specifica per questa pagina. Se non si imposta una parola chiave specifica non Ã¨ possibile calcolare alcun punteggio."],"No subheading tags (like an H2) appear in the copy.":["Nessuna marcatore di sottotestata (come ad esempio gli H2) appare nel testo."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La densitÃ della parola chiave Ã¨ %1$f%, che Ã¨ sopra il massimo valore consigliato di 2.5%%, la parola chiave Ã¨ stata trovata %2$d volte."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["La parola chiave appare in %2$d(su %1$d) sotto testate nel documento. Sebbene non sia un fattore principale di posizionamento, Ã¨ certamente di aiuto."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["All'interno del testo non Ã¨ stata utilizzata alcuna parola chiave in nessuna delle sotto testate (come ad esempio una H2)."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["La parola chiave per questa pagina contiene una o piÃ¹ %1$s, consiglio di rimuoverle. Rilevate '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["La parola chiave non appare nella URL di questa pagina. Se decidi di rinominare l'URL assicurati di controllare che la vecchia URL redirezioni con un 301 a quella nuova!"],"The slug for this page is a bit long, consider shortening it.":["L'abbreviazione di questa pagina Ã¨ troppo lunga, prova ad abbreviarla."],"Please create a page title.":["Si prega di creare un titolo di pagina."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["Il titolo di pagina contiene %3$d caratteri, che Ã¨ inferiore alla lunghezza raccomandata di %1$d caratteri. Usa questo spazio per aggiungere variazioni di parole chiave o per creare una descrizione persuasiva. "],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["Il titolo di pagina contiene %3$d caratteri, che Ã¨ maggiore del limite visibile di %2$d caratteri; alcune parole non saranno visibili agli utenti nell'elenco."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["Il titolo di pagina contiene la parola chiave all'inizio che Ã¨ considerato piÃ¹ rilevante per i posizionamenti. "],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["Il titolo di pagina contiene la parola chiave, ma questa non appare all'inizio; prova a spostarla all'inizio."],"No outbound links appear in this page, consider adding some as appropriate.":["In questa pagina non c'Ã¨ alcun link in uscita, considera di aggiungerne alcuni rilevanti."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Stai rimandando ad un'altra pagina attraverso la parola chiave con cui vorresti indicizzare questa pagina. Considera di modificarla se vuoi che questa pagina venga indicizzata."],"This page has %1$s outbound link(s).":["Questa pagina ha %1$s link in uscita."],"This page has %2$s outbound link(s), all nofollowed.":["Questa pagina ha %2$s link in uscita, tutti nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Questa pagina ha in uscita %2$s link nofollow e %3$s link normali."],"No images appear in this page, consider adding some as appropriate.":["In questa pagina non appare alcuna immagine, considera di aggiungerne alcune rilevanti."],"The images on this page are missing alt tags.":["Le immagini in questa pagina non presentano i tag alt."],"The images on this page do not have alt tags containing your focus keyword.":["Le immagini in questa pagina non presentano tag alt contenenti la tua la parola chiave."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Nella meta description fornita, tieni presente: come si rapporta alla concorrenza? PuÃ² essere migliorata?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["La meta description Ã¨ inferiore a %1$d caratteri, sono ancora disponibili %2$d caratteri."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["La meta description specificata supera i %2$d caratteri. Ridurla assicurerÃ la completa visibilitÃ della descrizione. "],"No meta description has been specified, search engines will display copy from the page instead.":["Non Ã¨ stata fornita alcuna meta description, i motori di ricerca mostreranno quindi sezioni di testo della pagina."],"A meta description has been specified, but it does not contain the focus keyword.":["Ã stata fornita una meta description, ma non contiene la parola chiave di riferimento."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["La ricorrenza della parola chiave Ã¨ %1$f%, Ã¨ un po' bassa; la parola chiave Ã¨ stata trovata %2$d volte. "],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["La ricorrenza della parola chiave Ã¨ %1$f%, che va oltre il massimo consigliato del 2.5%%; la parola chiave Ã¨ stata trovata %2$d volte."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["La ricorrenza della parola chiave Ã¨ %1$f%, Ã¨ un bene; la parola chiave Ã¨ stata trovata %2$d volte."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["La parola chiave non appare nel primo paragrafo del testo. Assicurati che l'argomento sia chiaro da subito."],"The focus keyword appears in the first paragraph of the copy.":["La parola chiave appare nel primo paragrafo del testo."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["Il testo ha un valore di %1$s nel test %2$s, che Ã¨ considerato %3$s da leggere. %4$s"],"fairly difficult":["abbastanza difficile"],"Try to make shorter sentences to improve readability.":["Prova a creare frasi piÃ¹ brevi per migliorare la leggibilitÃ ."],"difficult":["difficile"],"Try to make shorter sentences, using less difficult words to improve readability.":["Prova a creare frasi piÃ¹ brevi, usa parole meno difficili per migliorare la leggibilitÃ . "],"very difficult":["molto difficile"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.mo index 4c0ad0bc..26070dd6 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-it_IT.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.json new file mode 100644 index 00000000..1c9751cf --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=1; plural=0;"},"No keyword":["ãã¼ã¯ã¼ããããã¾ãã"],"Bad SEO score":["æªã SEO ã¹ã³ã¢ã§ã"],"Ok SEO score":["ã¾ãã¾ãã® SEO ã¹ã³ã¢ã§ã"],"Good SEO score":["éå¸¸ã«è¯ã SEO ã¹ã³ã¢ã§ã"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["ãã¼ãã¬ã¼ãºã10åä»¥ä¸å«ã¾ãã¦ãã¾ããæ¸ããã¦ãã ããã"],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":["ãã®æç¨¿ã®ç»åã«ã¯ alt ã¿ã°ãããã¾ã"],"The images on this page contain alt tags with the focus keyword.":["ãã®æç¨¿ã®ç»åã«ã¯ãã©ã¼ã«ã¹ãã¼ã¯ã¼ãå¥ãã® alt ã¿ã°ãããã¾ã"],"The focus keyword '%1$s' does not appear in the page title.":["ãã©ã¼ã«ã¹ãã¼ã¯ã¼ãã%1$sãããã¼ã¸ã¿ã¤ãã«ã«å«ã¾ãã¦ãã¾ããã"],"The focus keyword appears in the URL for this page.":["ãã©ã¼ã«ã¹ãã¼ã¯ã¼ãããã®ãã¼ã¸ã® URL ã«å«ã¾ãã¦ãã¾ãã"],"The meta description contains the focus keyword.":["ã¡ã¿èª¬ææã«ãã©ã¼ã«ã¹ãã¼ã¯ã¼ããå«ã¾ãã¦ãã¾ãã"],"stop words":["ã¹ãããã¯ã¼ã"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["ããã¹ãã¯%1$dæåã§ã%2$dæåä»¥ä¸ããã¾ãã"],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["ããã¹ãã¯%1$dæåã§ã%2$dæåã«ãããã«å±ãã¦ãã¾ãããããå°ãæç« ãè¶³ãã¦ã¿ã¦ãã ããã"],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["ããã¹ãã¯%1$dæåã§ãæ¨å¥¨æåæ°ï¼%2$dæåï¼ã«å±ãã¦ãã¾ãããèªèã«ã¨ã£ã¦ããããããã»æç¨ãªæç« ãè¶³ãã¦ãã ããã"],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["ããã¾ã§ä¸åº¦ããã®ãã©ã¼ã«ã¹ãã¼ã¯ã¼ããä½¿ã£ããã¨ãããã¾ãããè¯ãã§ããã"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["ãã®ãã©ã¼ã«ã¹ãã¼ã¯ã¼ãã%1$sä»¥åã«ã%2$sä½¿ã£ããã¨ãããã¾ãããã®ãã¼ã¯ã¼ãã«å¯¾ãã¦ã©ã®URLãä¸çªå¤§äºãªã®ãæç¢ºã«ããããã«ãã¦ãã ããã"],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["ãµãè¦åºãã¿ã°ï¼H2ãªã©ï¼ã¯ã³ãã¼ã«è¡¨ç¤ºããã¾ããã"],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["ãã®ãã¼ã¸ã®ã¹ã©ãã°ã¯å°ãé·ãã§ããçç¸®ãæ¤è¨ãã¦ãã ããã"],"Please create a page title.":["ãã¼ã¸ã¿ã¤ãã«ãä½æãã¦ãã ããã"],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["ãã®ãã¼ã¸ã«å¤é¨ãªã³ã¯ã¯è¡¨ç¤ºãã¦ãã¾ããããå¿è¦ã«å¿ãã¦ããã¤ãè¿½å ãããã¨ãæ¤è¨ãã¦ãã ããã"],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["ãã®ãã¼ã¸ã«å¨ãç»åãè¡¨ç¤ºããã¾ããããå¿è¦ã«å¿ãã¦ããã¤ãè¿½å ãããã¨ãæ¤è¨ãã¾ãã"],"The images on this page are missing alt tags.":["ãã®ãã¼ã¸ã®ç»åã¯ãalt ã¿ã°ãããã¾ããã"],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["ã¡ã¿èª¬ææãæå®ããã¨ãã¯ãä»ã¨ã®ç«¶äºã«åã¦ãããããéåçã«åºæ¥ãªããæ¨æ²ãã¦ãã ããã"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["ã¡ã¿èª¬ææãæå®ããã¦ããªãã®ã§ãæ¤ç´¢ã¨ã³ã¸ã³ã¯ãã¼ã¸ã®ä»£ããã«ã³ãã¼ãè¡¨ç¤ºãã¦ãã¾ãã"],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["ããªãé£ãã"],"Try to make shorter sentences to improve readability.":["èªã¿ããããåä¸ãããããã«ãçãæç« ãä½ã£ã¦ã¿ã¦ãã ããã"],"difficult":["é£ãã"],"Try to make shorter sentences, using less difficult words to improve readability.":["èªã¿ããããåä¸ãããããã«ä»¥ä¸ã®é£ããè¨èãä½¿ã£ã¦ãçãæç« ãä½ã£ã¦ã¿ã¦ãã ããã"],"very difficult":["éå¸¸ã«é£ãã"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.mo index d052224b..5c69a2c4 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ja.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.json new file mode 100644 index 00000000..b58c936c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Ingen nÃ¸kkelord"],"Bad SEO score":["DÃ¥rlig SEO-resultat"],"Ok SEO score":["OK SEO-resultat"],"Good SEO score":["Godt SEO-resultat"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Din nÃ¸kkelfrase er over 10 ord. En nÃ¸kkelfrase bÃ¸r vÃ¦re kortere."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Du har aldri brukt dette fokus-nÃ¸kkelordet tidligere. Veldig bra."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Du har brukt dette fokus-nÃ¸kkelordet %1$sen gang tidligere%2$s. SÃ¸rg for Ã¥ gjÃ¸re det veldig klart hvilken nettadresse pÃ¥ nettstedet ditt som er det viktigste for dette nÃ¸kkelordet."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Ingen undertittel-elementer (som H2) vises i brÃ¸dteksten."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Permalenken for denne siden er litt lang. Vurder Ã¥ forkorte den."],"Please create a page title.":["Vennligst opprett en sidetittel."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Ingen utgÃ¥ende lenker vises pÃ¥ denne siden. Du bÃ¸r vurdere Ã¥ legge til noen som passer."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Ingen bilder vises pÃ¥ denne siden, du bÃ¸r vurdere Ã¥ legge til noen som passer."],"The images on this page are missing alt tags.":["Bildene pÃ¥ denne siden mangler alt tags."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["I den angitte meta-beskrivelsen, vurder: Hvordan er det sammenlignet med konkurransen? Kan det gjÃ¸res mer attraktivt?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Ingen meta-beskrivelse er spesifisert, sÃ¸kemotorer vil vise tekst fra siden i stedet."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["ganske vanskelig"],"Try to make shorter sentences to improve readability.":["PrÃ¸v Ã¥ lage kortere setninger for Ã¥ bedre lesbarheten."],"difficult":["vanskelig"],"Try to make shorter sentences, using less difficult words to improve readability.":["PrÃ¸v Ã¥ lage kortere setninger og bruk enklere ord for Ã¥ bedre lesbarheten."],"very difficult":["veldig vanskelig"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.mo index f2b4664c..9e715465 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nb_NO.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.json new file mode 100644 index 00000000..91beec23 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Geen trefwoord"],"Bad SEO score":["Slechte SEO score"],"Ok SEO score":["Matige SEO score"],"Good SEO score":["Goede SEO score"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Je sleutelzin bevat meer dan 10 woorden. Een sleutelzin moet korter zijn."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["De slug van deze pagina bevat een of meerdere %1$sstopwoorden%2$s. Overweeg om ze te verwijderen."],"http://en.wikipedia.org/wiki/Stop_words":["https://nl.wikipedia.org/wiki/Stopwoord_(taalkunde)"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["De paginatitel lengte is tussen het minimum van %1$d karakters en het aanbevolen maximum van %2$d karakters."],"The images on this page contain alt tags":["De afbeeldingen op deze pagina bevatten alt-tags"],"The images on this page contain alt tags with the focus keyword.":["De afbeeldingen op deze pagina bevatten alt-tags met het focus-zoekwoord."],"The focus keyword '%1$s' does not appear in the page title.":["Het focus-zoekwoord '%1$s' komt niet voor in de paginatitel."],"The focus keyword appears in the URL for this page.":["Het focus-zoekwoord komt voor in de URL voor deze pagina."],"The meta description contains the focus keyword.":["De meta-omschrijving bevat het focus-zoekwoord."],"stop words":["stopwoorden"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["De tekst bevat %1$d woorden, dit is meer dan het minimum van %2$d woorden."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["De tekst bevat %1$d woorden, dit is net iets minder dan het aangeraden minimum van %2$d woorden, voeg wat meer tekst toe."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["De tekst bevat %1$d woorden, dit is minder dan het aangeraden minimum van %2$d. Voeg meer nuttige tekst toe aan dit onderwerp."],"The text contains %1$d words. This is far too low and should be increased.":["De tekst bevat %1$d woorden. Dit is veel te weinig, voeg meer tekst toe."],"Outbound links appear in this page":["Op deze pagina worden uitgaande links getoond"],"You've never used this focus keyword before, very good.":["Je hebt dit trefwoord nog nooit eerder gebruikt, heel goed."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Je hebt dit trefwoord %1$sÃ©Ã©n keer eerder%2$s gebruikt, zorg ervoor dat het heel duidelijk is welke URL op de website het belangrijkst is voor dit trefwoord."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["Je hebt dit trefwoord %3$s%4$d keer eerder gebruikt%2$s. Het is misschien een goed idee om %1$sdit bericht over goede inhoud%2$s te lezen om de trefwoorden-strategie te verbeteren."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Er is geen focus-trefwoord ingesteld voor deze pagina. Als er geen focus-trefwoord wordt opgegeven, kan er geen score worden berekend."],"No subheading tags (like an H2) appear in the copy.":["Er staan geen sub-titel-tags (zoals een H2) in de tekst."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["De trefwoorden-dichtheid is %1$f%, wat meer is dan het geadviseerde maximum van 2.5%, het trefwoord is %2$d keer gevonden. "],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["Trefwoord/trefwoorden-zin verschijnt in %2$d (van de %1$d) ondertitels van de tekst. Hoewel het geen grote rol speelt in de zoekresultaten, helpt het wel."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["Je hebt geen trefwoord/trefwoorden-zin gebruikt in welke subkop (zoals een H2) dan ook in de tekst."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["Het trefwoord voor deze pagina bevat Ã©Ã©n of meer %1$s, overweeg ze te verwijderen. Gevonden '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["Het trefwoord komt niet voor in de URL van deze pagina. Wanneer je de URL zou aanpassen, vergeet dan geen 301-redirect van de oude URL naar de nieuwe!"],"The slug for this page is a bit long, consider shortening it.":["De slug van deze pagina is wat lang, overweeg om deze in te korten."],"Please create a page title.":["Geef een paginatitel op."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["De paginatitel bevat %3$d tekens, wat minder is dan het aanbevolen minimum van %1$d tekens. Neem de ruimte om trefwoord-variaties toe te voegen of schrijf een aantrekkelijke call-to-action-titel."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["De paginatitel bevat %3$d tekens, wat meer is dan de limiet van %2$d tekens die getoond worden; sommige woorden zullen niet zichtbaar zijn in de zoekresultaten."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["De paginatitel bevat een trefwoord aan het begin, wat de rankings ten goede komt."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["De paginatitel bevat een trefwoord, maar deze staat niet aan het begin; probeer deze naar voren te verplaatsen."],"No outbound links appear in this page, consider adding some as appropriate.":["Geen uitgaande verwijzende links gevonden op deze pagina; overweeg enkele toe te voegen, waar van toepassing."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Je linkt naar een andere pagina met het trefwoord waarmee je deze pagina wil laten ranken. Overweeg dit aan te passen als je deze pagina echt wil ranken."],"This page has %1$s outbound link(s).":["Deze pagina heeft %1$s uitgaande link(s)."],"This page has %2$s outbound link(s), all nofollowed.":["Deze pagina heeft %2$s uitgaande link(s), allemaal van het type nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Deze pagina heeft %2$s nofollow link(s) en %3$s normale uitgaande link(s)."],"No images appear in this page, consider adding some as appropriate.":["Deze pagina heeft geen afbeeldingen, overweeg geschikte afbeeldingen toe te voegen."],"The images on this page are missing alt tags.":["De afbeeldingen op deze pagina missen alt-tags."],"The images on this page do not have alt tags containing your focus keyword.":["De afbeeldingen op deze pagina bevatten geen alt-tags met het trefwoord."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Overweeg in de opgegeven meta-omschrijving: Hoe staat hij in verhouding tot de concurrentie? Zou hij aantrekkelijker gemaakt kunnen worden?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["De meta-omschrijving is minder dan %1$d tekens, hoewel er tot %2$d tekens beschikbaar zijn. "],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["De opgegeven meta-omschrijving bevat meer dan %2$d tekens, kort deze in om er zeker van te zijn dat de hele omschrijving zichtbaar zal zijn."],"No meta description has been specified, search engines will display copy from the page instead.":["Er is geen meta-omschrijving opgegeven, zoekmachines zullen tekst van de pagina tonen."],"A meta description has been specified, but it does not contain the focus keyword.":["Een meta-omschrijving is gespecificeerd, maar bevat geen doel-trefwoord."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["De trefwoord-dichtheid is %1$f%, wat aan de lage kant is. Het trefwoord is %2$d keer gevonden."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["De zoekterm-dichtheid is %1$f%, wat meer is dan het geadviseerde maximum van 2,5%. Het trefwoord werd %2$d keer gevonden."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["De trefwoord-dichtheid is %1$f%, wat goed is. Het trefwoord is %2$d keer gevonden."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["Het trefwoord komt niet voor in de eerste alinea van het bericht. Zorg dat het onderwerp direct duidelijk is."],"The focus keyword appears in the first paragraph of the copy.":["Het sleutelwoord komt voor in de eerste alinea van het bericht."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["De inhoud scoort %1$s in de %2$s-test, wat beschouwd wordt als %3$s om te lezen. %4$s"],"fairly difficult":["redelijk moeilijk"],"Try to make shorter sentences to improve readability.":["Probeer kortere zinnen te maken om de leesbaarheid te verbeteren."],"difficult":["moeilijk"],"Try to make shorter sentences, using less difficult words to improve readability.":["Probeer kortere zinnen te maken, met minder moeilijke woorden om de leesbaarheid te verbeteren."],"very difficult":["heel moeilijk"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo index 5ff648d4..d462cb06 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.json new file mode 100644 index 00000000..9c13e9b6 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"},"No keyword":["Brak frazy kluczowej"],"Bad SEO score":["ZÅa ocena SEO"],"Ok SEO score":["Poprawna ocena SEO"],"Good SEO score":["Dobra ocena SEO"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Twoja fraza kluczowa ma wiÄcej, niÅ¼ 10 wyrazÃ³w. Fraza kluczowa powinna byÄ krÃ³tsza."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["Adres tej podstrony zawiera jedno lub wiÄcej %1$ssÅÃ³w pomijalnych%2$s - rozwaÅ¼ ich usuniÄcie."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["TytuÅ strony zawiera siÄ miÄdzy zalecanÄ dÅugoÅciÄ od %1$d do %2$d znakÃ³w."],"The images on this page contain alt tags":["Obrazki na tej stronie zawierajÄ atrybuty alt"],"The images on this page contain alt tags with the focus keyword.":["Obrazki na tej stronie zawierajÄ atrybuty alt z gÅÃ³wnÄ frazÄ kluczowÄ."],"The focus keyword '%1$s' does not appear in the page title.":["Fraza kluczowa '%1$s' nie wystÄpuje w tytule strony."],"The focus keyword appears in the URL for this page.":["Fraza kluczowa pojawia siÄ w adresie URL tej podstrony."],"The meta description contains the focus keyword.":["Opis meta zawiera frazÄ kluczowÄ."],"stop words":["pomijalne sÅowa"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Tekst zawiera %1$d wyrazÃ³w, czyli wiÄcej, niÅ¼ zalecane minimum %2$d wyrazÃ³w."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Tekst zawiera %1$d wyrazÃ³w. To trochÄ mniej, niÅ¼ zalecana minimalna liczba %2$d wyrazÃ³w. Dodaj trochÄ wiÄcej treÅci."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Tekst zawiera %1$d wyrazÃ³w, czyli mniej, niÅ¼ zalecane minimum %2$d wyrazÃ³w. Dopisz wiÄcej wartoÅciowej treÅci dla swoich czytelnikÃ³w."],"The text contains %1$d words. This is far too low and should be increased.":["Tekst zawiera %1$d wyrazÃ³w. To stanowczo za maÅo. SprÃ³buj napisaÄ wiÄcej treÅci."],"Outbound links appear in this page":["Strona zawiera odnoÅniki wychodzÄce"],"You've never used this focus keyword before, very good.":["Nigdy wczeÅniej nie uÅ¼yÅeÅ tej frazy kluczowej, bardzo dobrze."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["%1$sJuÅ¼ raz%2$s uÅ¼yÅeÅ tej frazy kluczowej. Zadbaj o to, aby byÅo jasne, ktÃ³ry adres URL jest dla tej frazy najwaÅ¼niejszy."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["UÅ¼yÅeÅ tej frazy kluczowej juÅ¼ %3$s%4$d razy%2$s - dobrym pomysÅem moÅ¼e byÄ przeczytanie %6$stego artykuÅu o kamieniu wÄgielnym treÅci%5$s i udoskonalenie strategii doboru fraz kluczowych."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Ta strona nie ma ustawionej frazy kluczowej. JeÅli jej nie ustawisz, nie bÄdzie obliczona ocena pozycjonowania."],"No subheading tags (like an H2) appear in the copy.":["W tekÅcie brakuje tagÃ³w nagÅÃ³wka (takich jak h2, h3)."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["CzÄstotliwoÅÄ pojawiania siÄ frazy kluczowej wynosi %1$f%, czyli wiÄcej, niÅ¼ zalecane maksimum, wynoszÄce 2,5%. Fraza kluczowa wystÄpuje %2$d razy."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["Fraza kluczowa wystÄpuje w %2$d z %1$d nagÅÃ³wkÃ³w w treÅci. Nie jest to kluczowy, ale wciÄÅ¼ wartoÅciowy czynnik dla pozycjonowania."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["Nie zamieÅciÅeÅ frazy kluczowej w Å¼adnym nagÅÃ³wku treÅci (np. stopnia drugiego - H2)."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["Fraza kluczowa dla tej podstrony zwiera jedno lub wiÄcej %1$s. RozwaÅ¼ ich usuniÄcie. Znaleziono: '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["Fraza kluczowa nie pojawia siÄ w adresie URL strony. JeÅli zdecydujesz siÄ na zmianÄ adresu, upewnij siÄ, Å¼e poprzedni adres ma ustawione przekierowanie 301 na nowy adres."],"The slug for this page is a bit long, consider shortening it.":["BezpoÅredni odnoÅnik strony jest za dÅugi, proponujÄ go trochÄ skrÃ³ciÄ."],"Please create a page title.":["ProszÄ utworzyÄ tytuÅ strony."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["TytuÅ strony zawiera %3$d znakÃ³w, czyli mniej, niÅ¼ zalecane minimum %1$d znakÃ³w. UÅ¼yj pozostaÅego miejsca, aby dodaÄ odmiany fraz kluczowych lub dodaj tekst zachÄcajÄcy uÅ¼ytkownika do dziaÅania."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["TytuÅ strony zawiera %3$d znakÃ³w, a wiÄc przekracza limit %2$d znakÃ³w wyÅwietlanych w wynikach wyszukiwania znakÃ³w. CzÄÅÄ wyrazÃ³w nie bÄdzie widoczna w wynikach wyszukiwania."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["TytuÅ strony zawiera frazÄ kluczowÄ umieszczonÄ na jego na poczÄtku, co powinno pozytywnie wpÅywaÄ na ranking w wyszukiwarkach."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["TytuÅ strony zawiera frazÄ kluczowÄ, ale nie znajduje siÄ ona na jego poczÄtku. SprÃ³buj przenieÅÄ jÄ na poczÄtek."],"No outbound links appear in this page, consider adding some as appropriate.":["Ta strona nie zawiera Å¼adnych odnoÅnikÃ³w wychodzÄcych. RozwaÅ¼ ich dodanie."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["Ta podstrona zawiera odnoÅnik do innej podstrony, w ktÃ³rej ustawione jest taka sama fraza kluczowa, jak dla obecnej. Sugerujemy to zmieniÄ, jeÅli naprawdÄ chcesz, aby ta podstrona byÅa wysoko w wynikach wyszukiwania dla tej frazy."],"This page has %1$s outbound link(s).":["Ta strona posiada %1$s odnoÅnikÃ³w wychodzÄcych."],"This page has %2$s outbound link(s), all nofollowed.":["Ta strona posiada %2$s odnoÅnikÃ³w wychodzÄcych, wszystkie z atrybutem nofollow."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Ta strona posiada %2$s odnoÅnikÃ³w z atrybutem nofollow i %3$s normalnych odnoÅnikÃ³w zewnÄtrznych."],"No images appear in this page, consider adding some as appropriate.":["Ta strona nie posiada obrazkÃ³w, dobrze by byÅo to zmieniÄ."],"The images on this page are missing alt tags.":["Obrazki na tej stronie nie posiadajÄ tagu alt."],"The images on this page do not have alt tags containing your focus keyword.":["Obrazki na tej stronie nie posiadajÄ atrybutÃ³w alt z frazÄ kluczowÄ."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["W kontekÅcie meta opisu zastanÃ³w siÄ: Jak to wyglÄda w porÃ³wnaniu z konkurencjÄ? Czy moÅ¼na to lepiej wyraziÄ i wyeksponowaÄ?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["DÅugoÅÄ opisu meta wynosi mniej, niÅ¼ zalecane %1$d znakÃ³w, zaÅ moÅ¼na zamieÅciÄ aÅ¼ do %2$d znakÃ³w."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["DÅugoÅÄ opisu meta przekracza limit %2$d znakÃ³w. SkrÃ³cenie go zapewni widocznoÅÄ caÅego opisu."],"No meta description has been specified, search engines will display copy from the page instead.":["Ta strona nie posiada meta opisu wiÄc wyszukiwarki wyÅwietlÄ tekst z treÅci strony."],"A meta description has been specified, but it does not contain the focus keyword.":["Opis meta zostaÅ wpisany, ale nie zawiera frazy kluczowej."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["CzÄstotliwoÅÄ pojawiania siÄ frazy kluczowej wynosi %1$f%, a wiÄc jest trochÄ zbyt maÅa. Fraza kluczowa wystÄpuje %2$d razy."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["CzÄstotliwoÅÄ pojawiania siÄ frazy kluczowej wynosi %1$f%, czyli znacznie wiÄcej, niÅ¼ zalecane maksimum, wynoszÄce 2,5%. Fraza kluczowa wystÄpuje %2$d razy."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["CzÄstotliwoÅÄ pojawiania siÄ frazy kluczowej wynosi %1$f%, co jest Åwietnym wynikiem. Fraza kluczowa wystÄpuje %2$d razy."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["Fraza kluczowa nie pojawia siÄ w pierwszym akapicie tekstu. Upewnij siÄ, Å¼e temat treÅci jest jasny od pierwszego zdania."],"The focus keyword appears in the first paragraph of the copy.":["Fraza kluczowa pojawia siÄ w pierwszym akapicie tekstu."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["Tekst otrzymaÅ wynik %1$s w teÅcie %2$s, co oznacza, Å¼e jego czytelnoÅÄ jest %3$s. %4$s"],"fairly difficult":["doÅÄ trudna"],"Try to make shorter sentences to improve readability.":["Aby poprawiÄ czytelnoÅÄ, sprÃ³buj trochÄ skrÃ³ciÄ zdania."],"difficult":["trudna"],"Try to make shorter sentences, using less difficult words to improve readability.":["Aby poprawiÄ czytelnoÅÄ, sprÃ³buj trochÄ skrÃ³ciÄ zdania i uÅ¼ywaÄ prostszych sÅÃ³w."],"very difficult":["bardzo trudna"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.mo index 09334dff..904521af 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pl_PL.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.json new file mode 100644 index 00000000..64548ace --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=(n > 1);"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["ParabÃ©ns, vocÃª nÃ£o havia utilizado esta palavra chave antes."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["VocÃª usou esta palavra chave %1$suma vez%2$s, tenha certeza de qual URL em seu site Ã© mais importante para essa palavra chave."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Nenhuma tag de cabeÃ§alho secundÃ¡rio (como um H2) aparece no texto."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["O slug desta pÃ¡gina Ã© um pouco longo, considere encurtÃ¡-lo."],"Please create a page title.":["Por favor, crie um tÃtulo para a pÃ¡gina."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Nenhum link de saÃda aparece nesta pÃ¡gina, considere acrescentar alguns como apropriado."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Nenhuma imagem aparece nesta pÃ¡gina, considere acrescentar algumas como apropriado."],"The images on this page are missing alt tags.":["As imagens nesta pÃ¡gina estÃ£o sem tags alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Na meta-descriÃ§Ã£o especificada, considere: Como ela se compara Ã competiÃ§Ã£o? Ã possÃvel tornÃ¡-la mais atraente?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Nenhuma meta-descriÃ§Ã£o foi especificada, e como resultado os mecanismos de busca mostrarÃ£o trechos da pÃ¡gina no lugar dela."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["razoavelmente difÃcil de"],"Try to make shorter sentences to improve readability.":["Tente escrever sentenÃ§as mais curtas para aumentar a facilidade de leitura."],"difficult":["difÃcil de"],"Try to make shorter sentences, using less difficult words to improve readability.":["Tente escrever sentenÃ§as mais curtas, usando palavras menos difÃceis para aumentar a facilidade de leitura."],"very difficult":["muito difÃcil de"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.mo index 5aa2917a..f9fda743 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_BR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.json new file mode 100644 index 00000000..a7c31022 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":["Sem palavra-chave"],"Bad SEO score":["Mau resultado de SEO"],"Ok SEO score":["Resultado de SEO: OK"],"Good SEO score":["Bom resultado de SEO"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["A sua frase chave tem mais de 10 palavras; uma frase chave deve ser mais curta."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["O URL desta pÃ¡gina contÃ©m uma ou mais %1$spalavras de ligaÃ§Ã£o%2$s; considere removelas."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["O tÃtulo da pÃ¡gina estÃ¡ entre o nÃºmero mÃnimo de %1$d caracteres e o mÃ¡ximo recomendado de %2$d."],"The images on this page contain alt tags":["As imagens nesta pÃ¡gina contÃ©m etiquetas alternativas"],"The images on this page contain alt tags with the focus keyword.":["As imagens nesta pÃ¡gina contÃ©m etiquetas alternativas com palavras-chave em foco"],"The focus keyword '%1$s' does not appear in the page title.":["A palavra-chave em foco '%1$s' nÃ£o aparece no tÃtulo da pÃ¡gina."],"The focus keyword appears in the URL for this page.":["A palavra-chave em foco aparece no URL desta pÃ¡gina."],"The meta description contains the focus keyword.":["A descriÃ§Ã£o meta contÃ©m a palavra-chave em foco."],"stop words":["palavras de ligaÃ§Ã£o"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["O texto contÃ©m %1$d palavras, que sÃ£o mais que as %2$d palavras recomendadas como mÃnimo."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["O texto contÃ©m %1$d palavras, que sÃ£o pouco menos que as %2$d palavras recomendadas como mÃnimo. Acrescente mais algum texto. "],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["O texto contÃ©m %1$d palavras, que sÃ£o menos que as %2$d palavras recomendadas como mÃnimo. Acrescente mais conteÃºdo Ãºtil para os leitores. "],"The text contains %1$d words. This is far too low and should be increased.":["O texto contÃ©m %1$d palavras. Ã muito curto e deve ser aumentado. "],"Outbound links appear in this page":["Links de saÃda aparecem nesta pÃ¡gina"],"You've never used this focus keyword before, very good.":["Nunca usou esta palavra-chave antes, muito bem."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["JÃ¡ usou esta palavra-chave %1$suma vez antes %2$s, nÃ£o se esqueÃ§a de deixar bem claro que o URL do seu site Ã© o mais importante para esta palavra-chave."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["JÃ¡ usou esta palavra-chave em foco %3$s%4$d vezes antes %2$s, Ã© provavelmente uma boa ideia ler %6$s este artigo sobre conteÃºdo 'cornerstone' %5$s e melhorar a sua estratÃ©gia de palavras-chave."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["NÃ£o hÃ¡ palavra-chave em foco definida para esta pÃ¡gina. Se nÃ£o definir uma, nÃ£o pode ser calculado nenhum resultado."],"No subheading tags (like an H2) appear in the copy.":["NÃ£o aparecem subtÃtulos (H2) no texto."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["A densidade da palavra-chave Ã© %1$f%, que estÃ¡ acima do mÃ¡ximo aconselhado de 2.5%; a palavra-chave foi encontrada %2$d vezes."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["A palavra-chave em foco aparece em %2$d (de %1$d) cabeÃ§alhos secundÃ¡rios no texto. Embora este nÃ£o seja um dos factores principais de posicionamento, ainda assim Ã© benÃ©fico."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["NÃ£o utilizou a sua palavra-chave em foco em qualquer sub-cabeÃ§alho (como o H2) no corpo do texto."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["A palavra-chave em foco para esta pÃ¡gina contÃ©m um ou mais %1$s, considere removÃª-las. Encontradas '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["A palavra-chave em foco nÃ£o aparece no URL desta pÃ¡gina. Caso decida alterar o URL, verifique os redireccionamentos 301 para esta novo!"],"The slug for this page is a bit long, consider shortening it.":["O slug desta pÃ¡gina Ã© um pouco longo, considere encurtÃ¡-lo."],"Please create a page title.":["Por favor, crie um tÃtulo de pÃ¡gina."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["O tÃtulo da pÃ¡gina tem %3$d caracteres, o que Ã© menos que o mÃnimo recomendado de %1$d caracteres. Use o espaÃ§o para adicionar variaÃ§Ãµes da palavra-chave."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["O tÃtulo da pÃ¡gina contÃ©m %3$d caracteres, o que Ã© mais que o limite visÃvel de %2$d caracteres recomendados; algumas palavras nÃ£o ficarÃ£o visÃveis."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["O tÃtulo da pÃ¡gina contÃ©m a palavra-chave em foco no inÃcio, o que Ã© bom para aumentar o posicionamento."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["O tÃtulo da pÃ¡gina contÃ©m a palavra-chave em foco, mas nÃ£o aparece no inÃcio; tente colocÃ¡-la no inÃcio."],"No outbound links appear in this page, consider adding some as appropriate.":["NÃ£o hÃ¡ links externos aparecer nesta pÃ¡gina, acrescentando considerar alguns como apropriado."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["VocÃª estÃ¡ a linkar para outra pÃ¡gina com a palavra-chave em foco, para a qual pretende um posicionamento. Considere mudar, se realmente quer ter esta pÃ¡gina classificada."],"This page has %1$s outbound link(s).":["Esta pÃ¡gina tem %1$s link(s) de saÃda."],"This page has %2$s outbound link(s), all nofollowed.":["Esta pÃ¡gina tem %2$s link(s) de saÃda. Tudo nofollowed."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Esta pÃ¡gina tem %2$s nofollowed link(s) e %3$s link(s) de saÃda."],"No images appear in this page, consider adding some as appropriate.":["NÃ£o aparecem imagens nesta pÃ¡gina, consider acrescentar algumas."],"The images on this page are missing alt tags.":["Falta a tag \"alt\" nas imagens desta pÃ¡gina."],"The images on this page do not have alt tags containing your focus keyword.":["As imagens desta pÃ¡gina nÃ£o contÃ©m texto alternativo com a palavra-chave em foco."],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["No meta description especificado, considere: Como comparar isto em competiÃ§Ã£o? Pode tornÃ¡-lo mais apelativo?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["A meta descriÃ§Ã£o tem menos de %1$d caracteres. Tem atÃ© %2$d caracteres disponÃveis."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["A descriÃ§Ã£o meta colocada ultrapassa os %2$d caracteres. Reduza a descriÃ§Ã£o atÃ© ficar visÃvel por inteiro."],"No meta description has been specified, search engines will display copy from the page instead.":["A meta descriÃ§Ã£o nÃ£o foi especÃficada, os motores de pesquisa, vÃ£o mostrar uma cÃ³pia desta pÃ¡gina abaixo."],"A meta description has been specified, but it does not contain the focus keyword.":["Foi fornecida uma meta descriÃ§Ã£o mas nÃ£o contÃ©m a palavra-chave em foco."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["A densidade da palavra-chave Ã© %1$f%, o que Ã© baixo; a palavra-chave em foco foi encontrada %2$d vezes."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["A densidade da palavra-chave Ã© de %1$f%, o que Ã© bem acima do mÃ¡ximo de 2.5%; a palavra-chave em foco foi encontrada %2$d vezes."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["A densidade da palavra-chave Ã© %1$f%; o que Ã© muito bom, a palavra-chave em foco foi encontrada %2$d vezes."],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["A palavra-chave em foco nÃ£o aparece no primeiro parÃ¡grafo do texto. Tenha a certeza que o tema fica claro de forma imediata."],"The focus keyword appears in the first paragraph of the copy.":["A palavra-chave em foco aparece no primeiro parÃ¡grafo do texto."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["O texto tem os resultados de %1$s no teste %2$s, o que Ã© considerado %3$s de ler. %4$s"],"fairly difficult":["pouca dificuldade"],"Try to make shorter sentences to improve readability.":["Tente fazer frases mais curtas, para aumentar a leitura."],"difficult":["difÃcil"],"Try to make shorter sentences, using less difficult words to improve readability.":["Tente fazer frases mais curtas, use menos palavras difÃceis para aumentar a leitura."],"very difficult":["muito difÃcil"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo index 210158cd..c81ed63b 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.json new file mode 100644 index 00000000..8f6b5094 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","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);"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["ÐÑÐµÐ½Ñ ÑÐ¾ÑÐ¾ÑÐ¾, Ð²Ñ ÐµÑÐµ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð»Ð¸ ÑÑÐ¾ ÑÐ¾ÐºÑÑÐ½Ð¾Ðµ ÐºÐ»ÑÑÐµÐ²Ð¾Ðµ ÑÐ»Ð¾Ð²Ð¾."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["ÐÑ ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð»Ð¸ ÑÑÐ¾ ÑÐ¾ÐºÑÑÐ½Ð¾Ðµ ÐºÐ»ÑÑÐµÐ²Ð¾Ðµ ÑÐ»Ð¾Ð²Ð¾ %1$sÐ¾Ð´Ð¸Ð½ ÑÐ°Ð·%2$s, Ð¿Ð¾ÑÑÐ¾Ð¼Ñ ÑÐ»ÐµÐ´ÑÐµÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ, ÐºÐ°ÐºÐ¾Ð¹ Ð¸Ð· ÑÑÐ¸Ñ Ð´Ð²ÑÑ URL Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐ°Ð¹ÑÐµ Ð½Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ Ð²Ð°Ð¶ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ»Ð¾Ð²Ð°."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["ÐÐ¾Ð´Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ (ÑÐ¸Ð¿Ð° H2) Ð² ÑÑÐ¾Ð¹ ÑÑÐ°ÑÑÐµ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑ."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Ð¯ÑÐ»ÑÐº ÑÑÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½ÑÐ¹, Ð¿Ð¾Ð´ÑÐ¼Ð°Ð¹ÑÐµ, ÐºÐ°Ðº ÑÐ¾ÐºÑÐ°ÑÐ¸ÑÑ ÐµÐ³Ð¾."],"Please create a page title.":["ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° ÑÐ¾Ð·Ð´Ð°Ð¹ÑÐµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÑÑÑÐ°Ð½Ð¸ÑÑ."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Ð¡ÑÑÐ°Ð½Ð¸ÑÐ° Ð½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ñ ÑÑÑÐ»Ð¾Ðº, Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¿Ð¾ Ð¼ÐµÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÑÐ¸."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["ÐÐ° ÑÑÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ Ð½ÐµÑ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ, Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Ð¿Ð¾ Ð¼ÐµÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÑÐ¸."],"The images on this page are missing alt tags.":["Ð£ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ Ð½Ð° ÑÑÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑ Ð°ÑÑÐ¸Ð±ÑÑÑ alt."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Ð Ð´Ð°Ð½Ð½Ð¾Ð¼ Ð¼ÐµÑÐ°-Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¸ Ð¾ÑÐ²ÐµÑÑÑÐµ Ð½Ð° ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ Ð²Ð¾Ð¿ÑÐ¾ÑÑ: ÐÐ°Ðº ÑÑÐ¾ Ð²ÑÐ³Ð»ÑÐ´Ð¸Ñ Ð² ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ð¸ Ñ ÐºÐ¾Ð½ÐºÑÑÐµÐ½ÑÐ°Ð¼Ð¸? ÐÐ¾Ð¶ÐµÑ Ð»Ð¸ ÑÑÐ¾ Ð±ÑÑÑ Ð±Ð¾Ð»ÐµÐµ Ð¿ÑÐ¸Ð²Ð»ÐµÐºÐ°ÑÐµÐ»ÑÐ½ÑÐ¼?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["ÐÐµÑÐ° Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð½Ðµ Ð·Ð°Ð´Ð°Ð½Ð½Ð¾, Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ Ð±ÑÐ´ÑÑ Ð²Ð¼ÐµÑÑÐ¾ Ð½ÐµÐ³Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["Ð´Ð¾Ð²Ð¾Ð»ÑÐ½Ð¾ ÑÑÑÐ´Ð½Ð¾"],"Try to make shorter sentences to improve readability.":["ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ¾ÑÐ¾ÑÐµ Ð´Ð»Ñ ÑÐ»ÑÑÑÐµÐ½Ð¸Ñ ÑÐ¸ÑÐ°ÐµÐ¼Ð¾ÑÑÐ¸."],"difficult":["ÑÑÑÐ´Ð½Ð¾"],"Try to make shorter sentences, using less difficult words to improve readability.":["ÐÐ¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ¾ÑÐ¾ÑÐµ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð¼ÐµÐ½ÑÑÐµ ÑÑÑÐ´Ð½ÑÑ ÑÐ»Ð¾Ð² Ð´Ð»Ñ ÑÐ»ÑÑÑÐµÐ½Ð¸Ñ ÑÐ¸ÑÐ°ÐµÐ¼Ð¾ÑÑÐ¸."],"very difficult":["Ð¾ÑÐµÐ½Ñ ÑÑÑÐ´Ð½Ð¾"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo index 9b243804..7a3a0e46 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.json new file mode 100644 index 00000000..d25b9c15 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["EÅ¡te ste nikdy nepouÅ¾ili toto hlavnÃ© kÄ¾ÃºÄovÃ© slovo, vynikajÃºco."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["UÅ¾ ste toto hlavnÃ© kÄ¾ÃºÄovÃ© slovo %1$ raz pouÅ¾ili %2$s, uistite sa ktorÃ¡ adresa vaÅ¡ej strÃ¡nky je najdÃ´leÅ¾itejÅ¡ia pre toto slovo."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Neobjavia sa znaÄky podnadpisov (napr. H2) v kÃ³pii."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Slug pre tÃºto strÃ¡nku je prÃliÅ¡ dlhÃ½, prosÃm zvÃ¡Å¾te jeho skrÃ¡tenie."],"Please create a page title.":["ProsÃm vytvorte nadpis strÃ¡nky."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["NenaÅ¡li za Å¾iadne odchÃ¡dzajÃºce odkazy na tejto strÃ¡nke. prosÃm zvÃ¡Å¾te pridanie vhodnÃ½ch odkazov."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Å½iadne obrÃ¡zky na strÃ¡nke, zvÃ¡Å¾te pridanie vhodnÃ½ch obrÃ¡zkov."],"The images on this page are missing alt tags.":["ObrÃ¡zky na strÃ¡nke neobsahujÃº alt znaÄky."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["V uvedenom meta popise zvÃ¡Å¾te: Ako sa porovnÃ¡vate s konkurenciou? MÃ´Å¾ete byÅ¥ vÃ½raznejÅ¡Ã?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Nebol zadanÃ½ meta popis, vyhÄ¾adÃ¡vaÄe budÃº zobrazovaÅ¥ kÃ³piu zo strÃ¡nky."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["trochu taÅ¾kÃ©"],"Try to make shorter sentences to improve readability.":["SkÃºste tvoriÅ¥ kratÅ¡ie vety pre zjednoduchÅ¡enie ÄÃtania."],"difficult":["taÅ¾kÃ©"],"Try to make shorter sentences, using less difficult words to improve readability.":["SkÃºste tvoriÅ¥ kratÅ¡ie vety,pouÅ¾ÃvaÅ¥ jednoduchÅ¡ie slovÃ¡, aby ste zlepÅ¡ili ÄitateÄ¾nosÅ¥."],"very difficult":["veÄ¾mi taÅ¾kÃ©"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.mo index cb3ef21a..58f9d37f 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sk_SK.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.json new file mode 100644 index 00000000..fde95116 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=n != 1;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["Du har aldrig anvÃ¤nt detta fokus-nyckelord tidigare, mycket bra."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["Du har anvÃ¤nt detta fokus-nyckelord %1$sen gÃ¥ng tidigare%2$s. Du bÃ¶r vara tydlig med vilken URL pÃ¥ sajten som Ã¤r viktigast fÃ¶r detta nyckelord."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["Inga taggar fÃ¶r underrubriker (som t.ex. H2) Ã¥terfinns i brÃ¶dtexten."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["Urlen fÃ¶r denna sida Ã¤r rÃ¤tt sÃ¥ lÃ¥ng. ÃvervÃ¤g att fÃ¶rkorta den."],"Please create a page title.":["VÃ¤nligen skapa en sidtitel."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["Det finns inga utgÃ¥ende lÃ¤nkar pÃ¥ denna sida. ÃvervÃ¤g att att lÃ¤gga till lÃ¤mpliga sÃ¥dana."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["Du har inga bilder pÃ¥ denna sida. ÃvervÃ¤g att lÃ¤gga till bild/er."],"The images on this page are missing alt tags.":["Bilderna pÃ¥ denna sida saknar alt-taggar."],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["AngÃ¥ende denna metabeskrivning, tÃ¤nk igenom hur den stÃ¥r sig i konkurransen med andras sidor? Kan den skrivas mer klickvÃ¤nlig?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["Ingen metabeskrivning har specifierats, sÃ¶kmotorer kommer att visa innehÃ¥ll frÃ¥n webbsidan istÃ¤llet."],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":["ganska svÃ¥rt"],"Try to make shorter sentences to improve readability.":["FÃ¶rsÃ¶k gÃ¶ra meningarna kortare fÃ¶r att fÃ¶rbÃ¤ttra lÃ¤sbarheten."],"difficult":["svÃ¥rt"],"Try to make shorter sentences, using less difficult words to improve readability.":["FÃ¶rsÃ¶k skriva kortare meningar med mindre svÃ¥ra ord fÃ¶r att fÃ¶rbÃ¤ttra lÃ¤sbarheten."],"very difficult":["VÃ¤ldigt svÃ¥r"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo index 383c15f7..7ee347b0 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.json new file mode 100644 index 00000000..bc93bf7c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=2; plural=(n > 1);"},"No keyword":["Anahtar kelime yok"],"Bad SEO score":["KÃ¶tÃ¼ SEO puanÄ±"],"Ok SEO score":["Orta SEO puanÄ±"],"Good SEO score":["Ä°yi SEO puanÄ±"],"Your keyphrase is over 10 words, a keyphrase should be shorter.":["Anahtar cÃ¼mleniz 10 kelimenin Ã¼stÃ¼nde, bir anahtar cÃ¼mle daha kÄ±sa olmalÄ±dÄ±r."],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":["Bu sayfanÄ±n kÄ±sa ismi bir ya da daha Ã§ok %1$sengelleyici kelime%2$s iÃ§eriyor, kaldÄ±rmayÄ± bir dÃ¼ÅÃ¼nÃ¼n."],"http://en.wikipedia.org/wiki/Stop_words":["http://en.wikipedia.org/wiki/Stop_words"],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":["Sayfa baÅlÄ±ÄÄ±, en az %1$d karakter ile Ã¶nerilen %2$d karakter arasÄ±nda."],"The images on this page contain alt tags":["Bu sayfadaki gÃ¶rseller alt etiketi iÃ§eriyor"],"The images on this page contain alt tags with the focus keyword.":["Bu sayfadaki gÃ¶rseller alt etiketinde odak anahtar kelime iÃ§eriyor."],"The focus keyword '%1$s' does not appear in the page title.":["Odak anahtar kelime '%1$s' sayfa baÅlÄ±ÄÄ±nda bulunmuyor."],"The focus keyword appears in the URL for this page.":["Odak anahtar kelime sayfa adresinde yer alÄ±yor."],"The meta description contains the focus keyword.":["Meta aÃ§Ä±klamasÄ± odak anahtar kelimeyi iÃ§eriyor."],"stop words":["engelleyici kelimeler"],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":["Metininiz %1$d kelime iÃ§eriyor, Ã¶nerilen en az %2$d kelimeden fazla."],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":["Metniniz %1$d kelime iÃ§eriyor, ki bu Ã§ok az. En az %2$d kelime Ã¶neriyoruz. LÃ¼tfen biraz daha iÃ§erik ekleyin."],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":["Metniniz %1$d kelime iÃ§eriyor, ki bu Ã§ok az. En az %2$d kelime Ã¶neriyoruz. LÃ¼tfen okuyucular iÃ§in biraz daha iÃ§erik ekleyin."],"The text contains %1$d words. This is far too low and should be increased.":["Metniniz %1$d kelime iÃ§eriyor. Bu Ã§ok az ve mutlaka arttÄ±rmalÄ±sÄ±nÄ±z."],"Outbound links appear in this page":["Bu sayfada bulunan dÄ±Å baÄlantÄ±lar"],"You've never used this focus keyword before, very good.":["Ãok iyi, daha Ã¶nce bu odak anahtar kelimeyi hiÃ§ kullanmamÄ±ÅtÄ±nÄ±z."],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["%1$sDaha Ã¶nce bir kez%2$s bu odak anahtar kelimesini kullanmÄ±ÅsÄ±nÄ±z, bu anahtar kelime iÃ§in sitenizin hangi adresinin daha Ã¶nemli olduÄundan emin olun."],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":["%3$sDaha Ã¶nce %4$d kez%2$s bu odak anahtar kelimesini kullanmÄ±ÅsÄ±nÄ±z, muhtemelen Åu an %6$sbu yazÄ±yÄ± okuyup%5$s anahtar kelime stratejinisi iyileÅtirmek iÃ§in iyi bir fÄ±rsat."],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":["Bu sayfa iÃ§in odak anahtar kelime belirlenmemiÅ. Bir odak anahtar kelime belirlemezseniz, puan hesaplanamaz."],"No subheading tags (like an H2) appear in the copy.":["Alt baÅlÄ±k etiketleri (H2 gibi) kopyada gÃ¶zÃ¼kmesin."],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":["Anahtar kelime yoÄunluÄu %%%1$f, ki bu Ã¶nerilen %%2,5 deÄerinden fazla. Anahtar kelime %2$d kere kullanÄ±lmÄ±Å."],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":["Anahtar kelimeler kopyanÄ±n %2$d altbaÅlÄ±ÄÄ± iÃ§inde (%1$d arasÄ±ndan) gÃ¶rÃ¼ntÃ¼lenir. Ãnemli bir sÄ±ralama Ã¶lÃ§Ã¼tÃ¼ olmasa da faydalÄ±dÄ±r."],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":["Mevcut kopyanÄ±zda anahtar kelime / cÃ¼mle Ã¶beklerini herhangi bir alt baÅlÄ±kta (H2 vb.) kullanmamÄ±ÅsÄ±nÄ±z."],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":["Bu sayfa iÃ§in anahtar sÃ¶zcÃ¼k bir veya daha fazla %1$s iÃ§eriyor, bunlarÄ± kaldÄ±rmayÄ± bir dÃ¼ÅÃ¼nÃ¼n. Bulunanlar '%2$s'."],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":["Anahtar kelime / cÃ¼mle bu sayfanÄ±n adresinde gÃ¶rÃ¼nmÃ¼yor. Adresi yeniden oluÅturmaya karar verirseniz eski adresin 301 yÃ¶nlendirmesi ile yeni adrese yÃ¶nlendiÄini kontrol edin!"],"The slug for this page is a bit long, consider shortening it.":["Bu sayfa iÃ§in kÄ±sa yazÄ± ismi biraz uzun, kÄ±saltmayÄ± gÃ¶zden geÃ§irin."],"Please create a page title.":["LÃ¼tfen bir sayfa baÅlÄ±ÄÄ± oluÅturun."],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":["Sayfa baÅlÄ±ÄÄ± %3$d karakterden oluÅuyor ki bu Ã¶nerilen %1$d karakter bareminin altÄ±nda kalÄ±yor. Kalan boÅluÄu anahtar kelime olasÄ±lÄ±klarÄ± ile ya da harekete Ã§aÄrÄ± metinleri ile doldurun."],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":["Sayfa baÅlÄ±ÄÄ± %3$d karakter iÃ§eriyor, ki bu gÃ¶rÃ¼ntÃ¼lenebilir %2$d karakter baremini geÃ§iyor; bazÄ± kelimeler listeleme sÄ±rasÄ±nda kullanÄ±cÄ±lara gÃ¶rÃ¼ntÃ¼lenmeyeceklerdir."],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":["Sayfa baÅlÄ±klarÄ±nda anahtar kelime bulunmasÄ± sÄ±ralama iyileÅtirme aÃ§Ä±sÄ±ndan Ã¶nemlidir."],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":["Sayfa baÅlÄ±ÄÄ± anahtar kelime iÃ§eriyor, ancak baÅlÄ±ÄÄ±n baÅlangÄ±cÄ±nda deÄil; mÃ¼mkÃ¼nse baÅa taÅÄ±maya Ã§alÄ±ÅÄ±n."],"No outbound links appear in this page, consider adding some as appropriate.":["Bu sayfada hiÃ§ dÄ±ÅarÄ± giden baÄlantÄ± gÃ¶zÃ¼kÃ¼yor, uygun bir kaÃ§ tane eklemeyi dÃ¼ÅÃ¼nÃ¼n."],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":["BaÅka bir sayfaya odak anahtar kelime ile baÄlantÄ± veriyorsunuz. GerÃ§ekten bu sayfanÄ±n sÄ±ralamada yÃ¼kselmesini istiyorsanÄ±z deÄiÅtirmeyi dÃ¼ÅÃ¼nÃ¼n."],"This page has %1$s outbound link(s).":["Bu sayfa %1$s giden baÄlantÄ±ya sahiptir."],"This page has %2$s outbound link(s), all nofollowed.":["Bu sayfa %2$s dÄ±ÅarÄ± baÄlantÄ± iÃ§eriyor ve hepsi takip edilmeyecek."],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":["Bu sayfa takip edilmeyecek %2$s baÄlantÄ± ve %3$s normal dÄ±Å baÄlantÄ± iÃ§eriyor."],"No images appear in this page, consider adding some as appropriate.":["Bu sayfada hiÃ§ gÃ¶rsel bulunmuyor, bir kaÃ§ tane eklemeyi dÃ¼ÅÃ¼nÃ¼n."],"The images on this page are missing alt tags.":["Bu sayfadaki gÃ¶rsellerde alt etiketi eksik."],"The images on this page do not have alt tags containing your focus keyword.":["Bu sayfadaki gÃ¶rseller hedef anahtar kelime iÃ§in alt etiketine sahip deÄil. "],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["Belirtilen meta aÃ§Ä±klamasÄ± iÃ§in ÅunlarÄ± gÃ¶z Ã¶nÃ¼nde bulundurun: Rekabete gÃ¶re nasÄ±l karÅÄ±laÅtÄ±rÄ±labilir? Daha Ã§ekici yapÄ±labilir mi?"],"The meta description is under %1$d characters, however up to %2$d characters are available.":["Meta aÃ§Ä±klamasÄ± %1$d karakterin altÄ±nda, ne var ki %2$d karaktere kadar uygun."],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":["Belirtilen meta aÃ§Ä±klamasÄ± %2$d karakterin Ã¼zerinde, AÃ§Ä±klamanÄ±n gÃ¶zÃ¼ktÃ¼ÄÃ¼nden emin olmak iÃ§in kÄ±saltÄ±n."],"No meta description has been specified, search engines will display copy from the page instead.":["HiÃ§ bir meta aÃ§Ä±klamasÄ± belirtilmemiÅ, arama motorlarÄ± ilgili sayfanÄ±n kopyasÄ±nÄ± gÃ¶sterecektir."],"A meta description has been specified, but it does not contain the focus keyword.":["Bir meta aÃ§Ä±klamasÄ± belirtilmiÅ, ancak hedef anahtar kelimeyi / cÃ¼mleyi iÃ§ermiyor."],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":["Anahtar kelime yoÄunluÄu %%%1$f, ki bu dÃ¼ÅÃ¼k bir deÄer. Anahtar kelime %2$d kere bulundu."],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":["Anahtar kelime yoÄunluÄunuz %%%1$f ki bu Ã¶nerilen %%2,5 deÄerinden Ã§ok Ã§ok yÃ¼ksek; odak anahtar kelime %2$d kere bulundu."],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":["Anahtar kelime yoÄunluÄu %%%1$f, ki bu harika. Anahtar kelime %2$d kere bulundu. "],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":["Odak anahtar kelime, kopyanÄ±n ilk paragrafÄ±nda gÃ¶rÃ¼nmÃ¼yor. Ä°lk fÄ±rsatta konunun ne olduÄunu netleÅtirin."],"The focus keyword appears in the first paragraph of the copy.":["Odak anahtar kelime kopyanÄ±n ilk paragrafÄ±nda gÃ¶rÃ¼nÃ¼yor."],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":["%2$s iÃ§indeki %1$s testindeki kopya skoru, ki %3$s okumasÄ± varsayÄ±lÄ±r. %4$s"],"fairly difficult":["oldukÃ§a zor"],"Try to make shorter sentences to improve readability.":["OkunabilirliÄi artÄ±rmak iÃ§in kÄ±sa cÃ¼mleler kurmaya Ã§alÄ±ÅÄ±n."],"difficult":["zor"],"Try to make shorter sentences, using less difficult words to improve readability.":["Daha kÄ±sa cÃ¼mleler kurmayÄ± deneyin, daha az zor kelimeler kullanarak okunabilirliÄi geliÅtirin."],"very difficult":["Ã§ok zor"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.mo index 5a80c963..4d02b9ce 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.json new file mode 100644 index 00000000..38582016 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=1; plural=0;"},"You've never used this focus keyword before, very good.":["ä»¥åæ²¡æä½¿ç¨è¿æ¤ç®æ å³é®è¯ï¼å¾å¥½ã"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":["æ¤ç®æ å³é®è¯%1$sæ¾è¢«ä½¿ç¨è¿1æ¬¡%2$sï¼è¯·æç¡®ç«ç¹éçåªä¸ªURLå¯¹è¿ä¸ªå³é®è¯æéè¦ã"],"No subheading tags (like an H2) appear in the copy.":["æ£æä¸æ²¡æåæ é¢æ ç¾ï¼ä¾å¦H2æ ç¾ï¼ã"],"The slug for this page is a bit long, consider shortening it.":["åºå®é¾æ¥å°åæç¹å¿é¿ï¼è¯·èèç¼©çã"],"Please create a page title.":["è¯·å¡«åé¡µé¢æ é¢ã"],"No outbound links appear in this page, consider adding some as appropriate.":["æ¤é¡µæ²¡æåºç«é¾æ¥ï¼è¯·èèéå½å¢å ä¸äºã"],"No images appear in this page, consider adding some as appropriate.":["æ¤é¡µæ²¡æä»»ä½å¾åï¼è¯·èèéå½å¢å ä¸äºã"],"The images on this page are missing alt tags.":["æ¤é¡µå¾åç¼ºå°altæ ç¾ã"],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":["å¨æå®åæè¿°æè¿°æ¶è¯·èèï¼å®åç«äºå¯¹æç¸æ¯å¦ä½ï¼ä¼æ´å¸å¼äººåï¼"],"No meta description has been specified, search engines will display copy from the page instead.":["æ²¡æå¡«ååæè¿°ï¼æç´¢å¼æä¸å°æ¾ç¤ºé¡µé¢æ£æã"],"fairly difficult":["å¾å°é¾"],"Try to make shorter sentences to improve readability.":["è¯è¯ç¼©çå¥åä»¥æé«å¯è¯»æ§ã"],"difficult":["å°é¾"],"Try to make shorter sentences, using less difficult words to improve readability.":["è¯è¯ç¼©çå¥åï¼å°ç¨ä¸äºçå»åä»¥æé«å¯è¯»æ§ã"],"very difficult":["éå¸¸å°é¾"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo index 863b8dc3..83288dea 100644 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.json new file mode 100644 index 00000000..4db85f04 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.json @@ -0,0 +1 @@ +{"domain":"wordpress-seo","locale_data":{"wordpress-seo":{"":{"domain":"wordpress-seo","plural_forms":"nplurals=1; plural=0;"},"No keyword":[""],"Bad SEO score":[""],"Ok SEO score":[""],"Good SEO score":[""],"Your keyphrase is over 10 words, a keyphrase should be shorter.":[""],"The slug for this page contains one or more %1$sstop words%2$s, consider removing them.":[""],"http://en.wikipedia.org/wiki/Stop_words":[""],"The page title is between the %1$d character minimum and the recommended %2$d character maximum.":[""],"The images on this page contain alt tags":[""],"The images on this page contain alt tags with the focus keyword.":[""],"The focus keyword '%1$s' does not appear in the page title.":[""],"The focus keyword appears in the URL for this page.":[""],"The meta description contains the focus keyword.":[""],"stop words":[""],"The text contains %1$d words, this is more than the %2$d word recommended minimum.":[""],"The text contains %1$d words, this is slightly below the %2$d word recommended minimum. Add a bit more copy.":[""],"The text contains %1$d words, this is below the %2$d word recommended minimum. Add more useful content on this topic for readers.":[""],"The text contains %1$d words. This is far too low and should be increased.":[""],"Outbound links appear in this page":[""],"You've never used this focus keyword before, very good.":["ä½ ä¹åä¸æ¾ä½¿ç¨ééåéé»ééµåï¼éå¸¸å¥½ã"],"You've used this focus keyword %1$sonce before%2$s, be sure to make very clear which URL on your site is the most important for this keyword.":[""],"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a good idea to read %6$sthis post on cornerstone content%5$s and improve your keyword strategy.":[""],"No focus keyword was set for this page. If you do not set a focus keyword, no score can be calculated.":[""],"No subheading tags (like an H2) appear in the copy.":["å¨å§æè£¡æ²æåºç¾å¯æ¨é¡æ¨ç±¤ï¼åæ¯ H2ï¼ã"],"The keyword density is %1$f%, which is over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. While not a major ranking factor, this is beneficial.":[""],"You have not used your focus keyword in any subheading (such as an H2) in your copy.":[""],"The focus keyword for this page contains one or more %1$s, consider removing them. Found '%2$s'.":[""],"The focus keyword does not appear in the URL for this page. If you decide to rename the URL be sure to check the old URL 301 redirects to the new one!":[""],"The slug for this page is a bit long, consider shortening it.":["éåé é¢çä»£ç¨±æé»é·ï¼è«èæ®æå®ç¸®çä¸äºã"],"Please create a page title.":["è«å»ºç«ä¸åé é¢æ¨é¡ã"],"The page title contains %3$d characters, which is less than the recommended minimum of %1$d characters. Use the space to add keyword variations or create compelling call-to-action copy.":[""],"The page title contains %3$d characters, which is more than the viewable limit of %2$d characters; some words will not be visible to users in your listing.":[""],"The page title contains the focus keyword, at the beginning which is considered to improve rankings.":[""],"The page title contains the focus keyword, but it does not appear at the beginning; try and move it to the beginning.":[""],"No outbound links appear in this page, consider adding some as appropriate.":["éåé é¢è£¡æ²æåºç¾ä»»ä½å¤é¨é£çµï¼è«èæ®é©ç¶å°å å¥ä¸äºã"],"You're linking to another page with the focus keyword you want this page to rank for. Consider changing that if you truly want this page to rank.":[""],"This page has %1$s outbound link(s).":[""],"This page has %2$s outbound link(s), all nofollowed.":[""],"This page has %2$s nofollowed link(s) and %3$s normal outbound link(s).":[""],"No images appear in this page, consider adding some as appropriate.":["éåé é¢ä¸æ²æåºç¾ä»»ä½åçï¼è«èæ®é©ç¶å°å å¥ä¸äºåçã"],"The images on this page are missing alt tags.":["å¨éåé é¢ä¸çåçéºå¤±äº alt æ¨ç±¤ã"],"The images on this page do not have alt tags containing your focus keyword.":[""],"In the specified meta description, consider: How does it compare to the competition? Could it be made more appealing?":[""],"The meta description is under %1$d characters, however up to %2$d characters are available.":[""],"The specified meta description is over %2$d characters. Reducing it will ensure the entire description is visible":[""],"No meta description has been specified, search engines will display copy from the page instead.":["å·²ç¶æå®ä¸å meta æè¿°ï¼æå°å¼æå°æå¾éåé é¢æåä¸¦é¡¯ç¤ºå®ã"],"A meta description has been specified, but it does not contain the focus keyword.":[""],"The keyword density is %1$f%, which is a bit low; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is way over the advised 2.5% maximum; the focus keyword was found %2$d times.":[""],"The keyword density is %1$f%, which is great; the focus keyword was found %2$d times.":[""],"The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.":[""],"The focus keyword appears in the first paragraph of the copy.":[""],"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s":[""],"fairly difficult":[""],"Try to make shorter sentences to improve readability.":["è«è©¦èè®å¥åçä¸äºä»¥å¢é²å¯è®æ§ã"],"difficult":["å°é£"],"Try to make shorter sentences, using less difficult words to improve readability.":["è«è©¦èè®å¥åçä¸äºï¼ä½¿ç¨è¼å°å°é£çåè©ä¾å¢é²å¯è®æ§ã"],"very difficult":["éå¸¸å°é£"]}}} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.mo b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.mo index a7b29746..ea22dcca 100755 Binary files a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.mo and b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_TW.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot index c70a1419..ced4a1ca 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot @@ -2,9 +2,21 @@ # This file is distributed under the GPL v3. msgid "" msgstr "" +<<<<<<< .mine +"Project-Id-Version: Yoast SEO 3.0.5\n" +||||||| .r11156 +"Project-Id-Version: WordPress SEO 1.6.3\n" +======= "Project-Id-Version: Yoast SEO 2.3.4\n" +>>>>>>> .r12027 "Report-Msgid-Bugs-To: https://github.com/yoast/wordpress-seo/issues\n" +<<<<<<< .mine +"POT-Creation-Date: 2015-12-01 14:43:56+00:00\n" +||||||| .r11156 +"POT-Creation-Date: 2014-11-16 19:18:56+00:00\n" +======= "POT-Creation-Date: 2015-08-06 15:27:10+00:00\n" +>>>>>>> .r12027 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -12,9 +24,9 @@ msgstr "" "Last-Translator: Yoast Translate Team \n" "Language-Team: Yoast Translate \n" "X-Generator: grunt-wp-i18n 0.4.9\n" -"X-Poedit-KeywordsList: " -"__;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;_nx_noop:1,2,3c;esc_" -"attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;esc_html_x:1,2c;\n" +"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;" +"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;" +"esc_html_x:1,2c;\n" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Country: United States\n" @@ -28,99 +40,282 @@ msgstr "" msgid "Some files could not be removed. Please remove them via FTP." msgstr "" +<<<<<<< .mine +#: admin/ajax.php:218 +||||||| .r11156 +#: admin/ajax.php:177 +======= #: admin/ajax.php:215 +>>>>>>> .r12027 msgid "Post doesn't exist." msgstr "" +<<<<<<< .mine +#: admin/ajax.php:227 +||||||| .r11156 +#: admin/ajax.php:186 +======= #: admin/ajax.php:224 +>>>>>>> .r12027 msgid "Post has an invalid Post Type: %s." msgstr "" +<<<<<<< .mine +#: admin/ajax.php:235 +||||||| .r11156 +#: admin/ajax.php:194 +======= #: admin/ajax.php:232 +>>>>>>> .r12027 msgid "You can't edit %s." msgstr "" +<<<<<<< .mine +#: admin/ajax.php:243 +||||||| .r11156 +#: admin/ajax.php:202 +======= #: admin/ajax.php:240 +>>>>>>> .r12027 msgid "You can't edit %s that aren't yours." msgstr "" +<<<<<<< .mine +#: admin/ajax.php:251 +||||||| .r11156 +#: admin/ajax.php:210 +======= #: admin/ajax.php:248 +>>>>>>> .r12027 msgid "You have used HTML in your value which is not allowed." msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, $2%s to the version number, %3$s and +#. %4$s to anchor tags with link to intro page +#: admin/class-admin-init.php:76 +msgid "" +"%1$s has been updated to version %2$s. %3$sClick here%4$s to find out what's " +"new!" +||||||| .r11156 +#: admin/class-admin.php:95 admin/class-admin.php:214 admin/class-admin.php:276 +#: admin/class-admin.php:282 admin/class-admin.php:289 +msgid "Yoast WordPress SEO:" +======= #: admin/class-admin-init.php:71 #. translators: %1$s expands to Yoast SEO, $2%s to the version number, %3$s and #. %4$s to anchor tags with link to intro page msgid "" "%1$s has been updated to version %2$s. %3$sClick here%4$s to find out " "what's new!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin-init.php:120 +msgid "" +"You still have the default WordPress tagline, even an empty one is probably " +"better. %1$sYou can fix this in the customizer%2$s." +||||||| .r11156 +#: admin/class-admin.php:95 +msgid "General Settings" +======= #: admin/class-admin-init.php:115 msgid "" "You still have the default WordPress tagline, even an empty one is probably " "better. %1$sYou can fix this in the customizer%2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin-init.php:141 +msgid "Just another WordPress site" +||||||| .r11156 +#: admin/class-admin.php:95 admin/class-admin.php:276 +#: admin/class-metabox.php:790 inc/wpseo-non-ajax-functions.php:323 +msgid "SEO" +======= #: admin/class-admin-init.php:136 msgid "Just another WordPress site" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2$s expands to 5.4.3, %3$s expands +#. to Google Analytics by Yoast +#: admin/class-admin-init.php:162 +msgid "" +"%1$s detected you are using version %2$s of %3$s, please update to the " +"latest version to prevent compatibility issues." +||||||| .r11156 +#: admin/class-admin.php:112 inc/wpseo-non-ajax-functions.php:466 +msgid "Titles & Metas" +======= #: admin/class-admin-init.php:157 #. translators: %1$s expands to Yoast SEO, %2$s expands to 5.4.3, %3$s expands #. to Google Analytics by Yoast msgid "" "%1$s detected you are using version %2$s of %3$s, please update to the " "latest version to prevent compatibility issues." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: is a link to 'admin_url / +#. admin.php?page=wpseo_tools&recalculate=1' 2: closing link tag +#: admin/class-admin-init.php:191 +msgid "" +"We've updated our SEO score algorithm. %1$sClick here to recalculate the SEO " +"scores%2$s for all posts and pages." +||||||| .r11156 +#: admin/class-admin.php:121 admin/class-opengraph-admin.php:59 +#: admin/class-opengraph-admin.php:70 inc/wpseo-non-ajax-functions.php:472 +msgid "Social" +======= #: admin/class-admin.php:100 msgid "General Settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin-init.php:377 +msgid "%s filter/action" +||||||| .r11156 +#: admin/class-admin.php:130 admin/class-pointers.php:133 +#: inc/wpseo-non-ajax-functions.php:478 +msgid "XML Sitemaps" +======= #: admin/class-admin.php:100 admin/class-admin.php:251 #: admin/class-metabox.php:982 inc/wpseo-non-ajax-functions.php:261 msgid "SEO" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:117 +msgid "General Settings" +||||||| .r11156 +#: admin/class-admin.php:139 inc/wpseo-non-ajax-functions.php:484 +msgid "Permalinks" +======= #: admin/class-admin.php:117 inc/wpseo-non-ajax-functions.php:412 msgid "Titles & Metas" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:117 admin/class-admin.php:276 +#: admin/class-meta-columns.php:43 inc/wpseo-non-ajax-functions.php:257 +msgid "SEO" +||||||| .r11156 +#: admin/class-admin.php:148 inc/wpseo-non-ajax-functions.php:490 +msgid "Internal Links" +======= #: admin/class-admin.php:126 admin/class-opengraph-admin.php:75 #: admin/class-opengraph-admin.php:86 inc/wpseo-non-ajax-functions.php:418 msgid "Social" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:127 inc/wpseo-non-ajax-functions.php:408 +msgid "Titles & Metas" +||||||| .r11156 +#: admin/class-admin.php:157 inc/wpseo-non-ajax-functions.php:496 +msgid "RSS" +======= #: admin/class-admin.php:135 admin/class-pointers.php:310 #: inc/wpseo-non-ajax-functions.php:424 msgid "XML Sitemaps" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:136 admin/class-social-admin.php:125 +#: admin/class-social-admin.php:126 +#: admin/taxonomy/class-taxonomy-metabox.php:203 +#: admin/taxonomy/class-taxonomy-metabox.php:204 +#: inc/wpseo-non-ajax-functions.php:414 +msgid "Social" +||||||| .r11156 +#: admin/class-admin.php:166 admin/class-pointers.php:163 +#: inc/wpseo-non-ajax-functions.php:502 +msgid "Import & Export" +======= #: admin/class-admin.php:144 admin/class-metabox.php:594 #: admin/class-metabox.php:617 inc/wpseo-non-ajax-functions.php:430 msgid "Advanced" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:145 admin/class-pointers.php:300 +#: inc/wpseo-non-ajax-functions.php:420 +msgid "XML Sitemaps" +||||||| .r11156 +#: admin/class-admin.php:175 admin/class-pointers.php:173 +#: inc/wpseo-non-ajax-functions.php:508 +msgid "Bulk Editor" +======= #: admin/class-admin.php:153 msgid "Tools" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:154 admin/metabox/class-metabox.php:419 +#: admin/metabox/class-metabox.php:421 admin/metabox/class-metabox.php:430 +#: admin/metabox/class-metabox.php:431 inc/wpseo-non-ajax-functions.php:426 +msgid "Advanced" +||||||| .r11156 +#: admin/class-admin.php:188 admin/class-admin.php:282 +#: inc/wpseo-non-ajax-functions.php:517 +msgid "Edit Files" +======= #: admin/class-admin.php:162 msgid "Search Console" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-admin.php:163 inc/wpseo-non-ajax-functions.php:432 +msgid "Tools" +msgstr "" + +#: admin/class-admin.php:172 inc/wpseo-non-ajax-functions.php:438 +msgid "Search Console" msgstr "" +#: admin/class-admin.php:181 admin/class-admin.php:289 +#: admin/class-pointers.php:331 admin/pages/licenses.php:77 +#: inc/wpseo-non-ajax-functions.php:444 +||||||| .r11156 +#: admin/class-admin.php:199 admin/class-admin.php:289 +#: admin/class-pointers.php:188 admin/pages/licenses.php:21 +#: inc/wpseo-non-ajax-functions.php:525 +======= #: admin/class-admin.php:174 admin/class-admin.php:264 #: admin/class-pointers.php:341 admin/pages/licenses.php:77 #: inc/wpseo-non-ajax-functions.php:436 +>>>>>>> .r12027 msgid "Extensions" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:211 admin/pages/dashboard.php:145 +#: admin/pages/metas.php:20 admin/pages/xml-sitemaps.php:36 +#: inc/wpseo-non-ajax-functions.php:402 +msgid "General" +||||||| .r11156 +#: admin/class-admin.php:227 admin/class-pointers.php:96 +msgid "Dashboard" +======= #: admin/class-admin.php:202 admin/class-metabox.php:588 #: admin/class-metabox.php:607 admin/pages/dashboard.php:145 #: admin/pages/metas.php:20 admin/pages/xml-sitemaps.php:36 #: inc/wpseo-non-ajax-functions.php:406 msgid "General" +>>>>>>> .r12027 msgstr "" #: admin/class-admin.php:213 @@ -139,19 +334,36 @@ msgstr "" msgid "Template explanation" msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-admin.php:248 +||||||| .r11156 +#: admin/class-admin.php:247 +======= #: admin/class-admin.php:223 #. translators: %1$s expands to Yoast SEO +>>>>>>> .r12027 msgid "" "The title & metas settings for %1$s are made up of variables that are " "replaced by specific values from the page when the page is displayed. The " "tabs on the left explain the available variables." msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:248 +msgid "Note that not all variables can be used in every template." +msgstr "" + +#: admin/class-admin.php:255 admin/class-admin.php:256 +||||||| .r11156 +#: admin/class-admin.php:255 admin/class-admin.php:256 +======= #: admin/class-admin.php:223 msgid "Note that not all variables can be used in every template." msgstr "" #: admin/class-admin.php:230 admin/class-admin.php:231 +>>>>>>> .r12027 msgid "Basic Variables" msgstr "" @@ -159,74 +371,219 @@ msgstr "" msgid "Advanced Variables" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:276 admin/pages/network.php:86 +||||||| .r11156 +#: admin/class-admin.php:276 admin/pages/network.php:120 +======= #: admin/class-admin.php:251 admin/pages/network.php:86 +>>>>>>> .r12027 msgid "MultiSite Settings" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:282 +msgid "Edit Files" +msgstr "" + +#: admin/class-admin.php:355 +||||||| .r11156 +#: admin/class-admin.php:367 +======= #: admin/class-admin.php:257 msgid "Edit Files" msgstr "" #: admin/class-admin.php:330 +>>>>>>> .r12027 msgid "Posts" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:402 +||||||| .r11156 +#: admin/class-admin.php:398 +======= #: admin/class-admin.php:373 +>>>>>>> .r12027 msgid "Huge SEO Issue: You're blocking access to robots." msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:403 +||||||| .r11156 +#: admin/class-admin.php:398 +======= #: admin/class-admin.php:374 +>>>>>>> .r12027 msgid "" "You must %sgo to your Reading Settings%s and uncheck the box for Search " "Engine Visibility." msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:405 admin/class-admin.php:440 +||||||| .r11156 +#: admin/class-admin.php:398 admin/class-admin.php:422 +======= #: admin/class-admin.php:376 admin/class-admin.php:411 +>>>>>>> .r12027 msgid "I know, don't bug me." msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:436 +||||||| .r11156 +#: admin/class-admin.php:422 +======= #: admin/class-admin.php:407 +>>>>>>> .r12027 msgid "SEO Issue:" msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2$s to opening anchor and %3$s the +#. anchor closing tag +#: admin/class-admin.php:438 +||||||| .r11156 +#: admin/class-admin.php:422 +======= #: admin/class-admin.php:409 #. translators: %1$s expands to Yoast SEO, %2$s to opening anchor and %3$s the #. anchor closing tag +>>>>>>> .r12027 msgid "" "Your theme contains a meta description, which blocks %1$s from working " "properly. Please visit the %2$sSEO Dashboard%3$s to fix this." msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:456 +#: admin/google_search_console/class-gsc-platform-tabs.php:40 +#: admin/taxonomy/class-taxonomy-metabox.php:129 +#: admin/taxonomy/class-taxonomy-metabox.php:131 +#: admin/taxonomy/class-taxonomy-metabox.php:140 +#: admin/taxonomy/class-taxonomy-metabox.php:141 +||||||| .r11156 +#: admin/class-admin.php:437 +======= #: admin/class-admin.php:427 #: admin/google_search_console/class-gsc-platform-tabs.php:40 +>>>>>>> .r12027 msgid "Settings" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:468 +||||||| .r11156 +#: admin/class-admin.php:449 +======= #: admin/class-admin.php:439 +>>>>>>> .r12027 msgid "Premium Support" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:472 +||||||| .r11156 +#: admin/class-admin.php:453 +======= #: admin/class-admin.php:443 +>>>>>>> .r12027 msgid "FAQ" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:498 admin/class-pointers.php:287 +#: admin/class-social-admin.php:47 admin/pages/social.php:24 +#: admin/taxonomy/class-taxonomy-social-fields.php:94 +||||||| .r11156 +#: admin/class-admin.php:495 admin/class-pointers.php:126 +#: admin/pages/social.php:174 +======= #: admin/class-admin.php:469 admin/class-opengraph-admin.php:43 #: admin/class-pointers.php:296 admin/pages/social.php:24 +>>>>>>> .r12027 msgid "Google+" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:500 +||||||| .r11156 +#: admin/class-admin.php:497 +======= #: admin/class-admin.php:471 +>>>>>>> .r12027 msgid "Twitter username (without @)" msgstr "" +<<<<<<< .mine +#: admin/class-admin.php:502 +||||||| .r11156 +#: admin/class-admin.php:499 +======= #: admin/class-admin.php:473 +>>>>>>> .r12027 msgid "Facebook profile URL" msgstr "" +<<<<<<< .mine +||||||| .r11156 +#: admin/class-admin.php:519 +msgid "WordPress SEO settings" +msgstr "" + +#: admin/class-admin.php:523 +msgid "Title to use for Author page" +msgstr "" + +#: admin/class-admin.php:531 +msgid "Meta description to use for Author page" +msgstr "" + +#: admin/class-admin.php:540 +msgid "Meta keywords to use for Author page" +msgstr "" + +#: admin/class-admin.php:549 +msgid "Exclude user from Author-sitemap" +msgstr "" + +#: admin/class-admin.php:600 +======= #: admin/class-admin.php:528 +>>>>>>> .r12027 #. translators: this should be an array of stopwords for your language, #. separated by comma's. +#: admin/class-admin.php:571 msgid "" +<<<<<<< .mine +"a,about,above,after,again,against,all,am,an,and,any,are,as,at,be,because," +"been,before,being,below,between,both,but,by,could,did,do,does,doing,down," +"during,each,few,for,from,further,had,has,have,having,he,he'd,he'll,he's,her," +"here,here's,hers,herself,him,himself,his,how,how's,i,i'd,i'll,i'm,i've,if,in," +"into,is,it,it's,its,itself,let's,me,more,most,my,myself,nor,of,on,once,only," +"or,other,ought,our,ours,ourselves,out,over,own,same,she,she'd,she'll,she's," +"should,so,some,such,than,that,that's,the,their,theirs,them,themselves,then," +"there,there's,these,they,they'd,they'll,they're,they've,this,those,through," +"to,too,under,until,up,very,was,we,we'd,we'll,we're,we've,were,what,what's," +"when,when's,where,where's,which,while,who,who's,whom,why,why's,with,would," +"you,you'd,you'll,you're,you've,your,yours,yourself,yourselves" +||||||| .r11156 +"a,about,above,after,again,against,all,am,an,and,any,are,aren't,as,at,be," +"because,been,before,being,below,between,both,but,by,can't,cannot,could," +"couldn't,did,didn't,do,does,doesn't,doing,don't,down,during,each,few,for," +"from,further,had,hadn't,has,hasn't,have,haven't,having,he,he'd,he'll,he's," +"her,here,here's,hers,herself,him,himself,his,how,how's,i,i'd,i'll,i'm,i've," +"if,in,into,is,isn't,it,it's,its,itself,let's,me,more,most,mustn't,my,myself," +"no,nor,not,of,off,on,once,only,or,other,ought,our,ours,ourselves,out,over," +"own,same,shan't,she,she'd,she'll,she's,should,shouldn't,so,some,such,than," +"that,that's,the,their,theirs,them,themselves,then,there,there's,these,they," +"they'd,they'll,they're,they've,this,those,through,to,too,under,until,up," +"very,was,wasn't,we,we'd,we'll,we're,we've,were,weren't,what,what's,when," +"when's,where,where's,which,while,who,who's,whom,why,why's,with,won't,would," +"wouldn't,you,you'd,you'll,you're,you've,your,yours,yourself,yourselves" +======= "a,about,above,after,again,against,all,am,an,and,any,are,as,at,be,because," "been,before,being,below,between,both,but,by,could,did,do,does,doing,down," "during,each,few,for,from,further,had,has,have,having,he,he'd,he'll,he's,her," @@ -238,6 +595,7 @@ msgid "" "through,to,too,under,until,up,very,was,we,we'd,we'll,we're,we've,were,what," "what's,when,when's,where,where's,which,while,who,who's,whom,why,why's,with," "would,you,you'd,you'll,you're,you've,your,yours,yourself,yourselves" +>>>>>>> .r12027 msgstr "" #: admin/class-bulk-description-editor-list-table.php:43 @@ -313,24 +671,60 @@ msgstr "" msgid "New Yoast SEO Title" msgstr "" +<<<<<<< .mine +#: admin/class-config.php:102 admin/metabox/class-metabox.php:759 +#: admin/taxonomy/class-taxonomy.php:101 +msgid "Use Image" +||||||| .r11156 +#: admin/class-config.php:150 +msgid "Remove these ads?" +======= #: admin/class-config.php:95 admin/class-metabox.php:547 #: admin/class-metabox.php:931 msgid "Use Image" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s: '%%term_title%%' variable used in titles and meta's +#. template that's not compatible with the given template +#: admin/class-config.php:116 +msgid "Warning: the variable %s cannot be used in this template." +||||||| .r11156 +#: admin/class-config.php:151 +msgid "Upgrade to WordPress SEO Premium »" +======= #: admin/class-config.php:109 #. translators: %s: '%%term_title%%' variable used in titles and meta's #. template that's not compatible with the given template msgid "Warning: the variable %s cannot be used in this template." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-config.php:116 +msgid "See the help tab for more info." +||||||| .r11156 +#: admin/class-config.php:231 +msgid "Debug Information" +======= #: admin/class-config.php:109 msgid "See the help tab for more info." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s is the name of the plugin +#: admin/class-customizer.php:52 +msgid "%s Breadcrumbs" +||||||| .r11156 +#: admin/class-config.php:233 +msgid "Current option:" +======= #: admin/class-customizer.php:52 #. translators: %s is the name of the plugin msgid "%s Breadcrumbs" +>>>>>>> .r12027 msgstr "" #: admin/class-customizer.php:86 @@ -341,6 +735,13 @@ msgstr "" msgid "Breadcrumbs separator:" msgstr "" +<<<<<<< .mine +#: admin/class-customizer.php:146 +msgid "Anchor text for the homepage:" +||||||| .r11156 +#: admin/class-metabox.php:48 +msgid "Snippet Preview" +======= #: admin/class-customizer.php:146 msgid "Anchor text for the homepage:" msgstr "" @@ -447,661 +848,2037 @@ msgstr "" #: admin/class-metabox.php:36 msgid "Snippet Preview" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-customizer.php:171 +msgid "Prefix for breadcrumbs:" +||||||| .r11156 +#: admin/class-metabox.php:49 +msgid "" +"This is a rendering of what this post might look like in Google's search " +"results.

Read %sthis post%s for more info." +======= #: admin/class-metabox.php:37 msgid "" "This is a rendering of what this post might look like in Google's search " "results.

Read %sthis post%s for more info." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-customizer.php:196 +msgid "Prefix for archive pages:" +||||||| .r11156 +#: admin/class-metabox.php:51 +msgid "Focus Keyword" +======= #: admin/class-metabox.php:39 msgid "Focus Keyword" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-customizer.php:221 +msgid "Prefix for search result pages:" +||||||| .r11156 +#: admin/class-metabox.php:52 +msgid "" +"Pick the main keyword or keyphrase that this post/page is " +"about.

Read %sthis post%s for more info." +======= #: admin/class-metabox.php:40 msgid "" "Pick the main keyword or keyphrase that this post/page is " "about.

Read %sthis post%s for more info." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-customizer.php:246 +msgid "Breadcrumb for 404 pages:" +||||||| .r11156 +#: admin/class-metabox.php:54 admin/class-metabox.php:791 +#: admin/class-taxonomy.php:177 +msgid "SEO Title" +======= #: admin/class-metabox.php:42 admin/class-metabox.php:983 #: admin/class-taxonomy.php:188 msgid "SEO Title" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-export.php:66 +msgid "Export created: %1$sdownload your export file here%2$s." +||||||| .r11156 +#: admin/class-metabox.php:55 +msgid "Warning:" +======= #: admin/class-metabox.php:43 msgid "Warning:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-export.php:71 +msgid "Error creating %1$s export: " +||||||| .r11156 +#: admin/class-metabox.php:55 +msgid "Title display in Google is limited to a fixed width, yours is too long." +======= #: admin/class-metabox.php:43 msgid "Title display in Google is limited to a fixed width, yours is too long." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-export.php:97 +msgid "Could not zip settings-file." +||||||| .r11156 +#: admin/class-metabox.php:56 +msgid "" +"The SEO title defaults to what is generated based on this sites title " +"template for this posttype." +======= #: admin/class-metabox.php:44 msgid "" "The SEO title defaults to what is generated based on this sites title " "template for this posttype." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-export.php:102 +msgid "Could not write settings to file." +||||||| .r11156 +#: admin/class-metabox.php:58 admin/pages/metas.php:138 +msgid "Meta Description" +======= #: admin/class-metabox.php:46 admin/pages/metas.php:135 msgid "Meta description" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-export.php:112 +msgid "This is a settings export file for the %1$s plugin by Yoast.com" +||||||| .r11156 +#: admin/class-metabox.php:59 +msgid "" +"The meta description will be limited to %s chars%s, %s chars " +"left." +======= #: admin/class-metabox.php:47 msgid "" "The meta description will be limited to %s chars%s, %s chars " "left." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-export.php:114 +msgid "This export includes taxonomy metadata" +||||||| .r11156 +#: admin/class-metabox.php:60 +msgid "" +"The meta description is often shown as the black text under the title in a " +"search result. For this to work it has to contain the keyword that was " +"searched for.

Read %sthis post%s for more info." +======= #: admin/class-metabox.php:48 msgid "" "The meta description is often shown as the black text under the title in a " "search result. For this to work it has to contain the keyword that was " "searched for.

Read %sthis post%s for more info." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-export.php:181 +msgid "No taxonomy metadata found" +||||||| .r11156 +#: admin/class-metabox.php:62 admin/class-taxonomy.php:181 +#: admin/pages/metas.php:140 +msgid "Meta Keywords" +======= #: admin/class-metabox.php:50 admin/class-taxonomy.php:192 #: admin/pages/metas.php:137 msgid "Meta keywords" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-external.php:108 +msgid "HeadSpace2 data successfully imported" +||||||| .r11156 +#: admin/class-metabox.php:63 +msgid "" +"If you type something above it will override your %smeta keywords " +"template%s." +======= #: admin/class-metabox.php:51 msgid "" "If you type something above it will override your %smeta keywords " "template%s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-external.php:120 +msgid "Error: no Robots Meta data found to import." +||||||| .r11156 +#: admin/class-metabox.php:66 +msgid "Meta Robots Index" +======= #: admin/class-metabox.php:54 msgid "Meta Robots Index" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-external.php:168 +msgid "RSS Footer options imported successfully." +||||||| .r11156 +#: admin/class-metabox.php:68 admin/class-taxonomy.php:200 +msgid "" +"Warning: even though you can set the meta robots setting here, the entire " +"site is set to noindex in the sitewide privacy settings, so these settings " +"won't have an effect." +======= #: admin/class-metabox.php:56 admin/class-taxonomy.php:211 msgid "" "Warning: even though you can set the meta robots setting here, the entire " "site is set to noindex in the sitewide privacy settings, so these settings " "won't have an effect." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-external.php:189 +msgid "Yoast Breadcrumbs options imported successfully." +||||||| .r11156 +#: admin/class-metabox.php:70 +msgid "Default for post type, currently: %s" +======= #: admin/class-metabox.php:58 msgid "Default for post type, currently: %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-external.php:192 +msgid "Yoast Breadcrumbs options could not be found" +||||||| .r11156 +#: admin/class-metabox.php:71 +msgid "index" +======= #: admin/class-metabox.php:59 msgid "index" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import-woothemes-seo.php:29 +msgid "WooThemes SEO framework settings & data successfully imported." +||||||| .r11156 +#: admin/class-metabox.php:72 +msgid "noindex" +======= #: admin/class-metabox.php:60 msgid "noindex" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:76 admin/class-import.php:82 +#: admin/class-import.php:88 admin/class-import.php:120 +#: admin/class-import.php:127 admin/class-import.php:151 +msgid "Settings could not be imported:" +||||||| .r11156 +#: admin/class-metabox.php:74 +msgid "Meta Robots Follow" +======= #: admin/class-metabox.php:62 msgid "Meta Robots Follow" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:88 +msgid "Upload failed." +||||||| .r11156 +#: admin/class-metabox.php:75 +msgid "Follow" +======= #: admin/class-metabox.php:63 msgid "Follow" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:120 +msgid "Unzipping failed with error \"%s\"." +||||||| .r11156 +#: admin/class-metabox.php:76 +msgid "Nofollow" +======= #: admin/class-metabox.php:64 msgid "Nofollow" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:127 +msgid "Unzipping failed - file settings.ini not found." +||||||| .r11156 +#: admin/class-metabox.php:78 +msgid "Meta Robots Advanced" +======= #: admin/class-metabox.php:66 msgid "Meta Robots Advanced" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:148 +msgid "Settings successfully imported." +||||||| .r11156 +#: admin/class-metabox.php:79 +msgid "Advanced meta robots settings for this page." +======= #: admin/class-metabox.php:67 msgid "Advanced meta robots settings for this page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:151 +msgid "No settings found in file." +||||||| .r11156 +#: admin/class-metabox.php:80 +msgid "Site-wide default: %s" +======= #: admin/class-metabox.php:68 msgid "Site-wide default: %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-import.php:173 +msgid "Setting \"%s\" is no longer used and has been discarded." +||||||| .r11156 +#: admin/class-metabox.php:81 admin/pages/internal-links.php:37 +#: admin/pages/internal-links.php:55 admin/pages/network.php:52 +#: inc/class-wpseo-meta.php:431 +msgid "None" +======= #: admin/class-metabox.php:69 admin/pages/network.php:53 #: admin/views/tab-breadcrumbs.php:40 admin/views/tab-breadcrumbs.php:57 #: inc/class-wpseo-meta.php:397 msgid "None" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:44 admin/metabox/class-metabox.php:59 +msgid "SEO Title" +||||||| .r11156 +#: admin/class-metabox.php:82 +msgid "NO ODP" +======= #: admin/class-metabox.php:70 msgid "NO ODP" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:45 +msgid "Meta Desc." +||||||| .r11156 +#: admin/class-metabox.php:83 +msgid "NO YDIR" +======= #: admin/class-metabox.php:71 msgid "NO YDIR" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:46 +msgid "Focus KW" +||||||| .r11156 +#: admin/class-metabox.php:84 +msgid "No Image Index" +======= #: admin/class-metabox.php:72 msgid "No Image Index" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:137 +msgid "All SEO Scores" +||||||| .r11156 +#: admin/class-metabox.php:85 +msgid "No Archive" +======= #: admin/class-metabox.php:73 msgid "No Archive" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:330 admin/metabox/class-metabox.php:150 +msgid "Post is set to noindex." +||||||| .r11156 +#: admin/class-metabox.php:86 +msgid "No Snippet" +======= #: admin/class-metabox.php:74 msgid "No Snippet" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-meta-columns.php:335 +msgid "Focus keyword not set." +||||||| .r11156 +#: admin/class-metabox.php:88 admin/class-taxonomy.php:187 +#: admin/pages/metas.php:143 +msgid "Breadcrumbs Title" +======= #: admin/class-metabox.php:76 msgid "Breadcrumbs Title" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2%s: 'Facebook' plugin name of +#. possibly conflicting plugin with regard to creating OpenGraph output +#: admin/class-plugin-conflict.php:128 +msgid "" +"Both %1$s and %2$s create OpenGraph output, which might make Facebook, " +"Twitter, LinkedIn and other social networks use the wrong texts and images " +"when your pages are being shared." +||||||| .r11156 +#: admin/class-metabox.php:89 +msgid "Title to use for this page in breadcrumb paths" +======= #: admin/class-metabox.php:77 msgid "Title to use for this page in breadcrumb paths" +>>>>>>> .r12027 msgstr "" -#: admin/class-metabox.php:79 -msgid "Canonical URL" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-plugin-conflict.php:132 +msgid "Configure %1$s's OpenGraph settings" msgstr "" -#: admin/class-metabox.php:80 +#. translators: %1$s expands to Yoast SEO, %2$s: 'Google XML Sitemaps' plugin +#. name of possibly conflicting plugin with regard to the creation of sitemaps +#: admin/class-plugin-conflict.php:135 msgid "" -"The canonical URL that this page should point to, leave empty to default to " -"permalink. %sCross domain canonical%s supported too." +"Both %1$s and %2$s can create XML sitemaps. Having two XML sitemaps is not " +"beneficial for search engines, yet might slow down your site." msgstr "" -#: admin/class-metabox.php:82 -msgid "301 Redirect" +#. translators: %1$s expands to Yoast SEO +#: admin/class-plugin-conflict.php:139 +msgid "Configure %1$s's XML Sitemap settings" msgstr "" -#: admin/class-metabox.php:83 -msgid "The URL that this page should redirect to." +#: admin/class-pointers.php:111 +msgid "Close" msgstr "" -#: admin/class-metabox.php:417 admin/class-metabox.php:1004 -msgid "Post is set to noindex." +#: admin/class-pointers.php:174 +msgid "Congratulations!" msgstr "" -#: admin/class-metabox.php:431 -msgid "No focus keyword set." +#. translators: %1$s expands to Yoast SEO +#: admin/class-pointers.php:176 +msgid "" +"You’ve just installed %1$s! Click “Start Tour” to view a " +"quick introduction of this plugin’s core functionality." msgstr "" -#: admin/class-metabox.php:451 -msgid "SEO:" +#: admin/class-pointers.php:182 admin/pages/dashboard.php:162 +msgid "Start Tour" msgstr "" -#: admin/class-metabox.php:453 -msgid "Check" +#: admin/class-pointers.php:208 +msgid "Next" msgstr "" -#: admin/class-metabox.php:494 -msgid " (because of date display)" +#: admin/class-pointers.php:214 +msgid "Previous" msgstr "" -#: admin/class-metabox.php:541 -msgid "Focus keyword usage" +#: admin/class-pointers.php:230 +msgid "General settings" msgstr "" -#: admin/class-metabox.php:541 -msgid "Your focus keyword was found in:" +#. translators: %1$s expands to Yoast SEO +#: admin/class-pointers.php:232 +msgid "" +"These are the General settings for %1$s, here you can restart this tour or " +"revert the %1$s settings to default." msgstr "" -#: admin/class-metabox.php:542 -msgid "Article Heading: " +#: admin/class-pointers.php:233 +msgid "Tab: Your Info / Company Info" msgstr "" -#: admin/class-metabox.php:543 -msgid "Page title: " +#: admin/class-pointers.php:233 +msgid "Add some info here needed for Google's Knowledge Graph." msgstr "" -#: admin/class-metabox.php:544 -msgid "Page URL: " +#: admin/class-pointers.php:234 +msgid "Tab: Webmaster Tools" +||||||| .r11156 +#: admin/class-metabox.php:91 +msgid "Include in Sitemap" +msgstr "" + +#: admin/class-metabox.php:92 +msgid "" +"Should this page be in the XML Sitemap at all times, regardless of Robots " +"Meta settings?" +msgstr "" + +#: admin/class-metabox.php:93 admin/class-taxonomy.php:65 +msgid "Auto detect" +msgstr "" + +#: admin/class-metabox.php:94 admin/class-taxonomy.php:66 +msgid "Always include" +msgstr "" + +#: admin/class-metabox.php:95 admin/class-taxonomy.php:67 +msgid "Never include" +msgstr "" + +#: admin/class-metabox.php:97 +msgid "Sitemap Priority" +msgstr "" + +#: admin/class-metabox.php:98 +msgid "The priority given to this page in the XML sitemap." +msgstr "" + +#: admin/class-metabox.php:99 +msgid "Automatic prioritization" +msgstr "" + +#: admin/class-metabox.php:100 +msgid "1 - Highest priority" +msgstr "" + +#: admin/class-metabox.php:101 +msgid "Default for first tier pages" +msgstr "" + +#: admin/class-metabox.php:102 +msgid "Default for second tier pages and posts" +msgstr "" + +#: admin/class-metabox.php:103 +msgid "Medium priority" +msgstr "" + +#: admin/class-metabox.php:104 +msgid "Lowest priority" +msgstr "" + +#: admin/class-metabox.php:106 +msgid "Canonical URL" +======= +#: admin/class-metabox.php:79 +msgid "Canonical URL" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:234 +||||||| .r11156 +#: admin/class-metabox.php:107 +======= +#: admin/class-metabox.php:80 +>>>>>>> .r12027 +msgid "" +"You can add the verification codes for the different Webmaster Tools " +"programs here. We highly encourage you to check out both Google and " +"Bing’s Webmaster Tools." +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:235 +msgid "Tab: Security" +||||||| .r11156 +#: admin/class-metabox.php:109 +msgid "301 Redirect" +======= +#: admin/class-metabox.php:82 +msgid "301 Redirect" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:235 +msgid "" +"Determine who has access to the plugins advanced settings on the post edit " +"screen." +||||||| .r11156 +#: admin/class-metabox.php:110 +msgid "The URL that this page should redirect to." +======= +#: admin/class-metabox.php:83 +msgid "The URL that this page should redirect to." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-pointers.php:238 +msgid "More %1$s" +||||||| .r11156 +#: admin/class-metabox.php:252 admin/class-metabox.php:812 +msgid "Post is set to noindex." +======= +#: admin/class-metabox.php:417 admin/class-metabox.php:1004 +msgid "Post is set to noindex." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:241 +msgid "" +"There’s more to learn about WordPress & SEO than just using this " +"plugin. A great start is our article %1$sthe definitive guide to WordPress " +"SEO%2$s." +||||||| .r11156 +#: admin/class-metabox.php:265 +msgid "No focus keyword set." +======= +#: admin/class-metabox.php:431 +msgid "No focus keyword set." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:243 +msgid "Subscribe to our Newsletter" +||||||| .r11156 +#: admin/class-metabox.php:278 +msgid "SEO: " +======= +#: admin/class-metabox.php:451 +msgid "SEO:" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-pointers.php:245 +msgid "" +"If you would like us to keep you up-to-date regarding %1$s and other plugins " +"by Yoast, subscribe to our newsletter:" +||||||| .r11156 +#: admin/class-metabox.php:280 +msgid "Check" +======= +#: admin/class-metabox.php:453 +msgid "Check" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:248 +msgid "Email" +msgstr "" + +#: admin/class-pointers.php:250 +msgid "Subscribe" +||||||| .r11156 +#: admin/class-metabox.php:294 +msgid "WordPress SEO by Yoast" +msgstr "" + +#: admin/class-metabox.php:322 +msgid " (because of date display)" +======= +#: admin/class-metabox.php:494 +msgid " (because of date display)" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:264 +msgid "Title & Metas settings" +||||||| .r11156 +#: admin/class-metabox.php:369 +msgid "Focus keyword usage" +======= +#: admin/class-metabox.php:541 +msgid "Focus keyword usage" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:265 +msgid "" +"This is where you\tset the titles and meta-information for all your post " +"types, taxonomies, archives, special pages and for your homepage. The page " +"is divided into different tabs. Make sure you check ’em all out!" +||||||| .r11156 +#: admin/class-metabox.php:369 +msgid "Your focus keyword was found in:" +======= +#: admin/class-metabox.php:541 +msgid "Your focus keyword was found in:" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:266 +msgid "Sitewide settings" +||||||| .r11156 +#: admin/class-metabox.php:370 +msgid "Article Heading: " +======= +#: admin/class-metabox.php:542 +msgid "Article Heading: " +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:266 +msgid "" +"The first tab will show you site-wide settings for titles, normally you'll " +"only need to change the Title Separator." +||||||| .r11156 +#: admin/class-metabox.php:371 +msgid "Page title: " +======= +#: admin/class-metabox.php:543 +msgid "Page title: " +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:267 +msgid "Templates and settings" +||||||| .r11156 +#: admin/class-metabox.php:372 +msgid "Page URL: " +======= +#: admin/class-metabox.php:544 +msgid "Page URL: " +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:267 +msgid "" +"Now click on the ‘%1$sPost Types%2$s’-tab, as this will be our " +"example." +||||||| .r11156 +#: admin/class-metabox.php:373 +msgid "Content: " +======= #: admin/class-metabox.php:545 msgid "Content: " +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:267 +msgid "" +"The templates are built using variables. You can find all these variables in " +"the help tab (in the top-right corner of the page). The settings allow you " +"to set specific behavior for the post types." +||||||| .r11156 +#: admin/class-metabox.php:374 +msgid "Meta description: " +======= #: admin/class-metabox.php:546 msgid "Meta description: " +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:268 admin/pages/metas.php:24 +#: frontend/class-frontend.php:527 frontend/class-frontend.php:548 +msgid "Archives" +||||||| .r11156 +#: admin/class-metabox.php:382 +msgid "(no parent)" +======= #: admin/class-metabox.php:554 msgid "(no parent)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:268 +msgid "" +"On the archives tab you can set templates for specific pages like author " +"archives, search results and more." +||||||| .r11156 +#: admin/class-metabox.php:415 admin/class-metabox.php:433 +#: admin/pages/dashboard.php:144 admin/pages/metas.php:20 +msgid "General" +======= #: admin/class-metabox.php:555 msgid "" "The featured image should be at least 200x200 pixels to be picked up by " "Facebook and other social media sites." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:269 +#: admin/google_search_console/class-gsc-category-filters.php:117 +#: admin/pages/metas.php:25 +msgid "Other" +||||||| .r11156 +#: admin/class-metabox.php:417 admin/class-metabox.php:435 +msgid "Page Analysis" +======= #: admin/class-metabox.php:590 admin/class-metabox.php:609 msgid "Page Analysis" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/class-pointers.php:269 +msgid "" +"On the Other tab you can change sitewide meta settings, like enable meta " +"keywords." +msgstr "" + +#: admin/class-pointers.php:282 +msgid "Social settings" +||||||| .r11156 +#: admin/class-metabox.php:421 admin/class-metabox.php:442 +msgid "Advanced" msgstr "" +#: admin/class-metabox.php:757 +msgid "SEO: No Focus Keyword" +======= #: admin/class-metabox.php:946 msgid "SEO: No Focus Keyword" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:283 admin/class-social-admin.php:45 +#: admin/pages/social.php:21 admin/taxonomy/class-taxonomy-social-fields.php:92 +msgid "Facebook" +||||||| .r11156 +#: admin/class-metabox.php:758 +msgid "SEO: Bad" +======= #: admin/class-metabox.php:947 msgid "SEO: Bad" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:283 +msgid "" +"On this tab you can enable the %1$sFacebook Open Graph%2$s functionality " +"from this plugin, as well as assign a Facebook user or Application to be the " +"admin of your site, so you can view the Facebook insights." +||||||| .r11156 +#: admin/class-metabox.php:759 +msgid "SEO: Poor" +======= #: admin/class-metabox.php:948 msgid "SEO: Poor" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:284 +msgid "" +"The frontpage settings allow you to set meta-data for your homepage, whereas " +"the default settings allow you to set a fallback for all posts/pages without " +"images. " +||||||| .r11156 +#: admin/class-metabox.php:760 +msgid "SEO: OK" +======= #: admin/class-metabox.php:949 msgid "SEO: OK" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:285 admin/class-social-admin.php:46 +#: admin/pages/social.php:22 admin/taxonomy/class-taxonomy-social-fields.php:93 +msgid "Twitter" +||||||| .r11156 +#: admin/class-metabox.php:761 +msgid "SEO: Good" +======= #: admin/class-metabox.php:950 msgid "SEO: Good" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:285 +msgid "" +"With %1$sTwitter Cards%2$s, you can attach rich photos, videos and media " +"experience to tweets that drive traffic to your website. Simply check the " +"box, sign up for the service, and users who Tweet links to your content will " +"have a “Card” added to the tweet that’s visible to all of " +"their followers." +||||||| .r11156 +#: admin/class-metabox.php:762 +msgid "SEO: Post Noindexed" +======= #: admin/class-metabox.php:951 msgid "SEO: Post Noindexed" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:286 admin/pages/social.php:23 +msgid "Pinterest" +||||||| .r11156 +#: admin/class-metabox.php:766 +msgid "All SEO Scores" +======= #: admin/class-metabox.php:956 msgid "All SEO Scores" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:286 +msgid "" +"On this tab you can verify your site with Pinterest and enter your Pinterest " +"account." +||||||| .r11156 +#: admin/class-metabox.php:792 +msgid "Meta Desc." +======= #: admin/class-metabox.php:984 msgid "Meta Desc." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:287 +msgid "" +"This tab allows you to add specific post meta data for Google+. And if you " +"have a Google+ page for your business, add that URL here and link it on your " +"%1$sGoogle+%2$s page’s about page." +||||||| .r11156 +#: admin/class-metabox.php:793 +msgid "Focus KW" +======= #: admin/class-metabox.php:985 msgid "Focus KW" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:301 +msgid "What are XML sitemaps?" +||||||| .r11156 +#: admin/class-metabox.php:824 +msgid "Focus keyword not set." +======= #: admin/class-metabox.php:1018 msgid "Focus keyword not set." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:301 +||||||| .r11156 +#: admin/class-metabox.php:1110 +======= #: admin/class-metabox.php:1335 +>>>>>>> .r12027 msgid "" -"To update this page analysis, save as draft or update and check this tab " -"again" +"A Sitemap is an XML file that lists the URLs for a site. It allows " +"webmasters to include additional information about each URL: when it was " +"last updated, how often it changes, and how important it is in relation to " +"other URLs in the site. This allows search engines to crawl the site more " +"intelligently." msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:302 +msgid "What does the plugin do with XML Sitemaps?" +||||||| .r11156 +#: admin/class-metabox.php:1134 +msgid "Your hosting environment does not support PHP's %sDocument Object Model%s." +======= #: admin/class-metabox.php:1359 msgid "Your hosting environment does not support PHP's %sDocument Object Model%s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:302 +||||||| .r11156 +#: admin/class-metabox.php:1134 +======= #: admin/class-metabox.php:1359 +>>>>>>> .r12027 msgid "" -"To enjoy all the benefits of the page analysis feature, you'll need to (get " -"your host to) install it." +"This plugin adds XML sitemaps to your site. The sitemaps are automatically " +"updated when you publish a new post, page or custom post and Google and Bing " +"will be automatically notified." msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:303 +msgid "" +"If you want to exclude certain post types and/or taxonomies, you can also " +"set that on this page." +||||||| .r11156 +#: admin/class-metabox.php:1140 +msgid "No post content to analyse." +======= #: admin/class-metabox.php:1365 msgid "No post content to analyse." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:304 +||||||| .r11156 +#: admin/class-metabox.php:1144 +======= #: admin/class-metabox.php:1370 +>>>>>>> .r12027 msgid "" -"No focus keyword was set for this %s. If you do not set a focus keyword, no " -"score can be calculated." +"Is your webserver low on memory? Decrease the entries per sitemap (default: " +"1000) to reduce load." msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:317 +msgid "Advanced Settings" +||||||| .r11156 +#: admin/class-metabox.php:1150 +msgid "Page Analysis has been disabled." +======= #: admin/class-metabox.php:1377 msgid "Page Analysis has been disabled." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:317 +msgid "" +"All of the options on these tabs are for advanced users only, if you " +"don’t know whether you should check any, don’t touch them." +||||||| .r11156 +#: admin/class-metabox.php:1382 +msgid "You've never used this focus keyword before, very good." +======= #: admin/class-metabox.php:1614 msgid "You've never used this focus keyword before, very good." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:330 +msgid "Extensions and Licenses" +||||||| .r11156 +#: admin/class-metabox.php:1384 +msgid "" +"You've used this focus keyword %1$sonce before%2$s, be sure to make very " +"clear which URL on your site is the most important for this keyword." +======= #: admin/class-metabox.php:1617 msgid "" "You've used this focus keyword %1$sonce before%2$s, be sure to make very " "clear which URL on your site is the most important for this keyword." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2$s to Yoast SEO Premium, %3$s and +#. %4$s to an anchor with link about our premium plugins +#: admin/class-pointers.php:333 +||||||| .r11156 +#: admin/class-metabox.php:1389 +======= #: admin/class-metabox.php:1626 +>>>>>>> .r12027 msgid "" -"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a " -"good idea to read %1$sthis post on cornerstone content%2$s and improve your " -"keyword strategy." +"The powerful functions of %1$s can be extended with %3$sYoast premium plugins" +"%4$s. These premium plugins require the installation of %1$s or %2$s and add " +"specific functionality. You can read all about the Yoast Premium Plugins " +"%3$shere%4$s." msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:335 admin/pages/licenses.php:78 +msgid "Licenses" +msgstr "" + +#. translators: %1$s expands to Yoast SEO Premium +#: admin/class-pointers.php:337 +||||||| .r11156 +#: admin/class-metabox.php:1402 +======= #: admin/class-metabox.php:1645 +>>>>>>> .r12027 msgid "" -"The keyword for this page contains one or more %sstop words%s, consider " -"removing them. Found '%s'." +"Once you’ve purchased %1$s or any other premium Yoast plugin, " +"you’ll have to enter a license key. You can do so on the Licenses-tab. " +"Once you’ve activated your premium plugin, you can use all its " +"powerful features." msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:339 +msgid "Like this plugin?" +||||||| .r11156 +#: admin/class-metabox.php:1418 +msgid "The keyword / phrase appears in the URL for this page." +======= #: admin/class-metabox.php:1659 msgid "The keyword / phrase appears in the URL for this page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:339 +||||||| .r11156 +#: admin/class-metabox.php:1419 +======= #: admin/class-metabox.php:1660 +>>>>>>> .r12027 msgid "" -"The keyword / phrase does not appear in the URL for this page. If you " -"decide to rename the URL be sure to check the old URL 301 redirects to the " -"new one!" +"So, we’ve come to the end of the tour. If you like the plugin, please " +"%srate it 5 stars on WordPress.org%s!" msgstr "" +<<<<<<< .mine +#: admin/class-pointers.php:340 +||||||| .r11156 +#: admin/class-metabox.php:1420 +======= #: admin/class-metabox.php:1661 +>>>>>>> .r12027 msgid "" -"The slug for this page contains one or more stop words, consider " -"removing them." +"Thank you for using our plugin and good luck with your SEO!

Best," +"
Team Yoast - %1$sYoast.com%2$s" msgstr "" +<<<<<<< .mine +#. translators: 1: expands to a containing the number of posts +#. recalculated. 2: expands to a containing the total number of posts. +#: admin/class-recalculate-scores.php:39 +msgid "%1$s of %2$s done." +||||||| .r11156 +#: admin/class-metabox.php:1421 +msgid "The slug for this page is a bit long, consider shortening it." +======= #: admin/class-metabox.php:1662 msgid "The slug for this page is a bit long, consider shortening it." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-recalculate-scores.php:46 +msgid "" +"Recalculating SEO scores for all pieces of content with a focus keyword." +||||||| .r11156 +#: admin/class-metabox.php:1455 +msgid "Please create a page title." +======= #: admin/class-metabox.php:1697 msgid "Please create a page title." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network's name +#: admin/class-social-admin.php:34 +||||||| .r11156 +#: admin/class-metabox.php:1456 +======= #: admin/class-metabox.php:1698 +>>>>>>> .r12027 msgid "" -"The page title is more than 40 characters and less than the recommended 70 " -"character limit." +"If you don't want to use the post title for sharing the post on %s but " +"instead want another title there, write it here." msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network's name +#: admin/class-social-admin.php:36 +||||||| .r11156 +#: admin/class-metabox.php:1457 +======= #: admin/class-metabox.php:1699 +>>>>>>> .r12027 msgid "" -"The page title contains %d characters, which is less than the recommended " -"minimum of 40 characters. Use the space to add keyword variations or create " -"compelling call-to-action copy." +"If you don't want to use the meta description for sharing the post on %s but " +"want another description there, write it here." msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network's name +#: admin/class-social-admin.php:38 +||||||| .r11156 +#: admin/class-metabox.php:1458 +======= #: admin/class-metabox.php:1700 +>>>>>>> .r12027 msgid "" -"The page title contains %d characters, which is more than the viewable " -"limit of 70 characters; some words will not be visible to users in your " -"listing." +"If you want to override the image used on %s for this post, upload / choose " +"an image or add the URL here." msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to the social network, %2$s to the recommended +#. image size +#. translators: %1$s expands to the social network name, %2$s expands to the +#. image size +#: admin/class-social-admin.php:40 +#: admin/taxonomy/class-taxonomy-social-fields.php:63 +msgid "The recommended image size for %1$s is %2$spx." +||||||| .r11156 +#: admin/class-metabox.php:1459 +msgid "The keyword / phrase %s does not appear in the page title." +======= #: admin/class-metabox.php:1701 msgid "The keyword / phrase %s does not appear in the page title." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network name +#: admin/class-social-admin.php:63 +#: admin/taxonomy/class-taxonomy-social-fields.php:44 +msgid "%s Title" +||||||| .r11156 +#: admin/class-metabox.php:1460 +msgid "" +"The page title contains keyword / phrase, at the beginning which is " +"considered to improve rankings." +======= #: admin/class-metabox.php:1702 msgid "" "The page title contains keyword / phrase, at the beginning which is " "considered to improve rankings." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network name +#: admin/class-social-admin.php:66 +#: admin/taxonomy/class-taxonomy-social-fields.php:52 +msgid "%s Description" +||||||| .r11156 +#: admin/class-metabox.php:1461 +msgid "" +"The page title contains keyword / phrase, but it does not appear at the " +"beginning; try and move it to the beginning." +======= #: admin/class-metabox.php:1703 msgid "" "The page title contains keyword / phrase, but it does not appear at the " "beginning; try and move it to the beginning." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to the social network name +#: admin/class-social-admin.php:69 +#: admin/taxonomy/class-taxonomy-social-fields.php:59 +msgid "%s Image" +||||||| .r11156 +#: admin/class-metabox.php:1503 +msgid "No outbound links appear in this page, consider adding some as appropriate." +======= #: admin/class-metabox.php:1750 msgid "No outbound links appear in this page, consider adding some as appropriate." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-admin.php:90 admin/class-social-admin.php:91 +msgid "Facebook / Open Graph metadata" +||||||| .r11156 +#: admin/class-metabox.php:1504 +msgid "" +"You're linking to another page with the keyword you want this page to rank " +"for, consider changing that if you truly want this page to rank." +======= #: admin/class-metabox.php:1751 msgid "" "You're linking to another page with the keyword you want this page to rank " "for, consider changing that if you truly want this page to rank." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-admin.php:102 admin/class-social-admin.php:103 +#: admin/taxonomy/class-taxonomy-metabox.php:178 +#: admin/taxonomy/class-taxonomy-metabox.php:179 +msgid "Twitter metadata" +||||||| .r11156 +#: admin/class-metabox.php:1505 +msgid "This page has %s outbound link(s)." +======= #: admin/class-metabox.php:1752 msgid "This page has %s outbound link(s)." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-admin.php:114 admin/class-social-admin.php:115 +#: admin/taxonomy/class-taxonomy-metabox.php:192 +#: admin/taxonomy/class-taxonomy-metabox.php:193 +msgid "Google+ metadata" +||||||| .r11156 +#: admin/class-metabox.php:1506 +msgid "This page has %s outbound link(s), all nofollowed." +======= #: admin/class-metabox.php:1753 msgid "This page has %s outbound link(s), all nofollowed." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:113 +msgid "Please make sure both fields are filled." +||||||| .r11156 +#: admin/class-metabox.php:1507 +msgid "This page has %s nofollowed link(s) and %s normal outbound link(s)." +======= #: admin/class-metabox.php:1754 msgid "This page has %s nofollowed link(s) and %s normal outbound link(s)." +>>>>>>> .r12027 msgstr "" -#: admin/class-metabox.php:1871 -msgid "No images appear in this page, consider adding some as appropriate." -msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:116 +msgid "" +"Your input contains invalid characters. Please make sure both fields are " +"filled in correctly." +||||||| .r11156 +#: admin/class-metabox.php:1616 +msgid "No images appear in this page, consider adding some as appropriate." +======= +#: admin/class-metabox.php:1871 +msgid "No images appear in this page, consider adding some as appropriate." +>>>>>>> .r12027 +msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:119 +msgid "This Facebook user has already been added as an admin." +||||||| .r11156 +#: admin/class-metabox.php:1617 +msgid "The images on this page are missing alt tags." +======= #: admin/class-metabox.php:1872 msgid "The images on this page are missing alt tags." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:155 +msgid "Successfully removed admin %s" +||||||| .r11156 +#: admin/class-metabox.php:1618 +msgid "The images on this page contain alt tags with the target keyword / phrase." +======= #: admin/class-metabox.php:1873 msgid "The images on this page contain alt tags with the target keyword / phrase." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:178 +msgid "Successfully cleared all Facebook Data" +||||||| .r11156 +#: admin/class-metabox.php:1619 +msgid "" +"The images on this page do not have alt tags containing your keyword / " +"phrase." +======= #: admin/class-metabox.php:1874 msgid "" "The images on this page do not have alt tags containing your keyword / " "phrase." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:291 +msgid "Facebook Insights and Admins" +||||||| .r11156 +#: admin/class-metabox.php:1693 +msgid "No subheading tags (like an H2) appear in the copy." +======= #: admin/class-metabox.php:1956 msgid "No subheading tags (like an H2) appear in the copy." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:293 +||||||| .r11156 +#: admin/class-metabox.php:1694 +======= #: admin/class-metabox.php:1957 +>>>>>>> .r12027 msgid "" -"Keyword / keyphrase appears in %s (out of %s) subheadings in the copy. " -"While not a major ranking factor, this is beneficial." +"To be able to access %sFacebook Insights%s for your site, you need to " +"specify a Facebook Admin. This can be a user. If you have an app for your " +"site, you could use that as well." msgstr "" +<<<<<<< .mine +#. translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base +#: admin/class-social-facebook.php:301 +msgid "More info can be found %1$son our knowledge base%2$s." +||||||| .r11156 +#: admin/class-metabox.php:1695 +msgid "" +"You have not used your keyword / keyphrase in any subheading (such as an " +"H2) in your copy." +======= #: admin/class-metabox.php:1958 msgid "" "You have not used your keyword / keyphrase in any subheading (such as an " "H2) in your copy." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s and %2$s expand to a link to Facebook Insights +#: admin/class-social-facebook.php:318 +||||||| .r11156 +#: admin/class-metabox.php:1751 +======= #: admin/class-metabox.php:2019 +>>>>>>> .r12027 msgid "" -"In the specified meta description, consider: How does it compare to the " -"competition? Could it be made more appealing?" +"To be able to access %1$sFacebook Insights%2$s, you need to add a user here. " +"The name is used for reference only, the ID is used for verification." msgstr "" +<<<<<<< .mine +#. translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base +#: admin/class-social-facebook.php:322 +||||||| .r11156 +#: admin/class-metabox.php:1752 +======= #: admin/class-metabox.php:2020 +>>>>>>> .r12027 msgid "" -"The meta description is under 120 characters, however up to %s characters " -"are available. %s" +"If you don't know where to find the needed ID, see %1$sthis knowledge base " +"article%2$s." msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:325 +msgid "Admin's name:" +||||||| .r11156 +#: admin/class-metabox.php:1753 +msgid "" +"The specified meta description is over %s characters, reducing it will " +"ensure the entire description is visible. %s" +======= #: admin/class-metabox.php:2021 msgid "" "The specified meta description is over %s characters, reducing it will " "ensure the entire description is visible. %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:329 +msgid "Admin's Facebook user ID:" +||||||| .r11156 +#: admin/class-metabox.php:1754 +msgid "" +"No meta description has been specified, search engines will display copy " +"from the page instead." +======= #: admin/class-metabox.php:2022 msgid "" "No meta description has been specified, search engines will display copy " "from the page instead." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:334 admin/class-social-facebook.php:348 +msgid "Add Facebook admin" +||||||| .r11156 +#: admin/class-metabox.php:1755 +msgid "The meta description contains the primary keyword / phrase." +======= #: admin/class-metabox.php:2023 msgid "The meta description contains the primary keyword / phrase." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:354 +msgid "Add Another Facebook Admin" +||||||| .r11156 +#: admin/class-metabox.php:1756 +msgid "" +"A meta description has been specified, but it does not contain the target " +"keyword / phrase." +======= #: admin/class-metabox.php:2024 msgid "" "A meta description has been specified, but it does not contain the target " "keyword / phrase." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:359 +msgid "Currently connected Facebook admins:" +||||||| .r11156 +#: admin/class-metabox.php:1760 +msgid "" +"The available space is shorter than the usual 155 characters because Google " +"will also include the publication date in the snippet." +======= #: admin/class-metabox.php:2028 msgid "" "The available space is shorter than the usual 155 characters because Google " "will also include the publication date in the snippet." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:386 +msgid "Facebook App ID" +||||||| .r11156 +#: admin/class-metabox.php:1804 +msgid "" +"There are %d words contained in the body copy, this is more than the %d " +"word recommended minimum." +======= #: admin/class-metabox.php:2076 msgid "" "There are %d words contained in the body copy, this is more than the %d " "word recommended minimum." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-social-facebook.php:454 +msgid "Clear all Facebook Data" +||||||| .r11156 +#: admin/class-metabox.php:1805 +msgid "" +"There are %d words contained in the body copy, this is below the %d word " +"recommended minimum. Add more useful content on this topic for readers." +======= #: admin/class-metabox.php:2077 msgid "" "There are %d words contained in the body copy, this is below the %d word " "recommended minimum. Add more useful content on this topic for readers." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s is the plugin name +#: admin/class-yoast-dashboard-widget.php:41 +msgid "%s Posts Overview" +||||||| .r11156 +#: admin/class-metabox.php:1806 +msgid "" +"There are %d words contained in the body copy, this is slightly below the " +"%d word recommended minimum, add a bit more copy." +======= #: admin/class-metabox.php:2078 msgid "" "There are %d words contained in the body copy, this is slightly below the " "%d word recommended minimum, add a bit more copy." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-dashboard-widget.php:153 +msgid "Posts without focus keyword" +||||||| .r11156 +#: admin/class-metabox.php:1807 +msgid "" +"There are %d words contained in the body copy. This is far too low and " +"should be increased." +======= #: admin/class-metabox.php:2079 msgid "" "There are %d words contained in the body copy. This is far too low and " "should be increased." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-dashboard-widget.php:154 +msgid "Posts with bad SEO score" +||||||| .r11156 +#: admin/class-metabox.php:1809 +msgid "" +"The keyword density is %s%%, which is a bit low, the keyword was found %s " +"times." +======= #: admin/class-metabox.php:2081 msgid "" "The keyword density is %s%%, which is a bit low, the keyword was found %s " "times." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-dashboard-widget.php:155 +msgid "Posts with OK SEO score" +||||||| .r11156 +#: admin/class-metabox.php:1810 +msgid "" +"The keyword density is %s%%, which is over the advised 4.5%% maximum, the " +"keyword was found %s times." +======= #: admin/class-metabox.php:2082 msgid "" "The keyword density is %s%%, which is over the advised 4.5%% maximum, the " "keyword was found %s times." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-dashboard-widget.php:156 +msgid "Posts with good SEO score" +||||||| .r11156 +#: admin/class-metabox.php:1811 +msgid "The keyword density is %s%%, which is great, the keyword was found %s times." +======= #: admin/class-metabox.php:2083 msgid "The keyword density is %s%%, which is great, the keyword was found %s times." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to noindex +#: admin/class-yoast-dashboard-widget.php:158 +msgid "Posts that are set to %s" +||||||| .r11156 +#: admin/class-metabox.php:1813 +msgid "" +"The keyword doesn't appear in the first paragraph of the copy, make sure " +"the topic is clear immediately." +======= #: admin/class-metabox.php:2085 msgid "" "The keyword doesn't appear in the first paragraph of the copy, make sure " "the topic is clear immediately." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-form.php:130 +msgid "Debug Information" +||||||| .r11156 +#: admin/class-metabox.php:1814 +msgid "The keyword appears in the first paragraph of the copy." +======= #: admin/class-metabox.php:2086 msgid "The keyword appears in the first paragraph of the copy." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-form.php:132 +msgid "Current option:" +||||||| .r11156 +#: admin/class-metabox.php:1816 +msgid "Flesch Reading Ease" +======= #: admin/class-metabox.php:2088 msgid "Flesch Reading Ease" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-form.php:232 +msgid "Remove these ads?" +||||||| .r11156 +#: admin/class-metabox.php:1817 +msgid "The copy scores %s in the %s test, which is considered %s to read. %s" +======= #: admin/class-metabox.php:2089 msgid "The copy scores %s in the %s test, which is considered %s to read. %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO Premium +#: admin/class-yoast-form.php:235 +msgid "Upgrade to %1$s »" +||||||| .r11156 +#: admin/class-metabox.php:1844 +msgid "" +"Your keyphrase is over 10 words, a keyphrase should be shorter and there " +"can be only one keyphrase." +======= #: admin/class-metabox.php:2120 msgid "" "Your keyphrase is over 10 words, a keyphrase should be shorter and there " "can be only one keyphrase." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-form.php:429 +#: admin/taxonomy/class-taxonomy-fields-presenter.php:88 +msgid "Upload Image" +||||||| .r11156 +#: admin/class-metabox.php:1883 +msgid "very easy" +======= #: admin/class-metabox.php:2163 msgid "very easy" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-plugin-conflict.php:160 +msgid "Warning!" +||||||| .r11156 +#: admin/class-metabox.php:1886 +msgid "easy" +======= #: admin/class-metabox.php:2167 msgid "easy" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s: 'Facebook & Open Graph' plugin name(s) of possibly +#. conflicting plugin(s), %2$s to Yoast SEO +#: admin/class-yoast-plugin-conflict.php:163 +msgid "" +"The %1$s plugin(s) might cause issues when used in conjunction with %2$s." +||||||| .r11156 +#: admin/class-metabox.php:1889 +msgid "fairly easy" +======= #: admin/class-metabox.php:2171 msgid "fairly easy" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/class-yoast-plugin-conflict.php:165 +msgid "Recommended solution" +||||||| .r11156 +#: admin/class-metabox.php:1892 inc/wpseo-non-ajax-functions.php:236 +msgid "OK" +======= #: admin/class-metabox.php:2175 inc/class-wpseo-utils.php:213 msgid "OK" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s: 'Facebook & Open Graph' plugin name(s) of possibly +#. conflicting plugin(s). %2$s to Yoast SEO +#: admin/class-yoast-plugin-conflict.php:168 +msgid "" +"We recommend you deactivate %1$s and have another look at your %2$s " +"configuration using the button above." +||||||| .r11156 +#: admin/class-metabox.php:1895 +msgid "fairly difficult" +======= #: admin/class-metabox.php:2179 msgid "fairly difficult" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s: 'Facebook' plugin name of possibly conflicting plugin +#: admin/class-yoast-plugin-conflict.php:172 +msgid "Deactivate %s" +||||||| .r11156 +#: admin/class-metabox.php:1896 +msgid "Try to make shorter sentences to improve readability." +======= #: admin/class-metabox.php:2180 msgid "Try to make shorter sentences to improve readability." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/class-yoast-plugin-conflict.php:176 +msgid "This warning is generated by %1$s." +||||||| .r11156 +#: admin/class-metabox.php:1899 +msgid "difficult" +======= #: admin/class-metabox.php:2184 msgid "difficult" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:113 +msgid "Access denied" msgstr "" +#: admin/google_search_console/class-gsc-category-filters.php:113 +||||||| .r11156 +#: admin/class-metabox.php:1900 admin/class-metabox.php:1904 +======= #: admin/class-metabox.php:2185 admin/class-metabox.php:2190 +>>>>>>> .r12027 msgid "" -"Try to make shorter sentences, using less difficult words to improve " -"readability." +"Server requires authentication or is blocking Googlebot from accessing the " +"site." msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:114 +msgid "Faulty redirects" +||||||| .r11156 +#: admin/class-metabox.php:1903 +msgid "very difficult" +======= #: admin/class-metabox.php:2189 msgid "very difficult" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:115 +msgid "Not followed" +||||||| .r11156 +#: admin/class-opengraph-admin.php:36 +msgid "Facebook Title" +======= #: admin/class-opengraph-admin.php:30 #. translators: %s expands to the social network's name msgid "" "If you don't want to use the post title for sharing the post on %s but " "instead want another title there, write it here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:116 +msgid "Not found" +||||||| .r11156 +#: admin/class-opengraph-admin.php:37 +msgid "" +"If you don't want to use the post title for sharing the post on Facebook " +"but instead want another title there, write it here." +======= #: admin/class-opengraph-admin.php:32 #. translators: %s expands to the social network's name msgid "" "If you don't want to use the meta description for sharing the post on %s " "but want another description there, write it here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:116 +msgid "URL points to a non-existent page." +||||||| .r11156 +#: admin/class-opengraph-admin.php:39 +msgid "Facebook Description" +======= #: admin/class-opengraph-admin.php:34 #. translators: %s expands to the social network's name msgid "" "If you want to override the image used on %s for this post, upload / choose " "an image or add the URL here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:117 +msgid "Google was unable to crawl this URL due to an undetermined issue." +||||||| .r11156 +#: admin/class-opengraph-admin.php:40 +msgid "" +"If you don't want to use the meta description for sharing the post on " +"Facebook but want another description there, write it here." +======= #: admin/class-opengraph-admin.php:36 #. translators: %1$s expands to the social network, %2$s to the recommended #. image size msgid "The recommended image size for %1$s is %2$spx." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to 'robots.txt'. +#: admin/google_search_console/class-gsc-category-filters.php:119 +msgid "Blocked" +||||||| .r11156 +#: admin/class-opengraph-admin.php:42 +msgid "Facebook Image" +======= #: admin/class-opengraph-admin.php:41 admin/class-pointers.php:292 #: admin/pages/social.php:21 msgid "Facebook" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:119 +msgid "" +"Googlebot could access your site, but certain URLs are blocked for Googlebot " +"in your %1$s file. This block could either be for all Googlebots or even " +"specifically for Googlebot-mobile." +||||||| .r11156 +#: admin/class-opengraph-admin.php:43 +msgid "" +"If you want to override the Facebook image for this post, upload / choose " +"an image or add the URL here." +======= #: admin/class-opengraph-admin.php:42 admin/class-pointers.php:294 #: admin/pages/social.php:22 msgid "Twitter" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:120 +msgid "Server Error" +||||||| .r11156 +#: admin/class-opengraph-admin.php:45 +msgid "Google+ Title" +======= #: admin/class-opengraph-admin.php:59 msgid "%s Title" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:120 +msgid "Request timed out or site is blocking Google." +||||||| .r11156 +#: admin/class-opengraph-admin.php:46 +msgid "" +"If you don't want to use the post title for sharing the post on Google+ but " +"instead want another title there, write it here." +======= #: admin/class-opengraph-admin.php:62 msgid "%s Description" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:121 +msgid "Soft 404" +||||||| .r11156 +#: admin/class-opengraph-admin.php:48 +msgid "Google+ Description" +======= #: admin/class-opengraph-admin.php:65 msgid "%s Image" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-category-filters.php:121 +||||||| .r11156 +#: admin/class-opengraph-admin.php:49 +======= #: admin/class-plugin-conflict.php:128 #. translators: %1$s expands to Yoast SEO, %2%s: 'Facebook' plugin name of #. possibly conflicting plugin with regard to creating OpenGraph output +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"The target URL doesn't exist, but your server is not returning a 404 (file " +"not found) error." +||||||| .r11156 +"If you don't want to use the meta description for sharing the post on " +"Google+ but want another description there, write it here." +======= "Both %1$s and %2$s create OpenGraph output, which might make Facebook, " "Twitter, LinkedIn and other social networks use the wrong texts and images " "when your pages are being shared." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-platform-tabs.php:43 +#: admin/google_search_console/class-gsc.php:281 +msgid "Desktop" +||||||| .r11156 +#: admin/class-opengraph-admin.php:51 +msgid "Google+ Image" +======= #: admin/class-plugin-conflict.php:132 #. translators: %1$s expands to Yoast SEO msgid "Configure %1$s's OpenGraph settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-platform-tabs.php:44 +#: admin/google_search_console/class-gsc.php:282 +msgid "Smartphone" +||||||| .r11156 +#: admin/class-opengraph-admin.php:52 +msgid "" +"If you want to override the image for this post that Google+ will use, " +"upload / choose an image or add the URL here. Note that it will otherwise " +"default to the Facebook one above." +======= #: admin/class-plugin-conflict.php:135 #. translators: %1$s expands to Yoast SEO, %2$s: 'Google XML Sitemaps' plugin #. name of possibly conflicting plugin with regard to the creation of sitemaps msgid "" "Both %1$s and %2$s can create XML sitemaps. Having two XML sitemaps is not " "beneficial for search engines, yet might slow down your site." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-platform-tabs.php:45 +#: admin/google_search_console/class-gsc.php:283 +msgid "Feature phone" +||||||| .r11156 +#: admin/class-pointers.php:67 +msgid "Help improve WordPress SEO" +======= #: admin/class-plugin-conflict.php:139 #. translators: %1$s expands to Yoast SEO msgid "Configure %1$s's XML Sitemap settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-service.php:137 +||||||| .r11156 +#: admin/class-pointers.php:68 +======= #: admin/class-pointers.php:121 msgid "Close" msgstr "" @@ -1112,75 +2889,223 @@ msgstr "" #: admin/class-pointers.php:185 #. translators: %1$s expands to Yoast SEO +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Yoast plugins share some code between them to make your site faster. As a " +"result of that, we need all Yoast plugins to be up to date. We've detected " +"this isn't the case, so please update the Yoast plugins that aren't up to " +"date yet." +||||||| .r11156 +"You’ve just installed WordPress SEO by Yoast. Please helps us improve " +"it by allowing us to gather anonymous usage stats so we know which " +"configurations, plugins and themes to test with." +======= "You’ve just installed %1$s! Click “Start Tour” to view a " "quick introduction of this plugin’s core functionality." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2$s expands to Google Analytics by +#. Yoast +#: admin/google_search_console/class-gsc-service.php:146 +msgid "" +"%1$s detected youâre using a version of %2$s which is not compatible with " +"%1$s. Please update %2$s to the latest version to use this feature." +||||||| .r11156 +#: admin/class-pointers.php:75 +msgid "Do not allow tracking" +======= #: admin/class-pointers.php:191 admin/pages/dashboard.php:161 msgid "Start Tour" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:107 +msgid "URL" +||||||| .r11156 +#: admin/class-pointers.php:79 +msgid "Allow tracking" +======= #: admin/class-pointers.php:217 msgid "Next" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:108 +msgid "Last crawled" +||||||| .r11156 +#: admin/class-pointers.php:96 +msgid "" +"This is the WordPress SEO Dashboard, here you can restart this tour or " +"revert the WP SEO settings to default." +======= #: admin/class-pointers.php:223 msgid "Previous" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:109 +msgid "First detected" +||||||| .r11156 +#: admin/class-pointers.php:97 +msgid "More WordPress SEO" +======= #: admin/class-pointers.php:239 msgid "General settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:110 +msgid "Response code" +||||||| .r11156 +#: admin/class-pointers.php:97 +msgid "" +"There’s more to learn about WordPress & SEO than just using this " +"plugin. A great start is our article %1$sthe definitive guide to WordPress " +"SEO%2$s." +======= #: admin/class-pointers.php:241 #. translators: %1$s expands to Yoast SEO msgid "" "These are the General settings for %1$s, here you can restart this tour or " "revert the %1$s settings to default." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:139 +#: admin/google_search_console/class-gsc-table.php:210 +msgid "Mark as fixed" +||||||| .r11156 +#: admin/class-pointers.php:98 admin/pages/dashboard.php:154 +msgid "Tracking" +======= #: admin/class-pointers.php:242 msgid "Tab: Your Info / Company Info" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:206 +msgid "Create a redirect" +||||||| .r11156 +#: admin/class-pointers.php:98 +msgid "" +"To provide you with the best experience possible, we need your help. Please " +"enable tracking to help us gather anonymous usage data." +======= #: admin/class-pointers.php:242 msgid "Add some info here needed for Google's Knowledge Graph." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc-table.php:206 +#: admin/google_search_console/views/gsc-create-redirect.php:40 +msgid "Create redirect" +||||||| .r11156 +#: admin/class-pointers.php:99 admin/pages/dashboard.php:162 +msgid "Webmaster Tools" +======= #: admin/class-pointers.php:243 msgid "Tab: Webmaster Tools" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:79 +||||||| .r11156 +#: admin/class-pointers.php:99 +======= #: admin/class-pointers.php:243 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"Don't miss your crawl errors: %1$sconnect with Google Search Console here" +"%2$s." +||||||| .r11156 +"You can also add the verification codes for the different Webmaster Tools " +"programs here, we highly encourage you to check out both Google and " +"Bing’s Webmaster Tools." +======= "You can add the verification codes for the different Webmaster Tools " "programs here. We highly encourage you to check out both Google and " "Bing’s Webmaster Tools." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:118 +msgid "Search" +||||||| .r11156 +#: admin/class-pointers.php:100 +msgid "WordPress SEO Tour" +======= #: admin/class-pointers.php:244 msgid "Tab: Security" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:128 +msgid "Crawl errors per page" +||||||| .r11156 +#: admin/class-pointers.php:100 +msgid "" +"This tour will show you around in the plugin, to give you a general " +"overview of the plugin." +======= #: admin/class-pointers.php:244 msgid "" "Determine who has access to the plugins advanced settings on the post edit " "screen." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to Google Search Console. +#: admin/google_search_console/class-gsc.php:179 +||||||| .r11156 +#: admin/class-pointers.php:101 +msgid "Newsletter" +msgstr "" + +#: admin/class-pointers.php:102 +======= #: admin/class-pointers.php:247 #. translators: %1$s expands to Yoast SEO msgid "More %1$s" msgstr "" #: admin/class-pointers.php:250 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"The %1$s data has been removed. You will have to reauthenticate if you want " +"to retrieve the data again." +||||||| .r11156 +"If you would like to us to keep you up-to-date regarding WordPress SEO and " +"other plugins by Yoast, subscribe to our newsletter:" +======= "There’s more to learn about WordPress & SEO than just using this " "plugin. A great start is our article %1$sthe definitive guide to WordPress " "SEO%2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:192 +msgid "The issues have been successfully reloaded!" +||||||| .r11156 +#: admin/class-pointers.php:105 +msgid "Email" +======= #: admin/class-pointers.php:252 msgid "Subscribe to our Newsletter" msgstr "" @@ -1194,69 +3119,208 @@ msgstr "" #: admin/class-pointers.php:257 msgid "Email" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:223 +msgid "Incorrect Google Authorization Code." +||||||| .r11156 +#: admin/class-pointers.php:107 +msgid "Subscribe" +======= #: admin/class-pointers.php:259 msgid "Subscribe" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:280 +msgid "Issue categories" msgstr "" +#: admin/google_search_console/class-gsc.php:281 +msgid "Errors that occurred when your site was crawled by Googlebot." +||||||| .r11156 +#: admin/class-pointers.php:109 admin/class-pointers.php:117 +#: admin/class-pointers.php:127 admin/class-pointers.php:136 +#: admin/class-pointers.php:143 admin/class-pointers.php:150 +#: admin/class-pointers.php:157 admin/class-pointers.php:167 +#: admin/class-pointers.php:174 admin/class-pointers.php:181 +msgid "Next" +msgstr "" + +#: admin/class-pointers.php:114 +msgid "Title & Metas settings" +======= #: admin/class-pointers.php:273 msgid "Title & Metas settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:282 +||||||| .r11156 +#: admin/class-pointers.php:114 +======= #: admin/class-pointers.php:274 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Errors that occurred only when your site was crawled by Googlebot-Mobile " +"(errors didn't appear for desktop)." +||||||| .r11156 +"This is where you set the titles and meta-information for all your post " +"types, taxonomies, archives, special pages and for your homepage. The page " +"is divided into different tabs. Make sure you check ’em all out!" +======= "This is where you\tset the titles and meta-information for all your post " "types, taxonomies, archives, special pages and for your homepage. The page " "is divided into different tabs. Make sure you check ’em all out!" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/google_search_console/class-gsc.php:283 +||||||| .r11156 +#: admin/class-pointers.php:115 +msgid "Sitewide settings" msgstr "" +#: admin/class-pointers.php:115 +======= #: admin/class-pointers.php:275 msgid "Sitewide settings" msgstr "" #: admin/class-pointers.php:275 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Errors that only occurred when your site was crawled by Googlebot for " +"feature phones (errors didn't appear for desktop)." +||||||| .r11156 +"The first tab will show you site-wide settings. You can also set some " +"settings for the entire site here to add specific meta tags or to remove " +"some unneeded cruft." +======= "The first tab will show you site-wide settings for titles, normally you'll " "only need to change the Title Separator." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-create-redirect.php:21 +msgid "Redirect this broken URL and fix the error" +||||||| .r11156 +#: admin/class-pointers.php:116 +msgid "Templates and settings" +======= #: admin/class-pointers.php:276 msgid "Templates and settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-create-redirect.php:24 +msgid "Current URL:" +||||||| .r11156 +#: admin/class-pointers.php:116 +msgid "" +"Now click on the ‘%1$sPost Types%2$s’-tab, as this will be our " +"example." +======= #: admin/class-pointers.php:276 msgid "" "Now click on the ‘%1$sPost Types%2$s’-tab, as this will be our " "example." +>>>>>>> .r12027 msgstr "" -#: admin/class-pointers.php:276 -msgid "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-create-redirect.php:28 +msgid "New URL:" +||||||| .r11156 +#: admin/class-pointers.php:116 +msgid "" +"The templates are built using variables. You can find all these variables " +"in the help tab (in the top-right corner of the page). The settings allow " +"you to set specific behavior for the post types." +======= +#: admin/class-pointers.php:276 +msgid "" "The templates are built using variables. You can find all these variables " "in the help tab (in the top-right corner of the page). The settings allow " "you to set specific behavior for the post types." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-create-redirect.php:32 +msgid "Mark as fixed:" +||||||| .r11156 +#: admin/class-pointers.php:119 admin/class-pointers.php:129 +#: admin/class-pointers.php:138 admin/class-pointers.php:145 +#: admin/class-pointers.php:152 admin/class-pointers.php:159 +#: admin/class-pointers.php:169 admin/class-pointers.php:176 +#: admin/class-pointers.php:183 admin/class-pointers.php:192 +msgid "Previous" +======= #: admin/class-pointers.php:277 admin/pages/metas.php:24 #: frontend/class-frontend.php:523 frontend/class-frontend.php:544 msgid "Archives" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to 'Google Search Console'. +#: admin/google_search_console/views/gsc-create-redirect.php:36 +msgid "Mark this issue as fixed in %1$s." +||||||| .r11156 +#: admin/class-pointers.php:123 +msgid "Social settings" +======= #: admin/class-pointers.php:277 msgid "" "On the archives tab you can set templates for specific pages like author " "archives, search results and more." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-create-redirect.php:46 +msgid "Error: a redirect for this URL already exists" +||||||| .r11156 +#: admin/class-pointers.php:124 admin/pages/social.php:172 +msgid "Facebook" +======= #: admin/class-pointers.php:278 admin/class-pointers.php:297 #: admin/google_search_console/class-gsc-category-filters.php:117 #: admin/pages/metas.php:25 msgid "Other" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to the current url and %2$s expands to url the +#. redirects points to. +#: admin/google_search_console/views/gsc-create-redirect.php:51 +||||||| .r11156 +#: admin/class-pointers.php:124 +======= #: admin/class-pointers.php:278 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"You do not have to create a redirect for URL %1$s because a redirect already " +"exists. The existing redirect points to %2$s. If this is fine you can mark " +"this issue as fixed. If not, please go to the redirects page and change the " +"target URL." +||||||| .r11156 +"On this tab you can enable the %1$sFacebook Open Graph%2$s functionality " +"from this plugin, as well as assign a Facebook user or Application to be " +"the admin of your site, so you can view the Facebook insights." +======= "On the Other tab you can change sitewide meta settings, like enable meta " "keywords." msgstr "" @@ -1270,15 +3334,52 @@ msgid "" "On this tab you can enable the %1$sFacebook Open Graph%2$s functionality " "from this plugin, as well as assign a Facebook user or Application to be " "the admin of your site, so you can view the Facebook insights." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %s: expands to Yoast SEO Premium +#: admin/google_search_console/views/gsc-create-redirect.php:60 +msgid "Creating redirects is a %s feature" +||||||| .r11156 +#: admin/class-pointers.php:124 +msgid "" +"The frontpage settings allow you to set meta-data for your homepage, " +"whereas the default settings allow you to set a fallback for all " +"posts/pages without images. " +======= #: admin/class-pointers.php:293 msgid "" "The frontpage settings allow you to set meta-data for your homepage, " "whereas the default settings allow you to set a fallback for all " "posts/pages without images. " +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to 'Yoast SEO Premium', %2$s: links to Yoast SEO +#. Premium plugin page. +#: admin/google_search_console/views/gsc-create-redirect.php:64 +msgid "" +"To be able to create a redirect and fix this issue, you need %1$s. You can " +"buy the plugin, including one year of support and updates, on %2$s." +msgstr "" + +#: admin/google_search_console/views/gsc-display.php:16 +msgid "Reload crawl issues" +||||||| .r11156 +#: admin/class-pointers.php:125 admin/pages/social.php:173 +msgid "Twitter" +msgstr "" + +#: admin/class-pointers.php:125 +msgid "" +"With %1$sTwitter Cards%2$s, you can attach rich photos, videos and media " +"experience to tweets that drive traffic to your website. Simply check the " +"box, sign up for the service, and users who Tweet links to your content " +"will have a “Card” added to the tweet that’s visible to " +"all of their followers." +======= #: admin/class-pointers.php:294 msgid "" "With %1$sTwitter Cards%2$s, you can attach rich photos, videos and media " @@ -1286,14 +3387,31 @@ msgid "" "box, sign up for the service, and users who Tweet links to your content " "will have a “Card” added to the tweet that’s visible to " "all of their followers." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to 'Yoast SEO', %2$s expands to Google Search +#. Console. +#: admin/google_search_console/views/gsc-display.php:31 +||||||| .r11156 +#: admin/class-pointers.php:126 +======= #: admin/class-pointers.php:295 admin/pages/social.php:23 msgid "Pinterest" msgstr "" #: admin/class-pointers.php:295 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"To allow %1$s to fetch your %2$s information, please enter your Google " +"Authorization Code." +||||||| .r11156 +"This tab allows you to add specific post meta data for Google+. And if you " +"have a Google+ page for your business, add that URL here and link it on " +"your %1$sGoogle+%2$s page’s about page." +======= "On this tab you can verify your site with Pinterest and enter your " "Pinterest account." msgstr "" @@ -1303,8 +3421,16 @@ msgid "" "This tab allows you to add specific post meta data for Google+. And if you " "have a Google+ page for your business, add that URL here and link it on " "your %1$sGoogle+%2$s page’s about page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:34 +msgid "Get Google Authorization Code" +||||||| .r11156 +#: admin/class-pointers.php:134 +msgid "What are XML sitemaps?" +======= #: admin/class-pointers.php:297 msgid "" "On this tab you can enter some more of your social accounts, mostly used " @@ -1313,189 +3439,561 @@ msgstr "" #: admin/class-pointers.php:311 msgid "What are XML sitemaps?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:36 +||||||| .r11156 +#: admin/class-pointers.php:134 +======= #: admin/class-pointers.php:311 +>>>>>>> .r12027 msgid "" -"A Sitemap is an XML file that lists the URLs for a site. It allows " -"webmasters to include additional information about each URL: when it was " -"last updated, how often it changes, and how important it is in relation to " -"other URLs in the site. This allows search engines to crawl the site more " -"intelligently." +"Please enter the Google Authorization Code in the field below and press the " +"Authenticate button." msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:40 +msgid "Authenticate" +||||||| .r11156 +#: admin/class-pointers.php:135 +msgid "What does the plugin do with XML Sitemaps?" +======= #: admin/class-pointers.php:312 msgid "What does the plugin do with XML Sitemaps?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:44 +msgid "Reauthenticate with Google " +||||||| .r11156 +#: admin/class-pointers.php:135 +msgid "" +"This plugin adds XML sitemaps to your site. The sitemaps are automatically " +"updated when you publish a new post, page or custom post and Google and " +"Bing will be automatically notified. You can also have the plugin " +"automatically notify Yahoo! and Ask.com." +======= #: admin/class-pointers.php:312 msgid "" "This plugin adds XML sitemaps to your site. The sitemaps are automatically " "updated when you publish a new post, page or custom post and Google and " "Bing will be automatically notified." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:45 +#: admin/google_search_console/views/gsc-display.php:48 +msgid "Current profile" +||||||| .r11156 +#: admin/class-pointers.php:135 +msgid "" +"If you want to exclude certain post types and/or taxonomies, you can also " +"set that on this page." +======= #: admin/class-pointers.php:313 msgid "" "If you want to exclude certain post types and/or taxonomies, you can also " "set that on this page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:67 +#: admin/google_search_console/views/gsc-display.php:71 +msgid "Profile" +||||||| .r11156 +#: admin/class-pointers.php:135 +msgid "" +"Is your webserver low on memory? Decrease the entries per sitemap (default: " +"1000) to reduce load." +======= #: admin/class-pointers.php:314 msgid "" "Is your webserver low on memory? Decrease the entries per sitemap (default: " "1000) to reduce load." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:72 +msgid "There were no profiles found" +||||||| .r11156 +#: admin/class-pointers.php:142 admin/pages/permalinks.php:38 +msgid "Permalink Settings" +======= #: admin/class-pointers.php:327 msgid "Advanced Settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:80 +msgid "Save Profile" +||||||| .r11156 +#: admin/class-pointers.php:142 +msgid "" +"All of the options here are for advanced users only, if you don’t " +"know whether you should check any, don’t touch them." +======= #: admin/class-pointers.php:327 msgid "" "All of the options on these tabs are for advanced users only, if you " "don’t know whether you should check any, don’t touch them." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/google_search_console/views/gsc-display.php:80 +msgid "or" +||||||| .r11156 +#: admin/class-pointers.php:149 admin/pages/internal-links.php:81 +msgid "Breadcrumbs Settings" +======= #: admin/class-pointers.php:340 msgid "Extensions and Licenses" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/import/class-import-aioseo-hooks.php:28 +||||||| .r11156 +#: admin/class-pointers.php:149 +======= #: admin/class-pointers.php:343 #. translators: %1$s expands to Yoast SEO, %2$s to Yoast SEO Premium, %3$s and #. %4$s to an anchor with link about our premium plugins +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"The plugin All-In-One-SEO has been detected. Do you want to %simport its " +"settings%s?" +||||||| .r11156 +"If your theme supports my breadcrumbs, as all Genesis and WooThemes themes " +"as well as a couple of other ones do, you can change the settings for those " +"here. If you want to modify your theme to support them, %sfollow these " +"instructions%s." +======= "The powerful functions of %1$s can be extended with %3$sYoast premium " "plugins%4$s. These premium plugins require the installation of %1$s or %2$s " "and add specific functionality. You can read all about the Yoast Premium " "Plugins %3$shere%4$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/import/class-import-aioseo-hooks.php:37 +msgid "All-In-One-SEO has been deactivated" +||||||| .r11156 +#: admin/class-pointers.php:156 +msgid "RSS Settings" +======= #: admin/class-pointers.php:345 admin/pages/licenses.php:78 msgid "Licenses" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/import/class-import-robots-meta-hooks.php:28 +||||||| .r11156 +#: admin/class-pointers.php:156 +======= #: admin/class-pointers.php:347 #. translators: %1$s expands to Yoast SEO Premium +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"The plugin Robots-Meta has been detected. Do you want to %simport its " +"settings%s." +||||||| .r11156 +"This incredibly powerful function allows you to add content to the " +"beginning and end of your posts in your RSS feed. This helps you gain links " +"from people who steal your content!" +======= "Once you’ve purchased %1$s or any other premium Yoast plugin, " "you’ll have to enter a license key. You can do so on the " "Licenses-tab. Once you’ve activated your premium plugin, you can use " "all its powerful features." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/import/class-import-robots-meta-hooks.php:37 +msgid "Robots-Meta has been deactivated" +||||||| .r11156 +#: admin/class-pointers.php:164 +msgid "Import from other (SEO) plugins" +======= #: admin/class-pointers.php:349 msgid "Like this plugin?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/import/class-import-wpseo-hooks.php:28 +||||||| .r11156 +#: admin/class-pointers.php:164 +======= #: admin/class-pointers.php:349 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"The plugin wpSEO has been detected. Do you want to %simport its settings%s?" +||||||| .r11156 +"We can imagine that you switch from another SEO plugin to WordPress SEO. If " +"you just did, you can use these options to transfer your SEO-data. If you " +"were using one of my older plugins like Robots Meta & RSS Footer, you " +"can import the settings here too." +======= "So, we’ve come to the end of the tour. If you like the plugin, please " "%srate it 5 stars on WordPress.org%s!" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/import/class-import-wpseo-hooks.php:37 +msgid "wpSEO has been deactivated" +msgstr "" + +#: admin/metabox/class-metabox-add-keyword-tab.php:22 +msgid "Add keyword" +||||||| .r11156 +#: admin/class-pointers.php:165 +msgid "Other imports" msgstr "" +#: admin/class-pointers.php:165 +msgid "" +"If you’re using one of our premium plugins, such as %1$sLocal " +"SEO%2$s, you can also find specific import-options for that plugin here." +======= #: admin/class-pointers.php:350 msgid "" "Thank you for using our plugin and good luck with your " "SEO!

Best,
Team Yoast - %1$sYoast.com%2$s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox-add-keyword-tab.php:29 +msgid "Multiple focus keywords is a %s feature" +||||||| .r11156 +#: admin/class-pointers.php:166 admin/pages/import.php:400 +msgid "Export" +======= #: admin/class-social-facebook.php:113 msgid "Please make sure both fields are filled." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. Translators: %1$s: expands to 'Yoast SEO Premium', %2$s: links to Yoast SEO +#. Premium plugin page. +#: admin/metabox/class-metabox-add-keyword-tab.php:34 +||||||| .r11156 +#: admin/class-pointers.php:166 +======= #: admin/class-social-facebook.php:116 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"To be able to add and analyze multiple keywords for a post or page you need " +"%1$s. You can buy the plugin, including one year of support, updates and " +"upgrades, on %2$s." +||||||| .r11156 +"If you have multiple blogs and you’re happy with how you’ve " +"configured this blog, you can export the settings and import them on " +"another blog so you don’t have to go through this process twice!" +======= "Your input contains invalid characters. Please make sure both fields are " "filled in correctly." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox-add-keyword-tab.php:40 +msgid "Buy %s »" +||||||| .r11156 +#: admin/class-pointers.php:173 +msgid "" +"This page lets you view and edit the titles and meta descriptions of all " +"posts and pages on your site. This allows you to edit the title or meta " +"description of all your pages in one place, rather than having to edit each " +"individual page." +======= #: admin/class-social-facebook.php:119 msgid "This Facebook user has already been added as an admin." -msgstr "" - +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/metabox/class-metabox.php:50 +#: admin/taxonomy/class-taxonomy-content-fields.php:19 +#: tests/taxonomy/test-class-taxonomy-content-fields.php:55 +msgid "Snippet Editor" +||||||| .r11156 +#: admin/class-pointers.php:180 +msgid "File Editor" +======= #: admin/class-social-facebook.php:155 msgid "Successfully removed admin %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:51 +#: admin/taxonomy/class-taxonomy-content-fields.php:20 +msgid "" +"This is a rendering of what this post might look like in Google's search " +"results.

Read %sthis post%s for more info." +||||||| .r11156 +#: admin/class-pointers.php:180 +msgid "" +"Here you can edit the .htaccess and robots.txt files, two of the most " +"powerful files in your WordPress install, if your WordPress installation " +"has write-access to the files. But please, only touch these files if you " +"know what you’re doing!" +======= #: admin/class-social-facebook.php:178 msgid "Successfully cleared all Facebook Data" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:53 +#: admin/taxonomy/class-taxonomy-content-fields.php:28 +msgid "Content Analysis" +||||||| .r11156 +#: admin/class-pointers.php:187 +msgid "Extensions and Licenses" +======= #: admin/class-social-facebook.php:292 msgid "Facebook Insights and Admins" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:54 +#: admin/taxonomy/class-taxonomy-content-fields.php:29 +||||||| .r11156 +#: admin/class-pointers.php:188 +======= #: admin/class-social-facebook.php:294 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"This is the content analysis, a collection of content checks that analyze " +"the content of your page. Read %sthis post%s for more info." +||||||| .r11156 +"The powerful functions of WordPress SEO can be extended with %1$sYoast " +"premium plugins%2$s. These premium plugins require the installation of " +"WordPress SEO or WordPress SEO Premium and add specific functionality. You " +"can read all about the Yoast Premium Plugins on " +"%1$shttp://yoast.com/wordpress/plugins/%2$s." +======= "To be able to access %sFacebook Insights%s for your site, you need to " "specify a Facebook Admin. This can be a user. If you have an app for your " "site, you could use that as well." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:56 +#: admin/taxonomy/class-taxonomy-content-fields.php:24 +msgid "Focus Keyword" +||||||| .r11156 +#: admin/class-pointers.php:189 admin/pages/licenses.php:22 +msgid "Licenses" +======= #: admin/class-social-facebook.php:302 #. translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base msgid "More info can be found %1$son our knowledge base%2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:57 +#: admin/taxonomy/class-taxonomy-content-fields.php:25 +||||||| .r11156 +#: admin/class-pointers.php:189 +======= #: admin/class-social-facebook.php:319 #. translators: %1$s and %2$s expand to a link to Facebook Insights -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"Pick the main keyword or keyphrase that this post/page is about.

Read %sthis post%s for more info." +||||||| .r11156 +"Once you’ve purchased WordPress SEO Premium or any other premium " +"Yoast plugin, you’ll have to enter a license key. You can do so on " +"the Licenses-tab. Once you’ve activated your premium plugin, you can " +"use all its powerful features." +======= "To be able to access %1$sFacebook Insights%2$s, you need to add a user " "here. The name is used for reference only, the ID is used for verification." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:61 admin/pages/metas.php:141 +msgid "Meta description" +||||||| .r11156 +#: admin/class-pointers.php:190 +msgid "Like this plugin?" +======= #: admin/class-social-facebook.php:323 #. translators: %1$s and %2$s expand to a link to the Yoast Knowledge Base msgid "" "If you don't know where to find the needed ID, see %1$sthis knowledge base " "article%2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:63 admin/pages/metas.php:143 +#: admin/taxonomy/class-taxonomy-settings-fields.php:37 +msgid "Meta keywords" +||||||| .r11156 +#: admin/class-pointers.php:190 +msgid "" +"So, we’ve come to the end of the tour. If you like the plugin, please " +"%srate it 5 stars on WordPress.org%s!" +======= #: admin/class-social-facebook.php:326 msgid "Admin's name:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:64 +msgid "" +"If you type something above it will override your %smeta keywords template%s." +||||||| .r11156 +#: admin/class-pointers.php:191 +msgid "" +"Thank you for using my plugin and good luck with your " +"SEO!

Best,
Team Yoast - %1$sYoast.com%2$s" +======= #: admin/class-social-facebook.php:330 msgid "Admin's Facebook user ID:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:67 +msgid "Meta Robots Index" +||||||| .r11156 +#: admin/class-pointers.php:210 +msgid "Close" +======= #: admin/class-social-facebook.php:335 admin/class-social-facebook.php:349 msgid "Add Facebook admin" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/metabox/class-metabox.php:69 +#: admin/taxonomy/class-taxonomy-settings-fields.php:105 +msgid "" +"Warning: even though you can set the meta robots setting here, the entire " +"site is set to noindex in the sitewide privacy settings, so these settings " +"won't have an effect." +||||||| .r11156 +#: admin/class-pointers.php:218 +msgid "Congratulations!" msgstr "" +#: admin/class-pointers.php:219 +msgid "" +"You’ve just installed WordPress SEO by Yoast! Click “Start " +"Tour” to view a quick introduction of this plugin’s core " +"functionality." +======= #: admin/class-social-facebook.php:355 msgid "Add Another Facebook Admin" msgstr "" #: admin/class-social-facebook.php:360 msgid "Currently connected Facebook admins:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:71 +msgid "Default for post type, currently: %s" +||||||| .r11156 +#: admin/class-pointers.php:224 admin/pages/dashboard.php:147 +msgid "Start Tour" +======= #: admin/class-social-facebook.php:387 msgid "Facebook App ID" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:72 +msgid "index" +||||||| .r11156 +#: admin/class-taxonomy.php:61 +msgid "Use %s default (Currently: %s)" +======= #: admin/class-social-facebook.php:455 msgid "Clear all Facebook Data" msgstr "" #: admin/class-taxonomy.php:76 msgid "Use %s default (Currently: %s)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:73 +msgid "noindex" +||||||| .r11156 +#: admin/class-taxonomy.php:62 +msgid "Always index" +======= #: admin/class-taxonomy.php:77 msgid "Always index" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:75 +msgid "Meta Robots Follow" +||||||| .r11156 +#: admin/class-taxonomy.php:63 +msgid "Always noindex" +======= #: admin/class-taxonomy.php:78 msgid "Always noindex" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:76 +msgid "Follow" +||||||| .r11156 +#: admin/class-taxonomy.php:174 +msgid "Yoast WordPress SEO Settings" +======= #: admin/class-taxonomy.php:80 msgid "Auto detect" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:77 +msgid "Nofollow" +||||||| .r11156 +#: admin/class-taxonomy.php:177 +msgid "The SEO title is used on the archive page for this term." +======= #: admin/class-taxonomy.php:81 msgid "Always include" msgstr "" @@ -1511,125 +4009,374 @@ msgstr "" #: admin/class-taxonomy.php:188 msgid "The SEO title is used on the archive page for this term." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:79 +msgid "Meta Robots Advanced" +||||||| .r11156 +#: admin/class-taxonomy.php:178 +msgid "SEO Description" +======= #: admin/class-taxonomy.php:189 msgid "SEO Description" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:80 +msgid "Advanced meta robots settings for this page." +||||||| .r11156 +#: admin/class-taxonomy.php:178 +msgid "" +"The SEO description is used for the meta description on the archive page " +"for this term." +======= #: admin/class-taxonomy.php:189 msgid "" "The SEO description is used for the meta description on the archive page " "for this term." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:81 +msgid "Site-wide default: %s" +||||||| .r11156 +#: admin/class-taxonomy.php:181 +msgid "Meta keywords used on the archive page for this term." +======= #: admin/class-taxonomy.php:192 msgid "Meta keywords used on the archive page for this term." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:82 admin/pages/network.php:53 +#: admin/views/tab-breadcrumbs.php:40 admin/views/tab-breadcrumbs.php:57 +#: inc/class-wpseo-meta.php:412 +msgid "None" +||||||| .r11156 +#: admin/class-taxonomy.php:184 +msgid "Canonical" +======= #: admin/class-taxonomy.php:195 msgid "Canonical" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:83 +msgid "NO ODP" +||||||| .r11156 +#: admin/class-taxonomy.php:184 +msgid "The canonical link is shown on the archive page for this term." +======= #: admin/class-taxonomy.php:195 msgid "The canonical link is shown on the archive page for this term." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:84 +msgid "NO YDIR" +||||||| .r11156 +#: admin/class-taxonomy.php:187 +msgid "The Breadcrumbs title is used in the breadcrumbs where this %s appears." +======= #: admin/class-taxonomy.php:198 admin/pages/metas.php:140 msgid "Breadcrumbs title" msgstr "" #: admin/class-taxonomy.php:198 msgid "The Breadcrumbs title is used in the breadcrumbs where this %s appears." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:85 +msgid "No Image Index" +||||||| .r11156 +#: admin/class-taxonomy.php:198 +msgid "" +"This %s follows the indexation rules set under Metas and Titles, you can " +"override it here." +======= #: admin/class-taxonomy.php:209 msgid "" "This %s follows the indexation rules set under Metas and Titles, you can " "override it here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:86 +msgid "No Archive" +||||||| .r11156 +#: admin/class-taxonomy.php:203 +msgid "Noindex this %s" +======= #: admin/class-taxonomy.php:214 msgid "Noindex this %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:87 +msgid "No Snippet" +||||||| .r11156 +#: admin/class-taxonomy.php:207 +msgid "Include in sitemap?" +======= #: admin/class-taxonomy.php:218 msgid "Include in sitemap?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:89 +msgid "Breadcrumbs Title" +||||||| .r11156 +#: admin/class-yoast-plugin-conflict.php:164 +msgid "The following plugins might cause (%1s) issues with Yoast WordPress SEO: %2s" +======= #: admin/class-yoast-dashboard-widget.php:41 #. translators: %s is the plugin name msgid "%s Posts Overview" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:90 +msgid "Title to use for this page in breadcrumb paths" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:137 +msgid "" +"Warning! You're blocking external requests which means you won't be " +"able to get %s updates. Please add %s to %s." +======= #: admin/class-yoast-dashboard-widget.php:116 msgid "Posts with good SEO score" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:92 +msgid "Canonical URL" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:180 +msgid "Your %s license has been activated. You have an unlimited license. " +======= #: admin/class-yoast-dashboard-widget.php:122 msgid "Posts with OK SEO score" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:93 +msgid "" +"The canonical URL that this page should point to, leave empty to default to " +"permalink. %sCross domain canonical%s supported too." +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:182 +msgid "Your %s license has been activated. You have used %d/%d activations. " +======= #: admin/class-yoast-dashboard-widget.php:128 msgid "Posts with poor SEO score" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:95 +msgid "301 Redirect" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:187 +msgid "Did you know you can upgrade your license?" +======= #: admin/class-yoast-dashboard-widget.php:134 msgid "Posts with bad SEO score" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:96 +msgid "The URL that this page should redirect to." +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:191 +msgid "" +"Your license is expiring in %d days, would you like to " +"extend it?" +======= #: admin/class-yoast-dashboard-widget.php:140 msgid "Posts without focus keyword" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:157 +msgid "No focus keyword set." +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:200 +msgid "" +"You've reached your activation limit. You must upgrade your " +"license to use it on this site." +======= #: admin/class-yoast-dashboard-widget.php:147 #. translators: %s expands to noindex msgid "Posts that are set to %s" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:173 +msgid "SEO score" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:203 +msgid "" +"Your license has expired. You must extend your license " +"in order to use it again." +======= #: admin/class-yoast-form.php:130 msgid "Debug Information" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:175 +msgid "SEO:" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:206 +msgid "Failed to activate your license, your license key seems to be invalid." +======= #: admin/class-yoast-form.php:132 msgid "Current option:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:177 +msgid "Check" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:230 +msgid "Your %s license has been deactivated." +======= #: admin/class-yoast-form.php:227 msgid "Remove these ads?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:222 admin/taxonomy/class-taxonomy.php:210 +msgid "Content:" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:232 +msgid "Failed to deactivate your %s license." +======= #: admin/class-yoast-form.php:230 #. translators: %1$s expands to Yoast SEO Premium msgid "Upgrade to %1$s »" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:298 admin/taxonomy/class-taxonomy.php:258 +msgid "(no parent)" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:267 +msgid "Request error: \"%s\" (%scommon license notices%s)" +======= #: admin/class-yoast-form.php:424 msgid "Upload Image" -msgstr "" - +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/metabox/class-metabox.php:388 admin/metabox/class-metabox.php:391 +#: admin/metabox/class-metabox.php:402 admin/metabox/class-metabox.php:403 +#: admin/taxonomy/class-taxonomy-metabox.php:99 +#: admin/taxonomy/class-taxonomy-metabox.php:102 +#: admin/taxonomy/class-taxonomy-metabox.php:111 +#: admin/taxonomy/class-taxonomy-metabox.php:112 +msgid "Content" +||||||| .r11156 +#: admin/license-manager/class-license-manager.php:423 +msgid "%s: License Settings" +======= #: admin/class-yoast-plugin-conflict.php:160 msgid "Warning!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:448 admin/metabox/class-metabox.php:449 +msgid "Add-ons" +||||||| .r11156 +#: admin/license-manager/class-plugin-license-manager.php:73 +msgid "" +"%s is network activated, you can manage your license in the network admin license page." +======= #: admin/class-yoast-plugin-conflict.php:163 #. translators: %1$s: 'Facebook & Open Graph' plugin name(s) of possibly #. conflicting plugin(s), %2$s to Yoast SEO msgid "The %1$s plugin(s) might cause issues when used in conjunction with %2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/metabox/class-metabox.php:746 +msgid "" +"The featured image should be at least 200x200 pixels to be picked up by " +"Facebook and other social media sites." +||||||| .r11156 +#: admin/license-manager/class-plugin-license-manager.php:75 +msgid "" +"%s is network activated, please contact your site administrator to manage " +"the license." +======= #: admin/class-yoast-plugin-conflict.php:165 msgid "Recommended solution" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: opens a link to yoast.com. 2: closes the link 3: opens a +#. link to onpage.org +#: admin/onpage/class-onpage-email-presenter.php:54 +msgid "Indexing powered by %1$sYoast%2$s and %3$sOnPage.org%2$s." +||||||| .r11156 +#: admin/license-manager/class-theme-license-manager.php:34 +#: admin/license-manager/samples/sample-plugin.php:53 +msgid "%s License" +======= #: admin/class-yoast-plugin-conflict.php:168 #. translators: %1$s: 'Facebook & Open Graph' plugin name(s) of possibly #. conflicting plugin(s). %2$s to Yoast SEO msgid "" "We recommend you deactivate %1$s and have another look at your %2$s " "configuration using the button above." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). 2: opens a link to a +#. related knowledge base article. 3: closes the link +#: admin/onpage/class-onpage-email-presenter.php:72 +msgid "" +"Yoast SEO has detected that %1$s can no longer be indexed. Please note that " +"this will make it impossible for search engines like Google and Bing to " +"index your site. %2$sRead more about this error on our knowledge base%3$s." +||||||| .r11156 +#: admin/license-manager/class-theme-license-manager.php:34 +msgid "Theme License" msgstr "" +#: admin/license-manager/class-theme-update-manager.php:96 +msgid "" +"Updating this theme will lose any customizations you have made. 'Cancel' to " +"stop, 'OK' to update." +======= #: admin/class-yoast-plugin-conflict.php:172 #. translators: %s: 'Facebook' plugin name of possibly conflicting plugin msgid "Deactivate %s" @@ -1638,65 +4385,209 @@ msgstr "" #: admin/class-yoast-plugin-conflict.php:176 #. translators: %1$s expands to Yoast SEO msgid "This warning is generated by %1$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:79 +msgid "Yoast SEO has detected that %1$s can be indexed again." +||||||| .r11156 +#: admin/license-manager/class-theme-update-manager.php:101 +msgid "" +"%s version %s is available. Check out what's new or update now." +======= #: admin/google_search_console/class-gsc-category-filters.php:113 msgid "Access denied" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). 2: opens a link to a +#. related knowledge base article. 3: closes the link +#: admin/onpage/class-onpage-email-presenter.php:96 +||||||| .r11156 +#: admin/license-manager/class-update-manager.php:83 +msgid "%s failed to check for updates because of the following error: %s" msgstr "" +#: admin/license-manager/class-update-manager.php:153 +======= #: admin/google_search_console/class-gsc-category-filters.php:113 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Yoast SEO has detected that %1$s can not be indexed. Please note that this " +"will make it impossible for search engines like Google and Bing to index " +"your site. %2$sRead more about this error on our knowledge base%3$s." +||||||| .r11156 +"This site has not been activated properly on yoast.com and thus cannot " +"check for future updates. Please activate your site with a valid license " +"key." +======= "Server requires authentication or is blocking Googlebot from accessing the " "site." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:103 +msgid "Yoast SEO has detected that %1$s can be indexed." +||||||| .r11156 +#: admin/license-manager/views/form.php:23 +msgid "License status" +======= #: admin/google_search_console/class-gsc-category-filters.php:114 msgid "Faulty redirects" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:120 +msgid "Yoast SEO alert: Search engines can no longer index %1$s!" +||||||| .r11156 +#: admin/license-manager/views/form.php:33 +msgid "Toggle license status" +======= #: admin/google_search_console/class-gsc-category-filters.php:115 msgid "Not followed" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:125 +msgid "Yoast SEO alert fixed: Search engines can index %1$s again." +||||||| .r11156 +#: admin/license-manager/views/form.php:37 +msgid "Deactivate License" +======= #: admin/google_search_console/class-gsc-category-filters.php:116 msgid "Not found" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:142 +msgid "Yoast SEO alert: Search engines cannot index %1$s!" +||||||| .r11156 +#: admin/license-manager/views/form.php:38 +msgid "(deactivate your license so you can activate it on another WordPress site)" +======= #: admin/google_search_console/class-gsc-category-filters.php:116 msgid "URL points to a non-existent page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to get_option( 'home' ). +#: admin/onpage/class-onpage-email-presenter.php:147 +msgid "Yoast SEO alert fixed: Search engines can index %1$s." +||||||| .r11156 +#: admin/license-manager/views/form.php:42 +msgid "Activate License" +======= #: admin/google_search_console/class-gsc-category-filters.php:117 msgid "Google was unable to crawl this URL due to an undetermined issue." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/onpage/class-onpage.php:56 tests/onpage/test-class-onpage.php:67 +msgid "Once Weekly" +||||||| .r11156 +#: admin/license-manager/views/form.php:44 +msgid "Please enter a license key in the field below first." +======= #: admin/google_search_console/class-gsc-category-filters.php:119 #. Translators: %1$s: expands to 'robots.txt'. msgid "Blocked" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: opens a link to a related knowledge base article. 2: closes +#. the link +#: admin/onpage/class-onpage.php:99 admin/views/dashboard-widget.php:65 +msgid "" +"%1$sYour homepage cannot be indexed by search engines%2$s. This is very bad " +"for SEO and should be fixed." +||||||| .r11156 +#: admin/license-manager/views/form.php:52 +msgid "License Key" +======= #: admin/google_search_console/class-gsc-category-filters.php:119 msgid "" "Googlebot could access your site, but certain URLs are blocked for " "Googlebot in your %1$s file. This block could either be for all Googlebots " "or even specifically for Googlebot-mobile." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/advanced.php:16 +msgid "Breadcrumbs" +||||||| .r11156 +#: admin/license-manager/views/form.php:54 +msgid "Paste your %s license key here.." +======= #: admin/google_search_console/class-gsc-category-filters.php:120 msgid "Server Error" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/advanced.php:20 +msgid "Permalinks" +||||||| .r11156 +#: admin/license-manager/views/form.php:56 +msgid "You defined your license key using the %s PHP constant." +======= #: admin/google_search_console/class-gsc-category-filters.php:120 msgid "Request timed out or site is blocking Google." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/advanced.php:24 +msgid "RSS" +||||||| .r11156 +#: admin/license-manager/views/form.php:73 +msgid "Your %s license will expire on %s." +======= #: admin/google_search_console/class-gsc-category-filters.php:121 msgid "Soft 404" +>>>>>>> .r12027 msgstr "" -#: admin/google_search_console/class-gsc-category-filters.php:121 -msgid "" -"The target URL doesn't exist, but your server is not returning a 404 (file " +<<<<<<< .mine +#: admin/pages/dashboard.php:59 +msgid "Removed hardcoded meta description." +||||||| .r11156 +#: admin/license-manager/views/form.php:76 +msgid "%sRenew your license now%s." +msgstr "" + +#: admin/pages/bulk-editor.php:36 admin/pages/metas.php:137 +#: admin/pages/social.php:188 +msgid "Title" +msgstr "" + +#: admin/pages/bulk-editor.php:37 admin/pages/social.php:189 +msgid "Description" +msgstr "" + +#: admin/pages/dashboard.php:64 +msgid "Removed hardcoded meta description." +======= +#: admin/google_search_console/class-gsc-category-filters.php:121 +msgid "" +"The target URL doesn't exist, but your server is not returning a 404 (file " "not found) error." msgstr "" @@ -1713,128 +4604,401 @@ msgstr "" #: admin/google_search_console/class-gsc-platform-tabs.php:45 #: admin/google_search_console/class-gsc.php:276 msgid "Feature phone" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:65 +msgid "Failed to remove hardcoded meta description." +||||||| .r11156 +#: admin/pages/dashboard.php:70 +msgid "Failed to remove hardcoded meta description." +======= #: admin/google_search_console/class-gsc-service.php:137 msgid "" "Yoast plugins share some code between them to make your site faster. As a " "result of that, we need all Yoast plugins to be up to date. We've detected " "this isn't the case, so please update the Yoast plugins that aren't up to " "date yet." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:72 +||||||| .r11156 +#: admin/pages/dashboard.php:77 +======= #: admin/google_search_console/class-gsc-service.php:146 #. translators: %1$s expands to Yoast SEO, %2$s expands to Google Analytics by #. Yoast +>>>>>>> .r12027 msgid "" "%1$s detected youâre using a version of %2$s which is not compatible with " "%1$s. Please update %2$s to the latest version to use this feature." msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:104 admin/pages/dashboard.php:119 +#: admin/pages/dashboard.php:130 admin/pages/dashboard.php:137 +msgid "Fix it." +||||||| .r11156 +#: admin/pages/dashboard.php:110 admin/pages/dashboard.php:122 +#: admin/pages/dashboard.php:132 admin/pages/dashboard.php:139 +msgid "Fix it." +======= #: admin/google_search_console/class-gsc-table.php:107 msgid "URL" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:105 +msgid "" +"The following file(s) is/are blocking your XML sitemaps from working " +"properly:" +||||||| .r11156 +#: admin/pages/dashboard.php:111 +msgid "" +"The following file(s) is/are blocking your XML sitemaps from working " +"properly:" +======= #: admin/google_search_console/class-gsc-table.php:108 msgid "Last crawled" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/dashboard.php:112 +msgid "" +"Either delete them (this can be done with the \"Fix it\" button) or disable " +"%1$s XML sitemaps." +||||||| .r11156 +#: admin/pages/dashboard.php:115 +msgid "" +"Either delete them (this can be done with the \"Fix it\" button) or disable " +"WP SEO XML sitemaps." +======= #: admin/google_search_console/class-gsc-table.php:109 msgid "First detected" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:120 +msgid "Re-check theme." +||||||| .r11156 +#: admin/pages/dashboard.php:123 +msgid "Re-check theme." +======= #: admin/google_search_console/class-gsc-table.php:110 msgid "Response code" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/dashboard.php:122 +msgid "" +"Your theme contains a meta description, which blocks %1$s from working " +"properly, please delete the following line, or press fix it:" +||||||| .r11156 +#: admin/pages/dashboard.php:124 +msgid "" +"Your theme contains a meta description, which blocks WordPress SEO from " +"working properly, please delete the following line, or press fix it:" +======= #: admin/google_search_console/class-gsc-table.php:139 #: admin/google_search_console/class-gsc-table.php:210 msgid "Mark as fixed" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:131 admin/pages/dashboard.php:138 +msgid "Ignore." +||||||| .r11156 +#: admin/pages/dashboard.php:133 admin/pages/dashboard.php:140 +msgid "Ignore." +======= #: admin/google_search_console/class-gsc-table.php:206 msgid "Create a redirect" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:132 +msgid "" +"You do not have your postname in the URL of your posts and pages, it is " +"highly recommended that you do. Consider setting your permalink structure to " +"/%postname%/." +||||||| .r11156 +#: admin/pages/dashboard.php:134 +msgid "" +"You do not have your postname in the URL of your posts and pages, it is " +"highly recommended that you do. Consider setting your permalink structure " +"to /%postname%/." +======= #: admin/google_search_console/class-gsc-table.php:206 #: admin/google_search_console/views/gsc-create-redirect.php:40 msgid "Create redirect" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:139 +||||||| .r11156 +#: admin/pages/dashboard.php:141 +======= #: admin/google_search_console/class-gsc.php:72 +>>>>>>> .r12027 msgid "" "Don't miss your crawl errors: %1$sconnect with Google Search Console " "here%2$s." msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:147 +msgid "Company Info" +||||||| .r11156 +#: admin/pages/dashboard.php:147 +msgid "Introduction Tour:" +======= #: admin/google_search_console/class-gsc.php:111 msgid "Search" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:147 +msgid "Your Info" +||||||| .r11156 +#: admin/pages/dashboard.php:148 +msgid "Take this tour to quickly learn about the use of this plugin." +======= #: admin/google_search_console/class-gsc.php:121 msgid "Crawl errors per page" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/dashboard.php:149 +msgid "Webmaster Tools" +msgstr "" + +#: admin/pages/dashboard.php:150 +msgid "Security" +msgstr "" + +#: admin/pages/dashboard.php:157 +msgid "Introduction Tour" +msgstr "" + +#: admin/pages/dashboard.php:158 +msgid "Take this tour to quickly learn about the use of this plugin." +||||||| .r11156 +#: admin/pages/dashboard.php:151 +msgid "Default Settings:" +msgstr "" + +#: admin/pages/dashboard.php:151 +msgid "Are you sure you want to reset your SEO settings?" +msgstr "" + +#: admin/pages/dashboard.php:151 +msgid "Reset Default Settings" msgstr "" +#: admin/pages/dashboard.php:152 +msgid "" +"If you want to restore a site to the default WordPress SEO settings, press " +"this button." +======= #: admin/google_search_console/class-gsc.php:172 #. Translators: %1$s: expands to Google Search Console. msgid "" "The %1$s data has been removed. You will have to reauthenticate if you want " "to retrieve the data again." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:169 +msgid "Latest Changes" +||||||| .r11156 +#: admin/pages/dashboard.php:155 +msgid "Allow tracking of this WordPress install's anonymous data." +======= #: admin/google_search_console/class-gsc.php:185 msgid "The issues have been successfully reloaded!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to Yoast SEO +#: admin/pages/dashboard.php:172 +msgid "We've summarized the most recent changes in %s." +||||||| .r11156 +#: admin/pages/dashboard.php:156 +msgid "" +"To maintain a plugin as big as WordPress SEO, we need to know what we're " +"dealing with: what kinds of other plugins our users are using, what themes, " +"etc. Please allow us to track that data from your install. It will not " +"track any user details, so your security and privacy are safe with " +"us." +======= #: admin/google_search_console/class-gsc.php:216 msgid "Incorrect Google Authorization Code." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:177 +msgid "View Changes" +||||||| .r11156 +#: admin/pages/dashboard.php:158 +msgid "Security" +======= #: admin/google_search_console/class-gsc.php:273 msgid "Issue categories" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:183 admin/pages/dashboard.php:191 +msgid "Restore Default Settings" +||||||| .r11156 +#: admin/pages/dashboard.php:159 +msgid "Disable the Advanced part of the WordPress SEO meta box" +======= #: admin/google_search_console/class-gsc.php:274 msgid "Errors that occurred when your site was crawled by Googlebot." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to Yoast SEO +#: admin/pages/dashboard.php:186 +||||||| .r11156 +#: admin/pages/dashboard.php:160 +======= #: admin/google_search_console/class-gsc.php:275 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"If you want to restore a site to the default %s settings, press this button." +||||||| .r11156 +"Unchecking this box allows authors and editors to redirect posts, noindex " +"them and do other things you might not want if you don't trust your authors." +======= "Errors that occurred only when your site was crawled by Googlebot-Mobile " "(errors didn't appear for desktop)." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:191 +msgid "Are you sure you want to reset your SEO settings?" +||||||| .r11156 +#: admin/pages/dashboard.php:163 +msgid "" +"You can use the boxes below to verify with the different Webmaster Tools, " +"if your site is already verified, you can just forget about these. Enter " +"the verify meta values for:" +======= #: admin/google_search_console/class-gsc.php:276 msgid "" "Errors that only occurred when your site was crawled by Googlebot for " "feature phones (errors didn't appear for desktop)." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:196 admin/pages/dashboard.php:203 +msgid "Website name" +||||||| .r11156 +#: admin/pages/dashboard.php:164 +msgid "Alexa Verification ID" +======= #: admin/google_search_console/views/gsc-create-redirect.php:21 msgid "Redirect this broken URL and fix the error" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:199 +msgid "" +"Google shows your website's name in the search results, we will default to " +"your site name but you can adapt it here. You can also provide an alternate " +"website name you want Google to consider." +||||||| .r11156 +#: admin/pages/dashboard.php:165 +msgid "Bing Webmaster Tools" +======= #: admin/google_search_console/views/gsc-create-redirect.php:24 msgid "Current URL:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:204 +msgid "Alternate name" +||||||| .r11156 +#: admin/pages/dashboard.php:166 +msgid "Google Webmaster Tools" +======= #: admin/google_search_console/views/gsc-create-redirect.php:28 msgid "New URL:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:206 admin/pages/dashboard.php:214 +msgid "Company or person" +||||||| .r11156 +#: admin/pages/dashboard.php:167 +msgid "Pinterest" +======= #: admin/google_search_console/views/gsc-create-redirect.php:32 msgid "Mark as fixed:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:210 +msgid "" +"This data is shown as metadata in your site. It is intended to appear in " +"Google's Knowledge Graph. You can be either a company, or a person, choose " +"either:" +||||||| .r11156 +#: admin/pages/dashboard.php:168 +msgid "Yandex Webmaster Tools" +======= #: admin/google_search_console/views/gsc-create-redirect.php:36 #. Translators: %1$s: expands to 'Google Search Console'. msgid "Mark this issue as fixed in %1$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:215 +msgid "Choose whether you're a company or person" +||||||| .r11156 +#: admin/pages/files.php:19 +msgid "You cannot create a robots.txt file." +======= #: admin/google_search_console/views/gsc-create-redirect.php:46 msgid "Error: a redirect for this URL already exists" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:216 admin/pages/dashboard.php:221 +msgid "Company" +||||||| .r11156 +#: admin/pages/files.php:35 +msgid "You cannot edit the robots.txt file." +======= #: admin/google_search_console/views/gsc-create-redirect.php:51 #. Translators: %1$s: expands to the current url and %2$s expands to url the #. redirects points to. @@ -1843,488 +5007,1548 @@ msgid "" "already exists. The existing redirect points to %2$s. If this is fine you " "can mark this issue as fixed. If not, please go to the redirects page and " "change the target URL." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:217 admin/pages/dashboard.php:228 +msgid "Person" +||||||| .r11156 +#: admin/pages/files.php:46 +msgid "Updated Robots.txt" +======= #: admin/google_search_console/views/gsc-create-redirect.php:60 #. Translators: %s: expands to Yoast SEO Premium msgid "Creating redirects is a %s feature" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:223 +msgid "Company Name" +||||||| .r11156 +#: admin/pages/files.php:53 +msgid "You cannot edit the .htaccess file." +======= #: admin/google_search_console/views/gsc-create-redirect.php:64 #. Translators: %1$s: expands to 'Yoast SEO Premium', %2$s: links to Yoast SEO #. Premium plugin page. msgid "" "To be able to create a redirect and fix this issue, you need %1$s. You can " "buy the plugin, including one year support and updates, on %2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:224 +msgid "Company Logo" +||||||| .r11156 +#: admin/pages/files.php:79 +msgid "You don't have a robots.txt file, create one here:" +======= #: admin/google_search_console/views/gsc-display.php:16 msgid "Reload crawl issues" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/dashboard.php:229 +msgid "Your name" +msgstr "" + +#: admin/pages/dashboard.php:234 +||||||| .r11156 +#: admin/pages/files.php:80 +msgid "Create robots.txt file" msgstr "" +#: admin/pages/files.php:84 +======= #: admin/google_search_console/views/gsc-display.php:31 #. Translators: %1$s: expands to 'Yoast SEO', %2$s expands to Google Search #. Console. +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"You can use the boxes below to verify with the different Webmaster Tools, if " +"your site is already verified, you can just forget about these. Enter the " +"verify meta values for:" +||||||| .r11156 +"If you had a robots.txt file and it was editable, you could edit it from " +"here." +======= "To allow %1$s to fetch your %2$s information, please enter your Google " "Authorization Code." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:235 +msgid "Alexa Verification ID" +||||||| .r11156 +#: admin/pages/files.php:97 +msgid "If your robots.txt were writable, you could edit it from here." +======= #: admin/google_search_console/views/gsc-display.php:34 msgid "Get Google Authorization Code" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:236 +msgid "Bing Webmaster Tools" +||||||| .r11156 +#: admin/pages/files.php:102 +msgid "Edit the content of your robots.txt:" +======= #: admin/google_search_console/views/gsc-display.php:36 msgid "" "Please enter the Google Authorization Code in the field below and press the " "Authenticate button." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:238 +msgid "Yandex Webmaster Tools" +||||||| .r11156 +#: admin/pages/files.php:104 +msgid "Save changes to Robots.txt" +======= #: admin/google_search_console/views/gsc-display.php:40 msgid "Authenticate" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/dashboard.php:243 +msgid "" +"Unchecking this box allows authors and editors to redirect posts, noindex " +"them and do other things you might not want if you don't trust your authors." +||||||| .r11156 +#: admin/pages/files.php:109 +msgid "Robots.txt" +======= #: admin/google_search_console/views/gsc-display.php:44 msgid "Reauthenticate with Google " +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/dashboard.php:245 +msgid "Disable the Advanced part of the %1$s meta box" +||||||| .r11156 +#: admin/pages/files.php:121 +msgid "If your .htaccess were writable, you could edit it from here." +======= #: admin/google_search_console/views/gsc-display.php:45 #: admin/google_search_console/views/gsc-display.php:48 msgid "Current profile" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to OnPage.org +#: admin/pages/dashboard.php:251 +msgid "Enable %1$s indexability check" +||||||| .r11156 +#: admin/pages/files.php:126 +msgid "Edit the content of your .htaccess:" +======= #: admin/google_search_console/views/gsc-display.php:67 #: admin/google_search_console/views/gsc-display.php:71 msgid "Profile" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/licenses.php:18 +msgid "The premium version of %1$s with more features & support." +||||||| .r11156 +#: admin/pages/files.php:128 +msgid "Save changes to .htaccess" +======= #: admin/google_search_console/views/gsc-display.php:72 msgid "There were no profiles found" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/licenses.php:24 +msgid "" +"Optimize your videos to show them off in search results and get more clicks!" +||||||| .r11156 +#: admin/pages/files.php:131 admin/pages/files.php:134 +msgid ".htaccess file" +======= #: admin/google_search_console/views/gsc-display.php:80 msgid "Save Profile" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/licenses.php:30 +msgid "" +"Are you in Google News? Increase your traffic from Google News by optimizing " +"for it!" +||||||| .r11156 +#: admin/pages/files.php:133 +msgid "" +"If you had a .htaccess file and it was editable, you could edit it from " +"here." +======= #: admin/google_search_console/views/gsc-display.php:80 msgid "or" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/licenses.php:36 +msgid "Rank better locally and in Google Maps, without breaking a sweat!" +||||||| .r11156 +#: admin/pages/import.php:164 +msgid "WooThemes SEO framework settings & data successfully imported." +======= #: admin/pages/advanced.php:16 msgid "Breadcrumbs" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/licenses.php:43 +msgid "Seamlessly integrate WooCommerce with %1$s and get extra features!" +||||||| .r11156 +#: admin/pages/import.php:206 +msgid "HeadSpace2 data successfully imported" +======= #: admin/pages/advanced.php:20 msgid "Permalinks" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/licenses.php:73 +msgid "%1$s Extensions" +||||||| .r11156 +#: admin/pages/import.php:266 +msgid "All in One SEO (Old version) data successfully imported." +======= #: admin/pages/advanced.php:24 msgid "RSS" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/licenses.php:99 +msgid "Get this extension" +||||||| .r11156 +#: admin/pages/import.php:313 +msgid "RSS Footer options imported successfully." +======= #: admin/pages/dashboard.php:59 msgid "Removed hardcoded meta description." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/licenses.php:117 +msgid "" +"This is where you would enter the license keys for one of our premium " +"plugins, should you activate one." +||||||| .r11156 +#: admin/pages/import.php:330 +msgid "Yoast Breadcrumbs options imported successfully." +======= #: admin/pages/dashboard.php:65 msgid "Failed to remove hardcoded meta description." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:21 admin/pages/metas.php:65 +msgid "Homepage" +||||||| .r11156 +#: admin/pages/import.php:332 +msgid "Yoast Breadcrumbs options could not be found" +======= #: admin/pages/dashboard.php:72 msgid "" "Earlier found meta description was not found in file. Renewed the " "description test data." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:22 admin/pages/xml-sitemaps.php:40 +msgid "Post Types" +||||||| .r11156 +#: admin/pages/import.php:348 +msgid ", and old data deleted." +======= #: admin/pages/dashboard.php:104 admin/pages/dashboard.php:119 #: admin/pages/dashboard.php:130 admin/pages/dashboard.php:137 msgid "Fix it." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/metas.php:23 admin/pages/xml-sitemaps.php:43 +msgid "Taxonomies" +msgstr "" + +#: admin/pages/metas.php:36 +msgid "Force rewrite titles" +||||||| .r11156 +#: admin/pages/import.php:351 +msgid ", and meta keywords data deleted." msgstr "" +#: admin/pages/import.php:361 +msgid "" +"No doubt you've used an SEO plugin before if this site isn't new. Let's " +"make it easy on you, you can import the data below. If you want, you can " +"import first, check if it was imported correctly, and then import & " +"delete. No duplicate data will be imported." +======= #: admin/pages/dashboard.php:105 msgid "" "The following file(s) is/are blocking your XML sitemaps from working " "properly:" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/metas.php:40 +msgid "Enable force rewrite titles" msgstr "" +#. translators: %1$s expands to Yoast SEO +#: admin/pages/metas.php:42 +||||||| .r11156 +#: admin/pages/import.php:362 +======= #: admin/pages/dashboard.php:112 #. translators: %1$s expands to Yoast SEO +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"%1$s has auto-detected whether it needs to force rewrite the titles for your " +"pages, if you think it's wrong and you know what you're doing, you can " +"change the setting here." +||||||| .r11156 +"If you've used another SEO plugin, try the %sSEO Data Transporter%s plugin " +"to move your data into this plugin, it rocks!" +======= "Either delete them (this can be done with the \"Fix it\" button) or disable " "%1$s XML sitemaps." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:51 +msgid "Title Separator" +||||||| .r11156 +#: admin/pages/import.php:366 +msgid "Import from HeadSpace2?" +======= #: admin/pages/dashboard.php:120 msgid "Re-check theme." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:56 +msgid "" +"Choose the symbol to use as your title separator. This will display, for " +"instance, between your post title and site name." +||||||| .r11156 +#: admin/pages/import.php:367 +msgid "Import from All-in-One SEO?" +======= #: admin/pages/dashboard.php:122 #. translators: %1$s expands to Yoast SEO msgid "" "Your theme contains a meta description, which blocks %1$s from working " "properly, please delete the following line, or press fix it:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:56 +msgid "Symbols are shown in the size they'll appear in in search results." +||||||| .r11156 +#: admin/pages/import.php:368 +msgid "Import from OLD All-in-One SEO?" +======= #: admin/pages/dashboard.php:131 admin/pages/dashboard.php:138 msgid "Ignore." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:66 admin/pages/metas.php:103 admin/pages/metas.php:164 +#: admin/pages/metas.php:183 admin/pages/metas.php:190 +#: admin/pages/metas.php:218 admin/pages/metas.php:221 +msgid "Title template" +||||||| .r11156 +#: admin/pages/import.php:369 +msgid "Import from WooThemes SEO framework?" +======= #: admin/pages/dashboard.php:132 msgid "" "You do not have your postname in the URL of your posts and pages, it is " "highly recommended that you do. Consider setting your permalink structure " "to /%postname%/." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:67 admin/pages/metas.php:104 admin/pages/metas.php:165 +#: admin/pages/metas.php:184 admin/pages/metas.php:191 +msgid "Meta description template" +||||||| .r11156 +#: admin/pages/import.php:371 +msgid "Delete the old data after import? (recommended)" +======= #: admin/pages/dashboard.php:139 msgid "" "Paging comments is enabled, this is not needed in 999 out of 1000 cases, so " "the suggestion is to disable it, to do that, simply uncheck the box before " "\"Break comments into pages...\"" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:69 admin/pages/metas.php:106 admin/pages/metas.php:167 +#: admin/pages/metas.php:186 +msgid "Meta keywords template" +||||||| .r11156 +#: admin/pages/import.php:373 admin/pages/import.php:388 +#: admin/pages/import.php:391 admin/pages/import.php:425 +msgid "Import" +======= #: admin/pages/dashboard.php:147 msgid "Company Info" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:74 +msgid "Homepage & Front page" +||||||| .r11156 +#: admin/pages/import.php:376 +msgid "Import settings from other plugins" +======= #: admin/pages/dashboard.php:147 msgid "Your Info" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:75 +msgid "" +"You can determine the title and description for the front page by %sediting " +"the front page itself »%s" +||||||| .r11156 +#: admin/pages/import.php:377 +msgid "Import from Robots Meta (by Yoast)?" +======= #: admin/pages/dashboard.php:149 msgid "Webmaster Tools" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:78 +msgid "" +"You can determine the title and description for the blog page by %sediting " +"the blog page itself »%s" +||||||| .r11156 +#: admin/pages/import.php:378 +msgid "Import from RSS Footer (by Yoast)?" +======= #: admin/pages/dashboard.php:150 msgid "Security" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:97 admin/pages/network.php:115 +msgid "Take note:" +||||||| .r11156 +#: admin/pages/import.php:379 +msgid "Import from Yoast Breadcrumbs?" +======= #: admin/pages/dashboard.php:156 msgid "Introduction Tour" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:99 +msgid "" +"As you are redirecting attachment URLs to parent post URLs, these settings " +"will currently only have an effect on unattached media " +"items!" +||||||| .r11156 +#: admin/pages/import.php:403 +msgid "" +"Export your WordPress SEO settings here, to import them again later or to " +"import them on another site." +======= #: admin/pages/dashboard.php:157 msgid "Take this tour to quickly learn about the use of this plugin." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:100 +msgid "" +"So remember: If you change the %sattachment redirection setting%s in the " +"future, the below settings will take effect for *all* media items." +||||||| .r11156 +#: admin/pages/import.php:404 +msgid "Include Taxonomy Metadata" +======= #: admin/pages/dashboard.php:168 msgid "Latest Changes" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:108 admin/pages/metas.php:148 +#: admin/pages/metas.php:169 +msgid "Meta Robots" +||||||| .r11156 +#: admin/pages/import.php:405 +msgid "Export settings" +======= #: admin/pages/dashboard.php:171 #. translators: %s expands to Yoast SEO msgid "We've summarized the most recent changes in %s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:109 +msgid "Show date in snippet preview?" +||||||| .r11156 +#: admin/pages/import.php:427 +msgid "Import settings by locating settings.zip and clicking" +======= #: admin/pages/dashboard.php:176 msgid "View Changes" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:109 +msgid "Date in Snippet Preview" +||||||| .r11156 +#: admin/pages/import.php:427 admin/pages/import.php:433 +msgid "Import settings" +======= #: admin/pages/dashboard.php:182 admin/pages/dashboard.php:190 msgid "Restore Default Settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/metas.php:111 admin/pages/metas.php:171 +msgid "Hide" +||||||| .r11156 +#: admin/pages/import.php:472 +msgid "Setting \"%s\" is no longer used and has been discarded." +======= #: admin/pages/dashboard.php:185 #. translators: %s expands to Yoast SEO msgid "If you want to restore a site to the default %s settings, press this button." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:111 admin/pages/metas.php:171 +msgid "%1$s Meta Box" +||||||| .r11156 +#: admin/pages/import.php:476 +msgid "Settings successfully imported." +======= #: admin/pages/dashboard.php:190 msgid "Are you sure you want to reset your SEO settings?" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:133 +msgid "Custom Post Type Archives" +||||||| .r11156 +#: admin/pages/import.php:478 admin/pages/import.php:482 +#: admin/pages/import.php:487 admin/pages/import.php:493 +#: admin/pages/import.php:495 +msgid "Settings could not be imported:" +======= #: admin/pages/dashboard.php:194 admin/pages/dashboard.php:201 msgid "Website name" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:134 +msgid "" +"Note: instead of templates these are the actual titles and meta descriptions " +"for these custom post type archive pages." +||||||| .r11156 +#: admin/pages/import.php:478 +msgid "No settings found in file." +======= #: admin/pages/dashboard.php:197 msgid "" "Google shows your website's name in the search results, we will default to " "your site name but you can adapt it here. You can also provide an alternate " "website name you want Google to consider." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:140 admin/pages/social.php:61 +#: admin/views/tool-bulk-editor.php:33 +msgid "Title" +||||||| .r11156 +#: admin/pages/import.php:482 +msgid "Unzipping failed - file settings.ini not found." +======= #: admin/pages/dashboard.php:202 msgid "Alternate name" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:146 +#: admin/taxonomy/class-taxonomy-settings-fields.php:48 +msgid "Breadcrumbs title" +||||||| .r11156 +#: admin/pages/import.php:487 +msgid "Unzipping failed with error \"%s\"." +======= #: admin/pages/dashboard.php:204 admin/pages/dashboard.php:212 msgid "Company or person" +>>>>>>> .r12027 msgstr "" -#: admin/pages/dashboard.php:208 +<<<<<<< .mine +#: admin/pages/metas.php:182 +msgid "Author Archives" +||||||| .r11156 +#: admin/pages/import.php:495 +msgid "Upload failed." +======= +#: admin/pages/dashboard.php:208 msgid "" "This data is shown as metadata in your site. It is intended to appear in " "Google's Knowledge Graph. You can be either a company, or a person, choose " "either:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:189 +msgid "Date Archives" +||||||| .r11156 +#: admin/pages/import.php:499 +msgid "Export & Import SEO Settings" +======= #: admin/pages/dashboard.php:213 msgid "Choose whether you're a company or person" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:194 +msgid "Duplicate content prevention" +||||||| .r11156 +#: admin/pages/internal-links.php:16 +msgid "Enable Breadcrumbs" +======= #: admin/pages/dashboard.php:214 admin/pages/dashboard.php:219 msgid "Company" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s / %2$s: links to an article about duplicate content on +#. yoast.com +#: admin/pages/metas.php:197 +msgid "" +"If you're running a one author blog, the author archive will be exactly the " +"same as your homepage. This is what's called a %1$sduplicate content problem" +"%2$s." +||||||| .r11156 +#: admin/pages/internal-links.php:18 +msgid "Separator between breadcrumbs" +======= #: admin/pages/dashboard.php:215 admin/pages/dashboard.php:226 msgid "Person" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to noindex, follow +#: admin/pages/metas.php:200 +msgid "" +"If this is the case on your site, you can choose to either disable it (which " +"makes it redirect to the homepage), or to add %s to it so it doesn't show up " +"in the search results." +||||||| .r11156 +#: admin/pages/internal-links.php:19 +msgid "Anchor text for the Homepage" +======= #: admin/pages/dashboard.php:221 msgid "Company Name" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to noindex, follow +#: admin/pages/metas.php:203 +msgid "Add %s to the author archives" +||||||| .r11156 +#: admin/pages/internal-links.php:20 +msgid "Prefix for the breadcrumb path" +======= #: admin/pages/dashboard.php:222 msgid "Company Logo" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:204 +msgid "Disable the author archives" +||||||| .r11156 +#: admin/pages/internal-links.php:21 +msgid "Prefix for Archive breadcrumbs" +======= #: admin/pages/dashboard.php:227 msgid "Your name" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:206 +msgid "" +"Date-based archives could in some cases also be seen as duplicate content." +||||||| .r11156 +#: admin/pages/internal-links.php:22 +msgid "Prefix for Search Page breadcrumbs" +======= #: admin/pages/dashboard.php:232 msgid "" "You can use the boxes below to verify with the different Webmaster Tools, " "if your site is already verified, you can just forget about these. Enter " "the verify meta values for:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to noindex, follow +#: admin/pages/metas.php:209 +msgid "Add %s to the date-based archives" +||||||| .r11156 +#: admin/pages/internal-links.php:23 +msgid "Breadcrumb for 404 Page" +======= #: admin/pages/dashboard.php:233 msgid "Alexa Verification ID" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:210 +msgid "Disable the date-based archives" +||||||| .r11156 +#: admin/pages/internal-links.php:25 +msgid "Remove Blog page from Breadcrumbs" +======= #: admin/pages/dashboard.php:234 msgid "Bing Webmaster Tools" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:214 +msgid "Special Pages" +||||||| .r11156 +#: admin/pages/internal-links.php:27 +msgid "Bold the last page in the breadcrumb" +======= #: admin/pages/dashboard.php:236 msgid "Yandex Webmaster Tools" +>>>>>>> .r12027 msgstr "" -#: admin/pages/dashboard.php:241 +<<<<<<< .mine +#. translators: %s expands to noindex, follow +#: admin/pages/metas.php:216 msgid "" +"These pages will be %s by default, so they will never show up in search " +"results." +msgstr "" + +#: admin/pages/metas.php:217 +msgid "Search pages" +msgstr "" + +#: admin/pages/metas.php:220 +msgid "404 pages" +msgstr "" + +#: admin/pages/metas.php:227 +msgid "Sitewide meta settings" +msgstr "" + +#: admin/pages/metas.php:230 +||||||| .r11156 +#: admin/pages/internal-links.php:33 +msgid "Taxonomy to show in breadcrumbs for:" +msgstr "" + +#: admin/pages/internal-links.php:53 +msgid "Post type archive to show in breadcrumbs for:" +msgstr "" + +#: admin/pages/internal-links.php:57 +msgid "Blog" +msgstr "" + +#: admin/pages/internal-links.php:76 +msgid "How to insert breadcrumbs in your theme" +msgstr "" + +#: admin/pages/internal-links.php:77 +======= +#: admin/pages/dashboard.php:241 +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"If you want to prevent /page/2/ and further of any archive to show up in the " +"search results, enable this." +||||||| .r11156 +"Usage of this breadcrumbs feature is explained here. For the " +"more code savvy, insert this in your theme:" +======= "Unchecking this box allows authors and editors to redirect posts, noindex " "them and do other things you might not want if you don't trust your authors." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:231 +msgid "Noindex subpages of archives" +||||||| .r11156 +#: admin/pages/licenses.php:31 +msgid "WordPress SEO Premium" +======= #: admin/pages/dashboard.php:243 #. translators: %1$s expands to Yoast SEO msgid "Disable the Advanced part of the %1$s meta box" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/metas.php:233 +msgid "" +"I don't know why you'd want to use meta keywords, but if you want to, check " +"this box." +||||||| .r11156 +#: admin/pages/licenses.php:32 +msgid "The premium version of WordPress SEO with more features & support." +======= #: admin/pages/licenses.php:18 #. translators: %1$s expands to Yoast SEO msgid "The premium version of %1$s with more features & support." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/metas.php:234 +msgid "Use meta keywords tag?" +msgstr "" + +#: admin/pages/metas.php:236 +msgid "" +"Prevents search engines from using the DMOZ description for pages from this " +"site in the search results." +||||||| .r11156 +#: admin/pages/licenses.php:37 +msgid "Video SEO" msgstr "" +#: admin/pages/licenses.php:38 +msgid "Optimize your videos to show them off in search results and get more clicks!" +======= #: admin/pages/licenses.php:24 msgid "Optimize your videos to show them off in search results and get more clicks!" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %s expands to noodp +#. translators: %s expands to noydir +#: admin/pages/metas.php:238 admin/pages/metas.php:242 +msgid "Add %s meta robots tag sitewide" +msgstr "" + +#: admin/pages/metas.php:240 +||||||| .r11156 +#: admin/pages/licenses.php:43 +msgid "News SEO" msgstr "" +#: admin/pages/licenses.php:44 +======= #: admin/pages/licenses.php:30 +>>>>>>> .r12027 msgid "" -"Are you in Google News? Increase your traffic from Google News by " -"optimizing for it!" +"Prevents search engines from using the Yahoo! directory description for " +"pages from this site in the search results." +msgstr "" + +<<<<<<< .mine +#: admin/pages/network.php:24 +msgid "Settings Updated." +msgstr "" + +#: admin/pages/network.php:35 +msgid "%s restored to default SEO settings." +||||||| .r11156 +#: admin/pages/licenses.php:49 +msgid "Local SEO" msgstr "" +#: admin/pages/licenses.php:50 +msgid "Rank better locally and in Google Maps, without breaking a sweat!" +======= #: admin/pages/licenses.php:36 msgid "Rank better locally and in Google Maps, without breaking a sweat!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:38 +msgid "Blog %s not found." +||||||| .r11156 +#: admin/pages/licenses.php:55 +msgid "Yoast WooCommerce SEO" +======= #: admin/pages/licenses.php:43 #. translators: %1$s expands to Yoast SEO msgid "Seamlessly integrate WooCommerce with %1$s and get extra features!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:61 +msgid "public" +||||||| .r11156 +#: admin/pages/licenses.php:56 +msgid "Seamlessly integrate WooCommerce with WordPress SEO and get extra features!" +======= #: admin/pages/licenses.php:73 #. translators: %1$s expands to Yoast SEO msgid "%1$s Extensions" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:64 +msgid "archived" +||||||| .r11156 +#: admin/pages/licenses.php:96 +msgid "Get this extension" +======= #: admin/pages/licenses.php:99 msgid "Get this extension" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:67 +msgid "mature" +||||||| .r11156 +#: admin/pages/metas.php:21 inc/class-wpseo-options.php:2086 +msgid "Home" +======= #: admin/pages/licenses.php:117 msgid "" "This is where you would enter the license keys for one of our premium " "plugins, should you activate one." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:70 +msgid "spam" +||||||| .r11156 +#: admin/pages/metas.php:22 +msgid "Post Types" +======= #: admin/pages/metas.php:21 admin/pages/metas.php:59 msgid "Homepage" msgstr "" #: admin/pages/metas.php:22 admin/pages/xml-sitemaps.php:40 msgid "Post Types" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/network.php:94 +msgid "Who should have access to the %1$s settings" +||||||| .r11156 +#: admin/pages/metas.php:23 +msgid "Taxonomies" +======= #: admin/pages/metas.php:23 admin/pages/xml-sitemaps.php:43 msgid "Taxonomies" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:96 +msgid "Site Admins (default)" +||||||| .r11156 +#: admin/pages/metas.php:24 +msgid "Other" +======= #: admin/pages/metas.php:33 msgid "Force rewrite titles" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:97 +msgid "Super Admins only" +||||||| .r11156 +#: admin/pages/metas.php:30 +msgid "Title settings" +======= #: admin/pages/metas.php:37 msgid "Enable force rewrite titles" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/network.php:105 admin/pages/network.php:112 +msgid "New sites in the network inherit their SEO settings from this site" +msgstr "" + +#: admin/pages/network.php:109 +||||||| .r11156 +#: admin/pages/metas.php:31 +msgid "Force rewrite titles" msgstr "" +#: admin/pages/metas.php:32 +======= #: admin/pages/metas.php:39 #. translators: %1$s expands to Yoast SEO -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"Choose the site whose settings you want to use as default for all sites that " +"are added to your network. If you choose 'None', the normal plugin defaults " +"will be used." +||||||| .r11156 +"WordPress SEO has auto-detected whether it needs to force rewrite the " +"titles for your pages, if you think it's wrong and you know what you're " +"doing, you can change the setting here." +======= "%1$s has auto-detected whether it needs to force rewrite the titles for " "your pages, if you think it's wrong and you know what you're doing, you can " "change the setting here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:113 +msgid "" +"Enter the %sSite ID%s for the site whose settings you want to use as default " +"for all sites that are added to your network. Leave empty for none (i.e. the " +"normal plugin defaults will be used)." +||||||| .r11156 +#: admin/pages/metas.php:34 +msgid "Title Separator" +======= #: admin/pages/metas.php:45 msgid "Title Separator" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:115 +||||||| .r11156 +#: admin/pages/metas.php:36 +======= #: admin/pages/metas.php:50 +>>>>>>> .r12027 msgid "" -"Choose the symbol to use as your title separator. This will display, for " -"instance, between your post title and site name." +"Privacy sensitive (FB admins and such), theme specific (title rewrite) and a " +"few very site specific settings will not be imported to new blogs." msgstr "" +<<<<<<< .mine +#: admin/pages/network.php:118 +msgid "Save MultiSite Settings" +||||||| .r11156 +#: admin/pages/metas.php:36 +msgid "Symbols are shown in the size they'll appear in in search results." +======= #: admin/pages/metas.php:50 msgid "Symbols are shown in the size they'll appear in in search results." +>>>>>>> .r12027 msgstr "" -#: admin/pages/metas.php:60 admin/pages/metas.php:97 admin/pages/metas.php:158 -#: admin/pages/metas.php:177 admin/pages/metas.php:184 -#: admin/pages/metas.php:212 admin/pages/metas.php:215 -msgid "Title template" -msgstr "" - -#: admin/pages/metas.php:61 admin/pages/metas.php:98 admin/pages/metas.php:159 -#: admin/pages/metas.php:178 admin/pages/metas.php:185 -msgid "Meta description template" +<<<<<<< .mine +#: admin/pages/network.php:121 +msgid "Restore site to default settings" msgstr "" -#: admin/pages/metas.php:63 admin/pages/metas.php:100 admin/pages/metas.php:161 -#: admin/pages/metas.php:180 -msgid "Meta keywords template" +#: admin/pages/network.php:124 +msgid "Using this form you can reset a site to the default SEO settings." msgstr "" -#: admin/pages/metas.php:68 -msgid "Homepage & Front page" +#: admin/pages/network.php:130 +msgid "Site ID" msgstr "" -#: admin/pages/metas.php:69 -msgid "" -"You can determine the title and description for the front page by %sediting " -"the front page itself »%s" +#: admin/pages/network.php:136 +msgid "Blog ID" msgstr "" -#: admin/pages/metas.php:72 -msgid "" -"You can determine the title and description for the blog page by %sediting " -"the blog page itself »%s" +#: admin/pages/network.php:139 +msgid "Restore site to defaults" msgstr "" -#: admin/pages/metas.php:91 admin/pages/network.php:115 -msgid "Take note:" +#: admin/pages/social.php:20 +msgid "Accounts" msgstr "" -#: admin/pages/metas.php:93 +#: admin/pages/social.php:29 msgid "" -"As you are redirecting attachment URLs to parent post URLs, these settings " -"will currently only have an effect on unattached media " -"items!" +"To inform Google about your social profiles, we need to know their URLs." msgstr "" -#: admin/pages/metas.php:94 +#: admin/pages/social.php:30 msgid "" -"So remember: If you change the %sattachment redirection setting%s in the " -"future, the below settings will take effect for *all* media items." +"For each, pick the main account associated with this site and please enter " +"them below:" msgstr "" -#: admin/pages/metas.php:102 admin/pages/metas.php:142 -#: admin/pages/metas.php:163 -msgid "Meta Robots" +#: admin/pages/social.php:33 +msgid "Facebook Page URL" msgstr "" -#: admin/pages/metas.php:103 -msgid "Show date in snippet preview?" +#: admin/pages/social.php:34 +msgid "Twitter Username" msgstr "" -#: admin/pages/metas.php:103 -msgid "Date in Snippet Preview" +#: admin/pages/social.php:35 +msgid "Instagram URL" msgstr "" -#: admin/pages/metas.php:105 admin/pages/metas.php:165 -#. translators: %1$s expands to Yoast SEO -msgid "Hide" +#: admin/pages/social.php:36 +msgid "LinkedIn URL" msgstr "" -#: admin/pages/metas.php:105 admin/pages/metas.php:165 -msgid "%1$s Meta Box" +#: admin/pages/social.php:37 +msgid "MySpace URL" msgstr "" -#: admin/pages/metas.php:127 -msgid "Custom Post Type Archives" +#: admin/pages/social.php:38 +msgid "Pinterest URL" msgstr "" -#: admin/pages/metas.php:128 -msgid "" -"Note: instead of templates these are the actual titles and meta " -"descriptions for these custom post type archive pages." +#: admin/pages/social.php:39 +msgid "YouTube URL" msgstr "" -#: admin/pages/metas.php:134 admin/pages/social.php:61 -#: admin/views/tool-bulk-editor.php:33 -msgid "Title" +#: admin/pages/social.php:40 +msgid "Google+ URL" +||||||| .r11156 +#: admin/pages/metas.php:38 +msgid "Sitewide meta settings" msgstr "" -#: admin/pages/metas.php:176 -msgid "Author Archives" +#: admin/pages/metas.php:39 +msgid "Noindex subpages of archives" msgstr "" -#: admin/pages/metas.php:183 -msgid "Date Archives" +#: admin/pages/metas.php:40 +msgid "" +"If you want to prevent /page/2/ and further of any archive to show up in " +"the search results, enable this." msgstr "" -#: admin/pages/metas.php:188 -msgid "Duplicate content prevention" +#: admin/pages/metas.php:42 +msgid "Use meta keywords tag?" msgstr "" -#: admin/pages/metas.php:191 -#. translators: %1$s / %2$s: links to an article about duplicate content on -#. yoast.com +#: admin/pages/metas.php:43 msgid "" -"If you're running a one author blog, the author archive will be exactly the " -"same as your homepage. This is what's called a %1$sduplicate content " -"problem%2$s." +"I don't know why you'd want to use meta keywords, but if you want to, check " +"this box." msgstr "" -#: admin/pages/metas.php:194 -#. translators: %s expands to noindex, follow +#: admin/pages/metas.php:45 +msgid "Add noodp meta robots tag sitewide" +msgstr "" + +#: admin/pages/metas.php:46 msgid "" -"If this is the case on your site, you can choose to either disable it " -"(which makes it redirect to the homepage), or to add %s to it so it doesn't " -"show up in the search results." +"Prevents search engines from using the DMOZ description for pages from this " +"site in the search results." msgstr "" -#: admin/pages/metas.php:197 -#. translators: %s expands to noindex, follow -msgid "Add %s to the author archives" +#: admin/pages/metas.php:48 +msgid "Add noydir meta robots tag sitewide" msgstr "" -#: admin/pages/metas.php:198 -msgid "Disable the author archives" +#: admin/pages/metas.php:49 +msgid "" +"Prevents search engines from using the Yahoo! directory description for " +"pages from this site in the search results." msgstr "" -#: admin/pages/metas.php:200 -msgid "Date-based archives could in some cases also be seen as duplicate content." +#: admin/pages/metas.php:51 +msgid "Clean up the <head>" msgstr "" -#: admin/pages/metas.php:203 -#. translators: %s expands to noindex, follow -msgid "Add %s to the date-based archives" +#: admin/pages/metas.php:52 +msgid "Hide RSD Links" +msgstr "" + +#: admin/pages/metas.php:53 +msgid "Hide WLW Manifest Links" +msgstr "" + +#: admin/pages/metas.php:54 +msgid "Hide Shortlink for posts" +msgstr "" + +#: admin/pages/metas.php:55 +msgid "Hide RSS Links" +msgstr "" + +#: admin/pages/metas.php:61 +msgid "Homepage" +msgstr "" + +#: admin/pages/metas.php:62 admin/pages/metas.php:97 admin/pages/metas.php:159 +#: admin/pages/metas.php:177 admin/pages/metas.php:187 +#: admin/pages/metas.php:197 admin/pages/metas.php:199 +msgid "Title template" +======= +#: admin/pages/metas.php:60 admin/pages/metas.php:97 admin/pages/metas.php:158 +#: admin/pages/metas.php:177 admin/pages/metas.php:184 +#: admin/pages/metas.php:212 admin/pages/metas.php:215 +msgid "Title template" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %s expands to <head> +#: admin/pages/social.php:50 +msgid "" +"Add Open Graph meta data to your site's %s section, Facebook and other " +"social networks use this data when your pages are shared." +||||||| .r11156 +#: admin/pages/metas.php:63 admin/pages/metas.php:98 admin/pages/metas.php:160 +#: admin/pages/metas.php:178 admin/pages/metas.php:188 +msgid "Meta description template" +======= +#: admin/pages/metas.php:61 admin/pages/metas.php:98 admin/pages/metas.php:159 +#: admin/pages/metas.php:178 admin/pages/metas.php:185 +msgid "Meta description template" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:53 +msgid "Add Open Graph meta data" +||||||| .r11156 +#: admin/pages/metas.php:65 admin/pages/metas.php:100 admin/pages/metas.php:162 +#: admin/pages/metas.php:180 +msgid "Meta keywords template" +======= +#: admin/pages/metas.php:63 admin/pages/metas.php:100 admin/pages/metas.php:161 +#: admin/pages/metas.php:180 +msgid "Meta keywords template" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:57 +msgid "Frontpage settings" +||||||| .r11156 +#: admin/pages/metas.php:69 +msgid "Homepage & Front page" +======= +#: admin/pages/metas.php:68 +msgid "Homepage & Front page" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:58 +||||||| .r11156 +#: admin/pages/metas.php:70 +======= +#: admin/pages/metas.php:69 +>>>>>>> .r12027 +msgid "" +"These are the title, description and image used in the Open Graph meta tags " +"on the front page of your site." +msgstr "" + +#: admin/pages/social.php:60 admin/pages/social.php:72 +msgid "Image URL" +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:62 admin/views/tool-bulk-editor.php:35 +msgid "Description" +||||||| .r11156 +#: admin/pages/metas.php:91 +msgid "Take note:" +======= +#: admin/pages/metas.php:91 admin/pages/network.php:115 +msgid "Take note:" +>>>>>>> .r12027 +msgstr "" + +#: admin/pages/social.php:67 +msgid "Copy home meta description" +msgstr "" + +#: admin/pages/social.php:71 +msgid "Default settings" +msgstr "" + +#: admin/pages/social.php:74 +msgid "" +"This image is used if the post/page being shared does not contain any images." +msgstr "" + +<<<<<<< .mine +#. translators: %s expands to <head> +#: admin/pages/social.php:86 +msgid "Add Twitter card meta data to your site's %s section." +||||||| .r11156 +#: admin/pages/metas.php:102 admin/pages/metas.php:145 +#: admin/pages/metas.php:164 admin/pages/metas.php:182 +#: admin/pages/metas.php:190 +msgid "Meta Robots" +======= +#: admin/pages/metas.php:102 admin/pages/metas.php:142 +#: admin/pages/metas.php:163 +msgid "Meta Robots" +>>>>>>> .r12027 +msgstr "" + +#: admin/pages/social.php:90 +msgid "Add Twitter card meta data" +msgstr "" + +#: admin/pages/social.php:93 +msgid "The default card type to use" +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:100 +msgid "" +"Pinterest uses Open Graph metadata just like Facebook, so be sure to keep " +"the Open Graph checkbox on the Facebook tab checked if you want to optimize " +"your site for Pinterest." +||||||| .r11156 +#: admin/pages/metas.php:104 admin/pages/metas.php:165 +msgid "Hide" +======= +#: admin/pages/metas.php:105 admin/pages/metas.php:165 +#. translators: %1$s expands to Yoast SEO +msgid "Hide" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %1$s / %2$s expands to a link to pinterest.com's help page. +#: admin/pages/social.php:105 +msgid "To %1$sverify your site with Pinterest%2$s, add the meta tag here:" +||||||| .r11156 +#: admin/pages/metas.php:104 admin/pages/metas.php:165 +msgid "WordPress SEO Meta Box" +======= +#: admin/pages/metas.php:105 admin/pages/metas.php:165 +msgid "%1$s Meta Box" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:109 +msgid "Pinterest verification" +||||||| .r11156 +#: admin/pages/metas.php:126 +msgid "Custom Post Type Archives" +======= +#: admin/pages/metas.php:127 +msgid "Custom Post Type Archives" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:118 +msgid "Add Google+ specific post meta data" +msgstr "" + +#: admin/pages/social.php:121 +||||||| .r11156 +#: admin/pages/metas.php:127 +======= +#: admin/pages/metas.php:128 +>>>>>>> .r12027 +msgid "" +"If you have a Google+ page for your business, add that URL here and link it " +"on your Google+ page's about page." +msgstr "" + +<<<<<<< .mine +#: admin/pages/social.php:123 +msgid "Google Publisher Page" +||||||| .r11156 +#: admin/pages/metas.php:176 +msgid "Author Archives" +======= +#: admin/pages/metas.php:134 admin/pages/social.php:61 +#: admin/views/tool-bulk-editor.php:33 +msgid "Title" +msgstr "" + +#: admin/pages/metas.php:176 +msgid "Author Archives" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:24 +msgid "Bulk editor" +||||||| .r11156 +#: admin/pages/metas.php:183 +msgid "Disable the author archives" +======= +#: admin/pages/metas.php:183 +msgid "Date Archives" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:25 +||||||| .r11156 +#: admin/pages/metas.php:184 +======= +#: admin/pages/metas.php:188 +msgid "Duplicate content prevention" +msgstr "" + +#: admin/pages/metas.php:191 +#. translators: %1$s / %2$s: links to an article about duplicate content on +#. yoast.com +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"This tool allows you to quickly change titles and descriptions of your posts " +"and pages without having to go into the editor for each page." +||||||| .r11156 +"If you're running a one author blog, the author archive will always look " +"exactly the same as your homepage. And even though you may not link to it, " +"others might, to do you harm. Disabling them here will make sure any link " +"to those archives will be 301 redirected to the homepage." +======= +"If you're running a one author blog, the author archive will be exactly the " +"same as your homepage. This is what's called a %1$sduplicate content " +"problem%2$s." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:28 +msgid "Import and Export" +||||||| .r11156 +#: admin/pages/metas.php:186 +msgid "Date Archives" +======= +#: admin/pages/metas.php:194 +#. translators: %s expands to noindex, follow +msgid "" +"If this is the case on your site, you can choose to either disable it " +"(which makes it redirect to the homepage), or to add %s to it so it doesn't " +"show up in the search results." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:29 +msgid "" +"Import settings from other SEO plugins and export your settings for re-use " +"on (another) blog." +||||||| .r11156 +#: admin/pages/metas.php:191 +msgid "Disable the date-based archives" +======= +#: admin/pages/metas.php:197 +#. translators: %s expands to noindex, follow +msgid "Add %s to the author archives" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:34 +msgid "File editor" +msgstr "" + +#: admin/pages/tools.php:35 +msgid "" +"This tool allows you to quickly change important files for your SEO, like " +"your robots.txt and, if you have one, your .htaccess file." +||||||| .r11156 +#: admin/pages/metas.php:192 +msgid "" +"For the date based archives, the same applies: they probably look a lot " +"like your homepage, and could thus be seen as duplicate content." +======= +#: admin/pages/metas.php:198 +msgid "Disable the author archives" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/tools.php:42 +msgid "Recalculate SEO scores" +||||||| .r11156 +#: admin/pages/metas.php:194 +msgid "Special Pages" +======= +#: admin/pages/metas.php:200 +msgid "Date-based archives could in some cases also be seen as duplicate content." +msgstr "" + +#: admin/pages/metas.php:203 +#. translators: %s expands to noindex, follow +msgid "Add %s to the date-based archives" msgstr "" #: admin/pages/metas.php:204 @@ -2333,27 +6557,70 @@ msgstr "" #: admin/pages/metas.php:208 msgid "Special Pages" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/tools.php:43 +msgid "Recalculate SEO scores for all pieces of content with a focus keyword." +||||||| .r11156 +#: admin/pages/metas.php:195 +msgid "" +"These pages will be noindex, followed by default, so they will never show " +"up in search results." +======= #: admin/pages/metas.php:210 #. translators: %s expands to noindex, follow msgid "" "These pages will be %s by default, so they will never show up in search " "results." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/pages/tools.php:51 +msgid "%1$s comes with some very powerful built-in tools:" +||||||| .r11156 +#: admin/pages/metas.php:196 +msgid "Search pages" +======= #: admin/pages/metas.php:211 msgid "Search pages" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/tools.php:70 +msgid "« Back to Tools page" +||||||| .r11156 +#: admin/pages/metas.php:198 +msgid "404 pages" +======= #: admin/pages/metas.php:214 msgid "404 pages" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:29 +msgid "Check this box to enable XML sitemap functionality." +||||||| .r11156 +#: admin/pages/metas.php:206 +msgid "Variables" +======= #: admin/pages/metas.php:221 msgid "Sitewide meta settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:38 +msgid "User sitemap" +||||||| .r11156 +#: admin/pages/network.php:23 +msgid "Settings Updated." +======= #: admin/pages/metas.php:224 msgid "" "If you want to prevent /page/2/ and further of any archive to show up in " @@ -2394,127 +6661,396 @@ msgstr "" #: admin/pages/network.php:24 msgid "Settings Updated." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:41 +msgid "Excluded Posts" +||||||| .r11156 +#: admin/pages/network.php:34 +msgid "%s restored to default SEO settings." +======= #: admin/pages/network.php:35 msgid "%s restored to default SEO settings." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:51 +msgid "You can find your XML Sitemap here: %sXML Sitemap%s" +||||||| .r11156 +#: admin/pages/network.php:37 +msgid "Blog %s not found." +======= #: admin/pages/network.php:38 msgid "Blog %s not found." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:54 +msgid "" +"You do not need to generate the XML sitemap, nor will it " +"take up time to generate after publishing a post." +||||||| .r11156 +#: admin/pages/network.php:60 +msgid "public" +======= #: admin/pages/network.php:61 msgid "public" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:58 +msgid "Save your settings to activate XML Sitemaps." +||||||| .r11156 +#: admin/pages/network.php:63 +msgid "archived" +======= #: admin/pages/network.php:64 msgid "archived" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:63 +msgid "Entries per page" +||||||| .r11156 +#: admin/pages/network.php:66 +msgid "mature" +======= #: admin/pages/network.php:67 msgid "mature" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:64 +msgid "" +"Please enter the maximum number of entries per sitemap page (defaults to %s, " +"you might want to lower this to prevent memory issues on some installs):" +||||||| .r11156 +#: admin/pages/network.php:69 +msgid "spam" +======= #: admin/pages/network.php:70 msgid "spam" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:68 +msgid "Max entries per sitemap" +||||||| .r11156 +#: admin/pages/network.php:93 +msgid "Who should have access to the WordPress SEO settings" +======= #: admin/pages/network.php:94 #. translators: %1$s expands to Yoast SEO msgid "Who should have access to the %1$s settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:74 +msgid "Disable author/user sitemap" +||||||| .r11156 +#: admin/pages/network.php:95 +msgid "Site Admins (default)" +======= #: admin/pages/network.php:96 msgid "Site Admins (default)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:77 +msgid "Exclude users without posts" +||||||| .r11156 +#: admin/pages/network.php:96 +msgid "Super Admins only" +======= #: admin/pages/network.php:97 msgid "Super Admins only" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:78 +msgid "Disable all users with zero posts" +||||||| .r11156 +#: admin/pages/network.php:104 +msgid "New sites in the network inherit their SEO settings from this site" +======= #: admin/pages/network.php:105 admin/pages/network.php:112 msgid "New sites in the network inherit their SEO settings from this site" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:82 +msgid "Exclude user roles" +msgstr "" + +#: admin/pages/xml-sitemaps.php:83 +||||||| .r11156 +#: admin/pages/network.php:108 +======= +#: admin/pages/network.php:109 +>>>>>>> .r12027 +msgid "" +"Please check the appropriate box below if there's a user role that you do " +"NOT want to include in your sitemap:" +msgstr "" + +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:96 +msgid "" +"Please check the appropriate box below if there's a post type that you do " +"NOT want to include in your sitemap:" +msgstr "" + +#. Translators: %1$s: expands to '1,2,99,100' +#: admin/pages/xml-sitemaps.php:109 +||||||| .r11156 +#: admin/pages/network.php:111 +msgid "New sites in the network get the SEO settings from this site" msgstr "" -#: admin/pages/network.php:109 +#: admin/pages/network.php:112 +======= +#: admin/pages/network.php:113 +>>>>>>> .r12027 msgid "" -"Choose the site whose settings you want to use as default for all sites " -"that are added to your network. If you choose 'None', the normal plugin " -"defaults will be used." +"You can exclude posts from the sitemap by entering a comma separated string " +"with the Post ID's. The format will become something like: %1$s." msgstr "" -#: admin/pages/network.php:113 -msgid "" -"Enter the %sSite ID%s for the site whose settings you want to use as " -"default for all sites that are added to your network. Leave empty for none " -"(i.e. the normal plugin defaults will be used)." +<<<<<<< .mine +#: admin/pages/xml-sitemaps.php:110 +msgid "Posts to exclude" msgstr "" +#: admin/pages/xml-sitemaps.php:119 +||||||| .r11156 +#: admin/pages/network.php:114 +msgid "Take note :" +msgstr "" + +#: admin/pages/network.php:114 +======= #: admin/pages/network.php:115 +>>>>>>> .r12027 msgid "" -"Privacy sensitive (FB admins and such), theme specific (title rewrite) and " -"a few very site specific settings will not be imported to new blogs." +"Please check the appropriate box below if there's a taxonomy that you do " +"NOT want to include in your sitemap:" msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/taxonomy/class-taxonomy-metabox.php:55 +msgid "%1$s Settings" +||||||| .r11156 +#: admin/pages/network.php:117 +msgid "Save MultiSite Settings" +======= #: admin/pages/network.php:118 msgid "Save MultiSite Settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-metabox.php:164 +#: admin/taxonomy/class-taxonomy-metabox.php:165 +msgid "Facebook / Opengraph metadata" +||||||| .r11156 +#: admin/pages/network.php:125 +msgid "Using this form you can reset a site to the default SEO settings." +======= #: admin/pages/network.php:121 msgid "Restore site to default settings" msgstr "" #: admin/pages/network.php:124 msgid "Using this form you can reset a site to the default SEO settings." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:38 +msgid "Meta keywords used on the archive page for this term." +||||||| .r11156 +#: admin/pages/network.php:131 +msgid "Site ID" +======= #: admin/pages/network.php:130 msgid "Site ID" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:44 +msgid "Canonical" +||||||| .r11156 +#: admin/pages/network.php:137 +msgid "Blog ID" +======= #: admin/pages/network.php:136 msgid "Blog ID" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:45 +msgid "The canonical link is shown on the archive page for this term." +||||||| .r11156 +#: admin/pages/network.php:140 +msgid "Restore site to defaults" +======= #: admin/pages/network.php:139 msgid "Restore site to defaults" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to the taxonomy name +#: admin/taxonomy/class-taxonomy-settings-fields.php:50 +msgid "The Breadcrumbs title is used in the breadcrumbs where this %s appears." +||||||| .r11156 +#: admin/pages/network.php:143 +msgid "Restore site to default settings" +======= #: admin/pages/social.php:20 msgid "Accounts" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to taxonomy name +#: admin/taxonomy/class-taxonomy-settings-fields.php:57 +msgid "Noindex this %s" +||||||| .r11156 +#: admin/pages/permalinks.php:20 +msgid "" +"Strip the category base (usually /category/) from the category " +"URL." +======= #: admin/pages/social.php:29 msgid "To inform Google about your social profiles, we need to know their URLs." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to taxonomy name +#: admin/taxonomy/class-taxonomy-settings-fields.php:59 +||||||| .r11156 +#: admin/pages/permalinks.php:21 +======= #: admin/pages/social.php:30 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"This %s follows the indexation rules set under Metas and Titles, you can " +"override it here." +||||||| .r11156 +"We suggest using %1$sFV Top Level Categories%2$s, if you insist on keeping " +"this but do know that the feature is very error prone and not that " +"important for your SEO." +======= "For each, pick the main account associated with this site and please enter " "them below:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to the taxonomy name +#: admin/taxonomy/class-taxonomy-settings-fields.php:65 +msgid "Include %1$s in sitemap?" +||||||| .r11156 +#: admin/pages/permalinks.php:23 +msgid "Enforce a trailing slash on all category and tag URL's" +======= #: admin/pages/social.php:33 msgid "Facebook Page URL" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s$s expands to the taxonomy name and %2$s to the current index +#. value +#: admin/taxonomy/class-taxonomy-settings-fields.php:86 +msgid "Use %1$s default (Currently: %2$s)" +||||||| .r11156 +#: admin/pages/permalinks.php:24 +msgid "" +"If you choose a permalink for your posts with .html, or " +"anything else but a / on the end, this will force WordPress to add a " +"trailing slash to non-post pages nonetheless." +======= #: admin/pages/social.php:34 msgid "Twitter Username" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:87 +#: admin/taxonomy/class-taxonomy.php:56 +msgid "Always index" +||||||| .r11156 +#: admin/pages/permalinks.php:26 +msgid "Remove stop words from slugs." +======= #: admin/pages/social.php:35 msgid "Instagram URL" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:88 +#: admin/taxonomy/class-taxonomy.php:57 +msgid "Always noindex" +||||||| .r11156 +#: admin/pages/permalinks.php:27 +msgid "" +"This helps you to create cleaner URLs by automatically removing the " +"stopwords from them." +======= #: admin/pages/social.php:36 msgid "LinkedIn URL" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:90 +#: admin/taxonomy/class-taxonomy.php:59 +msgid "Auto detect" +||||||| .r11156 +#: admin/pages/permalinks.php:29 +msgid "Redirect attachment URL's to parent post URL." +======= #: admin/pages/social.php:37 msgid "MySpace URL" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy-settings-fields.php:91 +#: admin/taxonomy/class-taxonomy.php:60 +msgid "Always include" msgstr "" +#: admin/taxonomy/class-taxonomy-settings-fields.php:92 +#: admin/taxonomy/class-taxonomy.php:61 +msgid "Never include" +msgstr "" + +#. translators: %1$s expands to the social network name +#: admin/taxonomy/class-taxonomy-social-fields.php:46 +||||||| .r11156 +#: admin/pages/permalinks.php:30 +======= #: admin/pages/social.php:38 msgid "Pinterest URL" msgstr "" @@ -2529,29 +7065,98 @@ msgstr "" #: admin/pages/social.php:50 #. translators: %s expands to <head> +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"If you don't want to use the title for sharing on %1$s but instead want " +"another title there, write it here." +||||||| .r11156 +"Attachments to posts are stored in the database as posts, this means " +"they're accessible under their own URL's if you do not redirect them, " +"enabling this will redirect them to the post they were attached to." +======= "Add Open Graph meta data to your site's %s section, Facebook and other " "social networks use this data when your pages are shared." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to the social network name +#: admin/taxonomy/class-taxonomy-social-fields.php:54 +msgid "" +"If you don't want to use the meta description for sharing on %1$s but want " +"another description there, write it here." +||||||| .r11156 +#: admin/pages/permalinks.php:32 +msgid "Remove the ?replytocom variables." +======= #: admin/pages/social.php:53 msgid "Add Open Graph meta data" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to the social network name +#: admin/taxonomy/class-taxonomy-social-fields.php:61 +||||||| .r11156 +#: admin/pages/permalinks.php:33 +======= #: admin/pages/social.php:57 msgid "Frontpage settings" msgstr "" #: admin/pages/social.php:58 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"If you want to use an image for sharing on %1$s, you can upload / choose an " +"image or add the image URL here." +||||||| .r11156 +"This prevents threaded replies from working when the user has JavaScript " +"disabled, but on a large site can mean a huge improvement in crawl " +"efficiency for search engines when you have a lot of comments." +======= "These are the title, description and image used in the Open Graph meta tags " "on the front page of your site." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/taxonomy/class-taxonomy.php:55 +msgid "Use %s default (Currently: %s)" +||||||| .r11156 +#: admin/pages/permalinks.php:35 +msgid "Redirect ugly URL's to clean permalinks. (Not recommended in many cases!)" +======= #: admin/pages/social.php:60 admin/pages/social.php:72 msgid "Image URL" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/views/about.php:32 +msgid "Thank you for updating %1$s!" +msgstr "" + +#. translators: %s: '3.0' version number +#: admin/views/about.php:46 +msgid "Whatâs new in %s" +msgstr "" + +#: admin/views/about.php:49 +msgid "Credits" +msgstr "" + +#: admin/views/about.php:116 +msgid "Go to the General settings page â" msgstr "" +#. translators: %1$s and %2$s expands to anchor tags, %3$s expands to Yoast SEO +#: admin/views/about.php:126 +||||||| .r11156 +#: admin/pages/permalinks.php:36 +======= #: admin/pages/social.php:62 admin/views/tool-bulk-editor.php:35 msgid "Description" msgstr "" @@ -2565,101 +7170,294 @@ msgid "Default settings" msgstr "" #: admin/pages/social.php:74 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"While most of the development team is at %1$sYoast%2$s in the Netherlands, " +"%3$s is created by a worldwide team." +||||||| .r11156 +"People make mistakes in their links towards you sometimes, or unwanted " +"parameters are added to the end of your URLs, this allows you to redirect " +"them all away. Please note that while this is a feature that is actively " +"maintained, it is known to break several plugins, and should for that " +"reason be the first feature you disable when you encounter issues after " +"installing this plugin." +======= "This image is used if the post/page being shared does not contain any " "images." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:128 +msgid "Want to help us develop? Read our %1$scontribution guidelines%2$s!" +||||||| .r11156 +#: admin/pages/permalinks.php:41 +msgid "Force Transport" +======= #: admin/pages/social.php:86 #. translators: %s expands to <head> msgid "Add Twitter card meta data to your site's %s section." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:132 +msgid "Project Leaders" +||||||| .r11156 +#: admin/pages/permalinks.php:41 +msgid "Leave default" +======= #: admin/pages/social.php:90 msgid "Add Twitter card meta data" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:138 +msgid "Project Lead" +||||||| .r11156 +#: admin/pages/permalinks.php:41 +msgid "Force http" +======= #: admin/pages/social.php:93 msgid "The default card type to use" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:143 +msgid "Lead Architect" +||||||| .r11156 +#: admin/pages/permalinks.php:41 +msgid "Force https" +======= #: admin/pages/social.php:100 msgid "" "Pinterest uses Open Graph metadata just like Facebook, so be sure to keep " "the Open Graph checkbox on the Facebook tab checked if you want to optimize " "your site for Pinterest." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:148 +msgid "Architect" +||||||| .r11156 +#: admin/pages/permalinks.php:42 +msgid "Force the canonical to either http or https, when your blog runs under both." +======= #: admin/pages/social.php:105 #. translators: %1$s / %2$s expands to a link to pinterest.com's help page. msgid "To %1$sverify your site with Pinterest%2$s, add the meta tag here:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:153 +msgid "QA & Translations Manager" +||||||| .r11156 +#: admin/pages/permalinks.php:44 +msgid "Canonical Settings" +======= #: admin/pages/social.php:109 msgid "Pinterest verification" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:161 +msgid "Contributing Developers" +||||||| .r11156 +#: admin/pages/permalinks.php:47 +msgid "Prevent cleaning out Google Site Search URL's." +======= #: admin/pages/social.php:118 msgid "Add Google+ specific post meta data" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:167 admin/views/about.php:172 +#: admin/views/about.php:177 admin/views/about.php:187 +msgid "Developer" +||||||| .r11156 +#: admin/pages/permalinks.php:48 +msgid "" +"Google Site Search URL's look weird, and ugly, but if you're using Google " +"Site Search, you probably do not want them cleaned out." +======= #: admin/pages/social.php:121 msgid "" "If you have a Google+ page for your business, add that URL here and link it " "on your Google+ page's about page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/about.php:211 +msgid "Contributors to this release" +||||||| .r11156 +#: admin/pages/permalinks.php:50 +msgid "Prevent cleaning out Google Analytics Campaign & Google AdWords Parameters." +======= #: admin/pages/social.php:123 msgid "Google Publisher Page" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/dashboard-widget.php:16 +||||||| .r11156 +#: admin/pages/permalinks.php:51 +======= #: admin/pages/tools.php:21 msgid "Bulk editor" msgstr "" #: admin/pages/tools.php:22 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Below are your published posts’ SEO scores. Now is as good a time as " +"any to start improving some of your posts!" +||||||| .r11156 +"If you use Google Analytics campaign parameters starting with " +"?utm_, check this box. You shouldn't use these btw, you should " +"instead use the hash tagged version instead." +======= "This tool allows you to quickly change titles and descriptions of your " "posts and pages without having to go into the editor for each page." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: expands to OnPage.org +#: admin/views/dashboard-widget.php:45 +msgid "Indexability check by %1$s" +||||||| .r11156 +#: admin/pages/permalinks.php:53 +msgid "Other variables not to clean" +======= #: admin/pages/tools.php:25 msgid "Import and Export" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/dashboard-widget.php:58 +msgid "Your homepage can be indexed by search engines." +||||||| .r11156 +#: admin/pages/permalinks.php:54 +msgid "" +"You might have extra variables you want to prevent from cleaning out, add " +"them here, comma separated." +======= #: admin/pages/tools.php:26 msgid "" "Import settings from other SEO plugins and export your settings for re-use " "on (another) blog." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: opens a link to a related knowledge base article. 2: closes +#. the link +#: admin/views/dashboard-widget.php:74 +msgid "" +"Yoast SEO has %1$snot been able to fetch your siteâs indexability status%2$s " +"from OnPage.org" +||||||| .r11156 +#: admin/pages/permalinks.php:56 +msgid "Clean Permalink Settings" +======= #: admin/pages/tools.php:31 msgid "File editor" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: 1: opens a link to a related knowledge base article. 2: closes +#. the link +#: admin/views/dashboard-widget.php:83 +||||||| .r11156 +#: admin/pages/rss.php:17 +======= #: admin/pages/tools.php:32 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Yoast SEO has %1$snot fetched your siteâs indexability status%2$s yet from " +"OnPage.org" +||||||| .r11156 +"This feature is used to automatically add content to your RSS, more " +"specifically, it's meant to add links back to your blog and your blog " +"posts, so dumb scrapers will automatically add these links too, helping " +"search engines identify you as the original source of the content." +======= "This tool allows you to quickly change important files for your SEO, like " "your robots.txt and, if you have one, your .htaccess file." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/dashboard-widget.php:93 +msgid "Fetch the current status" +||||||| .r11156 +#: admin/pages/rss.php:22 +msgid "Content to put before each post in the feed" +======= #: admin/pages/tools.php:37 #. translators: %1$s expands to Yoast SEO msgid "%1$s comes with some very powerful built-in tools:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/dashboard-widget.php:97 +msgid "Analyze entire site" +||||||| .r11156 +#: admin/pages/rss.php:23 admin/pages/rss.php:29 +msgid "(HTML allowed)" +======= #: admin/pages/tools.php:52 msgid "« Back to Tools page" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:17 +msgid "Enable Breadcrumbs" +||||||| .r11156 +#: admin/pages/rss.php:28 +msgid "Content to put after each post in the feed" +======= #: admin/pages/xml-sitemaps.php:29 msgid "Check this box to enable XML sitemap functionality." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:21 +msgid "Separator between breadcrumbs" +||||||| .r11156 +#: admin/pages/rss.php:33 +msgid "Explanation" +======= #: admin/pages/xml-sitemaps.php:38 msgid "User sitemap" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:22 +msgid "Anchor text for the Homepage" +||||||| .r11156 +#: admin/pages/rss.php:34 +msgid "" +"You can use the following variables within the content, they will be " +"replaced by the value on the right." +======= #: admin/pages/xml-sitemaps.php:41 msgid "Excluded Posts" msgstr "" @@ -2672,8 +7470,18 @@ msgstr "" msgid "" "You do not need to generate the XML sitemap, nor will it " "take up time to generate after publishing a post." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:23 +msgid "Prefix for the breadcrumb path" +||||||| .r11156 +#: admin/pages/rss.php:36 +msgid "" +"A link to the archive for the post author, with the authors name as anchor " +"text." +======= #: admin/pages/xml-sitemaps.php:58 msgid "Save your settings to activate XML Sitemaps." msgstr "" @@ -2686,62 +7494,186 @@ msgstr "" msgid "" "Please enter the maximum number of entries per sitemap page (defaults to " "%s, you might want to lower this to prevent memory issues on some installs):" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:24 +msgid "Prefix for Archive breadcrumbs" +||||||| .r11156 +#: admin/pages/rss.php:37 +msgid "A link to the post, with the title as anchor text." +======= #: admin/pages/xml-sitemaps.php:68 msgid "Max entries per sitemap" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:25 +msgid "Prefix for Search Page breadcrumbs" +||||||| .r11156 +#: admin/pages/rss.php:38 +msgid "A link to your site, with your site's name as anchor text." +======= #: admin/pages/xml-sitemaps.php:74 msgid "Disable author/user sitemap" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:26 +msgid "Breadcrumb for 404 Page" +||||||| .r11156 +#: admin/pages/rss.php:39 +msgid "A link to your site, with your site's name and description as anchor text." +======= #: admin/pages/xml-sitemaps.php:77 msgid "Exclude users without posts" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:29 +msgid "Remove Blog page from Breadcrumbs" +||||||| .r11156 +#: admin/pages/rss.php:42 +msgid "Content of your RSS Feed" +======= #: admin/pages/xml-sitemaps.php:78 msgid "Disable all users with zero posts" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:31 +msgid "Bold the last page in the breadcrumb" +||||||| .r11156 +#: admin/pages/social.php:15 +msgid "Facebook Insights and Admins" +======= #: admin/pages/xml-sitemaps.php:82 msgid "Exclude user roles" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/views/tab-breadcrumbs.php:36 +msgid "Taxonomy to show in breadcrumbs for post types" +msgstr "" + +#: admin/views/tab-breadcrumbs.php:55 +msgid "Post type archive to show in breadcrumbs for taxonomies" +msgstr "" + +#: admin/views/tab-breadcrumbs.php:59 +msgid "Blog" +msgstr "" + +#: admin/views/tab-breadcrumbs.php:79 +msgid "How to insert breadcrumbs in your theme" msgstr "" +#. translators: %1$s / %2$s: links to the breadcrumbs implementation page on +#. the Yoast knowledgebase +#: admin/views/tab-breadcrumbs.php:83 +||||||| .r11156 +#: admin/pages/social.php:16 +======= #: admin/pages/xml-sitemaps.php:83 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Usage of this breadcrumbs feature is explained in %1$sour knowledge-base " +"article on breadcrumbs implementation%2$s." +||||||| .r11156 +"To be able to access your %sFacebook Insights%s for your site, you need to " +"specify a Facebook Admin. This can be a user, but if you have an app for " +"your site, you could use that. For most people a user will be \"good " +"enough\" though." +======= "Please check the appropriate box below if there's a user role that you do " "NOT want to include in your sitemap:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:15 +msgid "Change URLs" +||||||| .r11156 +#: admin/pages/social.php:33 +msgid "Successfully removed admin %s" +======= #: admin/pages/xml-sitemaps.php:96 msgid "" "Please check the appropriate box below if there's a post type that you do " "NOT want to include in your sitemap:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to /category/ +#: admin/views/tab-permalinks.php:18 +msgid "Strip the category base (usually %s) from the category URL." +||||||| .r11156 +#: admin/pages/social.php:53 +msgid "Successfully cleared all Facebook Data" +======= #: admin/pages/xml-sitemaps.php:109 #. Translators: %1$s: expands to '1,2,99,100' msgid "" "You can exclude posts from the sitemap by entering a comma separated string " "with the Post ID's. The format will become something like: %1$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:20 +msgid "" +"Attachments to posts are stored in the database as posts, this means they're " +"accessible under their own URL's if you do not redirect them, enabling this " +"will redirect them to the post they were attached to." +||||||| .r11156 +#: admin/pages/social.php:69 +msgid "Successfully added %s as a Facebook Admin!" +======= #: admin/pages/xml-sitemaps.php:110 msgid "Posts to exclude" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:21 +msgid "Redirect attachment URL's to parent post URL." +||||||| .r11156 +#: admin/pages/social.php:72 +msgid "%s already exists as a Facebook Admin." +======= #: admin/pages/xml-sitemaps.php:119 msgid "" "Please check the appropriate box below if there's a taxonomy that you do " "NOT want to include in your sitemap:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:23 +msgid "Clean up permalinks" +||||||| .r11156 +#: admin/pages/social.php:79 +msgid "Do not use a Facebook App as Admin" +======= #: admin/views/about.php:32 #. translators: %1$s expands to Yoast SEO msgid "Thank you for updating %1$s!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:24 +||||||| .r11156 +#: admin/pages/social.php:84 +======= #: admin/views/about.php:43 #. translators: %s: '2.3' version number msgid "Whatâs new in %s" @@ -2759,51 +7691,155 @@ msgstr "" #. translators: %1$s expands to Yoast SEO, %2$s and %3$s to the anchor tags to #. the translate.yoast.com link, %4$d to the number of translations, %5$d to #. the number of translations, +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"This helps you to create cleaner URLs by automatically removing the " +"stopwords from them." +||||||| .r11156 +"Successfully retrieved your apps from Facebook, now select an app to use as " +"admin." +======= "%1$s ships, at time of release, with %4$d translations, of which %5$d are " "complete. That's a huge improvement from last time, and we're improving " "every week. Join us at %2$stranslate.yoast.com%3$s!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:25 +msgid "Remove stop words from slugs." +||||||| .r11156 +#: admin/pages/social.php:87 +msgid "Failed to retrieve your apps from Facebook." +======= #: admin/views/about.php:172 msgid "Go to The General settings page â" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:27 +msgid "" +"This prevents threaded replies from working when the user has JavaScript " +"disabled, but on a large site can mean a huge improvement in crawl " +"efficiency for search engines when you have a lot of comments." +||||||| .r11156 +#: admin/pages/social.php:110 +msgid "Use a Facebook App as Admin" +======= #: admin/views/about.php:181 #. translators: %1$s and %2$s expands to anchor tags, %3$s expands to Yoast SEO msgid "" "While most of the development team is at %1$sYoast%2$s in the Netherlands, " "%3$s is created by a worldwide team." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to ?replytocom +#: admin/views/tab-permalinks.php:30 +msgid "Remove the %s variables." +||||||| .r11156 +#: admin/pages/social.php:114 +msgid "Select an app to use as Facebook admin:" +======= #: admin/views/about.php:183 msgid "Want to help us develop? Read our %1$scontribution guidelines%2$s!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to .html +#: admin/views/tab-permalinks.php:33 +msgid "" +"If you choose a permalink for your posts with %1$s, or anything else but a " +"%2$s at the end, this will force WordPress to add a trailing slash to non-" +"post pages nonetheless." +||||||| .r11156 +#: admin/pages/social.php:125 +msgid "Update Facebook Apps" +======= #: admin/views/about.php:187 msgid "Project Leaders" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:34 +msgid "Enforce a trailing slash on all category and tag URL's" +||||||| .r11156 +#: admin/pages/social.php:129 +msgid "Add Facebook Admin" +======= #: admin/views/about.php:193 msgid "Project Lead" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:36 +msgid "" +"People make mistakes in their links towards you sometimes, or unwanted " +"parameters are added to the end of your URLs, this allows you to redirect " +"them all away. Please note that while this is a feature that is actively " +"maintained, it is known to break several plugins, and should for that reason " +"be the first feature you disable when you encounter issues after installing " +"this plugin." +||||||| .r11156 +#: admin/pages/social.php:133 +msgid "Currently connected Facebook admins:" +======= #: admin/views/about.php:198 admin/views/about.php:203 msgid "Lead Developer" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:37 +msgid "" +"Redirect ugly URL's to clean permalinks. (Not recommended in many cases!)" +||||||| .r11156 +#: admin/pages/social.php:144 +msgid "Add Another Facebook Admin" +======= #: admin/views/about.php:208 msgid "QA & Translations Manager" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:40 +msgid "" +"Google Site Search URL's look weird, and ugly, but if you're using Google " +"Site Search, you probably do not want them cleaned out." +||||||| .r11156 +#: admin/pages/social.php:160 +msgid "Clear all Facebook Data" +======= #: admin/views/about.php:216 msgid "Recent Rockstars" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:41 +msgid "Prevent cleaning out Google Site Search URL's." +||||||| .r11156 +#: admin/pages/social.php:180 +msgid "Add Open Graph meta data" +======= #: admin/views/about.php:245 msgid "Contributing Developers" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to ?utm_ +#: admin/views/tab-permalinks.php:44 +||||||| .r11156 +#: admin/pages/social.php:182 +======= #: admin/views/about.php:251 admin/views/about.php:256 #: admin/views/about.php:261 msgid "Developer" @@ -2814,27 +7850,94 @@ msgid "Contributors to this release" msgstr "" #: admin/views/dashboard-widget.php:16 -msgid "" +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"If you use Google Analytics campaign parameters starting with %s, check this " +"box. However, you're advised not to use these. Instead, use the version with " +"a hash." +||||||| .r11156 +"Add Open Graph meta data to your site's <head> section. " +"You can specify some of the ID's that are sometimes needed below:" +======= "Below are your published posts’ SEO scores. Now is as good a time as " "any to start improving some of your posts!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:45 +msgid "" +"Prevent cleaning out Google Analytics Campaign & Google AdWords Parameters." +||||||| .r11156 +#: admin/pages/social.php:184 +msgid "Facebook Page URL" +======= #: admin/views/tab-breadcrumbs.php:17 msgid "Enable Breadcrumbs" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:47 +msgid "" +"You might have extra variables you want to prevent from cleaning out, add " +"them here, comma separated." +||||||| .r11156 +#: admin/pages/social.php:186 +msgid "Frontpage settings" +======= #: admin/views/tab-breadcrumbs.php:21 msgid "Separator between breadcrumbs" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-permalinks.php:48 +msgid "Other variables not to clean" +||||||| .r11156 +#: admin/pages/social.php:187 admin/pages/social.php:199 +msgid "Image URL" +======= #: admin/views/tab-breadcrumbs.php:22 msgid "Anchor text for the Homepage" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %s expands to <head> +#: admin/views/tab-permalinks.php:52 +msgid "Clean up the %s" +||||||| .r11156 +#: admin/pages/social.php:194 +msgid "Copy home meta description" +======= #: admin/views/tab-breadcrumbs.php:23 msgid "Prefix for the breadcrumb path" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/views/tab-permalinks.php:53 +msgid "Hide RSD Links" +msgstr "" + +#: admin/views/tab-permalinks.php:54 +msgid "Hide WLW Manifest Links" +msgstr "" + +#: admin/views/tab-permalinks.php:55 +msgid "Hide Shortlink for posts" +msgstr "" + +#: admin/views/tab-permalinks.php:56 +msgid "Hide RSS Links" msgstr "" +#: admin/views/tab-rss.php:15 +||||||| .r11156 +#: admin/pages/social.php:196 +======= #: admin/views/tab-breadcrumbs.php:24 msgid "Prefix for Archive breadcrumbs" msgstr "" @@ -2874,68 +7977,194 @@ msgstr "" #: admin/views/tab-breadcrumbs.php:83 #. translators: %1$s / %2$s: links to the breadcrumbs implementation page on #. the Yoast knowledgebase +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"This feature is used to automatically add content to your RSS, more " +"specifically, it's meant to add links back to your blog and your blog posts, " +"so dumb scrapers will automatically add these links too, helping search " +"engines identify you as the original source of the content." +||||||| .r11156 +"These are the title, description and image used in the Open Graph meta tags " +"on the front page of your site." +======= "Usage of this breadcrumbs feature is explained in %1$sour knowledge-base " "article on breadcrumbs implementation%2$s." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-rss.php:21 +msgid "Content to put before each post in the feed" +||||||| .r11156 +#: admin/pages/social.php:198 +msgid "Default settings" +======= #: admin/views/tab-permalinks.php:15 msgid "Change URLs" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/views/tab-rss.php:22 +msgid "Content to put after each post in the feed" msgstr "" +#: admin/views/tab-rss.php:25 +||||||| .r11156 +#: admin/pages/social.php:200 +======= #: admin/views/tab-permalinks.php:16 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"You can use the following variables within the content, they will be " +"replaced by the value on the right." +||||||| .r11156 +"This image is used if the post/page being shared does not contain any " +"images." +======= "Strip the category base (usually /category/) from the category " "URL." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-rss.php:29 +||||||| .r11156 +#: admin/pages/social.php:208 +======= #: admin/views/tab-permalinks.php:18 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"A link to the archive for the post author, with the authors name as anchor " +"text." +||||||| .r11156 +"Note that for the Twitter Cards to work, you have to check the box below " +"and then validate your Twitter Cards through the %1$sTwitter Card " +"Validator%2$s." +======= "Attachments to posts are stored in the database as posts, this means " "they're accessible under their own URL's if you do not redirect them, " "enabling this will redirect them to the post they were attached to." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-rss.php:33 +msgid "A link to the post, with the title as anchor text." +||||||| .r11156 +#: admin/pages/social.php:211 +msgid "Add Twitter card meta data" +======= #: admin/views/tab-permalinks.php:19 msgid "Redirect attachment URL's to parent post URL." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-rss.php:37 +msgid "A link to your site, with your site's name as anchor text." +||||||| .r11156 +#: admin/pages/social.php:213 +msgid "Add Twitter card meta data to your site's <head> section." +======= #: admin/views/tab-permalinks.php:21 msgid "Clean up permalinks" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tab-rss.php:41 +msgid "" +"A link to your site, with your site's name and description as anchor text." +||||||| .r11156 +#: admin/pages/social.php:214 +msgid "Site Twitter Username" +======= #: admin/views/tab-permalinks.php:22 msgid "" "This helps you to create cleaner URLs by automatically removing the " "stopwords from them." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:17 +msgid "You cannot create a robots.txt file." +||||||| .r11156 +#: admin/pages/social.php:215 +msgid "The default card type to use" +======= #: admin/views/tab-permalinks.php:23 msgid "Remove stop words from slugs." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:33 +msgid "You cannot edit the robots.txt file." +||||||| .r11156 +#: admin/pages/social.php:223 +msgid "Add Google+ specific post meta data" +======= #: admin/views/tab-permalinks.php:25 msgid "" "This prevents threaded replies from working when the user has JavaScript " "disabled, but on a large site can mean a huge improvement in crawl " "efficiency for search engines when you have a lot of comments." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:44 +msgid "Updated Robots.txt" +||||||| .r11156 +#: admin/pages/social.php:226 +msgid "Google Publisher Page" +======= #: admin/views/tab-permalinks.php:26 msgid "Remove the ?replytocom variables." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:51 +msgid "You cannot edit the .htaccess file." +||||||| .r11156 +#: admin/pages/social.php:227 +msgid "" +"If you have a Google+ page for your business, add that URL here and link it " +"on your Google+ page's about page." +======= #: admin/views/tab-permalinks.php:29 msgid "" "If you choose a permalink for your posts with %1$s, or anything else but a " "%2$s at the end, this will force WordPress to add a trailing slash to " "non-post pages nonetheless." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:77 +msgid "Robots.txt" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:27 +msgid "Check this box to enable XML sitemap functionality." +======= #: admin/views/tab-permalinks.php:30 msgid "Enforce a trailing slash on all category and tag URL's" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:83 +msgid "You don't have a robots.txt file, create one here:" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:31 +msgid "As you're on NGINX, you'll need the following rewrites:" +======= #: admin/views/tab-permalinks.php:32 msgid "" "People make mistakes in their links towards you sometimes, or unwanted " @@ -2944,55 +8173,160 @@ msgid "" "maintained, it is known to break several plugins, and should for that " "reason be the first feature you disable when you encounter issues after " "installing this plugin." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:84 +msgid "Create robots.txt file" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:38 +msgid "You can find your XML Sitemap here: %sXML Sitemap%s" +======= #: admin/views/tab-permalinks.php:33 msgid "Redirect ugly URL's to clean permalinks. (Not recommended in many cases!)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:88 +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:38 +======= #: admin/views/tab-permalinks.php:36 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"If you had a robots.txt file and it was editable, you could edit it from " +"here." +||||||| .r11156 +"You do not need to generate the XML sitemap, nor will it " +"take up time to generate after publishing a post." +======= "Google Site Search URL's look weird, and ugly, but if you're using Google " "Site Search, you probably do not want them cleaned out." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:101 +msgid "If your robots.txt were writable, you could edit it from here." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:40 +msgid "Save your settings to activate XML Sitemaps." +======= #: admin/views/tab-permalinks.php:37 msgid "Prevent cleaning out Google Site Search URL's." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:107 +msgid "Edit the content of your robots.txt:" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:44 +msgid "User sitemap" +======= #: admin/views/tab-permalinks.php:40 msgid "" "If you use Google Analytics campaign parameters starting with %s, check " "this box. However, you're advised not to use these. Instead, use the " "version with a hash." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:109 +msgid "Save changes to Robots.txt" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:45 +msgid "Disable author/user sitemap" +======= #: admin/views/tab-permalinks.php:41 msgid "Prevent cleaning out Google Analytics Campaign & Google AdWords Parameters." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:115 +msgid ".htaccess file" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:48 +msgid "Exclude users without posts" +======= #: admin/views/tab-permalinks.php:43 msgid "" "You might have extra variables you want to prevent from cleaning out, add " "them here, comma separated." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:127 +msgid "If your .htaccess were writable, you could edit it from here." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:49 +msgid "Disable all users with zero posts" +======= #: admin/views/tab-permalinks.php:44 msgid "Other variables not to clean" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-file-editor.php:133 +msgid "Edit the content of your .htaccess:" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:53 +msgid "Exclude user roles" +======= #: admin/views/tab-permalinks.php:48 msgid "Clean up the %s" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: admin/views/tool-file-editor.php:135 +msgid "Save changes to .htaccess" msgstr "" +#: admin/views/tool-file-editor.php:140 +msgid "" +"If you had a .htaccess file and it was editable, you could edit it from here." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:54 +msgid "" +"Please check the appropriate box below if there's a user role that you do " +"NOT want to include in your sitemap:" +======= #: admin/views/tab-permalinks.php:49 msgid "Hide RSD Links" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:89 +msgid "The old data of the imported plugin was deleted successfully." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:62 +msgid "General settings" +======= #: admin/views/tab-permalinks.php:50 msgid "Hide WLW Manifest Links" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:101 +#: admin/views/tool-import-export.php:166 +#: admin/views/tool-import-export.php:192 +msgid "Import" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:63 +msgid "" +"After content publication, the plugin automatically pings Google and Bing, " +"do you need it to ping other search engines too? If so, check the box:" +======= #: admin/views/tab-permalinks.php:51 msgid "Hide Shortlink for posts" msgstr "" @@ -3007,121 +8341,376 @@ msgid "" "specifically, it's meant to add links back to your blog and your blog " "posts, so dumb scrapers will automatically add these links too, helping " "search engines identify you as the original source of the content." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:102 +msgid "Export" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:64 +msgid "Ping Yahoo!" +======= #: admin/views/tab-rss.php:21 msgid "Content to put before each post in the feed" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:104 +msgid "Import from other SEO plugins" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:65 +msgid "Ping Ask.com" +======= #: admin/views/tab-rss.php:22 msgid "Content to put after each post in the feed" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:106 +msgid "Import from other plugins" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:70 +msgid "Exclude post types" +======= #: admin/views/tab-rss.php:25 msgid "" "You can use the following variables within the content, they will be " "replaced by the value on the right." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:116 +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:71 +======= #: admin/views/tab-rss.php:29 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Import settings by locating settings.zip and clicking \"Import " +"settings\"" +||||||| .r11156 +"Please check the appropriate box below if there's a post type that you do " +"NOT want to include in your sitemap:" +======= "A link to the archive for the post author, with the authors name as anchor " "text." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:126 +msgid "Import settings" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:80 +msgid "Exclude taxonomies" +======= #: admin/views/tab-rss.php:33 msgid "A link to the post, with the title as anchor text." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/views/tool-import-export.php:133 +msgid "" +"Export your %1$s settings here, to import them again later or to import them " +"on another site." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:81 +msgid "" +"Please check the appropriate box below if there's a taxonomy that you do " +"NOT want to include in your sitemap:" +======= #: admin/views/tab-rss.php:37 msgid "A link to your site, with your site's name as anchor text." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:135 +msgid "Include Taxonomy Metadata" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:91 +msgid "Entries per page" +======= #: admin/views/tab-rss.php:41 msgid "A link to your site, with your site's name and description as anchor text." +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/views/tool-import-export.php:138 +msgid "Export your %1$s settings" msgstr "" +#: admin/views/tool-import-export.php:146 +msgid "" +"No doubt you've used an SEO plugin before if this site isn't new. Let's make " +"it easy on you, you can import the data below. If you want, you can import " +"first, check if it was imported correctly, and then import & delete. No " +"duplicate data will be imported." +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:92 +msgid "" +"Please enter the maximum number of entries per sitemap page (defaults to " +"%s, you might want to lower this to prevent memory issues on some installs):" +======= #: admin/views/tool-file-editor.php:17 msgid "You cannot create a robots.txt file." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:148 +msgid "" +"If you've used another SEO plugin, try the %sSEO Data Transporter%s plugin " +"to move your data into this plugin, it rocks!" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:93 +msgid "Max entries per sitemap page" +======= #: admin/views/tool-file-editor.php:33 msgid "You cannot edit the robots.txt file." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:155 +msgid "Import from HeadSpace2?" +||||||| .r11156 +#: admin/pages/xml-sitemaps.php:98 +msgid "XML Sitemap" +======= #: admin/views/tool-file-editor.php:44 msgid "Updated Robots.txt" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:156 +msgid "Import from All-in-One SEO?" +||||||| .r11156 +#: frontend/class-frontend.php:365 +msgid "Search for \"%s\"" +======= #: admin/views/tool-file-editor.php:51 msgid "You cannot edit the .htaccess file." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:157 +msgid "Import from WooThemes SEO framework?" +||||||| .r11156 +#: frontend/class-frontend.php:417 frontend/class-frontend.php:419 +#: frontend/class-frontend.php:421 frontend/class-frontend.php:434 +#: frontend/class-frontend.php:436 frontend/class-frontend.php:438 +#: inc/class-wpseo-options.php:1595 +msgid "%s Archives" +======= #: admin/views/tool-file-editor.php:77 msgid "Robots.txt" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:158 +msgid "Import from wpSEO" +||||||| .r11156 +#: frontend/class-frontend.php:423 frontend/class-frontend.php:440 +msgid "Archives" +======= #: admin/views/tool-file-editor.php:83 msgid "You don't have a robots.txt file, create one here:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:162 +msgid "Delete the old data after import? (recommended)" +||||||| .r11156 +#: frontend/class-frontend.php:449 inc/class-wpseo-options.php:1547 +msgid "Page not found" +======= #: admin/views/tool-file-editor.php:84 msgid "Create robots.txt file" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:173 +||||||| .r11156 +#: frontend/class-frontend.php:1180 +======= #: admin/views/tool-file-editor.php:88 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"If you want to import data from (by now ancient) Yoast plugins, you can do " +"so here:" +||||||| .r11156 +"Admin only notice: this page doesn't show a meta description because it " +"doesn't have one, either write it for this page specifically or go into the " +"SEO -> Titles menu and set up a template." +======= "If you had a robots.txt file and it was editable, you could edit it from " "here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:180 +msgid "Import from Robots Meta (by Yoast)?" +||||||| .r11156 +#: inc/class-wpseo-options.php:1072 +msgid "%s does not seem to be a valid %s verification string. Please correct." +======= #: admin/views/tool-file-editor.php:101 msgid "If your robots.txt were writable, you could edit it from here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:181 +msgid "Import from RSS Footer (by Yoast)?" +||||||| .r11156 +#: inc/class-wpseo-options.php:1311 +msgid "" +"Invalid transport mode set for the canonical settings. Value reset to " +"default." +======= #: admin/views/tool-file-editor.php:107 msgid "Edit the content of your robots.txt:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/tool-import-export.php:182 +msgid "Import from Yoast Breadcrumbs?" +||||||| .r11156 +#: inc/class-wpseo-options.php:1545 +msgid "%s, Author at %s" +======= #: admin/views/tool-file-editor.php:109 msgid "Save changes to Robots.txt" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO +#: admin/views/user-profile.php:10 +msgid "%1$s settings" +||||||| .r11156 +#: inc/class-wpseo-options.php:1546 +msgid "You searched for %s" +======= #: admin/views/tool-file-editor.php:114 msgid ".htaccess file" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/user-profile.php:16 +msgid "Title to use for Author page" +||||||| .r11156 +#: inc/class-wpseo-options.php:1584 +msgid "%s Archive" +======= #: admin/views/tool-file-editor.php:125 msgid "If your .htaccess were writable, you could edit it from here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/user-profile.php:25 +msgid "Meta description to use for Author page" +||||||| .r11156 +#: inc/class-wpseo-options.php:1992 +msgid "The post %s appeared first on %s." +======= #: admin/views/tool-file-editor.php:131 msgid "Edit the content of your .htaccess:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/user-profile.php:36 +msgid "Meta keywords to use for Author page" +||||||| .r11156 +#: inc/class-wpseo-options.php:2084 +msgid "Error 404: Page not found" +======= #: admin/views/tool-file-editor.php:133 msgid "Save changes to .htaccess" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: admin/views/user-profile.php:48 +msgid "Exclude user from Author-sitemap" +||||||| .r11156 +#: inc/class-wpseo-options.php:2085 +msgid "Archives for" +======= #: admin/views/tool-file-editor.php:138 msgid "" "If you had a .htaccess file and it was editable, you could edit it from " "here." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: frontend/class-frontend.php:459 +msgid "Search for \"%s\"" +||||||| .r11156 +#: inc/class-wpseo-options.php:2087 +msgid "You searched for" +======= #: admin/views/tool-import-export.php:80 msgid "The old data of the imported plugin was deleted successfully." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: frontend/class-frontend.php:518 frontend/class-frontend.php:521 +#: frontend/class-frontend.php:524 frontend/class-frontend.php:539 +#: frontend/class-frontend.php:542 frontend/class-frontend.php:545 +#: inc/options/class-wpseo-option-titles.php:228 +msgid "%s Archives" +||||||| .r11156 +#: inc/class-wpseo-options.php:2176 +msgid "Please select a valid taxonomy for post type \"%s\"" +======= #: admin/views/tool-import-export.php:92 admin/views/tool-import-export.php:156 #: admin/views/tool-import-export.php:182 msgid "Import" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: frontend/class-frontend.php:558 +#: inc/options/class-wpseo-option-titles.php:180 +msgid "Page not found" +||||||| .r11156 +#: inc/class-wpseo-options.php:2209 +msgid "Please select a valid post type for taxonomy \"%s\"" +======= #: admin/views/tool-import-export.php:93 msgid "Export" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: frontend/class-frontend.php:1253 +||||||| .r11156 +#: inc/class-wpseo-options.php:2516 +======= #: admin/views/tool-import-export.php:95 msgid "Import from other SEO plugins" msgstr "" @@ -3131,45 +8720,116 @@ msgid "Import from other plugins" msgstr "" #: admin/views/tool-import-export.php:107 +>>>>>>> .r12027 msgid "" +<<<<<<< .mine +"Admin only notice: this page doesn't show a meta description because it " +"doesn't have one, either write it for this page specifically or go into the " +"SEO -> Titles menu and set up a template." +||||||| .r11156 +"\"Max entries per sitemap page\" should be a positive number, which %s is " +"not. Please correct." +======= "Import settings by locating settings.zip and clicking \"Import " "settings\"" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:101 +msgid "N/A" +||||||| .r11156 +#: inc/class-wpseo-options.php:2679 +msgid "Summary" +======= #: admin/views/tool-import-export.php:117 msgid "Import settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:102 +msgid "No index" +||||||| .r11156 +#: inc/class-wpseo-options.php:2680 +msgid "Summary with large image" +======= #: admin/views/tool-import-export.php:124 #. translators: %1$s expands to Yoast SEO msgid "" "Export your %1$s settings here, to import them again later or to import " "them on another site." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:103 +msgid "Bad" +||||||| .r11156 +#: inc/class-wpseo-options.php:2804 +msgid "%s does not seem to be a valid url. Please correct." +======= #: admin/views/tool-import-export.php:126 msgid "Include Taxonomy Metadata" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:104 +msgid "OK" +||||||| .r11156 +#: inc/class-wpseo-options.php:2840 +msgid "%s does not seem to be a valid Twitter user-id. Please correct." +======= #: admin/views/tool-import-export.php:129 #. translators: %1$s expands to Yoast SEO msgid "Export your %1$s settings" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:105 +msgid "Good" +||||||| .r11156 +#: inc/class-wpseo-options.php:3085 +msgid "" +"%s is not a valid choice for who should be allowed access to the WP SEO " +"settings. Value reset to the default." +======= #: admin/views/tool-import-export.php:137 msgid "" "No doubt you've used an SEO plugin before if this site isn't new. Let's " "make it easy on you, you can import the data below. If you want, you can " "import first, check if it was imported correctly, and then import & " "delete. No duplicate data will be imported." +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:118 +msgid "SEO: No Focus Keyword" +||||||| .r11156 +#: inc/class-wpseo-options.php:3104 inc/class-wpseo-options.php:3113 +msgid "" +"The default blog setting must be the numeric blog id of the blog you want " +"to use as default." +======= #: admin/views/tool-import-export.php:139 msgid "" "If you've used another SEO plugin, try the %sSEO Data Transporter%s plugin " "to move your data into this plugin, it rocks!" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:119 +msgid "SEO: Bad" +||||||| .r11156 +#: inc/class-wpseo-options.php:3104 +msgid "" +"This must be an existing blog. Blog %s does not exist or has been marked as " +"deleted." +======= #: admin/views/tool-import-export.php:146 msgid "Import from HeadSpace2?" msgstr "" @@ -3190,12 +8850,34 @@ msgstr "" msgid "" "If you want to import data from (by now ancient) Yoast plugins, you can do " "so here:" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-rank.php:120 +msgid "SEO: OK" +||||||| .r11156 +#: inc/class-wpseo-options.php:3113 +msgid "No numeric value was received." +======= #: admin/views/tool-import-export.php:170 msgid "Import from Robots Meta (by Yoast)?" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-rank.php:121 +msgid "SEO: Good" +msgstr "" + +#: inc/class-wpseo-rank.php:122 +msgid "SEO: Post Noindexed" msgstr "" +#: inc/class-wpseo-replace-vars.php:106 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:108 +======= #: admin/views/tool-import-export.php:171 msgid "Import from RSS Footer (by Yoast)?" msgstr "" @@ -3242,6 +8924,7 @@ msgid "Page not found" msgstr "" #: frontend/class-frontend.php:1245 +>>>>>>> .r12027 msgid "" "Admin only notice: this page doesn't show a meta description because it " "doesn't have one, either write it for this page specifically or go into the " @@ -3257,8 +8940,8 @@ msgstr "" #: inc/class-wpseo-replace-vars.php:109 msgid "" "A replacement variable can not start with \"%%cf_\" or \"%%ct_\" as these " -"are reserved for the WPSEO standard variable variables for custom fields " -"and custom taxonomies. Try making your variable name unique." +"are reserved for the WPSEO standard variable variables for custom fields and " +"custom taxonomies. Try making your variable name unique." msgstr "" #: inc/class-wpseo-replace-vars.php:118 @@ -3274,170 +8957,509 @@ msgid "" "to adjust the replacement value." msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:879 +msgid "Page %1$d of %2$d" +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:886 +msgid "Page %d of %d" +======= #: inc/class-wpseo-replace-vars.php:897 msgid "Page %1$d of %2$d" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1067 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1069 +======= #: inc/class-wpseo-replace-vars.php:1085 +>>>>>>> .r12027 msgid "Replaced with the date of the post/page" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1068 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1070 +======= #: inc/class-wpseo-replace-vars.php:1086 +>>>>>>> .r12027 msgid "Replaced with the title of the post/page" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1069 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1071 +======= #: inc/class-wpseo-replace-vars.php:1087 +>>>>>>> .r12027 msgid "Replaced with the title of the parent page of the current page" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1070 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1072 +======= #: inc/class-wpseo-replace-vars.php:1088 +>>>>>>> .r12027 msgid "The site's name" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1071 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1073 +======= #: inc/class-wpseo-replace-vars.php:1089 +>>>>>>> .r12027 msgid "The site's tag line / description" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1072 +msgid "" +"Replaced with the post/page excerpt (or auto-generated if it does not exist)" +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1074 +msgid "Replaced with the post/page excerpt (or auto-generated if it does not exist)" +======= #: inc/class-wpseo-replace-vars.php:1090 msgid "Replaced with the post/page excerpt (or auto-generated if it does not exist)" +>>>>>>> .r12027 msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1073 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1075 +======= #: inc/class-wpseo-replace-vars.php:1091 +>>>>>>> .r12027 msgid "Replaced with the post/page excerpt (without auto-generation)" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1074 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1076 +======= #: inc/class-wpseo-replace-vars.php:1092 +>>>>>>> .r12027 msgid "Replaced with the current tag/tags" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1075 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1077 +======= #: inc/class-wpseo-replace-vars.php:1093 +>>>>>>> .r12027 msgid "Replaced with the post categories (comma separated)" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1076 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1078 +======= #: inc/class-wpseo-replace-vars.php:1094 +>>>>>>> .r12027 msgid "Replaced with the category description" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1077 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1079 +======= #: inc/class-wpseo-replace-vars.php:1095 +>>>>>>> .r12027 msgid "Replaced with the tag description" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1078 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1080 +======= #: inc/class-wpseo-replace-vars.php:1096 +>>>>>>> .r12027 msgid "Replaced with the term description" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1079 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1081 +======= #: inc/class-wpseo-replace-vars.php:1097 +>>>>>>> .r12027 msgid "Replaced with the term name" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1080 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1082 +======= #: inc/class-wpseo-replace-vars.php:1098 +>>>>>>> .r12027 msgid "Replaced with the current search phrase" msgstr "" +<<<<<<< .mine +#. translators: %s: wp_title() function +#: inc/class-wpseo-replace-vars.php:1083 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1083 +======= #: inc/class-wpseo-replace-vars.php:1099 -msgid "The separator defined in your theme's wp_title() tag." +>>>>>>> .r12027 +msgid "The separator defined in your theme's %s tag." msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1094 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1092 +======= #: inc/class-wpseo-replace-vars.php:1108 +>>>>>>> .r12027 msgid "Replaced with the post type single label" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1095 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1093 +======= #: inc/class-wpseo-replace-vars.php:1109 +>>>>>>> .r12027 msgid "Replaced with the post type plural label" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1096 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1094 +======= #: inc/class-wpseo-replace-vars.php:1110 +>>>>>>> .r12027 msgid "Replaced with the post/page modified time" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1097 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1095 +======= #: inc/class-wpseo-replace-vars.php:1111 +>>>>>>> .r12027 msgid "Replaced with the post/page ID" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1098 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1096 +======= #: inc/class-wpseo-replace-vars.php:1112 +>>>>>>> .r12027 msgid "Replaced with the post/page author's 'nicename'" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1099 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1097 +======= #: inc/class-wpseo-replace-vars.php:1113 +>>>>>>> .r12027 msgid "Replaced with the post/page author's 'Biographical Info'" msgstr "" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1100 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1098 +======= #: inc/class-wpseo-replace-vars.php:1114 +>>>>>>> .r12027 msgid "Replaced with the post/page author's userid" msgstr "" -#: inc/class-wpseo-replace-vars.php:1115 -msgid "Replaced with the current time" +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1101 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1099 +======= +#: inc/class-wpseo-replace-vars.php:1115 +>>>>>>> .r12027 +msgid "Replaced with the current time" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1102 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1100 +======= +#: inc/class-wpseo-replace-vars.php:1116 +>>>>>>> .r12027 +msgid "Replaced with the current date" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1103 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1101 +======= +#: inc/class-wpseo-replace-vars.php:1117 +>>>>>>> .r12027 +msgid "Replaced with the current day" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1104 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1102 +======= +#: inc/class-wpseo-replace-vars.php:1118 +>>>>>>> .r12027 +msgid "Replaced with the current month" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1105 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1103 +======= +#: inc/class-wpseo-replace-vars.php:1119 +>>>>>>> .r12027 +msgid "Replaced with the current year" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1106 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1104 +======= +#: inc/class-wpseo-replace-vars.php:1120 +>>>>>>> .r12027 +msgid "Replaced with the current page number with context (i.e. page 2 of 4)" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1107 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1105 +======= +#: inc/class-wpseo-replace-vars.php:1121 +>>>>>>> .r12027 +msgid "Replaced with the current page total" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1108 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1106 +======= +#: inc/class-wpseo-replace-vars.php:1122 +>>>>>>> .r12027 +msgid "Replaced with the current page number" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1109 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1107 +======= +#: inc/class-wpseo-replace-vars.php:1123 +>>>>>>> .r12027 +msgid "Attachment caption" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1110 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1108 +======= +#: inc/class-wpseo-replace-vars.php:1124 +>>>>>>> .r12027 +msgid "Replaced with the posts focus keyword" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1111 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1109 +======= +#: inc/class-wpseo-replace-vars.php:1125 +>>>>>>> .r12027 +msgid "Replaced with the slug which caused the 404" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1112 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1110 +======= +#: inc/class-wpseo-replace-vars.php:1126 +>>>>>>> .r12027 +msgid "Replaced with a posts custom field value" +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1113 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1111 +======= +#: inc/class-wpseo-replace-vars.php:1127 +>>>>>>> .r12027 +msgid "Replaced with a posts custom taxonomies, comma separated." +msgstr "" + +<<<<<<< .mine +#: inc/class-wpseo-replace-vars.php:1114 +||||||| .r11156 +#: inc/class-wpseo-replace-vars.php:1112 +======= +#: inc/class-wpseo-replace-vars.php:1128 +>>>>>>> .r12027 +msgid "Replaced with a custom taxonomies description" +msgstr "" + +<<<<<<< .mine +#: inc/options/class-wpseo-option-internallinks.php:68 +msgid "Error 404: Page not found" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:226 +msgid "N/A" +======= +#: inc/class-wpseo-utils.php:203 +msgid "N/A" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: inc/options/class-wpseo-option-internallinks.php:69 +msgid "Archives for" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:231 +msgid "Poor" +======= +#: inc/class-wpseo-utils.php:208 +msgid "Poor" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: inc/options/class-wpseo-option-internallinks.php:70 +msgid "Home" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:242 +msgid "Good" +======= +#: inc/class-wpseo-utils.php:219 +msgid "Good" +>>>>>>> .r12027 msgstr "" -#: inc/class-wpseo-replace-vars.php:1116 -msgid "Replaced with the current date" +<<<<<<< .mine +#: inc/options/class-wpseo-option-internallinks.php:71 +msgid "You searched for" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:246 +msgid "Bad" +======= +#: inc/class-wpseo-utils.php:223 +msgid "Bad" +>>>>>>> .r12027 msgstr "" -#: inc/class-wpseo-replace-vars.php:1117 -msgid "Replaced with the current day" +<<<<<<< .mine +#: inc/options/class-wpseo-option-internallinks.php:165 +msgid "Please select a valid taxonomy for post type \"%s\"" msgstr "" -#: inc/class-wpseo-replace-vars.php:1118 -msgid "Replaced with the current month" +#: inc/options/class-wpseo-option-internallinks.php:204 +msgid "Please select a valid post type for taxonomy \"%s\"" msgstr "" -#: inc/class-wpseo-replace-vars.php:1119 -msgid "Replaced with the current year" +#. translators: %1$s expands to the option name and %2$sexpands to Yoast SEO +#: inc/options/class-wpseo-option-ms.php:153 +msgid "" +"%1$s is not a valid choice for who should be allowed access to the %2$s " +"settings. Value reset to the default." msgstr "" -#: inc/class-wpseo-replace-vars.php:1120 -msgid "Replaced with the current page number with context (i.e. page 2 of 4)" +#: inc/options/class-wpseo-option-ms.php:173 +#: inc/options/class-wpseo-option-ms.php:183 +msgid "" +"The default blog setting must be the numeric blog id of the blog you want to " +"use as default." msgstr "" -#: inc/class-wpseo-replace-vars.php:1121 -msgid "Replaced with the current page total" +#: inc/options/class-wpseo-option-ms.php:173 +msgid "" +"This must be an existing blog. Blog %s does not exist or has been marked as " +"deleted." msgstr "" -#: inc/class-wpseo-replace-vars.php:1122 -msgid "Replaced with the current page number" +#: inc/options/class-wpseo-option-ms.php:183 +msgid "No numeric value was received." msgstr "" -#: inc/class-wpseo-replace-vars.php:1123 -msgid "Attachment caption" +#: inc/options/class-wpseo-option-rss.php:47 +msgid "The post %s appeared first on %s." msgstr "" -#: inc/class-wpseo-replace-vars.php:1124 -msgid "Replaced with the posts focus keyword" +#: inc/options/class-wpseo-option-social.php:103 +msgid "Summary" msgstr "" -#: inc/class-wpseo-replace-vars.php:1125 -msgid "Replaced with the slug which caused the 404" +#: inc/options/class-wpseo-option-social.php:104 +msgid "Summary with large image" msgstr "" -#: inc/class-wpseo-replace-vars.php:1126 -msgid "Replaced with a posts custom field value" +#: inc/options/class-wpseo-option-social.php:240 +msgid "%s does not seem to be a valid Twitter user-id. Please correct." msgstr "" -#: inc/class-wpseo-replace-vars.php:1127 -msgid "Replaced with a posts custom taxonomies, comma separated." +#: inc/options/class-wpseo-option-titles.php:178 +msgid "%s, Author at %s" msgstr "" -#: inc/class-wpseo-replace-vars.php:1128 -msgid "Replaced with a custom taxonomies description" +#: inc/options/class-wpseo-option-titles.php:179 +msgid "You searched for %s" msgstr "" -#: inc/class-wpseo-utils.php:203 -msgid "N/A" +#: inc/options/class-wpseo-option-titles.php:212 +msgid "%s Archive" msgstr "" -#: inc/class-wpseo-utils.php:208 -msgid "Poor" +#: inc/options/class-wpseo-option-xml.php:166 +msgid "" +"\"Max entries per sitemap page\" should be a positive number, which %s is " +"not. Please correct." msgstr "" -#: inc/class-wpseo-utils.php:219 -msgid "Good" +#: inc/options/class-wpseo-option.php:300 +msgid "%s does not seem to be a valid %s verification string. Please correct." msgstr "" -#: inc/class-wpseo-utils.php:223 -msgid "Bad" +#: inc/options/class-wpseo-option.php:333 +msgid "%s does not seem to be a valid url. Please correct." msgstr "" +#: inc/wpseo-non-ajax-functions.php:263 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:329 +======= #: inc/options/class-wpseo-option-internallinks.php:68 msgid "Error 404: Page not found" msgstr "" @@ -3529,99 +9551,418 @@ msgid "%s does not seem to be a valid url. Please correct." msgstr "" #: inc/wpseo-non-ajax-functions.php:267 +>>>>>>> .r12027 msgid "Keyword Research" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:269 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:335 +======= #: inc/wpseo-non-ajax-functions.php:273 +>>>>>>> .r12027 msgid "AdWords External" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:276 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:342 +======= #: inc/wpseo-non-ajax-functions.php:280 +>>>>>>> .r12027 msgid "Google Insights" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:283 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:349 +======= #: inc/wpseo-non-ajax-functions.php:287 +>>>>>>> .r12027 msgid "SEO Book" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:295 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:358 +======= #: inc/wpseo-non-ajax-functions.php:299 +>>>>>>> .r12027 msgid "Analyze this page" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:301 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:366 +======= #: inc/wpseo-non-ajax-functions.php:305 +>>>>>>> .r12027 msgid "Check Inlinks (OSE)" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:308 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:373 +======= #: inc/wpseo-non-ajax-functions.php:312 +>>>>>>> .r12027 msgid "Check Keyword Density" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:315 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:380 +======= #: inc/wpseo-non-ajax-functions.php:319 +>>>>>>> .r12027 msgid "Check Google Cache" msgstr "" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:322 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:387 +======= #: inc/wpseo-non-ajax-functions.php:326 +>>>>>>> .r12027 msgid "Check Headers" msgstr "" -#: inc/wpseo-non-ajax-functions.php:333 -msgid "Check Rich Snippets" +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:329 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:394 +======= +#: inc/wpseo-non-ajax-functions.php:333 +>>>>>>> .r12027 +msgid "Check Rich Snippets" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:336 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:401 +======= +#: inc/wpseo-non-ajax-functions.php:340 +>>>>>>> .r12027 +msgid "Facebook Debugger" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:343 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:408 +======= +#: inc/wpseo-non-ajax-functions.php:347 +>>>>>>> .r12027 +msgid "Pinterest Rich Pins Validator" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:350 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:415 +======= +#: inc/wpseo-non-ajax-functions.php:354 +>>>>>>> .r12027 +msgid "HTML Validator" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:357 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:422 +======= +#: inc/wpseo-non-ajax-functions.php:361 +>>>>>>> .r12027 +msgid "CSS Validator" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:364 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:429 +======= +#: inc/wpseo-non-ajax-functions.php:368 +>>>>>>> .r12027 +msgid "Google Page Speed Test" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:371 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:436 +======= +#: inc/wpseo-non-ajax-functions.php:375 +>>>>>>> .r12027 +msgid "Modern IE Site Scan" +msgstr "" + +<<<<<<< .mine +#: inc/wpseo-non-ajax-functions.php:378 +msgid "Mobile-Friendly Test" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:397 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:460 +======= +#: inc/wpseo-non-ajax-functions.php:382 +msgid "Mobile-Friendly Test" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:401 +>>>>>>> .r12027 +msgid "SEO Settings" +msgstr "" + +<<<<<<< .mine +#: vendor/yoast/i18n-module/i18n-module.php:170 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:651 +======= +#: inc/wpseo-non-ajax-functions.php:562 +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"As you can see, there is a translation of this plugin in %1$s. This " +"translation is currently %3$d%% complete. We need your help to make it " +"complete and to fix any errors. Please register at %4$s to help complete the " +"translation to %1$s!" +||||||| .r11156 +"The plugin All-In-One-SEO has been detected. Do you want to %simport its " +"settings%s." +======= +"The plugin All-In-One-SEO has been detected. Do you want to %simport its " +"settings%s?" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: vendor/yoast/i18n-module/i18n-module.php:172 +msgid "" +"You're using WordPress in %1$s. While %2$s has been translated to %1$s for " +"%3$d%%, it's not been shipped with the plugin yet. You can help! Register at " +"%4$s to help complete the translation to %1$s!" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:660 +msgid "All-In-One-SEO has been deactivated" +======= +#: inc/wpseo-non-ajax-functions.php:571 +msgid "All-In-One-SEO has been deactivated" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: vendor/yoast/i18n-module/i18n-module.php:174 +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:669 +======= +#: inc/wpseo-non-ajax-functions.php:581 +>>>>>>> .r12027 +msgid "" +"You're using WordPress in a language we don't support yet. We'd love for " +"%2$s to be translated in that language too, but unfortunately, it isn't " +"right now. You can change that! Register at %4$s to help translate it!" +msgstr "" + +<<<<<<< .mine +#: vendor/yoast/i18n-module/i18n-module.php:194 +msgid "Translation of %s" +||||||| .r11156 +#: inc/wpseo-non-ajax-functions.php:678 +msgid "Robots-Meta has been deactivated" +======= +#: inc/wpseo-non-ajax-functions.php:590 +msgid "Robots-Meta has been deactivated" +>>>>>>> .r12027 +msgstr "" + +<<<<<<< .mine +#: vendor/yoast/i18n-module/i18n-module.php:199 +msgid "Register now »" +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:138 +||||||| .r11156 +#: wp-seo-main.php:425 +======= +#: vendor/yoast/i18n-module/i18n-module.php:170 +>>>>>>> .r12027 +msgid "" +<<<<<<< .mine +"Warning! You're blocking external requests which means you won't be " +"able to get %s updates. Please add %s to %s." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:179 +msgid "Your %s license has been activated. " +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:183 +msgid "You have an unlimited license. " +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:185 +msgid "You have used %d/%d activations. " +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:190 +msgid "Did you know you can upgrade your license?" +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:194 +msgid "" +"Your license is expiring in %d days, would you like to extend " +"it?" +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:203 +msgid "" +"You've reached your activation limit. You must upgrade your " +"license to use it on this site." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:206 +msgid "" +"Your license has expired. You must extend your license in " +"order to use it again." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:209 +msgid "Failed to activate your license, your license key seems to be invalid." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:233 +msgid "Your %s license has been deactivated." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:235 +msgid "Failed to deactivate your %s license." +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:271 +msgid "Request error: \"%s\" (%scommon license notices%s)" +msgstr "" + +#: vendor/yoast/license-manager/class-license-manager.php:430 +msgid "%s: License Settings" +msgstr "" + +#: vendor/yoast/license-manager/class-plugin-license-manager.php:73 +msgid "" +"%s is network activated, you can manage your license in the network admin license page." +msgstr "" + +#: vendor/yoast/license-manager/class-plugin-license-manager.php:75 +msgid "" +"%s is network activated, please contact your site administrator to manage " +"the license." +msgstr "" + +#: vendor/yoast/license-manager/class-theme-license-manager.php:34 +#: vendor/yoast/license-manager/samples/sample-plugin.php:53 +msgid "%s License" +msgstr "" + +#: vendor/yoast/license-manager/class-theme-license-manager.php:34 +msgid "Theme License" +msgstr "" + +#: vendor/yoast/license-manager/class-theme-update-manager.php:96 +msgid "" +"Updating this theme will lose any customizations you have made. 'Cancel' to " +"stop, 'OK' to update." +msgstr "" + +#: vendor/yoast/license-manager/class-theme-update-manager.php:101 +msgid "" +"%s version %s is available. Check out what's new or update now." +msgstr "" + +#: vendor/yoast/license-manager/class-update-manager.php:83 +msgid "" +"%s failed to check for updates because of the following error: %s" +msgstr "" + +#: vendor/yoast/license-manager/class-update-manager.php:153 +msgid "" +"This site has not been activated properly on yoast.com and thus cannot check " +"for future updates. Please activate your site with a valid license key." +msgstr "" + +#: vendor/yoast/license-manager/views/form.php:15 +msgid "" +"We couldn't create a connection to our API to verify your license key(s). " +"Please ask your hosting company to allow outgoing connections from your " +"server to %s." msgstr "" -#: inc/wpseo-non-ajax-functions.php:340 -msgid "Facebook Debugger" +#: vendor/yoast/license-manager/views/form.php:19 +msgid "" +"Your server has an outdated version of the PHP module cURL (Version: %s). " +"Please ask your hosting company to update this to a recent version of cURL. " +"You can read more about that in our %sKnowledge base%s." msgstr "" -#: inc/wpseo-non-ajax-functions.php:347 -msgid "Pinterest Rich Pins Validator" +#: vendor/yoast/license-manager/views/form.php:31 +msgid "License status" msgstr "" -#: inc/wpseo-non-ajax-functions.php:354 -msgid "HTML Validator" +#: vendor/yoast/license-manager/views/form.php:41 +msgid "Toggle license status" msgstr "" -#: inc/wpseo-non-ajax-functions.php:361 -msgid "CSS Validator" +#: vendor/yoast/license-manager/views/form.php:45 +msgid "Deactivate License" msgstr "" -#: inc/wpseo-non-ajax-functions.php:368 -msgid "Google Page Speed Test" +#: vendor/yoast/license-manager/views/form.php:46 +msgid "" +"(deactivate your license so you can activate it on another WordPress site)" msgstr "" -#: inc/wpseo-non-ajax-functions.php:375 -msgid "Modern IE Site Scan" +#: vendor/yoast/license-manager/views/form.php:50 +msgid "Activate License" msgstr "" -#: inc/wpseo-non-ajax-functions.php:382 -msgid "Mobile-Friendly Test" +#: vendor/yoast/license-manager/views/form.php:52 +msgid "Please enter a license key in the field below first." msgstr "" -#: inc/wpseo-non-ajax-functions.php:401 -msgid "SEO Settings" +#: vendor/yoast/license-manager/views/form.php:60 +msgid "License Key" msgstr "" -#: inc/wpseo-non-ajax-functions.php:562 -msgid "" -"The plugin All-In-One-SEO has been detected. Do you want to %simport its " -"settings%s?" +#: vendor/yoast/license-manager/views/form.php:62 +msgid "Paste your %s license key here.." msgstr "" -#: inc/wpseo-non-ajax-functions.php:571 -msgid "All-In-One-SEO has been deactivated" +#: vendor/yoast/license-manager/views/form.php:64 +msgid "You defined your license key using the %s PHP constant." msgstr "" -#: inc/wpseo-non-ajax-functions.php:581 -msgid "" -"The plugin Robots-Meta has been detected. Do you want to %simport its " -"settings%s." +#: vendor/yoast/license-manager/views/form.php:81 +msgid "Your %s license will expire on %s." msgstr "" -#: inc/wpseo-non-ajax-functions.php:590 -msgid "Robots-Meta has been deactivated" +#: vendor/yoast/license-manager/views/form.php:84 +msgid "%sRenew your license now%s." msgstr "" -#: vendor/yoast/i18n-module/i18n-module.php:170 +#: wp-seo-main.php:383 msgid "" +||||||| .r11156 +======= "As you can see, there is a translation of this plugin in %1$s. This " "translation is currently %3$d%% complete. We need your help to make it " "complete and to fix any errors. Please register at %4$s to help complete " @@ -3815,10 +10156,33 @@ msgstr "" #: wp-seo-main.php:368 msgid "" +>>>>>>> .r12027 "The Standard PHP Library (SPL) extension seem to be unavailable. Please ask " "your web host to enable it." msgstr "" +<<<<<<< .mine +#. translators: %1$s expands to Yoast SEO, %2$s / %3$s: links to the +#. installation manual in the Readme for the Yoast SEO code repository on +#. GitHub +#: wp-seo-main.php:405 +msgid "" +"The %1$s plugin installation is incomplete. Please refer to %2$sinstallation " +"instructions%3$s." +msgstr "" + +#: wp-seo-main.php:429 +msgid "" +"The filter extension seem to be unavailable. Please ask your web host to " +"enable it." +msgstr "" + +#: wp-seo-main.php:439 +msgid "Activation failed:" +msgstr "" + +||||||| .r11156 +======= #: wp-seo-main.php:390 #. translators: %1$s expands to Yoast SEO, %2$s / %3$s: links to the #. installation manual in the Readme for the Yoast SEO code repository on @@ -3838,14 +10202,15 @@ msgstr "" msgid "Activation failed:" msgstr "" +>>>>>>> .r12027 #. Plugin Name of the plugin/theme msgid "Yoast SEO" msgstr "" #. Plugin URI of the plugin/theme msgid "" -"https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=" -"plugin&utm_campaign=wpseoplugin" +"https://yoast.com/wordpress/plugins/seo/" +"#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin" msgstr "" #. Description of the plugin/theme @@ -3874,4 +10239,329 @@ msgctxt "posts" msgid "Trash (%s)" msgid_plural "Trash (%s)" msgstr[0] "" -msgstr[1] "" \ No newline at end of file +msgstr[1] "" + +#: js/scoreFormatter.js:143 +msgid "No keyword" +msgstr "" + +#: js/scoreFormatter.js:147 +msgid "Bad SEO score" +msgstr "" + +#: js/scoreFormatter.js:151 +msgid "Ok SEO score" +msgstr "" + +#: js/scoreFormatter.js:155 +msgid "Good SEO score" +msgstr "" + +#. translators: %1$d expands to the number of words in the text, %2$s to the recommended minimum of words +#: js/config/scoring.js:19 +msgid "" +"The text contains %1$d words, this is more than the %2$d word recommended " +"minimum." +msgstr "" + +#. translators: %1$d expands to the number of words in the text, %2$s to the recommended minimum of words +#: js/config/scoring.js:27 +msgid "" +"The text contains %1$d words, this is slightly below the %2$d word " +"recommended minimum. Add a bit more copy." +msgstr "" + +#. translators: %1$d expands to the number of words in the text, %2$d to the recommended minimum of words +#: js/config/scoring.js:35 js/config/scoring.js:43 +msgid "" +"The text contains %1$d words, this is below the %2$d word recommended " +"minimum. Add more useful content on this topic for readers." +msgstr "" + +#. translators: %1$d expands to the number of words in the text +#: js/config/scoring.js:51 +msgid "" +"The text contains %1$d words. This is far too low and should be increased." +msgstr "" + +#: js/config/scoring.js:65 +msgid "" +"No focus keyword was set for this page. If you do not set a focus keyword, " +"no score can be calculated." +msgstr "" + +#: js/config/scoring.js:70 +msgid "Your keyphrase is over 10 words, a keyphrase should be shorter." +msgstr "" + +#. translators: %1$f expands to the keyword density percentage, %2$d expands to the number of times the keyword is found +#: js/config/scoring.js:82 +msgid "" +"The keyword density is %1$f%, which is way over the advised 2.5% maximum; " +"the focus keyword was found %2$d times." +msgstr "" + +#. translators: %1$f expands to the keyword density percentage, %2$d expands to the number of times the keyword is found +#: js/config/scoring.js:90 +msgid "" +"The keyword density is %1$f%, which is over the advised 2.5% maximum; the " +"focus keyword was found %2$d times." +msgstr "" + +#. translators: %1$f expands to the keyword density percentage, %2$d expands to the number of times the keyword is found +#: js/config/scoring.js:98 +msgid "" +"The keyword density is %1$f%, which is great; the focus keyword was found " +"%2$d times." +msgstr "" + +#. translators: %1$f expands to the keyword density percentage, %2$d expands to the number of times the keyword is found +#: js/config/scoring.js:106 +msgid "" +"The keyword density is %1$f%, which is a bit low; the focus keyword was " +"found %2$d times." +msgstr "" + +#: js/config/scoring.js:122 js/config/scoring.js:127 js/config/scoring.js:131 +msgid "" +"No outbound links appear in this page, consider adding some as appropriate." +msgstr "" + +#: js/config/scoring.js:137 +msgid "Outbound links appear in this page" +msgstr "" + +#: js/config/scoring.js:143 +msgid "" +"You're linking to another page with the focus keyword you want this page to " +"rank for. Consider changing that if you truly want this page to rank." +msgstr "" + +#. translators: %2$s expands the number of outbound links +#: js/config/scoring.js:147 +msgid "This page has %2$s outbound link(s), all nofollowed." +msgstr "" + +#. translators: %2$s expands to the number of nofollow links, %3$s to the number of outbound links +#: js/config/scoring.js:153 +msgid "This page has %2$s nofollowed link(s) and %3$s normal outbound link(s)." +msgstr "" + +#. translators: %1$s expands to the number of outbound links +#: js/config/scoring.js:157 +msgid "This page has %1$s outbound link(s)." +msgstr "" + +#: js/config/scoring.js:177 +msgid "fairly difficult" +msgstr "" + +#: js/config/scoring.js:178 +msgid "Try to make shorter sentences to improve readability." +msgstr "" + +#: js/config/scoring.js:185 +msgid "difficult" +msgstr "" + +#: js/config/scoring.js:186 js/config/scoring.js:194 +msgid "" +"Try to make shorter sentences, using less difficult words to improve " +"readability." +msgstr "" + +#: js/config/scoring.js:193 +msgid "very difficult" +msgstr "" + +#. translators: %1$s expands to the numeric flesh reading ease score, %2$s to a link to the wikipedia article about Flesh ease reading score, %3$s to the easyness of reading, %4$s expands to a note about the flesh reading score. +#: js/config/scoring.js:203 +msgid "" +"The copy scores %1$s in the %2$s test, which is considered %3$s to read. %4$s" +msgstr "" + +#: js/config/scoring.js:223 +msgid "" +"No meta description has been specified, search engines will display copy " +"from the page instead." +msgstr "" + +#. translators: %1$d expands to the minimum length for the meta description, %2$d to the maximum length for the meta description +#: js/config/scoring.js:230 +msgid "" +"The meta description is under %1$d characters, however up to %2$d characters " +"are available." +msgstr "" + +#. translators: %2$d expands to the maximum length for the meta description +#: js/config/scoring.js:237 +msgid "" +"The specified meta description is over %2$d characters. Reducing it will " +"ensure the entire description is visible" +msgstr "" + +#: js/config/scoring.js:243 +msgid "" +"In the specified meta description, consider: How does it compare to the " +"competition? Could it be made more appealing?" +msgstr "" + +#: js/config/scoring.js:254 +msgid "The meta description contains the focus keyword." +msgstr "" + +#: js/config/scoring.js:259 +msgid "" +"A meta description has been specified, but it does not contain the focus " +"keyword." +msgstr "" + +#: js/config/scoring.js:268 +msgid "" +"The focus keyword doesn't appear in the first paragraph of the copy. Make " +"sure the topic is clear immediately." +msgstr "" + +#: js/config/scoring.js:270 +msgid "The focus keyword appears in the first paragraph of the copy." +msgstr "" + +#. translators: %1$s expands to a link to the wikipedia article about stop words, %2$s expands to the actual stop words found in the text +#: js/config/scoring.js:281 +msgid "" +"The focus keyword for this page contains one or more %1$s, consider removing " +"them. Found '%2$s'." +msgstr "" + +#: js/config/scoring.js:289 +msgid "" +"stop words" +msgstr "" + +#: js/config/scoring.js:296 +msgid "No subheading tags (like an H2) appear in the copy." +msgstr "" + +#: js/config/scoring.js:301 +msgid "" +"You have not used your focus keyword in any subheading (such as an H2) in " +"your copy." +msgstr "" + +#. translators: %1$d expands to the number of subheadings, %2$d to the number of subheadings containing the focus keyword +#: js/config/scoring.js:309 +msgid "" +"The focus keyword appears in %2$d (out of %1$d) subheadings in the copy. " +"While not a major ranking factor, this is beneficial." +msgstr "" + +#: js/config/scoring.js:319 +msgid "Please create a page title." +msgstr "" + +#. translators: %3$d expands to the number of characters in the page title, %1$d to the minimum number of characters for the title +#: js/config/scoring.js:325 +msgid "" +"The page title contains %3$d characters, which is less than the recommended " +"minimum of %1$d characters. Use the space to add keyword variations or " +"create compelling call-to-action copy." +msgstr "" + +#. translators: %3$d expands to the number of characters in the page title, %2$d to the maximum number of characters for the title +#: js/config/scoring.js:332 +msgid "" +"The page title contains %3$d characters, which is more than the viewable " +"limit of %2$d characters; some words will not be visible to users in your " +"listing." +msgstr "" + +#. translators: %1$d expands to the minimum number of characters in the page title, %2$d to the maximum number of characters +#: js/config/scoring.js:340 +msgid "" +"The page title is between the %1$d character minimum and the recommended " +"%2$d character maximum." +msgstr "" + +#. translators: %1$s expands to the focus keyword +#: js/config/scoring.js:358 +msgid "The focus keyword '%1$s' does not appear in the page title." +msgstr "" + +#: js/config/scoring.js:364 +msgid "" +"The page title contains the focus keyword, at the beginning which is " +"considered to improve rankings." +msgstr "" + +#: js/config/scoring.js:370 +msgid "" +"The page title contains the focus keyword, but it does not appear at the " +"beginning; try and move it to the beginning." +msgstr "" + +#: js/config/scoring.js:379 +msgid "The focus keyword appears in the URL for this page." +msgstr "" + +#: js/config/scoring.js:383 +msgid "" +"The focus keyword does not appear in the URL for this page. If you decide to " +"rename the URL be sure to check the old URL 301 redirects to the new one!" +msgstr "" + +#: js/config/scoring.js:389 +msgid "The slug for this page is a bit long, consider shortening it." +msgstr "" + +#. translators: %1$s opens a link to a wikipedia article about stop words, %2$s closes the link +#: js/config/scoring.js:398 +msgid "" +"The slug for this page contains one or more %1$sstop words%2$s, consider " +"removing them." +msgstr "" + +#. translators: this link is referred to in the content analysis when a slug contains one or more stop words +#: js/config/scoring.js:406 +msgid "http://en.wikipedia.org/wiki/Stop_words" +msgstr "" + +#: js/config/scoring.js:421 +msgid "No images appear in this page, consider adding some as appropriate." +msgstr "" + +#: js/config/scoring.js:427 +msgid "The images on this page are missing alt tags." +msgstr "" + +#: js/config/scoring.js:433 +msgid "The images on this page contain alt tags" +msgstr "" + +#: js/config/scoring.js:439 +msgid "The images on this page contain alt tags with the focus keyword." +msgstr "" + +#: js/config/scoring.js:445 +msgid "" +"The images on this page do not have alt tags containing your focus keyword." +msgstr "" + +#: js/config/scoring.js:451 +msgid "You've never used this focus keyword before, very good." +msgstr "" + +#. translators: %1$s and %2$s expand to an admin link where the focus keyword is already used +#: js/config/scoring.js:458 +msgid "" +"You've used this focus keyword %1$sonce before%2$s, be sure to make very " +"clear which URL on your site is the most important for this keyword." +msgstr "" + +#. translators: %3$s and $2$s expand to the admin search page for the focus keyword, %4$d expands to the number of times this focus keyword has been used before, %5$s and %6$s expand to a link to an article on yoast.com about cornerstone content +#: js/config/scoring.js:466 +msgid "" +"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a " +"good idea to read %6$sthis post on cornerstone content%5$s and improve your " +"keyword strategy." +msgstr "" diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/readme.txt b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/readme.txt index 5cf26d34..1fe214fd 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/readme.txt +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/readme.txt @@ -4,9 +4,19 @@ Donate link: https://yoast.com/ License: GPLv3 License URI: http://www.gnu.org/licenses/gpl.html Tags: seo, SEO, Yoast SEO, google, meta, meta description, search engine optimization, xml sitemap, xml sitemaps, google sitemap, sitemap, sitemaps, robots meta, rss, rss footer, yahoo, bing, news sitemaps, XML News Sitemaps, WordPress SEO, WordPress SEO by Yoast, yoast, multisite, canonical, nofollow, noindex, keywords, meta keywords, description, webmaster tools, google webmaster tools, seo pack +<<<<<<< .mine +Requires at least: 4.0 +Tested up to: 4.4 +Stable tag: 3.0.6 +||||||| .r11156 +Requires at least: 3.8 +Tested up to: 4.0 +Stable tag: 1.7.1 +======= Requires at least: 3.9 Tested up to: 4.3 Stable tag: 2.3.4 +>>>>>>> .r12027 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using Yoast SEO plugin. @@ -120,26 +130,641 @@ You'll find the [FAQ on Yoast.com](https://yoast.com/wordpress/plugins/seo/faq/) == Changelog == +<<<<<<< .mine += 3.0.6 = +||||||| .r11156 += 1.7.1 = +======= += 2.3.4 = +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: December 1st, 2015 +||||||| .r11156 +* Security fix: fixed possible cross scripting issue with encoded entities in a post title. This could potentially allow an author on your site to execute JavaScript when you visit that posts edit page, allowing them to do rights expansion or otherwise. +======= +Release Date: August 6th, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +* Bugfixes: + * Fixes the recalculate tool that was broken with the Localized Flesch Reading ease change... +||||||| .r11156 +Thanks to [Joe Hoyle](http://www.joehoyle.co.uk/) for responsibly disclosing this issue. +======= +* Bugfixes: + * Fixes a bug where the focus keyword test in the Yoast SEO metabox was broken as a regression of removing the autocomplete functionality. +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0.5 = +||||||| .r11156 += 1.7 = +======= += 2.3.3 = +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: December 1st, 2015 +||||||| .r11156 +* Features: + * Adds Twitter inputs to the Social tab. + * Tries to purge Facebook cache when OpenGraph settings are edited. + * Added a new box promoting our translation site for non en_US users. + * Added several new tools (Pinterest Rich Pins, HTML Validation, CSS Validation, Google PageSpeed), props [bhubbard](https://github.com/bhubbard) +======= +Release Date: August 6th, 2015 +>>>>>>> .r12027 + +* Removes the autocomplete functionality from the focus keyword field in the Yoast SEO metabox because Google is shutting down its autocomplete API [as of August 10th](http://googlewebmastercentral.blogspot.nl/2015/07/update-on-autocomplete-api.html). + +* Enhancements: +<<<<<<< .mine + * Made it possible to opt out from the OnPage.org indexability check. + * Contains a few small performance enhancements in the Content Analysis. + * Only includes Flesch Reading ease test when site language is set to English, since it doesn't really add value in other languages yet. +||||||| .r11156 + * Functionality change: when there's a featured image, output only that for both Twitter and FB, ignore other images in post. + * UX change: rework logic for showing networks on Social tab, social network no longer shows on social tabs if not enabled in admin. + * Always output a specific Twitter title and description, as otherwise we can't overwrite them from metabox. + * Check for conflicts with other plugins doing XML sitemaps or OpenGraph. + * Qtip library replaced with Qtip2. + * Merged several similar translation strings, props [@ramiy](https://github.com/ramiy) + * Several RTL improvements, props [@ramiy](https://github.com/ramiy) + * Several Typo fixes, props [@ramiy](https://github.com/ramiy) + * Updated Open Site Explorer Link, props [bhubbard](https://github.com/bhubbard) + * Updated all links to use // instead of https:// and http://, props [bhubbard](https://github.com/bhubbard) + * When importing from AIOSEO, on finding GA settings, advertise Yoast GA plugin. + * Makes sure stopwords are only removed from slug on publication. + * Updated translations. +======= + * Introduces a dismissible notice encouraging users to connect with Google Search Console. + * Improves the dashboard widget to only show posts which are actually editable by the current user. + * Makes the plugin conflict notices persistent and dismissible. Once dismissed, it will no longer be shown for the specific set of conflicting plugins the notice has been dismissed for. + * Contains a few textual improvements. + * Makes sure the counts are updated correctly and intuitively when marking a Search Console issue as fixed. +>>>>>>> .r12027 + +* Bugfixes: +<<<<<<< .mine + * Fixes a lot of issues with dismissible notices. Thanks [Craig Pearson](https://github.com/craigpearson) for writing the patch! + * Fixes several issues with keyword recognition for keywords which contain punctuation. + * Fixes an issue where keywords containing diacritics were not recognized in alt tags. +||||||| .r11156 + * Fixes a bug where the wrong image was being displayed in twitter cards. + * Fixes a bug where facebook would display the wrong image. + * Fixes a bug where last modified in sitemap was broken. + * Fixes a bug wher SEO-score heading made the table row jump on hover because there wasn't enough place left for the down arrow. + * Removed a couple of languages that were not up to date. +======= + * Fixes a bug where current_user_can was called before init, props [Claudio Sanches](https://github.com/claudiosmweb). + * Fixes a bug where the article:publisher metatag was also included on pages that were not of type 'article'. + * Fixes a bug where the link to the list of posts with the same focus keyword was broken for focus keywords containing a space. + * Fixes a bug where a h3 header was being closed with a h2 closing tag. + * Fixes a bug where the Google Search Console issues table was giving errors on installs running on PHP 5.2. + * Fixes a bug where the sitemap caches were no longer being cleared when running Yoast SEO in the upcoming 4.3 release of WordPress. +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0.4 = +||||||| .r11156 += 1.6.3 = +======= += 2.3.2 = +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: November 25th, 2015 +||||||| .r11156 +* Bugfixes: + * Revert earlier logic change that broke taxonomy sitemaps. +======= +Release Date: July 23rd, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +* Enhancement: Made the "Analyze entire site" button have better color contrast and resemble JetPack. Thanks [WPExplorer](https://github.com/wpexplorer) for the contribution. + +||||||| .r11156 += 1.6.2 = + +======= +>>>>>>> .r12027 +* Bugfixes: +<<<<<<< .mine + * Fixes JS errors in combination with Give plugin, CMB2 Framework, ACF layout builder and any other plugin that replaces the editor with something else. Thanks a lot [Daniel Seripap](https://github.com/seripap) for fixing. + * Fixes JavaScript error on post types without 'editor' capability. Thanks [Aaron Hipple](https://github.com/aaronhipple) for the fix and [Zvonko BiÅ¡kup](https://github.com/codeforest) for testing. + * Fixes a lot of text analysis issues for languages with non-latin scripts, including the "0% keyword density" issues. + * Fixes an issue where html tags were not stripped properly from taxonomy descriptions for custom taxonomies. + * Fixes possible "URI too long" errors when parsing shortcodes in the content before it is analyzed. +||||||| .r11156 + * Fixed security issue with XSS in bulk editor, props @ryanhellyer. + * Fix bug where URL would show wrongly in snippet preview for static homepage. + * Fix bug where filtering for posts without a focus keyword in the posts overview wouldn't work. + * Fix a bug where code wouldn't be escaped in the bulk editor. +======= + * Fixes a bug where non-admin users were no longer able to update their profile with Yoast SEO active. + * Fixes a bug where all labels in the Yoast SEO admin were bold. +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 +* Enhancements: + * When meta description is present, `og:description` is filled with that on category pages. + * Texturize some pointers, props @nacin. + * Fix typo in tour, props @markjaquith. + * Code optimization in in replace vars functionality, props @dannyvankooten. +======= += 2.3.1 = +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0.3 = +||||||| .r11156 += 1.6.1 = +======= +Release Date: July 22nd, 2015 +>>>>>>> .r12027 + +Release Date: November 19th, 2015 + +* Bugfixes: +<<<<<<< .mine + * Fixes a bug where the snippet preview was broken. +||||||| .r11156 + * Remove tags from title and description for snippet preview. + * Fix several notices. + * Improve escaping of values in the bulk editor before saving. +======= + * Makes sure authors and editors cannot submit advanced metadata on a post when the advanced tab in the metabox has been disabled for them. Thanks Peter Allor from IBM for finding and reporting this issue. + * Fixes a bug where upgrading to version 2.3 would occasionally cause WSOD's on both admin and frontend. We were unable to pinpoint the exact conflicting plugins and themes, but we are quite confident it was caused by us using, and others hooking into, WP_Query too early. +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0.2 = +||||||| .r11156 +* Enhancements: + * New admin icon using SVG, which uses proper color. + * Introduced a filter for the XML Sitemap base URL, `wpseo_sitemaps_base_url` + * Introduced a filter for the JSON+LD output: `wpseo_json_ld_search_output` +======= += 2.3 = +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: November 19th, 2015 +||||||| .r11156 +* For developers: the [GitHub version](https://github.com/Yoast/wordpress-seo) now contains a full Grunt implementation for many actions. +======= +Release Date: July 21st, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 += 1.6 = + +This update removes more code than it adds, because Google stopped support for rel=author. It adds the new json+ld code for search in sitelinks though, so could have some cool results! + +======= +* Features: + * Adds full integration with Google Search Console (formerly: Google Webmaster Tools). It is now possible to see all errors from Google straight in your WordPress install. If you have [Yoast SEO Premium](https://yoast.com/wordpress/plugins/seo-premium/#utm_source=wordpress-seo-config&utm_medium=textlink&utm_campaign=changelog), you'll even be able to fix those errors by redirecting the broken urls. + * Adds a dashboard widget showing published posts' SEO scores. Thanks [Brandon Hubbard](https://github.com/bhubbard) for the idea! + * Adds a customizer panel for Yoast SEO Breadcrumbs if breadcrumbs are enabled or the active theme has declared theme support for it. Props again to [Brandon Hubbard](https://github.com/bhubbard) for his awesome contribution. + +* Enhancements: + * Renames plugin from "WordPress SEO by Yoast" to "Yoast SEO". + * Adds a warning advising to change the tagline, if a site still has the default WordPress tagline "just another WordPress site". + * Changes the default columns visibility for the edit posts overview page. Only the SEO score column is now visible by default. + * Contains several en_US string improvements, including a fix for a typo in the word "typos"... Thanks [Gary Jones](https://github.com/GaryJones) for redacting! + * Adds a filter to allow filtering the content before analysis in the Twitter class, props [Pete Nelson](https://github.com/petenelson). + * Adds a link to our knowledge base on how to retrieve a Facebook admin user ID. + +>>>>>>> .r12027 +* Bugfixes: +<<<<<<< .mine + * Fixes a bug where disabling the visual editor caused our content analysis to break. + * Fixes a bug where the content analysis would break on installs that replace tinyMCE with ckEditor. Currently only supports the html editor. + * Fixes a bug where slug changes were not properly synchronized in the snippet preview. + * Fixes a bug where long slugs could be broken by wrongful synchronization with the snippet preview. + * Fixes a bug where digits were not analyzed well in the content, causing focus keywords or keyphrases with digits to no longer be matched. + * Fixes a bug where the url in the snippet preview was not in line with permalink settings. Fixed for permalinks containing the post name. + * Fixes a bug where focus keyphrases of more than two words would not be recognized properly in the content. + * Fixes a bug where the translation files were corrupted causing the translations to no longer work. +||||||| .r11156 + * Removed leftover code for the deleted HTML sitemap functionality. + * Fix [a bug](https://github.com/Yoast/wordpress-seo/pull/1520) where the wrong `$post` info would be used for the metabox, props [mgmartel](https://github.com/mgmartel). + * Fix the way we [replace whitespace](https://github.com/Yoast/wordpress-seo/pull/1542) to be more compatible with different encoding, props [Jrf](http://profiles.wordpress.org/jrf). +======= + * Fixes a bug where sitemaps for taxonomies with no eligible terms were still included and responded with 404 errors when visited. + * Fixes a bug where breadcrumbs were wrongly nested on archive paginations, props [Filippo Buratti](https://github.com/fburatti). + * Fixes a bug where the wrong separator was used after import/export. + * Fixes a bug where XML Sitemaps query invalidation caused other queries to fail as well. + * Fixes a bug where the wrong placeholder was being used for the search term string in the JSON+LD Search markup. + * Fixes a bug where the link to the newsletter signup in the tour was broken by uncommunicated changes in Mailchimp. + * Fixes a bug where the Edit Files settings page in the network admin was broken, props [Ajay D'Souza](https://github.com/ajaydsouza). + * Fixes a broken link in the advanced tab of the Yoast SEO metabox to the titles and meta's settings. +>>>>>>> .r12027 + +<<<<<<< .mine +* Enhancements: + * Fixes caching problems. We've versioned file names for assets that have changed to circumvent caching strategies that consider preventing regular cache busting a good idea... +||||||| .r11156 +* Enhancements: + * Implement new [sitelinks search box json+ld code](https://developers.google.com/webmasters/richsnippets/sitelinkssearch). Enabled by default, to disable use the new `disable_wpseo_json_ld_search` filter. To change the URL being put out use the `wpseo_json_ld_search_url` filter. + * Improved the onboarding tour to be more in line with the current status of the plugin. +======= +* Other notable changes: + * Removed the possibility to redirect a post in the advanced tab of the Yoast SEO metabox. + * Moved the option to include a post in sitemap from the advanced tab of the Yoast SEO metabox to the sitemap settings. + * Removed the option to configure sitemap priority in the advanced tab of the Yoast SEO metabox. + * Added multiple checks to prevent plugin compatibility issue between Yoast SEO and old versions of Google Analytics by Yoast. + * Updated the banners with new designs. +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0.1 = +||||||| .r11156 +* Other: + * Removed all code to do with `rel=author` as Google has stopped that "experiment", see [this blog post](https://yoast.com/ten-blue-links/) for more info. +======= += 2.2.1 = +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: November 18th, 2015 +||||||| .r11156 +* i18n + * Updated da_DK, fa_IR, fr_FR, hr, hu_HU, nl_NL, pt_BR and tr_RK +======= +Release Date: June 11th, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 += 1.5.6 = + +======= +* Makes sure users can close the tour by circumventing possible JavaScript caching issues that might occur. + +>>>>>>> .r12027 +<<<<<<< .mine +* Bugfixes: + * Fixes a bug where users where getting error notifications about how their site was not indexable when in fact no check had been performed yet. + * Fixes a few broken links to help docs about the OnPage.org integration. + * Fixes an edgecase where the indexability check would go wrong for sites that filter the home url. + * Fixes a bug where the admin email that was sent to report the current indexability status was not rendered as HTML. +||||||| .r11156 +* Bugfixes: + * Fixed a dot without explanation on the page analysis tab. + * Fix save all feature bug in Bulk Editor as reported (and fixed) by [vdwijngaert](https://github.com/vdwijngaert) [here](https://github.com/Yoast/wordpress-seo/issues/1485). + * Fix bug where meta description based on a template wouldn't show up on author archive pages. + * Fix bug where shortlink HTTP header wouldn't be removed when checking the remove shortlink function as [reported here](https://github.com/Yoast/wordpress-seo/issues/1397). + * Fix a bug where force title setting would be reset on upgrade / update. + * Fix warning being thrown in breadcrumbs code. +======= += 2.2 = +>>>>>>> .r12027 + +<<<<<<< .mine += 3.0 = +||||||| .r11156 +* Enhancements: + * Removing sitemap transients when updating the plugin, to make sure XML sitemaps always use latest code. + * Styling of metaboxes is more in line with WordPress core. + * Add new `%%user_description%%` replacement tag. + * Add option to remove users with zero posts from the XML sitemap. + * Move SEO data on term edit pages to lower on the page, to not interfere with themes. + * Code: use WP time constants as introduced in WP 3.5. +======= +Release Date: June 10th, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: November 18th, 2015 + +* Features: + * Adds realtime content analysis to the Yoast SEO metabox for all post types and taxonomies. + * Adds a tool to recalculate all SEO scores using the new client side analysis. + * Adds a content analysis plugin for parsing shortcodes before the content is analyzed. This means the snippet preview will now take the rendered content of shortcodes into account. + * Adds a content analysis plugin for parsing replace vars before the content is analyzed, allowing templates set in the Yoast SEO admin to work everywhere. + * Adds a weekly check if the homepage is indexable (in collaboration with [OnPage.org](https://en.onpage.org/lp/yoast/)). + * Adds possibility to import titles, metas and settings from the WPSEO.de plugin. + * Adds possibility to set Facebook (Opengraph), Twitter and Google+ metadata for taxonomies. + +||||||| .r11156 +* Other: + * Removing html-sitemap shortcode, it'll reappear in WordPress SEO Premium when it actually works. + += 1.5.5.3 = +Release Date: August 14th, 2014 + +* Bugfixes: + * Prevent dying on edit post page for new posts / pages without focus keyword. + * Fix replacement of `%%excerpt%%` in snippet preview. + += 1.5.5.2 = +Release Date: August 14th, 2014 + +* Bugfixes: + * Fix wrong SEO Analysis value icon, regression from 1.5.5.1 +======= +>>>>>>> .r12027 +* Enhancements: +<<<<<<< .mine + * We've completely revised the UX of the Yoast SEO metabox. We've introduced multiple sections which in turn can contain one or more tabs. + * Makes the Yoast SEO metabox on the taxonomy edit page the same as on the post edit page. + * Makes sure the capability for the General Settings menu is also `wpseo_manage_options_capability`. + * Adds a fix to the tour allowing for multiple plugins to use WP pointers at the same time. + * Makes sure all Yoast SEO settings pages are also accessible through the WP admin bar. +||||||| .r11156 + * Add role specific removal from XML Author sitemap + * Add option to exclude user from XML Author sitemap on user profile page +======= + * Contains several accessibility improvements, including 'for' attributes for labels and several links to explanatory articles. + * Adds support for creating partial sitemaps with WP CLI, props [Lars Schenk](https://github.com/larsschenk). + * Add Google's mobile friendly test to the SEO toolbar, props [Brandon Hubbard](https://github.com/bhubbard). + * Makes sure slugs are not being stripped if the remaining slug is less than 3 characters, props [andyexeter](https://github.com/andyexeter). + * Shows an activation error when dependencies were not installed properly with composer. + * Added a filter to allow the RSS footer to be dynamically shown/hidden, props [Hugh Lashbrooke](https://github.com/hlashbrooke). + * Added many translator comments to help translators more easily get the context. + * Made sure Open Graph article tags are added separately, following up on the Open Graph specification. + * Adds recommended image sizes per Social network in the social tab of the SEO metabox. + * Removes the tracking functionality. + * Shows a dismissible notice with a link to the about page that is shown after every update. The user is no longer being redirected and only has to dismiss the notice once for all sites (in case of multisite). + * Adds a link to the about page to the general tab of the settings dashboard. + * Makes the tour dismissible on user level. + * Adds Twitter profile to JSON LD output. + * Twitter profile input field now also accepts full url and automatically strips it down to just the username. + * Only adds the JSON LD output to the frontpage, since it's not needed on other pages. + * Makes all Yoast SEO notices dismissible. +>>>>>>> .r12027 + +* Bugfixes: +<<<<<<< .mine + * Fixes a bug where the `og:image` would not be set, even when a default image was available. + * Fixes a bug where the links in the sitemap would 'randomly' change from https to http or the other way around (in very rare circumstances). + * Fixes a bug where it was not possible to upload different images for different social media in the post metabox. + * Fixes a bug where users would see the after-update notice, but were not allowed to visit the about page. + * Fixes a bug where we were not properly splitting taxonomy metadata when a shared taxonomy term got split through a Cron job, props [Daniel Homer](https://github.com/danielhomer). +||||||| .r11156 + * Fixed a potential error with `$canonical` not being a string after being filtered. + * Fixed more bugs with first paragraph keyword detection. + * Fixed bug in saving new opengraph title and images variables in the social settings. + * Fixed bug where SEO score incorrectly reported as 'Bad' when no focus keyword set, props [smerriman](https://github.com/smerriman) for finding, props [Jrf](http://profiles.wordpress.org/jrf) for the fix. + * Override `woo_title()` output harder than before to remove need for force rewrite with WooThemes themes. +======= + * Fixes a bug where the widgets were removed from every XML file. This is now only the case for the sitemaps. + * Fixes a bug where validation errors were shown for the wrong variables in the titles and metas settings. + * Fixes a bug where the SEO toolbar was broken. + * Fixes a few typos, props [Gary Jones](https://github.com/GaryJones). + * Fixes a bug where links in tooltips were not impossible to click. + * Fixes a broken link to the permalinks section of the advanced settings, props [Michael Nordmeyer](https://github.com/michaelnordmeyer). + * Fixes settings import on multisite. + * Fixes a bug where the sitemap could contain datetimes in the wrong timezone. + * Fixes a bug where the wrong Facebook user ID was added to the fb:admins meta tag. Adding FB admin user id is now a manual process. + * Fixed Open Graph and Twitter cards on static posts pages + * Fixes a bug where sitemap cache was not always cleared after saving the Yoast SEO settings. +>>>>>>> .r12027 + +<<<<<<< .mine +* Other notable changes: + * Adds a JavaScript API for registering data modifications that is quite similar to `add_filter`/`apply_filters` in WordPress. Allows for filtering data before it is analyzed. See [YoastSEO.js](https://github.com/Yoast/YoastSEO.js). + * Adds a JavaScript API for adding content analysis tests, see [YoastSEO.js](https://github.com/Yoast/YoastSEO.js). +||||||| .r11156 +* Enhancements: + * Replace `%%parent_title%%` variable client side through JS. +======= +* Security: + * Fixes a possible XSS vulnerability in the snippet preview. Thanks [Charles Neill](https://twitter.com/ccneill) and [Mazen Gamal](https://twitter.com/mazengamal) for discovering and responsibly disclosing this issue. +>>>>>>> .r12027 + +<<<<<<< .mine +* Because we moved the entire content analysis to JavaScript, we had to remove the following PHP filters: + * `wpseo_pre_analysis_post_content`. Alternative: [Modifications API](https://github.com/Yoast/YoastSEO.js). + * `wpseo_metadesc_length`. Functionality removed. + * `wpseo_metadesc_length_reason`. Functionality removed. + * `wpseo_body_length_score`. Alternative: [Content Checks API](https://github.com/Yoast/YoastSEO.js). + * `wpseo_linkdex_results`. Alternative: [Content Checks API](https://github.com/Yoast/YoastSEO.js). + * `wpseo_snippet`. Functionality removed. +||||||| .r11156 +* i18n + * updated ar, cs_CZ, fr_FR, hr, pl_PL, pt_BR and ru_RU + * new .pot file based off of the 1.5.5 version +======= += 2.1.1 = +>>>>>>> .r12027 + +<<<<<<< .mine += 2.3.5 = +||||||| .r11156 += 1.5.5 = +Release Date: August 12th, 2014 +======= +Release Date: April 21st, 2015 +>>>>>>> .r12027 + +<<<<<<< .mine +Release Date: September 16th, 2015 +||||||| .r11156 +* Bugfixes: + * WP Shortlinks weren't always removed when user did choose to remove them as reported in [issue #1397](https://github.com/Yoast/wordpress-seo/issues/1397), props [Firebird75](https://github.com/Firebird75). + * Fixed the way we prevent Jetpack from outputting OpenGraph tags. Props [jeherve](https://github.com/jeherve). + * Symlinking the plugin should now work. Props [crewstyle](https://github.com/crewstyle) and [dannyvankooten](https://github.com/dannyvankooten). + * Fix warnings on new site creation multisite as reported in [issue #1368](https://github.com/Yoast/wordpress-seo/issues/1368), props [jrfnl](https://github.com/jrfnl) and [jennybeaumont](https://github.com/jennybeaumont). + * Fixed redirect loop which occurred on multi-word search or when search query contained special characters and the 'redirect ugly URL's' option was on, as reported by [inventurblogger](https://github.com/inventurblogger) in [issue #1340](https://github.com/Yoast/wordpress-seo/issues/1340). + * Fixed double separators in snippet preview as reported by [GermanKiwi](https://github.com/GermanKiwi) in [issue #1321](https://github.com/Yoast/wordpress-seo/issues/1321), props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed slashes in title in snippet preview as reported by [fittedwebdesign](https://github.com/fittedwebdesign) in [issue #1333](https://github.com/Yoast/wordpress-seo/issues/1333), props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed re-introduced js compatibility issue with Soliloquy slider as reported by [ajsonnick](https://github.com/ajsonnick) in [issue #1343](https://github.com/Yoast/wordpress-seo/issues/1343), props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed a bug where we could do a query in XML Sitemaps even when there were no posts to query for. + * If the sitemap is empty, add the homepage URL to make sure it doesn't throw errors in GWT. + * Change how we set 404's for non existing sitemap files, as reported in [#1383](https://github.com/Yoast/wordpress-seo/issues/1383) props [Dinglebat](https://github.com/Dinglebat). + * Fix issues with conflicting expectations being plugins/theme of the user meta twitter field - url vs twitter id, props [Jrf](http://profiles.wordpress.org/jrf). + * Fix how the first paragraph test for the keyword is done after a solid bug report by [squelchdesign](squelchdesign). + * Fix how we're handling protocol relative image URLs in the XML sitemap. + * Fix page analysis slug test for keywords with special characters. + * Properly set "No score" result for posts that have no focus keyword. +======= +* Bugfixes: + * Fixes a bug where the JSON+LD output was outputted twice when company or person info wasn't set. + * Fixes a compatibility issue with Video SEO and WooCommerce SEO add-ons causing WSOD on the frontend for video's and WooCommerce products. + * Fixes a compatibility issue with BBPress caused by hooking `current_user_can` too early. +>>>>>>> .r12027 + +<<<<<<< .mine +||||||| .r11156 +* Enhancements: + * Drastically improved performance of snippet preview rendering. + * Added Facebook / OpenGraph title input and Google+ title input and image upload field to Social tab. + * Added Facebook / OpenGraph title input for the homepage on SEO -> Social settings page. + * Changed Facebook / OpenGraph default image and homepage image input fields to use the media uploader. + * Added a new title separator feature on the Titles admin page. + * Merged the bulk editor pages for titles and descriptions into one menu item "bulk editor". + * Added `noimageindex` option to advanced meta robots options. + * Bulk editor rights are no longer added for contributors, only for editors and up. + * If an archives meta description template has `%%page` variables, show it on page 2 and onwards of archives too. + * Add a confirm dialog when resetting setting to default. + * Add sorting by publication date in bulk editor as [requested by krogsgard here](https://github.com/Yoast/wordpress-seo/issues/1269). + +* Other: + * Remove references to deprecated Video Manual plugin. + += 1.5.4.2 = +Release Date: July 16th, 2014 + +======= += 2.1 = + +Release Date: April 20th, 2015 + +* Features: + * Added support for [website name JSON+LD markup](https://developers.google.com/structured-data/site-name). + +>>>>>>> .r12027 +<<<<<<< .mine +* Bugfixes: + * Fixes the Twitter image metatag that was invalidated after a recent API change by Twitter. Thanks [Andy Piper](https://github.com/andypiper) for notifying us. + * Removes all tests directories from the release. Props [Edward Beckett](https://github.com/EdwardBeckett) for reporting. + * Updated the minimum required version of WordPress to 4.0. + +||||||| .r11156 +* Bugfixes: + * Fixed several notices for undefined variables. + * Properly trim meta description to its desired size again, regression caused in 1.5.4. + * Fix empty last modified date for term sitemaps in sitemap index. + * Fix bug where `wpseo_sitemap_exclude_empty_terms` filter wouldn't work for index sitemap. + +======= +>>>>>>> .r12027 +<<<<<<< .mine = 2.3.4 = +||||||| .r11156 +* Enhancements: + * Improve nonce checking in bulk title & description editor. + * Prevent direct access to XSL file. + * Improve code styling to match WordPress code standard even more strictly, props [Jrf](http://profiles.wordpress.org/jrf). + * Add button to copy home meta description to home OpenGraph description. +======= +* Enhancements: + * Makes sure Twitter cards are by default enabled since they don't need to be validated anymore by Twitter. + * Removes the Twitter url meta tag, since Twitter no longer uses it. + * Shows a validation error when a user selects a featured image for a post that is smaller than 200x200 pixels. + * Shows a validation error when a user tries to use shortcodes in the titles and meta's settings page that are incompatible with the type of content those titles and meta's are associated with. + * Makes sure no taxonomy metadata is lost with the upcoming 4.2 version of WordPress. + * Upgraded to Facebook Graph API 3.0 for fetching Facebook user ID's straight from Facebook. + * Made the plugin conflict notices more user friendly, explaining better which piece of functionality might be impacted, offering a link to the corresponding settings and a button to deactivate the conflicting plugin. +>>>>>>> .r12027 +<<<<<<< .mine Release Date: August 6th, 2015 +||||||| .r11156 += 1.5.4.1 = +Release Date: July 15th, 2014 + +======= +>>>>>>> .r12027 * Bugfixes: +<<<<<<< .mine * Fixes a bug where the focus keyword test in the Yoast SEO metabox was broken as a regression of removing the autocomplete functionality. +||||||| .r11156 + * Properly minified the metabox JS file, fixing snippet preview, props [Jrf](http://profiles.wordpress.org/jrf). + * Format unix timestamp to string in sitemap, fixes possible fatal error in XML sitemap. +======= + * Fixes a bug where the sitemaps were no longer being served from WP transient cache. + * Fixes a bug where breadcrumbs weren't nested properly. + * Fixes a possible "headers already sent" error in the sitemaps. + * Fixes a notice for the homepage URL in post type sitemaps. + * Fixes an "undefined index" notice on the sitemaps. + * Fixes an "undefined index" notice in the breadcrumbs. + * Fixes a bug where translations were not loaded when used as MU-plugin. + * Fixes a JS error that was raised when editing post-types without a TinyMCE editor. +>>>>>>> .r12027 +<<<<<<< .mine = 2.3.3 = +||||||| .r11156 += 1.5.4 = +Release Date: July 15th, 2014 +======= +* Security: + * Fixes a possible XSS vulnerability. Thanks [Johannes Schmitt](https://github.com/schmittjoh) from [Scrutinizer CI](https://scrutinizer-ci.com/) for discovering and responsibly disclosing this issue. +>>>>>>> .r12027 +<<<<<<< .mine Release Date: August 6th, 2015 +||||||| .r11156 +* Bugfixes + * Refactored the variable replacement function for better and faster results and more stability. This should fix most if not all problems users where having with variables not being replaced in the title, meta description, snippet preview etc - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: `wpseo_replacements` filter was being run before all replacements were known. + * Fixed: `%%pt_single%%` and `%%pt_plural%%` didn't work in preview mode. + * Fixed: `%%page_total%%` would sometimes be one short. + * Fixed: `%%term404%%` would sometimes be empty while the pagename causing the 404 was known. + * Fixed: empty taxonomy sitemap could still be shown, while it shouldn't, as reported by [allasai](https://github.com/allasai) in [issue #1004](https://github.com/Yoast/wordpress-seo/issues/1004) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: if first result of a search is a post, the blog page was incorrectly added to the breadcrumb, as reported in [issue #1248](https://github.com/Yoast/wordpress-seo/issues/1248) by [Nikoya](https://github.com/Nikoya) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: ensure that all our options exist always, fixes rare case in which this wouldn't be so. As reported by [bonny](https://github.com/bonny) in [issue #1245](https://github.com/Yoast/wordpress-seo/issues/1245) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: Media title and meta settings could not be set when 'attachment URLs redirect to parent post' was selected which let to issues for attachments without a parent, as reported by [Firebird75](https://github.com/Firebird75) in [issue #1243](https://github.com/Yoast/wordpress-seo/issues/1243) - props [Jrf](http://profiles.wordpress.org/jrf). + * Improved and more consistent check for whether to show the admin 'Edit files' screen, [issue #1197](https://github.com/Yoast/wordpress-seo/issues/1197) - props [hostliketoast](https://github.com/hostliketoast) and [Jrf](http://profiles.wordpress.org/jrf). + * Restore robots meta box per taxonomy to its former glory, it now shows even when blog is not set to public, as reported by [Lumieredelune](https://github.com/Lumieredelune) in [issue #1158](https://github.com/Yoast/wordpress-seo/issues/1158) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: Multisite issues, as reported by [GaryJones](https://github.com/GaryJones) and [chrisfromthelc](https://github.com/chrisfromthelc) in [issue #935](https://github.com/Yoast/wordpress-seo/issues/935) - props [Jrf](http://profiles.wordpress.org/jrf). + - saving of settings on the multisite settings page was not working. + - restoring site to default settings from multisite settings page was not working. + - initializing new blogs with settings from a chosen default blog was not working (might still not be completely stable for WP multisite with WPSEO in must-use plugins directory, stable in all other cases). + - wrong option debug information shown on multisite settings page + * Fixed: an issue with sitemap transient caching for plugins not using paginated sitemaps (like news seo). + * Check if get_queried_object_id is not 0 before enqueueing wp_enqueue_media. + * Set rssafter to empty string on test_embed_rss() test. + * Fixed: Bing URL - props [GodThor](https://github.com/GodThor). + * Prevent from loading if WP is installing - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: Incorrect timezone in the root sitemap. + * Fixed: Multiselect fields are now properly saved in wpseo meta boxes. + * Force canonical links to be absolute, relative is NOT an option. + * Fixed: Breadcrumb on search pages. + * Added CDATA in sitemap image captions and titles. + * Various sitemap fixes and improvements - props [Rarst] (https://github.com/Rarst). +======= += 2.0.1 = +>>>>>>> .r12027 +<<<<<<< .mine * Removes the autocomplete functionality from the focus keyword field in the Yoast SEO metabox because Google is shutting down its autocomplete API [as of August 10th](http://googlewebmastercentral.blogspot.nl/2015/07/update-on-autocomplete-api.html). +||||||| .r11156 +* Enhancements + * Heavily reduce query load for XML sitemaps by caching XML sitemaps in transients. + * New `wpseo_register_extra_replacements` action hook which lets plugin/theme builders add new `%%...%%` replacement variables - including relevant help texts -. See [function documentation](https://github.com/Yoast/wordpress-seo/blob/master/inc/wpseo-functions.php) for an example of how to use this new functionality. + * If the final string - after replacement - would contain two separators with nothing between them, this extra separator will be removed. + * All remaining not replaced replacement vars are now stripped from the strings (without breaking the snippet preview). + * New filter `wpseo_replacements_filter_sep` which can be used to change the seperator character passed by the theme. + * When using the 'Reset default settings' button on a blog in a network while another blog has been chosen to be used as a basis for the settings for all new blogs, the reset will respect that setting and reset the blog to the settings from the chosen blog. + * For small networks ( < 100 sites ), the network page user interface has been improved, by offering drop-down lists of the blogs for blog selection fields. For larger networks, the interface remains the same. + * Added an action to allow adding content to the Post Type tab on the meta admin page. + * Removing the extra blog name added to the title by woo_title(). + * More optimization improvements to snippet preview. + * Add filter to allow other plugins to interact with our metaboxes outside of the standard pages - props [Jrf](http://profiles.wordpress.org/jrf). + * Replace variables through an AJAX call, which makes them work in the post editor too and allows for more variables to be replaced in the title. + * Added priority filters for XML sitemaps. +======= +Release Date: April 1st, 2015 +>>>>>>> .r12027 +<<<<<<< .mine * Enhancements: * Introduces a dismissible notice encouraging users to connect with Google Search Console. * Improves the dashboard widget to only show posts which are actually editable by the current user. * Makes the plugin conflict notices persistent and dismissible. Once dismissed, it will no longer be shown for the specific set of conflicting plugins the notice has been dismissed for. * Contains a few textual improvements. * Makes sure the counts are updated correctly and intuitively when marking a Search Console issue as fixed. +||||||| .r11156 +* Other enhancements + * Security improvement: As the .htaccess / robots.txt files are site-wide files, on a multi-site WP installation they will no longer be available for editing to individual site owners. For super-admins, the 'SEO -> Edit Files' admin page will now be accessible through the Network Admin. + * We've added server specific info to our tracking class. Most notably, we're tracking whether a number of PHP extensions are enabled for our users now. +======= +* Bugfixes: + * Fixes an issue where (in rare cases) people upgrading to 2.0 got stuck in a redirect loop on their admin. + * Fixes a broken link in the Dutch translation, causing the Pinterest tab on the Social settings page to overflow into the Google+ tab. + * Fixes a small typo on the about page. +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where current_user_can was called before init, props [Claudio Sanches](https://github.com/claudiosmweb). * Fixes a bug where the article:publisher metatag was also included on pages that were not of type 'article'. @@ -147,32 +772,127 @@ Release Date: August 6th, 2015 * Fixes a bug where a h3 header was being closed with a h2 closing tag. * Fixes a bug where the Google Search Console issues table was giving errors on installs running on PHP 5.2. * Fixes a bug where the sitemap caches were no longer being cleared when running Yoast SEO in the upcoming 4.3 release of WordPress. +||||||| .r11156 += 1.5.3.3 = +Release Date: June 2nd, 2014 +======= += 2.0 = +>>>>>>> .r12027 +<<<<<<< .mine = 2.3.2 = +||||||| .r11156 +* Enhancements + * We've added some options and some host specific info to our tracking class. Most notably, we're tracking the PHP version for our users now, so we can see whether we, at some point, might drop PHP 5.2 support before WordPress does. + * Auto-deactivate plugin in the rare case that the SPL (Standard PHP Library) extension is not available. + * Switch from inline `xmlns` to inline use of the `prefix` attribute for breadcrumbs as that makes validation work. Fixes [Issue 1186]((https://github.com/Yoast/wordpress-seo/issues/1186). +======= +Release Date: March 26th, 2015 +>>>>>>> .r12027 +<<<<<<< .mine Release Date: July 23rd, 2015 +||||||| .r11156 +* Bugfixes + * Check whether snippet preview is shown on page before hiding / showing errors, deducted from [#1178](https://github.com/Yoast/wordpress-seo/issues/1178) + * Fixed incorrect sitemap last modified date as reported in [issue 1136](https://github.com/Yoast/wordpress-seo/issues/1136) - props [rscs](https://github.com/rscs). + * Specify post ID when using `wp_enqueue_media()` to set up correctly for the post being edited. [Pull #1165](https://github.com/Yoast/wordpress-seo/pull/1165), props [benhuson](https://github.com/benhuson). + * Fixed unreachable filter `wpseo_sitemap_[post_type]_content` as reported in [pull #1163](https://github.com/Yoast/wordpress-seo/pull/1163), also fixes unreachable filter `wpseo_sitemap_author_content`. Props [jakub-klapka](https://github.com/jakub-klapka). + * Fixed PHP notice as reported by [maxiwheat](https://github.com/maxiwheat) in [issue #1160](https://github.com/Yoast/wordpress-seo/issues/1160). + * Backed out pagination overflow redirect as it's causing too many issues. +======= +* Features: + * Simplified and revised Admin menu's: + * Moved all advanced functionality to one "Advanced" submenu page. + * Moved the bulk editor, the export functionality and the file editor to one "Tools" submenu page. + * Improved consistency and usability of settings pages by having them use exactly the same, tab-based, styling. + * Made it easy to output structured data for social profiles, person and company profiles, for use in Google Knowledge Graph. +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where non-admin users were no longer able to update their profile with Yoast SEO active. * Fixes a bug where all labels in the Yoast SEO admin were bold. +||||||| .r11156 +* i18n + * Make sure extensions menu is fully i18n compatible. +======= +* Enhancements: + * Makes sure the user is redirected to the last active settings tab after saving. +>>>>>>> .r12027 +<<<<<<< .mine = 2.3.1 = +||||||| .r11156 += 1.5.3.2 = +Release Date: May 16th, 2014 +======= +* Bugfixes: + * Fixes a bug where custom field variables were no longer working in the snippet preview. + * Fixes a bug where the $post global was emptied by our Frontend class, causing conflicts with other plugins. + * Fixes a bug where variables weren't replaced in the og:description meta tag. + * Fixes a bug where the breadcrumbs caused an undefined variable notice. +>>>>>>> .r12027 +<<<<<<< .mine Release Date: July 22nd, 2015 +||||||| .r11156 +* Bugfixes + * Backing out earlier change, as this breaks the snippet preview. +======= +* Under the hood: + * Contains an incredible amount of code style improvements, making the code cleaner and more readable. + * Makes sure every function in the plugin is documented using PHPDoc by having it checked automatically by the Codesniffer. + * Refactored a lot of legacy code in the admin, mainly with regard to the way output is rendered. Provides for a better separation of concerns, making the code more comprehensible and re-usable. + * Deprecated a large amount of form methods and moved them to the `Yoast_Form` class. Click [here](https://github.com/Yoast/wordpress-seo/blob/add975664d1f160eed262b02327a93bda5488f8b/admin/class-config.php#L172) for the list of deprecated methods. + * Deprecated a large amount of utility functions and moved them to the `WPSEO_Utils` class. Click [here](https://github.com/Yoast/wordpress-seo/blob/add975664d1f160eed262b02327a93bda5488f8b/inc/wpseo-functions.php#L496) for the list of deprecated functions. +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Makes sure authors and editors cannot submit advanced metadata on a post when the advanced tab in the metabox has been disabled for them. Thanks Peter Allor from IBM for finding and reporting this issue. * Fixes a bug where upgrading to version 2.3 would occasionally cause WSOD's on both admin and frontend. We were unable to pinpoint the exact conflicting plugins and themes, but we are quite confident it was caused by us using, and others hooking into, WP_Query too early. +||||||| .r11156 +* Enhancement + * Reintroduced the 'Strip the category base (usually /category/) from the category URL.' option. +======= += 1.7.4 = +>>>>>>> .r12027 +<<<<<<< .mine = 2.3 = +||||||| .r11156 += 1.5.3.1 = +Release Date: May 15th, 2014 +======= +Release Date: March 11th, 2015 +>>>>>>> .r12027 +<<<<<<< .mine Release Date: July 21st, 2015 +||||||| .r11156 +* Bugfixes + * Fix regression issue - non-replacement of %%name%% variable as reported in [issue #1104](https://github.com/Yoast/wordpress-seo/issues/1104) by [firstinflight](https://github.com/firstinflight) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed an issue where %%category%% was not replaced on certain pages. + * Added support for %%tag%% even if the ID is empty. + * All remaining not replaced title vars are now stripped from the title. + * Added a fallback to post_date in the sitemap 'mod' property for when a post is lacking the post_date_gmt value. +======= +* Security fix: fixed possible CSRF and blind SQL injection vulnerabilities in bulk editor. Added strict sanitation to order_by and order params. Added extra nonce checks on requests sending additional parameters. Minimal capability needed to access the bulk editor is now Editor. Thanks [Ryan Dewhurst](https://github.com/ethicalhack3r) from WPScan for discovering and responsibly disclosing this issue. +>>>>>>> .r12027 +<<<<<<< .mine * Features: * Adds full integration with Google Search Console (formerly: Google Webmaster Tools). It is now possible to see all errors from Google straight in your WordPress install. If you have [Yoast SEO Premium](https://yoast.com/wordpress/plugins/seo-premium/#utm_source=wordpress-seo-config&utm_medium=textlink&utm_campaign=changelog), you'll even be able to fix those errors by redirecting the broken urls. * Adds a dashboard widget showing published posts' SEO scores. Thanks [Brandon Hubbard](https://github.com/bhubbard) for the idea! * Adds a customizer panel for Yoast SEO Breadcrumbs if breadcrumbs are enabled or the active theme has declared theme support for it. Props again to [Brandon Hubbard](https://github.com/bhubbard) for his awesome contribution. +||||||| .r11156 += 1.5.3 = +======= += 1.7.3.3 = +>>>>>>> .r12027 +<<<<<<< .mine * Enhancements: * Renames plugin from "WordPress SEO by Yoast" to "Yoast SEO". * Adds a warning advising to change the tagline, if a site still has the default WordPress tagline "just another WordPress site". @@ -180,7 +900,21 @@ Release Date: July 21st, 2015 * Contains several en_US string improvements, including a fix for a typo in the word "typos"... Thanks [Gary Jones](https://github.com/GaryJones) for redacting! * Adds a filter to allow filtering the content before analysis in the Twitter class, props [Pete Nelson](https://github.com/petenelson). * Adds a link to our knowledge base on how to retrieve a Facebook admin user ID. +||||||| .r11156 +* Bugfixes + * Don't ping search engines if the blog is set to 'discourage search engines from indexing this site' - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix error in sitemap_index.xml if post type does not contain any posts as reported by [sebastiaandegeus](https://github.com/sebastiaandegeus). + * Use the correct HTTP protocol for responses - props [Fab1en](https://github.com/Fab1en). + * Better OG locale handling - props [maiis](https://github.com/maiis). + * Fixed: 'breadcrumb_last' class was missing on homepage, as reported by [uprise10](https://github.com/uprise10) in [issue #1045](https://github.com/Yoast/wordpress-seo/issues/1045) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix empty post id notice, [issue #1080](https://github.com/Yoast/wordpress-seo/issues/1080) as reported by [sosada](https://github.com/sosada). + * Localize dates where appropriate as suggested by [allankronmark](https://github.com/allankronmark) in [issue #1073](https://github.com/Yoast/wordpress-seo/issues/1073). + * Fix for escaping str literals in JS regexes - props [MarventusWP](https://github.com/MarventusWP). +======= +Release Date: February 23rd, 2015 +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where sitemaps for taxonomies with no eligible terms were still included and responded with 404 errors when visited. * Fixes a bug where breadcrumbs were wrongly nested on archive paginations, props [Filippo Buratti](https://github.com/fburatti). @@ -190,24 +924,88 @@ Release Date: July 21st, 2015 * Fixes a bug where the link to the newsletter signup in the tour was broken by uncommunicated changes in Mailchimp. * Fixes a bug where the Edit Files settings page in the network admin was broken, props [Ajay D'Souza](https://github.com/ajaydsouza). * Fixes a broken link in the advanced tab of the Yoast SEO metabox to the titles and meta's settings. +||||||| .r11156 +* Enhancement + * Redirect paginated archive pages with a pagination number that doesn't exist to the first page of that archive. + * Update score circle icon to look great on HiDPI displays, as well as fitting better with WordPress 3.8+ design - props [paulwilde](https://github.com/paulwilde). + * Only show article publication time for posts, not for pages or other post types, introduce a new filter to _do_ allow them when needed. + * Load of improvements to banners and licenses page. + * Update snippet preview to use latest Google design changes - props [paulwilde](https://github.com/paulwilde). +======= +* Bugfixes: + * Repair missing dependencies... +>>>>>>> .r12027 +<<<<<<< .mine * Other notable changes: * Removed the possibility to redirect a post in the advanced tab of the Yoast SEO metabox. * Moved the option to include a post in sitemap from the advanced tab of the Yoast SEO metabox to the sitemap settings. * Removed the option to configure sitemap priority in the advanced tab of the Yoast SEO metabox. * Added multiple checks to prevent plugin compatibility issue between Yoast SEO and old versions of Google Analytics by Yoast. * Updated the banners with new designs. +||||||| .r11156 += 1.5.2.8 = +======= += 1.7.3.2 = +>>>>>>> .r12027 +<<<<<<< .mine = 2.2.1 = +||||||| .r11156 +* Bugfixes + * Added some missing textdomains. + * Fixed a license manager request bug. + * Work-around for fatal error caused by other plugins doing front-end post updates without loading all the required WP files, such as the WP Google Forms plugin - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed incorrect link to Issues in CONTRIBUTING.md - props [GaryJones](https://github.com/GaryJones). + * Fixed a fatal error caused by not checking if Google Suggest request reponse is valid - props [jeremyfelt](https://github.com/jeremyfelt). + * Fixed a screen option bug in bulk edit options - props [designerken](https://github.com/designerken). + * Fixed warnings on edit files section - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed a warning when post_type is an array - props [unr](https://github.com/unr). +======= +Release Date: February 23rd, 2015 +>>>>>>> .r12027 +<<<<<<< .mine Release Date: June 11th, 2015 +||||||| .r11156 +* i18n + * Updated el_GR, hu_HU, nl_NL and pl_PL +======= +* Bugfixes: + * Fixes a bug where the rel="next" and rel="prev" links were broken for all taxonomies. + * Removes an obsolete quote from the html for the seo metabox. +>>>>>>> .r12027 +<<<<<<< .mine * Makes sure users can close the tour by circumventing possible JavaScript caching issues that might occur. +||||||| .r11156 += 1.5.2.7 = +======= += 1.7.3.1 = +>>>>>>> .r12027 +<<<<<<< .mine = 2.2 = +||||||| .r11156 +* Bugfixes + * Fixed a WordPress Network license bug. +======= +Release Date: February 19th, 2015 +>>>>>>> .r12027 +<<<<<<< .mine Release Date: June 10th, 2015 +||||||| .r11156 +* i18n + * Updated el_GR, fa_IR, hu, it_IT, pt_PT, ru_RU, tr_TK and zh_CN + * Added Malay +======= +* Bugfixes: + * Fixes a bug where the keyword analysis was broken. + * Fixes a bug where our plugin raised a fatal error in the wpseo_admin bar when the $wpseo_front global was used. +>>>>>>> .r12027 +<<<<<<< .mine * Enhancements: * Contains several accessibility improvements, including 'for' attributes for labels and several links to explanatory articles. * Adds support for creating partial sitemaps with WP CLI, props [Lars Schenk](https://github.com/larsschenk). @@ -226,7 +1024,13 @@ Release Date: June 10th, 2015 * Twitter profile input field now also accepts full url and automatically strips it down to just the username. * Only adds the JSON LD output to the frontpage, since it's not needed on other pages. * Makes all Yoast SEO notices dismissible. +||||||| .r11156 += 1.5.2.6 = +======= += 1.7.3 = +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where the widgets were removed from every XML file. This is now only the case for the sitemaps. * Fixes a bug where validation errors were shown for the wrong variables in the titles and metas settings. @@ -239,26 +1043,111 @@ Release Date: June 10th, 2015 * Fixes a bug where the wrong Facebook user ID was added to the fb:admins meta tag. Adding FB admin user id is now a manual process. * Fixed Open Graph and Twitter cards on static posts pages * Fixes a bug where sitemap cache was not always cleared after saving the Yoast SEO settings. +||||||| .r11156 +* Bugfixes + * Fixed Open Graph Facebook Debubber Tags/Categories Issue, tags/categories are now grouped into one metatag - props [lgrandicelli](https://github.com/lgrandicelli). + * Fixed: %%cf_%% and %%parent_title%% not being resolved in the preview snippet as reported by [Glark](https://github.com/Glark) in [issue #916](https://github.com/Yoast/wordpress-seo/issues/916) - props [Jrf](http://profiles.wordpress.org/jrf). + * Options are no longer deleted on plugin uninstall. + * Fixed a bug that caused the 'Plugins activated' message to be removed by the robots error message - props [andyexeter](https://github.com/andyexeter). + * Fix white screen/blog down issues caused by some webhosts actively disabling the PHP ctype extension - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixes Metabox Social tab media uploader not working on custom post types which don't use media as reported by [Drethic](https://github.com/Drethic) in [issue #911](https://github.com/Yoast/wordpress-seo/issues/911) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed vars not being replaced in OG description tag. +======= +Release Date: February 17th, 2015 +>>>>>>> .r12027 +<<<<<<< .mine * Security: * Fixes a possible XSS vulnerability in the snippet preview. Thanks [Charles Neill](https://twitter.com/ccneill) and [Mazen Gamal](https://twitter.com/mazengamal) for discovering and responsibly disclosing this issue. +||||||| .r11156 +* Enhancement + * Fix PHP warnings when post_type is an array. +======= +* Bugfixes: + * Fixes a bug where the translations were corrupted due to an issue with out glotpress grunt task. +>>>>>>> .r12027 +<<<<<<< .mine = 2.1.1 = +||||||| .r11156 += 1.5.2.5 = +======= += 1.7.2 = +>>>>>>> .r12027 +<<<<<<< .mine Release Date: April 21st, 2015 +||||||| .r11156 +* Bugfixes + * Fixed: Premium support link was being added to all plugins, not just ours ;-) + * Only show the breadcrumbs-blog-remove option if user uses page_for_posts as it's not applicable otherwise and can cause confusion. + * Clean up url query vars after use in our settings page to avoid actions being executed twice - props [Jrf](http://profiles.wordpress.org/jrf). +======= +Release Date: February 17th, 2015 +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where the JSON+LD output was outputted twice when company or person info wasn't set. * Fixes a compatibility issue with Video SEO and WooCommerce SEO add-ons causing WSOD on the frontend for video's and WooCommerce products. * Fixes a compatibility issue with BBPress caused by hooking `current_user_can` too early. +||||||| .r11156 += 1.5.2.4 = +======= +* Enhancements: + * Contains lots of performance optimizations, including removal of unnecessary inclusion and defined checks for every classfile, refactoring of frontend logic, cutting unnecessary inheritance chains et. al. + * Adds Twitter gallery cards. + * Adds Twitter cards for non singular pages (including Homepage). + * Allows archive titles & meta to be set on non public post types that do have a public archive, props [xeeeveee](https://github.com/xeeeveee). + * Huge performance gain for `enrich_defaults()`, props [Koen Van den Wijngaert](https://github.com/vdwijngaert). + * Nextscripts removed from the OG conflict list. + * Added full Composer support, switched to Composer for dependency management and autoloading. +>>>>>>> .r12027 +<<<<<<< .mine = 2.1 = +||||||| .r11156 +* Bugfixes + * Changed 'wpseo_frontend_head_init' hook to 'template_redirect' to prevent incorrect canonical redirect. + * Improved upgrade routine for breadcrumbs maintax/pt option as reported by [benfreke](https://github.com/benfreke) in [issue #849](https://github.com/Yoast/wordpress-seo/issues/849) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed a bug where the banners overlapped WordPress notices/errors. + * Fixed: Slashes in Taxonomy text inputs as reported by [chuckreynolds](https://github.com/chuckreynolds) in [issue #868](https://github.com/Yoast/wordpress-seo/issues/868) - props [Jrf](http://profiles.wordpress.org/jrf). + * Increased priority (decreased priority int) on the template_redirect for the sitemap redirect hook. + * Fixed: `current_user_can` was being called too early as reported by [satrya](https://github.com/satrya) in [issue #881](https://github.com/Yoast/wordpress-seo/issues/881) - props [Jrf](http://profiles.wordpress.org/jrf). +======= +* Bugfixes: + * Fixes a bug where new posts weren't always added to the post sitemap properly in case of multiple sitemaps. + * Fixes a grammatical error in the tutorial. + * Fixes a bug where %%currentyear%% shortcode wasn't parsed well in the meta description. + * Fixes an undefined index notice in the opengraph functionality. + * Fixes a bug where variable placeholders were not always assigned the correct value, props [Andy Sozot](https://github.com/sozot) for reporting and [Juliette](https://github.com/jrfnl) for fixing. + * Fixes a bug with SEO score on servers using international number formats. + * Fixes broken backward compatibility / snippet preview, props [Juliette](https://github.com/jrfnl). + * Fixes a bug where the %%page%% shortcode wasn't properly rendered in the titles and meta's. + * Fixes a bug where custom replacement variables where not properly rendered when using them in multiple fields. + * Fixes at least a large part of the keyword density 0% issues. + * Corrected price on WooCommerce SEO banner. +>>>>>>> .r12027 +<<<<<<< .mine Release Date: April 20th, 2015 +||||||| .r11156 +* Enhancement + * Enhanced validation of webmaster verification keys to prevent invalidating incorrect input which does contain a key as reported by [TheZoker](https://github.com/TheZoker) in [issue #864](https://github.com/Yoast/wordpress-seo/issues/864) - props [Jrf](http://profiles.wordpress.org/jrf). +======= += 1.7.1 = +>>>>>>> .r12027 +<<<<<<< .mine * Features: * Added support for [website name JSON+LD markup](https://developers.google.com/structured-data/site-name). +||||||| .r11156 += 1.5.2.3 = +======= +* Security fix: fixed possible cross scripting issue with encoded entities in a post title. This could potentially allow an author on your site to execute JavaScript when you visit that posts edit page, allowing them to do rights expansion or otherwise. Thanks to [Joe Hoyle](http://www.joehoyle.co.uk/) for responsibly disclosing this issue. +>>>>>>> .r12027 +<<<<<<< .mine * Enhancements: * Makes sure Twitter cards are by default enabled since they don't need to be validated anymore by Twitter. * Removes the Twitter url meta tag, since Twitter no longer uses it. @@ -267,7 +1156,13 @@ Release Date: April 20th, 2015 * Makes sure no taxonomy metadata is lost with the upcoming 4.2 version of WordPress. * Upgraded to Facebook Graph API 3.0 for fetching Facebook user ID's straight from Facebook. * Made the plugin conflict notices more user friendly, explaining better which piece of functionality might be impacted, offering a link to the corresponding settings and a button to deactivate the conflicting plugin. +||||||| .r11156 +** Note: if you already upgraded to v1.5+, you will need to retrieve your Facebook Apps again and please also check your Google+ URL. We had some bugs with both being escaped too aggressively. Sorry about that. ** +======= += 1.7 = +>>>>>>> .r12027 +<<<<<<< .mine * Bugfixes: * Fixes a bug where the sitemaps were no longer being served from WP transient cache. * Fixes a bug where breadcrumbs weren't nested properly. @@ -277,12 +1172,78 @@ Release Date: April 20th, 2015 * Fixes an "undefined index" notice in the breadcrumbs. * Fixes a bug where translations were not loaded when used as MU-plugin. * Fixes a JS error that was raised when editing post-types without a TinyMCE editor. +||||||| .r11156 +* Bugfixes + * Added missing settings menu pages to wp admin bar. + * Replaced old AdWords keyword tool link. + * Fix wp admin bar keyword density check link + * Taxonomy sitemap will now also show if empty. + * Prevent infinite loop triggered by `sitemap_close()`, fixes [#600](https://github.com/Yoast/wordpress-seo/issues/) as reported and fixed by [pbogdan](https://github.com/pbogdan). + * Fixed a link count Page Analysis bug. + * Fixed a keyword density problem in the Page Analysis + * Fixed OpenGraph/GooglePlus/Twitter tags not showing in a select few themes, [issue #750](https://github.com/Yoast/wordpress-seo/issues/750) as reported by [Jovian](https://github.com/Jovian) and [wwdboer](https://github.com/wwdboer) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed Facebook Apps not being saved/ "Failed to retrieve your apps from Facebook" as reported by [kevinlisota](https://github.com/kevinlisota) in [issue #812](https://github.com/Yoast/wordpress-seo/issues/812) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed duplicate feedback messages on WPSEO -> Social pages as reported by [steverep](https://github.com/steverep) in [issue #743](https://github.com/Yoast/wordpress-seo/issues/743) - props [Jrf](http://profiles.wordpress.org/jrf). + * Flush our force title rewrite buffer earlier in `wp_footer` so it can be used by other plugins in `wp_footer`. Props [Gabriel PÃ©rez Salazar](http://www.guero.net/). + * Start the force rewrite buffer late (at 999) in `template_redirect` instead of `get_header` because of several themes not using `get_header`, issue [#817](https://github.com/Yoast/wordpress-seo/issues/817) as reported by [Jrf](http://profiles.wordpress.org/jrf). + * Fixed 'Page %d of %d' / %%page%% variable not being replaced when on pages, as reported by [SGr33n](https://github.com/SGr33n) in [issue #801](https://github.com/Yoast/wordpress-seo/issues/801) - props [Jrf](http://profiles.wordpress.org/jrf). + * Restore robots meta box per post to its former glory, it now shows even when blog is not set to public. + * Fixed individual page robots settings not being respected when using a page as blog as reported by [wintersolutions](https://github.com/wintersolutions) in [issue #813](https://github.com/Yoast/wordpress-seo/issues/813) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: Too aggressive html escaping of the breadcrumbs. + * Fixed: Last breadcrumb wasn't always determined correctly resulting in crumbs not being linked when they should have been. + * Fixed: Breadcrumbs were sometimes missing separators and default texts since v1.5.0. + * Fixed: 404 date based breadcrumb and title creation could cause corruption of the `$post` object. + * Fixed: Filtering posts based on SEO score via the dropdown at the top of a post/page overview page no longer worked. Fixed. As reported by [gmuehl](https://github.com/gmuehl) in [issue #838](https://github.com/Yoast/wordpress-seo/issues/838) - props [Jrf](http://profiles.wordpress.org/jrf). +======= +* Features: + * Adds Twitter inputs to the Social tab. + * Tries to purge Facebook cache when OpenGraph settings are edited. + * Added a new box promoting our translation site for non en_US users. + * Added several new tools (Pinterest Rich Pins, HTML Validation, CSS Validation, Google PageSpeed), props [bhubbard](https://github.com/bhubbard) +>>>>>>> .r12027 +<<<<<<< .mine * Security: * Fixes a possible XSS vulnerability. Thanks [Johannes Schmitt](https://github.com/schmittjoh) from [Scrutinizer CI](https://scrutinizer-ci.com/) for discovering and responsibly disclosing this issue. +||||||| .r11156 +* Enhancements + * Added filters for the change frequencies of different URLs added to the sitemap. Props to [haroldkyle](https://github.com/haroldkyle) for the idea. + * Added filter `wpseo_sitemap_exclude_empty_terms` to allow including empty terms in the XML sitemap. + * Private posts now default to noindex (even though they technically probably couldn't be indexed anyway). + * Show a warning message underneath a post's robots meta settings when site is set to noindex sitewide in WP core. + * Updated licensing class to show a notice when requests to yoast.com are blocked because of `WP_HTTP_BLOCK_EXTERNALS`. +======= +* Enhancements: + * Functionality change: when there's a featured image, output only that for both Twitter and FB, ignore other images in post. + * UX change: rework logic for showing networks on Social tab, social network no longer shows on social tabs if not enabled in admin. + * Always output a specific Twitter title and description, as otherwise we can't overwrite them from metabox. + * Check for conflicts with other plugins doing XML sitemaps or OpenGraph. + * Qtip library replaced with Qtip2. + * Merged several similar translation strings, props [@ramiy](https://github.com/ramiy) + * Several RTL improvements, props [@ramiy](https://github.com/ramiy) + * Several Typo fixes, props [@ramiy](https://github.com/ramiy) + * Updated Open Site Explorer Link, props [bhubbard](https://github.com/bhubbard) + * Updated all links to use // instead of https:// and http://, props [bhubbard](https://github.com/bhubbard) + * When importing from AIOSEO, on finding GA settings, advertise Yoast GA plugin. + * Makes sure stopwords are only removed from slug on publication. + * Updated translations. +>>>>>>> .r12027 +<<<<<<< .mine = 2.0.1 = +||||||| .r11156 +* Other + * Refactored the breadcrumb class - props [Jrf](http://profiles.wordpress.org/jrf). +======= +* Bugfixes: + * Fixes a bug where the wrong image was being displayed in twitter cards. + * Fixes a bug where facebook would display the wrong image. + * Fixes a bug where last modified in sitemap was broken. + * Fixes a bug wher SEO-score heading made the table row jump on hover because there wasn't enough place left for the down arrow. + * Removed a couple of languages that were not up to date. +>>>>>>> .r12027 +<<<<<<< .mine Release Date: April 1st, 2015 * Bugfixes: @@ -413,6 +1374,283 @@ Release Date: February 17th, 2015 * Fixes a bug wher SEO-score heading made the table row jump on hover because there wasn't enough place left for the down arrow. * Removed a couple of languages that were not up to date. +||||||| .r11156 += 1.5.2.2 = + +* Bugfixes + * Fix for issue with Soliloquy image slider was not applied to minified js file. + * Fixed some PHP 'undefined index' notices. + * Fix banner images overlapping text in help tabs. + * Fixed meta description tag not showing for taxonomy (category/tag/etc) pages as reported in [issue #737](https://github.com/Yoast/wordpress-seo/issues/737) and [#780](https://github.com/Yoast/wordpress-seo/issues/780) - props [Jrf](http://profiles.wordpress.org/jrf). + * Prevent a fatal error if `wp_remote_get()` fails while testing whether the title needs to be force rewritten as reported by [homeispv](http://wordpress.org/support/profile/homeispv) - props [Jrf](http://profiles.wordpress.org/jrf). + +* Enhancements + * Added composer support - props [codekipple](https://github.com/codekipple) and [Rarst](https://github.com/Rarst). + += 1.5.2.1 = + +* Bugfixes + * Fix white screen/blog down issues caused by some (bloody stupid) webhosts actively disabling the filter extension - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix for some PHP notices, [issue #747](https://github.com/Yoast/wordpress-seo/issues/747) as reported by [benfreke](https://github.com/benfreke) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed: GooglePlus vanity urls were saved without the `+` as reported by [ronimarin](https://github.com/ronimarin) in [issue #730](https://github.com/Yoast/wordpress-seo/issues/730) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix WP Admin menu items no longer clickable when on WPSEO pages as reported in [issue #733](https://github.com/Yoast/wordpress-seo/issues/733) and [#738](https://github.com/Yoast/wordpress-seo/issues/738) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix strict warning for W3TC, [issue 721](https://github.com/Yoast/wordpress-seo/issues/721). + * Fix RSS text strings on options page being double escaped, [issue #731](https://github.com/Yoast/wordpress-seo/issues/731) as reported by [namaserajesh](https://github.com/namaserajesh) - props [Jrf](http://profiles.wordpress.org/jrf). + * Avoid potential confusion over Facebook OpenGraph front page usage, [issue #570](https://github.com/Yoast/wordpress-seo/issues/570) - props [Jrf](http://profiles.wordpress.org/jrf). + * Potentially fix [issue 565](https://github.com/Yoast/wordpress-seo/issues/565) bbpress warning message. Thanks [inetbiz](https://github.com/inetbiz) for reporting and [tobylewis](https://github.com/tobylewis) for finding the likely cause. + * Filter 'wpseo_pre_analysis_post_content' output is now only loaded in DOM object if not empty. - props [mgmartel](https://github.com/mgmartel). + * $post_content is now unset after loading in DOM object. - props [mgmartel](https://github.com/mgmartel). + * Fix Alexa ID string validation, as reported by [kyasajin](https://github.com/kyasajin) and [Bubichka](https://github.com/Bubichka) in [issue 736](https://github.com/Yoast/wordpress-seo/issues/736) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix issue with Soliloquy image query, as reported by [osalcedo](https://github.com/osalcedo) and [mattisherwood](https://github.com/mattisherwood) in [issue #733](https://github.com/Yoast/wordpress-seo/issues/733) - props [Jrf](http://profiles.wordpress.org/jrf). + +* Enhancements + * Twitter metatag key is now filterable by 'wpseo_twitter_metatag_key'. + * Added a filter called "wpseo_replacements" in wpseo_replace_vars to allow customization of the replacements before they are applied - props [martinernst](https://github.com/martinernst). + * Added useful links for page analysis - props [bhubbard](https://github.com/bhubbard). + +* i18n Updates + * Updated nl_NL, id_ID, it_IT, fr_FR and de_DE + * Added ko + * Updated .pot file. + += 1.5.2 = + +* Bugfix: + * If `mbstring` extension isn't loaded, fatal error was thrown. + += 1.5.0 = + +This release contains tons and tons of bugfixes and security improvements. Credits for this release largely go to Juliette Reinders Folmer aka [Jrf](http://profiles.wordpress.org/jrf) / [jrfnl](https://github.com/jrfnl). + +Also a heartfelt thanks go out to the beta testers who tested all the changes. Special mentions for testers [Woyto](https://github.com/Woyto), [Bnpositive](https://github.com/Bnpositive), [Surbma](https://github.com/Surbma), [DavidCH1](https://github.com/DavidCH1), [TheITJuggler](https://github.com/TheITJuggler), [kletskater](https://github.com/kletskater) who caught a number of bugs and provided us with actionable information to fix these. + +This version also incorporates the [SEO Extended](http://wordpress.org/plugins/seo-extended/) plugin functionality into WP SEO with graceful thanks to [Faison](http://profiles.wordpress.org/faison/) and [Scott Offord](http://profiles.wordpress.org/scottofford/) for their great work on this plugin. + +**This version contains a lot of changes under the hood which will break backward compatibility, i.e. once you've upgraded, downgrading will break things.** So make sure you make a backup of your settings/database before upgrading. + + +* Bugfixes + * Major overhaul of the way the plugin deals with options. This should fix a truck-load of bugs and provides improved security. + * Major overhaul of the way the plugin deals with post meta values. This should fix a truck-load of bugs and provides improved security. + * Major overhaul of the way the plugin deals with taxonomy meta values. This should fix a truck-load of bugs and provides improved security. + + * Fixed: Renamed a number of options as they ran the risk of being overwritten by post type/taxonomy options which could get the same name. This may fix some issues where options did not seem to get saved correctly. + + * Fixed: if page specific keywords were set for a static homepage, they would never be shown. + * Fixed: if only one FB admin was selected, the tag would not be added. + * Fixed: bug where taxonomies which were on an individual level set to noindex and sitemap include 'auto-detect' would still be shown in the sitemap + * Fixed: bug in canonical urls where an essential part of the logic was skipped for singular posts/pages + * Fixed: category rewrite rules could have errors for categories without parent categories. + * Fixed: bug in delete_sitemaps() - wrong retrieval of needed options. + * Fixed: HTML sitemaps would sometimes display headers without a link list. + * Fixed: Breadcrumbs could potentially output an empty element as part of the chain, resulting in two separators in a row. + * Fixed: Breadcrumbs: even when removing the prefix texts from the admin page, they would sometimes still be included. + * Improved fixed for possible caching issue when `title_test` option remained set, issue [#627](https://github.com/Yoast/wordpress-seo/issues/627). + * Fixed bug in `title_test_helper` where it would pass the wrong information to `update_option()`, related to issue [#627](https://github.com/Yoast/wordpress-seo/issues/627). + * Fixed: shortcodes should be removed from ogdesc. + + * Fixed: Admin -> Dashboard -> Failed removal of the meta description from a theme file would still change the relevant internal option as if it had succeeded. + * Fixed: Admin -> Dashboard -> bug where message about files blocking the sitemap from working would not be removed when it should. + * Fixed: Admin -> Titles & Meta's -> Post types would show attachments even when attachment redirection to post was enabled. + * Fixed: Admin -> Import -> Fixed partially broken import functionality for WooThemes SEO framework + * Fixed: Admin -> Import -> Importing settings from file would not always work due to file/directory permission issues. + * Fixed: Admin -> Export -> Some values were exported in a way that they couldn't be imported properly again. + * Fixed: Admin -> Import/Export -> On export, the part of the admin page after export would not be loaded. + * Fixed: Admin -> Various -> Removed some superfluous hidden fields which could cause issues. + * Fixed: Admin -> Social -> The same fb user can no longer be added twice as Facebook admin. + + * Admin -> Multi-site -> Added error message when user tries to restore to defaults a non-existent blog (only applies to multi-site installations). + + * Bow out early from displaying the post/taxonomy metabox if the post/taxonomy is not public (no use adding meta data which will never be displayed). + * Prevent the SEO score filter from displaying on a post type overview page if the metabox has been hidden for the post type as suggested by [coreyworrell](https://github.com/coreyworrell) in issue [#601](https://github.com/Yoast/wordpress-seo/issues/601). + + * Improved: post meta -> the keyword density calculation for non-latin, non-ideograph languages - i.e. cyrillic, hebrew etc - has been improved. Related issues [#703](https://github.com/Yoast/wordpress-seo/issues/703), [#681](https://github.com/Yoast/wordpress-seo/issues/681), [#349](https://github.com/Yoast/wordpress-seo/issues/349) and [#264](https://github.com/Yoast/wordpress-seo/issues/264). The keyword density calculation for ideograph based languages such as Japanese and Chinese will not work yet, issue [#145](https://github.com/Yoast/wordpress-seo/issues/145) remains open. + * Fixed: post meta -> SEO score indicator -> wpseo_translate_score() would never return score, but always the css value. + * Fixed: post meta -> SEO score indicator -> wpseo_translate_score() calls were passing unintended wrong parameters + * Fixed: post meta -> page analysis -> text analysis did not respect the blog character encoding. This may or may not solve a number of related bugs. + * Fixed: post meta -> often wrong meta value was shown for meta robots follow and meta robots index in post meta box so it appeared as if the chosen value was not saved correctly. + * Fixed: post meta -> meta robots advanced entry could have strange (invalid) values. + * Fixed: post meta -> since v1.4.22 importing from other plugins would import data even when the post already had WP SEO values, effectively overwritting (empty by choice) WPSEO fields. + * Fixed: post meta -> A few of the meta values could contain line breaks where those aren't allowed. + + * Fixed: taxonomy meta -> breadcrumb title entry field would show for taxonomy even when breadcrumbs were not enabled + * Fixed: taxonomy meta -> bug where W3TC cache for taxonomy meta data wouldn't always be refreshed when it should and sometimes would when it shouldn't + + * Fixed: some things should work better now for must-use installations. + * Added sanitation/improved validation to $_GET and $_POST variables if/when they are used in a manner which could cause security issues. + * Fixed: wrong file was loaded for the get_plugin_data() function. + * Fixed: several bug-sensitive code constructs. This will probably get rid of a number of hard to figure out bugs. + * Fixed: several html validation issues. + * Prevent error when theme does not support featured images, issue [#639](https://github.com/Yoast/wordpress-seo/issues/639) as reported by [kuzudecoletaje](https://github.com/kuzudecoletaje). + + +* Enhancements + * The [SEO Extended](http://wordpress.org/plugins/seo-extended/) plugin functionality has now been integrated into WP SEO. + * Added ability to add Pininterest and Yandex site verification tags. You can enter this info on the WPSEO Dashboard and it will auto-generate the relevant meta tags for your webpage headers. + * New `[wpseo_breadcrumb]` shortcode. + * Post meta -> Don't show robots index/no-index choice in advanced meta box if there is a blog-wide override in place, i.e. the Settings -> Reading -> Block search engines checkbox is checked. + * Post meta -> Added 'Site-wide default' option to meta robots advanced field in advanced meta box. + * Post meta -> Added an option to decide whether to include/exclude `rel="author"` on a per post base as suggested by [GaryJones](https://github.com/GaryJones). (Added to the advanced meta box). + * Taxonomy meta -> Don't show robots index/no-index choice in taxonomy meta box if there is a blog-wide override in place, i.e. the Settings -> Reading -> Block search engines checkbox is checked. + * Admin -> If WP_DEBUG is on or if you have set the special constant WPSEO_DEBUG, a block with the currently saved options will be shown on the settings pages. + * Admin -> Dashboard -> Added error message for when meta description tag removal from theme file fails. + * Admin -> Titles & Meta -> Added option to add meta keywords to post type archives. + * Admin -> Social -> Facebook -> Added error messages for if communication with Facebook failed. + * Admin -> Import -> WPSEO settings -> Better error messages for when importing the settings fails and better clean up after itself. + * Adminbar -> Keyword research links now also search for the set the keyword when editing a post in the back-end. + * [Usability] Proper field labels for user profile form fields. + * The New Relic daemon (not the W3TC New Relic PHP module) realtime user monitoring will be turned off for xml/xsl files by default to prevent breaking the sitemaps as suggested by [szepeviktor](https://github.com/szepeviktor) in [issue #603](https://github.com/Yoast/wordpress-seo/issues/603) + * General jQuery efficiency improvements. + * Improved lazy loading of plugin files using autoload. + * Made the Google+ and Facebook post descriptions translatable by WPML. + * Better calculation precision for SEO score + * Improved 403 headers for illegal file requests as suggested by [cfoellmann](https://github.com/cfoellmann) + * Synchronized TextStatistics class with changes from the original, this should provide somewhat better results for non-latin languages. + * CSS and JS files are now minified + * Rewrote query logic for XML sitemaps + * Changed default settings for rel="author" + * Added option to switch to summary card with image for Twitter cards + * Made several changes to Open Graph logic + * Implemented new Yoast License framework + * Added possibility to create a robots.txt file directly on the server + +* Other: + * Removed some backward compatibility with WP < 3.5 as minimum requirement for WP SEO is now 3.5 + * Removed some old (commented out) code + * Deprecated category rewrite functionality + + + += 1.4.25 = + +* Bugfixes + * Do not include external URLs in XML sitemap (Issue #528) - props [tivnet](https://github.com/tivnet). + * Get home_url out of the sitemap loop - props [tivnet](https://github.com/tivnet). + * Add support for html entities - props [julienmeyer](https://github.com/julienmeyer). + * Fixed wrong use of `__FILE__`. + +* Enhancement + * WPSEO_FILE now has a 'defined' check. + * Removed unneeded `dirname` calls. + +* i18n + * Updated cs_CZ, de_DE, fr_FR & tr_TK + += 1.4.24 = + +* Bugfixes + * Removed screen_icon() calls. + * Fixed a bug in robots meta tag on singular items. + * Fix double robots header, WP native settings will be respected - props [Jrf](http://profiles.wordpress.org/jrf). + * When post published data is newer than last modified date, use that in XML sitemap, props [mindingdata](https://github.com/mindingdata). + * Check if tab hash is correct after being redirected from Facebook API, props [dannyvankooten](https://github.com/dannyvankooten). + * Fix 404 in category rewrites when `pagination_base` was changed, props [raugfer](https://github.com/raugfer). + * Make the metabox tabs jQuery only work for WPSEO tabs, props [imageinabox](https://github.com/imageinabox). + * Sitemap shortcode sql had hard-coded table name which could easily cause the shortcode display to fail. Fixed. - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix issue with user capability authorisation check as reported by [scienceandpoetry](https://github.com/scienceandpoetry) in issue [#492](https://github.com/Yoast/wordpress-seo/issues/492) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed canonical rel links was causing an error when given an invalid taxonomy, issue [#306](https://github.com/Yoast/wordpress-seo/issues/306) - props [Jrf](http://profiles.wordpress.org/jrf). + * Removed add_meta_box() function duplication - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix issue "Flesch Reading Ease should only be a positive number". This also fixes the message being unclear. Thanks [eugenmihailescu](https://github.com/eugenmihailescu) for reporting - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed issue with page analysis not taking feature image into account - props [darrarski](https://github.com/darrarski). + +* Enhancement + * Shortcode now also available to ajax requests - props [Jrf](http://profiles.wordpress.org/jrf). + * Added gitignores to prevent incorrect commits (Cross platform collab) - props [cfoellmann](https://github.com/cfoellmann). + * Adding filters to individual sitemap url entries - props [mboynes](https://github.com/mboynes). + += 1.4.23 = + +* Bugfixes + * Fix for serious sitemap issue which caused all pages of a split sitemap to be the same (show the first 1000 urls) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed a bug in the WPSEO tour in WP Network installs + * clean_permalink 301 redirect issue when using https - props [pirategaspard](https://github.com/pirategaspard) + +* i18n + * Updated cs_CZ, fa_IR, fr_FR, hu, hu_HU, pl_PL, ru_RU & zh_CN + + += 1.4.22 = + +* Bugfixes + * Reverted change to XML sitemaps stylesheet URL as that was giving issues on multisite installs. + * Reverted change to XML sitemap loading as we were no longer exposing some variables that other plugins relied upon. + * Fix bug with author sitemap showing for everyone. + +* Enhancement + * No longer save empty meta post variables, issue [#463](https://github.com/Yoast/wordpress-seo/issues/463). Clean up of DB is coming in future release, if you want to clean your DB now, see that issue for SQL queries. + += 1.4.21 = + +* Bugfixes + * Fix notice for `ICL_LANGUAGE_CODE` not being defined. + * Fix missing function in install by adding a require. + += 1.4.20 = + +* Bugfixes + * Fixed bug where posts set to _always_ index would not end up in XML sitemap. + * Fix _Invalid argument supplied for foreach()_ notice for WPML as reported by [pbearne](https://github.com/pbearne) - props [Jrf](http://profiles.wordpress.org/jrf). + * Yoast tracking cron job will now unschedule on disallowing of tracking, on deactivation and on uninstall, inspired by [Bluebird Blvd.](http://wordpress.org/support/topic/found-active-tracking-device-after-deleting-wp-seo-months-ago) - props [Jrf](http://profiles.wordpress.org/jrf). + * Fix issue [#453](https://github.com/Yoast/wordpress-seo/issues/435): setting shop as homepage caused a notice and wrong title with WooCommerce. + * Fixed a bug [#449](https://github.com/Yoast/wordpress-seo/issues/449) where a canonical, when manually set for a category, tag or term, could get pagination added to it on paginated pages, when it shouldn't. + * Fixed a bug where manually set canonicals would end up in `rel="next"` and `rel="prev"` tags. + * Fixed a bug [#450](https://github.com/Yoast/wordpress-seo/issues/450) where noindexed pages would appear in the HTML sitemap. + * Fixed a bug where non-public taxonomies would appear in the HTML sitemap. + * Fixed quotes not working in meta title and description for terms, issue [#405](https://github.com/Yoast/wordpress-seo/issues/405). + * Make sure author sitemap works when they should. + * Fix some notices in author sitemap, issue [#402](https://github.com/Yoast/wordpress-seo/issues/402). + * Fix breadcrumbs being broken on empty post type archives, issue [#443](https://github.com/Yoast/wordpress-seo/issues/443). + * Fixed a possible caching issue when `title_test` option remained set, issue [#419](https://github.com/Yoast/wordpress-seo/issues/419). + * Make sure og:description is shown on homepage when it's left empty in settings, fixes [#441](https://github.com/Yoast/wordpress-seo/issues/441). + * Make sure there are no WPML leftovers in our title, issue [#383](https://github.com/Yoast/wordpress-seo/issues/383). + * Fix padding on fix it buttons with 3.8 design, issue [#400](https://github.com/Yoast/wordpress-seo/issues/400). + * Hide SEO columns in responsive admin ( in 3.8 admin design ), issue [#445](https://github.com/Yoast/wordpress-seo/issues/445). + +* Misc + * Switch back to MailChimp for newsletter subscribe. + * Default to nofollowing links in RSS feed footers. + +* i18n + * Updated es_ES, pt_BR & ru_RU + * Added sk_SK + += 1.4.19 = + +* Enhancements + * Added the option to upload a separate image for Facebook in the Social tab. + * Added published time, last modified time, tags and categories to OpenGraph output, to work with Pinterests new article pin. + * Added a filter for post length requirements in the Analysis tab. + * If there is a term description, use it in the OpenGraph description for a term archive page. + * Applied a number of settings form best practices - props [Jrf](http://profiles.wordpress.org/jrf). + * File inclusion best practices applied - props [Jrf](http://profiles.wordpress.org/jrf). + * Breadcrumbs for Custom Post Types now take the CPT->label instead of CPT->labels->menu_name as text parameter, as suggested by [katart17](http://wordpress.org/support/profile/katart17) and [Robbert V](http://wordpress.org/support/profile/robbert-v) - props [Jrf](http://profiles.wordpress.org/jrf). + +* Bugfixes + * Move all rewrite flushing to shutdown, so it doesn't break other plugins who add their rewrites late. + * Fixed the wrong naming of the L10n JS object, props [Otto](http://profiles.wordpress.org/otto42). + * Improved form support for UTF-8 - props [Jrf](http://profiles.wordpress.org/jrf). + * Corrected faulty multisite option registration - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed appropriate use of plugins_url() to avoid breaking hooked in filters - props [Jrf](http://profiles.wordpress.org/jrf). + * (Temporary) fix for metabox styling for users using the MP6 plugin - props [Jrf](http://profiles.wordpress.org/jrf). + * Minor fix in localization loading - props [Jrf](http://profiles.wordpress.org/jrf). + * Fixed [Missing argument 3 for wpseo_upgrader_process_complete](https://github.com/Yoast/wordpress-seo/issues/327) notice for WP 3.7+, thanks [vickyindo](https://github.com/vickyindo), [Wendyhihi](https://github.com/Wendihihi) and [Theressa1](https://github.com/Theressa1) for reporting - props [Jrf](http://profiles.wordpress.org/jrf). + +* i18n + * Updated ru_RU, tr_TK and Hr + += 1.4.18 = + +* Unhooking 'shutdown' (part of the NGG fix in 1.4.16) caused caching plugins to break, fixed while preserving NGG fix. +* These changes were pushed in later but were deemed not important enough to force an update: + * Updated newsletter subscription form to reflect new newsletter system. + * Documentation + * Updated readme.txt to reflect support changes. + * Moved old sections of changelog to external file. + * i18n + * Updated pt_PT + +======= +>>>>>>> .r12027 = Earlier versions = For the changelog of earlier versions, please refer to the separate changelog.txt file. diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload.php index fef9dce7..22f68a37 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload.php @@ -1,3 +1,13 @@ +<<<<<<< .mine +>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload_52.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload_52.php index 979fa0e0..1e2acd2a 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload_52.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/autoload_52.php @@ -1,3 +1,13 @@ +<<<<<<< .mine +>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/ClassLoader.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/ClassLoader.php index 5e1469e8..45d157d4 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/ClassLoader.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/ClassLoader.php @@ -1,3 +1,419 @@ +<<<<<<< .mine + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + * @see http://www.php-fig.org/psr/psr-0/ + * @see http://www.php-fig.org/psr/psr-4/ + */ +class ClassLoader +{ + // PSR-4 + private $prefixLengthsPsr4 = array(); + private $prefixDirsPsr4 = array(); + private $fallbackDirsPsr4 = array(); + + // PSR-0 + private $prefixesPsr0 = array(); + private $fallbackDirsPsr0 = array(); + + private $useIncludePath = false; + private $classMap = array(); + + private $classMapAuthoritative = false; + + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', $this->prefixesPsr0); + } + + return array(); + } + + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + */ + public function add($prefix, $paths, $prepend = false) + { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + (array) $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + (array) $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = (array) $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + (array) $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-0 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + (array) $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + (array) $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + (array) $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return bool|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + includeFile($file); + + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731 + if ('\\' == $class[0]) { + $class = substr($class, 1); + } + + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative) { + return false; + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if ($file === null && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if ($file === null) { + // Remember that this class does not exist. + return $this->classMap[$class] = false; + } + + return $file; + } + + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { + if (0 === strpos($class, $prefix)) { + foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + } +} + +/** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + */ +function includeFile($file) +{ + include $file; +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/LICENSE b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/LICENSE new file mode 100644 index 00000000..c8d57af8 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) 2015 Nils Adermann, Jordi Boggiano + +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/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_classmap.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_classmap.php index a109e714..29f3ef13 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_classmap.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_classmap.php @@ -1,3 +1,183 @@ +<<<<<<< .mine + $vendorDir . '/composer/installers/src/Composer/Installers/AglInstaller.php', + 'Composer\\Installers\\AimeosInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/AimeosInstaller.php', + 'Composer\\Installers\\AnnotateCmsInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php', + 'Composer\\Installers\\AsgardInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/AsgardInstaller.php', + 'Composer\\Installers\\BaseInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/BaseInstaller.php', + 'Composer\\Installers\\BitrixInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/BitrixInstaller.php', + 'Composer\\Installers\\CakePHPInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/CakePHPInstaller.php', + 'Composer\\Installers\\ChefInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ChefInstaller.php', + 'Composer\\Installers\\ClanCatsFrameworkInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ClanCatsFrameworkInstaller.php', + 'Composer\\Installers\\CodeIgniterInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php', + 'Composer\\Installers\\Concrete5Installer' => $vendorDir . '/composer/installers/src/Composer/Installers/Concrete5Installer.php', + 'Composer\\Installers\\CraftInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/CraftInstaller.php', + 'Composer\\Installers\\CroogoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/CroogoInstaller.php', + 'Composer\\Installers\\DokuWikiInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/DokuWikiInstaller.php', + 'Composer\\Installers\\DolibarrInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/DolibarrInstaller.php', + 'Composer\\Installers\\DrupalInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/DrupalInstaller.php', + 'Composer\\Installers\\ElggInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ElggInstaller.php', + 'Composer\\Installers\\FuelInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/FuelInstaller.php', + 'Composer\\Installers\\FuelphpInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/FuelphpInstaller.php', + 'Composer\\Installers\\GravInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/GravInstaller.php', + 'Composer\\Installers\\HuradInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/HuradInstaller.php', + 'Composer\\Installers\\Installer' => $vendorDir . '/composer/installers/src/Composer/Installers/Installer.php', + 'Composer\\Installers\\JoomlaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/JoomlaInstaller.php', + 'Composer\\Installers\\KirbyInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/KirbyInstaller.php', + 'Composer\\Installers\\KohanaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/KohanaInstaller.php', + 'Composer\\Installers\\LaravelInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/LaravelInstaller.php', + 'Composer\\Installers\\LithiumInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/LithiumInstaller.php', + 'Composer\\Installers\\MODULEWorkInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MODULEWorkInstaller.php', + 'Composer\\Installers\\MODXEvoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MODXEvoInstaller.php', + 'Composer\\Installers\\MagentoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MagentoInstaller.php', + 'Composer\\Installers\\MakoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MakoInstaller.php', + 'Composer\\Installers\\MediaWikiInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MediaWikiInstaller.php', + 'Composer\\Installers\\MicroweberInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MicroweberInstaller.php', + 'Composer\\Installers\\MoodleInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MoodleInstaller.php', + 'Composer\\Installers\\OctoberInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/OctoberInstaller.php', + 'Composer\\Installers\\OxidInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/OxidInstaller.php', + 'Composer\\Installers\\PPIInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PPIInstaller.php', + 'Composer\\Installers\\PhpBBInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PhpBBInstaller.php', + 'Composer\\Installers\\PimcoreInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PimcoreInstaller.php', + 'Composer\\Installers\\PiwikInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PiwikInstaller.php', + 'Composer\\Installers\\PrestashopInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PrestashopInstaller.php', + 'Composer\\Installers\\PuppetInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/PuppetInstaller.php', + 'Composer\\Installers\\RedaxoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/RedaxoInstaller.php', + 'Composer\\Installers\\RoundcubeInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/RoundcubeInstaller.php', + 'Composer\\Installers\\SMFInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SMFInstaller.php', + 'Composer\\Installers\\ShopwareInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ShopwareInstaller.php', + 'Composer\\Installers\\SilverStripeInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SilverStripeInstaller.php', + 'Composer\\Installers\\Symfony1Installer' => $vendorDir . '/composer/installers/src/Composer/Installers/Symfony1Installer.php', + 'Composer\\Installers\\TYPO3CmsInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php', + 'Composer\\Installers\\TYPO3FlowInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php', + 'Composer\\Installers\\TheliaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TheliaInstaller.php', + 'Composer\\Installers\\TuskInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TuskInstaller.php', + 'Composer\\Installers\\WHMCSInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/WHMCSInstaller.php', + 'Composer\\Installers\\WolfCMSInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/WolfCMSInstaller.php', + 'Composer\\Installers\\WordPressInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/WordPressInstaller.php', + 'Composer\\Installers\\ZendInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ZendInstaller.php', + 'Composer\\Installers\\ZikulaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/ZikulaInstaller.php', + 'Metabox_Add_Keyword_Tab' => $baseDir . '/admin/metabox/class-metabox-add-keyword-tab.php', + 'WPSEO_Admin' => $baseDir . '/admin/class-admin.php', + 'WPSEO_Admin_Init' => $baseDir . '/admin/class-admin-init.php', + 'WPSEO_Admin_Pages' => $baseDir . '/admin/class-config.php', + 'WPSEO_Admin_User_Profile' => $baseDir . '/admin/class-admin-user-profile.php', + 'WPSEO_Breadcrumbs' => $baseDir . '/frontend/class-breadcrumbs.php', + 'WPSEO_Bulk_Description_List_Table' => $baseDir . '/admin/class-bulk-description-editor-list-table.php', + 'WPSEO_Bulk_List_Table' => $baseDir . '/admin/class-bulk-editor-list-table.php', + 'WPSEO_Bulk_Title_Editor_List_Table' => $baseDir . '/admin/class-bulk-title-editor-list-table.php', + 'WPSEO_Customizer' => $baseDir . '/admin/class-customizer.php', + 'WPSEO_Export' => $baseDir . '/admin/class-export.php', + 'WPSEO_Frontend' => $baseDir . '/frontend/class-frontend.php', + 'WPSEO_GSC' => $baseDir . '/admin/google_search_console/class-gsc.php', + 'WPSEO_GSC_Ajax' => $baseDir . '/admin/google_search_console/class-gsc-ajax.php', + 'WPSEO_GSC_Bulk_Action' => $baseDir . '/admin/google_search_console/class-gsc-bulk-action.php', + 'WPSEO_GSC_Category_Filters' => $baseDir . '/admin/google_search_console/class-gsc-category-filters.php', + 'WPSEO_GSC_Config' => $baseDir . '/admin/google_search_console/class-gsc-config.php', + 'WPSEO_GSC_Count' => $baseDir . '/admin/google_search_console/class-gsc-count.php', + 'WPSEO_GSC_Issue' => $baseDir . '/admin/google_search_console/class-gsc-issue.php', + 'WPSEO_GSC_Issues' => $baseDir . '/admin/google_search_console/class-gsc-issues.php', + 'WPSEO_GSC_Mapper' => $baseDir . '/admin/google_search_console/class-gsc-mapper.php', + 'WPSEO_GSC_Marker' => $baseDir . '/admin/google_search_console/class-gsc-marker.php', + 'WPSEO_GSC_Platform_Tabs' => $baseDir . '/admin/google_search_console/class-gsc-platform-tabs.php', + 'WPSEO_GSC_Service' => $baseDir . '/admin/google_search_console/class-gsc-service.php', + 'WPSEO_GSC_Settings' => $baseDir . '/admin/google_search_console/class-gsc-settings.php', + 'WPSEO_GSC_Table' => $baseDir . '/admin/google_search_console/class-gsc-table.php', + 'WPSEO_GooglePlus' => $baseDir . '/frontend/class-googleplus.php', + 'WPSEO_Import' => $baseDir . '/admin/class-import.php', + 'WPSEO_Import_AIOSEO' => $baseDir . '/admin/class-import-aioseo.php', + 'WPSEO_Import_AIOSEO_Hooks' => $baseDir . '/admin/import/class-import-aioseo-hooks.php', + 'WPSEO_Import_External' => $baseDir . '/admin/class-import-external.php', + 'WPSEO_Import_Hooks' => $baseDir . '/admin/import/class-import-hooks.php', + 'WPSEO_Import_Robots_Meta_Hooks' => $baseDir . '/admin/import/class-import-robots-meta-hooks.php', + 'WPSEO_Import_WPSEO' => $baseDir . '/admin/class-import-wpseo.php', + 'WPSEO_Import_WPSEO_Hooks' => $baseDir . '/admin/import/class-import-wpseo-hooks.php', + 'WPSEO_Import_WooThemes_SEO' => $baseDir . '/admin/class-import-woothemes-seo.php', + 'WPSEO_JSON_LD' => $baseDir . '/frontend/class-json-ld.php', + 'WPSEO_Meta' => $baseDir . '/inc/class-wpseo-meta.php', + 'WPSEO_Meta_Columns' => $baseDir . '/admin/class-meta-columns.php', + 'WPSEO_Metabox' => $baseDir . '/admin/metabox/class-metabox.php', + 'WPSEO_Metabox_Addon_Tab_Section' => $baseDir . '/admin/metabox/class-metabox-addon-section.php', + 'WPSEO_Metabox_Form_Tab' => $baseDir . '/admin/metabox/class-metabox-form-tab.php', + 'WPSEO_Metabox_Section' => $baseDir . '/admin/metabox/interface-metabox-section.php', + 'WPSEO_Metabox_Tab' => $baseDir . '/admin/metabox/interface-metabox-tab.php', + 'WPSEO_Metabox_Tab_Section' => $baseDir . '/admin/metabox/class-metabox-tab-section.php', + 'WPSEO_OnPage' => $baseDir . '/admin/onpage/class-onpage.php', + 'WPSEO_OnPage_Email_Presenter' => $baseDir . '/admin/onpage/class-onpage-email-presenter.php', + 'WPSEO_OnPage_Notifier' => $baseDir . '/admin/onpage/class-onpage-notifier.php', + 'WPSEO_OnPage_Option' => $baseDir . '/admin/onpage/class-onpage-option.php', + 'WPSEO_OnPage_Request' => $baseDir . '/admin/onpage/class-onpage-request.php', + 'WPSEO_OpenGraph' => $baseDir . '/frontend/class-opengraph.php', + 'WPSEO_OpenGraph_Image' => $baseDir . '/frontend/class-opengraph.php', + 'WPSEO_Option' => $baseDir . '/inc/options/class-wpseo-option.php', + 'WPSEO_Option_InternalLinks' => $baseDir . '/inc/options/class-wpseo-option-internallinks.php', + 'WPSEO_Option_MS' => $baseDir . '/inc/options/class-wpseo-option-ms.php', + 'WPSEO_Option_Permalinks' => $baseDir . '/inc/options/class-wpseo-option-permalinks.php', + 'WPSEO_Option_RSS' => $baseDir . '/inc/options/class-wpseo-option-rss.php', + 'WPSEO_Option_Social' => $baseDir . '/inc/options/class-wpseo-option-social.php', + 'WPSEO_Option_Titles' => $baseDir . '/inc/options/class-wpseo-option-titles.php', + 'WPSEO_Option_Wpseo' => $baseDir . '/inc/options/class-wpseo-option-wpseo.php', + 'WPSEO_Option_XML' => $baseDir . '/inc/options/class-wpseo-option-xml.php', + 'WPSEO_Options' => $baseDir . '/inc/options/class-wpseo-options.php', + 'WPSEO_Plugin_Conflict' => $baseDir . '/admin/class-plugin-conflict.php', + 'WPSEO_Pointers' => $baseDir . '/admin/class-pointers.php', + 'WPSEO_Rank' => $baseDir . '/inc/class-wpseo-rank.php', + 'WPSEO_Recalculate_Scores' => $baseDir . '/admin/class-recalculate-scores.php', + 'WPSEO_Recalculate_Scores_Ajax' => $baseDir . '/admin/ajax/class-recalculate-scores-ajax.php', + 'WPSEO_Replace_Vars' => $baseDir . '/inc/class-wpseo-replace-vars.php', + 'WPSEO_Rewrite' => $baseDir . '/inc/class-rewrite.php', + 'WPSEO_Shortcode_Filter' => $baseDir . '/admin/ajax/class-shortcode-filter.php', + 'WPSEO_Sitemap_Timezone' => $baseDir . '/inc/class-sitemap-timezone.php', + 'WPSEO_Sitemaps' => $baseDir . '/inc/class-sitemaps.php', + 'WPSEO_Sitemaps_Admin' => $baseDir . '/admin/class-sitemaps-admin.php', + 'WPSEO_Snippet_Preview' => $baseDir . '/deprecated/class-snippet-preview.php', + 'WPSEO_Social_Admin' => $baseDir . '/admin/class-social-admin.php', + 'WPSEO_Statistics' => $baseDir . '/inc/class-wpseo-statistics.php', + 'WPSEO_Taxonomy' => $baseDir . '/admin/taxonomy/class-taxonomy.php', + 'WPSEO_Taxonomy_Content_Fields' => $baseDir . '/admin/taxonomy/class-taxonomy-content-fields.php', + 'WPSEO_Taxonomy_Fields' => $baseDir . '/admin/taxonomy/class-taxonomy-fields.php', + 'WPSEO_Taxonomy_Fields_Presenter' => $baseDir . '/admin/taxonomy/class-taxonomy-fields-presenter.php', + 'WPSEO_Taxonomy_Meta' => $baseDir . '/inc/options/class-wpseo-taxonomy-meta.php', + 'WPSEO_Taxonomy_Metabox' => $baseDir . '/admin/taxonomy/class-taxonomy-metabox.php', + 'WPSEO_Taxonomy_Settings_Fields' => $baseDir . '/admin/taxonomy/class-taxonomy-settings-fields.php', + 'WPSEO_Taxonomy_Social_Fields' => $baseDir . '/admin/taxonomy/class-taxonomy-social-fields.php', + 'WPSEO_Twitter' => $baseDir . '/frontend/class-twitter.php', + 'WPSEO_Upgrade' => $baseDir . '/inc/class-upgrade.php', + 'WPSEO_Utils' => $baseDir . '/inc/class-wpseo-utils.php', + 'Yoast_API_Request' => $vendorDir . '/yoast/license-manager/class-api-request.php', + 'Yoast_Api_Libs' => $vendorDir . '/yoast/api-libs/class-api-libs.php', + 'Yoast_Dashboard_Widget' => $baseDir . '/admin/class-yoast-dashboard-widget.php', + 'Yoast_Dismissable_Notice_Ajax' => $baseDir . '/admin/ajax/class-yoast-dismissable-notice.php', + 'Yoast_Form' => $baseDir . '/admin/class-yoast-form.php', + 'Yoast_License_Manager' => $vendorDir . '/yoast/license-manager/class-license-manager.php', + 'Yoast_Notification' => $baseDir . '/admin/class-yoast-notification.php', + 'Yoast_Notification_Center' => $baseDir . '/admin/class-yoast-notification-center.php', + 'Yoast_OnPage_Ajax' => $baseDir . '/admin/ajax/class-yoast-onpage-ajax.php', + 'Yoast_Plugin_Conflict' => $baseDir . '/admin/class-yoast-plugin-conflict.php', + 'Yoast_Plugin_Conflict_Ajax' => $baseDir . '/admin/ajax/class-yoast-plugin-conflict-ajax.php', + 'Yoast_Plugin_License_Manager' => $vendorDir . '/yoast/license-manager/class-plugin-license-manager.php', + 'Yoast_Plugin_Update_Manager' => $vendorDir . '/yoast/license-manager/class-plugin-update-manager.php', + 'Yoast_Product' => $vendorDir . '/yoast/license-manager/class-product.php', + 'Yoast_Social_Facebook' => $baseDir . '/admin/class-social-facebook.php', + 'Yoast_Social_Facebook_Form' => $baseDir . '/admin/class-social-facebook.php', + 'Yoast_TextStatistics' => $baseDir . '/deprecated/class-yoast-textstatistics.php', + 'Yoast_Theme_License_Manager' => $vendorDir . '/yoast/license-manager/class-theme-license-manager.php', + 'Yoast_Theme_Update_Manager' => $vendorDir . '/yoast/license-manager/class-theme-update-manager.php', + 'Yoast_Update_Manager' => $vendorDir . '/yoast/license-manager/class-update-manager.php', + 'iYoast_License_Manager' => $vendorDir . '/yoast/license-manager/class-license-manager.php', + 'xrstf\\Composer52\\AutoloadGenerator' => $vendorDir . '/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php', + 'xrstf\\Composer52\\Generator' => $vendorDir . '/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php', + 'yoast_i18n' => $vendorDir . '/yoast/i18n-module/i18n-module.php', +); +||||||| .r0 +======= $vendorDir . '/yoast/license-manager/class-license-manager.php', 'yoast_i18n' => $vendorDir . '/yoast/i18n-module/i18n-module.php', ); +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real.php index 76762395..4ccd6912 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real.php @@ -1,3 +1,51 @@ +<<<<<<< .mine + $path) { + $loader->set($namespace, $path); + } + + $map = require __DIR__ . '/autoload_psr4.php'; + foreach ($map as $namespace => $path) { + $loader->setPsr4($namespace, $path); + } + + $classMap = require __DIR__ . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + + $loader->register(true); + + return $loader; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real_52.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real_52.php index 1fe1635b..8a7c48fa 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real_52.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/autoload_real_52.php @@ -1,3 +1,50 @@ +<<<<<<< .mine + $path) { + $loader->add($namespace, $path); + } + + $classMap = require $dir.'/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + + $loader->register(true); + + return $loader; + } +} +||||||| .r0 +======= >>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/installed.json b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/installed.json index 02f03687..51f5a8bc 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/installed.json +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/composer/installed.json @@ -1,3 +1,266 @@ +<<<<<<< .mine +[ + { + "name": "composer/installers", + "version": "v1.0.21", + "version_normalized": "1.0.21.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", + "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45", + "shasum": "" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" + }, + "time": "2015-02-18 17:17:01", + "type": "composer-installer", + "extra": { + "class": "Composer\\Installers\\Installer", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Hurad", + "MODX Evo", + "OXID", + "SMF", + "Thelia", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "bitrix", + "cakephp", + "chef", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "elgg", + "fuelphp", + "grav", + "installer", + "joomla", + "kohana", + "laravel", + "lithium", + "magento", + "mako", + "mediawiki", + "modulework", + "moodle", + "phpbb", + "piwik", + "ppi", + "puppet", + "roundcube", + "shopware", + "silverstripe", + "symfony", + "typo3", + "wordpress", + "zend", + "zikula" + ] + }, + { + "name": "xrstf/composer-php52", + "version": "v1.0.19", + "version_normalized": "1.0.19.0", + "source": { + "type": "hg", + "url": "https://bitbucket.org/xrstf/composer-php52", + "reference": "9a4a9c46d0347b39bf9159815301dc66fc25324e" + }, + "dist": { + "type": "zip", + "url": "https://bitbucket.org/xrstf/composer-php52/get/9a4a9c46d0347b39bf9159815301dc66fc25324e.zip", + "reference": "9a4a9c46d0347b39bf9159815301dc66fc25324e", + "shasum": "" + }, + "time": "2015-10-01 14:11:58", + "type": "library", + "extra": { + "branch-alias": { + "dev-default": "1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "xrstf\\Composer52": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "homepage": "http://www.xrstf.de/" + }, + { + "name": "yoast/api-libs", + "version": "2.0", + "version_normalized": "2.0.0.0", + "source": { + "type": "git", + "url": "https://github.com/Yoast/api-libs.git", + "reference": "e7361081a1d6ae79c0b96c8363379435ea736ef8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Yoast/api-libs/zipball/e7361081a1d6ae79c0b96c8363379435ea736ef8", + "reference": "e7361081a1d6ae79c0b96c8363379435ea736ef8", + "shasum": "" + }, + "time": "2015-07-14 10:25:59", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "class-api-libs.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0" + ], + "authors": [ + { + "name": "Team Yoast", + "email": "support@yoast.com", + "homepage": "https://yoast.com" + } + ], + "description": "Shared API libraries for Yoast projects.", + "homepage": "https://github.com/Yoast/api-libs", + "keywords": [ + "wordpress" + ] + }, + { + "name": "yoast/i18n-module", + "version": "1.0", + "version_normalized": "1.0.0.0", + "source": { + "type": "git", + "url": "https://github.com/Yoast/i18n-module.git", + "reference": "4648918ccf8bc6da12eadf57e4bece4829af29b3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Yoast/i18n-module/zipball/4648918ccf8bc6da12eadf57e4bece4829af29b3", + "reference": "4648918ccf8bc6da12eadf57e4bece4829af29b3", + "shasum": "" + }, + "time": "2015-04-22 12:48:39", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "i18n-module.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Team Yoast", + "email": "support@yoast.com", + "homepage": "https://yoast.com" + } + ], + "description": "Handle i18n for WordPress plugins.", + "homepage": "https://github.com/Yoast/i18n-module", + "keywords": [ + "wordpress" + ] + }, + { + "name": "yoast/license-manager", + "version": "1.2", + "version_normalized": "1.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/Yoast/License-Manager.git", + "reference": "8caf52202bf51011686e31c9a43b18731047f1be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Yoast/License-Manager/zipball/8caf52202bf51011686e31c9a43b18731047f1be", + "reference": "8caf52202bf51011686e31c9a43b18731047f1be", + "shasum": "" + }, + "time": "2015-03-16 11:51:33", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "class-api-request.php", + "class-license-manager.php", + "class-plugin-license-manager.php", + "class-plugin-update-manager.php", + "class-product.php", + "class-theme-license-manager.php", + "class-theme-update-manager.php", + "class-update-manager.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Team Yoast", + "email": "support@yoast.com", + "homepage": "https://yoast.com" + } + ], + "description": "Yoast License Manager.", + "homepage": "https://github.com/Yoast/License-Manager", + "keywords": [ + "wordpress" + ] + } +] +||||||| .r0 +======= [ { "name": "composer/installers", @@ -258,3 +521,4 @@ ] } ] +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hg_archival.txt b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hg_archival.txt index d6be04a6..eda77cb7 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hg_archival.txt +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hg_archival.txt @@ -1,4 +1,12 @@ +<<<<<<< .mine +repo: 0d0ceaca3a0500b3f45b41b79c6ac4f396dc4b13 +node: 9a4a9c46d0347b39bf9159815301dc66fc25324e +branch: default +tag: v1.0.19 +||||||| .r0 +======= repo: 0d0ceaca3a0500b3f45b41b79c6ac4f396dc4b13 node: 70b853668d6c3f97b63dafcfaeebb622bf08fd30 branch: default tag: v1.0.17 +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hgtags b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hgtags index d6ecb1f1..2e859dd8 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hgtags +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/.hgtags @@ -1,3 +1,4 @@ +<<<<<<< .mine 1328b37f36994039e0482272bfea90825f9b8d4c v1.0.0 8ed634e8a47ed96c8c6e7ef3bffb73e69c181f4b v1.0.1 8490d268ce216557f2ba82298c8dc7a8233d1c51 v1.0.2 @@ -15,3 +16,25 @@ eabb654da4d9200180037805cf348c20caf775c2 v1.0.13 8cc8f6ceddf527eafd0cd7b4cb274bef39d27a92 v1.0.14 b69d211ed4885e3c16282b01b7548226c7b50657 v1.0.15 b80de08b940ea59789646fa20d841fbdd72d72f0 v1.0.16 +70b853668d6c3f97b63dafcfaeebb622bf08fd30 v1.0.17 +32bc8be472523512b0ab1517f61d60bc4032803d v1.0.18 +||||||| .r0 +======= +1328b37f36994039e0482272bfea90825f9b8d4c v1.0.0 +8ed634e8a47ed96c8c6e7ef3bffb73e69c181f4b v1.0.1 +8490d268ce216557f2ba82298c8dc7a8233d1c51 v1.0.2 +e719a1afd817bc0c260750d40e871d4a8ea312f2 v1.0.3 +c139ce4683b3f0269ff017a0dc30f964ec165156 v1.0.4 +b8d4df7f5d4441c30bb35c4ab0eea7e7a2710cd4 v1.0.5 +05d33685ec9a85742d4f1634dcdd2bb8da74f626 v1.0.6 +a1377306c6e40426e3913f46cf5019c9e2497164 v1.0.7 +77cc535bc7441dacdbc10be7720c44c47b9cc2a2 v1.0.8 +b4e44b96b96762d08366196f7f9013e26c8d610d v1.0.9 +9b04ae051405d81c85dcb3a307b503a1471ee4fb v1.0.10 +c0b2cd0685c3a35297e3392b3a9df3c51c287740 v1.0.11 +1d534d45cf037b5f2f83c04043851b5f0f478975 v1.0.12 +eabb654da4d9200180037805cf348c20caf775c2 v1.0.13 +8cc8f6ceddf527eafd0cd7b4cb274bef39d27a92 v1.0.14 +b69d211ed4885e3c16282b01b7548226c7b50657 v1.0.15 +b80de08b940ea59789646fa20d841fbdd72d72f0 v1.0.16 +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php index 16592fc3..62434802 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php @@ -1,3 +1,352 @@ +<<<<<<< .mine + + * - Jordi Boggiano + */ + +namespace xrstf\Composer52; + +use Composer\Autoload\AutoloadGenerator as BaseGenerator; +use Composer\Autoload\ClassMapGenerator; +use Composer\Config; +use Composer\Installer\InstallationManager; +use Composer\Package\AliasPackage; +use Composer\Package\PackageInterface; +use Composer\Repository\InstalledRepositoryInterface; +use Composer\Util\Filesystem; + +class AutoloadGenerator extends BaseGenerator { + + /** + * @var bool + */ + private $classMapAuthoritative = false; + + public function __construct() { + // do nothing (but keep this constructor so we can build an instance without the need for an event dispatcher) + } + + /** + * Whether or not generated autoloader considers the class map + * authoritative. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = (boolean) $classMapAuthoritative; + } + + public function dump(Config $config, InstalledRepositoryInterface $localRepo, PackageInterface $mainPackage, InstallationManager $installationManager, $targetDir, $scanPsr0Packages = false, $suffix = '') { + if ($this->classMapAuthoritative) { + // Force scanPsr0Packages when classmap is authoritative + $scanPsr0Packages = true; + } + + $filesystem = new Filesystem(); + $filesystem->ensureDirectoryExists($config->get('vendor-dir')); + + $cwd = getcwd(); + $basePath = $filesystem->normalizePath($cwd); + $vendorPath = $filesystem->normalizePath(realpath($config->get('vendor-dir'))); + $targetDir = $vendorPath.'/'.$targetDir; + $filesystem->ensureDirectoryExists($targetDir); + + $useGlobalIncludePath = (bool) $config->get('use-include-path'); + $prependAutoloader = $config->get('prepend-autoloader') === false ? 'false' : 'true'; + $classMapAuthoritative = $config->get('classmap-authoritative'); + + $vendorPathCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true); + $vendorPathToTargetDirCode = $filesystem->findShortestPathCode($vendorPath, realpath($targetDir), true); + + $appBaseDirCode = $filesystem->findShortestPathCode($vendorPath, $basePath, true); + $appBaseDirCode = str_replace('__DIR__', '$vendorDir', $appBaseDirCode); + + // add 5.2 compat + $vendorPathCode = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathCode); + $vendorPathToTargetDirCode = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathToTargetDirCode); + + $packageMap = $this->buildPackageMap($installationManager, $mainPackage, $localRepo->getCanonicalPackages()); + $autoloads = $this->parseAutoloads($packageMap, $mainPackage); + + // add custom psr-0 autoloading if the root package has a target dir + $targetDirLoader = null; + $mainAutoload = $mainPackage->getAutoload(); + if ($mainPackage->getTargetDir() && !empty($mainAutoload['psr-0'])) { + $levels = count(explode('/', $filesystem->normalizePath($mainPackage->getTargetDir()))); + $prefixes = implode(', ', array_map(function ($prefix) { + return var_export($prefix, true); + }, array_keys($mainAutoload['psr-0']))); + + $baseDirFromTargetDirCode = $filesystem->findShortestPathCode($targetDir, $basePath, true); + + $targetDirLoader = <<isPHP53($functionFile)) { + $filesCode .= '// require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile)."; // disabled because of PHP 5.3 syntax\n"; + } + else { + $filesCode .= ' require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; + } + } + + if (!$suffix) { + $suffix = md5(uniqid('', true)); + } + + $includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode); + + file_put_contents($vendorPath.'/autoload_52.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix)); + file_put_contents($targetDir.'/autoload_real_52.php', $this->getAutoloadRealFile(true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)); + + // use stream_copy_to_stream instead of copy + // to work around https://bugs.php.net/bug.php?id=64634 + $sourceLoader = fopen(__DIR__.'/ClassLoader.php', 'r'); + $targetLoader = fopen($targetDir.'/ClassLoader52.php', 'w+'); + stream_copy_to_stream($sourceLoader, $targetLoader); + fclose($sourceLoader); + fclose($targetLoader); + unset($sourceLoader, $targetLoader); + } + + protected function isPHP53($file) { + $tokens = token_get_all(file_get_contents($file)); + $php53 = array(T_DIR, T_GOTO, T_NAMESPACE, T_NS_C, T_NS_SEPARATOR, T_USE); + + // PHP 5.4+ + if (defined('T_TRAIT')) { + $php53[] = T_TRAIT; + $php53[] = T_TRAIT_C; + $php53[] = T_TRAIT_C; + } + + // PHP 5.5+ + if (defined('T_FINALLY')) { + $php53[] = T_FINALLY; + $php53[] = T_YIELD; + } + + foreach ($tokens as $token) { + if (is_array($token) && in_array($token[0], $php53)) { + return true; + } + } + + return false; + } + + protected function getIncludePathsFile(array $packageMap, Filesystem $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode) { + $includePaths = array(); + + foreach ($packageMap as $item) { + list($package, $installPath) = $item; + + if (null !== $package->getTargetDir() && strlen($package->getTargetDir()) > 0) { + $installPath = substr($installPath, 0, -strlen('/'.$package->getTargetDir())); + } + + foreach ($package->getIncludePaths() as $includePath) { + $includePath = trim($includePath, '/'); + $includePaths[] = empty($installPath) ? $includePath : $installPath.'/'.$includePath; + } + } + + if (!$includePaths) { + return; + } + + $includePathsFile = <<getPathCode($filesystem, $basePath, $vendorPath, $path) . ",\n"; + } + + return $includePathsFile . ");\n"; + } + + protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix) { + return << $path) { + $loader->add($namespace, $path); + } + + +PSR0; + + if ($useClassMap) { + $file .= <<<'CLASSMAP' + $classMap = require $dir.'/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + + +CLASSMAP; + } + + if ($this->classMapAuthoritative) { + $file .= <<<'CLASSMAPAUTHORITATIVE' + $loader->setClassMapAuthoritative(true); + +CLASSMAPAUTHORITATIVE; + } + + if ($useGlobalIncludePath) { + $file .= <<<'INCLUDEPATH' + $loader->setUseIncludePath(true); + + +INCLUDEPATH; + } + + if ($targetDirLoader) { + $file .= <<register($prependAutoloader);{$filesCode} + + return \$loader; + } + +METHOD_FOOTER; + + $file .= $targetDirLoader; + + return $file . <<

>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php index 7f7e3ccd..df8f35e3 100755 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/vendor/xrstf/composer-php52/lib/xrstf/Composer52/Generator.php @@ -1,3 +1,45 @@ +<<<<<<< .mine +getComposer(); + $installationManager = $composer->getInstallationManager(); + $repoManager = $composer->getRepositoryManager(); + $localRepo = $repoManager->getLocalRepository(); + $package = $composer->getPackage(); + $config = $composer->getConfig(); + + // We can't gain access to the Command's input object, so we have to look + // for -o / --optimize-autoloader ourselves. Sadly, neither getopt() works + // (always returns an empty array), nor does Symfony's Console Input, as + // it expects a full definition of the current command line and we can't + // provide that. + + $args = $_SERVER['argv']; + $optimize = in_array('-o', $args) || in_array('--optimize-autoloader', $args) || in_array('--optimize', $args); + + $suffix = $config->get('autoloader-suffix'); + + $generator = new AutoloadGenerator(); + $generator->dump($config, $localRepo, $package, $installationManager, 'composer', $optimize, $suffix); + } +} +||||||| .r0 +======= dump($config, $localRepo, $package, $installationManager, 'composer', $optimize); } } +>>>>>>> .r12027 diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo-main.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo-main.php index 846f0380..19310f06 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo-main.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo-main.php @@ -13,7 +13,13 @@ if ( ! function_exists( 'add_filter' ) ) { * @internal Nobody should be able to overrule the real version number as this can cause serious issues * with the options, so no if ( ! defined() ) */ +<<<<<<< .mine +define( 'WPSEO_VERSION', '3.0.6' ); +||||||| .r11156 +define( 'WPSEO_VERSION', '1.7.1' ); +======= define( 'WPSEO_VERSION', '2.3.4' ); +>>>>>>> .r12027 if ( ! defined( 'WPSEO_PATH' ) ) { define( 'WPSEO_PATH', plugin_dir_path( WPSEO_FILE ) ); @@ -108,7 +114,12 @@ function wpseo_deactivate( $networkwide = false ) { function wpseo_network_activate_deactivate( $activate = true ) { global $wpdb; +<<<<<<< .mine +||||||| .r11156 + $original_blog_id = get_current_blog_id(); // alternatively use: $wpdb->blogid +======= $original_blog_id = get_current_blog_id(); // Alternatively use: $wpdb->blogid. +>>>>>>> .r12027 $all_blogs = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); if ( is_array( $all_blogs ) && $all_blogs !== array() ) { @@ -121,9 +132,17 @@ function wpseo_network_activate_deactivate( $activate = true ) { else { _wpseo_deactivate(); } + + restore_current_blog(); } +<<<<<<< .mine +||||||| .r11156 + // Restore back to original blog + switch_to_blog( $original_blog_id ); +======= // Restore back to original blog. switch_to_blog( $original_blog_id ); +>>>>>>> .r12027 } } @@ -143,7 +162,18 @@ function _wpseo_activate() { } WPSEO_Options::ensure_options_exist(); +<<<<<<< .mine + if ( is_multisite() && ms_is_switched() ) { + delete_option( 'rewrite_rules' ); + } + else { + add_action( 'shutdown', 'flush_rewrite_rules' ); + } +||||||| .r11156 + flush_rewrite_rules(); +======= add_action( 'shutdown', 'flush_rewrite_rules' ); +>>>>>>> .r12027 wpseo_add_capabilities(); @@ -159,7 +189,18 @@ function _wpseo_activate() { function _wpseo_deactivate() { require_once( WPSEO_PATH . 'inc/wpseo-functions.php' ); +<<<<<<< .mine + if ( is_multisite() && ms_is_switched() ) { + delete_option( 'rewrite_rules' ); + } + else { + add_action( 'shutdown', 'flush_rewrite_rules' ); + } +||||||| .r11156 + flush_rewrite_rules(); +======= add_action( 'shutdown', 'flush_rewrite_rules' ); +>>>>>>> .r12027 wpseo_remove_capabilities(); @@ -177,8 +218,14 @@ function _wpseo_deactivate() { * * @internal Unfortunately will fail if the plugin is in the must-use directory * @see https://core.trac.wordpress.org/ticket/24205 +<<<<<<< .mine + * + * @param int $blog_id Blog ID. +||||||| .r11156 +======= * * @param int $blog_id +>>>>>>> .r12027 */ function wpseo_on_activate_blog( $blog_id ) { if ( ! function_exists( 'is_plugin_active_for_network' ) ) { @@ -280,7 +327,7 @@ function wpseo_frontend_head_init() { $GLOBALS['wpseo_og'] = new WPSEO_OpenGraph; } - if ( $options['googleplus'] === true && is_singular() ) { + if ( $options['googleplus'] === true && ( is_singular() || ( is_category() || is_tax() || is_tag() ) ) ) { add_action( 'wpseo_head', array( 'WPSEO_GooglePlus', 'get_instance' ), 35 ); } } @@ -311,6 +358,22 @@ if ( ( ! defined( 'WP_INSTALLING' ) || WP_INSTALLING === false ) && ( $spl_autol if ( is_admin() ) { if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { require_once( WPSEO_PATH . 'admin/ajax.php' ); +<<<<<<< .mine + + // Crawl Issue Manager AJAX hooks. + new WPSEO_GSC_Ajax; + + // Plugin conflict ajax hooks. + new Yoast_Plugin_Conflict_Ajax(); + + if ( filter_input( INPUT_POST, 'action' ) === 'inline-save' ) { + add_action( 'plugins_loaded', 'wpseo_admin_init', 15 ); + } + } + else { +||||||| .r11156 + } else { +======= // Crawl Issue Manager AJAX hooks. new WPSEO_GSC_Ajax; @@ -320,6 +383,7 @@ if ( ( ! defined( 'WP_INSTALLING' ) || WP_INSTALLING === false ) && ( $spl_autol } else { +>>>>>>> .r12027 add_action( 'plugins_loaded', 'wpseo_admin_init', 15 ); } } @@ -337,6 +401,17 @@ register_deactivation_hook( WPSEO_FILE, 'wpseo_deactivate' ); add_action( 'wpmu_new_blog', 'wpseo_on_activate_blog' ); add_action( 'activate_blog', 'wpseo_on_activate_blog' ); +<<<<<<< .mine +// Loading OnPage integration. +new WPSEO_OnPage(); + +||||||| .r11156 + +======= +/** + * Wraps for notifications center class. + */ +>>>>>>> .r12027 /** * Wraps for notifications center class. */ @@ -378,6 +453,63 @@ function yoast_wpseo_missing_autoload() { if ( is_admin() ) { add_action( 'admin_notices', 'yoast_wpseo_missing_autoload_notice' ); +<<<<<<< .mine + yoast_wpseo_self_deactivate(); + } +} + +/** + * Returns the notice in case of missing Composer autoload + */ +function yoast_wpseo_missing_autoload_notice() { + /* translators: %1$s expands to Yoast SEO, %2$s / %3$s: links to the installation manual in the Readme for the Yoast SEO code repository on GitHub */ + $message = esc_html__( 'The %1$s plugin installation is incomplete. Please refer to %2$sinstallation instructions%3$s.', 'wordpress-seo' ); + $message = sprintf( $message, 'Yoast SEO', '', '' ); + yoast_wpseo_activation_failed_notice( $message ); +} + +/** + * Throw an error if the filter extension is disabled (prevent white screens) and self-deactivate plugin + * + * @since 2.0 + * + * @return void + */ +function yoast_wpseo_missing_filter() { + if ( is_admin() ) { + add_action( 'admin_notices', 'yoast_wpseo_missing_filter_notice' ); + + yoast_wpseo_self_deactivate(); + } +} + +/** + * Returns the notice in case of missing filter extension + */ +function yoast_wpseo_missing_filter_notice() { + $message = esc_html__( 'The filter extension seem to be unavailable. Please ask your web host to enable it.', 'wordpress-seo' ); + yoast_wpseo_activation_failed_notice( $message ); +} + +/** + * Echo's the Activation failed notice with any given message. + * + * @param string $message Message string. + */ +function yoast_wpseo_activation_failed_notice( $message ) { + echo '
' . __( 'Activation failed:', 'wordpress-seo' ) . ' ' . $message . '
'; +} + +/** + * The method will deactivate the plugin, but only once, done by the static $is_deactivated + */ +function yoast_wpseo_self_deactivate() { + static $is_deactivated; + + if ( $is_deactivated === null ) { + $is_deactivated = true; +||||||| .r11156 +======= yoast_wpseo_self_deactivate(); } } @@ -432,6 +564,7 @@ function yoast_wpseo_self_deactivate() { if ( $is_deactivated === null ) { $is_deactivated = true; +>>>>>>> .r12027 deactivate_plugins( plugin_basename( WPSEO_FILE ) ); if ( isset( $_GET['activate'] ) ) { unset( $_GET['activate'] ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo.php b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo.php index 3522834c..d6831b88 100644 --- a/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo.php +++ b/pavillonmadeleine.fr/wp-content/plugins/wordpress-seo/wp-seo.php @@ -3,6 +3,22 @@ * @package WPSEO\Main */ +<<<<<<< .mine +/** + * Plugin Name: Yoast SEO + * Version: 3.0.6 + * Plugin URI: https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin + * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. + * Author: Team Yoast + * Author URI: https://yoast.com/ + * Text Domain: wordpress-seo + * Domain Path: /languages/ + * License: GPL v3 + */ +||||||| .r11156 +WordPress SEO Plugin +Copyright (C) 2008-2014, Yoast BV - support@yoast.com +======= /** * Plugin Name: Yoast SEO * Version: 2.3.4 @@ -14,6 +30,7 @@ * Domain Path: /languages/ * License: GPL v3 */ +>>>>>>> .r12027 /** * Yoast SEO Plugin diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/plugin-update-styles.css b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/plugin-update-styles.css new file mode 100644 index 00000000..c9cf9ac7 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/plugin-update-styles.css @@ -0,0 +1 @@ +.check-licence-spinner{left:5px;position:relative;top:2px;margin-bottom:-2px;width:16px;height:16px}.wpmdb-original-update-row{display:none}.plugin-update-tr.wpmdbpro-custom-visible .update-message{padding-left:40px}.plugin-update-tr.wpmdbpro-custom-visible .update-message::before{margin-left:-30px}.plugin-update-tr.wpmdbpro-custom-visible .update-message span{display:inline-block} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/styles.css b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/styles.css new file mode 100644 index 00000000..a4ce3184 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/css/styles.css @@ -0,0 +1 @@ +#wpmdb-main{width:742px;position:relative;min-height:950px}#overlay{background-color:rgba(255,255,255,0.9)}.wpmdb h2 ~ .error,.wpmdb h2 ~ .notice,.wpmdb h2 ~ .updated{clear:both}.wpmdb div.updated.warning{max-width:742px;box-sizing:border-box;margin:10px 0}.wpmdb div.updated.warning p{font-size:13px;margin:0.5em 0}.wpmdb a{text-decoration:none}.wpmdb li{margin-bottom:5px;position:relative}.wpmdb ul{margin:0}.wpmdb input[type=checkbox],.wpmdb input[type=radio]{margin-right:5px;vertical-align:baseline;margin-top:0}.wpmdb input[type=text],.wpmdb input[type=password]{padding:5px}.wpmdb input[disabled=disabled]{cursor:default}.wpmdb label.disabled{color:#888;cursor:default}.wpmdb .option-section{border-bottom:1px solid #ccc;padding-bottom:20px;margin-bottom:20px}.wpmdb .option-section h3{font-size:18px;font-weight:normal}.wpmdb p.migrate-db{overflow:hidden}.wpmdb p.migrate-db input{float:left}.wpmdb p.migrate-db img{float:left;margin:3px 0 0 5px}.wpmdb p.migrate-db .save-settings-button{margin-left:10px;display:none}.wpmdb .indent-wrap{margin-left:24px}.wpmdb .expandable-content{display:none;margin-top:10px}.wpmdb .expandable-content li:last-child{margin-bottom:0px}.wpmdb .header-wrapper{margin-bottom:10px}.wpmdb .header-expand-collapse{cursor:pointer;display:inline-block}.wpmdb .option-description{font-size:12px;color:#999;margin-left:8px;font-weight:normal}.wpmdb .option-group li:last-child{margin-bottom:0}.wpmdb .connection-status{display:none;overflow:auto}.wpmdb .connection-status.error{color:#9D1818}.wpmdb .copy-licence-to-remote-site{display:inline-block}.wpmdb .ajax-spinner{left:6px;position:relative;top:3px}.wpmdb div.message{margin:15px 0 0}.wpmdb .licence-wrap h3{margin:0 0 10px 0}.wpmdb .licence-input{clear:both;display:block;font-family:Consolas, Monaco, monospace;font-size:14px;margin-bottom:7px;padding:10px;width:418px}.wpmdb .register-licence{float:left;outline:none}.wpmdb .licence-status{color:#A21B1B;font-weight:bold;clear:both;padding-top:0.5em;margin:0}.wpmdb .licence-status.success{color:#333}.wpmdb .register-licence-ajax-spinner{margin:4px 0 0 8px}.wpmdb .return-to-profile-selection{margin-bottom:15px;display:inline-block}.wpmdb .return-to-profile-selection.bottom{margin-top:10px}.wpmdb h2.nav-tab-wrapper{margin-top:10px;margin-bottom:20px;padding-left:5px}.wpmdb h2.nav-tab-wrapper a.nav-tab-active{color:#464646;cursor:default}.wpmdb label{display:inline-block;clear:both}.wpmdb .migration-profile-options li{position:relative;width:520px}.wpmdb .migration-profile-options li a{padding:5px 10px;width:500px;border:1px solid #ddd;margin:0px 0px 7px;display:block;font-size:14px;color:#333}.wpmdb .migration-profile-options li a:hover{border-color:#bbb}.wpmdb .main-list-delete-profile-link{color:#999999;font-family:"Times New Roman", serif;font-size:26px;font-weight:200;position:absolute;right:7px;top:6px;cursor:pointer}.wpmdb .main-list-delete-profile-link:hover{color:#444}.wpmdb .crumbs{overflow:hidden;border-bottom:1px solid #ccc;padding:12px 0}.wpmdb .crumbs .crumb{position:relative;display:block;float:left;margin-right:4px;padding-right:3px;font-size:13px;font-weight:bold}.wpmdb .crumbs span.crumb{padding-left:25px}.wpmdb .crumbs span.crumb:before{content:"\f345";position:absolute;left:0;top:0;display:inline-block;-webkit-font-smoothing:antialiased;font:normal 18px/1 'dashicons';vertical-align:middle}.wpmdb .option-group li{margin-bottom:5px}.wpmdb .option-group>li{margin-bottom:8px}.wpmdb .option-group li>label{font-size:14px;font-weight:bold}.wpmdb .option-group ul{display:none;margin:10px 0px 10px 25px}.wpmdb .option-group ul label{font-size:12px;font-weight:normal}.wpmdb .option-heading,.wpmdb .checkbox-label{font-size:14px;font-weight:bold}.wpmdb .checkbox-label input[type=checkbox]{margin-right:7px;position:relative;top:-1px}.wpmdb .expand-collapse-arrow{margin-right:9px}.wpmdb .migrate-selection{padding-top:20px}.wpmdb .migrate-connection-info{min-width:675px;margin:0}.wpmdb .migrate-tab .pull-push-connection-info{width:418px;height:65px;color:#333;font-family:Consolas, Monaco, monospace;font-size:15px;line-height:21px;padding:10px}.wpmdb .basic-access-auth-wrapper{display:none;margin-bottom:5px}.wpmdb .auth-username,.wpmdb .auth-password{width:206px;margin-top:3px}.wpmdb .auth-password{width:207px}.wpmdb .connection-info-wrapper{display:none;width:670px}.wpmdb .connect-button{margin-top:2px}.wpmdb .temp-disabled{background-color:#EEEEEE;color:#888888;font-family:Consolas, Monaco, monospace;text-shadow:0 1px 0 #FFFFFF}.wpmdb .push-list ul{margin-bottom:0px}.wpmdb .find-heading,.wpmdb .replace-heading{float:left}.wpmdb .find-heading{width:400px}.wpmdb .replace-fields{border-collapse:collapse;border-spacing:0px}.wpmdb .replace-fields input{width:295px}.wpmdb .replace-fields tr td{padding-bottom:7px}.wpmdb .replace-fields tr:last-child td{padding-bottom:0px}.wpmdb .arrow-col{width:93px;text-align:center;vertical-align:middle}.wpmdb .right-arrow{font-size:36px;color:#aaa;font-family:arial, sans-serif}.wpmdb .replace-right-col span{border-radius:50%;border:1px solid #ccc;background-color:#eee;width:16px;height:16px;display:inline-block;position:relative;top:4px;cursor:pointer}.wpmdb .replace-right-col span:hover{border-color:#aaa}.wpmdb .pin .sort-handle-col{opacity:0.5;cursor:default}.wpmdb .pin .sort-handle{cursor:default !important}.wpmdb .sort-handle-col{width:20px;cursor:-webkit-grab;cursor:-moz-grab}.wpmdb .sort-handle:before{content:"\f214";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 20px/1 'dashicons';vertical-align:top;color:#aaa;background-color:transparent !important;margin-right:4px}.wpmdb .original-repeatable-field{display:none}.wpmdb .no-replaces-message{display:none;margin-bottom:0px}.wpmdb .inline-message.missing-replace{margin-top:15px;display:none}.wpmdb #new-path-missing-warning{margin-top:5px}.wpmdb .tables-header{display:inline-block}.wpmdb .expand-collapse-arrow{display:inline-block;position:relative;top:-2px;font-size:11px}.wpmdb .collapsed{-webkit-transform:scale(1) rotate(-90deg) translateX(0px) translateY(0px) skewX(0deg) skewY(0deg);-ms-transform:scale(1) rotate(-90deg) translateX(0px) translateY(0px) skewX(0deg) skewY(0deg);transform:scale(1) rotate(-90deg) translateX(0px) translateY(0px) skewX(0deg) skewY(0deg)}.wpmdb .select-deselect-divider{margin:0 6px}.wpmdb .select-wrap{display:none;margin-top:12px}.wpmdb .select-post-types-wrap{display:block}.wpmdb .multiselect{min-width:420px;min-height:180px;margin-bottom:10px}.wpmdb .table-migrate-options li label{font-size:12px;font-weight:normal}.wpmdb .table-migrate-options li{margin-bottom:5px}.wpmdb .general-helper{border-radius:50%;border:1px solid #ccc;background-color:#eee;width:15px;height:15px;display:inline-block;position:relative;top:4px;margin-top:-4px;cursor:pointer;margin-left:2px}.wpmdb .general-helper:hover{border-color:#aaa}.wpmdb .general-helper:after{content:"?";color:#999999;font-size:10px;font-weight:bold;left:4px;position:absolute;top:-1px}.wpmdb .helper-message{padding:10px;border:1px solid #ccc;border-radius:3px;background-color:#fff;position:absolute;width:500px;z-index:9999;display:none;box-shadow:0px 0px 5px rgba(0,0,0,0.2)}.wpmdb .inline-message{padding:10px;border-radius:3px;margin-top:5px}.wpmdb .inline-message.error{border:1px solid #CC0000;background-color:#FFEBE8}.wpmdb .inline-message.warning{background-color:#FFFFE0;border:1px solid #E6DB55}.wpmdb .helper-message:before{content:'';border-bottom:8px solid transparent;border-right:8px solid #aaa;border-top:8px solid transparent;display:block;height:0;left:-8px;position:absolute;top:11px;width:0}.wpmdb .helper-message:after{content:'';border-bottom:8px solid transparent;border-right:8px solid #fff;border-top:8px solid transparent;display:block;height:0;left:-7px;position:absolute;top:11px;width:0}.wpmdb .helper-message.bottom:before{content:'';border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #aaa;border-top:0;display:block;height:0;left:50%;margin-left:-8px;position:absolute;top:-9px;width:0}.wpmdb .helper-message.bottom:after{content:'';border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #fff;border-top:0;display:block;height:0;left:50%;margin-left:-8px;position:absolute;top:-8px;width:0}.wpmdb .label-disabled{color:#888}.wpmdb .prefix-notice,.wpmdb .ssl-notice,.wpmdb .different-plugin-version-notice,.wpmdb .directory-permission-notice{background-color:#FFFFE0;border:1px solid #E6DB55;padding:15px;border-radius:3px;margin-bottom:15px;display:none}.wpmdb .prefix-notice p,.wpmdb .ssl-notice p,.wpmdb .different-plugin-version-notice p,.wpmdb .directory-permission-notice p{margin-top:0px}.wpmdb .prefix-notice p:last-child,.wpmdb .ssl-notice p:last-child,.wpmdb .different-plugin-version-notice p:last-child,.wpmdb .directory-permission-notice p:last-child{margin:0px}.wpmdb .different-plugin-version-notice,.wpmdb .directory-permission-notice{background-color:#FFEBE8;border-color:#CC0000}.wpmdb .different-plugin-version-notice a,.wpmdb .directory-permission-notice a{color:#CC0000;text-decoration:underline}.wpmdb .mixed-case-table-name-notice{display:none}.wpmdb .save-migration-profile-wrap li label{font-size:12px;font-weight:normal}.wpmdb .save-migration-profile-wrap li{margin-bottom:5px;padding-left:25px}.wpmdb .save-migration-profile-wrap .indent-wrap{margin-left:0px}.wpmdb .create-new-label{margin-right:8px}.wpmdb .create-new-profile{position:absolute;top:-5px}.wpmdb .replace-remove-row,.wpmdb .delete-profile{background-color:#eee;border:1px solid #ccc;border-radius:50% 50% 50% 50%;cursor:pointer;height:11px;left:5px;margin-left:2px;position:absolute;margin-top:-6px;top:50%;width:11px;display:block;background-position:50% 50%;background-size:6px 6px;background-repeat:no-repeat}.wpmdb .replace-remove-row:after,.wpmdb .delete-profile:after{content:"\00d7";left:2px;position:absolute;top:-3px;color:#aaa;font-size:12px}.wpmdb .replace-remove-row:after{position:relative}.wpmdb .replace-remove-row:hover,.wpmdb .delete-profile:hover{border-color:#aaa}.wpmdb .migrate-db .ajax-success-msg{font-weight:bold;margin:3px 0 0 9px;display:inline-block}.wpmdb p img.save-profile-ajax-spinner{margin-left:10px}.wpmdb .backup-description{left:20px;position:relative}.wpmdb .backup-option-disabled{margin-bottom:0px !important}.wpmdb .settings-tab{display:none}.wpmdb .settings-tab .slider{max-width:416px}.wpmdb .settings-tab .slider-label{display:block;margin-bottom:10px;float:left;width:50%}.wpmdb .settings-tab .slider-label-wrapper{max-width:416px;width:100%;position:relative}.wpmdb .settings-tab .amount{width:50%;text-align:right;display:block;text-align:right;float:left}.wpmdb .settings-tab .slider-spinner{position:absolute;right:-35px;bottom:-13px}.wpmdb .settings-tab .slider-success-msg{display:none;right:-53px;bottom:-13px;position:absolute;font-weight:bold}.wpmdb .settings-tab .ui-slider{border:1px solid #dfdfdf;height:10px;border-radius:2px;position:relative}.wpmdb .settings-tab .ui-slider-handle{width:7px;height:20px;background-color:#aaa;display:block;position:absolute;top:-5px;outline:none}.wpmdb .settings-tab .ui-slider-handle:active{background-color:#999}.wpmdb .settings-tab .ui-slider-range{background-color:#eee;height:100%}.wpmdb .settings-tab .option-section label{font-weight:normal;position:relative}.wpmdb .settings-tab .option-section li{margin-bottom:5px}.wpmdb .settings-tab .option-section li:last-child{margin-bottom:0px}.wpmdb .settings-tab .option-section.allow-remote-requests-wrap .ajax-spinner,.wpmdb .settings-tab .option-section.plugin-compatibility-section .ajax-spinner{right:-23px;left:inherit;top:0px;position:absolute}.wpmdb .settings-tab .option-section .ajax-success-msg{right:-42px;left:inherit;top:0px;position:absolute;font-weight:bold}.wpmdb .settings-tab .option-section .bubble .ajax-spinner{right:-45px}.wpmdb .settings-tab .option-section .bubble .ajax-success-msg{right:-65px}.wpmdb .allow-remote-reqeusts{font-size:14px;font-weight:bold}.wpmdb .connection-info-label{margin-top:15px;margin-bottom:5px;display:block}.wpmdb .connection-info{clear:both;font-size:15px;line-height:21px;font-family:Consolas, Monaco, monospace;padding:10px 10px;height:67px;text-shadow:0px 1px 0px #fff;display:block;margin-bottom:7px;width:418px}.wpmdb .reset-button-wrap{width:418px}.wpmdb .reset-api-key{float:left}.wpmdb .reset-api-key-ajax-spinner{float:left;margin:4px 7px}.wpmdb .masked-licence{margin-top:0px}.wpmdb .bull{font-size:22px;position:relative;top:4px}.wpmdb .plugin-compatibility-wrap{padding:18px 18px 18px 24px;background-color:#e6e6e6;margin-left:0}.wpmdb .plugin-compatibility-wrap p:last-of-type{margin-bottom:0}.wpmdb ul.plugin-compatibility-options{display:block;margin:10px 0 10px 0px}.wpmdb .plugin-compatibility-spinner{position:relative;top:3px;left:10px}.wpmdb .plugin-compatibility-success-msg{position:relative;left:10px;font-weight:bold;display:none}.wpmdb .help-tab{display:none}.wpmdb .help-tab h3{font-size:18px;font-weight:normal}.wpmdb .help-tab .support{border-bottom:1px solid #ccc;margin-bottom:25px;padding-bottom:18px}.wpmdb .help-tab .support p{width:640px}.wpmdb .help-tab .support .email a{font-size:12px}.wpmdb .help-tab .support .upgrade-to-pro{font-size:16px;font-weight:bold}.wpmdb .help-tab .support .upgrade-to-pro a{white-space:nowrap}.wpmdb .help-tab .support .ajax-spinner{top:2px}.wpmdb .help-tab .video-viewer{margin-bottom:30px;border:1px solid #ccc}.wpmdb .help-tab .videos{width:640px}.wpmdb .help-tab .videos ul>li{margin-bottom:30px;overflow:hidden;position:relative}.wpmdb .help-tab .videos ul>li a{overflow:hidden;display:block;width:320px;height:180px;float:left;margin-right:15px;position:relative;z-index:1;border:1px solid #ccc}.wpmdb .help-tab .videos ul>li a:before,.wpmdb .help-tab .videos ul>li a:after{position:absolute;content:" ";margin:auto;left:0;right:0;top:0;bottom:0}.wpmdb .help-tab .videos ul>li a:before{width:64px;height:64px;border-radius:64px;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);opacity:0.8;border:1px solid #ddd;background-color:#fff;z-index:2}.wpmdb .help-tab .videos ul>li a:after{filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);opacity:0.8;border:21.33333px solid transparent;border-top-width:12.8px;border-bottom-width:12.8px;border-left-color:#333;background:transparent;display:block;left:25px;width:0px;height:0px;z-index:3}.wpmdb .help-tab .videos .video:last-child{margin-bottom:0px}.wpmdb .help-tab .videos img{width:320px;height:240px;position:relative;top:50%;margin-top:-120px}.wpmdb .help-tab .debug{width:640px;border-bottom:1px solid #CCCCCC;margin-bottom:25px;padding-bottom:28px}.wpmdb .help-tab .debug textarea{width:100%;min-height:200px;font-family:Consolas, Monaco, monospace;margin-bottom:5px}.wpmdb .help-tab h4{margin:0 0 0.2em 0}.wpmdb .help-tab p{margin:0 0 0.5em 0}.wpmdb .help-tab iframe{display:none}.wpmdb .addons-tab{display:none}.wpmdb .addons-tab .addon{position:relative;width:100%;min-height:138px;padding:25px 30px 30px 165px;box-sizing:border-box;color:#fff;margin-top:15px}.wpmdb .addons-tab .addon .actions{float:right;font-size:14px}.wpmdb .addons-tab .addon .actions>*{margin-right:10px}.wpmdb .addons-tab .addon .actions *:last-child{margin-right:0}.wpmdb .addons-tab .addon .actions .action{background-color:#fff;font-weight:bold;display:inline-block;padding:0.2em 0.4em}.wpmdb .addons-tab .addon .actions .action:hover{background-color:rgba(255,255,255,0.92)}.wpmdb .addons-tab .addon .actions .status{border-bottom:2px solid #fff;padding-bottom:0.1em}.wpmdb .addons-tab .addon h1{font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;font-weight:normal;float:left;margin:0;margin-top:5px;color:#fff}.wpmdb .addons-tab .addon p{font-size:16px;line-height:1.2em;clear:both;margin:0}.wpmdb .addons-tab .addon p a{text-decoration:underline;color:#fff}.wpmdb .addons-tab .addon p a:hover{color:rgba(255,255,255,0.9)}.wpmdb .addons-tab .addon.wp-migrate-db-pro-media-files{background:#3fab3f url(../img/icon-media-files.svg) no-repeat 30px 30px;background-size:110px 85px}.wpmdb .addons-tab .addon.wp-migrate-db-pro-media-files .action{color:#3fab3f}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli{background:#272822 url(../img/icon-cli.svg) no-repeat 30px 30px;background-size:110px 97px;min-height:157px;color:#ddd}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli .action{color:#272822;background-color:#ddd}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli .action:hover{color:#272822;background-color:#eee}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli .status{border-bottom-color:#ddd}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli p a{color:#ddd}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli p a:hover{color:#f7f7f7}.wpmdb .addons-tab .addon.wp-migrate-db-pro-cli code{white-space:nowrap;margin:0;padding:0}.wpmdb .addons-tab .addon.wp-migrate-db-pro-multisite-tools{background:#a90000 url(../img/icon-multisite-tools.svg) no-repeat 30px 20px;background-size:110px 118px;min-height:157px}.wpmdb .addons-tab .addon.wp-migrate-db-pro-multisite-tools .action{color:#a90000}.clearfix:before,.clearfix:after{content:"";display:table}.clearfix:after{clear:both}.clearfix{zoom:1}.general-spinner{width:16px;height:16px}.migration-error{color:#A21B1B;display:block;max-height:400px;max-width:100%;overflow:auto;word-wrap:break-word}.migration-php-errors{display:none;margin:20px 0;overflow-y:scroll;height:180px}.progress-content{display:none;position:relative;margin:0 auto;background-color:#fff;padding:50px;box-shadow:0 0 10px #ccc;cursor:default;width:80%;z-index:99999;position:fixed;left:50%;margin-left:-40%;box-sizing:border-box;max-height:100%;overflow-y:auto}.progress-content .progress-bar{height:10px;background-color:#8cc1e9;margin-bottom:5px;background-image:url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzcyYTdjZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzhjYzFlOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');background-size:100%;background-image:-webkit-gradient(linear, 50% 100%, 50% 0%, color-stop(0%, #72a7cf),color-stop(100%, #8cc1e9));background-image:-webkit-linear-gradient(bottom, #72a7cf,#8cc1e9);background-image:-webkit-linear-gradient(bottom, #72a7cf, #8cc1e9);background-image:linear-gradient(to top, #72a7cf,#8cc1e9)}.progress-content .progress-title{font-size:18px;font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;font-weight:normal;float:left}.progress-content .progress-bar{width:0%}.progress-content .progress-info-wrapper{margin-bottom:10px}.progress-content .progress-text{clear:left;float:left;width:100%}.progress-content .timer{float:right}.progress-content .progress-tables{overflow:hidden;margin-bottom:2px;padding:0 0 20px 0}.progress-content .progress-bar-wrapper{position:relative}.progress-content .progress-bar-wrapper:before{content:'';display:block;height:5px;width:1px;background-color:#ccc;position:absolute;top:15px;left:0px}.progress-content .progress-tables-hover-boxes{position:absolute;top:0px;left:0px;display:block;width:100%}.progress-content .progress-chunk-hover{display:block;float:left;height:35px;position:relative;top:-5px;z-index:1}.progress-content .progress-chunk{box-sizing:border-box;float:left;display:block;height:6px;border-right:1px solid #ccc;border-bottom:1px solid #ccc;color:#999;position:relative;text-align:center}.progress-content .progress-chunk>span{padding:0px 3px;white-space:nowrap;text-overflow:ellipsis;margin-top:10px;display:inline-block}.progress-content .progress-label{padding:5px 10px;border:1px solid #ccc;border-radius:3px;background-color:#fff;font-family:Consolas, Monaco, monospace;font-size:12px;display:inline-block;top:-35px;position:absolute;opacity:0;-webkit-transition:opacity 200ms ease-in-out;transition:opacity 200ms ease-in-out}.progress-content .label-visible{opacity:1}.progress-content .progress-label:before{content:"";width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ccc;display:block;position:absolute;bottom:-5px;left:50%;margin-left:-2px}.progress-content .progress-label:after{content:"";width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;display:block;position:absolute;bottom:-4px;left:50%;margin-left:-2px}.progress-content .migration-progress-ajax-spinner{left:7px;position:relative;top:15px}.progress-content .close-progress-content{color:#999999;cursor:pointer;font-family:"Times New Roman",serif;font-size:26px;font-weight:200;position:absolute;right:20px;top:20px;padding:5px;display:none}.progress-content .close-progress-content:hover{color:#666;border-color:#aaa}.progress-content .migration-controls{display:block;margin-top:45px;overflow:hidden}.progress-content .migration-controls span{float:left;text-align:center;display:block}.progress-content .migration-controls span:first-child{margin-right:10px;width:71px}.progress-content .pro-version{margin-top:45px;padding-top:40px;position:relative;border-top:1px solid #ccc}.progress-content .pro-version iframe{position:absolute;top:40px;right:0;display:block}.progress-content .pro-version-content{padding-right:460px;min-height:255px}.progress-content .pro-version-content h1{line-height:1em;margin-top:0;font-size:20px}.progress-content .pro-version-content ul{margin-left:24px}.progress-content .pro-version-content li{position:relative;font-size:14px;line-height:1.4em;margin-bottom:15px;max-width:580px}.progress-content .pro-version-content li:before{content:"\f147";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 30px/1 'dashicons';position:absolute;top:-3px;left:-32px;vertical-align:top;font-family:'dashicons'}.progress-content .pro-version-content .pro-quote{margin:0 0 20px 0;max-width:570px}.progress-content .pro-version-content .pro-quote .dashicons-star-filled{font-size:16px;width:16px;height:16px;position:relative;top:2px}.progress-content .pro-version-content .pro-quote-author{font-style:italic;white-space:nowrap}@media screen and (max-width: 1096px){.progress-content .pro-version iframe{position:relative;top:auto;right:auto}.progress-content .pro-version-content{min-height:0;padding:0 0 20px 0}}.wpmdb-not-pro .wpmdb .wpmdb-main{margin-top:15px}.wpmdb-not-pro .wpmdb .migrate-selection ul{margin:0px}.wpmdb-not-pro .wpmdb .help-tab .support p{width:auto}#wpmdb-sidebar{position:absolute;top:-21px;right:-312px;width:292px}#wpmdb-sidebar .block{padding:20px;border:1px solid #ccc}#wpmdb-sidebar .subscribe{border-top:none}#wpmdb-sidebar .subscribe h2{padding:0;margin:0;margin-bottom:0.5em;color:#666;font-size:20px;line-height:1.2em;float:none}#wpmdb-sidebar .subscribe h3{font-size:16px;margin:0}#wpmdb-sidebar .subscribe p{margin:0}#wpmdb-sidebar .subscribe p.interesting{margin-bottom:1em;line-height:1.4}#wpmdb-sidebar .subscribe .links{margin-bottom:2em}#wpmdb-sidebar .subscribe .links a{text-decoration:none}#wpmdb-sidebar .subscribe .promise{color:#999;font-size:12px;line-height:1.4em}#wpmdb-sidebar .subscribe .field{margin-bottom:0.5em}#wpmdb-sidebar .subscribe .field p{margin-bottom:0.3em}#wpmdb-sidebar .subscribe .field.submit-button{margin-bottom:1em}#wpmdb-sidebar .testimonial{border-top:none}#wpmdb-sidebar .testimonial p{margin:0}#wpmdb-sidebar .testimonial .quote{font-size:20px}#wpmdb-sidebar .testimonial .author{white-space:nowrap;text-align:right}#wpmdb-sidebar .testimonial .stars{white-space:nowrap;margin-bottom:5px}#wpmdb-sidebar .testimonial .via{text-align:right;font-size:12px}#wpmdb-sidebar .testimonial .via a{color:#666}#wpmdb-sidebar .testimonial .via a:before{content:"\f301";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 18px/1 'dashicons';vertical-align:top;margin-right:3px}@media (min--moz-device-pixel-ratio: 1.3), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx){#wpmdb-sidebar .wpmdb-banner{background-image:url(../img/wp-migrate-db-pro@2x.jpg);background-size:292px 292px;width:292px;height:292px;display:block}#wpmdb-sidebar .wpmdb-banner img{display:none}}@media screen and (max-width: 1252px){#wpmdb-sidebar{position:relative;top:auto;right:auto;margin-top:50px}}body.mp6 input[type=checkbox]:disabled{opacity:1;border-color:#ccc}body.mp6 #wpmdb-main{font-size:14px}body.mp6 p{font-size:14px}body.mp6 .wrap>h1{float:left}body.mp6 .wrap h2{float:left}body.mp6 .wpmdb .content-tab{padding-top:15px}body.mp6 .wpmdb .migrate-tab{padding-top:0}body.mp6 .wpmdb input[type=checkbox],body.mp6 .wpmdb input[type=radio]{vertical-align:middle;margin-top:-4px}body.mp6 .wpmdb input[type=text],body.mp6 .wpmdb input[type=password]{padding:3px 5px}body.mp6 .wpmdb input.code{padding-top:6px}body.mp6 .wpmdb label{font-size:14px}body.mp6 .wpmdb h2.nav-tab-wrapper{float:none;margin-bottom:0;width:722px;font-size:23px;line-height:29px;padding:9px 0 0 5px}body.mp6 .wpmdb .help-tab h3{margin-top:0}body.mp6 .wpmdb .temp-disabled{background-color:#f9f9f9}body.mp6 .wpmdb .migration-profile-options li a{border-color:#ccc;color:#555;background-color:#e4e4e4}body.mp6 .wpmdb .migration-profile-options li a:hover{background-color:#fff;color:#464646}body.mp6 .wpmdb .settings-tab .slider-label span{vertical-align:middle}body.mp6 .wpmdb .settings-tab .slider-label-wrapper{font-size:14px}body.mp6 .wpmdb .settings-tab .ui-slider{border-color:#ccc;background-color:#fff}body.mp6 .wpmdb .settings-tab .ui-slider-range{background-color:#d8fcd1}body.mp6 .wpmdb .settings-tab .option-section li label{font-size:14px}body.mp6 .wpmdb .connection-info,body.mp6 .wpmdb .migrate-tab .pull-push-connection-info{font-weight:bold;font-size:14px}body.mp6 .wpmdb .general-helper{border:0;width:auto;height:auto;top:auto;margin:0}body.mp6 .wpmdb .general-helper:after{content:"\f223";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 22px/1 'dashicons';vertical-align:top;top:auto;left:auto;position:relative}body.mp6 .wpmdb .helper-message{font-size:14px;line-height:1.4em}body.mp6 .wpmdb .right-arrow{display:none}body.mp6 .wpmdb .arrow-col{width:75px}body.mp6 .wpmdb .arrow-col:after{content:"\f344";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 22px/1 'dashicons';vertical-align:top;color:#999}body.mp6 .wpmdb .arrow-col:hover{cursor:pointer}body.mp6 .wpmdb .arrow-col:hover:after{color:#666}body.mp6 .wpmdb .find-heading{width:409px}body.mp6 .wpmdb .replace-fields input{width:304px}body.mp6 .wpmdb .replace-right-col span{border-color:#999}body.mp6 .wpmdb .replace-right-col span:hover{border-color:#666}body.mp6 .wpmdb .replace-add-row:after,body.mp6 .wpmdb .replace-add-row:before{background-color:#999}body.mp6 .wpmdb .replace-add-row:hover:after,body.mp6 .wpmdb .replace-add-row:hover:before{background-color:#666}body.mp6 .wpmdb .option-group.migrate-selection>li>label{font-size:16px}body.mp6 .wpmdb .saved-migration-profile-label{font-size:16px}body.mp6 .wpmdb .option-heading,body.mp6 .wpmdb .checkbox-label{font-size:16px}body.mp6 .wpmdb .checkbox-label input[type=checkbox]{top:auto}body.mp6 .wpmdb .return-to-profile-selection{font-size:14px}body.mp6 .wpmdb .option-description{font-size:13px}body.mp6 .wpmdb .save-migration-profile-wrap li{position:relative}body.mp6 .wpmdb .replace-remove-row,body.mp6 .wpmdb .delete-profile{border:0;border-radius:0;height:auto;width:auto;left:0;top:50%;margin-left:0}body.mp6 .wpmdb .replace-remove-row:after,body.mp6 .wpmdb .delete-profile:after{content:"\f153";display:inline-block;-webkit-font-smoothing:antialiased;font:normal 18px/1 'dashicons';vertical-align:middle;color:#999}body.mp6 .wpmdb .replace-remove-row:hover:after,body.mp6 .wpmdb .delete-profile:hover:after{color:#666}body.mp6 .wpmdb .delete-profile:after{color:#ccc}body.mp6 .wpmdb .delete-profile:hover:after{color:#aaa}body.mp6 .wpmdb .addons-tab .addons-content>div:nth-child(1),body.mp6 .wpmdb .addons-tab .addons-content>article:nth-child(1){margin-top:0px}body.mp6 .wpmdb .addons-tab .addon h1{font-family:'Open Sans', sans-serif;font-weight:200;font-size:24px;margin-top:2px}body.mp6 .wpmdb .addons-tab .addon.wp-migrate-db-pro-cli h1{margin-top:5px}body.mp6 .wpmdb .addons-tab .addon p{font-size:14px;line-height:1.4em}body.mp6 .wpmdb .help-tab .support p,body.mp6 .wpmdb .help-tab .support .email a{font-size:14px}body.mp6 .wpmdb .help-tab div.warning p{font-size:13px}body.mp6 .wpmdb .help-tab .videos h4,body.mp6 .wpmdb .help-tab .videos p{font-size:14px}body.mp6 .wpmdb .inline-message,body.mp6 .wpmdb .notification-message{border-radius:0;border:0;box-shadow:0 1px 1px 0 rgba(0,0,0,0.1);padding:10px 14px;font-size:13px}body.mp6 .wpmdb .notification-message{margin-bottom:20px;background-color:#fff}body.mp6 .wpmdb .notification-message.ssl-notice,body.mp6 .wpmdb .notification-message.invalid-licence{margin-bottom:0;margin-top:15px}body.mp6 .wpmdb .notification-message p{font-size:13px;margin-top:0}body.mp6 .wpmdb .notification-message p:last-child{margin:0}body.mp6 .wpmdb .notification-message h4{margin-top:0}body.mp6 .wpmdb .notification-message a{color:#0074a2;text-decoration:none}body.mp6 .wpmdb .notification-message a:hover{color:#2ea2cc}body.mp6 .wpmdb div.notification-message.invalid-licence p:last-child{margin:0.5em 0}body.mp6 .wpmdb div.notification-message.invalid-licence p:last-child a.button{color:#555555}body.mp6 .wpmdb .inline-message.error,body.mp6 .wpmdb .notification-message.error-notice{border-left:4px solid #dd3d36;background-color:#fff}body.mp6 .wpmdb .inline-message.warning,body.mp6 .wpmdb .notification-message.warning-notice{background-color:#fff;border-left:4px solid #ffba00}body.mp6 .wpmdb .inline-message.success,body.mp6 .wpmdb .notification-message.success-notice{border-left:4px solid #7ad03a}body.mp6 .wpmdb .ssl-notice{margin-bottom:0}body.mp6 .wpmdb .different-plugin-version-notice,body.mp6 .wpmdb .directory-permission-notice{margin-bottom:10px}body.mp6 .wpmdb .licence-status{color:#444;float:left;font-weight:normal}body.mp6 .progress-content{font-size:14px;box-shadow:0 0 10px rgba(0,0,0,0.5);background-color:#eee}body.mp6 .progress-content .progress-title{font-family:'Open Sans', sans-serif;font-weight:normal;font-size:22px}body.mp6 .progress-content .dashicons-yes{font-size:42px;line-height:0.5em}body.mp6 .progress-content .progress-bar{background-image:none;background-color:#0074a2}body.mp6 #overlay{background-color:rgba(0,0,0,0.5)}body.mp6 .migration-progress-ajax-spinner{top:20px} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/icon-multisite-tools.svg b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/icon-multisite-tools.svg new file mode 100644 index 00000000..a1cbdcf4 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/icon-multisite-tools.svg @@ -0,0 +1,28 @@ + + + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro.jpg b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro.jpg new file mode 100644 index 00000000..a2508919 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro.jpg differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro@2x.jpg b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro@2x.jpg new file mode 100644 index 00000000..f61f2022 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/img/wp-migrate-db-pro@2x.jpg differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.js new file mode 100644 index 00000000..270e27ff --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.js @@ -0,0 +1,164 @@ +// global vars +var wpmdb = wpmdb || {}; +wpmdb.common = { + hooks: [], + call_stack: [], + non_fatal_errors: '', + migration_error: false +}; +wpmdb.functions = {}; + +/** + * Toggle proper translated strings based on migration type selected. + * + * To show the properly translated strings for the selected push or pull + * migration type, we need to hide all strings then show the right + * translated strings based on the migration type selected. + * + * @see https://github.com/deliciousbrains/wp-migrate-db-pro/issues/764 + * + * @return void + */ +function wpmdb_toggle_migration_action_text() { + jQuery( '.action-text' ).hide(); + jQuery( '.action-text.' + jQuery( 'input[name=action]:checked' ).val() ).show(); +} + +/** + * Return the currently selected migration type selected. + * + * @return string Will return `push`, `pull`, or `savefile` for exporting as a file. + */ +function wpmdb_migration_type() { + return jQuery( 'input[name=action]:checked' ).val(); +} + +function wpmdb_call_next_hook() { + if ( !wpmdb.common.call_stack.length ) { + wpmdb.common.call_stack = wpmdb.common.hooks; + } + + var func = wpmdb.common.call_stack[ 0 ]; + wpmdb.common.call_stack.shift(); + func.call( this ); +} + +function wpmdb_add_commas( number_string ) { + number_string += ''; + var number_parts = number_string.split( '.' ); + var integer = number_parts[ 0 ]; + var decimal = 1 < number_parts.length ? '.' + number_parts[ 1 ] : ''; + var rgx = /(\d+)(\d{3})/; + while ( rgx.test( integer ) ) { + integer = integer.replace( rgx, '$1' + ',' + '$2' ); + } + return integer + decimal; +} + +function wpmdb_parse_json( maybe_json ) { + var json_object = {}; + try { + json_object = jQuery.parseJSON( maybe_json ); + } + catch ( e ) { + + // We simply return false here because the json data itself will never just contain a value of "false" + return false; + } + return json_object; +} + +/** + * Global error method for detecting PHP or other errors in AJAX response + * + * @param title - the error title if not a PHP error + * @param code - the error code if not a PHP error + * @param text - the AJAX response text to sniff for errors + * @param jqXHR - optional AJAX object used to enrich the error message + * + * @returns {string} - html error string with view error toggle element + */ +function wpmdbGetAjaxErrors( title, code, text, jqXHR ) { + var jsonErrors = false; + var html = ''; + + var validJson = wpmdb_parse_json( text ); + if ( false === validJson ) { + jsonErrors = true; + title = wpmdb_strings.ajax_json_message; + code = '(#144)'; + var originalText = text; + text = wpmdb_strings.ajax_json_errors + ' ' + code; + text += '
' + wpmdb_strings.view_error_messages + ' '; + text += '
' + originalText + '
'; + } + + // Only add local connection issue if php errors (#144) or jqXHR has been provided + if ( jsonErrors || 'undefined' !== jqXHR ) { + html += '' + title + '' + ' — '; + } + + // Only add extra error details if not php errors (#144) and jqXHR has been provided + if ( !jsonErrors && 'undefined' !== jqXHR ) { + html += wpmdb_strings.status + ': ' + jqXHR.status + ' ' + jqXHR.statusText; + html += '

' + wpmdb_strings.response + ':
'; + } + + // Add code to the end of the error text if not json errors + if ( !jsonErrors ) { + text += ' ' + code; + } + + // Finally add the error message to the output + html += text; + + return html; +} + +wpmdb.preg_quote = function( str, delimiter ) { + + // discuss at: http://phpjs.org/functions/preg_quote/ + // original by: booeyOH + // improved by: Ates Goral (http://magnetiq.com) + // improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) + // improved by: Brett Zamir (http://brett-zamir.me) + // bugfixed by: Onno Marsman + // example 1: preg_quote("$40"); + // returns 1: '\\$40' + // example 2: preg_quote("*RRRING* Hello?"); + // returns 2: '\\*RRRING\\* Hello\\?' + // example 3: preg_quote("\\.+*?[^]$(){}=!<>|:"); + // returns 3: '\\\\\\.\\+\\*\\?\\[\\^\\]\\$\$\$\\{\\}\\=\\!\\<\\>\\|\\:' + + return String( str ) + .replace( new RegExp( '[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\' + ( delimiter || '' ) + '-]', 'g' ), '\\$&' ); +}; + +wpmdb.table_is = function( table_prefix, desired_table, given_table ) { + if ( ( table_prefix + desired_table ).toLowerCase() === given_table.toLowerCase() ) { + return true; + } + + var escaped_given_table = wpmdb.preg_quote( given_table ); + var regex = new RegExp( table_prefix + '([0-9]+)_' + desired_table, 'i' ); + var results = regex.exec( escaped_given_table ); + return null != results; +}; + +wpmdb.subsite_for_table = function( table_prefix, table_name ) { + var escaped_table_name = wpmdb.preg_quote( table_name ); + var regex = new RegExp( table_prefix + '([0-9]+)_', 'i' ); + var results = regex.exec( escaped_table_name ); + + if ( null === results ) { + return 1; + } else { + return results[ 1 ]; + } +}; + +(function( $ ) { + + // jQuery code here + +})( jQuery ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.min.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.min.js new file mode 100644 index 00000000..8e1d73d1 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/common.min.js @@ -0,0 +1 @@ +function wpmdb_toggle_migration_action_text(){jQuery(".action-text").hide(),jQuery(".action-text."+jQuery("input[name=action]:checked").val()).show()}function wpmdb_migration_type(){return jQuery("input[name=action]:checked").val()}function wpmdb_call_next_hook(){wpmdb.common.call_stack.length||(wpmdb.common.call_stack=wpmdb.common.hooks);var a=wpmdb.common.call_stack[0];wpmdb.common.call_stack.shift(),a.call(this)}function wpmdb_add_commas(a){a+="";for(var b=a.split("."),c=b[0],d=1 ",c+='
'+h+"
"}return(e||"undefined"!==d)&&(f+=""+a+" — "),e||"undefined"===d||(f+=wpmdb_strings.status+": "+d.status+" "+d.statusText,f+="

"+wpmdb_strings.response+":
"),e||(c+=" "+b),f+=c}var wpmdb=wpmdb||{};wpmdb.common={hooks:[],call_stack:[],non_fatal_errors:"",migration_error:!1},wpmdb.functions={},wpmdb.preg_quote=function(a,b){return String(a).replace(new RegExp("[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\"+(b||"")+"-]","g"),"\\$&")},wpmdb.table_is=function(a,b,c){if((a+b).toLowerCase()===c.toLowerCase())return!0;var d=wpmdb.preg_quote(c),e=new RegExp(a+"([0-9]+)_"+b,"i"),f=e.exec(d);return null!=f},wpmdb.subsite_for_table=function(a,b){var c=wpmdb.preg_quote(b),d=new RegExp(a+"([0-9]+)_","i"),e=d.exec(c);return null===e?1:e[1]},function(a){}(jQuery); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.js new file mode 100644 index 00000000..46adb077 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.js @@ -0,0 +1,64 @@ +(function( $ ) { + + $.wpmdb = { + /** + * Implement a WordPress-link Hook System for Javascript + * TODO: Change 'tag' to 'args', allow number (priority), string (tag), object (priority+tag) + */ + hooks: { action: {}, filter: {} }, + add_action: function( action, callable, tag ) { + jQuery.wpmdb.add_hook( 'action', action, callable, tag ); + }, + add_filter: function( action, callable, tag ) { + jQuery.wpmdb.add_hook( 'filter', action, callable, tag ); + }, + do_action: function( action, args ) { + jQuery.wpmdb.do_hook( 'action', action, null, args ); + }, + apply_filters: function( action, value, args ) { + return jQuery.wpmdb.do_hook( 'filter', action, value, args ); + }, + remove_action: function( action, tag ) { + jQuery.wpmdb.remove_hook( 'action', action, tag ); + }, + remove_filter: function( action, tag ) { + jQuery.wpmdb.remove_hook( 'filter', action, tag ); + }, + add_hook: function( hook_type, action, callable, tag ) { + if ( undefined === jQuery.wpmdb.hooks[hook_type][action] ) { + jQuery.wpmdb.hooks[hook_type][action] = []; + } + var hooks = jQuery.wpmdb.hooks[hook_type][action]; + if ( undefined === tag ) { + tag = action + '_' + hooks.length; + } + jQuery.wpmdb.hooks[hook_type][action].push( { tag: tag, callable: callable } ); + }, + do_hook: function( hook_type, action, value, args ) { + if ( undefined !== jQuery.wpmdb.hooks[hook_type][action] ) { + var hooks = jQuery.wpmdb.hooks[hook_type][action]; + for ( var i = 0; i < hooks.length; i++ ) { + if ( 'action' === hook_type ) { + hooks[i].callable( args ); + } else { + value = hooks[i].callable( value, args ); + } + } + } + if ( 'filter' === hook_type ) { + return value; + } + }, + remove_hook: function( hook_type, action, tag ) { + if ( undefined !== jQuery.wpmdb.hooks[hook_type][action] ) { + var hooks = jQuery.wpmdb.hooks[hook_type][action]; + for ( var i = hooks.length - 1; 0 < i; i-- ) { + if ( undefined === tag || tag === hooks[i].tag ) { + hooks.splice( i, 1 ); + } + } + } + } + }; + +})( jQuery ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.min.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.min.js new file mode 100644 index 00000000..4a2e2872 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/hook.min.js @@ -0,0 +1 @@ +!function(a){a.wpmdb={hooks:{action:{},filter:{}},add_action:function(a,b,c){jQuery.wpmdb.add_hook("action",a,b,c)},add_filter:function(a,b,c){jQuery.wpmdb.add_hook("filter",a,b,c)},do_action:function(a,b){jQuery.wpmdb.do_hook("action",a,null,b)},apply_filters:function(a,b,c){return jQuery.wpmdb.do_hook("filter",a,b,c)},remove_action:function(a,b){jQuery.wpmdb.remove_hook("action",a,b)},remove_filter:function(a,b){jQuery.wpmdb.remove_hook("filter",a,b)},add_hook:function(a,b,c,d){void 0===jQuery.wpmdb.hooks[a][b]&&(jQuery.wpmdb.hooks[a][b]=[]);var e=jQuery.wpmdb.hooks[a][b];void 0===d&&(d=b+"_"+e.length),jQuery.wpmdb.hooks[a][b].push({tag:d,callable:c})},do_hook:function(a,b,c,d){if(void 0!==jQuery.wpmdb.hooks[a][b])for(var e=jQuery.wpmdb.hooks[a][b],f=0;f0;e--)(void 0===c||c===d[e].tag)&&d.splice(e,1)}}}(jQuery); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.js new file mode 100644 index 00000000..c61450fe --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.js @@ -0,0 +1,35 @@ +var wpmdb = wpmdb || {}; + +wpmdb.multisite = {}; + +(function( $, wpmdb ) { + wpmdb.multisite.update_multiselect = function( element, subsites, selected_subsite_ids ) { + $( element ).empty(); + + if ( 0 < Object.keys( subsites ).length ) { + var table_prefix = $.wpmdb.apply_filters( 'wpmdb_get_table_prefix', null, null ); + var site_selected = false; + $.each( subsites, function( blog_id, subsite_path ) { + if ( $.wpmdb.apply_filters( 'wpmdb_exclude_subsite', false, blog_id ) ) { + return; + } + + var selected = ' '; + if ( ( undefined === selected_subsite_ids || null === selected_subsite_ids || 0 === selected_subsite_ids.length ) || + ( undefined !== selected_subsite_ids && null !== selected_subsite_ids && 0 < selected_subsite_ids.length && -1 !== $.inArray( blog_id, selected_subsite_ids ) ) + ) { + selected = ' selected="selected" '; + site_selected = true; + } + subsite_path += ' (' + table_prefix + ( ( '1' !== blog_id ) ? blog_id + '_' : '' ) + ')'; + $( element ).append( '' + subsite_path + '' ); + } ); + + // If nothing selected (maybe IDs differ between saved profile and current config) revert to default of all selected. + if ( false === site_selected ) { + wpmdb.multisite.update_multiselect( element, subsites, [] ); + } + } + }; + +})( jQuery, wpmdb ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.min.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.min.js new file mode 100644 index 00000000..56f2d785 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/multisite.min.js @@ -0,0 +1 @@ +var wpmdb=wpmdb||{};wpmdb.multisite={},function(a,b){b.multisite.update_multiselect=function(c,d,e){if(a(c).empty(),0'+d+"")}}),!1===g&&b.multisite.update_multiselect(c,d,[])}}}(jQuery,wpmdb); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.js new file mode 100644 index 00000000..5058c04b --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.js @@ -0,0 +1,2889 @@ +(function( $, wpmdb ) { + + var connection_established = false; + var last_replace_switch = ''; + var doing_ajax = false; + var doing_licence_registration_ajax = false; + var doing_reset_api_key_ajax = false; + var doing_save_profile = false; + var doing_plugin_compatibility_ajax = false; + var profile_name_edited = false; + var checked_licence = false; + var show_prefix_notice = false; + var show_ssl_notice = false; + var show_version_notice = false; + var migration_completed = false; + var currently_migrating = false; + var dump_filename = ''; + var dump_path = ''; + var migration_intent; + var remote_site; + var secret_key; + var form_data; + var stage; + var elapsed_interval; + var completed_msg; + var tables_to_migrate = ''; + var migration_paused = false; + var previous_progress_title = ''; + var previous_progress_text_primary = ''; + var previous_progress_text_secondary = ''; + var timer_count = 0; + var overall_percent = 0; + var migration_cancelled = false; + var counter_display = false; + var counter_label = ''; + var flag_skip_delay = false; + var delay_between_requests = 0; + var fade_duration = 400; + var pause_before_finalize = false; + var is_auto_pause_before_finalize = false; + + var admin_url = ajaxurl.replace( '/admin-ajax.php', '' ), spinner_url = admin_url + '/images/spinner'; + + if ( 2 < window.devicePixelRatio ) { + spinner_url += '-2x'; + } + spinner_url += '.gif'; + var ajax_spinner = ''; + + window.onbeforeunload = function( e ) { + if ( currently_migrating ) { + e = e || window.event; + + // For IE and Firefox prior to version 4 + if ( e ) { + e.returnValue = wpmdb_strings.sure; + } + + // For Safari + return wpmdb_strings.sure; + } + }; + + function pad( n, width, z ) { + z = z || '0'; + n = n + ''; + return n.length >= width ? n : new Array( width - n.length + 1 ).join( z ) + n; + } + + function is_int( n ) { + n = parseInt( n ); + return 'number' === typeof n && 0 === n % 1; + } + + function setup_counter() { + timer_count = 0; + counter_display = $( '.timer' ); + counter_label = wpmdb_strings.time_elapsed + ' '; + + elapsed_interval = setInterval( count, 1000 ); + } + + function display_count() { + var hours = Math.floor( timer_count / 3600 ) % 24; + var minutes = Math.floor( timer_count / 60 ) % 60; + var seconds = timer_count % 60; + var display = counter_label + pad( hours, 2, 0 ) + ':' + pad( minutes, 2, 0 ) + ':' + pad( seconds, 2, 0 ); + counter_display.html( display ); + } + + function count() { + timer_count = timer_count + 1; + display_count(); + } + + function get_intersect( arr1, arr2 ) { + var r = [], o = {}, l = arr2.length, i, v; + for ( i = 0; i < l; i++ ) { + o[ arr2[ i ] ] = true; + } + l = arr1.length; + for ( i = 0; i < l; i++ ) { + v = arr1[ i ]; + if ( v in o ) { + r.push( v ); + } + } + return r; + } + + function get_query_var( name ) { + name = name.replace( /[\[]/, '\\[' ).replace( /[\]]/, '\\]' ); + var regex = new RegExp( '[\\?&]' + name + '=([^&#]*)' ), + results = regex.exec( location.search ); + return null === results ? '' : decodeURIComponent( results[ 1 ].replace( /\+/g, ' ' ) ); + } + + function maybe_show_ssl_warning( url, key, remote_scheme ) { + var scheme = url.substr( 0, url.indexOf( ':' ) ); + if ( remote_scheme !== scheme && url.indexOf( 'https' ) !== -1 ) { + $( '.ssl-notice' ).show(); + show_ssl_notice = true; + url = url.replace( 'https', 'http' ); + $( '.pull-push-connection-info' ).val( url + '\n' + key ); + return; + } + show_ssl_notice = false; + return; + } + + function maybe_show_prefix_notice( prefix ) { + if ( prefix !== wpmdb_data.this_prefix ) { + $( '.remote-prefix' ).html( prefix ); + show_prefix_notice = true; + if ( 'pull' === wpmdb_migration_type() ) { + $( '.prefix-notice.pull' ).show(); + } else { + $( '.prefix-notice.push' ).show(); + } + } + } + + function maybe_show_mixed_cased_table_name_warning() { + if ( 'undefined' === typeof wpmdb.common.connection_data || false === wpmdb.common.connection_data ) { + return; + } + + var migration_intent = wpmdb_migration_type(); + var tables_to_migrate = get_tables_to_migrate( null, null ); + + $( '.mixed-case-table-name-notice' ).hide(); + + if ( null === tables_to_migrate ) { + return; + } + + tables_to_migrate = tables_to_migrate.join( '' ); + + // The table names are all lowercase, no need to display the warning. + if ( tables_to_migrate === tables_to_migrate.toLowerCase() ) { + return; + } + + /* + * Do not display the warning if the remote lower_case_table_names does not equal "1" (i.e the only problematic setting) + * Applies to push/export migrations. + */ + if ( '1' !== wpmdb.common.connection_data.lower_case_table_names && ( 'push' === migration_intent || 'savefile' === migration_intent ) ) { + return; + } + + /* + * Do not display the warning if the local lower_case_table_names does not equal "1" (i.e the only problematic setting) + * Only applies to pull migrations. + */ + if ( '1' !== wpmdb_data.lower_case_table_names && 'pull' === migration_intent ) { + return; + } + + /* + * At this stage we've determined: + * 1. The source database contains at least one table that contains an uppercase character. + * 2. The destination environment has lower_case_table_names set to 1. + * 3. The source database table containing the uppercase letter will be converted to lowercase during the migration. + */ + + if ( 'push' === migration_intent || 'savefile' === migration_intent ) { + $( '.mixed-case-table-name-notice.push' ).show(); + } else { + $( '.mixed-case-table-name-notice.pull' ).show(); + } + } + + function get_domain_name( url ) { + var temp_url = url; + var domain = temp_url.replace( /\/\/(.*)@/, '//' ).replace( 'http://', '' ).replace( 'https://', '' ).replace( 'www.', '' ); + return domain; + } + + function get_migration_status_label( url, intent, stage ) { + var domain = get_domain_name( url ); + var migrating_stage_label, completed_stage_label; + if ( 'pull' === intent ) { + migrating_stage_label = wpmdb_strings.pull_migration_label_migrating; + completed_stage_label = wpmdb_strings.pull_migration_label_completed; + } else { + migrating_stage_label = wpmdb_strings.push_migration_label_migrating; + completed_stage_label = wpmdb_strings.push_migration_label_completed; + } + + migrating_stage_label = migrating_stage_label.replace( '%s', domain ); + completed_stage_label = completed_stage_label.replace( '%s', domain ); + + if ( 'migrating' === stage ) { + return migrating_stage_label; + } else { + return completed_stage_label; + } + } + + function remove_protocol( url ) { + return url.replace( /^https?:/i, '' ); + } + + function disable_export_type_controls() { + $( '.option-group' ).each( function( index ) { + $( 'input', this ).attr( 'disabled', 'disabled' ); + $( 'label', this ).css( 'cursor', 'default' ); + } ); + } + + function enable_export_type_controls() { + $( '.option-group' ).each( function( index ) { + $( 'input', this ).removeAttr( 'disabled' ); + $( 'label', this ).css( 'cursor', 'pointer' ); + } ); + } + + function set_slider_value( parent_selector, value, unit ) { + $( '.slider', parent_selector ).slider( 'value', value ); + $( '.amount', parent_selector ).html( wpmdb_add_commas( value ) + ' ' + unit ); + } + + function set_pause_resume_button( event ) { + if ( true === migration_paused ) { + migration_paused = false; + doing_ajax = true; + $( '.progress-title' ).html( previous_progress_title ); + $( '.progress-text', '.progress-wrapper-primary' ).html( previous_progress_text_primary ); + $( '.progress-text', '.progress-wrapper-secondary' ).html( previous_progress_text_secondary ); + $( '.migration-progress-ajax-spinner' ).show(); + $( '.pause-resume' ).html( wpmdb_strings.pause ); + + // Resume the timer + elapsed_interval = setInterval( count, 1000 ); + wpmdb.functions.execute_next_step(); + } else { + migration_paused = true; + doing_ajax = false; + previous_progress_title = $( '.progress-title' ).html(); + previous_progress_text_primary = $( '.progress-text', '.progress-wrapper-primary' ).html(); + previous_progress_text_secondary = $( '.progress-text', '.progress-wrapper-secondary ' ).html(); + $( '.progress-title' ).html( wpmdb_strings.migration_paused ); + $( '.progress-text' ).html( wpmdb_strings.completing_current_request ); + $( 'body' ).off( 'click', '.pause-resume' ); // Is re-bound at execute_next_step when migration is finally paused + $( 'body' ).off( 'click', '.cancel' ); // Is re-bound at execute_next_step when migration is finally paused + } + } + + function create_table_select( tables, table_sizes_hr, selected_tables ) { + var $table_select = document.createElement( 'select' ); + $( $table_select ).attr( { + multiple: 'multiple', + name: 'select_tables[]', + id: 'select-tables', + class: 'multiselect' + } ); + + if ( 0 < tables.length ) { + $.each( tables, function( index, table ) { + if ( $.wpmdb.apply_filters( 'wpmdb_exclude_table', false, table ) ) { + return; + } + + var selected = ' '; + if ( undefined !== selected_tables && null !== selected_tables && 0 < selected_tables.length && -1 !== $.inArray( table, selected_tables ) ) { + selected = ' selected="selected" '; + } + $( $table_select ).append( '' + table + ' (' + table_sizes_hr[ table ] + ')' ); + } ); + } + + return $table_select; + } + + /** + * Returns tables selected for migration. + * + * @param value + * @param args + * @returns {string} + * + * Also handler for wpmdb_get_tables_to_migrate filter, disregards input values as it is the primary source. + */ + function get_tables_to_migrate( value, args ) { + var tables = ''; + var mig_type = wpmdb_migration_type(); + var table_intent = $( 'input[name=table_migrate_option]:checked' ).val(); + + // Grab tables as per what the user has selected from the multiselect box or all prefixed tables. + if ( 'migrate_select' === table_intent ) { + tables = $( '#select-tables' ).val(); + } else { + if ( 'push' === mig_type || 'savefile' === mig_type ) { + tables = wpmdb_data.this_prefixed_tables; + } else { + tables = wpmdb.common.connection_data.prefixed_tables; + } + } + + return tables; + } + + function get_table_prefix( value, args ) { + return $( '.table-select-wrap .table-prefix' ).text(); + } + + $( document ).ready( function() { + wpmdb.migration_state_id = ''; + + $( '#plugin-compatibility' ).change( function( e ) { + var install = '1'; + if ( $( this ).is( ':checked' ) ) { + var answer = confirm( wpmdb_strings.mu_plugin_confirmation ); + + if ( !answer ) { + $( this ).prop( 'checked', false ); + return; + } + } else { + install = '0'; + } + + $( '.plugin-compatibility-wrap' ).toggle(); + + $( this ).parent().append( ajax_spinner ); + $( '#plugin-compatibility' ).attr( 'disabled', 'disabled' ); + $( '.plugin-compatibility' ).addClass( 'disabled' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_plugin_compatibility', + install: install + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.plugin_compatibility_settings_problem + '\r\n\r\n' + wpmdb_strings.status + ' ' + jqXHR.status + ' ' + jqXHR.statusText + '\r\n\r\n' + wpmdb_strings.response + '\r\n' + jqXHR.responseText ); + $( '.ajax-spinner' ).remove(); + $( '#plugin-compatibility' ).removeAttr( 'disabled' ); + $( '.plugin-compatibility' ).removeClass( 'disabled' ); + }, + success: function( data ) { + if ( '' !== $.trim( data ) ) { + alert( data ); + } else { + $( '.plugin-compatibility' ).append( '' + wpmdb_strings.saved + '' ); + $( '.ajax-success-msg' ).fadeOut( 2000, function() { + $( this ).remove(); + } ); + } + $( '.ajax-spinner' ).remove(); + $( '#plugin-compatibility' ).removeAttr( 'disabled' ); + $( '.plugin-compatibility' ).removeClass( 'disabled' ); + } + } ); + + } ); + + if ( $( '#plugin-compatibility' ).is( ':checked' ) ) { + $( '.plugin-compatibility-wrap' ).show(); + } + + if ( 0 <= navigator.userAgent.indexOf( 'MSIE' ) || 0 <= navigator.userAgent.indexOf( 'Trident' ) ) { + $( '.ie-warning' ).show(); + } + + if ( 0 === wpmdb_data.valid_licence ) { + $( '#savefile' ).prop( 'checked', true ); + } + var max_request_size_container = $( '.max-request-size' ); + var max_request_size_slider = $( '.slider', max_request_size_container ); + max_request_size_slider.slider( { + range: 'min', + value: parseInt( wpmdb_data.max_request / 1024 ), + min: 512, + max: parseInt( wpmdb_data.bottleneck / 1024 ), + step: 1, + create: function( event, ui ) { + set_slider_value( max_request_size_container, wpmdb_data.max_request / 1024, 'kB' ); + }, + slide: function( event, ui ) { + set_slider_value( max_request_size_container, ui.value, 'kB' ); + }, + stop: function( event, ui ) { + $( '.amount', max_request_size_container ).after( '' ); + max_request_size_slider.slider( 'disable' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + cache: false, + data: { + action: 'wpmdb_update_max_request_size', + max_request_size: parseInt( ui.value ), + nonce: wpmdb_data.nonces.update_max_request_size + }, + error: function( jqXHR, textStatus, errorThrown ) { + max_request_size_slider.slider( 'enable' ); + $( '.slider-spinner', max_request_size_container ).remove(); + alert( wpmdb_strings.max_request_size_problem ); + set_slider_value( max_request_size_container, wpmdb_data.max_request / 1024, 'kB' ); + max_request_size_slider.slider( 'enable' ); + }, + success: function() { + max_request_size_slider.slider( 'enable' ); + $( '.slider-success-msg', max_request_size_container ).show(); + $( '.slider-success-msg', max_request_size_container ).fadeOut( 2000, function() { + $( this ).hide(); + } ); + $( '.slider-spinner', max_request_size_container ).remove(); + } + } ); + } + } ); + + var delay_between_requests_container = $( '.delay-between-requests' ); + var delay_between_requests_slider = $( '.slider', delay_between_requests_container ); + delay_between_requests_slider.slider( { + range: 'min', + value: parseInt( wpmdb_data.delay_between_requests / 1000 ), + min: 0, + max: 10, + step: 1, + create: function( event, ui ) { + set_slider_value( delay_between_requests_container, wpmdb_data.delay_between_requests / 1000, 's' ); + }, + slide: function( event, ui ) { + set_slider_value( delay_between_requests_container, ui.value, 's' ); + }, + stop: function( event, ui ) { + $( '.amount', delay_between_requests_container ).after( '' ); + delay_between_requests_slider.slider( 'disable' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + cache: false, + data: { + action: 'wpmdb_update_delay_between_requests', + delay_between_requests: parseInt( ui.value * 1000 ), + nonce: wpmdb_data.nonces.update_delay_between_requests + }, + error: function( jqXHR, textStatus, errorThrown ) { + delay_between_requests_slider.slider( 'enable' ); + $( '.slider-spinner', delay_between_requests_container ).remove(); + alert( wpmdb_strings.delay_between_requests_problem ); + set_slider_value( delay_between_requests_container, wpmdb_data.delay_between_requests / 1000, 's' ); + delay_between_requests_slider.slider( 'enable' ); + }, + success: function() { + wpmdb_data.delay_between_requests = parseInt( ui.value * 1000 ); + delay_between_requests_slider.slider( 'enable' ); + $( '.slider-success-msg', delay_between_requests_container ).show(); + $( '.slider-success-msg', delay_between_requests_container ).fadeOut( 2000, function() { + $( this ).hide(); + } ); + $( '.slider-spinner', delay_between_requests_container ).remove(); + } + } ); + } + } ); + + var $progress_content_original = $( '.progress-content' ).clone(); + $( '.progress-content' ).remove(); + + var $push_select = $( '#select-tables' ).clone(); + var $pull_select = $( '#select-tables' ).clone(); + var $push_post_type_select = $( '#select-post-types' ).clone(); + var $pull_post_type_select = $( '#select-post-types' ).clone(); + var $push_select_backup = $( '#select-backup' ).clone(); + var $pull_select_backup = $( '#select-backup' ).clone(); + + $( '.help-tab .video' ).each( function() { + var $container = $( this ), + $viewer = $( '.video-viewer' ); + + $( 'a', this ).click( function( e ) { + e.preventDefault(); + + $viewer.attr( 'src', '//www.youtube.com/embed/' + $container.data( 'video-id' ) + '?autoplay=1' ); + $viewer.show(); + var offset = $viewer.offset(); + $( window ).scrollTop( offset.top - 50 ); + } ); + } ); + + $( '.backup-options' ).show(); + $( '.keep-active-plugins' ).show(); + if ( 'savefile' === wpmdb_migration_type() ) { + $( '.backup-options' ).hide(); + $( '.keep-active-plugins' ).hide(); + } + + last_replace_switch = wpmdb_migration_type(); + + function check_licence( licence ) { + checked_licence = true; + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: { + action: 'wpmdb_check_licence', + licence: licence, + context: 'all', + nonce: wpmdb_data.nonces.check_licence + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.license_check_problem ); + }, + success: function( data ) { + + var $support_content = $( '.support-content' ); + var $addons_content = $( '.addons-content' ); + var $licence_content = $( '.licence-status:not(.notification-message)' ); + var licence_msg, support_msg, addons_msg; + + if ( 'undefined' !== typeof data.dbrains_api_down ) { + support_msg = data.dbrains_api_down + data.message; + addons_msg = data.dbrains_api_down; + } else if ( 'undefined' !== typeof data.errors ) { + + if ( 'undefined' !== typeof data.errors.subscription_expired ) { + licence_msg = data.errors.subscription_expired.licence; + support_msg = data.errors.subscription_expired.support; + addons_msg = data.errors.subscription_expired.addons; + } else { + var msg = ''; + for ( var key in data.errors ) { + msg += data.errors[ key ]; + } + support_msg = msg; + addons_msg = msg; + } + if ( 'undefined' !== typeof data.addon_content ) { + addons_msg += '\n' + data.addon_content; + } + } else { + support_msg = data.message; + addons_msg = data.addon_content; + } + + $licence_content.stop().fadeOut( fade_duration, function() { + $( this ) + .empty() + .html( licence_msg ) + .stop() + .fadeIn( fade_duration ); + } ); + $support_content.stop().fadeOut( fade_duration, function() { + $( this ) + .empty() + .html( support_msg ) + .stop() + .fadeIn( fade_duration ); + } ); + $addons_content.stop().fadeOut( fade_duration, function() { + $( this ) + .empty() + .html( addons_msg ) + .stop() + .fadeIn( fade_duration ); + } ); + + } + } ); + } + + /** + * Handle 'Check License Again' functionality found in expired license messages. + */ + $( '.content-tab' ).on( 'click', '.check-my-licence-again', function( e ) { + e.preventDefault(); + checked_licence = false; + $( e.target ).replaceWith( 'Checking... ' + ajax_spinner ); + check_licence( null, 'all' ); + } ); + function refresh_table_selects() { + if ( undefined !== wpmdb_data && undefined !== wpmdb_data.this_tables && undefined !== wpmdb_data.this_table_sizes_hr ) { + $push_select = create_table_select( wpmdb_data.this_tables, wpmdb_data.this_table_sizes_hr, $( $push_select ).val() ); + } + + if ( undefined !== wpmdb.common.connection_data && undefined !== wpmdb.common.connection_data.tables && undefined !== wpmdb.common.connection_data.table_sizes_hr ) { + $pull_select = create_table_select( wpmdb.common.connection_data.tables, wpmdb.common.connection_data.table_sizes_hr, $( $pull_select ).val() ); + } + } + + $.wpmdb.add_action( 'wpmdb_refresh_table_selects', refresh_table_selects ); + + function update_push_table_select() { + $( '#select-tables' ).remove(); + $( '.select-tables-wrap' ).prepend( $push_select ); + } + + $.wpmdb.add_action( 'wpmdb_update_push_table_select', update_push_table_select ); + + function update_pull_table_select() { + $( '#select-tables' ).remove(); + $( '.select-tables-wrap' ).prepend( $pull_select ); + } + + $.wpmdb.add_action( 'wpmdb_update_pull_table_select', update_pull_table_select ); + + function disable_table_migration_options() { + $( '#migrate-selected' ).parents( '.option-section' ).children( '.header-expand-collapse' ).children( '.expand-collapse-arrow' ).removeClass( 'collapsed' ); + $( '.table-select-wrap' ).show(); + $( '#migrate-only-with-prefix' ).prop( 'checked', false ); + $( '#migrate-selected' ).prop( 'checked', true ); + $( '.table-migrate-options' ).hide(); + $( '.select-tables-wrap' ).show(); + } + + $.wpmdb.add_action( 'wpmdb_disable_table_migration_options', disable_table_migration_options ); + + function enable_table_migration_options() { + $( '.table-migrate-options' ).show(); + } + + $.wpmdb.add_action( 'wpmdb_enable_table_migration_options', enable_table_migration_options ); + + function select_all_tables() { + $( '#select-tables' ).children( 'option' ).prop( 'selected', true ); + } + + $.wpmdb.add_action( 'wpmdb_select_all_tables', select_all_tables ); + + function base_old_url( value, args ) { + return remove_protocol( wpmdb_data.this_url ); + } + + $.wpmdb.add_filter( 'wpmdb_base_old_url', base_old_url ); + + function establish_remote_connection_from_saved_profile() { + var action = wpmdb_migration_type(); + var connection_info = $.trim( $( '.pull-push-connection-info' ).val() ).split( '\n' ); + if ( 'undefined' === typeof wpmdb_default_profile || true === wpmdb_default_profile || 'savefile' === action || doing_ajax || !wpmdb_data.is_pro ) { + return; + } + + doing_ajax = true; + disable_export_type_controls(); + + $( '.connection-status' ).html( wpmdb_strings.establishing_remote_connection ); + $( '.connection-status' ).removeClass( 'notification-message error-notice migration-error' ); + $( '.connection-status' ).append( ajax_spinner ); + + var intent = wpmdb_migration_type(); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: { + action: 'wpmdb_verify_connection_to_remote_site', + url: connection_info[ 0 ], + key: connection_info[ 1 ], + intent: intent, + nonce: wpmdb_data.nonces.verify_connection_to_remote_site, + convert_post_type_selection: wpmdb_convert_post_type_selection, + profile: wpmdb_data.profile + }, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.connection-status' ).html( getAjaxErrors( jqXHR.responseText, '(#102)', jqXHR ) ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + }, + success: function( data ) { + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + + if ( 'undefined' !== typeof data.wpmdb_error && 1 === data.wpmdb_error ) { + $( '.connection-status' ).html( data.body ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + + if ( data.body.indexOf( '401 Unauthorized' ) > -1 ) { + $( '.basic-access-auth-wrapper' ).show(); + } + + return; + } + + maybe_show_ssl_warning( connection_info[ 0 ], connection_info[ 1 ], data.scheme ); + maybe_show_prefix_notice( data.prefix ); + + $( '.pull-push-connection-info' ).addClass( 'temp-disabled' ); + $( '.pull-push-connection-info' ).attr( 'readonly', 'readonly' ); + $( '.connect-button' ).hide(); + + $( '.connection-status' ).hide(); + $( '.step-two' ).show(); + connection_established = true; + wpmdb.common.connection_data = data; + move_connection_info_box(); + + maybe_show_mixed_cased_table_name_warning(); + + var loaded_tables = ''; + if ( false === wpmdb_default_profile && 'undefined' !== typeof wpmdb_loaded_tables ) { + loaded_tables = wpmdb_loaded_tables; + } + + $pull_select = create_table_select( wpmdb.common.connection_data.tables, wpmdb.common.connection_data.table_sizes_hr, loaded_tables ); + + var loaded_post_types = ''; + if ( false === wpmdb_default_profile && 'undefined' !== typeof wpmdb_loaded_post_types ) { + if ( 'undefined' !== typeof data.select_post_types ) { + $( '#exclude-post-types' ).attr( 'checked', 'checked' ); + $( '.post-type-select-wrap' ).show(); + loaded_post_types = data.select_post_types; + } else { + loaded_post_types = wpmdb_loaded_post_types; + } + } + + var $post_type_select = document.createElement( 'select' ); + $( $post_type_select ).attr( { + multiple: 'multiple', + name: 'select_post_types[]', + id: 'select-post-types', + class: 'multiselect' + } ); + + $.each( wpmdb.common.connection_data.post_types, function( index, value ) { + var selected = $.inArray( value, loaded_post_types ); + if ( -1 !== selected || ( true === wpmdb_convert_exclude_revisions && 'revision' !== value ) ) { + selected = ' selected="selected" '; + } else { + selected = ' '; + } + $( $post_type_select ).append( '' + value + '' ); + } ); + + $pull_post_type_select = $post_type_select; + + var loaded_tables_backup = ''; + if ( false === wpmdb_default_profile && 'undefined' !== typeof wpmdb_loaded_tables_backup ) { + loaded_tables_backup = wpmdb_loaded_tables_backup; + } + + var $table_select_backup = document.createElement( 'select' ); + $( $table_select_backup ).attr( { + multiple: 'multiple', + name: 'select_backup[]', + id: 'select-backup', + class: 'multiselect' + } ); + + $.each( wpmdb.common.connection_data.tables, function( index, value ) { + var selected = $.inArray( value, loaded_tables_backup ); + if ( -1 !== selected ) { + selected = ' selected="selected" '; + } else { + selected = ' '; + } + $( $table_select_backup ).append( '' + value + ' (' + wpmdb.common.connection_data.table_sizes_hr[ value ] + ')' ); + } ); + + $push_select_backup = $table_select_backup; + + if ( 'pull' === wpmdb_migration_type() ) { + $.wpmdb.do_action( 'wpmdb_update_pull_table_select' ); + $( '#select-post-types' ).remove(); + $( '.select-post-types-wrap' ).prepend( $pull_post_type_select ); + $( '#select-backup' ).remove(); + $( '.backup-tables-wrap' ).prepend( $pull_select_backup ); + $( '.table-prefix' ).html( data.prefix ); + $( '.uploads-dir' ).html( wpmdb_data.this_uploads_dir ); + } else { + $( '#select-backup' ).remove(); + $( '.backup-tables-wrap' ).prepend( $push_select_backup ); + } + + $.wpmdb.do_action( 'verify_connection_to_remote_site', wpmdb.common.connection_data ); + } + + } ); + + } + + // automatically validate connection info if we're loading a saved profile + establish_remote_connection_from_saved_profile(); + + // add to tags which act as JS event buttons, will not jump page to top and will deselect the button + $( 'body' ).on( 'click', '.js-action-link', function( e ) { + e.preventDefault(); + $( this ).blur(); + } ); + + function enable_pro_licence( data, licence_key ) { + $( '.licence-input, .register-licence' ).remove(); + $( '.licence-not-entered' ).prepend( data.masked_licence ); + $( '.support-content' ).empty().html( '
' + wpmdb_strings.fetching_license + '
' ); + check_licence( licence_key ); + + $( '.migrate-selection label' ).removeClass( 'disabled' ); + $( '.migrate-selection input' ).removeAttr( 'disabled' ); + } + + // registers your licence + $( '.licence-form' ).submit( function( e ) { + e.preventDefault(); + + if ( doing_licence_registration_ajax ) { + return; + } + + $( '.licence-status' ).removeClass( 'notification-message error-notice success-notice' ); + + var licence_key = $.trim( $( '.licence-input' ).val() ); + + if ( '' === licence_key ) { + $( '.licence-status' ).addClass( 'notification-message error-notice' ); + $( '.licence-status' ).html( wpmdb_strings.enter_license_key ); + return; + } + + $( '.licence-status' ).empty().removeClass( 'success' ); + doing_licence_registration_ajax = true; + $( '.button.register-licence' ).after( '' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'JSON', + cache: false, + data: { + action: 'wpmdb_activate_licence', + licence_key: licence_key, + nonce: wpmdb_data.nonces.activate_licence, + context: 'licence' + }, + error: function( jqXHR, textStatus, errorThrown ) { + doing_licence_registration_ajax = false; + $( '.register-licence-ajax-spinner' ).remove(); + $( '.licence-status' ).html( wpmdb_strings.register_license_problem ); + }, + success: function( data ) { + doing_licence_registration_ajax = false; + $( '.register-licence-ajax-spinner' ).remove(); + + if ( 'undefined' !== typeof data.errors ) { + var msg = ''; + for ( var key in data.errors ) { + msg += data.errors[ key ]; + } + $( '.licence-status' ).html( msg ); + + if ( 'undefined' !== typeof data.masked_licence ) { + enable_pro_licence( data, licence_key ); + $( '.migrate-tab .invalid-licence' ).hide(); + } + } else if ( 'undefined' !== typeof data.wpmdb_error && 'undefined' !== typeof data.body ) { + $( '.licence-status' ).html( data.body ); + } else { + $( '.licence-status' ).html( wpmdb_strings.license_registered ).delay( 5000 ).fadeOut( 1000 ); + $( '.licence-status' ).addClass( 'success notification-message success-notice' ); + enable_pro_licence( data, licence_key ); + $( '.invalid-licence' ).hide(); + } + } + } ); + + } ); + + // clears the debug log + $( '.clear-log' ).click( function() { + $( '.debug-log-textarea' ).val( '' ); + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_clear_log', + nonce: wpmdb_data.nonces.clear_log + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.clear_log_problem ); + }, + success: function( data ) { + } + } ); + } ); + + // updates the debug log when the user switches to the help tab + function refresh_debug_log() { + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_get_log', + nonce: wpmdb_data.nonces.get_log + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.update_log_problem ); + }, + success: function( data ) { + $( '.debug-log-textarea' ).val( data ); + } + } ); + } + + // select all tables + $( '.multiselect-select-all' ).click( function() { + var multiselect = $( this ).parents( '.select-wrap' ).children( '.multiselect' ); + $( 'option', multiselect ).prop( 'selected', 1 ); + $( multiselect ).focus().trigger( 'change' ); + } ); + + // deselect all tables + $( '.multiselect-deselect-all' ).click( function() { + var multiselect = $( this ).parents( '.select-wrap' ).children( '.multiselect' ); + $( 'option', multiselect ).removeAttr( 'selected' ); + $( multiselect ).focus().trigger( 'change' ); + } ); + + // invert table selection + $( '.multiselect-invert-selection' ).click( function() { + var multiselect = $( this ).parents( '.select-wrap' ).children( '.multiselect' ); + $( 'option', multiselect ).each( function() { + $( this ).attr( 'selected', !$( this ).attr( 'selected' ) ); + } ); + $( multiselect ).focus().trigger( 'change' ); + } ); + + // on option select hide all "advanced" option divs and show the correct div for the option selected + $( '.option-group input[type=radio]' ).change( function() { + var group = $( this ).closest( '.option-group' ); + $( 'ul', group ).hide(); + var parent = $( this ).closest( 'li' ); + $( 'ul', parent ).show(); + } ); + + // on page load, expand hidden divs for selected options (browser form cache) + $( '.option-group' ).each( function() { + $( '.option-group input[type=radio]' ).each( function() { + if ( $( this ).is( ':checked' ) ) { + var parent = $( this ).closest( 'li' ); + $( 'ul', parent ).show(); + } + } ); + } ); + + // expand and collapse content on click + $( '.header-expand-collapse' ).click( function() { + if ( $( '.expand-collapse-arrow', this ).hasClass( 'collapsed' ) ) { + $( '.expand-collapse-arrow', this ).removeClass( 'collapsed' ); + $( this ).next().show(); + } else { + $( '.expand-collapse-arrow', this ).addClass( 'collapsed' ); + $( this ).next().hide(); + } + } ); + + $( '.checkbox-label input[type=checkbox]' ).change( function() { + if ( $( this ).is( ':checked' ) ) { + $( this ).parent().next().show(); + } else { + $( this ).parent().next().hide(); + } + } ); + + // special expand and collapse content on click for save migration profile + $( '#save-migration-profile' ).change( function() { + wpmdb.functions.update_migrate_button_text(); + if ( $( this ).is( ':checked' ) ) { + $( '.save-settings-button' ).show(); + } else { + $( '.save-settings-button' ).hide(); + } + } ); + + if ( $( '#save-migration-profile' ).is( ':checked' ) ) { + $( '.save-settings-button' ).show(); + } + + $( '.create-new-profile' ).focus( function() { + $( '#create_new' ).prop( 'checked', true ); + } ); + + $( '.checkbox-label input[type=checkbox]' ).each( function() { + if ( $( this ).is( ':checked' ) ) { + $( this ).parent().next().show(); + } + } ); + + // AJAX migrate button + $( '.migrate-db-button' ).click( function( event ) { + $( this ).blur(); + event.preventDefault(); + wpmdb.migration_state_id = ''; + + if ( false === $.wpmdb.apply_filters( 'wpmdb_migration_profile_ready', true ) ) { + return; + } + + // check that they've selected some tables to migrate + if ( $( '#migrate-selected' ).is( ':checked' ) && null === $( '#select-tables' ).val() ) { + alert( wpmdb_strings.please_select_one_table ); + return; + } + + // check that they've selected some tables to backup + if ( 'savefile' !== wpmdb_migration_type() && $( '#backup-manual-select' ).is( ':checked' ) && null === $( '#select-backup' ).val() ) { + alert( wpmdb_strings.please_select_one_table_backup ); + return; + } + + var new_url_missing = false; + var new_file_path_missing = false; + if ( $( '#new-url' ).length && !$( '#new-url' ).val() ) { + $( '#new-url-missing-warning' ).show(); + $( '#new-url' ).focus(); + $( 'html,body' ).scrollTop( 0 ); + new_url_missing = true; + } + + if ( $( '#new-path' ).length && !$( '#new-path' ).val() ) { + $( '#new-path-missing-warning' ).show(); + if ( false === new_url_missing ) { + $( '#new-path' ).focus(); + $( 'html,body' ).scrollTop( 0 ); + } + new_file_path_missing = true; + } + + if ( true === new_url_missing || true === new_file_path_missing ) { + return; + } + + // also save profile + if ( $( '#save-migration-profile' ).is( ':checked' ) ) { + save_active_profile(); + } + + form_data = $( '#migrate-form' ).serialize(); + + var doc_height = $( document ).height(); + + $( 'body' ).append( '
' ); + + $( '#overlay' ) + .height( doc_height ) + .css( { + 'position': 'fixed', + 'top': 0, + 'left': 0, + 'width': '100%', + 'z-index': 99999, + 'display': 'none' + } ); + + var $progress_content = $progress_content_original.clone(); + migration_intent = wpmdb_migration_type(); + + stage = 'backup'; + + if ( 'savefile' === migration_intent ) { + stage = 'migrate'; + } + + if ( false === $( '#create-backup' ).is( ':checked' ) ) { + stage = 'migrate'; + } + + var table_intent = $( 'input[name=table_migrate_option]:checked' ).val(); + var connection_info = $.trim( $( '.pull-push-connection-info' ).val() ).split( '\n' ); + var table_rows = ''; + + remote_site = connection_info[ 0 ]; + secret_key = connection_info[ 1 ]; + + var static_migration_label = ''; + + $( '#overlay' ).after( $progress_content ); + + completed_msg = wpmdb_strings.exporting_complete; + + if ( 'savefile' === migration_intent ) { + static_migration_label = wpmdb_strings.exporting_please_wait; + } else { + static_migration_label = get_migration_status_label( remote_site, migration_intent, 'migrating' ); + completed_msg = get_migration_status_label( remote_site, migration_intent, 'completed' ); + } + + $( '.progress-title' ).html( static_migration_label ); + + $( '#overlay' ).show(); + var backup_option = $( 'input[name=backup_option]:checked' ).val(); + var table_option = $( 'input[name=table_migrate_option]:checked' ).val(); + var selected_tables = ''; + + if ( 'backup' === stage ) { + if ( 'migrate_only_with_prefix' === table_option && 'backup_selected' === backup_option ) { + backup_option = 'backup_only_with_prefix'; + } + if ( 'push' === migration_intent ) { + table_rows = wpmdb.common.connection_data.table_rows; + if ( 'backup_only_with_prefix' === backup_option ) { + tables_to_migrate = wpmdb.common.connection_data.prefixed_tables; + } else if ( 'backup_selected' === backup_option ) { + selected_tables = $( '#select-tables' ).val(); + tables_to_migrate = get_intersect( selected_tables, wpmdb.common.connection_data.tables ); + } else if ( 'backup_manual_select' === backup_option ) { + tables_to_migrate = $( '#select-backup' ).val(); + } + } else { + table_rows = wpmdb_data.this_table_rows; + if ( 'backup_only_with_prefix' === backup_option ) { + tables_to_migrate = wpmdb_data.this_prefixed_tables; + } else if ( 'backup_selected' === backup_option ) { + selected_tables = $( '#select-tables' ).val(); + tables_to_migrate = get_intersect( selected_tables, wpmdb_data.this_tables ); + } else if ( 'backup_manual_select' === backup_option ) { + tables_to_migrate = $( '#select-backup' ).val(); + } + } + } else { + tables_to_migrate = get_tables_to_migrate( null, null ); + + // User is pushing or exporting + if ( 'push' === migration_intent || 'savefile' === migration_intent ) { + + // Default value, assuming we're not backing up + table_rows = wpmdb_data.this_table_rows; + } else { + table_rows = wpmdb.common.connection_data.table_rows; + } + } + + function decide_tables_to_display_rows( tables_to_migrate, orig_table_rows ) { + var total_size = 0; + var table_rows = JSON.parse( JSON.stringify( orig_table_rows ) ); + + $.each( tables_to_migrate, function( index, value ) { + total_size += parseInt( table_rows[ value ] ); + } ); + + var max_percent = 0; + var total_percent = 0; + var table_widths = []; + $.each( tables_to_migrate, function( index, value ) { + var percent = Math.round( ( table_rows[ value ] / total_size ) * 100 ); + table_widths[ value ] = percent; + + if ( percent > max_percent ) { + max_percent = percent; + } + total_percent += percent; + } ); + + var last_element = ''; + var percent_diff = 100 - total_percent; + $.each( tables_to_migrate, function( index, value ) { + var percent = table_widths[ value ]; + + if ( 0 !== percent_diff && percent === max_percent ) { + percent += percent_diff; + percent_diff = 0; + } + + $( '.progress-tables' ).append( '
' + value + '
' ); + $( '.progress-tables-hover-boxes' ).append( '
' ); + last_element = value; + } ); + + // Only enumerate progress-chunk classed elements from core + $( '.progress-tables', '.progress-wrapper-primary' ).find( '.progress-chunk' ).each( function( index ) { + if ( 1 > $( this ).width() ) { + $( this ).hide(); + $( '.progress-chunk-hover[data-table=' + tables_to_migrate[ index ] + ']' ).hide(); + table_rows[ last_element ] = Number( table_rows[ last_element ] ); + table_rows[ last_element ] += Number( table_rows[ tables_to_migrate[ index ] ] ); + table_rows[ tables_to_migrate[ index ] ] = 0; + } + + var element = this; + setTimeout( function() { + hide_overflowing_elements( element ); + }, 0 ); + + function hide_overflowing_elements( element ) { + if ( $( 'span', element ).innerWidth() > $( element ).width() ) { + $( 'span', element ).hide(); + } + } + } ); + + var return_vals = [ table_rows, total_size ]; + + return return_vals; + + } + + var table_details = decide_tables_to_display_rows( tables_to_migrate, table_rows ); + table_rows = table_details[ 0 ]; + var total_size = table_details[ 1 ]; + + $( '.progress-title' ).after( '' ); + + var height = $( '.progress-content' ).outerHeight(); + $( '.progress-content' ).css( 'top', '-' + height + 'px' ).show().animate( { 'top': '0px' } ); + + setup_counter(); + currently_migrating = true; + + var request_data = { + action: 'wpmdb_initiate_migration', + intent: migration_intent, + url: remote_site, + key: secret_key, + form_data: form_data, + stage: stage, + nonce: wpmdb_data.nonces.initiate_migration + }; + + if ( 'savefile' !== migration_intent ) { + request_data.temp_prefix = wpmdb.common.connection_data.temp_prefix; + } + + doing_ajax = true; + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: request_data, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( getAjaxErrors( jqXHR.responseText, '(#112)', jqXHR ) ); + $( '.progress-text' ).addClass( 'migration-error' ); + console.log( jqXHR ); + console.log( textStatus ); + console.log( errorThrown ); + doing_ajax = false; + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + }, + success: function( data ) { + doing_ajax = false; + if ( 'undefined' !== typeof data && 'undefined' !== typeof data.wpmdb_error && 1 === data.wpmdb_error ) { + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).addClass( 'migration-error' ); + $( '.progress-text' ).html( data.body ); + return; + } + + wpmdb.migration_state_id = data.migration_state_id; + + var i = 0; + var progress_size = 0; + overall_percent = 0; + var table_progress = 0; + var temp_progress = 0; + var last_progress = 0; + var overall_table_progress = 0; + + // Set delay between requests - use max of local/remote values, 0 if doing export + delay_between_requests = 0; + if ( 'savefile' !== migration_intent && 'undefined' !== typeof wpmdb.common.connection_data && 'undefined' !== typeof wpmdb.common.connection_data.delay_between_requests ) { + delay_between_requests = Math.max( parseInt( wpmdb_data.delay_between_requests ), parseInt( wpmdb.common.connection_data.delay_between_requests ) ); + } + + wpmdb.functions.migrate_table_recursive = function( current_row, primary_keys ) { + + if ( i >= tables_to_migrate.length ) { + if ( 'backup' === stage ) { + stage = 'migrate'; + i = 0; + progress_size = 0; + overall_percent = 0; + $( '.progress-bar' ).width( '0px' ); + + tables_to_migrate = get_tables_to_migrate( null, null ); + + // User is pushing or exporting + if ( 'push' === migration_intent || 'savefile' === migration_intent ) { + + // Default value, assuming we're not backing up + table_rows = wpmdb_data.this_table_rows; + } else { + table_rows = wpmdb.common.connection_data.table_rows; + } + + $( '.progress-tables' ).empty(); + $( '.progress-tables-hover-boxes' ).empty(); + + table_details = decide_tables_to_display_rows( tables_to_migrate, table_rows ); + table_rows = table_details[ 0 ]; + total_size = table_details[ 1 ]; + + } else { + $( '.progress-label' ).removeClass( 'label-visible' ); + + wpmdb.common.hooks = $.wpmdb.apply_filters( 'wpmdb_before_migration_complete_hooks', wpmdb.common.hooks ); + wpmdb.common.hooks.push( wpmdb.functions.migration_complete ); + wpmdb.common.hooks.push( wpmdb.functions.wpmdb_flush ); + wpmdb.common.hooks = $.wpmdb.apply_filters( 'wpmdb_after_migration_complete_hooks', wpmdb.common.hooks ); + wpmdb.common.hooks.push( wpmdb.functions.migration_complete_events ); + wpmdb.common.next_step_in_migration = { fn: wpmdb_call_next_hook }; + wpmdb.functions.execute_next_step(); + return; + } + } + + if ( 'backup' === stage ) { + $( '.progress-text' ).html( overall_percent + '% - ' + wpmdb_strings.backing_up + ' "' + tables_to_migrate[ i ] + '"' ); + } else { + $( '.progress-text' ).html( overall_percent + '% - ' + wpmdb_strings.migrating + ' "' + tables_to_migrate[ i ] + '"' ); + } + + var last_table = 0; + if ( i === ( tables_to_migrate.length - 1 ) ) { + last_table = 1; + } + + var gzip = 0; + if ( 'savefile' !== migration_intent && 1 === parseInt( wpmdb.common.connection_data.gzip ) ) { + gzip = 1; + } + + var request_data = { + action: 'wpmdb_migrate_table', + migration_state_id: wpmdb.migration_state_id, + table: tables_to_migrate[ i ], + stage: stage, + current_row: current_row, + last_table: last_table, + primary_keys: primary_keys, + gzip: gzip, + nonce: wpmdb_data.nonces.migrate_table + }; + + if ( 'savefile' !== migration_intent ) { + request_data.bottleneck = wpmdb.common.connection_data.bottleneck; + request_data.prefix = wpmdb.common.connection_data.prefix; + } + + if ( wpmdb.common.connection_data && wpmdb.common.connection_data.path_current_site && wpmdb.common.connection_data.domain ) { + request_data.path_current_site = wpmdb.common.connection_data.path_current_site; + request_data.domain_current_site = wpmdb.common.connection_data.domain; + } + + doing_ajax = true; + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + timeout: 0, + data: request_data, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( wpmdb_strings.table_process_problem + ' ' + tables_to_migrate[ i ] ); + $( '.progress-text' ).append( '

' + wpmdb_strings.status + ': ' + jqXHR.status + ' ' + jqXHR.statusText + '

' + wpmdb_strings.response + ':
' + jqXHR.responseText ); + $( '.progress-text' ).addClass( 'migration-error' ); + doing_ajax = false; + console.log( jqXHR ); + console.log( textStatus ); + console.log( errorThrown ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + }, + success: function( data ) { + doing_ajax = false; + data = $.trim( data ); + var row_information = wpmdb_parse_json( data ); + if ( false === row_information || null === row_information ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + if ( '' === data || null === data ) { + $( '.progress-text' ).html( wpmdb_strings.table_process_problem_empty_response + ' ' + tables_to_migrate[ i ] ); + } else { + $( '.progress-text' ).html( getAjaxErrors( data, null, null ) ); + } + $( '.progress-text' ).addClass( 'migration-error' ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + } + + if ( 'undefined' !== typeof row_information.wpmdb_error && 1 === row_information.wpmdb_error ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).addClass( 'migration-error' ); + $( '.progress-text' ).html( row_information.body ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + } + + // We need the returned file name for delivery or display to the user. + if ( 1 === last_table && 'savefile' === migration_intent ) { + if ( 'undefined' !== typeof row_information.dump_filename ) { + dump_filename = row_information.dump_filename; + } + if ( 'undefined' !== typeof row_information.dump_path ) { + dump_path = row_information.dump_path; + } + } + + if ( -1 === row_information.current_row || '-1' === row_information.current_row ) { + progress_size -= overall_table_progress; + overall_table_progress = 0; + last_progress = 0; + progress_size += parseInt( table_rows[ tables_to_migrate[ i ] ] ); + i++; + row_information.current_row = ''; + row_information.primary_keys = ''; + } else { + temp_progress = parseInt( row_information.current_row ); + table_progress = temp_progress - last_progress; + last_progress = temp_progress; + progress_size += table_progress; + overall_table_progress += table_progress; + } + overall_percent = Math.floor( ( progress_size / total_size ) * 100 ); + $( '.progress-bar' ).width( overall_percent + '%' ); + wpmdb.common.next_step_in_migration = { + fn: wpmdb.functions.migrate_table_recursive, + args: [ row_information.current_row, row_information.primary_keys ] + }; + wpmdb.functions.execute_next_step(); + } + } ); + + }; + + wpmdb.common.next_step_in_migration = { + fn: wpmdb.functions.migrate_table_recursive, + args: [ '-1', '' ] + }; + wpmdb.functions.execute_next_step(); + + } + + } ); // end ajax + + } ); + + wpmdb.functions.migration_complete_events = function() { + if ( false === wpmdb.common.migration_error ) { + if ( '' === wpmdb.common.non_fatal_errors ) { + if ( 'savefile' !== migration_intent && true === $( '#save_computer' ).is( ':checked' ) ) { + $( '.progress-text' ).css( 'visibility', 'hidden' ); + } + $( '.progress-title' ).html( completed_msg ).append( '
' ); + } else { + $( '.progress-text' ).html( wpmdb.common.non_fatal_errors ); + $( '.progress-text' ).addClass( 'migration-error' ); + $( '.progress-title' ).html( wpmdb_strings.completed_with_some_errors ); + } + + $( '.progress-bar-wrapper' ).hide(); + } + + $( '.migration-controls' ).hide(); + + // reset migration variables so consecutive migrations work correctly + wpmdb.common.hooks = []; + wpmdb.common.call_stack = []; + wpmdb.common.migration_error = false; + currently_migrating = false; + migration_completed = true; + migration_paused = false; + migration_cancelled = false; + doing_ajax = false; + wpmdb.common.non_fatal_errors = ''; + + $( '.progress-label' ).remove(); + $( '.migration-progress-ajax-spinner' ).remove(); + $( '.close-progress-content' ).show(); + $( '#overlay' ).css( 'cursor', 'pointer' ); + clearInterval( elapsed_interval ); + }; + + wpmdb.functions.migration_complete = function() { + + $( '.migration-controls' ).fadeOut(); + + if ( 'savefile' === migration_intent ) { + currently_migrating = false; + var migrate_complete_text = wpmdb_strings.migration_complete; + if ( $( '#save_computer' ).is( ':checked' ) ) { + var url = wpmdb_data.this_download_url + encodeURIComponent( dump_filename ); + if ( $( '#gzip_file' ).is( ':checked' ) ) { + url += '&gzip=1'; + } + window.location = url; + } else { + migrate_complete_text = wpmdb_strings.completed_dump_located_at + ' ' + dump_path; + } + + if ( false === wpmdb.common.migration_error ) { + $( '.progress-text' ).html( migrate_complete_text ); + wpmdb.functions.migration_complete_events(); + $( '.progress-title' ).html( completed_msg ); + } + + } else { // rename temp tables, delete old tables + $( '.progress-text' ).html( wpmdb_strings.finalizing_migration ); + doing_ajax = true; + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_finalize_migration', + migration_state_id: wpmdb.migration_state_id, + prefix: wpmdb.common.connection_data.prefix, + tables: tables_to_migrate.join( ',' ), + nonce: wpmdb_data.nonces.finalize_migration + }, + error: function( jqXHR, textStatus, errorThrown ) { + doing_ajax = false; + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( wpmdb_strings.finalize_tables_problem ); + $( '.progress-text' ).addClass( 'migration-error' ); + alert( jqXHR + ' : ' + textStatus + ' : ' + errorThrown ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + }, + success: function( data ) { + doing_ajax = false; + if ( '1' !== $.trim( data ) ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( data ); + $( '.progress-text' ).addClass( 'migration-error' ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + } + wpmdb.common.next_step_in_migration = { fn: wpmdb_call_next_hook }; + wpmdb.functions.execute_next_step(); + } + } ); + } + }; + + wpmdb.functions.wpmdb_flush = function() { + if ( 'savefile' !== migration_intent ) { + $( '.progress-text' ).html( wpmdb_strings.flushing ); + doing_ajax = true; + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_flush', + migration_state_id: wpmdb.migration_state_id, + nonce: wpmdb_data.nonces.flush + }, + error: function( jqXHR, textStatus, errorThrown ) { + doing_ajax = false; + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( wpmdb_strings.flush_problem ); + $( '.progress-text' ).addClass( 'migration-error' ); + alert( jqXHR + ' : ' + textStatus + ' : ' + errorThrown ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + }, + success: function( data ) { + doing_ajax = false; + if ( '1' !== $.trim( data ) ) { + $( '.progress-title' ).html( wpmdb_strings.migration_failed ); + $( '.progress-text' ).html( data ); + $( '.progress-text' ).addClass( 'migration-error' ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + } + wpmdb.common.next_step_in_migration = { fn: wpmdb_call_next_hook }; + wpmdb.functions.execute_next_step(); + } + } ); + } + }; + + wpmdb.functions.update_migrate_button_text = function() { + var migration_intent = wpmdb_migration_type(); + var save_string = ( $( '#save-migration-profile' ).is( ':checked' ) ) ? '_save' : ''; + var migrate_string = 'migrate_button_' + ( ( 'savefile' === migration_intent ) ? 'export' : migration_intent ) + save_string; + $( '.migrate-db .button-primary' ).val( wpmdb_strings[ migrate_string ] ); + }; + + wpmdb.functions.update_migrate_button_text(); + + // close progress pop up once migration is completed + $( 'body' ).on( 'click', '.close-progress-content-button', function( e ) { + hide_overlay(); + } ); + + $( 'body' ).on( 'click', '#overlay', function() { + if ( true === migration_completed ) { + hide_overlay(); + } + } ); + + function hide_overlay() { + var height = $( '.progress-content' ).outerHeight(); + $( '.progress-content' ).animate( { 'top': '-' + height + 'px' }, 400, 'swing', function() { + $( '#overlay' ).remove(); + $( '.progress-content' ).remove(); + } ); + migration_completed = false; + } + + // AJAX save button profile + $( '.save-settings-button' ).click( function( event ) { + event.preventDefault(); + if ( '' === $.trim( $( '.create-new-profile' ).val() ) && $( '#create_new' ).is( ':checked' ) ) { + alert( wpmdb_strings.enter_name_for_profile ); + $( '.create-new-profile' ).focus(); + return; + } + save_active_profile(); + } ); + + function save_active_profile() { + var profile; + $( '.save-settings-button' ).blur(); + + if ( doing_save_profile ) { + return; + } + + // check that they've selected some tables to migrate + if ( $( '#migrate-selected' ).is( ':checked' ) && null === $( '#select-tables' ).val() ) { + alert( wpmdb_strings.please_select_one_table ); + return; + } + + // check that they've selected some tables to backup + if ( 'savefile' !== wpmdb_migration_type() && $( '#backup-manual-select' ).is( ':checked' ) && null === $( '#select-backup' ).val() ) { + alert( wpmdb_strings.please_select_one_table_backup ); + return; + } + + var create_new_profile = false; + + if ( $( '#create_new' ).is( ':checked' ) ) { + create_new_profile = true; + } + var profile_name = $( '.create-new-profile' ).val(); + + doing_save_profile = true; + profile = $( '#migrate-form' ).serialize(); + + $( '.save-settings-button' ).attr( 'disabled', 'disabled' ) + .after( '' ); + + doing_ajax = true; + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_save_profile', + profile: profile, + nonce: wpmdb_data.nonces.save_profile + }, + error: function( jqXHR, textStatus, errorThrown ) { + doing_ajax = false; + alert( wpmdb_strings.save_profile_problem ); + $( '.save-settings-button' ).removeAttr( 'disabled' ); + $( '.save-profile-ajax-spinner' ).remove(); + $( '.save-settings-button' ).after( '' + wpmdb_strings.saved + '' ); + $( '.ajax-success-msg' ).fadeOut( 2000, function() { + $( this ).remove(); + } ); + doing_save_profile = false; + }, + success: function( data ) { + var updated_profile_id = parseInt( $( '#migrate-form input[name=save_migration_profile_option]:checked' ).val(), 10 ) + 1; + doing_ajax = false; + $( '.save-settings-button' ).removeAttr( 'disabled' ); + $( '.save-profile-ajax-spinner' ).remove(); + $( '.save-settings-button' ).after( '' + wpmdb_strings.saved + '' ); + $( '.ajax-success-msg' ).fadeOut( 2000, function() { + $( this ).remove(); + } ); + doing_save_profile = false; + $( '.create-new-profile' ).val( '' ); + + if ( create_new_profile ) { + var new_profile_key = parseInt( data, 10 ); + var new_profile_id = new_profile_key + 1; + var new_li = $( '
' ); + new_li.find( 'label' ).append( document.createTextNode( ' ' + profile_name ) ); + updated_profile_id = new_profile_id; + + $( '#create_new' ).parents( 'li' ).before( new_li ); + $( '#profile-' + new_profile_id ).attr( 'checked', 'checked' ); + } + + // Push updated profile id to history if available + var updatedURL = window.location.href.replace( '#migrate', '' ).replace( /&wpmdb-profile=-?\d+/, '' ) + '&wpmdb-profile=' + updated_profile_id; + var updated_profile_name = $( '#migrate-form input[name=save_migration_profile_option]:checked' ).parent().text().trim(); + + if ( 'function' === typeof window.history.pushState ) { + if ( $( '#migrate-form .crumbs' ).length ) { + $( '#migrate-form .crumbs .crumb:last' ).text( updated_profile_name ); + } else { + var $crumbs = $( '

' ) + .append( ' Saved Profiles ' ) + .append( '' + updated_profile_name + '' ); + $( '#migrate-form' ).prepend( $crumbs ); + } + window.history.pushState( { updated_profile_id: updated_profile_id }, null, updatedURL ); + } + } + } ); + } + + // progress label updating + $( 'body' ).on( 'mousemove', '.progress-chunk-hover', function( e ) { + var mX = e.pageX; + var offset = $( '.progress-bar-wrapper' ).offset(); + var label_offset = $( '.progress-label' ).outerWidth() / 2; + mX = ( mX - offset.left ) - label_offset; + $( '.progress-label' ).css( 'left', mX + 'px' ); + $( '.progress-label' ).html( $( this ).attr( 'data-table' ) ); + } ); + + // show / hide progress lavel on hover + $( 'body' ).on( 'mouseenter mouseleave', '.progress-chunk-hover', function( event ) { + if ( 'mouseenter' === event.type ) { + $( '.progress-label' ).addClass( 'label-visible' ); + } else { + $( '.progress-label' ).removeClass( 'label-visible' ); + } + } ); + + // save file (export) / push / pull special conditions + function move_connection_info_box() { + $( '.connection-status' ).hide(); + $( '.prefix-notice' ).hide(); + $( '.ssl-notice' ).hide(); + $( '.different-plugin-version-notice' ).hide(); + $( '.step-two' ).show(); + $( '.backup-options' ).show(); + $( '.keep-active-plugins' ).show(); + $( '.directory-permission-notice' ).hide(); + $( '#create-backup' ).removeAttr( 'disabled' ); + $( '#create-backup-label' ).removeClass( 'disabled' ); + $( '.backup-option-disabled' ).hide(); + $( '.compatibility-older-mysql' ).hide(); + $( '.pause-before-finalize' ).show(); + var connection_info = $.trim( $( '.pull-push-connection-info' ).val() ).split( '\n' ); + var profile_name; + wpmdb_toggle_migration_action_text(); + if ( 'pull' === wpmdb_migration_type() ) { + $( '.pull-list li' ).append( $connection_info_box ); + $connection_info_box.show( function() { + var connection_textarea = $( this ).find( '.pull-push-connection-info' ); + if ( !connection_textarea.val() ) { + connection_textarea.focus(); + } + } ); + if ( connection_established ) { + $( '.connection-status' ).hide(); + $( '.step-two' ).show(); + $( '.table-prefix' ).html( wpmdb.common.connection_data.prefix ); + $( '.uploads-dir' ).html( wpmdb_data.this_uploads_dir ); + if ( false === profile_name_edited ) { + profile_name = get_domain_name( wpmdb.common.connection_data.url ); + $( '.create-new-profile' ).val( profile_name ); + } + if ( true === show_prefix_notice ) { + $( '.prefix-notice.pull' ).show(); + } + if ( true === show_ssl_notice ) { + $( '.ssl-notice' ).show(); + } + if ( true === show_version_notice ) { + $( '.different-plugin-version-notice' ).show(); + $( '.step-two' ).hide(); + } + wpmdb_toggle_migration_action_text(); + if ( false === wpmdb_data.write_permission ) { + $( '#create-backup' ).prop( 'checked', false ); + $( '#create-backup' ).attr( 'disabled', 'disabled' ); + $( '#create-backup-label' ).addClass( 'disabled' ); + $( '.backup-option-disabled' ).show(); + $( '.upload-directory-location' ).html( wpmdb_data.this_upload_dir_long ); + } + } else { + $( '.connection-status' ).show(); + $( '.step-two' ).hide(); + } + } else if ( 'push' === wpmdb_migration_type() ) { + $( '.push-list li' ).append( $connection_info_box ); + $connection_info_box.show( function() { + var connection_textarea = $( this ).find( '.pull-push-connection-info' ); + if ( !connection_textarea.val() ) { + connection_textarea.focus(); + } + } ); + if ( connection_established ) { + $( '.connection-status' ).hide(); + $( '.step-two' ).show(); + $( '.table-prefix' ).html( wpmdb_data.this_prefix ); + $( '.uploads-dir' ).html( wpmdb.common.connection_data.uploads_dir ); + if ( false === profile_name_edited ) { + profile_name = get_domain_name( wpmdb.common.connection_data.url ); + $( '.create-new-profile' ).val( profile_name ); + } + if ( true === show_prefix_notice ) { + $( '.prefix-notice.push' ).show(); + } + if ( true === show_ssl_notice ) { + $( '.ssl-notice' ).show(); + } + if ( true === show_version_notice ) { + $( '.different-plugin-version-notice' ).show(); + $( '.step-two' ).hide(); + } + wpmdb_toggle_migration_action_text(); + if ( '0' === wpmdb.common.connection_data.write_permissions ) { + $( '#create-backup' ).prop( 'checked', false ); + $( '#create-backup' ).attr( 'disabled', 'disabled' ); + $( '#create-backup-label' ).addClass( 'disabled' ); + $( '.backup-option-disabled' ).show(); + $( '.upload-directory-location' ).html( wpmdb.common.connection_data.upload_dir_long ); + } + } else { + $( '.connection-status' ).show(); + $( '.step-two' ).hide(); + } + } else if ( 'savefile' === wpmdb_migration_type() ) { + $( '.connection-status' ).hide(); + $( '.step-two' ).show(); + $( '.table-prefix' ).html( wpmdb_data.this_prefix ); + $( '.compatibility-older-mysql' ).show(); + if ( false === profile_name_edited ) { + $( '.create-new-profile' ).val( '' ); + } + $( '.backup-options' ).hide(); + $( '.keep-active-plugins' ).hide(); + $( '.pause-before-finalize' ).hide(); + if ( false === wpmdb_data.write_permission ) { + $( '.directory-permission-notice' ).show(); + $( '.step-two' ).hide(); + } + } + maybe_show_mixed_cased_table_name_warning(); + $.wpmdb.do_action( 'move_connection_info_box', { + 'migration_type': wpmdb_migration_type(), + 'last_migration_type': last_replace_switch + } ); + } + + // move around textarea depending on whether or not the push/pull options are selected + var $connection_info_box = $( '.connection-info-wrapper' ); + move_connection_info_box(); + + $( '.migrate-selection.option-group input[type=radio]' ).change( function() { + move_connection_info_box(); + if ( connection_established ) { + change_replace_values(); + } + wpmdb.functions.update_migrate_button_text(); + } ); + + function change_replace_values() { + var old_url = null; + var old_path = null; + if ( null !== wpmdb.common.previous_connection_data && 'object' === typeof wpmdb.common.previous_connection_data && wpmdb.common.previous_connection_data.url !== wpmdb.common.connection_data.url ) { + old_url = remove_protocol( wpmdb.common.previous_connection_data.url ); + old_path = wpmdb.common.previous_connection_data.path; + } + + if ( 'push' === wpmdb_migration_type() || 'savefile' === wpmdb_migration_type() ) { + if ( 'pull' === last_replace_switch ) { + $( '.replace-row' ).each( function() { + var old_val = $( '.old-replace-col input', this ).val(); + $( '.old-replace-col input', this ).val( $( '.replace-right-col input', this ).val() ); + $( '.replace-right-col input', this ).val( old_val ); + } ); + } else if ( 'push' === last_replace_switch && 'push' === wpmdb_migration_type() && null !== old_url && null !== old_path ) { + $( '.replace-row' ).each( function() { + var old_val = $( '.replace-right-col input', this ).val(); + if ( old_val === old_path ) { + $( '.replace-right-col input', this ).val( wpmdb.common.connection_data.path ); + } + if ( old_val === old_url ) { + $( '.replace-right-col input', this ).val( remove_protocol( wpmdb.common.connection_data.url ) ); + } + } ); + } + $.wpmdb.do_action( 'wpmdb_update_push_table_select' ); + $( '#select-post-types' ).remove(); + $( '.select-post-types-wrap' ).prepend( $push_post_type_select ); + $( '#select-backup' ).remove(); + $( '.backup-tables-wrap' ).prepend( $push_select_backup ); + } else if ( 'pull' === wpmdb_migration_type() ) { + if ( '' === last_replace_switch || 'push' === last_replace_switch || 'savefile' === last_replace_switch ) { + $( '.replace-row' ).each( function() { + var old_val = $( '.old-replace-col input', this ).val(); + $( '.old-replace-col input', this ).val( $( '.replace-right-col input', this ).val() ); + $( '.replace-right-col input', this ).val( old_val ); + } ); + } else if ( 'pull' === last_replace_switch && 'pull' === wpmdb_migration_type() && null !== old_url && null !== old_path ) { + $( '.replace-row' ).each( function() { + var old_val = $( '.old-replace-col input', this ).val(); + if ( old_val === old_path ) { + $( '.old-replace-col input', this ).val( wpmdb.common.connection_data.path ); + } + if ( old_val === old_url ) { + $( '.old-replace-col input', this ).val( remove_protocol( wpmdb.common.connection_data.url ) ); + } + } ); + } + $.wpmdb.do_action( 'wpmdb_update_pull_table_select' ); + $( '#select-post-types' ).remove(); + $( '.select-post-types-wrap' ).prepend( $pull_post_type_select ); + $( '#select-backup' ).remove(); + $( '.backup-tables-wrap' ).prepend( $pull_select_backup ); + } + last_replace_switch = wpmdb_migration_type(); + } + + // hide second section if pull or push is selected with no connection established + if ( ( 'pull' === wpmdb_migration_type() || 'push' === wpmdb_migration_type() ) && !connection_established ) { + $( '.step-two' ).hide(); + $( '.connection-status' ).show(); + } + + // show / hide GUID helper description + $( '.general-helper' ).click( function( e ) { + e.preventDefault(); + var icon = $( this ), + bubble = $( this ).next(); + + // Close any that are already open + $( '.helper-message' ).not( bubble ).hide(); + + var position = icon.position(); + if ( bubble.hasClass( 'bottom' ) ) { + bubble.css( { + 'left': ( position.left - bubble.width() / 2 ) + 'px', + 'top': ( position.top + icon.height() + 9 ) + 'px' + } ); + } else { + bubble.css( { + 'left': ( position.left + icon.width() + 9 ) + 'px', + 'top': ( position.top + icon.height() / 2 - 18 ) + 'px' + } ); + } + + bubble.toggle(); + e.stopPropagation(); + } ); + + $( 'body' ).click( function() { + $( '.helper-message' ).hide(); + } ); + + $( '.helper-message' ).click( function( e ) { + e.stopPropagation(); + } ); + + $( 'body' ).on( 'click', '.show-errors-toggle', function( e ) { + e.preventDefault(); + $( this ).next( '.migration-php-errors' ).toggle(); + } ); + + /** + * Core plugin wrapper for the common AJAX error detecting method + * + * @param text + * @param code + * @param jqXHR + * + * @returns {string} + */ + function getAjaxErrors( text, code, jqXHR ) { + return wpmdbGetAjaxErrors( wpmdb_strings.connection_local_server_problem, code, text, jqXHR ); + } + + // migrate / settings tabs + $( '.nav-tab' ).click( function() { + var hash = $( this ).attr( 'data-div-name' ); + hash = hash.replace( '-tab', '' ); + window.location.hash = hash; + switch_to_plugin_tab( hash, false ); + } ); + + $( 'body' ).on( 'click', 'a[href^="#"]', function( event ) { + var href = $( event.target ).attr( 'href' ); + var tab_name = href.substr( 1 ); + + if ( tab_name ) { + var nav_tab = $( '.' + tab_name ); + if ( 1 === nav_tab.length ) { + nav_tab.trigger( 'click' ); + event.preventDefault(); + } + } + } ); + + // repeatable fields + $( 'body' ).on( 'click', '.add-row', function() { + $( this ).parents( 'tr' ).before( $( '.original-repeatable-field' ).clone().removeClass( 'original-repeatable-field' ) ); + } ); + + // repeatable fields + $( 'body' ).on( 'click', '.replace-remove-row', function() { + $( this ).parents( 'tr' ).remove(); + if ( 2 >= $( '.replace-row' ).length ) { + $( '.no-replaces-message' ).show(); + } + + var prev_id = $( this ).prev().attr( 'id' ); + if ( 'new-url' === prev_id || 'new-path' === prev_id ) { + $( '#' + prev_id + '-missing-warning' ).hide(); + } + } ); + + // Hide New URL & New Path Warnings on change. + $( 'body' ) + .on( 'change', '#new-url', function() { + $( '#new-url-missing-warning' ).hide(); + } ) + .on( 'change', '#new-path', function() { + $( '#new-path-missing-warning' ).hide(); + } ); + + // Copy Find field to associated Replace field on arrow click. + $( 'body' ).on( 'click', '.arrow-col', function() { + var replace_row_arrow = this; + var original_value = $( replace_row_arrow ).prev( 'td' ).find( 'input' ).val(); + var new_value_input = $( replace_row_arrow ).next( 'td' ).find( 'input' ); + new_value_input.val( original_value ); + + // Hide New URL or New Path Warning if changed. + if ( 'new-url' === new_value_input.prop( 'id' ) ) { + $( '#new-url-missing-warning' ).hide(); + } else if ( 'new-path' === new_value_input.prop( 'id' ) ) { + $( '#new-path-missing-warning' ).hide(); + } + } ); + + $( '.add-replace' ).click( function() { + $( '.replace-fields' ).prepend( $( '.original-repeatable-field' ).clone().removeClass( 'original-repeatable-field' ) ); + $( '.no-replaces-message' ).hide(); + } ); + + $( '#find-and-replace-sort tbody' ).sortable( { + items: '> tr:not(.pin)', + handle: 'td:first', + start: function() { + $( '.sort-handle' ).css( 'cursor', '-webkit-grabbing' ); + $( '.sort-handle' ).css( 'cursor', '-moz-grabbing' ); + }, + stop: function() { + $( '.sort-handle' ).css( 'cursor', '-webkit-grab' ); + $( '.sort-handle' ).css( 'cursor', '-moz-grab' ); + } + } ); + + function validate_url( url ) { + return /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)|\/|\?)*)?$/i.test( url ); + } + + function switch_to_plugin_tab( hash, skip_addons_check ) { + $( '.nav-tab' ).removeClass( 'nav-tab-active' ); + $( '.nav-tab.' + hash ).addClass( 'nav-tab-active' ); + $( '.content-tab' ).hide(); + $( '.' + hash + '-tab' ).show(); + + if ( 'settings' === hash ) { + if ( false === checked_licence && '1' === wpmdb_data.has_licence ) { + $( 'p.licence-status' ).append( 'Checking License... ' ).append( ajax_spinner ); + check_licence(); + } + } + + if ( 'help' === hash ) { + refresh_debug_log(); + if ( false === checked_licence && '1' === wpmdb_data.has_licence ) { + $( '.support-content p' ).append( ajax_spinner ); + check_licence(); + } + } + + if ( 'addons' === hash && true !== skip_addons_check ) { + if ( false === checked_licence && '1' === wpmdb_data.has_licence ) { + $( '.addons-content p' ).append( ajax_spinner ); + check_licence(); + } + } + } + + var hash = ''; + + // check for hash in url (settings || migrate) switch tabs accordingly + if ( window.location.hash ) { + hash = window.location.hash.substring( 1 ); + switch_to_plugin_tab( hash, false ); + } + + if ( '' !== get_query_var( 'install-plugin' ) ) { + hash = 'addons'; + checked_licence = true; + switch_to_plugin_tab( hash, true ); + } + + // process notice links clicks, eg. dismiss, reminder + $( '.notice-link' ).click( function( e ) { + e.preventDefault(); + $( this ).closest( '.inline-message' ).hide(); + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_process_notice_link', + nonce: wpmdb_data.nonces.process_notice_link, + notice: $( this ).data( 'notice' ), + type: $( this ).data( 'type' ), + reminder: $( this ).data( 'reminder' ) + } + } ); + } ); + + // regenerates the saved secret key + $( '.reset-api-key' ).click( function() { + var answer = confirm( wpmdb_strings.reset_api_key ); + + if ( !answer || doing_reset_api_key_ajax ) { + return; + } + + doing_reset_api_key_ajax = true; + $( '.reset-api-key' ).after( '' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_reset_api_key', + nonce: wpmdb_data.nonces.reset_api_key + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.reset_api_key_problem ); + $( '.reset-api-key-ajax-spinner' ).remove(); + doing_reset_api_key_ajax = false; + }, + success: function( data ) { + $( '.reset-api-key-ajax-spinner' ).remove(); + doing_reset_api_key_ajax = false; + $( '.connection-info' ).html( data ); + wpmdb_data.connection_info = $.trim( data ).split( '\n' ); + } + } ); + + } ); + + // show / hide table select box when specific settings change + $( 'input.multiselect-toggle' ).change( function() { + $( this ).parents( '.expandable-content' ).children( '.select-wrap' ).toggle(); + } ); + + $( '.show-multiselect' ).each( function() { + if ( $( this ).is( ':checked' ) ) { + $( this ).parents( '.option-section' ).children( '.header-expand-collapse' ).children( '.expand-collapse-arrow' ).removeClass( 'collapsed' ); + $( this ).parents( '.expandable-content' ).show(); + $( this ).parents( '.expandable-content' ).children( '.select-wrap' ).toggle(); + } + } ); + + $( 'input[name=backup_option]' ).change( function() { + $( '.backup-tables-wrap' ).hide(); + if ( 'backup_manual_select' === $( this ).val() ) { + $( '.backup-tables-wrap' ).show(); + } + } ); + + if ( $( '#backup-manual-select' ).is( ':checked' ) ) { + $( '.backup-tables-wrap' ).show(); + } + + $( '.plugin-compatibility-save' ).click( function() { + if ( doing_plugin_compatibility_ajax ) { + return; + } + $( this ).addClass( 'disabled' ); + var select_element = $( '#selected-plugins' ); + $( select_element ).attr( 'disabled', 'disabled' ); + + doing_plugin_compatibility_ajax = true; + $( this ).after( '' ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_blacklist_plugins', + blacklist_plugins: $( select_element ).val() + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.blacklist_problem + '\r\n\r\n' + wpmdb_strings.status + ' ' + jqXHR.status + ' ' + jqXHR.statusText + '\r\n\r\n' + wpmdb_strings.response + '\r\n' + jqXHR.responseText ); + $( select_element ).removeAttr( 'disabled' ); + $( '.plugin-compatibility-save' ).removeClass( 'disabled' ); + doing_plugin_compatibility_ajax = false; + $( '.plugin-compatibility-spinner' ).remove(); + $( '.plugin-compatibility-success-msg' ).show().fadeOut( 2000 ); + }, + success: function( data ) { + if ( '' !== $.trim( data ) ) { + alert( data ); + } + $( select_element ).removeAttr( 'disabled' ); + $( '.plugin-compatibility-save' ).removeClass( 'disabled' ); + doing_plugin_compatibility_ajax = false; + $( '.plugin-compatibility-spinner' ).remove(); + $( '.plugin-compatibility-success-msg' ).show().fadeOut( 2000 ); + } + } ); + } ); + + // delete a profile from the migrate form area + $( 'body' ).on( 'click', '.delete-profile', function() { + var name = $( this ).next().clone(); + $( 'input', name ).remove(); + name = $.trim( $( name ).html() ); + var answer = confirm( wpmdb_strings.remove_profile.replace( '{{profile}}', name ) ); + + if ( !answer ) { + return; + } + var $profile_li = $( this ).parent(); + + if ( $profile_li.find( 'input:checked' ).length ) { + var $new_profile_li = $profile_li.siblings().last(); + $new_profile_li.find( 'input[type=radio]' ).prop( 'checked', 'checked' ); + $new_profile_li.find( 'input[type=text]' ).focus(); + $( '#migrate-form .crumbs .crumb:last' ).text( 'New Profile' ); + + if ( 'function' === typeof window.history.pushState ) { + var updatedURL = window.location.href.replace( '#migrate', '' ).replace( /&wpmdb-profile=-?\d+/, '' ) + '&wpmdb-profile=-1'; + window.history.pushState( { updated_profile_id: -1 }, null, updatedURL ); + } + } + + $profile_li.fadeOut( 500 ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_delete_migration_profile', + profile_id: $( this ).attr( 'data-profile-id' ), + nonce: wpmdb_data.nonces.delete_migration_profile + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.remove_profile_problem ); + }, + success: function( data ) { + if ( '-1' === data ) { + alert( wpmdb_strings.remove_profile_not_found ); + } + } + } ); + + } ); + + // deletes a profile from the main profile selection screen + $( '.main-list-delete-profile-link' ).click( function() { + var name = $( this ).prev().html(); + var answer = confirm( wpmdb_strings.remove_profile.replace( '{{profile}}', name ) ); + + if ( !answer ) { + return; + } + + $( this ).parent().fadeOut( 500 ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_delete_migration_profile', + profile_id: $( this ).attr( 'data-profile-id' ), + nonce: wpmdb_data.nonces.delete_migration_profile + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.remove_profile_problem ); + } + } ); + + } ); + + // warn the user when editing the connection info after a connection has been established + $( 'body' ).on( 'click', '.temp-disabled', function() { + var answer = confirm( wpmdb_strings.change_connection_info ); + + if ( !answer ) { + return; + } else { + $( '.ssl-notice' ).hide(); + $( '.different-plugin-version-notice' ).hide(); + $( '.migrate-db-button' ).show(); + $( '.temp-disabled' ).removeAttr( 'readonly' ); + $( '.temp-disabled' ).removeClass( 'temp-disabled' ); + $( '.connect-button' ).show(); + $( '.step-two' ).hide(); + $( '.connection-status' ).show().html( wpmdb_strings.enter_connection_info ); + connection_established = false; + } + } ); + + // ajax request for settings page when checking/unchecking setting radio buttons + $( '.settings-tab input[type=checkbox]' ).change( function() { + if ( 'plugin-compatibility' === $( this ).attr( 'id' ) ) { + return; + } + var checked = $( this ).is( ':checked' ); + var setting = $( this ).attr( 'id' ); + + $( this ).parent().append( ajax_spinner ); + var $label = $( this ).parent(); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: { + action: 'wpmdb_save_setting', + checked: checked, + setting: setting, + nonce: wpmdb_data.nonces.save_setting + }, + error: function( jqXHR, textStatus, errorThrown ) { + alert( wpmdb_strings.save_settings_problem ); + $( '.ajax-spinner' ).remove(); + }, + success: function( data ) { + $( '.ajax-spinner' ).remove(); + $( $label ).append( '' + wpmdb_strings.saved + '' ); + $( '.ajax-success-msg' ).fadeOut( 2000, function() { + $( this ).remove(); + } ); + } + } ); + + } ); + + // disable form submissions + $( '.migrate-form' ).submit( function( e ) { + e.preventDefault(); + } ); + + // fire connection_box_changed when the connect button is pressed + $( '.connect-button' ).click( function( event ) { + event.preventDefault(); + $( this ).blur(); + connection_box_changed(); + } ); + + // send paste even to connection_box_changed() function + $( '.pull-push-connection-info' ).bind( 'paste', function( e ) { + var $this = this; + setTimeout( function() { + connection_box_changed(); + }, 0 ); + + } ); + + $( 'body' ).on( 'click', '.try-again', function() { + connection_box_changed(); + } ); + + $( 'body' ).on( 'click', '.try-http', function() { + var connection_info = $.trim( $( '.pull-push-connection-info' ).val() ).split( '\n' ); + var new_url = connection_info[ 0 ].replace( 'https', 'http' ); + var new_contents = new_url + '\n' + connection_info[ 1 ]; + $( '.pull-push-connection-info' ).val( new_contents ); + connection_box_changed(); + } ); + + $( '.create-new-profile' ).change( function() { + profile_name_edited = true; + } ); + + $( 'body' ).on( 'click', '.temporarily-disable-ssl', function() { + var hash = ''; + if ( window.location.hash ) { + hash = window.location.hash.substring( 1 ); + } + $( this ).attr( 'href', $( this ).attr( 'href' ) + '&hash=' + hash ); + } ); + + // fired when the connection info box changes (e.g. gets pasted into) + function connection_box_changed( data ) { + var $this = $( '.pull-push-connection-info' ); + + if ( doing_ajax || $( $this ).hasClass( 'temp-disabled' ) ) { + return; + } + + data = $( '.pull-push-connection-info' ).val(); + + var connection_info = $.trim( data ).split( '\n' ); + var error = false; + var error_message = ''; + + if ( '' === connection_info ) { + error = true; + error_message = wpmdb_strings.connection_info_missing; + } + + if ( 2 !== connection_info.length && !error ) { + error = true; + error_message = wpmdb_strings.connection_info_incorrect; + } + + if ( !error && !validate_url( connection_info[ 0 ] ) ) { + error = true; + error_message = wpmdb_strings.connection_info_url_invalid; + } + + if ( !error && 32 >= connection_info[ 1 ].length ) { + error = true; + error_message = wpmdb_strings.connection_info_key_invalid; + } + + if ( !error && connection_info[ 0 ] === wpmdb_data.connection_info[ 0 ] ) { + error = true; + error_message = wpmdb_strings.connection_info_local_url; + } + + if ( !error && connection_info[ 1 ] === wpmdb_data.connection_info[ 1 ] ) { + error = true; + error_message = wpmdb_strings.connection_info_local_key; + } + + if ( error ) { + $( '.connection-status' ).html( error_message ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + return; + } + + var new_connection_info_contents = connection_info[ 0 ] + '\n' + connection_info[ 1 ]; + + if ( false === wpmdb_data.openssl_available ) { + connection_info[ 0 ] = connection_info[ 0 ].replace( 'https://', 'http://' ); + new_connection_info_contents = connection_info[ 0 ] + '\n' + connection_info[ 1 ]; + $( '.pull-push-connection-info' ).val( new_connection_info_contents ); + } + + show_prefix_notice = false; + doing_ajax = true; + disable_export_type_controls(); + + if ( $( '.basic-access-auth-wrapper' ).is( ':visible' ) ) { + connection_info[ 0 ] = connection_info[ 0 ].replace( /\/\/(.*)@/, '//' ); + connection_info[ 0 ] = connection_info[ 0 ].replace( '//', '//' + encodeURIComponent( $.trim( $( '.auth-username' ).val() ) ) + ':' + encodeURIComponent( $.trim( $( '.auth-password' ).val() ) ) + '@' ); + new_connection_info_contents = connection_info[ 0 ] + '\n' + connection_info[ 1 ]; + $( '.pull-push-connection-info' ).val( new_connection_info_contents ); + $( '.basic-access-auth-wrapper' ).hide(); + } + + $( '.step-two' ).hide(); + $( '.ssl-notice' ).hide(); + $( '.prefix-notice' ).hide(); + $( '.connection-status' ).show(); + + $( '.connection-status' ).html( wpmdb_strings.establishing_remote_connection ); + $( '.connection-status' ).removeClass( 'notification-message error-notice migration-error' ); + $( '.connection-status' ).append( ajax_spinner ); + + var intent = wpmdb_migration_type(); + + profile_name_edited = false; + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: { + action: 'wpmdb_verify_connection_to_remote_site', + url: connection_info[ 0 ], + key: connection_info[ 1 ], + intent: intent, + nonce: wpmdb_data.nonces.verify_connection_to_remote_site + }, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.connection-status' ).html( getAjaxErrors( jqXHR.responseText, '(#100)', jqXHR ) ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + }, + success: function( data ) { + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + maybe_show_ssl_warning( connection_info[ 0 ], connection_info[ 1 ], data.scheme ); + + if ( 'undefined' !== typeof data.wpmdb_error && 1 === data.wpmdb_error ) { + $( '.connection-status' ).html( data.body ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + + if ( data.body.indexOf( '401 Unauthorized' ) > -1 ) { + $( '.basic-access-auth-wrapper' ).show(); + } + + return; + } + + var profile_name = get_domain_name( data.url ); + $( '.create-new-profile' ).val( profile_name ); + + $( '.pull-push-connection-info' ).addClass( 'temp-disabled' ); + $( '.pull-push-connection-info' ).attr( 'readonly', 'readonly' ); + $( '.connect-button' ).hide(); + + $( '.connection-status' ).hide(); + $( '.step-two' ).show(); + + maybe_show_prefix_notice( data.prefix ); + + connection_established = true; + wpmdb.common.previous_connection_data = wpmdb.common.connection_data; + wpmdb.common.connection_data = data; + move_connection_info_box(); + change_replace_values(); + + maybe_show_mixed_cased_table_name_warning(); + + refresh_table_selects(); + + $push_select_backup = $( $pull_select ).clone(); + $( $push_select_backup ).attr( { + name: 'select_backup[]', + id: 'select-backup' + } ); + + var $post_type_select = document.createElement( 'select' ); + $( $post_type_select ).attr( { + multiple: 'multiple', + name: 'select_post_types[]', + id: 'select-post-types', + class: 'multiselect' + } ); + + $.each( wpmdb.common.connection_data.post_types, function( index, value ) { + $( $post_type_select ).append( '' ); + } ); + + $pull_post_type_select = $post_type_select; + + $( '#new-path-missing-warning, #new-url-missing-warning' ).hide(); + + if ( 'pull' === wpmdb_migration_type() ) { + $( '#new-url' ).val( remove_protocol( wpmdb_data.this_url ) ); + $( '#new-path' ).val( wpmdb_data.this_path ); + if ( 'true' === wpmdb_data.is_multisite ) { + $( '#new-domain' ).val( wpmdb_data.this_domain ); + $( '.replace-row.pin .old-replace-col input[type="text"]' ).val( remove_protocol( data.url ) ); + } + $( '#old-url' ).val( remove_protocol( data.url ) ); + $( '#old-path' ).val( data.path ); + $.wpmdb.do_action( 'wpmdb_update_pull_table_select' ); + $( '#select-post-types' ).remove(); + $( '.select-post-types-wrap' ).prepend( $pull_post_type_select ); + $( '.table-prefix' ).html( data.prefix ); + $( '.uploads-dir' ).html( wpmdb_data.this_uploads_dir ); + } else { + $( '#new-url' ).val( remove_protocol( data.url ) ); + $( '#new-path' ).val( data.path ); + if ( 'true' === wpmdb_data.is_multisite ) { + $( '.replace-row.pin .old-replace-col input[type="text"]' ).val( remove_protocol( wpmdb_data.this_url ) ); + } + $.wpmdb.do_action( 'wpmdb_update_push_table_select' ); + $( '#select-backup' ).remove(); + $( '.backup-tables-wrap' ).prepend( $push_select_backup ); + } + + wpmdb.common.next_step_in_migration = { + fn: $.wpmdb.do_action, + args: [ 'verify_connection_to_remote_site', wpmdb.common.connection_data ] + }; + wpmdb.functions.execute_next_step(); + } + + } ); + + } + + // Sets the initial Pause/Resume button event to Pause + $( 'body' ).on( 'click', '.pause-resume', function( event ) { + set_pause_resume_button( event ); + } ); + + function cancel_migration( event ) { + migration_cancelled = true; + $( '.progress-text' ).html( wpmdb_strings.completing_current_request ); + $( '.progress-title' ).html( wpmdb_strings.cancelling_migration ); + $( '.migration-controls' ).fadeOut(); + $( '.migration-progress-ajax-spinner' ).show(); + + if ( true === migration_paused ) { + migration_paused = false; + wpmdb.functions.execute_next_step(); + } + } + + $( 'body' ).on( 'click', '.cancel', function( event ) { + cancel_migration( event ); + } ); + + $( '.enter-licence' ).click( function() { + $( '.settings' ).click(); + $( '.licence-input' ).focus(); + } ); + + wpmdb.functions.execute_next_step = function() { + + // if delay is set, set a timeout for delay to recall this function, then return + if ( 0 < delay_between_requests && false === flag_skip_delay ) { + setTimeout( function() { + flag_skip_delay = true; + wpmdb.functions.execute_next_step(); + }, delay_between_requests ); + return; + } else { + flag_skip_delay = false; + } + + if ( true === migration_paused ) { + $( '.migration-progress-ajax-spinner' ).hide(); + + // Pause the timer + clearInterval( elapsed_interval ); + + if ( true === is_auto_pause_before_finalize ) { + $( '.progress-text' ).html( wpmdb_strings.paused_before_finalize ); + is_auto_pause_before_finalize = false; + } else { + $( '.progress-text' ).html( wpmdb_strings.paused ); + } + + // Re-bind Pause/Resume button to Resume when we are finally Paused + $( 'body' ).on( 'click', '.pause-resume', function( event ) { + set_pause_resume_button( event ); + } ); + $( 'body' ).on( 'click', '.cancel', function( event ) { + cancel_migration( event ); + } ); + $( '.pause-resume' ).html( wpmdb_strings.resume ); + return; + } else if ( true === migration_cancelled ) { + migration_intent = wpmdb_migration_type(); + + var progress_msg; + + if ( 'savefile' === migration_intent ) { + progress_msg = wpmdb_strings.removing_local_sql; + } else if ( 'pull' === migration_intent ) { + if ( 'backup' === stage ) { + progress_msg = wpmdb_strings.removing_local_backup; + } else { + progress_msg = wpmdb_strings.removing_local_temp_tables; + } + } else if ( 'push' === migration_intent ) { + if ( 'backup' === stage ) { + progress_msg = wpmdb_strings.removing_remote_sql; + } else { + progress_msg = wpmdb_strings.removing_remote_temp_tables; + } + } + $( '.progress-text' ).html( progress_msg ); + + var request_data = { + action: 'wpmdb_cancel_migration', + migration_state_id: wpmdb.migration_state_id + }; + + doing_ajax = true; + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'text', + cache: false, + data: request_data, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.progress-title' ).html( wpmdb_strings.migration_cancellation_failed ); + $( '.progress-text' ).html( wpmdb_strings.manually_remove_temp_files ); + $( '.progress-text' ).append( '

' + wpmdb_strings.status + ': ' + jqXHR.status + ' ' + jqXHR.statusText + '

' + wpmdb_strings.response + ':
' + jqXHR.responseText ); + $( '.progress-text' ).addClass( 'migration-error' ); + console.log( jqXHR ); + console.log( textStatus ); + console.log( errorThrown ); + doing_ajax = false; + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + }, + success: function( data ) { + doing_ajax = false; + data = $.trim( data ); + if ( ( 'push' === migration_intent && '1' !== data ) || ( 'push' !== migration_intent && '' !== data ) ) { + $( '.progress-title' ).html( wpmdb_strings.migration_cancellation_failed ); + $( '.progress-text' ).html( data ); + $( '.progress-text' ).addClass( 'migration-error' ); + wpmdb.common.migration_error = true; + wpmdb.functions.migration_complete_events(); + return; + } + completed_msg = wpmdb_strings.migration_cancelled; + $( '.progress-text' ).hide(); + wpmdb.functions.migration_complete_events(); + } + } ); + } else { + wpmdb.common.next_step_in_migration.fn.apply( null, wpmdb.common.next_step_in_migration.args ); + } + }; + + $( 'body' ).on( 'click', '.copy-licence-to-remote-site', function() { + $( '.connection-status' ).html( wpmdb_strings.copying_license ); + $( '.connection-status' ).removeClass( 'notification-message error-notice migration-error' ); + $( '.connection-status' ).append( ajax_spinner ); + + var connection_info = $.trim( $( '.pull-push-connection-info' ).val() ).split( '\n' ); + + doing_ajax = true; + disable_export_type_controls(); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: { + action: 'wpmdb_copy_licence_to_remote_site', + url: connection_info[ 0 ], + key: connection_info[ 1 ], + nonce: wpmdb_data.nonces.copy_licence_to_remote_site + }, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.connection-status' ).html( getAjaxErrors( jqXHR.responseText, '(#143)', jqXHR ) ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + }, + success: function( data ) { + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + enable_export_type_controls(); + + if ( 'undefined' !== typeof data.wpmdb_error && 1 === data.wpmdb_error ) { + $( '.connection-status' ).html( data.body ); + $( '.connection-status' ).addClass( 'notification-message error-notice migration-error' ); + + if ( data.body.indexOf( '401 Unauthorized' ) > -1 ) { + $( '.basic-access-auth-wrapper' ).show(); + } + + return; + } + connection_box_changed(); + } + } ); + } ); + + $( 'body' ).on( 'click', '.reactivate-licence', function( e ) { + doing_ajax = true; + + $( '.invalid-licence' ).empty().html( wpmdb_strings.attempting_to_activate_licence ); + $( '.invalid-licence' ).append( ajax_spinner ); + + $.ajax( { + url: ajaxurl, + type: 'POST', + dataType: 'json', + cache: false, + data: { + action: 'wpmdb_reactivate_licence', + nonce: wpmdb_data.nonces.reactivate_licence + }, + error: function( jqXHR, textStatus, errorThrown ) { + $( '.invalid-licence' ).html( wpmdb_strings.activate_licence_problem ); + $( '.invalid-licence' ).append( '

' + wpmdb_strings.status + ': ' + jqXHR.status + ' ' + jqXHR.statusText + '

' + wpmdb_strings.response + '
' + jqXHR.responseText ); + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + }, + success: function( data ) { + $( '.ajax-spinner' ).remove(); + doing_ajax = false; + + if ( 'undefined' !== typeof data.wpmdb_error && 1 === data.wpmdb_error ) { + $( '.invalid-licence' ).html( data.body ); + return; + } + + if ( 'undefined' !== typeof data.wpmdb_dbrains_api_down && 1 === data.wpmdb_dbrains_api_down ) { + $( '.invalid-licence' ).html( wpmdb_strings.temporarily_activated_licence ); + $( '.invalid-licence' ).append( data.body ); + return; + } + + $( '.invalid-licence' ).empty().html( wpmdb_strings.licence_reactivated ); + location.reload(); + } + } ); + + } ); + + $( 'input[name=table_migrate_option]' ).change( function() { + maybe_show_mixed_cased_table_name_warning(); + $.wpmdb.do_action( 'wpmdb_tables_to_migrate_changed' ); + } ); + + $( 'body' ).on( 'change', '#select-tables', function() { + maybe_show_mixed_cased_table_name_warning(); + $.wpmdb.do_action( 'wpmdb_tables_to_migrate_changed' ); + } ); + + $.wpmdb.add_filter( 'wpmdb_get_table_prefix', get_table_prefix ); + $.wpmdb.add_filter( 'wpmdb_get_tables_to_migrate', get_tables_to_migrate ); + + $.wpmdb.add_filter( 'wpmdb_before_migration_complete_hooks', function( hooks ) { + pause_before_finalize = $( 'input[name=pause_before_finalize]:checked' ).length ? true : false; + if ( true === pause_before_finalize && 'savefile' !== migration_intent ) { + set_pause_resume_button( null ); // don't just set migration_paused to true, since `set_pause_resume_button` will get double bound to clicking resume + is_auto_pause_before_finalize = true; + } + return hooks; + } ); + } ); + +})( jQuery, wpmdb ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.min.js b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.min.js new file mode 100644 index 00000000..5f8dc048 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/asset/js/script.min.js @@ -0,0 +1,2 @@ +!function(a,b){function c(a,b,c){return c=c||"0",a+="",a.length>=b?a:new Array(b-a.length+1).join(c)+a}function d(){X=0,$=a(".timer"),_=wpmdb_strings.time_elapsed+" ",A=setInterval(f,1e3)}function e(){var a=Math.floor(X/3600)%24,b=Math.floor(X/60)%60,d=X%60,e=_+c(a,2,0)+":"+c(b,2,0)+":"+c(d,2,0);$.html(e)}function f(){X+=1,e()}function g(a,b){var c,d,e=[],f={},g=b.length;for(c=0;g>c;c++)f[b[c]]=!0;for(g=a.length,c=0;g>c;c++)d=a[c],d in f&&e.push(d);return e}function h(a){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var b=new RegExp("[\\?&]"+a+"=([^&#]*)"),c=b.exec(location.search);return null===c?"":decodeURIComponent(c[1].replace(/\+/g," "))}function i(b,c,d){var e=b.substr(0,b.indexOf(":"));return d!==e&&-1!==b.indexOf("https")?(a(".ssl-notice").show(),M=!0,b=b.replace("https","http"),void a(".pull-push-connection-info").val(b+"\n"+c)):void(M=!1)}function j(b){b!==wpmdb_data.this_prefix&&(a(".remote-prefix").html(b),L=!0,"pull"===wpmdb_migration_type()?a(".prefix-notice.pull").show():a(".prefix-notice.push").show())}function k(){if("undefined"!=typeof b.common.connection_data&&!1!==b.common.connection_data){var c=wpmdb_migration_type(),d=t(null,null);a(".mixed-case-table-name-notice").hide(),null!==d&&(d=d.join(""),d!==d.toLowerCase()&&("1"===b.common.connection_data.lower_case_table_names||"push"!==c&&"savefile"!==c)&&("1"===wpmdb_data.lower_case_table_names||"pull"!==c)&&("push"===c||"savefile"===c?a(".mixed-case-table-name-notice.push").show():a(".mixed-case-table-name-notice.pull").show()))}}function l(a){var b=a,c=b.replace(/\/\/(.*)@/,"//").replace("http://","").replace("https://","").replace("www.","");return c}function m(a,b,c){var d,e,f=l(a);return"pull"===b?(d=wpmdb_strings.pull_migration_label_migrating,e=wpmdb_strings.pull_migration_label_completed):(d=wpmdb_strings.push_migration_label_migrating,e=wpmdb_strings.push_migration_label_completed),d=d.replace("%s",f),e=e.replace("%s",f),"migrating"===c?d:e}function n(a){return a.replace(/^https?:/i,"")}function o(){a(".option-group").each(function(b){a("input",this).attr("disabled","disabled"),a("label",this).css("cursor","default")})}function p(){a(".option-group").each(function(b){a("input",this).removeAttr("disabled"),a("label",this).css("cursor","pointer")})}function q(b,c,d){a(".slider",b).slider("value",c),a(".amount",b).html(wpmdb_add_commas(c)+" "+d)}function r(c){!0===T?(T=!1,E=!0,a(".progress-title").html(U),a(".progress-text",".progress-wrapper-primary").html(V),a(".progress-text",".progress-wrapper-secondary").html(W),a(".migration-progress-ajax-spinner").show(),a(".pause-resume").html(wpmdb_strings.pause),A=setInterval(f,1e3),b.functions.execute_next_step()):(T=!0,E=!1,U=a(".progress-title").html(),V=a(".progress-text",".progress-wrapper-primary").html(),W=a(".progress-text",".progress-wrapper-secondary ").html(),a(".progress-title").html(wpmdb_strings.migration_paused),a(".progress-text").html(wpmdb_strings.completing_current_request),a("body").off("click",".pause-resume"),a("body").off("click",".cancel"))}function s(b,c,d){var e=document.createElement("select");return a(e).attr({multiple:"multiple",name:"select_tables[]",id:"select-tables","class":"multiselect"}),0'+f+" ("+c[f]+")")}}),e}function t(c,d){var e="",f=wpmdb_migration_type(),g=a("input[name=table_migrate_option]:checked").val();return e="migrate_select"===g?a("#select-tables").val():"push"===f||"savefile"===f?wpmdb_data.this_prefixed_tables:b.common.connection_data.prefixed_tables}function u(b,c){return a(".table-select-wrap .table-prefix").text()}var v,w,x,y,z,A,B,C=!1,D="",E=!1,F=!1,G=!1,H=!1,I=!1,J=!1,K=!1,L=!1,M=!1,N=!1,O=!1,P=!1,Q="",R="",S="",T=!1,U="",V="",W="",X=0,Y=0,Z=!1,$=!1,_="",aa=!1,ba=0,ca=400,da=!1,ea=!1,fa=ajaxurl.replace("/admin-ajax.php",""),ga=fa+"/images/spinner";2';window.onbeforeunload=function(a){return P?(a=a||window.event,a&&(a.returnValue=wpmdb_strings.sure),wpmdb_strings.sure):void 0},a(document).ready(function(){function c(b){K=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:{action:"wpmdb_check_licence",licence:b,context:"all",nonce:wpmdb_data.nonces.check_licence},error:function(a,b,c){alert(wpmdb_strings.license_check_problem)},success:function(b){var c,d,e,f=a(".support-content"),g=a(".addons-content"),h=a(".licence-status:not(.notification-message)");if("undefined"!=typeof b.dbrains_api_down)d=b.dbrains_api_down+b.message,e=b.dbrains_api_down;else if("undefined"!=typeof b.errors){if("undefined"!=typeof b.errors.subscription_expired)c=b.errors.subscription_expired.licence,d=b.errors.subscription_expired.support,e=b.errors.subscription_expired.addons;else{var i="";for(var j in b.errors)i+=b.errors[j];d=i,e=i}"undefined"!=typeof b.addon_content&&(e+="\n"+b.addon_content)}else d=b.message,e=b.addon_content;h.stop().fadeOut(ca,function(){a(this).empty().html(c).stop().fadeIn(ca)}),f.stop().fadeOut(ca,function(){a(this).empty().html(d).stop().fadeIn(ca)}),g.stop().fadeOut(ca,function(){a(this).empty().html(e).stop().fadeIn(ca)})}})}function e(){void 0!==wpmdb_data&&void 0!==wpmdb_data.this_tables&&void 0!==wpmdb_data.this_table_sizes_hr&&(xa=s(wpmdb_data.this_tables,wpmdb_data.this_table_sizes_hr,a(xa).val())),void 0!==b.common.connection_data&&void 0!==b.common.connection_data.tables&&void 0!==b.common.connection_data.table_sizes_hr&&(ya=s(b.common.connection_data.tables,b.common.connection_data.table_sizes_hr,a(ya).val()))}function f(){a("#select-tables").remove(),a(".select-tables-wrap").prepend(xa)}function U(){a("#select-tables").remove(),a(".select-tables-wrap").prepend(ya)}function V(){a("#migrate-selected").parents(".option-section").children(".header-expand-collapse").children(".expand-collapse-arrow").removeClass("collapsed"),a(".table-select-wrap").show(),a("#migrate-only-with-prefix").prop("checked",!1),a("#migrate-selected").prop("checked",!0),a(".table-migrate-options").hide(),a(".select-tables-wrap").show()}function W(){a(".table-migrate-options").show()}function X(){a("#select-tables").children("option").prop("selected",!0)}function $(a,b){return n(wpmdb_data.this_url)}function _(){var c=wpmdb_migration_type(),d=a.trim(a(".pull-push-connection-info").val()).split("\n");if("undefined"!=typeof wpmdb_default_profile&&!0!==wpmdb_default_profile&&"savefile"!==c&&!E&&wpmdb_data.is_pro){E=!0,o(),a(".connection-status").html(wpmdb_strings.establishing_remote_connection),a(".connection-status").removeClass("notification-message error-notice migration-error"),a(".connection-status").append(ha);var e=wpmdb_migration_type();a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:{action:"wpmdb_verify_connection_to_remote_site",url:d[0],key:d[1],intent:e,nonce:wpmdb_data.nonces.verify_connection_to_remote_site,convert_post_type_selection:wpmdb_convert_post_type_selection,profile:wpmdb_data.profile},error:function(b,c,d){a(".connection-status").html(na(b.responseText,"(#102)",b)),a(".connection-status").addClass("notification-message error-notice migration-error"),a(".ajax-spinner").remove(),E=!1,p()},success:function(c){if(a(".ajax-spinner").remove(),E=!1,p(),"undefined"!=typeof c.wpmdb_error&&1===c.wpmdb_error)return a(".connection-status").html(c.body),a(".connection-status").addClass("notification-message error-notice migration-error"),void(c.body.indexOf("401 Unauthorized")>-1&&a(".basic-access-auth-wrapper").show());i(d[0],d[1],c.scheme),j(c.prefix),a(".pull-push-connection-info").addClass("temp-disabled"),a(".pull-push-connection-info").attr("readonly","readonly"),a(".connect-button").hide(),a(".connection-status").hide(),a(".step-two").show(),C=!0,b.common.connection_data=c,la(),k();var e="";!1===wpmdb_default_profile&&"undefined"!=typeof wpmdb_loaded_tables&&(e=wpmdb_loaded_tables),ya=s(b.common.connection_data.tables,b.common.connection_data.table_sizes_hr,e);var f="";!1===wpmdb_default_profile&&"undefined"!=typeof wpmdb_loaded_post_types&&("undefined"!=typeof c.select_post_types?(a("#exclude-post-types").attr("checked","checked"),a(".post-type-select-wrap").show(),f=c.select_post_types):f=wpmdb_loaded_post_types);var g=document.createElement("select");a(g).attr({multiple:"multiple",name:"select_post_types[]",id:"select-post-types","class":"multiselect"}),a.each(b.common.connection_data.post_types,function(b,c){var d=a.inArray(c,f);d=-1!==d||!0===wpmdb_convert_exclude_revisions&&"revision"!==c?' selected="selected" ':" ",a(g).append("'+c+"")}),Aa=g;var h="";!1===wpmdb_default_profile&&"undefined"!=typeof wpmdb_loaded_tables_backup&&(h=wpmdb_loaded_tables_backup);var l=document.createElement("select");a(l).attr({multiple:"multiple",name:"select_backup[]",id:"select-backup","class":"multiselect"}),a.each(b.common.connection_data.tables,function(c,d){var e=a.inArray(d,h);e=-1!==e?' selected="selected" ':" ",a(l).append("'+d+" ("+b.common.connection_data.table_sizes_hr[d]+")")}),Ba=l,"pull"===wpmdb_migration_type()?(a.wpmdb.do_action("wpmdb_update_pull_table_select"),a("#select-post-types").remove(),a(".select-post-types-wrap").prepend(Aa),a("#select-backup").remove(),a(".backup-tables-wrap").prepend(Ca),a(".table-prefix").html(c.prefix),a(".uploads-dir").html(wpmdb_data.this_uploads_dir)):(a("#select-backup").remove(),a(".backup-tables-wrap").prepend(Ba)),a.wpmdb.do_action("verify_connection_to_remote_site",b.common.connection_data)}})}}function fa(b,d){a(".licence-input, .register-licence").remove(),a(".licence-not-entered").prepend(b.masked_licence),a(".support-content").empty().html("
"+wpmdb_strings.fetching_license+'
'),c(d),a(".migrate-selection label").removeClass("disabled"),a(".migrate-selection input").removeAttr("disabled")}function ia(){a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_get_log",nonce:wpmdb_data.nonces.get_log},error:function(a,b,c){alert(wpmdb_strings.update_log_problem)},success:function(b){a(".debug-log-textarea").val(b)}})}function ja(){var b=a(".progress-content").outerHeight();a(".progress-content").animate({top:"-"+b+"px"},400,"swing",function(){a("#overlay").remove(),a(".progress-content").remove()}),O=!1}function ka(){var b;if(a(".save-settings-button").blur(),!H){if(a("#migrate-selected").is(":checked")&&null===a("#select-tables").val())return void alert(wpmdb_strings.please_select_one_table);if("savefile"!==wpmdb_migration_type()&&a("#backup-manual-select").is(":checked")&&null===a("#select-backup").val())return void alert(wpmdb_strings.please_select_one_table_backup);var c=!1;a("#create_new").is(":checked")&&(c=!0);var d=a(".create-new-profile").val();H=!0,b=a("#migrate-form").serialize(),a(".save-settings-button").attr("disabled","disabled").after(''),E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_save_profile",profile:b,nonce:wpmdb_data.nonces.save_profile},error:function(b,c,d){E=!1,alert(wpmdb_strings.save_profile_problem),a(".save-settings-button").removeAttr("disabled"),a(".save-profile-ajax-spinner").remove(),a(".save-settings-button").after(''+wpmdb_strings.saved+""),a(".ajax-success-msg").fadeOut(2e3,function(){a(this).remove()}),H=!1},success:function(b){var e=parseInt(a("#migrate-form input[name=save_migration_profile_option]:checked").val(),10)+1;if(E=!1,a(".save-settings-button").removeAttr("disabled"),a(".save-profile-ajax-spinner").remove(),a(".save-settings-button").after(''+wpmdb_strings.saved+""),a(".ajax-success-msg").fadeOut(2e3,function(){a(this).remove()}),H=!1,a(".create-new-profile").val(""),c){var f=parseInt(b,10),g=f+1,h=a('
');h.find("label").append(document.createTextNode(" "+d)),e=g,a("#create_new").parents("li").before(h),a("#profile-"+g).attr("checked","checked")}var i=window.location.href.replace("#migrate","").replace(/&wpmdb-profile=-?\d+/,"")+"&wpmdb-profile="+e,j=a("#migrate-form input[name=save_migration_profile_option]:checked").parent().text().trim();if("function"==typeof window.history.pushState){if(a("#migrate-form .crumbs").length)a("#migrate-form .crumbs .crumb:last").text(j);else{var k=a('
').append(' Saved Profiles ').append(''+j+"");a("#migrate-form").prepend(k)}window.history.pushState({updated_profile_id:e},null,i)}}})}}function la(){a(".connection-status").hide(),a(".prefix-notice").hide(),a(".ssl-notice").hide(),a(".different-plugin-version-notice").hide(),a(".step-two").show(),a(".backup-options").show(),a(".keep-active-plugins").show(),a(".directory-permission-notice").hide(),a("#create-backup").removeAttr("disabled"),a("#create-backup-label").removeClass("disabled"),a(".backup-option-disabled").hide(),a(".compatibility-older-mysql").hide(),a(".pause-before-finalize").show();var c;a.trim(a(".pull-push-connection-info").val()).split("\n");wpmdb_toggle_migration_action_text(),"pull"===wpmdb_migration_type()?(a(".pull-list li").append(Da),Da.show(function(){var b=a(this).find(".pull-push-connection-info");b.val()||b.focus()}),C?(a(".connection-status").hide(),a(".step-two").show(),a(".table-prefix").html(b.common.connection_data.prefix),a(".uploads-dir").html(wpmdb_data.this_uploads_dir),!1===J&&(c=l(b.common.connection_data.url),a(".create-new-profile").val(c)),!0===L&&a(".prefix-notice.pull").show(),!0===M&&a(".ssl-notice").show(),!0===N&&(a(".different-plugin-version-notice").show(),a(".step-two").hide()),wpmdb_toggle_migration_action_text(),!1===wpmdb_data.write_permission&&(a("#create-backup").prop("checked",!1),a("#create-backup").attr("disabled","disabled"),a("#create-backup-label").addClass("disabled"),a(".backup-option-disabled").show(),a(".upload-directory-location").html(wpmdb_data.this_upload_dir_long))):(a(".connection-status").show(),a(".step-two").hide())):"push"===wpmdb_migration_type()?(a(".push-list li").append(Da),Da.show(function(){var b=a(this).find(".pull-push-connection-info");b.val()||b.focus()}),C?(a(".connection-status").hide(),a(".step-two").show(),a(".table-prefix").html(wpmdb_data.this_prefix),a(".uploads-dir").html(b.common.connection_data.uploads_dir),!1===J&&(c=l(b.common.connection_data.url),a(".create-new-profile").val(c)),!0===L&&a(".prefix-notice.push").show(),!0===M&&a(".ssl-notice").show(),!0===N&&(a(".different-plugin-version-notice").show(),a(".step-two").hide()),wpmdb_toggle_migration_action_text(),"0"===b.common.connection_data.write_permissions&&(a("#create-backup").prop("checked",!1),a("#create-backup").attr("disabled","disabled"),a("#create-backup-label").addClass("disabled"),a(".backup-option-disabled").show(),a(".upload-directory-location").html(b.common.connection_data.upload_dir_long))):(a(".connection-status").show(),a(".step-two").hide())):"savefile"===wpmdb_migration_type()&&(a(".connection-status").hide(),a(".step-two").show(),a(".table-prefix").html(wpmdb_data.this_prefix),a(".compatibility-older-mysql").show(),!1===J&&a(".create-new-profile").val(""),a(".backup-options").hide(),a(".keep-active-plugins").hide(),a(".pause-before-finalize").hide(),!1===wpmdb_data.write_permission&&(a(".directory-permission-notice").show(),a(".step-two").hide())),k(),a.wpmdb.do_action("move_connection_info_box",{migration_type:wpmdb_migration_type(),last_migration_type:D})}function ma(){var c=null,d=null;null!==b.common.previous_connection_data&&"object"==typeof b.common.previous_connection_data&&b.common.previous_connection_data.url!==b.common.connection_data.url&&(c=n(b.common.previous_connection_data.url),d=b.common.previous_connection_data.path),"push"===wpmdb_migration_type()||"savefile"===wpmdb_migration_type()?("pull"===D?a(".replace-row").each(function(){var b=a(".old-replace-col input",this).val();a(".old-replace-col input",this).val(a(".replace-right-col input",this).val()),a(".replace-right-col input",this).val(b)}):"push"===D&&"push"===wpmdb_migration_type()&&null!==c&&null!==d&&a(".replace-row").each(function(){var e=a(".replace-right-col input",this).val();e===d&&a(".replace-right-col input",this).val(b.common.connection_data.path),e===c&&a(".replace-right-col input",this).val(n(b.common.connection_data.url))}),a.wpmdb.do_action("wpmdb_update_push_table_select"),a("#select-post-types").remove(),a(".select-post-types-wrap").prepend(za),a("#select-backup").remove(),a(".backup-tables-wrap").prepend(Ba)):"pull"===wpmdb_migration_type()&&(""===D||"push"===D||"savefile"===D?a(".replace-row").each(function(){var b=a(".old-replace-col input",this).val();a(".old-replace-col input",this).val(a(".replace-right-col input",this).val()),a(".replace-right-col input",this).val(b)}):"pull"===D&&"pull"===wpmdb_migration_type()&&null!==c&&null!==d&&a(".replace-row").each(function(){var e=a(".old-replace-col input",this).val();e===d&&a(".old-replace-col input",this).val(b.common.connection_data.path),e===c&&a(".old-replace-col input",this).val(n(b.common.connection_data.url))}),a.wpmdb.do_action("wpmdb_update_pull_table_select"),a("#select-post-types").remove(),a(".select-post-types-wrap").prepend(Aa),a("#select-backup").remove(),a(".backup-tables-wrap").prepend(Ca)),D=wpmdb_migration_type()}function na(a,b,c){return wpmdbGetAjaxErrors(wpmdb_strings.connection_local_server_problem,b,a,c)}function oa(a){return/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)}function pa(b,d){a(".nav-tab").removeClass("nav-tab-active"),a(".nav-tab."+b).addClass("nav-tab-active"),a(".content-tab").hide(),a("."+b+"-tab").show(),"settings"===b&&!1===K&&"1"===wpmdb_data.has_licence&&(a("p.licence-status").append("Checking License... ").append(ha),c()),"help"===b&&(ia(),!1===K&&"1"===wpmdb_data.has_licence&&(a(".support-content p").append(ha),c())),"addons"===b&&!0!==d&&!1===K&&"1"===wpmdb_data.has_licence&&(a(".addons-content p").append(ha),c())}function qa(c){var d=a(".pull-push-connection-info");if(!E&&!a(d).hasClass("temp-disabled")){c=a(".pull-push-connection-info").val();var f=a.trim(c).split("\n"),g=!1,h="";if(""===f&&(g=!0,h=wpmdb_strings.connection_info_missing),2===f.length||g||(g=!0,h=wpmdb_strings.connection_info_incorrect),g||oa(f[0])||(g=!0,h=wpmdb_strings.connection_info_url_invalid),!g&&32>=f[1].length&&(g=!0,h=wpmdb_strings.connection_info_key_invalid),g||f[0]!==wpmdb_data.connection_info[0]||(g=!0,h=wpmdb_strings.connection_info_local_url),g||f[1]!==wpmdb_data.connection_info[1]||(g=!0,h=wpmdb_strings.connection_info_local_key),g)return a(".connection-status").html(h),void a(".connection-status").addClass("notification-message error-notice migration-error");var m=f[0]+"\n"+f[1];!1===wpmdb_data.openssl_available&&(f[0]=f[0].replace("https://","http://"),m=f[0]+"\n"+f[1],a(".pull-push-connection-info").val(m)),L=!1,E=!0,o(),a(".basic-access-auth-wrapper").is(":visible")&&(f[0]=f[0].replace(/\/\/(.*)@/,"//"),f[0]=f[0].replace("//","//"+encodeURIComponent(a.trim(a(".auth-username").val()))+":"+encodeURIComponent(a.trim(a(".auth-password").val()))+"@"),m=f[0]+"\n"+f[1],a(".pull-push-connection-info").val(m),a(".basic-access-auth-wrapper").hide()),a(".step-two").hide(),a(".ssl-notice").hide(),a(".prefix-notice").hide(),a(".connection-status").show(),a(".connection-status").html(wpmdb_strings.establishing_remote_connection),a(".connection-status").removeClass("notification-message error-notice migration-error"),a(".connection-status").append(ha);var q=wpmdb_migration_type();J=!1,a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:{action:"wpmdb_verify_connection_to_remote_site",url:f[0],key:f[1],intent:q,nonce:wpmdb_data.nonces.verify_connection_to_remote_site},error:function(b,c,d){a(".connection-status").html(na(b.responseText,"(#100)",b)),a(".connection-status").addClass("notification-message error-notice migration-error"),a(".ajax-spinner").remove(),E=!1,p()},success:function(c){if(a(".ajax-spinner").remove(),E=!1,p(),i(f[0],f[1],c.scheme),"undefined"!=typeof c.wpmdb_error&&1===c.wpmdb_error)return a(".connection-status").html(c.body),a(".connection-status").addClass("notification-message error-notice migration-error"),void(c.body.indexOf("401 Unauthorized")>-1&&a(".basic-access-auth-wrapper").show());var d=l(c.url);a(".create-new-profile").val(d),a(".pull-push-connection-info").addClass("temp-disabled"),a(".pull-push-connection-info").attr("readonly","readonly"),a(".connect-button").hide(),a(".connection-status").hide(),a(".step-two").show(),j(c.prefix),C=!0,b.common.previous_connection_data=b.common.connection_data,b.common.connection_data=c,la(),ma(),k(),e(),Ba=a(ya).clone(),a(Ba).attr({name:"select_backup[]",id:"select-backup"});var g=document.createElement("select");a(g).attr({multiple:"multiple",name:"select_post_types[]",id:"select-post-types","class":"multiselect"}),a.each(b.common.connection_data.post_types,function(b,c){a(g).append('")}),Aa=g,a("#new-path-missing-warning, #new-url-missing-warning").hide(),"pull"===wpmdb_migration_type()?(a("#new-url").val(n(wpmdb_data.this_url)),a("#new-path").val(wpmdb_data.this_path),"true"===wpmdb_data.is_multisite&&(a("#new-domain").val(wpmdb_data.this_domain),a('.replace-row.pin .old-replace-col input[type="text"]').val(n(c.url))),a("#old-url").val(n(c.url)),a("#old-path").val(c.path),a.wpmdb.do_action("wpmdb_update_pull_table_select"),a("#select-post-types").remove(),a(".select-post-types-wrap").prepend(Aa),a(".table-prefix").html(c.prefix),a(".uploads-dir").html(wpmdb_data.this_uploads_dir)):(a("#new-url").val(n(c.url)),a("#new-path").val(c.path),"true"===wpmdb_data.is_multisite&&a('.replace-row.pin .old-replace-col input[type="text"]').val(n(wpmdb_data.this_url)),a.wpmdb.do_action("wpmdb_update_push_table_select"),a("#select-backup").remove(),a(".backup-tables-wrap").prepend(Ba)),b.common.next_step_in_migration={fn:a.wpmdb.do_action,args:["verify_connection_to_remote_site",b.common.connection_data]},b.functions.execute_next_step()}})}}function ra(c){Z=!0,a(".progress-text").html(wpmdb_strings.completing_current_request),a(".progress-title").html(wpmdb_strings.cancelling_migration),a(".migration-controls").fadeOut(),a(".migration-progress-ajax-spinner").show(),!0===T&&(T=!1,b.functions.execute_next_step())}b.migration_state_id="",a("#plugin-compatibility").change(function(b){var c="1";if(a(this).is(":checked")){var d=confirm(wpmdb_strings.mu_plugin_confirmation);if(!d)return void a(this).prop("checked",!1)}else c="0";a(".plugin-compatibility-wrap").toggle(),a(this).parent().append(ha),a("#plugin-compatibility").attr("disabled","disabled"),a(".plugin-compatibility").addClass("disabled"),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_plugin_compatibility",install:c},error:function(b,c,d){alert(wpmdb_strings.plugin_compatibility_settings_problem+"\r\n\r\n"+wpmdb_strings.status+" "+b.status+" "+b.statusText+"\r\n\r\n"+wpmdb_strings.response+"\r\n"+b.responseText),a(".ajax-spinner").remove(),a("#plugin-compatibility").removeAttr("disabled"),a(".plugin-compatibility").removeClass("disabled")},success:function(b){""!==a.trim(b)?alert(b):(a(".plugin-compatibility").append(''+wpmdb_strings.saved+""),a(".ajax-success-msg").fadeOut(2e3,function(){a(this).remove()})),a(".ajax-spinner").remove(),a("#plugin-compatibility").removeAttr("disabled"),a(".plugin-compatibility").removeClass("disabled")}})}),a("#plugin-compatibility").is(":checked")&&a(".plugin-compatibility-wrap").show(),(0<=navigator.userAgent.indexOf("MSIE")||0<=navigator.userAgent.indexOf("Trident"))&&a(".ie-warning").show(),0===wpmdb_data.valid_licence&&a("#savefile").prop("checked",!0);var sa=a(".max-request-size"),ta=a(".slider",sa);ta.slider({range:"min",value:parseInt(wpmdb_data.max_request/1024),min:512,max:parseInt(wpmdb_data.bottleneck/1024),step:1,create:function(a,b){q(sa,wpmdb_data.max_request/1024,"kB")},slide:function(a,b){q(sa,b.value,"kB")},stop:function(b,c){a(".amount",sa).after(''),ta.slider("disable"),a.ajax({url:ajaxurl,type:"POST",cache:!1,data:{action:"wpmdb_update_max_request_size",max_request_size:parseInt(c.value),nonce:wpmdb_data.nonces.update_max_request_size},error:function(b,c,d){ta.slider("enable"),a(".slider-spinner",sa).remove(),alert(wpmdb_strings.max_request_size_problem),q(sa,wpmdb_data.max_request/1024,"kB"),ta.slider("enable")},success:function(){ta.slider("enable"),a(".slider-success-msg",sa).show(),a(".slider-success-msg",sa).fadeOut(2e3,function(){a(this).hide()}),a(".slider-spinner",sa).remove()}})}});var ua=a(".delay-between-requests"),va=a(".slider",ua);va.slider({range:"min",value:parseInt(wpmdb_data.delay_between_requests/1e3),min:0,max:10,step:1,create:function(a,b){q(ua,wpmdb_data.delay_between_requests/1e3,"s")},slide:function(a,b){q(ua,b.value,"s")},stop:function(b,c){a(".amount",ua).after(''),va.slider("disable"),a.ajax({url:ajaxurl,type:"POST",cache:!1,data:{action:"wpmdb_update_delay_between_requests",delay_between_requests:parseInt(1e3*c.value),nonce:wpmdb_data.nonces.update_delay_between_requests},error:function(b,c,d){va.slider("enable"),a(".slider-spinner",ua).remove(),alert(wpmdb_strings.delay_between_requests_problem),q(ua,wpmdb_data.delay_between_requests/1e3,"s"),va.slider("enable")},success:function(){wpmdb_data.delay_between_requests=parseInt(1e3*c.value),va.slider("enable"),a(".slider-success-msg",ua).show(),a(".slider-success-msg",ua).fadeOut(2e3,function(){a(this).hide()}),a(".slider-spinner",ua).remove()}})}});var wa=a(".progress-content").clone();a(".progress-content").remove();var xa=a("#select-tables").clone(),ya=a("#select-tables").clone(),za=a("#select-post-types").clone(),Aa=a("#select-post-types").clone(),Ba=a("#select-backup").clone(),Ca=a("#select-backup").clone();a(".help-tab .video").each(function(){var b=a(this),c=a(".video-viewer");a("a",this).click(function(d){d.preventDefault(),c.attr("src","//www.youtube.com/embed/"+b.data("video-id")+"?autoplay=1"),c.show();var e=c.offset();a(window).scrollTop(e.top-50)})}),a(".backup-options").show(),a(".keep-active-plugins").show(),"savefile"===wpmdb_migration_type()&&(a(".backup-options").hide(),a(".keep-active-plugins").hide()),D=wpmdb_migration_type(),a(".content-tab").on("click",".check-my-licence-again",function(b){b.preventDefault(),K=!1,a(b.target).replaceWith("Checking... "+ha),c(null,"all")}),a.wpmdb.add_action("wpmdb_refresh_table_selects",e),a.wpmdb.add_action("wpmdb_update_push_table_select",f),a.wpmdb.add_action("wpmdb_update_pull_table_select",U),a.wpmdb.add_action("wpmdb_disable_table_migration_options",V),a.wpmdb.add_action("wpmdb_enable_table_migration_options",W),a.wpmdb.add_action("wpmdb_select_all_tables",X),a.wpmdb.add_filter("wpmdb_base_old_url",$),_(),a("body").on("click",".js-action-link",function(b){b.preventDefault(),a(this).blur()}),a(".licence-form").submit(function(b){if(b.preventDefault(),!F){a(".licence-status").removeClass("notification-message error-notice success-notice");var c=a.trim(a(".licence-input").val());if(""===c)return a(".licence-status").addClass("notification-message error-notice"),void a(".licence-status").html(wpmdb_strings.enter_license_key);a(".licence-status").empty().removeClass("success"),F=!0,a(".button.register-licence").after(''),a.ajax({url:ajaxurl,type:"POST",dataType:"JSON",cache:!1,data:{action:"wpmdb_activate_licence",licence_key:c,nonce:wpmdb_data.nonces.activate_licence,context:"licence"},error:function(b,c,d){F=!1,a(".register-licence-ajax-spinner").remove(),a(".licence-status").html(wpmdb_strings.register_license_problem)},success:function(b){if(F=!1,a(".register-licence-ajax-spinner").remove(),"undefined"!=typeof b.errors){var d="";for(var e in b.errors)d+=b.errors[e];a(".licence-status").html(d),"undefined"!=typeof b.masked_licence&&(fa(b,c),a(".migrate-tab .invalid-licence").hide())}else"undefined"!=typeof b.wpmdb_error&&"undefined"!=typeof b.body?a(".licence-status").html(b.body):(a(".licence-status").html(wpmdb_strings.license_registered).delay(5e3).fadeOut(1e3),a(".licence-status").addClass("success notification-message success-notice"),fa(b,c),a(".invalid-licence").hide())}})}}),a(".clear-log").click(function(){a(".debug-log-textarea").val(""),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_clear_log",nonce:wpmdb_data.nonces.clear_log},error:function(a,b,c){alert(wpmdb_strings.clear_log_problem)},success:function(a){}})}),a(".multiselect-select-all").click(function(){var b=a(this).parents(".select-wrap").children(".multiselect");a("option",b).prop("selected",1),a(b).focus().trigger("change")}),a(".multiselect-deselect-all").click(function(){var b=a(this).parents(".select-wrap").children(".multiselect");a("option",b).removeAttr("selected"),a(b).focus().trigger("change")}),a(".multiselect-invert-selection").click(function(){var b=a(this).parents(".select-wrap").children(".multiselect");a("option",b).each(function(){a(this).attr("selected",!a(this).attr("selected"))}),a(b).focus().trigger("change")}),a(".option-group input[type=radio]").change(function(){var b=a(this).closest(".option-group");a("ul",b).hide();var c=a(this).closest("li");a("ul",c).show()}),a(".option-group").each(function(){a(".option-group input[type=radio]").each(function(){if(a(this).is(":checked")){var b=a(this).closest("li");a("ul",b).show()}})}),a(".header-expand-collapse").click(function(){a(".expand-collapse-arrow",this).hasClass("collapsed")?(a(".expand-collapse-arrow",this).removeClass("collapsed"),a(this).next().show()):(a(".expand-collapse-arrow",this).addClass("collapsed"),a(this).next().hide())}),a(".checkbox-label input[type=checkbox]").change(function(){a(this).is(":checked")?a(this).parent().next().show():a(this).parent().next().hide()}),a("#save-migration-profile").change(function(){b.functions.update_migrate_button_text(),a(this).is(":checked")?a(".save-settings-button").show():a(".save-settings-button").hide(); +}),a("#save-migration-profile").is(":checked")&&a(".save-settings-button").show(),a(".create-new-profile").focus(function(){a("#create_new").prop("checked",!0)}),a(".checkbox-label input[type=checkbox]").each(function(){a(this).is(":checked")&&a(this).parent().next().show()}),a(".migrate-db-button").click(function(c){function e(b,c){var d=0,e=JSON.parse(JSON.stringify(c));a.each(b,function(a,b){d+=parseInt(e[b])});var f=0,g=0,h=[];a.each(b,function(a,b){var c=Math.round(e[b]/d*100);h[b]=c,c>f&&(f=c),g+=c});var i="",j=100-g;a.each(b,function(b,c){var d=h[c];0!==j&&d===f&&(d+=j,j=0),a(".progress-tables").append('
'+c+"
"),a(".progress-tables-hover-boxes").append('
'),i=c}),a(".progress-tables",".progress-wrapper-primary").find(".progress-chunk").each(function(c){function d(b){a("span",b).innerWidth()>a(b).width()&&a("span",b).hide()}1>a(this).width()&&(a(this).hide(),a(".progress-chunk-hover[data-table="+b[c]+"]").hide(),e[i]=Number(e[i]),e[i]+=Number(e[b[c]]),e[b[c]]=0);var f=this;setTimeout(function(){d(f)},0)});var k=[e,d];return k}if(a(this).blur(),c.preventDefault(),b.migration_state_id="",!1!==a.wpmdb.apply_filters("wpmdb_migration_profile_ready",!0)){if(a("#migrate-selected").is(":checked")&&null===a("#select-tables").val())return void alert(wpmdb_strings.please_select_one_table);if("savefile"!==wpmdb_migration_type()&&a("#backup-manual-select").is(":checked")&&null===a("#select-backup").val())return void alert(wpmdb_strings.please_select_one_table_backup);var f=!1,h=!1;if(a("#new-url").length&&!a("#new-url").val()&&(a("#new-url-missing-warning").show(),a("#new-url").focus(),a("html,body").scrollTop(0),f=!0),a("#new-path").length&&!a("#new-path").val()&&(a("#new-path-missing-warning").show(),!1===f&&(a("#new-path").focus(),a("html,body").scrollTop(0)),h=!0),!0!==f&&!0!==h){a("#save-migration-profile").is(":checked")&&ka(),y=a("#migrate-form").serialize();var i=a(document).height();a("body").append('
'),a("#overlay").height(i).css({position:"fixed",top:0,left:0,width:"100%","z-index":99999,display:"none"});var j=wa.clone();v=wpmdb_migration_type(),z="backup","savefile"===v&&(z="migrate"),!1===a("#create-backup").is(":checked")&&(z="migrate");var k=(a("input[name=table_migrate_option]:checked").val(),a.trim(a(".pull-push-connection-info").val()).split("\n")),l="";w=k[0],x=k[1];var n="";a("#overlay").after(j),B=wpmdb_strings.exporting_complete,"savefile"===v?n=wpmdb_strings.exporting_please_wait:(n=m(w,v,"migrating"),B=m(w,v,"completed")),a(".progress-title").html(n),a("#overlay").show();var o=a("input[name=backup_option]:checked").val(),p=a("input[name=table_migrate_option]:checked").val(),q="";"backup"===z?("migrate_only_with_prefix"===p&&"backup_selected"===o&&(o="backup_only_with_prefix"),"push"===v?(l=b.common.connection_data.table_rows,"backup_only_with_prefix"===o?S=b.common.connection_data.prefixed_tables:"backup_selected"===o?(q=a("#select-tables").val(),S=g(q,b.common.connection_data.tables)):"backup_manual_select"===o&&(S=a("#select-backup").val())):(l=wpmdb_data.this_table_rows,"backup_only_with_prefix"===o?S=wpmdb_data.this_prefixed_tables:"backup_selected"===o?(q=a("#select-tables").val(),S=g(q,wpmdb_data.this_tables)):"backup_manual_select"===o&&(S=a("#select-backup").val()))):(S=t(null,null),l="push"===v||"savefile"===v?wpmdb_data.this_table_rows:b.common.connection_data.table_rows);var r=e(S,l);l=r[0];var s=r[1];a(".progress-title").after('');var u=a(".progress-content").outerHeight();a(".progress-content").css("top","-"+u+"px").show().animate({top:"0px"}),d(),P=!0;var A={action:"wpmdb_initiate_migration",intent:v,url:w,key:x,form_data:y,stage:z,nonce:wpmdb_data.nonces.initiate_migration};"savefile"!==v&&(A.temp_prefix=b.common.connection_data.temp_prefix),E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:A,error:function(c,d,e){a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(na(c.responseText,"(#112)",c)),a(".progress-text").addClass("migration-error"),console.log(c),console.log(d),console.log(e),E=!1,b.common.migration_error=!0,b.functions.migration_complete_events()},success:function(c){if(E=!1,"undefined"!=typeof c&&"undefined"!=typeof c.wpmdb_error&&1===c.wpmdb_error)return b.common.migration_error=!0,b.functions.migration_complete_events(),a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").addClass("migration-error"),void a(".progress-text").html(c.body);b.migration_state_id=c.migration_state_id;var d=0,f=0;Y=0;var g=0,h=0,i=0,j=0;ba=0,"savefile"!==v&&"undefined"!=typeof b.common.connection_data&&"undefined"!=typeof b.common.connection_data.delay_between_requests&&(ba=Math.max(parseInt(wpmdb_data.delay_between_requests),parseInt(b.common.connection_data.delay_between_requests))),b.functions.migrate_table_recursive=function(c,k){if(d>=S.length){if("backup"!==z)return a(".progress-label").removeClass("label-visible"),b.common.hooks=a.wpmdb.apply_filters("wpmdb_before_migration_complete_hooks",b.common.hooks),b.common.hooks.push(b.functions.migration_complete),b.common.hooks.push(b.functions.wpmdb_flush),b.common.hooks=a.wpmdb.apply_filters("wpmdb_after_migration_complete_hooks",b.common.hooks),b.common.hooks.push(b.functions.migration_complete_events),b.common.next_step_in_migration={fn:wpmdb_call_next_hook},void b.functions.execute_next_step();z="migrate",d=0,f=0,Y=0,a(".progress-bar").width("0px"),S=t(null,null),l="push"===v||"savefile"===v?wpmdb_data.this_table_rows:b.common.connection_data.table_rows,a(".progress-tables").empty(),a(".progress-tables-hover-boxes").empty(),r=e(S,l),l=r[0],s=r[1]}"backup"===z?a(".progress-text").html(Y+"% - "+wpmdb_strings.backing_up+' "'+S[d]+'"'):a(".progress-text").html(Y+"% - "+wpmdb_strings.migrating+' "'+S[d]+'"');var m=0;d===S.length-1&&(m=1);var n=0;"savefile"!==v&&1===parseInt(b.common.connection_data.gzip)&&(n=1);var o={action:"wpmdb_migrate_table",migration_state_id:b.migration_state_id,table:S[d],stage:z,current_row:c,last_table:m,primary_keys:k,gzip:n,nonce:wpmdb_data.nonces.migrate_table};"savefile"!==v&&(o.bottleneck=b.common.connection_data.bottleneck,o.prefix=b.common.connection_data.prefix),b.common.connection_data&&b.common.connection_data.path_current_site&&b.common.connection_data.domain&&(o.path_current_site=b.common.connection_data.path_current_site,o.domain_current_site=b.common.connection_data.domain),E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,timeout:0,data:o,error:function(c,e,f){a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(wpmdb_strings.table_process_problem+" "+S[d]),a(".progress-text").append("

"+wpmdb_strings.status+": "+c.status+" "+c.statusText+"

"+wpmdb_strings.response+":
"+c.responseText),a(".progress-text").addClass("migration-error"),E=!1,console.log(c),console.log(e),console.log(f),b.common.migration_error=!0,b.functions.migration_complete_events()},success:function(c){E=!1,c=a.trim(c);var e=wpmdb_parse_json(c);return!1===e||null===e?(a(".progress-title").html(wpmdb_strings.migration_failed),""===c||null===c?a(".progress-text").html(wpmdb_strings.table_process_problem_empty_response+" "+S[d]):a(".progress-text").html(na(c,null,null)),a(".progress-text").addClass("migration-error"),b.common.migration_error=!0,void b.functions.migration_complete_events()):"undefined"!=typeof e.wpmdb_error&&1===e.wpmdb_error?(a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").addClass("migration-error"),a(".progress-text").html(e.body),b.common.migration_error=!0,void b.functions.migration_complete_events()):(1===m&&"savefile"===v&&("undefined"!=typeof e.dump_filename&&(Q=e.dump_filename),"undefined"!=typeof e.dump_path&&(R=e.dump_path)),-1===e.current_row||"-1"===e.current_row?(f-=j,j=0,i=0,f+=parseInt(l[S[d]]),d++,e.current_row="",e.primary_keys=""):(h=parseInt(e.current_row),g=h-i,i=h,f+=g,j+=g),Y=Math.floor(f/s*100),a(".progress-bar").width(Y+"%"),b.common.next_step_in_migration={fn:b.functions.migrate_table_recursive,args:[e.current_row,e.primary_keys]},void b.functions.execute_next_step())}})},b.common.next_step_in_migration={fn:b.functions.migrate_table_recursive,args:["-1",""]},b.functions.execute_next_step()}})}}}),b.functions.migration_complete_events=function(){!1===b.common.migration_error&&(""===b.common.non_fatal_errors?("savefile"!==v&&!0===a("#save_computer").is(":checked")&&a(".progress-text").css("visibility","hidden"),a(".progress-title").html(B).append('
')):(a(".progress-text").html(b.common.non_fatal_errors),a(".progress-text").addClass("migration-error"),a(".progress-title").html(wpmdb_strings.completed_with_some_errors)),a(".progress-bar-wrapper").hide()),a(".migration-controls").hide(),b.common.hooks=[],b.common.call_stack=[],b.common.migration_error=!1,P=!1,O=!0,T=!1,Z=!1,E=!1,b.common.non_fatal_errors="",a(".progress-label").remove(),a(".migration-progress-ajax-spinner").remove(),a(".close-progress-content").show(),a("#overlay").css("cursor","pointer"),clearInterval(A)},b.functions.migration_complete=function(){if(a(".migration-controls").fadeOut(),"savefile"===v){P=!1;var c=wpmdb_strings.migration_complete;if(a("#save_computer").is(":checked")){var d=wpmdb_data.this_download_url+encodeURIComponent(Q);a("#gzip_file").is(":checked")&&(d+="&gzip=1"),window.location=d}else c=wpmdb_strings.completed_dump_located_at+" "+R;!1===b.common.migration_error&&(a(".progress-text").html(c),b.functions.migration_complete_events(),a(".progress-title").html(B))}else a(".progress-text").html(wpmdb_strings.finalizing_migration),E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_finalize_migration",migration_state_id:b.migration_state_id,prefix:b.common.connection_data.prefix,tables:S.join(","),nonce:wpmdb_data.nonces.finalize_migration},error:function(c,d,e){E=!1,a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(wpmdb_strings.finalize_tables_problem),a(".progress-text").addClass("migration-error"),alert(c+" : "+d+" : "+e),b.common.migration_error=!0,b.functions.migration_complete_events()},success:function(c){return E=!1,"1"!==a.trim(c)?(a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(c),a(".progress-text").addClass("migration-error"),b.common.migration_error=!0,void b.functions.migration_complete_events()):(b.common.next_step_in_migration={fn:wpmdb_call_next_hook},void b.functions.execute_next_step())}})},b.functions.wpmdb_flush=function(){"savefile"!==v&&(a(".progress-text").html(wpmdb_strings.flushing),E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_flush",migration_state_id:b.migration_state_id,nonce:wpmdb_data.nonces.flush},error:function(c,d,e){E=!1,a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(wpmdb_strings.flush_problem),a(".progress-text").addClass("migration-error"),alert(c+" : "+d+" : "+e),b.common.migration_error=!0,b.functions.migration_complete_events()},success:function(c){return E=!1,"1"!==a.trim(c)?(a(".progress-title").html(wpmdb_strings.migration_failed),a(".progress-text").html(c),a(".progress-text").addClass("migration-error"),b.common.migration_error=!0,void b.functions.migration_complete_events()):(b.common.next_step_in_migration={fn:wpmdb_call_next_hook},void b.functions.execute_next_step())}}))},b.functions.update_migrate_button_text=function(){var b=wpmdb_migration_type(),c=a("#save-migration-profile").is(":checked")?"_save":"",d="migrate_button_"+("savefile"===b?"export":b)+c;a(".migrate-db .button-primary").val(wpmdb_strings[d])},b.functions.update_migrate_button_text(),a("body").on("click",".close-progress-content-button",function(a){ja()}),a("body").on("click","#overlay",function(){!0===O&&ja()}),a(".save-settings-button").click(function(b){return b.preventDefault(),""===a.trim(a(".create-new-profile").val())&&a("#create_new").is(":checked")?(alert(wpmdb_strings.enter_name_for_profile),void a(".create-new-profile").focus()):void ka()}),a("body").on("mousemove",".progress-chunk-hover",function(b){var c=b.pageX,d=a(".progress-bar-wrapper").offset(),e=a(".progress-label").outerWidth()/2;c=c-d.left-e,a(".progress-label").css("left",c+"px"),a(".progress-label").html(a(this).attr("data-table"))}),a("body").on("mouseenter mouseleave",".progress-chunk-hover",function(b){"mouseenter"===b.type?a(".progress-label").addClass("label-visible"):a(".progress-label").removeClass("label-visible")});var Da=a(".connection-info-wrapper");la(),a(".migrate-selection.option-group input[type=radio]").change(function(){la(),C&&ma(),b.functions.update_migrate_button_text()}),"pull"!==wpmdb_migration_type()&&"push"!==wpmdb_migration_type()||C||(a(".step-two").hide(),a(".connection-status").show()),a(".general-helper").click(function(b){b.preventDefault();var c=a(this),d=a(this).next();a(".helper-message").not(d).hide();var e=c.position();d.hasClass("bottom")?d.css({left:e.left-d.width()/2+"px",top:e.top+c.height()+9+"px"}):d.css({left:e.left+c.width()+9+"px",top:e.top+c.height()/2-18+"px"}),d.toggle(),b.stopPropagation()}),a("body").click(function(){a(".helper-message").hide()}),a(".helper-message").click(function(a){a.stopPropagation()}),a("body").on("click",".show-errors-toggle",function(b){b.preventDefault(),a(this).next(".migration-php-errors").toggle()}),a(".nav-tab").click(function(){var b=a(this).attr("data-div-name");b=b.replace("-tab",""),window.location.hash=b,pa(b,!1)}),a("body").on("click",'a[href^="#"]',function(b){var c=a(b.target).attr("href"),d=c.substr(1);if(d){var e=a("."+d);1===e.length&&(e.trigger("click"),b.preventDefault())}}),a("body").on("click",".add-row",function(){a(this).parents("tr").before(a(".original-repeatable-field").clone().removeClass("original-repeatable-field"))}),a("body").on("click",".replace-remove-row",function(){a(this).parents("tr").remove(),2>=a(".replace-row").length&&a(".no-replaces-message").show();var b=a(this).prev().attr("id");("new-url"===b||"new-path"===b)&&a("#"+b+"-missing-warning").hide()}),a("body").on("change","#new-url",function(){a("#new-url-missing-warning").hide()}).on("change","#new-path",function(){a("#new-path-missing-warning").hide()}),a("body").on("click",".arrow-col",function(){var b=this,c=a(b).prev("td").find("input").val(),d=a(b).next("td").find("input");d.val(c),"new-url"===d.prop("id")?a("#new-url-missing-warning").hide():"new-path"===d.prop("id")&&a("#new-path-missing-warning").hide()}),a(".add-replace").click(function(){a(".replace-fields").prepend(a(".original-repeatable-field").clone().removeClass("original-repeatable-field")),a(".no-replaces-message").hide()}),a("#find-and-replace-sort tbody").sortable({items:"> tr:not(.pin)",handle:"td:first",start:function(){a(".sort-handle").css("cursor","-webkit-grabbing"),a(".sort-handle").css("cursor","-moz-grabbing")},stop:function(){a(".sort-handle").css("cursor","-webkit-grab"),a(".sort-handle").css("cursor","-moz-grab")}});var Ea="";window.location.hash&&(Ea=window.location.hash.substring(1),pa(Ea,!1)),""!==h("install-plugin")&&(Ea="addons",K=!0,pa(Ea,!0)),a(".notice-link").click(function(b){b.preventDefault(),a(this).closest(".inline-message").hide(),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_process_notice_link",nonce:wpmdb_data.nonces.process_notice_link,notice:a(this).data("notice"),type:a(this).data("type"),reminder:a(this).data("reminder")}})}),a(".reset-api-key").click(function(){var b=confirm(wpmdb_strings.reset_api_key);b&&!G&&(G=!0,a(".reset-api-key").after(''),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_reset_api_key",nonce:wpmdb_data.nonces.reset_api_key},error:function(b,c,d){alert(wpmdb_strings.reset_api_key_problem),a(".reset-api-key-ajax-spinner").remove(),G=!1},success:function(b){a(".reset-api-key-ajax-spinner").remove(),G=!1,a(".connection-info").html(b),wpmdb_data.connection_info=a.trim(b).split("\n")}}))}),a("input.multiselect-toggle").change(function(){a(this).parents(".expandable-content").children(".select-wrap").toggle()}),a(".show-multiselect").each(function(){a(this).is(":checked")&&(a(this).parents(".option-section").children(".header-expand-collapse").children(".expand-collapse-arrow").removeClass("collapsed"),a(this).parents(".expandable-content").show(),a(this).parents(".expandable-content").children(".select-wrap").toggle())}),a("input[name=backup_option]").change(function(){a(".backup-tables-wrap").hide(),"backup_manual_select"===a(this).val()&&a(".backup-tables-wrap").show()}),a("#backup-manual-select").is(":checked")&&a(".backup-tables-wrap").show(),a(".plugin-compatibility-save").click(function(){if(!I){a(this).addClass("disabled");var b=a("#selected-plugins");a(b).attr("disabled","disabled"),I=!0,a(this).after(''),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_blacklist_plugins",blacklist_plugins:a(b).val()},error:function(c,d,e){alert(wpmdb_strings.blacklist_problem+"\r\n\r\n"+wpmdb_strings.status+" "+c.status+" "+c.statusText+"\r\n\r\n"+wpmdb_strings.response+"\r\n"+c.responseText),a(b).removeAttr("disabled"),a(".plugin-compatibility-save").removeClass("disabled"),I=!1,a(".plugin-compatibility-spinner").remove(),a(".plugin-compatibility-success-msg").show().fadeOut(2e3)},success:function(c){""!==a.trim(c)&&alert(c),a(b).removeAttr("disabled"),a(".plugin-compatibility-save").removeClass("disabled"),I=!1,a(".plugin-compatibility-spinner").remove(),a(".plugin-compatibility-success-msg").show().fadeOut(2e3)}})}}),a("body").on("click",".delete-profile",function(){var b=a(this).next().clone();a("input",b).remove(),b=a.trim(a(b).html());var c=confirm(wpmdb_strings.remove_profile.replace("{{profile}}",b));if(c){var d=a(this).parent();if(d.find("input:checked").length){var e=d.siblings().last();if(e.find("input[type=radio]").prop("checked","checked"),e.find("input[type=text]").focus(),a("#migrate-form .crumbs .crumb:last").text("New Profile"),"function"==typeof window.history.pushState){var f=window.location.href.replace("#migrate","").replace(/&wpmdb-profile=-?\d+/,"")+"&wpmdb-profile=-1";window.history.pushState({updated_profile_id:-1},null,f)}}d.fadeOut(500),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_delete_migration_profile",profile_id:a(this).attr("data-profile-id"),nonce:wpmdb_data.nonces.delete_migration_profile},error:function(a,b,c){alert(wpmdb_strings.remove_profile_problem)},success:function(a){"-1"===a&&alert(wpmdb_strings.remove_profile_not_found)}})}}),a(".main-list-delete-profile-link").click(function(){var b=a(this).prev().html(),c=confirm(wpmdb_strings.remove_profile.replace("{{profile}}",b));c&&(a(this).parent().fadeOut(500),a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_delete_migration_profile",profile_id:a(this).attr("data-profile-id"),nonce:wpmdb_data.nonces.delete_migration_profile},error:function(a,b,c){alert(wpmdb_strings.remove_profile_problem)}}))}),a("body").on("click",".temp-disabled",function(){var b=confirm(wpmdb_strings.change_connection_info);b&&(a(".ssl-notice").hide(),a(".different-plugin-version-notice").hide(),a(".migrate-db-button").show(),a(".temp-disabled").removeAttr("readonly"),a(".temp-disabled").removeClass("temp-disabled"),a(".connect-button").show(),a(".step-two").hide(),a(".connection-status").show().html(wpmdb_strings.enter_connection_info),C=!1)}),a(".settings-tab input[type=checkbox]").change(function(){if("plugin-compatibility"!==a(this).attr("id")){var b=a(this).is(":checked"),c=a(this).attr("id");a(this).parent().append(ha);var d=a(this).parent();a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:{action:"wpmdb_save_setting",checked:b,setting:c,nonce:wpmdb_data.nonces.save_setting},error:function(b,c,d){alert(wpmdb_strings.save_settings_problem),a(".ajax-spinner").remove()},success:function(b){a(".ajax-spinner").remove(),a(d).append(''+wpmdb_strings.saved+""),a(".ajax-success-msg").fadeOut(2e3,function(){a(this).remove()})}})}}),a(".migrate-form").submit(function(a){a.preventDefault()}),a(".connect-button").click(function(b){b.preventDefault(),a(this).blur(),qa()}),a(".pull-push-connection-info").bind("paste",function(a){setTimeout(function(){qa()},0)}),a("body").on("click",".try-again",function(){qa()}),a("body").on("click",".try-http",function(){var b=a.trim(a(".pull-push-connection-info").val()).split("\n"),c=b[0].replace("https","http"),d=c+"\n"+b[1];a(".pull-push-connection-info").val(d),qa()}),a(".create-new-profile").change(function(){J=!0}),a("body").on("click",".temporarily-disable-ssl",function(){var b="";window.location.hash&&(b=window.location.hash.substring(1)),a(this).attr("href",a(this).attr("href")+"&hash="+b)}),a("body").on("click",".pause-resume",function(a){r(a)}),a("body").on("click",".cancel",function(a){ra(a)}),a(".enter-licence").click(function(){a(".settings").click(),a(".licence-input").focus()}),b.functions.execute_next_step=function(){if(ba>0&&!1===aa)return void setTimeout(function(){aa=!0,b.functions.execute_next_step()},ba);if(aa=!1,!0===T)return a(".migration-progress-ajax-spinner").hide(),clearInterval(A),!0===ea?(a(".progress-text").html(wpmdb_strings.paused_before_finalize),ea=!1):a(".progress-text").html(wpmdb_strings.paused),a("body").on("click",".pause-resume",function(a){r(a)}),a("body").on("click",".cancel",function(a){ra(a)}),void a(".pause-resume").html(wpmdb_strings.resume);if(!0===Z){v=wpmdb_migration_type();var c;"savefile"===v?c=wpmdb_strings.removing_local_sql:"pull"===v?c="backup"===z?wpmdb_strings.removing_local_backup:wpmdb_strings.removing_local_temp_tables:"push"===v&&(c="backup"===z?wpmdb_strings.removing_remote_sql:wpmdb_strings.removing_remote_temp_tables),a(".progress-text").html(c);var d={action:"wpmdb_cancel_migration",migration_state_id:b.migration_state_id};E=!0,a.ajax({url:ajaxurl,type:"POST",dataType:"text",cache:!1,data:d,error:function(c,d,e){a(".progress-title").html(wpmdb_strings.migration_cancellation_failed),a(".progress-text").html(wpmdb_strings.manually_remove_temp_files),a(".progress-text").append("

"+wpmdb_strings.status+": "+c.status+" "+c.statusText+"

"+wpmdb_strings.response+":
"+c.responseText),a(".progress-text").addClass("migration-error"),console.log(c),console.log(d),console.log(e),E=!1,b.common.migration_error=!0,b.functions.migration_complete_events()},success:function(c){return E=!1,c=a.trim(c),"push"===v&&"1"!==c||"push"!==v&&""!==c?(a(".progress-title").html(wpmdb_strings.migration_cancellation_failed),a(".progress-text").html(c),a(".progress-text").addClass("migration-error"),b.common.migration_error=!0,void b.functions.migration_complete_events()):(B=wpmdb_strings.migration_cancelled,a(".progress-text").hide(),void b.functions.migration_complete_events())}})}else b.common.next_step_in_migration.fn.apply(null,b.common.next_step_in_migration.args)},a("body").on("click",".copy-licence-to-remote-site",function(){a(".connection-status").html(wpmdb_strings.copying_license),a(".connection-status").removeClass("notification-message error-notice migration-error"),a(".connection-status").append(ha);var b=a.trim(a(".pull-push-connection-info").val()).split("\n");E=!0,o(),a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:{action:"wpmdb_copy_licence_to_remote_site",url:b[0],key:b[1],nonce:wpmdb_data.nonces.copy_licence_to_remote_site},error:function(b,c,d){a(".connection-status").html(na(b.responseText,"(#143)",b)),a(".connection-status").addClass("notification-message error-notice migration-error"),a(".ajax-spinner").remove(),E=!1,p()},success:function(b){return a(".ajax-spinner").remove(),E=!1,p(),"undefined"!=typeof b.wpmdb_error&&1===b.wpmdb_error?(a(".connection-status").html(b.body),a(".connection-status").addClass("notification-message error-notice migration-error"),void(b.body.indexOf("401 Unauthorized")>-1&&a(".basic-access-auth-wrapper").show())):void qa()}})}),a("body").on("click",".reactivate-licence",function(b){E=!0,a(".invalid-licence").empty().html(wpmdb_strings.attempting_to_activate_licence),a(".invalid-licence").append(ha),a.ajax({url:ajaxurl,type:"POST",dataType:"json",cache:!1,data:{action:"wpmdb_reactivate_licence",nonce:wpmdb_data.nonces.reactivate_licence},error:function(b,c,d){a(".invalid-licence").html(wpmdb_strings.activate_licence_problem),a(".invalid-licence").append("

"+wpmdb_strings.status+": "+b.status+" "+b.statusText+"

"+wpmdb_strings.response+"
"+b.responseText),a(".ajax-spinner").remove(),E=!1},success:function(b){return a(".ajax-spinner").remove(),E=!1,"undefined"!=typeof b.wpmdb_error&&1===b.wpmdb_error?void a(".invalid-licence").html(b.body):"undefined"!=typeof b.wpmdb_dbrains_api_down&&1===b.wpmdb_dbrains_api_down?(a(".invalid-licence").html(wpmdb_strings.temporarily_activated_licence),void a(".invalid-licence").append(b.body)):(a(".invalid-licence").empty().html(wpmdb_strings.licence_reactivated),void location.reload())}})}),a("input[name=table_migrate_option]").change(function(){k(),a.wpmdb.do_action("wpmdb_tables_to_migrate_changed")}),a("body").on("change","#select-tables",function(){k(),a.wpmdb.do_action("wpmdb_tables_to_migrate_changed")}),a.wpmdb.add_filter("wpmdb_get_table_prefix",u),a.wpmdb.add_filter("wpmdb_get_tables_to_migrate",t),a.wpmdb.add_filter("wpmdb_before_migration_complete_hooks",function(b){return da=a("input[name=pause_before_finalize]:checked").length?!0:!1,!0===da&&"savefile"!==v&&(r(null),ea=!0),b})})}(jQuery,wpmdb); \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-base.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-base.php new file mode 100644 index 00000000..5157b3cb --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-base.php @@ -0,0 +1,1844 @@ +load_settings(); + $this->maybe_schema_update(); + + $this->plugin_file_path = $plugin_file_path; + $this->plugin_dir_path = plugin_dir_path( $plugin_file_path ); + $this->plugin_folder_name = basename( $this->plugin_dir_path ); + $this->plugin_basename = plugin_basename( $plugin_file_path ); + $this->template_dir = $this->plugin_dir_path . 'template' . DIRECTORY_SEPARATOR; + $this->plugin_title = ucwords( str_ireplace( '-', ' ', basename( $plugin_file_path ) ) ); + $this->plugin_title = str_ireplace( array( 'db', 'wp', '.php' ), array( 'DB', 'WP', '' ), $this->plugin_title ); + + // We need to set $this->plugin_slug here because it was set here + // in Media Files prior to version 1.1.2. If we remove it the customer + // cannot upgrade, view release notes, etc + // used almost exclusively as a identifier for plugin version checking (both core and addons) + $this->plugin_slug = basename( $plugin_file_path, '.php' ); + + // used to add admin menus and to identify the core version in the $GLOBALS['wpmdb_meta'] variable for delicious brains api calls, version checking etc + $this->core_slug = ( $this->is_pro || $this->is_addon ) ? 'wp-migrate-db-pro' : 'wp-migrate-db'; + + if ( is_multisite() ) { + $this->plugin_base = 'settings.php?page=' . $this->core_slug; + } else { + $this->plugin_base = 'tools.php?page=' . $this->core_slug; + } + + if ( $this->is_addon || $this->is_pro ) { + $this->pro_addon_construct(); + } + + add_action( 'init', array( $this, 'load_plugin_textdomain' ) ); + + // in case admin_init isn't run (tests/cli), we'll just instantiate the fs class without wpfs and allow it to be overwritten when/if admin_init is run + if ( class_exists( 'WPMDB_Filesystem' ) ) { + $this->filesystem = new WPMDB_Filesystem( true ); + add_action( 'admin_init', array( $this, 'init_wpmdb_filesystem' ) ); + } + + } + + /** + * Get the URL to wp-admin/admin-ajax.php for the intended WordPress site. + * + * The intended WordPress site URL is sent via Ajax, so to get a properly + * formatted URL to wp-admin/admin-ajax.php we can't count on the site + * URL being sent with a trailing slash. + * + * @return string URL to wp-admin/admin-ajax.php, e.g. http://example.com/wp-admin/admin-ajax.php + */ + function ajax_url() { + static $ajax_url; + + if ( ! empty( $ajax_url ) ) { + return $ajax_url; + } + + $ajax_url = trailingslashit( $this->state_data['url'] ) . 'wp-admin/admin-ajax.php'; + + return $ajax_url; + } + + /** + * Sets $this->state_data from $_POST, potentially un-slashed and sanitized. + * + * @param array $key_rules An optional associative array of expected keys and their sanitization rule(s). + * @param string $state_key The key in $_POST that contains the migration state id (defaults to 'migration_state_id'). + * @param string $context The method that is specifying the sanitization rules. Defaults to calling method. + */ + function set_post_data( $key_rules = array(), $state_key = 'migration_state_id', $context = '' ) { + if ( defined( 'DOING_WPMDB_TESTS' ) || $this->doing_cli_migration ) { + $this->state_data = $_POST; + } elseif ( is_null( $this->state_data ) ) { + $this->state_data = WPMDB_Utils::safe_wp_unslash( $_POST ); + } else { + return; + } + + // Sanitize the new state data. + if ( ! empty( $key_rules ) ) { + $context = empty( $context ) ? $this->get_caller_function() : trim( $context ); + $this->state_data = WPMDB_Sanitize::sanitize_data( $this->state_data, $key_rules, $context ); + + if ( false === $this->state_data ) { + exit; + } + } + + $migration_state_id = null; + if ( ! empty( $this->state_data[ $state_key ] ) ) { + $migration_state_id = $this->state_data[ $state_key ]; + } + + if ( true !== $this->get_migration_state( $migration_state_id ) ) { + exit; + } + } + + function load_plugin_textdomain() { + load_plugin_textdomain( 'wp-migrate-db', false, dirname( plugin_basename( $this->plugin_file_path ) ) . '/languages/' ); + } + + function init_wpmdb_filesystem() { + if ( ! is_a( $this->filesystem, 'WPMDB_Filesystem' ) || ( is_a( $this->filesystem, 'WPMDB_Filesystem' ) && ! $this->filesystem->using_wp_filesystem() ) ) { + $this->filesystem = new WPMDB_Filesystem(); + } + } + + function pro_addon_construct() { + $this->addons = array( + 'wp-migrate-db-pro-media-files/wp-migrate-db-pro-media-files.php' => array( + 'name' => 'Media Files', + 'required_version' => '1.4', + ), + 'wp-migrate-db-pro-cli/wp-migrate-db-pro-cli.php' => array( + 'name' => 'CLI', + 'required_version' => '1.2.2', + ), + 'wp-migrate-db-pro-multisite-tools/wp-migrate-db-pro-multisite-tools.php' => array( + 'name' => 'Multisite Tools', + 'required_version' => '1.0.2', + ) + ); + + $this->invalid_content_verification_error = __( 'Invalid content verification signature, please verify the connection information on the remote site and try again.', 'wp-migrate-db' ); + + $this->transient_timeout = 60 * 60 * 12; + $this->transient_retry_timeout = 60 * 60 * 2; + + if ( defined( 'DBRAINS_API_BASE' ) ) { + $this->dbrains_api_base = DBRAINS_API_BASE; + } + + if ( $this->open_ssl_enabled() == false ) { + $this->dbrains_api_base = str_replace( 'https://', 'http://', $this->dbrains_api_base ); + } + + $this->dbrains_api_url = $this->dbrains_api_base . '/?wc-api=delicious-brains'; + + // allow developers to change the temporary prefix applied to the tables + $this->temp_prefix = apply_filters( 'wpmdb_temporary_prefix', $this->temp_prefix ); + + // Adds a custom error message to the plugin install page if required (licence expired / invalid) + add_filter( 'http_response', array( $this, 'verify_download' ), 10, 3 ); + + add_action( 'wpmdb_notices', array( $this, 'version_update_notice' ) ); + } + + /** + * Loads the settings into the settings class property, sets some defaults if no existing settings are found. + */ + function load_settings() { + if ( ! is_null( $this->settings ) ) { + return; + } + + $update_settings = false; + $this->settings = get_site_option( 'wpmdb_settings' ); + + /* + * Settings were previously stored and retrieved using get_option and update_option respectively. + * Here we update the subsite option to a network wide option if applicable. + */ + if ( false === $this->settings && is_multisite() && is_network_admin() ) { + $this->settings = get_option( 'wpmdb_settings' ); + if ( false !== $this->settings ) { + $update_settings = true; + delete_option( 'wpmdb_settings' ); + } + } + + $default_settings = array( + 'key' => $this->generate_key(), + 'allow_pull' => false, + 'allow_push' => false, + 'profiles' => array(), + 'licence' => '', + 'verify_ssl' => false, + 'blacklist_plugins' => array(), + 'max_request' => min( 1024 * 1024, $this->get_bottleneck( 'max' ) ), + 'delay_between_requests' => 0, + ); + + // if we still don't have settings exist this must be a fresh install, set up some default settings + if ( false === $this->settings ) { + $this->settings = $default_settings; + $update_settings = true; + } else { + /* + * When new settings are added an existing customer's db won't have the new settings. + * They're added here to circumvent array index errors in debug mode. + */ + foreach ( $default_settings as $key => $value ) { + if ( ! isset( $this->settings[ $key ] ) ) { + $this->settings[ $key ] = $value; + $update_settings = true; + } + } + } + + if ( $update_settings ) { + update_site_option( 'wpmdb_settings', $this->settings ); + } + } + + /** + * Loads the error log into the error log class property. + */ + function load_error_log() { + if ( ! is_null( $this->error_log ) ) { + return; + } + + $this->error_log = get_site_option( 'wpmdb_error_log' ); + + /* + * The error log was previously stored and retrieved using get_option and update_option respectively. + * Here we update the subsite option to a network wide option if applicable. + */ + if ( false === $this->error_log && is_multisite() && is_network_admin() ) { + $this->error_log = get_option( 'wpmdb_error_log' ); + if ( false !== $this->error_log ) { + update_site_option( 'wpmdb_error_log', $this->error_log ); + delete_option( 'wpmdb_error_log' ); + } + } + } + + function template( $template, $dir = '', $args = array() ) { + global $wpdb; + // TODO: Refactor to remove extract(). + extract( $args, EXTR_OVERWRITE ); + $dir = ( ! empty( $dir ) ) ? trailingslashit( $dir ) : $dir; + include $this->template_dir . $dir . $template . '.php'; + } + + function open_ssl_enabled() { + if ( defined( 'OPENSSL_VERSION_TEXT' ) ) { + return true; + } else { + return false; + } + } + + function set_time_limit() { + if ( ! function_exists( 'ini_get' ) || ! ini_get( 'safe_mode' ) ) { + @set_time_limit( 0 ); + } + } + + /** + * Post data to a remote site with WP Migrate DB Pro and check the response. + * + * @param string $url The URL to post to. + * @param array $data The associative array of data to be posted to the remote. + * @param string $scope A string to be used in error messages defining the function that initiated the remote post. + * @param array $args An optional array of args to alter the timeout, blocking and sslverify options. + * @param bool $expecting_serial Verify that the response is a serialized string (defaults to false). + * + * @return bool|string + */ + function remote_post( $url, $data, $scope, $args = array(), $expecting_serial = false ) { + $this->set_time_limit(); + $this->set_post_data(); + + if ( function_exists( 'fsockopen' ) && 0 === strpos( $url, 'https://' ) && 'ajax_verify_connection_to_remote_site' == $scope ) { + $url_parts = $this->parse_url( $url ); + $host = $url_parts['host']; + if ( $pf = @fsockopen( $host, 443, $err, $err_string, 1 ) ) { + // worked + fclose( $pf ); + } else { + // failed + $url = substr_replace( $url, 'http', 0, 5 ); + } + } + + $sslverify = ( 1 == $this->settings['verify_ssl'] ? true : false ); + + $default_remote_post_timeout = apply_filters( 'wpmdb_default_remote_post_timeout', 60 * 20 ); + + $args = wp_parse_args( $args, + array( + 'timeout' => $default_remote_post_timeout, + 'blocking' => true, + 'sslverify' => $sslverify, + ) ); + + $args['method'] = 'POST'; + + if ( ! isset( $args['body'] ) ) { + $args['body'] = $this->array_to_multipart( $data ); + } + + $args['headers']['Content-Type'] = 'multipart/form-data; boundary=' . $this->multipart_boundary; + $args['headers']['Referer'] = $this->referer_from_url( $url ); + + $this->attempting_to_connect_to = $url; + + do_action( 'wpmdb_before_remote_post' ); + + $response = wp_remote_post( $url, $args ); + + if ( ! is_wp_error( $response ) ) { + // Every response should be scrambled, but other processes may have been applied too so we use a filter. + add_filter( 'wpmdb_after_response', array( $this, 'unscramble' ) ); + $response['body'] = apply_filters( 'wpmdb_after_response', trim( $response['body'], "\xef\xbb\xbf" ) ); + remove_filter( 'wpmdb_after_response', array( $this, 'unscramble' ) ); + } + + if ( is_wp_error( $response ) ) { + if ( 0 === strpos( $url, 'https://' ) && 'ajax_verify_connection_to_remote_site' == $scope ) { + return $this->retry_remote_post( $url, $data, $scope, $args, $expecting_serial ); + } elseif ( isset( $response->errors['http_request_failed'][0] ) && strstr( $response->errors['http_request_failed'][0], 'timed out' ) ) { + $this->error = sprintf( __( 'The connection to the remote server has timed out, no changes have been committed. (#134 - scope: %s)', 'wp-migrate-db' ), $scope ); + } elseif ( isset( $response->errors['http_request_failed'][0] ) && ( strstr( $response->errors['http_request_failed'][0], 'Could not resolve host' ) || strstr( $response->errors['http_request_failed'][0], "couldn't connect to host" ) ) ) { + $this->error = sprintf( __( 'We could not find: %s. Are you sure this is the correct URL?', 'wp-migrate-db' ), $this->state_data['url'] ); + $url_bits = $this->parse_url( $this->state_data['url'] ); + if ( strstr( $this->state_data['url'], 'dev.' ) || strstr( $this->state_data['url'], '.dev' ) || ! strstr( $url_bits['host'], '.' ) ) { + $this->error .= '
'; + if ( 'pull' == $this->state_data['intent'] ) { + $this->error .= __( 'It appears that you might be trying to pull from a local environment. This will not work if this website happens to be located on a remote server, it would be impossible for this server to contact your local environment.', 'wp-migrate-db' ); + } else { + $this->error .= __( 'It appears that you might be trying to push to a local environment. This will not work if this website happens to be located on a remote server, it would be impossible for this server to contact your local environment.', 'wp-migrate-db' ); + } + } + } else { + if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { + $url_parts = $this->parse_url( $url ); + $host = $url_parts['host']; + if ( ! defined( 'WP_ACCESSIBLE_HOSTS' ) || strpos( WP_ACCESSIBLE_HOSTS, $host ) === false ) { + $this->error = sprintf( __( 'We\'ve detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add %1$s to WP_ACCESSIBLE_HOSTS to continue. More information. (#147 - scope: %3$s)', 'wp-migrate-db' ), esc_attr( $host ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/wp_http_block_external/', $scope ); + } + } else { + $this->error = sprintf( __( 'The connection failed, an unexpected error occurred, please contact support. (#121 - scope: %s)', 'wp-migrate-db' ), $scope ); + } + } + $this->log_error( $this->error, $response ); + + return false; + } elseif ( 200 > (int) $response['response']['code'] || 399 < (int) $response['response']['code'] ) { + if ( 0 === strpos( $url, 'https://' ) && 'ajax_verify_connection_to_remote_site' == $scope ) { + return $this->retry_remote_post( $url, $data, $scope, $args, $expecting_serial ); + } elseif ( '401' == $response['response']['code'] ) { + $this->error = __( 'The remote site is protected with Basic Authentication. Please enter the username and password above to continue. (401 Unauthorized)', 'wp-migrate-db' ); + $this->log_error( $this->error, $response ); + + return false; + } else { + $this->error = sprintf( __( 'Unable to connect to the remote server, please check the connection details - %1$s %2$s (#129 - scope: %3$s)', 'wp-migrate-db' ), $response['response']['code'], $response['response']['message'], $scope ); + $this->log_error( $this->error, $response ); + + return false; + } + } elseif ( empty( $response['body'] ) ) { + if ( '0' === $response['body'] && 'ajax_verify_connection_to_remote_site' == $scope ) { + if ( 0 === strpos( $url, 'https://' ) ) { + return $this->retry_remote_post( $url, $data, $scope, $args, $expecting_serial ); + } else { + $this->error = sprintf( __( 'WP Migrate DB Pro does not seem to be installed or active on the remote site. (#131 - scope: %s)', 'wp-migrate-db' ), $scope ); + } + } else { + $this->error = sprintf( __( 'A response was expected from the remote, instead we got nothing. (#146 - scope: %1$s) Please review %2$s for possible solutions.', 'wp-migrate-db' ), $scope, sprintf( '%1$s', __( 'our documentation', 'wp-migrate-db' ) ) ); + } + $this->log_error( $this->error, $response ); + + return false; + } elseif ( $expecting_serial && false == is_serialized( $response['body'] ) ) { + if ( 0 === strpos( $url, 'https://' ) && 'ajax_verify_connection_to_remote_site' == $scope ) { + return $this->retry_remote_post( $url, $data, $scope, $args, $expecting_serial ); + } + $this->error = __( 'There was a problem with the AJAX request, we were expecting a serialized response, instead we received:
', 'wp-migrate-db' ) . esc_html( $response['body'] ); + $this->log_error( $this->error, $response ); + + return false; + } elseif ( $expecting_serial && true == is_serialized( $response['body'] ) && 'ajax_verify_connection_to_remote_site' == $scope ) { + $unserialized_response = unserialize( $response['body'] ); + if ( isset( $unserialized_response['error'] ) && '1' == $unserialized_response['error'] && 0 === strpos( $url, 'https://' ) ) { + return $this->retry_remote_post( $url, $data, $scope, $args, $expecting_serial ); + } + } + + return $response['body']; + } + + function retry_remote_post( $url, $data, $scope, $args = array(), $expecting_serial = false ) { + $url = substr_replace( $url, 'http', 0, 5 ); + if ( $response = $this->remote_post( $url, $data, $scope, $args, $expecting_serial ) ) { + return $response; + } + + return false; + } + + function array_to_multipart( $data ) { + if ( ! $data || ! is_array( $data ) ) { + return $data; + } + + $result = ''; + + foreach ( $data as $key => $value ) { + $result .= '--' . $this->multipart_boundary . "\r\n" . sprintf( 'Content-Disposition: form-data; name="%s"', $key ); + + if ( 'chunk' == $key ) { + if ( $data['chunk_gzipped'] ) { + $result .= "; filename=\"chunk.txt.gz\"\r\nContent-Type: application/x-gzip"; + } else { + $result .= "; filename=\"chunk.txt\"\r\nContent-Type: text/plain;"; + } + } else { + $result .= "\r\nContent-Type: text/plain; charset=" . get_option( 'blog_charset' ); + } + + $result .= "\r\n\r\n" . $value . "\r\n"; + } + + $result .= '--' . $this->multipart_boundary . "--\r\n"; + + return $result; + } + + function file_to_multipart( $file ) { + $result = ''; + + if ( false == file_exists( $file ) ) { + return false; + } + + $filetype = wp_check_filetype( $file ); + $contents = file_get_contents( $file ); + + $result .= '--' . $this->multipart_boundary . "\r\n" . sprintf( 'Content-Disposition: form-data; name="media[]"; filename="%s"', basename( $file ) ); + $result .= sprintf( "\r\nContent-Type: %s", $filetype['type'] ); + $result .= "\r\n\r\n" . $contents . "\r\n"; + $result .= '--' . $this->multipart_boundary . "--\r\n"; + + return $result; + } + + function log_error( $wpmdb_error, $additional_error_var = false ) { + $error_header = "********************************************\n****** Log date: " . date( 'Y/m/d H:i:s' ) . " ******\n********************************************\n\n"; + $error = $error_header . 'WPMDB Error: ' . $wpmdb_error . "\n\n"; + + if ( ! empty( $this->attempting_to_connect_to ) ) { + $error .= 'Attempted to connect to: ' . $this->attempting_to_connect_to . "\n\n"; + } + + if ( $additional_error_var !== false ) { + $error .= print_r( $additional_error_var, true ) . "\n\n"; + } + + $this->load_error_log(); + + if ( isset( $this->error_log ) ) { + $this->error_log .= $error; + } else { + $this->error_log = $error; + } + + update_site_option( 'wpmdb_error_log', $this->error_log ); + } + + function display_errors() { + if ( ! empty( $this->error ) ) { + echo $this->error; + $this->error = ''; + + return true; + } + + return false; + } + + function filter_post_elements( $post_array, $accepted_elements ) { + $accepted_elements[] = 'sig'; + + return array_intersect_key( $post_array, array_flip( $accepted_elements ) ); + } + + function sanitize_signature_data( $value ) { + if ( is_bool( $value ) ) { + $value = $value ? 'true' : 'false'; + } + + return $value; + } + + /** + * Generate a signature string for the supplied data given a key. + * + * @param array $data + * @param string $key + * + * @return string + */ + function create_signature( $data, $key ) { + if ( isset( $data['sig'] ) ) { + unset( $data['sig'] ); + } + $data = array_map( array( $this, 'sanitize_signature_data' ), $data ); + ksort( $data ); + $flat_data = implode( '', $data ); + + return base64_encode( hash_hmac( 'sha1', $flat_data, $key, true ) ); + } + + function verify_signature( $data, $key ) { + if ( empty( $data['sig'] ) ) { + return false; + } + + if ( isset( $data['nonce'] ) ) { + unset( $data['nonce'] ); + } + + $temp = $data; + $computed_signature = $this->create_signature( $temp, $key ); + + return $computed_signature === $data['sig']; + } + + function get_dbrains_api_url( $request, $args = array() ) { + $url = $this->dbrains_api_url; + $args['request'] = $request; + $args['version'] = $GLOBALS['wpmdb_meta'][ $this->core_slug ]['version']; + $url = add_query_arg( $args, $url ); + if ( false !== get_site_transient( 'wpmdb_temporarily_disable_ssl' ) && 0 === strpos( $this->dbrains_api_url, 'https://' ) ) { + $url = substr_replace( $url, 'http', 0, 5 ); + } + + $url .= '&locale=' . urlencode( get_locale() ); + + return $url; + } + + /** + * Determines, sets up, and returns folder information for storying files. + * + * By default, the folder created will be `wp-migrate-db` and will be stored + * inside of the `uploads` folder in WordPress' current `WP_CONTENT_DIR`, + * usually `wp-content/uploads` + * + * To change the folder name of `wp-migrate-db` to something else, you can use + * the `wpmdb_upload_dir_name` filter to change it. e.g.: + * + * function upload_dir_name() { + * return 'database-dumps'; + * } + * + * add_filter( 'wpmdb_upload_dir_name', 'upload_dir_name' ); + * + * If `WP_CONTENT_DIR` was set to `wp-content` in this example, + * this would change the folder to `wp-content/uploads/database-dumps`. + * + * To change the entire path, for example to store these files outside of + * WordPress' `WP_CONTENT_DIR`, use the `wpmdb_upload_info` filter to do so. e.g.: + * + * function upload_info() { + * // The returned data needs to be in a very specific format, see below for example + * return array( + * 'path' => '/path/to/custom/uploads/directory', // note missing end trailing slash + * 'url' => 'http://yourwebsite.com/custom/uploads/directory' // note missing end trailing slash + * ); + * } + * + * add_filter( 'wpmdb_upload_info', 'upload_info' ); + * + * This would store files in `/path/to/custom/uploads/directory` with a + * URL to access files via `http://yourwebsite.com/custom/uploads/directory` + * + * @link https://github.com/deliciousbrains/wp-migrate-db-pro-tweaks + * + * @param string $type Either `path` or `url`. + * + * @return string The Path or the URL to the folder being used. + */ + function get_upload_info( $type = 'path' ) { + $upload_info = apply_filters( 'wpmdb_upload_info', array() ); + + // No need to create the directory structure since it should already exist. + if ( ! empty( $upload_info ) ) { + return $upload_info[ $type ]; + } + + $upload_dir = wp_upload_dir(); + + $upload_info['path'] = $upload_dir['basedir']; + $upload_info['url'] = $upload_dir['baseurl']; + + $upload_dir_name = apply_filters( 'wpmdb_upload_dir_name', 'wp-migrate-db' ); + + if ( ! file_exists( $upload_dir['basedir'] . DIRECTORY_SEPARATOR . $upload_dir_name ) ) { + $url = wp_nonce_url( $this->plugin_base, 'wp-migrate-db-pro-nonce' ); + + // Create the directory. + // TODO: Do not silence errors, use wp_mkdir_p? + if ( false === @mkdir( $upload_dir['basedir'] . DIRECTORY_SEPARATOR . $upload_dir_name, 0755 ) ) { + return $upload_info[ $type ]; + } + + // Protect from directory listings by making sure an index file exists. + $filename = $upload_dir['basedir'] . DIRECTORY_SEPARATOR . $upload_dir_name . DIRECTORY_SEPARATOR . 'index.php'; + // TODO: Do not silence errors, use WP_Filesystem API? + if ( false === @file_put_contents( $filename, "" ) ) { + return $upload_info[ $type ]; + } + } + + // Protect from directory listings by ensuring this folder does not allow Indexes if using Apache. + $htaccess = $upload_dir['basedir'] . DIRECTORY_SEPARATOR . $upload_dir_name . DIRECTORY_SEPARATOR . '.htaccess'; + if ( ! file_exists( $htaccess ) ) { + // TODO: Do not silence errors, use WP_Filesystem API? + if ( false === @file_put_contents( $htaccess, "Options -Indexes\r\nDeny from all" ) ) { + return $upload_info[ $type ]; + } + } + + $upload_info['path'] .= DIRECTORY_SEPARATOR . $upload_dir_name; + $upload_info['url'] .= '/' . $upload_dir_name; + + return $upload_info[ $type ]; + } + + /** + * Main function for communicating with the Delicious Brains API. + * + * @param string $request + * @param array $args + * + * @return mixed + */ + function dbrains_api_request( $request, $args = array() ) { + $trans = get_site_transient( 'wpmdb_dbrains_api_down' ); + + if ( false !== $trans ) { + $api_down_message = sprintf( '
%s
', $trans ); + + return json_encode( array( 'dbrains_api_down' => $api_down_message ) ); + } + + $sslverify = ( $this->settings['verify_ssl'] == 1 ? true : false ); + + $url = $this->get_dbrains_api_url( $request, $args ); + $response = wp_remote_get( + $url, + array( + 'timeout' => 30, + 'blocking' => true, + 'sslverify' => $sslverify, + ) + ); + + if ( is_wp_error( $response ) || (int) $response['response']['code'] < 200 || (int) $response['response']['code'] > 399 ) { + $this->log_error( print_r( $response, true ) ); + + if ( true === $this->dbrains_api_down() ) { + $trans = get_site_transient( 'wpmdb_dbrains_api_down' ); + + if ( false !== $trans ) { + $api_down_message = sprintf( '
%s
', $trans ); + + return json_encode( array( 'dbrains_api_down' => $api_down_message ) ); + } + } + + $disable_ssl_url = network_admin_url( $this->plugin_base . '&nonce=' . wp_create_nonce( 'wpmdb-disable-ssl' ) . '&wpmdb-disable-ssl=1' ); + $connection_failed_message = '
'; + $connection_failed_message .= sprintf( __( 'Could not connect to deliciousbrains.com — You will not receive update notifications or be able to activate your license until this is fixed. This issue is often caused by an improperly configured SSL server (https). We recommend fixing the SSL configuration on your server, but if you need a quick fix you can:%2$s', 'wp-migrate-db' ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/could-not-connect-deliciousbrains-com/', sprintf( '
%2$s
', $disable_ssl_url, __( 'Temporarily disable SSL for connections to deliciousbrains.com', 'wp-migrate-db' ) ) ); + $connection_failed_message .= '
'; + + if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { + $url_parts = $this->parse_url( $url ); + $host = $url_parts['host']; + if ( ! defined( 'WP_ACCESSIBLE_HOSTS' ) || strpos( WP_ACCESSIBLE_HOSTS, $host ) === false ) { + $connection_failed_message = '
'; + $connection_failed_message .= sprintf( __( 'We\'ve detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add %1$s to WP_ACCESSIBLE_HOSTS to continue. More information.', 'wp-migrate-db' ), esc_attr( $host ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/wp_http_block_external/' ); + $connection_failed_message .= '
'; + } + } + + // Don't cache the license response so we can try again + delete_site_transient( 'wpmdb_licence_response' ); + + return json_encode( array( 'errors' => array( 'connection_failed' => $connection_failed_message ) ) ); + } + + return $response['body']; + } + + /** + * Is the Delicious Brains API down? + * + * If not available then a 'wpmdb_dbrains_api_down' transient will be set with an appropriate message. + * + * @return bool + */ + function dbrains_api_down() { + if ( false !== get_site_transient( 'wpmdb_dbrains_api_down' ) ) { + return true; + } + + $response = wp_remote_get( $this->dbrains_api_status_url, array( 'timeout' => 30 ) ); + + // Can't get to api status url so fall back to normal failure handling. + if ( is_wp_error( $response ) || 200 != (int) $response['response']['code'] || empty( $response['body'] ) ) { + return false; + } + + $json = json_decode( $response['body'], true ); + + // Can't decode json so fall back to normal failure handling. + if ( ! $json ) { + return false; + } + + // JSON doesn't seem to have the format we expect or is not down, so fall back to normal failure handling. + if ( ! isset( $json['api']['status'] ) || 'down' != $json['api']['status'] ) { + return false; + } + + $message = __( "Delicious Brains API is Down â Unfortunately we're experiencing some problems with our server.", 'wp-migrate-db' ); + + if ( ! empty( $json['api']['updated'] ) ) { + $updated = $json['api']['updated']; + $updated_ago = sprintf( _x( '%s ago', 'ex. 2 hours ago', 'wp-migrate-db' ), human_time_diff( strtotime( $updated ) ) ); + } + + if ( ! empty( $json['api']['message'] ) ) { + $message .= '
'; + $message .= __( "Here's the most recent update on its status", 'wp-migrate-db' ); + if ( ! empty( $updated_ago ) ) { + $message .= ' (' . $updated_ago . ')'; + } + $message .= ': ' . $json['api']['message'] . ''; + } + + set_site_transient( 'wpmdb_dbrains_api_down', $message, $this->transient_retry_timeout ); + + return true; + } + + function verify_download( $response, $args, $url ) { + if ( is_wp_error( $response ) ) { + return $response; + } + + $download_url = $this->get_plugin_update_download_url( $this->plugin_slug ); + + if ( 0 === strpos( $url, $download_url ) || 402 != $response['response']['code'] ) { + return $response; + } + + // The $response['body'] is blank but output is actually saved to a file in this case + $data = @file_get_contents( $response['filename'] ); + + if ( ! $data ) { + return new WP_Error( 'wpmdbpro_download_error_empty', sprintf( __( 'Error retrieving download from deliciousbrain.com. Please try again or download manually from %2$s.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/', _x( 'My Account', 'Delicious Brains account', 'wp-migrate-db' ) ) ); + } + + $decoded_data = json_decode( $data, true ); + + // Can't decode the JSON errors, so just barf it all out + if ( ! isset( $decoded_data['errors'] ) || ! $decoded_data['errors'] ) { + return new WP_Error( 'wpmdbpro_download_error_raw', $data ); + } + + foreach ( $decoded_data['errors'] as $key => $msg ) { + return new WP_Error( 'wpmdbpro_' . $key, $msg ); + } + } + + function is_licence_constant() { + return defined( 'WPMDB_LICENCE' ); + } + + function get_licence_key() { + return $this->is_licence_constant() ? WPMDB_LICENCE : $this->settings['licence']; + } + + /** + * Sets the licence index in the $settings array class property and updates the wpmdb_settings option. + * + * @param string $key + */ + function set_licence_key( $key ) { + $this->settings['licence'] = $key; + update_site_option( 'wpmdb_settings', $this->settings ); + } + + /** + * Checks whether the saved licence has expired or not. + * + * @param bool $skip_transient_check + * + * @return bool + */ + function is_valid_licence( $skip_transient_check = false ) { + $response = $this->is_licence_expired( $skip_transient_check ); + + if ( isset( $response['dbrains_api_down'] ) ) { + return true; + } + + // Don't cripple the plugin's functionality if the user's licence is expired + if ( isset( $response['errors']['subscription_expired'] ) && 1 === count( $response['errors'] ) ) { + return true; + } + + return ( isset( $response['errors'] ) ) ? false : true; + } + + function is_licence_expired( $skip_transient_check = false ) { + $licence = $this->get_licence_key(); + + if ( empty( $licence ) ) { + $settings_link = sprintf( '%s', network_admin_url( $this->plugin_base ) . '#settings', _x( 'Settings', 'Plugin configuration and preferences', 'wp-migrate-db' ) ); + $message = sprintf( __( 'To finish activating WP Migrate DB Pro, please go to %1$s and enter your license key. If you don\'t have a license key, you may purchase one.', 'wp-migrate-db' ), $settings_link, 'http://deliciousbrains.com/wp-migrate-db-pro/pricing/' ); + + return array( 'errors' => array( 'no_licence' => $message ) ); + } + + if ( ! $skip_transient_check ) { + $trans = get_site_transient( 'wpmdb_licence_response' ); + if ( false !== $trans ) { + return json_decode( $trans, true ); + } + } + + return json_decode( $this->check_licence( $licence ), true ); + } + + function check_licence( $licence_key ) { + if ( empty( $licence_key ) ) { + return false; + } + + $args = array( + 'licence_key' => $licence_key, + 'site_url' => home_url( '', 'http' ), + ); + + $response = $this->dbrains_api_request( 'check_support_access', $args ); + + set_site_transient( 'wpmdb_licence_response', $response, $this->transient_timeout ); + + return $response; + } + + function is_beta_version( $ver ) { + if ( preg_match( '@b[0-9]+$@', $ver ) ) { + return true; + } + + return false; + } + + function get_required_version( $slug ) { + $plugin_file = sprintf( '%1$s/%1$s.php', $slug ); + + if ( isset( $this->addons[ $plugin_file ]['required_version'] ) ) { + return $this->addons[ $plugin_file ]['required_version']; + } else { + return 0; + } + } + + function get_latest_version( $slug ) { + $data = $this->get_upgrade_data(); + + if ( ! isset( $data[ $slug ] ) ) { + return false; + } + + // If pre-1.1.2 version of Media Files addon + if ( ! isset( $GLOBALS['wpmdb_meta'][ $slug ]['version'] ) ) { + $installed_version = false; + } else { + $installed_version = $GLOBALS['wpmdb_meta'][ $slug ]['version']; + } + + $required_version = $this->get_required_version( $slug ); + + // Return the latest beta version if the installed version is beta + // and the API returned a beta version and it's newer than the latest stable version + if ( $installed_version + && ( $this->is_beta_version( $installed_version ) || $this->is_beta_version( $required_version ) ) + && isset( $data[ $slug ]['beta_version'] ) + && version_compare( $data[ $slug ]['version'], $data[ $slug ]['beta_version'], '<' ) + ) { + return $data[ $slug ]['beta_version']; + } + + return $data[ $slug ]['version']; + } + + function get_upgrade_data() { + $info = get_site_transient( 'wpmdb_upgrade_data' ); + + if ( isset( $info['version'] ) ) { + delete_site_transient( 'wpmdb_licence_response' ); + delete_site_transient( 'wpmdb_upgrade_data' ); + $info = false; + } + + if ( $info ) { + return $info; + } + + $data = $this->dbrains_api_request( 'upgrade_data' ); + + $data = json_decode( $data, true ); + + /* + We need to set the transient even when there's an error, + otherwise we'll end up making API requests over and over again + and slowing things down big time. + */ + $default_upgrade_data = array( 'wp-migrate-db-pro' => array( 'version' => $GLOBALS['wpmdb_meta'][ $this->core_slug ]['version'] ) ); + + if ( ! $data ) { + set_site_transient( 'wpmdb_upgrade_data', $default_upgrade_data, $this->transient_retry_timeout ); + $this->log_error( 'Error trying to decode JSON upgrade data.' ); + + return false; + } + + if ( isset( $data['errors'] ) ) { + set_site_transient( 'wpmdb_upgrade_data', $default_upgrade_data, $this->transient_retry_timeout ); + $this->log_error( 'Error trying to get upgrade data.', $data['errors'] ); + + return false; + } + + set_site_transient( 'wpmdb_upgrade_data', $data, $this->transient_timeout ); + + return $data; + } + + function get_plugin_update_download_url( $plugin_slug, $is_beta = false ) { + $licence = $this->get_licence_key(); + $query_args = array( + 'request' => 'download', + 'licence_key' => $licence, + 'slug' => $plugin_slug, + 'site_url' => home_url( '', 'http' ), + ); + + if ( $is_beta ) { + $query_args['beta'] = '1'; + } + + return add_query_arg( $query_args, $this->dbrains_api_url ); + } + + function diverse_array( $vector ) { + $result = array(); + + foreach ( $vector as $key1 => $value1 ) { + foreach ( $value1 as $key2 => $value2 ) { + $result[ $key2 ][ $key1 ] = $value2; + } + } + + return $result; + } + + function set_time_limit_available() { + if ( ! function_exists( 'set_time_limit' ) || ! function_exists( 'ini_get' ) ) { + return false; + } + + $current_max_execution_time = ini_get( 'max_execution_time' ); + $proposed_max_execution_time = ( $current_max_execution_time == 30 ) ? 31 : 30; + @set_time_limit( $proposed_max_execution_time ); + $current_max_execution_time = ini_get( 'max_execution_time' ); + + return $proposed_max_execution_time == $current_max_execution_time; + } + + function get_plugin_name( $plugin = false ) { + if ( ! is_admin() ) { + return false; + } + + $plugin_basename = ( false !== $plugin ? $plugin : $this->plugin_basename ); + + $plugins = get_plugins(); + + if ( ! isset( $plugins[ $plugin_basename ]['Name'] ) ) { + return false; + } + + return $plugins[ $plugin_basename ]['Name']; + } + + function get_class_props() { + return get_object_vars( $this ); + } + + /** + * Get only the tables beginning with our DB prefix or temporary prefix, also skip views and legacy wpmdb_alter_statements table. + * + * @param string $scope + * + * @return array + */ + function get_tables( $scope = 'regular' ) { + global $wpdb; + $prefix = ( $scope == 'temp' ? $this->temp_prefix : $wpdb->base_prefix ); + $tables = $wpdb->get_results( 'SHOW FULL TABLES', ARRAY_N ); + $clean_tables = array(); + + foreach ( $tables as $table ) { + if ( ( ( $scope == 'temp' || $scope == 'prefix' ) && 0 !== strpos( $table[0], $prefix ) ) || $table[1] == 'VIEW' ) { + continue; + } + if ( $this->get_legacy_alter_table_name() == $table[0] ) { + continue; + } + $clean_tables[] = $table[0]; + } + + return apply_filters( 'wpmdb_tables', $clean_tables, $scope ); + } + + function version_update_notice() { + // We don't want to show both the "Update Required" and "Update Available" messages at the same time + if ( isset( $this->addons[ $this->plugin_basename ] ) && true == $this->is_addon_outdated( $this->plugin_basename ) ) { + return; + } + + // To reduce UI clutter we hide addon update notices if the core plugin has updates available + if ( isset( $this->addons[ $this->plugin_basename ] ) ) { + $core_installed_version = $GLOBALS['wpmdb_meta'][ $this->core_slug ]['version']; + $core_latest_version = $this->get_latest_version( $this->core_slug ); + // Core update is available, don't show update notices for addons until core is updated + if ( version_compare( $core_installed_version, $core_latest_version, '<' ) ) { + return; + } + } + + $update_url = wp_nonce_url( network_admin_url( 'update.php?action=upgrade-plugin&plugin=' . urlencode( $this->plugin_basename ) ), 'upgrade-plugin_' . $this->plugin_basename ); + + // If pre-1.1.2 version of Media Files addon, don't bother getting the versions + if ( ! isset( $GLOBALS['wpmdb_meta'][ $this->plugin_slug ]['version'] ) ) { + ?> +
+ — + plugin_title, sprintf( '%s', $update_url, _x( 'Update Now', 'Download and install a new version of the plugin', 'wp-migrate-db' ) ) ); ?> +
+ plugin_slug ]['version']; + $latest_version = $this->get_latest_version( $this->plugin_slug ); + + if ( version_compare( $installed_version, $latest_version, '<' ) ) { ?> +
+ — + %5$s', 'wp-migrate-db' ), $this->plugin_title, $latest_version, $installed_version, $update_url, _x( 'Update Now', 'Download and install a new version of the plugin', 'wp-migrate-db' ) ); ?> +
+ plugin_dir_path ); + + return substr( $path, 0, strrpos( $path, DIRECTORY_SEPARATOR ) ) . DIRECTORY_SEPARATOR; + } + + function is_addon_outdated( $addon_basename ) { + $addon_slug = current( explode( '/', $addon_basename ) ); + + // If pre-1.1.2 version of Media Files addon, then it is outdated + if ( ! isset( $GLOBALS['wpmdb_meta'][ $addon_slug ]['version'] ) ) { + return true; + } + + $installed_version = $GLOBALS['wpmdb_meta'][ $addon_slug ]['version']; + $required_version = $this->addons[ $addon_basename ]['required_version']; + + return version_compare( $installed_version, $required_version, '<' ); + } + + function get_plugin_file_path() { + return $this->plugin_file_path; + } + + /** + * Returns a formatted message dependant on the status of the licence. + * + * @param bool $trans + * @param string $context + * + * @return array|string|void + */ + function get_licence_status_message( $trans = false, $context = null ) { + $licence = $this->get_licence_key(); + $api_response_provided = true; + + if ( empty( $licence ) && ! $trans ) { + $message = sprintf( __( 'Activate Your License — Please enter your license key to enable push and pull functionality, priority support and plugin updates.', 'wp-migrate-db' ), network_admin_url( $this->plugin_base . '#settings' ), 'js-action-link enter-licence' ); + + return $message; + } + + if ( ! $trans ) { + $trans = get_site_transient( 'wpmdb_licence_response' ); + + if ( false === $trans ) { + $trans = $this->check_licence( $licence ); + } + + $trans = json_decode( $trans, true ); + $api_response_provided = false; + } + + if ( isset( $trans['dbrains_api_down'] ) ) { + return __( "We've temporarily activated your license and will complete the activation once the Delicious Brains API is available again.", 'wp-migrate-db' ); + } + + $errors = $trans['errors']; + + $check_licence_again_url = network_admin_url( $this->plugin_base . '&nonce=' . wp_create_nonce( 'wpmdb-check-licence' ) . '&wpmdb-check-licence=1' ); + + if ( isset( $errors['connection_failed'] ) ) { + $disable_ssl_url = network_admin_url( $this->plugin_base . '&nonce=' . wp_create_nonce( 'wpmdb-disable-ssl' ) . '&wpmdb-disable-ssl=1' ); + $message = sprintf( __( 'Could not connect to deliciousbrains.com — You will not receive update notifications or be able to activate your license until this is fixed. This issue is often caused by an improperly configured SSL server (https). We recommend fixing the SSL configuration on your server, but if you need a quick fix you can:%2$s', 'wp-migrate-db' ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/could-not-connect-deliciousbrains-com/', sprintf( '
%2$s
', $disable_ssl_url, __( 'Temporarily disable SSL for connections to deliciousbrains.com', 'wp-migrate-db' ) ) ); + + if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { + $url_parts = $this->parse_url( $this->dbrains_api_base ); + $host = $url_parts['host']; + if ( ! defined( 'WP_ACCESSIBLE_HOSTS' ) || strpos( WP_ACCESSIBLE_HOSTS, $host ) === false ) { + $message = sprintf( __( 'We\'ve detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add %1$s to WP_ACCESSIBLE_HOSTS to continue. More information.', 'wp-migrate-db' ), esc_attr( $host ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/wp_http_block_external/' ); + } + } + + // Don't cache the license response so we can try again + delete_site_transient( 'wpmdb_licence_response' ); + } elseif ( isset( $errors['subscription_cancelled'] ) ) { + $message = sprintf( __( 'Your License Was Cancelled — Please visit My Account to renew or upgrade your license and enable push and pull.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/' ); + $message .= sprintf( '
%s', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ); + } elseif ( isset( $errors['subscription_expired'] ) ) { + + $message_base = sprintf( '%s — ', __( 'Your License Has Expired', 'wp-migrate-db' ) ); + $message_end = sprintf( __( 'Login to My Account to renew. ', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/' ); + $message_end .= sprintf( ' %s', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ); + + $contextual_messages = array( + 'default' => $message_base . $message_end, + 'update' => $message_base . __( 'Updates are only available to those with an active license. ', 'wp-migrate-db' ) . $message_end, + 'addons' => $message_base . __( 'Only active licenses can download and install addons. ', 'wp-migrate-db' ) . $message_end, + 'support' => $message_base . __( 'Only active licenses can submit support requests. ', 'wp-migrate-db' ) . $message_end, + 'licence' => $message_base . __( "All features will continue to work, but you won't be able to receive updates or email support. ", 'wp-migrate-db' ) . $message_end, + ); + + if ( empty( $context ) ) { + $context = 'default'; + } + if ( ! empty( $contextual_messages[ $context ] ) ) { + $message = $contextual_messages[ $context ]; + } elseif ( 'all' === $context ) { + $message = $contextual_messages; + } + } elseif ( isset( $errors['no_activations_left'] ) ) { + $message = sprintf( __( 'No Activations Left — Please visit My Account to upgrade your license or deactivate a previous activation and enable push and pull.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/' ); + $message .= sprintf( ' %s', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ); + } elseif ( isset( $errors['licence_not_found'] ) ) { + if ( ! $api_response_provided ) { + $message = sprintf( __( 'Your License Was Not Found — Perhaps you made a typo when defining your WPMDB_LICENCE constant in your wp-config.php? Please visit My Account to double check your license key.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/' ); + $message .= sprintf( ' %s', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ); + } else { + $error = reset( $errors ); + $message = __( 'Your License Was Not Found — ', 'wp-migrate-db' ); + $message .= $error; + } + } elseif ( isset( $errors['activation_deactivated'] ) ) { + $message = sprintf( '%s — ', __( 'Your License Is Inactive', 'wp-migrate-db' ) ); + $message .= sprintf( '%s %s', __( 'Your license has been deactivated for this install.', 'wp-migrate-db' ), __( 'Reactivate License', 'wp-migrate-db' ) ); + } else { + $error = reset( $errors ); + $message = sprintf( __( 'An Unexpected Error Occurred — Please contact us at %2$s and quote the following:', 'wp-migrate-db' ), 'mailto:nom@deliciousbrains.com', 'nom@deliciousbrains.com' ); + $message .= sprintf( '
%s
', $error ); + } + + return $message; + } + + function set_cli_migration() { + $this->doing_cli_migration = true; + } + + /** + * @param mixed $return Value to be returned as response. + * + * @return null + */ + function end_ajax( $return = false ) { + $return = apply_filters( 'wpmdb_before_response', $return ); + + if ( defined( 'DOING_WPMDB_TESTS' ) || $this->doing_cli_migration ) { + // This function should signal the end of the PHP process, but for CLI it carries on so we need to reset our own usage + // of the wpmdb_before_response filter before another respond_to_* function adds it again. + remove_filter( 'wpmdb_before_response', array( $this, 'scramble' ) ); + + return ( false === $return ) ? null : $return; + } + + echo ( false === $return ) ? '' : $return; + exit; + } + + function check_ajax_referer( $action ) { + if ( defined( 'DOING_WPMDB_TESTS' ) || $this->doing_cli_migration ) { + return; + } + + $result = check_ajax_referer( $action, 'nonce', false ); + + if ( false === $result ) { + $return = array( 'wpmdb_error' => 1, 'body' => sprintf( __( 'Invalid nonce for: %s', 'wp-migrate-db' ), $action ) ); + $this->end_ajax( json_encode( $return ) ); + } + + $cap = ( is_multisite() ) ? 'manage_network_options' : 'export'; + $cap = apply_filters( 'wpmdb_ajax_cap', $cap ); + + if ( ! current_user_can( $cap ) ) { + $return = array( 'wpmdb_error' => 1, 'body' => sprintf( __( 'Access denied for: %s', 'wp-migrate-db' ), $action ) ); + $this->end_ajax( json_encode( $return ) ); + } + } + + // Generates our secret key + function generate_key( $length = 40 ) { + $keyset = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/'; + $key = ''; + + for ( $i = 0; $i < $length; $i ++ ) { + $key .= substr( $keyset, wp_rand( 0, strlen( $keyset ) - 1 ), 1 ); + } + + return $key; + } + + /** + * Returns the wpmdb_bottleneck value in bytes + * + * @param string $type + * + * @return int + */ + function get_bottleneck( $type = 'regular' ) { + $suhosin_limit = false; + $suhosin_request_limit = false; + $suhosin_post_limit = false; + + if ( function_exists( 'ini_get' ) ) { + $suhosin_request_limit = $this->return_bytes( ini_get( 'suhosin.request.max_value_length' ) ); + $suhosin_post_limit = $this->return_bytes( ini_get( 'suhosin.post.max_value_length' ) ); + } + + if ( $suhosin_request_limit && $suhosin_post_limit ) { + $suhosin_limit = min( $suhosin_request_limit, $suhosin_post_limit ); + } + + // we have to account for HTTP headers and other bloating, here we minus 1kb for bloat + $post_max_upper_size = apply_filters( 'wpmdb_post_max_upper_size', 26214400 ); + + $calculated_bottleneck = min( ( $this->get_post_max_size() - 1024 ), $post_max_upper_size ); + + if( 0 >= $calculated_bottleneck ) { + $calculated_bottleneck = $post_max_upper_size; + } + + if ( $suhosin_limit ) { + $calculated_bottleneck = min( $calculated_bottleneck, $suhosin_limit - 1024 ); + } + + if ( $type != 'max' ) { + $calculated_bottleneck = min( $calculated_bottleneck, $this->settings['max_request'] ); + } + + return apply_filters( 'wpmdb_bottleneck', $calculated_bottleneck ); + } + + function return_bytes( $val ) { + if ( is_numeric( $val ) ) { + return $val; + } + + if ( empty( $val ) ) { + return false; + } + + $val = trim( $val ); + $last = strtolower( $val[ strlen( $val ) - 1 ] ); + + switch ( $last ) { + // The 'G' modifier is available since PHP 5.1.0 + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + break; + default : + $val = false; + break; + } + + return $val; + } + + /** + * Returns the php ini value for post_max_size in bytes + * + * @return int + */ + function get_post_max_size() { + return $this->return_bytes( trim( ini_get( 'post_max_size' ) ) ); + } + + /** + * Returns a url string given an associative array as per the output of parse_url. + * + * @param $parsed_url + * + * @return string + */ + function unparse_url( $parsed_url ) { + $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : ''; + $host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : ''; + $port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : ''; + $user = isset( $parsed_url['user'] ) ? $parsed_url['user'] : ''; + $pass = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : ''; + $pass = ( $user || $pass ) ? "$pass@" : ''; + $path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : ''; + $query = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : ''; + $fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : ''; + + return "$scheme$user$pass$host$port$path$query$fragment"; + } + + /** + * Get a simplified url for use as the referrer. + * + * @param $referer_url + * + * @return string + * + * NOTE: mis-spelling intentional to match usage. + */ + function referer_from_url( $referer_url ) { + $url_parts = $this->parse_url( $referer_url ); + + if ( false !== $url_parts ) { + $reduced_url_parts = array_intersect_key( $url_parts, array_flip( array( 'scheme', 'host', 'port', 'path' ) ) ); + if ( ! empty( $reduced_url_parts ) ) { + $referer_url = $this->unparse_url( $reduced_url_parts ); + } + } + + return $referer_url; + } + + /** + * Get a simplified base url without scheme. + * + * @param string $url + * + * @return string + */ + function scheme_less_url( $url ) { + $url_parts = $this->parse_url( $url ); + + if ( false !== $url_parts ) { + $reduced_url_parts = array_intersect_key( $url_parts, array_flip( array( 'host', 'port', 'path', 'user', 'pass' ) ) ); + if ( ! empty( $reduced_url_parts ) ) { + $url = $this->unparse_url( $reduced_url_parts ); + } + } + + return $url; + } + + /** + * Parses a url into its components. Compatible with PHP < 5.4.7. + * + * @param $url string The url to parse. + * + * @return array|false The parsed components or false on error. + */ + function parse_url( $url ) { + $url = trim( $url ); + if ( 0 === strpos( $url, '//' ) ) { + $url = 'http:' . $url; + $no_scheme = true; + } else { + $no_scheme = false; + } + + $parts = parse_url( $url ); + if ( $no_scheme ) { + unset( $parts['scheme'] ); + } + + return $parts; + } + + /** + * Standard notice display check + * Returns dismiss and reminder links html for templates where necessary + * + * @param string $notice The name of the notice e.g. license-key-warning + * @param bool $dismiss If the notice has a dismiss link + * @param bool|int $reminder If the notice has a reminder link, this will be the number of seconds + * + * @return array|bool + */ + function check_notice( $notice, $dismiss = false, $reminder = false ) { + if ( true === apply_filters( 'wpmdb_hide_' . $notice, false ) ) { + return false; + } + global $current_user; + $notice_links = array(); + + if ( $dismiss ) { + if ( get_user_meta( $current_user->ID, 'wpmdb_dismiss_' . $notice ) ) { + return false; + } + $notice_links['dismiss'] = '' . _x( 'Dismiss', 'dismiss notice permanently', 'wp-migrate-db' ) . ''; + } + + if ( $reminder ) { + if ( ( $reminder_set = get_user_meta( $current_user->ID, 'wpmdb_reminder_' . $notice, true ) ) ) { + if ( strtotime( 'now' ) < $reminder_set ) { + return false; + } + } + $notice_links['reminder'] = '' . __( 'Remind Me Later', 'wp-migrate-db' ) . ''; + } + + return ( count( $notice_links ) > 0 ) ? $notice_links : true; + } + + /** + * Performs a schema update if required. + */ + function maybe_schema_update() { + $schema_version = get_site_option( 'wpmdb_schema_version' ); + $update_schema = false; + + /* + * Upgrade this option to a network wide option if the site has been upgraded + * from a regular WordPress installation to a multisite installation. + */ + if ( false === $schema_version && is_multisite() && is_network_admin() ) { + $schema_version = get_option( 'wpmdb_schema_version' ); + if ( false !== $schema_version ) { + update_site_option( 'wpmdb_schema_version', $schema_version ); + delete_option( 'wpmdb_schema_version' ); + } + } + + if ( false === $schema_version ) { + $schema_version = 0; + } + + if ( $schema_version < 1 ) { + $error_log = get_option( 'wpmdb_error_log' ); + // skip multisite installations as we can't use add_site_option because it doesn't include an 'autoload' argument + if ( false !== $error_log && false === is_multisite() ) { + delete_option( 'wpmdb_error_log' ); + add_option( 'wpmdb_error_log', $error_log, '', 'no' ); + } + + $update_schema = true; + $schema_version = 1; + } + + if ( true === $update_schema ) { + update_site_option( 'wpmdb_schema_version', $schema_version ); + } + } + + /** + * Converts file paths that include mixed slashes to use the correct type of slash for the current operating system. + * + * @param $path string + * + * @return string + */ + function slash_one_direction( $path ) { + return str_replace( array( '/', '\\' ), DIRECTORY_SEPARATOR, $path ); + } + + /** + * Returns the table name where the alter statements are held during the migration. + * + * @return string + */ + function get_alter_table_name() { + static $alter_table_name; + + if ( ! empty( $alter_table_name ) ) { + return $alter_table_name; + } + + $alter_table_name = apply_filters( 'wpmdb_alter_table_name', $this->temp_prefix . 'wpmdb_alter_statements' ); + + return $alter_table_name; + } + + /** + * Returns the table name where the alter statements are held during the migration (old "wp_" prefixed style). + * + * @return string + */ + function get_legacy_alter_table_name() { + static $alter_table_name; + + if ( ! empty( $alter_table_name ) ) { + return $alter_table_name; + } + + global $wpdb; + $alter_table_name = apply_filters( 'wpmdb_alter_table_name', $wpdb->base_prefix . 'wpmdb_alter_statements' ); + + return $alter_table_name; + } + + /** + * Save the migration state, and replace the current item to be returned if there is an error. + * + * @param $state mixed + * @param $default mixed The default value to return on success, optional defaults to null. + * + * @return mixed + */ + function save_migration_state( $state, $default = null ) { + if ( ! $this->migration_state->set( $state ) ) { + $error_msg = __( 'Failed to save migration state. Please contact support.', 'wp-migrate-db' ); + $default = array( 'wpmdb_error' => 1, 'body' => $error_msg ); + $this->log_error( $error_msg ); + } + + return $default; + } + + /** + * Restore previous migration state and merge in new information or initialize new migration state. + * + * @param null $id + * + * @return array|bool|mixed|void + */ + function get_migration_state( $id = null ) { + $return = true; + + if ( ! empty( $id ) ) { + $this->migration_state = new WPMDB_Migration_State( $id ); + $state = $this->migration_state->get(); + + if ( empty( $state ) || $this->migration_state->id() !== $id ) { + $error_msg = __( 'Failed to retrieve migration state. Please contact support.', 'wp-migrate-db' ); + $return = array( 'wpmdb_error' => 1, 'body' => $error_msg ); + $this->log_error( $error_msg ); + $return = $this->end_ajax( json_encode( $return ) ); + } else { + $this->state_data = array_merge( $state, $this->state_data ); + + $return = $this->save_migration_state( $this->state_data, $return ); + + if ( ! empty( $return['wpmdb_error'] ) ) { + $return = $this->end_ajax( json_encode( $return ) ); + } + } + } else { + $this->migration_state = new WPMDB_Migration_State(); + } + + return $return; + } + + /** + * Returns the absolute path to the root of the website. + * + * @return string + */ + function get_absolute_root_file_path() { + static $absolute_path; + + if ( ! empty( $absolute_path ) ) { + return $absolute_path; + } + + $absolute_path = rtrim( ABSPATH, '\\/' ); + $site_url = rtrim( site_url( '', 'http' ), '\\/' ); + $home_url = rtrim( home_url( '', 'http' ), '\\/' ); + + if ( $site_url != $home_url ) { + $difference = str_replace( $home_url, '', $site_url ); + if ( strpos( $absolute_path, $difference ) !== false ) { + $absolute_path = rtrim( substr( $absolute_path, 0, - strlen( $difference ) ), '\\/' ); + } + } + + return $absolute_path; + } + + /** + * Returns the function name that called the function using this function. + * + * @return string + */ + function get_caller_function() { + list( , , $caller ) = debug_backtrace( false ); + + if ( ! empty( $caller['function'] ) ) { + $caller = $caller['function']; + } else { + $caller = ''; + } + + return $caller; + } + + /** + * Scramble string. + * + * @param mixed $input String to be scrambled. + * + * @return mixed + */ + function scramble( $input ) { + if ( ! empty( $input ) ) { + $input = 'WPMDB-SCRAMBLED' . str_rot13( $input ); + } + + return $input; + } + + /** + * Unscramble string. + * + * @param mixed $input String to be unscrambled. + * + * @return mixed + */ + function unscramble( $input ) { + if ( ! empty( $input ) && is_string( $input ) ) { + if ( 0 === strpos( $input, 'WPMDB-SCRAMBLED' ) ) { + // If the string begins with WPMDB-SCRAMBED we can unscramble. + // As the scrambled string could be multiple segments of scrambling (from stow) we remove indicators in one go. + $input = str_replace( 'WPMDB-SCRAMBLED', '', $input ); + $input = str_rot13( $input ); + } elseif ( false !== strpos( $input, 'WPMDB-SCRAMBLED' ) ) { + // Starts with non-scrambled data (error), but with scrambled string following. + $pos = strpos( $input, 'WPMDB-SCRAMBLED' ); + $input = substr( $input, 0, $pos ) . $this->unscramble( substr( $input, $pos ) ); + } + } + + return $input; + } + + /** + * Returns HTML for setting a checkbox as checked depending on supplied option value. + * + * @param string|array $option Options value or array containing $option_name as key. + * @param string $option_name If $option is an array, the key that contains the value to be checked. + */ + public function maybe_checked( $option, $option_name = '' ) { + if ( is_array( $option ) && ! empty( $option_name ) && ! empty( $option[ $option_name ] ) ) { + $option = $option[ $option_name ]; + } + echo esc_html( ( ! empty( $option ) && '1' == $option ) ? ' checked="checked"' : '' ); + } + + /** + * Get array of subsite simple urls keyed by their ID. + * + * @return array + */ + public function subsites_list() { + $subsites = array(); + + if ( ! is_multisite() ) { + return $subsites; + } + + $sites = wp_get_sites( array( 'limit' => 0 ) ); + + if ( ! empty( $sites ) ) { + foreach ( $sites as $subsite ) { + $subsites[ $subsite['blog_id'] ] = $this->simple_site_url( get_blogaddress_by_id( $subsite['blog_id'] ) ); + } + } + + return $subsites; + } + + /** + * Returns validated and sanitized form data. + * + * @param array|string $data + * + * @return array|string + * + * This is a base implementation that should be overridden and included with a call to parent before validating form_data contents. + */ + function parse_migration_form_data( $data ) { + parse_str( $data, $form_data ); + // As the magic_quotes_gpc setting affects the output of parse_str() we may need to remove any quote escaping. + // (it uses the same mechanism that PHP > uses to populate the $_GET, $_POST, etc. variables) + if ( get_magic_quotes_gpc() ) { + $form_data = WPMDB_Utils::safe_wp_unslash( $form_data ); + } + + return $form_data; + } + + /** + * Returns the profile value for a given key. + * + * @param string $key + * + * @return mixed + */ + function profile_value( $key ) { + if ( ! empty( $key ) && ! empty( $this->form_data ) && isset( $this->form_data[ $key ] ) ) { + return $this->form_data[ $key ]; + } + + return null; + } + + /** + * Returns a simplified site url (good for identifying subsites). + * + * @param string $site_url + * + * @return string + */ + public function simple_site_url( $site_url ) { + $site_url = untrailingslashit( $this->scheme_less_url( $site_url ) ); + + return $site_url; + } + + /** + * Checks given subsite id or url to see if it exists and returns its blog id. + * + * @param int|string $subsite Blog ID or URL + * @param array $subsites_list Optional array of blog_id => simple urls to use, defaults to result of subsites_list(). + * + * @return bool|string + */ + public function get_subsite_id( $subsite, $subsites_list = array() ) { + if ( ! is_numeric( $subsite ) ) { + $subsite = $this->simple_site_url( $subsite ); + } + + if ( empty( $subsites_list ) ) { + $subsites_list = $this->subsites_list(); + } + + foreach ( $subsites_list as $blog_id => $subsite_path ) { + if ( is_numeric( $subsite ) ) { + if ( $blog_id == $subsite ) { + return $blog_id; + } + } elseif ( $subsite == $subsite_path ) { + return $blog_id; + } + } + + return false; + } + + /** + * Checks given array of subsite ids or urls to see if they exist and returns array of blog ids. + * + * @param array $subsites + * @param array $subsites_list Optional array of blog_id => simple urls to use, defaults to result of subsites_list(). + * + * @return array + * + * Returned array element values will be false if the given value does not correspond to a subsite. + */ + public function get_subsite_ids( $subsites, $subsites_list = array() ) { + if ( empty( $subsites ) ) { + return array(); + } + + if ( ! is_array( $subsites ) ) { + $subsites = array( $subsites ); + } + + foreach ( $subsites as $index => $subsite ) { + $subsites[ $index ] = $this->get_subsite_id( $subsite, $subsites_list ); + } + + return $subsites; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-cli.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-cli.php new file mode 100644 index 00000000..5ce532ad --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-cli.php @@ -0,0 +1,515 @@ +php_version_required, '>=' ) ) { + return; + } + + global $wpmdb; + $this->wpmdb = $wpmdb; + } + + /** + * Checks profile data before CLI migration. + * + * @param int|array $profile Profile key or array. + * + * @return mixed|WP_Error + */ + public function pre_cli_migration_check( $profile ) { + if ( ! version_compare( PHP_VERSION, $this->php_version_required, '>=' ) ) { + return $this->cli_error( sprintf( __( 'CLI addon requires PHP %1$s+', 'wp-migrate-db-cli' ), $this->php_version_required ) ); + } + + if ( is_array( $profile ) ) { + $query_str = http_build_query( $profile ); + $profile = $this->wpmdb->parse_migration_form_data( $query_str ); + $profile = wp_parse_args( + $profile, + array( + 'save_computer' => '0', + 'gzip_file' => '0', + 'replace_guids' => '0', + 'exclude_transients' => '0', + 'exclude_spam' => '0', + 'keep_active_plugins' => '0', + 'compatibility_older_mysql' => '0', + ) + ); + } + + $this->profile = $profile = apply_filters( 'wpmdb_cli_profile_before_migration', $profile ); + + if ( is_wp_error( $profile ) ) { + return $profile; + } + + return true; + } + + /** + * Performs CLI migration given a profile data. + * + * @param int|array $profile Profile key or array. + * + * @return bool|WP_Error Returns true if succeed or WP_Error if failed. + */ + public function cli_migration( $profile ) { + $pre_check = $this->pre_cli_migration_check( $profile ); + if ( is_wp_error( $pre_check ) ) { + return $pre_check; + } + + // At this point, $profile has been checked a retrieved into $this->profile, so should not be used in this function any further. + if ( empty( $this->profile ) ) { + return $this->cli_error( __( 'Profile not found or unable to be generated from params.', 'wp-migrate-db-cli' ) ); + } + unset( $profile ); + + $this->set_time_limit(); + $this->wpmdb->set_cli_migration(); + + if ( 'savefile' === $this->profile['action'] ) { + $this->post_data['intent'] = 'savefile'; + if ( ! empty( $this->profile['export_dest'] ) ) { + $this->post_data['export_dest'] = $this->profile['export_dest']; + } else { + $this->post_data['export_dest'] = 'ORIGIN'; + } + } + + // Check for tables specified in migration profile that do not exist in the source database + if ( ! empty( $this->profile['select_tables'] ) ) { + $source_tables = apply_filters( 'wpmdb_cli_filter_source_tables', $this->get_tables() ); + + if ( ! empty( $source_tables ) ) { + // Return error if selected tables do not exist in source database + $nonexistent_tables = array(); + foreach ( $this->profile['select_tables'] as $table ) { + if ( ! in_array( $table, $source_tables ) ) { + $nonexistent_tables[] = $table; + } + } + + if ( ! empty( $nonexistent_tables ) ) { + $local_or_remote = ( 'pull' === $this->profile['action'] ) ? 'remote' : 'local'; + + return $this->cli_error( sprintf( __( 'The following table(s) do not exist in the %1$s database: %2$s', 'wp-migrate-db-cli' ), $local_or_remote, implode( ', ', $nonexistent_tables ) ) ); + } + } + } + + $this->profile = apply_filters( 'wpmdb_cli_filter_before_cli_initiate_migration', $this->profile ); + if ( is_wp_error( $this->profile ) ) { + return $this->profile; + } + + $this->migration = $this->cli_initiate_migration(); + if ( is_wp_error( $this->migration ) ) { + return $this->migration; + } + + $this->post_data['migration_state_id'] = $this->migration['migration_state_id']; + + $tables_to_process = $this->migrate_tables(); + if ( is_wp_error( $tables_to_process ) ) { + return $tables_to_process; + } + + $this->post_data['tables'] = implode( ',', $tables_to_process ); + + $finalize = $this->finalize_migration(); + if ( is_wp_error( $finalize ) || 'savefile' === $this->profile['action'] ) { + return $finalize; + } + + return true; + } + + /** + * Verify CLI response from endpoint. + * + * @param string $response Response from endpoint. + * @param string $function_name Name of called function. + * + * @return WP_Error|string + */ + function verify_cli_response( $response, $function_name ) { + $response = trim( $response ); + if ( false === $response ) { + return $this->cli_error( $this->error ); + } + + if ( false === $this->wpmdb->is_json( $response ) ) { + return $this->cli_error( sprintf( __( 'We were expecting a JSON response, instead we received: %2$s (function name: %1$s)', 'wp-migrate-db-cli' ), $function_name, $response ) ); + } + + $response = json_decode( $response, true ); + if ( isset( $response['wpmdb_error'] ) ) { + return $this->cli_error( $response['body'] ); + } + + // Display warnings and non fatal error messages as CLI warnings without aborting. + if ( isset( $response['wpmdb_warning'] ) || isset( $response['wpmdb_non_fatal_error'] ) ) { + $body = ( isset ( $response['cli_body'] ) ) ? $response['cli_body'] : $response['body']; + $messages = maybe_unserialize( $body ); + foreach ( ( array ) $messages as $message ) { + if ( $message ) { + WP_CLI::warning( self::cleanup_message( $message ) ); + } + } + } + + return $response; + } + + /** + * Return instance of WP_Error. + * + * @param string $message Error message. + * + * @return WP_Error. + */ + function cli_error( $message ) { + return new WP_Error( 'wpmdb_cli_error', self::cleanup_message( $message ) ); + } + + /** + * Cleanup message, replacing
with \n and removing HTML. + * + * @param string $message Error message. + * + * @return string $message. + */ + static function cleanup_message( $message ) { + $message = html_entity_decode( $message, ENT_QUOTES ); + $message = preg_replace( '##', "\n", $message ); + $message = trim( strip_tags( $message ) ); + + return $message; + } + + /** + * Initiates migration and verifies result + * + * @return array|WP_Error + */ + function cli_initiate_migration() { + do_action( 'wpmdb_cli_before_initiate_migration', $this->profile ); + + WP_CLI::log( __( 'Initiating migration...', 'wp-migrate-db-cli' ) ); + + $migration_args = $this->post_data; + $migration_args['form_data'] = http_build_query( $this->profile ); + $migration_args['stage'] = 'migrate'; + $this->post_data = apply_filters( 'wpmdb_cli_initiate_migration_args', $migration_args, $this->profile ); + + $response = $this->initiate_migration( $this->post_data ); + + $initiate_migration_response = $this->verify_cli_response( $response, 'initiate_migration()' ); + if ( ! is_wp_error( $initiate_migration_response ) ) { + $initiate_migration_response = apply_filters( 'wpmdb_cli_initiate_migration_response', $initiate_migration_response ); + } + + return $initiate_migration_response; + } + + /** + * Determine which tables to migrate + * + * @return array|WP_Error + */ + function get_tables_to_migrate() { + $tables_to_migrate = $this->get_tables( 'prefix' ); + + return apply_filters( 'wpmdb_cli_tables_to_migrate', $tables_to_migrate, $this->profile, $this->migration ); + } + + /** + * Returns a WP-CLI progress bar instance + * + * @param array $tables + * @param int $stage + * + * @return \cli\progress\Bar + */ + function get_progress_bar( $tables, $stage ) { + + $progress_label = __( 'Exporting tables', 'wp-migrate-db-cli' ); + + $progress_label = apply_filters( 'wpmdb_cli_progress_label', $progress_label, $stage, $tables ); + + $progress_label = str_pad( $progress_label, 20, ' ' ); + + $count = $this->get_total_rows_from_table_list( $tables, $stage ); + + return new \cli\progress\Bar( $progress_label, $count ); + } + + /** + * Returns total rows from list of tables + * + * @param array $tables + * @param int $stage + * + * @return Int + */ + function get_total_rows_from_table_list( $tables, $stage ) { + static $cached_results = array(); + + if ( isset( $cached_results[ $stage ] ) ) { + return $cached_results[ $stage ]; + } + + $table_rows = $this->get_row_counts_from_table_list( $tables, $stage ); + $cached_results[ $stage ] = array_sum( array_intersect_key( $table_rows, array_flip( $tables ) ) ); + + return $cached_results[ $stage ]; + } + + /** + * Returns row counts from list of tables + * + * @param array $tables + * @param int $stage + * + * @return mixed + */ + function get_row_counts_from_table_list( $tables, $stage ) { + static $cached_results = array(); + + if ( isset( $cached_results[ $stage ] ) ) { + return $cached_results[ $stage ]; + } + + $local_table_rows = $this->wpmdb->get_table_row_count(); + $cached_results[ $stage ] = apply_filters( 'wpmdb_cli_get_row_counts_from_table_list', $local_table_rows, $stage ); + + return $cached_results[ $stage ]; + } + + /** + * @return array|mixed|string|void|WP_Error + */ + function migrate_tables() { + $tables_to_migrate = $this->get_tables_to_migrate(); + + $tables = $tables_to_migrate; + $stage_iterator = 2; + + $filtered_vars = apply_filters( 'wpmdb_cli_filter_before_migrate_tables', array( 'tables' => $tables, 'stage_iterator' => $stage_iterator ) ); + if ( ! is_array( $filtered_vars ) ) { + return $filtered_vars; + } else { + extract( $filtered_vars, EXTR_OVERWRITE ); + } + + if ( empty( $tables ) ) { + return $this->cli_error( __( 'No tables selected for migration.', 'wp-migrate-db' ) ); + } + + $table_rows = $this->get_row_counts_from_table_list( $tables, $stage_iterator ); + + do_action( 'wpmdb_cli_before_migrate_tables', $this->profile, $this->migration ); + + $notify = $this->get_progress_bar( $tables, $stage_iterator ); + $args = $this->post_data; + + do { + $migration_progress = 0; + + foreach ( $tables as $key => $table ) { + $current_row = -1; + $primary_keys = ''; + $table_progress = 0; + $table_progress_last = 0; + + $args['table'] = $table; + $args['last_table'] = ( $key == count( $tables ) - 1 ) ? '1' : '0'; + + do { + // reset the current chunk + $this->wpmdb->empty_current_chunk(); + + $args['current_row'] = $current_row; + $args['primary_keys'] = $primary_keys; + $args = apply_filters( 'wpmdb_cli_migrate_table_args', $args, $this->profile, $this->migration ); + + $response = $this->migrate_table( $args ); + + $migrate_table_response = $this->verify_cli_response( $response, 'migrate_table()' ); + + if ( is_wp_error( $migrate_table_response ) ) { + return $migrate_table_response; + } + + $migrate_table_response = apply_filters( 'wpmdb_cli_migrate_table_response', $migrate_table_response, $_POST, $this->profile, $this->migration ); + + $current_row = $migrate_table_response['current_row']; + $primary_keys = $migrate_table_response['primary_keys']; + + $last_migration_progress = $migration_progress; + + if ( -1 == $current_row ) { + $migration_progress -= $table_progress; + $migration_progress += $table_rows[ $table ]; + } else { + if ( 0 === $table_progress_last ) { + $table_progress_last = $current_row; + $table_progress = $table_progress_last; + $migration_progress += $table_progress_last; + } else { + $iteration_progress = $current_row - $table_progress_last; + $table_progress_last = $current_row; + $table_progress += $iteration_progress; + $migration_progress += $iteration_progress; + } + } + + $increment = $migration_progress - $last_migration_progress; + + $notify->tick( $increment ); + + } while ( -1 != $current_row ); + } + + $notify->finish(); + + ++$stage_iterator; + $args['stage'] = 'migrate'; + $tables = $tables_to_migrate; + $table_rows = $this->get_row_counts_from_table_list( $tables, $stage_iterator ); + + if ( $stage_iterator < 3 ) { + $notify = $this->get_progress_bar( $tables, $stage_iterator ); + } + } while ( $stage_iterator < 3 ); + + $this->post_data = $args; + + return $tables; + } + + /** + * Finalize migration + * + * @return bool|WP_Error + */ + function finalize_migration() { + do_action( 'wpmdb_cli_before_finalize_migration', $this->profile, $this->migration ); + + WP_CLI::log( __( 'Cleaning up...', 'wp-migrate-db-cli' ) ); + + $finalize = apply_filters( 'wpmdb_cli_finalize_migration', true, $this->profile, $this->migration ); + if ( is_wp_error( $finalize ) ) { + return $finalize; + } + + $this->post_data = apply_filters( 'wpmdb_cli_finalize_migration_args', $this->post_data, $this->profile, $this->migration ); + + if ( 'savefile' === $this->post_data['intent'] ) { + return $this->finalize_export(); + } + + $response = null; + $response = apply_filters( 'wpmdb_cli_finalize_migration_response', $response ); + if ( ! empty( $response ) && '1' !== $response ) { + return $this->cli_error( $response ); + } + + do_action( 'wpmdb_cli_after_finalize_migration', $this->profile, $this->migration ); + + return true; + } + + /** + * Stub for ajax_initiate_migration() + * + * @param array|bool $args + * + * @return string + */ + function initiate_migration( $args = false ) { + $_POST = $args; + $response = $this->wpmdb->ajax_initiate_migration(); + + return $response; + } + + /** + * stub for ajax_migrate_table() + * + * @param array|bool $args + * + * @return string + */ + function migrate_table( $args = false ) { + $_POST = $args; + $response = $this->wpmdb->ajax_migrate_table(); + + return $response; + } + + /** + * Finalize Export by moving file to specified destination + * + * @return string|error + */ + function finalize_export() { + $state_data = $this->wpmdb->state_data; + $temp_file = $state_data['dump_path']; + if ( 'ORIGIN' === $state_data['export_dest'] ) { + $response = $temp_file; + } else { + $dest_file = $state_data['export_dest']; + if ( file_exists( $temp_file ) && rename( $temp_file, $dest_file ) ) { + $response = $dest_file; + } else { + $response = $this->cli_error( __( 'Unable to move exported file.', 'wp-migrate-db' ) ); + } + } + + return $response; + } + + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-command.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-command.php new file mode 100644 index 00000000..b7aa1505 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-command.php @@ -0,0 +1,226 @@ + + * : A file path to export to. Filename will be modified to end in .sql or + * .sql.gz if necessary. + * + * [--find=] + * : A comma separated list of strings to find when performing a string find + * and replace across the database. + * + * Table names should be quoted as needed, i.e. when using a comma in the + * find/replace string. + * + * The --replace= argument should be used in conjunction to specify + * the replace values for the strings found using this argument. The number + * of strings specified in this argument should match the number passed into + * --replace= argument. + * + * [--replace=] + * : A comma separated list of replace value strings to implement when + * performing a string find & replace across the database. + * + * Should be used in conjunction with the --find= argument, see it's + * documentation for further explanation of the find & replace functionality. + * + * [--exclude-post-revisions] + * : Exclude post revisions from export. + * + * [--skip-replace-guids] + * : Do not perform a find & replace on the guid column in the wp_posts table. + * + * [--exclude-spam] + * : Exclude spam comments. + * + * [--gzip-file] + * : GZip compress export file. + * + * [--include-transients] + * : Include transients (temporary cached data). + * + * ## EXAMPLES + * + * wp migratedb export ./migratedb.sql \ + * --find=http://dev.bradt.ca,/Users/bradt/home/bradt.ca + * --replace=http://bradt.ca,/home/bradt.ca + * + * @param array $args + * @param array $assoc_args + */ + public function export( $args, $assoc_args ) { + + $assoc_args['action'] = 'savefile'; + $assoc_args['export_dest'] = trim( $args[0] ); + + if ( empty( $assoc_args['export_dest'] ) ) { + WP_CLI::error( WPMDB_CLI::cleanup_message( __( 'You must provide a destination filename.', 'wp-migrate-db-cli' ) ) ); + } + + $profile = $this->_get_profile_data_from_args( $args, $assoc_args ); + + if ( is_wp_error( $profile ) ) { + WP_CLI::error( $profile ); + } + + $this->_perform_cli_migration( $profile ); + } + + + /** + * Get profile data from CLI args. + * + * @param array $args + * @param array $assoc_args + * + * @return array|WP_Error + */ + protected function _get_profile_data_from_args( $args, $assoc_args ) { + + //load correct cli class + if ( function_exists( 'wp_migrate_db_pro_cli_addon' ) ){ + $wpmdb_cli = wp_migrate_db_pro_cli_addon(); + } + elseif ( function_exists( 'wpmdb_pro_cli' ) ) { + $wpmdb_cli = wpmdb_pro_cli(); + } else { + $wpmdb_cli = wpmdb_cli(); + } + + if ( empty( $assoc_args['action'] ) ) { + return $wpmdb_cli->cli_error( __( 'Missing action parameter', 'wp-migrate-db-cli' ) ); + } + + if ( 'savefile' === $assoc_args['action'] && ! empty( $assoc_args['export_dest'] ) ) { + $export_dest = $assoc_args['export_dest']; + } + + $action = $assoc_args['action']; + + // --find= and --replace= + $replace_old = array(); + $replace_new = array(); + if ( ! empty( $assoc_args['find'] ) ) { + $replace_old = str_getcsv( $assoc_args['find'] ); + } + if ( ! empty( $assoc_args['replace'] ) ) { + $replace_new = str_getcsv( $assoc_args['replace'] ); + } + if ( count( $replace_old ) !== count( $replace_new ) ) { + return $wpmdb_cli->cli_error( sprintf( __( '%1$s and %2$s must contain the same number of values', 'wp-migrate-db-cli' ), '--find', '--replace' ) ); + } + array_unshift( $replace_old, '' ); + array_unshift( $replace_new, '' ); + + // --exclude-spam + $exclude_spam = intval( isset( $assoc_args['exclude-spam'] ) ); + + // --gzip-file + $gzip_file = intval( isset( $assoc_args['gzip-file'] ) ); + + $select_post_types = array(); + + // --exclude-post-revisions + if ( ! empty( $assoc_args['exclude-post-revisions'] ) ) { + $select_post_types[] = 'revision'; + } + + $exclude_post_types = count( $select_post_types ) > 0 ? 1 : 0; + + // --skip-replace-guids + $replace_guids = 1; + if ( isset( $assoc_args['skip-replace-guids'] ) ) { + $replace_guids = 0; + } + + $select_tables = array(); + $table_migrate_option = 'migrate_only_with_prefix'; + + // --include-transients. + $exclude_transients = intval( ! isset( $assoc_args['include-transients'] ) ); + + //cleanup filename for exports + if ( ! empty( $export_dest ) ) { + if ( $gzip_file ) { + if ( 'gz' !== pathinfo( $export_dest, PATHINFO_EXTENSION ) ) { + if ( 'sql' === pathinfo( $export_dest, PATHINFO_EXTENSION ) ) { + $export_dest .= '.gz'; + } else { + $export_dest .= '.sql.gz'; + } + } + } elseif ( 'sql' !== pathinfo( $export_dest, PATHINFO_EXTENSION ) ) { + $export_dest = preg_replace( '/(\.sql)?(\.gz)?$/i', '', $export_dest ) . '.sql'; + } + + // ensure export destination is writable + if ( ! @touch( $export_dest ) ) { + return $wpmdb_cli->cli_error( sprintf( __( 'Cannot write to file "%1$s". Please ensure that the specified directory exists and is writable.', 'wp-migrate-db-cli' ), $export_dest ) ); + } + + } + + $profile = compact( + 'action', + 'replace_old', + 'table_migrate_option', + 'replace_new', + 'select_tables', + 'exclude_post_types', + 'select_post_types', + 'replace_guids', + 'exclude_spam', + 'gzip_file', + 'exclude_transients', + 'export_dest' + ); + + $profile = apply_filters( 'wpmdb_cli_filter_get_profile_data_from_args', $profile, $args, $assoc_args ); + + return $profile; + } + + + /** + * Perform CLI migration. + * + * @param mixed $profile Profile key or array + * + * @return void + */ + protected function _perform_cli_migration( $profile ) { + $wpmdb_cli = null; + + //load correct cli class + if ( function_exists( 'wpmdb_pro_cli' ) ) { + $wpmdb_cli = wpmdb_pro_cli(); + } else { + $wpmdb_cli = wpmdb_cli(); + } + + if ( empty( $wpmdb_cli ) ) { + WP_CLI::error( __( 'WP Migrate DB CLI class not available.', 'wp-migrate-db-cli' ) ); + return; + } + + $result = $wpmdb_cli->cli_migration( $profile ); + + if ( ! is_wp_error( $result ) ) { + WP_CLI::success( sprintf( __( 'Export saved to: %s', 'wp-migrate-db-cli' ), $result ) ); + } elseif ( is_wp_error( $result ) ) { + WP_CLI::error( WPMDB_CLI::cleanup_message( $result->get_error_message() ) ); + } + } + +} + +WP_CLI::add_command( 'migratedb', 'WPMDB_Command' ); diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-filesystem.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-filesystem.php new file mode 100644 index 00000000..211c9ab9 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-filesystem.php @@ -0,0 +1,527 @@ +maybe_init_wp_filesystem(); + } + } + + // Set default permissions + if ( defined( 'FS_CHMOD_DIR' ) ) { + $this->chmod_dir = FS_CHMOD_DIR; + } else { + $this->chmod_dir = ( fileperms( ABSPATH ) & 0777 | 0755 ); + } + + if ( defined( 'FS_CHMOD_FILE' ) ) { + $this->chmod_file = FS_CHMOD_FILE; + } else { + $this->chmod_file = ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ); + } + } + + /** + * Getter for the instantiated WP_Filesystem + * + * @return WP_Filesystem|false + * + * This should be used carefully since $wp_filesystem won't always have a value. + */ + public function get_wp_filesystem() { + if ( $this->use_filesystem ) { + return $this->wp_filesystem; + } else { + return false; + } + } + + /** + * Is WP_Filesystem being used? + * + * @return bool + */ + public function using_wp_filesystem() { + return $this->use_filesystem; + } + + /** + * Attempts to use the correct path for the FS method being used + * + * @param string $abs_path + * + * @return string + */ + public function get_sanitized_path( $abs_path ) { + if ( $this->using_wp_filesystem() ) { + return str_replace( ABSPATH, $this->wp_filesystem->abspath(), $abs_path ); + } + + return $abs_path; + } + + /** + * Attempt to initiate WP_Filesystem + * + * If this fails, $use_filesystem is set to false and all methods in this class should use native php fallbacks + * Thwarts `request_filesystem_credentials()` attempt to display a form for obtaining creds from users + * + * TODO: provide notice and input in wp-admin for users when this fails + */ + public function maybe_init_wp_filesystem() { + ob_start(); + $this->credentials = request_filesystem_credentials( '', '', false, false, null ); + $ob_contents = ob_get_contents(); + ob_end_clean(); + + if ( wp_filesystem( $this->credentials ) ) { + global $wp_filesystem; + $this->wp_filesystem = $wp_filesystem; + $this->use_filesystem = true; + } + } + + /** + * Create file if not exists then set mtime and atime on file + * + * @param string $abs_path + * @param int $time + * @param int $atime + * + * @return bool + */ + public function touch( $abs_path, $time = 0, $atime = 0 ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + if ( $this->use_filesystem ) { + return $this->wp_filesystem->touch( $abs_path, $time, $atime ); + } else { + if ( 0 == $time ) { + $time = time(); + } + if ( 0 == $atime ) { + $atime = time(); + } + + return @touch( $abs_path, $time, $atime ); + } + } + + /** + * file_put_contents with chmod + * + * @param string $abs_path + * @param string $contents + * + * @return bool + */ + public function put_contents( $abs_path, $contents ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->put_contents( $abs_path, $contents, $this->chmod_file ); + } else { + $return = @file_put_contents( $abs_path, $contents ); + $this->chmod( $abs_path ); + + return (bool) $return; + } + } + + /** + * Does the specified file or dir exist + * + * @param string $abs_path + * + * @return bool + */ + public function file_exists( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->exists( $abs_path ); + } else { + return file_exists( $abs_path ); + } + } + + /** + * Get a file's size + * + * @param string $abs_path + * + * @return int + */ + public function filesize( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->size( $abs_path ); + } else { + return filesize( $abs_path ); + } + } + + /** + * Get the contents of a file as a string + * + * @param string $abs_path + * + * @return string + */ + public function get_contents( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->get_contents( $abs_path ); + } else { + return @file_get_contents( $abs_path ); + } + } + + /** + * Delete a file + * + * @param string $abs_path + * + * @return bool + */ + public function unlink( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->delete( $abs_path, false, false ); + } else { + return @unlink( $abs_path ); + } + } + + /** + * chmod a file + * + * @param string $abs_path + * @param int $perms + * + * @return bool + * + * Leave $perms blank to use $this->chmod_file/DIR or pass value like 0777 + */ + public function chmod( $abs_path, $perms = null ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( is_null( $perms ) ) { + $perms = $this->is_file( $abs_path ) ? $this->chmod_file : $this->chmod_dir; + } + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->chmod( $abs_path, $perms, false ); + } else { + return @chmod( $abs_path, $perms ); + } + } + + /** + * Is the specified pat a directory? + * + * @param string $abs_path + * + * @return bool + */ + public function is_dir( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->is_dir( $abs_path ); + } else { + return is_dir( $abs_path ); + } + } + + /** + * Is the specified path a file? + * + * @param string $abs_path + * + * @return bool + */ + public function is_file( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->is_file( $abs_path ); + } else { + return is_file( $abs_path ); + } + } + + /** + * Is the specified path readable + * + * @param string $abs_path + * + * @return bool + */ + public function is_readable( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->is_readable( $abs_path ); + } else { + return is_readable( $abs_path ); + } + } + + /** + * Is the specified path writable + * + * @param string $abs_path + * + * @return bool + */ + public function is_writable( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->is_writable( $abs_path ); + } else { + return is_writable( $abs_path ); + } + } + + /** + * Recursive mkdir + * + * @param string $abs_path + * @param int $perms + * + * @return bool + */ + public function mkdir( $abs_path, $perms = null ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( is_null( $perms ) ) { + $perms = $this->chmod_dir; + } + + if ( $this->is_dir( $abs_path ) ) { + return true; + } else { + if ( $this->use_filesystem ) { + // WP_Filesystem doesn't offer a recursive mkdir() + $abs_path = str_replace( '//', '/', $abs_path ); + $abs_path = rtrim( $abs_path, '/' ); + if ( empty( $abs_path ) ) { + $abs_path = '/'; + } + + $dirs = explode( '/', ltrim( $abs_path, '/' ) ); + $current_dir = ''; + + foreach ( $dirs as $dir ) { + $current_dir .= '/' . $dir; + if ( ! $this->is_dir( $current_dir ) ) { + $this->wp_filesystem->mkdir( $current_dir, $perms ); + } + } + + return $this->is_dir( $abs_path ); + } else { + return @mkdir( $abs_path, $perms, true ); + } + } + } + + /** + * Delete a directory + * + * @param string $abs_path + * @param bool $recursive + * + * @return bool + */ + public function rmdir( $abs_path, $recursive = false ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( ! $this->is_dir( $abs_path ) ) { + return false; + } + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->rmdir( $abs_path, $recursive ); + } else { + + // taken from WP_Filesystem_Direct + if ( ! $recursive ) { + return @rmdir( $abs_path ); + } + + // At this point it's a folder, and we're in recursive mode + $abs_path = trailingslashit( $abs_path ); + $filelist = $this->scandir( $abs_path ); + + $retval = true; + if ( is_array( $filelist ) ) { + foreach ( $filelist as $filename => $fileinfo ) { + + if ( 'd' === $fileinfo['type'] ) { + $retval = $this->rmdir( $abs_path . $filename, $recursive ); + } else { + $retval = $this->unlink( $abs_path . $filename ); + } + } + } + + if ( file_exists( $abs_path ) && ! @rmdir( $abs_path ) ) { + $retval = false; + } + + return $retval; + } + + return false; + } + + /** + * Get a list of files/folders under specified directory + * + * @param $abs_path + * + * @return array|bool + */ + public function scandir( $abs_path ) { + $abs_path = $this->get_sanitized_path( $abs_path ); + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->dirlist( $abs_path, true, false ); + } else { + $dirlist = @scandir( $abs_path ); + if ( false === $dirlist ) { + return false; + } + $return = array(); + + // normalize return to look somewhat like the return value for WP_Filesystem::dirlist + foreach ( $dirlist as $entry ) { + if ( '.' === $entry || '..' === $entry ) { + continue; + } + $return[ $entry ] = array( + 'name' => $entry, + 'type' => $this->is_dir( $abs_path . '/' . $entry ) ? 'd' : 'f', + ); + } + + return $return; + } + } + + /** + * Light wrapper for move_uploaded_file with chmod + * + * @param string $file + * @param string $destination + * @param int $perms + * + * @return bool + * + * TODO: look into replicating more functionality from wp_handle_upload() + */ + public function move_uploaded_file( $file, $destination, $perms = null ) { + $return = @move_uploaded_file( $file, $destination ); + + if ( $return ) { + $this->chmod( $destination, $perms ); + } + + return $return; + } + + /** + * Copy a file + * + * @param string $source_abs_path + * @param string $destination_abs_path + * @param bool $overwrite + * @param int $perms + * + * @return bool + * + * Taken from WP_Filesystem_Direct + */ + public function copy( $source_abs_path, $destination_abs_path, $overwrite = false, $perms = false ) { + $source_abs_path = $this->get_sanitized_path( $source_abs_path ); + $destination_abs_path = $this->get_sanitized_path( $destination_abs_path ); + + // error if source file doesn't exist + if ( ! $this->file_exists( $source_abs_path ) ) { + return false; + } + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->copy( $source_abs_path, $destination_abs_path, $overwrite, $perms ); + } else { + if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) { + return false; + } + + $rtval = copy( $source_abs_path, $destination_abs_path ); + if ( $perms ) { + $this->chmod( $destination_abs_path, $perms ); + } + + return $rtval; + } + } + + /** + * Move a file + * + * @param string $source_abs_path + * @param string $destination_abs_path + * @param bool $overwrite + * + * @return bool + */ + public function move( $source_abs_path, $destination_abs_path, $overwrite = false ) { + $source_abs_path = $this->get_sanitized_path( $source_abs_path ); + $destination_abs_path = $this->get_sanitized_path( $destination_abs_path ); + + // error if source file doesn't exist + if ( ! $this->file_exists( $source_abs_path ) ) { + return false; + } + + if ( $this->use_filesystem ) { + return $this->wp_filesystem->move( $source_abs_path, $destination_abs_path, $overwrite ); + } else { + + // Try using rename first. if that fails (for example, source is read only) try copy. + // Taken in part from WP_Filesystem_Direct + if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) { + return false; + } elseif ( @rename( $source_abs_path, $destination_abs_path ) ) { + return true; + } else { + if ( $this->copy( $source_abs_path, $destination_abs_path, $overwrite ) && $this->exists( $destination_abs_path ) ) { + $this->unlink( $source_abs_path ); + + return true; + } else { + return false; + } + } + } + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-migration-state.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-migration-state.php new file mode 100644 index 00000000..68dccc81 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-migration-state.php @@ -0,0 +1,299 @@ +_option( $id ), false, false ); + + if ( false !== $value ) { + $this->_id = $id; + $this->_value = $value; + } + } + } + + /** + * Returns the unique id of the instance. + * + * @return string + */ + function id() { + if ( empty( $this->_id ) ) { + $this->_id = uniqid(); + } + + return $this->_id; + } + + /** + * Returns the site option string used to save the migration state. + * + * @param string $id + * + * @return string + */ + private function _option( $id = null ) { + if ( empty( $id ) ) { + $id = $this->id(); + } + + return self::OPTION_PREFIX . $id; + } + + /** + * Returns the site option string used to save the migration state timeout. + * + * @param string $id + * + * @return string + */ + private function _timeout_option( $id = null ) { + if ( empty( $id ) ) { + $id = $this->id(); + } + + return self::TIMEOUT_PREFIX . $id; + } + + /** + * Set the migration state. + * + * @param $value + * + * @return bool + */ + function set( $value ) { + if ( $this->_update_timeout() && update_site_option( $this->_option(), $value ) ) { + return true; + } + + // If nothing changed it's still OK. + if ( $this->get() === $value ) { + return true; + } + + return false; + } + + /** + * Updates the companion timeout setting to the current migration state option. + * + * @return bool + */ + private function _update_timeout() { + $value = time() + self::EXPIRATION; + + if ( update_site_option( $this->_timeout_option(), $value ) ) { + return true; + } + + // If nothing changed it's still OK. + if ( get_site_option( $this->_timeout_option(), false, false ) == $value ) { + return true; + } + + return false; + } + + /** + * Returns the current saved migration state. + * + * @return mixed + */ + function get() { + return get_site_option( $this->_option(), false, false ); + } + + /** + * Deletes the site options for migration state and its companion timeout record. + * + * @param $id + * + * @return bool + */ + private static function _delete_id( $id ) { + if ( false === get_site_option( self::OPTION_PREFIX . $id, false, false ) || delete_site_option( self::OPTION_PREFIX . $id ) ) { + delete_site_option( self::TIMEOUT_PREFIX . $id ); + + return true; + } + + return false; + } + + /** + * Delete the current migration state. + * + * @return bool + */ + function delete() { + return $this->_delete_id( $this->id() ); + } + + /** + * Get all migration state ids that have timed out. + * + * @param int $timeout Optional UNIX timestamp for timeout, default of 0 uses current timestamp. + * + * @return array + */ + private static function _timed_out_ids( $timeout = 0 ) { + global $wpdb; + + $ids = array(); + + if ( empty( $timeout ) ) { + $timeout = time(); + } + + if ( is_multisite() ) { + $timeout_keys = $wpdb->get_col( + $wpdb->prepare( + "SELECT meta_key FROM {$wpdb->sitemeta} WHERE site_id = %d AND meta_key like %s AND meta_value < %d", + $wpdb->siteid, + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%', + $timeout + ) + ); + } else { + $timeout_keys = $wpdb->get_col( + $wpdb->prepare( + "SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s and option_value < %d", + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%', + $timeout + ) + ); + } + + if ( ! empty( $timeout_keys ) ) { + $id_start = strlen( self::TIMEOUT_PREFIX ); + + foreach ( $timeout_keys as $timeout_key ) { + $ids[] = substr( $timeout_key, $id_start ); + } + } + + return $ids; + } + + /** + * Get all migration state ids that have no time out companion. + * + * @return array + */ + private static function _orphaned_ids() { + global $wpdb; + + $ids = array(); + + if ( is_multisite() ) { + $keys = $wpdb->get_col( + $wpdb->prepare( " + SELECT meta_key + FROM {$wpdb->sitemeta} + WHERE site_id = %d + AND meta_key LIKE %s + AND meta_key NOT LIKE %s + AND meta_key NOT IN ( + SELECT CONCAT(%s, SUBSTR(meta_key, %d)) + FROM {$wpdb->sitemeta} + WHERE site_id = %d + AND meta_key LIKE %s + ) + ", + $wpdb->siteid, + addcslashes( self::OPTION_PREFIX, '_' ) . '%', + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%', + self::OPTION_PREFIX, + strlen( self::TIMEOUT_PREFIX ) + 1, + $wpdb->siteid, + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%' + ) + ); + } else { + $keys = $wpdb->get_col( + $wpdb->prepare( " + SELECT option_name + FROM $wpdb->options + WHERE option_name LIKE %s + AND option_name NOT LIKE %s + AND option_name NOT IN ( + SELECT CONCAT(%s, SUBSTR(option_name, %d)) + FROM $wpdb->options + WHERE option_name LIKE %s + ) + ", + addcslashes( self::OPTION_PREFIX, '_' ) . '%', + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%', + self::OPTION_PREFIX, + strlen( self::TIMEOUT_PREFIX ) + 1, + addcslashes( self::TIMEOUT_PREFIX, '_' ) . '%' + ) + ); + } + + if ( ! empty( $keys ) ) { + $id_start = strlen( self::OPTION_PREFIX ); + + foreach ( $keys as $key ) { + $ids[] = substr( $key, $id_start ); + } + } + + return $ids; + } + + /** + * returns count of all migration state records that have timed out. + * + * @param int $timeout Optional UNIX timestamp for timeout, default of 0 uses current timestamp. + * + * @return int + */ + static function cleanup_count( $timeout = 0 ) { + return count( self::_timed_out_ids( $timeout ) ) + count( self::_orphaned_ids() ); + } + + /** + * Remove all migration state records that have timed out or are orphaned from their timeout companion. + * + * @param int $timeout Optional UNIX timestamp for timeout, default of 0 uses current timestamp. + * + * @return int Count of successfully cleaned up options. + */ + static function cleanup( $timeout = 0 ) { + $count = 0; + + $timed_out_ids = self::_timed_out_ids( $timeout ); + + if ( ! empty( $timed_out_ids ) ) { + foreach ( $timed_out_ids as $id ) { + if ( self::_delete_id( $id ) ) { + $count ++; + } + } + } + + $orphaned_ids = self::_orphaned_ids(); + + if ( ! empty( $orphaned_ids ) ) { + foreach ( $orphaned_ids as $id ) { + if ( self::_delete_id( $id ) ) { + $count ++; + } + } + } + + return $count; + } +} \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-replace.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-replace.php new file mode 100644 index 00000000..3c84ac73 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-replace.php @@ -0,0 +1,257 @@ +table = $args['table']; + $this->search = $args['search']; + $this->replace = $args['replace']; + $this->intent = $args['intent']; + $this->base_domain = $args['base_domain']; + $this->site_domain = $args['site_domain']; + $this->wpmdb = $args['wpmdb']; + } + + /** + * Determine whether to apply a subdomain replace over each value in the database. + * + * @return bool + */ + function is_subdomain_replaces_on() { + if ( ! isset( $this->subdomain_replaces_on ) ) { + $this->subdomain_replaces_on = ( is_multisite() && is_subdomain_install() && apply_filters( 'wpmdb_subdomain_replace', true ) ); + } + + return $this->subdomain_replaces_on; + } + + /** + * Automatically replace URLs for subdomain based multisite installations + * e.g. //site1.example.com -> //site1.example.local for site with domain example.com + * NB: only handles the current network site, does not work for additional networks / mapped domains + * + * @param $new + * + * @return mixed + */ + function subdomain_replaces( $new ) { + if ( empty( $this->base_domain ) ) { + return $new; + } + + $pattern = '|//(.*?)\\.' . preg_quote( $this->site_domain, '|' ) . '|'; + $replacement = '//$1.' . trim( $this->base_domain ); + $new = preg_replace( $pattern, $replacement, $new ); + + return $new; + } + + /** + * Applies find/replace pairs to a given string. + * + * @param string $subject + * + * @return string + */ + function apply_replaces( $subject ) { + $new = str_ireplace( $this->search, $this->replace, $subject, $count ); + if ( $this->is_subdomain_replaces_on() ) { + $new = $this->subdomain_replaces( $new ); + } + + return $new; + } + + /** + * Take a serialized array and unserialize it replacing elements as needed and + * unserialising any subordinate arrays and performing the replace on those too. + * + * Mostly from https://github.com/interconnectit/Search-Replace-DB + * + * @param mixed $data Used to pass any subordinate arrays back to in. + * @param bool $serialized Does the array passed via $data need serialising. + * @param bool $parent_serialized Passes whether the original data passed in was serialized + * @param bool $filtered Should we apply before and after filters successively + * + * @return mixed The original array with all elements replaced as needed. + */ + function recursive_unserialize_replace( $data, $serialized = false, $parent_serialized = false, $filtered = true ) { + $pre = apply_filters( 'wpmdb_pre_recursive_unserialize_replace', false, $data, $this ); + if ( false !== $pre ) { + return $pre; + } + + $is_json = false; + $before_fired = false; + $successive_filter = $filtered; + + if ( true === $filtered ) { + list( $data, $before_fired, $successive_filter ) = apply_filters( 'wpmdb_before_replace_custom_data', array( $data, $before_fired, $successive_filter ), $this ); + } + + // some unserialized data cannot be re-serialized eg. SimpleXMLElements + try { + if ( is_string( $data ) && ( $unserialized = @unserialize( $data ) ) !== false ) { + // PHP currently has a bug that doesn't allow you to clone the DateInterval / DatePeriod classes. + // We skip them here as they probably won't need data to be replaced anyway + if ( is_object( $unserialized ) ) { + if ( $unserialized instanceof DateInterval || $unserialized instanceof DatePeriod ) { + return $data; + } + } + $data = $this->recursive_unserialize_replace( $unserialized, true, true, $successive_filter ); + } elseif ( is_array( $data ) ) { + $_tmp = array(); + foreach ( $data as $key => $value ) { + $_tmp[ $key ] = $this->recursive_unserialize_replace( $value, false, $parent_serialized, $successive_filter ); + } + + $data = $_tmp; + unset( $_tmp ); + } elseif ( is_object( $data ) ) { // Submitted by Tina Matter + $_tmp = clone $data; + foreach ( $data as $key => $value ) { + // Integer properties are crazy and the best thing we can do is to just ignore them. + // see http://stackoverflow.com/a/10333200 and https://github.com/deliciousbrains/wp-migrate-db-pro/issues/853 + if ( is_int( $key ) ) { + continue; + } + $_tmp->$key = $this->recursive_unserialize_replace( $value, false, $parent_serialized, $successive_filter ); + } + + $data = $_tmp; + unset( $_tmp ); + } elseif ( $this->wpmdb->is_json( $data, true ) ) { + $_tmp = array(); + $data = json_decode( $data, true ); + + foreach ( $data as $key => $value ) { + $_tmp[ $key ] = $this->recursive_unserialize_replace( $value, false, $parent_serialized, $successive_filter ); + } + + $data = $_tmp; + unset( $_tmp ); + $is_json = true; + } elseif ( is_string( $data ) ) { + list( $data, $do_replace ) = apply_filters( 'wpmdb_replace_custom_data', array( $data, true ), $this ); + + if ( $do_replace ) { + $data = $this->apply_replaces( $data ); + } + } + + if ( $is_json ) { + $data = json_encode( $data ); + } + + if ( $serialized ) { + $data = serialize( $data ); + } + } catch ( Exception $error ) { + $error_msg = __( 'Failed attempting to do the recursive unserialize replace. Please contact support.', 'wp-migrate-db' ); + $error_details = $error->getMessage() . "\n\n"; + $error_details .= var_export( $data, true ); + $this->wpmdb->log_error( $error_msg, $error_details ); + } + + if ( true === $filtered ) { + $data = apply_filters( 'wpmdb_after_replace_custom_data', $data, $before_fired, $this ); + } + + return $data; + } + + /** + * Getter for the $table class property. + * + * @return string Name of the table currently being processed in the migration. + */ + public function get_table() { + return $this->table; + } + + /** + * Getter for the $column class property. + * + * @return string Name of the column currently being processed in the migration. + */ + public function get_column() { + return $this->column; + } + + /** + * Getter for the $row class property. + * + * @return string Name of the row currently being processed in the migration. + */ + public function get_row() { + return $this->row; + } + + /** + * Setter for the $column class property. + * + * @param string $column Name of the column currently being processed in the migration. + */ + public function set_column( $column ) { + $this->column = $column; + } + + /** + * Setter for the $row class property. + * + * @param string $row Name of the row currently being processed in the migration. + */ + public function set_row( $row ) { + $this->row = $row; + } + + /** + * Multsite safe way of comparing the table currently being processed in the migration against a desired table. + * + * The table prefix should be omitted, example: + * + * $is_posts = $this->table_is( 'posts' ); + * + * @param string $desired_table Name of the desired table, table prefix omitted. + * + * @return boolean Whether or not the desired table is the table currently being processed. + */ + public function table_is( $desired_table ) { + return $this->wpmdb->table_is( $desired_table, $this->table ); + } + + /** + * Intent of the current replace migration. + * + * Helpful for hookers who need to know what intent they are working on. + * + * @return string Intent of the current migration + */ + public function get_intent() { + return $this->intent; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-sanitize.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-sanitize.php new file mode 100644 index 00000000..9ced28e0 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-sanitize.php @@ -0,0 +1,158 @@ + $value ) { + // If a key does not have a rule it's not ours and can be removed. + // We should not fail if there is extra data as plugins like Polylang add their own data to each ajax request. + if ( ! array_key_exists( $key, $key_rules ) ) { + unset( $data[ $key ] ); + continue; + } + $data[ $key ] = WPMDB_Sanitize::_sanitize_data( $value, $key_rules[ $key ], $context, ( $recursion_level + 1 ) ); + } + } elseif ( is_array( $key_rules ) ) { + foreach ( $key_rules as $rule ) { + $data = WPMDB_Sanitize::_sanitize_data( $data, $rule, $context, ( $recursion_level + 1 ) ); + } + } else { + // Neither $data or $key_rules are a first level array so can be analysed. + if ( 'array' == $key_rules ) { + if ( ! is_array( $data ) ) { + wp_die( sprintf( __( '%1$s was expecting an array but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + } elseif ( 'string' == $key_rules ) { + if ( ! is_string( $data ) ) { + wp_die( sprintf( __( '%1$s was expecting a string but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + } elseif ( 'key' == $key_rules ) { + $key_name = sanitize_key( $data ); + if ( $key_name !== $data ) { + wp_die( sprintf( __( '%1$s was expecting a valid key but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = $key_name; + } elseif ( 'text' == $key_rules ) { + $text = sanitize_text_field( $data ); + if ( $text !== $data ) { + wp_die( sprintf( __( '%1$s was expecting text but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = $text; + } elseif ( 'serialized' == $key_rules ) { + if ( ! is_string( $data ) || ! is_serialized( $data ) ) { + wp_die( sprintf( __( '%1$s was expecting serialized data but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + } elseif ( 'numeric' == $key_rules ) { + if ( ! is_numeric( $data ) ) { + wp_die( sprintf( __( '%1$s was expecting a valid numeric but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + } elseif ( 'int' == $key_rules ) { + // As we are sanitizing form data, even integers are within a string. + if ( ! is_numeric( $data ) || (int) $data != $data ) { + wp_die( sprintf( __( '%1$s was expecting an integer but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = (int) $data; + } elseif ( 'positive_int' == $key_rules ) { + if ( ! is_numeric( $data ) || (int) $data != $data || 0 > $data ) { + wp_die( sprintf( __( '%1$s was expecting a positive number (int) but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = floor( $data ); + } elseif ( 'negative_int' == $key_rules ) { + if ( ! is_numeric( $data ) || (int) $data != $data || 0 < $data ) { + wp_die( sprintf( __( '%1$s was expecting a negative number (int) but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = ceil( $data ); + } elseif ( 'zero_int' == $key_rules ) { + if ( ! is_numeric( $data ) || (int) $data != $data || 0 !== $data ) { + wp_die( sprintf( __( '%1$s was expecting 0 (int) but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = 0; + } elseif ( 'empty' == $key_rules ) { + if ( ! empty( $data ) ) { + wp_die( sprintf( __( '%1$s was expecting an empty value but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + } elseif ( 'url' == $key_rules ) { + $url = esc_url_raw( $data ); + if ( empty( $url ) ) { + wp_die( sprintf( __( '%1$s was expecting a URL but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = $url; + } elseif ( 'bool' == $key_rules ) { + $bool = sanitize_key( $data ); + if ( empty( $bool ) || ! in_array( $bool, array( 'true', 'false' ) ) ) { + wp_die( sprintf( __( '%1$s was expecting a bool but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) ); + + return false; + } + $data = $bool; + } else { + wp_die( sprintf( __( 'Unknown sanitization rule "%1$s" supplied by %2$s', 'wp-db-migrate-pro' ), $key_rules, $context ) ); + + return false; + } + } + + return $data; + } +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-utils.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-utils.php new file mode 100644 index 00000000..331607e6 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb-utils.php @@ -0,0 +1,80 @@ +id ) { + return false; + } + + return true; + } + + /** + * Checks if another version of WPMDB(Pro) is active and deactivates it. + * To be hooked on `activated_plugin` so other plugin is deactivated when current plugin is activated. + * + * @param string $plugin + * + */ + public static function deactivate_other_instances( $plugin ) { + if ( ! in_array( basename( $plugin ), array( 'wp-migrate-db-pro.php', 'wp-migrate-db.php' ) ) ) { + return; + } + + $plugin_to_deactivate = 'wp-migrate-db.php'; + $deactivated_notice_id = '1'; + if ( basename( $plugin ) == $plugin_to_deactivate ) { + $plugin_to_deactivate = 'wp-migrate-db-pro.php'; + $deactivated_notice_id = '2'; + } + + if ( is_multisite() ) { + $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() ); + $active_plugins = array_keys( $active_plugins ); + } else { + $active_plugins = (array) get_option( 'active_plugins', array() ); + } + + foreach ( $active_plugins as $basename ) { + if ( false !== strpos( $basename, $plugin_to_deactivate ) ) { + set_transient( 'wp_migrate_db_deactivated_notice_id', $deactivated_notice_id, 1 * HOUR_IN_SECONDS ); + deactivate_plugins( $basename ); + + return; + } + } + } + + /** + * Use wp_unslash if available, otherwise fall back to stripslashes_deep + * + * @param string|array $arg + * + * @return string|array + */ + public static function safe_wp_unslash( $arg ){ + if ( function_exists( 'wp_unslash' ) ) { + return wp_unslash( $arg ); + } else { + return stripslashes_deep( $arg ); + } + } + +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb.php new file mode 100644 index 00000000..71ada40c --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/class/wpmdb.php @@ -0,0 +1,2889 @@ +plugin_version = $GLOBALS['wpmdb_meta'][ $this->core_slug ]['version']; + + $this->max_insert_string_len = 50000; // 50000 is the default as defined by PhpMyAdmin + + add_filter( 'plugin_action_links_' . $this->plugin_basename, array( $this, 'plugin_action_links' ) ); + add_filter( 'network_admin_plugin_action_links_' . $this->plugin_basename, array( $this, 'plugin_action_links' ) ); + + // internal AJAX handlers + add_action( 'wp_ajax_wpmdb_delete_migration_profile', array( $this, 'ajax_delete_migration_profile' ) ); + add_action( 'wp_ajax_wpmdb_save_profile', array( $this, 'ajax_save_profile' ) ); + add_action( 'wp_ajax_wpmdb_initiate_migration', array( $this, 'ajax_initiate_migration' ) ); + add_action( 'wp_ajax_wpmdb_migrate_table', array( $this, 'ajax_migrate_table' ) ); + add_action( 'wp_ajax_wpmdb_finalize_migration', array( $this, 'ajax_finalize_migration' ) ); + add_action( 'wp_ajax_wpmdb_flush', array( $this, 'ajax_flush' ) ); + add_action( 'wp_ajax_nopriv_wpmdb_flush', array( $this, 'ajax_nopriv_flush' ) ); // Required for Pull if user tables being updated. + add_action( 'wp_ajax_wpmdb_clear_log', array( $this, 'ajax_clear_log' ) ); + add_action( 'wp_ajax_wpmdb_get_log', array( $this, 'ajax_get_log' ) ); + add_action( 'wp_ajax_wpmdb_fire_migration_complete', array( $this, 'fire_migration_complete' ) ); + add_action( 'wp_ajax_wpmdb_plugin_compatibility', array( $this, 'ajax_plugin_compatibility' ) ); + add_action( 'wp_ajax_wpmdb_blacklist_plugins', array( $this, 'ajax_blacklist_plugins' ) ); + add_action( 'wp_ajax_wpmdb_update_max_request_size', array( $this, 'ajax_update_max_request_size' ) ); + add_action( 'wp_ajax_wpmdb_update_delay_between_requests', array( $this, 'ajax_update_delay_between_requests' ) ); + add_action( 'wp_ajax_wpmdb_cancel_migration', array( $this, 'ajax_cancel_migration' ) ); + + $this->absolute_root_file_path = $this->get_absolute_root_file_path(); + + $this->accepted_fields = array( + 'action', + 'save_computer', + 'gzip_file', + 'connection_info', + 'replace_old', + 'replace_new', + 'table_migrate_option', + 'select_tables', + 'replace_guids', + 'exclude_spam', + 'save_migration_profile', + 'save_migration_profile_option', + 'create_new_profile', + 'create_backup', + 'remove_backup', + 'keep_active_plugins', + 'select_post_types', + 'backup_option', + 'select_backup', + 'exclude_transients', + 'exclude_post_types', + 'exclude_post_revisions', + 'compatibility_older_mysql', + 'export_dest', + 'pause_before_finalize', + ); + + $this->default_profile = array( + 'action' => 'savefile', + 'save_computer' => '1', + 'gzip_file' => '1', + 'table_migrate_option' => 'migrate_only_with_prefix', + 'replace_guids' => '1', + 'default_profile' => true, + 'name' => '', + 'select_tables' => array(), + 'select_post_types' => array(), + 'backup_option' => 'backup_only_with_prefix', + 'exclude_transients' => '1', + 'compatibility_older_mysql' => '1', + ); + + $this->checkbox_options = array( + 'save_computer' => '0', + 'gzip_file' => '0', + 'replace_guids' => '0', + 'exclude_spam' => '0', + 'keep_active_plugins' => '0', + 'create_backup' => '0', + 'exclude_post_types' => '0', + 'compatibility_older_mysql' => '0', + 'pause_before_finalize' => '0', + ); + + $this->plugin_tabs = array( + '' . esc_html( _x( 'Migrate', 'Configure a migration or export', 'wp-migrate-db' ) ) . '', + '' . esc_html( _x( 'Settings', 'Plugin configuration and preferences', 'wp-migrate-db' ) ) . '', + '' . esc_html( _x( 'Help', 'Get help or contact support', 'wp-migrate-db' ) ) . '', + ); + + // display a notice when either WP Migrate DB or WP Migrate DB Pro is automatically deactivated + add_action( 'pre_current_active_plugins', array( $this, 'plugin_deactivated_notice' ) ); + + // check if WP Engine is filtering the buffer and prevent it + add_action( 'plugins_loaded', array( $this, 'maybe_disable_wp_engine_filtering' ) ); + + // this is how many DB rows are processed at a time, allow devs to change this value + $this->rows_per_segment = apply_filters( 'wpmdb_rows_per_segment', $this->rows_per_segment ); + + if ( is_multisite() ) { + add_action( 'network_admin_menu', array( $this, 'network_admin_menu' ) ); + /* + * The URL find & replace is locked down (delete & reorder disabled) on multisite installations as we require the URL + * of the remote site for export migrations. This URL is parsed into its various components and + * used to change values in the 'domain' & 'path' columns in the wp_blogs and wp_site tables. + */ + $this->lock_url_find_replace_row = true; + } else { + add_action( 'admin_menu', array( $this, 'admin_menu' ) ); + } + } + + /** + * Returns a fragment of SQL for creating the table where the alter statements are held during the migration. + * + * @return string + */ + function get_create_alter_table_query() { + if ( ! is_null( $this->create_alter_table_query ) ) { + return $this->create_alter_table_query; + } + + $legacy_alter_table_name = $this->get_legacy_alter_table_name(); + $this->create_alter_table_query = sprintf( "DROP TABLE IF EXISTS `%s`;\n", $legacy_alter_table_name ); + + $alter_table_name = $this->get_alter_table_name(); + $this->create_alter_table_query .= sprintf( "DROP TABLE IF EXISTS `%s`;\n", $alter_table_name ); + $this->create_alter_table_query .= sprintf( "CREATE TABLE `%s` ( `query` LONGTEXT NOT NULL );\n", $alter_table_name ); + $this->create_alter_table_query = apply_filters( 'wpmdb_create_alter_table_query', $this->create_alter_table_query ); + + return $this->create_alter_table_query; + } + + function get_short_uploads_dir() { + $short_path = str_replace( $this->absolute_root_file_path, '', $this->get_upload_info( 'path' ) ); + + return trailingslashit( substr( str_replace( '\\', '/', $short_path ), 1 ) ); + } + + /** + * Handler for ajax request to turn on or off Compatibility Mode. + */ + function ajax_plugin_compatibility() { + $key_rules = array( + 'action' => 'key', + 'install' => 'numeric', + ); + $this->set_post_data( $key_rules ); + + $mu_dir = ( defined( 'WPMU_PLUGIN_DIR' ) && defined( 'WPMU_PLUGIN_URL' ) ) ? WPMU_PLUGIN_DIR : trailingslashit( WP_CONTENT_DIR ) . 'mu-plugins'; + $source = trailingslashit( $this->plugin_dir_path ) . 'compatibility/wp-migrate-db-pro-compatibility.php'; + $dest = trailingslashit( $mu_dir ) . 'wp-migrate-db-pro-compatibility.php'; + if ( '1' === trim( $this->state_data['install'] ) ) { // install MU plugin + if ( ! wp_mkdir_p( $mu_dir ) ) { + printf( esc_html__( 'The following directory could not be created: %s', 'wp-migrate-db' ), $mu_dir ); + exit; + } + + if ( ! copy( $source, $dest ) ) { + printf( esc_html__( 'Could not copy the compatibility plugin from %1$s to %2$s', 'wp-migrate-db' ), $source, $dest ); + exit; + } + } else { // uninstall MU plugin + // TODO: Use WP_Filesystem API. + if ( file_exists( $dest ) && ! unlink( $dest ) ) { + printf( esc_html__( 'Could not remove the compatibility plugin from %s', 'wp-migrate-db' ), $dest ); + exit; + } + } + exit; + } + + /** + * Handler for updating the plugins that are not to be loaded during a request (Compatibility Mode). + */ + function ajax_blacklist_plugins() { + $key_rules = array( + 'action' => 'key', + 'blacklist_plugins' => 'array', + ); + $this->set_post_data( $key_rules ); + + $this->settings['blacklist_plugins'] = (array) $this->state_data['blacklist_plugins']; + update_site_option( 'wpmdb_settings', $this->settings ); + exit; + } + + /** + * Updates the Maximum Request Size setting. + * + * @return void + */ + function ajax_update_max_request_size() { + $this->check_ajax_referer( 'update-max-request-size' ); + + $key_rules = array( + 'action' => 'key', + 'max_request_size' => 'positive_int', + 'nonce' => 'key', + ); + $this->set_post_data( $key_rules ); + + $this->settings['max_request'] = (int) $this->state_data['max_request_size'] * 1024; + $result = update_site_option( 'wpmdb_settings', $this->settings ); + $this->end_ajax( $result ); + } + + /** + * Updates the Delay Between Requests setting. + * + * @return void + */ + function ajax_update_delay_between_requests() { + $this->check_ajax_referer( 'update-delay-between-requests' ); + + $key_rules = array( + 'action' => 'key', + 'delay_between_requests' => 'positive_int', + 'nonce' => 'key', + ); + $this->set_post_data( $key_rules ); + + $this->settings['delay_between_requests'] = (int) $this->state_data['delay_between_requests']; + $result = update_site_option( 'wpmdb_settings', $this->settings ); + $this->end_ajax( $result ); + } + + function is_json( $string, $strict = false ) { + $json = @json_decode( $string, true ); + if ( $strict == true && ! is_array( $json ) ) { + return false; + } + + return ! ( $json == null || $json == false ); + } + + function get_sql_dump_info( $migration_type, $info_type ) { + if ( empty( $this->session_salt ) ) { + $this->session_salt = strtolower( wp_generate_password( 5, false, false ) ); + } + $datetime = date( 'YmdHis' ); + $ds = ( $info_type == 'path' ? DIRECTORY_SEPARATOR : '/' ); + $dump_info = sprintf( '%s%s%s-%s-%s-%s.sql', $this->get_upload_info( $info_type ), $ds, sanitize_title_with_dashes( DB_NAME ), $migration_type, $datetime, $this->session_salt ); + + return ( $info_type == 'path' ? $this->slash_one_direction( $dump_info ) : $dump_info ); + } + + /** + * Returns validated and sanitized form data. + * + * @param array|string $data + * + * @return array|string + */ + function parse_migration_form_data( $data ) { + $form_data = parent::parse_migration_form_data( $data ); + + $this->accepted_fields = apply_filters( 'wpmdb_accepted_profile_fields', $this->accepted_fields ); + $form_data = array_intersect_key( $form_data, array_flip( $this->accepted_fields ) ); + unset( $form_data['replace_old'][0] ); + unset( $form_data['replace_new'][0] ); + + if ( ! isset( $form_data['replace_old'] ) ) { + $form_data['replace_old'] = array(); + } + if ( ! isset( $form_data['replace_new'] ) ) { + $form_data['replace_new'] = array(); + } + + if ( isset( $form_data['exclude_post_revisions'] ) ) { + $form_data['exclude_post_types'] = '1'; + $form_data['select_post_types'][] = 'revision'; + $form_data['select_post_types'] = array_unique( $form_data['select_post_types'] ); + unset( $form_data['exclude_post_revisions'] ); + } + + return $form_data; + } + + /** + * Adds settings link to plugin page + * + * @param array $links + * + * @return array $links + */ + function plugin_action_links( $links ) { + $link = sprintf( '%s', network_admin_url( $this->plugin_base ) . '#settings', _x( 'Settings', 'Plugin configuration and preferences', 'wp-migrate-db' ) ); + array_unshift( $links, $link ); + + return $links; + } + + function ajax_clear_log() { + $this->check_ajax_referer( 'clear-log' ); + delete_site_option( 'wpmdb_error_log' ); + $result = $this->end_ajax(); + + return $result; + } + + function ajax_get_log() { + $this->check_ajax_referer( 'get-log' ); + ob_start(); + $this->output_diagnostic_info(); + $this->output_log_file(); + $return = ob_get_clean(); + $result = $this->end_ajax( $return ); + + return $result; + } + + function output_log_file() { + $this->load_error_log(); + if ( isset( $this->error_log ) ) { + echo $this->error_log; + } + } + + /** + * Outputs diagnostic info for debugging. + * + * Outputs useful diagnostic info text at the Diagnostic Info & Error Log + * section under the Help tab so the information can be viewed or + * downloaded and shared for debugging. + * + * If you would like to add additional diagnostic information use the + * `wpmdb_diagnostic_info` action hook (see {@link https://developer.wordpress.org/reference/functions/add_action/}). + * + * + * add_action( 'wpmdb_diagnostic_info', 'my_diagnostic_info' ) { + * echo "Additional Diagnostic Info: \r\n"; + * echo "...\r\n"; + * } + * + * + * @return void + */ + function output_diagnostic_info() { + global $wpdb; + $table_prefix = $wpdb->base_prefix; + + echo 'site_url(): '; + echo esc_html( site_url() ); + echo "\r\n"; + + echo 'home_url(): '; + echo esc_html( home_url() ); + echo "\r\n"; + + echo 'Database Name: '; + echo esc_html( $wpdb->dbname ); + echo "\r\n"; + + echo 'Table Prefix: '; + echo esc_html( $table_prefix ); + echo "\r\n"; + + echo 'WordPress: '; + echo bloginfo( 'version' ); + if ( is_multisite() ) { + echo ' Multisite'; + } + echo "\r\n"; + + echo 'Web Server: '; + echo esc_html( ! empty( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' ); + echo "\r\n"; + + echo 'PHP: '; + if ( function_exists( 'phpversion' ) ) { + echo esc_html( phpversion() ); + } + echo "\r\n"; + + echo 'MySQL: '; + echo esc_html( empty( $wpdb->use_mysqli ) ? mysql_get_server_info() : mysqli_get_server_info( $wpdb->dbh ) ); + echo "\r\n"; + + echo 'ext/mysqli: '; + echo empty( $wpdb->use_mysqli ) ? 'no' : 'yes'; + echo "\r\n"; + + echo 'WP Memory Limit: '; + echo esc_html( WP_MEMORY_LIMIT ); + echo "\r\n"; + + echo 'Blocked External HTTP Requests: '; + if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) { + echo 'None'; + } else { + $accessible_hosts = ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) ? WP_ACCESSIBLE_HOSTS : ''; + + if ( empty( $accessible_hosts ) ) { + echo 'ALL'; + } else { + echo 'Partially (Accessible Hosts: ' . esc_html( $accessible_hosts ) . ')'; + } + } + echo "\r\n"; + + echo 'WPMDB Bottleneck: '; + echo esc_html( size_format( $this->get_bottleneck() ) ); + echo "\r\n"; + + echo 'WP Locale: '; + echo esc_html( get_locale() ); + echo "\r\n"; + + echo 'DB Charset: '; + echo esc_html( DB_CHARSET ); + echo "\r\n"; + + if ( function_exists( 'ini_get' ) && $suhosin_limit = ini_get( 'suhosin.post.max_value_length' ) ) { + echo 'Suhosin Post Max Value Length: '; + echo esc_html( is_numeric( $suhosin_limit ) ? size_format( $suhosin_limit ) : $suhosin_limit ); + echo "\r\n"; + } + + if ( function_exists( 'ini_get' ) && $suhosin_limit = ini_get( 'suhosin.request.max_value_length' ) ) { + echo 'Suhosin Request Max Value Length: '; + echo esc_html( is_numeric( $suhosin_limit ) ? size_format( $suhosin_limit ) : $suhosin_limit ); + echo "\r\n"; + } + + echo 'Debug Mode: '; + echo esc_html( ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ? 'Yes' : 'No' ); + echo "\r\n"; + + echo 'WP Max Upload Size: '; + echo esc_html( size_format( wp_max_upload_size() ) ); + echo "\r\n"; + + echo 'PHP Post Max Size: '; + echo esc_html( size_format( $this->get_post_max_size() ) ); + echo "\r\n"; + + echo 'PHP Time Limit: '; + if ( function_exists( 'ini_get' ) ) { + echo esc_html( ini_get( 'max_execution_time' ) ); + } + echo "\r\n"; + + echo 'PHP Error Log: '; + if ( function_exists( 'ini_get' ) ) { + echo esc_html( ini_get( 'error_log' ) ); + } + echo "\r\n"; + + echo 'fsockopen: '; + if ( function_exists( 'fsockopen' ) ) { + echo 'Enabled'; + } else { + echo 'Disabled'; + } + echo "\r\n"; + + echo 'OpenSSL: '; + if ( $this->open_ssl_enabled() ) { + echo esc_html( OPENSSL_VERSION_TEXT ); + } else { + echo 'Disabled'; + } + echo "\r\n"; + + echo 'cURL: '; + if ( function_exists( 'curl_init' ) ) { + echo 'Enabled'; + } else { + echo 'Disabled'; + } + echo "\r\n"; + + echo 'Enable SSL verification setting: '; + if ( 1 == $this->settings['verify_ssl'] ) { + echo 'Yes'; + } else { + echo 'No'; + } + echo "\r\n"; + + echo 'Compatibility Mode: '; + if ( isset( $GLOBALS['wpmdb_compatibility'] ) ) { + echo 'Yes'; + } else { + echo 'No'; + } + echo "\r\n"; + + echo 'Delay Between Requests: '; + $delay_between_requests = $this->settings['delay_between_requests']; + $delay_between_requests = $delay_between_requests > 0 ? $delay_between_requests / 1000 : $delay_between_requests; + echo esc_html( $delay_between_requests ) . ' s'; + echo "\r\n\r\n"; + + do_action( 'wpmdb_diagnostic_info' ); + if ( has_action( 'wpmdb_diagnostic_info' ) ) { + echo "\r\n"; + } + + $theme_info = wp_get_theme(); + echo "Active Theme Name: " . esc_html( $theme_info->Name ) . "\r\n"; + echo "Active Theme Folder: " . esc_html( basename( $theme_info->get_stylesheet_directory() ) ) . "\r\n"; + if ( $theme_info->get( 'Template' ) ) { + echo "Parent Theme Folder: " . esc_html( $theme_info->get( 'Template' ) ) . "\r\n"; + } + if ( ! file_exists( $theme_info->get_stylesheet_directory() ) ) { + echo "WARNING: Active Theme Folder Not Found\r\n"; + } + + echo "\r\n"; + + echo "Active Plugins:\r\n"; + + if ( isset( $GLOBALS['wpmdb_compatibility'] ) ) { + remove_filter( 'option_active_plugins', 'wpmdbc_exclude_plugins' ); + remove_filter( 'site_option_active_sitewide_plugins', 'wpmdbc_exclude_site_plugins' ); + $blacklist = array_flip( (array) $this->settings['blacklist_plugins'] ); + } else { + $blacklist = array(); + } + + $active_plugins = (array) get_option( 'active_plugins', array() ); + + if ( is_multisite() ) { + $network_active_plugins = wp_get_active_network_plugins(); + $active_plugins = array_map( array( $this, 'remove_wp_plugin_dir' ), $network_active_plugins ); + } + + foreach ( $active_plugins as $plugin ) { + $suffix = ( isset( $blacklist[ $plugin ] ) ) ? '*' : ''; + $this->print_plugin_details( WP_PLUGIN_DIR . '/' . $plugin, $suffix ); + } + + if ( isset( $GLOBALS['wpmdb_compatibility'] ) ) { + add_filter( 'option_active_plugins', 'wpmdbc_exclude_plugins' ); + add_filter( 'site_option_active_sitewide_plugins', 'wpmdbc_exclude_site_plugins' ); + } + + $mu_plugins = wp_get_mu_plugins(); + if ( $mu_plugins ) { + echo "\r\n"; + + echo "Must-use Plugins:\r\n"; + + foreach ( $mu_plugins as $mu_plugin ) { + $this->print_plugin_details( $mu_plugin ); + } + } + } + + function print_plugin_details( $plugin_path, $suffix = '' ) { + $plugin_data = get_plugin_data( $plugin_path ); + if ( empty( $plugin_data['Name'] ) ) { + return; + } + + printf( "%s%s (v%s) by %s\r\n", $plugin_data['Name'], $suffix, $plugin_data['Version'], $plugin_data['AuthorName'] ); + } + + function remove_wp_plugin_dir( $name ) { + $plugin = str_replace( WP_PLUGIN_DIR, '', $name ); + + return substr( $plugin, 1 ); + } + + function get_alter_queries() { + global $wpdb; + $alter_table_name = $this->get_alter_table_name(); + $sql = ''; + $alter_queries = $wpdb->get_results( "SELECT * FROM `{$alter_table_name}`", ARRAY_A ); + if ( ! empty( $alter_queries ) ) { + foreach ( $alter_queries as $alter_query ) { + $sql .= $alter_query['query'] . "\n"; + } + } + + return $sql; + } + + function process_chunk( $chunk ) { + // prepare db + global $wpdb; + $this->set_time_limit(); + + $queries = array_filter( explode( ";\n", $chunk ) ); + array_unshift( $queries, "SET sql_mode='NO_AUTO_VALUE_ON_ZERO';" ); + + ob_start(); + $wpdb->show_errors(); + + if ( empty( $wpdb->charset ) ) { + $charset = ( defined( 'DB_CHARSET' ) ? DB_CHARSET : 'utf8' ); + $wpdb->charset = $charset; + $wpdb->set_charset( $wpdb->dbh, $wpdb->charset ); + } + + foreach ( $queries as $query ) { + if ( false === $wpdb->query( $query ) ) { + $return = ob_get_clean(); + $return = array( 'wpmdb_error' => 1, 'body' => $return ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + } + + return true; + } + + /** + * Called for each database table to be migrated. + * + * @return string + */ + function ajax_migrate_table() { + $this->check_ajax_referer( 'migrate-table' ); + + $key_rules = array( + 'action' => 'key', + 'migration_state_id' => 'key', + 'table' => 'string', + 'stage' => 'key', + 'current_row' => 'numeric', + 'last_table' => 'string', + 'primary_keys' => 'string', + 'gzip' => 'int', + 'nonce' => 'key', + 'bottleneck' => 'positive_int', + 'prefix' => 'string', + 'path_current_site' => 'string', + 'domain_current_site' => 'text', + ); + $this->set_post_data( $key_rules ); + + global $wpdb; + + $this->form_data = $this->parse_migration_form_data( $this->state_data['form_data'] ); + + $result = ''; + + // checks if we're performing a backup, if so, continue with the backup and exit immediately after + if ( $this->state_data['stage'] == 'backup' && $this->state_data['intent'] != 'savefile' ) { + // if performing a push we need to backup the REMOTE machine's DB + if ( $this->state_data['intent'] == 'push' ) { + $data = $this->filter_post_elements( + $this->state_data, + array( + 'action', + 'remote_state_id', + 'url', + 'table', + 'form_data', + 'stage', + 'bottleneck', + 'prefix', + 'current_row', + 'last_table', + 'gzip', + 'primary_keys', + 'path_current_site', + 'domain_current_site', + ) + ); + + $data['action'] = 'wpmdb_backup_remote_table'; + $data['intent'] = 'pull'; + $data['sig'] = $this->create_signature( $data, $this->state_data['key'] ); + $data['primary_keys'] = addslashes( $data['primary_keys'] ); + $ajax_url = $this->ajax_url(); + $response = $this->remote_post( $ajax_url, $data, __FUNCTION__ ); + ob_start(); + $this->display_errors(); + $maybe_errors = ob_get_clean(); + + if ( false === empty( $maybe_errors ) ) { + $maybe_errors = array( 'wpmdb_error' => 1, 'body' => $maybe_errors ); + $return = json_encode( $maybe_errors ); + } else { + $return = $response; + } + } else { + $return = $this->handle_table_backup(); + } + + $result = $this->end_ajax( $return ); + + return $result; + } + + // Pull and push need to be handled differently for obvious reasons, trigger different code depending on the migration intent (push or pull) + if ( $this->state_data['intent'] == 'push' || $this->state_data['intent'] == 'savefile' ) { + $this->maximum_chunk_size = $this->get_bottleneck(); + + if ( isset( $this->state_data['bottleneck'] ) ) { + $this->maximum_chunk_size = (int) $this->state_data['bottleneck']; + } + + $sql_dump_file_name = $this->get_upload_info( 'path' ) . DIRECTORY_SEPARATOR; + $sql_dump_file_name .= $this->format_dump_name( $this->state_data['dump_filename'] ); + + if ( $this->state_data['intent'] == 'savefile' ) { + $this->fp = $this->open( $sql_dump_file_name ); + } + + $db_version = ''; + if ( ! empty( $this->state_data['db_version'] ) ) { + $db_version = $this->state_data['db_version']; + + if ( 'push' == $this->state_data['intent'] ) { + // $db_version has been set to remote database's version. + add_filter( 'wpmdb_create_table_query', array( $this, 'mysql_compat_filter' ), 10, 5 ); + } elseif ( 'savefile' == $this->state_data['intent'] && ! empty( $this->form_data['compatibility_older_mysql'] ) ) { + // compatibility_older_mysql is currently a checkbox meaning pre-5.5 compatibility (we play safe and target 5.1), + // this may change in the future to be a dropdown or radiobox returning the version to be compatible with. + $db_version = '5.1'; + add_filter( 'wpmdb_create_table_query', array( $this, 'mysql_compat_filter' ), 10, 5 ); + } + } + + if ( ! empty( $this->state_data['find_replace_pairs'] ) ) { + $this->find_replace_pairs = $this->state_data['find_replace_pairs']; + } + + ob_start(); + $result = $this->export_table( $this->state_data['table'], $db_version ); + + if ( $this->state_data['intent'] == 'savefile' && isset( $this->fp ) ) { + $this->close( $this->fp ); + } + + $this->display_errors(); + $maybe_errors = trim( ob_get_clean() ); + if ( false === empty( $maybe_errors ) ) { + $return = array( 'wpmdb_error' => 1, 'body' => $maybe_errors ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + return $result; + } else { + $data = $this->filter_post_elements( + $this->state_data, + array( + 'remote_state_id', + 'intent', + 'url', + 'table', + 'form_data', + 'stage', + 'bottleneck', + 'current_row', + 'last_table', + 'gzip', + 'primary_keys', + 'site_url', + 'find_replace_pairs', + ) + ); + + $data['action'] = 'wpmdb_process_pull_request'; + $data['pull_limit'] = $this->get_sensible_pull_limit(); + $data['db_version'] = $wpdb->db_version(); + + if ( is_multisite() ) { + $data['path_current_site'] = $this->get_path_current_site(); + $data['domain_current_site'] = $this->get_domain_current_site(); + } + + $data['prefix'] = $wpdb->base_prefix; + + if ( isset( $data['find_replace_pairs'] ) ) { + $data['find_replace_pairs'] = serialize( $data['find_replace_pairs'] ); + } + + if ( isset( $data['sig'] ) ) { + unset( $data['sig'] ); + } + + $data['sig'] = $this->create_signature( $data, $this->state_data['key'] ); + $data['primary_keys'] = addslashes( $data['primary_keys'] ); + $data['find_replace_pairs'] = addslashes( $data['find_replace_pairs'] ); + $ajax_url = $this->ajax_url(); + + $response = $this->remote_post( $ajax_url, $data, __FUNCTION__ ); + ob_start(); + $this->display_errors(); + $maybe_errors = trim( ob_get_clean() ); + + if ( false === empty( $maybe_errors ) ) { + $return = array( 'wpmdb_error' => 1, 'body' => $maybe_errors ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + if ( strpos( $response, ';' ) === false ) { + $result = $this->end_ajax( $response ); + + return $result; + } + + // returned data is just a big string like this query;query;query;33 + // need to split this up into a chunk and row_tracker + $row_information = trim( substr( strrchr( $response, "\n" ), 1 ) ); + $row_information = explode( ',', $row_information ); + $chunk = substr( $response, 0, strrpos( $response, ";\n" ) + 1 ); + + if ( ! empty( $chunk ) ) { + $process_chunk_result = $this->process_chunk( $chunk ); + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + } + + $result = array( + 'current_row' => $row_information[0], + 'primary_keys' => $row_information[1], + ); + + $result = $this->end_ajax( json_encode( $result ) ); + } + + return $result; + } + + /** + * Occurs right before the first table is migrated / backed up during the migration process. + * + * @return string + * + * Does a quick check to make sure the verification string is valid and also opens / creates files for writing to (if required). + */ + function ajax_initiate_migration() { + global $wpdb; + + $this->check_ajax_referer( 'initiate-migration' ); + + $key_rules = array( + 'action' => 'key', + 'intent' => 'key', + 'url' => 'url', + 'key' => 'string', + 'form_data' => 'string', + 'stage' => 'key', + 'nonce' => 'key', + 'temp_prefix' => 'string', + ); + $this->set_post_data( $key_rules ); + + $this->form_data = $this->parse_migration_form_data( $this->state_data['form_data'] ); + + // A little bit of house keeping. + WPMDB_Migration_State::cleanup(); + + if ( $this->state_data['intent'] == 'savefile' ) { + $return = array( + 'code' => 200, + 'message' => 'OK', + 'body' => json_encode( array( 'error' => 0 ) ), + ); + + $return['dump_path'] = $this->get_sql_dump_info( 'migrate', 'path' ); + $return['dump_filename'] = basename( $return['dump_path'] ); + $return['dump_url'] = $this->get_sql_dump_info( 'migrate', 'url' ); + $dump_filename_no_extension = substr( $return['dump_filename'], 0, -4 ); + + $create_alter_table_query = $this->get_create_alter_table_query(); + // sets up our table to store 'ALTER' queries + $process_chunk_result = $this->process_chunk( $create_alter_table_query ); + + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + + if ( $this->gzip() && isset( $this->form_data['gzip_file'] ) && $this->form_data['gzip_file'] ) { + $return['dump_path'] .= '.gz'; + $return['dump_filename'] .= '.gz'; + $return['dump_url'] .= '.gz'; + } + + $this->fp = $this->open( $this->get_upload_info( 'path' ) . DIRECTORY_SEPARATOR . $return['dump_filename'] ); + $this->db_backup_header(); + $this->close( $this->fp ); + + $return['dump_filename'] = $dump_filename_no_extension; + } else { // does one last check that our verification string is valid + $data = array( + 'action' => 'wpmdb_remote_initiate_migration', + 'intent' => $this->state_data['intent'], + 'form_data' => $this->state_data['form_data'], + ); + + $data['sig'] = $this->create_signature( $data, $this->state_data['key'] ); + $ajax_url = $this->ajax_url(); + $response = $this->remote_post( $ajax_url, $data, __FUNCTION__ ); + + if ( false === $response ) { + $return = array( 'wpmdb_error' => 1, 'body' => $this->error ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + $return = @unserialize( trim( $response ) ); + + if ( false === $return ) { + $error_msg = __( 'Failed attempting to unserialize the response from the remote server. Please contact support.', 'wp-migrate-db' ); + $return = array( 'wpmdb_error' => 1, 'body' => $error_msg ); + $this->log_error( $error_msg, $response ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + if ( isset( $return['error'] ) && $return['error'] == 1 ) { + $return = array( 'wpmdb_error' => 1, 'body' => $return['message'] ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + if ( $this->state_data['intent'] == 'pull' ) { + // sets up our table to store 'ALTER' queries + $create_alter_table_query = $this->get_create_alter_table_query(); + $process_chunk_result = $this->process_chunk( $create_alter_table_query ); + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + } + + if ( ! empty( $this->form_data['create_backup'] ) && $this->state_data['intent'] == 'pull' ) { + $return['dump_filename'] = basename( $this->get_sql_dump_info( 'backup', 'path' ) ); + $return['dump_filename'] = substr( $return['dump_filename'], 0, -4 ); + $return['dump_url'] = $this->get_sql_dump_info( 'backup', 'url' ); + } + } + + $return['dump_filename'] = ( empty( $return['dump_filename'] ) ) ? '' : $return['dump_filename']; + $return['dump_url'] = ( empty( $return['dump_url'] ) ) ? '' : $return['dump_url']; + + // A successful call to wpmdb_remote_initiate_migration for a Push migration will have set db_version. + // Otherwise ensure it is set with own db_version so that we always return one. + $return['db_version'] = ( empty( $return['db_version'] ) ) ? $wpdb->db_version() : $return['db_version']; + + // A successful call to wpmdb_remote_initiate_migration for a Push migration will have set site_url. + // Otherwise ensure it is set with own site_url so that we always return one. + $return['site_url'] = ( empty( $return['site_url'] ) ) ? site_url() : $return['site_url']; + + $return['find_replace_pairs'] = $this->parse_find_replace_pairs( $this->state_data['intent'], $return['site_url'] ); + + // Store current migration state and return its id. + $state = array_merge( $this->state_data, $return ); + unset( $return ); + $return['migration_state_id'] = $this->migration_state->id(); + $return = $this->save_migration_state( $state, $return ); + + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + /** + * Handler for the ajax request to save a migration profile. + * + * @return bool|null + */ + function ajax_save_profile() { + $this->check_ajax_referer( 'save-profile' ); + + $key_rules = array( + 'action' => 'key', + 'profile' => 'string', + 'nonce' => 'key', + ); + $this->set_post_data( $key_rules ); + + $profile = $this->parse_migration_form_data( $this->state_data['profile'] ); + $profile = wp_parse_args( $profile, $this->checkbox_options ); + + if ( isset( $profile['save_migration_profile_option'] ) && $profile['save_migration_profile_option'] == 'new' ) { + $profile['name'] = $profile['create_new_profile']; + $this->settings['profiles'][] = $profile; + } else { + $key = $profile['save_migration_profile_option']; + $name = $this->settings['profiles'][ $key ]['name']; + $this->settings['profiles'][ $key ] = $profile; + $this->settings['profiles'][ $key ]['name'] = $name; + } + + update_site_option( 'wpmdb_settings', $this->settings ); + end( $this->settings['profiles'] ); + $key = key( $this->settings['profiles'] ); + $result = $this->end_ajax( $key ); + + return $result; + } + + /** + * Handler for deleting a migration profile. + * + * @return bool|null + */ + function ajax_delete_migration_profile() { + $this->check_ajax_referer( 'delete-migration-profile' ); + + $key_rules = array( + 'action' => 'key', + 'profile_id' => 'positive_int', + 'nonce' => 'key', + ); + $this->set_post_data( $key_rules ); + + $key = absint( $this->state_data['profile_id'] ); + --$key; + $return = ''; + + if ( isset( $this->settings['profiles'][ $key ] ) ) { + unset( $this->settings['profiles'][ $key ] ); + update_site_option( 'wpmdb_settings', $this->settings ); + } else { + $return = '-1'; + } + + $result = $this->end_ajax( $return ); + + return $result; + } + + function format_table_sizes( $size ) { + $size *= 1024; + + return size_format( $size ); + } + + /** + * Return array of post type slugs stored within DB. + * + * @return array List of post types + */ + function get_post_types() { + global $wpdb; + + if ( is_multisite() ) { + $tables = $this->get_tables(); + $sql = "SELECT `post_type` FROM `{$wpdb->base_prefix}posts` "; + $prefix_escaped = preg_quote( $wpdb->base_prefix, '/' ); + + foreach ( $tables as $table ) { + if ( 0 == preg_match( '/' . $prefix_escaped . '[0-9]+_posts/', $table ) ) { + continue; + } + $blog_id = str_replace( array( $wpdb->base_prefix, '_posts' ), array( '', '' ), $table ); + $sql .= "UNION SELECT `post_type` FROM `{$wpdb->base_prefix}" . $blog_id . '_posts` '; + } + $sql .= ';'; + $post_types = $wpdb->get_results( $sql, ARRAY_A ); + } else { + $post_types = $wpdb->get_results( + "SELECT DISTINCT `post_type` + FROM `{$wpdb->base_prefix}posts` + WHERE 1;", + ARRAY_A + ); + } + + $return = array( 'revision' ); + + foreach ( $post_types as $post_type ) { + $return[] = $post_type['post_type']; + } + + return apply_filters( 'wpmdb_post_types', array_unique( $return ) ); + } + + // Retrieves the specified profile, if -1, returns the default profile + function get_profile( $profile_id ) { + --$profile_id; + + if ( $profile_id == '-1' || ! isset( $this->settings['profiles'][ $profile_id ] ) ) { + return $this->default_profile; + } + + return $this->settings['profiles'][ $profile_id ]; + } + + /** + * Returns an array of table names with their associated row counts. + * + * @return array + */ + function get_table_row_count() { + global $wpdb; + + $sql = $wpdb->prepare( 'SELECT table_name, TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = %s ORDER BY table_name', DB_NAME ); + $results = $wpdb->get_results( $sql, ARRAY_A ); + + $return = array(); + + foreach ( $results as $result ) { + if ( $this->get_legacy_alter_table_name() == $result['table_name'] ) { + continue; + } + $return[ $result['table_name'] ] = ( $result['TABLE_ROWS'] == 0 ? 1 : $result['TABLE_ROWS'] ); + } + + return $return; + } + + /** + * Returns an array of table names with associated size in kilobytes. + * + * @return mixed + * + * NOTE: Returned array may have been altered by wpmdb_table_sizes filter. + */ + function get_table_sizes() { + global $wpdb; + + static $return; + + if ( ! empty( $return ) ) { + return $return; + } + + $return = array(); + + $sql = $wpdb->prepare( + "SELECT TABLE_NAME AS 'table', + ROUND( ( data_length + index_length ) / 1024, 0 ) AS 'size' + FROM INFORMATION_SCHEMA.TABLES + WHERE INFORMATION_SCHEMA.TABLES.table_schema = %s + AND INFORMATION_SCHEMA.TABLES.table_type = %s + ORDER BY TABLE_NAME", + DB_NAME, + 'BASE TABLE' + ); + + $results = $wpdb->get_results( $sql, ARRAY_A ); + + if ( ! empty( $results ) ) { + foreach ( $results as $result ) { + if ( $this->get_legacy_alter_table_name() == $result['table'] ) { + continue; + } + $return[ $result['table'] ] = $result['size']; + } + } + + // "regular" is passed to the filter as the scope for backwards compatibility (a possible but never used scope was "temp"). + return apply_filters( 'wpmdb_table_sizes', $return, 'regular' ); + } + + function format_dump_name( $dump_name ) { + $extension = '.sql'; + $dump_name = sanitize_file_name( $dump_name ); + + if ( $this->gzip() && isset( $this->form_data['gzip_file'] ) && $this->form_data['gzip_file'] ) { + $extension .= '.gz'; + } + + return $dump_name . $extension; + } + + function options_page() { + $this->template( 'options' ); + } + + /** + * Get the remote site's base domain for subdomain multisite search/replace. + * + * @return string|bool The remote site's domain or false on error. + */ + function get_domain_replace() { + $this->set_post_data(); + + if ( ! isset( $this->domain_replace ) ) { + if ( is_multisite() && ! empty( $this->state_data['domain_current_site'] ) ) { + $this->domain_replace = $this->state_data['domain_current_site']; + } elseif ( is_multisite() && ! empty( $this->form_data['replace_new'][1] ) ) { + $url = $this->form_data['replace_new'][1]; + $url = $this->parse_url( $url ); + + if ( isset( $url['host'] ) ) { + $this->domain_replace = $url['host']; + } else { + $this->domain_replace = false; + } + } else { + $this->domain_replace = false; + } + } + + return $this->domain_replace; + } + + function process_sql_constraint( $create_query, $table, &$alter_table_query ) { + if ( preg_match( '@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query ) ) { + $sql_constraints_query = ''; + + $nl_nix = "\n"; + $nl_win = "\r\n"; + $nl_mac = "\r"; + + if ( strpos( $create_query, $nl_win ) !== false ) { + $crlf = $nl_win; + } elseif ( strpos( $create_query, $nl_mac ) !== false ) { + $crlf = $nl_mac; + } else { + $crlf = $nl_nix; + } + + // Split the query into lines, so we can easily handle it. + // We know lines are separated by $crlf (done few lines above). + $sql_lines = explode( $crlf, $create_query ); + $sql_count = count( $sql_lines ); + + // lets find first line with constraints + for ( $i = 0; $i < $sql_count; $i++ ) { + if ( preg_match( + '@^[\s]*(CONSTRAINT|FOREIGN[\s]+KEY)@', + $sql_lines[ $i ] + ) ) { + break; + } + } + + // If we really found a constraint + if ( $i != $sql_count ) { + // remove, from the end of create statement + $sql_lines[ $i - 1 ] = preg_replace( + '@,$@', + '', + $sql_lines[ $i - 1 ] + ); + + // let's do the work + $sql_constraints_query .= 'ALTER TABLE ' . $this->backquote( $table ) . $crlf; + + $first = true; + for ( $j = $i; $j < $sql_count; $j++ ) { + if ( preg_match( + '@CONSTRAINT|FOREIGN[\s]+KEY@', + $sql_lines[ $j ] + ) ) { + if ( strpos( $sql_lines[ $j ], 'CONSTRAINT' ) === false ) { + $tmp_str = preg_replace( + '/(FOREIGN[\s]+KEY)/', + 'ADD \1', + $sql_lines[ $j ] + ); + $sql_constraints_query .= $tmp_str; + } else { + $tmp_str = preg_replace( + '/(CONSTRAINT)/', + 'ADD \1', + $sql_lines[ $j ] + ); + $sql_constraints_query .= $tmp_str; + preg_match( + '/(CONSTRAINT)([\s])([\S]*)([\s])/', + $sql_lines[ $j ], + $matches + ); + } + $first = false; + } else { + break; + } + } + + $sql_constraints_query .= ";\n"; + + $create_query = implode( + $crlf, + array_slice( $sql_lines, 0, $i ) + ) + . $crlf + . implode( + $crlf, + array_slice( $sql_lines, $j, $sql_count - 1 ) + ); + unset( $sql_lines ); + + $alter_table_query = $sql_constraints_query; + + return $create_query; + } + } + + return $create_query; + } + + /** + * Taken partially from phpMyAdmin and partially from + * Alain Wolf, Zurich - Switzerland + * Website: http://restkultur.ch/personal/wolf/scripts/db_backup/ + * Modified by Scott Merrill (http://www.skippy.net/) + * to use the WordPress $wpdb object + * + * @param string $table + * @param string $db_version + * + * @return mixed + */ + function export_table( $table, $db_version = '' ) { + global $wpdb; + $this->set_time_limit(); + $this->set_post_data(); + + if ( empty( $this->form_data ) ) { + $this->form_data = $this->parse_migration_form_data( $this->state_data['form_data'] ); + } + + $temp_prefix = ( isset( $this->state_data['temp_prefix'] ) ? $this->state_data['temp_prefix'] : $this->temp_prefix ); + + $table_structure = $wpdb->get_results( 'DESCRIBE ' . $this->backquote( $table ) ); + + if ( ! $table_structure ) { + $this->error = __( 'Failed to retrieve table structure, please ensure your database is online. (#125)', 'wp-migrate-db' ); + + return false; + } + + $table_name = $table; + $target_table_name = apply_filters( 'wpmdb_target_table_name', $table_name, $this->form_data['action'], $this->state_data['stage'] ); + $table_name = $target_table_name; + + if ( 'savefile' !== $this->form_data['action'] && 'backup' !== $this->state_data['stage'] ) { + $table_name = $temp_prefix . $table; + } + + $current_row = -1; + + if ( ! empty( $this->state_data['current_row'] ) ) { + $temp_current_row = trim( $this->state_data['current_row'] ); + if ( ! empty( $temp_current_row ) ) { + $current_row = (int) $temp_current_row; + } + } + + if ( $current_row == -1 ) { + // Don't stow data until after `wpmdb_create_table_query` filter is applied as mysql_compat_filter() can return an error + $stow = ''; + + // Add SQL statement to drop existing table + if ( $this->form_data['action'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + $stow .= ( "\n\n" ); + $stow .= ( "#\n" ); + $stow .= ( '# ' . sprintf( __( 'Delete any existing table %s', 'wp-migrate-db' ), $this->backquote( $table_name ) ) . "\n" ); + $stow .= ( "#\n" ); + $stow .= ( "\n" ); + } + $stow .= ( 'DROP TABLE IF EXISTS ' . $this->backquote( $table_name ) . ";\n" ); + + // Table structure + // Comment in SQL-file + if ( $this->form_data['action'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + $stow .= ( "\n\n" ); + $stow .= ( "#\n" ); + $stow .= ( '# ' . sprintf( __( 'Table structure of table %s', 'wp-migrate-db' ), $this->backquote( $table_name ) ) . "\n" ); + $stow .= ( "#\n" ); + $stow .= ( "\n" ); + } + + $create_table = $wpdb->get_results( 'SHOW CREATE TABLE ' . $this->backquote( $table ), ARRAY_N ); + + if ( false === $create_table ) { + $this->error = __( 'Failed to generate the create table query, please ensure your database is online. (#126)', 'wp-migrate-db' ); + + return false; + } + $create_table[0][1] = str_replace( 'CREATE TABLE `' . $table . '`', 'CREATE TABLE `' . $table_name . '`', $create_table[0][1] ); + + $create_table[0][1] = str_replace( 'TYPE=', 'ENGINE=', $create_table[0][1] ); + + $alter_table_query = ''; + $create_table[0][1] = $this->process_sql_constraint( $create_table[0][1], $target_table_name, $alter_table_query ); + + $create_table[0][1] = apply_filters( 'wpmdb_create_table_query', $create_table[0][1], $table_name, $db_version, $this->form_data['action'], $this->state_data['stage'] ); + $stow .= ( $create_table[0][1] . ";\n" ); + + $this->stow( $stow ); + + if ( ! empty( $alter_table_query ) ) { + $alter_table_name = $this->get_alter_table_name(); + $insert = sprintf( "INSERT INTO %s ( `query` ) VALUES ( '%s' );\n", $this->backquote( $alter_table_name ), esc_sql( $alter_table_query ) ); + if ( $this->form_data['action'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + $process_chunk_result = $this->process_chunk( $insert ); + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + } else { + $this->stow( $insert ); + } + } + + $alter_data_queries = array(); + $alter_data_queries = apply_filters( 'wpmdb_alter_data_queries', $alter_data_queries, $table_name, $this->form_data['action'], $this->state_data['stage'] ); + + if ( ! empty( $alter_data_queries ) ) { + $alter_table_name = $this->get_alter_table_name(); + $insert = ''; + foreach ( $alter_data_queries as $alter_data_query ) { + $insert .= sprintf( "INSERT INTO %s ( `query` ) VALUES ( '%s' );\n", $this->backquote( $alter_table_name ), esc_sql( $alter_data_query ) ); + } + if ( 'savefile' == $this->form_data['action'] || 'backup' == $this->state_data['stage'] ) { + $process_chunk_result = $this->process_chunk( $insert ); + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + } else { + $this->stow( $insert ); + } + } + + // Comment in SQL-file + if ( $this->form_data['action'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + $this->stow( "\n\n" ); + $this->stow( "#\n" ); + $this->stow( '# ' . sprintf( __( 'Data contents of table %s', 'wp-migrate-db' ), $this->backquote( $table_name ) ) . "\n" ); + $this->stow( "#\n" ); + } + } + + // $defs = mysql defaults, looks up the default for that particular column, used later on to prevent empty inserts values for that column + // $ints = holds a list of the possible integer types so as to not wrap them in quotation marks later in the insert statements + $defs = array(); + $ints = array(); + $bins = array(); + $bits = array(); + foreach ( $table_structure as $struct ) { + if ( ( 0 === strpos( $struct->Type, 'tinyint' ) ) || + ( 0 === strpos( strtolower( $struct->Type ), 'smallint' ) ) || + ( 0 === strpos( strtolower( $struct->Type ), 'mediumint' ) ) || + ( 0 === strpos( strtolower( $struct->Type ), 'int' ) ) || + ( 0 === strpos( strtolower( $struct->Type ), 'bigint' ) ) + ) { + $defs[ strtolower( $struct->Field ) ] = ( null === $struct->Default ) ? 'NULL' : $struct->Default; + $ints[ strtolower( $struct->Field ) ] = '1'; + } elseif ( 0 === strpos( $struct->Type, 'binary' ) ) { + $bins[ strtolower( $struct->Field ) ] = '1'; + } elseif ( 0 === strpos( $struct->Type, 'bit' ) ) { + $bits[ strtolower( $struct->Field ) ] = '1'; + } + } + + // Batch by $row_inc + + $row_inc = $this->rows_per_segment; + $row_start = 0; + if ( $current_row != -1 ) { + $row_start = $current_row; + } + + $this->row_tracker = $row_start; + + // \x08\\x09, not required + $multibyte_search = array( "\x00", "\x0a", "\x0d", "\x1a" ); + $multibyte_replace = array( '\0', '\n', '\r', '\Z' ); + + $query_size = 0; + + $this->primary_keys = array(); + $field_set = array(); + $use_primary_keys = true; + + foreach ( $table_structure as $col ) { + $field_set[] = $this->backquote( $col->Field ); + if ( $col->Key == 'PRI' && true == $use_primary_keys ) { + if ( false === strpos( $col->Type, 'int' ) ) { + $use_primary_keys = false; + $this->primary_keys = array(); + continue; + } + $this->primary_keys[ $col->Field ] = 0; + } + } + + $first_select = true; + if ( ! empty( $this->state_data['primary_keys'] ) ) { + $this->state_data['primary_keys'] = trim( $this->state_data['primary_keys'] ); + if ( ! empty( $this->state_data['primary_keys'] ) && is_serialized( $this->state_data['primary_keys'] ) ) { + $this->primary_keys = unserialize( stripslashes( $this->state_data['primary_keys'] ) ); + $first_select = false; + } + } + + $fields = implode( ', ', $field_set ); + + $insert_buffer = $insert_query_template = 'INSERT INTO ' . $this->backquote( $table_name ) . ' ( ' . $fields . ") VALUES\n"; + + do { + $join = array(); + $where = 'WHERE 1=1'; + $order_by = ''; + // We need ORDER BY here because with LIMIT, sometimes it will return + // the same results from the previous query and we'll have duplicate insert statements + if ( 'backup' != $this->state_data['stage'] && false === empty( $this->form_data['exclude_spam'] ) ) { + if ( $this->table_is( 'comments', $table ) ) { + $where .= ' AND comment_approved != "spam"'; + } elseif ( $this->table_is( 'commentmeta', $table ) ) { + $tables = $this->get_ms_compat_table_names( array( 'commentmeta', 'comments' ), $table ); + $join[] = sprintf( 'INNER JOIN %1$s ON %1$s.comment_ID = %2$s.comment_id', $this->backquote( $tables['comments_table'] ), $this->backquote( $tables['commentmeta_table'] ) ); + $where .= sprintf( ' AND %1$s.comment_approved != \'spam\'', $this->backquote( $tables['comments_table'] ) ); + } + } + + if ( 'backup' != $this->state_data['stage'] && isset( $this->form_data['exclude_post_types'] ) && ! empty( $this->form_data['select_post_types'] ) ) { + $post_types = '\'' . implode( '\', \'', $this->form_data['select_post_types'] ) . '\''; + if ( $this->table_is( 'posts', $table ) ) { + $where .= ' AND `post_type` NOT IN ( ' . $post_types . ' )'; + } elseif ( $this->table_is( 'postmeta', $table ) ) { + $tables = $this->get_ms_compat_table_names( array( 'postmeta', 'posts' ), $table ); + $join[] = sprintf( 'INNER JOIN %1$s ON %1$s.ID = %2$s.post_id', $this->backquote( $tables['posts_table'] ), $this->backquote( $tables['postmeta_table'] ) ); + $where .= sprintf( ' AND %1$s.post_type NOT IN ( ' . $post_types . ' )', $this->backquote( $tables['posts_table'] ) ); + } elseif ( $this->table_is( 'comments', $table ) ) { + $tables = $this->get_ms_compat_table_names( array( 'comments', 'posts' ), $table ); + $join[] = sprintf( 'INNER JOIN %1$s ON %1$s.ID = %2$s.comment_post_ID', $this->backquote( $tables['posts_table'] ), $this->backquote( $tables['comments_table'] ) ); + $where .= sprintf( ' AND %1$s.post_type NOT IN ( ' . $post_types . ' )', $this->backquote( $tables['posts_table'] ) ); + } elseif ( $this->table_is( 'commentmeta', $table ) ) { + $tables = $this->get_ms_compat_table_names( array( 'commentmeta', 'posts', 'comments' ), $table ); + $join[] = sprintf( 'INNER JOIN %1$s ON %1$s.comment_ID = %2$s.comment_id', $this->backquote( $tables['comments_table'] ), $this->backquote( $tables['commentmeta_table'] ) ); + $join[] = sprintf( 'INNER JOIN %2$s ON %2$s.ID = %1$s.comment_post_ID', $this->backquote( $tables['comments_table'] ), $this->backquote( $tables['posts_table'] ) ); + $where .= sprintf( ' AND %1$s.post_type NOT IN ( ' . $post_types . ' )', $this->backquote( $tables['posts_table'] ) ); + } + } + + if ( 'backup' != $this->state_data['stage'] && true === apply_filters( 'wpmdb_exclude_transients', true ) && isset( $this->form_data['exclude_transients'] ) && '1' === $this->form_data['exclude_transients'] && ( $this->table_is( 'options', $table ) || ( isset( $wpdb->sitemeta ) && $wpdb->sitemeta == $table ) ) ) { + $col_name = 'option_name'; + + if ( isset( $wpdb->sitemeta ) && $wpdb->sitemeta == $table ) { + $col_name = 'meta_key'; + } + + $where .= " AND `{$col_name}` NOT LIKE '\_transient\_%' AND `{$col_name}` NOT LIKE '\_site\_transient\_%'"; + } + + // don't export/migrate wpmdb specific option rows unless we're performing a backup + if ( 'backup' != $this->state_data['stage'] && ( $this->table_is( 'options', $table ) || ( isset( $wpdb->sitemeta ) && $wpdb->sitemeta == $table ) ) ) { + $col_name = 'option_name'; + + if ( isset( $wpdb->sitemeta ) && $wpdb->sitemeta == $table ) { + $col_name = 'meta_key'; + } + + $where .= " AND `{$col_name}` != 'wpmdb_settings'"; + $where .= " AND `{$col_name}` != 'wpmdb_error_log'"; + $where .= " AND `{$col_name}` != 'wpmdb_schema_version'"; + $where .= " AND `{$col_name}` NOT LIKE 'wpmdb_state_%'"; + } + + $limit = "LIMIT {$row_start}, {$row_inc}"; + + if ( ! empty( $this->primary_keys ) ) { + $primary_keys_keys = array_keys( $this->primary_keys ); + $primary_keys_keys = array_map( array( $this, 'backquote' ), $primary_keys_keys ); + + $order_by = 'ORDER BY ' . implode( ',', $primary_keys_keys ); + $limit = "LIMIT $row_inc"; + + if ( false == $first_select ) { + $where .= ' AND '; + + $temp_primary_keys = $this->primary_keys; + $primary_key_count = count( $temp_primary_keys ); + + // build a list of clauses, iteratively reducing the number of fields compared in the compound key + // e.g. (a = 1 AND b = 2 AND c > 3) OR (a = 1 AND b > 2) OR (a > 1) + $clauses = array(); + for ( $j = 0; $j < $primary_key_count; $j++ ) { + // build a subclause for each field in the compound index + $subclauses = array(); + $i = 0; + foreach ( $temp_primary_keys as $primary_key => $value ) { + // only the last field in the key should be different in this subclause + $operator = ( count( $temp_primary_keys ) - 1 == $i ? '>' : '=' ); + $subclauses[] = sprintf( '%s %s %s', $this->backquote( $primary_key ), $operator, $wpdb->prepare( '%s', $value ) ); + ++$i; + } + + // remove last field from array to reduce fields in next clause + array_pop( $temp_primary_keys ); + + // join subclauses into a single clause + // NB: AND needs to be wrapped in () as it has higher precedence than OR + $clauses[] = '( ' . implode( ' AND ', $subclauses ) . ' )'; + } + // join clauses into a single clause + // NB: OR needs to be wrapped in () as it has lower precedence than AND + $where .= '( ' . implode( ' OR ', $clauses ) . ' )'; + } + + $first_select = false; + } + + $sel = $this->backquote( $table ) . '.*'; + if ( ! empty( $bins ) ) { + foreach ( $bins as $key => $bin ) { + $hex_key = strtolower( $key ) . '__hex'; + $sel .= ', HEX(' . $this->backquote( $key ) . ') as ' . $this->backquote( $hex_key ); + } + } + if ( ! empty( $bits ) ) { + foreach ( $bits as $key => $bit ) { + $bit_key = strtolower( $key ) . '__bit'; + $sel .= ', ' . $this->backquote( $key ) . '+0 as ' . $this->backquote( $bit_key ); + } + } + $join = implode( ' ', array_unique( $join ) ); + $join = apply_filters( 'wpmdb_rows_join', $join, $table ); + $where = apply_filters( 'wpmdb_rows_where', $where, $table ); + $order_by = apply_filters( 'wpmdb_rows_order_by', $order_by, $table ); + $limit = apply_filters( 'wpmdb_rows_limit', $limit, $table ); + + $sql = 'SELECT ' . $sel . ' FROM ' . $this->backquote( $table ) . " $join $where $order_by $limit"; + $sql = apply_filters( 'wpmdb_rows_sql', $sql, $table ); + + $table_data = $wpdb->get_results( $sql ); + + if ( $table_data ) { + $to_search = isset( $this->find_replace_pairs['replace_old'] ) ? $this->find_replace_pairs['replace_old'] : ''; + $to_replace = isset( $this->find_replace_pairs['replace_new'] ) ? $this->find_replace_pairs['replace_new'] : ''; + $replacer = new WPMDB_Replace( array( + 'table' => $table, + 'search' => $to_search, + 'replace' => $to_replace, + 'intent' => $this->state_data['intent'], + 'base_domain' => $this->get_domain_replace(), + 'site_domain' => $this->get_domain_current_site(), + 'wpmdb' => $this, + ) ); + + foreach ( $table_data as $row ) { + $skip_row = false; + + if ( ! apply_filters( 'wpmdb_table_row', $row, $table, $this->form_data['action'], $this->state_data['stage'] ) ) { + $skip_row = true; + } + + if ( ! $skip_row ) { + $replacer->set_row( $row ); + $values = array(); + + foreach ( $row as $key => $value ) { + $replacer->set_column( $key ); + + if ( isset( $ints[ strtolower( $key ) ] ) && $ints[ strtolower( $key ) ] ) { + // make sure there are no blank spots in the insert syntax, + // yet try to avoid quotation marks around integers + $value = ( null === $value || '' === $value ) ? $defs[ strtolower( $key ) ] : $value; + $values[] = ( '' === $value ) ? "''" : $value; + continue; + } + + if ( null === $value ) { + $values[] = 'NULL'; + continue; + } + + // If we have binary data, substitute in hex encoded version and remove hex encoded version from row. + $hex_key = strtolower( $key ) . '__hex'; + if ( isset( $bins[ strtolower( $key ) ] ) && $bins[ strtolower( $key ) ] && isset( $row->$hex_key ) ) { + $value = "UNHEX('" . $row->$hex_key . "')"; + $values[] = $value; + unset( $row->$hex_key ); + continue; + } + + // If we have bit data, substitute in properly bit encoded version. + $bit_key = strtolower( $key ) . '__bit'; + if ( isset( $bits[ strtolower( $key ) ] ) && $bits[ strtolower( $key ) ] && isset( $row->$bit_key ) ) { + $value = "b'" . $row->$bit_key . "'"; + $values[] = $value; + unset( $row->$bit_key ); + continue; + } + + if ( is_multisite() && 'path' == $key && $this->state_data['stage'] != 'backup' && ( $wpdb->site == $table || $wpdb->blogs == $table ) ) { + $old_path_current_site = $this->get_path_current_site(); + $new_path_current_site = ''; + + if ( ! empty( $this->state_data['path_current_site'] ) ) { + $new_path_current_site = $this->state_data['path_current_site']; + } elseif ( ! empty ( $this->form_data['replace_new'][1] ) ) { + $new_path_current_site = $this->get_path_from_url( $this->form_data['replace_new'][1] ); + } + + $new_path_current_site = apply_filters( 'wpmdb_new_path_current_site', $new_path_current_site ); + + if ( ! empty( $new_path_current_site ) && $old_path_current_site != $new_path_current_site ) { + $pos = strpos( $value, $old_path_current_site ); + $value = substr_replace( $value, $new_path_current_site, $pos, strlen( $old_path_current_site ) ); + } + } + + if ( is_multisite() && 'domain' == $key && $this->state_data['stage'] != 'backup' && ( $wpdb->site == $table || $wpdb->blogs == $table ) ) { + if ( ! empty( $this->state_data['domain_current_site'] ) ) { + $main_domain_replace = $this->state_data['domain_current_site']; + } elseif ( ! empty ( $this->form_data['replace_new'][1] ) ) { + $url = $this->parse_url( $this->form_data['replace_new'][1] ); + $main_domain_replace = $url['host']; + } + + $domain_replaces = array(); + $main_domain_find = sprintf( '/%s/', preg_quote( $this->get_domain_current_site(), '/' ) ); + if ( isset( $main_domain_replace ) ) { + $domain_replaces[ $main_domain_find ] = $main_domain_replace; + } + + $domain_replaces = apply_filters( 'wpmdb_domain_replaces', $domain_replaces ); + + $value = preg_replace( array_keys( $domain_replaces ), array_values( $domain_replaces ), $value ); + } + + if ( 'guid' != $key || ( false === empty( $this->form_data['replace_guids'] ) && $this->table_is( 'posts', $table ) ) ) { + if ( $this->state_data['stage'] != 'backup' ) { + $value = $replacer->recursive_unserialize_replace( $value ); + } + } + + $value = $this->sql_addslashes( $value ); + $value = str_replace( $multibyte_search, $multibyte_replace, $value ); + + $values[] = "'" . $value . "'"; + } + + $insert_line = '(' . implode( ', ', $values ) . '),'; + $insert_line .= "\n"; + } else { + $insert_line = ''; + } + + if ( ( strlen( $this->current_chunk ) + strlen( $insert_line ) + strlen( $insert_buffer ) + 30 ) > $this->maximum_chunk_size ) { + if ( $insert_buffer == $insert_query_template ) { + $insert_buffer .= $insert_line; + + ++$this->row_tracker; + + if ( ! empty( $this->primary_keys ) ) { + foreach ( $this->primary_keys as $primary_key => $value ) { + $this->primary_keys[ $primary_key ] = $row->$primary_key; + } + } + } + + $insert_buffer = rtrim( $insert_buffer, "\n," ); + $insert_buffer .= " ;\n"; + $this->stow( $insert_buffer ); + $insert_buffer = $insert_query_template; + $query_size = 0; + + return $this->transfer_chunk(); + } + + if ( ( $query_size + strlen( $insert_line ) ) > $this->max_insert_string_len && $insert_buffer != $insert_query_template ) { + $insert_buffer = rtrim( $insert_buffer, "\n," ); + $insert_buffer .= " ;\n"; + $this->stow( $insert_buffer ); + $insert_buffer = $insert_query_template; + $query_size = 0; + } + + $insert_buffer .= $insert_line; + $query_size += strlen( $insert_line ); + + ++$this->row_tracker; + + if ( ! empty( $this->primary_keys ) ) { + foreach ( $this->primary_keys as $primary_key => $value ) { + $this->primary_keys[ $primary_key ] = $row->$primary_key; + } + } + } + + $row_start += $row_inc; + + if ( $insert_buffer != $insert_query_template ) { + $insert_buffer = rtrim( $insert_buffer, "\n," ); + $insert_buffer .= " ;\n"; + $this->stow( $insert_buffer ); + $insert_buffer = $insert_query_template; + $query_size = 0; + } + } + } while ( count( $table_data ) > 0 ); + + // Create footer/closing comment in SQL-file + if ( 'savefile' == $this->form_data['action'] || 'backup' == $this->state_data['stage'] ) { + $this->stow( "\n" ); + $this->stow( "#\n" ); + $this->stow( '# ' . sprintf( __( 'End of data contents of table %s', 'wp-migrate-db' ), $this->backquote( $table_name ) ) . "\n" ); + $this->stow( "# --------------------------------------------------------\n" ); + $this->stow( "\n" ); + + if ( $this->state_data['last_table'] == '1' ) { + $this->stow( "#\n" ); + $this->stow( "# Add constraints back in and apply any alter data queries.\n" ); + $this->stow( "#\n\n" ); + $this->stow( $this->get_alter_queries() ); + $alter_table_name = $this->get_alter_table_name(); + + $wpdb->query( 'DROP TABLE IF EXISTS ' . $this->backquote( $alter_table_name ) . ';' ); + + if ( 'backup' == $this->state_data['stage'] ) { + // Re-create our table to store 'ALTER' queries so we don't get duplicates. + $create_alter_table_query = $this->get_create_alter_table_query(); + $process_chunk_result = $this->process_chunk( $create_alter_table_query ); + if ( true !== $process_chunk_result ) { + $result = $this->end_ajax( $process_chunk_result ); + + return $result; + } + } + } + } + + $this->row_tracker = -1; + + return $this->transfer_chunk(); + } // end export_table() + + /** + * Check that the given table is of the desired type, + * including single and multisite installs. + * eg: wp_posts, wp_2_posts + * + * The scope argument can take one of the following: + * + * 'table' - Match on the un-prefixed table name, this is the default. + * 'all' - Match on 'blog' and 'global' tables. No old tables are returned. + * 'blog' - Match the blog-level tables for the queried blog. + * 'global' - Match the global tables for the installation, matching multisite tables only if running multisite. + * 'ms_global' - Match the multisite global tables, regardless if current installation is multisite. + * 'non_ms_global' - Match the non multisite global tables, regardless if current installation is multisite. + * 'old' - Matches tables which are deprecated. + * + * @param string $desired_table Can be empty to match on tables from scopes other than 'table'. + * @param string $given_table + * @param string $scope Optional type of table to match against, default is 'table'. + * @param string $new_prefix Optional new prefix already added to $given_table. + * @param int $blog_id Optional Only used with 'blog' scope to test against a specific subsite's tables other than current for $wpdb. + * + * @return boolean + */ + function table_is( $desired_table, $given_table, $scope = 'table', $new_prefix = '', $blog_id = 0 ) { + global $wpdb; + + $scopes = array( 'all', 'blog', 'global', 'ms_global', 'non_ms_global', 'old' ); + + if ( ! in_array( $scope, $scopes ) ) { + $scope = 'table'; + } + + if ( empty( $desired_table ) && 'table' === $scope ) { + return false; + } + + if ( ! empty( $new_prefix ) && 0 === stripos( $given_table, $new_prefix ) ) { + $given_table = substr_replace( $given_table, $wpdb->base_prefix, 0, strlen( $new_prefix ) ); + } + + $match = false; + $prefix_escaped = preg_quote( $wpdb->base_prefix, '/' ); + $desired_table_escaped = preg_quote( $desired_table, '/' ); + + if ( 'table' === $scope ) { + if ( $wpdb->{$desired_table} == $given_table || + preg_match( '/' . $prefix_escaped . '[0-9]+_' . $desired_table_escaped . '/', $given_table ) + ) { + $match = true; + } + } else { + if ( 'non_ms_global' === $scope ) { + $tables = array_diff_key( $wpdb->tables( 'global', true, $blog_id ), $wpdb->tables( 'ms_global', true, $blog_id ) ); + } else { + $tables = $wpdb->tables( $scope, true, $blog_id ); + } + + if ( ! empty( $desired_table ) ) { + $tables = array_intersect_key( $tables, array( $desired_table => '' ) ); + } + + if ( ! empty( $tables ) ) { + foreach ( $tables as $table_name ) { + if ( ! empty( $table_name ) && strtolower( $table_name ) === strtolower( $given_table ) ) { + $match = true; + break; + } + } + } + } + + return $match; + } + + /** + * Return multisite-compatible names for requested + * tables, based on queried table name + * + * @param array $tables List of table names required + * @param string $queried_table Name of table from which to derive the blog ID + * + * @return array List of table names altered for multisite compatibility + */ + function get_ms_compat_table_names( $tables, $queried_table ) { + global $wpdb; + + // default table prefix + $prefix = $wpdb->base_prefix; + $prefix_escaped = preg_quote( $prefix, '/' ); + + // if multisite, extract blog ID from queried table name and add to prefix + // won't match for primary blog because it uses standard table names, i.e. blog_id will never be 1 + if ( is_multisite() && preg_match( '/^' . $prefix_escaped . '([0-9]+)_/', $queried_table, $matches ) ) { + $blog_id = $matches[1]; + $prefix .= $blog_id . '_'; + } + + // build table names + $ms_compat_table_names = array(); + + foreach ( $tables as $table ) { + $ms_compat_table_names[ $table . '_table' ] = $prefix . $table; + } + + return $ms_compat_table_names; + } + + function db_backup_header() { + $charset = ( defined( 'DB_CHARSET' ) ? DB_CHARSET : 'utf8' ); + $this->stow( '# ' . __( 'WordPress MySQL database migration', 'wp-migrate-db' ) . "\n", false ); + $this->stow( "#\n", false ); + $this->stow( '# ' . sprintf( __( 'Generated: %s', 'wp-migrate-db' ), date( 'l j. F Y H:i T' ) ) . "\n", false ); + $this->stow( '# ' . sprintf( __( 'Hostname: %s', 'wp-migrate-db' ), DB_HOST ) . "\n", false ); + $this->stow( '# ' . sprintf( __( 'Database: %s', 'wp-migrate-db' ), $this->backquote( DB_NAME ) ) . "\n", false ); + $this->stow( "# --------------------------------------------------------\n\n", false ); + $this->stow( "/*!40101 SET NAMES $charset */;\n\n", false ); + $this->stow( "SET sql_mode='NO_AUTO_VALUE_ON_ZERO';\n\n", false ); + } + + function gzip() { + return function_exists( 'gzopen' ); + } + + function open( $filename = '', $mode = 'a' ) { + if ( '' == $filename ) { + return false; + } + + if ( $this->gzip() && isset( $this->form_data['gzip_file'] ) && $this->form_data['gzip_file'] ) { + $fp = gzopen( $filename, $mode ); + } else { + $fp = fopen( $filename, $mode ); + } + + return $fp; + } + + function close( $fp ) { + if ( $this->gzip() && isset( $this->form_data['gzip_file'] ) && $this->form_data['gzip_file'] ) { + gzclose( $fp ); + } else { + fclose( $fp ); + } + + unset( $this->fp ); + } + + /** + * Write query line to chunk, file pointer, or buffer depending on migration stage/action. + * + * @param string $query_line + * @param bool $replace + * + * @return bool + */ + function stow( $query_line, $replace = true ) { + $this->set_post_data(); + $this->current_chunk .= $query_line; + + if ( 0 === strlen( $query_line ) ) { + return true; + } + + if ( $this->form_data['action'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + if ( $this->gzip() && isset( $this->form_data['gzip_file'] ) && $this->form_data['gzip_file'] ) { + if ( ! @gzwrite( $this->fp, $query_line ) ) { + $this->error = __( 'Failed to write the gzipped SQL data to the file. (#127)', 'wp-migrate-db' ); + + return false; + } + } else { + // TODO: Use WP_Filesystem API. + if ( false === @fwrite( $this->fp, $query_line ) ) { + $this->error = __( 'Failed to write the SQL data to the file. (#128)', 'wp-migrate-db' ); + + return false; + } + } + } elseif ( $this->state_data['intent'] == 'pull' ) { + echo apply_filters( 'wpmdb_before_response', $query_line ); + } + } + + /** + * Called once our chunk buffer is full, will transfer the SQL to the remote server for importing + * + * @return array|void + */ + function transfer_chunk() { + $this->set_post_data(); + + if ( $this->state_data['intent'] == 'savefile' || $this->state_data['stage'] == 'backup' ) { + $this->close( $this->fp ); + + $result = array( + 'current_row' => $this->row_tracker, + 'primary_keys' => serialize( $this->primary_keys ), + ); + + if ( $this->state_data['intent'] == 'savefile' && $this->state_data['last_table'] == '1' ) { + $result['dump_filename'] = $this->state_data['dump_filename']; + $result['dump_path'] = $this->state_data['dump_path']; + } + + $result = $this->end_ajax( json_encode( $result ) ); + + return $result; + } + + if ( $this->state_data['intent'] == 'pull' ) { + $result = $this->end_ajax( $this->row_tracker . ',' . serialize( $this->primary_keys ) ); + + return $result; + } + + $chunk_gzipped = '0'; + if ( isset( $this->state_data['gzip'] ) && $this->state_data['gzip'] == '1' && $this->gzip() ) { + $this->current_chunk = gzcompress( $this->current_chunk ); + $chunk_gzipped = '1'; + } + + $data = array( + 'action' => 'wpmdb_process_chunk', + 'remote_state_id' => $this->state_data['remote_state_id'], + 'table' => $this->state_data['table'], + 'chunk_gzipped' => $chunk_gzipped, + 'chunk' => $this->current_chunk, + // NEEDS TO BE the last element in this array because of adding it back into the array in ajax_process_chunk() + ); + + $data['sig'] = $this->create_signature( $data, $this->state_data['key'] ); + + $ajax_url = $this->ajax_url(); + $response = $this->remote_post( $ajax_url, $data, __FUNCTION__ ); + + ob_start(); + $this->display_errors(); + $maybe_errors = trim( ob_get_clean() ); + + if ( false === empty( $maybe_errors ) ) { + $maybe_errors = array( 'wpmdb_error' => 1, 'body' => $maybe_errors ); + $result = $this->end_ajax( json_encode( $maybe_errors ) ); + + return $result; + } + + if ( '1' !== $response ) { + $return = array( 'wpmdb_error' => 1, 'body' => $response ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + + $result = $this->end_ajax( json_encode( + array( + 'current_row' => $this->row_tracker, + 'primary_keys' => serialize( $this->primary_keys ), + ) + ) ); + + return $result; + } + + /** + * Add backquotes to tables and db-names in + * SQL queries. Taken from phpMyAdmin. + * + * @param $a_name + * + * @return array|string + */ + function backquote( $a_name ) { + if ( ! empty( $a_name ) && $a_name != '*' ) { + if ( is_array( $a_name ) ) { + $result = array(); + reset( $a_name ); + while ( list( $key, $val ) = each( $a_name ) ) { + $result[ $key ] = '`' . $val . '`'; + } + + return $result; + } else { + return '`' . $a_name . '`'; + } + } else { + return $a_name; + } + } + + /** + * Better addslashes for SQL queries. + * Taken from phpMyAdmin. + * + * @param string $a_string + * @param bool $is_like + * + * @return mixed + */ + function sql_addslashes( $a_string = '', $is_like = false ) { + if ( $is_like ) { + $a_string = str_replace( '\\', '\\\\\\\\', $a_string ); + } else { + $a_string = str_replace( '\\', '\\\\', $a_string ); + } + + return str_replace( '\'', '\\\'', $a_string ); + } + + function network_admin_menu() { + $title = ( $this->is_pro ) ? __( 'Migrate DB Pro', 'wp-migrate-db' ) : __( 'Migrate DB', 'wp-migrate-db' ); + $hook_suffix = add_submenu_page( 'settings.php', + $title, + $title, + 'manage_network_options', + $this->core_slug, + array( $this, 'options_page' ) ); + $this->after_admin_menu( $hook_suffix ); + } + + function admin_menu() { + $title = ( $this->is_pro ) ? __( 'Migrate DB Pro', 'wp-migrate-db' ) : __( 'Migrate DB', 'wp-migrate-db' ); + $hook_suffix = add_management_page( $title, + $title, + 'export', + $this->core_slug, + array( $this, 'options_page' ) ); + $this->after_admin_menu( $hook_suffix ); + } + + function after_admin_menu( $hook_suffix ) { + add_action( 'admin_head-' . $hook_suffix, array( $this, 'admin_head_connection_info' ) ); + add_action( 'load-' . $hook_suffix, array( $this, 'load_assets' ) ); + + // Remove licence from the database if constant is set + if ( $this->is_licence_constant() && ! empty( $this->settings['licence'] ) ) { + $this->settings['licence'] = ''; + update_site_option( 'wpmdb_settings', $this->settings ); + } + } + + function admin_body_class( $classes ) { + if ( ! $classes ) { + $classes = array(); + } else { + $classes = explode( ' ', $classes ); + } + + $version_class = 'wpmdb-not-pro'; + if ( true == $this->is_pro ) { + $version_class = 'wpmdb-pro'; + } + + $classes[] = $version_class; + + // Recommended way to target WP 3.8+ + // http://make.wordpress.org/ui/2013/11/19/targeting-the-new-dashboard-design-in-a-post-mp6-world/ + if ( version_compare( $GLOBALS['wp_version'], '3.8-alpha', '>' ) ) { + if ( ! in_array( 'mp6', $classes ) ) { + $classes[] = 'mp6'; + } + } + + return implode( ' ', $classes ); + } + + /** + * Check for download + * if found prepare file for download + * + * @return void + */ + function http_verify_download() { + if ( ! empty( $_GET['download'] ) ) { + $this->download_file(); + } + } + + /** + * Check for wpmdb-download-log and related nonce + * if found begin diagnostic logging + * + * @return void + */ + function http_prepare_download_log() { + if ( isset( $_GET['wpmdb-download-log'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-download-log' ) ) { + ob_start(); + $this->output_diagnostic_info(); + $this->output_log_file(); + $log = ob_get_clean(); + $url = $this->parse_url( home_url() ); + $host = sanitize_file_name( $url['host'] ); + $filename = sprintf( '%s-diagnostic-log-%s.txt', $host, date( 'YmdHis' ) ); + header( 'Content-Description: File Transfer' ); + header( 'Content-Type: application/octet-stream' ); + header( 'Content-Length: ' . strlen( $log ) ); + header( 'Content-Disposition: attachment; filename=' . $filename ); + echo $log; + exit; + } + } + + /** + * Check for wpmdb-remove-licence and related nonce + * if found cleanup routines related to licenced product + * + * @return void + */ + function http_remove_license() { + if ( isset( $_GET['wpmdb-remove-licence'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-remove-licence' ) ) { + $this->settings['licence'] = ''; + update_site_option( 'wpmdb_settings', $this->settings ); + // delete these transients as they contain information only valid for authenticated licence holders + delete_site_transient( 'update_plugins' ); + delete_site_transient( 'wpmdb_upgrade_data' ); + delete_site_transient( 'wpmdb_licence_response' ); + // redirecting here because we don't want to keep the query string in the web browsers address bar + wp_redirect( network_admin_url( $this->plugin_base . '#settings' ) ); + exit; + } + } + + /** + * Check for wpmdb-disable-ssl and related nonce + * if found temporaily disable ssl via transient + * + * @return void + */ + function http_disable_ssl() { + if ( isset( $_GET['wpmdb-disable-ssl'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-disable-ssl' ) ) { + set_site_transient( 'wpmdb_temporarily_disable_ssl', '1', 60 * 60 * 24 * 30 ); // 30 days + $hash = ( isset( $_GET['hash'] ) ) ? '#' . sanitize_title( $_GET['hash'] ) : ''; + // delete the licence transient as we want to attempt to fetch the licence details again + delete_site_transient( 'wpmdb_licence_response' ); + // redirecting here because we don't want to keep the query string in the web browsers address bar + wp_redirect( network_admin_url( $this->plugin_base . $hash ) ); + exit; + } + } + + /** + * Check for wpmdb-check-licence and related nonce + * if found refresh licence details + * + * @return void + */ + function http_refresh_licence() { + if ( isset( $_GET['wpmdb-check-licence'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-check-licence' ) ) { + $hash = ( isset( $_GET['hash'] ) ) ? '#' . sanitize_title( $_GET['hash'] ) : ''; + // delete the licence transient as we want to attempt to fetch the licence details again + delete_site_transient( 'wpmdb_licence_response' ); + // redirecting here because we don't want to keep the query string in the web browsers address bar + wp_redirect( network_admin_url( $this->plugin_base . $hash ) ); + exit; + } + } + + /** + * Checks and sets up plugin assets. + * Filter actions, enqueue scripts, define configuration, and constants. + * + * @return void + */ + function load_assets() { + $this->http_verify_download(); + $this->http_prepare_download_log(); + $this->http_remove_license(); + $this->http_disable_ssl(); + $this->http_refresh_licence(); + + // add our custom CSS classes to + add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) ); + + $plugins_url = trailingslashit( plugins_url( $this->plugin_folder_name ) ); + $version = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? time() : $this->plugin_version; + $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + + $src = $plugins_url . 'asset/css/styles.css'; + wp_enqueue_style( 'wp-migrate-db-pro-styles', $src, array(), $version ); + + $src = $plugins_url . "asset/js/common$min.js"; + wp_enqueue_script( 'wp-migrate-db-pro-common', $src, null, $version, true ); + + $src = $plugins_url . "asset/js/hook$min.js"; + wp_enqueue_script( 'wp-migrate-db-pro-hook', $src, null, $version, true ); + + $src = $plugins_url . "asset/js/multisite$min.js"; + wp_enqueue_script( 'wp-migrate-db-pro-multisite', $src, array( 'jquery' ), $version, true ); + + do_action( 'wpmdb_load_assets' ); + + $src = $plugins_url . "asset/js/script$min.js"; + wp_enqueue_script( 'wp-migrate-db-pro-script', $src, array( 'jquery' ), $version, true ); + + wp_localize_script( 'wp-migrate-db-pro-script', + 'wpmdb_strings', + array( + 'max_request_size_problem' => __( 'A problem occurred when trying to change the maximum request size, please try again.', 'wp-migrate-db' ), + 'license_check_problem' => __( 'A problem occurred when trying to check the license, please try again.', 'wp-migrate-db' ), + 'establishing_remote_connection' => __( 'Establishing connection to remote server, please wait', 'wp-migrate-db' ), + 'connection_local_server_problem' => __( 'A problem occurred when attempting to connect to the local server, please check the details and try again.', 'wp-migrate-db' ), + 'enter_license_key' => __( 'Please enter your license key.', 'wp-migrate-db' ), + 'register_license_problem' => __( 'A problem occurred when trying to register the license, please try again.', 'wp-migrate-db' ), + 'license_registered' => __( 'Your license has been activated. You will now receive automatic updates and access to email support.', 'wp-migrate-db' ), + 'fetching_license' => __( 'Fetching license details, please wait...', 'wp-migrate-db' ), + 'clear_log_problem' => __( 'An error occurred when trying to clear the debug log. Please contact support. (#132)', 'wp-migrate-db' ), + 'update_log_problem' => __( 'An error occurred when trying to update the debug log. Please contact support. (#133)', 'wp-migrate-db' ), + 'please_select_one_table' => __( 'Please select at least one table to migrate.', 'wp-migrate-db' ), + 'please_select_one_table_backup' => __( 'Please select at least one table for backup.', 'wp-migrate-db' ), + 'enter_name_for_profile' => __( 'Please enter a name for your migration profile.', 'wp-migrate-db' ), + 'save_profile_problem' => __( 'An error occurred when attempting to save the migration profile. Please see the Help tab for details on how to request support. (#118)', 'wp-migrate-db' ), + 'exporting_complete' => _x( 'Exporting complete', 'Data has been successfully exported', 'wp-migrate-db' ), + 'exporting_please_wait' => __( 'Exporting, please wait...', 'wp-migrate-db' ), + 'please_wait' => __( 'please wait...', 'wp-migrate-db' ), + 'complete' => _x( 'complete', 'Finished successfully', 'wp-migrate-db' ), + 'migration_failed' => _x( 'Migration failed', 'Copy of data between servers did not complete', 'wp-migrate-db' ), + 'backing_up' => _x( 'Backing up', 'Saving a copy of the data before import', 'wp-migrate-db' ), + 'migrating' => _x( 'Migrating', 'Copying data between servers', 'wp-migrate-db' ), + 'status' => _x( 'Status', 'Current request status', 'wp-migrate-db' ), + 'response' => _x( 'Response', 'The message the server responded with', 'wp-migrate-db' ), + 'table_process_problem' => __( 'A problem occurred when attempting to process the following table (#113)', 'wp-migrate-db' ), + 'table_process_problem_empty_response' => __( 'A problem occurred when processing the following table. We were expecting a response in JSON format but instead received an empty response.', 'wp-migrate-db' ), + 'completed_with_some_errors' => __( 'Migration completed with some errors', 'wp-migrate-db' ), + 'completed_dump_located_at' => __( 'Migration complete, your backup is located at:', 'wp-migrate-db' ), + 'finalize_tables_problem' => __( 'A problem occurred when finalizing the backup. (#140)', 'wp-migrate-db' ), + 'saved' => _x( 'Saved', 'The settings were saved successfully', 'wp-migrate-db' ), + 'reset_api_key' => __( 'Any sites setup to use the current secret key will no longer be able to connect. You will need to update those sites with the newly generated secret key. Do you wish to continue?', 'wp-migrate-db' ), + 'reset_api_key_problem' => __( 'An error occurred when trying to generate the secret key. Please see the Help tab for details on how to request support. (#105)', 'wp-migrate-db' ), + 'remove_profile' => __( 'You are about to remove the migration profile "{{profile}}". This cannot be undone. Do you wish to continue?', 'wp-migrate-db' ), + 'remove_profile_problem' => __( 'An error occurred when trying to delete the profile. Please see the Help tab for details on how to request support. (#106)', 'wp-migrate-db' ), + 'remove_profile_not_found' => __( "The selected migration profile could not be deleted because it was not found.\nPlease refresh this page to see an accurate list of the currently available migration profiles.", 'wp-migrate-db' ), + 'change_connection_info' => __( 'If you change the connection details, you will lose any replaces and table selections you have made below. Do you wish to continue?', 'wp-migrate-db' ), + 'enter_connection_info' => __( 'Please enter the connection information above to continue.', 'wp-migrate-db' ), + 'save_settings_problem' => __( 'An error occurred when trying to save the settings. Please try again. If the problem persists, please see the Help tab for details on how to request support. (#108)', 'wp-migrate-db' ), + 'connection_info_missing' => __( 'The connection information appears to be missing, please enter it to continue.', 'wp-migrate-db' ), + 'connection_info_incorrect' => __( "The connection information appears to be incorrect, it should consist of two lines. The first being the remote server's URL and the second being the secret key.", 'wp-migrate-db' ), + 'connection_info_url_invalid' => __( 'The URL on the first line appears to be invalid, please check it and try again.', 'wp-migrate-db' ), + 'connection_info_key_invalid' => __( 'The secret key on the second line appears to be invalid. It should be a 32 character string that consists of letters, numbers and special characters only.', 'wp-migrate-db' ), + 'connection_info_local_url' => __( "It appears you've entered the URL for this website, you need to provide the URL of the remote website instead.", 'wp-migrate-db' ), + 'connection_info_local_key' => __( 'Looks like your remote secret key is the same as the secret key for this site. To fix this, go to the Settings tab and click "Reset Secret Key"', 'wp-migrate-db' ), + 'time_elapsed' => __( 'Time Elapsed:', 'wp-migrate-db' ), + 'pause' => _x( 'Pause', 'Temporarily stop migrating', 'wp-migrate-db' ), + 'migration_paused' => _x( 'Migration Paused', 'The migration has been temporarily stopped', 'wp-migrate-db' ), + 'resume' => _x( 'Resume', 'Restart migrating after it was paused', 'wp-migrate-db' ), + 'completing_current_request' => __( 'Completing current request', 'wp-migrate-db' ), + 'cancelling_migration' => _x( 'Cancelling migration', 'The migration is being cancelled', 'wp-migrate-db' ), + 'paused' => _x( 'Paused', 'The migration has been temporarily stopped', 'wp-migrate-db' ), + 'paused_before_finalize' => __( 'Automatically paused before migrated tables are replaced. Click "Resume" or "Cancel" when ready.', 'wp-migrate-db' ), + 'removing_local_sql' => __( 'Removing the local MySQL export file', 'wp-migrate-db' ), + 'removing_local_backup' => __( 'Removing the local backup MySQL export file', 'wp-migrate-db' ), + 'removing_local_temp_tables' => __( 'Removing the local temporary tables', 'wp-migrate-db' ), + 'removing_remote_sql' => __( 'Removing the remote backup MySQL export file', 'wp-migrate-db' ), + 'removing_remote_temp_tables' => __( 'Removing the remote temporary tables', 'wp-migrate-db' ), + 'migration_cancellation_failed' => __( 'Migration cancellation failed', 'wp-migrate-db' ), + 'manually_remove_temp_files' => __( 'A problem occurred while cancelling the migration, you may have to manually delete some temporary files / tables.', 'wp-migrate-db' ), + 'migration_cancelled' => _x( 'Migration cancelled', 'The migration has been cancelled', 'wp-migrate-db' ), + 'migration_complete' => _x( 'Migration complete', 'The migration completed successfully', 'wp-migrate-db' ), + 'finalizing_migration' => _x( 'Finalizing migration', 'The migration is in the last stages', 'wp-migrate-db' ), + 'flushing' => _x( 'Flushing caches and rewrite rules', 'The caches and rewrite rules for the target are being flushed', 'wp-migrate-db' ), + 'blacklist_problem' => __( 'A problem occurred when trying to add plugins to backlist.', 'wp-migrate-db' ), + 'mu_plugin_confirmation' => __( "If confirmed we will install an additional WordPress 'Must Use' plugin. This plugin will allow us to control which plugins are loaded during WP Migrate DB Pro specific operations. Do you wish to continue?", 'wp-migrate-db' ), + 'plugin_compatibility_settings_problem' => __( 'A problem occurred when trying to change the plugin compatibility setting.', 'wp-migrate-db' ), + 'sure' => _x( 'Sure?', 'Confirmation required', 'wp-migrate-db' ), + 'pull_migration_label_migrating' => __( 'Pulling from %s, please wait...', 'wp-migrate-db' ), + 'pull_migration_label_completed' => __( 'Pulling from %s complete', 'wp-migrate-db' ), + 'push_migration_label_migrating' => __( 'Pushing to %s, please wait...', 'wp-migrate-db' ), + 'push_migration_label_completed' => __( 'Pushing to %s complete', 'wp-migrate-db' ), + 'copying_license' => __( 'Copying license to the remote site, please wait', 'wp-migrate-db' ), + 'attempting_to_activate_licence' => __( 'Attempting to activate your license, please wait...', 'wp-migrate-db' ), + 'licence_reactivated' => __( 'License successfully activated, please wait...', 'wp-migrate-db' ), + 'activate_licence_problem' => __( 'An error occurred when trying to reactivate your license. Please provide the following information when requesting support:', 'wp-migrate-db' ), + 'temporarily_activated_licence' => __( "We've temporarily activated your licence and will complete the activation once the Delicious Brains API is available again.
Please refresh this page to continue.", 'wp-migrate-db' ), + 'ajax_json_message' => __( 'JSON Decoding Failure', 'wp-migrate-db' ), + 'ajax_json_errors' => __( 'Our AJAX request was expecting JSON but we received something else. Often this is caused by your theme and/or plugins spitting out PHP errors. If you can edit the theme or plugins causing the errors, you should be able to fix them up, but if not, you can set WP_DEBUG to false in wp-config.php to disable errors from showing up.', 'wp-migrate-db' ), + 'view_error_messages' => __( 'View error messages', 'wp-migrate-db' ), + 'delaying_next_request' => __( 'Waiting %s seconds before executing next step', 'wp-migrate-db' ), + 'delay_between_requests_problem' => __( 'A problem occurred when trying to change the delay between requests, please try again.', 'wp-migrate-db' ), + 'flush_problem' => __( 'A problem occurred when flushing caches and rewrite rules. (#145)', 'wp-migrate-db' ), + 'migrate_button_push' => _x( 'Push', 'Transfer this database to the remote site', 'wp-migrate-db' ), + 'migrate_button_push_save' => _x( 'Push & Save', 'Transfer this database to the remote site and save migration profile', 'wp-migrate-db' ), + 'migrate_button_pull' => _x( 'Pull', 'Transfer the remote database to this site', 'wp-migrate-db' ), + 'migrate_button_pull_save' => _x( 'Pull & Save', 'Transfer the remote database to this site and save migration profile', 'wp-migrate-db' ), + 'migrate_button_export' => _x( 'Export', 'Download a copy of the database', 'wp-migrate-db' ), + 'migrate_button_export_save' => _x( 'Export & Save', 'Download a copy of the database and save migration profile', 'wp-migrate-db' ), + ) + ); + + wp_enqueue_script( 'jquery' ); + wp_enqueue_script( 'jquery-ui-core' ); + wp_enqueue_script( 'jquery-ui-slider' ); + wp_enqueue_script( 'jquery-ui-sortable' ); + } + + function download_file() { + // don't need to check for user permissions as our 'add_management_page' already takes care of this + $this->set_time_limit(); + + $dump_name = $this->format_dump_name( $_GET['download'] ); + + if ( isset( $_GET['gzip'] ) ) { + $dump_name .= '.gz'; + } + + $diskfile = $this->get_upload_info( 'path' ) . DIRECTORY_SEPARATOR . $dump_name; + $filename = basename( $diskfile ); + $last_dash = strrpos( $filename, '-' ); + $salt = substr( $filename, $last_dash, 6 ); + $filename_no_salt = str_replace( $salt, '', $filename ); + + if ( file_exists( $diskfile ) ) { + header( 'Content-Description: File Transfer' ); + header( 'Content-Type: application/octet-stream' ); + header( 'Content-Length: ' . filesize( $diskfile ) ); + header( 'Content-Disposition: attachment; filename=' . $filename_no_salt ); + $success = readfile( $diskfile ); + // TODO: Use WP_Filesystem API. + unlink( $diskfile ); + exit; + } else { + wp_die( __( 'Could not find the file to download:', 'wp-migrate-db' ) . '
' . esc_html( $diskfile ) ); + } + } + + /** + * Supply inline JS data and nonces for enqueued scripts. + * + * @return void + */ + function admin_head_connection_info() { + global $wpdb; + $table_prefix = $wpdb->base_prefix; + + $nonces = apply_filters( 'wpmdb_nonces', array( + 'update_max_request_size' => wp_create_nonce( 'update-max-request-size' ), + 'update_delay_between_requests' => wp_create_nonce( 'update-delay-between-requests' ), + 'check_licence' => wp_create_nonce( 'check-licence' ), + 'verify_connection_to_remote_site' => wp_create_nonce( 'verify-connection-to-remote-site' ), + 'activate_licence' => wp_create_nonce( 'activate-licence' ), + 'clear_log' => wp_create_nonce( 'clear-log' ), + 'get_log' => wp_create_nonce( 'get-log' ), + 'save_profile' => wp_create_nonce( 'save-profile' ), + 'initiate_migration' => wp_create_nonce( 'initiate-migration' ), + 'migrate_table' => wp_create_nonce( 'migrate-table' ), + 'finalize_migration' => wp_create_nonce( 'finalize-migration' ), + 'reset_api_key' => wp_create_nonce( 'reset-api-key' ), + 'delete_migration_profile' => wp_create_nonce( 'delete-migration-profile' ), + 'save_setting' => wp_create_nonce( 'save-setting' ), + 'copy_licence_to_remote_site' => wp_create_nonce( 'copy-licence-to-remote-site' ), + 'reactivate_licence' => wp_create_nonce( 'reactivate-licence' ), + 'process_notice_link' => wp_create_nonce( 'process-notice-link' ), + 'flush' => wp_create_nonce( 'flush' ), + ) ); + + $data = apply_filters( 'wpmdb_data', array( + 'connection_info' => array( site_url( '', 'https' ), $this->settings['key'] ), + 'this_url' => esc_html( addslashes( home_url() ) ), + 'this_path' => esc_html( addslashes( $this->absolute_root_file_path ) ), + 'this_domain' => esc_html( $this->get_domain_current_site() ), + 'this_tables' => $this->get_tables(), + 'this_prefixed_tables' => $this->get_tables( 'prefix' ), + 'this_table_sizes' => $this->get_table_sizes(), + 'this_table_sizes_hr' => array_map( array( $this, 'format_table_sizes' ), $this->get_table_sizes() ), + 'this_table_rows' => $this->get_table_row_count(), + 'this_upload_url' => esc_html( addslashes( trailingslashit( $this->get_upload_info( 'url' ) ) ) ), + 'this_upload_dir_long' => esc_html( addslashes( trailingslashit( $this->get_upload_info( 'path' ) ) ) ), + 'this_uploads_dir' => esc_html( addslashes( $this->get_short_uploads_dir() ) ), + 'this_website_name' => sanitize_title_with_dashes( DB_NAME ), + 'this_download_url' => network_admin_url( $this->plugin_base . '&download=' ), + 'this_prefix' => esc_html( $table_prefix ), + 'this_plugin_base' => esc_html( $this->plugin_base ), + 'is_multisite' => esc_html( is_multisite() ? 'true' : 'false' ), + 'openssl_available' => esc_html( $this->open_ssl_enabled() ? 'true' : 'false' ), + 'max_request' => esc_html( $this->settings['max_request'] ), + 'delay_between_requests' => esc_html( $this->settings['delay_between_requests'] ), + 'bottleneck' => esc_html( $this->get_bottleneck( 'max' ) ), + 'has_licence' => esc_html( $this->get_licence_key() == '' ? '0' : '1' ), + // TODO: Use WP_Filesystem API. + 'write_permission' => esc_html( is_writeable( $this->get_upload_info( 'path' ) ) ? 'true' : 'false' ), + 'nonces' => $nonces, + 'valid_licence' => ( $this->is_valid_licence() ) ? '1' : '0', + 'profile' => isset( $_GET['wpmdb-profile'] ) ? $_GET['wpmdb-profile'] : '-1', + 'is_pro' => esc_html( ( $this->is_pro ) ? 'true' : 'false' ), + 'lower_case_table_names' => esc_html( $this->get_lower_case_table_names_setting() ), + 'subsites' => $this->subsites_list(), + ) ); + + wp_localize_script( 'wp-migrate-db-pro-script', 'wpmdb_data', $data ); + } + + function maybe_update_profile( $profile, $profile_id ) { + $profile_changed = false; + + if ( isset( $profile['exclude_revisions'] ) ) { + unset( $profile['exclude_revisions'] ); + $profile['select_post_types'] = array( 'revision' ); + $profile_changed = true; + } + + if ( isset( $profile['post_type_migrate_option'] ) && 'migrate_select_post_types' == $profile['post_type_migrate_option'] && 'pull' != $profile['action'] ) { + unset( $profile['post_type_migrate_option'] ); + $profile['exclude_post_types'] = '1'; + $all_post_types = $this->get_post_types(); + $profile['select_post_types'] = array_diff( $all_post_types, $profile['select_post_types'] ); + $profile_changed = true; + } + + if ( $profile_changed ) { + $this->settings['profiles'][ $profile_id ] = $profile; + update_site_option( 'wpmdb_settings', $this->settings ); + } + + return $profile; + } + + function get_path_from_url( $url ) { + $parts = $this->parse_url( $url ); + + return ( ! empty( $parts['path'] ) ) ? trailingslashit( $parts['path'] ) : '/'; + } + + function get_path_current_site() { + if ( ! is_multisite() ) { + return ''; + } + + $current_site = get_current_site(); + + return $current_site->path; + } + + /** + * Get the domain for the current site. + * + * @return string + */ + function get_domain_current_site() { + if ( ! is_multisite() ) { + return ''; + } + + $current_site = get_current_site(); + + return $current_site->domain; + } + + /** + * Called to cancel an in-progress migration. + */ + function ajax_cancel_migration() { + $key_rules = array( + 'action' => 'key', + 'migration_state_id' => 'key', + ); + $this->set_post_data( $key_rules ); + + $this->form_data = $this->parse_migration_form_data( $this->state_data['form_data'] ); + + switch ( $this->state_data['intent'] ) { + case 'savefile' : + $this->delete_export_file( $this->state_data['dump_filename'], false ); + break; + case 'push' : + $data = $this->filter_post_elements( + $this->state_data, + array( + 'remote_state_id', + 'intent', + 'url', + 'form_data', + 'temp_prefix', + 'stage', + 'dump_filename', + ) + ); + + $data['action'] = 'wpmdb_process_push_migration_cancellation'; + $data['sig'] = $this->create_signature( $data, $this->state_data['key'] ); + $ajax_url = $this->ajax_url(); + + $response = $this->remote_post( $ajax_url, $data, __FUNCTION__ ); + $this->display_errors(); + + echo esc_html( trim( $response ) ); + break; + case 'pull' : + if ( $this->state_data['stage'] == 'backup' ) { + if ( ! empty( $this->state_data['dumpfile_created'] ) ) { + $this->delete_export_file( $this->state_data['dump_filename'], true ); + } + } else { + $this->delete_temporary_tables( $this->state_data['temp_prefix'] ); + } + break; + default: + break; + } + + if ( ! $this->migration_state->delete() ) { + $this->log_error( 'Could not delete migration state.' ); + } + + exit; + } + + function delete_export_file( $filename, $is_backup ) { + $dump_file = $this->format_dump_name( $filename ); + + if ( true == $is_backup ) { + $dump_file = preg_replace( '/.gz$/', '', $dump_file ); + } + + $dump_file = $this->get_upload_info( 'path' ) . DIRECTORY_SEPARATOR . $dump_file; + + if ( empty( $dump_file ) || false == file_exists( $dump_file ) ) { + _e( 'MySQL export file not found.', 'wp-migrate-db' ); + exit; + } + + // TODO: Use WP_Filesystem API. + if ( false === @unlink( $dump_file ) ) { + _e( 'Could not delete the MySQL export file.', 'wp-migrate-db' ); + exit; + } + } + + function empty_current_chunk() { + $this->current_chunk = ''; + } + + function template_compatibility() { + $args = array( + 'plugin_compatibility_checked' => ( isset( $GLOBALS['wpmdb_compatibility'] ) ? ' checked="checked"' : '' ), + ); + $this->template( 'compatibility', 'common', $args ); + } + + function template_max_request_size() { + $this->template( 'max-request-size', 'common' ); + } + + function template_debug_info() { + $this->template( 'debug-info', 'common' ); + } + + function template_exclude_post_revisions( $loaded_profile ) { + $args = array( + 'loaded_profile' => $loaded_profile, + ); + $this->template( 'exclude-post-revisions', 'wpmdb', $args ); + } + + function template_wordpress_org_support() { + $this->template( 'wordpress-org-support', 'wpmdb' ); + } + + function template_progress_upgrade() { + $this->template( 'progress-upgrade', 'wpmdb' ); + } + + function template_sidebar() { + $this->template( 'sidebar', 'wpmdb' ); + } + + function template_part( $methods, $args = false ) { + $methods = array_diff( $methods, $this->unhook_templates ); + + foreach ( $methods as $method ) { + $method_name = 'template_' . $method; + + if ( method_exists( $this, $method_name ) ) { + call_user_func( array( $this, $method_name ), $args ); + } + } + } + + function plugin_tabs() { + echo implode( '', $this->plugin_tabs ); + } + + function get_plugin_title() { + return __( 'Migrate DB', 'wp-migrate-db' ); + } + + function plugin_deactivated_notice() { + if ( false !== ( $deactivated_notice_id = get_transient( 'wp_migrate_db_deactivated_notice_id' ) ) ) { + if ( '1' === $deactivated_notice_id ) { + $message = __( "WP Migrate DB and WP Migrate DB Pro cannot both be active. We've automatically deactivated WP Migrate DB.", 'wp-migrate-db' ); + } else { + $message = __( "WP Migrate DB and WP Migrate DB Pro cannot both be active. We've automatically deactivated WP Migrate DB Pro.", 'wp-migrate-db' ); + } ?> + +
+
+
%1$s', __( 'our documentation', 'wp-migrate-db-pro' ) ) ); + $return = array( 'wpmdb_error' => 1, 'body' => $return ); + $result = $this->end_ajax( json_encode( $return ) ); + + return $result; + } + } + + return $create_table; + } + + /** + * Provides find/replace pairs with wpmdb_find_and_replace filter applied. + * + * @param string $intent + * @param string $site_url + * + * @return array + */ + function parse_find_replace_pairs( $intent = '', $site_url = '' ) { + $find_replace_pairs = array(); + $tmp_find_replace_pairs = array(); + if ( ! empty( $this->form_data['replace_old'] ) && ! empty( $this->form_data['replace_new'] ) ) { + $tmp_find_replace_pairs = array_combine( $this->form_data['replace_old'], $this->form_data['replace_new'] ); + } + + $tmp_find_replace_pairs = apply_filters( 'wpmdb_find_and_replace', $tmp_find_replace_pairs, $intent, $site_url ); + + if ( ! empty( $tmp_find_replace_pairs ) ) { + $i = 1; + foreach ( $tmp_find_replace_pairs as $replace_old => $replace_new ) { + $find_replace_pairs['replace_old'][ $i ] = $replace_old; + $find_replace_pairs['replace_new'][ $i ] = $replace_new; + $i++; + } + } + + return $find_replace_pairs; + } + + function get_lower_case_table_names_setting() { + global $wpdb; + + $setting = $wpdb->get_var( "SHOW VARIABLES LIKE 'lower_case_table_names'", 1 ); + + return empty( $setting ) ? '-1' : $setting; + } + + function mixed_case_table_name_warning( $migration_type ) { + ob_start(); + ?> +
+ + +
local site has the MySQL setting lower_case_table_names set to 1.", 'wp-migrate-db' ); ?>
+ +
remote site has the MySQL setting lower_case_table_names set to 1.", 'wp-migrate-db' ); ?>
+ + +
+ +
our documentation, proceed with caution.', 'wp-migrate-db' ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/mixed-case-table-names/' ); ?>
+ $functions ) { + foreach ( $functions as $key => $function ) { + // searching for function this way as can't rely on the calling class being named TGM_Plugin_Activation + if ( false !== strpos( $key, 'force_activation' ) ) { + unset( $wp_filter['admin_init'][ $priority ][ $key ] ); + + return; + } + } + } + } +} + +add_action( 'admin_init', 'wpmdbc_tgmpa_compatibility', 1 ); + +/** + * remove blog-active plugins + * + * @param array $plugins numerically keyed array of plugin names + * + * @return array + */ +function wpmdbc_exclude_plugins( $plugins ) { + if ( ! is_array( $plugins ) || empty( $plugins ) ) { + return $plugins; + } + + if ( ! wpmdbc_is_compatibility_mode_request() ) { + return $plugins; + } + + $blacklist_plugins = wpmdbc_get_blacklist_plugins(); + + if ( ! empty( $blacklist_plugins ) ) { + foreach ( $plugins as $key => $plugin ) { + if ( false !== strpos( $plugin, 'wp-migrate-db-pro' ) || ! isset( $blacklist_plugins[ $plugin ] ) ) { + continue; + } + unset( $plugins[ $key ] ); + } + } + + return $plugins; +} + +add_filter( 'option_active_plugins', 'wpmdbc_exclude_plugins' ); + +/** + * remove network-active plugins + * + * @param array $plugins array of plugins keyed by name (name=>timestamp pairs) + * + * @return array + */ +function wpmdbc_exclude_site_plugins( $plugins ) { + if ( ! is_array( $plugins ) || empty( $plugins ) ) { + return $plugins; + } + + if ( ! wpmdbc_is_compatibility_mode_request() ) { + return $plugins; + } + + $blacklist_plugins = wpmdbc_get_blacklist_plugins(); + + if ( ! empty( $blacklist_plugins ) ) { + foreach ( array_keys( $plugins ) as $plugin ) { + if ( false !== strpos( $plugin, 'wp-migrate-db-pro' ) || ! isset( $blacklist_plugins[ $plugin ] ) ) { + continue; + } + unset( $plugins[ $plugin ] ); + } + } + + return $plugins; +} + +add_filter( 'site_option_active_sitewide_plugins', 'wpmdbc_exclude_site_plugins' ); + +/** + * Should the current request be processed by Compatibility Mode? + * + * @return bool + */ +function wpmdbc_is_compatibility_mode_request() { + if ( ! defined( 'DOING_AJAX' ) || + ! DOING_AJAX || + ! isset( $_POST['action'] ) || + false === strpos( $_POST['action'], 'wpmdb' ) || + in_array( $_POST['action'], array( 'wpmdb_flush', 'wpmdb_remote_flush' ) ) + ) { + return false; + } + + return true; +} + +/** + * Returns an array of plugin slugs to be blacklisted. + * + * @return array + */ +function wpmdbc_get_blacklist_plugins() { + $blacklist_plugins = array(); + + $wpmdb_settings = get_site_option( 'wpmdb_settings' ); + + if ( ! empty( $wpmdb_settings['blacklist_plugins'] ) ) { + $blacklist_plugins = array_flip( $wpmdb_settings['blacklist_plugins'] ); + } + + return $blacklist_plugins; +} diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-en.pot b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-en.pot new file mode 100644 index 00000000..bc82afa1 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-en.pot @@ -0,0 +1,1958 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the wp-migrate-db package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: wp-migrate-db\n" +"Report-Msgid-Bugs-To: nom@deliciousbrains.com\n" +"POT-Creation-Date: 2015-12-06 10:37+1300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: class/wpmdb-base.php:159 +msgid "" +"Invalid content verification signature, please verify the connection " +"information on the remote site and try again." +msgstr "" + +#: class/wpmdb-base.php:349 +#, php-format +msgid "" +"The connection to the remote server has timed out, no changes have been " +"committed. (#134 - scope: %s)" +msgstr "" + +#: class/wpmdb-base.php:351 +#, php-format +msgid "We could not find: %s. Are you sure this is the correct URL?" +msgstr "" + +#: class/wpmdb-base.php:356 +msgid "" +"It appears that you might be trying to pull from a local environment. This " +"will not work if this website happens to be located on a remote " +"server, it would be impossible for this server to contact your local " +"environment." +msgstr "" + +#: class/wpmdb-base.php:358 +msgid "" +"It appears that you might be trying to push to a local environment. This " +"will not work if this website happens to be located on a remote " +"server, it would be impossible for this server to contact your local " +"environment." +msgstr "" + +#: class/wpmdb-base.php:366 +#, php-format +msgid "" +"We've detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the " +"host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add " +"%1$s to WP_ACCESSIBLE_HOSTS to continue. More information. (#147 - scope: %3$s)" +msgstr "" + +#: class/wpmdb-base.php:369 +#, php-format +msgid "" +"The connection failed, an unexpected error occurred, please contact support. " +"(#121 - scope: %s)" +msgstr "" + +#: class/wpmdb-base.php:379 +msgid "" +"The remote site is protected with Basic Authentication. Please enter the " +"username and password above to continue. (401 Unauthorized)" +msgstr "" + +#: class/wpmdb-base.php:384 +#, php-format +msgid "" +"Unable to connect to the remote server, please check the connection details " +"- %1$s %2$s (#129 - scope: %3$s)" +msgstr "" + +#: class/wpmdb-base.php:394 +#, php-format +msgid "" +"WP Migrate DB Pro does not seem to be installed or active on the remote " +"site. (#131 - scope: %s)" +msgstr "" + +#: class/wpmdb-base.php:397 +#, php-format +msgid "" +"A response was expected from the remote, instead we got nothing. (#146 - " +"scope: %1$s) Please review %2$s for possible solutions." +msgstr "" + +#: class/wpmdb-base.php:397 +#: class/wpmdb.php:2824 +msgid "our documentation" +msgstr "" + +#: class/wpmdb-base.php:406 +msgid "" +"There was a problem with the AJAX request, we were expecting a serialized " +"response, instead we received: " +msgstr "" + +#: class/wpmdb-base.php:703 +#: class/wpmdb-base.php:1164 +#, php-format +msgid "" +"Could not connect to deliciousbrains.com — You will " +"not receive update notifications or be able to activate your license until " +"this is fixed. This issue is often caused by an improperly configured SSL " +"server (https). We recommend fixing the " +"SSL configuration on your server, but if you need a quick fix you can:" +"%2$s" +msgstr "" + +#: class/wpmdb-base.php:703 +#: class/wpmdb-base.php:1164 +msgid "Temporarily disable SSL for connections to deliciousbrains.com" +msgstr "" + +#: class/wpmdb-base.php:711 +#: class/wpmdb-base.php:1170 +#, php-format +msgid "" +"We've detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the " +"host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add " +"%1$s to WP_ACCESSIBLE_HOSTS to continue. More information." +msgstr "" + +#: class/wpmdb-base.php:756 +msgid "" +"Delicious Brains API is Down â Unfortunately we're " +"experiencing some problems with our server." +msgstr "" + +#: class/wpmdb-base.php:760 +#, php-format +msgctxt "ex. 2 hours ago" +msgid "%s ago" +msgstr "" + +#: class/wpmdb-base.php:765 +msgid "Here's the most recent update on its status" +msgstr "" + +#: class/wpmdb-base.php:792 +#, php-format +msgid "" +"Error retrieving download from deliciousbrain.com. Please try again or " +"download manually from %2$s." +msgstr "" + +#: class/wpmdb-base.php:792 +msgctxt "Delicious Brains account" +msgid "My Account" +msgstr "" + +#: class/wpmdb-base.php:851 +#: class/wpmdb.php:112 +#: class/wpmdb.php:313 +#: class/wpmdbpro.php:1916 +msgctxt "Plugin configuration and preferences" +msgid "Settings" +msgstr "" + +#: class/wpmdb-base.php:852 +#, php-format +msgid "" +"To finish activating WP Migrate DB Pro, please go to %1$s and enter your " +"license key. If you don't have a license key, you may purchase one." +msgstr "" + +#: class/wpmdb-base.php:1083 +#: class/wpmdb-base.php:1093 +msgctxt "A new version of the plugin is available" +msgid "Update Available" +msgstr "" + +#: class/wpmdb-base.php:1084 +#, php-format +msgid "A new version of %1$s is now available. %2$s" +msgstr "" + +#: class/wpmdb-base.php:1084 +#: class/wpmdb-base.php:1094 +msgctxt "Download and install a new version of the plugin" +msgid "Update Now" +msgstr "" + +#: class/wpmdb-base.php:1094 +#, php-format +msgid "" +"%1$s %2$s is now available. You currently have %3$s installed. %5$s" +msgstr "" + +#: class/wpmdb-base.php:1138 +#, php-format +msgid "" +"Activate Your License — Please enter your license key to enable push and pull functionality, " +"priority support and plugin updates." +msgstr "" + +#: class/wpmdb-base.php:1155 +msgid "" +"We've temporarily activated your license and will complete the " +"activation once the Delicious Brains API is available again." +msgstr "" + +#: class/wpmdb-base.php:1177 +#, php-format +msgid "" +"Your License Was Cancelled — Please visit My Account to renew or upgrade your license and " +"enable push and pull." +msgstr "" + +#: class/wpmdb-base.php:1178 +#: class/wpmdb-base.php:1183 +#: class/wpmdb-base.php:1203 +#: class/wpmdb-base.php:1207 +#: class/wpmdbpro.php:1017 +#: class/wpmdbpro.php:1923 +msgid "Check my license again" +msgstr "" + +#: class/wpmdb-base.php:1181 +msgid "Your License Has Expired" +msgstr "" + +#: class/wpmdb-base.php:1182 +#, php-format +msgid "Login to My Account to renew. " +msgstr "" + +#: class/wpmdb-base.php:1187 +msgid "Updates are only available to those with an active license. " +msgstr "" + +#: class/wpmdb-base.php:1188 +msgid "Only active licenses can download and install addons. " +msgstr "" + +#: class/wpmdb-base.php:1189 +msgid "Only active licenses can submit support requests. " +msgstr "" + +#: class/wpmdb-base.php:1190 +msgid "" +"All features will continue to work, but you won't be able to receive updates " +"or email support. " +msgstr "" + +#: class/wpmdb-base.php:1202 +#, php-format +msgid "" +"No Activations Left — Please visit My Account to upgrade your license or deactivate a " +"previous activation and enable push and pull." +msgstr "" + +#: class/wpmdb-base.php:1206 +#, php-format +msgid "" +"Your License Was Not Found — Perhaps you made a typo " +"when defining your WPMDB_LICENCE constant in your wp-config.php? Please " +"visit My Account to double check your " +"license key." +msgstr "" + +#: class/wpmdb-base.php:1210 +msgid "Your License Was Not Found — " +msgstr "" + +#: class/wpmdb-base.php:1214 +msgid "Your License Is Inactive" +msgstr "" + +#: class/wpmdb-base.php:1215 +msgid "Your license has been deactivated for this install." +msgstr "" + +#: class/wpmdb-base.php:1215 +msgid "Reactivate License" +msgstr "" + +#: class/wpmdb-base.php:1218 +#, php-format +msgid "" +"An Unexpected Error Occurred — Please contact us at " +"%2$s and quote the following:" +msgstr "" + +#: class/wpmdb-base.php:1257 +#, php-format +msgid "Invalid nonce for: %s" +msgstr "" + +#: class/wpmdb-base.php:1265 +#, php-format +msgid "Access denied for: %s" +msgstr "" + +#: class/wpmdb-base.php:1469 +msgctxt "dismiss notice permanently" +msgid "Dismiss" +msgstr "" + +#: class/wpmdb-base.php:1478 +msgid "Remind Me Later" +msgstr "" + +#: class/wpmdb-base.php:1580 +msgid "Failed to save migration state. Please contact support." +msgstr "" + +#: class/wpmdb-base.php:1603 +msgid "Failed to retrieve migration state. Please contact support." +msgstr "" + +#: class/wpmdb-cli.php:60 +#, php-format +msgid "CLI addon requires PHP %1$s+" +msgstr "" + +#: class/wpmdb-cli.php:104 +msgid "Profile not found or unable to be generated from params." +msgstr "" + +#: class/wpmdb-cli.php:136 +#, php-format +msgid "The following table(s) do not exist in the %1$s database: %2$s" +msgstr "" + +#: class/wpmdb-cli.php:183 +#, php-format +msgid "" +"We were expecting a JSON response, instead we received: %2$s (function name: " +"%1$s)" +msgstr "" + +#: class/wpmdb-cli.php:239 +msgid "Initiating migration..." +msgstr "" + +#: class/wpmdb-cli.php:277 +msgid "Exporting tables" +msgstr "" + +#: class/wpmdb-cli.php:347 +msgid "No tables selected for migration." +msgstr "" + +#: class/wpmdb-cli.php:440 +msgid "Cleaning up..." +msgstr "" + +#: class/wpmdb-cli.php:507 +msgid "Unable to move exported file." +msgstr "" + +#: class/wpmdb-command.php:66 +msgid "You must provide a destination filename." +msgstr "" + +#: class/wpmdb-command.php:100 +msgid "Missing action parameter" +msgstr "" + +#: class/wpmdb-command.php:119 +#, php-format +msgid "%1$s and %2$s must contain the same number of values" +msgstr "" + +#: class/wpmdb-command.php:167 +#, php-format +msgid "" +"Cannot write to file \"%1$s\". Please ensure that the specified directory " +"exists and is writable." +msgstr "" + +#: class/wpmdb-command.php:211 +msgid "WP Migrate DB CLI class not available." +msgstr "" + +#: class/wpmdb-command.php:218 +#, php-format +msgid "Export saved to: %s" +msgstr "" + +#: class/wpmdb-replace.php:174 +msgid "" +"Failed attempting to do the recursive unserialize replace. Please contact " +"support." +msgstr "" + +#: class/wpmdb-sanitize.php:39 +#, php-format +msgid "%1$s was not expecting data to be an array." +msgstr "" + +#: class/wpmdb-sanitize.php:60 +#, php-format +msgid "%1$s was expecting an array but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:66 +#, php-format +msgid "%1$s was expecting a string but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:73 +#, php-format +msgid "%1$s was expecting a valid key but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:81 +#, php-format +msgid "%1$s was expecting text but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:88 +#, php-format +msgid "%1$s was expecting serialized data but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:94 +#, php-format +msgid "%1$s was expecting a valid numeric but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:101 +#, php-format +msgid "%1$s was expecting an integer but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:108 +#, php-format +msgid "" +"%1$s was expecting a positive number (int) but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:115 +#, php-format +msgid "" +"%1$s was expecting a negative number (int) but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:122 +#, php-format +msgid "%1$s was expecting 0 (int) but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:129 +#, php-format +msgid "%1$s was expecting an empty value but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:136 +#, php-format +msgid "%1$s was expecting a URL but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:144 +#, php-format +msgid "%1$s was expecting a bool but got something else: \"%2$s\"" +msgstr "" + +#: class/wpmdb-sanitize.php:150 +#, php-format +msgid "Unknown sanitization rule \"%1$s\" supplied by %2$s" +msgstr "" + +#: class/wpmdb.php:111 +msgctxt "Configure a migration or export" +msgid "Migrate" +msgstr "" + +#: class/wpmdb.php:113 +msgctxt "Get help or contact support" +msgid "Help" +msgstr "" + +#: class/wpmdb.php:180 +#, php-format +msgid "The following directory could not be created: %s" +msgstr "" + +#: class/wpmdb.php:185 +#, php-format +msgid "Could not copy the compatibility plugin from %1$s to %2$s" +msgstr "" + +#: class/wpmdb.php:191 +#, php-format +msgid "Could not remove the compatibility plugin from %s" +msgstr "" + +#: class/wpmdb.php:938 +#: class/wpmdbpro.php:333 +#: class/wpmdbpro.php:1763 +msgid "" +"Failed attempting to unserialize the response from the remote server. Please " +"contact support." +msgstr "" + +#: class/wpmdb.php:1352 +msgid "" +"Failed to retrieve table structure, please ensure your database is online. " +"(#125)" +msgstr "" + +#: class/wpmdb.php:1382 +#, php-format +msgid "Delete any existing table %s" +msgstr "" + +#: class/wpmdb.php:1393 +#, php-format +msgid "Table structure of table %s" +msgstr "" + +#: class/wpmdb.php:1401 +msgid "" +"Failed to generate the create table query, please ensure your database is " +"online. (#126)" +msgstr "" + +#: class/wpmdb.php:1457 +#, php-format +msgid "Data contents of table %s" +msgstr "" + +#: class/wpmdb.php:1828 +#, php-format +msgid "End of data contents of table %s" +msgstr "" + +#: class/wpmdb.php:1968 +msgid "WordPress MySQL database migration" +msgstr "" + +#: class/wpmdb.php:1970 +#, php-format +msgid "Generated: %s" +msgstr "" + +#: class/wpmdb.php:1971 +#, php-format +msgid "Hostname: %s" +msgstr "" + +#: class/wpmdb.php:1972 +#, php-format +msgid "Database: %s" +msgstr "" + +#: class/wpmdb.php:2025 +msgid "Failed to write the gzipped SQL data to the file. (#127)" +msgstr "" + +#: class/wpmdb.php:2032 +msgid "Failed to write the SQL data to the file. (#128)" +msgstr "" + +#: class/wpmdb.php:2168 +#: class/wpmdb.php:2179 +#: class/wpmdbpro.php:1723 +msgid "Migrate DB Pro" +msgstr "" + +#: class/wpmdb.php:2168 +#: class/wpmdb.php:2179 +#: class/wpmdb.php:2738 +msgid "Migrate DB" +msgstr "" + +#: class/wpmdb.php:2355 +msgid "" +"A problem occurred when trying to change the maximum request size, please " +"try again." +msgstr "" + +#: class/wpmdb.php:2356 +#: class/wpmdbpro.php:1017 +msgid "A problem occurred when trying to check the license, please try again." +msgstr "" + +#: class/wpmdb.php:2357 +msgid "Establishing connection to remote server, please wait" +msgstr "" + +#: class/wpmdb.php:2358 +msgid "" +"A problem occurred when attempting to connect to the local server, please " +"check the details and try again." +msgstr "" + +#: class/wpmdb.php:2359 +msgid "Please enter your license key." +msgstr "" + +#: class/wpmdb.php:2360 +msgid "" +"A problem occurred when trying to register the license, please try again." +msgstr "" + +#: class/wpmdb.php:2361 +msgid "" +"Your license has been activated. You will now receive automatic updates and " +"access to email support." +msgstr "" + +#: class/wpmdb.php:2362 +#: template/pro/licence-info.php:6 +msgid "Fetching license details, please wait..." +msgstr "" + +#: class/wpmdb.php:2363 +msgid "" +"An error occurred when trying to clear the debug log. Please contact " +"support. (#132)" +msgstr "" + +#: class/wpmdb.php:2364 +msgid "" +"An error occurred when trying to update the debug log. Please contact " +"support. (#133)" +msgstr "" + +#: class/wpmdb.php:2365 +msgid "Please select at least one table to migrate." +msgstr "" + +#: class/wpmdb.php:2366 +msgid "Please select at least one table for backup." +msgstr "" + +#: class/wpmdb.php:2367 +msgid "Please enter a name for your migration profile." +msgstr "" + +#: class/wpmdb.php:2368 +msgid "" +"An error occurred when attempting to save the migration profile. Please see " +"the Help tab for details on how to request support. (#118)" +msgstr "" + +#: class/wpmdb.php:2369 +msgctxt "Data has been successfully exported" +msgid "Exporting complete" +msgstr "" + +#: class/wpmdb.php:2370 +msgid "Exporting, please wait..." +msgstr "" + +#: class/wpmdb.php:2371 +msgid "please wait..." +msgstr "" + +#: class/wpmdb.php:2372 +msgctxt "Finished successfully" +msgid "complete" +msgstr "" + +#: class/wpmdb.php:2373 +msgctxt "Copy of data between servers did not complete" +msgid "Migration failed" +msgstr "" + +#: class/wpmdb.php:2374 +msgctxt "Saving a copy of the data before import" +msgid "Backing up" +msgstr "" + +#: class/wpmdb.php:2375 +msgctxt "Copying data between servers" +msgid "Migrating" +msgstr "" + +#: class/wpmdb.php:2376 +msgctxt "Current request status" +msgid "Status" +msgstr "" + +#: class/wpmdb.php:2377 +msgctxt "The message the server responded with" +msgid "Response" +msgstr "" + +#: class/wpmdb.php:2378 +msgid "" +"A problem occurred when attempting to process the following table (#113)" +msgstr "" + +#: class/wpmdb.php:2379 +msgid "" +"A problem occurred when processing the following table. We were expecting a " +"response in JSON format but instead received an empty response." +msgstr "" + +#: class/wpmdb.php:2380 +msgid "Migration completed with some errors" +msgstr "" + +#: class/wpmdb.php:2381 +msgid "Migration complete, your backup is located at:" +msgstr "" + +#: class/wpmdb.php:2382 +msgid "A problem occurred when finalizing the backup. (#140)" +msgstr "" + +#: class/wpmdb.php:2383 +#: template/common/compatibility.php:34 +#: template/common/max-request-size.php:11 +#: template/pro/delay-between-requests.php:11 +msgctxt "The settings were saved successfully" +msgid "Saved" +msgstr "" + +#: class/wpmdb.php:2384 +msgid "" +"Any sites setup to use the current secret key will no longer be able to " +"connect. You will need to update those sites with the newly generated secret " +"key. Do you wish to continue?" +msgstr "" + +#: class/wpmdb.php:2385 +msgid "" +"An error occurred when trying to generate the secret key. Please see the " +"Help tab for details on how to request support. (#105)" +msgstr "" + +#: class/wpmdb.php:2386 +msgid "" +"You are about to remove the migration profile \"{{profile}}\". This cannot " +"be undone. Do you wish to continue?" +msgstr "" + +#: class/wpmdb.php:2387 +msgid "" +"An error occurred when trying to delete the profile. Please see the Help tab " +"for details on how to request support. (#106)" +msgstr "" + +#: class/wpmdb.php:2388 +msgid "" +"The selected migration profile could not be deleted because it was not " +"found.\n" +"Please refresh this page to see an accurate list of the currently available " +"migration profiles." +msgstr "" + +#: class/wpmdb.php:2389 +msgid "" +"If you change the connection details, you will lose any replaces and table " +"selections you have made below. Do you wish to continue?" +msgstr "" + +#: class/wpmdb.php:2390 +#: template/migrate.php:113 +msgid "Please enter the connection information above to continue." +msgstr "" + +#: class/wpmdb.php:2391 +msgid "" +"An error occurred when trying to save the settings. Please try again. If the " +"problem persists, please see the Help tab for details on how to request " +"support. (#108)" +msgstr "" + +#: class/wpmdb.php:2392 +msgid "" +"The connection information appears to be missing, please enter it to " +"continue." +msgstr "" + +#: class/wpmdb.php:2393 +msgid "" +"The connection information appears to be incorrect, it should consist of two " +"lines. The first being the remote server's URL and the second being the " +"secret key." +msgstr "" + +#: class/wpmdb.php:2394 +msgid "" +"The URL on the first line appears to be invalid, please check it and try " +"again." +msgstr "" + +#: class/wpmdb.php:2395 +msgid "" +"The secret key on the second line appears to be invalid. It should be a 32 " +"character string that consists of letters, numbers and special characters " +"only." +msgstr "" + +#: class/wpmdb.php:2396 +msgid "" +"It appears you've entered the URL for this website, you need to provide the " +"URL of the remote website instead." +msgstr "" + +#: class/wpmdb.php:2397 +msgid "" +"Looks like your remote secret key is the same as the secret key for this " +"site. To fix this, go to the Settings tab and " +"click \"Reset Secret Key\"" +msgstr "" + +#: class/wpmdb.php:2398 +#: template/migrate-progress.php:11 +msgid "Time Elapsed:" +msgstr "" + +#: class/wpmdb.php:2399 +#: template/migrate-progress.php:25 +msgctxt "Temporarily stop migrating" +msgid "Pause" +msgstr "" + +#: class/wpmdb.php:2400 +msgctxt "The migration has been temporarily stopped" +msgid "Migration Paused" +msgstr "" + +#: class/wpmdb.php:2401 +msgctxt "Restart migrating after it was paused" +msgid "Resume" +msgstr "" + +#: class/wpmdb.php:2402 +msgid "Completing current request" +msgstr "" + +#: class/wpmdb.php:2403 +msgctxt "The migration is being cancelled" +msgid "Cancelling migration" +msgstr "" + +#: class/wpmdb.php:2404 +msgctxt "The migration has been temporarily stopped" +msgid "Paused" +msgstr "" + +#: class/wpmdb.php:2405 +msgid "" +"Automatically paused before migrated tables are replaced. Click \"Resume\" " +"or \"Cancel\" when ready." +msgstr "" + +#: class/wpmdb.php:2406 +msgid "Removing the local MySQL export file" +msgstr "" + +#: class/wpmdb.php:2407 +msgid "Removing the local backup MySQL export file" +msgstr "" + +#: class/wpmdb.php:2408 +msgid "Removing the local temporary tables" +msgstr "" + +#: class/wpmdb.php:2409 +msgid "Removing the remote backup MySQL export file" +msgstr "" + +#: class/wpmdb.php:2410 +msgid "Removing the remote temporary tables" +msgstr "" + +#: class/wpmdb.php:2411 +msgid "Migration cancellation failed" +msgstr "" + +#: class/wpmdb.php:2412 +msgid "" +"A problem occurred while cancelling the migration, you may have to manually " +"delete some temporary files / tables." +msgstr "" + +#: class/wpmdb.php:2413 +msgctxt "The migration has been cancelled" +msgid "Migration cancelled" +msgstr "" + +#: class/wpmdb.php:2414 +msgctxt "The migration completed successfully" +msgid "Migration complete" +msgstr "" + +#: class/wpmdb.php:2415 +msgctxt "The migration is in the last stages" +msgid "Finalizing migration" +msgstr "" + +#: class/wpmdb.php:2416 +msgctxt "The caches and rewrite rules for the target are being flushed" +msgid "Flushing caches and rewrite rules" +msgstr "" + +#: class/wpmdb.php:2417 +msgid "A problem occurred when trying to add plugins to backlist." +msgstr "" + +#: class/wpmdb.php:2418 +msgid "" +"If confirmed we will install an additional WordPress 'Must Use' plugin. This " +"plugin will allow us to control which plugins are loaded during WP Migrate " +"DB Pro specific operations. Do you wish to continue?" +msgstr "" + +#: class/wpmdb.php:2419 +msgid "" +"A problem occurred when trying to change the plugin compatibility setting." +msgstr "" + +#: class/wpmdb.php:2420 +msgctxt "Confirmation required" +msgid "Sure?" +msgstr "" + +#: class/wpmdb.php:2421 +#, php-format +msgid "Pulling from %s, please wait..." +msgstr "" + +#: class/wpmdb.php:2422 +#, php-format +msgid "Pulling from %s complete" +msgstr "" + +#: class/wpmdb.php:2423 +#, php-format +msgid "Pushing to %s, please wait..." +msgstr "" + +#: class/wpmdb.php:2424 +#, php-format +msgid "Pushing to %s complete" +msgstr "" + +#: class/wpmdb.php:2425 +msgid "Copying license to the remote site, please wait" +msgstr "" + +#: class/wpmdb.php:2426 +msgid "Attempting to activate your license, please wait..." +msgstr "" + +#: class/wpmdb.php:2427 +msgid "License successfully activated, please wait..." +msgstr "" + +#: class/wpmdb.php:2428 +msgid "" +"An error occurred when trying to reactivate your license. Please provide the " +"following information when requesting support:" +msgstr "" + +#: class/wpmdb.php:2429 +msgid "" +"We've temporarily activated your licence and will complete the " +"activation once the Delicious Brains API is available again. Please refresh this page to continue." +msgstr "" + +#: class/wpmdb.php:2430 +msgid "JSON Decoding Failure" +msgstr "" + +#: class/wpmdb.php:2431 +msgid "" +"Our AJAX request was expecting JSON but we received something else. Often " +"this is caused by your theme and/or plugins spitting out PHP errors. If you " +"can edit the theme or plugins causing the errors, you should be able to fix " +"them up, but if not, you can set WP_DEBUG to false in wp-config.php to " +"disable errors from showing up." +msgstr "" + +#: class/wpmdb.php:2432 +msgid "View error messages" +msgstr "" + +#: class/wpmdb.php:2433 +#, php-format +msgid "Waiting %s seconds before executing next step" +msgstr "" + +#: class/wpmdb.php:2434 +msgid "" +"A problem occurred when trying to change the delay between requests, please " +"try again." +msgstr "" + +#: class/wpmdb.php:2435 +msgid "A problem occurred when flushing caches and rewrite rules. (#145)" +msgstr "" + +#: class/wpmdb.php:2436 +msgctxt "Transfer this database to the remote site" +msgid "Push" +msgstr "" + +#: class/wpmdb.php:2437 +msgctxt "Transfer this database to the remote site and save migration profile" +msgid "Push & Save" +msgstr "" + +#: class/wpmdb.php:2438 +msgctxt "Transfer the remote database to this site" +msgid "Pull" +msgstr "" + +#: class/wpmdb.php:2439 +msgctxt "Transfer the remote database to this site and save migration profile" +msgid "Pull & Save" +msgstr "" + +#: class/wpmdb.php:2440 +#: template/migrate.php:353 +msgctxt "Download a copy of the database" +msgid "Export" +msgstr "" + +#: class/wpmdb.php:2441 +msgctxt "Download a copy of the database and save migration profile" +msgid "Export & Save" +msgstr "" + +#: class/wpmdb.php:2477 +msgid "Could not find the file to download:" +msgstr "" + +#: class/wpmdb.php:2672 +msgid "MySQL export file not found." +msgstr "" + +#: class/wpmdb.php:2678 +msgid "Could not delete the MySQL export file." +msgstr "" + +#: class/wpmdb.php:2744 +msgid "" +"WP Migrate DB and WP Migrate DB Pro cannot both be active. We've " +"automatically deactivated WP Migrate DB." +msgstr "" + +#: class/wpmdb.php:2746 +msgid "" +"WP Migrate DB and WP Migrate DB Pro cannot both be active. We've " +"automatically deactivated WP Migrate DB Pro." +msgstr "" + +#: class/wpmdb.php:2824 +#, php-format +msgid "" +"The source site supports utf8mb4 data but the target does not, aborting " +"migration to avoid possible data corruption. Please see %1$s for more " +"information. (#148)" +msgstr "" + +#: class/wpmdb.php:2875 +msgid "Warning: Mixed Case Table Names" +msgstr "" + +#: class/wpmdb.php:2878 +msgid "" +"Whoa! We've detected that your local site has the MySQL setting " +"lower_case_table_names set to 1." +msgstr "" + +#: class/wpmdb.php:2880 +msgid "" +"Whoa! We've detected that your remote site has the MySQL setting " +"lower_case_table_names set to 1." +msgstr "" + +#: class/wpmdb.php:2883 +msgid "" +"As a result, uppercase characters in table names will be converted to " +"lowercase during the migration." +msgstr "" + +#: class/wpmdb.php:2885 +#, php-format +msgid "" +"You can read more about this in our documentation, " +"proceed with caution." +msgstr "" + +#: class/wpmdbpro-addon.php:61 +#, php-format +msgid "" +"The version of %1$s you have installed, requires version %2$s of WP Migrate " +"DB Pro. You currently have %3$s installed. Update " +"Now" +msgstr "" + +#: class/wpmdbpro-cli-export.php:62 +msgid "" +"The installation must be a Multisite network to make use of the subsite " +"option" +msgstr "" + +#: class/wpmdbpro-cli-export.php:65 +msgid "" +"The Multisite Tools addon needs to be installed and activated to make use of " +"the subsite option" +msgstr "" + +#: class/wpmdbpro-cli-export.php:68 +#: class/wpmdbpro-cli-export.php:73 +msgid "" +"A valid Blog ID or Subsite URL must be supplied to make use of the subsite " +"option" +msgstr "" + +#: class/wpmdbpro-cli-export.php:84 +msgid "A new table name prefix may only be specified for subsite exports." +msgstr "" + +#: class/wpmdbpro-cli-export.php:87 +msgid "A valid prefix must be supplied to make use of the prefix option" +msgstr "" + +#: class/wpmdbpro.php:108 +msgctxt "Plugin extensions" +msgid "Addons" +msgstr "" + +#: class/wpmdbpro.php:179 +msgid "UI Walkthrough" +msgstr "" + +#: class/wpmdbpro.php:180 +msgid "" +"A brief walkthrough of the WP Migrate DB plugin showing all of the different " +"options and explaining them." +msgstr "" + +#: class/wpmdbpro.php:183 +msgid "Pulling Live Data Into Your Local Development Environment" +msgstr "" + +#: class/wpmdbpro.php:184 +msgid "" +"This screencast demonstrates how you can pull data from a remote, live " +"WordPress install and update the data in your local development environment." +msgstr "" + +#: class/wpmdbpro.php:187 +msgid "Pushing Local Development Data to a Staging Environment" +msgstr "" + +#: class/wpmdbpro.php:188 +msgid "" +"This screencast demonstrates how you can push a local WordPress database " +"you've been using for development to a staging environment." +msgstr "" + +#: class/wpmdbpro.php:191 +msgid "WP Migrate DB Pro Media Files Addon 1.3 and CLI Addon 1.1" +msgstr "" + +#: class/wpmdbpro.php:192 +msgid "" +"A demonstration of what's new in WP Migrate DB Pro Media Files Addon 1.3 and " +"CLI Addon 1.1." +msgstr "" + +#: class/wpmdbpro.php:299 +msgid "" +"Please activate your license before attempting a pull or push migration." +msgstr "" + +#: class/wpmdbpro.php:597 +msgid "" +"The connection succeeded but the remote site is configured to reject pull " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#141)" +msgstr "" + +#: class/wpmdbpro.php:648 +msgid "" +"The connection succeeded but the remote site is configured to reject pull " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#110)" +msgstr "" + +#: class/wpmdbpro.php:650 +msgid "" +"The connection succeeded but the remote site is configured to reject push " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#110)" +msgstr "" + +#: class/wpmdbpro.php:729 +#, php-format +msgid "" +"Version Mismatch — We've detected you have version %1$s of WP " +"Migrate DB Pro at %2$s but are using an outdated version here. Please go to " +"the Plugins page on both installs and check for updates." +msgstr "" + +#: class/wpmdbpro.php:731 +#, php-format +msgid "" +"Version Mismatch — We've detected you have version %1$s of WP " +"Migrate DB Pro at %2$s but are using %3$s here. Please go to the Plugins page on both installs and check for updates." +msgstr "" + +#: class/wpmdbpro.php:745 +msgctxt "Asking to try and connect to remote server after verification error" +msgid "Try again?" +msgstr "" + +#: class/wpmdbpro.php:758 +#, php-format +msgid "" +"Activate remote license — Looks like you don't have a WP Migrate DB " +"Pro license active at %s." +msgstr "" + +#: class/wpmdbpro.php:760 +#, php-format +msgid "Copy %1$s license key to %2$s and activate it" +msgstr "" + +#: class/wpmdbpro.php:771 +msgid "" +"The connection succeeded but the remote site is configured to reject pull " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#122)" +msgstr "" + +#: class/wpmdbpro.php:773 +msgid "" +"The connection succeeded but the remote site is configured to reject push " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#122)" +msgstr "" + +#: class/wpmdbpro.php:775 +msgctxt "Attempt to connect to the remote server again" +msgid "Try again?" +msgstr "" + +#: class/wpmdbpro.php:920 +msgctxt "Delete license" +msgid "Remove" +msgstr "" + +#: class/wpmdbpro.php:1104 +msgid "" +"If you have an active license, you may send an email to the " +"following address." +msgstr "" + +#: class/wpmdbpro.php:1106 +msgid "" +"Please copy the Diagnostic Info & Error Log info below into a text file " +"and attach it to your email. Do the same for any other site involved in your " +"email." +msgstr "" + +#: class/wpmdbpro.php:1137 +msgctxt "License does not allow use of addons" +msgid "Addons Unavailable" +msgstr "" + +#: class/wpmdbpro.php:1137 +#, php-format +msgid "" +"Addons are not included with the Personal license. Visit My Account to upgrade in just a few clicks." +msgstr "" + +#: class/wpmdbpro.php:1152 +msgctxt "Installed on website but not activated" +msgid "Installed" +msgstr "" + +#: class/wpmdbpro.php:1154 +msgctxt "Installed and activated on website" +msgid "Activated" +msgstr "" + +#: class/wpmdbpro.php:1157 +msgctxt "Enable addon so it may be used" +msgid "Activate" +msgstr "" + +#: class/wpmdbpro.php:1161 +msgctxt "Download and activate addon" +msgid "Install" +msgstr "" + +#: class/wpmdbpro.php:1167 +#: template/common/debug-info.php:4 +msgctxt "Download to your computer" +msgid "Download" +msgstr "" + +#: class/wpmdbpro.php:1615 +msgid "Could not upload the SQL to the server. (#135)" +msgstr "" + +#: class/wpmdbpro.php:1621 +msgid "Could not read the SQL file we uploaded to the server. (#136)" +msgstr "" + +#: class/wpmdbpro.php:1640 +msgid "" +"The connection succeeded but the remote site is configured to reject push " +"connections. You can change this in the \"settings\" tab on the remote site. " +"(#139)" +msgstr "" + +#: class/wpmdbpro.php:1906 +#, php-format +msgid "There is a new version of %s available." +msgstr "" + +#: class/wpmdbpro.php:1908 +#, php-format +msgid "View version %s details" +msgstr "" + +#: class/wpmdbpro.php:1918 +#, php-format +msgid "" +"To update, go to %1$s and enter your license key. If you don't have a " +"license key, you may purchase one." +msgstr "" + +#: class/wpmdbpro.php:1920 +#, php-format +msgid "" +"To finish activating %1$s, please go to %2$s and enter your license key. If " +"you don't have a license key, you may purchase one." +msgstr "" + +#: class/wpmdbpro.php:1988 +msgid "Could not retrieve version details. Please try again." +msgstr "" + +#: template/addons.php:7 +msgid "Fetching addon details, please wait..." +msgstr "" + +#: template/addons.php:9 +#: template/pro/licence-info.php:8 +msgid "" +"We couldn't find your license information. Please switch to the settings tab " +"and enter your license." +msgstr "" + +#: template/addons.php:10 +msgid "Once completed, you may visit this tab to view the available addons." +msgstr "" + +#: template/common/breadcrumbs.php:3 +msgctxt "Default profile loaded" +msgid "New Profile" +msgstr "" + +#: template/common/breadcrumbs.php:9 +msgid "Saved Profiles" +msgstr "" + +#: template/common/compatibility.php:4 +msgid "" +"Improve performance and reliability by not loading the following plugins for " +"migration requests" +msgstr "" + +#: template/common/compatibility.php:9 +msgid "" +"Some plugins add a lot of overhead to each request, requiring extra memory " +"and CPU. And some plugins even interfere with migrations and cause them to " +"fail. We recommend only loading plugins that affect migration requests, for " +"example a plugin that hooks into WP Migrate DB." +msgstr "" + +#: template/common/compatibility.php:26 +#: template/pro/backup.php:44 +#: template/pro/exclude-post-types.php:19 +#: template/pro/select-tables.php:42 +msgid "Select All" +msgstr "" + +#: template/common/compatibility.php:28 +#: template/pro/backup.php:46 +#: template/pro/exclude-post-types.php:21 +#: template/pro/select-tables.php:44 +msgid "Deselect All" +msgstr "" + +#: template/common/compatibility.php:30 +#: template/pro/backup.php:48 +#: template/pro/exclude-post-types.php:23 +#: template/pro/select-tables.php:46 +msgid "Invert Selection" +msgstr "" + +#: template/common/compatibility.php:33 +msgid "Save Changes" +msgstr "" + +#: template/common/debug-info.php:2 +msgid "Diagnostic Info & Error Log" +msgstr "" + +#: template/common/debug-info.php:5 +msgid "Clear Error Log" +msgstr "" + +#: template/common/max-request-size.php:3 +msgid "Maximum Request Size" +msgstr "" + +#: template/common/max-request-size.php:7 +#, php-format +msgid "" +"We've detected that your server supports requests up to %s, but it's " +"possible that your server has limitations that we could not detect. To be on " +"the safe side, we set the default to 1 MB, but you can try throttling it up " +"to get better performance. If you're getting a 413 error or having trouble " +"with time outs, try throttling this setting down." +msgstr "" + +#: template/migrate-progress.php:5 +msgid "Please wait while migration is running..." +msgstr "" + +#: template/migrate-progress.php:10 +msgid "Establishing Connection" +msgstr "" + +#: template/migrate-progress.php:26 +msgctxt "Stop the migration" +msgid "Cancel" +msgstr "" + +#: template/migrate.php:72 +msgid "Export File" +msgstr "" + +#: template/migrate.php:78 +msgid "Save as file to your computer" +msgstr "" + +#: template/migrate.php:85 +msgid "Compress file with gzip" +msgstr "" + +#: template/migrate.php:95 +msgid "Connection Info - Site URL & Secret Key" +msgstr "" + +#: template/migrate.php:106 +msgid "SSL Disabled" +msgstr "" + +#: template/migrate.php:106 +msgid "" +"We couldn't connect over SSL but regular http (no SSL) appears to be working " +"so we've switched to that. If you run a push or pull, your data will be " +"transmitted unencrypted. Most people are fine with this, but just a heads up." +msgstr "" + +#: template/migrate.php:116 +msgid "Cannot Access Uploads Directory" +msgstr "" + +#: template/migrate.php:118 +msgid "" +"We require write permissions to the standard WordPress uploads directory. " +"Without this permission exports are unavailable. Please grant 755 " +"permissions on the following directory:" +msgstr "" + +#: template/migrate.php:129 +msgctxt "Source text to be replaced" +msgid "Find" +msgstr "" + +#: template/migrate.php:130 +msgctxt "Text to replace in source" +msgid "Replace" +msgstr "" + +#: template/migrate.php:217 +#, php-format +msgid "" +"New URL Missing — Please enter the protocol-relative " +"URL of the remote website in the \"New URL\" field or remove the whole row " +"entirely. If you are unsure of what this URL should be, please consult our documentation on find and replace " +"fields." +msgstr "" + +#: template/migrate.php:219 +#, php-format +msgid "" +"New URL Missing — Please enter the protocol-relative " +"URL of the remote website in the \"New URL\" field. If you are unsure of " +"what this URL should be, please consult our " +"documentation on find and replace fields." +msgstr "" + +#: template/migrate.php:223 +#, php-format +msgid "" +"New File Path Missing — Please enter the root file " +"path of the remote website in the \"New file path\" field or remove the " +"whole row entirely. If you are unsure of what the file path should be, " +"please consult our documentation on " +"find and replace fields." +msgstr "" + +#: template/migrate.php:232 +msgid "Advanced Options" +msgstr "" + +#: template/migrate.php:241 +msgid "Replace GUIDs" +msgstr "" + +#: template/migrate.php:247 +#, php-format +msgid "" +"Although the WordPress Codex emphasizes " +"that GUIDs should not be changed, this is limited to sites that are already " +"live. If the site has never been live, we recommend replacing the GUIDs. For " +"example, you may be developing a new site locally at dev.somedomain.com and " +"want to migrate the site live to somedomain.com." +msgstr "" + +#: template/migrate.php:253 +msgid "Exclude spam comments" +msgstr "" + +#: template/migrate.php:259 +msgid "" +"Do not migrate the 'active_plugins' setting (i.e. which plugins are " +"activated/deactivated)" +msgstr "" + +#: template/migrate.php:271 +msgid "Compatible with older versions of MySQL (pre-5.5)" +msgstr "" + +#: template/migrate.php:277 +msgid "Pause before replacing migrated tables" +msgstr "" + +#: template/migrate.php:293 +msgid "Save Migration Profile" +msgstr "" + +#: template/migrate.php:293 +msgid "Save the above settings for the next time you do a similiar migration" +msgstr "" + +#: template/migrate.php:315 +msgid "Create new profile" +msgstr "" + +#: template/migrate.php:324 +#: template/migrate.php:334 +msgid "Warning: Different Table Prefixes" +msgstr "" + +#: template/migrate.php:326 +msgid "" +"Whoa! We've detected that the database table prefix differs between " +"installations. Clicking the Migrate button below will create new database " +"tables in your local database with prefix \"\"." +msgstr "" + +#: template/migrate.php:328 +#, php-format +msgid "" +"However, your local install is configured to use table prefix \"%1$s\" and " +"will ignore the migrated tables. So, AFTER migration is complete, you " +"will need to edit your local install's wp-config.php and change the \"%1$s\" " +"variable to \"\"." +msgstr "" + +#: template/migrate.php:330 +msgid "" +"This will allow your local install the use the migrated tables. Once you do " +"this, you shouldn't have to do it again." +msgstr "" + +#: template/migrate.php:336 +#, php-format +msgid "" +"Whoa! We've detected that the database table prefix differs between " +"installations. Clicking the Migrate button below will create new database " +"tables in the remote database with prefix \"%s\"." +msgstr "" + +#: template/migrate.php:338 +#, php-format +msgid "" +"However, your remote install is configured to use table prefix \"\" and will ignore the migrated tables. So, " +"AFTER migration is complete, you will need to edit your remote " +"install's wp-config.php and change the \"\" variable to \"%s\"." +msgstr "" + +#: template/migrate.php:340 +msgid "" +"This will allow your remote install the use the migrated tables. Once you do " +"this, you shouldn't have to do it again." +msgstr "" + +#: template/migrate.php:354 +msgctxt "Save current migration settings" +msgid "Save Profile" +msgstr "" + +#: template/options.php:22 +msgid "" +"PHP Safe Mode Enabled — We do not officially support " +"running this plugin in safe mode because set_time_limit() has " +"no effect. Therefore we can't extend the run time of the script and ensure " +"it doesn't time out before the migration completes. We haven't disabled the " +"plugin however, so you're free to cross your fingers and hope for the best. " +"However, if you have trouble, we can't help you until you turn off safe mode." +msgstr "" + +#: template/options.php:24 +#: template/options.php:43 +#, php-format +msgid "Your current PHP run time limit is set to %s seconds." +msgstr "" + +#: template/options.php:32 +#, php-format +msgid "" +"Internet Explorer Not Supported — Less than 2% of our " +"customers use IE, so we've decided not to spend time supporting it. We ask " +"that you use Firefox or a Webkit-based browser like Chrome or Safari " +"instead. If this is a problem for you, please let us know." +msgstr "" + +#: template/options.php:41 +msgid "" +"PHP Function Disabled — The set_time_limit() function is currently disabled on your server. We use this function to " +"ensure that the migration doesn't time out. We haven't disabled the plugin " +"however, so you're free to cross your fingers and hope for the best. You may " +"want to contact your web host to enable this function." +msgstr "" + +#: template/pro/backup.php:4 +msgid "Backup the local database before replacing it" +msgstr "" + +#: template/pro/backup.php:5 +msgid "Backup the remote database before replacing it" +msgstr "" + +#: template/pro/backup.php:7 +msgid "An SQL file will be saved to" +msgstr "" + +#: template/pro/backup.php:15 +msgid "Backup all tables with prefix" +msgstr "" + +#: template/pro/backup.php:21 +msgid "Backup only tables selected for migration" +msgstr "" + +#: template/pro/backup.php:27 +msgid "Backup only selected tables below" +msgstr "" + +#: template/pro/backup.php:51 +#, php-format +msgid "" +"The backup option has been disabled as your local uploads directory is " +"currently not writeable. The following directory should have 755 " +"permissions: %s" +msgstr "" + +#: template/pro/block-external-warning.php:4 +#, php-format +msgid "" +"We've detected that WP_HTTP_BLOCK_EXTERNAL is enabled which " +"will prevent WP Migrate DB Pro from functioning properly. You should either " +"disable WP_HTTP_BLOCK_EXTERNAL or add any sites that you'd like " +"to migrate to or from with WP Migrate DB Pro to WP_ACCESSIBLE_HOSTS (deliciousbrains.com must be added to WP_ACCESSIBLE_HOSTS " +"for the API to work). More information on this can be found here." +msgstr "" + +#. translators: 1: Remind Me Later, 2: Dismiss +#: template/pro/block-external-warning.php:10 +#, php-format +msgctxt "Block External actions" +msgid "%1$s | %2$s" +msgstr "" + +#: template/pro/connection-info.php:2 +msgid "Connection Info" +msgstr "" + +#: template/pro/connection-info.php:5 +msgid "Reset Secret Key" +msgstr "" + +#: template/pro/delay-between-requests.php:3 +msgid "Delay Between Requests" +msgstr "" + +#: template/pro/delay-between-requests.php:7 +msgid "" +"Some servers have rate limits which the plugin can hit when performing " +"migrations. If you're experiencing migration failures due to server rate " +"limits, you should set this to one or more seconds to alleviate the problem." +msgstr "" + +#: template/pro/exclude-post-types.php:4 +msgid "Exclude Post Types" +msgstr "" + +#: template/pro/licence-info.php:2 +msgid "Email Support" +msgstr "" + +#: template/pro/licence-info.php:9 +msgid "Once completed, you may visit this tab to view your support details." +msgstr "" + +#: template/pro/licence.php:2 +msgid "Your License" +msgstr "" + +#: template/pro/licence.php:5 +msgid "The license key is currently defined in wp-config.php." +msgstr "" + +#: template/pro/licence.php:15 +msgid "Activate License" +msgstr "" + +#: template/pro/outdated-addons-warning.php:16 +#, php-format +msgid "" +"The version of the %1$s addon you have installed%2$s is out-of-date and will " +"not work with this version WP Migrate DB Pro. Update Now" +msgstr "" + +#: template/pro/pull-push-radio-buttons.php:4 +msgctxt "Import data from remote database" +msgid "Pull" +msgstr "" + +#: template/pro/pull-push-radio-buttons.php:4 +msgid "Replace this site's db with remote db" +msgstr "" + +#: template/pro/pull-push-radio-buttons.php:13 +msgctxt "Export data to remote database" +msgid "Push" +msgstr "" + +#: template/pro/pull-push-radio-buttons.php:13 +msgid "Replace remote db with this site's db" +msgstr "" + +#: template/pro/secret-key-warning.php:2 +msgid "Improve Security" +msgstr "" + +#: template/pro/secret-key-warning.php:3 +#, php-format +msgid "" +"We have implemented a more secure method of secret key generation since your " +"key was generated. We recommend you visit the Settings tab and reset your secret key." +msgstr "" + +#. translators: 1: Remind Me Later, 2: Dismiss +#: template/pro/secret-key-warning.php:7 +#, php-format +msgctxt "Improve Security actions" +msgid "%1$s | %2$s" +msgstr "" + +#: template/pro/select-tables.php:4 +msgctxt "Database tables" +msgid "Tables" +msgstr "" + +#: template/pro/select-tables.php:13 +msgid "Migrate all tables with prefix" +msgstr "" + +#: template/pro/select-tables.php:19 +msgid "Migrate only selected tables below" +msgstr "" + +#: template/pro/toggle-remote-requests.php:6 +msgid "" +"Accept pull requests allow this database to be exported and downloaded" +msgstr "" + +#: template/pro/toggle-remote-requests.php:12 +msgid "Accept push requests allow this database to be overwritten" +msgstr "" + +#: template/pro/toggle-remote-requests.php:18 +msgid "Enable SSL verification" +msgstr "" + +#: template/pro/toggle-remote-requests.php:23 +msgid "" +"We disable SSL verification by default because a lot of people's " +"environments are not setup for it to work. For example, with XAMPP, you have " +"to manually enable OpenSSL by editing the php.ini. Without SSL verification, " +"an HTTPS connection is vulnerable to a man-in-the-middle attack, so we do " +"recommend you configure your environment and enable this." +msgstr "" + +#: template/pro/videos.php:2 +msgctxt "Tutorial videos" +msgid "Videos" +msgstr "" + +#: template/profile.php:2 +msgid "Would you like to use a saved migration profile?" +msgstr "" + +#: template/profile.php:14 +msgid "Nope, let's start fresh..." +msgstr "" + +#: template/wpmdb/exclude-post-revisions.php:4 +msgid "Exclude post revisions" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:3 +msgid "Seen the PRO version?" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:5 +msgid "" +"One-click in your WordPress dashboard to push your database up to staging/" +"production or pull it down to dev" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:6 +msgid "Sync the Media Libraries of two sites" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:7 +msgid "Run migrations from the command line" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:11 +msgid "Within a few hours WP Migrate DB Pro has paid for itself!" +msgstr "" + +#: template/wpmdb/progress-upgrade.php:17 +msgid "More About The Pro Version" +msgstr "" + +#: template/wpmdb/sidebar.php:3 +msgid "" +"WP Migrate DB Pro — Push and pull your database from one WordPress " +"install to another in 1-click." +msgstr "" + +#: template/wpmdb/sidebar.php:6 +msgid "Get 20% Off!" +msgstr "" + +#: template/wpmdb/sidebar.php:11 +#, php-format +msgid "" +"Submit your name and email and we'll send you a coupon for 20% off your " +"upgrade to the pro version." +msgstr "" + +#: template/wpmdb/sidebar.php:15 +msgid "Your Email" +msgstr "" + +#: template/wpmdb/sidebar.php:19 +msgid "First Name" +msgstr "" + +#: template/wpmdb/sidebar.php:23 +msgid "Last Name" +msgstr "" + +#: template/wpmdb/sidebar.php:30 +msgid "Send me the coupon" +msgstr "" + +#: template/wpmdb/sidebar.php:34 +msgid "" +"We promise we will not use your email for anything else and you can " +"unsubscribe with 1-click anytime." +msgstr "" + +#: template/wpmdb/wordpress-org-support.php:2 +msgctxt "Get help from the community" +msgid "Support" +msgstr "" + +#: template/wpmdb/wordpress-org-support.php:4 +msgid "As this is a free plugin, we do not provide support." +msgstr "" + +#: template/wpmdb/wordpress-org-support.php:6 +#, php-format +msgid "" +"You may ask the WordPress community for help by posting to the WordPress.org support forum. Response time can range from a few days " +"to a few weeks and will likely be from a non-developer." +msgstr "" + +#: template/wpmdb/wordpress-org-support.php:8 +#, php-format +msgid "" +"If you want a timely response via email from a developer " +"who works on this plugin, upgrade to WP Migrate DB Pro " +"and send us an email." +msgstr "" + +#: template/wpmdb/wordpress-org-support.php:10 +#, php-format +msgid "" +"If you've found a bug, please submit an issue at Github." +msgstr "" diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-pt_BR.mo b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-pt_BR.mo new file mode 100644 index 00000000..e421b2d2 Binary files /dev/null and b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/languages/wp-migrate-db-pt_BR.mo differ diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/readme.txt b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/readme.txt new file mode 100644 index 00000000..71a1de81 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/readme.txt @@ -0,0 +1,237 @@ +=== WP Migrate DB === +Contributors: bradt +Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5VPMGLLK94XJC +Tags: migrate, migration, export, data dump, backup, database, mysql +Requires at least: 3.0 +Tested up to: 4.4 +Stable tag: 0.7.2 +License: GPLv2 + +Migrates your database by running find & replace on URLs and file paths, handling serialized data, and saving an SQL file. + +== Description == + +https://www.youtube.com/watch?v=m8oScnEK5y0 + +WP Migrate DB exports your database as a MySQL data dump (much like phpMyAdmin), does a find and replace on URLs and file paths, handles serialized data, then allows you to save it to your computer as an SQL file. To complete the migration, you need to use a database management tool (e.g. phpMyAdmin) to import the SQL file to your database, replacing your existing database. It is perfect for developers who need to migrate fresh data from the production site to their local install, or migrate their locally developed site to a staging or production server. + +WP Migrate DB handles serialized data (both arrays and objects) by unserializing the data and going through it, identifying strings and running a find & replace on them. Once it has gone through all the data, it serializes it again and sticks it back in the database. + +Example: s:5:"hello" becomes s:11:"hello world" + +**PRO Version with Email Support and More Features** + +* Push and pull your databases +* Find & replace that handles serialized data +* Backups +* Export your database +* Select which tables to migrate +* Filter out post types +* Exclude useless data +* Save migration profiles +* Phenomenal email support +* Stress tested on massive databases +* Solid security +* [Media Files addon](https://deliciousbrains.com/wp-migrate-db-pro/doc/media-files-addon/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=freeplugin) +* [CLI addon](https://deliciousbrains.com/wp-migrate-db-pro/doc/cli-addon/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=freeplugin) +* [Multisite Tools addon](https://deliciousbrains.com/wp-migrate-db-pro/doc/multisite-tools-addon/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=freeplugin) + +See the video below or [visit the web site](http://deliciousbrains.com/wp-migrate-db-pro/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=freeplugin) to learn more about the pro version. + +https://www.youtube.com/watch?v=fHFcH4bCzmU + +== Installation == + +1. Use WordPress' built-in installer +2. Access the "Migrate DB" menu option under Tools (or under Settings on multsite intallations) + +== Frequently Asked Questions == + += Why wouldn't I just use WordPress' built-in XML export/import to migrate my site? = + +WP Migrate DB will migrate your entire WordPress database, WordPress' built-in tools will not. For more details, please see our blog post, [WordPress XML Export/Import vs. WP Migrate DB Pro](https://deliciousbrains.com/wordpress-xml-export-import-vs-wp-migrate-db-pro/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin). + += Will you migrate my site for me? = + +Sorry, but we do not offer site migration services at the moment. + += Does the plugin support multisite? = + +Yes, but the [Multisite Tools addon](https://deliciousbrains.com/wp-migrate-db-pro/doc/multisite-tools-addon/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin) for the [pro version](http://deliciousbrains.com/wp-migrate-db-pro/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin) does a lot more with multisite like migrating a subsite as a single-site install. + += Does the plugin migrate files as well? = + +No, it only operates on the database. The pro version's [Media Files addon](https://deliciousbrains.com/wp-migrate-db-pro/doc/media-files-addon/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin) allows you to migrate media files. + += Why do I end up with a wp-login.php download instead of the exported SQL file? = + +It is likely you have a download manager plugin or extension installed in your web browser. You will need to disable it for the SQL download to work properly. + += Does the plugin handle serialized data? = + +Yep, it will run a find & replace on your serialized data and migrate it without corrupting it. See [our documentation](https://deliciousbrains.com/wp-migrate-db-pro/doc/serialized-data/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin) for details. + += What are the requirements? = + +They are the same as the [requirements for WP Migrate DB Pro](https://deliciousbrains.com/wp-migrate-db-pro/pricing/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin#requirements). + += Do you offer email support? = + +If you upgrade to [WP Migrate DB Pro](http://deliciousbrains.com/wp-migrate-db-pro/?utm_source=wordpress.org&utm_medium=web&utm_content=faq&utm_campaign=freeplugin), we will gladly provide you with email support. We take pride in delivering exceptional customer support. We do not provide email support for the free version. + +== Screenshots == + +1. Main screen +2. Settings tab +3. Saving the exported database + +== Changelog == + += WP Migrate DB 0.7.2 - 2015-12-03 = + +* Improvement: "Migrate" button renamed to "Export" +* Improvement: Uses WP_Filesystem instead of direct PHP filesystem functionality where possible +* Improvement: Remove Find & Replace row icon is now a little dimmer to reduce UI clutter +* Improvement: Compatibility with WordPress 4.4 + += WP Migrate DB 0.7.1 - 2015-07-09 = + +* Improvement: Added more diagnostic info to facilitate debugging +* Improvement: Global JS variables moved to single global object to avoid conflicts +* Bug Fix: WP Migrate DB and Pro can be activated at the same time when activating plugins in bulk or via WP-CLI +* Bug Fix: `BINARY` data not exported properly +* Bug Fix: `BIT` data not exported properly +* Bug Fix: When `post_max_size` is set to 0 (unlimited), `wpmdb_bottleneck` is broken +* Bug Fix: Saved Profiles link is broken in certain situations + += WP Migrate DB 0.7 - 2015-06-12 = + +* New: [WP-CLI export subcommand](https://deliciousbrains.com/wp-migrate-db-pro/doc/cli-export-subcommand/) +* New: Quick copy find textbox value to replace textbox by clicking arrow icon in between (hat tip Jonathan Perlman) +* New: Added filters to hook into find & replace routine and deal with encoded data ([example](https://github.com/deliciousbrains/wp-migrate-db-pro-tweaks/blob/master/wp-migrate-db-pro-tweaks.php#L316-L413)) +* Improvement: Greatly reduced data passed through each HTTP request for better security and reliability +* Improvement: Massive overhaul of input sanitization for better security +* Improvement: Add `_mig_` prefix to wpmdb_alter_statements table +* Improvement: Cleanup wpmdb_alter_statements tables from failed migrations +* Improvement: Show dimmed remove icons in find & replace rows to indicate they can be removed +* Improvement: Dim remove icons next to saved profiles +* Improvement: Better error message when empty response received from remote server +* Improvement: Added diagnostic info to facilitate debugging and decrease time to resolution for support requests +* Improvement: Warning notice when `WP_HTTP_BLOCK_EXTERNAL` constant is set to true +* Improvement: Leave it to WordPress core to convert tables to utf8mb4 +* Improvement: Workaround to fix issues with Siteground's staging environments +* Bug fix: Connection URL with space(s) in beginning failing +* Bug fix: Cancelling a gzipped Export does not remove file +* Bug fix: Unusual table names causing regular expressions to fail +* Bug fix: Preserving options not working when default subsite is not 1 +* Bug fix: NAN% shown at beginning of a migration +* Bug fix: Migration progress bar is overflowing the scale, passing 100% +* Bug fix: Custom post type links broken after migration with Compatibility Mode enabled +* Bug fix: Saving a new profile does not change the URL to that saved profile URL + += WP Migrate DB 0.6.1 - 2014-10-29 = +* New: breadcrumb-style UI for saved profiles +* New: Brazilian Portugese translation +* Security: Added .htaccess to backup folder to help prevent direct downloads +* Security: False values not included in signature +* Improvement: Compatibility with TGM Plugin Activation +* Improvement: Fixed hundreds of PHP Code Sniffer warnings +* Improvement: Switch to `update_site_option()` and `get_site_option()` +* Improvement: Cleaner and more instructive error message on JSON decoding failure +* Improvement: New hooks to massage data before and after find & replace +* Improvement: Common server security rules better accommodated +* Improvement: Better compatibility with SSL on WP Engine +* Improvement: Minify all the Javascripts +* Improvement: Use PHP's DIRECTORY_SEPARATOR instead of our own constant +* Improvement: Updated tons of translation strings to be translator-friendly +* Improvement: Find & replace field error messages could suggest removing the fields +* Improvement: Download button for Diagnostic Info & Error Log +* Bug fix: 404 errors after successful migrations due to caching +* Bug fix: Multisite exports broken on PHP < 5.4.7 +* Bug fix: Using relative paths for file includes +* Bug fix: Typing new profile name does not select "Create new profile" option +* Bug fix: Find & replace field errors stick around even after removing fields +* Bug fix: `wpmdb_error_log` option is auto loading +* Bug fix: Inconsistent stripping of slashes +* Bug fix: Spinner is inconsistent with WP 3.8+ spinner +* Bug fix: Apostrophe in path not being handled +* Bug fix: Inappropriate use of `htmlentities()` +* Bug fix: The table tooltip still shows during the media files migration +* Bug fix: Import/Export issues between MySQL 5.1 and 5.5+ +* Bug fix: Notice error on Updates dashboard page +* Bug fix: Signature verification error when local and remote plugins are different versions +* Bug fix: Find & replace handle icon is rendering poorly +* Bug fix: PHP Notice: Undefined variable: safe_mode +* Bug fix: Fatal error: Cannot use object of type WP_Error as array in `verify_download()` + += WP Migrate DB 0.6 - 2014-08-19 = +* New: Updated the migration UI to include a detailed progress bar, time elapsed, pause and cancel buttons and more! +* New: Option to exclude transients (temporary cached data) +* New: Migration profiles +* New: Setting to configure the maximum request size (how much data is exported in a given HTTP request) +* Improvement: Unlimited find & replace fields with drag & drop reordering + += WP Migrate DB 0.5 - 2013-07-26 = +* Language support! Thanks to an awesome [pull request](https://github.com/bradt/wp-migrate-db/pull/19) from [Rafael Funchal](https://github.com/rafaelfunchal). +* New Language: Brazilian Portugese +* [Added filter for the filename of the exported file](https://github.com/bradt/wp-migrate-db/issues/16) +* Bug fix: [Spam commentmeta included when "Do not export spam comments" checked](https://github.com/bradt/wp-migrate-db/issues/18) +* Bug fix: [Fatal error method `error` does not exist](https://github.com/bradt/wp-migrate-db/issues/20) +* Bug fix: [Table names with dashes not exporting](https://github.com/bradt/wp-migrate-db/issues/15) +* Bug fix: [Find & replace is case-sensitive but shouldn't](https://github.com/bradt/wp-migrate-db/issues/13) + += WP Migrate DB 0.4.4 - 2013-05-19 = +* [Pro version has arrived!](http://deliciousbrains.com/wp-migrate-db-pro/?utm_source=wordpress.org&utm_medium=web&utm_content=changelog&utm_campaign=freeplugin) Added some info to the sidebar. +* Updated required version to WordPress 3.0+ +* Bug fix: [Does not handle serialized objects](https://github.com/bradt/wp-migrate-db/issues/11) +* Bug fix: [Admin menu disappears when DISALLOW_FILE_MODS is true](https://github.com/bradt/wp-migrate-db/issues/8) +* Bug fix: [Duplicate records on export](https://github.com/bradt/wp-migrate-db/issues/5) +* Bug fix: Updated spinner image for HiDPI displays + += WP Migrate DB 0.4.3 - 2012-12-18 = +* Fixed deprecated error notices when debug mode is on +* Bug fix: [Exports views as tables](https://github.com/bradt/wp-migrate-db/issues/3) +* Compatibility tested with WordPress 3.5 + += WP Migrate DB 0.4.2 - 2012-09-13 = +* Moved screenshots to /assets folder and updated them to support retina +* Added sidebar including author profile and survey to gauge interest for a pro version + += WP Migrate DB 0.4.1 - 2012-08-15 = +* Removed WP App Store installer - not allowed in WP.org repo + += WP Migrate DB 0.4 - 2012-08-07 = +* New: More than 4x faster than version 0.3 due to find & replace improvements +* New: Option to turn off replacing GUIDs +* New: Option to exclude spam comments and post revisions from the export +* New: Option to save file with gzip compression +* New: Added date and time to file names +* New: Display path to SQL file on the server +* New: WP App Store installer integration +* Bug fix: Notices and warnings displayed when WP_DEBUG is on + += WP Migrate DB 0.3 - 2011-12-16 = +* Bug fix: [Null formatting error](http://plugins.trac.wordpress.org/ticket/1430) +* Bug fix: [Deprecated capability](http://plugins.trac.wordpress.org/ticket/1431) +* Bug fix: Serialized string lengths incorrect when string contains double quotes + += WP Migrate DB 0.2.2 - 2011-09-23 = +* Bug fix: [Breaks Export](http://wordpress.org/support/topic/plugin-wp-migrate-db-breaks-export?replies=1) + += WP Migrate DB 0.2.1 - 2009-12-13 = +* Moved to WordPress.org hosting + += WP Migrate DB 0.2 - 2009-04-03 = +* Moved menu link from "Settings" to "Tools" +* The random string of characters no longer appears in the filename on save. + += WP Migrate DB 0.1 - 2009-03-20 = +* First release + +== Upgrade Notice == + += 0.4 = +Runs export over 4x faster and adds some nice new features often requested. Upgrade recommended. + += 0.2.2 = +This version fixes a bug that breaks the WordPress core export feature. It is highly recommended that everyone upgrade. diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/addons.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/addons.php new file mode 100644 index 00000000..9dc87a43 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/addons.php @@ -0,0 +1,13 @@ +get_licence_key(); +?> + + + + + + + + + + \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/breadcrumbs.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/breadcrumbs.php new file mode 100644 index 00000000..34117f10 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/breadcrumbs.php @@ -0,0 +1,17 @@ +settings['profiles'] ) > 0 ) : + $profile_name = $is_default_profile ? _x( 'New Profile', 'Default profile loaded', 'wp-migrate-db' ) : $loaded_profile['name']; + ?> + + + + + + + + + + + + + + autocomplete="off" /> + + + + + + + + + + + + + / + + / + + + + + + + +
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/debug-info.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/debug-info.php new file mode 100644 index 00000000..185f3b2a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/debug-info.php @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/max-request-size.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/max-request-size.php new file mode 100644 index 00000000..6c56b23a --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/common/max-request-size.php @@ -0,0 +1,14 @@ + + + + + + + get_bottleneck( 'max' ) ) ); ?> + + + + + + + \ No newline at end of file diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/help.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/help.php new file mode 100644 index 00000000..f2ea64ee --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/help.php @@ -0,0 +1,3 @@ + + template_part( array( 'wordpress_org_support', 'licence_info', 'debug_info', 'videos' ) ); ?> + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate-progress.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate-progress.php new file mode 100644 index 00000000..f0e224f3 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate-progress.php @@ -0,0 +1,31 @@ + + × + + + + + + + + + + + + + + wp_options + + + + + + + + + + + + + template_part( array( 'progress_upgrade' ) ); ?> + + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate.php new file mode 100644 index 00000000..3b76c0f9 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/migrate.php @@ -0,0 +1,362 @@ +get_profile( $_GET['wpmdb-profile'] ); +} else { + $loaded_profile = $this->default_profile; +} + +$is_default_profile = isset( $loaded_profile['default_profile'] ); + +$convert_exclude_revisions = false; +$convert_post_type_selection = false; +if ( ! $is_default_profile ) { + if ( isset( $loaded_profile['exclude_revisions'] ) ) { + $convert_exclude_revisions = true; + } + /* We used to provide users the option of selecting which post types they'd like to migrate. + * We found that our wording for this functionality was a little confusing so we switched it to instead read "Exclude Post Types" + * Once we made the switch we needed a way of inverting their saved post type selection to instead exclude the select post types. + * This was required to make their select compatible with the new "exclude" wording. + * This is easy enough for "push" and "export" saved profile as we know which post types exist on the local system and + * can easily invert the selection. Pull saved profiles is a little trickier. + * $this->maybe_update_profile() is used to update deprecated profile options to their new values. + * At the time of page request $this->maybe_update_profile() cannot be used to update a pull profile as we don't know which + * post types exist on the remote machine. As such we invert this selection later using the $convert_post_type_selection flag below. + */ + if ( isset( $loaded_profile['post_type_migrate_option'] ) && 'migrate_select_post_types' == $loaded_profile['post_type_migrate_option'] && 'pull' == $loaded_profile['action'] ) { + $convert_post_type_selection = true; + } + $loaded_profile = $this->maybe_update_profile( $loaded_profile, $_GET['wpmdb-profile'] ); +} + +if ( false == $is_default_profile ) { + $loaded_profile = wp_parse_args( $loaded_profile, $this->default_profile ); +} +$loaded_profile = wp_parse_args( $loaded_profile, $this->checkbox_options ); +$breadcrumbs_params = array( + 'loaded_profile' => $loaded_profile, + 'is_default_profile' => $is_default_profile, +); +?> + + ++ + + + template( 'breadcrumbs', 'common', $breadcrumbs_params ); ?> + + + + + + is_pro ) ? '' : ' style="display: none;"'; ?> + > + is_pro ) ? ' checked="checked"' : ''; ?> /> + + + + + + maybe_checked( $loaded_profile['save_computer'] ); ?> /> + + + + gzip() ) : ?> + + + maybe_checked( $loaded_profile['gzip_file'] ); ?> /> + + + + + + + template_part( array( 'pull_push_radio_buttons' ), $loaded_profile ); ?> + + + + <?php echo esc_html( isset( $loaded_profile['connection_info'] ) ? $loaded_profile['connection_info'] : '' ); ?> + + + + + + + + + + + — + + + template_part( array( 'invalid_licence_warning' ) ); ?> + + + + + + + — + get_upload_info( 'path' ) ); + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + → + + + + + + + lock_url_find_replace_row ) ? ' readonly' : ''; ?> /> + + → + + + lock_url_find_replace_row ) : ?> + + + + + + + + → + + + + + + + lock_url_find_replace_row ) ? ' readonly' : ''; ?> /> + + → + + + lock_url_find_replace_row || ( $this->lock_url_find_replace_row && $i != 1 ) ) : ?> + + + Add Row + + New URL Missing — Please enter the protocol-relative URL of the remote website in the "New URL" field or remove the whole row entirely. If you are unsure of what this URL should be, please consult our documentation on find and replace fields.', 'wp-migrate-db' ); + if ( $is_default_profile && $this->lock_url_find_replace_row ) { + $new_url_missing_warning = __( 'New URL Missing — Please enter the protocol-relative URL of the remote website in the "New URL" field. If you are unsure of what this URL should be, please consult our documentation on find and replace fields.', 'wp-migrate-db' ); + } + ?> + + New File Path Missing — Please enter the root file path of the remote website in the "New file path" field or remove the whole row entirely. If you are unsure of what the file path should be, please consult our documentation on find and replace fields.', 'wp-migrate-db' ), 'https://deliciousbrains.com/wp-migrate-db-pro/doc/find-and-replace/' ); ?> + + + + template_part( array( 'select_tables', 'exclude_post_types' ), $loaded_profile ); ?> + + + + ▼ + + + + + + + + + maybe_checked( $loaded_profile['replace_guids'] ); ?> /> + + + + + + + WordPress Codex emphasizes that GUIDs should not be changed, this is limited to sites that are already live. If the site has never been live, we recommend replacing the GUIDs. For example, you may be developing a new site locally at dev.somedomain.com and want to migrate the site live to somedomain.com.', 'wp-migrate-db' ), 'http://codex.wordpress.org/Changing_The_Site_URL#Important_GUID_Note' ); ?> + + + + + maybe_checked( $loaded_profile['exclude_spam'] ); ?> /> + + + + + + maybe_checked( $loaded_profile['keep_active_plugins'] ); ?> /> + + + + + + maybe_checked( $loaded_profile['exclude_transients'] ); ?> /> + Exclude transients (temporary cached data) + + + + + maybe_checked( $loaded_profile['compatibility_older_mysql'] ); ?> /> + + + + + + maybe_checked( $loaded_profile['pause_before_finalize'] ); ?> /> + + + + template_part( array( 'exclude_post_revisions' ), $loaded_profile ); ?> + + + + + + template_part( array( 'backup' ), $loaded_profile ); ?> + + + + + + /> + + + + + + settings['profiles'] as $profile_id => $profile ) { + ++ $profile_id; + ?> + + + + /> + + + + + + + /> + + + + + + + + + + + + ".', 'wp-migrate-db' ); ?> + + AFTER migration is complete, you will need to edit your local install\'s wp-config.php and change the "%1$s" variable to "".', 'wp-migrate-db' ), $wpdb->base_prefix, $wpdb->base_prefix ); ?> + + + + + + + + base_prefix ); ?> + + " and will ignore the migrated tables. So, AFTER migration is complete, you will need to edit your remote install\'s wp-config.php and change the "" variable to "%s".', 'wp-migrate-db' ), $wpdb->base_prefix ); ?> + + + + + + mixed_case_table_name_warning( 'pull' ); ?> + + + + mixed_case_table_name_warning( 'push' ); ?> + + + + + + + + + + + + template( 'migrate-progress' ); ?> + + diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/options.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/options.php new file mode 100644 index 00000000..0a3c48a5 --- /dev/null +++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/options.php @@ -0,0 +1,69 @@ +


+
+	
+	
+
+	

+	get_plugin_title(); ?>
+
+	
+		plugin_tabs(); ?>
+	
+
+	
+
+	
+		
+			PHP Safe Mode Enabled — We do not officially support running this plugin in safe mode because set_time_limit() has no effect. Therefore we can't extend the run time of the script and ensure it doesn't time out before the migration completes. We haven't disabled the plugin however, so you're free to cross your fingers and hope for the best. However, if you have trouble, we can't help you until you turn off safe mode.", 'wp-migrate-db' );
+			if ( function_exists( 'ini_get' ) ) {
+				printf( __( 'Your current PHP run time limit is set to %s seconds.', 'wp-migrate-db' ), ini_get( 'max_execution_time' ) );
+			} ?>
+		
+	
+
+	
+		Internet Explorer Not Supported — Less than 2% of our customers use IE, so we've decided not to spend time supporting it. We ask that you use Firefox or a Webkit-based browser like Chrome or Safari instead. If this is a problem for you, please let us know.", 'wp-migrate-db' ); ?>
+	
+
+	set_time_limit_available() && ! $hide_warning && ! $safe_mode ) {
+		?>
+		
+			PHP Function Disabled — The set_time_limit() function is currently disabled on your server. We use this function to ensure that the migration doesn't time out. We haven't disabled the plugin however, so you're free to cross your fingers and hope for the best. You may want to contact your web host to enable this function.", 'wp-migrate-db' );
+			if ( function_exists( 'ini_get' ) ) {
+				printf( __( 'Your current PHP run time limit is set to %s seconds.', 'wp-migrate-db' ), ini_get( 'max_execution_time' ) );
+			} ?>
+		
+	
+
+	
+
+		 1 profile saved
+		if ( ! empty( $this->settings['profiles'] ) && ! isset( $_GET['wpmdb-profile'] ) ) {
+			$this->template( 'profile' );
+		} else {
+			$this->template( 'migrate' );
+		}
+		$this->template( 'settings' );
+		$this->template( 'addons' );
+		$this->template( 'help' );
+
+		$this->template_part( array( 'sidebar' ) );
+		?>
+
+	
+	
+
+
 
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/profile.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/profile.php
new file mode 100644
index 00000000..986aa9a4
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/profile.php
@@ -0,0 +1,17 @@
+
+	
+	
+		settings['profiles'] as $key => $profile ) {
+			++ $key
+			?>
+			
+				
+				×
+			
+		
+		
+			
+		
+	
+
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/settings.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/settings.php
new file mode 100644
index 00000000..219be547
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/settings.php
@@ -0,0 +1,6 @@
+
+	
+		template_part( array( 'toggle_remote_requests', 'connection_info', 'compatibility', 'max_request_size', 'delay_between_requests' ) ); ?>
+	
+	template_part( array( 'licence' ) ); ?>
+
 
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/exclude-post-revisions.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/exclude-post-revisions.php
new file mode 100644
index 00000000..9342e7e4
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/exclude-post-revisions.php
@@ -0,0 +1,6 @@
+
+	
+		 />
+		
+	
+
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/progress-upgrade.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/progress-upgrade.php
new file mode 100644
index 00000000..9126b311
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/progress-upgrade.php
@@ -0,0 +1,21 @@
+
+	
+		
+		
+			
+			
+			
+		
+
+		
+			“ ”
+			
+				— Eric Wagner 
+			
+		
+
+		 →
+	
+
+	
+
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/sidebar.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/sidebar.php
new file mode 100644
index 00000000..9a5b1086
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/sidebar.php
@@ -0,0 +1,55 @@
+
+
+	
+
+	
+		
+
+		
+
+		
+			
+		
+
+		
+			
+		
+
+		
+			
+		
+
+		
+			
+		
+
+		
+		
+
+		
+			
+		
+
+		
+			
+		
+	
+
+	
+		
+			
+			
+			
+			
+			
+		
+
+		
+			“WOW. WP Migrate DB Pro has made our local/live development a breeze. What a brilliant plugin. Worth every penny.”
+		
+
+		— Boxy Studio
+
+		via Twitter
+	
+
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/wordpress-org-support.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/wordpress-org-support.php
new file mode 100644
index 00000000..b34378a0
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/template/wpmdb/wordpress-org-support.php
@@ -0,0 +1,12 @@
+
+	
+
+	
+
+	WordPress.org support forum. Response time can range from a few days to a few weeks and will likely be from a non-developer.', 'wp-migrate-db' ), 'http://wordpress.org/support/plugin/wp-migrate-db' ); ?>
+
+	timely response via email from a developer who works on this plugin, upgrade to WP Migrate DB Pro and send us an email.', 'wp-migrate-db' ), 'https://deliciousbrains.com/wp-migrate-db-pro/?utm_source=insideplugin&utm_medium=web&utm_content=help-tab&utm_campaign=freeplugin' ); ?>
+
+	submit an issue at Github.', 'wp-migrate-db' ), 'https://github.com/bradt/wp-migrate-db/issues' ); ?>
+
+
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db-readme.pot b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db-readme.pot
new file mode 100644
index 00000000..ebe202d5
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db-readme.pot
@@ -0,0 +1,602 @@
+msgid ""
+msgstr "MIME-Version: 1.0\n"
+
+#. Name.
+msgid "WP Migrate DB"
+msgstr ""
+
+#. Short description.
+msgid "Migrates your database by running find & replace on URLs and file paths, handling serialized data, and saving an SQL file."
+msgstr ""
+
+#. Screenshot description.
+msgid "Main screen"
+msgstr ""
+
+#. Screenshot description.
+msgid "Settings tab"
+msgstr ""
+
+#. Screenshot description.
+msgid "Saving the exported database"
+msgstr ""
+
+#. Found in description list item.
+msgid "Push and pull your databases"
+msgstr ""
+
+#. Found in description list item.
+msgid "Find & replace that handles serialized data"
+msgstr ""
+
+#. Found in description list item.
+msgid "Backups"
+msgstr ""
+
+#. Found in description list item.
+msgid "Export your database"
+msgstr ""
+
+#. Found in description list item.
+msgid "Select which tables to migrate"
+msgstr ""
+
+#. Found in description list item.
+msgid "Filter out post types"
+msgstr ""
+
+#. Found in description list item.
+msgid "Exclude useless data"
+msgstr ""
+
+#. Found in description list item.
+msgid "Save migration profiles"
+msgstr ""
+
+#. Found in description list item.
+msgid "Phenomenal email support"
+msgstr ""
+
+#. Found in description list item.
+msgid "Stress tested on massive databases"
+msgstr ""
+
+#. Found in description list item.
+msgid "Solid security"
+msgstr ""
+
+#. Found in description list item.
+msgid "Media Files addon"
+msgstr ""
+
+#. Found in description list item.
+msgid "CLI addon"
+msgstr ""
+
+#. Found in description list item.
+msgid "Multisite Tools addon"
+msgstr ""
+
+#. Found in description paragraph.
+msgid "https://www.youtube.com/watch?v=m8oScnEK5y0"
+msgstr ""
+
+#. Found in description paragraph.
+msgid "WP Migrate DB exports your database as a MySQL data dump (much like phpMyAdmin), does a find and replace on URLs and file paths, handles serialized data, then allows you to save it to your computer as an SQL file. To complete the migration, you need to use a database management tool (e.g. phpMyAdmin) to import the SQL file to your database, replacing your existing database. It is perfect for developers who need to migrate fresh data from the production site to their local install, or migrate their locally developed site to a staging or production server."
+msgstr ""
+
+#. Found in description paragraph.
+msgid "WP Migrate DB handles serialized data (both arrays and objects) by unserializing the data and going through it, identifying strings and running a find & replace on them. Once it has gone through all the data, it serializes it again and sticks it back in the database."
+msgstr ""
+
+#. Found in description paragraph.
+msgid "Example: s:5:\"hello\" becomes s:11:\"hello world\""
+msgstr ""
+
+#. Found in description paragraph.
+msgid "PRO Version with Email Support and More Features"
+msgstr ""
+
+#. Found in description paragraph.
+msgid "See the video below or visit the web site to learn more about the pro version."
+msgstr ""
+
+#. Found in description paragraph.
+msgid "https://www.youtube.com/watch?v=fHFcH4bCzmU"
+msgstr ""
+
+#. Found in installation list item.
+msgid "Use WordPress' built-in installer"
+msgstr ""
+
+#. Found in installation list item.
+msgid "Access the \"Migrate DB\" menu option under Tools (or under Settings on multsite intallations)"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: \"Migrate\" button renamed to \"Export\""
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Uses WP_Filesystem instead of direct PHP filesystem functionality where possible"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Remove Find & Replace row icon is now a little dimmer to reduce UI clutter"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Compatibility with WordPress 4.4"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Added more diagnostic info to facilitate debugging"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Global JS variables moved to single global object to avoid conflicts"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug Fix: WP Migrate DB and Pro can be activated at the same time when activating plugins in bulk or via WP-CLI"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug Fix: BINARY data not exported properly"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug Fix: BIT data not exported properly"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug Fix: When post_max_size is set to 0 (unlimited), wpmdb_bottleneck is broken"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug Fix: Saved Profiles link is broken in certain situations"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: WP-CLI export subcommand"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Quick copy find textbox value to replace textbox by clicking arrow icon in between (hat tip Jonathan Perlman)"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Added filters to hook into find & replace routine and deal with encoded data (example)"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Greatly reduced data passed through each HTTP request for better security and reliability"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Massive overhaul of input sanitization for better security"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Add _mig_ prefix to wpmdb_alter_statements table"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Cleanup wpmdb_alter_statements tables from failed migrations"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Show dimmed remove icons in find & replace rows to indicate they can be removed"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Dim remove icons next to saved profiles"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Better error message when empty response received from remote server"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Added diagnostic info to facilitate debugging and decrease time to resolution for support requests"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Warning notice when WP_HTTP_BLOCK_EXTERNAL constant is set to true"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Leave it to WordPress core to convert tables to utf8mb4"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Workaround to fix issues with Siteground's staging environments"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Connection URL with space(s) in beginning failing"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Cancelling a gzipped Export does not remove file"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Unusual table names causing regular expressions to fail"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Preserving options not working when default subsite is not 1"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: NAN% shown at beginning of a migration"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Migration progress bar is overflowing the scale, passing 100%"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Custom post type links broken after migration with Compatibility Mode enabled"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Saving a new profile does not change the URL to that saved profile URL"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: breadcrumb-style UI for saved profiles"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Brazilian Portugese translation"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Security: Added .htaccess to backup folder to help prevent direct downloads"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Security: False values not included in signature"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Compatibility with TGM Plugin Activation"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Fixed hundreds of PHP Code Sniffer warnings"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Switch to update_site_option() and get_site_option()"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Cleaner and more instructive error message on JSON decoding failure"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: New hooks to massage data before and after find & replace"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Common server security rules better accommodated"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Better compatibility with SSL on WP Engine"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Minify all the Javascripts"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Use PHP's DIRECTORY_SEPARATOR instead of our own constant"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Updated tons of translation strings to be translator-friendly"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Find & replace field error messages could suggest removing the fields"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Download button for Diagnostic Info & Error Log"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: 404 errors after successful migrations due to caching"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Multisite exports broken on PHP < 5.4.7"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Using relative paths for file includes"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Typing new profile name does not select \"Create new profile\" option"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Find & replace field errors stick around even after removing fields"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: wpmdb_error_log option is auto loading"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Inconsistent stripping of slashes"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Spinner is inconsistent with WP 3.8+ spinner"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Apostrophe in path not being handled"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Inappropriate use of htmlentities()"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: The table tooltip still shows during the media files migration"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Import/Export issues between MySQL 5.1 and 5.5+"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Notice error on Updates dashboard page"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Signature verification error when local and remote plugins are different versions"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Find & replace handle icon is rendering poorly"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: PHP Notice: Undefined variable: safe_mode"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Fatal error: Cannot use object of type WP_Error as array in verify_download()"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Updated the migration UI to include a detailed progress bar, time elapsed, pause and cancel buttons and more!"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Option to exclude transients (temporary cached data)"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Migration profiles"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Setting to configure the maximum request size (how much data is exported in a given HTTP request)"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Improvement: Unlimited find & replace fields with drag & drop reordering"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Language support! Thanks to an awesome pull request from Rafael Funchal."
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New Language: Brazilian Portugese"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Added filter for the filename of the exported file"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Spam commentmeta included when \"Do not export spam comments\" checked"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Fatal error method error does not exist"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Table names with dashes not exporting"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Find & replace is case-sensitive but shouldn't"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Pro version has arrived! Added some info to the sidebar."
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Updated required version to WordPress 3.0+"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Does not handle serialized objects"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Admin menu disappears when DISALLOW_FILE_MODS is true"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Duplicate records on export"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Updated spinner image for HiDPI displays"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Fixed deprecated error notices when debug mode is on"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Exports views as tables"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Compatibility tested with WordPress 3.5"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Moved screenshots to /assets folder and updated them to support retina"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Added sidebar including author profile and survey to gauge interest for a pro version"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Removed WP App Store installer - not allowed in WP.org repo"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: More than 4x faster than version 0.3 due to find & replace improvements"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Option to turn off replacing GUIDs"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Option to exclude spam comments and post revisions from the export"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Option to save file with gzip compression"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Added date and time to file names"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: Display path to SQL file on the server"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "New: WP App Store installer integration"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Notices and warnings displayed when WP_DEBUG is on"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Null formatting error"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Deprecated capability"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Serialized string lengths incorrect when string contains double quotes"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Bug fix: Breaks Export"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Moved to WordPress.org hosting"
+msgstr ""
+
+#. Found in changelog list item.
+msgid "Moved menu link from \"Settings\" to \"Tools\""
+msgstr ""
+
+#. Found in changelog list item.
+msgid "The random string of characters no longer appears in the filename on save."
+msgstr ""
+
+#. Found in changelog list item.
+msgid "First release"
+msgstr ""
+
+#. Found in faq header.
+msgid "Why wouldn't I just use WordPress' built-in XML export/import to migrate my site?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Will you migrate my site for me?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Does the plugin support multisite?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Does the plugin migrate files as well?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Why do I end up with a wp-login.php download instead of the exported SQL file?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Does the plugin handle serialized data?"
+msgstr ""
+
+#. Found in faq header.
+msgid "What are the requirements?"
+msgstr ""
+
+#. Found in faq header.
+msgid "Do you offer email support?"
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "WP Migrate DB will migrate your entire WordPress database, WordPress' built-in tools will not. For more details, please see our blog post, WordPress XML Export/Import vs. WP Migrate DB Pro."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "Sorry, but we do not offer site migration services at the moment."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "Yes, but the Multisite Tools addon for the pro version does a lot more with multisite like migrating a subsite as a single-site install."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "No, it only operates on the database. The pro version's Media Files addon allows you to migrate media files."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "It is likely you have a download manager plugin or extension installed in your web browser. You will need to disable it for the SQL download to work properly."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "Yep, it will run a find & replace on your serialized data and migrate it without corrupting it. See our documentation for details."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "They are the same as the requirements for WP Migrate DB Pro."
+msgstr ""
+
+#. Found in faq paragraph.
+msgid "If you upgrade to WP Migrate DB Pro, we will gladly provide you with email support. We take pride in delivering exceptional customer support. We do not provide email support for the free version."
+msgstr ""
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db.pot b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db.pot
new file mode 100644
index 00000000..ba61bb32
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/tmp-wp-migrate-db.pot
@@ -0,0 +1,1433 @@
+# Copyright (C) 2015 WP Migrate DB
+# This file is distributed under the same license as the WP Migrate DB package.
+msgid ""
+msgstr ""
+"Project-Id-Version: WP Migrate DB 0.7.2\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-migrate-db\n"
+"POT-Creation-Date: 2015-12-05 21:43:09+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+
+#: class/wpmdb-base.php:159
+msgid ""
+"Invalid content verification signature, please verify the connection "
+"information on the remote site and try again."
+msgstr ""
+
+#: class/wpmdb-base.php:349
+msgid ""
+"The connection to the remote server has timed out, no changes have been "
+"committed. (#134 - scope: %s)"
+msgstr ""
+
+#: class/wpmdb-base.php:351
+msgid "We could not find: %s. Are you sure this is the correct URL?"
+msgstr ""
+
+#: class/wpmdb-base.php:356
+msgid ""
+"It appears that you might be trying to pull from a local environment. This "
+"will not work if this website happens to be located on a remote "
+"server, it would be impossible for this server to contact your local "
+"environment."
+msgstr ""
+
+#: class/wpmdb-base.php:358
+msgid ""
+"It appears that you might be trying to push to a local environment. This "
+"will not work if this website happens to be located on a remote "
+"server, it would be impossible for this server to contact your local "
+"environment."
+msgstr ""
+
+#: class/wpmdb-base.php:366
+msgid ""
+"We've detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the "
+"host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add "
+"%1$s to WP_ACCESSIBLE_HOSTS to continue. More information. (#147 - scope: %3$s)"
+msgstr ""
+
+#: class/wpmdb-base.php:369
+msgid ""
+"The connection failed, an unexpected error occurred, please contact support. "
+"(#121 - scope: %s)"
+msgstr ""
+
+#: class/wpmdb-base.php:379
+msgid ""
+"The remote site is protected with Basic Authentication. Please enter the "
+"username and password above to continue. (401 Unauthorized)"
+msgstr ""
+
+#: class/wpmdb-base.php:384
+msgid ""
+"Unable to connect to the remote server, please check the connection details "
+"- %1$s %2$s (#129 - scope: %3$s)"
+msgstr ""
+
+#: class/wpmdb-base.php:394
+msgid ""
+"WP Migrate DB Pro does not seem to be installed or active on the remote "
+"site. (#131 - scope: %s)"
+msgstr ""
+
+#: class/wpmdb-base.php:397
+msgid ""
+"A response was expected from the remote, instead we got nothing. (#146 - "
+"scope: %1$s) Please review %2$s for possible solutions."
+msgstr ""
+
+#: class/wpmdb-base.php:397 class/wpmdb.php:2824
+msgid "our documentation"
+msgstr ""
+
+#: class/wpmdb-base.php:406
+msgid ""
+"There was a problem with the AJAX request, we were expecting a serialized "
+"response, instead we received:
"
+msgstr ""
+
+#: class/wpmdb-base.php:703 class/wpmdb-base.php:1164
+msgid ""
+"Could not connect to deliciousbrains.com — You will "
+"not receive update notifications or be able to activate your license until "
+"this is fixed. This issue is often caused by an improperly configured SSL "
+"server (https). We recommend fixing the "
+"SSL configuration on your server, but if you need a quick fix you can:"
+"%2$s"
+msgstr ""
+
+#: class/wpmdb-base.php:703 class/wpmdb-base.php:1164
+msgid "Temporarily disable SSL for connections to deliciousbrains.com"
+msgstr ""
+
+#: class/wpmdb-base.php:711 class/wpmdb-base.php:1170
+msgid ""
+"We've detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the "
+"host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add "
+"%1$s to WP_ACCESSIBLE_HOSTS to continue. More information."
+msgstr ""
+
+#: class/wpmdb-base.php:756
+msgid ""
+"Delicious Brains API is Down â Unfortunately we're "
+"experiencing some problems with our server."
+msgstr ""
+
+#: class/wpmdb-base.php:760
+msgctxt "ex. 2 hours ago"
+msgid "%s ago"
+msgstr ""
+
+#: class/wpmdb-base.php:765
+msgid "Here's the most recent update on its status"
+msgstr ""
+
+#: class/wpmdb-base.php:792
+msgid ""
+"Error retrieving download from deliciousbrain.com. Please try again or "
+"download manually from %2$s."
+msgstr ""
+
+#: class/wpmdb-base.php:792
+msgctxt "Delicious Brains account"
+msgid "My Account"
+msgstr ""
+
+#: class/wpmdb-base.php:851 class/wpmdb.php:112 class/wpmdb.php:313
+msgctxt "Plugin configuration and preferences"
+msgid "Settings"
+msgstr ""
+
+#: class/wpmdb-base.php:852
+msgid ""
+"To finish activating WP Migrate DB Pro, please go to %1$s and enter your "
+"license key. If you don't have a license key, you may purchase one."
+msgstr ""
+
+#: class/wpmdb-base.php:1083 class/wpmdb-base.php:1093
+msgctxt "A new version of the plugin is available"
+msgid "Update Available"
+msgstr ""
+
+#: class/wpmdb-base.php:1084
+msgid "A new version of %1$s is now available. %2$s"
+msgstr ""
+
+#: class/wpmdb-base.php:1084 class/wpmdb-base.php:1094
+msgctxt "Download and install a new version of the plugin"
+msgid "Update Now"
+msgstr ""
+
+#: class/wpmdb-base.php:1094
+msgid ""
+"%1$s %2$s is now available. You currently have %3$s installed. %5$s"
+msgstr ""
+
+#: class/wpmdb-base.php:1138
+msgid ""
+"Activate Your License — Please enter your license key to enable push and pull functionality, "
+"priority support and plugin updates."
+msgstr ""
+
+#: class/wpmdb-base.php:1155
+msgid ""
+"We've temporarily activated your license and will complete the "
+"activation once the Delicious Brains API is available again."
+msgstr ""
+
+#: class/wpmdb-base.php:1177
+msgid ""
+"Your License Was Cancelled — Please visit My Account to renew or upgrade your license and "
+"enable push and pull."
+msgstr ""
+
+#: class/wpmdb-base.php:1178 class/wpmdb-base.php:1183
+#: class/wpmdb-base.php:1203 class/wpmdb-base.php:1207
+msgid "Check my license again"
+msgstr ""
+
+#: class/wpmdb-base.php:1181
+msgid "Your License Has Expired"
+msgstr ""
+
+#: class/wpmdb-base.php:1182
+msgid "Login to My Account to renew. "
+msgstr ""
+
+#: class/wpmdb-base.php:1187
+msgid "Updates are only available to those with an active license. "
+msgstr ""
+
+#: class/wpmdb-base.php:1188
+msgid "Only active licenses can download and install addons. "
+msgstr ""
+
+#: class/wpmdb-base.php:1189
+msgid "Only active licenses can submit support requests. "
+msgstr ""
+
+#: class/wpmdb-base.php:1190
+msgid ""
+"All features will continue to work, but you won't be able to receive updates "
+"or email support. "
+msgstr ""
+
+#: class/wpmdb-base.php:1202
+msgid ""
+"No Activations Left — Please visit My Account to upgrade your license or deactivate a "
+"previous activation and enable push and pull."
+msgstr ""
+
+#: class/wpmdb-base.php:1206
+msgid ""
+"Your License Was Not Found — Perhaps you made a typo "
+"when defining your WPMDB_LICENCE constant in your wp-config.php? Please "
+"visit My Account to double check your "
+"license key."
+msgstr ""
+
+#: class/wpmdb-base.php:1210
+msgid "Your License Was Not Found — "
+msgstr ""
+
+#: class/wpmdb-base.php:1214
+msgid "Your License Is Inactive"
+msgstr ""
+
+#: class/wpmdb-base.php:1215
+msgid "Your license has been deactivated for this install."
+msgstr ""
+
+#: class/wpmdb-base.php:1215
+msgid "Reactivate License"
+msgstr ""
+
+#: class/wpmdb-base.php:1218
+msgid ""
+"An Unexpected Error Occurred — Please contact us at "
+"%2$s and quote the following:"
+msgstr ""
+
+#: class/wpmdb-base.php:1257
+msgid "Invalid nonce for: %s"
+msgstr ""
+
+#: class/wpmdb-base.php:1265
+msgid "Access denied for: %s"
+msgstr ""
+
+#: class/wpmdb-base.php:1469
+msgctxt "dismiss notice permanently"
+msgid "Dismiss"
+msgstr ""
+
+#: class/wpmdb-base.php:1478
+msgid "Remind Me Later"
+msgstr ""
+
+#: class/wpmdb-base.php:1580
+msgid "Failed to save migration state. Please contact support."
+msgstr ""
+
+#: class/wpmdb-base.php:1603
+msgid "Failed to retrieve migration state. Please contact support."
+msgstr ""
+
+#: class/wpmdb-cli.php:60
+msgid "CLI addon requires PHP %1$s+"
+msgstr ""
+
+#: class/wpmdb-cli.php:104
+msgid "Profile not found or unable to be generated from params."
+msgstr ""
+
+#: class/wpmdb-cli.php:136
+msgid "The following table(s) do not exist in the %1$s database: %2$s"
+msgstr ""
+
+#: class/wpmdb-cli.php:183
+msgid ""
+"We were expecting a JSON response, instead we received: %2$s (function name: "
+"%1$s)"
+msgstr ""
+
+#: class/wpmdb-cli.php:239
+msgid "Initiating migration..."
+msgstr ""
+
+#: class/wpmdb-cli.php:277
+msgid "Exporting tables"
+msgstr ""
+
+#: class/wpmdb-cli.php:347
+msgid "No tables selected for migration."
+msgstr ""
+
+#: class/wpmdb-cli.php:440
+msgid "Cleaning up..."
+msgstr ""
+
+#: class/wpmdb-cli.php:507
+msgid "Unable to move exported file."
+msgstr ""
+
+#: class/wpmdb-command.php:66
+msgid "You must provide a destination filename."
+msgstr ""
+
+#: class/wpmdb-command.php:100
+msgid "Missing action parameter"
+msgstr ""
+
+#: class/wpmdb-command.php:119
+msgid "%1$s and %2$s must contain the same number of values"
+msgstr ""
+
+#: class/wpmdb-command.php:167
+msgid ""
+"Cannot write to file \"%1$s\". Please ensure that the specified directory "
+"exists and is writable."
+msgstr ""
+
+#: class/wpmdb-command.php:211
+msgid "WP Migrate DB CLI class not available."
+msgstr ""
+
+#: class/wpmdb-command.php:218
+msgid "Export saved to: %s"
+msgstr ""
+
+#: class/wpmdb-replace.php:174
+msgid ""
+"Failed attempting to do the recursive unserialize replace. Please contact "
+"support."
+msgstr ""
+
+#: class/wpmdb-sanitize.php:39
+msgid "%1$s was not expecting data to be an array."
+msgstr ""
+
+#: class/wpmdb-sanitize.php:60
+msgid "%1$s was expecting an array but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:66
+msgid "%1$s was expecting a string but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:73
+msgid "%1$s was expecting a valid key but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:81
+msgid "%1$s was expecting text but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:88
+msgid "%1$s was expecting serialized data but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:94
+msgid "%1$s was expecting a valid numeric but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:101
+msgid "%1$s was expecting an integer but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:108
+msgid ""
+"%1$s was expecting a positive number (int) but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:115
+msgid ""
+"%1$s was expecting a negative number (int) but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:122
+msgid "%1$s was expecting 0 (int) but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:129
+msgid "%1$s was expecting an empty value but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:136
+msgid "%1$s was expecting a URL but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:144
+msgid "%1$s was expecting a bool but got something else: \"%2$s\""
+msgstr ""
+
+#: class/wpmdb-sanitize.php:150
+msgid "Unknown sanitization rule \"%1$s\" supplied by %2$s"
+msgstr ""
+
+#: class/wpmdb.php:111
+msgctxt "Configure a migration or export"
+msgid "Migrate"
+msgstr ""
+
+#: class/wpmdb.php:113
+msgctxt "Get help or contact support"
+msgid "Help"
+msgstr ""
+
+#: class/wpmdb.php:180
+msgid "The following directory could not be created: %s"
+msgstr ""
+
+#: class/wpmdb.php:185
+msgid "Could not copy the compatibility plugin from %1$s to %2$s"
+msgstr ""
+
+#: class/wpmdb.php:191
+msgid "Could not remove the compatibility plugin from %s"
+msgstr ""
+
+#: class/wpmdb.php:938
+msgid ""
+"Failed attempting to unserialize the response from the remote server. Please "
+"contact support."
+msgstr ""
+
+#: class/wpmdb.php:1352
+msgid ""
+"Failed to retrieve table structure, please ensure your database is online. "
+"(#125)"
+msgstr ""
+
+#: class/wpmdb.php:1382
+msgid "Delete any existing table %s"
+msgstr ""
+
+#: class/wpmdb.php:1393
+msgid "Table structure of table %s"
+msgstr ""
+
+#: class/wpmdb.php:1401
+msgid ""
+"Failed to generate the create table query, please ensure your database is "
+"online. (#126)"
+msgstr ""
+
+#: class/wpmdb.php:1457
+msgid "Data contents of table %s"
+msgstr ""
+
+#: class/wpmdb.php:1828
+msgid "End of data contents of table %s"
+msgstr ""
+
+#: class/wpmdb.php:1968
+msgid "WordPress MySQL database migration"
+msgstr ""
+
+#: class/wpmdb.php:1970
+msgid "Generated: %s"
+msgstr ""
+
+#: class/wpmdb.php:1971
+msgid "Hostname: %s"
+msgstr ""
+
+#: class/wpmdb.php:1972
+msgid "Database: %s"
+msgstr ""
+
+#: class/wpmdb.php:2025
+msgid "Failed to write the gzipped SQL data to the file. (#127)"
+msgstr ""
+
+#: class/wpmdb.php:2032
+msgid "Failed to write the SQL data to the file. (#128)"
+msgstr ""
+
+#: class/wpmdb.php:2168 class/wpmdb.php:2179
+msgid "Migrate DB Pro"
+msgstr ""
+
+#: class/wpmdb.php:2168 class/wpmdb.php:2179 class/wpmdb.php:2738
+msgid "Migrate DB"
+msgstr ""
+
+#: class/wpmdb.php:2355
+msgid ""
+"A problem occurred when trying to change the maximum request size, please "
+"try again."
+msgstr ""
+
+#: class/wpmdb.php:2356
+msgid "A problem occurred when trying to check the license, please try again."
+msgstr ""
+
+#: class/wpmdb.php:2357
+msgid "Establishing connection to remote server, please wait"
+msgstr ""
+
+#: class/wpmdb.php:2358
+msgid ""
+"A problem occurred when attempting to connect to the local server, please "
+"check the details and try again."
+msgstr ""
+
+#: class/wpmdb.php:2359
+msgid "Please enter your license key."
+msgstr ""
+
+#: class/wpmdb.php:2360
+msgid ""
+"A problem occurred when trying to register the license, please try again."
+msgstr ""
+
+#: class/wpmdb.php:2361
+msgid ""
+"Your license has been activated. You will now receive automatic updates and "
+"access to email support."
+msgstr ""
+
+#: class/wpmdb.php:2362
+msgid "Fetching license details, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2363
+msgid ""
+"An error occurred when trying to clear the debug log. Please contact "
+"support. (#132)"
+msgstr ""
+
+#: class/wpmdb.php:2364
+msgid ""
+"An error occurred when trying to update the debug log. Please contact "
+"support. (#133)"
+msgstr ""
+
+#: class/wpmdb.php:2365
+msgid "Please select at least one table to migrate."
+msgstr ""
+
+#: class/wpmdb.php:2366
+msgid "Please select at least one table for backup."
+msgstr ""
+
+#: class/wpmdb.php:2367
+msgid "Please enter a name for your migration profile."
+msgstr ""
+
+#: class/wpmdb.php:2368
+msgid ""
+"An error occurred when attempting to save the migration profile. Please see "
+"the Help tab for details on how to request support. (#118)"
+msgstr ""
+
+#: class/wpmdb.php:2369
+msgctxt "Data has been successfully exported"
+msgid "Exporting complete"
+msgstr ""
+
+#: class/wpmdb.php:2370
+msgid "Exporting, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2371
+msgid "please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2372
+msgctxt "Finished successfully"
+msgid "complete"
+msgstr ""
+
+#: class/wpmdb.php:2373
+msgctxt "Copy of data between servers did not complete"
+msgid "Migration failed"
+msgstr ""
+
+#: class/wpmdb.php:2374
+msgctxt "Saving a copy of the data before import"
+msgid "Backing up"
+msgstr ""
+
+#: class/wpmdb.php:2375
+msgctxt "Copying data between servers"
+msgid "Migrating"
+msgstr ""
+
+#: class/wpmdb.php:2376
+msgctxt "Current request status"
+msgid "Status"
+msgstr ""
+
+#: class/wpmdb.php:2377
+msgctxt "The message the server responded with"
+msgid "Response"
+msgstr ""
+
+#: class/wpmdb.php:2378
+msgid ""
+"A problem occurred when attempting to process the following table (#113)"
+msgstr ""
+
+#: class/wpmdb.php:2379
+msgid ""
+"A problem occurred when processing the following table. We were expecting a "
+"response in JSON format but instead received an empty response."
+msgstr ""
+
+#: class/wpmdb.php:2380
+msgid "Migration completed with some errors"
+msgstr ""
+
+#: class/wpmdb.php:2381
+msgid "Migration complete, your backup is located at:"
+msgstr ""
+
+#: class/wpmdb.php:2382
+msgid "A problem occurred when finalizing the backup. (#140)"
+msgstr ""
+
+#: class/wpmdb.php:2383 template/common/compatibility.php:34
+#: template/common/max-request-size.php:11
+msgctxt "The settings were saved successfully"
+msgid "Saved"
+msgstr ""
+
+#: class/wpmdb.php:2384
+msgid ""
+"Any sites setup to use the current secret key will no longer be able to "
+"connect. You will need to update those sites with the newly generated secret "
+"key. Do you wish to continue?"
+msgstr ""
+
+#: class/wpmdb.php:2385
+msgid ""
+"An error occurred when trying to generate the secret key. Please see the "
+"Help tab for details on how to request support. (#105)"
+msgstr ""
+
+#: class/wpmdb.php:2386
+msgid ""
+"You are about to remove the migration profile \"{{profile}}\". This cannot "
+"be undone. Do you wish to continue?"
+msgstr ""
+
+#: class/wpmdb.php:2387
+msgid ""
+"An error occurred when trying to delete the profile. Please see the Help tab "
+"for details on how to request support. (#106)"
+msgstr ""
+
+#: class/wpmdb.php:2388
+msgid ""
+"The selected migration profile could not be deleted because it was not "
+"found.\n"
+"Please refresh this page to see an accurate list of the currently available "
+"migration profiles."
+msgstr ""
+
+#: class/wpmdb.php:2389
+msgid ""
+"If you change the connection details, you will lose any replaces and table "
+"selections you have made below. Do you wish to continue?"
+msgstr ""
+
+#: class/wpmdb.php:2390 template/migrate.php:113
+msgid "Please enter the connection information above to continue."
+msgstr ""
+
+#: class/wpmdb.php:2391
+msgid ""
+"An error occurred when trying to save the settings. Please try again. If the "
+"problem persists, please see the Help tab for details on how to request "
+"support. (#108)"
+msgstr ""
+
+#: class/wpmdb.php:2392
+msgid ""
+"The connection information appears to be missing, please enter it to "
+"continue."
+msgstr ""
+
+#: class/wpmdb.php:2393
+msgid ""
+"The connection information appears to be incorrect, it should consist of two "
+"lines. The first being the remote server's URL and the second being the "
+"secret key."
+msgstr ""
+
+#: class/wpmdb.php:2394
+msgid ""
+"The URL on the first line appears to be invalid, please check it and try "
+"again."
+msgstr ""
+
+#: class/wpmdb.php:2395
+msgid ""
+"The secret key on the second line appears to be invalid. It should be a 32 "
+"character string that consists of letters, numbers and special characters "
+"only."
+msgstr ""
+
+#: class/wpmdb.php:2396
+msgid ""
+"It appears you've entered the URL for this website, you need to provide the "
+"URL of the remote website instead."
+msgstr ""
+
+#: class/wpmdb.php:2397
+msgid ""
+"Looks like your remote secret key is the same as the secret key for this "
+"site. To fix this, go to the Settings tab and "
+"click \"Reset Secret Key\""
+msgstr ""
+
+#: class/wpmdb.php:2398 template/migrate-progress.php:11
+msgid "Time Elapsed:"
+msgstr ""
+
+#: class/wpmdb.php:2399 template/migrate-progress.php:25
+msgctxt "Temporarily stop migrating"
+msgid "Pause"
+msgstr ""
+
+#: class/wpmdb.php:2400
+msgctxt "The migration has been temporarily stopped"
+msgid "Migration Paused"
+msgstr ""
+
+#: class/wpmdb.php:2401
+msgctxt "Restart migrating after it was paused"
+msgid "Resume"
+msgstr ""
+
+#: class/wpmdb.php:2402
+msgid "Completing current request"
+msgstr ""
+
+#: class/wpmdb.php:2403
+msgctxt "The migration is being cancelled"
+msgid "Cancelling migration"
+msgstr ""
+
+#: class/wpmdb.php:2404
+msgctxt "The migration has been temporarily stopped"
+msgid "Paused"
+msgstr ""
+
+#: class/wpmdb.php:2405
+msgid ""
+"Automatically paused before migrated tables are replaced. Click \"Resume\" "
+"or \"Cancel\" when ready."
+msgstr ""
+
+#: class/wpmdb.php:2406
+msgid "Removing the local MySQL export file"
+msgstr ""
+
+#: class/wpmdb.php:2407
+msgid "Removing the local backup MySQL export file"
+msgstr ""
+
+#: class/wpmdb.php:2408
+msgid "Removing the local temporary tables"
+msgstr ""
+
+#: class/wpmdb.php:2409
+msgid "Removing the remote backup MySQL export file"
+msgstr ""
+
+#: class/wpmdb.php:2410
+msgid "Removing the remote temporary tables"
+msgstr ""
+
+#: class/wpmdb.php:2411
+msgid "Migration cancellation failed"
+msgstr ""
+
+#: class/wpmdb.php:2412
+msgid ""
+"A problem occurred while cancelling the migration, you may have to manually "
+"delete some temporary files / tables."
+msgstr ""
+
+#: class/wpmdb.php:2413
+msgctxt "The migration has been cancelled"
+msgid "Migration cancelled"
+msgstr ""
+
+#: class/wpmdb.php:2414
+msgctxt "The migration completed successfully"
+msgid "Migration complete"
+msgstr ""
+
+#: class/wpmdb.php:2415
+msgctxt "The migration is in the last stages"
+msgid "Finalizing migration"
+msgstr ""
+
+#: class/wpmdb.php:2416
+msgctxt "The caches and rewrite rules for the target are being flushed"
+msgid "Flushing caches and rewrite rules"
+msgstr ""
+
+#: class/wpmdb.php:2417
+msgid "A problem occurred when trying to add plugins to backlist."
+msgstr ""
+
+#: class/wpmdb.php:2418
+msgid ""
+"If confirmed we will install an additional WordPress 'Must Use' plugin. This "
+"plugin will allow us to control which plugins are loaded during WP Migrate "
+"DB Pro specific operations. Do you wish to continue?"
+msgstr ""
+
+#: class/wpmdb.php:2419
+msgid ""
+"A problem occurred when trying to change the plugin compatibility setting."
+msgstr ""
+
+#: class/wpmdb.php:2420
+msgctxt "Confirmation required"
+msgid "Sure?"
+msgstr ""
+
+#: class/wpmdb.php:2421
+msgid "Pulling from %s, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2422
+msgid "Pulling from %s complete"
+msgstr ""
+
+#: class/wpmdb.php:2423
+msgid "Pushing to %s, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2424
+msgid "Pushing to %s complete"
+msgstr ""
+
+#: class/wpmdb.php:2425
+msgid "Copying license to the remote site, please wait"
+msgstr ""
+
+#: class/wpmdb.php:2426
+msgid "Attempting to activate your license, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2427
+msgid "License successfully activated, please wait..."
+msgstr ""
+
+#: class/wpmdb.php:2428
+msgid ""
+"An error occurred when trying to reactivate your license. Please provide the "
+"following information when requesting support:"
+msgstr ""
+
+#: class/wpmdb.php:2429
+msgid ""
+"We've temporarily activated your licence and will complete the "
+"activation once the Delicious Brains API is available again.
Please refresh this page to continue."
+msgstr ""
+
+#: class/wpmdb.php:2430
+msgid "JSON Decoding Failure"
+msgstr ""
+
+#: class/wpmdb.php:2431
+msgid ""
+"Our AJAX request was expecting JSON but we received something else. Often "
+"this is caused by your theme and/or plugins spitting out PHP errors. If you "
+"can edit the theme or plugins causing the errors, you should be able to fix "
+"them up, but if not, you can set WP_DEBUG to false in wp-config.php to "
+"disable errors from showing up."
+msgstr ""
+
+#: class/wpmdb.php:2432
+msgid "View error messages"
+msgstr ""
+
+#: class/wpmdb.php:2433
+msgid "Waiting %s seconds before executing next step"
+msgstr ""
+
+#: class/wpmdb.php:2434
+msgid ""
+"A problem occurred when trying to change the delay between requests, please "
+"try again."
+msgstr ""
+
+#: class/wpmdb.php:2435
+msgid "A problem occurred when flushing caches and rewrite rules. (#145)"
+msgstr ""
+
+#: class/wpmdb.php:2436
+msgctxt "Transfer this database to the remote site"
+msgid "Push"
+msgstr ""
+
+#: class/wpmdb.php:2437
+msgctxt "Transfer this database to the remote site and save migration profile"
+msgid "Push & Save"
+msgstr ""
+
+#: class/wpmdb.php:2438
+msgctxt "Transfer the remote database to this site"
+msgid "Pull"
+msgstr ""
+
+#: class/wpmdb.php:2439
+msgctxt "Transfer the remote database to this site and save migration profile"
+msgid "Pull & Save"
+msgstr ""
+
+#: class/wpmdb.php:2440 template/migrate.php:353
+msgctxt "Download a copy of the database"
+msgid "Export"
+msgstr ""
+
+#: class/wpmdb.php:2441
+msgctxt "Download a copy of the database and save migration profile"
+msgid "Export & Save"
+msgstr ""
+
+#: class/wpmdb.php:2477
+msgid "Could not find the file to download:"
+msgstr ""
+
+#: class/wpmdb.php:2672
+msgid "MySQL export file not found."
+msgstr ""
+
+#: class/wpmdb.php:2678
+msgid "Could not delete the MySQL export file."
+msgstr ""
+
+#: class/wpmdb.php:2744
+msgid ""
+"WP Migrate DB and WP Migrate DB Pro cannot both be active. We've "
+"automatically deactivated WP Migrate DB."
+msgstr ""
+
+#: class/wpmdb.php:2746
+msgid ""
+"WP Migrate DB and WP Migrate DB Pro cannot both be active. We've "
+"automatically deactivated WP Migrate DB Pro."
+msgstr ""
+
+#: class/wpmdb.php:2824
+msgid ""
+"The source site supports utf8mb4 data but the target does not, aborting "
+"migration to avoid possible data corruption. Please see %1$s for more "
+"information. (#148)"
+msgstr ""
+
+#: class/wpmdb.php:2875
+msgid "Warning: Mixed Case Table Names"
+msgstr ""
+
+#: class/wpmdb.php:2878
+msgid ""
+"Whoa! We've detected that your local site has the MySQL setting "
+"lower_case_table_names set to 1."
+msgstr ""
+
+#: class/wpmdb.php:2880
+msgid ""
+"Whoa! We've detected that your remote site has the MySQL setting "
+"lower_case_table_names set to 1."
+msgstr ""
+
+#: class/wpmdb.php:2883
+msgid ""
+"As a result, uppercase characters in table names will be converted to "
+"lowercase during the migration."
+msgstr ""
+
+#: class/wpmdb.php:2885
+msgid ""
+"You can read more about this in our documentation, "
+"proceed with caution."
+msgstr ""
+
+#: template/addons.php:7
+msgid "Fetching addon details, please wait..."
+msgstr ""
+
+#: template/addons.php:9
+msgid ""
+"We couldn't find your license information. Please switch to the settings tab "
+"and enter your license."
+msgstr ""
+
+#: template/addons.php:10
+msgid "Once completed, you may visit this tab to view the available addons."
+msgstr ""
+
+#: template/common/breadcrumbs.php:3
+msgctxt "Default profile loaded"
+msgid "New Profile"
+msgstr ""
+
+#: template/common/breadcrumbs.php:9
+msgid "Saved Profiles"
+msgstr ""
+
+#: template/common/compatibility.php:4
+msgid ""
+"Improve performance and reliability by not loading the following plugins for "
+"migration requests"
+msgstr ""
+
+#: template/common/compatibility.php:9
+msgid ""
+"Some plugins add a lot of overhead to each request, requiring extra memory "
+"and CPU. And some plugins even interfere with migrations and cause them to "
+"fail. We recommend only loading plugins that affect migration requests, for "
+"example a plugin that hooks into WP Migrate DB."
+msgstr ""
+
+#: template/common/compatibility.php:26
+msgid "Select All"
+msgstr ""
+
+#: template/common/compatibility.php:28
+msgid "Deselect All"
+msgstr ""
+
+#: template/common/compatibility.php:30
+msgid "Invert Selection"
+msgstr ""
+
+#: template/common/compatibility.php:33
+msgid "Save Changes"
+msgstr ""
+
+#: template/common/debug-info.php:2
+msgid "Diagnostic Info & Error Log"
+msgstr ""
+
+#: template/common/debug-info.php:4
+msgctxt "Download to your computer"
+msgid "Download"
+msgstr ""
+
+#: template/common/debug-info.php:5
+msgid "Clear Error Log"
+msgstr ""
+
+#: template/common/max-request-size.php:3
+msgid "Maximum Request Size"
+msgstr ""
+
+#: template/common/max-request-size.php:7
+msgid ""
+"We've detected that your server supports requests up to %s, but it's "
+"possible that your server has limitations that we could not detect. To be on "
+"the safe side, we set the default to 1 MB, but you can try throttling it up "
+"to get better performance. If you're getting a 413 error or having trouble "
+"with time outs, try throttling this setting down."
+msgstr ""
+
+#: template/migrate-progress.php:5
+msgid "Please wait while migration is running..."
+msgstr ""
+
+#: template/migrate-progress.php:10
+msgid "Establishing Connection"
+msgstr ""
+
+#: template/migrate-progress.php:26
+msgctxt "Stop the migration"
+msgid "Cancel"
+msgstr ""
+
+#: template/migrate.php:72
+msgid "Export File"
+msgstr ""
+
+#: template/migrate.php:78
+msgid "Save as file to your computer"
+msgstr ""
+
+#: template/migrate.php:85
+msgid "Compress file with gzip"
+msgstr ""
+
+#: template/migrate.php:95
+msgid "Connection Info - Site URL & Secret Key"
+msgstr ""
+
+#: template/migrate.php:106
+msgid "SSL Disabled"
+msgstr ""
+
+#: template/migrate.php:106
+msgid ""
+"We couldn't connect over SSL but regular http (no SSL) appears to be working "
+"so we've switched to that. If you run a push or pull, your data will be "
+"transmitted unencrypted. Most people are fine with this, but just a heads up."
+msgstr ""
+
+#: template/migrate.php:116
+msgid "Cannot Access Uploads Directory"
+msgstr ""
+
+#: template/migrate.php:118
+msgid ""
+"We require write permissions to the standard WordPress uploads directory. "
+"Without this permission exports are unavailable. Please grant 755 "
+"permissions on the following directory:"
+msgstr ""
+
+#: template/migrate.php:129
+msgctxt "Source text to be replaced"
+msgid "Find"
+msgstr ""
+
+#: template/migrate.php:130
+msgctxt "Text to replace in source"
+msgid "Replace"
+msgstr ""
+
+#: template/migrate.php:217
+msgid ""
+"New URL Missing — Please enter the protocol-relative "
+"URL of the remote website in the \"New URL\" field or remove the whole row "
+"entirely. If you are unsure of what this URL should be, please consult our documentation on find and replace "
+"fields."
+msgstr ""
+
+#: template/migrate.php:219
+msgid ""
+"New URL Missing — Please enter the protocol-relative "
+"URL of the remote website in the \"New URL\" field. If you are unsure of "
+"what this URL should be, please consult our "
+"documentation on find and replace fields."
+msgstr ""
+
+#: template/migrate.php:223
+msgid ""
+"New File Path Missing — Please enter the root file "
+"path of the remote website in the \"New file path\" field or remove the "
+"whole row entirely. If you are unsure of what the file path should be, "
+"please consult our documentation on "
+"find and replace fields."
+msgstr ""
+
+#: template/migrate.php:232
+msgid "Advanced Options"
+msgstr ""
+
+#: template/migrate.php:241
+msgid "Replace GUIDs"
+msgstr ""
+
+#: template/migrate.php:247
+msgid ""
+"Although the WordPress Codex emphasizes "
+"that GUIDs should not be changed, this is limited to sites that are already "
+"live. If the site has never been live, we recommend replacing the GUIDs. For "
+"example, you may be developing a new site locally at dev.somedomain.com and "
+"want to migrate the site live to somedomain.com."
+msgstr ""
+
+#: template/migrate.php:253
+msgid "Exclude spam comments"
+msgstr ""
+
+#: template/migrate.php:259
+msgid ""
+"Do not migrate the 'active_plugins' setting (i.e. which plugins are "
+"activated/deactivated)"
+msgstr ""
+
+#: template/migrate.php:271
+msgid "Compatible with older versions of MySQL (pre-5.5)"
+msgstr ""
+
+#: template/migrate.php:277
+msgid "Pause before replacing migrated tables"
+msgstr ""
+
+#: template/migrate.php:293
+msgid "Save Migration Profile"
+msgstr ""
+
+#: template/migrate.php:293
+msgid "Save the above settings for the next time you do a similiar migration"
+msgstr ""
+
+#: template/migrate.php:315
+msgid "Create new profile"
+msgstr ""
+
+#: template/migrate.php:324 template/migrate.php:334
+msgid "Warning: Different Table Prefixes"
+msgstr ""
+
+#: template/migrate.php:326
+msgid ""
+"Whoa! We've detected that the database table prefix differs between "
+"installations. Clicking the Migrate button below will create new database "
+"tables in your local database with prefix \"\"."
+msgstr ""
+
+#: template/migrate.php:328
+msgid ""
+"However, your local install is configured to use table prefix \"%1$s\" and "
+"will ignore the migrated tables. So, AFTER migration is complete, you "
+"will need to edit your local install's wp-config.php and change the \"%1$s\" "
+"variable to \"\"."
+msgstr ""
+
+#: template/migrate.php:330
+msgid ""
+"This will allow your local install the use the migrated tables. Once you do "
+"this, you shouldn't have to do it again."
+msgstr ""
+
+#: template/migrate.php:336
+msgid ""
+"Whoa! We've detected that the database table prefix differs between "
+"installations. Clicking the Migrate button below will create new database "
+"tables in the remote database with prefix \"%s\"."
+msgstr ""
+
+#: template/migrate.php:338
+msgid ""
+"However, your remote install is configured to use table prefix \"\" and will ignore the migrated tables. So, "
+"AFTER migration is complete, you will need to edit your remote "
+"install's wp-config.php and change the \"\" variable to \"%s\"."
+msgstr ""
+
+#: template/migrate.php:340
+msgid ""
+"This will allow your remote install the use the migrated tables. Once you do "
+"this, you shouldn't have to do it again."
+msgstr ""
+
+#: template/migrate.php:354
+msgctxt "Save current migration settings"
+msgid "Save Profile"
+msgstr ""
+
+#: template/options.php:22
+msgid ""
+"PHP Safe Mode Enabled — We do not officially support "
+"running this plugin in safe mode because set_time_limit() has "
+"no effect. Therefore we can't extend the run time of the script and ensure "
+"it doesn't time out before the migration completes. We haven't disabled the "
+"plugin however, so you're free to cross your fingers and hope for the best. "
+"However, if you have trouble, we can't help you until you turn off safe mode."
+msgstr ""
+
+#: template/options.php:24 template/options.php:43
+msgid "Your current PHP run time limit is set to %s seconds."
+msgstr ""
+
+#: template/options.php:32
+msgid ""
+"Internet Explorer Not Supported — Less than 2% of our "
+"customers use IE, so we've decided not to spend time supporting it. We ask "
+"that you use Firefox or a Webkit-based browser like Chrome or Safari "
+"instead. If this is a problem for you, please let us know."
+msgstr ""
+
+#: template/options.php:41
+msgid ""
+"PHP Function Disabled — The set_time_limit() function is currently disabled on your server. We use this function to "
+"ensure that the migration doesn't time out. We haven't disabled the plugin "
+"however, so you're free to cross your fingers and hope for the best. You may "
+"want to contact your web host to enable this function."
+msgstr ""
+
+#: template/profile.php:2
+msgid "Would you like to use a saved migration profile?"
+msgstr ""
+
+#: template/profile.php:14
+msgid "Nope, let's start fresh..."
+msgstr ""
+
+#: template/wpmdb/exclude-post-revisions.php:4
+msgid "Exclude post revisions"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:3
+msgid "Seen the PRO version?"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:5
+msgid ""
+"One-click in your WordPress dashboard to push your database up to staging/"
+"production or pull it down to dev"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:6
+msgid "Sync the Media Libraries of two sites"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:7
+msgid "Run migrations from the command line"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:11
+msgid "Within a few hours WP Migrate DB Pro has paid for itself!"
+msgstr ""
+
+#: template/wpmdb/progress-upgrade.php:17
+msgid "More About The Pro Version"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:3
+msgid ""
+"WP Migrate DB Pro — Push and pull your database from one WordPress "
+"install to another in 1-click."
+msgstr ""
+
+#: template/wpmdb/sidebar.php:6
+msgid "Get 20% Off!"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:11
+msgid ""
+"Submit your name and email and we'll send you a coupon for 20% off your "
+"upgrade to the pro version."
+msgstr ""
+
+#: template/wpmdb/sidebar.php:15
+msgid "Your Email"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:19
+msgid "First Name"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:23
+msgid "Last Name"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:30
+msgid "Send me the coupon"
+msgstr ""
+
+#: template/wpmdb/sidebar.php:34
+msgid ""
+"We promise we will not use your email for anything else and you can "
+"unsubscribe with 1-click anytime."
+msgstr ""
+
+#: template/wpmdb/wordpress-org-support.php:2
+msgctxt "Get help from the community"
+msgid "Support"
+msgstr ""
+
+#: template/wpmdb/wordpress-org-support.php:4
+msgid "As this is a free plugin, we do not provide support."
+msgstr ""
+
+#: template/wpmdb/wordpress-org-support.php:6
+msgid ""
+"You may ask the WordPress community for help by posting to the WordPress.org support forum. Response time can range from a few days "
+"to a few weeks and will likely be from a non-developer."
+msgstr ""
+
+#: template/wpmdb/wordpress-org-support.php:8
+msgid ""
+"If you want a timely response via email from a developer "
+"who works on this plugin, upgrade to WP Migrate DB Pro "
+"and send us an email."
+msgstr ""
+
+#: template/wpmdb/wordpress-org-support.php:10
+msgid ""
+"If you've found a bug, please submit an issue at Github."
+msgstr ""
+
+#. Plugin Name of the plugin/theme
+msgid "WP Migrate DB"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "http://wordpress.org/plugins/wp-migrate-db/"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Exports your database as a MySQL data dump (much like phpMyAdmin), does a "
+"find and replace on URLs and file paths, then allows you to save it to your "
+"computer."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Delicious Brains"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://deliciousbrains.com"
+msgstr ""
diff --git a/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/wp-migrate-db.php b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/wp-migrate-db.php
new file mode 100644
index 00000000..e93cd7bd
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/plugins/wp-migrate-db/wp-migrate-db.php
@@ -0,0 +1,97 @@
+ 'slider',
+		'posts_per_page'   => -1,
+		'post_status'      => 'publish',
+		'orderby'          => $orderby,
+		'order'            => $order,
+		'suppress_filters' => $suppress_filters,
+	);
+	$slides = get_posts( $args );
+	if ( empty( $slides ) ) return;
+?>
+
+
+
+
+	
+		 $slide ) {
+
+				// Check if WPML is activated.
+				if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+					global $sitepress;
+
+					$post_lang = $sitepress->get_language_for_element( $slide->ID, 'post_slider' );
+					$curr_lang = $sitepress->get_current_language();
+
+					// Unset not translated posts.
+					if ( $post_lang != $curr_lang ) {
+						unset( $slides[ $k ] );
+					}
+
+					// Post ID is different in a second language Solution.
+					if ( function_exists( 'icl_object_id' ) ) {
+						$slide = get_post( icl_object_id( $slide->ID, 'slider', true ) );
+					}
+				}
+
+				if ( in_array( "1", $post_array ) ) {
+					if ( $post_array[ $slide->ID ] == 1 ) {
+						addItem( $slide );
+					}
+				} else {
+					addItem( $slide );
+				}
+			}
+			wp_reset_postdata();
+
+			function addItem( $slide ) {
+				$slide_id     = $slide->ID;
+				$url          = get_post_meta( $slide_id, 'my_slider_url', true );
+				$caption      = get_post_meta( $slide_id, 'my_slider_caption', true );
+				$sl_image_url = wp_get_attachment_image_src( get_post_thumbnail_id( $slide_id ), 'slider-post-thumbnail' );
+				$title        = get_the_title( $slide_id );
+				$img_class    = '';
+
+				if ( $sl_image_url[0] == '' ) {
+					$sl_image_url[0] = PARENT_URL . '/images/blank.gif';
+					$img_class       = 'max_height';
+				}
+
+				if ( $url != '' ) {
+					$url = '' . theme_locals('read_more') . '';
+				}
+
+				if ( $caption ) {
+					$caption = stripslashes( htmlspecialchars_decode( $caption ) );
+				}
+
+				echo '';
+					echo '';
+
+					if ( $caption != '' || $url != '' ) {
+						echo '' . $caption . $url . '';
+					}
+
+				echo '';
+			}
+		?>
+	
+	
+||||||| .r11156
+ 'slider',
+		'posts_per_page'   => -1,
+		'post_status'      => 'publish',
+		'orderby'          => $orderby,
+		'order'            => $order,
+		'suppress_filters' => $suppress_filters
+		);
+	$slides = get_posts($args);
+	if (empty($slides)) return;
+?>
+
+
+
+
+	
+		 $slide ) {
+				//Check if WPML is activated
+				if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+					global $sitepress;
+
+					$post_lang = $sitepress->get_language_for_element($slide->ID, 'post_slider');
+					$curr_lang = $sitepress->get_current_language();
+					// Unset not translated posts
+					if ( $post_lang != $curr_lang ) {
+						unset( $slides[$k] );
+					}
+					// Post ID is different in a second language Solution
+					if ( function_exists( 'icl_object_id' ) ) {
+						$slide = get_post( icl_object_id( $slide->ID, 'slider', true ) );
+					}
+				}
+
+				if(in_array("1", $post_array)){
+					if($post_array[$slide -> ID] == 1){
+						addItem($slide);
+					}
+				}else{
+					addItem($slide);
+				}
+			}
+			wp_reset_postdata();
+
+			function addItem($slide){
+				$url          = get_post_meta($slide->ID, 'my_slider_url', true);
+				$caption      = get_post_meta($slide->ID, 'my_slider_caption', true);
+				$sl_image_url = wp_get_attachment_image_src( get_post_thumbnail_id($slide->ID), 'slider-post-thumbnail');
+				$title        = get_the_title( $slide->ID );
+				$img_class    = "";
+
+				if($sl_image_url[0]==""){
+					$sl_image_url[0] = PARENT_URL."/images/blank.gif";
+					$img_class = 'max_height';
+				}
+				if($url!=""){
+					$url = ''.theme_locals('read_more').'';
+				}
+				if ($caption) {
+					$caption = stripslashes(htmlspecialchars_decode($caption));
+				}
+				echo '';
+					echo '';
+					if($caption!="" || $url!=""){
+						echo ''.$caption.$url.'';
+					}
+				echo '';
+			}
+		?>
+	
+	
+=======
 
 	
 	
+>>>>>>> .r12027
 
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/comments.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/comments.php
index b939f43e..4c62b912 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/comments.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/comments.php
@@ -1,3 +1,178 @@
+<<<<<<< .mine
+
+	' . theme_locals("password") . ''; ?>
+	
+	
+	
+	
+		
+		
+			 
+		
+		
+			
+		
+		
+			 
+		
+	
+	
+
+	
+			
+		' . theme_locals("no_comments_yet") . ''; ?>
+		
+			
+		' . theme_locals("comments_are_closed") . ''; ?>
+
+		
+	
+	
+	
+
+	
+
+	
+
+	
+
+	
+		
+	
+
+	
+	  
+	
+
+	
+
+	
+
+	 . ">
+
+	
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="1"  />
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="2"  />
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="3" />
+
+	
+
+	
+
+	'){this.value=''}" onblur="if(this.value==''){this.value='<?php echo theme_locals("your_comment"); ?>'}"><?php echo theme_locals("your_comment"); ?>
+
+	" />
+		
+	
+	ID); ?>
+
+	
+
+	
+	
+
+
+
+||||||| .r11156
+
+	' . theme_locals("password") . ''; ?>
+	
+	
+	
+	
+		
+		
+			 
+		
+		
+			
+		
+		
+			 
+		
+	
+	
+
+	
+			
+		' . theme_locals("no_comments_yet") . ''; ?>
+		
+			
+		' . theme_locals("comments_are_closed") . ''; ?>
+
+		
+	
+	
+	
+
+	
+
+	
+
+	
+
+	
+		
+	
+
+	
+	  
+	
+
+	
+
+	
+
+	 . ">
+
+	
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="1"  />
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="2"  />
+
+	" onfocus="if(this.value==''){this.value=''}" onblur="if(this.value==''){this.value=''}" size="22" tabindex="3" />
+
+	
+
+	
+
+	'){this.value=''}" onblur="if(this.value==''){this.value='<?php echo theme_locals("your_comment"); ?>'}"><?php echo theme_locals("your_comment"); ?>
+
+	" />
+		
+	
+	ID); ?>
+
+	
+
+	
+	
+
+
+
+=======
 
 
+>>>>>>> .r12027
 
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/filterable-portfolio-loop.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/filterable-portfolio-loop.php
index 65f97980..fd45f15b 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/filterable-portfolio-loop.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/filterable-portfolio-loop.php
@@ -1,3 +1,551 @@
+<<<<<<< .mine
+
+
+
+
+
+
+ID, 'portfolio', true ) );
+
+	// Get categories
+	$portfolio_cats = wp_get_object_terms($post->ID, 'portfolio_category');
+
+	// Get tags
+	$portfolio_tags = !is_wp_error( wp_get_object_terms($post->ID, 'portfolio_tag')) ? wp_get_object_terms($post->ID, 'portfolio_tag') : array();
+
+	// Theme Options vars
+	$folio_filter        = of_get_option('folio_filter');
+	$folio_title         = of_get_option('folio_title');
+	$folio_btn           = of_get_option('folio_btn');
+	$folio_excerpt       = of_get_option('folio_excerpt');
+	$folio_excerpt_count = of_get_option('folio_excerpt_count');
+	$lightbox            = (of_get_option('folio_lightbox') != '') ? of_get_option('folio_lightbox') : 'yes';
+
+	// Set size for image
+	$image_size = array(
+		'width'  => 600,
+		'height' => 380
+		);
+
+	// Get img URL, resize & crop
+	$thumb   = get_post_thumbnail_id();
+	$img_url = wp_get_attachment_url( $thumb,'full');
+	$image   = aq_resize( $img_url, $image_size['width'], $image_size['height'], true );
+
+	//mediaType init
+	$mediaType = get_post_meta($post->ID, 'tz_portfolio_type', true);
+?>
+	
+		
+		ID);
+				$link_rel   = 'rel="'.$prettyType.'"';
+				$zoom_icon  = '';
+			else :
+				$link_href  = get_permalink($post->ID);
+				$link_title = theme_locals("permanent_link_to").' '.get_the_title($post->ID);
+				$link_rel   = '';
+				unset($zoom_icon);
+			endif;
+
+			// in any for Video and Audio posts no lightbox
+			if ( ($mediaType == 'Video') || ($mediaType == 'Audio') ) {
+				$link_href  = get_permalink($post->ID);
+				$link_title = theme_locals("permanent_link_to").' '.get_the_title($post->ID);
+				$link_rel   = '';
+				unset($zoom_icon);
+			} ?>
+
+			
+			
+				>
+					
+					
+				
+			

+			ID);
+				$images = get_children( array(
+					'orderby'        => 'menu_order',
+					'order'          => 'ASC',
+					'post_type'      => 'attachment',
+					'post_parent'    => $post->ID,
+					'post_mime_type' => 'image',
+					'post_status'    => null,
+					'numberposts'    => -1
+				) );
+				// output attachments
+				if ( $images ) {
+					$attachment_counter = 0;
+					foreach ( $images as $attachment_id => $attachment ) {
+						if ( ($attachment->ID == $thumbid) ) continue;
+
+							$image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array
+							$image            = aq_resize( $image_attributes[0], $image_size['width'], $image_size['height'], true );
+							$image_title      = $attachment->post_title;
+
+							if (!$attachment_counter && !has_post_thumbnail()) {
+								if ($lightbox == "yes") {
+									$link_href    = $image_attributes[0];
+								} else {
+									$link_href    = get_permalink($post->ID);
+								}
+								$figure_before = '';
+								$figure_after  = '
';
+								$link_style    = 'display:block';
+								$img_tag       = '';
+							} else {
+								$figure_before = '';
+								$figure_after  = '';
+								$link_href = $image_attributes[0];
+								$link_style = 'display:none';
+								unset($img_tag);
+								unset($zoom_icon);
+							} ?>
+					>
+					
+
+			
+				
+					
+				
+
+				
+					
+						
+					
+				
+
+				
+					
+				
+			

+
+		

+	

+||||||| .r11156
+
+
+
+
+
+
+ID, 'portfolio', true ) );
+
+	// Get categories
+	$portfolio_cats = wp_get_object_terms($post->ID, 'portfolio_category');
+
+	// Get tags
+	$portfolio_tags = !is_wp_error( wp_get_object_terms($post->ID, 'portfolio_tag')) ? wp_get_object_terms($post->ID, 'portfolio_tag') : array();
+
+	// Theme Options vars
+	$folio_filter        = of_get_option('folio_filter');
+	$folio_title         = of_get_option('folio_title');
+	$folio_btn           = of_get_option('folio_btn');
+	$folio_excerpt       = of_get_option('folio_excerpt');
+	$folio_excerpt_count = of_get_option('folio_excerpt_count');
+	$lightbox            = (of_get_option('folio_lightbox') != '') ? of_get_option('folio_lightbox') : 'yes';
+
+	// Set size for image
+	$image_size = array(
+		'width'  => 600,
+		'height' => 380
+		);
+
+	// Get img URL, resize & crop
+	$thumb   = get_post_thumbnail_id();
+	$img_url = wp_get_attachment_url( $thumb,'full');
+	$image   = aq_resize( $img_url, $image_size['width'], $image_size['height'], true );
+
+	//mediaType init
+	$mediaType = get_post_meta($post->ID, 'tz_portfolio_type', true);
+?>
+	
+		
+		ID);
+				$link_rel   = 'rel="'.$prettyType.'"';
+				$zoom_icon  = '';
+			else :
+				$link_href  = get_permalink($post->ID);
+				$link_title = theme_locals("permanent_link_to").' '.get_the_title($post->ID);
+				$link_rel   = '';
+				unset($zoom_icon);
+			endif;
+
+			// in any for Video and Audio posts no lightbox
+			if ( ($mediaType == 'Video') || ($mediaType == 'Audio') ) {
+				$link_href  = get_permalink($post->ID);
+				$link_title = theme_locals("permanent_link_to").' '.get_the_title($post->ID);
+				$link_rel   = '';
+				unset($zoom_icon);
+			} ?>
+
+			
+			
+				>
+					
+					
+				
+			

+			ID);
+				$images = get_children( array(
+					'orderby'        => 'menu_order',
+					'order'          => 'ASC',
+					'post_type'      => 'attachment',
+					'post_parent'    => $post->ID,
+					'post_mime_type' => 'image',
+					'post_status'    => null,
+					'numberposts'    => -1
+				) );
+				// output attachments
+				if ( $images ) {
+					$attachment_counter = 0;
+					foreach ( $images as $attachment_id => $attachment ) {
+						if ( ($attachment->ID == $thumbid) ) continue;
+
+							$image_attributes = wp_get_attachment_image_src( $attachment_id, 'full' ); // returns an array
+							$image            = aq_resize( $image_attributes[0], $image_size['width'], $image_size['height'], true );
+							$image_title      = $attachment->post_title;
+
+							if (!$attachment_counter && !has_post_thumbnail()) {
+								if ($lightbox == "yes") {
+									$link_href    = $image_attributes[0];
+								} else {
+									$link_href    = get_permalink($post->ID);
+								}
+								$figure_before = '';
+								$figure_after  = '
';
+								$link_style    = 'display:block';
+								$img_tag       = '';
+							} else {
+								$figure_before = '';
+								$figure_after  = '';
+								$link_href = $image_attributes[0];
+								$link_style = 'display:none';
+								unset($img_tag);
+								unset($zoom_icon);
+							} ?>
+					>
+					
+
+			
+				
+					
+				
+
+				
+					
+				
+
+				
+					
+				
+			

+
+		

+	

+=======
 
 
 
 	
+>>>>>>> .r12027
 	
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/framework_options.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/framework_options.php
index a8ab0455..6b0e9055 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/framework_options.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/framework_options.php
@@ -1,3 +1,3303 @@
+<<<<<<< .mine
+ theme_locals("yes"),
+				"false" => theme_locals("no")
+			);
+	//yes/no array
+			$yes_no_array = array(
+				"yes" => theme_locals("yes"),
+				"no"  => theme_locals("no")
+			);
+	//filter orderby array
+			$filter_orderby_array = array(
+				'id'         => 'ID',
+				'name'       => 'Name',
+				'slug'       => 'Slug',
+				'count'      => 'Posts count',
+				);
+	//orderby array
+			$orderby_array = array(
+				'id'            => 'ID',
+				'author'        => 'Author',
+				'title'         => 'Title',
+				'name'          => 'Name (slug)',
+				'date'          => 'Date',
+				'modified'      => 'Modified',
+				'comment_count' => 'Comments',
+				'rand'          => 'Random',
+				);
+	//order array
+			$order_array = array(
+				'ASC'  => 'ASC',
+				'DESC' => 'DESC',
+				);
+	// If using image radio buttons, define a directory path
+			$imagepath = PARENT_URL . '/includes/images/';
+
+			$options = array();
+// ---------------------------------------------------------
+// General
+// ---------------------------------------------------------
+			$options["general"] = array( "name" => theme_locals('general'),
+								"type" => "heading");
+	// Background Defaults
+			$background_defaults = array(
+				'color' => '',
+				'image' => '',
+				'repeat' => 'repeat',
+				'position' => 'top center',
+				'attachment'=>'scroll'
+			);
+
+			$options['body_background'] = array( "name" =>  theme_locals('body_name'),
+								"desc" => theme_locals('body_desc'),
+								"id" => "body_background",
+								"std" => $background_defaults,
+								"type" => "background");
+
+			$main_layout_opt = array('fullwidth' => theme_locals('fullwidth'), 'fixed' => theme_locals('fixed'));
+			$options['main_layout'] = array( "name" => theme_locals('main_layout_name'),
+								"desc" => theme_locals('main_layout_desc'),
+								"id" => "main_layout",
+								"type" => "radio",
+								"std" => "fullwidth",
+								"options" => $main_layout_opt);
+
+			$options['main_background'] = array( "name" => theme_locals('main_bg_name'),
+								"desc" => theme_locals('main_bg_desc'),
+								"id" => "main_background",
+								"std" => "#fafafa",
+								"type" => "color");
+
+			$header_bg_defaults = array(
+				'color' => '',
+				'image' => '',
+				'repeat' => 'repeat',
+				'position' => 'top center',
+				'attachment'=>'scroll'
+			);
+			$options['header_background'] = array( "name" => theme_locals('header_name'),
+								"desc" => theme_locals('header_desc'),
+								"id" => "header_background",
+								"std" => $header_bg_defaults,
+								"type" => "background");
+
+			$options['links_color'] = array( "name" => theme_locals('buttons_name'),
+								"desc" => theme_locals('buttons_desc'),
+								"id" => "links_color",
+								"std" => "#0088cc",
+								"type" => "color");
+
+			$options['links_color_hover'] = array( "name" => theme_locals('links_color_hover'),
+								"desc" => theme_locals('links_color_hover_desc'),
+								"id" => "links_color_hover",
+								"std" => "",
+								"type" => "color");
+
+
+			$options['google_mixed_3'] = array( 'name' => theme_locals('body_text_name'),
+								'desc' => theme_locals('body_text_desc'),
+								'id' => 'google_mixed_3',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h1_heading'] = array( 'name' => theme_locals('h1_name'),
+								'desc' => theme_locals('h1_desc'),
+								'id' => 'h1_heading',
+								'std' => array( 'size' => '30px', 'lineheight' => '35px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h2_heading'] = array( 'name' => theme_locals('h2_name'),
+								'desc' => theme_locals('h2_desc'),
+								'id' => 'h2_heading',
+								'std' => array( 'size' => '22px', 'lineheight' => '26px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h3_heading'] = array( 'name' => theme_locals('h3_name'),
+								'desc' => theme_locals('h3_desc'),
+								'id' => 'h3_heading',
+								'std' => array( 'size' => '18px', 'lineheight' => '22px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h4_heading'] = array( 'name' => theme_locals('h4_name'),
+								'desc' => theme_locals('h4_desc'),
+								'id' => 'h4_heading',
+								'std' => array( 'size' => '14px', 'lineheight' => '20px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h5_heading'] = array( 'name' => theme_locals('h5_name'),
+								'desc' => theme_locals('h5_desc'),
+								'id' => 'h5_heading',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h6_heading'] = array( 'name' => theme_locals('h6_name'),
+								'desc' => theme_locals('h6_desc'),
+								'id' => 'h6_heading',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['g_search_box_id'] = array( "name" => theme_locals('search_name'),
+								"desc" => theme_locals('search_desc'),
+								"id" => "g_search_box_id",
+								"type" => "radio",
+								"std" => "yes",
+								"options" => $yes_no_array);
+
+			$options['g_breadcrumbs_id'] = array( "name" => theme_locals('breadcrumbs_name'),
+								"desc" => theme_locals('breadcrumbs_desc'),
+								"id" => "g_breadcrumbs_id",
+								"type" => "radio",
+								"std" => "yes",
+								"options" => $yes_no_array);
+
+			$options['custom_css'] = array( "name" => theme_locals('css_name'),
+								"desc" => theme_locals('css_desc'),
+								"id" => "custom_css",
+								"std" => "",
+								"type" => "textarea");
+
+			$options['live_chat_id'] = array( "name" => theme_locals('live_chat_name'),
+					"desc"  => sprintf( theme_locals('live_chat_desc'), "Get own account ID." ),
+					"id"    => "live_chat_id",
+					"std"   => "",
+					"class" => "tiny",
+					"type"  => "text" );
+
+			$options['tm_live_chat'] = array( "name" => theme_locals('tm_live_chat_name'),
+					"desc"    => theme_locals('tm_live_chat_desc'),
+					"id"      => "tm_live_chat",
+					"type"    => "radio",
+					"std"     => "yes",
+					"options" => $yes_no_array );
+
+// ---------------------------------------------------------
+// Logo & Favicon
+// ---------------------------------------------------------
+
+			$options['logo_favicon'] = array( "name" => theme_locals('logo_favicon'),
+								"type" => "heading");
+	// Logo type
+			$logo_type = array(
+				"image_logo" => theme_locals("image_logo"),
+				"text_logo" => theme_locals("text_logo")
+			);
+
+			$options['logo_type'] = array( "name" => theme_locals('logo_name'),
+								"desc" => theme_locals('logo_desc'),
+								"id" => "logo_type",
+								"std" => "image_logo",
+								"type" => "radio",
+								"options" => $logo_type);
+
+			$options['logo_typography'] = array( 'name' => theme_locals('logo_t_name'),
+								'desc' => theme_locals('logo_t_desc'),
+								'id' => 'logo_typography',
+								'std' => array( 'size' => '40px', 'lineheight' => '48px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#049CDB'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['logo_url'] = array( "name" => theme_locals('logo_image_path'),
+								"desc" => theme_locals('logo_image_path_desc'),
+								"id" => "logo_url",
+								"std" => get_stylesheet_directory_uri() . "/images/logo.png",
+								"type" => "upload");
+
+			$options['favicon'] = array( "name" => theme_locals('favicon_name'),
+								"desc" => theme_locals('favicon_desc'),
+								"id" => "favicon",
+								"std" => get_stylesheet_directory_uri() . "/favicon.ico",
+								"type" => "upload");
+
+// ---------------------------------------------------------
+// Navigation
+// ---------------------------------------------------------
+
+			$options['navigation'] = array( "name" => theme_locals('navigation'),
+								"type" => "heading");
+
+			$options['menu_typography'] = array( 'name' => theme_locals('menu_t_name'),
+								'desc' => theme_locals('menu_t_desc'),
+								'id' => 'menu_typography',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#1133AA'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['sf_delay'] = array( "name" => theme_locals('delay_name'),
+								"desc" => theme_locals('delay_desc'),
+								"id" => "sf_delay",
+								"std" => "1000",
+								"class" => "tiny",
+								"type" => "text");
+	// Superfish fade-in animation
+			$sf_f_animation_array = array(
+				"show" => theme_locals("enable fade-in animation"),
+				"false" => theme_locals("disable fade-in animation")
+			);
+
+			$options['sf_f_animation'] = array( "name" => theme_locals('fade_name'),
+								"desc" => theme_locals('fade_desc'),
+								"id" => "sf_f_animation",
+								"std" => "show",
+								"type" => "radio",
+								"options" => $sf_f_animation_array);
+	// Superfish slide-down animation
+			$sf_sl_animation_array = array(
+				"show" => theme_locals("enable slide-down animation"),
+				"false" => theme_locals("disable slide-down animation")
+			);
+
+			$options['sf_sl_animation'] = array( "name" => theme_locals('slide_name'),
+								"desc" => theme_locals('slide_desc'),
+								"id" => "sf_sl_animation",
+								"std" => "show",
+								"type" => "radio",
+								"options" => $sf_sl_animation_array);
+	// Superfish animation speed
+			$sf_speed_array = array(
+				"slow" => theme_locals("slow_speed"), "normal" => theme_locals("normal_speed"), "fast" => theme_locals("fast_speed"));
+
+			$options['sf_speed'] = array( "name" => theme_locals('speed_name'),
+								"desc" => theme_locals('speed_desc'),
+								"id" => "sf_speed",
+								"type" => "select",
+								"std" => "normal",
+								"class" => "tiny", //mini, tiny, small
+								"options" => $sf_speed_array);
+
+			$options['sf_arrows'] = array( "name" => theme_locals('arrows_name'),
+								"desc" => theme_locals('arrows_desc'),
+								"id" => "sf_arrows",
+								"std" => "false",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['mobile_menu_label'] = array( "name" => theme_locals('mobile_menu_name'),
+								"desc" => theme_locals('mobile_menu_desc'),
+								"id" => "mobile_menu_label",
+								"std" => theme_locals('mobile_menu_std'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['stickup_menu'] = array(
+								"name" => theme_locals('stickup_menu'),
+								"desc" => theme_locals('stickup_menu_desc'),
+								"id" => "stickup_menu",
+								"std" => "false",
+								"type" => "radio",
+								"options" => $true_false_array
+			);
+// ---------------------------------------------------------
+// Slider
+// ---------------------------------------------------------
+
+			$options['slider'] = array( "name" => theme_locals('slider'),
+								"type" => "heading");
+	// Slider type
+			$options['slider_type'] = array(
+								"name" => theme_locals('slider_type_name'),
+								"desc" => theme_locals('slider_type_desc'),
+								"id" => "slider_type",
+								"std" => "camera_slider",
+								"type" => "images",
+								"options" => array(
+									'none_slider' => $imagepath . 'slider_none.png',
+									'camera_slider' => $imagepath . 'slider_type_1.png',
+									'accordion_slider' => $imagepath . 'slider_type_2.png'),
+								"title" => array(
+									'none_slider' => theme_locals('slider_off'),
+									'camera_slider' => theme_locals('camera_slider'),
+									'accordion_slider' => theme_locals('accordion_slider')));
+
+			$options['slider_posts_orderby'] = array(
+				"name"    => theme_locals("folio_posts_orderby"),
+				"desc"    => theme_locals("folio_posts_orderby_desc"),
+				"id"      => "slider_posts_orderby",
+				"std"     => "date",
+				"type"    => "select",
+				"options" => $orderby_array
+				);
+
+			$options['slider_posts_order'] = array(
+				"name"    => theme_locals("folio_posts_order"),
+				"desc"    => theme_locals("folio_posts_order_desc"),
+				"id"      => "slider_posts_order",
+				"std"     => "ASC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+	// ---------------------------------------------------------*/
+	// Camera Slider
+	// ---------------------------------------------------------
+
+	// Slider effects
+			$sl_effect_array = array("random" => theme_locals("random"), "simpleFade" => theme_locals("simpleFade"), "curtainTopLeft" => theme_locals("curtainTopLeft"), "curtainTopRight" => theme_locals("curtainTopRight"), "curtainBottomLeft" => theme_locals("curtainBottomLeft"), "curtainBottomRight" => theme_locals("curtainBottomRight"), "curtainSliceLeft" => theme_locals("curtainSliceLeft"), "curtainSliceRight" => theme_locals("curtainSliceRight"), "blindCurtainTopLeft" => theme_locals("blindCurtainTopLeft"), "blindCurtainTopRight" => theme_locals("blindCurtainTopRight"), "blindCurtainBottomLeft" => theme_locals("blindCurtainBottomLeft"), "blindCurtainBottomRight" => theme_locals("blindCurtainBottomRight"), "blindCurtainSliceBottom" => theme_locals("blindCurtainSliceBottom"), "blindCurtainSliceTop" => theme_locals("blindCurtainSliceTop"), "stampede" => theme_locals("stampede"), "mosaic" => theme_locals("mosaic"), "mosaicReverse" => theme_locals("mosaicReverse"), "mosaicRandom" => theme_locals("mosaicRandom"), "mosaicSpiral" => theme_locals("mosaicSpiral"), "mosaicSpiralReverse" => theme_locals("mosaicSpiralReverse"), "topLeftBottomRight" => theme_locals("topLeftBottomRight"), "bottomRightTopLeft" => theme_locals("bottomRightTopLeft"), "bottomLeftTopRight" => theme_locals("bottomLeftTopRight"));
+
+			$options['sl_effect'] = array( "name" => theme_locals('effect_name'),
+								"desc" => theme_locals('effect_desc'),
+								"id" => "sl_effect",
+								"std" => "simpleFade",
+								"type" => "select",
+								"class" => "tiny slider_type_1", //mini, tiny, small
+								"options" => $sl_effect_array);
+	// Slider columns
+			$sl_columns_array = array("1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "11" => "11", "12" => "12", "13" => "13", "14" => "14", "15" => "15", "16" => "16", "17" => "17", "18" => "18", "19" => "19", "20" => "20");
+
+			$options['sl_columns'] = array( "name" => theme_locals('columns_name'),
+								"desc" => theme_locals('columns_desc'),
+								"id" => "sl_columns",
+								"std" => "6",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_columns_array);
+	// Slider rows
+			$sl_rows_array = array("1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "11" => "11", "12" => "12", "13" => "13", "14" => "14", "15" => "15", "16" => "16", "17" => "17", "18" => "18", "19" => "19", "20" => "20");
+
+			$options['sl_rows'] = array( "name" => theme_locals('rows_name'),
+								"desc" => theme_locals('rows_desc'),
+								"id" => "sl_rows",
+								"std" => "6",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_rows_array);
+	// Banner effects
+			$sl_banner_array = array("moveFromLeft" => theme_locals("moveFromLeft"), "moveFromRight" => theme_locals("moveFromRight"), "moveFromTop" => theme_locals("moveFromTop"), "moveFromBottom" => theme_locals("moveFromBottom"), "fadeIn" => theme_locals("fadeIn"), "fadeFromLeft" => theme_locals("fadeFromLeft"), "fadeFromRight" => theme_locals("fadeFromRight"), "fadeFromTop" => theme_locals("fadeFromTop"), "fadeFromBottom" => theme_locals("fadeFromBottom"));
+
+			$options['sl_banner'] = array( "name" =>  theme_locals('banner_name'),
+								"desc" =>  theme_locals('banner_desc'),
+								"id" => "sl_banner",
+								"std" => "fadeFromBottom",
+								"type" => "select",
+								"class" => "tiny slider_type_1", //mini, tiny, small
+								"options" => $sl_banner_array);
+
+			$options['sl_pausetime'] = array( "name" => theme_locals('pause_name'),
+								"desc" => theme_locals('pause_desc'),
+								"id" => "sl_pausetime",
+								"std" => "7000",
+								"class" => "tiny slider_type_1",
+								"type" => "text");
+
+			$options['sl_animation_speed'] = array( "name" => theme_locals('animation_name'),
+								"desc" => theme_locals('animation_desc'),
+								"id" => "sl_animation_speed",
+								"std" => "1500",
+								"class" => "tiny slider_type_1",
+								"type" => "text");
+
+			$options['sl_slideshow'] = array( "name" => theme_locals('slideshow_name'),
+								"desc" => theme_locals('slideshow_desc'),
+								"id" => "sl_slideshow",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_thumbnails'] = array( "name" => theme_locals('thumbnails_name'),
+								"desc" => theme_locals('thumbnails_desc'),
+								"id" => "sl_thumbnails",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_control_nav'] = array( "name" => theme_locals('pagination_name'),
+								"desc" => theme_locals('pagination_desc'),
+								"id" => "sl_control_nav",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_dir_nav'] = array( "name" => theme_locals('navigation_name'),
+								"desc" => theme_locals('navigation_desc'),
+								"id" => "sl_dir_nav",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_dir_nav_hide'] = array( "name" => theme_locals('hover_name'),
+								"desc" => theme_locals('hover_desc'),
+								"id" => "sl_dir_nav_hide",
+								"std" => "false",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_play_pause_button'] = array( "name" => theme_locals('button_name'),
+								"desc" => theme_locals('button_desc'),
+								"id" => "sl_play_pause_button",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_pause_on_hover'] = array( "name" => theme_locals('pause_on_hover_title'),
+								"desc" => theme_locals('pause_on_hover_desc'),
+								"id" => "sl_pause_on_hover",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+	// Slider loader
+			$sl_loader_array = array("no" => theme_locals("none"), "pie" => theme_locals("pie"), "bar" => theme_locals("bar"));
+
+			$options['sl_loader'] = array( "name" => theme_locals('loader_name'),
+								"desc" => theme_locals('loader_desc'),
+								"id" => "sl_loader",
+								"std" => "no",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_loader_array);
+	// ---------------------------------------------------------
+	// Accordion Slider
+	// ---------------------------------------------------------
+			$post_array = array();
+			$slider_post = query_posts("post_type=slider&posts_per_page=-1&post_status=publish&orderby=name&order=ASC");
+			foreach ($slider_post as $value){
+				$postID = $value -> ID;
+				$post_array[$postID] = get_the_title($postID);
+			};
+			wp_reset_query();
+
+			$options['acc_show_post'] = array( "name" => theme_locals('show_post_name'),
+					"desc" => theme_locals('show_post_desc'),
+					"id" => "acc_show_post",
+					"std" => "",
+					"type" => "multicheck",
+					"class" => "slider_type_2",
+					"options" => $post_array);
+
+			$options['acc_slideshow'] = array( "name" => theme_locals('slideshow_name'),
+								"desc" => theme_locals('slideshow_desc'),
+								"id" => "acc_slideshow",
+								"std" => "false",
+								"type" => "radio",
+								"class" => "slider_type_2",
+								"options" => $true_false_array);
+
+			$options['acc_hover_pause'] = array( "name" => theme_locals('hover_pause_name'),
+								"desc" => theme_locals('hover_pause_desc'),
+								"id" => "acc_hover_pause",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_2",
+								"options" => $true_false_array);
+
+			$options['acc_pausetime'] = array( "name" => theme_locals('pause_name'),
+								"desc" => theme_locals('pause_desc'),
+								"id" => "acc_pausetime",
+								"std" => "6000",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+
+			$options['acc_animation_speed'] = array( "name" => theme_locals('animation_name'),
+								"desc" => theme_locals('animation_desc'),
+								"id" => "acc_animation_speed",
+								"std" => "600",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+
+			// Accordion animation easing
+			$acc_easing = array("linear" => theme_locals("linear"), "easeInSine" => theme_locals("easeInSine"), "easeOutSine" => theme_locals("easeOutSine"), "easeInOutSine" => theme_locals("easeInOutSine"), "easeInQuad" => theme_locals("easeInQuad"), "easeOutQuad" => theme_locals("easeOutQuad"), "easeInOutQuad" => theme_locals("easeInOutQuad"), "easeInCubic" => theme_locals("easeInCubic"), "easeOutCubic" => theme_locals("easeOutCubic"), "easeInOutCubic" => theme_locals("easeInOutCubic"), "easeInQuart" => theme_locals("easeInQuart"), "easeOutQuart" => theme_locals("easeOutQuart"), "easeInOutQuart" => theme_locals("easeInOutQuart"), "easeInQuint" => theme_locals("easeInQuint"), "easeOutQuint" => theme_locals("easeOutQuint"), "easeInOutQuint" => theme_locals("easeInOutQuint"), "easeInExpo" => theme_locals("easeInExpo"), "easeOutExpo" => theme_locals("easeOutExpo"), "easeInOutExpo" => theme_locals("easeInOutExpo"), "easeInCirc" => theme_locals("easeInCirc"), "easeOutCirc" => theme_locals("easeOutCirc"), "easeInOutCirc" => theme_locals("easeInOutCirc"), "easeInBack" => theme_locals("easeInBack"), "easeOutBack" => theme_locals("easeOutBack"), "easeInOutBack" => theme_locals("easeInOutBack"), "easeInElastic" => theme_locals("easeInElastic"), "easeOutElastic" => theme_locals("easeOutElastic"), "easeInOutElastic" => theme_locals("easeInOutElastic"), "easeInBounce" => theme_locals("easeInBounce"), "easeOutBounce" => theme_locals("easeOutBounce"), "easeInOutBounce" => theme_locals("easeInOutBounce"));
+
+			$options['acc_easing'] = array( "name" =>  theme_locals('easing_name'),
+								"desc" =>  theme_locals('easing_desc'),
+								"id" => "acc_easing",
+								"std" => "easeOutCubic",
+								"type" => "select",
+								"class" => "tiny slider_type_2", //mini, tiny, small
+								"options" => $acc_easing);
+			// Accordion trigger
+			$acc_trigger = array("click" => theme_locals("click"), "mouseover" => theme_locals("mouseover"), "dblclick" => theme_locals("dblclick"));
+
+			$options['acc_trigger'] = array( "name" => theme_locals('trigger_name'),
+								"desc" => theme_locals('trigger_desc'),
+								"id" => "acc_trigger",
+								"std" => "mouseover",
+								"type" => "select",
+								"class" => "tiny slider_type_2", //mini, tiny, small
+								"options" => $acc_trigger);
+
+			$options['acc_starting_slide'] = array( "name" => theme_locals('starting_slide_name'),
+								"desc" => theme_locals('starting_slide_desc'),
+								"id" => "acc_starting_slide",
+								"std" => "0",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+// ---------------------------------------------------------
+// Blog
+// ---------------------------------------------------------
+
+			$options['blog'] = array( "name" => theme_locals('blog'),
+								"type" => "heading");
+
+			$options['blog_text'] = array( "name" => theme_locals('blog_name'),
+								"desc" => theme_locals('blog_desc'),
+								"id" => "blog_text",
+								"std" => theme_locals('blog'),
+								"type" => "text");
+
+			$options['blog_related'] = array( "name" => theme_locals('posts_name'),
+								"desc" => theme_locals('posts_desc'),
+								"id" => "blog_related",
+								"std" => theme_locals('posts_std'),
+								"type" => "text");
+
+			$options['blog_sidebar_pos'] = array( "name" => theme_locals('sidebar_name'),
+								"desc" => theme_locals('sidebar_option_desc'),
+								"id" => "blog_sidebar_pos",
+								"std" => "right",
+								"type" => "images",
+								"options" => array(
+									'left' => $imagepath . '2cl.png',
+									'right' => $imagepath . '2cr.png',
+									'none' => $imagepath . '1col.png',
+									'masonry' => $imagepath . 'masonry.png'),
+								"title" => array(
+									'left' => theme_locals('sidebar_left'),
+									'right' => theme_locals('sidebar_right'),
+									'none' => theme_locals('sidebar_hide'),
+									'masonry' => theme_locals('blog_masonry')
+									)
+								);
+	// Featured image size on the blog.
+			$post_image_size_array = array("normal" => theme_locals("normal_size"),"large" => theme_locals("large_size"));
+
+			$options['post_image_size'] = array( "name" => theme_locals('image_size_name'),
+								"desc" => theme_locals('image_size_desc'),
+								"id" => "post_image_size",
+								"type" => "select",
+								"std" => "large",
+								"class" => "small", //mini, tiny, small
+								"options" => $post_image_size_array);
+	// Featured image size on the single page.
+			$single_image_size_array = array("normal" => theme_locals("normal_size"),"large" => theme_locals("large_size"));
+
+			$options['single_image_size'] = array( "name" => theme_locals('single_post_image_name'),
+								"desc" => theme_locals('single_post_image_desc'),
+								"id" => "single_image_size",
+								"type" => "select",
+								"std" => "large",
+								"class" => "small", //mini, tiny, small
+								"options" => $single_image_size_array);
+
+			$options['single_share_button'] = array( "name" => theme_locals('display_share_name'),
+								"desc" => theme_locals('display_share_desc'),
+								"id" => "single_share_button",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['load_image'] = array( "name" => theme_locals('load_image_name'),
+								"desc" => theme_locals('load_image_desc'),
+								"id" => "load_image",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['post_excerpt'] = array( "name" => theme_locals('excerpt_name'),
+								"desc" => theme_locals('excerpt_desc'),
+								"id" => "post_excerpt",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['blog_button_text'] = array( "name" => theme_locals('button_text_name'),
+								"desc" => theme_locals('button_text_desc'),
+								"id" => "blog_button_text",
+								"std" => theme_locals('read_more'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['post_meta'] = array( "name" => theme_locals('meta_name'),
+								"desc" => theme_locals('meta_desc'),
+								"id" => "post_meta",
+								"std" => "line",
+								"type" => "radio",
+								"options" => array('false' => theme_locals('hide'), 'line' => theme_locals('line'), 'icon' => theme_locals('icons')));
+
+			$options['post_meta_display'] = array( "name" => theme_locals('meta_display_name'),
+								"desc" => theme_locals('meta_display_desc'),
+								"id" => "post_meta_display",
+								"std" => "only_post",
+								"type" => "radio",
+								"options" => array('only_blog' => theme_locals('only_blog'), 'only_post' => theme_locals('only_post'), 'blog_post' => theme_locals('blog_post'), 'hide' => theme_locals('hide')));
+
+			$options['post_date'] = array( "name" => theme_locals('post_date_name'),
+								"desc" => theme_locals('post_date_desc'),
+								"id" => "post_date",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_author'] = array( "name" => theme_locals('post_author_name'),
+								"desc" => theme_locals('post_author_desc'),
+								"id" => "post_author",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_permalink'] = array( "name" => theme_locals('post_permalink_name'),
+								"desc" => theme_locals('post_permalink_desc'),
+								"id" => "post_permalink",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_category'] = array( "name" => theme_locals('post_category_name'),
+								"desc" => theme_locals('post_category_desc'),
+								"id" => "post_category",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_tag'] = array( "name" => theme_locals('post_tag_name'),
+								"desc" => theme_locals('post_tag_desc'),
+								"id" => "post_tag",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_comment'] = array( "name" => theme_locals('post_comment_name'),
+								"desc" => theme_locals('post_comment_desc'),
+								"id" => "post_comment",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_views'] = array( "name" => theme_locals('post_views_name'),
+								"desc" => theme_locals('post_views_desc'),
+								"id" => "post_views",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_like'] = array( "name" => theme_locals('post_like_name'),
+								"desc" => theme_locals('post_like_desc'),
+								"id" => "post_like",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_dislike'] = array( "name" => theme_locals('post_dislike_name'),
+								"desc" => theme_locals('post_dislike_desc'),
+								"id" => "post_dislike",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+// ---------------------------------------------------------
+// Portfolio
+// ---------------------------------------------------------
+
+			$options['portfolio'] = array( "name" => theme_locals("portfolio"),
+								"type" => "heading");
+
+			$options['folio_filter'] = array( "name" => theme_locals("filter_name"),
+								"desc" => theme_locals("filter_desc"),
+								"id" => "folio_filter",
+								"std" => "cat",
+								"type" => "select",
+								"options" => array(
+												"cat"	=>	theme_locals("by_category"),
+												"tag"	=>	theme_locals("by_tags"),
+												"none"	=>	theme_locals("none")));
+
+			$options['folio_filter_orderby'] = array(
+				"name"    => theme_locals("folio_filter_orderby"),
+				"desc"    => theme_locals("folio_filter_orderby_desc"),
+				"id"      => "folio_filter_orderby",
+				"std"     => "name",
+				"type"    => "select",
+				"options" => $filter_orderby_array
+				);
+
+			$options['folio_filter_order'] = array(
+				"name"    => theme_locals("folio_filter_order"),
+				"desc"    => theme_locals("folio_filter_order_desc"),
+				"id"      => "folio_filter_order",
+				"std"     => "ASC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+			$options['folio_title'] = array( "name" => theme_locals("show_title_name"),
+								"desc" => theme_locals("show_title_desc"),
+								"id" => "folio_title",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_excerpt'] = array( "name" => theme_locals("show_excerpt_name"),
+								"desc" => theme_locals("show_excerpt_desc"),
+								"id" => "folio_excerpt",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_excerpt_count'] = array( "name" => theme_locals("excerpt_words_name"),
+								"desc" => theme_locals("excerpt_words_desc"),
+								"id" => "folio_excerpt_count",
+								"std" => "20",
+								"class" => "small",
+								"type" => "text");
+
+			$options['folio_btn'] = array( "name" => theme_locals("show_button_name"),
+								"desc" => theme_locals("show_button_desc"),
+								"id" => "folio_btn",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_button_text'] = array( "name" => theme_locals('folio_button_text_name'),
+								"desc" => theme_locals('folio_button_text_desc'),
+								"id" => "folio_button_text",
+								"std" => theme_locals('read_more'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['folio_meta'] = array( "name" => theme_locals("show_meta_name"),
+								"desc" => theme_locals("show_meta_desc"),
+								"id" => "folio_meta",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_lightbox'] = array( "name" => theme_locals("enable_lightbox"),
+								"desc" => theme_locals("folio_enable_lightbox_desc"),
+								"id" => "folio_lightbox",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['single_folio_layout'] = array( "name" => theme_locals("single_folio_layout"),
+								"desc" => theme_locals("single_folio_layout_desc"),
+								"id" => "single_folio_layout",
+								"type" => "radio",
+								"std" => "grid",
+								"options" => array(
+												"grid" => theme_locals("grid_sp"),
+												"fullwidth" => theme_locals("fullwidth_sp")));
+
+			$options['single_gallery_layout'] = array( "name" => theme_locals("single_gallery_layout"),
+								"desc" => theme_locals("single_gallery_layout_desc"),
+								"id" => "single_gallery_layout",
+								"type" => "radio",
+								"std" => "grid",
+								"options" => array(
+												"grid" => theme_locals("grid_gallery"),
+												"masonry" => theme_locals("masonry")));
+
+			$options['layout_mode'] = array( "name" => theme_locals("layout_name"),
+								"desc" => theme_locals("layout_desc"),
+								"id" => "layout_mode",
+								"type" => "select",
+								"std" => "fitRows",
+								"class" => "small", //mini, tiny, small
+								"options" => array(
+												"fitRows" => theme_locals("fit_rows"),
+												"masonry" => theme_locals("masonry")));
+
+			$options['folio_posts_orderby'] = array(
+				"name"    => theme_locals("folio_posts_orderby"),
+				"desc"    => theme_locals("folio_posts_orderby_desc"),
+				"id"      => "folio_posts_orderby",
+				"std"     => "date",
+				"type"    => "select",
+				"options" => $orderby_array
+				);
+
+			$options['folio_posts_order'] = array(
+				"name"    => theme_locals("folio_posts_order"),
+				"desc"    => theme_locals("folio_posts_order_desc"),
+				"id"      => "folio_posts_order",
+				"std"     => "DESC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+			$options['items_count2'] = array( "name" => theme_locals("portfolio_2_name"),
+								"desc" => theme_locals("portfolio_2_desc"),
+								"id" => "items_count2",
+								"std" => "8",
+								"class" => "small",
+								"type" => "text");
+
+			$options['items_count3'] = array( "name" => theme_locals("portfolio_3_name"),
+								"desc" => theme_locals("portfolio_3_desc"),
+								"id" => "items_count3",
+								"std" => "9",
+								"class" => "small",
+								"type" => "text");
+
+			$options['items_count4'] = array( "name" => theme_locals("portfolio_4_name"),
+								"desc" => theme_locals("portfolio_4_desc"),
+								"id" => "items_count4",
+								"std" => "12",
+								"class" => "small",
+								"type" => "text");
+
+// ---------------------------------------------------------
+// Footer
+// ---------------------------------------------------------
+
+			$options['footer'] = array( "name" => theme_locals("footer"),
+								"type" => "heading");
+
+			$options['footer_text'] = array( "name" => theme_locals("copyright_text_name"),
+								"desc" => theme_locals("copyright_text_desc"),
+								"id" => "footer_text",
+								"std" => "",
+								"type" => "textarea");
+
+			$options['ga_code'] = array( "name" => theme_locals("google_name"),
+								"desc" => theme_locals("google_desc"),
+								"id" => "ga_code",
+								"std" => "",
+								"type" => "textarea");
+
+			$options['feed_url'] = array( "name" => theme_locals("feedburner_name"),
+								"desc" => theme_locals("feedburner_desc"),
+								"id" => "feed_url",
+								"std" => "",
+								"type" => "text");
+
+			$options['footer_menu'] = array( "name" => theme_locals("footer_menu_name"),
+								"desc" => theme_locals("footer_menu_desc"),
+								"id" => "footer_menu",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['footer_menu_typography'] = array( 'name' => theme_locals("footer_menu_typography_name"),
+								'desc' => theme_locals("footer_menu_typography_desc"),
+								'id' => 'footer_menu_typography',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#0088CC'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+// ---------------------------------------------------------
+// Cookie Banner
+// ---------------------------------------------------------
+			$options['cookie_banner_h'] = array( "name" => theme_locals("cookie_banner_h"),
+								"type" => "heading");
+
+			$options['cookie_banner'] = array( "name" => theme_locals('cookie_banner_name'),
+								"desc" => theme_locals('cookie_banner_desc'),
+								"id" => "cookie_banner",
+								"type" => "radio",
+								"std" => "no",
+								"options" => $yes_no_array);
+
+			$options['cookie_banner_text'] = array( "name" => theme_locals('cookie_banner_text'),
+								"desc" => theme_locals('cookie_banner_text_desc'),
+								"id" => "cookie_banner_text",
+								"std" => theme_locals('cookie_banner_text_std'),
+								"type" => "textarea");
+
+			return $options;
+		}
+	}
+
+// This function combined child theme options and framework options
+	if(!function_exists('combined_option_array')){
+		function combined_option_array(){
+			$child_options = optionsframework_options();
+			$framework_options = framework_options();
+			$add_child_array = array();
+			$add_child_tabs_array = array();
+			$combined_array = array();
+			$old_value_array = array();
+			foreach ($child_options as $value) {
+				foreach ($framework_options as $key => $value_2) {
+					if(array_key_exists("id", $value) && array_key_exists("id", $value_2)){
+						if(in_array($value["id"], $value_2)){
+							if(array_key_exists("std", $value)){
+								$framework_options[array_search($value_2, $framework_options)]["std"] = $value["std"];
+							}
+							if(array_key_exists("disable", $value)){
+								if($value["disable"]=="true"){
+									unset($framework_options[$key]);
+								}
+							}
+							unset($add_to_array);
+							break;
+						}else{
+							if(array_key_exists("type", $value)){
+								if($value["type"] != "heading"){
+									$add_to_array = $value;
+								}
+							}
+						}
+					}
+				}
+
+				if(isset($add_to_array)){
+					if(array_key_exists("type", $old_value_array)){
+						if($old_value_array["type"]=="heading"){
+							array_push($add_child_array, $old_value_array);
+						}
+					}
+					array_push($add_child_array, $add_to_array);
+					unset($add_to_array);
+				}
+				$old_value_array = $value;
+			}
+			$combined_array =  array_merge ($framework_options, $add_child_array);
+			return $combined_array;
+		}
+	}
+
+/**
+ * This is optional, but if you want to reuse some of the defaults
+ * or values you already have built in the options panel, you
+ * can load them into $options for easy reference
+ */
+add_action('customize_register', 'cherry_register');
+
+	if(!function_exists('cherry_register')) {
+		function cherry_register($wp_customize) {
+
+			$themename = CURRENT_THEME;
+			$options = combined_option_array();
+
+			// remove default sections
+			$wp_customize->remove_section( 'static_front_page' );
+
+			// change transport
+			$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
+			$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+
+// ------------------------------------------------------------
+// General
+// ------------------------------------------------------------
+			$wp_customize->add_section( $themename.'_general', array(
+				'title'    => theme_locals('general'),
+				'priority' => 1
+			));
+
+			if ( isset($options['body_background']) ) {
+				/* Body Background Color */
+				$wp_customize->add_setting( $themename.'[body_background][color]', array(
+					'default'   => $options['body_background']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_body_background_color', array(
+					'label'    => theme_locals('background_color'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[body_background][color]',
+					'priority' => 10
+				)));
+
+				/* Body Background Image */
+				$wp_customize->add_setting($themename.'[body_background][image]', array(
+					'default'   => $options['body_background']['std']['image'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_body_background_image', array(
+					'label'    => theme_locals('background_image'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[body_background][image]',
+					'priority' => 11
+				)));
+			}
+
+			/* Main Background Color */
+			if ( isset($options['main_background']) ) {
+				$wp_customize->add_setting( $themename.'[main_background]', array(
+					'default'   => $options['main_background']['std'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_main_background', array(
+					'label'    => $options['main_background']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[main_background]',
+					'priority' => 13
+				)));
+			}
+
+			if ( isset($options['header_background']) ) {
+				/* Header Background Color */
+				$wp_customize->add_setting( $themename.'[header_background][color]', array(
+					'default'   => $options['header_background']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_header_background_color', array(
+					'label'    => theme_locals('header_color'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[header_background][color]',
+					'priority' => 14
+				)));
+
+				/* Header Background Image */
+				$wp_customize->add_setting($themename.'[header_background][image]', array(
+					'default' => $options['header_background']['std']['image'],
+					'type'    => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_header_background_image', array(
+					'label'    => theme_locals('header_image'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[header_background][image]',
+					'priority' => 15
+				)));
+			}
+
+			/* Links Color */
+			if ( isset($options['links_color']) ) {
+				$wp_customize->add_setting( $themename.'[links_color]', array(
+					'default'   => $options['links_color']['std'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_links_color', array(
+					'label'    => $options['links_color']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[links_color]',
+					'priority' => 16
+				)));
+			}
+
+			/* H1 Heading font face */
+			if ( isset($options['h1_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h1_heading][face]', array(
+					'default' => $options['h1_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h1_heading', array(
+					'label'    => $options['h1_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h1_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h1_heading']['options']['faces'],
+					'priority' => 18
+				));
+			}
+
+			/* H2 Heading font face */
+			if ( isset($options['h2_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h2_heading][face]', array(
+					'default' => $options['h2_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h2_heading', array(
+					'label'    => $options['h2_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h2_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h2_heading']['options']['faces'],
+					'priority' => 19
+				));
+			}
+
+			/* H3 Heading font face */
+			if ( isset($options['h3_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h3_heading][face]', array(
+					'default' => $options['h3_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h3_heading', array(
+					'label'    => $options['h3_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h3_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h3_heading']['options']['faces'],
+					'priority' => 20
+				));
+			}
+
+			/* H4 Heading font face */
+			if ( isset($options['h4_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h4_heading][face]', array(
+					'default' => $options['h4_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h4_heading', array(
+					'label'    => $options['h4_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h4_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h4_heading']['options']['faces'],
+					'priority' => 21
+				));
+			}
+
+			/* H5 Heading font face */
+			if ( isset($options['h5_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h5_heading][face]', array(
+					'default' => $options['h5_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h5_heading', array(
+					'label'    => $options['h5_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h5_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h5_heading']['options']['faces'],
+					'priority' => 22
+				));
+			}
+
+			/* H6 Heading font face */
+			if ( isset($options['h6_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h6_heading][face]', array(
+					'default' => $options['h6_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h6_heading', array(
+					'label'    => $options['h6_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h6_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h6_heading']['options']['faces'],
+					'priority' => 23
+				));
+			}
+
+			/* Breadcrumbs */
+			if ( isset($options['g_breadcrumbs_id']) ) {
+				$wp_customize->add_setting( $themename.'[g_breadcrumbs_id]', array(
+					'default'   => $options['g_breadcrumbs_id']['std'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_g_breadcrumbs_id', array(
+					'label'    => $options['g_breadcrumbs_id']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[g_breadcrumbs_id]',
+					'type'     => 'radio',
+					'choices'  => $options['g_breadcrumbs_id']['options'],
+					'priority' => 24
+				));
+			}
+
+			/* Search Box */
+			if ( isset($options['g_search_box_id']) ) {
+				$wp_customize->add_setting( $themename.'[g_search_box_id]', array(
+					'default'   => $options['g_search_box_id']['std'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_g_search_box_id', array(
+					'label'    => $options['g_search_box_id']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[g_search_box_id]',
+					'type'     => 'radio',
+					'choices'  => $options['g_search_box_id']['options'],
+					'priority' => 25
+				));
+			}
+
+// ---------------------------------------------------------
+// Logo
+// ---------------------------------------------------------
+			/* Logo Type */
+			if ( isset($options['logo_type']) ) {
+				$wp_customize->add_setting( $themename.'[logo_type]', array(
+					'default' => $options['logo_type']['std'],
+					'type'    => 'option'
+				));
+				$wp_customize->add_control( $themename.'_logo_type', array(
+					'label'    => $options['logo_type']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_type]',
+					'type'     => $options['logo_type']['type'],
+					'choices'  => $options['logo_type']['options'],
+					'priority' => 1
+				));
+			}
+
+			/* Logo Path */
+			if ( isset($options['logo_url']) ) {
+				$wp_customize->add_setting( $themename.'[logo_url]', array(
+					'type' => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_logo_url', array(
+					'label'    => $options['logo_url']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_url]',
+					'priority' => 2
+				)));
+			}
+
+			/* Logo-text font */
+			if ( isset($options['logo_typography']) ) {
+				$wp_customize->add_setting( $themename.'[logo_typography][face]', array(
+					'default'   => $options['logo_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_logo_typography_face', array(
+					'label'    => $options['logo_typography']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['logo_typography']['options']['faces'],
+					'priority' => 3,
+				));
+
+				/* Logo Text Color */
+				$wp_customize->add_setting( $themename.'[logo_typography][color]', array(
+					'default'   => $options['logo_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_logo_typography_color', array(
+					'label'    => theme_locals('logo_color'),
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_typography][color]',
+					'priority' => 4
+				)));
+			}
+
+// ---------------------------------------------------------
+// Navigation
+// ---------------------------------------------------------
+			/* Header Navigation font */
+			if ( isset($options['menu_typography']) ) {
+				$wp_customize->add_setting( $themename.'[menu_typography][face]', array(
+					'default'   => $options['menu_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_menu_typography_face', array(
+					'label'    => theme_locals('header_menu_face'),
+					'section'  => 'nav',
+					'settings' => $themename.'[menu_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['menu_typography']['options']['faces'],
+					'priority' => 11,
+				));
+
+				/* Header Navigation Color */
+				$wp_customize->add_setting( $themename.'[menu_typography][color]', array(
+					'default'   => $options['menu_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_menu_typography_color', array(
+					'label'    => theme_locals('header_menu_color'),
+					'section'  => 'nav',
+					'settings' => $themename.'[menu_typography][color]',
+					'priority' => 12
+				)));
+			}
+
+			/* Footer Navigation font */
+			if ( isset($options['footer_menu_typography']) ) {
+				$wp_customize->add_setting( $themename.'[footer_menu_typography][face]', array(
+					'default'   => $options['footer_menu_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_footer_menu_typography_face', array(
+					'label'    => theme_locals('footer_menu_face'),
+					'section'  => 'nav',
+					'settings' => $themename.'[footer_menu_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['footer_menu_typography']['options']['faces'],
+					'priority' => 13,
+				));
+
+				/* Footer Navigation Color */
+				$wp_customize->add_setting( $themename.'[footer_menu_typography][color]', array(
+					'default'   => $options['footer_menu_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_footer_menu_typography_color', array(
+					'label'    => theme_locals('footer_menu_color'),
+					'section'  => 'nav',
+					'settings' => $themename.'[footer_menu_typography][color]',
+					'priority' => 14
+				)));
+			}
+
+// ---------------------------------------------------------
+// Slider
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_slider', array(
+				'title'    => theme_locals('slider'),
+				'priority' => 200
+			));
+
+			/* Slider Type */
+			// Custom control - Layout Picker
+			if ( isset($options['slider_type'])) {
+				$wp_customize->add_setting( $themename.'[slider_type]', array(
+					'default' => $options['slider_type']['std'],
+					'type'    => 'option'
+				) );
+				$wp_customize->add_control( $themename.'_slider_type', array(
+					'label'    => $options['slider_type']['name'],
+					'section'  => $themename.'_slider',
+					'settings' => $themename.'[slider_type]',
+					'choices'  => $options['slider_type']['title'],
+					'type'     => 'radio',
+				) );
+			}
+
+// ---------------------------------------------------------
+// Blog
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_blog', array(
+				'title' => theme_locals('blog'),
+				'priority' => 203
+			));
+
+			/* Blog title */
+			if ( isset($options['blog_text'])) {
+				$wp_customize->add_setting( $themename.'[blog_text]', array(
+					'default' => $options['blog_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_text', array(
+					'label' => $options['blog_text']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_text]',
+					'type' => 'text',
+					'priority' => 1
+				));
+			}
+
+			/* Related posts title */
+			if ( isset($options['blog_related'])) {
+				$wp_customize->add_setting( $themename.'[blog_related]', array(
+					'default' => $options['blog_related']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_related', array(
+					'label' => $options['blog_related']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_related]',
+					'type' => 'text',
+					'priority' => 2
+				));
+			}
+
+			/* Blog layout */
+			// Custom control - Layout Picker
+			if ( isset($options['blog_sidebar_pos'])) {
+				$wp_customize->add_setting( $themename.'[blog_sidebar_pos]', array(
+					'default' => $options['blog_sidebar_pos']['std'],
+					'type'    => 'option'
+				) );
+				$wp_customize->add_control( $themename.'_blog_sidebar_pos', array(
+					'label'    => $options['blog_sidebar_pos']['name'],
+					'section'  => $themename.'_blog',
+					'settings' => $themename.'[blog_sidebar_pos]',
+					'choices' => array(
+								'left' => theme_locals('sidebar_left'),
+								'right' => theme_locals('sidebar_right'),
+								'none' => theme_locals('sidebar_hide'),
+								'masonry' => theme_locals('blog_masonry')),
+					'type'     => 'radio',
+					'priority' => 3
+				) );
+			}
+
+			/* Blog image size */
+			if ( isset($options['post_image_size'])) {
+				$wp_customize->add_setting( $themename.'[post_image_size]', array(
+					'default' => $options['post_image_size']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_image_size', array(
+					'label' => $options['post_image_size']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_image_size]',
+					'type' => $options['post_image_size']['type'],
+					'choices' => $options['post_image_size']['options'],
+					'priority' => 4
+				));
+			}
+
+			/* Single post image size */
+			if ( isset($options['single_image_size'])) {
+				$wp_customize->add_setting( $themename.'[single_image_size]', array(
+					'default' => $options['single_image_size']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_single_image_size', array(
+					'label' => $options['single_image_size']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[single_image_size]',
+					'type' => $options['single_image_size']['type'],
+					'choices' => $options['single_image_size']['options'],
+					'priority' => 6
+				));
+			}
+
+			/* Post Meta */
+			if ( isset($options['post_meta'])) {
+				$wp_customize->add_setting( $themename.'[post_meta]', array(
+					'default' => $options['post_meta']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_meta', array(
+					'label' => $options['post_meta']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_meta]',
+					'type' => $options['post_meta']['type'],
+					'choices' => $options['post_meta']['options'],
+					'priority' => 7
+				));
+			}
+
+			/* Post Excerpt */
+			if ( isset($options['post_excerpt'])) {
+				$wp_customize->add_setting( $themename.'[post_excerpt]', array(
+					'default' => $options['post_excerpt']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_excerpt', array(
+					'label' => $options['post_excerpt']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_excerpt]',
+					'type' => $options['post_excerpt']['type'],
+					'choices' => $options['post_excerpt']['options'],
+					'priority' => 8
+				));
+			}
+
+			/* Button text */
+			if ( isset($options['blog_button_text'])) {
+				$wp_customize->add_setting( $themename.'[blog_button_text]', array(
+					'default' => $options['blog_button_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_button_text', array(
+					'label' => $options['blog_button_text']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_button_text]',
+					'type' => 'text',
+					'priority' => 9
+				));
+			}
+
+// ---------------------------------------------------------
+// Portfolio
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_portfolio', array(
+				'title' => theme_locals('portfolio'),
+				'priority' => 204
+			));
+
+			/* Portfolio filter */
+			if ( isset($options['folio_filter']) ) {
+				$wp_customize->add_setting( $themename.'[folio_filter]', array(
+					'default' => $options['folio_filter']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_filter', array(
+					'label' => $options['folio_filter']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_filter]',
+					'type' => $options['folio_filter']['type'],
+					'choices' => $options['folio_filter']['options'],
+					'priority' => 1
+				));
+			}
+
+			/* Show Portfolio posts title? */
+			if ( isset($options['folio_title']) ) {
+				$wp_customize->add_setting( $themename.'[folio_title]', array(
+					'default' => $options['folio_title']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_title', array(
+					'label' => $options['folio_title']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_title]',
+					'type' => $options['folio_title']['type'],
+					'choices' => $options['folio_title']['options'],
+					'priority' => 2
+				));
+			}
+
+			/* Show Portfolio posts excerpt? */
+			if ( isset($options['folio_excerpt']) ) {
+				$wp_customize->add_setting( $themename.'[folio_excerpt]', array(
+					'default' => $options['folio_excerpt']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_excerpt', array(
+					'label' => $options['folio_excerpt']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_excerpt]',
+					'type' => $options['folio_excerpt']['type'],
+					'choices' => $options['folio_excerpt']['options'],
+					'priority' => 3
+				));
+			}
+
+			/* Show Portfolio posts button? */
+			if ( isset($options['folio_btn']) ) {
+				$wp_customize->add_setting( $themename.'[folio_btn]', array(
+					'default' => $options['folio_btn']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_btn', array(
+					'label' => $options['folio_btn']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_btn]',
+					'type' => $options['folio_btn']['type'],
+					'choices' => $options['folio_btn']['options'],
+					'priority' => 4
+				));
+			}
+
+			/* Button text */
+			if ( isset($options['folio_button_text']) ) {
+				$wp_customize->add_setting( $themename.'[folio_button_text]', array(
+					'default' => $options['folio_button_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_folio_button_text', array(
+					'label' => $options['folio_button_text']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_button_text]',
+					'type' => 'text',
+					'priority' => 5
+				));
+			}
+
+// ---------------------------------------------------------
+// Footer
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_footer', array(
+				'title' => theme_locals('footer'),
+				'priority' => 205
+			));
+
+			/* Footer Copyright Text */
+			if ( isset($options['footer_text']) ) {
+				$wp_customize->add_setting( $themename.'[footer_text]', array(
+					'default' => $options['footer_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_footer_text', array(
+					'label' => $options['footer_text']['name'],
+					'section' => $themename.'_footer',
+					'settings' => $themename.'[footer_text]',
+					'type' => 'text'
+				));
+			}
+		}
+	}
+
+	add_action( 'customize_preview_init', 'cherry_customize_preview_js' );
+	function cherry_customize_preview_js() {
+		wp_enqueue_script( 'cherry-customizer', OPTIONS_FRAMEWORK_DIRECTORY . 'js/theme-customizer.min.js', array( 'customize-preview' ), CHERRY_VER, true );
+	}
+
+	if ( of_get_option('main_layout') === 'fixed' ) {
+		add_action( 'wp_head', 'cherry_customizer_css' );
+		function cherry_customizer_css() { ?>
+		
+		 theme_locals("yes"),
+				"false" => theme_locals("no")
+			);
+	//yes/no array
+			$yes_no_array = array(
+				"yes" => theme_locals("yes"),
+				"no"  => theme_locals("no")
+			);
+	//filter orderby array
+			$filter_orderby_array = array(
+				'id'         => 'ID',
+				'name'       => 'Name',
+				'slug'       => 'Slug',
+				'count'      => 'Posts count',
+				);
+	//orderby array
+			$orderby_array = array(
+				'id'            => 'ID',
+				'author'        => 'Author',
+				'title'         => 'Title',
+				'name'          => 'Name (slug)',
+				'date'          => 'Date',
+				'modified'      => 'Modified',
+				'comment_count' => 'Comments',
+				'rand'          => 'Random',
+				);
+	//order array
+			$order_array = array(
+				'ASC'  => 'ASC',
+				'DESC' => 'DESC',
+				);
+	// If using image radio buttons, define a directory path
+			$imagepath = PARENT_URL . '/includes/images/';
+
+			$options = array();
+// ---------------------------------------------------------
+// General
+// ---------------------------------------------------------
+			$options["general"] = array( "name" => theme_locals('general'),
+								"type" => "heading");
+	// Background Defaults
+			$background_defaults = array(
+				'color' => '',
+				'image' => '',
+				'repeat' => 'repeat',
+				'position' => 'top center',
+				'attachment'=>'scroll'
+			);
+
+			$options['body_background'] = array( "name" =>  theme_locals('body_name'),
+								"desc" => theme_locals('body_desc'),
+								"id" => "body_background",
+								"std" => $background_defaults,
+								"type" => "background");
+
+			$main_layout_opt = array('fullwidth' => theme_locals('fullwidth'), 'fixed' => theme_locals('fixed'));
+			$options['main_layout'] = array( "name" => theme_locals('main_layout_name'),
+								"desc" => theme_locals('main_layout_desc'),
+								"id" => "main_layout",
+								"type" => "radio",
+								"std" => "fullwidth",
+								"options" => $main_layout_opt);
+
+			$options['main_background'] = array( "name" => theme_locals('main_bg_name'),
+								"desc" => theme_locals('main_bg_desc'),
+								"id" => "main_background",
+								"std" => "#fafafa",
+								"type" => "color");
+
+			$header_bg_defaults = array(
+				'color' => '',
+				'image' => '',
+				'repeat' => 'repeat',
+				'position' => 'top center',
+				'attachment'=>'scroll'
+			);
+			$options['header_background'] = array( "name" => theme_locals('header_name'),
+								"desc" => theme_locals('header_desc'),
+								"id" => "header_background",
+								"std" => $header_bg_defaults,
+								"type" => "background");
+
+			$options['links_color'] = array( "name" => theme_locals('buttons_name'),
+								"desc" => theme_locals('buttons_desc'),
+								"id" => "links_color",
+								"std" => "#0088cc",
+								"type" => "color");
+
+			$options['links_color_hover'] = array( "name" => theme_locals('links_color_hover'),
+								"desc" => theme_locals('links_color_hover_desc'),
+								"id" => "links_color_hover",
+								"std" => "",
+								"type" => "color");
+
+
+			$options['google_mixed_3'] = array( 'name' => theme_locals('body_text_name'),
+								'desc' => theme_locals('body_text_desc'),
+								'id' => 'google_mixed_3',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h1_heading'] = array( 'name' => theme_locals('h1_name'),
+								'desc' => theme_locals('h1_desc'),
+								'id' => 'h1_heading',
+								'std' => array( 'size' => '30px', 'lineheight' => '35px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h2_heading'] = array( 'name' => theme_locals('h2_name'),
+								'desc' => theme_locals('h2_desc'),
+								'id' => 'h2_heading',
+								'std' => array( 'size' => '22px', 'lineheight' => '26px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h3_heading'] = array( 'name' => theme_locals('h3_name'),
+								'desc' => theme_locals('h3_desc'),
+								'id' => 'h3_heading',
+								'std' => array( 'size' => '18px', 'lineheight' => '22px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h4_heading'] = array( 'name' => theme_locals('h4_name'),
+								'desc' => theme_locals('h4_desc'),
+								'id' => 'h4_heading',
+								'std' => array( 'size' => '14px', 'lineheight' => '20px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h5_heading'] = array( 'name' => theme_locals('h5_name'),
+								'desc' => theme_locals('h5_desc'),
+								'id' => 'h5_heading',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['h6_heading'] = array( 'name' => theme_locals('h6_name'),
+								'desc' => theme_locals('h6_desc'),
+								'id' => 'h6_heading',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#333333'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['g_search_box_id'] = array( "name" => theme_locals('search_name'),
+								"desc" => theme_locals('search_desc'),
+								"id" => "g_search_box_id",
+								"type" => "radio",
+								"std" => "yes",
+								"options" => $yes_no_array);
+
+			$options['g_breadcrumbs_id'] = array( "name" => theme_locals('breadcrumbs_name'),
+								"desc" => theme_locals('breadcrumbs_desc'),
+								"id" => "g_breadcrumbs_id",
+								"type" => "radio",
+								"std" => "yes",
+								"options" => $yes_no_array);;
+
+			$options['custom_css'] = array( "name" => theme_locals('css_name'),
+								"desc" => theme_locals('css_desc'),
+								"id" => "custom_css",
+								"std" => "",
+								"type" => "textarea");
+
+// ---------------------------------------------------------
+// Logo & Favicon
+// ---------------------------------------------------------
+
+			$options['logo_favicon'] = array( "name" => theme_locals('logo_favicon'),
+								"type" => "heading");
+	// Logo type
+			$logo_type = array(
+				"image_logo" => theme_locals("image_logo"),
+				"text_logo" => theme_locals("text_logo")
+			);
+
+			$options['logo_type'] = array( "name" => theme_locals('logo_name'),
+								"desc" => theme_locals('logo_desc'),
+								"id" => "logo_type",
+								"std" => "image_logo",
+								"type" => "radio",
+								"options" => $logo_type);
+
+			$options['logo_typography'] = array( 'name' => theme_locals('logo_t_name'),
+								'desc' => theme_locals('logo_t_desc'),
+								'id' => 'logo_typography',
+								'std' => array( 'size' => '40px', 'lineheight' => '48px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#049CDB'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['logo_url'] = array( "name" => theme_locals('logo_image_path'),
+								"desc" => theme_locals('logo_image_path_desc'),
+								"id" => "logo_url",
+								"std" => get_stylesheet_directory_uri() . "/images/logo.png",
+								"type" => "upload");
+
+			$options['favicon'] = array( "name" => theme_locals('favicon_name'),
+								"desc" => theme_locals('favicon_desc'),
+								"id" => "favicon",
+								"std" => get_stylesheet_directory_uri() . "/favicon.ico",
+								"type" => "upload");
+
+// ---------------------------------------------------------
+// Navigation
+// ---------------------------------------------------------
+
+			$options['navigation'] = array( "name" => theme_locals('navigation'),
+								"type" => "heading");
+
+			$options['menu_typography'] = array( 'name' => theme_locals('menu_t_name'),
+								'desc' => theme_locals('menu_t_desc'),
+								'id' => 'menu_typography',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#1133AA'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			$options['sf_delay'] = array( "name" => theme_locals('delay_name'),
+								"desc" => theme_locals('delay_desc'),
+								"id" => "sf_delay",
+								"std" => "1000",
+								"class" => "tiny",
+								"type" => "text");
+	// Superfish fade-in animation
+			$sf_f_animation_array = array(
+				"show" => theme_locals("enable fade-in animation"),
+				"false" => theme_locals("disable fade-in animation")
+			);
+
+			$options['sf_f_animation'] = array( "name" => theme_locals('fade_name'),
+								"desc" => theme_locals('fade_desc'),
+								"id" => "sf_f_animation",
+								"std" => "show",
+								"type" => "radio",
+								"options" => $sf_f_animation_array);
+	// Superfish slide-down animation
+			$sf_sl_animation_array = array(
+				"show" => theme_locals("enable slide-down animation"),
+				"false" => theme_locals("disable slide-down animation")
+			);
+
+			$options['sf_sl_animation'] = array( "name" => theme_locals('slide_name'),
+								"desc" => theme_locals('slide_desc'),
+								"id" => "sf_sl_animation",
+								"std" => "show",
+								"type" => "radio",
+								"options" => $sf_sl_animation_array);
+	// Superfish animation speed
+			$sf_speed_array = array(
+				"slow" => theme_locals("slow_speed"), "normal" => theme_locals("normal_speed"), "fast" => theme_locals("fast_speed"));
+
+			$options['sf_speed'] = array( "name" => theme_locals('speed_name'),
+								"desc" => theme_locals('speed_desc'),
+								"id" => "sf_speed",
+								"type" => "select",
+								"std" => "normal",
+								"class" => "tiny", //mini, tiny, small
+								"options" => $sf_speed_array);
+
+			$options['sf_arrows'] = array( "name" => theme_locals('arrows_name'),
+								"desc" => theme_locals('arrows_desc'),
+								"id" => "sf_arrows",
+								"std" => "false",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['mobile_menu_label'] = array( "name" => theme_locals('mobile_menu_name'),
+								"desc" => theme_locals('mobile_menu_desc'),
+								"id" => "mobile_menu_label",
+								"std" => theme_locals('mobile_menu_std'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['stickup_menu'] = array(
+								"name" => theme_locals('stickup_menu'),
+								"desc" => theme_locals('stickup_menu_desc'),
+								"id" => "stickup_menu",
+								"std" => "false",
+								"type" => "radio",
+								"options" => $true_false_array
+			);
+// ---------------------------------------------------------
+// Slider
+// ---------------------------------------------------------
+
+			$options['slider'] = array( "name" => theme_locals('slider'),
+								"type" => "heading");
+	// Slider type
+			$options['slider_type'] = array(
+								"name" => theme_locals('slider_type_name'),
+								"desc" => theme_locals('slider_type_desc'),
+								"id" => "slider_type",
+								"std" => "camera_slider",
+								"type" => "images",
+								"options" => array(
+									'none_slider' => $imagepath . 'slider_none.png',
+									'camera_slider' => $imagepath . 'slider_type_1.png',
+									'accordion_slider' => $imagepath . 'slider_type_2.png'),
+								"title" => array(
+									'none_slider' => theme_locals('slider_off'),
+									'camera_slider' => theme_locals('camera_slider'),
+									'accordion_slider' => theme_locals('accordion_slider')));
+
+			$options['slider_posts_orderby'] = array(
+				"name"    => theme_locals("folio_posts_orderby"),
+				"desc"    => theme_locals("folio_posts_orderby_desc"),
+				"id"      => "slider_posts_orderby",
+				"std"     => "date",
+				"type"    => "select",
+				"options" => $orderby_array
+				);
+
+			$options['slider_posts_order'] = array(
+				"name"    => theme_locals("folio_posts_order"),
+				"desc"    => theme_locals("folio_posts_order_desc"),
+				"id"      => "slider_posts_order",
+				"std"     => "ASC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+	// ---------------------------------------------------------*/
+	// Camera Slider
+	// ---------------------------------------------------------
+
+	// Slider effects
+			$sl_effect_array = array("random" => theme_locals("random"), "simpleFade" => theme_locals("simpleFade"), "curtainTopLeft" => theme_locals("curtainTopLeft"), "curtainTopRight" => theme_locals("curtainTopRight"), "curtainBottomLeft" => theme_locals("curtainBottomLeft"), "curtainBottomRight" => theme_locals("curtainBottomRight"), "curtainSliceLeft" => theme_locals("curtainSliceLeft"), "curtainSliceRight" => theme_locals("curtainSliceRight"), "blindCurtainTopLeft" => theme_locals("blindCurtainTopLeft"), "blindCurtainTopRight" => theme_locals("blindCurtainTopRight"), "blindCurtainBottomLeft" => theme_locals("blindCurtainBottomLeft"), "blindCurtainBottomRight" => theme_locals("blindCurtainBottomRight"), "blindCurtainSliceBottom" => theme_locals("blindCurtainSliceBottom"), "blindCurtainSliceTop" => theme_locals("blindCurtainSliceTop"), "stampede" => theme_locals("stampede"), "mosaic" => theme_locals("mosaic"), "mosaicReverse" => theme_locals("mosaicReverse"), "mosaicRandom" => theme_locals("mosaicRandom"), "mosaicSpiral" => theme_locals("mosaicSpiral"), "mosaicSpiralReverse" => theme_locals("mosaicSpiralReverse"), "topLeftBottomRight" => theme_locals("topLeftBottomRight"), "bottomRightTopLeft" => theme_locals("bottomRightTopLeft"), "bottomLeftTopRight" => theme_locals("bottomLeftTopRight"));
+
+			$options['sl_effect'] = array( "name" => theme_locals('effect_name'),
+								"desc" => theme_locals('effect_desc'),
+								"id" => "sl_effect",
+								"std" => "simpleFade",
+								"type" => "select",
+								"class" => "tiny slider_type_1", //mini, tiny, small
+								"options" => $sl_effect_array);
+	// Slider columns
+			$sl_columns_array = array("1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "11" => "11", "12" => "12", "13" => "13", "14" => "14", "15" => "15", "16" => "16", "17" => "17", "18" => "18", "19" => "19", "20" => "20");
+
+			$options['sl_columns'] = array( "name" => theme_locals('columns_name'),
+								"desc" => theme_locals('columns_desc'),
+								"id" => "sl_columns",
+								"std" => "6",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_columns_array);
+	// Slider rows
+			$sl_rows_array = array("1" => "1", "2" => "2", "3" => "3", "4" => "4", "5" => "5", "6" => "6", "7" => "7", "8" => "8", "9" => "9", "10" => "10", "11" => "11", "12" => "12", "13" => "13", "14" => "14", "15" => "15", "16" => "16", "17" => "17", "18" => "18", "19" => "19", "20" => "20");
+
+			$options['sl_rows'] = array( "name" => theme_locals('rows_name'),
+								"desc" => theme_locals('rows_desc'),
+								"id" => "sl_rows",
+								"std" => "6",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_rows_array);
+	// Banner effects
+			$sl_banner_array = array("moveFromLeft" => theme_locals("moveFromLeft"), "moveFromRight" => theme_locals("moveFromRight"), "moveFromTop" => theme_locals("moveFromTop"), "moveFromBottom" => theme_locals("moveFromBottom"), "fadeIn" => theme_locals("fadeIn"), "fadeFromLeft" => theme_locals("fadeFromLeft"), "fadeFromRight" => theme_locals("fadeFromRight"), "fadeFromTop" => theme_locals("fadeFromTop"), "fadeFromBottom" => theme_locals("fadeFromBottom"));
+
+			$options['sl_banner'] = array( "name" =>  theme_locals('banner_name'),
+								"desc" =>  theme_locals('banner_desc'),
+								"id" => "sl_banner",
+								"std" => "fadeFromBottom",
+								"type" => "select",
+								"class" => "tiny slider_type_1", //mini, tiny, small
+								"options" => $sl_banner_array);
+
+			$options['sl_pausetime'] = array( "name" => theme_locals('pause_name'),
+								"desc" => theme_locals('pause_desc'),
+								"id" => "sl_pausetime",
+								"std" => "7000",
+								"class" => "tiny slider_type_1",
+								"type" => "text");
+
+			$options['sl_animation_speed'] = array( "name" => theme_locals('animation_name'),
+								"desc" => theme_locals('animation_desc'),
+								"id" => "sl_animation_speed",
+								"std" => "1500",
+								"class" => "tiny slider_type_1",
+								"type" => "text");
+
+			$options['sl_slideshow'] = array( "name" => theme_locals('slideshow_name'),
+								"desc" => theme_locals('slideshow_desc'),
+								"id" => "sl_slideshow",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_thumbnails'] = array( "name" => theme_locals('thumbnails_name'),
+								"desc" => theme_locals('thumbnails_desc'),
+								"id" => "sl_thumbnails",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_control_nav'] = array( "name" => theme_locals('pagination_name'),
+								"desc" => theme_locals('pagination_desc'),
+								"id" => "sl_control_nav",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_dir_nav'] = array( "name" => theme_locals('navigation_name'),
+								"desc" => theme_locals('navigation_desc'),
+								"id" => "sl_dir_nav",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_dir_nav_hide'] = array( "name" => theme_locals('hover_name'),
+								"desc" => theme_locals('hover_desc'),
+								"id" => "sl_dir_nav_hide",
+								"std" => "false",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_play_pause_button'] = array( "name" => theme_locals('button_name'),
+								"desc" => theme_locals('button_desc'),
+								"id" => "sl_play_pause_button",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+
+			$options['sl_pause_on_hover'] = array( "name" => theme_locals('pause_on_hover_title'),
+								"desc" => theme_locals('pause_on_hover_desc'),
+								"id" => "sl_pause_on_hover",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_1",
+								"options" => $true_false_array);
+	// Slider loader
+			$sl_loader_array = array("no" => theme_locals("none"), "pie" => theme_locals("pie"), "bar" => theme_locals("bar"));
+
+			$options['sl_loader'] = array( "name" => theme_locals('loader_name'),
+								"desc" => theme_locals('loader_desc'),
+								"id" => "sl_loader",
+								"std" => "no",
+								"type" => "select",
+								"class" => "small slider_type_1", //mini, tiny, small
+								"options" => $sl_loader_array);
+	// ---------------------------------------------------------
+	// Accordion Slider
+	// ---------------------------------------------------------
+			$post_array = array();
+			$slider_post = query_posts("post_type=slider&posts_per_page=-1&post_status=publish&orderby=name&order=ASC");
+			foreach ($slider_post as $value){
+				$postID = $value -> ID;
+				$post_array[$postID] = get_the_title($postID);
+			};
+			wp_reset_query();
+
+			$options['acc_show_post'] = array( "name" => theme_locals('show_post_name'),
+					"desc" => theme_locals('show_post_desc'),
+					"id" => "acc_show_post",
+					"std" => "",
+					"type" => "multicheck",
+					"class" => "slider_type_2",
+					"options" => $post_array);
+
+			$options['acc_slideshow'] = array( "name" => theme_locals('slideshow_name'),
+								"desc" => theme_locals('slideshow_desc'),
+								"id" => "acc_slideshow",
+								"std" => "false",
+								"type" => "radio",
+								"class" => "slider_type_2",
+								"options" => $true_false_array);
+
+			$options['acc_hover_pause'] = array( "name" => theme_locals('hover_pause_name'),
+								"desc" => theme_locals('hover_pause_desc'),
+								"id" => "acc_hover_pause",
+								"std" => "true",
+								"type" => "radio",
+								"class" => "slider_type_2",
+								"options" => $true_false_array);
+
+			$options['acc_pausetime'] = array( "name" => theme_locals('pause_name'),
+								"desc" => theme_locals('pause_desc'),
+								"id" => "acc_pausetime",
+								"std" => "6000",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+
+			$options['acc_animation_speed'] = array( "name" => theme_locals('animation_name'),
+								"desc" => theme_locals('animation_desc'),
+								"id" => "acc_animation_speed",
+								"std" => "600",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+
+			// Accordion animation easing
+			$acc_easing = array("linear" => theme_locals("linear"), "easeInSine" => theme_locals("easeInSine"), "easeOutSine" => theme_locals("easeOutSine"), "easeInOutSine" => theme_locals("easeInOutSine"), "easeInQuad" => theme_locals("easeInQuad"), "easeOutQuad" => theme_locals("easeOutQuad"), "easeInOutQuad" => theme_locals("easeInOutQuad"), "easeInCubic" => theme_locals("easeInCubic"), "easeOutCubic" => theme_locals("easeOutCubic"), "easeInOutCubic" => theme_locals("easeInOutCubic"), "easeInQuart" => theme_locals("easeInQuart"), "easeOutQuart" => theme_locals("easeOutQuart"), "easeInOutQuart" => theme_locals("easeInOutQuart"), "easeInQuint" => theme_locals("easeInQuint"), "easeOutQuint" => theme_locals("easeOutQuint"), "easeInOutQuint" => theme_locals("easeInOutQuint"), "easeInExpo" => theme_locals("easeInExpo"), "easeOutExpo" => theme_locals("easeOutExpo"), "easeInOutExpo" => theme_locals("easeInOutExpo"), "easeInCirc" => theme_locals("easeInCirc"), "easeOutCirc" => theme_locals("easeOutCirc"), "easeInOutCirc" => theme_locals("easeInOutCirc"), "easeInBack" => theme_locals("easeInBack"), "easeOutBack" => theme_locals("easeOutBack"), "easeInOutBack" => theme_locals("easeInOutBack"), "easeInElastic" => theme_locals("easeInElastic"), "easeOutElastic" => theme_locals("easeOutElastic"), "easeInOutElastic" => theme_locals("easeInOutElastic"), "easeInBounce" => theme_locals("easeInBounce"), "easeOutBounce" => theme_locals("easeOutBounce"), "easeInOutBounce" => theme_locals("easeInOutBounce"));
+
+			$options['acc_easing'] = array( "name" =>  theme_locals('easing_name'),
+								"desc" =>  theme_locals('easing_desc'),
+								"id" => "acc_easing",
+								"std" => "easeOutCubic",
+								"type" => "select",
+								"class" => "tiny slider_type_2", //mini, tiny, small
+								"options" => $acc_easing);
+			// Accordion trigger
+			$acc_trigger = array("click" => theme_locals("click"), "mouseover" => theme_locals("mouseover"), "dblclick" => theme_locals("dblclick"));
+
+			$options['acc_trigger'] = array( "name" => theme_locals('trigger_name'),
+								"desc" => theme_locals('trigger_desc'),
+								"id" => "acc_trigger",
+								"std" => "mouseover",
+								"type" => "select",
+								"class" => "tiny slider_type_2", //mini, tiny, small
+								"options" => $acc_trigger);
+
+			$options['acc_starting_slide'] = array( "name" => theme_locals('starting_slide_name'),
+								"desc" => theme_locals('starting_slide_desc'),
+								"id" => "acc_starting_slide",
+								"std" => "0",
+								"class" => "tiny slider_type_2",
+								"type" => "text");
+// ---------------------------------------------------------
+// Blog
+// ---------------------------------------------------------
+
+			$options['blog'] = array( "name" => theme_locals('blog'),
+								"type" => "heading");
+
+			$options['blog_text'] = array( "name" => theme_locals('blog_name'),
+								"desc" => theme_locals('blog_desc'),
+								"id" => "blog_text",
+								"std" => theme_locals('blog'),
+								"type" => "text");
+
+			$options['blog_related'] = array( "name" => theme_locals('posts_name'),
+								"desc" => theme_locals('posts_desc'),
+								"id" => "blog_related",
+								"std" => theme_locals('posts_std'),
+								"type" => "text");
+
+			$options['blog_sidebar_pos'] = array( "name" => theme_locals('sidebar_name'),
+								"desc" => theme_locals('sidebar_option_desc'),
+								"id" => "blog_sidebar_pos",
+								"std" => "right",
+								"type" => "images",
+								"options" => array(
+									'left' => $imagepath . '2cl.png',
+									'right' => $imagepath . '2cr.png',
+									'none' => $imagepath . '1col.png',
+									'masonry' => $imagepath . 'masonry.png'),
+								"title" => array(
+									'left' => theme_locals('sidebar_left'),
+									'right' => theme_locals('sidebar_right'),
+									'none' => theme_locals('sidebar_hide'),
+									'masonry' => theme_locals('blog_masonry')
+									)
+								);
+	// Featured image size on the blog.
+			$post_image_size_array = array("normal" => theme_locals("normal_size"),"large" => theme_locals("large_size"));
+
+			$options['post_image_size'] = array( "name" => theme_locals('image_size_name'),
+								"desc" => theme_locals('image_size_desc'),
+								"id" => "post_image_size",
+								"type" => "select",
+								"std" => "large",
+								"class" => "small", //mini, tiny, small
+								"options" => $post_image_size_array);
+	// Featured image size on the single page.
+			$single_image_size_array = array("normal" => theme_locals("normal_size"),"large" => theme_locals("large_size"));
+
+			$options['single_image_size'] = array( "name" => theme_locals('single_post_image_name'),
+								"desc" => theme_locals('single_post_image_desc'),
+								"id" => "single_image_size",
+								"type" => "select",
+								"std" => "large",
+								"class" => "small", //mini, tiny, small
+								"options" => $single_image_size_array);
+
+			$options['single_share_button'] = array( "name" => theme_locals('display_share_name'),
+								"desc" => theme_locals('display_share_desc'),
+								"id" => "single_share_button",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['load_image'] = array( "name" => theme_locals('load_image_name'),
+								"desc" => theme_locals('load_image_desc'),
+								"id" => "load_image",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['post_excerpt'] = array( "name" => theme_locals('excerpt_name'),
+								"desc" => theme_locals('excerpt_desc'),
+								"id" => "post_excerpt",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['blog_button_text'] = array( "name" => theme_locals('button_text_name'),
+								"desc" => theme_locals('button_text_desc'),
+								"id" => "blog_button_text",
+								"std" => theme_locals('read_more'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['post_meta'] = array( "name" => theme_locals('meta_name'),
+								"desc" => theme_locals('meta_desc'),
+								"id" => "post_meta",
+								"std" => "line",
+								"type" => "radio",
+								"options" => array('false' => theme_locals('hide'), 'line' => theme_locals('line'), 'icon' => theme_locals('icons')));
+
+			$options['post_meta_display'] = array( "name" => theme_locals('meta_display_name'),
+								"desc" => theme_locals('meta_display_desc'),
+								"id" => "post_meta_display",
+								"std" => "only_post",
+								"type" => "radio",
+								"options" => array('only_blog' => theme_locals('only_blog'), 'only_post' => theme_locals('only_post'), 'blog_post' => theme_locals('blog_post'), 'hide' => theme_locals('hide')));
+
+			$options['post_date'] = array( "name" => theme_locals('post_date_name'),
+								"desc" => theme_locals('post_date_desc'),
+								"id" => "post_date",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_author'] = array( "name" => theme_locals('post_author_name'),
+								"desc" => theme_locals('post_author_desc'),
+								"id" => "post_author",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_permalink'] = array( "name" => theme_locals('post_permalink_name'),
+								"desc" => theme_locals('post_permalink_desc'),
+								"id" => "post_permalink",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_category'] = array( "name" => theme_locals('post_category_name'),
+								"desc" => theme_locals('post_category_desc'),
+								"id" => "post_category",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_tag'] = array( "name" => theme_locals('post_tag_name'),
+								"desc" => theme_locals('post_tag_desc'),
+								"id" => "post_tag",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_comment'] = array( "name" => theme_locals('post_comment_name'),
+								"desc" => theme_locals('post_comment_desc'),
+								"id" => "post_comment",
+								"std" => "yes",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_views'] = array( "name" => theme_locals('post_views_name'),
+								"desc" => theme_locals('post_views_desc'),
+								"id" => "post_views",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_like'] = array( "name" => theme_locals('post_like_name'),
+								"desc" => theme_locals('post_like_desc'),
+								"id" => "post_like",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['post_dislike'] = array( "name" => theme_locals('post_dislike_name'),
+								"desc" => theme_locals('post_dislike_desc'),
+								"id" => "post_dislike",
+								"std" => "no",
+								"class" => "post_meta_options",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+// ---------------------------------------------------------
+// Portfolio
+// ---------------------------------------------------------
+
+			$options['portfolio'] = array( "name" => theme_locals("portfolio"),
+								"type" => "heading");
+
+			$options['folio_filter'] = array( "name" => theme_locals("filter_name"),
+								"desc" => theme_locals("filter_desc"),
+								"id" => "folio_filter",
+								"std" => "cat",
+								"type" => "select",
+								"options" => array(
+												"cat"	=>	theme_locals("by_category"),
+												"tag"	=>	theme_locals("by_tags"),
+												"none"	=>	theme_locals("none")));
+
+			$options['folio_filter_orderby'] = array(
+				"name"    => theme_locals("folio_filter_orderby"),
+				"desc"    => theme_locals("folio_filter_orderby_desc"),
+				"id"      => "folio_filter_orderby",
+				"std"     => "name",
+				"type"    => "select",
+				"options" => $filter_orderby_array
+				);
+
+			$options['folio_filter_order'] = array(
+				"name"    => theme_locals("folio_filter_order"),
+				"desc"    => theme_locals("folio_filter_order_desc"),
+				"id"      => "folio_filter_order",
+				"std"     => "ASC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+			$options['folio_title'] = array( "name" => theme_locals("show_title_name"),
+								"desc" => theme_locals("show_title_desc"),
+								"id" => "folio_title",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_excerpt'] = array( "name" => theme_locals("show_excerpt_name"),
+								"desc" => theme_locals("show_excerpt_desc"),
+								"id" => "folio_excerpt",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_excerpt_count'] = array( "name" => theme_locals("excerpt_words_name"),
+								"desc" => theme_locals("excerpt_words_desc"),
+								"id" => "folio_excerpt_count",
+								"std" => "20",
+								"class" => "small",
+								"type" => "text");
+
+			$options['folio_btn'] = array( "name" => theme_locals("show_button_name"),
+								"desc" => theme_locals("show_button_desc"),
+								"id" => "folio_btn",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_button_text'] = array( "name" => theme_locals('folio_button_text_name'),
+								"desc" => theme_locals('folio_button_text_desc'),
+								"id" => "folio_button_text",
+								"std" => theme_locals('read_more'),
+								"class" => "tiny",
+								"type" => "text");
+
+			$options['folio_meta'] = array( "name" => theme_locals("show_meta_name"),
+								"desc" => theme_locals("show_meta_desc"),
+								"id" => "folio_meta",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['folio_lightbox'] = array( "name" => theme_locals("enable_lightbox"),
+								"desc" => theme_locals("folio_enable_lightbox_desc"),
+								"id" => "folio_lightbox",
+								"std" => "yes",
+								"type" => "radio",
+								"options" => $yes_no_array);
+
+			$options['single_folio_layout'] = array( "name" => theme_locals("single_folio_layout"),
+								"desc" => theme_locals("single_folio_layout_desc"),
+								"id" => "single_folio_layout",
+								"type" => "radio",
+								"std" => "grid",
+								"options" => array(
+												"grid" => theme_locals("grid_sp"),
+												"fullwidth" => theme_locals("fullwidth_sp")));
+
+			$options['single_gallery_layout'] = array( "name" => theme_locals("single_gallery_layout"),
+								"desc" => theme_locals("single_gallery_layout_desc"),
+								"id" => "single_gallery_layout",
+								"type" => "radio",
+								"std" => "grid",
+								"options" => array(
+												"grid" => theme_locals("grid_gallery"),
+												"masonry" => theme_locals("masonry")));
+
+			$options['layout_mode'] = array( "name" => theme_locals("layout_name"),
+								"desc" => theme_locals("layout_desc"),
+								"id" => "layout_mode",
+								"type" => "select",
+								"std" => "fitRows",
+								"class" => "small", //mini, tiny, small
+								"options" => array(
+												"fitRows" => theme_locals("fit_rows"),
+												"masonry" => theme_locals("masonry")));
+
+			$options['folio_posts_orderby'] = array(
+				"name"    => theme_locals("folio_posts_orderby"),
+				"desc"    => theme_locals("folio_posts_orderby_desc"),
+				"id"      => "folio_posts_orderby",
+				"std"     => "date",
+				"type"    => "select",
+				"options" => $orderby_array
+				);
+
+			$options['folio_posts_order'] = array(
+				"name"    => theme_locals("folio_posts_order"),
+				"desc"    => theme_locals("folio_posts_order_desc"),
+				"id"      => "folio_posts_order",
+				"std"     => "DESC",
+				"type"    => "select",
+				"options" => $order_array
+				);
+
+			$options['items_count2'] = array( "name" => theme_locals("portfolio_2_name"),
+								"desc" => theme_locals("portfolio_2_desc"),
+								"id" => "items_count2",
+								"std" => "8",
+								"class" => "small",
+								"type" => "text");
+
+			$options['items_count3'] = array( "name" => theme_locals("portfolio_3_name"),
+								"desc" => theme_locals("portfolio_3_desc"),
+								"id" => "items_count3",
+								"std" => "9",
+								"class" => "small",
+								"type" => "text");
+
+			$options['items_count4'] = array( "name" => theme_locals("portfolio_4_name"),
+								"desc" => theme_locals("portfolio_4_desc"),
+								"id" => "items_count4",
+								"std" => "12",
+								"class" => "small",
+								"type" => "text");
+
+// ---------------------------------------------------------
+// Footer
+// ---------------------------------------------------------
+
+			$options['footer'] = array( "name" => theme_locals("footer"),
+								"type" => "heading");
+
+			$options['footer_text'] = array( "name" => theme_locals("copyright_text_name"),
+								"desc" => theme_locals("copyright_text_desc"),
+								"id" => "footer_text",
+								"std" => "",
+								"type" => "textarea");
+
+			$options['ga_code'] = array( "name" => theme_locals("google_name"),
+								"desc" => theme_locals("google_desc"),
+								"id" => "ga_code",
+								"std" => "",
+								"type" => "textarea");
+
+			$options['feed_url'] = array( "name" => theme_locals("feedburner_name"),
+								"desc" => theme_locals("feedburner_desc"),
+								"id" => "feed_url",
+								"std" => "",
+								"type" => "text");
+
+			$options['footer_menu'] = array( "name" => theme_locals("footer_menu_name"),
+								"desc" => theme_locals("footer_menu_desc"),
+								"id" => "footer_menu",
+								"std" => "true",
+								"type" => "radio",
+								"options" => $true_false_array);
+
+			$options['footer_menu_typography'] = array( 'name' => theme_locals("footer_menu_typography_name"),
+								'desc' => theme_locals("footer_menu_typography_desc"),
+								'id' => 'footer_menu_typography',
+								'std' => array( 'size' => '12px', 'lineheight' => '18px', 'face' => 'Arial, Helvetica, sans-serif', 'style' => 'normal', 'character'  => 'latin', 'color' => '#0088CC'),
+								'type' => 'typography',
+								'options' => array(
+										'faces' => $typography_mixed_fonts )
+								);
+
+			return $options;
+		}
+	}
+
+// This function combined child theme options and framework options
+	if(!function_exists('combined_option_array')){
+		function combined_option_array(){
+			$child_options = optionsframework_options();
+			$framework_options = framework_options();
+			$add_child_array = array();
+			$add_child_tabs_array = array();
+			$combined_array = array();
+			$old_value_array = array();
+			foreach ($child_options as $value) {
+				foreach ($framework_options as $key => $value_2) {
+					if(array_key_exists("id", $value) && array_key_exists("id", $value_2)){
+						if(in_array($value["id"], $value_2)){
+							if(array_key_exists("std", $value)){
+								$framework_options[array_search($value_2, $framework_options)]["std"] = $value["std"];
+							}
+							if(array_key_exists("disable", $value)){
+								if($value["disable"]=="true"){
+									unset($framework_options[$key]);
+								}
+							}
+							unset($add_to_array);
+							break;
+						}else{
+							if(array_key_exists("type", $value)){
+								if($value["type"] != "heading"){
+									$add_to_array = $value;
+								}
+							}
+						}
+					}
+				}
+
+				if(isset($add_to_array)){
+					if(array_key_exists("type", $old_value_array)){
+						if($old_value_array["type"]=="heading"){
+							array_push($add_child_array, $old_value_array);
+						}
+					}
+					array_push($add_child_array, $add_to_array);
+					unset($add_to_array);
+				}
+				$old_value_array = $value;
+			}
+			$combined_array =  array_merge ($framework_options, $add_child_array);
+			return $combined_array;
+		}
+	}
+
+/**
+ * This is optional, but if you want to reuse some of the defaults
+ * or values you already have built in the options panel, you
+ * can load them into $options for easy reference
+ */
+add_action('customize_register', 'cherry_register');
+
+	if(!function_exists('cherry_register')) {
+		function cherry_register($wp_customize) {
+
+			$themename = CURRENT_THEME;
+			$options = combined_option_array();
+
+			// remove default sections
+			$wp_customize->remove_section( 'static_front_page' );
+
+			// change transport
+			$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
+			$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+
+// ------------------------------------------------------------
+// General
+// ------------------------------------------------------------
+			$wp_customize->add_section( $themename.'_general', array(
+				'title'    => theme_locals('general'),
+				'priority' => 1
+			));
+
+			if ( isset($options['body_background']) ) {
+				/* Body Background Color */
+				$wp_customize->add_setting( $themename.'[body_background][color]', array(
+					'default'   => $options['body_background']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_body_background_color', array(
+					'label'    => theme_locals('background_color'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[body_background][color]',
+					'priority' => 10
+				)));
+
+				/* Body Background Image */
+				$wp_customize->add_setting($themename.'[body_background][image]', array(
+					'default'   => $options['body_background']['std']['image'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_body_background_image', array(
+					'label'    => theme_locals('background_image'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[body_background][image]',
+					'priority' => 11
+				)));
+			}
+
+			/* Main Background Color */
+			if ( isset($options['main_background']) ) {
+				$wp_customize->add_setting( $themename.'[main_background]', array(
+					'default'   => $options['main_background']['std'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_main_background', array(
+					'label'    => $options['main_background']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[main_background]',
+					'priority' => 13
+				)));
+			}
+
+			if ( isset($options['header_background']) ) {
+				/* Header Background Color */
+				$wp_customize->add_setting( $themename.'[header_background][color]', array(
+					'default'   => $options['header_background']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_header_background_color', array(
+					'label'    => theme_locals('header_color'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[header_background][color]',
+					'priority' => 14
+				)));
+
+				/* Header Background Image */
+				$wp_customize->add_setting($themename.'[header_background][image]', array(
+					'default' => $options['header_background']['std']['image'],
+					'type'    => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_header_background_image', array(
+					'label'    => theme_locals('header_image'),
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[header_background][image]',
+					'priority' => 15
+				)));
+			}
+
+			/* Links Color */
+			if ( isset($options['links_color']) ) {
+				$wp_customize->add_setting( $themename.'[links_color]', array(
+					'default'   => $options['links_color']['std'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_links_color', array(
+					'label'    => $options['links_color']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[links_color]',
+					'priority' => 16
+				)));
+			}
+
+			/* H1 Heading font face */
+			if ( isset($options['h1_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h1_heading][face]', array(
+					'default' => $options['h1_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h1_heading', array(
+					'label'    => $options['h1_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h1_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h1_heading']['options']['faces'],
+					'priority' => 18
+				));
+			}
+
+			/* H2 Heading font face */
+			if ( isset($options['h2_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h2_heading][face]', array(
+					'default' => $options['h2_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h2_heading', array(
+					'label'    => $options['h2_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h2_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h2_heading']['options']['faces'],
+					'priority' => 19
+				));
+			}
+
+			/* H3 Heading font face */
+			if ( isset($options['h3_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h3_heading][face]', array(
+					'default' => $options['h3_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h3_heading', array(
+					'label'    => $options['h3_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h3_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h3_heading']['options']['faces'],
+					'priority' => 20
+				));
+			}
+
+			/* H4 Heading font face */
+			if ( isset($options['h4_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h4_heading][face]', array(
+					'default' => $options['h4_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h4_heading', array(
+					'label'    => $options['h4_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h4_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h4_heading']['options']['faces'],
+					'priority' => 21
+				));
+			}
+
+			/* H5 Heading font face */
+			if ( isset($options['h5_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h5_heading][face]', array(
+					'default' => $options['h5_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h5_heading', array(
+					'label'    => $options['h5_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h5_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h5_heading']['options']['faces'],
+					'priority' => 22
+				));
+			}
+
+			/* H6 Heading font face */
+			if ( isset($options['h6_heading']) ) {
+				$wp_customize->add_setting( $themename.'[h6_heading][face]', array(
+					'default' => $options['h6_heading']['std']['face'],
+					'type'    => 'option',
+				));
+				$wp_customize->add_control( $themename.'_h6_heading', array(
+					'label'    => $options['h6_heading']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[h6_heading][face]',
+					'type'     => 'select',
+					'choices'  => $options['h6_heading']['options']['faces'],
+					'priority' => 23
+				));
+			}
+
+			/* Breadcrumbs */
+			if ( isset($options['g_breadcrumbs_id']) ) {
+				$wp_customize->add_setting( $themename.'[g_breadcrumbs_id]', array(
+					'default'   => $options['g_breadcrumbs_id']['std'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_g_breadcrumbs_id', array(
+					'label'    => $options['g_breadcrumbs_id']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[g_breadcrumbs_id]',
+					'type'     => 'radio',
+					'choices'  => $options['g_breadcrumbs_id']['options'],
+					'priority' => 24
+				));
+			}
+
+			/* Search Box */
+			if ( isset($options['g_search_box_id']) ) {
+				$wp_customize->add_setting( $themename.'[g_search_box_id]', array(
+					'default'   => $options['g_search_box_id']['std'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_g_search_box_id', array(
+					'label'    => $options['g_search_box_id']['name'],
+					'section'  => $themename.'_general',
+					'settings' => $themename.'[g_search_box_id]',
+					'type'     => 'radio',
+					'choices'  => $options['g_search_box_id']['options'],
+					'priority' => 25
+				));
+			}
+
+// ---------------------------------------------------------
+// Logo
+// ---------------------------------------------------------
+			/* Logo Type */
+			if ( isset($options['logo_type']) ) {
+				$wp_customize->add_setting( $themename.'[logo_type]', array(
+					'default' => $options['logo_type']['std'],
+					'type'    => 'option'
+				));
+				$wp_customize->add_control( $themename.'_logo_type', array(
+					'label'    => $options['logo_type']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_type]',
+					'type'     => $options['logo_type']['type'],
+					'choices'  => $options['logo_type']['options'],
+					'priority' => 1
+				));
+			}
+
+			/* Logo Path */
+			if ( isset($options['logo_url']) ) {
+				$wp_customize->add_setting( $themename.'[logo_url]', array(
+					'type' => 'option'
+				));
+				$wp_customize->add_control( new WP_Customize_Image_Control( $wp_customize, $themename.'_logo_url', array(
+					'label'    => $options['logo_url']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_url]',
+					'priority' => 2
+				)));
+			}
+
+			/* Logo-text font */
+			if ( isset($options['logo_typography']) ) {
+				$wp_customize->add_setting( $themename.'[logo_typography][face]', array(
+					'default'   => $options['logo_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_logo_typography_face', array(
+					'label'    => $options['logo_typography']['name'],
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['logo_typography']['options']['faces'],
+					'priority' => 3,
+				));
+
+				/* Logo Text Color */
+				$wp_customize->add_setting( $themename.'[logo_typography][color]', array(
+					'default'   => $options['logo_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_logo_typography_color', array(
+					'label'    => theme_locals('logo_color'),
+					'section'  => 'title_tagline',
+					'settings' => $themename.'[logo_typography][color]',
+					'priority' => 4
+				)));
+			}
+
+// ---------------------------------------------------------
+// Navigation
+// ---------------------------------------------------------
+			/* Header Navigation font */
+			if ( isset($options['menu_typography']) ) {
+				$wp_customize->add_setting( $themename.'[menu_typography][face]', array(
+					'default'   => $options['menu_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_menu_typography_face', array(
+					'label'    => theme_locals('header_menu_face'),
+					'section'  => 'nav',
+					'settings' => $themename.'[menu_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['menu_typography']['options']['faces'],
+					'priority' => 11,
+				));
+
+				/* Header Navigation Color */
+				$wp_customize->add_setting( $themename.'[menu_typography][color]', array(
+					'default'   => $options['menu_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_menu_typography_color', array(
+					'label'    => theme_locals('header_menu_color'),
+					'section'  => 'nav',
+					'settings' => $themename.'[menu_typography][color]',
+					'priority' => 12
+				)));
+			}
+
+			/* Footer Navigation font */
+			if ( isset($options['footer_menu_typography']) ) {
+				$wp_customize->add_setting( $themename.'[footer_menu_typography][face]', array(
+					'default'   => $options['footer_menu_typography']['std']['face'],
+					'type'      => 'option'
+				));
+				$wp_customize->add_control( $themename.'_footer_menu_typography_face', array(
+					'label'    => theme_locals('footer_menu_face'),
+					'section'  => 'nav',
+					'settings' => $themename.'[footer_menu_typography][face]',
+					'type'     => 'select',
+					'choices'  => $options['footer_menu_typography']['options']['faces'],
+					'priority' => 13,
+				));
+
+				/* Footer Navigation Color */
+				$wp_customize->add_setting( $themename.'[footer_menu_typography][color]', array(
+					'default'   => $options['footer_menu_typography']['std']['color'],
+					'type'      => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, $themename.'_footer_menu_typography_color', array(
+					'label'    => theme_locals('footer_menu_color'),
+					'section'  => 'nav',
+					'settings' => $themename.'[footer_menu_typography][color]',
+					'priority' => 14
+				)));
+			}
+
+// ---------------------------------------------------------
+// Slider
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_slider', array(
+				'title'    => theme_locals('slider'),
+				'priority' => 200
+			));
+
+			/* Slider Type */
+			// Custom control - Layout Picker
+			if ( isset($options['slider_type'])) {
+				$wp_customize->add_setting( $themename.'[slider_type]', array(
+					'default' => $options['slider_type']['std'],
+					'type'    => 'option'
+				) );
+				$wp_customize->add_control( $themename.'_slider_type', array(
+					'label'    => $options['slider_type']['name'],
+					'section'  => $themename.'_slider',
+					'settings' => $themename.'[slider_type]',
+					'choices'  => $options['slider_type']['title'],
+					'type'     => 'radio',
+				) );
+			}
+
+// ---------------------------------------------------------
+// Blog
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_blog', array(
+				'title' => theme_locals('blog'),
+				'priority' => 203
+			));
+
+			/* Blog title */
+			if ( isset($options['blog_text'])) {
+				$wp_customize->add_setting( $themename.'[blog_text]', array(
+					'default' => $options['blog_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_text', array(
+					'label' => $options['blog_text']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_text]',
+					'type' => 'text',
+					'priority' => 1
+				));
+			}
+
+			/* Related posts title */
+			if ( isset($options['blog_related'])) {
+				$wp_customize->add_setting( $themename.'[blog_related]', array(
+					'default' => $options['blog_related']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_related', array(
+					'label' => $options['blog_related']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_related]',
+					'type' => 'text',
+					'priority' => 2
+				));
+			}
+
+			/* Blog layout */
+			// Custom control - Layout Picker
+			if ( isset($options['blog_sidebar_pos'])) {
+				$wp_customize->add_setting( $themename.'[blog_sidebar_pos]', array(
+					'default' => $options['blog_sidebar_pos']['std'],
+					'type'    => 'option'
+				) );
+				$wp_customize->add_control( $themename.'_blog_sidebar_pos', array(
+					'label'    => $options['blog_sidebar_pos']['name'],
+					'section'  => $themename.'_blog',
+					'settings' => $themename.'[blog_sidebar_pos]',
+					'choices' => array(
+								'left' => theme_locals('sidebar_left'),
+								'right' => theme_locals('sidebar_right'),
+								'none' => theme_locals('sidebar_hide'),
+								'masonry' => theme_locals('blog_masonry')),
+					'type'     => 'radio',
+					'priority' => 3
+				) );
+			}
+
+			/* Blog image size */
+			if ( isset($options['post_image_size'])) {
+				$wp_customize->add_setting( $themename.'[post_image_size]', array(
+					'default' => $options['post_image_size']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_image_size', array(
+					'label' => $options['post_image_size']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_image_size]',
+					'type' => $options['post_image_size']['type'],
+					'choices' => $options['post_image_size']['options'],
+					'priority' => 4
+				));
+			}
+
+			/* Single post image size */
+			if ( isset($options['single_image_size'])) {
+				$wp_customize->add_setting( $themename.'[single_image_size]', array(
+					'default' => $options['single_image_size']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_single_image_size', array(
+					'label' => $options['single_image_size']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[single_image_size]',
+					'type' => $options['single_image_size']['type'],
+					'choices' => $options['single_image_size']['options'],
+					'priority' => 6
+				));
+			}
+
+			/* Post Meta */
+			if ( isset($options['post_meta'])) {
+				$wp_customize->add_setting( $themename.'[post_meta]', array(
+					'default' => $options['post_meta']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_meta', array(
+					'label' => $options['post_meta']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_meta]',
+					'type' => $options['post_meta']['type'],
+					'choices' => $options['post_meta']['options'],
+					'priority' => 7
+				));
+			}
+
+			/* Post Excerpt */
+			if ( isset($options['post_excerpt'])) {
+				$wp_customize->add_setting( $themename.'[post_excerpt]', array(
+					'default' => $options['post_excerpt']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_post_excerpt', array(
+					'label' => $options['post_excerpt']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[post_excerpt]',
+					'type' => $options['post_excerpt']['type'],
+					'choices' => $options['post_excerpt']['options'],
+					'priority' => 8
+				));
+			}
+
+			/* Button text */
+			if ( isset($options['blog_button_text'])) {
+				$wp_customize->add_setting( $themename.'[blog_button_text]', array(
+					'default' => $options['blog_button_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_blog_button_text', array(
+					'label' => $options['blog_button_text']['name'],
+					'section' => $themename.'_blog',
+					'settings' => $themename.'[blog_button_text]',
+					'type' => 'text',
+					'priority' => 9
+				));
+			}
+
+// ---------------------------------------------------------
+// Portfolio
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_portfolio', array(
+				'title' => theme_locals('portfolio'),
+				'priority' => 204
+			));
+
+			/* Portfolio filter */
+			if ( isset($options['folio_filter']) ) {
+				$wp_customize->add_setting( $themename.'[folio_filter]', array(
+					'default' => $options['folio_filter']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_filter', array(
+					'label' => $options['folio_filter']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_filter]',
+					'type' => $options['folio_filter']['type'],
+					'choices' => $options['folio_filter']['options'],
+					'priority' => 1
+				));
+			}
+
+			/* Show Portfolio posts title? */
+			if ( isset($options['folio_title']) ) {
+				$wp_customize->add_setting( $themename.'[folio_title]', array(
+					'default' => $options['folio_title']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_title', array(
+					'label' => $options['folio_title']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_title]',
+					'type' => $options['folio_title']['type'],
+					'choices' => $options['folio_title']['options'],
+					'priority' => 2
+				));
+			}
+
+			/* Show Portfolio posts excerpt? */
+			if ( isset($options['folio_excerpt']) ) {
+				$wp_customize->add_setting( $themename.'[folio_excerpt]', array(
+					'default' => $options['folio_excerpt']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_excerpt', array(
+					'label' => $options['folio_excerpt']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_excerpt]',
+					'type' => $options['folio_excerpt']['type'],
+					'choices' => $options['folio_excerpt']['options'],
+					'priority' => 3
+				));
+			}
+
+			/* Show Portfolio posts button? */
+			if ( isset($options['folio_btn']) ) {
+				$wp_customize->add_setting( $themename.'[folio_btn]', array(
+					'default' => $options['folio_btn']['std'],
+					'type' => 'option'
+				));
+				$wp_customize->add_control( $themename.'_folio_btn', array(
+					'label' => $options['folio_btn']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_btn]',
+					'type' => $options['folio_btn']['type'],
+					'choices' => $options['folio_btn']['options'],
+					'priority' => 4
+				));
+			}
+
+			/* Button text */
+			if ( isset($options['folio_button_text']) ) {
+				$wp_customize->add_setting( $themename.'[folio_button_text]', array(
+					'default' => $options['folio_button_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_folio_button_text', array(
+					'label' => $options['folio_button_text']['name'],
+					'section' => $themename.'_portfolio',
+					'settings' => $themename.'[folio_button_text]',
+					'type' => 'text',
+					'priority' => 5
+				));
+			}
+
+// ---------------------------------------------------------
+// Footer
+// ---------------------------------------------------------
+			$wp_customize->add_section( $themename.'_footer', array(
+				'title' => theme_locals('footer'),
+				'priority' => 205
+			));
+
+			/* Footer Copyright Text */
+			if ( isset($options['footer_text']) ) {
+				$wp_customize->add_setting( $themename.'[footer_text]', array(
+					'default' => $options['footer_text']['std'],
+					'type' => 'option',
+					'transport' => 'postMessage'
+				));
+				$wp_customize->add_control( $themename.'_footer_text', array(
+					'label' => $options['footer_text']['name'],
+					'section' => $themename.'_footer',
+					'settings' => $themename.'[footer_text]',
+					'type' => 'text'
+				));
+			}
+		}
+	}
+
+	add_action( 'customize_preview_init', 'cherry_customize_preview_js' );
+	function cherry_customize_preview_js() {
+		wp_enqueue_script( 'cherry-customizer', OPTIONS_FRAMEWORK_DIRECTORY . 'js/theme-customizer.min.js', array( 'customize-preview' ), CHERRY_VER, true );
+	}
+
+	if ( of_get_option('main_layout') === 'fixed' ) {
+		add_action( 'wp_head', 'cherry_customizer_css' );
+		function cherry_customizer_css() { ?>
+		
+		
 		>>>>>> .r12027
 ?>
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/functions.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/functions.php
index 6485194e..f1c0a4f7 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/functions.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/functions.php
@@ -1,3 +1,3272 @@
+<<<<<<< .mine
+ '#000000',
+		'bodyBackground' => '#000000',
+		'baseFontFamily' => '#000000',
+		'baseFontSize'   => '#000000',
+		'baseLineHeight' => '#000000',
+		'linkColor'      => '#000000',
+		'linkColorHover' => '#000000',
+		'mainBackground' => '#ffffff'
+		);
+
+	/**
+	*
+	* JS global variables
+	*
+	**/
+	function cherry_js_global_variables(){
+		$output = "";
+		echo $output;
+	}
+	add_action('wp_head', 'cherry_js_global_variables');
+	add_action('admin_head', 'cherry_js_global_variables');
+
+	/**
+	*
+	* Definition current theme
+	*
+	**/
+	function getCurrentTheme() {
+		if ( function_exists('wp_get_theme') ) {
+			$theme = wp_get_theme();
+			if ( $theme->exists() ) {
+				$theme_name = $theme->Name;
+			}
+		} else {
+			$theme_name = get_current_theme();
+		}
+		$theme_name = preg_replace("/\W/", "_", strtolower($theme_name) );
+		return $theme_name;
+	}
+
+	/**
+	*
+	* Definition theme version
+	* @param string $theme_name Directory name for the theme
+	*
+	**/
+	function cherry_get_theme_version($theme_name) {
+		if ( function_exists('wp_get_theme') ) {
+			$theme = wp_get_theme($theme_name);
+			if ( $theme->exists() ) {
+				$theme_ver = $theme->Version;
+			}
+		} else {
+			$theme_data = get_theme_data( get_theme_root() . '/' . $theme_name . '/style.css' );
+			$theme_ver  = $theme_data['Version'];
+		}
+		return $theme_ver;
+	}
+
+	/**
+	*
+	* Comment some value from variables.less
+	*
+	**/
+	if ( CURRENT_THEME != 'cherry' )
+		add_action('cherry_activation_hook', 'comment_child_var');
+
+	function comment_child_var() {
+		global $variablesArray;
+
+		$file = CHILD_DIR .'/bootstrap/less/variables.less';
+
+		if ( file_exists($file) ) {
+			$allVariablessArray = file($file);
+
+			foreach ($variablesArray as $key => $value) {
+				foreach ($allVariablessArray as $k => $v) {
+					$pos = strpos($v, $key);
+					if ( $pos!==false && $pos == 1 ) {
+						$allVariablessArray[$k] = '// ' . $v;
+						break;
+					}
+				}
+			}
+			file_put_contents($file, $allVariablessArray);
+		}
+	}
+
+	/**
+	 * Helper function to return the theme option value.
+	 * If no value has been saved, it returns $default.
+	 * Needed because options are saved as serialized strings.
+	 **/
+	if ( !function_exists( 'of_get_option' ) ) {
+		function of_get_option($name, $default = false) {
+
+			$optionsframework_settings = get_option('optionsframework');
+
+			// Gets the unique option id
+			$option_name = $optionsframework_settings['id'];
+
+			if ( get_option($option_name) ) {
+				$options = get_option($option_name);
+			}
+
+			if ( isset($options[$name]) ) {
+				return $options[$name];
+			} else {
+				return $default;
+			}
+		}
+	}
+
+	/**
+	*
+	* Unlink less cache files
+	*
+	**/
+	add_action('cherry_activation_hook', 'clean_less_cache');
+
+	function clean_less_cache() {
+		if ( CURRENT_THEME == 'cherry' ) {
+			$bootstrapInput	= PARENT_DIR .'/less/bootstrap.less';
+			$themeInput		= PARENT_DIR .'/less/style.less';
+		} else {
+			$bootstrapInput	= CHILD_DIR .'/bootstrap/less/bootstrap.less';
+			$themeInput		= CHILD_DIR .'/style.less';
+		}
+
+		$cacheFile1 = $bootstrapInput.".cache";
+		$cacheFile2 = $themeInput.".cache";
+		if (file_exists($cacheFile1)) unlink($cacheFile1);
+		if (file_exists($cacheFile2)) unlink($cacheFile2);
+	}
+
+	if ( (is_admin() && ($pagenow == "themes.php")) && FILE_WRITEABLE ) {
+		do_action('cherry_activation_hook');
+	}
+
+	if ( !function_exists('cherry_theme_setup')) {
+		function cherry_theme_setup() {
+
+			//Loading theme textdomain
+			load_theme_textdomain( CURRENT_THEME, PARENT_DIR . '/languages' );
+
+			//Localization functions
+			include_once (PARENT_DIR . '/includes/locals.php');
+
+			//Plugin Activation
+			include_once (CHILD_DIR . '/includes/register-plugins.php');
+
+			//Setup MotoPress
+			include_once (PARENT_DIR . '/includes/register-motopress.php');
+
+			//Include shop
+			if ( file_exists(get_stylesheet_directory().'/shop.php') ) {
+				include_once (CHILD_DIR . '/shop.php');
+			}
+		}
+		add_action('after_setup_theme', 'cherry_theme_setup');
+	}
+
+	//WPML compatibility
+	//WPML filter for correct posts IDs for the current language Solution
+	if ( function_exists( 'wpml_get_language_information' )) {
+		update_option('suppress_filters', 0);
+	} else {
+		update_option('suppress_filters', 1);
+	}
+	//Register text for translation
+	function cherry_wpml_translate_filter( $value, $name ) {
+		return icl_translate( 'cherry', $name, $value );
+	}
+	//Check if WPML is activated
+	if ( function_exists( 'icl_translate' ) ) {
+		add_filter( 'cherry_text_translate', 'cherry_wpml_translate_filter', 10, 2 );
+	}
+
+	//Loading Custom function
+	include_once (CHILD_DIR . '/includes/custom-function.php');
+
+	//Loading jQuery and Scripts
+	include_once (PARENT_DIR . '/includes/theme-scripts.php');
+
+	//Sidebar
+	include_once (CHILD_DIR . '/includes/sidebar-init.php');
+
+	//Theme initialization
+	include_once (CHILD_DIR . '/includes/theme-init.php');
+
+	//Additional function
+	include_once (PARENT_DIR . '/includes/theme-function.php');
+
+	//Aqua Resizer for image cropping and resizing on the fly
+	include_once (PARENT_DIR . '/includes/aq_resizer.php');
+
+	//Add the pagemeta
+	include_once (PARENT_DIR . '/includes/theme-pagemeta.php');
+
+	//Add the postmeta
+	include_once (PARENT_DIR . '/includes/theme-postmeta.php');
+
+	//Add the postmeta to Portfolio posts
+	include_once (PARENT_DIR . '/includes/theme-portfoliometa.php');
+
+	//Add the postmeta to Slider posts
+	include_once (PARENT_DIR . '/includes/theme-slidermeta.php');
+
+	//Add the postmeta to Testimonials
+	include_once (PARENT_DIR . '/includes/theme-testimeta.php');
+
+	//Add the postmeta to Our Team posts
+	include_once (PARENT_DIR . '/includes/theme-teammeta.php');
+
+	//Loading options.php for theme customizer
+	include_once (CHILD_DIR . '/options.php');
+	include_once (PARENT_DIR . '/framework_options.php');
+
+	//Framework Data Management
+	include_once (PARENT_DIR . '/admin/data_management/data_management_interface.php');
+
+	//SEO Settings
+	include_once (PARENT_DIR . '/admin/seo/seo_settings_page.php');
+
+	//WP Pointers
+	include_once (PARENT_DIR . '/includes/class.wp-help-pointers.php');
+
+	//Embedding LESS compile
+	if ( !class_exists('lessc') ) {
+		include_once (PARENT_DIR .'/includes/lessc.inc.php');
+	}
+	include_once (PARENT_DIR .'/includes/less-compile.php');
+
+	// Olark Live Chat.
+	if ( is_child_theme() && file_exists( CHILD_DIR . '/includes/live-chat.php' ) ) {
+		include_once ( CHILD_DIR . '/includes/live-chat.php' );
+	} else {
+		include_once ( PARENT_DIR . '/includes/live-chat.php' );
+	}
+
+	// TM Live Chat.
+	if ( 'yes' == of_get_option( 'tm_live_chat', 'yes' ) ) {
+		include_once ( PARENT_DIR . '/includes/tm-chat/class-cherry-tm-chat.php' );
+	}
+
+	// removes detailed login error information for security
+	add_filter('login_errors',create_function('$a', "return null;"));
+
+	/*
+	 * Loads the Options Panel
+	 *
+	 * If you're loading from a child theme use stylesheet_directory
+	 * instead of template_directory
+	 */
+	if ( !function_exists( 'optionsframework_init' ) ) {
+		define( 'OPTIONS_FRAMEWORK_DIRECTORY', PARENT_URL . '/admin/' );
+		include_once dirname( __FILE__ ) . '/admin/options-framework.php';
+	}
+
+	/*
+	 * Removes Trackbacks from the comment count
+	 *
+	 */
+	if ( !function_exists('comment_count') ) {
+		add_filter('get_comments_number', 'comment_count', 0);
+
+		function comment_count( $count ) {
+			if ( ! is_admin() ) {
+				global $id;
+				$args = 'status=approve&post_id=' . $id;
+				$comments = get_comments( $args, ARRAY_A );
+				$comments_by_type = separate_comments( $comments );
+				return count($comments_by_type['comment']);
+			} else {
+				return $count;
+			}
+		}
+	}
+
+	/*
+	 * Post Formats
+	 *
+	 */
+	$formats = array(
+				'aside',
+				'gallery',
+				'link',
+				'image',
+				'quote',
+				'audio',
+				'video');
+	add_theme_support( 'post-formats', $formats );
+	add_post_type_support( 'post', 'post-formats' );
+
+	/*
+	 * Custom excpert length
+	 *
+	 */
+	if(!function_exists('new_excerpt_length')) {
+
+		function new_excerpt_length($length) {
+			return 60;
+		}
+		add_filter('excerpt_length', 'new_excerpt_length');
+	}
+
+	add_filter( 'the_excerpt', 'do_shortcode' );
+	// enable shortcodes in sidebar
+	add_filter('widget_text', 'do_shortcode');
+
+	// custom excerpt ellipses for 2.9+
+	if(!function_exists('custom_excerpt_more')) {
+
+		function custom_excerpt_more($more) {
+			return theme_locals("read_more").' »';
+		}
+		add_filter('excerpt_more', 'custom_excerpt_more');
+	}
+
+	// no more jumping for read more link
+	if(!function_exists('no_more_jumping')) {
+
+		function no_more_jumping($post) {
+			return ' '.theme_locals("continue_reading").'';
+		}
+		add_filter('excerpt_more', 'no_more_jumping');
+	}
+
+	// category id in body and post class
+	if(!function_exists('category_id_class')) {
+
+		function category_id_class($classes) {
+			global $post;
+			foreach((get_the_category()) as $category)
+				$classes [] = 'cat-' . $category->cat_ID . '-id';
+				return $classes;
+		}
+		add_filter('post_class', 'category_id_class');
+		add_filter('body_class', 'category_id_class');
+	}
+
+	// Threaded Comments
+	if(!function_exists('enable_threaded_comments')) {
+		function enable_threaded_comments() {
+			if (!is_admin()) {
+				if (is_singular() AND comments_open() AND (get_option('thread_comments') == 1)) {
+					wp_enqueue_script('comment-reply');
+				}
+			}
+		}
+		add_action('get_header', 'enable_threaded_comments');
+	}
+
+	//remove auto loading rel=next post link in header
+	remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
+
+
+	// WP Pointers
+	if (!function_exists('myHelpPointers')) {
+		add_action('admin_enqueue_scripts', 'myHelpPointers');
+
+		function myHelpPointers() {
+			//First we define our pointers
+			$pointers = array(
+				array(
+					'id'       => 'xyz1', // unique id for this pointer
+					'screen'   => 'themes', // this is the page hook we want our pointer to show on
+					'target'   => '#toplevel_page_options-framework', // the css selector for the pointer to be tied to, best to use ID's
+					'title'    => theme_locals("import_sample_data"),
+					'content'  => theme_locals("import_sample_data_desc"),
+					'position' => array(
+										'edge'   => 'left', //top, bottom, left, right
+										'align'  => 'left', //top, bottom, left, right, middle
+										)
+					),
+				array(
+					'id'       => 'xyz2', // unique id for this pointer
+					'screen'   => 'toplevel_page_options-framework', // this is the page hook we want our pointer to show on
+					'target'   => '#toplevel_page_cherry-plugin-page', // the css selector for the pointer to be tied to, best to use ID's
+					'title'    => theme_locals("import_sample_data"),
+					'content'  => theme_locals("import_sample_data_desc"),
+					'position' => array(
+										'edge'   => 'left', //top, bottom, left, right
+										'align'  => 'left', //top, bottom, left, right, middle
+										)
+					)
+				// more as needed
+			);
+
+			//Now we instantiate the class and pass our pointer array to the constructor
+			$myPointers = new WP_Help_Pointer($pointers);
+		};
+	}
+
+	/*
+	 * Navigation with description
+	 *
+	 */
+	if (! class_exists('description_walker')) {
+		class description_walker extends Walker_Nav_Menu {
+			function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+				global $wp_query;
+				$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+
+				$class_names = $value = '';
+
+				$classes = empty( $item->classes ) ? array() : (array) $item->classes;
+
+				$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) );
+				$class_names = ' class="'. esc_attr( $class_names ) . '"';
+
+				$output .= $indent . '';
+
+				// $attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : '';
+				// $attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : '';
+				// $attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
+				// $attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
+
+				$atts = array();
+				$atts['title']  = ! empty( $item->attr_title ) ? $item->attr_title : '';
+				$atts['target'] = ! empty( $item->target )     ? $item->target     : '';
+				$atts['rel']    = ! empty( $item->xfn )        ? $item->xfn        : '';
+				$atts['href']   = ! empty( $item->url )        ? $item->url        : '';
+
+				/**
+				 * Filter the HTML attributes applied to a menu item's .
+				 *
+				 * @since 3.6.0
+				 *
+				 * @see wp_nav_menu()
+				 *
+				 * @param array $atts {
+				 *     The HTML attributes applied to the menu item's , empty strings are ignored.
+				 *
+				 *     @type string $title  Title attribute.
+				 *     @type string $target Target attribute.
+				 *     @type string $rel    The rel attribute.
+				 *     @type string $href   The href attribute.
+				 * }
+				 * @param object $item The current menu item.
+				 * @param array  $args An array of wp_nav_menu() arguments.
+				 */
+				$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
+
+				$attributes = '';
+				foreach ( $atts as $attr => $value ) {
+					if ( ! empty( $value ) ) {
+						$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+						$attributes .= ' ' . $attr . '="' . $value . '"';
+					}
+				}
+
+				$description  = ! empty( $item->description ) ? ''.esc_attr( $item->description ).'' : '';
+
+				if($depth != 0) {
+					$description = $append = $prepend = "";
+				}
+
+				$item_output = $args->before;
+				$item_output .= '';
+				$item_output .= $args->link_before;
+
+				if (isset($prepend))
+					$item_output .= $prepend;
+
+				$item_output .= apply_filters( 'the_title', $item->title, $item->ID );
+
+				if (isset($append))
+					$item_output .= $append;
+
+				$item_output .= $description.$args->link_after;
+				$item_output .= '';
+				$item_output .= $args->after;
+
+				$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
+			}
+		}
+	}
+
+	/*
+	 * Cherry update
+	 */
+	$cherryTemplates = array(
+		'404.php',
+		'archive.php',
+		'author.php',
+		'category.php',
+		'index.php',
+		'page.php',
+		'page-archives.php',
+		'page-faq.php',
+		'page-fullwidth.php',
+		'page-home.php',
+		'page-Portfolio2Cols-filterable.php',
+		'page-Portfolio3Cols-filterable.php',
+		'page-Portfolio4Cols-filterable.php',
+		'page-testi.php',
+		'search.php',
+		'single.php',
+		'single-portfolio.php',
+		'single-team.php',
+		'single-testi.php',
+		'tag.php'
+	);
+
+	$headerFooterPattern = '/(\.*?\<\/header\>|\.*?\<\/footer\>)/is';
+
+	if (is_user_logged_in() && current_user_can('update_themes')) {
+		$updateErrors = array();
+
+		$oldCherryVersion = get_option('cherry_version', '1.0');
+		$currentCherryVersion = getCherryVersion($updateErrors);
+		$cherryV2 = '2.0';
+		$cherryForceUpdate = (bool) get_option('cherry_force_update', false);
+
+		if (version_compare($oldCherryVersion, $cherryV2) == -1 || $cherryForceUpdate) {
+			writeLog(PHP_EOL . date('Y-m-d H:i:s'));
+			writeLog('Old CherryFramework version: ' . $oldCherryVersion);
+			writeLog('Current CherryFramework version: ' . $currentCherryVersion);
+			writeLog('Force update: ' . (int) $cherryForceUpdate);
+
+			cherryUpdate($cherryTemplates, $headerFooterPattern, $updateErrors);
+			//changeChildTheme
+			changeChildTheme($updateErrors);
+			//end changeChildTheme
+			if (empty($updateErrors)) {
+				update_option('cherry_version', $currentCherryVersion);
+				update_option('cherry_force_update', 0);
+			}
+		}
+	}
+
+	function getCherryVersion(&$updateErrors) {
+		$style = PARENT_DIR . '/style.css';
+		$themeVersion = 0;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme(get_option('template', 'CherryFramework'));
+			if (file_exists($style) && $theme->exists()) {
+				$themeVersion = $theme->Version;
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			if (file_exists($style)) {
+				$theme = get_theme_data($style);
+				$themeVersion = $theme['Version'];
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		} else {
+			if (file_exists($style)) {
+				$content = file_get_contents($style);
+				if ($content) {
+					$pattern = '/\s*version\s*:\s*([^\n]+)\s*/is';
+					preg_match($pattern, $content, $matches);
+					if (!empty($matches[1])) {
+						$themeVersion = trim($matches[1]);
+					}
+				} else {
+					$updateErrors[] = 'Failed to read ' . $style;
+					writeLog('Failed to read ' . $style);
+				}
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		}
+		return $themeVersion;
+	}
+
+	function isCherryChildTheme($themePath, $name, &$updateErrors) {
+		$style = $themePath . '/style.css';
+		$themeTemplate = false;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme($name);
+			if ($theme->exists()) {
+				if ($theme->Stylesheet != $theme->Template) {
+					$themeTemplate = $theme->Template;
+				}
+			} else {
+				$updateErrors[] = 'Theme ' . $theme->Name . ' does not exist';
+				writeLog('Theme ' . $theme->Name . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			$theme = get_theme_data($style);
+			$themeTemplate = $theme['Template'];
+		} else {
+			$content = file_get_contents($style);
+			if ($content) {
+				$pattern = '/\s*template\s*:\s*([^\n]+)\s*/is';
+				preg_match($pattern, $content, $matches);
+				if (!empty($matches[1])) {
+					$themeTemplate = trim($matches[1]);
+				}
+			} else {
+				$updateErrors[] = 'Failed to read ' . $style;
+				writeLog('Failed to read ' . $style);
+			}
+		}
+		return ($themeTemplate == 'CherryFramework') ? true : false;
+	}
+
+	function getHeaderFooterCode($headerFooterPattern) {
+		$headerFooter = array('header', 'footer');
+		$headerFooterCode = array('header' => null, 'footer' => null);
+
+		foreach ($headerFooter as $name) {
+			$filePath = PARENT_DIR . '/' . $name . '.php';
+			if (file_exists($filePath)) {
+				$content = file_get_contents($filePath);
+				if ($content) {
+					$matchesCount = preg_match($headerFooterPattern, $content, $matches);
+					if ($matchesCount == 1 && !empty($matches[0])) {
+						$headerFooterCode[$name] = $matches[0];
+					} else {
+						$updateErrors[] = 'header|footer code not found in ' . $filePath;
+						writeLog('header|footer code not found in ' . $filePath);
+					}
+				} else {
+					$updateErrors[] = 'Failed to read ' . $filePath;
+					writeLog('Failed to read ' . $filePath);
+				}
+			} else {
+				$updateErrors[] = $filePath . ' does not exist';
+				writeLog($filePath . ' does not exist');
+			}
+		}
+
+		return $headerFooterCode;
+	}
+
+	function backupFile($templatePath) {
+		return copy($templatePath, $templatePath . '.bak');
+	}
+
+	function writeLog($message) {
+		$logFile = PARENT_DIR . '/update.log';
+		if (is_writable(PARENT_DIR)) {
+			file_put_contents($logFile, $message . PHP_EOL, FILE_APPEND);
+		}
+	}
+
+	function cherryUpdate($cherryTemplates, $headerFooterPattern, &$updateErrors) {
+		$themesPath = get_theme_root();
+
+		$skip = array('.', '..', 'CherryFramework', 'twentytwelve', 'twentyeleven', 'twentyten', 'index.php');
+		$themes = array_diff(scandir($themesPath), $skip);
+
+		if (!empty($themes)) {
+			foreach ($themes as $theme) {
+				$themePath = $themesPath . '/' . $theme;
+				if (is_dir($themePath) && file_exists($themePath . '/style.css')) {
+
+					$isCherryChildTheme = isCherryChildTheme($themePath, $theme, $updateErrors);
+
+					if ($isCherryChildTheme) {
+						if (is_writable($themePath)) {
+							writeLog(PHP_EOL . 'Child theme: ' . $themePath);
+							$files = scandir($themePath);
+							$themeTemplates = array_intersect($files, $cherryTemplates);
+							if (!empty($themeTemplates)) {
+								foreach ($themeTemplates as $template) {
+									$templatePath = $themePath . '/' . $template;
+									if (is_writable($templatePath)) {
+										$content = file_get_contents($templatePath);
+										if ($content) {
+											$headerFooterMatchesCount = preg_match_all($headerFooterPattern, $content, $headerFooterMatches);
+											if ($headerFooterMatchesCount > 0) {
+												$backupFile = backupFile($templatePath);
+												if ($backupFile) {
+													writeLog('Backup ' . $templatePath);
+
+													$content = preg_replace($headerFooterPattern, '', $content, -1, $headerFooterReplaceCount);
+													if (!is_null($content) && $headerFooterReplaceCount > 0) {
+														writeLog('Replace ' . $headerFooterReplaceCount . ' header|footer');
+
+														if (file_put_contents($templatePath, $content)) {
+															writeLog('Save ' . $templatePath);
+														} else {
+															$updateErrors[] = 'Failed to save ' . $templatePath;
+															writeLog('Failed to save ' . $templatePath);
+														}
+													}
+												} else {
+													$updateErrors[] = 'Failed to backup ' . $templatePath;
+													writeLog('Failed to backup ' . $templatePath);
+												}
+											}
+										} else {
+											$updateErrors[] = 'Failed to read ' . $templatePath;
+											writeLog('Failed to read ' . $templatePath);
+										}
+									} else {
+										$updateErrors[] = $templatePath . ' is not writable';
+										writeLog($templatePath . ' is not writable');
+									}
+								}
+							}
+
+							$headerFooter = array_intersect($files, array('header.php', 'footer.php'));
+							if (!empty($headerFooter)) {
+								$headerFooterCode = getHeaderFooterCode($headerFooterPattern);
+								if (!is_null($headerFooterCode['header']) && !is_null($headerFooterCode['footer'])) {
+									foreach ($headerFooter as $file) {
+										$filePath = $themePath . '/' . $file;
+										if (is_writable($filePath)) {
+											$content = file_get_contents($filePath);
+											if ($content) {
+												$headerFooterMatchesCount = preg_match_all($headerFooterPattern, $content, $headerFooterMatches);
+												if ($headerFooterMatchesCount === 0) {
+													$backupFile = backupFile($filePath);
+													if ($backupFile) {
+														writeLog('Backup ' . $filePath);
+
+														if ($file == 'header.php') {
+															$content .= $headerFooterCode['header'];
+														} elseif ($file == 'footer.php') {
+															$content = $headerFooterCode['footer'] . $content;
+														}
+
+														writeLog('Add header|footer code in ' . $filePath);
+
+														if (file_put_contents($filePath, $content)) {
+															writeLog('Save ' . $filePath);
+														} else {
+															$updateErrors[] = 'Failed to save ' . $filePath;
+															writeLog('Failed to save ' . $filePath);
+														}
+													} else {
+														$updateErrors[] = 'Failed to backup ' . $filePath;
+														writeLog('Failed to backup ' . $filePath);
+													}
+												}
+											} else {
+												$updateErrors[] = 'Failed to read ' . $filePath;
+												writeLog('Failed to read ' . $filePath);
+											}
+										} else {
+											$updateErrors[] = $filePath . ' is not writable';
+											writeLog($filePath . ' is not writable');
+										}
+									}
+								}
+							}
+						} else {
+							$updateErrors[] = $themePath . ' is not writable';
+							writeLog($themePath . ' is not writable');
+						}
+					}
+				}
+			}
+		}
+	}
+//changeChildTheme
+	function changeChildTheme(&$updateErrors){
+		$themesPath = get_theme_root();
+
+		$skip = array('.', '..', 'CherryFramework', 'twentytwelve', 'twentyeleven', 'twentyten', 'index.php');
+		$themes = array_diff(scandir($themesPath), $skip);
+
+		if (!empty($themes)) {
+			foreach ($themes as $theme) {
+				$themePath = $themesPath . '/' . $theme;
+				if (is_dir($themePath) && file_exists($themePath . '/style.css')) {
+
+					$isCherryChildTheme = isCherryChildTheme($themePath, $theme, $updateErrors);
+
+					if ($isCherryChildTheme) {
+						if (is_writable($themePath)) {
+							unset($slider_in_header, $slider_in_page_home, $pahe_home_content);
+							writeLog(PHP_EOL . 'Child theme: ' . $themePath);
+							$files = scandir($themePath);
+							$header_php = array_intersect($files, array('header.php'));
+							if (!empty($header_php)) {
+								$templatePath = $themePath . '/header.php';
+								$content = file_get_contents($templatePath);
+								if (stripos($content, '"static/static-slider"')!==false) {
+									$slider_in_header = true;
+								}
+							}
+							if(!isset($slider_in_header)){
+								if (is_dir($themePath."/wrapper")){
+									$nestedFiles = scandir($themePath."/wrapper");
+									$header_wrapper_php = array_intersect($nestedFiles, array('wrapper-header.php'));
+									if (!empty($header_wrapper_php)) {
+										$header_wrapper_php_path = $themePath . '/wrapper/wrapper-header.php';
+										$content = file_get_contents($header_wrapper_php_path);
+										if (stripos($content, '"static/static-slider"')!==false) {
+											$slider_in_header = true;
+										}
+									}
+								}
+							}
+							if(!isset($slider_in_header)){
+								$page_home_php = array_intersect($files, array('page-home.php'));
+								if (!empty($page_home_php)) {
+									$templatePath = $themePath . '/page-home.php';
+									$content = file($templatePath);
+									for ($i=0, $arrayCount = count($content); $i < $arrayCount ; $i++) {
+										if(stripos($content[$i], '"static/static-slider"')!==false){
+											$slider_in_page_home = $i;
+										}
+										if(stripos($content[$i], '"page-home.php"')!==false){
+											$pahe_home_content = $i;
+										}
+									}
+									if(!isset($slider_in_page_home)){
+										array_splice($content, $pahe_home_content+1, 0, "\t\n\t\t\n\t\t\t\n\t\t
\n\t\n");
+										writeLog('Change page-home.php');
+										if (file_put_contents($templatePath, $content)) {
+											writeLog('Save ' . $templatePath);
+										} else {
+											$updateErrors[] = 'Failed to save ' . $templatePath;
+											writeLog('Failed to save ' . $templatePath);
+										}
+									}
+								}
+							}
+							$stylesheet = array_intersect($files, array('style.css'));
+							$stylePath = $themePath . '/style.css';
+							if (!empty($stylesheet)) {
+								$styleContent = file($stylePath);
+								if ($styleContent) {
+									for ($i=0, $arrayCount = count($styleContent); $i < $arrayCount ; $i++) {
+										if(stripos($styleContent[$i], "/*--")!==false){
+											$styleContentChange = array();
+										}
+										if(isset($styleContentChange)){
+											$styleContentChange[$i] = $styleContent[$i];
+										}
+										if(stripos($styleContent[$i], "--*/")!==false){
+											break;
+										}
+									}
+									array_push($styleContentChange, "\n/* ----------------------------------------\n\tPlease, You may put custom CSS here\n---------------------------------------- */\n");
+									if (file_put_contents($stylePath, $styleContentChange)) {
+										writeLog('Save ' . $stylePath);
+									} else {
+										$updateErrors[] = 'Failed to save ' . $stylePath;
+										writeLog('Failed to save ' . $stylePath);
+									}
+								} else {
+									$updateErrors[] = 'Failed to read ' . $stylesheet;
+									writeLog('Failed to read ' . $stylesheet);
+								}
+							}
+							if (is_dir($themePath."/static")){
+								$nestedFiles = scandir($themePath."/static");
+								$staticSlider = array_intersect($nestedFiles, array('static-slider.php'));
+								$staticSliderPath = $themePath . '/static/static-slider.php';
+								unset($sliderStatic, $new_function);
+								if (!empty($staticSlider)) {
+									$backupFileStatic = backupFile($staticSliderPath);
+									if ($backupFileStatic) {
+											$staticSliderContent = file($staticSliderPath);
+											if ($staticSliderContent) {
+												$static_slider_dom_1 = "\n";
+												$static_slider_dom_2 = "\t\n";
+												$static_slider_dom_3 = "\n\n\t
\n\n";
+												for ($i=0, $arrayCount = count($staticSliderContent); $i < $arrayCount ; $i++) {
+													if(stripos($staticSliderContent[$i], "get_template_part('slider')")!==false){
+														$sliderStatic = $i;
+													}
+													if(stripos($staticSliderContent[$i], "get_slider_template_part")!==false){
+														$new_function = $i;
+													}
+												}
+												if(!isset($sliderStatic) && !isset($new_function)){
+													$staticSliderContent = "\n\n\t\n\t\t\n\t\t\t\n\t\t
\n\t
\n\n\t
\n";
+												}else{
+													if(!isset($new_function)){
+														$staticSliderContent[$sliderStatic] = $static_slider_dom_2;
+														array_splice($staticSliderContent, 1, 0, $static_slider_dom_1);
+														array_push($staticSliderContent, $static_slider_dom_3);
+													}
+												}
+												if (file_put_contents($staticSliderPath, $staticSliderContent)) {
+													writeLog('Save ' . $staticSliderPath);
+												} else {
+													$updateErrors[] = 'Failed to save ' . $staticSliderPath;
+													writeLog('Failed to save ' . $staticSliderPath);
+												}
+											} else {
+												$updateErrors[] = 'Failed to read ' . $staticSlider;
+												writeLog('Failed to read ' . $staticSlider);
+											}
+
+									}else {
+										$updateErrors[] = 'Failed to backup ' . $staticSliderPath;
+										writeLog('Failed to backup ' . $staticSliderPath);
+									}
+								}
+							}
+						} else {
+							$updateErrors[] = $themePath . ' is not writable';
+							writeLog($themePath . ' is not writable');
+						}
+					}
+				}
+			}
+		}
+	};
+//end changeChildTheme
+	if (has_action('after_switch_theme')) {
+		add_action('after_switch_theme', 'activateCherryForceUpdate', 10, 0);
+	} else {
+		if (is_admin() && isset($_GET['activated']) && $pagenow == 'themes.php') {
+			activateCherryForceUpdate();
+		}
+	}
+
+	function activateCherryForceUpdate() {
+		global $cherryTemplates;
+		global $headerFooterPattern;
+
+		$style = CHILD_DIR . '/style.css';
+		$themeTemplate = false;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme();
+			if (file_exists($style) && $theme->exists()) {
+				if ($theme->Stylesheet != $theme->Template) {
+					$themeTemplate = $theme->Template;
+				}
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			if (file_exists($style)) {
+				$theme = get_theme_data($style);
+				$themeTemplate = $theme['Template'];
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		} else {
+			if (file_exists($style)) {
+				$content = file_get_contents($style);
+				if ($content) {
+					$pattern = '/\s*template\s*:\s*([^\n]+)\s*/is';
+					preg_match($pattern, $content, $matches);
+					if (!empty($matches[1])) {
+						$themeTemplate = trim($matches[1]);
+					}
+				} else {
+					writeLog('Failed to read ' . $style);
+				}
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		}
+
+		if ($themeTemplate == 'CherryFramework') {
+			$themePath = get_stylesheet_directory();
+			$files = scandir($themePath);
+			$themeTemplates = array_intersect($files, $cherryTemplates);
+
+			$cherryForceUpdate = false;
+
+			if (!empty($themeTemplates)) {
+				foreach ($themeTemplates as $template) {
+					$templatePath = $themePath . '/' . $template;
+					$content = file_get_contents($templatePath);
+					if ($content) {
+						$headerFooterMatchesCount = preg_match($headerFooterPattern, $content);
+						if ($headerFooterMatchesCount == 1) {
+							$cherryForceUpdate = true;
+							break;
+						}
+					} else {
+						writeLog('Failed to read ' . $templatePath);
+					}
+				}
+			}
+
+			if ($cherryForceUpdate) {
+				update_option('cherry_force_update', 1);
+			} else {
+				update_option('cherry_force_update', 0);
+			}
+		}
+	}
+//------------------------------------------------------
+//  slider function
+//------------------------------------------------------
+	if (!function_exists("my_post_type_slider")) {
+		function my_post_type_slider() {
+			register_post_type( 'slider',
+				array(
+					'label'               => theme_locals("slides"),
+					'singular_label'      => theme_locals("slides"),
+					'_builtin'            => false,
+					'exclude_from_search' => true, // Exclude from Search Results
+					'capability_type'     => 'page',
+					'public'              => true,
+					'show_ui'             => true,
+					'show_in_nav_menus'   => false,
+					'rewrite' => array(
+								'slug'       => 'slide-view',
+								'with_front' => FALSE,
+					),
+					'query_var' => "slide", // This goes to the WP_Query schema
+					'menu_icon' => PARENT_URL . '/includes/images/icon_slides.png',
+					'supports'  => array(
+									'title',
+									// 'custom-fields',
+									'thumbnail'
+					)
+				)
+			);
+		}
+		add_action('init', 'my_post_type_slider');
+	}
+	if (!function_exists("get_slider_template_part")) {
+		function get_slider_template_part() {
+			switch (of_get_option('slider_type')) {
+				case "accordion_slider":
+					$slider_type = "accordion";
+				break;
+				default:
+					$slider_type = "slider";
+			}
+			return get_template_part($slider_type);
+		}
+	}
+//------------------------------------------------------
+//  Warning notice
+//------------------------------------------------------
+	add_action( 'admin_notices', 'warning_notice' );
+	function warning_notice() {
+		global $pagenow;
+		$pageHidden = array('admin.php');
+		if (!get_user_meta(get_current_user_id(), '_wp_hide_notice', true) && is_admin() && !FILE_WRITEABLE && !in_array($pagenow, $pageHidden)) {
+			printf(''.theme_locals('warning_notice_2').'
'.theme_locals('warning_notice_3').'
'.theme_locals('dismiss_notice').'');
+		}
+	}
+//------------------------------------------------------
+//  Post Meta
+//------------------------------------------------------
+	$global_meta_elements = array();
+	function get_post_metadata( $args = array() ) {
+		global $global_meta_elements;
+		if(array_key_exists('meta_elements', $args)){
+			$global_meta_elements = array_unique(array_merge($global_meta_elements, $args['meta_elements']));
+		}
+
+		$meta_elements_empty  = isset($args['meta_elements']) ? false : true ;
+		$defaults = array(
+						'meta_elements' =>  array('start_unite', 'date', 'author', 'permalink', 'end_unite', 'start_unite', 'categories', 'tags', 'end_unite', 'start_unite', 'comment', 'views', 'like', 'dislike', 'end_unite'),
+						'meta_class' => 'post_meta',
+						'meta_before' => '',
+						'meta_after'  => '',
+						'display_meta_data' => true
+					);
+		$args = wp_parse_args( $args, $defaults );
+		$post_meta_type = (of_get_option('post_meta') == 'true' || of_get_option('post_meta') == '') ? 'line' : of_get_option('post_meta');
+		if($meta_elements_empty){
+			foreach ($global_meta_elements as $key) {
+				if($key != 'end_unite || start_unite'){
+				unset($args['meta_elements'][array_search($key, $args['meta_elements'])]);
+				}
+			}
+		}
+
+		if($post_meta_type!='false' && $args['display_meta_data']){
+			$post_ID = get_the_ID();
+			$post_type = get_post_type($post_ID);
+			$icon_tips_before = ($post_meta_type == 'icon') ? '' : '';
+			$icon_tips_after = ($post_meta_type == 'icon') ? '' : '';
+
+			$user_login = is_user_logged_in() ? true : false;
+			$user_id = $user_login ? get_current_user_id() : "";
+			$voting_class = $user_login ? 'ajax_voting ' : 'not_voting ';
+			$voting_url = PARENT_URL.'/includes/voting.php?post_ID='.$post_ID.'&get_user_ID='.$user_id;
+			$get_voting_array = cherry_getPostVoting($post_ID, $user_id);
+			$user_voting = $get_voting_array['user_voting'];
+
+			echo $args['meta_before'].'';
+				foreach ($args['meta_elements'] as $value) {
+					switch ($value) {
+						case 'date':
+							if(of_get_option('post_date') != 'no'){ ?>
+								
+									
+									' . get_the_date() . '' . $icon_tips_after; ?>
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									'.theme_locals('permalink_to').''.$icon_tips_after; ?>
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									 class="" title="" date-type="dislike" >
+										
+										'.$dislike_count.''.$icon_tips_after; ?>
+									
+								
+								
+								
+									 class="" title="" date-type="like" >
+										
+										'.$like_count.''.$icon_tips_after; ?>
+									
+								
+								';
+						break;
+						case 'end_unite':
+							echo '';
+						break;
+						case 'start_group':
+							echo '';
+						break;
+						case 'end_group':
+							echo '';
+						break;
+					}
+				}
+			echo ''.$args['meta_after'];
+		}
+	}
+//------------------------------------------------------
+//  Post Views
+//------------------------------------------------------
+	function cherry_getPostViews($postID){
+		return (get_post_meta($postID, 'post_views_count', true) == '') ? "0" : get_post_meta($postID, 'post_views_count', true);
+	}
+	function cherry_setPostViews($postID){
+		$count_key = 'post_views_count';
+		$count = get_post_meta($postID, $count_key, true);
+		if($count==''){
+			$count = 1;
+		}else{
+			$count++;
+		}
+		update_post_meta($postID, $count_key, $count);
+	}
+//------------------------------------------------------
+//  Post voting
+//------------------------------------------------------
+	function cherry_getPostVoting($postID, $user_id){
+		$like_count = (get_post_meta($postID, 'post_like', true) == false) ? "0" : get_post_meta($postID, 'post_like', true);
+		$dislike_count = (get_post_meta($postID, 'post_dislike', true) == false) ? "0" : get_post_meta($postID, 'post_dislike', true);
+		$user_like_array = get_post_meta($postID, 'user_like');
+		$user_dislike_array = get_post_meta($postID, 'user_dislike');
+		$user_voting = 'none';
+		if(in_array($user_id, $user_like_array)){
+			$user_voting = 'like';
+		}else if(in_array($user_id, $user_dislike_array)){
+			$user_voting = 'dislike';
+		}
+		return array('like_count' => $like_count, 'dislike_count' => $dislike_count, 'user_voting' => $user_voting);
+	}
+//------------------------------------------------------
+//  Get team social networks
+//------------------------------------------------------
+function cherry_get_post_networks( $args = array() ) {
+	global $post;
+	extract( wp_parse_args( $args, apply_filters( 'cherry_get_post_networks_args', array(
+				'post_id'       => get_the_ID(),
+				'class'         => 'post_networks',
+				'before_title'  => '',
+				'after_title'   => '',
+				'display_title' => true,
+				'output_type'   => 'echo',
+			) )
+		)
+	);
+
+	$output         = '';
+	$fields_id      = get_post_meta( $post_id, 'fields_id', true );
+	$networks_title = get_post_meta( $post_id, 'networks_title', true );
+	$network_icons  = get_post_meta( $post_id, 'network_icon', true );
+	$network_titles = get_post_meta( $post_id, 'network_title', true );
+	$network_urls   = get_post_meta( $post_id, 'network_url', true );
+
+	if ( empty( $fields_id ) || !is_array( $fields_id ) ) {
+		return $output;
+	}
+
+	$output .= '';
+	$output .= $networks_title && $display_title ? $before_title . $networks_title . $after_title : '';
+	$output .= '';
+
+	foreach ( $fields_id as $key => $value ) {
+
+		$icon  = ( isset( $network_icons[ $value ] ) ) ? $network_icons[ $value ] : '';
+		$title = ( isset( $network_titles[ $value ] ) ) ? $network_titles[ $value ] : '';
+		$url   = ( isset( $network_urls[ $value ] ) ) ? $network_urls[ $value ] : '';
+
+		$output .= '';
+			$output .= $url ? '' : '' ;
+			$output .= $icon ? '' :'';
+			$output .= $title ? ''.$title.'' : '' ;
+			$output .= $url ? '' : '' ;
+		$output .= '';
+	}
+
+	$output .= '';
+
+	$output = apply_filters( 'cherry_get_post_networks_html', $output );
+
+	if ( $output_type == 'echo' ) {
+		echo $output;
+	} else {
+		return $output;
+	}
+}
+//------------------------------------------------------
+//  Related Posts
+//------------------------------------------------------
+	if(!function_exists('cherry_related_posts')){
+		function cherry_related_posts($args = array()){
+			global $post;
+			$default = array(
+				'post_type' => get_post_type($post),
+				'class' => 'related-posts',
+				'class_list' => 'related-posts_list',
+				'class_list_item' => 'related-posts_item',
+				'display_title' => true,
+				'display_link' => true,
+				'display_thumbnail' => true,
+				'width_thumbnail' => 250,
+				'height_thumbnail' => 150,
+				'before_title' => '',
+				'after_title' => '',
+				'posts_count' => 4
+			);
+			extract(array_merge($default, $args));
+
+			$post_tags = wp_get_post_terms($post->ID, $post_type.'_tag', array("fields" => "slugs"));
+			$tags_type = $post_type=='post' ? 'tag' : $post_type.'_tag' ;
+			$suppress_filters = get_option('suppress_filters');// WPML filter
+			$blog_related = apply_filters( 'cherry_text_translate', of_get_option('blog_related'), 'blog_related' );
+			if ($post_tags && !is_wp_error($post_tags)) {
+				$args = array(
+					"$tags_type" => implode(',', $post_tags),
+					'post_status' => 'publish',
+					'posts_per_page' => $posts_count,
+					'ignore_sticky_posts' => 1,
+					'post__not_in' => array($post->ID),
+					'post_type' => $post_type,
+					'suppress_filters' => $suppress_filters
+					);
+				query_posts($args);
+				if ( have_posts() ) {
+					$output = '';
+					$output .= $display_title ? $before_title.$blog_related.$after_title : '' ;
+					$output .= '';
+					while( have_posts() ) {
+						the_post();
+						$thumb   = has_post_thumbnail() ? get_post_thumbnail_id() : PARENT_URL.'/images/empty_thumb.gif';
+						$blank_img = stripos($thumb, 'empty_thumb.gif');
+						$img_url = $blank_img ? $thumb : wp_get_attachment_url( $thumb,'full');
+						$image   = $blank_img ? $thumb : aq_resize($img_url, $width_thumbnail, $height_thumbnail, true) or $img_url;
+
+						$output .= '';
+						$output .= $display_thumbnail ? '': '' ;
+						$output .= $display_link ? ''.get_the_title().'': '' ;
+						$output .= '';
+					}
+					$output .= '';
+					echo $output;
+				}
+				wp_reset_query();
+			}
+		}
+	}
+
+//------------------------------------------------------
+//  Main Layout option
+//------------------------------------------------------
+	if (of_get_option('main_layout') == 'fixed') {
+		add_filter('body_class','cherry_layout_class');
+		function cherry_layout_class($classes) {
+			$classes[] = 'cherry-fixed-layout';
+
+			return $classes;
+		}
+	}
+
+//------------------------------------------------------
+//  General option
+//------------------------------------------------------
+	if ( (of_get_option('header_background') != '')
+		|| (of_get_option('header_color') !='')
+		|| (of_get_option('body_background') !='')
+		|| (of_get_option('custom_css') !='') ) {
+
+		add_action('wp_head', 'cherry_general_opt');
+		function cherry_general_opt(){
+			$output = "\n";
+			echo $output;
+		}
+	}
+
+	/**
+	*
+	* Register hook in update.php page
+	*
+	**/
+	add_action('load-update.php', 'cherry_register_update_page_hook');
+	function cherry_register_update_page_hook(){
+		if ( isset($_GET['action']) ) {
+			$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
+			$theme  = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
+			$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+
+			if ( 'CherryFramework' == $theme ) {
+
+				if ( 'upgrade-theme' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+				} elseif ( 'upload-theme' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+				}
+			}
+
+			if ( 'cherry-plugin' == $plugin ) {
+
+				if ( 'upgrade-plugin' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_plugin_upgrade_call');
+				}
+			}
+		}
+	}
+
+	/**
+	*
+	* Register hook in update-core.php page
+	*
+	**/
+	add_action('load-update-core.php', 'cherry_register_update_core_page_hook');
+	function cherry_register_update_core_page_hook(){
+		if ( isset( $_GET['themes'] ) )
+			$themes = explode( ',', stripslashes($_GET['themes']) );
+		elseif ( isset( $_POST['checked'] ) )
+			$themes = (array) $_POST['checked'];
+
+		if ( !isset($themes) )
+			return;
+
+		if ( array_search('CherryFramework', $themes) === FALSE )
+			return;
+
+		if ( isset($_GET['action']) ) {
+			$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+
+			if ( 'do-theme-upgrade' == $action ) {
+				add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+			}
+		}
+	}
+
+	/**
+	*
+	* Register hook after CherryFramework upgrade
+	*
+	**/
+	function after_cherry_theme_upgrade_call(){
+		do_action('after_cherry_theme_upgrade');
+	}
+
+	/**
+	*
+	* Register hook after Cherry Plugin upgrade
+	*
+	**/
+	function after_cherry_plugin_upgrade_call(){
+		do_action('after_cherry_plugin_upgrade');
+	}
+
+	/**
+	*
+	* Unpack Cherry Plugin package
+	*
+	**/
+	add_action('after_cherry_theme_upgrade', 'cherry_plugin_unpack_package');
+	function cherry_plugin_unpack_package(){
+		$plugin = 'cherry-plugin/cherry-plugin.php';
+
+		if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+			return;
+		}
+
+		if ( !function_exists( 'is_plugin_active' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
+
+		if ( is_plugin_active( $plugin ) )
+			return;
+
+		$file   = PARENT_DIR . '/includes/plugins/cherry-plugin.zip';
+		$to     = WP_PLUGIN_DIR . '/cherry-plugin/';
+		$result = false;
+
+		if ( !file_exists($file) )
+			return $result;
+
+		if ( !function_exists('WP_Filesystem') ) {
+			require_once(ABSPATH . 'wp-admin/includes/file.php');
+		}
+		WP_Filesystem();
+		global $wp_filesystem;
+
+		// Clean up plugin directory
+		if ( $wp_filesystem->is_dir($to) )
+			$wp_filesystem->delete($to, true);
+
+		$result = unzip_file( $file, $to );
+		if ( is_wp_error($result) ) {
+			if ( 'incompatible_archive' == $result->get_error_code() ) {
+				return new WP_Error( 'incompatible_archive', __('The package could not be installed.', CURRENT_THEME), $result->get_error_data() );
+			}
+		}
+		return $result;
+	}
+
+	/**
+	*
+	* Set Up Cherry Plugin
+	*
+	**/
+	add_action('after_setup_theme', 'cherry_plugin_setup');
+	function cherry_plugin_setup(){
+		$plugin = 'cherry-plugin/cherry-plugin.php';
+
+		if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+			return;
+		}
+
+		if ( !function_exists( 'is_plugin_active' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
+
+		if ( is_plugin_active( $plugin ) )
+			return;
+
+		$file   = PARENT_DIR . '/includes/plugins/cherry-plugin.zip';
+		$to     = WP_PLUGIN_DIR . '/cherry-plugin/';
+		$result = false;
+
+		if ( !file_exists($file) )
+			return $result;
+
+		if ( !function_exists('WP_Filesystem') ) {
+			require_once(ABSPATH . 'wp-admin/includes/file.php');
+		}
+		WP_Filesystem();
+		global $wp_filesystem;
+
+		$result = unzip_file( $file, $to );
+		if ( is_wp_error($result) ) {
+			if ( 'incompatible_archive' == $result->get_error_code() ) {
+				return new WP_Error( 'incompatible_archive', __('The package could not be installed.', CURRENT_THEME), $result->get_error_data() );
+			}
+		}
+		return $result;
+	}
+
+	/**
+	*
+	* Layout class
+	*
+	**/
+	if ( !function_exists('cherry_get_layout_class') ) {
+		function cherry_get_layout_class($layout) {
+			switch ($layout) {
+
+				case 'full_width_content':
+					$layout_class = apply_filters( "cherry_layout_wrapper", "span12" );
+					break;
+
+				case 'content':
+					$layout_class = apply_filters( "cherry_layout_content_column", "span8" );
+					$layout_class .= ' '.of_get_option('blog_sidebar_pos');
+					break;
+
+				case 'sidebar':
+					$layout_class = apply_filters( "cherry_layout_sidebar_column", "span4" );
+					break;
+
+				case 'left_block':
+					$layout_class = apply_filters( "cherry_layout_left_block_column", "span7" );
+					break;
+
+				case 'right_block':
+					$layout_class = apply_filters( "cherry_layout_right_block_column", "span5" );
+					break;
+			}
+
+			return $layout_class;
+		}
+	}
+||||||| .r11156
+ '#000000',
+		'bodyBackground' => '#000000',
+		'baseFontFamily' => '#000000',
+		'baseFontSize'   => '#000000',
+		'baseLineHeight' => '#000000',
+		'linkColor'      => '#000000',
+		'linkColorHover' => '#000000',
+		'mainBackground' => '#ffffff'
+		);
+
+	/**
+	*
+	* JS global variables
+	*
+	**/
+	function cherry_js_global_variables(){
+		$output = "";
+		echo $output;
+	}
+	add_action('wp_head', 'cherry_js_global_variables');
+	add_action('admin_head', 'cherry_js_global_variables');
+
+	/**
+	*
+	* Definition current theme
+	*
+	**/
+	function getCurrentTheme() {
+		if ( function_exists('wp_get_theme') ) {
+			$theme = wp_get_theme();
+			if ( $theme->exists() ) {
+				$theme_name = $theme->Name;
+			}
+		} else {
+			$theme_name = get_current_theme();
+		}
+		$theme_name = preg_replace("/\W/", "_", strtolower($theme_name) );
+		return $theme_name;
+	}
+
+	/**
+	*
+	* Definition theme version
+	* @param string $theme_name Directory name for the theme
+	*
+	**/
+	function cherry_get_theme_version($theme_name) {
+		if ( function_exists('wp_get_theme') ) {
+			$theme = wp_get_theme($theme_name);
+			if ( $theme->exists() ) {
+				$theme_ver = $theme->Version;
+			}
+		} else {
+			$theme_data = get_theme_data( get_theme_root() . '/' . $theme_name . '/style.css' );
+			$theme_ver  = $theme_data['Version'];
+		}
+		return $theme_ver;
+	}
+
+	/**
+	*
+	* Comment some value from variables.less
+	*
+	**/
+	if ( CURRENT_THEME != 'cherry' )
+		add_action('cherry_activation_hook', 'comment_child_var');
+
+	function comment_child_var() {
+		global $variablesArray;
+
+		$file = CHILD_DIR .'/bootstrap/less/variables.less';
+
+		if ( file_exists($file) ) {
+			$allVariablessArray = file($file);
+
+			foreach ($variablesArray as $key => $value) {
+				foreach ($allVariablessArray as $k => $v) {
+					$pos = strpos($v, $key);
+					if ( $pos!==false && $pos == 1 ) {
+						$allVariablessArray[$k] = '// ' . $v;
+						break;
+					}
+				}
+			}
+			file_put_contents($file, $allVariablessArray);
+		}
+	}
+
+	/**
+	 * Helper function to return the theme option value.
+	 * If no value has been saved, it returns $default.
+	 * Needed because options are saved as serialized strings.
+	 **/
+	if ( !function_exists( 'of_get_option' ) ) {
+		function of_get_option($name, $default = false) {
+
+			$optionsframework_settings = get_option('optionsframework');
+
+			// Gets the unique option id
+			$option_name = $optionsframework_settings['id'];
+
+			if ( get_option($option_name) ) {
+				$options = get_option($option_name);
+			}
+
+			if ( isset($options[$name]) ) {
+				return $options[$name];
+			} else {
+				return $default;
+			}
+		}
+	}
+
+	/**
+	*
+	* Unlink less cache files
+	*
+	**/
+	add_action('cherry_activation_hook', 'clean_less_cache');
+
+	function clean_less_cache() {
+		if ( CURRENT_THEME == 'cherry' ) {
+			$bootstrapInput	= PARENT_DIR .'/less/bootstrap.less';
+			$themeInput		= PARENT_DIR .'/less/style.less';
+		} else {
+			$bootstrapInput	= CHILD_DIR .'/bootstrap/less/bootstrap.less';
+			$themeInput		= CHILD_DIR .'/style.less';
+		}
+
+		$cacheFile1 = $bootstrapInput.".cache";
+		$cacheFile2 = $themeInput.".cache";
+		if (file_exists($cacheFile1)) unlink($cacheFile1);
+		if (file_exists($cacheFile2)) unlink($cacheFile2);
+	}
+
+	if ( (is_admin() && ($pagenow == "themes.php")) && FILE_WRITEABLE ) {
+		do_action('cherry_activation_hook');
+	}
+
+	if ( !function_exists('cherry_theme_setup')) {
+		function cherry_theme_setup() {
+
+			//Loading theme textdomain
+			load_theme_textdomain( CURRENT_THEME, PARENT_DIR . '/languages' );
+
+			//Localization functions
+			include_once (PARENT_DIR . '/includes/locals.php');
+
+			//Plugin Activation
+			include_once (CHILD_DIR . '/includes/register-plugins.php');
+
+			//Setup MotoPress
+			include_once (PARENT_DIR . '/includes/register-motopress.php');
+
+			//Include shop
+			if ( file_exists(get_stylesheet_directory().'/shop.php') ) {
+				include_once (CHILD_DIR . '/shop.php');
+			}
+		}
+		add_action('after_setup_theme', 'cherry_theme_setup');
+	}
+
+	//WPML compatibility
+	//WPML filter for correct posts IDs for the current language Solution
+	if ( function_exists( 'wpml_get_language_information' )) {
+		update_option('suppress_filters', 0);
+	} else {
+		update_option('suppress_filters', 1);
+	}
+	//Register text for translation
+	function cherry_wpml_translate_filter( $value, $name ) {
+		return icl_translate( 'cherry', $name, $value );
+	}
+	//Check if WPML is activated
+	if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
+		add_filter( 'cherry_text_translate', 'cherry_wpml_translate_filter', 10, 2 );
+	}
+
+	//Loading Custom function
+	include_once (CHILD_DIR . '/includes/custom-function.php');
+
+	//Loading jQuery and Scripts
+	include_once (PARENT_DIR . '/includes/theme-scripts.php');
+
+	//Sidebar
+	include_once (CHILD_DIR . '/includes/sidebar-init.php');
+
+	//Theme initialization
+	include_once (CHILD_DIR . '/includes/theme-init.php');
+
+	//Additional function
+	include_once (PARENT_DIR . '/includes/theme-function.php');
+
+	//Aqua Resizer for image cropping and resizing on the fly
+	include_once (PARENT_DIR . '/includes/aq_resizer.php');
+
+	//Add the pagemeta
+	include_once (PARENT_DIR . '/includes/theme-pagemeta.php');
+
+	//Add the postmeta
+	include_once (PARENT_DIR . '/includes/theme-postmeta.php');
+
+	//Add the postmeta to Portfolio posts
+	include_once (PARENT_DIR . '/includes/theme-portfoliometa.php');
+
+	//Add the postmeta to Slider posts
+	include_once (PARENT_DIR . '/includes/theme-slidermeta.php');
+
+	//Add the postmeta to Testimonials
+	include_once (PARENT_DIR . '/includes/theme-testimeta.php');
+
+	//Add the postmeta to Our Team posts
+	include_once (PARENT_DIR . '/includes/theme-teammeta.php');
+
+	//Loading options.php for theme customizer
+	include_once (CHILD_DIR . '/options.php');
+	include_once (PARENT_DIR . '/framework_options.php');
+
+	//Framework Data Management
+	include_once (PARENT_DIR . '/admin/data_management/data_management_interface.php');
+
+	//SEO Settings
+	include_once (PARENT_DIR . '/admin/seo/seo_settings_page.php');
+
+	//WP Pointers
+	include_once (PARENT_DIR . '/includes/class.wp-help-pointers.php');
+
+	//Embedding LESS compile
+	if ( !class_exists('lessc') ) {
+		include_once (PARENT_DIR .'/includes/lessc.inc.php');
+	}
+	include_once (PARENT_DIR .'/includes/less-compile.php');
+
+	// removes detailed login error information for security
+	add_filter('login_errors',create_function('$a', "return null;"));
+
+	/*
+	 * Loads the Options Panel
+	 *
+	 * If you're loading from a child theme use stylesheet_directory
+	 * instead of template_directory
+	 */
+	if ( !function_exists( 'optionsframework_init' ) ) {
+		define( 'OPTIONS_FRAMEWORK_DIRECTORY', PARENT_URL . '/admin/' );
+		include_once dirname( __FILE__ ) . '/admin/options-framework.php';
+	}
+
+	/*
+	 * Removes Trackbacks from the comment count
+	 *
+	 */
+	if ( !function_exists('comment_count') ) {
+		add_filter('get_comments_number', 'comment_count', 0);
+
+		function comment_count( $count ) {
+			if ( ! is_admin() ) {
+				global $id;
+				$args = 'status=approve&post_id=' . $id;
+				$comments = get_comments( $args, ARRAY_A );
+				$comments_by_type = separate_comments( $comments );
+				return count($comments_by_type['comment']);
+			} else {
+				return $count;
+			}
+		}
+	}
+
+	/*
+	 * Post Formats
+	 *
+	 */
+	$formats = array(
+				'aside',
+				'gallery',
+				'link',
+				'image',
+				'quote',
+				'audio',
+				'video');
+	add_theme_support( 'post-formats', $formats );
+	add_post_type_support( 'post', 'post-formats' );
+
+	/*
+	 * Custom excpert length
+	 *
+	 */
+	if(!function_exists('new_excerpt_length')) {
+
+		function new_excerpt_length($length) {
+			return 60;
+		}
+		add_filter('excerpt_length', 'new_excerpt_length');
+	}
+
+	add_filter( 'the_excerpt', 'do_shortcode' );
+	// enable shortcodes in sidebar
+	add_filter('widget_text', 'do_shortcode');
+
+	// custom excerpt ellipses for 2.9+
+	if(!function_exists('custom_excerpt_more')) {
+
+		function custom_excerpt_more($more) {
+			return theme_locals("read_more").' »';
+		}
+		add_filter('excerpt_more', 'custom_excerpt_more');
+	}
+
+	// no more jumping for read more link
+	if(!function_exists('no_more_jumping')) {
+
+		function no_more_jumping($post) {
+			return ' '.theme_locals("continue_reading").'';
+		}
+		add_filter('excerpt_more', 'no_more_jumping');
+	}
+
+	// category id in body and post class
+	if(!function_exists('category_id_class')) {
+
+		function category_id_class($classes) {
+			global $post;
+			foreach((get_the_category()) as $category)
+				$classes [] = 'cat-' . $category->cat_ID . '-id';
+				return $classes;
+		}
+		add_filter('post_class', 'category_id_class');
+		add_filter('body_class', 'category_id_class');
+	}
+
+	// Threaded Comments
+	if(!function_exists('enable_threaded_comments')) {
+		function enable_threaded_comments() {
+			if (!is_admin()) {
+				if (is_singular() AND comments_open() AND (get_option('thread_comments') == 1)) {
+					wp_enqueue_script('comment-reply');
+				}
+			}
+		}
+		add_action('get_header', 'enable_threaded_comments');
+	}
+
+	//remove auto loading rel=next post link in header
+	remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
+
+
+	// WP Pointers
+	if (!function_exists('myHelpPointers')) {
+		add_action('admin_enqueue_scripts', 'myHelpPointers');
+
+		function myHelpPointers() {
+			//First we define our pointers
+			$pointers = array(
+				array(
+					'id'       => 'xyz1', // unique id for this pointer
+					'screen'   => 'themes', // this is the page hook we want our pointer to show on
+					'target'   => '#toplevel_page_options-framework', // the css selector for the pointer to be tied to, best to use ID's
+					'title'    => theme_locals("import_sample_data"),
+					'content'  => theme_locals("import_sample_data_desc"),
+					'position' => array(
+										'edge'   => 'left', //top, bottom, left, right
+										'align'  => 'left', //top, bottom, left, right, middle
+										)
+					),
+				array(
+					'id'       => 'xyz2', // unique id for this pointer
+					'screen'   => 'toplevel_page_options-framework', // this is the page hook we want our pointer to show on
+					'target'   => '#toplevel_page_cherry-plugin-page', // the css selector for the pointer to be tied to, best to use ID's
+					'title'    => theme_locals("import_sample_data"),
+					'content'  => theme_locals("import_sample_data_desc"),
+					'position' => array(
+										'edge'   => 'left', //top, bottom, left, right
+										'align'  => 'left', //top, bottom, left, right, middle
+										)
+					)
+				// more as needed
+			);
+
+			//Now we instantiate the class and pass our pointer array to the constructor
+			$myPointers = new WP_Help_Pointer($pointers);
+		};
+	}
+
+	/*
+	 * Navigation with description
+	 *
+	 */
+	if (! class_exists('description_walker')) {
+		class description_walker extends Walker_Nav_Menu {
+			function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+				global $wp_query;
+				$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+
+				$class_names = $value = '';
+
+				$classes = empty( $item->classes ) ? array() : (array) $item->classes;
+
+				$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) );
+				$class_names = ' class="'. esc_attr( $class_names ) . '"';
+
+				$output .= $indent . '';
+
+				$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : '';
+				$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : '';
+				$attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
+				$attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
+
+				$description  = ! empty( $item->description ) ? ''.esc_attr( $item->description ).'' : '';
+
+				if($depth != 0) {
+					$description = $append = $prepend = "";
+				}
+
+				$item_output = $args->before;
+				$item_output .= '';
+				$item_output .= $args->link_before;
+
+				if (isset($prepend))
+					$item_output .= $prepend;
+
+				$item_output .= apply_filters( 'the_title', $item->title, $item->ID );
+
+				if (isset($append))
+					$item_output .= $append;
+
+				$item_output .= $description.$args->link_after;
+				$item_output .= '';
+				$item_output .= $args->after;
+
+				$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
+			}
+		}
+	}
+
+	/*
+	 * Cherry update
+	 */
+	$cherryTemplates = array(
+		'404.php',
+		'archive.php',
+		'author.php',
+		'category.php',
+		'index.php',
+		'page.php',
+		'page-archives.php',
+		'page-faq.php',
+		'page-fullwidth.php',
+		'page-home.php',
+		'page-Portfolio2Cols-filterable.php',
+		'page-Portfolio3Cols-filterable.php',
+		'page-Portfolio4Cols-filterable.php',
+		'page-testi.php',
+		'search.php',
+		'single.php',
+		'single-portfolio.php',
+		'single-team.php',
+		'single-testi.php',
+		'tag.php'
+	);
+
+	$headerFooterPattern = '/(\.*?\<\/header\>|\.*?\<\/footer\>)/is';
+
+	if (is_user_logged_in() && current_user_can('update_themes')) {
+		$updateErrors = array();
+
+		$oldCherryVersion = get_option('cherry_version', '1.0');
+		$currentCherryVersion = getCherryVersion($updateErrors);
+		$cherryV2 = '2.0';
+		$cherryForceUpdate = (bool) get_option('cherry_force_update', false);
+
+		if (version_compare($oldCherryVersion, $cherryV2) == -1 || $cherryForceUpdate) {
+			writeLog(PHP_EOL . date('Y-m-d H:i:s'));
+			writeLog('Old CherryFramework version: ' . $oldCherryVersion);
+			writeLog('Current CherryFramework version: ' . $currentCherryVersion);
+			writeLog('Force update: ' . (int) $cherryForceUpdate);
+
+			cherryUpdate($cherryTemplates, $headerFooterPattern, $updateErrors);
+			//changeChildTheme
+			changeChildTheme($updateErrors);
+			//end changeChildTheme
+			if (empty($updateErrors)) {
+				update_option('cherry_version', $currentCherryVersion);
+				update_option('cherry_force_update', 0);
+			}
+		}
+	}
+
+	function getCherryVersion(&$updateErrors) {
+		$style = PARENT_DIR . '/style.css';
+		$themeVersion = 0;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme(get_option('template', 'CherryFramework'));
+			if (file_exists($style) && $theme->exists()) {
+				$themeVersion = $theme->Version;
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			if (file_exists($style)) {
+				$theme = get_theme_data($style);
+				$themeVersion = $theme['Version'];
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		} else {
+			if (file_exists($style)) {
+				$content = file_get_contents($style);
+				if ($content) {
+					$pattern = '/\s*version\s*:\s*([^\n]+)\s*/is';
+					preg_match($pattern, $content, $matches);
+					if (!empty($matches[1])) {
+						$themeVersion = trim($matches[1]);
+					}
+				} else {
+					$updateErrors[] = 'Failed to read ' . $style;
+					writeLog('Failed to read ' . $style);
+				}
+			} else {
+				$updateErrors[] = $style . ' does not exist';
+				writeLog($style . ' does not exist');
+			}
+		}
+		return $themeVersion;
+	}
+
+	function isCherryChildTheme($themePath, $name, &$updateErrors) {
+		$style = $themePath . '/style.css';
+		$themeTemplate = false;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme($name);
+			if ($theme->exists()) {
+				if ($theme->Stylesheet != $theme->Template) {
+					$themeTemplate = $theme->Template;
+				}
+			} else {
+				$updateErrors[] = 'Theme ' . $theme->Name . ' does not exist';
+				writeLog('Theme ' . $theme->Name . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			$theme = get_theme_data($style);
+			$themeTemplate = $theme['Template'];
+		} else {
+			$content = file_get_contents($style);
+			if ($content) {
+				$pattern = '/\s*template\s*:\s*([^\n]+)\s*/is';
+				preg_match($pattern, $content, $matches);
+				if (!empty($matches[1])) {
+					$themeTemplate = trim($matches[1]);
+				}
+			} else {
+				$updateErrors[] = 'Failed to read ' . $style;
+				writeLog('Failed to read ' . $style);
+			}
+		}
+		return ($themeTemplate == 'CherryFramework') ? true : false;
+	}
+
+	function getHeaderFooterCode($headerFooterPattern) {
+		$headerFooter = array('header', 'footer');
+		$headerFooterCode = array('header' => null, 'footer' => null);
+
+		foreach ($headerFooter as $name) {
+			$filePath = PARENT_DIR . '/' . $name . '.php';
+			if (file_exists($filePath)) {
+				$content = file_get_contents($filePath);
+				if ($content) {
+					$matchesCount = preg_match($headerFooterPattern, $content, $matches);
+					if ($matchesCount == 1 && !empty($matches[0])) {
+						$headerFooterCode[$name] = $matches[0];
+					} else {
+						$updateErrors[] = 'header|footer code not found in ' . $filePath;
+						writeLog('header|footer code not found in ' . $filePath);
+					}
+				} else {
+					$updateErrors[] = 'Failed to read ' . $filePath;
+					writeLog('Failed to read ' . $filePath);
+				}
+			} else {
+				$updateErrors[] = $filePath . ' does not exist';
+				writeLog($filePath . ' does not exist');
+			}
+		}
+
+		return $headerFooterCode;
+	}
+
+	function backupFile($templatePath) {
+		return copy($templatePath, $templatePath . '.bak');
+	}
+
+	function writeLog($message) {
+		$logFile = PARENT_DIR . '/update.log';
+		if (is_writable(PARENT_DIR)) {
+			file_put_contents($logFile, $message . PHP_EOL, FILE_APPEND);
+		}
+	}
+
+	function cherryUpdate($cherryTemplates, $headerFooterPattern, &$updateErrors) {
+		$themesPath = get_theme_root();
+
+		$skip = array('.', '..', 'CherryFramework', 'twentytwelve', 'twentyeleven', 'twentyten', 'index.php');
+		$themes = array_diff(scandir($themesPath), $skip);
+
+		if (!empty($themes)) {
+			foreach ($themes as $theme) {
+				$themePath = $themesPath . '/' . $theme;
+				if (is_dir($themePath) && file_exists($themePath . '/style.css')) {
+
+					$isCherryChildTheme = isCherryChildTheme($themePath, $theme, $updateErrors);
+
+					if ($isCherryChildTheme) {
+						if (is_writable($themePath)) {
+							writeLog(PHP_EOL . 'Child theme: ' . $themePath);
+							$files = scandir($themePath);
+							$themeTemplates = array_intersect($files, $cherryTemplates);
+							if (!empty($themeTemplates)) {
+								foreach ($themeTemplates as $template) {
+									$templatePath = $themePath . '/' . $template;
+									if (is_writable($templatePath)) {
+										$content = file_get_contents($templatePath);
+										if ($content) {
+											$headerFooterMatchesCount = preg_match_all($headerFooterPattern, $content, $headerFooterMatches);
+											if ($headerFooterMatchesCount > 0) {
+												$backupFile = backupFile($templatePath);
+												if ($backupFile) {
+													writeLog('Backup ' . $templatePath);
+
+													$content = preg_replace($headerFooterPattern, '', $content, -1, $headerFooterReplaceCount);
+													if (!is_null($content) && $headerFooterReplaceCount > 0) {
+														writeLog('Replace ' . $headerFooterReplaceCount . ' header|footer');
+
+														if (file_put_contents($templatePath, $content)) {
+															writeLog('Save ' . $templatePath);
+														} else {
+															$updateErrors[] = 'Failed to save ' . $templatePath;
+															writeLog('Failed to save ' . $templatePath);
+														}
+													}
+												} else {
+													$updateErrors[] = 'Failed to backup ' . $templatePath;
+													writeLog('Failed to backup ' . $templatePath);
+												}
+											}
+										} else {
+											$updateErrors[] = 'Failed to read ' . $templatePath;
+											writeLog('Failed to read ' . $templatePath);
+										}
+									} else {
+										$updateErrors[] = $templatePath . ' is not writable';
+										writeLog($templatePath . ' is not writable');
+									}
+								}
+							}
+
+							$headerFooter = array_intersect($files, array('header.php', 'footer.php'));
+							if (!empty($headerFooter)) {
+								$headerFooterCode = getHeaderFooterCode($headerFooterPattern);
+								if (!is_null($headerFooterCode['header']) && !is_null($headerFooterCode['footer'])) {
+									foreach ($headerFooter as $file) {
+										$filePath = $themePath . '/' . $file;
+										if (is_writable($filePath)) {
+											$content = file_get_contents($filePath);
+											if ($content) {
+												$headerFooterMatchesCount = preg_match_all($headerFooterPattern, $content, $headerFooterMatches);
+												if ($headerFooterMatchesCount === 0) {
+													$backupFile = backupFile($filePath);
+													if ($backupFile) {
+														writeLog('Backup ' . $filePath);
+
+														if ($file == 'header.php') {
+															$content .= $headerFooterCode['header'];
+														} elseif ($file == 'footer.php') {
+															$content = $headerFooterCode['footer'] . $content;
+														}
+
+														writeLog('Add header|footer code in ' . $filePath);
+
+														if (file_put_contents($filePath, $content)) {
+															writeLog('Save ' . $filePath);
+														} else {
+															$updateErrors[] = 'Failed to save ' . $filePath;
+															writeLog('Failed to save ' . $filePath);
+														}
+													} else {
+														$updateErrors[] = 'Failed to backup ' . $filePath;
+														writeLog('Failed to backup ' . $filePath);
+													}
+												}
+											} else {
+												$updateErrors[] = 'Failed to read ' . $filePath;
+												writeLog('Failed to read ' . $filePath);
+											}
+										} else {
+											$updateErrors[] = $filePath . ' is not writable';
+											writeLog($filePath . ' is not writable');
+										}
+									}
+								}
+							}
+						} else {
+							$updateErrors[] = $themePath . ' is not writable';
+							writeLog($themePath . ' is not writable');
+						}
+					}
+				}
+			}
+		}
+	}
+//changeChildTheme
+	function changeChildTheme(&$updateErrors){
+		$themesPath = get_theme_root();
+
+		$skip = array('.', '..', 'CherryFramework', 'twentytwelve', 'twentyeleven', 'twentyten', 'index.php');
+		$themes = array_diff(scandir($themesPath), $skip);
+
+		if (!empty($themes)) {
+			foreach ($themes as $theme) {
+				$themePath = $themesPath . '/' . $theme;
+				if (is_dir($themePath) && file_exists($themePath . '/style.css')) {
+
+					$isCherryChildTheme = isCherryChildTheme($themePath, $theme, $updateErrors);
+
+					if ($isCherryChildTheme) {
+						if (is_writable($themePath)) {
+							unset($slider_in_header, $slider_in_page_home, $pahe_home_content);
+							writeLog(PHP_EOL . 'Child theme: ' . $themePath);
+							$files = scandir($themePath);
+							$header_php = array_intersect($files, array('header.php'));
+							if (!empty($header_php)) {
+								$templatePath = $themePath . '/header.php';
+								$content = file_get_contents($templatePath);
+								if (stripos($content, '"static/static-slider"')!==false) {
+									$slider_in_header = true;
+								}
+							}
+							if(!isset($slider_in_header)){
+								if (is_dir($themePath."/wrapper")){
+									$nestedFiles = scandir($themePath."/wrapper");
+									$header_wrapper_php = array_intersect($nestedFiles, array('wrapper-header.php'));
+									if (!empty($header_wrapper_php)) {
+										$header_wrapper_php_path = $themePath . '/wrapper/wrapper-header.php';
+										$content = file_get_contents($header_wrapper_php_path);
+										if (stripos($content, '"static/static-slider"')!==false) {
+											$slider_in_header = true;
+										}
+									}
+								}
+							}
+							if(!isset($slider_in_header)){
+								$page_home_php = array_intersect($files, array('page-home.php'));
+								if (!empty($page_home_php)) {
+									$templatePath = $themePath . '/page-home.php';
+									$content = file($templatePath);
+									for ($i=0, $arrayCount = count($content); $i < $arrayCount ; $i++) {
+										if(stripos($content[$i], '"static/static-slider"')!==false){
+											$slider_in_page_home = $i;
+										}
+										if(stripos($content[$i], '"page-home.php"')!==false){
+											$pahe_home_content = $i;
+										}
+									}
+									if(!isset($slider_in_page_home)){
+										array_splice($content, $pahe_home_content+1, 0, "\t\n\t\t\n\t\t\t\n\t\t
\n\t\n");
+										writeLog('Change page-home.php');
+										if (file_put_contents($templatePath, $content)) {
+											writeLog('Save ' . $templatePath);
+										} else {
+											$updateErrors[] = 'Failed to save ' . $templatePath;
+											writeLog('Failed to save ' . $templatePath);
+										}
+									}
+								}
+							}
+							$stylesheet = array_intersect($files, array('style.css'));
+							$stylePath = $themePath . '/style.css';
+							if (!empty($stylesheet)) {
+								$styleContent = file($stylePath);
+								if ($styleContent) {
+									for ($i=0, $arrayCount = count($styleContent); $i < $arrayCount ; $i++) {
+										if(stripos($styleContent[$i], "/*--")!==false){
+											$styleContentChange = array();
+										}
+										if(isset($styleContentChange)){
+											$styleContentChange[$i] = $styleContent[$i];
+										}
+										if(stripos($styleContent[$i], "--*/")!==false){
+											break;
+										}
+									}
+									array_push($styleContentChange, "\n/* ----------------------------------------\n\tPlease, You may put custom CSS here\n---------------------------------------- */\n");
+									if (file_put_contents($stylePath, $styleContentChange)) {
+										writeLog('Save ' . $stylePath);
+									} else {
+										$updateErrors[] = 'Failed to save ' . $stylePath;
+										writeLog('Failed to save ' . $stylePath);
+									}
+								} else {
+									$updateErrors[] = 'Failed to read ' . $stylesheet;
+									writeLog('Failed to read ' . $stylesheet);
+								}
+							}
+							if (is_dir($themePath."/static")){
+								$nestedFiles = scandir($themePath."/static");
+								$staticSlider = array_intersect($nestedFiles, array('static-slider.php'));
+								$staticSliderPath = $themePath . '/static/static-slider.php';
+								unset($sliderStatic, $new_function);
+								if (!empty($staticSlider)) {
+									$backupFileStatic = backupFile($staticSliderPath);
+									if ($backupFileStatic) {
+											$staticSliderContent = file($staticSliderPath);
+											if ($staticSliderContent) {
+												$static_slider_dom_1 = "\n";
+												$static_slider_dom_2 = "\t\n";
+												$static_slider_dom_3 = "\n\n\t
\n\n";
+												for ($i=0, $arrayCount = count($staticSliderContent); $i < $arrayCount ; $i++) {
+													if(stripos($staticSliderContent[$i], "get_template_part('slider')")!==false){
+														$sliderStatic = $i;
+													}
+													if(stripos($staticSliderContent[$i], "get_slider_template_part")!==false){
+														$new_function = $i;
+													}
+												}
+												if(!isset($sliderStatic) && !isset($new_function)){
+													$staticSliderContent = "\n\n\t\n\t\t\n\t\t\t\n\t\t
\n\t
\n\n\t
\n";
+												}else{
+													if(!isset($new_function)){
+														$staticSliderContent[$sliderStatic] = $static_slider_dom_2;
+														array_splice($staticSliderContent, 1, 0, $static_slider_dom_1);
+														array_push($staticSliderContent, $static_slider_dom_3);
+													}
+												}
+												if (file_put_contents($staticSliderPath, $staticSliderContent)) {
+													writeLog('Save ' . $staticSliderPath);
+												} else {
+													$updateErrors[] = 'Failed to save ' . $staticSliderPath;
+													writeLog('Failed to save ' . $staticSliderPath);
+												}
+											} else {
+												$updateErrors[] = 'Failed to read ' . $staticSlider;
+												writeLog('Failed to read ' . $staticSlider);
+											}
+
+									}else {
+										$updateErrors[] = 'Failed to backup ' . $staticSliderPath;
+										writeLog('Failed to backup ' . $staticSliderPath);
+									}
+								}
+							}
+						} else {
+							$updateErrors[] = $themePath . ' is not writable';
+							writeLog($themePath . ' is not writable');
+						}
+					}
+				}
+			}
+		}
+	};
+//end changeChildTheme
+	if (has_action('after_switch_theme')) {
+		add_action('after_switch_theme', 'activateCherryForceUpdate', 10, 0);
+	} else {
+		if (is_admin() && isset($_GET['activated']) && $pagenow == 'themes.php') {
+			activateCherryForceUpdate();
+		}
+	}
+
+	function activateCherryForceUpdate() {
+		global $cherryTemplates;
+		global $headerFooterPattern;
+
+		$style = CHILD_DIR . '/style.css';
+		$themeTemplate = false;
+
+		if (function_exists('wp_get_theme')) {
+			$theme = wp_get_theme();
+			if (file_exists($style) && $theme->exists()) {
+				if ($theme->Stylesheet != $theme->Template) {
+					$themeTemplate = $theme->Template;
+				}
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		} elseif (function_exists('get_theme_data')) {
+			if (file_exists($style)) {
+				$theme = get_theme_data($style);
+				$themeTemplate = $theme['Template'];
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		} else {
+			if (file_exists($style)) {
+				$content = file_get_contents($style);
+				if ($content) {
+					$pattern = '/\s*template\s*:\s*([^\n]+)\s*/is';
+					preg_match($pattern, $content, $matches);
+					if (!empty($matches[1])) {
+						$themeTemplate = trim($matches[1]);
+					}
+				} else {
+					writeLog('Failed to read ' . $style);
+				}
+			} else {
+				writeLog($style . ' does not exist');
+			}
+		}
+
+		if ($themeTemplate == 'CherryFramework') {
+			$themePath = get_stylesheet_directory();
+			$files = scandir($themePath);
+			$themeTemplates = array_intersect($files, $cherryTemplates);
+
+			$cherryForceUpdate = false;
+
+			if (!empty($themeTemplates)) {
+				foreach ($themeTemplates as $template) {
+					$templatePath = $themePath . '/' . $template;
+					$content = file_get_contents($templatePath);
+					if ($content) {
+						$headerFooterMatchesCount = preg_match($headerFooterPattern, $content);
+						if ($headerFooterMatchesCount == 1) {
+							$cherryForceUpdate = true;
+							break;
+						}
+					} else {
+						writeLog('Failed to read ' . $templatePath);
+					}
+				}
+			}
+
+			if ($cherryForceUpdate) {
+				update_option('cherry_force_update', 1);
+			} else {
+				update_option('cherry_force_update', 0);
+			}
+		}
+	}
+//------------------------------------------------------
+//  slider function
+//------------------------------------------------------
+	if (!function_exists("my_post_type_slider")) {
+		function my_post_type_slider() {
+			register_post_type( 'slider',
+				array(
+					'label'               => theme_locals("slides"),
+					'singular_label'      => theme_locals("slides"),
+					'_builtin'            => false,
+					'exclude_from_search' => true, // Exclude from Search Results
+					'capability_type'     => 'page',
+					'public'              => true,
+					'show_ui'             => true,
+					'show_in_nav_menus'   => false,
+					'rewrite' => array(
+								'slug'       => 'slide-view',
+								'with_front' => FALSE,
+					),
+					'query_var' => "slide", // This goes to the WP_Query schema
+					'menu_icon' => PARENT_URL . '/includes/images/icon_slides.png',
+					'supports'  => array(
+									'title',
+									// 'custom-fields',
+									'thumbnail'
+					)
+				)
+			);
+		}
+		add_action('init', 'my_post_type_slider');
+	}
+	if (!function_exists("get_slider_template_part")) {
+		function get_slider_template_part() {
+			switch (of_get_option('slider_type')) {
+				case "accordion_slider":
+					$slider_type = "accordion";
+				break;
+				default:
+					$slider_type = "slider";
+			}
+			return get_template_part($slider_type);
+		}
+	}
+//------------------------------------------------------
+//  Warning notice
+//------------------------------------------------------
+	add_action( 'admin_notices', 'warning_notice' );
+	function warning_notice() {
+		global $pagenow;
+		$pageHidden = array('admin.php');
+		if (!get_user_meta(get_current_user_id(), '_wp_hide_notice', true) && is_admin() && !FILE_WRITEABLE && !in_array($pagenow, $pageHidden)) {
+			printf(''.theme_locals('warning_notice_2').'
'.theme_locals('warning_notice_3').'
'.theme_locals('dismiss_notice').'');
+		}
+	}
+//------------------------------------------------------
+//  Post Meta
+//------------------------------------------------------
+	$global_meta_elements = array();
+	function get_post_metadata( $args = array() ) {
+		global $global_meta_elements;
+		if(array_key_exists('meta_elements', $args)){
+			$global_meta_elements = array_unique(array_merge($global_meta_elements, $args['meta_elements']));
+		}
+
+		$meta_elements_empty  = isset($args['meta_elements']) ? false : true ;
+		$defaults = array(
+						'meta_elements' =>  array('start_unite', 'date', 'author', 'permalink', 'end_unite', 'start_unite', 'categories', 'tags', 'end_unite', 'start_unite', 'comment', 'views', 'like', 'dislike', 'end_unite'),
+						'meta_class' => 'post_meta',
+						'meta_before' => '',
+						'meta_after'  => '',
+						'display_meta_data' => true
+					);
+		$args = wp_parse_args( $args, $defaults );
+		$post_meta_type = (of_get_option('post_meta') == 'true' || of_get_option('post_meta') == '') ? 'line' : of_get_option('post_meta');
+		if($meta_elements_empty){
+			foreach ($global_meta_elements as $key) {
+				if($key != 'end_unite || start_unite'){
+				unset($args['meta_elements'][array_search($key, $args['meta_elements'])]);
+				}
+			}
+		}
+
+		if($post_meta_type!='false' && $args['display_meta_data']){
+			$post_ID = get_the_ID();
+			$post_type = get_post_type($post_ID);
+			$icon_tips_before = ($post_meta_type == 'icon') ? '' : '';
+			$icon_tips_after = ($post_meta_type == 'icon') ? '' : '';
+
+			$user_login = is_user_logged_in() ? true : false;
+			$user_id = $user_login ? get_current_user_id() : "";
+			$voting_class = $user_login ? 'ajax_voting ' : 'not_voting ';
+			$voting_url = PARENT_URL.'/includes/voting.php?post_ID='.$post_ID.'&get_user_ID='.$user_id;
+			$get_voting_array = cherry_getPostVoting($post_ID, $user_id);
+			$user_voting = $get_voting_array['user_voting'];
+
+			echo $args['meta_before'].'';
+				foreach ($args['meta_elements'] as $value) {
+					switch ($value) {
+						case 'date':
+							if(of_get_option('post_date') != 'no'){ ?>
+								
+									
+									' . get_the_date() . '' . $icon_tips_after; ?>
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									'.theme_locals('permalink_to').''.$icon_tips_after; ?>
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									
+									
+								
+								
+								
+									 class="" title="" date-type="dislike" >
+										
+										'.$dislike_count.''.$icon_tips_after; ?>
+									
+								
+								
+								
+									 class="" title="" date-type="like" >
+										
+										'.$like_count.''.$icon_tips_after; ?>
+									
+								
+								';
+						break;
+						case 'end_unite':
+							echo '';
+						break;
+						case 'start_group':
+							echo '';
+						break;
+						case 'end_group':
+							echo '';
+						break;
+					}
+				}
+			echo '

'.$args['meta_after'];
+		}
+	}
+//------------------------------------------------------
+//  Post Views
+//------------------------------------------------------
+	function cherry_getPostViews($postID){
+		return (get_post_meta($postID, 'post_views_count', true) == '') ? "0" : get_post_meta($postID, 'post_views_count', true);
+	}
+	function cherry_setPostViews($postID){
+		$count_key = 'post_views_count';
+		$count = get_post_meta($postID, $count_key, true);
+		if($count==''){
+			$count = 1;
+		}else{
+			$count++;
+		}
+		update_post_meta($postID, $count_key, $count);
+	}
+//------------------------------------------------------
+//  Post voting
+//------------------------------------------------------
+	function cherry_getPostVoting($postID, $user_id){
+		$like_count = (get_post_meta($postID, 'post_like', true) == false) ? "0" : get_post_meta($postID, 'post_like', true);
+		$dislike_count = (get_post_meta($postID, 'post_dislike', true) == false) ? "0" : get_post_meta($postID, 'post_dislike', true);
+		$user_like_array = get_post_meta($postID, 'user_like');
+		$user_dislike_array = get_post_meta($postID, 'user_dislike');
+		$user_voting = 'none';
+		if(in_array($user_id, $user_like_array)){
+			$user_voting = 'like';
+		}else if(in_array($user_id, $user_dislike_array)){
+			$user_voting = 'dislike';
+		}
+		return array('like_count' => $like_count, 'dislike_count' => $dislike_count, 'user_voting' => $user_voting);
+	}
+//------------------------------------------------------
+//  Get team social networks
+//------------------------------------------------------
+	function cherry_get_post_networks($args = array()){
+		global $post;
+		extract(
+			wp_parse_args(
+				$args,
+				array(
+					'post_id' => get_the_ID(),
+					'class' => 'post_networks',
+					'before_title' => '',
+					'after_title' => '',
+					'display_title' => true,
+					'output_type' => 'echo'
+				)
+			)
+		);
+		$networks_array = explode(" ", get_option('fields_id_value'.$post_id, ''));
+
+		if($networks_array[0]!=''){
+			$count = 0;
+			$network_title = get_post_meta($post_id, 'network_title', true);
+
+			$output = '';
+			$output .= $network_title && $display_title ? $before_title.$network_title.$after_title : '';
+			$output .= '';
+			foreach ($networks_array as $networks_id) {
+				$network_array = explode(";", get_option('network_'.$post_id.'_'.$networks_id, array('','','')));
+				$output .= '';
+				$output .= $network_array[2] ? '' : '' ;
+				$output .= $network_array[0] ? '' :'';
+				$output .= $network_array[1] ? ''.$network_array[1].'' : '' ;
+				$output .= $network_array[2] ? '' : '' ;
+				$output .= '';
+				++$count;
+			}
+			$output .= '';
+			if($output_type == 'echo'){
+				echo $output;
+			}else{
+				return $output;
+			}
+		}
+	}
+//------------------------------------------------------
+//  Related Posts
+//------------------------------------------------------
+	if(!function_exists('cherry_related_posts')){
+		function cherry_related_posts($args = array()){
+			global $post;
+			$default = array(
+				'post_type' => get_post_type($post),
+				'class' => 'related-posts',
+				'class_list' => 'related-posts_list',
+				'class_list_item' => 'related-posts_item',
+				'display_title' => true,
+				'display_link' => true,
+				'display_thumbnail' => true,
+				'width_thumbnail' => 250,
+				'height_thumbnail' => 150,
+				'before_title' => '',
+				'after_title' => '',
+				'posts_count' => 4
+			);
+			extract(array_merge($default, $args));
+
+			$post_tags = wp_get_post_terms($post->ID, $post_type.'_tag', array("fields" => "slugs"));
+			$tags_type = $post_type=='post' ? 'tag' : $post_type.'_tag' ;
+			$suppress_filters = get_option('suppress_filters');// WPML filter
+			$blog_related = apply_filters( 'cherry_text_translate', of_get_option('blog_related'), 'blog_related' );
+			if ($post_tags && !is_wp_error($post_tags)) {
+				$args = array(
+					"$tags_type" => implode(',', $post_tags),
+					'post_status' => 'publish',
+					'posts_per_page' => $posts_count,
+					'ignore_sticky_posts' => 1,
+					'post__not_in' => array($post->ID),
+					'post_type' => $post_type,
+					'suppress_filters' => $suppress_filters
+					);
+				query_posts($args);
+				if ( have_posts() ) {
+					$output = '';
+					$output .= $display_title ? $before_title.$blog_related.$after_title : '' ;
+					$output .= '';
+					while( have_posts() ) {
+						the_post();
+						$thumb   = has_post_thumbnail() ? get_post_thumbnail_id() : PARENT_URL.'/images/empty_thumb.gif';
+						$blank_img = stripos($thumb, 'empty_thumb.gif');
+						$img_url = $blank_img ? $thumb : wp_get_attachment_url( $thumb,'full');
+						$image   = $blank_img ? $thumb : aq_resize($img_url, $width_thumbnail, $height_thumbnail, true) or $img_url;
+
+						$output .= '';
+						$output .= $display_thumbnail ? '': '' ;
+						$output .= $display_link ? ''.get_the_title().'': '' ;
+						$output .= '';
+					}
+					$output .= '';
+					echo $output;
+				}
+				wp_reset_query();
+			}
+		}
+	}
+
+//------------------------------------------------------
+//  Main Layout option
+//------------------------------------------------------
+	if (of_get_option('main_layout') == 'fixed') {
+		add_filter('body_class','cherry_layout_class');
+		function cherry_layout_class($classes) {
+			$classes[] = 'cherry-fixed-layout';
+
+			return $classes;
+		}
+	}
+
+//------------------------------------------------------
+//  General option
+//------------------------------------------------------
+	if ( (of_get_option('header_background') != '')
+		|| (of_get_option('header_color') !='')
+		|| (of_get_option('body_background') !='')
+		|| (of_get_option('custom_css') !='') ) {
+
+		add_action('wp_head', 'cherry_general_opt');
+		function cherry_general_opt(){
+			$output = "\n";
+			echo $output;
+		}
+	}
+
+	/**
+	*
+	* Register hook in update.php page
+	*
+	**/
+	add_action('load-update.php', 'cherry_register_update_page_hook');
+	function cherry_register_update_page_hook(){
+		if ( isset($_GET['action']) ) {
+			$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
+			$theme  = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
+			$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+
+			if ( 'CherryFramework' == $theme ) {
+
+				if ( 'upgrade-theme' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+				} elseif ( 'upload-theme' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+				}
+			}
+
+			if ( 'cherry-plugin' == $plugin ) {
+
+				if ( 'upgrade-plugin' == $action ) {
+					add_action('upgrader_process_complete', 'after_cherry_plugin_upgrade_call');
+				}
+			}
+		}
+	}
+
+	/**
+	*
+	* Register hook in update-core.php page
+	*
+	**/
+	add_action('load-update-core.php', 'cherry_register_update_core_page_hook');
+	function cherry_register_update_core_page_hook(){
+		if ( isset( $_GET['themes'] ) )
+			$themes = explode( ',', stripslashes($_GET['themes']) );
+		elseif ( isset( $_POST['checked'] ) )
+			$themes = (array) $_POST['checked'];
+
+		if ( !isset($themes) )
+			return;
+
+		if ( array_search('CherryFramework', $themes) === FALSE )
+			return;
+
+		if ( isset($_GET['action']) ) {
+			$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+
+			if ( 'do-theme-upgrade' == $action ) {
+				add_action('upgrader_process_complete', 'after_cherry_theme_upgrade_call');
+			}
+		}
+	}
+
+	/**
+	*
+	* Register hook after CherryFramework upgrade
+	*
+	**/
+	function after_cherry_theme_upgrade_call(){
+		do_action('after_cherry_theme_upgrade');
+	}
+
+	/**
+	*
+	* Register hook after Cherry Plugin upgrade
+	*
+	**/
+	function after_cherry_plugin_upgrade_call(){
+		do_action('after_cherry_plugin_upgrade');
+	}
+
+	/**
+	*
+	* Unpack Cherry Plugin package
+	*
+	**/
+	add_action('after_cherry_theme_upgrade', 'cherry_plugin_unpack_package');
+	function cherry_plugin_unpack_package(){
+		$plugin = 'cherry-plugin/cherry-plugin.php';
+
+		if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+			return;
+		}
+
+		if ( !function_exists( 'is_plugin_active' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
+
+		if ( is_plugin_active( $plugin ) )
+			return;
+
+		$file   = PARENT_DIR . '/includes/plugins/cherry-plugin.zip';
+		$to     = WP_PLUGIN_DIR . '/cherry-plugin/';
+		$result = false;
+
+		if ( !file_exists($file) )
+			return $result;
+
+		if ( !function_exists('WP_Filesystem') ) {
+			require_once(ABSPATH . 'wp-admin/includes/file.php');
+		}
+		WP_Filesystem();
+		global $wp_filesystem;
+
+		// Clean up plugin directory
+		if ( $wp_filesystem->is_dir($to) )
+			$wp_filesystem->delete($to, true);
+
+		$result = unzip_file( $file, $to );
+		if ( is_wp_error($result) ) {
+			if ( 'incompatible_archive' == $result->get_error_code() ) {
+				return new WP_Error( 'incompatible_archive', __('The package could not be installed.', CURRENT_THEME), $result->get_error_data() );
+			}
+		}
+		return $result;
+	}
+
+	/**
+	*
+	* Set Up Cherry Plugin
+	*
+	**/
+	add_action('after_setup_theme', 'cherry_plugin_setup');
+	function cherry_plugin_setup(){
+		$plugin = 'cherry-plugin/cherry-plugin.php';
+
+		if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+			return;
+		}
+
+		if ( !function_exists( 'is_plugin_active' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
+
+		if ( is_plugin_active( $plugin ) )
+			return;
+
+		$file   = PARENT_DIR . '/includes/plugins/cherry-plugin.zip';
+		$to     = WP_PLUGIN_DIR . '/cherry-plugin/';
+		$result = false;
+
+		if ( !file_exists($file) )
+			return $result;
+
+		if ( !function_exists('WP_Filesystem') ) {
+			require_once(ABSPATH . 'wp-admin/includes/file.php');
+		}
+		WP_Filesystem();
+		global $wp_filesystem;
+
+		$result = unzip_file( $file, $to );
+		if ( is_wp_error($result) ) {
+			if ( 'incompatible_archive' == $result->get_error_code() ) {
+				return new WP_Error( 'incompatible_archive', __('The package could not be installed.', CURRENT_THEME), $result->get_error_data() );
+			}
+		}
+		return $result;
+	}
+
+	/**
+	*
+	* Layout class
+	*
+	**/
+	if ( !function_exists('cherry_get_layout_class') ) {
+		function cherry_get_layout_class($layout) {
+			switch ($layout) {
+
+				case 'full_width_content':
+					$layout_class = apply_filters( "cherry_layout_wrapper", "span12" );
+					break;
+
+				case 'content':
+					$layout_class = apply_filters( "cherry_layout_content_column", "span8" );
+					$layout_class .= ' '.of_get_option('blog_sidebar_pos');
+					break;
+
+				case 'sidebar':
+					$layout_class = apply_filters( "cherry_layout_sidebar_column", "span4" );
+					break;
+
+				case 'left_block':
+					$layout_class = apply_filters( "cherry_layout_left_block_column", "span7" );
+					break;
+
+				case 'right_block':
+					$layout_class = apply_filters( "cherry_layout_right_block_column", "span5" );
+					break;
+			}
+
+			return $layout_class;
+		}
+	}
+=======
 >>>>>> .r12027
+
+	/**
+	 * Cookie Banner option.
+	 */
+	add_action( 'wp_footer', 'cherry_cookie_banner', 999 );
+	function cherry_cookie_banner() {
+		$is_banner_visibility = of_get_option( 'cookie_banner', false );
+		$banner_text          = trim( of_get_option( 'cookie_banner_text', '' ) );
+		$banner_dismiss       = false;
+
+		if ( 'yes' != $is_banner_visibility ) { ?>
+			
+			
+
+		
+			
+				
+				
+			
+		
+
+		
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/header.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/header.php
index 4be5bfa6..aa2b0d96 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/header.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/header.php
@@ -1,3 +1,247 @@
+<<<<<<< .mine
+
+
+
+
+
+> 
+
+	<?php if ( is_category() ) {
+		echo theme_locals("category_for")." ""; single_cat_title(); echo '" | '; bloginfo( 'name' );
+	} elseif ( is_tag() ) {
+		echo theme_locals("tag_for")." ""; single_tag_title(); echo '" | '; bloginfo( 'name' );
+	} elseif ( is_archive() ) {
+		wp_title(''); echo " ".theme_locals("archive")." | "; bloginfo( 'name' );
+	} elseif ( is_search() ) {
+		echo theme_locals("fearch_for")." "".esc_html($s).'" | '; bloginfo( 'name' );
+	} elseif ( is_home() || is_front_page()) {
+		bloginfo( 'name' ); echo ' | '; bloginfo( 'description' );
+	}  elseif ( is_404() ) {
+		echo theme_locals("error_404")." | "; bloginfo( 'name' );
+	} elseif ( is_single() ) {
+		wp_title('');
+	} else {
+		wp_title( ' | ', true, 'right' ); bloginfo( 'name' );
+	} ?>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		 * tag of your theme, or you will break many plugins, which
+		 * generally use this hook to add elements to  such
+		 * as styles, scripts, and meta tags.
+		 */
+		wp_head();
+	?>
+	
+	
+	
+		
+		
+	
+	
+	
+	
+
+
+>
+	
+		
+		
+			
+				
+					
+						
+					
+				
+			
+||||||| .r11156
+
+
+
+
+
+> 
+
+	<?php if ( is_category() ) {
+		echo theme_locals("category_for")." ""; single_cat_title(); echo '" | '; bloginfo( 'name' );
+	} elseif ( is_tag() ) {
+		echo theme_locals("tag_for")." ""; single_tag_title(); echo '" | '; bloginfo( 'name' );
+	} elseif ( is_archive() ) {
+		wp_title(''); echo " ".theme_locals("archive")." | "; bloginfo( 'name' );
+	} elseif ( is_search() ) {
+		echo theme_locals("fearch_for")." "".esc_html($s).'" | '; bloginfo( 'name' );
+	} elseif ( is_home() || is_front_page()) {
+		bloginfo( 'name' ); echo ' | '; bloginfo( 'description' );
+	}  elseif ( is_404() ) {
+		echo theme_locals("error_404")." | "; bloginfo( 'name' );
+	} elseif ( is_single() ) {
+		wp_title('');
+	} else {
+		wp_title( ' | ', true, 'right' ); bloginfo( 'name' );
+	} ?>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		 * tag of your theme, or you will break many plugins, which
+		 * generally use this hook to add elements to  such
+		 * as styles, scripts, and meta tags.
+		 */
+		wp_head();
+	?>
+	
+	
+	
+		
+		
+	
+	
+	
+	
+
+
+>
+	
+		
+		
+			
+				
+					
+						
+					
+				
+			
+=======
 
 
 
@@ -119,4 +363,5 @@


+>>>>>>> .r12027
 		
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/includes/theme-function.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/includes/theme-function.php
index 4f86080f..9c110787 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/includes/theme-function.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/includes/theme-function.php
@@ -1,3 +1,1595 @@
+<<<<<<< .mine
+ $word_limit )
+			array_pop($words);
+		return implode(' ', $words).'... ';
+	}
+}
+
+// The excerpt based on character
+if ( !function_exists('my_string_limit_char') ) {
+	function my_string_limit_char($excerpt, $substr=0){
+		$string = strip_tags(str_replace('...', '...', $excerpt));
+		if ( $substr > 0 ) {
+			$string = substr($string, 0, $substr);
+		}
+		return $string;
+	}
+}
+
+// Generates a random string
+function gener_random($length){
+	srand((double)microtime()*1000000 );
+	$random_id = "";
+	$char_list = "abcdefghijklmnopqrstuvwxyz";
+	for( $i = 0; $i < $length; $i++ ) {
+		$random_id .= substr($char_list,(rand()%(strlen($char_list))), 1);
+	}
+	return $random_id;
+}
+
+// Remove Empty Paragraphs
+add_filter('the_content', 'shortcode_empty_paragraph_fix');
+function shortcode_empty_paragraph_fix($content) {
+	$array = array (
+			'['    => '[',
+			']'   => ']',
+			']
' => ']'
+	);
+	$content = strtr($content, $array);
+	return $content;
+}
+
+// Add Thumb Column
+if ( !function_exists('fb_AddThumbColumn') && function_exists('add_theme_support') ) {
+	// for post and page
+	add_theme_support('post-thumbnails', array( 'post', 'page' ) );
+	function fb_AddThumbColumn($cols) {
+	$cols['thumbnail'] = theme_locals("thumbnail");
+	return $cols;
+}
+function fb_AddThumbValue($column_name, $post_id) {
+	$width = (int) 35;
+	$height = (int) 35;
+	if ( 'thumbnail' == $column_name ) {
+		// thumbnail of WP 2.9
+		$thumbnail_id = get_post_meta( $post_id, '_thumbnail_id', true );
+		// image from gallery
+		$attachments = get_children( array('post_parent' => $post_id, 'post_type' => 'attachment', 'post_mime_type' => 'image') );
+		if ($thumbnail_id)
+			$thumb = wp_get_attachment_image( $thumbnail_id, array($width, $height), true );
+		elseif ($attachments) {
+			foreach ( $attachments as $attachment_id => $attachment ) {
+				$thumb = wp_get_attachment_image( $attachment_id, array($width, $height), true );
+			}
+		}
+		if ( isset($thumb) && $thumb ) {
+			echo $thumb;
+		} else {
+			echo theme_locals("none");
+		}
+	}
+}
+// for posts
+add_filter( 'manage_posts_columns', 'fb_AddThumbColumn' );
+add_action( 'manage_posts_custom_column', 'fb_AddThumbValue', 10, 2 );
+// for pages
+add_filter( 'manage_pages_columns', 'fb_AddThumbColumn' );
+add_action( 'manage_pages_custom_column', 'fb_AddThumbValue', 10, 2 );
+}
+
+/**
+ * Add dropdowns for portfolio filters in admin
+ */
+function cherry_show_portfolio_filter() {
+	global $typenow, $wp_query;
+
+	if ($typenow=='portfolio') :
+		$portf_taxes = array( 'portfolio_category', 'portfolio_tag' );
+		foreach ($portf_taxes as $tax) {
+			$tax_obj = get_taxonomy($tax);
+
+			if ( isset($_GET[$tax]) ) {
+				$selected = $_GET[$tax];
+			} else {
+				$selected = '';
+			}
+
+			wp_dropdown_categories(array(
+				'show_option_all' => theme_locals("show_all") . $tax_obj->label,
+				'taxonomy'        => $tax,
+				'name'            => $tax_obj->name,
+				'orderby'         => 'term_order',
+				'selected'        => $selected,
+				'hierarchical'    => $tax_obj->hierarchical,
+				'show_count'      => false,
+				'hide_empty'      => true
+			));
+		}
+	endif;
+}
+add_action('restrict_manage_posts', 'cherry_show_portfolio_filter');
+
+/**
+ * Filter portfolio by cats and tags
+ */
+function cherry_portfolio_filter_query( $query ) {
+	global $typenow, $wp_query;
+
+	if ( $typenow == 'portfolio' ) {
+		// By Categories
+		if ( isset($_GET['portfolio_category']) && ! empty( $_GET['portfolio_category'] ) && 0 != $_GET['portfolio_category'] ) {
+				$cat_term = get_term_by( 'id', $_GET['portfolio_category'], 'portfolio_category' );
+			$query->query_vars['portfolio_category'] = $cat_term->slug;
+		}
+
+		// By Tags
+		if ( isset($_GET['portfolio_tag']) && ! empty( $_GET['portfolio_tag'] ) && 0 != $_GET['portfolio_tag'] ) {
+				$tag_term = get_term_by( 'id', $_GET['portfolio_tag'], 'portfolio_tag' );
+			$query->query_vars['portfolio_tag'] = $tag_term->slug;
+		}
+	}
+}
+add_filter( 'parse_query', 'cherry_portfolio_filter_query' );
+
+// Add to admin_init function
+add_action('manage_portfolio_posts_custom_column' , 'custom_portfolio_columns', 10, 2);
+add_filter('manage_edit-portfolio_columns', 'my_portfolio_columns');
+//Add columns for portfolio posts
+function my_portfolio_columns($columns) {
+	$columns = array(
+		"cb" => "",
+		"title" => theme_locals("title"),
+		"portfolio_categories" => theme_locals("categories"),
+		"portfolio_tags" => theme_locals("tags"),
+		"comments" => "",
+		"date" => theme_locals("date"),
+		"thumbnail" => theme_locals("thumbnail")
+	);
+	return $columns;
+}
+function custom_portfolio_columns( $column, $post_id ) {
+	switch ( $column ) {
+	case 'portfolio_categories':
+		$terms = get_the_term_list( $post_id , 'portfolio_category' , '' , ',' , '' );
+		if ( is_string( $terms ) ) {
+			echo $terms;
+		} else {
+			echo theme_locals('uncategorized');
+		}
+		break;
+	case 'portfolio_tags':
+		$terms = get_the_term_list( $post_id , 'portfolio_tag' , '' , ',' , '' );
+		if ( is_string( $terms ) ) {
+			echo $terms;
+		}
+		break;
+	}
+}
+
+/*-----------------------------------------------------------------------------------*/
+/* Output image */
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'tz_image' ) ) {
+	function tz_image( $postid = null, $imagesize ) {
+
+		$post_id = ( null === $postid ) ? get_the_ID() : $postid;
+
+		if ( has_post_thumbnail( $postid ) ):
+
+			$lightbox = get_post_meta( $post_id, 'tz_image_lightbox', TRUE );
+
+			if ( $lightbox == 'yes' )
+				$lightbox = TRUE;
+			else
+				$lightbox = FALSE;
+
+			$src     = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), array( '9999','9999' ), false, '' );
+			$thumb   = get_post_thumbnail_id();
+			$img_url = wp_get_attachment_url( $thumb, 'full' ); //get img URL
+			$image   = aq_resize( $img_url, 700, 460, true ); //resize & crop img
+
+			if ( $lightbox ) :
+				echo '
';
+			else :
+				echo '
';
+			endif;
+
+		endif;
+
+	}
+}
+
+
+/*-----------------------------------------------------------------------------------*/
+/* Output gallery */
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'tz_grid_gallery' ) ) {
+
+	function tz_grid_gallery($postid, $imagesize) {
+		$single_folio_layout = of_get_option('single_folio_layout');
+		$single_gallery_layout = of_get_option('single_gallery_layout');
+
+		if ( $single_gallery_layout == 'masonry' ) {
+
+			add_action( 'wp_footer', 'cherry_enqueue_isotope' );
+
+		} ?>
+
+		
+		
+			
+			 'menu_order',
+						'order'          => 'ASC',
+						'post_type'      => 'attachment',
+						'post_parent'    => get_the_ID(),
+						'post_mime_type' => 'image',
+						'post_status'    => null,
+						'numberposts'    => -1,
+				);
+				$attachments = get_posts($args);
+
+				$lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE);
+				if($lightbox == 'yes')
+					$lightbox = TRUE;
+				else
+					$lightbox = FALSE;
+				$src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' );
+
+			if ($attachments) :
+				foreach ($attachments as $attachment) :
+					$attachment_url = wp_get_attachment_image_src( $attachment->ID, 'full' );
+					$url			= $attachment_url['0'];
+					$imgWidth		= $attachment_url['1'];
+					$imgHeight		= $attachment_url['2'];
+
+					switch ($single_gallery_layout) {
+						case 'grid':
+							if($single_folio_layout=='grid'){
+								$new_width	= 260;
+								$new_height	= 160;
+							}else{
+								$new_width	= 390;
+								$new_height	= 260;
+							}
+							break;
+						case 'masonry':
+							if($single_folio_layout=='grid'){
+								$new_width	= 260;
+								$new_height	= $imgHeight / $imgWidth * $new_width;
+							}else{
+								$new_width	= 390;
+								$new_height	= $imgHeight / $imgWidth * $new_width;
+							}
+							break;
+					}
+					$image	= aq_resize($url, $new_width, $new_height, true);
+				?>
+				
+					
+					
+						
+						
+						
+					
+						
+					
+				
+			
+
+			
+
+			
+		
+		
+	
+		
+			
+
+			
+				
+				 'menu_order',
+						'order'          => 'ASC',
+						'post_type'      => 'attachment',
+						'post_parent'    => get_the_ID(),
+						'post_mime_type' => 'image',
+						'post_status'    => null,
+						'numberposts'    => -1,
+					);
+					$attachments = get_posts($args);
+
+					$lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE);
+					if($lightbox == 'yes')
+						$lightbox = TRUE;
+					else
+						$lightbox = FALSE;
+					$src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' );
+
+					if ($attachments) :
+						foreach ($attachments as $attachment) :
+						$attachment_url = wp_get_attachment_image_src( $attachment->ID, 'full' );
+						$url            = $attachment_url['0'];
+						$image          = aq_resize($url, 650, 400, true);
+					?>
+
+					
+						
+							
+								
+								
+							
+						
+							
+						
+					
+					
+					
+				
+			
+	
+		
+
+		
+		
+			
+				
+					
+						
+							
+								
+							
+						
+						
+						
+						
+						
+							
+								">
+								">
+								">
+								">
+								">
+							
+							
+								
+							
+							
+								">
+								">
+							
+						
+					
+					
+						
+					
+				
+			
+			
+				
+					
+				
+			
+		
+		
+			
+				
+			
+		
+			
+
+			
+				
+					
+						
+						
+							
+								Play
+							
+							
+								
+									
+										
+									
+								
+								
+								
+								
+								
+									
+										">
+										">
+										">
+										">
+										">
+									
+									
+										
+									
+									
+										">
+										">
+									
+								
+							
+							
+								
+							
+						
+					
+				
+			
+		query_vars['paged'];
+		if( empty($paged) || $paged == 0 ) $paged = 1;
+
+		if ( $pages == '' ) {
+			$pages = $wp_query->max_num_pages;
+			if( !$pages ) {
+				$pages = 1;
+			}
+		}
+		if ( 1 != $pages ) {
+			echo "";
+			if ( $paged > 2 && $paged > $range+1 && $showitems < $pages ) echo "".theme_locals("first")."";
+			if ( $paged > 1 && $showitems < $pages ) echo "".theme_locals("prev")."";
+
+			for ( $i = 1; $i <= $pages; $i++ ) {
+				if (1 != $pages &&( !($i >= $paged+$range+1 || $i <= $paged-$range-1) || $pages <= $showitems )) {
+					echo ($paged == $i)? "".$i."
":"".$i."";
+				}
+			}
+
+			if ( $paged < $pages && $showitems < $pages ) echo "".theme_locals("next")."";
+			if ( $paged < $pages-1 && $paged+$range-1 < $pages && $showitems < $pages ) echo "".theme_locals("last")."";
+			echo "\n";
+		}
+	}
+}
+
+
+/*-----------------------------------------------------------------------------------*/
+/* Custom Comments Structure
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'mytheme_comment' ) ) {
+	function mytheme_comment($comment, $args, $depth) {
+		$GLOBALS['comment'] = $comment;
+	?>
+	 id="li-comment-">
+		
+			
+				
+					comment_author_email, 65 ); ?>
+					%1$s', get_comment_author_link()) ?>
+				
+				comment_approved == '0') : ?>
+					
+				
+				
+					
+				
+			
+			
+				
+					 $depth, 'max_depth' => $args['max_depth']))) ?>
+				
+				
+			
+		
+'; // divider
+	$home        = get_the_title( get_option('page_on_front', true) ); // text for link "Home"
+	$showCurrent = 1; // 1 - show title current post/page, 0 - hide
+	$before      = ''; // open tag for active breadcrumb
+	$after       = ''; // close tag for active breadcrumb
+
+	global $post;
+	$homeLink = home_url();
+
+	if (is_front_page()) {
+		if ($showOnHome == 1)
+			echo '' . $home . '
';
+		} else {
+			echo '' . $home . '' . $delimiter;
+
+			if ( is_home() ) {
+				$blog_text = of_get_option('blog_text');
+				if ($blog_text == '' || empty($blog_text)) {
+					echo theme_locals("blog");
+				}
+				echo $before . $blog_text . $after;
+			}
+			elseif ( is_category() ) {
+				$thisCat = get_category(get_query_var('cat'), false);
+				if ($thisCat->parent != 0) echo get_category_parents($thisCat->parent, TRUE, ' ' . $delimiter . ' ');
+				echo $before . theme_locals("category_archives").': "' . single_cat_title('', false) . '"' . $after;
+			}
+			elseif ( is_search() ) {
+				echo $before . theme_locals("fearch_for") . ': "' . get_search_query() . '"' . $after;
+			}
+			elseif ( is_day() ) {
+				echo '' . get_the_time('Y') . ' ' . $delimiter . ' ';
+				echo '' . get_the_time('F') . ' ' . $delimiter . ' ';
+				echo $before . get_the_time('d') . $after;
+			}
+			elseif ( is_month() ) {
+				echo '' . get_the_time('Y') . ' ' . $delimiter . ' ';
+				echo $before . get_the_time('F') . $after;
+			}
+			elseif ( is_year() ) {
+				echo $before . get_the_time('Y') . $after;
+			}
+			elseif ( is_tax(get_post_type().'_category') ) {
+				$post_name = get_post_type();
+				echo $before . ucfirst($post_name) . ' ' . theme_locals('category') . ': ' . single_cat_title( '', false ) . $after;
+			}
+			elseif ( is_single() && !is_attachment() ) {
+				if ( get_post_type() != 'post' ) {
+					$post_id = get_the_ID();
+					$post_name = get_post_type();
+					$post_type = get_post_type_object(get_post_type());
+					// echo '' . $post_type->labels->name . '';
+
+					$terms = get_the_terms( $post_id, $post_name.'_category');
+					if ( $terms && ! is_wp_error( $terms ) ) {
+						echo ''.current($terms)->name.'';
+						echo ' ' . $delimiter . ' ';
+					} else {
+						// echo '' . $post_type->labels->name . '';
+					}
+
+					if ($showCurrent == 1)
+						echo $before . get_the_title() . $after;
+				} else {
+					$cat = get_the_category();
+					if (!empty($cat)) {
+						$cat  = $cat[0];
+						$cats = get_category_parents($cat, TRUE, '' . $delimiter . '');
+						if ($showCurrent == 0)
+							$cats = preg_replace("#^(.+)\s$delimiter\s$#", "$1", $cats);
+						echo '
' . substr($cats, 0, strlen($cats)-4);
+					}
+					if ($showCurrent == 1)
+						echo $before . get_the_title() . $after;
+				}
+			}
+			elseif ( !is_single() && !is_page() && get_post_type() != 'post' && !is_404() ) {
+				$post_type = get_post_type_object(get_post_type());
+				if ( isset($post_type) ) {
+					echo $before . $post_type->labels->singular_name . $after;
+				}
+			}
+			elseif ( is_attachment() ) {
+				$parent = get_post($post->post_parent);
+				$cat    = get_the_category($parent->ID);
+				if ( isset($cat) && !empty($cat)) {
+					$cat    = $cat[0];
+					echo get_category_parents($cat, TRUE, ' ' . $delimiter . ' ');
+					echo '
' . $parent->post_title . '';
+				}
+				if ($showCurrent == 1)
+					echo $before . get_the_title() . $after;
+			}
+			elseif ( is_page() && !$post->post_parent ) {
+				if ($showCurrent == 1)
+					echo $before . get_the_title() . $after;
+			}
+			elseif ( is_page() && $post->post_parent ) {
+				$parent_id  = $post->post_parent;
+				$breadcrumbs = array();
+				while ($parent_id) {
+					$page          = get_page($parent_id);
+					$breadcrumbs[] = '' . get_the_title($page->ID) . '';
+					$parent_id     = $page->post_parent;
+				}
+				$breadcrumbs = array_reverse($breadcrumbs);
+				for ($i = 0; $i < count($breadcrumbs); $i++) {
+					echo $breadcrumbs[$i];
+					if ($i != count($breadcrumbs)-1) echo ' ' . $delimiter . ' ';
+				}
+				if ($showCurrent == 1)
+					echo ' ' . $delimiter . ' ' . $before . get_the_title() . $after;
+			}
+			elseif ( is_tag() ) {
+				echo $before . theme_locals("tag_archives") . ': "' . single_tag_title('', false) . '"' . $after;
+			}
+			elseif ( is_author() ) {
+				global $author;
+				$userdata = get_userdata($author);
+				echo $before . theme_locals("by") . ' ' . $userdata->display_name . $after;
+			}
+			elseif ( is_404() ) {
+				echo $before . '404' . $after;
+			}
+			echo '';
+		}
+	} // end breadcrumbs()
+||||||| .r11156
+ $word_limit )
+		array_pop($words);
+	return implode(' ', $words).'... ';
+}
+
+// The excerpt based on character
+function my_string_limit_char($excerpt, $substr=0){
+	$string = strip_tags(str_replace('...', '...', $excerpt));
+	if ( $substr > 0 ) {
+		$string = substr($string, 0, $substr);
+	}
+	return $string;
+}
+
+// Generates a random string
+function gener_random($length){
+	srand((double)microtime()*1000000 );
+	$random_id = "";
+	$char_list = "abcdefghijklmnopqrstuvwxyz";
+	for( $i = 0; $i < $length; $i++ ) {
+		$random_id .= substr($char_list,(rand()%(strlen($char_list))), 1);
+	}
+	return $random_id;
+}
+
+// Remove Empty Paragraphs
+add_filter('the_content', 'shortcode_empty_paragraph_fix');
+function shortcode_empty_paragraph_fix($content) {
+	$array = array (
+			'['    => '[',
+			']'   => ']',
+			']
' => ']'
+	);
+	$content = strtr($content, $array);
+	return $content;
+}
+
+// Add Thumb Column
+if ( !function_exists('fb_AddThumbColumn') && function_exists('add_theme_support') ) {
+	// for post and page
+	add_theme_support('post-thumbnails', array( 'post', 'page' ) );
+	function fb_AddThumbColumn($cols) {
+	$cols['thumbnail'] = theme_locals("thumbnail");
+	return $cols;
+}
+function fb_AddThumbValue($column_name, $post_id) {
+	$width = (int) 35;
+	$height = (int) 35;
+	if ( 'thumbnail' == $column_name ) {
+		// thumbnail of WP 2.9
+		$thumbnail_id = get_post_meta( $post_id, '_thumbnail_id', true );
+		// image from gallery
+		$attachments = get_children( array('post_parent' => $post_id, 'post_type' => 'attachment', 'post_mime_type' => 'image') );
+		if ($thumbnail_id)
+			$thumb = wp_get_attachment_image( $thumbnail_id, array($width, $height), true );
+		elseif ($attachments) {
+			foreach ( $attachments as $attachment_id => $attachment ) {
+				$thumb = wp_get_attachment_image( $attachment_id, array($width, $height), true );
+			}
+		}
+		if ( isset($thumb) && $thumb ) {
+			echo $thumb;
+		} else {
+			echo theme_locals("none");
+		}
+	}
+}
+// for posts
+add_filter( 'manage_posts_columns', 'fb_AddThumbColumn' );
+add_action( 'manage_posts_custom_column', 'fb_AddThumbValue', 10, 2 );
+// for pages
+add_filter( 'manage_pages_columns', 'fb_AddThumbColumn' );
+add_action( 'manage_pages_custom_column', 'fb_AddThumbValue', 10, 2 );
+}
+
+/**
+ * Add dropdowns for portfolio filters in admin
+ */
+function cherry_show_portfolio_filter() {
+	global $typenow, $wp_query;
+
+	if ($typenow=='portfolio') :
+		$portf_taxes = array( 'portfolio_category', 'portfolio_tag' );
+		foreach ($portf_taxes as $tax) {
+			$tax_obj = get_taxonomy($tax);
+
+			if ( isset($_GET[$tax]) ) {
+				$selected = $_GET[$tax];
+			} else {
+				$selected = '';
+			}
+
+			wp_dropdown_categories(array(
+				'show_option_all' => theme_locals("show_all") . $tax_obj->label,
+				'taxonomy'        => $tax,
+				'name'            => $tax_obj->name,
+				'orderby'         => 'term_order',
+				'selected'        => $selected,
+				'hierarchical'    => $tax_obj->hierarchical,
+				'show_count'      => false,
+				'hide_empty'      => true
+			));
+		}
+	endif;
+}
+add_action('restrict_manage_posts', 'cherry_show_portfolio_filter');
+
+/**
+ * Filter portfolio by cats and tags
+ */
+function cherry_portfolio_filter_query( $query ) {
+	global $typenow, $wp_query;
+
+	if ( $typenow == 'portfolio' ) {
+		// By Categories
+		if ( isset($_GET['portfolio_category']) && ! empty( $_GET['portfolio_category'] ) && 0 != $_GET['portfolio_category'] ) {
+				$cat_term = get_term_by( 'id', $_GET['portfolio_category'], 'portfolio_category' );
+			$query->query_vars['portfolio_category'] = $cat_term->slug;
+		}
+
+		// By Tags
+		if ( isset($_GET['portfolio_tag']) && ! empty( $_GET['portfolio_tag'] ) && 0 != $_GET['portfolio_tag'] ) {
+				$tag_term = get_term_by( 'id', $_GET['portfolio_tag'], 'portfolio_tag' );
+			$query->query_vars['portfolio_tag'] = $tag_term->slug;
+		}
+	}
+}
+add_filter( 'parse_query', 'cherry_portfolio_filter_query' );
+
+// Add to admin_init function
+add_action('manage_portfolio_posts_custom_column' , 'custom_portfolio_columns', 10, 2);
+add_filter('manage_edit-portfolio_columns', 'my_portfolio_columns');
+//Add columns for portfolio posts
+function my_portfolio_columns($columns) {
+	$columns = array(
+		"cb" => "",
+		"title" => theme_locals("title"),
+		"portfolio_categories" => theme_locals("categories"),
+		"portfolio_tags" => theme_locals("tags"),
+		"comments" => "",
+		"date" => theme_locals("date"),
+		"thumbnail" => theme_locals("thumbnail")
+	);
+	return $columns;
+}
+function custom_portfolio_columns( $column, $post_id ) {
+	switch ( $column ) {
+	case 'portfolio_categories':
+		$terms = get_the_term_list( $post_id , 'portfolio_category' , '' , ',' , '' );
+		if ( is_string( $terms ) ) {
+			echo $terms;
+		} else {
+			echo theme_locals('uncategorized');
+		}
+		break;
+	case 'portfolio_tags':
+		$terms = get_the_term_list( $post_id , 'portfolio_tag' , '' , ',' , '' );
+		if ( is_string( $terms ) ) {
+			echo $terms;
+		}
+		break;
+	}
+}
+
+/*-----------------------------------------------------------------------------------*/
+/* Output image */
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'tz_image' ) ) {
+	function tz_image( $postid = null, $imagesize ) {
+
+		$post_id = ( null === $postid ) ? get_the_ID() : $postid;
+
+		if ( has_post_thumbnail( $postid ) ):
+
+			$lightbox = get_post_meta( $post_id, 'tz_image_lightbox', TRUE );
+
+			if ( $lightbox == 'yes' )
+				$lightbox = TRUE;
+			else
+				$lightbox = FALSE;
+
+			$src     = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), array( '9999','9999' ), false, '' );
+			$thumb   = get_post_thumbnail_id();
+			$img_url = wp_get_attachment_url( $thumb, 'full' ); //get img URL
+			$image   = aq_resize( $img_url, 700, 460, true ); //resize & crop img
+
+			if ( $lightbox ) :
+				echo '
';
+			else :
+				echo '
';
+			endif;
+
+		endif;
+
+	}
+}
+
+
+/*-----------------------------------------------------------------------------------*/
+/* Output gallery */
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'tz_grid_gallery' ) ) {
+
+	function tz_grid_gallery($postid, $imagesize) {
+		$single_folio_layout = of_get_option('single_folio_layout');
+		$single_gallery_layout = of_get_option('single_gallery_layout');
+
+		if ( $single_gallery_layout == 'masonry' ) {
+
+			add_action( 'wp_footer', 'cherry_enqueue_isotope' );
+
+		} ?>
+
+		
+		
+			
+			 'menu_order',
+						'order'          => 'ASC',
+						'post_type'      => 'attachment',
+						'post_parent'    => get_the_ID(),
+						'post_mime_type' => 'image',
+						'post_status'    => null,
+						'numberposts'    => -1,
+				);
+				$attachments = get_posts($args);
+
+				$lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE);
+				if($lightbox == 'yes')
+					$lightbox = TRUE;
+				else
+					$lightbox = FALSE;
+				$src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' );
+
+			if ($attachments) :
+				foreach ($attachments as $attachment) :
+					$attachment_url = wp_get_attachment_image_src( $attachment->ID, 'full' );
+					$url			= $attachment_url['0'];
+					$imgWidth		= $attachment_url['1'];
+					$imgHeight		= $attachment_url['2'];
+
+					switch ($single_gallery_layout) {
+						case 'grid':
+							if($single_folio_layout=='grid'){
+								$new_width	= 260;
+								$new_height	= 160;
+							}else{
+								$new_width	= 390;
+								$new_height	= 260;
+							}
+							break;
+						case 'masonry':
+							if($single_folio_layout=='grid'){
+								$new_width	= 260;
+								$new_height	= $imgHeight / $imgWidth * $new_width;
+							}else{
+								$new_width	= 390;
+								$new_height	= $imgHeight / $imgWidth * $new_width;
+							}
+							break;
+					}
+					$image	= aq_resize($url, $new_width, $new_height, true);
+				?>
+				
+					
+					
+						
+						
+						
+					
+						
+					
+				
+			
+
+			
+
+			
+		
+		
+	
+		
+			
+
+			
+				
+				 'menu_order',
+						'order'          => 'ASC',
+						'post_type'      => 'attachment',
+						'post_parent'    => get_the_ID(),
+						'post_mime_type' => 'image',
+						'post_status'    => null,
+						'numberposts'    => -1,
+					);
+					$attachments = get_posts($args);
+
+					$lightbox = get_post_meta(get_the_ID(), 'tz_image_lightbox', TRUE);
+					if($lightbox == 'yes')
+						$lightbox = TRUE;
+					else
+						$lightbox = FALSE;
+					$src = wp_get_attachment_image_src( get_post_thumbnail_id(get_the_ID()), array( '9999','9999' ), false, '' );
+
+					if ($attachments) :
+						foreach ($attachments as $attachment) :
+						$attachment_url = wp_get_attachment_image_src( $attachment->ID, 'full' );
+						$url            = $attachment_url['0'];
+						$image          = aq_resize($url, 650, 400, true);
+					?>
+
+					
+						
+							
+								
+								
+							
+						
+							
+						
+					
+					
+					
+				
+			
+	
+		
+
+		
+		
+			
+				
+					
+						
+							
+								
+							
+						
+						
+						
+						
+						
+							
+								">
+								">
+								">
+								">
+								">
+							
+							
+								
+							
+							
+								">
+								">
+							
+						
+					
+					
+						
+					
+				
+			
+			
+				
+					
+				
+			
+		
+		
+			
+				
+			
+		
+			
+
+			
+				
+					
+						
+						
+							
+								Play
+							
+							
+								
+									
+										
+									
+								
+								
+								
+								
+								
+									
+										">
+										">
+										">
+										">
+										">
+									
+									
+										
+									
+									
+										">
+										">
+									
+								
+							
+							
+								
+							
+						
+					
+				
+			
+		query_vars['paged'];
+		if( empty($paged) || $paged == 0 ) $paged = 1;
+
+		if ( $pages == '' ) {
+			$pages = $wp_query->max_num_pages;
+			if( !$pages ) {
+				$pages = 1;
+			}
+		}
+		if ( 1 != $pages ) {
+			echo "";
+			if ( $paged > 2 && $paged > $range+1 && $showitems < $pages ) echo "".theme_locals("first")."";
+			if ( $paged > 1 && $showitems < $pages ) echo "".theme_locals("prev")."";
+
+			for ( $i = 1; $i <= $pages; $i++ ) {
+				if (1 != $pages &&( !($i >= $paged+$range+1 || $i <= $paged-$range-1) || $pages <= $showitems )) {
+					echo ($paged == $i)? "".$i."
":"".$i."";
+				}
+			}
+
+			if ( $paged < $pages && $showitems < $pages ) echo "".theme_locals("next")."";
+			if ( $paged < $pages-1 && $paged+$range-1 < $pages && $showitems < $pages ) echo "".theme_locals("last")."";
+			echo "\n";
+		}
+	}
+}
+
+
+/*-----------------------------------------------------------------------------------*/
+/* Custom Comments Structure
+/*-----------------------------------------------------------------------------------*/
+if ( !function_exists( 'mytheme_comment' ) ) {
+	function mytheme_comment($comment, $args, $depth) {
+		$GLOBALS['comment'] = $comment;
+	?>
+	 id="li-comment-">
+		
+			
+				
+					comment_author_email, 65 ); ?>
+					%1$s', get_comment_author_link()) ?>
+				
+				comment_approved == '0') : ?>
+					
+				
+				
+					
+				
+			
+			
+				
+					 $depth, 'max_depth' => $args['max_depth']))) ?>
+				
+				
+			
+		
+'; // divider
+	$home        = get_the_title( get_option('page_on_front', true) ); // text for link "Home"
+	$showCurrent = 1; // 1 - show title current post/page, 0 - hide
+	$before      = ''; // open tag for active breadcrumb
+	$after       = ''; // close tag for active breadcrumb
+
+	global $post;
+	$homeLink = home_url();
+
+	if (is_front_page()) {
+		if ($showOnHome == 1)
+			echo '' . $home . '
';
+		} else {
+			echo '' . $home . '' . $delimiter;
+
+			if ( is_home() ) {
+				$blog_text = of_get_option('blog_text');
+				if ($blog_text == '' || empty($blog_text)) {
+					echo theme_locals("blog");
+				}
+				echo $before . $blog_text . $after;
+			}
+			elseif ( is_category() ) {
+				$thisCat = get_category(get_query_var('cat'), false);
+				if ($thisCat->parent != 0) echo get_category_parents($thisCat->parent, TRUE, ' ' . $delimiter . ' ');
+				echo $before . theme_locals("category_archives").': "' . single_cat_title('', false) . '"' . $after;
+			}
+			elseif ( is_search() ) {
+				echo $before . theme_locals("fearch_for") . ': "' . get_search_query() . '"' . $after;
+			}
+			elseif ( is_day() ) {
+				echo '' . get_the_time('Y') . ' ' . $delimiter . ' ';
+				echo '' . get_the_time('F') . ' ' . $delimiter . ' ';
+				echo $before . get_the_time('d') . $after;
+			}
+			elseif ( is_month() ) {
+				echo '' . get_the_time('Y') . ' ' . $delimiter . ' ';
+				echo $before . get_the_time('F') . $after;
+			}
+			elseif ( is_year() ) {
+				echo $before . get_the_time('Y') . $after;
+			}
+			elseif ( is_tax(get_post_type().'_category') ) {
+				$post_name = get_post_type();
+				echo $before . ucfirst($post_name) . ' ' . theme_locals('category') . ': ' . single_cat_title( '', false ) . $after;
+			}
+			elseif ( is_single() && !is_attachment() ) {
+				if ( get_post_type() != 'post' ) {
+					$post_id = get_the_ID();
+					$post_name = get_post_type();
+					$post_type = get_post_type_object(get_post_type());
+					// echo '' . $post_type->labels->name . '';
+
+					$terms = get_the_terms( $post_id, $post_name.'_category');
+					if ( $terms && ! is_wp_error( $terms ) ) {
+						echo ''.current($terms)->name.'';
+						echo ' ' . $delimiter . ' ';
+					} else {
+						// echo '' . $post_type->labels->name . '';
+					}
+
+					if ($showCurrent == 1)
+						echo $before . get_the_title() . $after;
+				} else {
+					$cat = get_the_category();
+					if (!empty($cat)) {
+						$cat  = $cat[0];
+						$cats = get_category_parents($cat, TRUE, '' . $delimiter . '');
+						if ($showCurrent == 0)
+							$cats = preg_replace("#^(.+)\s$delimiter\s$#", "$1", $cats);
+						echo '
' . substr($cats, 0, strlen($cats)-4);
+					}
+					if ($showCurrent == 1)
+						echo $before . get_the_title() . $after;
+				}
+			}
+			elseif ( !is_single() && !is_page() && get_post_type() != 'post' && !is_404() ) {
+				$post_type = get_post_type_object(get_post_type());
+				if ( isset($post_type) ) {
+					echo $before . $post_type->labels->singular_name . $after;
+				}
+			}
+			elseif ( is_attachment() ) {
+				$parent = get_post($post->post_parent);
+				$cat    = get_the_category($parent->ID);
+				if ( isset($cat) && !empty($cat)) {
+					$cat    = $cat[0];
+					echo get_category_parents($cat, TRUE, ' ' . $delimiter . ' ');
+					echo '
' . $parent->post_title . '';
+				}
+				if ($showCurrent == 1)
+					echo $before . get_the_title() . $after;
+			}
+			elseif ( is_page() && !$post->post_parent ) {
+				if ($showCurrent == 1)
+					echo $before . get_the_title() . $after;
+			}
+			elseif ( is_page() && $post->post_parent ) {
+				$parent_id  = $post->post_parent;
+				$breadcrumbs = array();
+				while ($parent_id) {
+					$page          = get_page($parent_id);
+					$breadcrumbs[] = '' . get_the_title($page->ID) . '';
+					$parent_id     = $page->post_parent;
+				}
+				$breadcrumbs = array_reverse($breadcrumbs);
+				for ($i = 0; $i < count($breadcrumbs); $i++) {
+					echo $breadcrumbs[$i];
+					if ($i != count($breadcrumbs)-1) echo ' ' . $delimiter . ' ';
+				}
+				if ($showCurrent == 1)
+					echo ' ' . $delimiter . ' ' . $before . get_the_title() . $after;
+			}
+			elseif ( is_tag() ) {
+				echo $before . theme_locals("tag_archives") . ': "' . single_tag_title('', false) . '"' . $after;
+			}
+			elseif ( is_author() ) {
+				global $author;
+				$userdata = get_userdata($author);
+				echo $before . theme_locals("by") . ' ' . $userdata->display_name . $after;
+			}
+			elseif ( is_404() ) {
+				echo $before . '404' . $after;
+			}
+			echo '';
+		}
+	} // end breadcrumbs()
+=======
 ';
 		}
 	} // end breadcrumbs()
+>>>>>>> .r12027
 }?>
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-author.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-author.php
index 143df9f5..8202a014 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-author.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-author.php
@@ -1,3 +1,169 @@
+<<<<<<< .mine
+
+
+
+
+	 display_name; ?>
+	
+		user_email, $size = '65' ); } /* Displays the Gravatar based on the author's email address. Visit Gravatar.com for info on Gravatars */ ?>
+	
+
+	description !="") { /* Displays the author's description from their Wordpress profile */ ?>
+		
+			description; ?>
+		
+	
+

+
+
+	 display_name; ?>
+	
+		
+			' . theme_locals("no_post_yet") . ''; ?>
+		

+	
+

+
+
+
+
+	 display_name; ?>
+	comments}
+				JOIN {$wpdb->prefix}icl_translations
+				ON {$wpdb->comments}.comment_post_id = {$wpdb->prefix}icl_translations.element_id
+				AND {$wpdb->prefix}icl_translations.element_type='post_post'
+				WHERE comment_approved = '1'
+				AND language_code = '".$sitepress->get_current_language()."'
+				ORDER BY comment_date_gmt DESC LIMIT {$number}";
+		} else {
+			$sql = "
+				SELECT * FROM $wpdb->comments
+				WHERE comment_approved = '1'
+				AND comment_author_email='$curauth->user_email'
+				ORDER BY comment_date_gmt
+				DESC LIMIT {$number}";
+		}
+		$comments = $wpdb->get_results($sql);
+
+		if ( $comments ) : ?>
+
+			
+
+			
+
+				
+					comment_ID ) . '">' . get_the_title( $comment->comment_post_ID ) . '' ); ?>
+				
+
+			
+
+			
+
+		
+
+			 display_name; ?> 
+
+		
+
||||||| .r11156
+
+
+
+
+	 display_name; ?>
+	
+		user_email, $size = '65' ); } /* Displays the Gravatar based on the author's email address. Visit Gravatar.com for info on Gravatars */ ?>
+	
+
+	description !="") { /* Displays the author's description from their Wordpress profile */ ?>
+		
+			description; ?>
+		
+	
+

+
+
+	 display_name; ?>
+	
+		
+			' . theme_locals("no_post_yet") . ''; ?>
+		

+	
+

+
+
+
+
+	 display_name; ?>
+	comments}
+				JOIN {$wpdb->prefix}icl_translations 
+				ON {$wpdb->comments}.comment_post_id = {$wpdb->prefix}icl_translations.element_id 
+				AND {$wpdb->prefix}icl_translations.element_type='post_post' 
+				WHERE comment_approved = '1' 
+				AND language_code = '".$sitepress->get_current_language()."' 
+				ORDER BY comment_date_gmt DESC LIMIT {$number}";
+		} else {
+			$sql = "
+				SELECT * FROM $wpdb->comments 
+				WHERE comment_approved = '1' 
+				AND comment_author_email='$curauth->user_email'
+				ORDER BY comment_date_gmt 
+				DESC LIMIT {$number}";
+		}
+		$comments = $wpdb->get_results($sql);
+	?>
+	
+		' . sprintf( theme_locals("no_comments_author"), get_comment_date(), '' . get_the_title($comment->comment_post_ID) . '') . '';
+		endforeach; else: ?>
+			
+				 display_name; ?> 
+			
+		
+	
+
=======
 
  display_name; ?> 
 
 		
-


\ No newline at end of file
+

>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-faq.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-faq.php
index 67e32044..6d76413d 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-faq.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-faq.php
@@ -1,3 +1,90 @@
+<<<<<<< .mine
+
+
+		>
+			
+			
+		

+	 'faq',
+		'showposts'        => -1,
+		'suppress_filters' => $suppress_filters,
+		);
+	$faq_query = new WP_Query( $args );
+
+	if ( $faq_query->have_posts() ) : ?>
+	
+	have_posts() ) : $faq_query->the_post(); ?>
+		
+			
+			
+		
+		
+			
+			
+		
+	
+	
+
+
+
+
+	' . theme_locals("there_has") . ''; ?>
+	  
+	
+

+
+
+
+		>
+			
+			
+		

+	 'faq',
+		'showposts'        => -1,
+		'suppress_filters' => $suppress_filters
+		);
+	$wp_query = new WP_Query($args);
+
+	if (have_posts()) : ?>
+	
+	have_posts()) : $wp_query->the_post(); ?>
+		
+			
+			
+		
+		
+			
+			
+		
+	
+	
+ 
+
+	' . theme_locals("there_has") . ''; ?>
+	  
+	
+

+
 >>>>>> .r12027
 ?>
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-page.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-page.php
index 59dbbc75..32924b4c 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-page.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-page.php
@@ -1,3 +1,20 @@
+<<<<<<< .mine
+
+
+	>
+		
+		
+		&after=
'); ?>
+


+||||||| .r11156
+
+
+	>
+		
+		
+		&after=
'); ?>
+


+=======
 
 
 	>
@@ -5,4 +22,5 @@
 		
 		&after=
'); ?>


+>>>>>>> .r12027
 
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-testi.php b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-testi.php
index e7d6b352..5b915ccc 100644
--- a/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-testi.php
+++ b/pavillonmadeleine.fr/wp-content/themes/CherryFramework/loop/loop-testi.php
@@ -1,3 +1,172 @@
+<<<<<<< .mine
+
+
+		
+	 'testi',
+	'showposts'        => 4,
+	'paged'            => $paged,
+	'suppress_filters' => $suppress_filters,
+	);
+$testi_query = new WP_Query( $args );
+
+if ( $testi_query->have_posts()) : while ( $testi_query->have_posts() ) : $testi_query->the_post();
+	$testiname  = get_post_meta( $post->ID, 'my_testi_caption', true );
+	$testiurl   = esc_url( get_post_meta( $post->ID, 'my_testi_url', true ) );
+	$testiinfo  = get_post_meta( $post->ID, 'my_testi_info', true );
+	$testiemail = sanitize_email( get_post_meta( $post->ID, 'my_testi_email', true ) );
+?>
+
+	
+		
+		
+			
+		
+		
+		
+			
+			
+			
+				
+					
+				
+				
+					

+				
+				
+					

+				
+				' . antispambot( $testiemail ) . ' ';
+				} ?>
+			
+		
+	
+
+
+
+
+
+	' . theme_locals("there_has") . ''; ?>
+	  
+	
+

+
+max_num_pages );
+	else :
+		if ( $testi_query->max_num_pages > 1 ) : ?>
+		
+			
+				
+			

+			
+				
+			

+		

+		
+
+		
+	 'testi',
+	'showposts'        => 4,
+	'paged'            => $paged,
+	'suppress_filters' => $suppress_filters
+	);
+$wp_query = new WP_Query($args);
+
+if ($wp_query->have_posts()) : while ($wp_query->have_posts()) : $wp_query->the_post();
+	$testiname  = get_post_meta( $post->ID, 'my_testi_caption', true );
+	$testiurl   = esc_url( get_post_meta( $post->ID, 'my_testi_url', true ) );
+	$testiinfo  = get_post_meta( $post->ID, 'my_testi_info', true );
+	$testiemail = sanitize_email( get_post_meta( $post->ID, 'my_testi_email', true ) );
+?>
+
+	
+		
+		
+			
+		
+		
+		
+			
+			
+			
+				
+					
+				
+				
+					

+				
+				
+					

+				
+				' . antispambot( $testiemail ) . ' ';
+				} ?>
+			
+		
+	
+
+
+
+	' . theme_locals("there_has") . ''; ?>
+	  
+	
+

+
+
+
 have_posts()) : while ( $testi_query->have_posts() ) : $testi
 	endif;
 
 	wp_reset_postdata();
+>>>>>>> .r12027
 ?>
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/css/bootstrap.css b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/css/bootstrap.css
index 4c293fde..8f126c8e 100644
--- a/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/css/bootstrap.css
+++ b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/css/bootstrap.css
@@ -1521,7 +1521,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
 	background-image:linear-gradient(to bottom,#08c,#0044cc);
 	background-repeat:repeat-x;
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0043cc', GradientType=0);
-	border-color:#0044cc #0044cc #002a80;
+	border-color:#0044cc #0044cc #002b80;
 	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
 	*background-color:#0044cc;
 	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
@@ -1529,7 +1529,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] {
 	color:#fff;
 	background-color:#0044cc;
-	*background-color:#003bb3;
+	*background-color:#003cb3;
 }
 .btn-primary:active, .btn-primary.active { background-color:#003399 \9; }
 .btn-warning {
diff --git a/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/bootstrap.less.cache b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/bootstrap.less.cache
new file mode 100644
index 00000000..aaa91c55
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/bootstrap.less.cache
@@ -0,0 +1,3342 @@
+a:4:{s:4:"root";s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/bootstrap.less";s:8:"compiled";s:107383:"article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display:block; }
+audio, canvas, video {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+}
+audio:not([controls]) { display:none; }
+html {
+	font-size:100%;
+	-webkit-text-size-adjust:100%;
+	-ms-text-size-adjust:100%;
+}
+a:focus {
+	outline:thin dotted #333;
+	outline:5px auto -webkit-focus-ring-color;
+	outline-offset:-2px;
+}
+a:hover, a:active { outline:0; }
+sub, sup {
+	position:relative;
+	font-size:75%;
+	line-height:0;
+	vertical-align:baseline;
+}
+sup { top:-0.5em; }
+sub { bottom:-0.25em; }
+img {
+	max-width:100%;
+	width:auto \9;
+	height:auto;
+	vertical-align:middle;
+	border:0;
+	-ms-interpolation-mode:bicubic;
+}
+#map_canvas img, .google-maps img { max-width:none; }
+button, input, select, textarea {
+	margin:0;
+	font-size:100%;
+	vertical-align:middle;
+}
+button, input {
+	*overflow:visible;
+	line-height:normal;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+	padding:0;
+	border:0;
+}
+button, html input[type="button"], input[type="reset"], input[type="submit"] {
+	-webkit-appearance:button;
+	cursor:pointer;
+}
+label, select, button, input[type="button"], input[type="reset"], input[type="submit"], input[type="radio"], input[type="checkbox"] { cursor:pointer; }
+input[type="search"] {
+	-webkit-box-sizing:content-box;
+	-moz-box-sizing:content-box;
+	box-sizing:content-box;
+	-webkit-appearance:textfield;
+}
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance:none; }
+textarea {
+	overflow:auto;
+	vertical-align:top;
+}
+@media print {
+	* {
+		text-shadow:none !important;
+		color:#000 !important;
+		background:transparent !important;
+		box-shadow:none !important;
+	}
+	a, a:visited { text-decoration:underline; }
+	a[href]:after { content:" (" attr(href) ")"; }
+	abbr[title]:after { content:" (" attr(title) ")"; }
+	.ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content:""; }
+	pre, blockquote {
+		border:1px solid #999;
+		page-break-inside:avoid;
+	}
+	thead { display:table-header-group; }
+	tr, img { page-break-inside:avoid; }
+	img { max-width:100% !important; }
+	@page {
+		margin:0.5cm;
+	}
+	p, h2, h3 {
+		orphans:3;
+		widows:3;
+	}
+	h2, h3 { page-break-after:avoid; }
+}
+.clearfix { *zoom:1; }
+.clearfix:before, .clearfix:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.clearfix:after { clear:both; }
+.hide-text {
+	font:0/0 a;
+	color:transparent;
+	text-shadow:none;
+	background-color:transparent;
+	border:0;
+}
+.input-block-level {
+	display:block;
+	width:100%;
+	min-height:30px;
+	-webkit-box-sizing:border-box;
+	-moz-box-sizing:border-box;
+	box-sizing:border-box;
+}
+body {
+	margin:0;
+	font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size:14px;
+	line-height:20px;
+	color:#333;
+	background-color:#fff;
+}
+a {
+	color:#08c;
+	text-decoration:none;
+}
+a:hover, a:focus {
+	color:#005580;
+	text-decoration:underline;
+}
+.img-rounded {
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+}
+.img-polaroid {
+	padding:4px;
+	background-color:#fff;
+	border:1px solid #ccc;
+	border:1px solid rgba(0,0,0,0.2);
+	-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);
+	-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);
+	box-shadow:0 1px 3px rgba(0,0,0,0.1);
+}
+.img-circle {
+	-webkit-border-radius:500px;
+	-moz-border-radius:500px;
+	border-radius:500px;
+}
+.row {
+	margin-left:-20px;
+	*zoom:1;
+}
+.row:before, .row:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.row:after { clear:both; }
+[class*="span"] {
+	float:left;
+	min-height:1px;
+	margin-left:20px;
+}
+.container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width:940px; }
+.span12 { width:940px; }
+.span11 { width:860px; }
+.span10 { width:780px; }
+.span9 { width:700px; }
+.span8 { width:620px; }
+.span7 { width:540px; }
+.span6 { width:460px; }
+.span5 { width:380px; }
+.span4 { width:300px; }
+.span3 { width:220px; }
+.span2 { width:140px; }
+.span1 { width:60px; }
+.offset12 { margin-left:980px; }
+.offset11 { margin-left:900px; }
+.offset10 { margin-left:820px; }
+.offset9 { margin-left:740px; }
+.offset8 { margin-left:660px; }
+.offset7 { margin-left:580px; }
+.offset6 { margin-left:500px; }
+.offset5 { margin-left:420px; }
+.offset4 { margin-left:340px; }
+.offset3 { margin-left:260px; }
+.offset2 { margin-left:180px; }
+.offset1 { margin-left:100px; }
+.row-fluid {
+	width:100%;
+	*zoom:1;
+}
+.row-fluid:before, .row-fluid:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.row-fluid:after { clear:both; }
+.row-fluid [class*="span"] {
+	display:block;
+	width:100%;
+	min-height:30px;
+	-webkit-box-sizing:border-box;
+	-moz-box-sizing:border-box;
+	box-sizing:border-box;
+	float:left;
+	margin-left:2.1276595744681%;
+	*margin-left:2.0744680851064%;
+}
+.row-fluid [class*="span"]:first-child { margin-left:0; }
+.row-fluid .controls-row [class*="span"] + [class*="span"] { margin-left:2.1276595744681%; }
+.row-fluid .span12 {
+	width:100%;
+	*width:99.946808510638%;
+}
+.row-fluid .span11 {
+	width:91.489361702128%;
+	*width:91.436170212766%;
+}
+.row-fluid .span10 {
+	width:82.978723404255%;
+	*width:82.925531914894%;
+}
+.row-fluid .span9 {
+	width:74.468085106383%;
+	*width:74.414893617021%;
+}
+.row-fluid .span8 {
+	width:65.957446808511%;
+	*width:65.904255319149%;
+}
+.row-fluid .span7 {
+	width:57.446808510638%;
+	*width:57.393617021277%;
+}
+.row-fluid .span6 {
+	width:48.936170212766%;
+	*width:48.882978723404%;
+}
+.row-fluid .span5 {
+	width:40.425531914894%;
+	*width:40.372340425532%;
+}
+.row-fluid .span4 {
+	width:31.914893617021%;
+	*width:31.86170212766%;
+}
+.row-fluid .span3 {
+	width:23.404255319149%;
+	*width:23.351063829787%;
+}
+.row-fluid .span2 {
+	width:14.893617021277%;
+	*width:14.840425531915%;
+}
+.row-fluid .span1 {
+	width:6.3829787234043%;
+	*width:6.3297872340426%;
+}
+.row-fluid .offset12 {
+	margin-left:104.25531914894%;
+	*margin-left:104.14893617021%;
+}
+.row-fluid .offset12:first-child {
+	margin-left:102.12765957447%;
+	*margin-left:102.02127659574%;
+}
+.row-fluid .offset11 {
+	margin-left:95.744680851064%;
+	*margin-left:95.63829787234%;
+}
+.row-fluid .offset11:first-child {
+	margin-left:93.617021276596%;
+	*margin-left:93.510638297872%;
+}
+.row-fluid .offset10 {
+	margin-left:87.234042553191%;
+	*margin-left:87.127659574468%;
+}
+.row-fluid .offset10:first-child {
+	margin-left:85.106382978723%;
+	*margin-left:85%;
+}
+.row-fluid .offset9 {
+	margin-left:78.723404255319%;
+	*margin-left:78.617021276596%;
+}
+.row-fluid .offset9:first-child {
+	margin-left:76.595744680851%;
+	*margin-left:76.489361702128%;
+}
+.row-fluid .offset8 {
+	margin-left:70.212765957447%;
+	*margin-left:70.106382978723%;
+}
+.row-fluid .offset8:first-child {
+	margin-left:68.085106382979%;
+	*margin-left:67.978723404255%;
+}
+.row-fluid .offset7 {
+	margin-left:61.702127659574%;
+	*margin-left:61.595744680851%;
+}
+.row-fluid .offset7:first-child {
+	margin-left:59.574468085106%;
+	*margin-left:59.468085106383%;
+}
+.row-fluid .offset6 {
+	margin-left:53.191489361702%;
+	*margin-left:53.085106382979%;
+}
+.row-fluid .offset6:first-child {
+	margin-left:51.063829787234%;
+	*margin-left:50.957446808511%;
+}
+.row-fluid .offset5 {
+	margin-left:44.68085106383%;
+	*margin-left:44.574468085106%;
+}
+.row-fluid .offset5:first-child {
+	margin-left:42.553191489362%;
+	*margin-left:42.446808510638%;
+}
+.row-fluid .offset4 {
+	margin-left:36.170212765957%;
+	*margin-left:36.063829787234%;
+}
+.row-fluid .offset4:first-child {
+	margin-left:34.042553191489%;
+	*margin-left:33.936170212766%;
+}
+.row-fluid .offset3 {
+	margin-left:27.659574468085%;
+	*margin-left:27.553191489362%;
+}
+.row-fluid .offset3:first-child {
+	margin-left:25.531914893617%;
+	*margin-left:25.425531914894%;
+}
+.row-fluid .offset2 {
+	margin-left:19.148936170213%;
+	*margin-left:19.042553191489%;
+}
+.row-fluid .offset2:first-child {
+	margin-left:17.021276595745%;
+	*margin-left:16.914893617021%;
+}
+.row-fluid .offset1 {
+	margin-left:10.63829787234%;
+	*margin-left:10.531914893617%;
+}
+.row-fluid .offset1:first-child {
+	margin-left:8.5106382978723%;
+	*margin-left:8.4042553191489%;
+}
+[class*="span"].hide, .row-fluid [class*="span"].hide { display:none; }
+[class*="span"].pull-right, .row-fluid [class*="span"].pull-right { float:right; }
+.container {
+	margin-right:auto;
+	margin-left:auto;
+	*zoom:1;
+}
+.container:before, .container:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.container:after { clear:both; }
+.container-fluid {
+	padding-right:20px;
+	padding-left:20px;
+	*zoom:1;
+}
+.container-fluid:before, .container-fluid:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.container-fluid:after { clear:both; }
+p { margin:0 0 10px; }
+.lead {
+	margin-bottom:20px;
+	font-size:21px;
+	font-weight:200;
+	line-height:30px;
+}
+small { font-size:85%; }
+strong { font-weight:bold; }
+em { font-style:italic; }
+cite { font-style:normal; }
+.muted { color:#999; }
+a.muted:hover, a.muted:focus { color:#808080; }
+.text-warning { color:#c09853; }
+a.text-warning:hover, a.text-warning:focus { color:#a47e3c; }
+.text-error { color:#b94a48; }
+a.text-error:hover, a.text-error:focus { color:#953b39; }
+.text-info { color:#3a87ad; }
+a.text-info:hover, a.text-info:focus { color:#2d6987; }
+.text-success { color:#468847; }
+a.text-success:hover, a.text-success:focus { color:#356635; }
+.text-left { text-align:left; }
+.text-right { text-align:right; }
+.text-center { text-align:center; }
+h1, h2, h3, h4, h5, h6 {
+	margin:10px 0;
+	font-family:inherit;
+	font-weight:bold;
+	line-height:20px;
+	color:inherit;
+	text-rendering:optimizelegibility;
+}
+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+	font-weight:normal;
+	line-height:1;
+	color:#999;
+}
+h1, h2, h3 { line-height:40px; }
+h1 { font-size:38.5px; }
+h2 { font-size:31.5px; }
+h3 { font-size:24.5px; }
+h4 { font-size:17.5px; }
+h5 { font-size:14px; }
+h6 { font-size:11.9px; }
+h1 small { font-size:24.5px; }
+h2 small { font-size:17.5px; }
+h3 small { font-size:14px; }
+h4 small { font-size:14px; }
+.page-header {
+	padding-bottom:9px;
+	margin:20px 0 30px;
+	border-bottom:1px solid #eee;
+}
+ul, ol {
+	padding:0;
+	margin:0 0 10px 25px;
+}
+ul ul, ul ol, ol ol, ol ul { margin-bottom:0; }
+li { line-height:20px; }
+ul.unstyled, ol.unstyled {
+	margin-left:0;
+	list-style:none;
+}
+ul.inline, ol.inline {
+	margin-left:0;
+	list-style:none;
+}
+ul.inline > li, ol.inline > li {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	padding-left:5px;
+	padding-right:5px;
+}
+dl { margin-bottom:20px; }
+dt, dd { line-height:20px; }
+dt { font-weight:bold; }
+dd { margin-left:10px; }
+.dl-horizontal { *zoom:1; }
+.dl-horizontal:before, .dl-horizontal:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.dl-horizontal:after { clear:both; }
+.dl-horizontal dt {
+	float:left;
+	width:160px;
+	clear:left;
+	text-align:right;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap;
+}
+.dl-horizontal dd { margin-left:180px; }
+hr {
+	margin:20px 0;
+	border:0;
+	border-top:1px solid #eee;
+	border-bottom:1px solid #fff;
+}
+abbr[title], abbr[data-original-title] {
+	cursor:help;
+	border-bottom:1px dotted #999;
+}
+abbr.initialism {
+	font-size:90%;
+	text-transform:uppercase;
+}
+blockquote {
+	padding:0 0 0 15px;
+	margin:0 0 20px;
+	border-left:5px solid #eee;
+}
+blockquote p {
+	margin-bottom:0;
+	font-size:17.5px;
+	font-weight:300;
+	line-height:1.25;
+}
+blockquote small {
+	display:block;
+	line-height:20px;
+	color:#999;
+}
+blockquote small:before { content:'\2014 \00A0'; }
+blockquote.pull-right {
+	float:right;
+	padding-right:15px;
+	padding-left:0;
+	border-right:5px solid #eee;
+	border-left:0;
+}
+blockquote.pull-right p, blockquote.pull-right small { text-align:right; }
+blockquote.pull-right small:before { content:''; }
+blockquote.pull-right small:after { content:'\00A0 \2014'; }
+q:before, q:after, blockquote:before, blockquote:after { content:""; }
+address {
+	display:block;
+	margin-bottom:20px;
+	font-style:normal;
+	line-height:20px;
+}
+code, pre {
+	padding:0 3px 2px;
+	font-family:Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size:12px;
+	color:#333;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+code {
+	padding:2px 4px;
+	color:#d14;
+	background-color:#f7f7f9;
+	border:1px solid #e1e1e8;
+	white-space:nowrap;
+}
+pre {
+	display:block;
+	padding:9.5px;
+	margin:0 0 10px;
+	font-size:13px;
+	line-height:20px;
+	word-break:break-all;
+	word-wrap:break-word;
+	white-space:pre;
+	white-space:pre-wrap;
+	background-color:#f5f5f5;
+	border:1px solid #ccc;
+	border:1px solid rgba(0,0,0,0.15);
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+pre.prettyprint { margin-bottom:20px; }
+pre code {
+	padding:0;
+	color:inherit;
+	white-space:pre;
+	white-space:pre-wrap;
+	background-color:transparent;
+	border:0;
+}
+.pre-scrollable {
+	max-height:340px;
+	overflow-y:scroll;
+}
+form { margin:0 0 20px; }
+fieldset {
+	padding:0;
+	margin:0;
+	border:0;
+}
+legend {
+	display:block;
+	width:100%;
+	padding:0;
+	margin-bottom:20px;
+	font-size:21px;
+	line-height:40px;
+	color:#333;
+	border:0;
+	border-bottom:1px solid #e5e5e5;
+}
+legend small {
+	font-size:15px;
+	color:#999;
+}
+label, input, button, select, textarea {
+	font-size:14px;
+	font-weight:normal;
+	line-height:20px;
+}
+input, button, select, textarea { font-family:"Helvetica Neue", Helvetica, Arial, sans-serif; }
+label {
+	display:block;
+	margin-bottom:5px;
+}
+select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
+	display:inline-block;
+	height:20px;
+	padding:4px 6px;
+	margin-bottom:10px;
+	font-size:14px;
+	line-height:20px;
+	color:#555;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	vertical-align:middle;
+}
+input, textarea, .uneditable-input { width:206px; }
+textarea { height:auto; }
+textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
+	background-color:#fff;
+	border:1px solid #ccc;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition:border linear .2s, box-shadow linear .2s;
+	-moz-transition:border linear .2s, box-shadow linear .2s;
+	-o-transition:border linear .2s, box-shadow linear .2s;
+	transition:border linear .2s, box-shadow linear .2s;
+}
+textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus {
+	border-color:rgba(82,168,236,0.8);
+	outline:0;
+	outline:thin dotted \9;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"], input[type="checkbox"] {
+	margin:4px 0 0;
+	*margin-top:0;
+	margin-top:1px \9;
+	line-height:normal;
+}
+input[type="file"], input[type="image"], input[type="submit"], input[type="reset"], input[type="button"], input[type="radio"], input[type="checkbox"] { width:auto; }
+select, input[type="file"] {
+	height:30px;
+	*margin-top:4px;
+	line-height:30px;
+}
+select {
+	width:220px;
+	border:1px solid #ccc;
+	background-color:#fff;
+}
+select[multiple], select[size] { height:auto; }
+select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus {
+	outline:thin dotted #333;
+	outline:5px auto -webkit-focus-ring-color;
+	outline-offset:-2px;
+}
+.uneditable-input, .uneditable-textarea {
+	color:#999;
+	background-color:#fcfcfc;
+	border-color:#ccc;
+	-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor:not-allowed;
+}
+.uneditable-input {
+	overflow:hidden;
+	white-space:nowrap;
+}
+.uneditable-textarea {
+	width:auto;
+	height:auto;
+}
+input:-moz-placeholder, textarea:-moz-placeholder { color:#999; }
+input:-ms-input-placeholder, textarea:-ms-input-placeholder { color:#999; }
+input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { color:#999; }
+.radio, .checkbox {
+	min-height:20px;
+	padding-left:20px;
+}
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
+	float:left;
+	margin-left:-20px;
+}
+.controls > .radio:first-child, .controls > .checkbox:first-child { padding-top:5px; }
+.radio.inline, .checkbox.inline {
+	display:inline-block;
+	padding-top:5px;
+	margin-bottom:0;
+	vertical-align:middle;
+}
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left:10px; }
+.input-mini { width:60px; }
+.input-small { width:90px; }
+.input-medium { width:150px; }
+.input-large { width:210px; }
+.input-xlarge { width:270px; }
+.input-xxlarge { width:530px; }
+input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input[class*="span"], .row-fluid input[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"] {
+	float:none;
+	margin-left:0;
+}
+.input-append input[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"], .input-prepend .uneditable-input[class*="span"], .row-fluid input[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] { display:inline-block; }
+input, textarea, .uneditable-input { margin-left:0; }
+.controls-row [class*="span"] + [class*="span"] { margin-left:20px; }
+input.span12, textarea.span12, .uneditable-input.span12 { width:926px; }
+input.span11, textarea.span11, .uneditable-input.span11 { width:846px; }
+input.span10, textarea.span10, .uneditable-input.span10 { width:766px; }
+input.span9, textarea.span9, .uneditable-input.span9 { width:686px; }
+input.span8, textarea.span8, .uneditable-input.span8 { width:606px; }
+input.span7, textarea.span7, .uneditable-input.span7 { width:526px; }
+input.span6, textarea.span6, .uneditable-input.span6 { width:446px; }
+input.span5, textarea.span5, .uneditable-input.span5 { width:366px; }
+input.span4, textarea.span4, .uneditable-input.span4 { width:286px; }
+input.span3, textarea.span3, .uneditable-input.span3 { width:206px; }
+input.span2, textarea.span2, .uneditable-input.span2 { width:126px; }
+input.span1, textarea.span1, .uneditable-input.span1 { width:46px; }
+.controls-row { *zoom:1; }
+.controls-row:before, .controls-row:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.controls-row:after { clear:both; }
+.controls-row [class*="span"], .row-fluid .controls-row [class*="span"] { float:left; }
+.controls-row .checkbox[class*="span"], .controls-row .radio[class*="span"] { padding-top:5px; }
+input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
+	cursor:not-allowed;
+	background-color:#eee;
+}
+input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"][readonly], input[type="checkbox"][readonly] { background-color:transparent; }
+.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color:#c09853; }
+.control-group.warning .checkbox, .control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color:#c09853; }
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
+	border-color:#c09853;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
+	border-color:#a47e3c;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
+	color:#c09853;
+	background-color:#fcf8e3;
+	border-color:#c09853;
+}
+.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color:#b94a48; }
+.control-group.error .checkbox, .control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color:#b94a48; }
+.control-group.error input, .control-group.error select, .control-group.error textarea {
+	border-color:#b94a48;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
+	border-color:#953b39;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+	color:#b94a48;
+	background-color:#f2dede;
+	border-color:#b94a48;
+}
+.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color:#468847; }
+.control-group.success .checkbox, .control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color:#468847; }
+.control-group.success input, .control-group.success select, .control-group.success textarea {
+	border-color:#468847;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
+	border-color:#356635;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
+	color:#468847;
+	background-color:#dff0d8;
+	border-color:#468847;
+}
+.control-group.info .control-label, .control-group.info .help-block, .control-group.info .help-inline { color:#3a87ad; }
+.control-group.info .checkbox, .control-group.info .radio, .control-group.info input, .control-group.info select, .control-group.info textarea { color:#3a87ad; }
+.control-group.info input, .control-group.info select, .control-group.info textarea {
+	border-color:#3a87ad;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.info input:focus, .control-group.info select:focus, .control-group.info textarea:focus {
+	border-color:#2d6987;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+}
+.control-group.info .input-prepend .add-on, .control-group.info .input-append .add-on {
+	color:#3a87ad;
+	background-color:#d9edf7;
+	border-color:#3a87ad;
+}
+input:focus:invalid, textarea:focus:invalid, select:focus:invalid {
+	color:#b94a48;
+	border-color:#ee5f5b;
+}
+input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:focus {
+	border-color:#e9322d;
+	-webkit-box-shadow:0 0 6px #f8b9b7;
+	-moz-box-shadow:0 0 6px #f8b9b7;
+	box-shadow:0 0 6px #f8b9b7;
+}
+.form-actions {
+	padding:19px 20px 20px;
+	margin-top:20px;
+	margin-bottom:20px;
+	background-color:#f5f5f5;
+	border-top:1px solid #e5e5e5;
+	*zoom:1;
+}
+.form-actions:before, .form-actions:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.form-actions:after { clear:both; }
+.help-block, .help-inline { color:#595959; }
+.help-block {
+	display:block;
+	margin-bottom:10px;
+}
+.help-inline {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	vertical-align:middle;
+	padding-left:5px;
+}
+.input-append, .input-prepend {
+	display:inline-block;
+	margin-bottom:10px;
+	vertical-align:middle;
+	font-size:0;
+	white-space:nowrap;
+}
+.input-append input, .input-append select, .input-append .uneditable-input, .input-append .dropdown-menu, .input-append .popover, .input-prepend input, .input-prepend select, .input-prepend .uneditable-input, .input-prepend .dropdown-menu, .input-prepend .popover { font-size:14px; }
+.input-append input, .input-append select, .input-append .uneditable-input, .input-prepend input, .input-prepend select, .input-prepend .uneditable-input {
+	position:relative;
+	margin-bottom:0;
+	*margin-left:0;
+	vertical-align:top;
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.input-append input:focus, .input-append select:focus, .input-append .uneditable-input:focus, .input-prepend input:focus, .input-prepend select:focus, .input-prepend .uneditable-input:focus { z-index:2; }
+.input-append .add-on, .input-prepend .add-on {
+	display:inline-block;
+	width:auto;
+	height:20px;
+	min-width:16px;
+	padding:4px 5px;
+	font-size:14px;
+	font-weight:normal;
+	line-height:20px;
+	text-align:center;
+	text-shadow:0 1px 0 #fff;
+	background-color:#eee;
+	border:1px solid #ccc;
+}
+.input-append .add-on, .input-append .btn, .input-append .btn-group > .dropdown-toggle, .input-prepend .add-on, .input-prepend .btn, .input-prepend .btn-group > .dropdown-toggle {
+	vertical-align:top;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.input-append .active, .input-prepend .active {
+	background-color:#a9dba9;
+	border-color:#46a546;
+}
+.input-prepend .add-on, .input-prepend .btn { margin-right:-1px; }
+.input-prepend .add-on:first-child, .input-prepend .btn:first-child {
+	-webkit-border-radius:4px 0 0 4px;
+	-moz-border-radius:4px 0 0 4px;
+	border-radius:4px 0 0 4px;
+}
+.input-append input, .input-append select, .input-append .uneditable-input {
+	-webkit-border-radius:4px 0 0 4px;
+	-moz-border-radius:4px 0 0 4px;
+	border-radius:4px 0 0 4px;
+}
+.input-append input + .btn-group .btn:last-child, .input-append select + .btn-group .btn:last-child, .input-append .uneditable-input + .btn-group .btn:last-child {
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.input-append .add-on, .input-append .btn, .input-append .btn-group { margin-left:-1px; }
+.input-append .add-on:last-child, .input-append .btn:last-child, .input-append .btn-group:last-child > .dropdown-toggle {
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.input-prepend.input-append input, .input-prepend.input-append select, .input-prepend.input-append .uneditable-input {
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.input-prepend.input-append input + .btn-group .btn, .input-prepend.input-append select + .btn-group .btn, .input-prepend.input-append .uneditable-input + .btn-group .btn {
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child {
+	margin-right:-1px;
+	-webkit-border-radius:4px 0 0 4px;
+	-moz-border-radius:4px 0 0 4px;
+	border-radius:4px 0 0 4px;
+}
+.input-prepend.input-append .add-on:last-child, .input-prepend.input-append .btn:last-child {
+	margin-left:-1px;
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.input-prepend.input-append .btn-group:first-child { margin-left:0; }
+input.search-query {
+	padding-right:14px;
+	padding-right:4px \9;
+	padding-left:14px;
+	padding-left:4px \9;
+	margin-bottom:0;
+	-webkit-border-radius:15px;
+	-moz-border-radius:15px;
+	border-radius:15px;
+}
+.form-search .input-append .search-query, .form-search .input-prepend .search-query {
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius:14px 0 0 14px;
+	-moz-border-radius:14px 0 0 14px;
+	border-radius:14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius:0 14px 14px 0;
+	-moz-border-radius:0 14px 14px 0;
+	border-radius:0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius:0 14px 14px 0;
+	-moz-border-radius:0 14px 14px 0;
+	border-radius:0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius:14px 0 0 14px;
+	-moz-border-radius:14px 0 0 14px;
+	border-radius:14px 0 0 14px;
+}
+.form-search input, .form-search textarea, .form-search select, .form-search .help-inline, .form-search .uneditable-input, .form-search .input-prepend, .form-search .input-append, .form-inline input, .form-inline textarea, .form-inline select, .form-inline .help-inline, .form-inline .uneditable-input, .form-inline .input-prepend, .form-inline .input-append, .form-horizontal input, .form-horizontal textarea, .form-horizontal select, .form-horizontal .help-inline, .form-horizontal .uneditable-input, .form-horizontal .input-prepend, .form-horizontal .input-append {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	margin-bottom:0;
+	vertical-align:middle;
+}
+.form-search .hide, .form-inline .hide, .form-horizontal .hide { display:none; }
+.form-search label, .form-inline label, .form-search .btn-group, .form-inline .btn-group { display:inline-block; }
+.form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend { margin-bottom:0; }
+.form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox {
+	padding-left:0;
+	margin-bottom:0;
+	vertical-align:middle;
+}
+.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] {
+	float:left;
+	margin-right:3px;
+	margin-left:0;
+}
+.control-group { margin-bottom:10px; }
+legend + .control-group {
+	margin-top:20px;
+	-webkit-margin-top-collapse:separate;
+}
+.form-horizontal .control-group {
+	margin-bottom:20px;
+	*zoom:1;
+}
+.form-horizontal .control-group:before, .form-horizontal .control-group:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.form-horizontal .control-group:after { clear:both; }
+.form-horizontal .control-label {
+	float:left;
+	width:160px;
+	padding-top:5px;
+	text-align:right;
+}
+.form-horizontal .controls {
+	*display:inline-block;
+	*padding-left:20px;
+	margin-left:180px;
+	*margin-left:0;
+}
+.form-horizontal .controls:first-child { *padding-left:180px; }
+.form-horizontal .help-block { margin-bottom:0; }
+.form-horizontal input + .help-block, .form-horizontal select + .help-block, .form-horizontal textarea + .help-block, .form-horizontal .uneditable-input + .help-block, .form-horizontal .input-prepend + .help-block, .form-horizontal .input-append + .help-block { margin-top:10px; }
+.form-horizontal .form-actions { padding-left:180px; }
+table {
+	max-width:100%;
+	background-color:transparent;
+	border-collapse:collapse;
+	border-spacing:0;
+}
+.table {
+	width:100%;
+	margin-bottom:20px;
+}
+.table th, .table td {
+	padding:8px;
+	line-height:20px;
+	text-align:left;
+	vertical-align:top;
+	border-top:1px solid #ddd;
+}
+.table th { font-weight:bold; }
+.table thead th { vertical-align:bottom; }
+.table caption + thead tr:first-child th, .table caption + thead tr:first-child td, .table colgroup + thead tr:first-child th, .table colgroup + thead tr:first-child td, .table thead:first-child tr:first-child th, .table thead:first-child tr:first-child td { border-top:0; }
+.table tbody + tbody { border-top:2px solid #ddd; }
+.table .table { background-color:#fff; }
+.table-condensed th, .table-condensed td { padding:4px 5px; }
+.table-bordered {
+	border:1px solid #ddd;
+	border-collapse:separate;
+	*border-collapse:collapse;
+	border-left:0;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.table-bordered th, .table-bordered td { border-left:1px solid #ddd; }
+.table-bordered caption + thead tr:first-child th, .table-bordered caption + tbody tr:first-child th, .table-bordered caption + tbody tr:first-child td, .table-bordered colgroup + thead tr:first-child th, .table-bordered colgroup + tbody tr:first-child th, .table-bordered colgroup + tbody tr:first-child td, .table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top:0; }
+.table-bordered thead:first-child tr:first-child > th:first-child, .table-bordered tbody:first-child tr:first-child > td:first-child, .table-bordered tbody:first-child tr:first-child > th:first-child {
+	-webkit-border-top-left-radius:4px;
+	-moz-border-radius-topleft:4px;
+	border-top-left-radius:4px;
+}
+.table-bordered thead:first-child tr:first-child > th:last-child, .table-bordered tbody:first-child tr:first-child > td:last-child, .table-bordered tbody:first-child tr:first-child > th:last-child {
+	-webkit-border-top-right-radius:4px;
+	-moz-border-radius-topright:4px;
+	border-top-right-radius:4px;
+}
+.table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, .table-bordered tbody:last-child tr:last-child > th:first-child, .table-bordered tfoot:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > th:first-child {
+	-webkit-border-bottom-left-radius:4px;
+	-moz-border-radius-bottomleft:4px;
+	border-bottom-left-radius:4px;
+}
+.table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, .table-bordered tbody:last-child tr:last-child > th:last-child, .table-bordered tfoot:last-child tr:last-child > td:last-child, .table-bordered tfoot:last-child tr:last-child > th:last-child {
+	-webkit-border-bottom-right-radius:4px;
+	-moz-border-radius-bottomright:4px;
+	border-bottom-right-radius:4px;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+	-webkit-border-bottom-left-radius:0;
+	-moz-border-radius-bottomleft:0;
+	border-bottom-left-radius:0;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+	-webkit-border-bottom-right-radius:0;
+	-moz-border-radius-bottomright:0;
+	border-bottom-right-radius:0;
+}
+.table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child {
+	-webkit-border-top-left-radius:4px;
+	-moz-border-radius-topleft:4px;
+	border-top-left-radius:4px;
+}
+.table-bordered caption + thead tr:first-child th:last-child, .table-bordered caption + tbody tr:first-child td:last-child, .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child {
+	-webkit-border-top-right-radius:4px;
+	-moz-border-radius-topright:4px;
+	border-top-right-radius:4px;
+}
+.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th { background-color:#f9f9f9; }
+.table-hover tbody tr:hover > td, .table-hover tbody tr:hover > th { background-color:#f5f5f5; }
+table td[class*="span"], table th[class*="span"], .row-fluid table td[class*="span"], .row-fluid table th[class*="span"] {
+	display:table-cell;
+	float:none;
+	margin-left:0;
+}
+.table td.span1, .table th.span1 {
+	float:none;
+	width:44px;
+	margin-left:0;
+}
+.table td.span2, .table th.span2 {
+	float:none;
+	width:124px;
+	margin-left:0;
+}
+.table td.span3, .table th.span3 {
+	float:none;
+	width:204px;
+	margin-left:0;
+}
+.table td.span4, .table th.span4 {
+	float:none;
+	width:284px;
+	margin-left:0;
+}
+.table td.span5, .table th.span5 {
+	float:none;
+	width:364px;
+	margin-left:0;
+}
+.table td.span6, .table th.span6 {
+	float:none;
+	width:444px;
+	margin-left:0;
+}
+.table td.span7, .table th.span7 {
+	float:none;
+	width:524px;
+	margin-left:0;
+}
+.table td.span8, .table th.span8 {
+	float:none;
+	width:604px;
+	margin-left:0;
+}
+.table td.span9, .table th.span9 {
+	float:none;
+	width:684px;
+	margin-left:0;
+}
+.table td.span10, .table th.span10 {
+	float:none;
+	width:764px;
+	margin-left:0;
+}
+.table td.span11, .table th.span11 {
+	float:none;
+	width:844px;
+	margin-left:0;
+}
+.table td.span12, .table th.span12 {
+	float:none;
+	width:924px;
+	margin-left:0;
+}
+.table tbody tr.success > td { background-color:#dff0d8; }
+.table tbody tr.error > td { background-color:#f2dede; }
+.table tbody tr.warning > td { background-color:#fcf8e3; }
+.table tbody tr.info > td { background-color:#d9edf7; }
+.table-hover tbody tr.success:hover > td { background-color:#d0e9c6; }
+.table-hover tbody tr.error:hover > td { background-color:#ebcccc; }
+.table-hover tbody tr.warning:hover > td { background-color:#faf2cc; }
+.table-hover tbody tr.info:hover > td { background-color:#c4e3f3; }
+.dropup, .dropdown { position:relative; }
+.dropdown-toggle { *margin-bottom:-3px; }
+.dropdown-toggle:active, .open .dropdown-toggle { outline:0; }
+.caret {
+	display:inline-block;
+	width:0;
+	height:0;
+	vertical-align:top;
+	border-top:4px solid #000;
+	border-right:4px solid transparent;
+	border-left:4px solid transparent;
+	content:"";
+}
+.dropdown .caret {
+	margin-top:8px;
+	margin-left:2px;
+}
+.dropdown-menu {
+	position:absolute;
+	top:100%;
+	left:0;
+	z-index:1000;
+	display:none;
+	float:left;
+	min-width:160px;
+	padding:5px 0;
+	margin:2px 0 0;
+	list-style:none;
+	background-color:#fff;
+	border:1px solid #ccc;
+	border:1px solid rgba(0,0,0,0.2);
+	*border-right-width:2px;
+	*border-bottom-width:2px;
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip:padding-box;
+	-moz-background-clip:padding;
+	background-clip:padding-box;
+}
+.dropdown-menu.pull-right {
+	right:0;
+	left:auto;
+}
+.dropdown-menu .divider {
+	*width:100%;
+	height:1px;
+	margin:9px 1px;
+	*margin:-5px 0 5px;
+	overflow:hidden;
+	background-color:#e5e5e5;
+	border-bottom:1px solid #fff;
+}
+.dropdown-menu > li > a {
+	display:block;
+	padding:3px 20px;
+	clear:both;
+	font-weight:normal;
+	line-height:20px;
+	color:#333;
+	white-space:nowrap;
+}
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
+	text-decoration:none;
+	color:#fff;
+	background-color:#0081c2;
+	background-image:-moz-linear-gradient(top,#08c,#0077b3);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
+	background-image:-webkit-linear-gradient(top,#08c,#0077b3);
+	background-image:-o-linear-gradient(top,#08c,#0077b3);
+	background-image:linear-gradient(to bottom,#08c,#0077b3);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+}
+.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
+	color:#fff;
+	text-decoration:none;
+	outline:0;
+	background-color:#0081c2;
+	background-image:-moz-linear-gradient(top,#08c,#0077b3);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
+	background-image:-webkit-linear-gradient(top,#08c,#0077b3);
+	background-image:-o-linear-gradient(top,#08c,#0077b3);
+	background-image:linear-gradient(to bottom,#08c,#0077b3);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+}
+.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color:#999; }
+.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
+	text-decoration:none;
+	background-color:transparent;
+	background-image:none;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	cursor:default;
+}
+.open { *z-index:1000; }
+.open > .dropdown-menu { display:block; }
+.pull-right > .dropdown-menu {
+	right:0;
+	left:auto;
+}
+.dropup .caret, .navbar-fixed-bottom .dropdown .caret {
+	border-top:0;
+	border-bottom:4px solid #000;
+	content:"";
+}
+.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu {
+	top:auto;
+	bottom:100%;
+	margin-bottom:1px;
+}
+.dropdown-submenu { position:relative; }
+.dropdown-submenu > .dropdown-menu {
+	top:0;
+	left:100%;
+	margin-top:-6px;
+	margin-left:-1px;
+	-webkit-border-radius:0 6px 6px 6px;
+	-moz-border-radius:0 6px 6px 6px;
+	border-radius:0 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu { display:block; }
+.dropup .dropdown-submenu > .dropdown-menu {
+	top:auto;
+	bottom:0;
+	margin-top:0;
+	margin-bottom:-2px;
+	-webkit-border-radius:5px 5px 5px 0;
+	-moz-border-radius:5px 5px 5px 0;
+	border-radius:5px 5px 5px 0;
+}
+.dropdown-submenu > a:after {
+	display:block;
+	content:" ";
+	float:right;
+	width:0;
+	height:0;
+	border-color:transparent;
+	border-style:solid;
+	border-width:5px 0 5px 5px;
+	border-left-color:#cccccc;
+	margin-top:5px;
+	margin-right:-10px;
+}
+.dropdown-submenu:hover > a:after { border-left-color:#fff; }
+.dropdown-submenu.pull-left { float:none; }
+.dropdown-submenu.pull-left > .dropdown-menu {
+	left:-100%;
+	margin-left:10px;
+	-webkit-border-radius:6px 0 6px 6px;
+	-moz-border-radius:6px 0 6px 6px;
+	border-radius:6px 0 6px 6px;
+}
+.dropdown .dropdown-menu .nav-header {
+	padding-left:20px;
+	padding-right:20px;
+}
+.typeahead {
+	z-index:1051;
+	margin-top:2px;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.well {
+	min-height:20px;
+	padding:19px;
+	margin-bottom:20px;
+	background-color:#f5f5f5;
+	border:1px solid #e3e3e3;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);
+	-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);
+	box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);
+}
+.well blockquote {
+	border-color:#ddd;
+	border-color:rgba(0,0,0,0.15);
+}
+.well-large {
+	padding:24px;
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+}
+.well-small {
+	padding:9px;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+.fade {
+	opacity:0;
+	-webkit-transition:opacity .15s linear;
+	-moz-transition:opacity .15s linear;
+	-o-transition:opacity .15s linear;
+	transition:opacity .15s linear;
+}
+.fade.in { opacity:1; }
+.collapse {
+	position:relative;
+	height:0;
+	overflow:hidden;
+	-webkit-transition:height .35s ease;
+	-moz-transition:height .35s ease;
+	-o-transition:height .35s ease;
+	transition:height .35s ease;
+}
+.collapse.in { height:auto; }
+.close {
+	float:right;
+	font-size:20px;
+	font-weight:bold;
+	line-height:20px;
+	color:#000;
+	text-shadow:0 1px 0 #ffffff;
+	opacity:0.2;
+	filter:alpha(opacity=20);
+}
+.close:hover, .close:focus {
+	color:#000;
+	text-decoration:none;
+	cursor:pointer;
+	opacity:0.4;
+	filter:alpha(opacity=40);
+}
+button.close {
+	padding:0;
+	cursor:pointer;
+	background:transparent;
+	border:0;
+	-webkit-appearance:none;
+}
+.btn {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	padding:4px 12px;
+	margin-bottom:0;
+	font-size:14px;
+	line-height:20px;
+	text-align:center;
+	vertical-align:middle;
+	cursor:pointer;
+	color:#333;
+	text-shadow:0 1px 1px rgba(255,255,255,0.75);
+	background-color:#f5f5f5;
+	background-image:-moz-linear-gradient(top,#fff,#e6e6e6);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+	background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);
+	background-image:-o-linear-gradient(top,#fff,#e6e6e6);
+	background-image:linear-gradient(to bottom,#fff,#e6e6e6);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color:#e6e6e6 #e6e6e6 #bfbfbf;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#e6e6e6;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border:1px solid #ccc;
+	*border:0;
+	border-bottom-color:#b3b3b3;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	*margin-left:.3em;
+	-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn:hover, .btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
+	color:#333;
+	background-color:#e6e6e6;
+	*background-color:#d9d9d9;
+}
+.btn:active, .btn.active { background-color:#cccccc \9; }
+.btn:first-child { *margin-left:0; }
+.btn:hover, .btn:focus {
+	color:#333;
+	text-decoration:none;
+	background-position:0 -15px;
+	-webkit-transition:background-position .1s linear;
+	-moz-transition:background-position .1s linear;
+	-o-transition:background-position .1s linear;
+	transition:background-position .1s linear;
+}
+.btn:focus {
+	outline:thin dotted #333;
+	outline:5px auto -webkit-focus-ring-color;
+	outline-offset:-2px;
+}
+.btn.active, .btn:active {
+	background-image:none;
+	outline:0;
+	-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn.disabled, .btn[disabled] {
+	cursor:default;
+	background-image:none;
+	opacity:0.65;
+	filter:alpha(opacity=65);
+	-webkit-box-shadow:none;
+	-moz-box-shadow:none;
+	box-shadow:none;
+}
+.btn-large {
+	padding:11px 19px;
+	font-size:17.5px;
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+}
+.btn-large [class^="icon-"], .btn-large [class*=" icon-"] { margin-top:4px; }
+.btn-small {
+	padding:2px 10px;
+	font-size:11.9px;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+.btn-small [class^="icon-"], .btn-small [class*=" icon-"] { margin-top:0; }
+.btn-mini [class^="icon-"], .btn-mini [class*=" icon-"] { margin-top:-1px; }
+.btn-mini {
+	padding:0 6px;
+	font-size:10.5px;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+.btn-block {
+	display:block;
+	width:100%;
+	padding-left:0;
+	padding-right:0;
+	-webkit-box-sizing:border-box;
+	-moz-box-sizing:border-box;
+	box-sizing:border-box;
+}
+.btn-block + .btn-block { margin-top:5px; }
+input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width:100%; }
+.btn-primary.active, .btn-warning.active, .btn-danger.active, .btn-success.active, .btn-info.active, .btn-inverse.active { color:rgba(255,255,255,0.75); }
+.btn-primary {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#006dcc;
+	background-image:-moz-linear-gradient(top,#08c,#0044cc);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0044cc));
+	background-image:-webkit-linear-gradient(top,#08c,#0044cc);
+	background-image:-o-linear-gradient(top,#08c,#0044cc);
+	background-image:linear-gradient(to bottom,#08c,#0044cc);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0043cc', GradientType=0);
+	border-color:#0044cc #0044cc #002b80;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#0044cc;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] {
+	color:#fff;
+	background-color:#0044cc;
+	*background-color:#003cb3;
+}
+.btn-primary:active, .btn-primary.active { background-color:#003399 \9; }
+.btn-warning {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#faa732;
+	background-image:-moz-linear-gradient(top,#fbb450,#f89406);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image:-webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image:-o-linear-gradient(top,#fbb450,#f89406);
+	background-image:linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+	border-color:#f89406 #f89406 #ad6704;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#f89406;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] {
+	color:#fff;
+	background-color:#f89406;
+	*background-color:#df8505;
+}
+.btn-warning:active, .btn-warning.active { background-color:#c67605 \9; }
+.btn-danger {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#da4f49;
+	background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+	background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+	border-color:#bd362f #bd362f #802420;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#bd362f;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] {
+	color:#fff;
+	background-color:#bd362f;
+	*background-color:#a9302a;
+}
+.btn-danger:active, .btn-danger.active { background-color:#942a25 \9; }
+.btn-success {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#5bb75b;
+	background-image:-moz-linear-gradient(top,#62c462,#51a351);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image:-webkit-linear-gradient(top,#62c462,#51a351);
+	background-image:-o-linear-gradient(top,#62c462,#51a351);
+	background-image:linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color:#51a351 #51a351 #387038;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#51a351;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] {
+	color:#fff;
+	background-color:#51a351;
+	*background-color:#499249;
+}
+.btn-success:active, .btn-success.active { background-color:#408140 \9; }
+.btn-info {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#49afcd;
+	background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+	background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+	border-color:#2f96b4 #2f96b4 #1f6377;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#2f96b4;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] {
+	color:#fff;
+	background-color:#2f96b4;
+	*background-color:#2a85a0;
+}
+.btn-info:active, .btn-info.active { background-color:#24748c \9; }
+.btn-inverse {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#363636;
+	background-image:-moz-linear-gradient(top,#444,#222);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));
+	background-image:-webkit-linear-gradient(top,#444,#222);
+	background-image:-o-linear-gradient(top,#444,#222);
+	background-image:linear-gradient(to bottom,#444,#222);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+	border-color:#222 #222 #000000;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#222;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover, .btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] {
+	color:#fff;
+	background-color:#222;
+	*background-color:#151515;
+}
+.btn-inverse:active, .btn-inverse.active { background-color:#090909 \9; }
+button.btn, input[type="submit"].btn {
+	*padding-top:3px;
+	*padding-bottom:3px;
+}
+button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
+	padding:0;
+	border:0;
+}
+button.btn.btn-large, input[type="submit"].btn.btn-large {
+	*padding-top:7px;
+	*padding-bottom:7px;
+}
+button.btn.btn-small, input[type="submit"].btn.btn-small {
+	*padding-top:3px;
+	*padding-bottom:3px;
+}
+button.btn.btn-mini, input[type="submit"].btn.btn-mini {
+	*padding-top:1px;
+	*padding-bottom:1px;
+}
+.btn-link, .btn-link:active, .btn-link[disabled] {
+	background-color:transparent;
+	background-image:none;
+	-webkit-box-shadow:none;
+	-moz-box-shadow:none;
+	box-shadow:none;
+}
+.btn-link {
+	border-color:transparent;
+	cursor:pointer;
+	color:#08c;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.btn-link:hover, .btn-link:focus {
+	color:#005580;
+	text-decoration:underline;
+	background-color:transparent;
+}
+.btn-link[disabled]:hover, .btn-link[disabled]:focus {
+	color:#333;
+	text-decoration:none;
+}
+.btn-group {
+	position:relative;
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	font-size:0;
+	vertical-align:middle;
+	white-space:nowrap;
+	*margin-left:.3em;
+}
+.btn-group:first-child { *margin-left:0; }
+.btn-group + .btn-group { margin-left:5px; }
+.btn-toolbar {
+	font-size:0;
+	margin-top:10px;
+	margin-bottom:10px;
+}
+.btn-toolbar > .btn + .btn, .btn-toolbar > .btn-group + .btn, .btn-toolbar > .btn + .btn-group { margin-left:5px; }
+.btn-group > .btn {
+	position:relative;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.btn-group > .btn + .btn { margin-left:-1px; }
+.btn-group > .btn, .btn-group > .dropdown-menu, .btn-group > .popover { font-size:14px; }
+.btn-group > .btn-mini { font-size:10.5px; }
+.btn-group > .btn-small { font-size:11.9px; }
+.btn-group > .btn-large { font-size:17.5px; }
+.btn-group > .btn:first-child {
+	margin-left:0;
+	-webkit-border-top-left-radius:4px;
+	-moz-border-radius-topleft:4px;
+	border-top-left-radius:4px;
+	-webkit-border-bottom-left-radius:4px;
+	-moz-border-radius-bottomleft:4px;
+	border-bottom-left-radius:4px;
+}
+.btn-group > .btn:last-child, .btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius:4px;
+	-moz-border-radius-topright:4px;
+	border-top-right-radius:4px;
+	-webkit-border-bottom-right-radius:4px;
+	-moz-border-radius-bottomright:4px;
+	border-bottom-right-radius:4px;
+}
+.btn-group > .btn.large:first-child {
+	margin-left:0;
+	-webkit-border-top-left-radius:6px;
+	-moz-border-radius-topleft:6px;
+	border-top-left-radius:6px;
+	-webkit-border-bottom-left-radius:6px;
+	-moz-border-radius-bottomleft:6px;
+	border-bottom-left-radius:6px;
+}
+.btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius:6px;
+	-moz-border-radius-topright:6px;
+	border-top-right-radius:6px;
+	-webkit-border-bottom-right-radius:6px;
+	-moz-border-radius-bottomright:6px;
+	border-bottom-right-radius:6px;
+}
+.btn-group > .btn:hover, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active { z-index:2; }
+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline:0; }
+.btn-group > .btn + .dropdown-toggle {
+	padding-left:8px;
+	padding-right:8px;
+	-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top:5px;
+	*padding-bottom:5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+	padding-left:5px;
+	padding-right:5px;
+	*padding-top:2px;
+	*padding-bottom:2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+	*padding-top:5px;
+	*padding-bottom:4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+	padding-left:12px;
+	padding-right:12px;
+	*padding-top:7px;
+	*padding-bottom:7px;
+}
+.btn-group.open .dropdown-toggle {
+	background-image:none;
+	-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn-group.open .btn.dropdown-toggle { background-color:#e6e6e6; }
+.btn-group.open .btn-primary.dropdown-toggle { background-color:#0044cc; }
+.btn-group.open .btn-warning.dropdown-toggle { background-color:#f89406; }
+.btn-group.open .btn-danger.dropdown-toggle { background-color:#bd362f; }
+.btn-group.open .btn-success.dropdown-toggle { background-color:#51a351; }
+.btn-group.open .btn-info.dropdown-toggle { background-color:#2f96b4; }
+.btn-group.open .btn-inverse.dropdown-toggle { background-color:#222; }
+.btn .caret {
+	margin-top:8px;
+	margin-left:0;
+}
+.btn-large .caret { margin-top:6px; }
+.btn-large .caret {
+	border-left-width:5px;
+	border-right-width:5px;
+	border-top-width:5px;
+}
+.btn-mini .caret, .btn-small .caret { margin-top:8px; }
+.dropup .btn-large .caret { border-bottom-width:5px; }
+.btn-primary .caret, .btn-warning .caret, .btn-danger .caret, .btn-info .caret, .btn-success .caret, .btn-inverse .caret {
+	border-top-color:#fff;
+	border-bottom-color:#fff;
+}
+.btn-group-vertical {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+}
+.btn-group-vertical > .btn {
+	display:block;
+	float:none;
+	max-width:100%;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.btn-group-vertical > .btn + .btn {
+	margin-left:0;
+	margin-top:-1px;
+}
+.btn-group-vertical > .btn:first-child {
+	-webkit-border-radius:4px 4px 0 0;
+	-moz-border-radius:4px 4px 0 0;
+	border-radius:4px 4px 0 0;
+}
+.btn-group-vertical > .btn:last-child {
+	-webkit-border-radius:0 0 4px 4px;
+	-moz-border-radius:0 0 4px 4px;
+	border-radius:0 0 4px 4px;
+}
+.btn-group-vertical > .btn-large:first-child {
+	-webkit-border-radius:6px 6px 0 0;
+	-moz-border-radius:6px 6px 0 0;
+	border-radius:6px 6px 0 0;
+}
+.btn-group-vertical > .btn-large:last-child {
+	-webkit-border-radius:0 0 6px 6px;
+	-moz-border-radius:0 0 6px 6px;
+	border-radius:0 0 6px 6px;
+}
+.alert {
+	padding:8px 35px 8px 14px;
+	margin-bottom:20px;
+	text-shadow:0 1px 0 rgba(255,255,255,0.5);
+	background-color:#fcf8e3;
+	border:1px solid #fbeed5;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.alert, .alert h4 { color:#c09853; }
+.alert h4 { margin:0; }
+.alert .close {
+	position:relative;
+	top:-2px;
+	right:-21px;
+	line-height:20px;
+}
+.alert-success {
+	background-color:#dff0d8;
+	border-color:#d6e9c6;
+	color:#468847;
+}
+.alert-success h4 { color:#468847; }
+.alert-danger, .alert-error {
+	background-color:#f2dede;
+	border-color:#eed3d7;
+	color:#b94a48;
+}
+.alert-danger h4, .alert-error h4 { color:#b94a48; }
+.alert-info {
+	background-color:#d9edf7;
+	border-color:#bce8f1;
+	color:#3a87ad;
+}
+.alert-info h4 { color:#3a87ad; }
+.alert-block {
+	padding-top:14px;
+	padding-bottom:14px;
+}
+.alert-block > p, .alert-block > ul { margin-bottom:0; }
+.alert-block p + p { margin-top:5px; }
+.nav {
+	margin-left:0;
+	margin-bottom:20px;
+	list-style:none;
+}
+.nav > li > a { display:block; }
+.nav > li > a:hover, .nav > li > a:focus {
+	text-decoration:none;
+	background-color:#eee;
+}
+.nav > li > a > img { max-width:none; }
+.nav > .pull-right { float:right; }
+.nav-header {
+	display:block;
+	padding:3px 15px;
+	font-size:11px;
+	font-weight:bold;
+	line-height:20px;
+	color:#999;
+	text-shadow:0 1px 0 rgba(255,255,255,0.5);
+	text-transform:uppercase;
+}
+.nav li + .nav-header { margin-top:9px; }
+.nav-list {
+	padding-left:15px;
+	padding-right:15px;
+	margin-bottom:0;
+}
+.nav-list > li > a, .nav-list .nav-header {
+	margin-left:-15px;
+	margin-right:-15px;
+	text-shadow:0 1px 0 rgba(255,255,255,0.5);
+}
+.nav-list > li > a { padding:3px 15px; }
+.nav-list > .active > a, .nav-list > .active > a:hover, .nav-list > .active > a:focus {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.2);
+	background-color:#08c;
+}
+.nav-list [class^="icon-"], .nav-list [class*=" icon-"] { margin-right:2px; }
+.nav-list .divider {
+	*width:100%;
+	height:1px;
+	margin:9px 1px;
+	*margin:-5px 0 5px;
+	overflow:hidden;
+	background-color:#e5e5e5;
+	border-bottom:1px solid #fff;
+}
+.nav-tabs, .nav-pills { *zoom:1; }
+.nav-tabs:before, .nav-tabs:after, .nav-pills:before, .nav-pills:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.nav-tabs:after, .nav-pills:after { clear:both; }
+.nav-tabs > li, .nav-pills > li { float:left; }
+.nav-tabs > li > a, .nav-pills > li > a {
+	padding-right:12px;
+	padding-left:12px;
+	margin-right:2px;
+	line-height:14px;
+}
+.nav-tabs { border-bottom:1px solid #ddd; }
+.nav-tabs > li { margin-bottom:-1px; }
+.nav-tabs > li > a {
+	padding-top:8px;
+	padding-bottom:8px;
+	line-height:20px;
+	border:1px solid transparent;
+	-webkit-border-radius:4px 4px 0 0;
+	-moz-border-radius:4px 4px 0 0;
+	border-radius:4px 4px 0 0;
+}
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { border-color:#eee #eee #ddd; }
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus {
+	color:#555;
+	background-color:#fff;
+	border:1px solid #ddd;
+	border-bottom-color:transparent;
+	cursor:default;
+}
+.nav-pills > li > a {
+	padding-top:8px;
+	padding-bottom:8px;
+	margin-top:2px;
+	margin-bottom:2px;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius:5px;
+}
+.nav-pills > .active > a, .nav-pills > .active > a:hover, .nav-pills > .active > a:focus {
+	color:#fff;
+	background-color:#08c;
+}
+.nav-stacked > li { float:none; }
+.nav-stacked > li > a { margin-right:0; }
+.nav-tabs.nav-stacked { border-bottom:0; }
+.nav-tabs.nav-stacked > li > a {
+	border:1px solid #ddd;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+	-webkit-border-top-right-radius:4px;
+	-moz-border-radius-topright:4px;
+	border-top-right-radius:4px;
+	-webkit-border-top-left-radius:4px;
+	-moz-border-radius-topleft:4px;
+	border-top-left-radius:4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+	-webkit-border-bottom-right-radius:4px;
+	-moz-border-radius-bottomright:4px;
+	border-bottom-right-radius:4px;
+	-webkit-border-bottom-left-radius:4px;
+	-moz-border-radius-bottomleft:4px;
+	border-bottom-left-radius:4px;
+}
+.nav-tabs.nav-stacked > li > a:hover, .nav-tabs.nav-stacked > li > a:focus {
+	border-color:#ddd;
+	z-index:2;
+}
+.nav-pills.nav-stacked > li > a { margin-bottom:3px; }
+.nav-pills.nav-stacked > li:last-child > a { margin-bottom:1px; }
+.nav-tabs .dropdown-menu {
+	-webkit-border-radius:0 0 6px 6px;
+	-moz-border-radius:0 0 6px 6px;
+	border-radius:0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+}
+.nav .dropdown-toggle .caret {
+	border-top-color:#08c;
+	border-bottom-color:#08c;
+	margin-top:6px;
+}
+.nav .dropdown-toggle:hover .caret, .nav .dropdown-toggle:focus .caret {
+	border-top-color:#005580;
+	border-bottom-color:#005580;
+}
+.nav-tabs .dropdown-toggle .caret { margin-top:8px; }
+.nav .active .dropdown-toggle .caret {
+	border-top-color:#fff;
+	border-bottom-color:#fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+	border-top-color:#555;
+	border-bottom-color:#555;
+}
+.nav > .dropdown.active > a:hover, .nav > .dropdown.active > a:focus { cursor:pointer; }
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover, .nav > li.dropdown.open.active > a:focus {
+	color:#fff;
+	background-color:#999;
+	border-color:#999;
+}
+.nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, .nav li.dropdown.open a:hover .caret, .nav li.dropdown.open a:focus .caret {
+	border-top-color:#fff;
+	border-bottom-color:#fff;
+	opacity:1;
+	filter:alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover, .tabs-stacked .open > a:focus { border-color:#999; }
+.tabbable { *zoom:1; }
+.tabbable:before, .tabbable:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.tabbable:after { clear:both; }
+.tab-content { overflow:auto; }
+.tabs-below > .nav-tabs, .tabs-right > .nav-tabs, .tabs-left > .nav-tabs { border-bottom:0; }
+.tab-content > .tab-pane, .pill-content > .pill-pane { display:none; }
+.tab-content > .active, .pill-content > .active { display:block; }
+.tabs-below > .nav-tabs { border-top:1px solid #ddd; }
+.tabs-below > .nav-tabs > li {
+	margin-top:-1px;
+	margin-bottom:0;
+}
+.tabs-below > .nav-tabs > li > a {
+	-webkit-border-radius:0 0 4px 4px;
+	-moz-border-radius:0 0 4px 4px;
+	border-radius:0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover, .tabs-below > .nav-tabs > li > a:focus {
+	border-bottom-color:transparent;
+	border-top-color:#ddd;
+}
+.tabs-below > .nav-tabs > .active > a, .tabs-below > .nav-tabs > .active > a:hover, .tabs-below > .nav-tabs > .active > a:focus { border-color:transparent #ddd #ddd #ddd; }
+.tabs-left > .nav-tabs > li, .tabs-right > .nav-tabs > li { float:none; }
+.tabs-left > .nav-tabs > li > a, .tabs-right > .nav-tabs > li > a {
+	min-width:74px;
+	margin-right:0;
+	margin-bottom:3px;
+}
+.tabs-left > .nav-tabs {
+	float:left;
+	margin-right:19px;
+	border-right:1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-right:-1px;
+	-webkit-border-radius:4px 0 0 4px;
+	-moz-border-radius:4px 0 0 4px;
+	border-radius:4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover, .tabs-left > .nav-tabs > li > a:focus { border-color:#eee #ddd #eee #eee; }
+.tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a:hover, .tabs-left > .nav-tabs .active > a:focus {
+	border-color:#ddd transparent #ddd #ddd;
+	*border-right-color:#fff;
+}
+.tabs-right > .nav-tabs {
+	float:right;
+	margin-left:19px;
+	border-left:1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+	margin-left:-1px;
+	-webkit-border-radius:0 4px 4px 0;
+	-moz-border-radius:0 4px 4px 0;
+	border-radius:0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover, .tabs-right > .nav-tabs > li > a:focus { border-color:#eee #eee #eee #ddd; }
+.tabs-right > .nav-tabs .active > a, .tabs-right > .nav-tabs .active > a:hover, .tabs-right > .nav-tabs .active > a:focus {
+	border-color:#ddd #ddd #ddd transparent;
+	*border-left-color:#fff;
+}
+.nav > .disabled > a { color:#999; }
+.nav > .disabled > a:hover, .nav > .disabled > a:focus {
+	text-decoration:none;
+	background-color:transparent;
+	cursor:default;
+}
+.navbar {
+	overflow:visible;
+	margin-bottom:20px;
+	*position:relative;
+	*z-index:2;
+}
+.navbar-inner {
+	min-height:40px;
+	padding-left:20px;
+	padding-right:20px;
+	background-color:#fafafa;
+	background-image:-moz-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f2f2f2));
+	background-image:-webkit-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image:-o-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image:linear-gradient(to bottom,#ffffff,#f2f2f2);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+	border:1px solid #d4d4d4;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);
+	-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);
+	box-shadow:0 1px 4px rgba(0,0,0,0.065);
+	*zoom:1;
+}
+.navbar-inner:before, .navbar-inner:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.navbar-inner:after { clear:both; }
+.navbar .container { width:auto; }
+.nav-collapse.collapse {
+	height:auto;
+	overflow:visible;
+}
+.navbar .brand {
+	float:left;
+	display:block;
+	padding:10px 20px 10px;
+	margin-left:-20px;
+	font-size:20px;
+	font-weight:200;
+	color:#777;
+	text-shadow:0 1px 0 #ffffff;
+}
+.navbar .brand:hover, .navbar .brand:focus { text-decoration:none; }
+.navbar-text {
+	margin-bottom:0;
+	line-height:40px;
+	color:#777;
+}
+.navbar-link { color:#777; }
+.navbar-link:hover, .navbar-link:focus { color:#333; }
+.navbar .divider-vertical {
+	height:40px;
+	margin:0 9px;
+	border-left:1px solid #f2f2f2;
+	border-right:1px solid #ffffff;
+}
+.navbar .btn, .navbar .btn-group { margin-top:5px; }
+.navbar .btn-group .btn, .navbar .input-prepend .btn, .navbar .input-append .btn, .navbar .input-prepend .btn-group, .navbar .input-append .btn-group { margin-top:0; }
+.navbar-form {
+	margin-bottom:0;
+	*zoom:1;
+}
+.navbar-form:before, .navbar-form:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.navbar-form:after { clear:both; }
+.navbar-form input, .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { margin-top:5px; }
+.navbar-form input, .navbar-form select, .navbar-form .btn {
+	display:inline-block;
+	margin-bottom:0;
+}
+.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top:3px; }
+.navbar-form .input-append, .navbar-form .input-prepend {
+	margin-top:5px;
+	white-space:nowrap;
+}
+.navbar-form .input-append input, .navbar-form .input-prepend input { margin-top:0; }
+.navbar-search {
+	position:relative;
+	float:left;
+	margin-top:5px;
+	margin-bottom:0;
+}
+.navbar-search .search-query {
+	margin-bottom:0;
+	padding:4px 14px;
+	font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size:13px;
+	font-weight:normal;
+	line-height:1;
+	-webkit-border-radius:15px;
+	-moz-border-radius:15px;
+	border-radius:15px;
+}
+.navbar-static-top {
+	position:static;
+	margin-bottom:0;
+}
+.navbar-static-top .navbar-inner {
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.navbar-fixed-top, .navbar-fixed-bottom {
+	position:fixed;
+	right:0;
+	left:0;
+	z-index:1030;
+	margin-bottom:0;
+}
+.navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { border-width:0 0 1px; }
+.navbar-fixed-bottom .navbar-inner { border-width:1px 0 0; }
+.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner {
+	padding-left:0;
+	padding-right:0;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+	border-radius:0;
+}
+.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width:940px; }
+.navbar-fixed-top { top:0; }
+.navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner {
+	-webkit-box-shadow:0 1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow:0 1px 10px rgba(0,0,0,.1);
+	box-shadow:0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom { bottom:0; }
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow:0 -1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow:0 -1px 10px rgba(0,0,0,.1);
+	box-shadow:0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+	position:relative;
+	left:0;
+	display:block;
+	float:left;
+	margin:0 10px 0 0;
+}
+.navbar .nav.pull-right {
+	float:right;
+	margin-right:0;
+}
+.navbar .nav > li { float:left; }
+.navbar .nav > li > a {
+	float:none;
+	padding:10px 15px 10px;
+	color:#777;
+	text-decoration:none;
+	text-shadow:0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret { margin-top:8px; }
+.navbar .nav > li > a:focus, .navbar .nav > li > a:hover {
+	background-color:transparent;
+	color:#333;
+	text-decoration:none;
+}
+.navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus {
+	color:#555;
+	text-decoration:none;
+	background-color:#e6e6e6;
+	-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);
+	-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);
+	box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);
+}
+.navbar .btn-navbar {
+	display:none;
+	float:right;
+	padding:7px 10px;
+	margin-left:5px;
+	margin-right:5px;
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#ededed;
+	background-image:-moz-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e6e6e6));
+	background-image:-webkit-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image:-o-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image:linear-gradient(to bottom,#f2f2f2,#e6e6e6);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color:#e6e6e6 #e6e6e6 #bfbfbf;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#e6e6e6;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover, .navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] {
+	color:#fff;
+	background-color:#e6e6e6;
+	*background-color:#d9d9d9;
+}
+.navbar .btn-navbar:active, .navbar .btn-navbar.active { background-color:#cccccc \9; }
+.navbar .btn-navbar .icon-bar {
+	display:block;
+	width:18px;
+	height:2px;
+	background-color:#f5f5f5;
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+	-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);
+	-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);
+	box-shadow:0 1px 0 rgba(0,0,0,0.25);
+}
+.btn-navbar .icon-bar + .icon-bar { margin-top:3px; }
+.navbar .nav > li > .dropdown-menu:before {
+	content:'';
+	display:inline-block;
+	border-left:7px solid transparent;
+	border-right:7px solid transparent;
+	border-bottom:7px solid #ccc;
+	border-bottom-color:rgba(0,0,0,0.2);
+	position:absolute;
+	top:-7px;
+	left:9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+	content:'';
+	display:inline-block;
+	border-left:6px solid transparent;
+	border-right:6px solid transparent;
+	border-bottom:6px solid #fff;
+	position:absolute;
+	top:-6px;
+	left:10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+	border-top:7px solid #ccc;
+	border-top-color:rgba(0,0,0,0.2);
+	border-bottom:0;
+	bottom:-7px;
+	top:auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+	border-top:6px solid #fff;
+	border-bottom:0;
+	bottom:-6px;
+	top:auto;
+}
+.navbar .nav li.dropdown > a:hover .caret, .navbar .nav li.dropdown > a:focus .caret {
+	border-top-color:#333;
+	border-bottom-color:#333;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color:#e6e6e6;
+	color:#555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color:#777;
+	border-bottom-color:#777;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret, .navbar .nav li.dropdown.active > .dropdown-toggle .caret, .navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color:#555;
+	border-bottom-color:#555;
+}
+.navbar .pull-right > li > .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right {
+	left:auto;
+	right:0;
+}
+.navbar .pull-right > li > .dropdown-menu:before, .navbar .nav > li > .dropdown-menu.pull-right:before {
+	left:auto;
+	right:12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after, .navbar .nav > li > .dropdown-menu.pull-right:after {
+	left:auto;
+	right:13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+	left:auto;
+	right:100%;
+	margin-left:0;
+	margin-right:-1px;
+	-webkit-border-radius:6px 0 6px 6px;
+	-moz-border-radius:6px 0 6px 6px;
+	border-radius:6px 0 6px 6px;
+}
+.navbar-inverse .navbar-inner {
+	background-color:#1b1b1b;
+	background-image:-moz-linear-gradient(top,#222222,#111111);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#222222),to(#111111));
+	background-image:-webkit-linear-gradient(top,#222222,#111111);
+	background-image:-o-linear-gradient(top,#222222,#111111);
+	background-image:linear-gradient(to bottom,#222222,#111111);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+	border-color:#252525;
+}
+.navbar-inverse .brand, .navbar-inverse .nav > li > a {
+	color:#999;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+}
+.navbar-inverse .brand:hover, .navbar-inverse .brand:focus, .navbar-inverse .nav > li > a:hover, .navbar-inverse .nav > li > a:focus { color:#fff; }
+.navbar-inverse .brand { color:#999; }
+.navbar-inverse .navbar-text { color:#999; }
+.navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover {
+	background-color:transparent;
+	color:#fff;
+}
+.navbar-inverse .nav .active > a, .navbar-inverse .nav .active > a:hover, .navbar-inverse .nav .active > a:focus {
+	color:#fff;
+	background-color:#111111;
+}
+.navbar-inverse .navbar-link { color:#999; }
+.navbar-inverse .navbar-link:hover, .navbar-inverse .navbar-link:focus { color:#fff; }
+.navbar-inverse .divider-vertical {
+	border-left-color:#111111;
+	border-right-color:#222222;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color:#111111;
+	color:#fff;
+}
+.navbar-inverse .nav li.dropdown > a:hover .caret, .navbar-inverse .nav li.dropdown > a:focus .caret {
+	border-top-color:#fff;
+	border-bottom-color:#fff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color:#999;
+	border-bottom-color:#999;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color:#fff;
+	border-bottom-color:#fff;
+}
+.navbar-inverse .navbar-search .search-query {
+	color:#fff;
+	background-color:#515151;
+	border-color:#111111;
+	-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-webkit-transition:none;
+	-moz-transition:none;
+	-o-transition:none;
+	transition:none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder { color:#ccc; }
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { color:#ccc; }
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { color:#ccc; }
+.navbar-inverse .navbar-search .search-query:focus, .navbar-inverse .navbar-search .search-query.focused {
+	padding:5px 15px;
+	color:#333;
+	text-shadow:0 1px 0 #fff;
+	background-color:#fff;
+	border:0;
+	-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);
+	-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);
+	box-shadow:0 0 3px rgba(0,0,0,0.15);
+	outline:0;
+}
+.navbar-inverse .btn-navbar {
+	color:#fff;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#0e0e0e;
+	background-image:-moz-linear-gradient(top,#151515,#040404);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));
+	background-image:-webkit-linear-gradient(top,#151515,#040404);
+	background-image:-o-linear-gradient(top,#151515,#040404);
+	background-image:linear-gradient(to bottom,#151515,#040404);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+	border-color:#040404 #040404 #000000;
+	border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color:#040404;
+	filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.navbar-inverse .btn-navbar:hover, .navbar-inverse .btn-navbar:focus, .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active, .navbar-inverse .btn-navbar.disabled, .navbar-inverse .btn-navbar[disabled] {
+	color:#fff;
+	background-color:#040404;
+	*background-color:#000000;
+}
+.navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { background-color:#000000 \9; }
+.breadcrumb {
+	padding:8px 15px;
+	margin:0 0 20px;
+	list-style:none;
+	background-color:#f5f5f5;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.breadcrumb > li {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	text-shadow:0 1px 0 #fff;
+}
+.breadcrumb > li > .divider {
+	padding:0 5px;
+	color:#ccc;
+}
+.breadcrumb > .active { color:#999; }
+.pagination { margin:20px 0; }
+.pagination ul {
+	display:inline-block;
+	*display:inline;
+	*zoom:1;
+	margin-left:0;
+	margin-bottom:0;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);
+	box-shadow:0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination ul > li { display:inline; }
+.pagination ul > li > a, .pagination ul > li > span {
+	float:left;
+	padding:4px 12px;
+	line-height:20px;
+	text-decoration:none;
+	background-color:#fff;
+	border:1px solid #ddd;
+	border-left-width:0;
+}
+.pagination ul > li > a:hover, .pagination ul > li > a:focus, .pagination ul > .active > a, .pagination ul > .active > span { background-color:#f5f5f5; }
+.pagination ul > .active > a, .pagination ul > .active > span {
+	color:#999;
+	cursor:default;
+}
+.pagination ul > .disabled > span, .pagination ul > .disabled > a, .pagination ul > .disabled > a:hover, .pagination ul > .disabled > a:focus {
+	color:#999;
+	background-color:transparent;
+	cursor:default;
+}
+.pagination ul > li:first-child > a, .pagination ul > li:first-child > span {
+	border-left-width:1px;
+	-webkit-border-top-left-radius:4px;
+	-moz-border-radius-topleft:4px;
+	border-top-left-radius:4px;
+	-webkit-border-bottom-left-radius:4px;
+	-moz-border-radius-bottomleft:4px;
+	border-bottom-left-radius:4px;
+}
+.pagination ul > li:last-child > a, .pagination ul > li:last-child > span {
+	-webkit-border-top-right-radius:4px;
+	-moz-border-radius-topright:4px;
+	border-top-right-radius:4px;
+	-webkit-border-bottom-right-radius:4px;
+	-moz-border-radius-bottomright:4px;
+	border-bottom-right-radius:4px;
+}
+.pagination-centered { text-align:center; }
+.pagination-right { text-align:right; }
+.pagination-large ul > li > a, .pagination-large ul > li > span {
+	padding:11px 19px;
+	font-size:17.5px;
+}
+.pagination-large ul > li:first-child > a, .pagination-large ul > li:first-child > span {
+	-webkit-border-top-left-radius:6px;
+	-moz-border-radius-topleft:6px;
+	border-top-left-radius:6px;
+	-webkit-border-bottom-left-radius:6px;
+	-moz-border-radius-bottomleft:6px;
+	border-bottom-left-radius:6px;
+}
+.pagination-large ul > li:last-child > a, .pagination-large ul > li:last-child > span {
+	-webkit-border-top-right-radius:6px;
+	-moz-border-radius-topright:6px;
+	border-top-right-radius:6px;
+	-webkit-border-bottom-right-radius:6px;
+	-moz-border-radius-bottomright:6px;
+	border-bottom-right-radius:6px;
+}
+.pagination-mini ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > a, .pagination-small ul > li:first-child > span {
+	-webkit-border-top-left-radius:3px;
+	-moz-border-radius-topleft:3px;
+	border-top-left-radius:3px;
+	-webkit-border-bottom-left-radius:3px;
+	-moz-border-radius-bottomleft:3px;
+	border-bottom-left-radius:3px;
+}
+.pagination-mini ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > a, .pagination-small ul > li:last-child > span {
+	-webkit-border-top-right-radius:3px;
+	-moz-border-radius-topright:3px;
+	border-top-right-radius:3px;
+	-webkit-border-bottom-right-radius:3px;
+	-moz-border-radius-bottomright:3px;
+	border-bottom-right-radius:3px;
+}
+.pagination-small ul > li > a, .pagination-small ul > li > span {
+	padding:2px 10px;
+	font-size:11.9px;
+}
+.pagination-mini ul > li > a, .pagination-mini ul > li > span {
+	padding:0 6px;
+	font-size:10.5px;
+}
+.pager {
+	margin:20px 0;
+	list-style:none;
+	text-align:center;
+	*zoom:1;
+}
+.pager:before, .pager:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.pager:after { clear:both; }
+.pager li { display:inline; }
+.pager li > a, .pager li > span {
+	display:inline-block;
+	padding:5px 14px;
+	background-color:#fff;
+	border:1px solid #ddd;
+	-webkit-border-radius:15px;
+	-moz-border-radius:15px;
+	border-radius:15px;
+}
+.pager li > a:hover, .pager li > a:focus {
+	text-decoration:none;
+	background-color:#f5f5f5;
+}
+.pager .next > a, .pager .next > span { float:right; }
+.pager .previous > a, .pager .previous > span { float:left; }
+.pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span {
+	color:#999;
+	background-color:#fff;
+	cursor:default;
+}
+.modal-backdrop {
+	position:fixed;
+	top:0;
+	right:0;
+	bottom:0;
+	left:0;
+	z-index:1040;
+	background-color:#000;
+}
+.modal-backdrop.fade { opacity:0; }
+.modal-backdrop, .modal-backdrop.fade.in {
+	opacity:0.8;
+	filter:alpha(opacity=80);
+}
+.modal {
+	position:fixed;
+	top:10%;
+	left:50%;
+	z-index:1050;
+	width:560px;
+	margin-left:-280px;
+	background-color:#fff;
+	border:1px solid #999;
+	border:1px solid rgba(0,0,0,0.3);
+	*border:1px solid #999;
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+	-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);
+	box-shadow:0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip:padding-box;
+	-moz-background-clip:padding-box;
+	background-clip:padding-box;
+	outline:none;
+}
+.modal.fade {
+	-webkit-transition:opacity .3s linear, top .3s ease-out;
+	-moz-transition:opacity .3s linear, top .3s ease-out;
+	-o-transition:opacity .3s linear, top .3s ease-out;
+	transition:opacity .3s linear, top .3s ease-out;
+	top:-25%;
+}
+.modal.fade.in { top:10%; }
+.modal-header {
+	padding:9px 15px;
+	border-bottom:1px solid #eee;
+}
+.modal-header .close { margin-top:2px; }
+.modal-header h3 {
+	margin:0;
+	line-height:30px;
+}
+.modal-body {
+	position:relative;
+	overflow-y:auto;
+	max-height:400px;
+	padding:15px;
+}
+.modal-form { margin-bottom:0; }
+.modal-footer {
+	padding:14px 15px 15px;
+	margin-bottom:0;
+	text-align:right;
+	background-color:#f5f5f5;
+	border-top:1px solid #ddd;
+	-webkit-border-radius:0 0 6px 6px;
+	-moz-border-radius:0 0 6px 6px;
+	border-radius:0 0 6px 6px;
+	-webkit-box-shadow:inset 0 1px 0 #fff;
+	-moz-box-shadow:inset 0 1px 0 #fff;
+	box-shadow:inset 0 1px 0 #fff;
+	*zoom:1;
+}
+.modal-footer:before, .modal-footer:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.modal-footer:after { clear:both; }
+.modal-footer .btn + .btn {
+	margin-left:5px;
+	margin-bottom:0;
+}
+.modal-footer .btn-group .btn + .btn { margin-left:-1px; }
+.modal-footer .btn-block + .btn-block { margin-left:0; }
+.tooltip {
+	position:absolute;
+	z-index:1030;
+	display:block;
+	visibility:visible;
+	font-size:11px;
+	line-height:1.4;
+	opacity:0;
+	filter:alpha(opacity=0);
+}
+.tooltip.in {
+	opacity:0.8;
+	filter:alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top:-3px;
+	padding:5px 0;
+}
+.tooltip.right {
+	margin-left:3px;
+	padding:0 5px;
+}
+.tooltip.bottom {
+	margin-top:3px;
+	padding:5px 0;
+}
+.tooltip.left {
+	margin-left:-3px;
+	padding:0 5px;
+}
+.tooltip-inner {
+	max-width:200px;
+	padding:8px;
+	color:#fff;
+	text-align:center;
+	text-decoration:none;
+	background-color:#000;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.tooltip-arrow {
+	position:absolute;
+	width:0;
+	height:0;
+	border-color:transparent;
+	border-style:solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom:0;
+	left:50%;
+	margin-left:-5px;
+	border-width:5px 5px 0;
+	border-top-color:#000;
+}
+.tooltip.right .tooltip-arrow {
+	top:50%;
+	left:0;
+	margin-top:-5px;
+	border-width:5px 5px 5px 0;
+	border-right-color:#000;
+}
+.tooltip.left .tooltip-arrow {
+	top:50%;
+	right:0;
+	margin-top:-5px;
+	border-width:5px 0 5px 5px;
+	border-left-color:#000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top:0;
+	left:50%;
+	margin-left:-5px;
+	border-width:0 5px 5px;
+	border-bottom-color:#000;
+}
+.popover {
+	position:absolute;
+	top:0;
+	left:0;
+	z-index:1010;
+	display:none;
+	max-width:276px;
+	padding:1px;
+	text-align:left;
+	background-color:#fff;
+	-webkit-background-clip:padding-box;
+	-moz-background-clip:padding;
+	background-clip:padding-box;
+	border:1px solid #ccc;
+	border:1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	white-space:normal;
+}
+.popover.top { margin-top:-10px; }
+.popover.right { margin-left:10px; }
+.popover.bottom { margin-top:10px; }
+.popover.left { margin-left:-10px; }
+.popover-title {
+	margin:0;
+	padding:8px 14px;
+	font-size:14px;
+	font-weight:normal;
+	line-height:18px;
+	background-color:#f7f7f7;
+	border-bottom:1px solid #ebebeb;
+	-webkit-border-radius:5px 5px 0 0;
+	-moz-border-radius:5px 5px 0 0;
+	border-radius:5px 5px 0 0;
+}
+.popover-title:empty { display:none; }
+.popover-content { padding:9px 14px; }
+.popover .arrow, .popover .arrow:after {
+	position:absolute;
+	display:block;
+	width:0;
+	height:0;
+	border-color:transparent;
+	border-style:solid;
+}
+.popover .arrow { border-width:11px; }
+.popover .arrow:after {
+	border-width:10px;
+	content:"";
+}
+.popover.top .arrow {
+	left:50%;
+	margin-left:-11px;
+	border-bottom-width:0;
+	border-top-color:#999;
+	border-top-color:rgba(0,0,0,0.25);
+	bottom:-11px;
+}
+.popover.top .arrow:after {
+	bottom:1px;
+	margin-left:-10px;
+	border-bottom-width:0;
+	border-top-color:#fff;
+}
+.popover.right .arrow {
+	top:50%;
+	left:-11px;
+	margin-top:-11px;
+	border-left-width:0;
+	border-right-color:#999;
+	border-right-color:rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left:1px;
+	bottom:-10px;
+	border-left-width:0;
+	border-right-color:#fff;
+}
+.popover.bottom .arrow {
+	left:50%;
+	margin-left:-11px;
+	border-top-width:0;
+	border-bottom-color:#999;
+	border-bottom-color:rgba(0,0,0,0.25);
+	top:-11px;
+}
+.popover.bottom .arrow:after {
+	top:1px;
+	margin-left:-10px;
+	border-top-width:0;
+	border-bottom-color:#fff;
+}
+.popover.left .arrow {
+	top:50%;
+	right:-11px;
+	margin-top:-11px;
+	border-right-width:0;
+	border-left-color:#999;
+	border-left-color:rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right:1px;
+	border-right-width:0;
+	border-left-color:#fff;
+	bottom:-10px;
+}
+.thumbnails {
+	margin-left:-20px;
+	list-style:none;
+	*zoom:1;
+}
+.thumbnails:before, .thumbnails:after {
+	display:table;
+	content:"";
+	line-height:0;
+}
+.thumbnails:after { clear:both; }
+.row-fluid .thumbnails { margin-left:0; }
+.thumbnails > li {
+	float:left;
+	margin-bottom:20px;
+	margin-left:20px;
+}
+.thumbnail {
+	display:block;
+	padding:4px;
+	line-height:20px;
+	border:1px solid #ddd;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);
+	-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);
+	box-shadow:0 1px 3px rgba(0,0,0,0.055);
+	-webkit-transition:all .2s ease-in-out;
+	-moz-transition:all .2s ease-in-out;
+	-o-transition:all .2s ease-in-out;
+	transition:all .2s ease-in-out;
+}
+a.thumbnail:hover, a.thumbnail:focus {
+	border-color:#08c;
+	-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);
+	-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);
+	box-shadow:0 1px 4px rgba(0,105,214,0.25);
+}
+.thumbnail > img {
+	display:block;
+	max-width:100%;
+	margin-left:auto;
+	margin-right:auto;
+}
+.thumbnail .caption {
+	padding:9px;
+	color:#555;
+}
+.media, .media-body {
+	overflow:hidden;
+	*overflow:visible;
+	zoom:1;
+}
+.media, .media .media { margin-top:15px; }
+.media:first-child { margin-top:0; }
+.media-object { display:block; }
+.media-heading { margin:0 0 5px; }
+.media > .pull-left { margin-right:10px; }
+.media > .pull-right { margin-left:10px; }
+.media-list {
+	margin-left:0;
+	list-style:none;
+}
+.label, .badge {
+	display:inline-block;
+	padding:2px 4px;
+	font-size:11.844px;
+	font-weight:bold;
+	line-height:14px;
+	color:#fff;
+	vertical-align:baseline;
+	white-space:nowrap;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#999;
+}
+.label {
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+.badge {
+	padding-left:9px;
+	padding-right:9px;
+	-webkit-border-radius:9px;
+	-moz-border-radius:9px;
+	border-radius:9px;
+}
+a.label:hover, a.badge:hover {
+	color:#fff;
+	text-decoration:none;
+	cursor:pointer;
+}
+.label-important, .badge-important { background-color:#b94a48; }
+.label-important[href], .badge-important[href] { background-color:#953b39; }
+.label-warning, .badge-warning { background-color:#f89406; }
+.label-warning[href], .badge-warning[href] { background-color:#c67605; }
+.label-success, .badge-success { background-color:#468847; }
+.label-success[href], .badge-success[href] { background-color:#356635; }
+.label-info, .badge-info { background-color:#3a87ad; }
+.label-info[href], .badge-info[href] { background-color:#2d6987; }
+.label-inverse, .badge-inverse { background-color:#333; }
+.label-inverse[href], .badge-inverse[href] { background-color:#1a1a1a; }
+.btn .label, .btn .badge {
+	position:relative;
+	top:-1px;
+}
+.btn-mini .label, .btn-mini .badge { top:0; }
+@-webkit-keyframes progress-bar-stripes {
+	from { background-position:40px 0; }
+	to { background-position:0 0; }
+}
+@-moz-keyframes progress-bar-stripes {
+	from { background-position:40px 0; }
+	to { background-position:0 0; }
+}
+@-ms-keyframes progress-bar-stripes {
+	from { background-position:40px 0; }
+	to { background-position:0 0; }
+}
+@-o-keyframes progress-bar-stripes {
+	from { background-position:0 0; }
+	to { background-position:40px 0; }
+}
+@keyframes progress-bar-stripes {
+	from { background-position:40px 0; }
+	to { background-position:0 0; }
+}
+.progress {
+	overflow:hidden;
+	height:20px;
+	margin-bottom:20px;
+	background-color:#f7f7f7;
+	background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+	background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+	-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.progress .bar {
+	width:0%;
+	height:100%;
+	color:#fff;
+	float:left;
+	font-size:12px;
+	text-align:center;
+	text-shadow:0 -1px 0 rgba(0,0,0,0.25);
+	background-color:#0e90d2;
+	background-image:-moz-linear-gradient(top,#149bdf,#0480be);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+	background-image:-webkit-linear-gradient(top,#149bdf,#0480be);
+	background-image:-o-linear-gradient(top,#149bdf,#0480be);
+	background-image:linear-gradient(to bottom,#149bdf,#0480be);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+	-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);
+	-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);
+	box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);
+	-webkit-box-sizing:border-box;
+	-moz-box-sizing:border-box;
+	box-sizing:border-box;
+	-webkit-transition:width .6s ease;
+	-moz-transition:width .6s ease;
+	-o-transition:width .6s ease;
+	transition:width .6s ease;
+}
+.progress .bar + .bar {
+	-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+	background-color:#149bdf;
+	background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	-webkit-background-size:40px 40px;
+	-moz-background-size:40px 40px;
+	-o-background-size:40px 40px;
+	background-size:40px 40px;
+}
+.progress.active .bar {
+	-webkit-animation:progress-bar-stripes 2s linear infinite;
+	-moz-animation:progress-bar-stripes 2s linear infinite;
+	-ms-animation:progress-bar-stripes 2s linear infinite;
+	-o-animation:progress-bar-stripes 2s linear infinite;
+	animation:progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar, .progress .bar-danger {
+	background-color:#dd514c;
+	background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+	background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
+	background-color:#ee5f5b;
+	background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-success .bar, .progress .bar-success {
+	background-color:#5eb95e;
+	background-image:-moz-linear-gradient(top,#62c462,#57a957);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+	background-image:-webkit-linear-gradient(top,#62c462,#57a957);
+	background-image:-o-linear-gradient(top,#62c462,#57a957);
+	background-image:linear-gradient(to bottom,#62c462,#57a957);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar, .progress-striped .bar-success {
+	background-color:#62c462;
+	background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-info .bar, .progress .bar-info {
+	background-color:#4bb1cf;
+	background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+	background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);
+	background-image:-o-linear-gradient(top,#5bc0de,#339bb9);
+	background-image:linear-gradient(to bottom,#5bc0de,#339bb9);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar, .progress-striped .bar-info {
+	background-color:#5bc0de;
+	background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-warning .bar, .progress .bar-warning {
+	background-color:#faa732;
+	background-image:-moz-linear-gradient(top,#fbb450,#f89406);
+	background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image:-webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image:-o-linear-gradient(top,#fbb450,#f89406);
+	background-image:linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat:repeat-x;
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
+	background-color:#fbb450;
+	background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.accordion { margin-bottom:20px; }
+.accordion-group {
+	margin-bottom:2px;
+	border:1px solid #e5e5e5;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.accordion-heading { border-bottom:0; }
+.accordion-heading .accordion-toggle {
+	display:block;
+	padding:8px 15px;
+}
+.accordion-toggle { cursor:pointer; }
+.accordion-inner {
+	padding:9px 15px;
+	border-top:1px solid #e5e5e5;
+}
+.carousel {
+	position:relative;
+	margin-bottom:20px;
+	line-height:1;
+}
+.carousel-inner {
+	overflow:hidden;
+	width:100%;
+	position:relative;
+}
+.carousel-inner > .item {
+	display:none;
+	position:relative;
+	-webkit-transition:.6s ease-in-out left;
+	-moz-transition:.6s ease-in-out left;
+	-o-transition:.6s ease-in-out left;
+	transition:.6s ease-in-out left;
+}
+.carousel-inner > .item > img, .carousel-inner > .item > a > img {
+	display:block;
+	line-height:1;
+}
+.carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display:block; }
+.carousel-inner > .active { left:0; }
+.carousel-inner > .next, .carousel-inner > .prev {
+	position:absolute;
+	top:0;
+	width:100%;
+}
+.carousel-inner > .next { left:100%; }
+.carousel-inner > .prev { left:-100%; }
+.carousel-inner > .next.left, .carousel-inner > .prev.right { left:0; }
+.carousel-inner > .active.left { left:-100%; }
+.carousel-inner > .active.right { left:100%; }
+.carousel-control {
+	position:absolute;
+	top:40%;
+	left:15px;
+	width:40px;
+	height:40px;
+	margin-top:-20px;
+	font-size:60px;
+	font-weight:100;
+	line-height:30px;
+	color:#fff;
+	text-align:center;
+	background:#222;
+	border:3px solid #fff;
+	-webkit-border-radius:23px;
+	-moz-border-radius:23px;
+	border-radius:23px;
+	opacity:0.5;
+	filter:alpha(opacity=50);
+}
+.carousel-control.right {
+	left:auto;
+	right:15px;
+}
+.carousel-control:hover, .carousel-control:focus {
+	color:#fff;
+	text-decoration:none;
+	opacity:0.9;
+	filter:alpha(opacity=90);
+}
+.carousel-indicators {
+	position:absolute;
+	top:15px;
+	right:15px;
+	z-index:5;
+	margin:0;
+	list-style:none;
+}
+.carousel-indicators li {
+	display:block;
+	float:left;
+	width:10px;
+	height:10px;
+	margin-left:5px;
+	text-indent:-999px;
+	background-color:#ccc;
+	background-color:rgba(255,255,255,0.25);
+	border-radius:5px;
+}
+.carousel-indicators .active { background-color:#fff; }
+.carousel-caption {
+	position:absolute;
+	left:0;
+	right:0;
+	bottom:0;
+	padding:15px;
+	background:#333;
+	background:rgba(0,0,0,0.75);
+}
+.carousel-caption h4, .carousel-caption p {
+	color:#fff;
+	line-height:20px;
+}
+.carousel-caption h4 { margin:0 0 5px; }
+.carousel-caption p { margin-bottom:0; }
+.hero-unit {
+	padding:60px;
+	margin-bottom:30px;
+	font-size:18px;
+	font-weight:200;
+	line-height:30px;
+	color:inherit;
+	background-color:#eee;
+	-webkit-border-radius:6px;
+	-moz-border-radius:6px;
+	border-radius:6px;
+}
+.hero-unit h1 {
+	margin-bottom:0;
+	font-size:60px;
+	line-height:1;
+	color:inherit;
+	letter-spacing:-1px;
+}
+.hero-unit li { line-height:30px; }
+.pull-right { float:right; }
+.pull-left { float:left; }
+.hide { display:none; }
+.show { display:block; }
+.invisible { visibility:hidden; }
+.affix { position:fixed; }
+";s:5:"files";a:34:{s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/bootstrap.less";i:1448312210;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/reset.less";i:1448312213;s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/variables.less";i:1448312215;s:94:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/mixins.less";i:1448312212;s:99:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/scaffolding.less";i:1448312214;s:92:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/grid.less";i:1448312212;s:95:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/layouts.less";i:1448312212;s:92:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/type.less";i:1448312215;s:92:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/code.less";i:1448312211;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/forms.less";i:1448312212;s:94:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/tables.less";i:1448312214;s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/dropdowns.less";i:1448312212;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/wells.less";i:1448312215;s:108:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/component-animations.less";i:1448312212;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/close.less";i:1448312211;s:95:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/buttons.less";i:1448312211;s:101:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/button-groups.less";i:1448312211;s:94:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/alerts.less";i:1448312210;s:92:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/navs.less";i:1448312213;s:94:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/navbar.less";i:1448312213;s:99:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/breadcrumbs.less";i:1448312211;s:98:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/pagination.less";i:1448312213;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/pager.less";i:1448312213;s:94:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/modals.less";i:1448312213;s:95:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/tooltip.less";i:1448312215;s:96:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/popovers.less";i:1448312213;s:98:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/thumbnails.less";i:1448312214;s:93:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/media.less";i:1448312212;s:101:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/labels-badges.less";i:1448312212;s:101:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/progress-bars.less";i:1448312213;s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/accordion.less";i:1448312210;s:96:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/carousel.less";i:1448312211;s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/hero-unit.less";i:1448312212;s:97:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/bootstrap/less/utilities.less";i:1448312215;}s:7:"updated";i:1448370346;}
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/style.less.cache b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/style.less.cache
new file mode 100644
index 00000000..2c618190
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/style.less.cache
@@ -0,0 +1,389 @@
+a:4:{s:4:"root";s:78:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/style.less";s:8:"compiled";s:9262:"html, body {
+	margin:0;
+	padding:0;
+	height:100%;
+}
+body {
+	color:#787878;
+	min-width:1000px;
+}
+a, a:hover, a:focus { color:#787878; }
+.hr {
+	border-bottom:1px solid #d8d8d8;
+	width:100%;
+}
+.header {
+	background:white;
+	border-bottom:none;
+	padding:0;
+}
+.logo {
+	position:absolute;
+	top:60px;
+	left:0;
+	right:0;
+	margin-left:auto;
+	margin-right:auto;
+	width:193px;
+}
+.btn-couzy, .btn-couzy:hover, .btn-couzy:focus, .btn-couzy:active {
+	background-color:#a7c352;
+	background-image:none;
+	border-color:#a7c352;
+	color:white;
+	text-shadow:none;
+}
+.main-holder {
+	min-height:100%;
+	position:relative;
+}
+.container-couzy { width:980px; }
+.container-fluid-couzy {
+	padding-left:0px;
+	padding-right:0px;
+}
+.span8-couzy { padding-right:22px; }
+.span4.sidebar {
+	margin-left:23px;
+	width:310px;
+}
+.span4.sidebar .custom-page-sidebar { padding:25px 37px 35px 37px; }
+.table { margin:30px 0 10px; }
+.table-bordered, .table-bordered thead:first-child tr:first-child > th:first-child, .table-bordered tbody:first-child tr:first-child > td:first-child, .table-bordered tbody:first-child tr:first-child > th:first-child, .table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, .table-bordered tbody:last-child tr:last-child > th:first-child, .table-bordered tfoot:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > th:first-child {
+	-webkit-border-radius:0px;
+	-moz-border-radius:0px;
+	border-radius:0px;
+}
+.table-bordered tfoot tr > th {
+	border-left:none;
+	border-right:none;
+	border-bottom:none;
+	border-top:1px solid #ddd;
+	padding-left:15px;
+}
+.header ul { list-style:none; }
+.header ul li {
+	position:relative;
+	float:left;
+}
+#very-top-menu-container { background-color:#b0b43b; }
+.very-top-menu > li a {
+	font-family:'Open Sans', sans-serif;
+	font-size:13px;
+	text-transform:uppercase;
+	color:white;
+	font-weight:bold;
+	margin:0 0 0 65px;
+	padding:15px 0 5px;
+	display:inline-block;
+	text-decoration:none;
+}
+#menu-item-27 a { color:#d8da9d; }
+.sub-menu {
+	margin:20px 0 80px;
+	text-align:right;
+}
+.sub-menu li {
+	display:block;
+	float:right !important;
+	margin-left:50px;
+}
+.sub-menu li a {
+	color:#8e8e8e;
+	border:none;
+	display:inline-block;
+	font-family:'Open Sans', sans-serif;
+	font-size:12px;
+	font-weight:600;
+	text-transform:uppercase;
+}
+.sub-menu .menu-item-blog a {
+	background-image:url(images/btn-menu-blog.jpg);
+	background-repeat:no-repeat;
+	text-indent:100%;
+	white-space:nowrap;
+	overflow:hidden;
+	width:75px;
+	height:28px;
+}
+.sub-menu li#menu-item-94 a { margin-top:6px; }
+.nav { margin-bottom:45px; }
+.sf-menu { float:none; }
+.top-menu.sf-menu li { background:none; }
+.top-menu.sf-menu li a {
+	color:#8e8e8e;
+	border:none;
+	font-family:'Open Sans', sans-serif;
+	font-size:16px;
+	font-weight:bold;
+	padding:10px 15px;
+	text-transform:uppercase;
+}
+.top-menu.sf-menu > li > a:hover, .top-menu.sf-menu > li > a:active, .top-menu.sf-menu > li.sfHover> a, .top-menu.sf-menu > li.current-menu-item > a, .top-menu.sf-menu > li.current_page_item > a {
+	background:none;
+	color:#b0b43b;
+	text-decoration:none;
+}
+#menu-item-19 a { padding-left:0; }
+#menu-item-20 { margin-right:241px; }
+#menu-item-24 a {
+	padding-left:0;
+	padding-right:35px;
+}
+#menu-item-23 a { padding-right:35px; }
+#menu-item-22 a { padding-right:0; }
+.container-fluid-slider {
+	padding-left:0;
+	padding-right:0;
+}
+.slider {
+	margin-left:auto;
+	margin-right:auto;
+}
+.camera_wrap {
+	height:1000px !important;
+	margin-bottom:0px !important;
+}
+.cameraSlide { overflow:hidden; }
+.cameraSlide img {
+	height:auto !important;
+	min-height:1002px;
+	margin-left:auto !important;
+	margin-right:auto !important;
+	width:100% !important;
+	min-width:2191px;
+}
+.camera_caption {
+	margin-left:auto;
+	margin-right:auto;
+	margin-top:350px;
+	position:relative;
+	width:980px;
+}
+.camera_caption > div { background:none; }
+.camera_caption > div > p {
+	display:inline-block;
+	background:url(images/slider-bg-title.png) repeat;
+	font-family:'Roboto Slab', serif;
+	font-size:57px;
+	margin-bottom:0;
+	padding:25px 10px;
+}
+.camera_caption > div > p:first-child {
+	font-size:39px;
+	padding:15px 10px 10px;
+}
+.camera_caption > div > p > span { opacity:1; }
+.camera_pag {
+	position:absolute;
+	bottom:370px;
+	left:0;
+	right:0;
+	margin-left:auto;
+	margin-right:auto;
+}
+.camera_wrap .camera_pag .camera_pag_ul li { opacity:0.8; }
+.camera_wrap .camera_pag .camera_pag_ul li.cameracurrent {
+	background-color:white;
+	opacity:1;
+}
+.camera_wrap .camera_pag .camera_pag_ul li.cameracurrent > span { background:white; }
+#introContainer {
+	background:url(images/slider-bottom-bg.png);
+	height:360px;
+	position:absolute;
+	bottom:0;
+	z-index:99;
+}
+#introContentLeft {
+	color:white;
+	font-family:'Open Sans', sans-serif;
+	font-size:16px;
+	line-height:30px;
+	margin-left:20px;
+	padding:40px 0;
+}
+#introContentLeft h2 {
+	color:white;
+	font-family:'Roboto Slab', serif;
+	font-size:39px;
+	line-height:50px;
+	margin-bottom:20px;
+}
+#introContentRight {
+	background-image:url(images/quotes.png);
+	background-repeat:no-repeat;
+	background-position:50px top;
+	color:white;
+	font-family:'Open Sans', sans-serif;
+	font-size:16px;
+	font-style:italic;
+	line-height:20px;
+	margin-left:0;
+	margin-top:45px;
+	padding-top:10px;
+	padding-left:50px;
+	padding-right:28px;
+}
+#introContentRight > p:first-child {
+	display:inline;
+	padding-left:40px;
+}
+#introContentRight #author {
+	font-family:'Open Sans', sans-serif;
+	font-size:12px;
+	line-height:14px;
+}
+#introContentRight .quote { font-size:60px; }
+.content-holder {
+	font-family:'Open Sans', sans-serif;
+	font-size:16px;
+	line-height:24px;
+	padding-bottom:300px;
+}
+.content-holder .page-thumbnail img { width:100%; }
+.content-holder .title-header, .content-holder h1 {
+	color:#859a43;
+	font-family:'Roboto Slab', serif;
+	font-weight:300;
+	font-size:39px;
+	line-height:50px;
+	margin-bottom:20px;
+}
+.content-holder strong { font-weight:600 !important; }
+.content-holder ul {
+	list-style-image:url(images/list.gif);
+	list-style-position:outside;
+	margin-left:15px;
+}
+.content-holder ul li {
+	font-weight:300;
+	line-height:24px;
+	margin:20px 0;
+}
+.content-holder a, .content-holder a:hover, .content-holder a:focus { text-decoration:underline; }
+.sidebar { margin-top:20px; }
+.sidebar-first { margin-top:-110px; }
+.custom-page-sidebar {
+	background-color:#382726;
+	padding:35px;
+	color:white;
+	line-height:24px;
+	font-size:16px;
+	font-weight:300;
+}
+.custom-page-sidebar h3 {
+	font-size:30px;
+	color:white;
+	font-family:'Roboto Slab', serif;
+	font-weight:100;
+	line-height:36px;
+}
+.sidebar .sidebar-thumbnail { width:310px; }
+.page-template-default .page-thumbnail {
+	background-repeat:no-repeat;
+	background-size:cover;
+	background-position:50% 50%;
+	height:502px;
+}
+.page-template-page-fullwidth-php .page-thumbnail {
+	background-repeat:no-repeat;
+	background-size:cover;
+	background-position:50% 50%;
+	height:254px;
+}
+.title-section { padding-top:0; }
+.page .span8-couzy { padding-top:0; }
+#content { padding-top:40px; }
+.page-template-page-fullwidth-php #content h3, .page .span8-couzy h3 {
+	color:#6e6e6e;
+	font-family:'Roboto Slab', serif;
+	font-size:24px;
+	font-weight:300;
+	margin:30px 0;
+}
+.page .span8-couzy .table, .table-bordered tfoot tr > th {
+	font-family:'Open Sans', sans-serif;
+	font-size:16px;
+	font-weight:300;
+}
+.page-template-page-fullwidth-php h1 { margin-top:50px; }
+.page-template-page-fullwidth-php #content { padding-top:10px; }
+.home .hentry { margin-top:50px; }
+.home .content-holder h1 { margin-bottom:40px; }
+.home .content-holder ul li { font-weight:normal; }
+.home .sidebar {
+	margin-top:60px;
+	padding-top:0 !important;
+}
+.home #custom_page_sidebar_1 { margin-top:0; }
+.page-id-7 .content-holder { padding-bottom:170px; }
+.container-gallery {
+	background-color:#f7f7f7;
+	margin-top:100px;
+	padding-top:30px;
+	padding-bottom:50px;
+}
+.container-gallery h1 { color:#777; }
+.html5gallery-container-0 .html5gallery-elem-0 {
+	box-shadow:none !important;
+	-webkit-box-shadow:none !important;
+}
+.html5gallery-elem-img-0 a > div { display:none !important; }
+.page-id-17 .content-holder { padding-bottom:0; }
+input[type="text"], input[type="email"], textarea, .btn {
+	border-radius:0;
+	-webkit-border-radius:0;
+	-moz-border-radius:0;
+}
+.wpcf7-form p.field input {
+	height:24px;
+	padding-top:7px;
+	width:100% !important;
+}
+.wpcf7-form textarea { width:100%; }
+input[type="submit"] { height:auto; }
+.help-block {
+	font-family:'Open Sans', sans-serif;
+	font-size:13px;
+	font-style:italic;
+	padding:10px 0;
+}
+.wpcf7-not-valid-tip, div.wpcf7-validation-errors {
+	font-family:'Open Sans', sans-serif !important;
+	font-size:13px !important;
+	font-style:italic !important;
+	padding:10px !important;
+	border-radius:0 !important;
+	-webkit-border-radius:0 !important;
+	-moz-border-radius:0 !important;
+}
+#map {
+	margin:50px 0 0 0;
+	padding:0;
+	height:515px;
+}
+.footer {
+	font-family:'Open Sans', sans-serif;
+	padding:0;
+	width:100%;
+	height:171px;
+	position:absolute;
+	bottom:0;
+	left:0;
+}
+.footer a, .footer a:hover, .footer a:focus { color:#827262; }
+#footer {
+	background-color:#f5f4f3;
+	color:#827262;
+	font-size:14px;
+	padding:30px 0 20px;
+}
+#copyright {
+	background-color:#b0b43b;
+	color:#f5f4f3;
+	text-transform:uppercase;
+	padding:20px 0;
+}
+#copyright a { color:#f5f4f3; }
+";s:5:"files";a:1:{s:78:"/home/mdryvesc/www/pavillonmadeleine.fr/wp-content/themes/YvesCouzy/style.less";i:1448312223;}s:7:"updated";i:1448370347;}
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/uploads/wftmptest.txt b/pavillonmadeleine.fr/wp-content/uploads/wftmptest.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/.htaccess b/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/.htaccess
new file mode 100644
index 00000000..dcd95120
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/.htaccess
@@ -0,0 +1,2 @@
+Options -Indexes
+Deny from all
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/index.php b/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/index.php
new file mode 100644
index 00000000..80bf0118
--- /dev/null
+++ b/pavillonmadeleine.fr/wp-content/uploads/wp-migrate-db/index.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-cron.php b/pavillonmadeleine.fr/wp-cron.php
index 75379a05..15c6676b 100644
--- a/pavillonmadeleine.fr/wp-cron.php
+++ b/pavillonmadeleine.fr/wp-cron.php
@@ -64,7 +64,9 @@ $gmt_time = microtime( true );
 if ( isset($keys[0]) && $keys[0] > $gmt_time )
 	die();
 
-$doing_cron_transient = get_transient( 'doing_cron');
+
+// The cron lock: a unix timestamp from when the cron was spawned.
+$doing_cron_transient = get_transient( 'doing_cron' );
 
 // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
 if ( empty( $doing_wp_cron ) ) {
@@ -79,7 +81,10 @@ if ( empty( $doing_wp_cron ) ) {
 	}
 }
 
-// Check lock
+/*
+ * The cron lock (a unix timestamp set when the cron was spawned),
+ * must match $doing_wp_cron (the "key").
+ */
 if ( $doing_cron_transient != $doing_wp_cron )
 	return;
 
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/getid3.lib.php b/pavillonmadeleine.fr/wp-includes/ID3/getid3.lib.php
index 0c92e060..07599640 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/getid3.lib.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/getid3.lib.php
@@ -519,11 +519,13 @@ class getid3_lib
 	}
 
 	public static function XML2array($XMLstring) {
-		if ( function_exists( 'simplexml_load_string' ) && function_exists( 'libxml_disable_entity_loader' ) ) {
-			$loader = libxml_disable_entity_loader( true );
-			$XMLobject = simplexml_load_string( $XMLstring, 'SimpleXMLElement', LIBXML_NOENT );
-			$return = self::SimpleXMLelement2array( $XMLobject );
-			libxml_disable_entity_loader( $loader );
+		if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) {
+			// http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
+			// https://core.trac.wordpress.org/changeset/29378
+			$loader = libxml_disable_entity_loader(true);
+			$XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT);
+			$return = self::SimpleXMLelement2array($XMLobject);
+			libxml_disable_entity_loader($loader);
 			return $return;
 		}
 		return false;
@@ -1163,6 +1165,8 @@ class getid3_lib
 				fwrite($tmp, $imgData);
 				fclose($tmp);
 				$GetDataImageSize = @getimagesize($tempfilename, $imageinfo);
+				$GetDataImageSize['height'] = $GetDataImageSize[0];
+				$GetDataImageSize['width']  = $GetDataImageSize[1];
 			}
 			unlink($tempfilename);
 		}
@@ -1360,6 +1364,7 @@ class getid3_lib
 		}
 		return $filesize;
 	}
+<<<<<<< .mine
 
 
 	/**
@@ -1373,4 +1378,20 @@ class getid3_lib
 		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
 	}
 
-}
\ No newline at end of file
+}
+||||||| .r11156
+}=======
+
+
+	/**
+	* Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
+	* @param string $path A path.
+	* @param string $suffix If the name component ends in suffix this will also be cut off.
+	* @return string
+	*/
+	public static function mb_basename($path, $suffix = null) {
+		$splited = preg_split('#/#', rtrim($path, '/ '));
+		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
+	}
+
+}>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/getid3.php b/pavillonmadeleine.fr/wp-includes/ID3/getid3.php
index 394e25e4..4c39245e 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/getid3.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/getid3.php
@@ -28,7 +28,14 @@ $temp_dir = ini_get('upload_tmp_dir');
 if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) {
 	$temp_dir = '';
 }
+<<<<<<< .mine
+if (!$temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
+||||||| .r11156
+if (!$temp_dir && function_exists('sys_get_temp_dir')) {
+	// PHP v5.2.1+
+=======
 if (!$temp_dir) {
+>>>>>>> .r12027
 	// sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts
 	$temp_dir = sys_get_temp_dir();
 }
@@ -109,7 +116,13 @@ class getID3
 	protected $startup_error   = '';
 	protected $startup_warning = '';
 
+<<<<<<< .mine
+	const VERSION           = '1.9.9-20141121';
+||||||| .r11156
+	const VERSION           = '1.9.7-20130705';
+=======
 	const VERSION           = '1.9.8-20140511';
+>>>>>>> .r12027
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
@@ -249,7 +262,7 @@ class getID3
 			$this->filename = $filename;
 			$this->info = array();
 			$this->info['GETID3_VERSION']   = $this->version();
-			$this->info['php_memory_limit'] = $this->memory_limit;
+			$this->info['php_memory_limit'] = (($this->memory_limit > 0) ? $this->memory_limit : false);
 
 			// remote files not supported
 			if (preg_match('/^(ht|f)tp:\/\//', $filename)) {
@@ -1793,4 +1806,4 @@ abstract class getid3_handler {
 class getid3_exception extends Exception
 {
 	public $message;
-}
\ No newline at end of file
+}
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.audio-video.quicktime.php b/pavillonmadeleine.fr/wp-includes/ID3/module.audio-video.quicktime.php
index 03f7a922..79cac7eb 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.audio-video.quicktime.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.audio-video.quicktime.php
@@ -35,7 +35,7 @@ class getid3_quicktime extends getid3_handler
 
 		$offset      = 0;
 		$atomcounter = 0;
-
+		$atom_data_read_buffer_size = ($info['php_memory_limit'] ? round($info['php_memory_limit'] / 2) : $this->getid3->option_fread_buffer_size * 1024); // allow [default: 32MB] if PHP configured with no memory_limit
 		while ($offset < $info['avdataend']) {
 			if (!getid3_lib::intValueSupported($offset)) {
 				$info['error'][] = 'Unable to parse atom at offset '.$offset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
@@ -67,8 +67,18 @@ class getid3_quicktime extends getid3_handler
 				// to read user data atoms, you should allow for the terminating 0.
 				break;
 			}
+<<<<<<< .mine
+			$atomHierarchy = array();
+			$info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, $atom_data_read_buffer_size)), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
+||||||| .r11156
+			switch ($atomname) {
+				case 'mdat': // Media DATa atom
+					// 'mdat' contains the actual data for the audio/video
+					if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) {
+=======
 			$atomHierarchy = array();
 			$info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, round($this->getid3->memory_limit / 2))), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
+>>>>>>> .r12027
 
 			$offset += $atomsize;
 			$atomcounter++;
@@ -798,12 +808,23 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($
 				$sttsEntriesDataOffset = 8;
 				//$FrameRateCalculatorArray = array();
 				$frames_count = 0;
+<<<<<<< .mine
+
+				$max_stts_entries_to_scan = ($info['php_memory_limit'] ? min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']) : $atom_structure['number_entries']);
+				if ($max_stts_entries_to_scan < $atom_structure['number_entries']) {
+					$info['warning'][] = 'QuickTime atom "stts" has '.$atom_structure['number_entries'].' but only scanning the first '.$max_stts_entries_to_scan.' entries due to limited PHP memory available ('.floor($atom_structure['number_entries'] / 1048576).'MB).';
+				}
+				for ($i = 0; $i < $max_stts_entries_to_scan; $i++) {
+||||||| .r11156
+				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+=======
 
 				$max_stts_entries_to_scan = min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']);
 				if ($max_stts_entries_to_scan < $atom_structure['number_entries']) {
 					$info['warning'][] = 'QuickTime atom "stts" has '.$atom_structure['number_entries'].' but only scanning the first '.$max_stts_entries_to_scan.' entries due to limited PHP memory available ('.floor($this->getid3->memory_limit / 1048576).'MB).';
 				}
 				for ($i = 0; $i < $max_stts_entries_to_scan; $i++) {
+>>>>>>> .r12027
 					$atom_structure['time_to_sample_table'][$i]['sample_count']    = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
 					$sttsEntriesDataOffset += 4;
 					$atom_structure['time_to_sample_table'][$i]['sample_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
@@ -1399,7 +1420,7 @@ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($
 			case "\x00\x00\x00\x00":
 			case 'meta': // METAdata atom
 				// some kind of metacontainer, may contain a big data dump such as:
-				// mdta keys  mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst   data DEApple 0  (data DE2011-05-11T17:54:04+0200 2  *data DE+52.4936+013.3897+040.247/   data DE4.3.1  data DEiPhone 4
+				// mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
 				// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
 
 	            $atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.audio.flac.php b/pavillonmadeleine.fr/wp-includes/ID3/module.audio.flac.php
index 8fa0f4c6..9d46c034 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.audio.flac.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.audio.flac.php
@@ -135,7 +135,17 @@ class getid3_flac extends getid3_handler
 		if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) {
 			foreach ($info['flac']['PICTURE'] as $entry) {
 				if (!empty($entry['data'])) {
-					$info['flac']['comments']['picture'][] = array('image_mime'=>$entry['image_mime'], 'data'=>$entry['data']);
+					if (!isset($info['flac']['comments']['picture'])) {
+						$info['flac']['comments']['picture'] = array();
+					}
+					$comments_picture_data = array();
+					foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+						if (isset($entry[$picture_key])) {
+							$comments_picture_data[$picture_key] = $entry[$picture_key];
+						}
+					}
+					$info['flac']['comments']['picture'][] = $comments_picture_data;
+					unset($comments_picture_data);
 				}
 			}
 		}
@@ -343,25 +353,25 @@ class getid3_flac extends getid3_handler
 		$info = &$this->getid3->info;
 
 		$picture['typeid']         = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['type']           = self::pictureTypeLookup($picture['typeid']);
+		$picture['picturetype']    = self::pictureTypeLookup($picture['typeid']);
 		$picture['image_mime']     = $this->fread(getid3_lib::BigEndian2Int($this->fread(4)));
 		$descr_length              = getid3_lib::BigEndian2Int($this->fread(4));
 		if ($descr_length) {
 			$picture['description'] = $this->fread($descr_length);
 		}
-		$picture['width']          = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['height']         = getid3_lib::BigEndian2Int($this->fread(4));
+		$picture['image_width']    = getid3_lib::BigEndian2Int($this->fread(4));
+		$picture['image_height']   = getid3_lib::BigEndian2Int($this->fread(4));
 		$picture['color_depth']    = getid3_lib::BigEndian2Int($this->fread(4));
 		$picture['colors_indexed'] = getid3_lib::BigEndian2Int($this->fread(4));
-		$data_length               = getid3_lib::BigEndian2Int($this->fread(4));
+		$picture['datalength']     = getid3_lib::BigEndian2Int($this->fread(4));
 
 		if ($picture['image_mime'] == '-->') {
-			$picture['data'] = $this->fread($data_length);
+			$picture['data'] = $this->fread($picture['datalength']);
 		} else {
 			$picture['data'] = $this->saveAttachment(
-				str_replace('/', '_', $picture['type']).'_'.$this->ftell(),
+				str_replace('/', '_', $picture['picturetype']).'_'.$this->ftell(),
 				$this->ftell(),
-				$data_length,
+				$picture['datalength'],
 				$picture['image_mime']);
 		}
 
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.audio.ogg.php b/pavillonmadeleine.fr/wp-includes/ID3/module.audio.ogg.php
index f3bb0047..ecffc5ff 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.audio.ogg.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.audio.ogg.php
@@ -63,6 +63,12 @@ class getid3_ogg extends getid3_handler
 
 			$this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
 
+		} elseif (substr($filedata, 0, 8) == 'OpusHead') {
+
+			if( $this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false ) {
+				return false;
+			}
+
 		} elseif (substr($filedata, 0, 8) == 'Speex   ') {
 
 			// http://www.speex.org/manual/node10.html
@@ -255,7 +261,7 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 
 		} else {
 
-			$info['error'][] = 'Expecting either "Speex   " or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
+			$info['error'][] = 'Expecting either "Speex   ", "OpusHead" or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
 			unset($info['ogg']);
 			unset($info['mime_type']);
 			return false;
@@ -288,8 +294,19 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 				$this->fseek($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
 				$this->ParseVorbisComments();
 				break;
-		}
 
+			case 'opus':
+				$filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
+				if(substr($filedata, 0, 8)  != 'OpusTags') {
+					$info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"';
+					return false;
+				}
+
+				$this->ParseVorbisComments();
+				break;
+
+		}
 
 		// Last Page - Number of Samples
 		if (!getid3_lib::intValueSupported($info['avdataend'])) {
@@ -409,6 +426,57 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 		return true;
 	}
 
+	// http://tools.ietf.org/html/draft-ietf-codec-oggopus-03
+	public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
+		$info = &$this->getid3->info;
+		$info['audio']['dataformat']   = 'opus';
+		$info['mime_type']             = 'audio/ogg; codecs=opus';
+
+		/** @todo find a usable way to detect abr (vbr that is padded to be abr) */
+		$info['audio']['bitrate_mode'] = 'vbr';
+
+		$info['audio']['lossless']     = false;
+
+		$info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead'
+		$filedataoffset += 8;
+		$info['ogg']['pageheader']['opus']['version']    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$filedataoffset += 1;
+
+		if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
+			$info['error'][] = 'Unknown opus version number (only accepting 1-15)';
+			return false;
+		}
+
+		$info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$filedataoffset += 1;
+
+		if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
+			$info['error'][] = 'Invalid channel count in opus header (must not be zero)';
+			return false;
+		}
+
+		$info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+		$filedataoffset += 2;
+
+		$info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+		$filedataoffset += 4;
+
+		//$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+		//$filedataoffset += 2;
+
+		//$info['ogg']['pageheader']['opus']['channel_mapping_family'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		//$filedataoffset += 1;
+
+		$info['opus']['opus_version']      = $info['ogg']['pageheader']['opus']['version'];
+		$info['opus']['sample_rate']       = $info['ogg']['pageheader']['opus']['sample_rate'];
+		$info['opus']['out_channel_count'] = $info['ogg']['pageheader']['opus']['out_channel_count'];
+
+		$info['audio']['channels']      = $info['opus']['out_channel_count'];
+		$info['audio']['sample_rate']   = $info['opus']['sample_rate'];
+		return true;
+	}
+
+
 	public function ParseOggPageHeader() {
 		// http://xiph.org/ogg/vorbis/doc/framing.html
 		$oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
@@ -471,6 +539,7 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 		switch ($info['audio']['dataformat']) {
 			case 'vorbis':
 			case 'speex':
+			case 'opus':
 				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
 				$this->fseek($CommentStartOffset);
 				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
@@ -479,6 +548,10 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 				if ($info['audio']['dataformat'] == 'vorbis') {
 					$commentdataoffset += (strlen('vorbis') + 1);
 				}
+				else if ($info['audio']['dataformat'] == 'opus') {
+					$commentdataoffset += strlen('OpusTags');
+				}
+
 				break;
 
 			case 'flac':
@@ -505,6 +578,12 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 		$ThisFileInfo_ogg_comments_raw = &$info['ogg']['comments_raw'];
 		for ($i = 0; $i < $CommentsCount; $i++) {
 
+			if ($i >= 10000) {
+				// https://github.com/owncloud/music/issues/212#issuecomment-43082336
+				$info['warning'][] = 'Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments';
+				break;
+			}
+
 			$ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset;
 
 			if ($this->ftell() < ($ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + 4)) {
@@ -615,8 +694,12 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 					$ogg = new self($this->getid3);
 					$ogg->setStringMode($data);
 					$info['ogg']['comments']['picture'][] = array(
-						'image_mime' => $imageinfo['mime'],
-						'data'       => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
+						'image_mime'   => $imageinfo['mime'],
+						'datalength'   => strlen($data),
+						'picturetype'  => 'cover art',
+						'image_height' => $imageinfo['height'],
+						'image_width'  => $imageinfo['width'],
+						'data'         => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
 					);
 					unset($ogg);
 
@@ -729,6 +812,35 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 		return round($qval, 1); // 5 or 4.9
 	}
 
+<<<<<<< .mine
+	public static function TheoraColorSpace($colorspace_id) {
+		// http://www.theora.org/doc/Theora.pdf (table 6.3)
+		static $TheoraColorSpaceLookup = array();
+		if (empty($TheoraColorSpaceLookup)) {
+			$TheoraColorSpaceLookup[0] = 'Undefined';
+			$TheoraColorSpaceLookup[1] = 'Rec. 470M';
+			$TheoraColorSpaceLookup[2] = 'Rec. 470BG';
+			$TheoraColorSpaceLookup[3] = 'Reserved';
+		}
+		return (isset($TheoraColorSpaceLookup[$colorspace_id]) ? $TheoraColorSpaceLookup[$colorspace_id] : null);
+	}
+
+	public static function TheoraPixelFormat($pixelformat_id) {
+		// http://www.theora.org/doc/Theora.pdf (table 6.4)
+		static $TheoraPixelFormatLookup = array();
+		if (empty($TheoraPixelFormatLookup)) {
+			$TheoraPixelFormatLookup[0] = '4:2:0';
+			$TheoraPixelFormatLookup[1] = 'Reserved';
+			$TheoraPixelFormatLookup[2] = '4:2:2';
+			$TheoraPixelFormatLookup[3] = '4:4:4';
+		}
+		return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null);
+	}
+
+}
+||||||| .r11156
+}
+=======
 	public static function TheoraColorSpace($colorspace_id) {
 		// http://www.theora.org/doc/Theora.pdf (table 6.3)
 		static $TheoraColorSpaceLookup = array();
@@ -753,4 +865,4 @@ $info['warning'][] = 'Ogg Theora (v3) not fully supported in this version of get
 		return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null);
 	}
 
-}
\ No newline at end of file
+}>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.apetag.php b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.apetag.php
index 5bd4b835..79a2b011 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.apetag.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.apetag.php
@@ -138,58 +138,88 @@ class getid3_apetag extends getid3_handler
 			$thisfile_ape_items_current['flags'] = $this->parseAPEtagFlags($item_flags);
 			switch ($thisfile_ape_items_current['flags']['item_contents_raw']) {
 				case 0: // UTF-8
-				case 3: // Locator (URL, filename, etc), UTF-8 encoded
-					$thisfile_ape_items_current['data'] = explode("\x00", trim($thisfile_ape_items_current['data']));
+				case 2: // Locator (URL, filename, etc), UTF-8 encoded
+					$thisfile_ape_items_current['data'] = explode("\x00", $thisfile_ape_items_current['data']);
 					break;
 
-				default: // binary data
+				case 1:  // binary data
+				default:
 					break;
 			}
 
 			switch (strtolower($item_key)) {
+				// http://wiki.hydrogenaud.io/index.php?title=ReplayGain#MP3Gain
 				case 'replaygain_track_gain':
-					$thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['track']['originator'] = 'unspecified';
+					if (preg_match('#^[\\-\\+][0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) {
+						$thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
+						$thisfile_replaygain['track']['originator'] = 'unspecified';
+					} else {
+						$info['warning'][] = 'MP3gainTrackGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
+					}
 					break;
 
 				case 'replaygain_track_peak':
-					$thisfile_replaygain['track']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['track']['originator'] = 'unspecified';
-					if ($thisfile_replaygain['track']['peak'] <= 0) {
-						$info['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+					if (preg_match('#^[0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) {
+						$thisfile_replaygain['track']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
+						$thisfile_replaygain['track']['originator'] = 'unspecified';
+						if ($thisfile_replaygain['track']['peak'] <= 0) {
+							$info['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+						}
+					} else {
+						$info['warning'][] = 'MP3gainTrackPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
 					}
 					break;
 
 				case 'replaygain_album_gain':
-					$thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['album']['originator'] = 'unspecified';
+					if (preg_match('#^[\\-\\+][0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) {
+						$thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
+						$thisfile_replaygain['album']['originator'] = 'unspecified';
+					} else {
+						$info['warning'][] = 'MP3gainAlbumGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
+					}
 					break;
 
 				case 'replaygain_album_peak':
-					$thisfile_replaygain['album']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['album']['originator'] = 'unspecified';
-					if ($thisfile_replaygain['album']['peak'] <= 0) {
-						$info['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+					if (preg_match('#^[0-9\\.,]{8}$#', $thisfile_ape_items_current['data'][0])) {
+						$thisfile_replaygain['album']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
+						$thisfile_replaygain['album']['originator'] = 'unspecified';
+						if ($thisfile_replaygain['album']['peak'] <= 0) {
+							$info['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+						}
+					} else {
+						$info['warning'][] = 'MP3gainAlbumPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
 					}
 					break;
 
 				case 'mp3gain_undo':
-					list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['undo_left']  = intval($mp3gain_undo_left);
-					$thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right);
-					$thisfile_replaygain['mp3gain']['undo_wrap']  = (($mp3gain_undo_wrap == 'Y') ? true : false);
+					if (preg_match('#^[\\-\\+][0-9]{3},[\\-\\+][0-9]{3},[NW]$#', $thisfile_ape_items_current['data'][0])) {
+						list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]);
+						$thisfile_replaygain['mp3gain']['undo_left']  = intval($mp3gain_undo_left);
+						$thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right);
+						$thisfile_replaygain['mp3gain']['undo_wrap']  = (($mp3gain_undo_wrap == 'Y') ? true : false);
+					} else {
+						$info['warning'][] = 'MP3gainUndo value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
+					}
 					break;
 
 				case 'mp3gain_minmax':
-					list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min);
-					$thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max);
+					if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) {
+						list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]);
+						$thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min);
+						$thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max);
+					} else {
+						$info['warning'][] = 'MP3gainMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
+					}
 					break;
 
 				case 'mp3gain_album_minmax':
-					list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min);
-					$thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max);
+					if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) {
+						list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]);
+						$thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min);
+						$thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max);
+					} else {
+						$info['warning'][] = 'MP3gainAlbumMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"';
+					}
 					break;
 
 				case 'tracknumber':
@@ -222,6 +252,10 @@ class getid3_apetag extends getid3_handler
 				case 'cover art (recording)':
 				case 'cover art (studio)':
 					// list of possible cover arts from http://taglib-sharp.sourcearchive.com/documentation/2.0.3.0-2/Ape_2Tag_8cs-source.html
+					if (is_array($thisfile_ape_items_current['data'])) {
+						$info['warning'][] = 'APEtag "'.$item_key.'" should be flagged as Binary data, but was incorrectly flagged as UTF-8';
+						$thisfile_ape_items_current['data'] = implode("\x00", $thisfile_ape_items_current['data']);
+					}
 					list($thisfile_ape_items_current['filename'], $thisfile_ape_items_current['data']) = explode("\x00", $thisfile_ape_items_current['data'], 2);
 					$thisfile_ape_items_current['data_offset'] = $thisfile_ape_items_current['offset'] + strlen($thisfile_ape_items_current['filename']."\x00");
 					$thisfile_ape_items_current['data_length'] = strlen($thisfile_ape_items_current['data']);
@@ -269,7 +303,14 @@ class getid3_apetag extends getid3_handler
 							if (!isset($info['ape']['comments']['picture'])) {
 								$info['ape']['comments']['picture'] = array();
 							}
-							$info['ape']['comments']['picture'][] = array('data'=>$thisfile_ape_items_current['data'], 'image_mime'=>$thisfile_ape_items_current['image_mime']);
+							$comments_picture_data = array();
+							foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+								if (isset($thisfile_ape_items_current[$picture_key])) {
+									$comments_picture_data[$picture_key] = $thisfile_ape_items_current[$picture_key];
+								}
+							}
+							$info['ape']['comments']['picture'][] = $comments_picture_data;
+							unset($comments_picture_data);
 						}
 					} while (false);
 					break;
@@ -317,7 +358,7 @@ class getid3_apetag extends getid3_handler
 	public function parseAPEtagFlags($rawflagint) {
 		// "Note: APE Tags 1.0 do not use any of the APE Tag flags.
 		// All are set to zero on creation and ignored on reading."
-		// http://www.uni-jena.de/~pfk/mpp/sv8/apetagflags.html
+		// http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags
 		$flags['header']            = (bool) ($rawflagint & 0x80000000);
 		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
 		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.id3v2.php b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.id3v2.php
index d1c4fce7..7373657f 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.id3v2.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.id3v2.php
@@ -625,12 +625,13 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -640,8 +641,8 @@ class getid3_id3v2 extends getid3_handler
 			$parsedFrame['encodingid']  = $frame_textencoding;
 			$parsedFrame['encoding']    = $this->TextEncodingNameLookup($frame_textencoding);
 
-			$parsedFrame['description'] = $frame_description;
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+			$parsedFrame['description'] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $frame_description));
+			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
 			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
 				$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
 				if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
@@ -717,11 +718,13 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -729,10 +732,10 @@ class getid3_id3v2 extends getid3_handler
 			if (ord($frame_description) === 0) {
 				$frame_description = '';
 			}
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
 
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding));
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			if ($frame_terminatorpos) {
@@ -956,20 +959,22 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
 			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
 			$frame_offset += 3;
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 			if (ord($frame_description) === 0) {
 				$frame_description = '';
 			}
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
 
 			$parsedFrame['encodingid']   = $frame_textencoding;
 			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
@@ -1002,8 +1007,10 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
 			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
 			$frame_offset += 3;
@@ -1020,16 +1027,16 @@ class getid3_id3v2 extends getid3_handler
 			$frame_remainingdata = substr($parsedFrame['data'], $frame_offset);
 			while (strlen($frame_remainingdata)) {
 				$frame_offset = 0;
-				$frame_terminatorpos = strpos($frame_remainingdata, $this->TextEncodingTerminatorLookup($frame_textencoding));
+				$frame_terminatorpos = strpos($frame_remainingdata, $frame_textencoding_terminator);
 				if ($frame_terminatorpos === false) {
 					$frame_remainingdata = '';
 				} else {
-					if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+					if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 						$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 					}
 					$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
 
-					$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+					$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator));
 					if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) {
 						// timestamp probably omitted for first data item
 					} else {
@@ -1060,20 +1067,22 @@ class getid3_id3v2 extends getid3_handler
 
 				$frame_offset = 0;
 				$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+				$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 				if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 					$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+					$frame_textencoding_terminator = "\x00";
 				}
 				$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
 				$frame_offset += 3;
-				$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+				$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 				}
 				$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 				if (ord($frame_description) === 0) {
 					$frame_description = '';
 				}
-				$frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+				$frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
 
 				$parsedFrame['encodingid']   = $frame_textencoding;
 				$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
@@ -1330,8 +1339,10 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
 
 			if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
@@ -1367,8 +1378,8 @@ class getid3_id3v2 extends getid3_handler
 			if ($frame_offset >= $parsedFrame['datalength']) {
 				$info['warning'][] = 'data portion of APIC frame is missing at offset '.($parsedFrame['dataoffset'] + 8 + $frame_offset);
 			} else {
-				$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+				$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 				}
 				$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1386,7 +1397,7 @@ class getid3_id3v2 extends getid3_handler
 				$parsedFrame['picturetypeid']    = $frame_picturetype;
 				$parsedFrame['picturetype']      = $this->APICPictureTypeLookup($frame_picturetype);
 				$parsedFrame['description']      = $frame_description;
-				$parsedFrame['data']             = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+				$parsedFrame['data']             = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
 				$parsedFrame['datalength']       = strlen($parsedFrame['data']);
 
 				$parsedFrame['image_mime'] = '';
@@ -1443,7 +1454,14 @@ class getid3_id3v2 extends getid3_handler
 							if (!isset($info['id3v2']['comments']['picture'])) {
 								$info['id3v2']['comments']['picture'] = array();
 							}
-							$info['id3v2']['comments']['picture'][] = array('data'=>$parsedFrame['data'], 'image_mime'=>$parsedFrame['image_mime']);
+							$comments_picture_data = array();
+							foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+								if (isset($parsedFrame[$picture_key])) {
+									$comments_picture_data[$picture_key] = $parsedFrame[$picture_key];
+								}
+							}
+							$info['id3v2']['comments']['picture'][] = $comments_picture_data;
+							unset($comments_picture_data);
 						}
 					}
 				} while (false);
@@ -1462,8 +1480,10 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
 			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
 			$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1472,25 +1492,25 @@ class getid3_id3v2 extends getid3_handler
 			}
 			$frame_offset = $frame_terminatorpos + strlen("\x00");
 
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_filename = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 			if (ord($frame_filename) === 0) {
 				$frame_filename = '';
 			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+			$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
 
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 			if (ord($frame_description) === 0) {
 				$frame_description = '';
 			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+			$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
 
 			$parsedFrame['objectdata']  = (string) substr($parsedFrame['data'], $frame_offset);
 			$parsedFrame['encodingid']  = $frame_textencoding;
@@ -1607,7 +1627,7 @@ class getid3_id3v2 extends getid3_handler
 
 
 		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'LINK')) || // 4.20  LINK Linked information
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) {     // 4.22  LNK  Linked information
+				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) {    // 4.22  LNK  Linked information
 			//   There may be more than one 'LINK' frame in a tag,
 			//   but only one with the same contents
 			// 
@@ -1635,7 +1655,7 @@ class getid3_id3v2 extends getid3_handler
 
 			$parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset);
 			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = utf8_encode($parsedFrame['url']);
+				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback_iso88591_utf8($parsedFrame['url']);
 			}
 			unset($parsedFrame['data']);
 
@@ -1729,8 +1749,10 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_offset = 0;
 			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+			$frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
 			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
 				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+				$frame_textencoding_terminator = "\x00";
 			}
 
 			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
@@ -1752,25 +1774,25 @@ class getid3_id3v2 extends getid3_handler
 
 			$frame_receivedasid = ord(substr($parsedFrame['data'], $frame_offset++, 1));
 
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_sellername = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 			if (ord($frame_sellername) === 0) {
 				$frame_sellername = '';
 			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+			$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
 
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+			$frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
 				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
 			}
 			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
 			if (ord($frame_description) === 0) {
 				$frame_description = '';
 			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+			$frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
 
 			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
 			$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1944,6 +1966,186 @@ class getid3_id3v2 extends getid3_handler
 
 			unset($parsedFrame['data']);
 
+		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CHAP')) { // CHAP Chapters frame (ID3v2.3+ only)
+			// http://id3.org/id3v2-chapters-1.0
+			//            (10 bytes)
+			// Element ID       $00
+			// Start time      $xx xx xx xx
+			// End time        $xx xx xx xx
+            // Start offset    $xx xx xx xx
+            // End offset      $xx xx xx xx
+            // 
+
+			$frame_offset = 0;
+			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
+			$frame_offset += strlen($parsedFrame['element_id']."\x00");
+			$parsedFrame['time_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			$frame_offset += 4;
+			$parsedFrame['time_end']   = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			$frame_offset += 4;
+			if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
+				// "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
+				$parsedFrame['offset_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			}
+			$frame_offset += 4;
+			if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
+				// "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
+				$parsedFrame['offset_end']   = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			}
+			$frame_offset += 4;
+
+			if ($frame_offset < strlen($parsedFrame['data'])) {
+				$parsedFrame['subframes'] = array();
+				while ($frame_offset < strlen($parsedFrame['data'])) {
+					// 
+					$subframe = array();
+					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$frame_offset += 4;
+					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+					$frame_offset += 4;
+					$subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
+					$frame_offset += 2;
+					if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) {
+						$info['warning'][] = 'CHAP subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)';
+						break;
+					}
+					$subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']);
+					$frame_offset += $subframe['size'];
+
+					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
+					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					switch (substr($encoding_converted_text, 0, 2)) {
+						case "\xFF\xFE":
+						case "\xFE\xFF":
+							switch (strtoupper($info['id3v2']['encoding'])) {
+								case 'ISO-8859-1':
+								case 'UTF-8':
+									$encoding_converted_text = substr($encoding_converted_text, 2);
+									// remove unwanted byte-order-marks
+									break;
+								default:
+									// ignore
+									break;
+							}
+							break;
+						default:
+							// do not remove BOM
+							break;
+					}
+
+					if (($subframe['name'] == 'TIT2') || ($subframe['name'] == 'TIT3')) {
+						if ($subframe['name'] == 'TIT2') {
+							$parsedFrame['chapter_name']        = $encoding_converted_text;
+						} elseif ($subframe['name'] == 'TIT3') {
+							$parsedFrame['chapter_description'] = $encoding_converted_text;
+						}
+						$parsedFrame['subframes'][] = $subframe;
+					} else {
+						$info['warning'][] = 'ID3v2.CHAP subframe "'.$subframe['name'].'" not handled (only TIT2 and TIT3)';
+					}
+				}
+				unset($subframe_rawdata, $subframe, $encoding_converted_text);
+			}
+
+			$id3v2_chapter_entry = array();
+			foreach (array('id', 'time_begin', 'time_end', 'offset_begin', 'offset_end', 'chapter_name', 'chapter_description') as $id3v2_chapter_key) {
+				if (isset($parsedFrame[$id3v2_chapter_key])) {
+					$id3v2_chapter_entry[$id3v2_chapter_key] = $parsedFrame[$id3v2_chapter_key];
+				}
+			}
+			if (!isset($info['id3v2']['chapters'])) {
+				$info['id3v2']['chapters'] = array();
+			}
+			$info['id3v2']['chapters'][] = $id3v2_chapter_entry;
+			unset($id3v2_chapter_entry, $id3v2_chapter_key);
+
+
+		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CTOC')) { // CTOC Chapters Table Of Contents frame (ID3v2.3+ only)
+			// http://id3.org/id3v2-chapters-1.0
+			//            (10 bytes)
+			// Element ID       $00
+			// CTOC flags        %xx
+			// Entry count       $xx
+			// Child Element ID  $00   /* zero or more child CHAP or CTOC entries */
+            // 
+
+			$frame_offset = 0;
+			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
+			$frame_offset += strlen($parsedFrame['element_id']."\x00");
+			$ctoc_flags_raw = ord(substr($parsedFrame['data'], $frame_offset, 1));
+			$frame_offset += 1;
+			$parsedFrame['entry_count'] = ord(substr($parsedFrame['data'], $frame_offset, 1));
+			$frame_offset += 1;
+
+			$terminator_position = null;
+			for ($i = 0; $i < $parsedFrame['entry_count']; $i++) {
+				$terminator_position = strpos($parsedFrame['data'], "\x00", $frame_offset);
+				$parsedFrame['child_element_ids'][$i] = substr($parsedFrame['data'], $frame_offset, $terminator_position - $frame_offset);
+				$frame_offset = $terminator_position + 1;
+			}
+
+			$parsedFrame['ctoc_flags']['ordered']   = (bool) ($ctoc_flags_raw & 0x01);
+			$parsedFrame['ctoc_flags']['top_level'] = (bool) ($ctoc_flags_raw & 0x03);
+
+			unset($ctoc_flags_raw, $terminator_position);
+
+			if ($frame_offset < strlen($parsedFrame['data'])) {
+				$parsedFrame['subframes'] = array();
+				while ($frame_offset < strlen($parsedFrame['data'])) {
+					// 
+					$subframe = array();
+					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$frame_offset += 4;
+					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+					$frame_offset += 4;
+					$subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
+					$frame_offset += 2;
+					if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) {
+						$info['warning'][] = 'CTOS subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)';
+						break;
+					}
+					$subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']);
+					$frame_offset += $subframe['size'];
+
+					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
+					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					switch (substr($encoding_converted_text, 0, 2)) {
+						case "\xFF\xFE":
+						case "\xFE\xFF":
+							switch (strtoupper($info['id3v2']['encoding'])) {
+								case 'ISO-8859-1':
+								case 'UTF-8':
+									$encoding_converted_text = substr($encoding_converted_text, 2);
+									// remove unwanted byte-order-marks
+									break;
+								default:
+									// ignore
+									break;
+							}
+							break;
+						default:
+							// do not remove BOM
+							break;
+					}
+
+					if (($subframe['name'] == 'TIT2') || ($subframe['name'] == 'TIT3')) {
+						if ($subframe['name'] == 'TIT2') {
+							$parsedFrame['toc_name']        = $encoding_converted_text;
+						} elseif ($subframe['name'] == 'TIT3') {
+							$parsedFrame['toc_description'] = $encoding_converted_text;
+						}
+						$parsedFrame['subframes'][] = $subframe;
+					} else {
+						$info['warning'][] = 'ID3v2.CTOC subframe "'.$subframe['name'].'" not handled (only TIT2 and TIT3)';
+					}
+				}
+				unset($subframe_rawdata, $subframe, $encoding_converted_text);
+			}
+
 		}
 
 		return true;
@@ -3344,7 +3546,7 @@ class getid3_id3v2 extends getid3_handler
 			3   => "\x00",     // $03  UTF-8 encoded Unicode. Terminated with $00.
 			255 => "\x00\x00"
 		);
-		return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : '');
+		return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : "\x00");
 	}
 
 	public static function TextEncodingNameLookup($encoding) {
diff --git a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.lyrics3.php b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.lyrics3.php
index 7891603e..287a9907 100644
--- a/pavillonmadeleine.fr/wp-includes/ID3/module.tag.lyrics3.php
+++ b/pavillonmadeleine.fr/wp-includes/ID3/module.tag.lyrics3.php
@@ -101,6 +101,38 @@ class getid3_lyrics3 extends getid3_handler
 			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
 
 			if (!isset($info['ape'])) {
+<<<<<<< .mine
+				if (isset($info['lyrics3']['tag_offset_start'])) {
+					$GETID3_ERRORARRAY = &$info['warning'];
+					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
+					$getid3_temp = new getID3();
+					$getid3_temp->openfile($this->getid3->filename);
+					$getid3_apetag = new getid3_apetag($getid3_temp);
+					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
+					$getid3_apetag->Analyze();
+					if (!empty($getid3_temp->info['ape'])) {
+						$info['ape'] = $getid3_temp->info['ape'];
+					}
+					if (!empty($getid3_temp->info['replay_gain'])) {
+						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
+					}
+					unset($getid3_temp, $getid3_apetag);
+||||||| .r11156
+				$GETID3_ERRORARRAY = &$info['warning'];
+				if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, false)) {
+					$getid3_temp = new getID3();
+					$getid3_temp->openfile($this->getid3->filename);
+					$getid3_apetag = new getid3_apetag($getid3_temp);
+					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
+					$getid3_apetag->Analyze();
+					if (!empty($getid3_temp->info['ape'])) {
+						$info['ape'] = $getid3_temp->info['ape'];
+					}
+					if (!empty($getid3_temp->info['replay_gain'])) {
+						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
+					}
+					unset($getid3_temp, $getid3_apetag);
+=======
 				$GETID3_ERRORARRAY = &$info['warning'];
 				getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
 				$getid3_temp = new getID3();
@@ -110,6 +142,9 @@ class getid3_lyrics3 extends getid3_handler
 				$getid3_apetag->Analyze();
 				if (!empty($getid3_temp->info['ape'])) {
 					$info['ape'] = $getid3_temp->info['ape'];
+>>>>>>> .r12027
+				} else {
+					$info['warning'][] = 'Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)';
 				}
 				if (!empty($getid3_temp->info['replay_gain'])) {
 					$info['replay_gain'] = $getid3_temp->info['replay_gain'];
diff --git a/pavillonmadeleine.fr/wp-includes/Text/Diff.php b/pavillonmadeleine.fr/wp-includes/Text/Diff.php
index dc24b67f..edcdd3ac 100644
--- a/pavillonmadeleine.fr/wp-includes/Text/Diff.php
+++ b/pavillonmadeleine.fr/wp-includes/Text/Diff.php
@@ -33,7 +33,7 @@ class Text_Diff {
      *                           Normally an array of two arrays, each
      *                           containing the lines from a file.
      */
-    function Text_Diff($engine, $params)
+    function __construct( $engine, $params )
     {
         // Backward compatibility workaround.
         if (!is_string($engine)) {
@@ -55,6 +55,13 @@ class Text_Diff {
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff( $engine, $params ) {
+		self::__construct( $engine, $params );
+	}
+
     /**
      * Returns the array of differences.
      */
@@ -304,7 +311,7 @@ class Text_MappedDiff extends Text_Diff {
      * @param array $mapped_to_lines    This array should have the same number
      *                                  of elements as $to_lines.
      */
-    function Text_MappedDiff($from_lines, $to_lines,
+    function __construct($from_lines, $to_lines,
                              $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
@@ -328,6 +335,15 @@ class Text_MappedDiff extends Text_Diff {
         }
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_MappedDiff( $from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines ) {
+		self::__construct( $from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines );
+	}
+
 }
 
 /**
@@ -366,7 +382,10 @@ class Text_Diff_Op {
  */
 class Text_Diff_Op_copy extends Text_Diff_Op {
 
-    function Text_Diff_Op_copy($orig, $final = false)
+	/**
+	 * PHP5 constructor.
+	 */
+    function __construct( $orig, $final = false )
     {
         if (!is_array($final)) {
             $final = $orig;
@@ -375,6 +394,13 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
         $this->final = $final;
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff_Op_copy( $orig, $final = false ) {
+		self::__construct( $orig, $final );
+	}
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
@@ -391,12 +417,22 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
  */
 class Text_Diff_Op_delete extends Text_Diff_Op {
 
-    function Text_Diff_Op_delete($lines)
+	/**
+	 * PHP5 constructor.
+	 */
+	function __construct( $lines )
     {
         $this->orig = $lines;
         $this->final = false;
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff_Op_delete( $lines ) {
+		self::__construct( $lines );
+	}
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_add($this->orig);
@@ -413,12 +449,22 @@ class Text_Diff_Op_delete extends Text_Diff_Op {
  */
 class Text_Diff_Op_add extends Text_Diff_Op {
 
-    function Text_Diff_Op_add($lines)
+	/**
+	 * PHP5 constructor.
+	 */
+    function __construct( $lines )
     {
         $this->final = $lines;
         $this->orig = false;
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff_Op_add( $lines ) {
+		self::__construct( $lines );
+	}
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_delete($this->final);
@@ -435,12 +481,22 @@ class Text_Diff_Op_add extends Text_Diff_Op {
  */
 class Text_Diff_Op_change extends Text_Diff_Op {
 
-    function Text_Diff_Op_change($orig, $final)
+	/**
+	 * PHP5 constructor.
+	 */
+    function __construct( $orig, $final )
     {
         $this->orig = $orig;
         $this->final = $final;
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff_Op_change( $orig, $final ) {
+		self::__construct( $orig, $final );
+	}
+
     function &reverse()
     {
         $reverse = new Text_Diff_Op_change($this->final, $this->orig);
diff --git a/pavillonmadeleine.fr/wp-includes/Text/Diff/Renderer.php b/pavillonmadeleine.fr/wp-includes/Text/Diff/Renderer.php
index 95c6db4b..712d985a 100644
--- a/pavillonmadeleine.fr/wp-includes/Text/Diff/Renderer.php
+++ b/pavillonmadeleine.fr/wp-includes/Text/Diff/Renderer.php
@@ -33,7 +33,7 @@ class Text_Diff_Renderer {
     /**
      * Constructor.
      */
-    function Text_Diff_Renderer($params = array())
+    function __construct( $params = array() )
     {
         foreach ($params as $param => $value) {
             $v = '_' . $param;
@@ -43,6 +43,13 @@ class Text_Diff_Renderer {
         }
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function Text_Diff_Renderer( $params = array() ) {
+		self::__construct( $params );
+	}
+
     /**
      * Get any renderer parameters.
      *
diff --git a/pavillonmadeleine.fr/wp-includes/admin-bar.php b/pavillonmadeleine.fr/wp-includes/admin-bar.php
index 746fdca7..fe3865fc 100644
--- a/pavillonmadeleine.fr/wp-includes/admin-bar.php
+++ b/pavillonmadeleine.fr/wp-includes/admin-bar.php
@@ -13,6 +13,9 @@
  *
  * @since 3.1.0
  * @access private
+ *
+ * @global WP_Admin_Bar $wp_admin_bar
+ *
  * @return bool Whether the admin bar was successfully initialized.
  */
 function _wp_admin_bar_init() {
@@ -55,12 +58,14 @@ function _wp_admin_bar_init() {
  * right before the admin bar is rendered. This also gives you access to the $post global, among others.
  *
  * @since 3.1.0
+ *
+ * @global WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_render() {
 	global $wp_admin_bar;
 
 	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
-		return false;
+		return;
 
 	/**
 	 * Load all necessary admin bar items.
@@ -268,7 +273,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	if ( is_network_admin() ) {
 		$blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
 	} elseif ( is_user_admin() ) {
-		$blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) );
+		$blogname = sprintf( __('User Dashboard: %s'), esc_html( get_current_site()->site_name ) );
 	}
 
 	$title = wp_html_excerpt( $blogname, 40, '…' );
@@ -313,6 +318,33 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	}
 }
 
+/**
+ * Adds the "Customize" link to the Toolbar.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+ */
+function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+	// Don't show for users who can't access the customizer or when in the admin.
+	if ( ! current_user_can( 'customize' ) || is_admin() ) {
+		return;
+	}
+
+	$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	$customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+
+	$wp_admin_bar->add_menu( array(
+		'id'     => 'customize',
+		'title'  => __( 'Customize' ),
+		'href'   => $customize_url,
+		'meta'   => array(
+			'class' => 'hide-if-no-customize',
+		),
+	) );
+	add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+}
+
 /**
  * Add the "My Sites/[Site Name]" menu and all submenus.
  *
@@ -480,6 +512,9 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
  *
  * @since 3.1.0
  *
+ * @global object   $tag
+ * @global WP_Query $wp_the_query
+ *
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_edit_menu( $wp_admin_bar ) {
@@ -496,7 +531,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 			&& ( $post_type_object->public )
 			&& ( $post_type_object->show_in_admin_bar ) )
 		{
-			if( 'draft' == $post->post_status ) {
+			if ( 'draft' == $post->post_status ) {
 				$preview_link = set_url_scheme( get_permalink( $post->ID ) );
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
 				$preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
@@ -656,9 +691,30 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
 
+<<<<<<< .mine
+	if ( current_user_can( 'switch_themes' ) ) {
+		$wp_admin_bar->add_menu( array(
+			'parent' => 'appearance',
+			'id'     => 'themes',
+			'title'  => __( 'Themes' ),
+			'href'   => admin_url( 'themes.php' ),
+		) );
+	}
+||||||| .r11156
+	if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
+		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
+=======
 	$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 	$customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+		return;
+||||||| .r11156
+	if ( ! current_user_can( 'edit_theme_options' ) )
+		return;
+=======
 	if ( current_user_can( 'switch_themes' ) ) {
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'appearance',
@@ -669,7 +725,15 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 				'class' => 'hide-if-customize',
 			),
 		) );
+>>>>>>> .r12027
+	}
 
+<<<<<<< .mine
+	if ( current_theme_supports( 'widgets' )  ) {
+||||||| .r11156
+	if ( current_user_can( 'customize' ) ) {
+		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+=======
 		if ( current_user_can( 'customize' ) ) {
 			$wp_admin_bar->add_menu( array(
 				'parent' => 'appearance',
@@ -684,22 +748,42 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 	}
 
 	if ( current_user_can( 'customize' ) ) {
+>>>>>>> .r12027
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'appearance',
+<<<<<<< .mine
+			'id'     => 'widgets',
+			'title'  => __( 'Widgets' ),
+			'href'   => admin_url( 'widgets.php' ),
+||||||| .r11156
+			'id'     => 'customize',
+			'title'  => __('Customize'),
+			'href'   => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
+			'meta'   => array(
+				'class' => 'hide-if-no-customize',
+			),
+=======
 			'id'     => 'customize',
 			'title'  => __('Customize'),
 			'href'   => $customize_url,
 			'meta'   => array(
 				'class' => 'hide-if-no-customize',
 			),
+>>>>>>> .r12027
 		) );
-		add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 	}
 
+<<<<<<< .mine
+||||||| .r11156
+	if ( current_theme_supports( 'widgets' )  )
+		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
+
+=======
 	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		return;
 	}
 
+>>>>>>> .r12027
 	if ( current_theme_supports( 'widgets' )  ) {
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'appearance',
@@ -727,6 +811,7 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
 		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
 
+<<<<<<< .mine
 	if ( current_theme_supports( 'custom-background' ) ) {
 		$wp_admin_bar->add_menu( array(
 			'parent' => 'appearance',
@@ -737,7 +822,40 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 				'class' => 'hide-if-customize',
 			),
 		) );
+	}
+||||||| .r11156
+	if ( current_theme_supports( 'custom-background' ) )
+		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
+=======
+	if ( current_theme_supports( 'custom-background' ) ) {
+		$wp_admin_bar->add_menu( array(
+			'parent' => 'appearance',
+			'id'     => 'background',
+			'title'  => __( 'Background' ),
+			'href'   => admin_url( 'themes.php?page=custom-background' ),
+			'meta'   => array(
+				'class' => 'hide-if-customize',
+			),
+		) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	if ( current_theme_supports( 'custom-header' ) ) {
+		$wp_admin_bar->add_menu( array(
+			'parent' => 'appearance',
+			'id'     => 'header',
+			'title'  => __( 'Header' ),
+			'href'   => admin_url( 'themes.php?page=custom-header' ),
+			'meta'   => array(
+				'class' => 'hide-if-customize',
+			),
+		) );
+	}
+
+||||||| .r11156
+	if ( current_theme_supports( 'custom-header' ) )
+		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
+=======
 		if ( current_user_can( 'customize' ) ) {
 			$wp_admin_bar->add_menu( array(
 				'parent' => 'appearance',
@@ -775,6 +893,7 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 		}
 	}
 
+>>>>>>> .r12027
 }
 
 /**
@@ -890,8 +1009,9 @@ function _admin_bar_bump_cb() { ?>
  *
  * @since 3.1.0
  *
+ * @global WP_Admin_Bar $wp_admin_bar
+ *
  * @param bool $show Whether to allow the admin bar to show.
- * @return void
  */
 function show_admin_bar( $show ) {
 	global $show_admin_bar;
@@ -903,6 +1023,9 @@ function show_admin_bar( $show ) {
  *
  * @since 3.1.0
  *
+ * @global WP_Admin_Bar $wp_admin_bar
+ * @global string       $pagenow
+ *
  * @return bool Whether the admin bar should be showing.
  */
 function is_admin_bar_showing() {
diff --git a/pavillonmadeleine.fr/wp-includes/atomlib.php b/pavillonmadeleine.fr/wp-includes/atomlib.php
index 9d34276a..271635fe 100644
--- a/pavillonmadeleine.fr/wp-includes/atomlib.php
+++ b/pavillonmadeleine.fr/wp-includes/atomlib.php
@@ -87,7 +87,10 @@ class AtomParser {
     var $feed;
     var $current;
 
-    function AtomParser() {
+	/**
+	 * PHP5 constructor.
+	 */
+    function __construct() {
 
         $this->feed = new AtomFeed();
         $this->current = null;
@@ -95,6 +98,13 @@ class AtomParser {
         $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
     }
 
+	/**
+	 * PHP4 constructor.
+	 */
+	public function AtomParser() {
+		self::__construct();
+	}
+
     function _p($msg) {
         if($this->debug) {
             print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
@@ -130,7 +140,8 @@ class AtomParser {
             if($this->debug) $this->content .= $data;
 
             if(!xml_parse($parser, $data, feof($fp))) {
-                trigger_error(sprintf(__('XML error: %s at line %d')."\n",
+                /* translators: 1: error message, 2: line number */
+                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
                     xml_get_current_line_number($parser)));
                 $ret = false;
diff --git a/pavillonmadeleine.fr/wp-includes/author-template.php b/pavillonmadeleine.fr/wp-includes/author-template.php
index 2e520f54..3c223cab 100644
--- a/pavillonmadeleine.fr/wp-includes/author-template.php
+++ b/pavillonmadeleine.fr/wp-includes/author-template.php
@@ -15,10 +15,17 @@
  *
  * @since 1.5.0
  *
+<<<<<<< .mine
+ * @global object $authordata The current author's DB object.
+||||||| .r11156
  * @uses $authordata The current author's DB object.
+ * @uses apply_filters() Calls 'the_author' hook on the author display name.
+=======
+ * @uses $authordata The current author's DB object.
+>>>>>>> .r12027
  *
  * @param string $deprecated Deprecated.
- * @return string The author's display name.
+ * @return string|null The author's display name.
  */
 function get_the_author($deprecated = '') {
 	global $authordata;
@@ -53,7 +60,7 @@ function get_the_author($deprecated = '') {
  *
  * @param string $deprecated Deprecated.
  * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
- * @return string The author's display name, from get_the_author().
+ * @return string|null The author's display name, from get_the_author().
  */
 function the_author( $deprecated = '', $deprecated_echo = true ) {
 	if ( !empty( $deprecated ) )
@@ -70,7 +77,17 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
  *
  * @since 2.8.0
  *
+<<<<<<< .mine
+ * @return string|void The author's display name.
+||||||| .r11156
+ * @uses $post The current post's DB object.
+ * @uses get_post_meta() Retrieves the ID of the author who last edited the current post.
+ * @uses get_userdata() Retrieves the author's DB object.
+ * @uses apply_filters() Calls 'the_modified_author' hook on the author display name.
+ * @return string The author's display name.
+=======
  * @return string The author's display name.
+>>>>>>> .r12027
  */
 function get_the_modified_author() {
 	if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) {
@@ -88,12 +105,12 @@ function get_the_modified_author() {
 }
 
 /**
- * Display the name of the author who last edited the current post.
+ * Display the name of the author who last edited the current post,
+ * if the author's ID is available.
  *
  * @since 2.8.0
  *
  * @see get_the_author()
- * @return string The author's display name, from get_the_modified_author().
  */
 function the_modified_author() {
 	echo get_the_modified_author();
@@ -103,11 +120,21 @@ function the_modified_author() {
  * Retrieve the requested data of the author of the current post.
  * @link https://codex.wordpress.org/Template_Tags/the_author_meta
  * @since 2.8.0
+<<<<<<< .mine
+ *
+ * @global object $authordata The current author's DB object.
+ *
+||||||| .r11156
+ * @uses $authordata The current author's DB object (if $user_id not specified).
+=======
+>>>>>>> .r12027
  * @param string $field selects the field of the users record.
  * @param int $user_id Optional. User ID.
  * @return string The author's field from the current author's DB object.
  */
 function get_the_author_meta( $field = '', $user_id = false ) {
+	$original_user_id = $user_id;
+
 	if ( ! $user_id ) {
 		global $authordata;
 		$user_id = isset( $authordata->ID ) ? $authordata->ID : 0;
@@ -126,20 +153,32 @@ function get_the_author_meta( $field = '', $user_id = false ) {
 	 * The filter name is dynamic and depends on the $field parameter of the function.
 	 *
 	 * @since 2.8.0
+	 * @since 4.3.0 The `$original_user_id` parameter was added.
 	 *
-	 * @param string $value   The value of the metadata.
-	 * @param int    $user_id The user ID.
+	 * @param string   $value            The value of the metadata.
+	 * @param int      $user_id          The user ID for the value.
+	 * @param int|bool $original_user_id The original user ID, as passed to the function.
 	 */
-	return apply_filters( 'get_the_author_' . $field, $value, $user_id );
+	return apply_filters( 'get_the_author_' . $field, $value, $user_id, $original_user_id );
 }
 
 /**
+<<<<<<< .mine
+ * Outputs the field from the user's DB object. Defaults to current post's author.
+ *
+ * @link https://codex.wordpress.org/Template_Tags/the_author_meta
+ *
+||||||| .r11156
+ * Retrieve the requested data of the author of the current post.
+ * @link http://codex.wordpress.org/Template_Tags/the_author_meta
+=======
  * Retrieve the requested data of the author of the current post.
  * @link https://codex.wordpress.org/Template_Tags/the_author_meta
+>>>>>>> .r12027
  * @since 2.8.0
+ *
  * @param string $field selects the field of the users record.
  * @param int $user_id Optional. User ID.
- * @echo string The author's field from the current author's DB object.
  */
 function the_author_meta( $field = '', $user_id = false ) {
 	$author_meta = get_the_author_meta( $field, $user_id );
@@ -162,6 +201,16 @@ function the_author_meta( $field = '', $user_id = false ) {
  *
  * If the author has a home page set, return an HTML link, otherwise just return the
  * author's name.
+<<<<<<< .mine
+ *
+ * @return string|null An HTML link if the author's url exist in user meta,
+ *                     else the result of get_the_author().
+||||||| .r11156
+ *
+ * @uses get_the_author_meta()
+ * @uses get_the_author()
+=======
+>>>>>>> .r12027
  */
 function get_the_author_link() {
 	if ( get_the_author_meta('url') ) {
@@ -219,6 +268,16 @@ function the_author_posts() {
  *
  * @link https://codex.wordpress.org/Template_Tags/the_author_posts_link
  * @since 1.2.0
+<<<<<<< .mine
+ *
+ * @global object $authordata The current author's DB object.
+ *
+||||||| .r11156
+ * @uses $authordata The current author's DB object.
+ * @uses get_author_posts_url()
+ * @uses get_the_author()
+=======
+>>>>>>> .r12027
  * @param string $deprecated Deprecated.
  */
 function the_author_posts_link($deprecated = '') {
@@ -226,8 +285,10 @@ function the_author_posts_link($deprecated = '') {
 		_deprecated_argument( __FUNCTION__, '2.1' );
 
 	global $authordata;
-	if ( !is_object( $authordata ) )
-		return false;
+	if ( ! is_object( $authordata ) ) {
+		return;
+	}
+
 	$link = sprintf(
 		'%3$s',
 		esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ),
@@ -249,7 +310,9 @@ function the_author_posts_link($deprecated = '') {
  * Retrieve the URL to the author page for the user with the ID provided.
  *
  * @since 2.1.0
- * @uses $wp_rewrite WP_Rewrite
+ *
+ * @global WP_Rewrite $wp_rewrite
+ *
  * @return string The URL to the author's page.
  */
 function get_author_posts_url($author_id, $author_nicename = '') {
@@ -291,6 +354,8 @@ function get_author_posts_url($author_id, $author_nicename = '') {
  *
  * @since 1.2.0
  *
+ * @global wpdb $wpdb
+ *
  * @param string|array $args {
  *     Optional. Array or string of default arguments.
  *
@@ -315,7 +380,7 @@ function get_author_posts_url($author_id, $author_nicename = '') {
  *     @type string $exclude       An array, comma-, or space-separated list of author IDs to exclude. Default empty.
  *     @type string $exclude       An array, comma-, or space-separated list of author IDs to include. Default empty.
  * }
- * @return null|string The output, if echo is set to false. Otherwise null.
+ * @return string|void The output, if echo is set to false.
  */
 function wp_list_authors( $args = '' ) {
 	global $wpdb;
@@ -422,6 +487,9 @@ function wp_list_authors( $args = '' ) {
  * Checks to see if more than one author has published posts.
  *
  * @since 3.2.0
+ *
+ * @global wpdb $wpdb
+ *
  * @return bool Whether or not we have more than one author
  */
 function is_multi_author() {
diff --git a/pavillonmadeleine.fr/wp-includes/bookmark-template.php b/pavillonmadeleine.fr/wp-includes/bookmark-template.php
index 54ad5c99..47bfb4a1 100644
--- a/pavillonmadeleine.fr/wp-includes/bookmark-template.php
+++ b/pavillonmadeleine.fr/wp-includes/bookmark-template.php
@@ -195,7 +195,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
  *                                      $categorize is true. Accepts 'ASC' (ascending) or 'DESC' (descending).
  *                                      Default 'ASC'.
  * }
- * @return string|null Will only return if echo option is set to not echo. Default is not return anything.
+ * @return string|void Will only return if echo option is set to not echo. Default is not return anything.
  */
 function wp_list_bookmarks( $args = '' ) {
 	$defaults = array(
@@ -214,6 +214,12 @@ function wp_list_bookmarks( $args = '' ) {
 
 	$output = '';
 
+	if ( ! is_array( $r['class'] ) ) {
+		$r['class'] = explode( ' ', $r['class'] );
+	}
+ 	$r['class'] = array_map( 'sanitize_html_class', $r['class'] );
+ 	$r['class'] = trim( join( ' ', $r['class'] ) );
+
 	if ( $r['categorize'] ) {
 		$cats = get_terms( 'link_category', array(
 			'name__like' => $r['category_name'],
diff --git a/pavillonmadeleine.fr/wp-includes/bookmark.php b/pavillonmadeleine.fr/wp-includes/bookmark.php
index 47f5d233..1e178f43 100644
--- a/pavillonmadeleine.fr/wp-includes/bookmark.php
+++ b/pavillonmadeleine.fr/wp-includes/bookmark.php
@@ -16,7 +16,7 @@
  * @param int|stdClass $bookmark
  * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
  * @param string $filter Optional, default is 'raw'.
- * @return array|object Type returned depends on $output value.
+ * @return array|object|null Type returned depends on $output value.
  */
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
@@ -65,7 +65,7 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
  * @param string $field The name of the data field to return
  * @param int $bookmark The bookmark ID to get field
  * @param string $context Optional. The context of how the field will be used.
- * @return string
+ * @return string|WP_Error
  */
 function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
 	$bookmark = (int) $bookmark;
diff --git a/pavillonmadeleine.fr/wp-includes/cache.php b/pavillonmadeleine.fr/wp-includes/cache.php
index d75c82c6..5c82a6a1 100644
--- a/pavillonmadeleine.fr/wp-includes/cache.php
+++ b/pavillonmadeleine.fr/wp-includes/cache.php
@@ -12,8 +12,8 @@
  * Adds data to the cache, if the cache key doesn't already exist.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::add()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key The cache key to use for retrieval later
  * @param mixed $data The data to add to the cache store
@@ -37,7 +37,7 @@ function wp_cache_add( $key, $data, $group = '', $expire = 0 ) {
  *
  * @since 2.0.0
  *
- * @return bool Always returns True
+ * @return true Always returns True
  */
 function wp_cache_close() {
 	return true;
@@ -47,8 +47,8 @@ function wp_cache_close() {
  * Decrement numeric cache item's value
  *
  * @since 3.3.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::decr()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key The cache key to increment
  * @param int $offset The amount by which to decrement the item's value. Default is 1.
@@ -65,8 +65,8 @@ function wp_cache_decr( $key, $offset = 1, $group = '' ) {
  * Removes the cache contents matching key and group.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::delete()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key What the contents in the cache are called
  * @param string $group Where the cache contents are grouped
@@ -82,8 +82,8 @@ function wp_cache_delete($key, $group = '') {
  * Removes all cache items.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::flush()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @return bool False on failure, true on success
  */
@@ -97,15 +97,15 @@ function wp_cache_flush() {
  * Retrieves the cache contents from the cache by key and group.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::get()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key What the contents in the cache are called
  * @param string $group Where the cache contents are grouped
  * @param bool $force Whether to force an update of the local cache from the persistent cache (default is false)
  * @param bool &$found Whether key was found in the cache. Disambiguates a return of false, a storable value.
  * @return bool|mixed False on failure to retrieve contents or the cache
- *		contents on success
+ *		              contents on success
  */
 function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
 	global $wp_object_cache;
@@ -117,8 +117,8 @@ function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
  * Increment numeric cache item's value
  *
  * @since 3.3.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::incr()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key The cache key to increment
  * @param int $offset The amount by which to increment the item's value. Default is 1.
@@ -135,7 +135,8 @@ function wp_cache_incr( $key, $offset = 1, $group = '' ) {
  * Sets up Object Cache Global and assigns it.
  *
  * @since 2.0.0
- * @global WP_Object_Cache $wp_object_cache WordPress Object Cache
+ *
+ * @global WP_Object_Cache $wp_object_cache
  */
 function wp_cache_init() {
 	$GLOBALS['wp_object_cache'] = new WP_Object_Cache();
@@ -145,8 +146,8 @@ function wp_cache_init() {
  * Replaces the contents of the cache with new data.
  *
  * @since 2.0.0
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::replace()
+ *
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key What to call the contents in the cache
  * @param mixed $data The contents to store in the cache
@@ -165,8 +166,7 @@ function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
  *
  * @since 2.0.0
  *
- * @uses $wp_object_cache Object Cache Class
- * @see WP_Object_Cache::set()
+ * @global WP_Object_Cache $wp_object_cache
  *
  * @param int|string $key What to call the contents in the cache
  * @param mixed $data The contents to store in the cache
@@ -187,12 +187,14 @@ function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
  *
  * @since 3.5.0
  *
+ * @global WP_Object_Cache $wp_object_cache
+ *
  * @param int $blog_id Blog ID
  */
 function wp_cache_switch_to_blog( $blog_id ) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->switch_to_blog( $blog_id );
+	$wp_object_cache->switch_to_blog( $blog_id );
 }
 
 /**
@@ -200,12 +202,14 @@ function wp_cache_switch_to_blog( $blog_id ) {
  *
  * @since 2.6.0
  *
+ * @global WP_Object_Cache $wp_object_cache
+ *
  * @param string|array $groups A group or an array of groups to add
  */
 function wp_cache_add_global_groups( $groups ) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->add_global_groups( $groups );
+	$wp_object_cache->add_global_groups( $groups );
 }
 
 /**
@@ -233,13 +237,15 @@ function wp_cache_add_non_persistent_groups( $groups ) {
  *
  * @since 2.6.0
  * @deprecated 3.5.0
+ *
+ * @global WP_Object_Cache $wp_object_cache
  */
 function wp_cache_reset() {
 	_deprecated_function( __FUNCTION__, '3.5' );
 
 	global $wp_object_cache;
 
-	return $wp_object_cache->reset();
+	$wp_object_cache->reset();
 }
 
 /**
@@ -477,10 +483,10 @@ class WP_Object_Cache {
 	 *
 	 * @since 2.0.0
 	 *
-	 * @return bool Always returns true
+	 * @return true Always returns true
 	 */
 	public function flush() {
-		$this->cache = array ();
+		$this->cache = array();
 
 		return true;
 	}
@@ -499,8 +505,8 @@ class WP_Object_Cache {
 	 * @param int|string $key What the contents in the cache are called
 	 * @param string $group Where the cache contents are grouped
 	 * @param string $force Whether to force a refetch rather than relying on the local cache (default is false)
-	 * @return bool|mixed False on failure to retrieve contents or the cache
-	 *		contents on success
+	 * @return false|mixed False on failure to retrieve contents or the cache
+	 *		               contents on success
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
 		if ( empty( $group ) )
@@ -616,7 +622,7 @@ class WP_Object_Cache {
 	 * @param mixed $data The contents to store in the cache
 	 * @param string $group Where to group the cache contents
 	 * @param int $expire Not Used
-	 * @return bool Always returns true
+	 * @return true Always returns true
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
 		if ( empty( $group ) )
@@ -684,6 +690,13 @@ class WP_Object_Cache {
 	 * Sets up object properties; PHP 5 style constructor
 	 *
 	 * @since 2.0.8
+<<<<<<< .mine
+	 *
+     * @global int $blog_id
+||||||| .r11156
+	 * @return null|WP_Object_Cache If cache is disabled, returns null.
+=======
+>>>>>>> .r12027
 	 */
 	public function __construct() {
 		global $blog_id;
@@ -706,7 +719,7 @@ class WP_Object_Cache {
 	 *
 	 * @since  2.0.8
 	 *
-	 * @return bool True value. Won't be used by PHP
+	 * @return true True value. Won't be used by PHP
 	 */
 	public function __destruct() {
 		return true;
diff --git a/pavillonmadeleine.fr/wp-includes/canonical.php b/pavillonmadeleine.fr/wp-includes/canonical.php
index 5f4bda08..434d90eb 100644
--- a/pavillonmadeleine.fr/wp-includes/canonical.php
+++ b/pavillonmadeleine.fr/wp-includes/canonical.php
@@ -27,14 +27,16 @@
  * or query in an attempt to figure the correct page to go to.
  *
  * @since 2.3.0
- * @uses $wp_rewrite
- * @uses $is_IIS
+ *
+ * @global WP_Rewrite $wp_rewrite
+ * @global bool $is_IIS
+ * @global WP_Query $wp_query
+ * @global wpdb $wpdb
  *
  * @param string $requested_url Optional. The URL that was requested, used to
  *		figure if redirect is needed.
  * @param bool $do_redirect Optional. Redirect to the new URL.
- * @return null|false|string Null, if redirect not needed. False, if redirect
- *		not needed or the string of the URL
+ * @return string|void The string of the URL, if redirect needed.
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
@@ -447,8 +449,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			$redirect_url .= '?' . $redirect['query'];
 	}
 
-	if ( !$redirect_url || $redirect_url == $requested_url )
-		return false;
+	if ( ! $redirect_url || $redirect_url == $requested_url ) {
+		return;
+	}
 
 	// Hex encoded octets are case-insensitive.
 	if ( false !== strpos($requested_url, '%') ) {
@@ -472,8 +475,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	 */
 	$redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );
 
-	if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
-		return false;
+	// yes, again -- in case the filter aborted the request
+	if ( ! $redirect_url || $redirect_url == $requested_url ) {
+		return;
+	}
 
 	if ( $do_redirect ) {
 		// protect against chained redirects
@@ -483,7 +488,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		} else {
 			// Debug
 			// die("1: $redirect_url
2: " . redirect_canonical( $redirect_url, false ) );
-			return false;
+			return;
 		}
 	} else {
 		return $redirect_url;
@@ -521,9 +526,18 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur
  *
  * @since 2.3.0
  *
+<<<<<<< .mine
  * @global wpdb $wpdb WordPress database abstraction object.
+ * @global WP_Rewrite $wp_rewrite
  *
+ * @return false|string The correct URL if one is found. False on failure.
+||||||| .r11156
  * @return bool|string The correct URL if one is found. False on failure.
+=======
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @return bool|string The correct URL if one is found. False on failure.
+>>>>>>> .r12027
  */
 function redirect_guess_404_permalink() {
 	global $wpdb, $wp_rewrite;
@@ -558,6 +572,16 @@ function redirect_guess_404_permalink() {
 	return false;
 }
 
+<<<<<<< .mine
+/**
+ *
+ * @global WP_Rewrite $wp_rewrite
+ */
+||||||| .r11156
+add_action('template_redirect', 'redirect_canonical');
+
+=======
+>>>>>>> .r12027
 function wp_redirect_admin_locations() {
 	global $wp_rewrite;
 	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
diff --git a/pavillonmadeleine.fr/wp-includes/capabilities.php b/pavillonmadeleine.fr/wp-includes/capabilities.php
index 8a3d3350..42133f6f 100644
--- a/pavillonmadeleine.fr/wp-includes/capabilities.php
+++ b/pavillonmadeleine.fr/wp-includes/capabilities.php
@@ -87,7 +87,7 @@ class WP_Roles {
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
-	 * @return mixed|bool Return value of the callback, false otherwise.
+	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
 	public function __call( $name, $arguments ) {
 		if ( '_init' === $name ) {
@@ -138,6 +138,8 @@ class WP_Roles {
 	 *
 	 * @since 3.5.0
 	 * @access public
+	 *
+	 * @global wpdb $wpdb
 	 */
 	public function reinit() {
 		// There is no need to reinit if using the wp_user_roles global.
@@ -174,7 +176,7 @@ class WP_Roles {
 	 * @param string $role Role name.
 	 * @param string $display_name Role display name.
 	 * @param array $capabilities List of role capabilities in the above format.
-	 * @return WP_Role|null WP_Role object if role is added, null if already exists.
+	 * @return WP_Role|void WP_Role object, if role is added.
 	 */
 	public function add_role( $role, $display_name, $capabilities = array() ) {
 		if ( isset( $this->roles[$role] ) )
@@ -339,7 +341,6 @@ class WP_Role {
 	/**
 	 * Assign role a capability.
 	 *
-	 * @see WP_Roles::add_cap() Method uses implementation for role.
 	 * @since 2.0.0
 	 * @access public
 	 *
@@ -347,13 +348,8 @@ class WP_Role {
 	 * @param bool $grant Whether role has capability privilege.
 	 */
 	public function add_cap( $cap, $grant = true ) {
-		global $wp_roles;
-
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
-
 		$this->capabilities[$cap] = $grant;
-		$wp_roles->add_cap( $this->name, $cap, $grant );
+		wp_roles()->add_cap( $this->name, $cap, $grant );
 	}
 
 	/**
@@ -370,13 +366,8 @@ class WP_Role {
 	 * @param string $cap Capability name.
 	 */
 	public function remove_cap( $cap ) {
-		global $wp_roles;
-
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
-
 		unset( $this->capabilities[$cap] );
-		$wp_roles->remove_cap( $this->name, $cap );
+		wp_roles()->remove_cap( $this->name, $cap );
 	}
 
 	/**
@@ -498,6 +489,11 @@ class WP_User {
 	 */
 	var $filter = null;
 
+	/**
+	 * @static
+	 * @access private
+	 * @var array
+	 */
 	private static $back_compat_keys;
 
 	/**
@@ -508,6 +504,8 @@ class WP_User {
 	 * @since 2.0.0
 	 * @access public
 	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Blog ID, defaults to current blog.
@@ -569,6 +567,10 @@ class WP_User {
 	 *
 	 * @since 3.3.0
 	 *
+	 * @static
+	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @param string $field The field to query against: 'id', 'slug', 'email' or 'login'
 	 * @param string|int $value The field value
 	 * @return object|false Raw user object
@@ -628,6 +630,23 @@ class WP_User {
 		return $user;
 	}
 
+	/**
+	 * Makes private/protected methods readable for backwards compatibility.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param callable $name      Method to call.
+	 * @param array    $arguments Arguments to pass when calling.
+	 * @return mixed|false Return value of the callback, false otherwise.
+	 */
+	public function __call( $name, $arguments ) {
+		if ( '_init_caps' === $name ) {
+			return call_user_func_array( array( $this, $name ), $arguments );
+		}
+		return false;
+	}
+
 	/**
 	 * Magic method for checking the existence of a certain custom field
 	 *
@@ -713,6 +732,7 @@ class WP_User {
 	 * @since 3.3.0
 	 *
 	 * @param string $key Property
+	 * @return mixed
 	 */
 	public function get( $key ) {
 		return $this->__get( $key );
@@ -726,6 +746,7 @@ class WP_User {
 	 * @since 3.3.0
 	 *
 	 * @param string $key Property
+	 * @return bool
 	 */
 	public function has_prop( $key ) {
 		return $this->__isset( $key );
@@ -753,9 +774,11 @@ class WP_User {
 	 * @access protected
 	 * @since 2.1.0
 	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @param string $cap_key Optional capability key
 	 */
-	function _init_caps( $cap_key = '' ) {
+	protected function _init_caps( $cap_key = '' ) {
 		global $wpdb;
 
 		if ( empty($cap_key) )
@@ -780,16 +803,12 @@ class WP_User {
 	 * granted permission to.
 	 *
 	 * @since 2.0.0
-	 * @uses $wp_roles
 	 * @access public
 	 *
 	 * @return array List of all capabilities for the user.
 	 */
 	public function get_role_caps() {
-		global $wp_roles;
-
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
+		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
 		if ( is_array( $this->caps ) )
@@ -821,6 +840,16 @@ class WP_User {
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
+
+		/**
+		 * Fires immediately after the user has been given a new role.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @param int    $user_id The user ID.
+		 * @param string $role    The new role.
+		 */
+		do_action( 'add_user_role', $this->ID, $role );
 	}
 
 	/**
@@ -838,6 +867,16 @@ class WP_User {
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
+
+		/**
+		 * Fires immediately after a role as been removed from a user.
+		 *
+		 * @since 4.3.0
+		 *
+		 * @param int    $user_id The user ID.
+		 * @param string $role    The removed role.
+		 */
+		do_action( 'remove_user_role', $this->ID, $role );
 	}
 
 	/**
@@ -920,6 +959,8 @@ class WP_User {
 	 *
 	 * @since 2.0.0
 	 * @access public
+	 *
+	 * @global wpdb $wpdb
 	 */
 	public function update_user_level_from_caps() {
 		global $wpdb;
@@ -966,6 +1007,8 @@ class WP_User {
 	 *
 	 * @since 2.1.0
 	 * @access public
+	 *
+	 * @global wpdb $wpdb
 	 */
 	public function remove_all_caps() {
 		global $wpdb;
@@ -1047,6 +1090,8 @@ class WP_User {
 	 *
 	 * @since 3.0.0
 	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @param int $blog_id Optional Blog ID, defaults to current blog.
 	 */
 	public function for_blog( $blog_id = '' ) {
@@ -1260,7 +1305,16 @@ function map_meta_cap( $cap, $user_id ) {
 		if ( empty( $comment ) )
 			break;
 		$post = get_post( $comment->comment_post_ID );
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+
+		/*
+		 * If the post doesn't exist, we have an orphaned comment.
+		 * Fall back to the edit_posts capability, instead.
+		 */
+		if ( $post ) {
+			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		} else {
+			$caps = map_meta_cap( 'edit_posts', $user_id );
+		}
 		break;
 	case 'unfiltered_upload':
 		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
@@ -1333,7 +1387,7 @@ function map_meta_cap( $cap, $user_id ) {
 	case 'create_users':
 		if ( !is_multisite() )
 			$caps[] = $cap;
-		elseif ( is_super_admin() || get_site_option( 'add_new_users' ) )
+		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -1474,28 +1528,39 @@ function user_can( $user, $capability ) {
 	return call_user_func_array( array( $user, 'has_cap' ), $args );
 }
 
+/**
+ * Retrieves the global WP_Roles instance and instantiates it if necessary.
+ *
+ * @since 4.3.0
+ *
+ * @global WP_Roles $wp_roles WP_Roles global instance.
+ *
+ * @return WP_Roles WP_Roles global instance if not already instantiated.
+ */
+function wp_roles() {
+	global $wp_roles;
+
+	if ( ! isset( $wp_roles ) ) {
+		$wp_roles = new WP_Roles();
+	}
+	return $wp_roles;
+}
+
 /**
  * Retrieve role object.
  *
- * @see WP_Roles::get_role() Uses method to retrieve role object.
  * @since 2.0.0
  *
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
 function get_role( $role ) {
-	global $wp_roles;
-
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
-	return $wp_roles->get_role( $role );
+	return wp_roles()->get_role( $role );
 }
 
 /**
  * Add role, if it does not exist.
  *
- * @see WP_Roles::add_role() Uses method to add role.
  * @since 2.0.0
  *
  * @param string $role Role name.
@@ -1504,29 +1569,18 @@ function get_role( $role ) {
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
 function add_role( $role, $display_name, $capabilities = array() ) {
-	global $wp_roles;
-
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
-	return $wp_roles->add_role( $role, $display_name, $capabilities );
+	return wp_roles()->add_role( $role, $display_name, $capabilities );
 }
 
 /**
  * Remove role, if it exists.
  *
- * @see WP_Roles::remove_role() Uses method to remove role.
  * @since 2.0.0
  *
  * @param string $role Role name.
  */
 function remove_role( $role ) {
-	global $wp_roles;
-
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
-	$wp_roles->remove_role( $role );
+	wp_roles()->remove_role( $role );
 }
 
 /**
@@ -1534,7 +1588,7 @@ function remove_role( $role ) {
  *
  * @since 3.0.0
  *
- * @uses $super_admins Super admins global variable, if set.
+ * @global array $super_admins
  *
  * @return array List of super admin logins
  */
diff --git a/pavillonmadeleine.fr/wp-includes/category-template.php b/pavillonmadeleine.fr/wp-includes/category-template.php
index 9a2120c9..974bc27c 100644
--- a/pavillonmadeleine.fr/wp-includes/category-template.php
+++ b/pavillonmadeleine.fr/wp-includes/category-template.php
@@ -65,10 +65,15 @@ function get_category_parents( $id, $link = false, $separator = '/', $nicename =
 /**
  * Retrieve post categories.
  *
+ * This tag may be used outside The Loop by passing a post id as the parameter.
+ *
+ * Note: This function only returns results from the default "category" taxonomy.
+ * For custom taxonomies use get_the_terms().
+ *
  * @since 0.71
  *
  * @param int $id Optional, default to current post ID. The post ID.
- * @return array
+ * @return array Array of objects, one for each category assigned to the post.
  */
 function get_the_category( $id = false ) {
 	$categories = get_the_terms( $id, 'category' );
@@ -153,6 +158,8 @@ function get_the_category_by_ID( $cat_ID ) {
  *
  * @since 1.5.1
  *
+ * @global WP_Rewrite $wp_rewrite
+ *
  * @param string $separator Optional, default is empty string. Separator for between the categories.
  * @param string $parents Optional. How to display the parents.
  * @param int $post_id Optional. Post ID to retrieve categories.
@@ -479,7 +486,13 @@ function wp_dropdown_categories( $args = '' ) {
  * @since 2.1.0
  *
  * @param string|array $args Optional. Override default arguments.
+<<<<<<< .mine
+ * @return false|string HTML content only if 'echo' argument is 0.
+||||||| .r11156
+ * @return string HTML content only if 'echo' argument is 0.
+=======
  * @return false|null|string HTML content only if 'echo' argument is 0.
+>>>>>>> .r12027
  */
 function wp_list_categories( $args = '' ) {
 	$defaults = array(
@@ -532,7 +545,28 @@ function wp_list_categories( $args = '' ) {
 		}
 	} else {
 		if ( ! empty( $show_option_all ) ) {
-			$posts_page = ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' );
+
+			$posts_page = '';
+
+			// For taxonomies that belong only to custom post types, point to a valid archive.
+			$taxonomy_object = get_taxonomy( $r['taxonomy'] );
+			if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) {
+				foreach ( $taxonomy_object->object_type as $object_type ) {
+					$_object_type = get_post_type_object( $object_type );
+
+					// Grab the first one.
+					if ( ! empty( $_object_type->has_archive ) ) {
+						$posts_page = get_post_type_archive_link( $object_type );
+						break;
+					}
+				}
+			}
+
+			// Fallback for the 'All' link is the front page.
+			if ( ! $posts_page ) {
+				$posts_page = 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' );
+			}
+
 			$posts_page = esc_url( $posts_page );
 			if ( 'list' == $r['style'] ) {
 				$output .= "$show_option_all";
@@ -607,8 +641,17 @@ function wp_list_categories( $args = '' ) {
  *
  * @since 2.3.0
  *
+<<<<<<< .mine
+ * @param array|string|null $args Optional. Override default arguments.
+ * @return void|array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
+ *                    Otherwise, this function outputs the tag cloud.
+||||||| .r11156
+ * @param array|string $args Optional. Override default arguments.
+ * @return array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
+=======
  * @param array|string|null $args Optional. Override default arguments.
  * @return null|false Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
+>>>>>>> .r12027
  */
 function wp_tag_cloud( $args = '' ) {
 	$defaults = array(
@@ -629,7 +672,7 @@ function wp_tag_cloud( $args = '' ) {
 		else
 			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
 		if ( is_wp_error( $link ) )
-			return false;
+			return;
 
 		$tags[ $key ]->link = $link;
 		$tags[ $key ]->id = $tag->term_id;
@@ -656,8 +699,8 @@ function wp_tag_cloud( $args = '' ) {
 /**
  * Default topic count scaling for tag links
  *
- * @param integer $count number of posts with that tag
- * @return integer scaled count
+ * @param int $count number of posts with that tag
+ * @return int scaled count
  */
 function default_topic_count_scale( $count ) {
 	return round(log10($count + 1) * 100);
@@ -784,24 +827,46 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 		$font_spread = 1;
 	$font_step = $font_spread / $spread;
 
-	$a = array();
-
+	// Assemble the data that will be used to generate the tag cloud markup.
+	$tags_data = array();
 	foreach ( $tags as $key => $tag ) {
+		$tag_id = isset( $tag->id ) ? $tag->id : $key;
+
 		$count = $counts[ $key ];
 		$real_count = $real_counts[ $key ];
-		$tag_link = '#' != $tag->link ? esc_url( $tag->link ) : '#';
-		$tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
-		$tag_name = $tags[ $key ]->name;
 
 		if ( $translate_nooped_plural ) {
-			$title_attribute = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
+			$title = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
 		} else {
-			$title_attribute = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
+			$title = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
 		}
 
-		$a[] = "$tag_name";
+		$tags_data[] = array(
+			'id'         => $tag_id,
+			'url'        => '#' != $tag->link ? $tag->link : '#',
+			'name'	     => $tag->name,
+			'title'      => $title,
+			'slug'       => $tag->slug,
+			'real_count' => $real_count,
+			'class'	     => 'tag-link-' . $tag_id,
+			'font_size'  => $args['smallest'] + ( $count - $min_count ) * $font_step,
+		);
+	}
+
+	/**
+	 * Filter the data used to generate the tag cloud.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param array $tags_data An array of term data for term used to generate the tag cloud.
+	 */
+	$tags_data = apply_filters( 'wp_generate_tag_cloud_data', $tags_data );
+
+	$a = array();
+
+	// generate the output links array
+	foreach ( $tags_data as $key => $tag_data ) {
+		$a[] = "" . esc_html( $tag_data['name'] ) . "";
 	}
 
 	switch ( $args['format'] ) {
@@ -847,6 +912,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
  *
  * @since 3.1.0
  * @access private
+ * @return int
  */
 function _wp_object_name_sort_cb( $a, $b ) {
 	return strnatcasecmp( $a->name, $b->name );
@@ -857,6 +923,7 @@ function _wp_object_name_sort_cb( $a, $b ) {
  *
  * @since 3.1.0
  * @access private
+ * @return bool
  */
 function _wp_object_count_sort_cb( $a, $b ) {
 	return ( $a->count > $b->count );
@@ -872,6 +939,7 @@ function _wp_object_count_sort_cb( $a, $b ) {
  * @uses Walker_Category to create HTML list content.
  * @since 2.1.0
  * @see Walker_Category::walk() for parameters and return description.
+ * @return string
  */
 function walk_category_tree() {
 	$args = func_get_args();
@@ -880,8 +948,16 @@ function walk_category_tree() {
 		$walker = new Walker_Category;
 	} else {
 		$walker = $args[2]['walker'];
+<<<<<<< .mine
 	}
+	return call_user_func_array( array( $walker, 'walk' ), $args );
+||||||| .r11156
+
 	return call_user_func_array(array( &$walker, 'walk' ), $args );
+=======
+	}
+	return call_user_func_array(array( &$walker, 'walk' ), $args );
+>>>>>>> .r12027
 }
 
 /**
@@ -890,16 +966,17 @@ function walk_category_tree() {
  * @uses Walker_CategoryDropdown to create HTML dropdown content.
  * @since 2.1.0
  * @see Walker_CategoryDropdown::walk() for parameters and return description.
+ * @return string
  */
 function walk_category_dropdown_tree() {
 	$args = func_get_args();
 	// the user's options are the third parameter
-	if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
+	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
 		$walker = new Walker_CategoryDropdown;
-	else
+	} else {
 		$walker = $args[2]['walker'];
-
-	return call_user_func_array(array( &$walker, 'walk' ), $args );
+	}
+	return call_user_func_array( array( $walker, 'walk' ), $args );
 }
 
 /**
@@ -1144,6 +1221,21 @@ class Walker_CategoryDropdown extends Walker {
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters( 'list_cats', $category->name, $category );
 
+<<<<<<< .mine
+		if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) {
+			$value_field = $args['value_field'];
+		} else {
+			$value_field = 'term_id';
+		}
+
+		$output .= "\t

type == 'container' )
-			return $this->_render_container( $node );
-
+		if ( $node->type == 'container' ) {
+			$this->_render_container( $node );
+			return;
+		}
 		if ( $node->type != 'group' || empty( $node->children ) )
 			return;
 
@@ -410,6 +458,9 @@ class WP_Admin_Bar {
 		?>type != 'item' )
 			return;
@@ -482,11 +533,18 @@ class WP_Admin_Bar {
 		_render_item( $node );
 	}
 
+	/**
+	 * @access public
+	 */
 	public function add_menus() {
 		// User related, aligned right.
 		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
@@ -498,7 +556,8 @@ class WP_Admin_Bar {
 		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
 		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
 		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
+		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
+		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
 
 		// Content related.
 		if ( ! is_network_admin() && ! is_user_admin() ) {
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-customize-control.php b/pavillonmadeleine.fr/wp-includes/class-wp-customize-control.php
index bf17fb20..dfef1fa9 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-customize-control.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-customize-control.php
@@ -15,6 +15,25 @@
 class WP_Customize_Control {
 
 	/**
+<<<<<<< .mine
+	 * Incremented with each new class instantiation, then stored in $instance_number.
+	 *
+	 * Used when sorting two instances whose priorities are equal.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @static
+	 * @access protected
+	 * @var int
+	 */
+	protected static $instance_count = 0;
+
+	/**
+	 * Order in which this instance was created in relation to other instances.
+	 *
+	 * @since 4.1.0
+||||||| .r11156
+=======
 	 * Incremented with each new class instantiation, then stored in $instance_number.
 	 *
 	 * Used when sorting two instances whose priorities are equal.
@@ -29,6 +48,7 @@ class WP_Customize_Control {
 	 * Order in which this instance was created in relation to other instances.
 	 *
 	 * @since 4.1.0
+>>>>>>> .r12027
 	 * @access public
 	 * @var int
 	 */
@@ -137,9 +157,9 @@ class WP_Customize_Control {
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param WP_Customize_Manager $manager
-	 * @param string $id
-	 * @param array $args
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+	 * @param string               $id      Control ID.
+	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
 		$keys = array_keys( get_object_vars( $this ) );
@@ -215,7 +235,7 @@ class WP_Customize_Control {
 	 * @since 4.0.0
 	 * @access public
 	 *
-	 * @return bool Always true.
+	 * @return true Always true.
 	 */
 	public function active_callback() {
 		return true;
@@ -290,6 +310,22 @@ class WP_Customize_Control {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Get the control's content for insertion into the Customizer pane.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @return string Contents of the control.
+	 */
+	final public function get_content() {
+		ob_start();
+		$this->maybe_render();
+		return trim( ob_get_clean() );
+	}
+
+	/**
+||||||| .r11156
+=======
 	 * Get the control's content for insertion into the Customizer pane.
 	 *
 	 * @since 4.1.0
@@ -305,6 +341,7 @@ class WP_Customize_Control {
 	}
 
 	/**
+>>>>>>> .r12027
 	 * Check capabilities and render the control.
 	 *
 	 * @since 3.4.0
@@ -568,9 +605,9 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	 * @since 3.4.0
 	 * @uses WP_Customize_Control::__construct()
 	 *
-	 * @param WP_Customize_Manager $manager
-	 * @param string $id
-	 * @param array $args
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+	 * @param string               $id      Control ID.
+	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
 		$this->statuses = array( '' => __('Default') );
@@ -678,7 +715,17 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 * @since 4.1.0
 	 * @since 4.2.0 Moved from WP_Customize_Upload_Control.
 	 *
+<<<<<<< .mine
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+	 * @param string               $id      Control ID.
+	 * @param array                $args    Optional. Arguments to override class property defaults.
+||||||| .r11156
+	 * @param WP_Customize_Manager $manager
+	 * @param string $id
+	 * @param array $args
+=======
 	 * @param WP_Customize_Manager $manager {@see WP_Customize_Manager} instance.
+>>>>>>> .r12027
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
 		parent::__construct( $manager, $id, $args );
@@ -714,6 +761,46 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 */
 	public function to_json() {
 		parent::to_json();
+<<<<<<< .mine
+		$this->json['label'] = html_entity_decode( $this->label, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$this->json['mime_type'] = $this->mime_type;
+		$this->json['button_labels'] = $this->button_labels;
+		$this->json['canUpload'] = current_user_can( 'upload_files' );
+
+		$value = $this->value();
+
+		if ( is_object( $this->setting ) ) {
+			if ( $this->setting->default ) {
+				// Fake an attachment model - needs all fields used by template.
+				// Note that the default value must be a URL, NOT an attachment ID.
+				$type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
+				$default_attachment = array(
+					'id' => 1,
+					'url' => $this->setting->default,
+					'type' => $type,
+					'icon' => wp_mime_type_icon( $type ),
+					'title' => basename( $this->setting->default ),
+				);
+
+				if ( 'image' === $type ) {
+					$default_attachment['sizes'] = array(
+						'full' => array( 'url' => $this->setting->default ),
+					);
+				}
+
+				$this->json['defaultAttachment'] = $default_attachment;
+			}
+
+			if ( $value && $this->setting->default && $value === $this->setting->default ) {
+				// Set the default as the attachment.
+				$this->json['attachment'] = $this->json['defaultAttachment'];
+			} elseif ( $value ) {
+				$this->json['attachment'] = wp_prepare_attachment_for_js( $value );
+			}
+		}
+||||||| .r11156
+		$this->json['statuses'] = $this->statuses;
+=======
 		$this->json['mime_type'] = $this->mime_type;
 		$this->json['button_labels'] = $this->button_labels;
 
@@ -748,6 +835,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 				$this->json['attachment'] = wp_prepare_attachment_for_js( $value );
 			}
 		}
+>>>>>>> .r12027
 	}
 
 	/**
@@ -777,6 +865,55 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 			<# } #>
 		
 
+<<<<<<< .mine
+		<# if ( data.attachment && data.attachment.id ) { #>
+			
+				
+					
+						
+							<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
+								
+							<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
+								
+							<# } else if ( 'audio' === data.attachment.type ) { #>
+								<# if ( data.attachment.image && data.attachment.image.src && data.attachment.image.src !== data.attachment.icon ) { #>
+									
+								<# } else { #>
+									
+								<# } #>
+								“{{ data.attachment.title }}”
+								<# if ( data.attachment.album || data.attachment.meta.album ) { #>
+								{{ data.attachment.album || data.attachment.meta.album }}
+								<# } #>
+								<# if ( data.attachment.artist || data.attachment.meta.artist ) { #>
+								{{ data.attachment.artist || data.attachment.meta.artist }}
+								<# } #>
+								
+							<# } else if ( 'video' === data.attachment.type ) { #>
+								
+									
+								
+							<# } else { #>
+								
+								{{ data.attachment.title }}
+							<# } #>
+						
+||||||| .r11156
+			
+				
+					
+						
+							
+						
+							
+						
+						
+=======
 		<# if ( data.attachment && data.attachment.id ) { #>
 			
 				
@@ -814,9 +951,41 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 								{{ data.attachment.title }}
 							<# } #>
 						
+>>>>>>> .r12027
 					
 				
 			
+<<<<<<< .mine
+			
+				<# if ( data.canUpload ) { #>
+				
+				
+				
+				<# } #>
+			
+		<# } else { #>
+			
+				
+					
+						
+							
+								button_labels['placeholder']; ?>
+							
+						
+||||||| .r11156
+
+			
+				
+					tabs as $id => $tab ): ?>
+						
+							
+						
+					
+				
+				tabs as $id => $tab ): ?>
+					
+						
+=======
 			
 				
 				
@@ -831,15 +1000,28 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 								button_labels['placeholder']; ?>
 							
 						
+>>>>>>> .r12027
 					
 				
 			
 			
+<<<<<<< .mine
+				<# if ( data.defaultAttachment ) { #>
+					
+				<# } #>
+				<# if ( data.canUpload ) { #>
+				
+				<# } #>
+				
+||||||| .r11156
+				
+=======
 				<# if ( data.defaultAttachment ) { #>
 					
 				<# } #>
 				
 				
+>>>>>>> .r12027
 			
 		<# } #>
 		>>>>>> .r12027
 	 * @param array  $args
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
@@ -967,7 +1157,7 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 	 * @since 3.4.0
 	 * @uses WP_Customize_Image_Control::__construct()
 	 *
-	 * @param WP_Customize_Manager $manager
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
 	 */
 	public function __construct( $manager ) {
 		parent::__construct( $manager, 'background_image', array(
@@ -989,6 +1179,152 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 				'add' => wp_create_nonce( 'background-add' ),
 			),
 		) );
+<<<<<<< .mine
+	}
+}
+
+/**
+ * Customize Cropped Image Control class.
+ *
+ * @since 4.3.0
+ *
+ * @see WP_Customize_Media_Control
+ */
+class WP_Customize_Cropped_Image_Control extends WP_Customize_Media_Control {
+
+	/**
+	 * Control type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = 'cropped_image';
+
+	/**
+	 * Suggested width for cropped image.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $width = 150;
+
+	/**
+	 * Suggested height for cropped image.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $height = 150;
+
+	/**
+	 * Whether the width is flexible.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var bool
+	 */
+	public $flex_width = false;
+
+	/**
+	 * Whether the height is flexible.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var bool
+	 */
+	public $flex_height = false;
+
+	/**
+	 * Enqueue control related scripts/styles.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 */
+	public function enqueue() {
+		wp_enqueue_script( 'customize-views' );
+
+		parent::enqueue();
+||||||| .r11156
+
+		?>
print_tab_image( esc_url_raw( $background->guid ) );
+=======
+>>>>>>> .r12027
+	}
+<<<<<<< .mine
+
+	/**
+	 * Refresh the parameters passed to the JavaScript via JSON.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Control::to_json()
+	 */
+	public function to_json() {
+		parent::to_json();
+
+		$this->json['width']       = absint( $this->width );
+		$this->json['height']      = absint( $this->height );
+		$this->json['flex_width']  = absint( $this->flex_width );
+		$this->json['flex_height'] = absint( $this->flex_height );
+	}
+||||||| .r11156
+
+	/**
+	 * @since 3.4.0
+	 * @uses WP_Customize_Image_Control::print_tab_image()
+	 */
+	public function tab_default_background() {
+		$this->print_tab_image( $this->setting->default );
+	}
+=======
+>>>>>>> .r12027
+
+}
+
+<<<<<<< .mine
+/**
+ * Customize Site Icon control class.
+ *
+ * Used only for custom functionality in JavaScript.
+ *
+ * @since 4.3.0
+ *
+ * @see WP_Customize_Cropped_Image_Control
+ */
+class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control {
+
+	/**
+	 * Control type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = 'site_icon';
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+	 * @param string               $id      Control ID.
+	 * @param array                $args    Optional. Arguments to override class property defaults.
+	 */
+	public function __construct( $manager, $id, $args = array() ) {
+		parent::__construct( $manager, $id, $args );
+		add_action( 'customize_controls_print_styles', 'wp_site_icon', 99 );
 	}
 }
 
@@ -999,14 +1335,35 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
  *
  * @see WP_Customize_Image_Control
  */
+||||||| .r11156
+=======
+/**
+ * Customize Header Image Control class.
+ *
+ * @since 3.4.0
+ *
+ * @see WP_Customize_Image_Control
+ */
+>>>>>>> .r12027
 class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	public $type = 'header';
 	public $uploaded_headers;
 	public $default_headers;
 
+<<<<<<< .mine
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.4.0
+	 *
+	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+	 */
+||||||| .r11156
+=======
 	/**
 	 * @param WP_Customize_Manager $manager
 	 */
+>>>>>>> .r12027
 	public function __construct( $manager ) {
 		parent::__construct( $manager, 'header_image', array(
 			'label'    => __( 'Header Image' ),
@@ -1021,6 +1378,17 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 	}
 
+<<<<<<< .mine
+	/**
+	 * @access public
+	 */
+||||||| .r11156
+	public function to_json() {
+		parent::to_json();
+	}
+
+=======
+>>>>>>> .r12027
 	public function enqueue() {
 		wp_enqueue_media();
 		wp_enqueue_script( 'customize-views' );
@@ -1046,6 +1414,10 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 		parent::enqueue();
 	}
 
+	/**
+	 *
+	 * @global Custom_Image_Header $custom_image_header
+	 */
 	public function prepare_control() {
 		global $custom_image_header;
 		if ( empty( $custom_image_header ) ) {
@@ -1058,23 +1430,32 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 		$this->uploaded_headers = $custom_image_header->get_uploaded_header_images();
 	}
 
+<<<<<<< .mine
+	/**
+	 * @access public
+	 */
 	public function print_header_image_template() {
+||||||| .r11156
+	function print_header_image_template() {
+=======
+	public function print_header_image_template() {
+>>>>>>> .r12027
 		?>
 		
+
+		
+	
+		
+			
+				
+				
+					
+						manager->get_panel( 'nav_menus' )->title ) );
+						?>
+					
+					
+				
+			
+			
+				
+					
+					
+					
+					
+					
+				
+				
+			
+			
+				
+					
+					
+				
+				
+					
+					
+						
+							
+							
+						
+					
+					
+						
+							
+							
+						
+					
+					
+						
+							
+							
+						
+					
+				
+			
+			available_item_types() as $available_item_type ) {
+				$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+				?>
+				
+					
+						
+						
+						
+						
+					
+					
+				
+				
+		

+	preview_nav_menu_instance_number += 1;
+		$args['instance_number'] = $this->preview_nav_menu_instance_number;
+
+		$can_partial_refresh = (
+			! empty( $args['echo'] )
+			&&
+			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			&&
+			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			&&
+			(
+				! empty( $args['theme_location'] )
+				||
+				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+			)
+		);
+		$args['can_partial_refresh'] = $can_partial_refresh;
+
+		$hashed_args = $args;
+
+		if ( ! $can_partial_refresh ) {
+			$hashed_args['fallback_cb'] = '';
+			$hashed_args['walker'] = '';
+		}
+
+		// Replace object menu arg with a term_id menu arg, as this exports better to JS and is easier to compare hashes.
+		if ( ! empty( $hashed_args['menu'] ) && is_object( $hashed_args['menu'] ) ) {
+			$hashed_args['menu'] = $hashed_args['menu']->term_id;
+		}
+
+		ksort( $hashed_args );
+		$hashed_args['args_hash'] = $this->hash_nav_menu_args( $hashed_args );
+
+		$this->preview_nav_menu_instance_args[ $this->preview_nav_menu_instance_number ] = $hashed_args;
+		return $args;
+	}
+
+	/**
+	 * Prepare wp_nav_menu() calls for partial refresh. Wraps output in container for refreshing.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_nav_menu()
+	 *
+	 * @param string $nav_menu_content The HTML content for the navigation menu.
+	 * @param object $args             An object containing wp_nav_menu() arguments.
+	 * @return null
+	 */
+	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
+		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {
+			$nav_menu_content = preg_replace(
+				'/(?<=class=")/',
+				sprintf( 'partial-refreshable-nav-menu partial-refreshable-nav-menu-%1$d ', $args->instance_number ),
+				$nav_menu_content,
+				1 // Only update the class on the first element found, the menu container.
+			);
+		}
+		return $nav_menu_content;
+	}
+
+	/**
+	 * Hash (hmac) the arguments with the nonce and secret auth key to ensure they
+	 * are not tampered with when submitted in the Ajax request.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $args The arguments to hash.
+	 * @return string
+	 */
+	public function hash_nav_menu_args( $args ) {
+		return wp_hash( wp_create_nonce( self::RENDER_AJAX_ACTION ) . serialize( $args ) );
+	}
+
+	/**
+	 * Enqueue scripts for the Customizer preview.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 */
+	public function customize_preview_enqueue_deps() {
+		wp_enqueue_script( 'customize-preview-nav-menus' );
+		wp_enqueue_style( 'customize-preview' );
+
+		add_action( 'wp_print_footer_scripts', array( $this, 'export_preview_data' ) );
+	}
+
+	/**
+	 * Export data from PHP to JS.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 */
+	public function export_preview_data() {
+
+		// Why not wp_localize_script? Because we're not localizing, and it forces values into strings.
+		$exports = array(
+			'renderQueryVar'        => self::RENDER_QUERY_VAR,
+			'renderNonceValue'      => wp_create_nonce( self::RENDER_AJAX_ACTION ),
+			'renderNoncePostKey'    => self::RENDER_NONCE_POST_KEY,
+			'requestUri'            => '/',
+			'theme'                 => array(
+				'stylesheet' => $this->manager->get_stylesheet(),
+				'active'     => $this->manager->is_theme_active(),
+			),
+			'previewCustomizeNonce' => wp_create_nonce( 'preview-customize_' . $this->manager->get_stylesheet() ),
+			'navMenuInstanceArgs'   => $this->preview_nav_menu_instance_args,
+		);
+
+		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+			$exports['requestUri'] = esc_url_raw( home_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		}
+
+		printf( '', wp_json_encode( $exports ) );
+	}
+
+	/**
+	 * Render a specific menu via wp_nav_menu() using the supplied arguments.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_nav_menu()
+	 */
+	public function render_menu() {
+		if ( empty( $_POST[ self::RENDER_QUERY_VAR ] ) ) {
+			return;
+		}
+
+		$this->manager->remove_preview_signature();
+
+		if ( empty( $_POST[ self::RENDER_NONCE_POST_KEY ] ) ) {
+			wp_send_json_error( 'missing_nonce_param' );
+		}
+
+		if ( ! is_customize_preview() ) {
+			wp_send_json_error( 'expected_customize_preview' );
+		}
+
+		if ( ! check_ajax_referer( self::RENDER_AJAX_ACTION, self::RENDER_NONCE_POST_KEY, false ) ) {
+			wp_send_json_error( 'nonce_check_fail' );
+		}
+
+		if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_send_json_error( 'unauthorized' );
+		}
+
+		if ( ! isset( $_POST['wp_nav_menu_args'] ) ) {
+			wp_send_json_error( 'missing_param' );
+		}
+
+		if ( ! isset( $_POST['wp_nav_menu_args_hash'] ) ) {
+			wp_send_json_error( 'missing_param' );
+		}
+
+		$wp_nav_menu_args = json_decode( wp_unslash( $_POST['wp_nav_menu_args'] ), true );
+		if ( ! is_array( $wp_nav_menu_args ) ) {
+			wp_send_json_error( 'wp_nav_menu_args_not_array' );
+		}
+
+		$wp_nav_menu_args_hash = sanitize_text_field( wp_unslash( $_POST['wp_nav_menu_args_hash'] ) );
+		if ( ! hash_equals( $this->hash_nav_menu_args( $wp_nav_menu_args ), $wp_nav_menu_args_hash ) ) {
+			wp_send_json_error( 'wp_nav_menu_args_hash_mismatch' );
+		}
+
+		$wp_nav_menu_args['echo'] = false;
+		wp_send_json_success( wp_nav_menu( $wp_nav_menu_args ) );
+	}
+}
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-customize-panel.php b/pavillonmadeleine.fr/wp-includes/class-wp-customize-panel.php
index ee9f846b..b709d398 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-customize-panel.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-customize-panel.php
@@ -19,6 +19,32 @@
 class WP_Customize_Panel {
 
 	/**
+<<<<<<< .mine
+	 * Incremented with each new class instantiation, then stored in $instance_number.
+	 *
+	 * Used when sorting two instances whose priorities are equal.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @static
+	 * @access protected
+	 * @static
+	 * @var int
+	 */
+	protected static $instance_count = 0;
+
+	/**
+	 * Order in which this instance was created in relation to other instances.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 * @var int
+	 */
+	public $instance_number;
+
+	/**
+||||||| .r11156
+=======
 	 * Incremented with each new class instantiation, then stored in $instance_number.
 	 *
 	 * Used when sorting two instances whose priorities are equal.
@@ -39,6 +65,7 @@ class WP_Customize_Panel {
 	public $instance_number;
 
 	/**
+>>>>>>> .r12027
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 4.0.0
@@ -190,6 +217,40 @@ class WP_Customize_Panel {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Default callback used when invoking {@see WP_Customize_Panel::active()}.
+	 *
+	 * Subclasses can override this with their specific logic, or they may
+	 * provide an 'active_callback' argument to the constructor.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 *
+	 * @return bool Always true.
+	 */
+	public function active_callback() {
+		return true;
+	}
+
+	/**
+	 * Gather the parameters passed to client JavaScript via JSON.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @return array The array to be exported to the client as JSON.
+	 */
+	public function json() {
+		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
+		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array['content'] = $this->get_content();
+		$array['active'] = $this->active();
+		$array['instanceNumber'] = $this->instance_number;
+		return $array;
+	}
+
+	/**
+||||||| .r11156
+=======
 	 * Default callback used when invoking {@see WP_Customize_Panel::active()}.
 	 *
 	 * Subclasses can override this with their specific logic, or they may
@@ -220,6 +281,7 @@ class WP_Customize_Panel {
 	}
 
 	/**
+>>>>>>> .r12027
 	 * Checks required user capabilities and whether the theme has the
 	 * feature support required by the panel.
 	 *
@@ -240,6 +302,22 @@ class WP_Customize_Panel {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Get the panel's content template for insertion into the Customizer pane.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @return string Content for the panel.
+	 */
+	final public function get_content() {
+		ob_start();
+		$this->maybe_render();
+		return trim( ob_get_clean() );
+	}
+
+	/**
+||||||| .r11156
+=======
 	 * Get the panel's content template for insertion into the Customizer pane.
 	 *
 	 * @since 4.1.0
@@ -255,6 +333,7 @@ class WP_Customize_Panel {
 	}
 
 	/**
+>>>>>>> .r12027
 	 * Check capabilities and render the panel.
 	 *
 	 * @since 4.0.0
@@ -287,25 +366,240 @@ class WP_Customize_Panel {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Render the panel container, and then its contents (via `this->render_content()`) in a subclass.
+||||||| .r11156
+	 * Render the panel, and the sections that have been added to it.
+=======
 	 * Render the panel container, and then its contents.
+>>>>>>> .r12027
+	 *
+	 * Panel containers are now rendered in JS by default, see {@see WP_Customize_Panel::print_template()}.
 	 *
 	 * @since 4.0.0
 	 * @access protected
 	 */
-	protected function render() {
+	protected function render() {}
+
+	/**
+	 * Render the panel UI in a subclass.
+	 *
+	 * Panel contents are now rendered in JS by default, see {@see WP_Customize_Panel::print_template()}.
+	 *
+	 * @since 4.1.0
+	 * @access protected
+	 */
+	protected function render_content() {}
+
+	/**
+	 * Render the panel's JS templates.
+	 *
+	 * This function is only run for panel types that have been registered with
+	 * WP_Customize_Manager::register_panel_type().
+	 *
+	 * @since 4.3.0
+	 *
+	 * @see WP_Customize_Manager::register_panel_type()
+	 */
+	public function print_template() {
 		$classes = 'accordion-section control-section control-panel control-panel-' . $this->type;
 		?>
+<<<<<<< .mine
+		
+		
+        
+		
+||||||| .r11156
+		

+=======
 		

+>>>>>>> .r12027
 			
-				title ); ?>
+				{{ data.title }}
 				
 			
+<<<<<<< .mine
+			
+||||||| .r11156
+			
+				
+					
+						' . esc_html( $this->title ) . '' );
+						?>
+					
+					description ) ) : ?>
+						
+							description; ?>
+						
+					
+				
+				sections as $section ) {
+					$section->maybe_render();
+				}
+				?>
+			
+=======
 			
 				render_content(); ?>
 			
+>>>>>>> .r12027
+		
+		
+		
+			
+			
+				{{ data.title }}' );
+				?>
+				
+			
+			<# if ( data.description ) { #>
+				
+					{{{ data.description }}}
+				
+			<# } #>
 		
 		render_screen_options();
+	}
+
+	/**
+	 * Returns the advanced options for the nav menus page.
+	 *
+	 * Link title attribute added as it's a relatively advanced concept for new users.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @return array The advanced menu properties.
+	 */
+	public function wp_nav_menu_manage_columns() {
+		return array(
+			'_title'      => __( 'Show advanced menu properties' ),
+			'cb'          => '',
+			'link-target' => __( 'Link Target' ),
+			'attr-title'  => __( 'Title Attribute' ),
+			'css-classes' => __( 'CSS Classes' ),
+			'xfn'         => __( 'Link Relationship (XFN)' ),
+			'description' => __( 'Description' ),
+		);
+	}
+
+	/**
+	 * An Underscore (JS) template for this panel's content (but not its container).
+	 *
+	 * Class variables for this panel class are available in the `data` JS object;
+	 * export custom variables by overriding WP_Customize_Panel::json().
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see WP_Customize_Panel::print_template()
+	 */
+	protected function content_template() {
+		?>
+		
+			
+			
+				
+					{{ data.title }}' );
+					?>
+				
+				
+				
+			
+			<# if ( data.description ) { #>
+			{{{ data.description }}}
+			<# } #>
+			render_screen_options(); ?>
+		
+	>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-customize-section.php b/pavillonmadeleine.fr/wp-includes/class-wp-customize-section.php
index b852dfba..dc2eb661 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-customize-section.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-customize-section.php
@@ -19,11 +19,14 @@
 class WP_Customize_Section {
 
 	/**
+<<<<<<< .mine
 	 * Incremented with each new class instantiation, then stored in $instance_number.
 	 *
 	 * Used when sorting two instances whose priorities are equal.
 	 *
 	 * @since 4.1.0
+	 *
+	 * @static
 	 * @access protected
 	 * @var int
 	 */
@@ -39,6 +42,29 @@ class WP_Customize_Section {
 	public $instance_number;
 
 	/**
+||||||| .r11156
+=======
+	 * Incremented with each new class instantiation, then stored in $instance_number.
+	 *
+	 * Used when sorting two instances whose priorities are equal.
+	 *
+	 * @since 4.1.0
+	 * @access protected
+	 * @var int
+	 */
+	protected static $instance_count = 0;
+
+	/**
+	 * Order in which this instance was created in relation to other instances.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 * @var int
+	 */
+	public $instance_number;
+
+	/**
+>>>>>>> .r12027
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 3.4.0
@@ -199,6 +225,48 @@ class WP_Customize_Section {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Default callback used when invoking {@see WP_Customize_Section::active()}.
+	 *
+	 * Subclasses can override this with their specific logic, or they may provide
+	 * an 'active_callback' argument to the constructor.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 *
+	 * @return true Always true.
+	 */
+	public function active_callback() {
+		return true;
+	}
+
+	/**
+	 * Gather the parameters passed to client JavaScript via JSON.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @return array The array to be exported to the client as JSON.
+	 */
+	public function json() {
+		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type' ) );
+		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array['content'] = $this->get_content();
+		$array['active'] = $this->active();
+		$array['instanceNumber'] = $this->instance_number;
+
+		if ( $this->panel ) {
+			/* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */
+			$array['customizeAction'] = sprintf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
+		} else {
+			$array['customizeAction'] = __( 'Customizing' );
+		}
+
+		return $array;
+	}
+
+	/**
+||||||| .r11156
+=======
 	 * Default callback used when invoking {@see WP_Customize_Section::active()}.
 	 *
 	 * Subclasses can override this with their specific logic, or they may provide
@@ -229,6 +297,7 @@ class WP_Customize_Section {
 	}
 
 	/**
+>>>>>>> .r12027
 	 * Checks required user capabilities and whether the theme has the
 	 * feature support required by the section.
 	 *
@@ -249,6 +318,22 @@ class WP_Customize_Section {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Get the section's content for insertion into the Customizer pane.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @return string Contents of the section.
+	 */
+	final public function get_content() {
+		ob_start();
+		$this->maybe_render();
+		return trim( ob_get_clean() );
+	}
+
+	/**
+||||||| .r11156
+=======
 	 * Get the section's content template for insertion into the Customizer pane.
 	 *
 	 * @since 4.1.0
@@ -264,6 +349,7 @@ class WP_Customize_Section {
 	}
 
 	/**
+>>>>>>> .r12027
 	 * Check capabilities and render the section.
 	 *
 	 * @since 3.4.0
@@ -295,25 +381,304 @@ class WP_Customize_Section {
 	}
 
 	/**
-	 * Render the section, and the controls that have been added to it.
+	 * Render the section UI in a subclass.
+	 *
+	 * Sections are now rendered in JS by default, see {@see WP_Customize_Section::print_template()}.
 	 *
 	 * @since 3.4.0
 	 */
+<<<<<<< .mine
+	protected function render() {}
+
+	/**
+	 * Render the section's JS template.
+	 *
+	 * This function is only run for section types that have been registered with
+	 * WP_Customize_Manager::register_section_type().
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Manager::render_template()
+	 */
+	public function print_template() {
+        ?>
+		
+        panel ) {
+			$classes .= ' control-subsection';
+		}
+=======
 	protected function render() {
 		$classes = 'accordion-section control-section control-section-' . $this->type;
+>>>>>>> .r12027
 		?>
-		
+		

 			
-				title ); ?>
-				
+				{{ data.title }}
+				
 			
 			
+<<<<<<< .mine
+				
+					
+						
+						
+							
+								{{{ data.customizeAction }}}
+							
+							{{ data.title }}
+						
+					
+					<# if ( data.description ) { #>
+						
+							{{{ data.description }}}
+						
+					<# } #>
+				
+			
+		
+		type;
+		?>
+		
+			
+||||||| .r11156
+				description ) ) : ?>
+				description; ?>
+				
+=======
 				description ) ) : ?>
 					
 						description; ?>
 					
 				
-			
+>>>>>>> .r12027
+<<<<<<< .mine
+				manager->is_theme_active() ) {
+					echo '' . __( 'Active theme' ) . ' ' . $this->title;
+				} else {
+					echo '' . __( 'Previewing theme' ) . ' ' . $this->title;
+				}
+				?>
+||||||| .r11156
+				controls as $control )
+					$control->maybe_render();
+				?>
+=======
+>>>>>>> .r12027
+
+				
+			
+			
+				
+					
+					
+					controls ) + 1 /* Active theme */; ?>
+				
+				
+					manager->is_theme_active() ) {
+						echo '' . __( 'Active theme' ) . ' ' . $this->title;
+					} else {
+						echo '' . __( 'Previewing theme' ) . ' ' . $this->title;
+					}
+					?>
+					
+				
+
+				
+
+				
+				controls ) > 4 ) : ?>
+					
+						
+						
+					
+				
+				
+					
+					
+				
+			
+		
+sidebar_id;
+		return $json;
+	}
+
+	/**
+	 * Whether the current sidebar is rendered on the page.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 *
+	 * @return bool Whether sidebar is rendered.
+	 */
+	public function active_callback() {
+		return $this->manager->widgets->is_sidebar_rendered( $this->sidebar_id );
+	}
+}
+
+/**
+ * Customize Menu Section Class
+ *
+ * Custom section only needed in JS.
+ *
+ * @since 4.3.0
+ *
+ * @see WP_Customize_Section
+ */
+class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
+
+	/**
+	 * Control type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = 'nav_menu';
+
+	/**
+	 * Get section parameters for JS.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @return array Exported parameters.
+	 */
+	public function json() {
+		$exported = parent::json();
+		$exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(\d+)\]/', '$1', $this->id ) );
+
+		return $exported;
+	}
+}
+
+/**
+ * Customize Menu Section Class
+ *
+ * Implements the new-menu-ui toggle button instead of a regular section.
+ *
+ * @since 4.3.0
+ *
+ * @see WP_Customize_Section
+ */
+class WP_Customize_New_Menu_Section extends WP_Customize_Section {
+
+	/**
+	 * Control type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = 'new_menu';
+
+	/**
+	 * Render the section, and the controls that have been added to it.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 */
+	protected function render() {
+		?>
+		
+			
+			
 		
 		id}", $this->sanitize_js_callback, 10, 2 );
 	}
 
+<<<<<<< .mine
+	/**
+	 * The ID for the current blog when the preview() method was called.
+	 *
+	 * @since 4.2.0
+	 * @access protected
+	 * @var int
+	 */
+	protected $_previewed_blog_id;
+
+	/**
+	 * Return true if the current blog is not the same as the previewed blog.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @return bool If preview() has been called.
+	 */
+	public function is_current_blog_previewed() {
+		if ( ! isset( $this->_previewed_blog_id ) ) {
+			return false;
+		}
+		return ( get_current_blog_id() === $this->_previewed_blog_id );
+||||||| .r11156
+		return $this;
+=======
 	/**
 	 * The ID for the current blog when the preview() method was called.
 	 *
@@ -136,6 +162,7 @@ class WP_Customize_Setting {
 			return null;
 		}
 		return ( get_current_blog_id() === $this->_previewed_blog_id );
+>>>>>>> .r12027
 	}
 
 	/**
@@ -235,7 +262,13 @@ class WP_Customize_Setting {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @return false|void False if cap check fails or value isn't set.
+||||||| .r11156
+	 * @return bool False if cap check fails or value isn't set.
+=======
 	 * @return false|null False if cap check fails or value isn't set.
+>>>>>>> .r12027
 	 */
 	final public function save() {
 		$value = $this->post_value();
@@ -275,8 +308,8 @@ class WP_Customize_Setting {
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $value The value to sanitize.
-	 * @return mixed Null if an input isn't valid, otherwise the sanitized value.
+	 * @param string|array $value The value to sanitize.
+	 * @return string|array|null Null if an input isn't valid, otherwise the sanitized value.
 	 */
 	public function sanitize( $value ) {
 		$value = wp_unslash( $value );
@@ -331,18 +364,19 @@ class WP_Customize_Setting {
 	 * @since 3.4.0
 	 *
 	 * @param mixed $value The value to update.
-	 * @return mixed The result of saving the value.
 	 */
 	protected function _update_theme_mod( $value ) {
 		// Handle non-array theme mod.
-		if ( empty( $this->id_data[ 'keys' ] ) )
-			return set_theme_mod( $this->id_data[ 'base' ], $value );
-
+		if ( empty( $this->id_data[ 'keys' ] ) ) {
+			set_theme_mod( $this->id_data[ 'base' ], $value );
+			return;
+		}
 		// Handle array-based theme mod.
 		$mods = get_theme_mod( $this->id_data[ 'base' ] );
 		$mods = $this->multidimensional_replace( $mods, $this->id_data[ 'keys' ], $value );
-		if ( isset( $mods ) )
-			return set_theme_mod( $this->id_data[ 'base' ], $mods );
+		if ( isset( $mods ) ) {
+			set_theme_mod( $this->id_data[ 'base' ], $mods );
+		}
 	}
 
 	/**
@@ -351,7 +385,13 @@ class WP_Customize_Setting {
 	 * @since 3.4.0
 	 *
 	 * @param mixed $value The value to update.
+<<<<<<< .mine
+	 * @return bool The result of saving the value.
+||||||| .r11156
+	 * @return mixed The result of saving the value.
+=======
 	 * @return bool|null The result of saving the value.
+>>>>>>> .r12027
 	 */
 	protected function _update_option( $value ) {
 		// Handle non-array option.
@@ -460,7 +500,7 @@ class WP_Customize_Setting {
 	 * @param $root
 	 * @param $keys
 	 * @param bool $create Default is false.
-	 * @return null|array Keys are 'root', 'node', and 'key'.
+	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
 	final protected function multidimensional( &$root, $keys, $create = false ) {
 		if ( $create && empty( $root ) )
@@ -591,6 +631,8 @@ final class WP_Customize_Header_Image_Setting extends WP_Customize_Setting {
 	/**
 	 * @since 3.4.0
 	 *
+	 * @global Custom_Image_Header $custom_image_header
+	 *
 	 * @param $value
 	 */
 	public function update( $value ) {
@@ -627,3 +669,1420 @@ final class WP_Customize_Background_Image_Setting extends WP_Customize_Setting {
 		remove_theme_mod( 'background_image_thumb' );
 	}
 }
+
+/**
+ * Customize Setting to represent a nav_menu.
+ *
+ * Subclass of WP_Customize_Setting to represent a nav_menu taxonomy term, and
+ * the IDs for the nav_menu_items associated with the nav menu.
+ *
+ * @since 4.3.0
+ *
+ * @see WP_Customize_Setting
+ */
+class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
+
+	const ID_PATTERN = '/^nav_menu_item\[(?P-?\d+)\]$/';
+
+	const POST_TYPE = 'nav_menu_item';
+
+	const TYPE = 'nav_menu_item';
+
+	/**
+	 * Setting type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = self::TYPE;
+
+	/**
+	 * Default setting value.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var array
+	 *
+	 * @see wp_setup_nav_menu_item()
+	 */
+	public $default = array(
+		// The $menu_item_data for wp_update_nav_menu_item().
+		'object_id'        => 0,
+		'object'           => '', // Taxonomy name.
+		'menu_item_parent' => 0, // A.K.A. menu-item-parent-id; note that post_parent is different, and not included.
+		'position'         => 0, // A.K.A. menu_order.
+		'type'             => 'custom', // Note that type_label is not included here.
+		'title'            => '',
+		'url'              => '',
+		'target'           => '',
+		'attr_title'       => '',
+		'description'      => '',
+		'classes'          => '',
+		'xfn'              => '',
+		'status'           => 'publish',
+		'original_title'   => '',
+		'nav_menu_term_id' => 0, // This will be supplied as the $menu_id arg for wp_update_nav_menu_item().
+		// @todo also expose invalid?
+	);
+
+	/**
+	 * Default transport.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $transport = 'postMessage';
+
+	/**
+	 * The post ID represented by this setting instance. This is the db_id.
+	 *
+	 * A negative value represents a placeholder ID for a new menu not yet saved.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $post_id;
+
+	/**
+	 * Storage of pre-setup menu item to prevent wasted calls to wp_setup_nav_menu_item().
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var array
+	 */
+	protected $value;
+
+	/**
+	 * Previous (placeholder) post ID used before creating a new menu item.
+	 *
+	 * This value will be exported to JS via the customize_save_response filter
+	 * so that JavaScript can update the settings to refer to the newly-assigned
+	 * post ID. This value is always negative to indicate it does not refer to
+	 * a real post.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 *
+	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+	 */
+	public $previous_post_id;
+
+	/**
+	 * When previewing or updating a menu item, this stores the previous nav_menu_term_id
+	 * which ensures that we can apply the proper filters.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $original_nav_menu_term_id;
+
+	/**
+	 * Whether or not preview() was called.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var bool
+	 */
+	protected $is_previewed = false;
+
+	/**
+	 * Whether or not update() was called.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var bool
+	 */
+	protected $is_updated = false;
+
+	/**
+	 * Status for calling the update method, used in customize_save_response filter.
+	 *
+	 * When status is inserted, the placeholder post ID is stored in $previous_post_id.
+	 * When status is error, the error is stored in $update_error.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string updated|inserted|deleted|error
+	 *
+	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+	 */
+	public $update_status;
+
+	/**
+	 * Any error object returned by wp_update_nav_menu_item() when setting is updated.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var WP_Error
+	 *
+	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+	 */
+	public $update_error;
+
+	/**
+	 * Constructor.
+	 *
+	 * Any supplied $args override class property defaults.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Customize_Manager $manager Bootstrap Customizer instance.
+	 * @param string               $id      An specific ID of the setting. Can be a
+	 *                                      theme mod or option name.
+	 * @param array                $args    Optional. Setting arguments.
+	 *
+	 * @throws Exception If $id is not valid for this setting type.
+	 */
+	public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
+		if ( empty( $manager->nav_menus ) ) {
+			throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+		}
+
+		if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
+			throw new Exception( "Illegal widget setting ID: $id" );
+		}
+
+		$this->post_id = intval( $matches['id'] );
+		add_action( 'wp_update_nav_menu_item', array( $this, 'flush_cached_value' ), 10, 2 );
+
+		parent::__construct( $manager, $id, $args );
+
+		// Ensure that an initially-supplied value is valid.
+		if ( isset( $this->value ) ) {
+			$this->populate_value();
+			foreach ( array_diff( array_keys( $this->default ), array_keys( $this->value ) ) as $missing ) {
+				throw new Exception( "Supplied nav_menu_item value missing property: $missing" );
+			}
+		}
+
+	}
+
+	/**
+	 * Clear the cached value when this nav menu item is updated.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param int $menu_id       The term ID for the menu.
+	 * @param int $menu_item_id  The post ID for the menu item.
+	 */
+	public function flush_cached_value( $menu_id, $menu_item_id ) {
+		unset( $menu_id );
+		if ( $menu_item_id === $this->post_id ) {
+			$this->value = null;
+		}
+	}
+
+	/**
+	 * Get the instance data for a given widget setting.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_setup_nav_menu_item()
+	 *
+	 * @return array|false Instance data array, or false if the item is marked for deletion.
+	 */
+	public function value() {
+		if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+			$undefined  = new stdClass(); // Symbol.
+			$post_value = $this->post_value( $undefined );
+
+			if ( $undefined === $post_value ) {
+				$value = $this->_original_value;
+			} else {
+				$value = $post_value;
+			}
+		} else if ( isset( $this->value ) ) {
+			$value = $this->value;
+		} else {
+			$value = false;
+
+			// Note that a ID of less than one indicates a nav_menu not yet inserted.
+			if ( $this->post_id > 0 ) {
+				$post = get_post( $this->post_id );
+				if ( $post && self::POST_TYPE === $post->post_type ) {
+					$value = (array) wp_setup_nav_menu_item( $post );
+				}
+			}
+
+			if ( ! is_array( $value ) ) {
+				$value = $this->default;
+			}
+
+			// Cache the value for future calls to avoid having to re-call wp_setup_nav_menu_item().
+			$this->value = $value;
+			$this->populate_value();
+			$value = $this->value;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Ensure that the value is fully populated with the necessary properties.
+	 *
+	 * Translates some properties added by wp_setup_nav_menu_item() and removes others.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
+	 */
+	protected function populate_value() {
+		if ( ! is_array( $this->value ) ) {
+			return;
+		}
+
+		if ( isset( $this->value['menu_order'] ) ) {
+			$this->value['position'] = $this->value['menu_order'];
+			unset( $this->value['menu_order'] );
+		}
+		if ( isset( $this->value['post_status'] ) ) {
+			$this->value['status'] = $this->value['post_status'];
+			unset( $this->value['post_status'] );
+		}
+
+		if ( ! isset( $this->value['original_title'] ) ) {
+			$original_title = '';
+			if ( 'post_type' === $this->value['type'] ) {
+				$original_title = get_the_title( $this->value['object_id'] );
+			} elseif ( 'taxonomy' === $this->value['type'] ) {
+				$original_title = get_term_field( 'name', $this->value['object_id'], $this->value['object'], 'raw' );
+				if ( is_wp_error( $original_title ) ) {
+					$original_title = '';
+				}
+			}
+			$this->value['original_title'] = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		}
+
+		if ( ! isset( $this->value['nav_menu_term_id'] ) && $this->post_id > 0 ) {
+			$menus = wp_get_post_terms( $this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
+				'fields' => 'ids',
+			) );
+			if ( ! empty( $menus ) ) {
+				$this->value['nav_menu_term_id'] = array_shift( $menus );
+			} else {
+				$this->value['nav_menu_term_id'] = 0;
+			}
+		}
+
+		foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
+			if ( ! is_int( $this->value[ $key ] ) ) {
+				$this->value[ $key ] = intval( $this->value[ $key ] );
+			}
+		}
+
+		// Remove remaining properties available on a setup nav_menu_item post object which aren't relevant to the setting value.
+		$irrelevant_properties = array(
+			'ID',
+			'comment_count',
+			'comment_status',
+			'db_id',
+			'filter',
+			'guid',
+			'ping_status',
+			'pinged',
+			'post_author',
+			'post_content',
+			'post_content_filtered',
+			'post_date',
+			'post_date_gmt',
+			'post_excerpt',
+			'post_mime_type',
+			'post_modified',
+			'post_modified_gmt',
+			'post_name',
+			'post_parent',
+			'post_password',
+			'post_title',
+			'post_type',
+			'to_ping',
+		);
+		foreach ( $irrelevant_properties as $property ) {
+			unset( $this->value[ $property ] );
+		}
+	}
+
+	/**
+	 * Handle previewing the setting.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Manager::post_value()
+	 */
+	public function preview() {
+		if ( $this->is_previewed ) {
+			return;
+		}
+
+		$this->is_previewed              = true;
+		$this->_original_value           = $this->value();
+		$this->original_nav_menu_term_id = $this->_original_value['nav_menu_term_id'];
+		$this->_previewed_blog_id        = get_current_blog_id();
+
+		add_filter( 'wp_get_nav_menu_items', array( $this, 'filter_wp_get_nav_menu_items' ), 10, 3 );
+
+		$sort_callback = array( __CLASS__, 'sort_wp_get_nav_menu_items' );
+		if ( ! has_filter( 'wp_get_nav_menu_items', $sort_callback ) ) {
+			add_filter( 'wp_get_nav_menu_items', array( __CLASS__, 'sort_wp_get_nav_menu_items' ), 1000, 3 );
+		}
+
+		// @todo Add get_post_metadata filters for plugins to add their data.
+	}
+
+	/**
+	 * Filter the wp_get_nav_menu_items() result to supply the previewed menu items.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_get_nav_menu_items()
+	 *
+	 * @param array  $items An array of menu item post objects.
+	 * @param object $menu  The menu object.
+	 * @param array  $args  An array of arguments used to retrieve menu item objects.
+	 * @return array Array of menu items,
+	 */
+	public function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
+		$this_item = $this->value();
+		$current_nav_menu_term_id = $this_item['nav_menu_term_id'];
+		unset( $this_item['nav_menu_term_id'] );
+
+		$should_filter = (
+			$menu->term_id === $this->original_nav_menu_term_id
+			||
+			$menu->term_id === $current_nav_menu_term_id
+		);
+		if ( ! $should_filter ) {
+			return $items;
+		}
+
+		// Handle deleted menu item, or menu item moved to another menu.
+		$should_remove = (
+			false === $this_item
+			||
+			(
+				$this->original_nav_menu_term_id === $menu->term_id
+				&&
+				$current_nav_menu_term_id !== $this->original_nav_menu_term_id
+			)
+		);
+		if ( $should_remove ) {
+			$filtered_items = array();
+			foreach ( $items as $item ) {
+				if ( $item->db_id !== $this->post_id ) {
+					$filtered_items[] = $item;
+				}
+			}
+			return $filtered_items;
+		}
+
+		$mutated = false;
+		$should_update = (
+			is_array( $this_item )
+			&&
+			$current_nav_menu_term_id === $menu->term_id
+		);
+		if ( $should_update ) {
+			foreach ( $items as $item ) {
+				if ( $item->db_id === $this->post_id ) {
+					foreach ( get_object_vars( $this->value_as_wp_post_nav_menu_item() ) as $key => $value ) {
+						$item->$key = $value;
+					}
+					$mutated = true;
+				}
+			}
+
+			// Not found so we have to append it..
+			if ( ! $mutated ) {
+				$items[] = $this->value_as_wp_post_nav_menu_item();
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Re-apply the tail logic also applied on $items by wp_get_nav_menu_items().
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @static
+	 *
+	 * @see wp_get_nav_menu_items()
+	 *
+	 * @param array  $items An array of menu item post objects.
+	 * @param object $menu  The menu object.
+	 * @param array  $args  An array of arguments used to retrieve menu item objects.
+	 * @return array Array of menu items,
+	 */
+	public static function sort_wp_get_nav_menu_items( $items, $menu, $args ) {
+		// @todo We should probably re-apply some constraints imposed by $args.
+		unset( $args['include'] );
+
+		// Remove invalid items only in frontend.
+		if ( ! is_admin() ) {
+			$items = array_filter( $items, '_is_valid_nav_menu_item' );
+		}
+
+		if ( ARRAY_A === $args['output'] ) {
+			$GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
+			usort( $items, '_sort_nav_menu_items' );
+			$i = 1;
+
+			foreach ( $items as $k => $item ) {
+				$items[ $k ]->{$args['output_key']} = $i++;
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get the value emulated into a WP_Post and set up as a nav_menu_item.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @return WP_Post With wp_setup_nav_menu_item() applied.
+	 */
+	public function value_as_wp_post_nav_menu_item() {
+		$item = (object) $this->value();
+		unset( $item->nav_menu_term_id );
+
+		$item->post_status = $item->status;
+		unset( $item->status );
+
+		$item->post_type = 'nav_menu_item';
+		$item->menu_order = $item->position;
+		unset( $item->position );
+
+		if ( $item->title ) {
+			$item->post_title = $item->title;
+		}
+
+		$item->ID = $this->post_id;
+		$item->db_id = $this->post_id;
+		$post = new WP_Post( (object) $item );
+
+		if ( empty( $post->post_author ) ) {
+			$post->post_author = get_current_user_id();
+		}
+
+		if ( ! isset( $post->type_label ) ) {
+			if ( 'post_type' === $post->type ) {
+				$object = get_post_type_object( $post->object );
+				if ( $object ) {
+					$post->type_label = $object->labels->singular_name;
+				} else {
+					$post->type_label = $post->object;
+				}
+			} elseif ( 'taxonomy' == $post->type ) {
+				$object = get_taxonomy( $post->object );
+				if ( $object ) {
+					$post->type_label = $object->labels->singular_name;
+				} else {
+					$post->type_label = $post->object;
+				}
+			} else {
+				$post->type_label = __( 'Custom Link' );
+			}
+		}
+
+		return $post;
+	}
+
+	/**
+	 * Sanitize an input.
+	 *
+	 * Note that parent::sanitize() erroneously does wp_unslash() on $value, but
+	 * we remove that in this override.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $menu_item_value The value to sanitize.
+	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
+	 *                          Otherwise the sanitized value.
+	 */
+	public function sanitize( $menu_item_value ) {
+		// Menu is marked for deletion.
+		if ( false === $menu_item_value ) {
+			return $menu_item_value;
+		}
+
+		// Invalid.
+		if ( ! is_array( $menu_item_value ) ) {
+			return null;
+		}
+
+		$default = array(
+			'object_id'        => 0,
+			'object'           => '',
+			'menu_item_parent' => 0,
+			'position'         => 0,
+			'type'             => 'custom',
+			'title'            => '',
+			'url'              => '',
+			'target'           => '',
+			'attr_title'       => '',
+			'description'      => '',
+			'classes'          => '',
+			'xfn'              => '',
+			'status'           => 'publish',
+			'original_title'   => '',
+			'nav_menu_term_id' => 0,
+		);
+		$menu_item_value = array_merge( $default, $menu_item_value );
+		$menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
+		$menu_item_value['position'] = max( 0, intval( $menu_item_value['position'] ) );
+
+		foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
+			// Note we need to allow negative-integer IDs for previewed objects not inserted yet.
+			$menu_item_value[ $key ] = intval( $menu_item_value[ $key ] );
+		}
+
+		foreach ( array( 'type', 'object', 'target' ) as $key ) {
+			$menu_item_value[ $key ] = sanitize_key( $menu_item_value[ $key ] );
+		}
+
+		foreach ( array( 'xfn', 'classes' ) as $key ) {
+			$value = $menu_item_value[ $key ];
+			if ( ! is_array( $value ) ) {
+				$value = explode( ' ', $value );
+			}
+			$menu_item_value[ $key ] = implode( ' ', array_map( 'sanitize_html_class', $value ) );
+		}
+
+		foreach ( array( 'title', 'attr_title', 'description', 'original_title' ) as $key ) {
+			// @todo Should esc_attr() the attr_title as well?
+			$menu_item_value[ $key ] = sanitize_text_field( $menu_item_value[ $key ] );
+		}
+
+		$menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
+		if ( ! get_post_status_object( $menu_item_value['status'] ) ) {
+			$menu_item_value['status'] = 'publish';
+		}
+
+		/** This filter is documented in wp-includes/class-wp-customize-setting.php */
+		return apply_filters( "customize_sanitize_{$this->id}", $menu_item_value, $this );
+	}
+
+	/**
+	 * Create/update the nav_menu_item post for this setting.
+	 *
+	 * Any created menu items will have their assigned post IDs exported to the client
+	 * via the customize_save_response filter. Likewise, any errors will be exported
+	 * to the client via the customize_save_response() filter.
+	 *
+	 * To delete a menu, the client can send false as the value.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see wp_update_nav_menu_item()
+	 *
+	 * @param array|false $value The menu item array to update. If false, then the menu item will be deleted
+	 *                           entirely. See WP_Customize_Nav_Menu_Item_Setting::$default for what the value
+	 *                           should consist of.
+	 * @return null|void
+	 */
+	protected function update( $value ) {
+		if ( $this->is_updated ) {
+			return;
+		}
+
+		$this->is_updated = true;
+		$is_placeholder   = ( $this->post_id < 0 );
+		$is_delete        = ( false === $value );
+
+		// Update the cached value.
+		$this->value = $value;
+
+		add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+
+		if ( $is_delete ) {
+			// If the current setting post is a placeholder, a delete request is a no-op.
+			if ( $is_placeholder ) {
+				$this->update_status = 'deleted';
+			} else {
+				$r = wp_delete_post( $this->post_id, true );
+
+				if ( false === $r ) {
+					$this->update_error  = new WP_Error( 'delete_failure' );
+					$this->update_status = 'error';
+				} else {
+					$this->update_status = 'deleted';
+				}
+				// @todo send back the IDs for all associated nav menu items deleted, so these settings (and controls) can be removed from Customizer?
+			}
+		} else {
+
+			// Handle saving menu items for menus that are being newly-created.
+			if ( $value['nav_menu_term_id'] < 0 ) {
+				$nav_menu_setting_id = sprintf( 'nav_menu[%s]', $value['nav_menu_term_id'] );
+				$nav_menu_setting    = $this->manager->get_setting( $nav_menu_setting_id );
+
+				if ( ! $nav_menu_setting || ! ( $nav_menu_setting instanceof WP_Customize_Nav_Menu_Setting ) ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'unexpected_nav_menu_setting' );
+					return;
+				}
+
+				if ( false === $nav_menu_setting->save() ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'nav_menu_setting_failure' );
+					return;
+				}
+
+				if ( $nav_menu_setting->previous_term_id !== intval( $value['nav_menu_term_id'] ) ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'unexpected_previous_term_id' );
+					return;
+				}
+
+				$value['nav_menu_term_id'] = $nav_menu_setting->term_id;
+			}
+
+			// Handle saving a nav menu item that is a child of a nav menu item being newly-created.
+			if ( $value['menu_item_parent'] < 0 ) {
+				$parent_nav_menu_item_setting_id = sprintf( 'nav_menu_item[%s]', $value['menu_item_parent'] );
+				$parent_nav_menu_item_setting    = $this->manager->get_setting( $parent_nav_menu_item_setting_id );
+
+				if ( ! $parent_nav_menu_item_setting || ! ( $parent_nav_menu_item_setting instanceof WP_Customize_Nav_Menu_Item_Setting ) ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'unexpected_nav_menu_item_setting' );
+					return;
+				}
+
+				if ( false === $parent_nav_menu_item_setting->save() ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'nav_menu_item_setting_failure' );
+					return;
+				}
+
+				if ( $parent_nav_menu_item_setting->previous_post_id !== intval( $value['menu_item_parent'] ) ) {
+					$this->update_status = 'error';
+					$this->update_error  = new WP_Error( 'unexpected_previous_post_id' );
+					return;
+				}
+
+				$value['menu_item_parent'] = $parent_nav_menu_item_setting->post_id;
+			}
+
+			// Insert or update menu.
+			$menu_item_data = array(
+				'menu-item-object-id'   => $value['object_id'],
+				'menu-item-object'      => $value['object'],
+				'menu-item-parent-id'   => $value['menu_item_parent'],
+				'menu-item-position'    => $value['position'],
+				'menu-item-type'        => $value['type'],
+				'menu-item-title'       => $value['title'],
+				'menu-item-url'         => $value['url'],
+				'menu-item-description' => $value['description'],
+				'menu-item-attr-title'  => $value['attr_title'],
+				'menu-item-target'      => $value['target'],
+				'menu-item-classes'     => $value['classes'],
+				'menu-item-xfn'         => $value['xfn'],
+				'menu-item-status'      => $value['status'],
+			);
+
+			$r = wp_update_nav_menu_item(
+				$value['nav_menu_term_id'],
+				$is_placeholder ? 0 : $this->post_id,
+				$menu_item_data
+			);
+
+			if ( is_wp_error( $r ) ) {
+				$this->update_status = 'error';
+				$this->update_error = $r;
+			} else {
+				if ( $is_placeholder ) {
+					$this->previous_post_id = $this->post_id;
+					$this->post_id = $r;
+					$this->update_status = 'inserted';
+				} else {
+					$this->update_status = 'updated';
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Export data for the JS client.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
+	 *
+	 * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
+	 * @return array Save response data.
+	 */
+	public function amend_customize_save_response( $data ) {
+		if ( ! isset( $data['nav_menu_item_updates'] ) ) {
+			$data['nav_menu_item_updates'] = array();
+		}
+
+		$data['nav_menu_item_updates'][] = array(
+			'post_id'          => $this->post_id,
+			'previous_post_id' => $this->previous_post_id,
+			'error'            => $this->update_error ? $this->update_error->get_error_code() : null,
+			'status'           => $this->update_status,
+		);
+		return $data;
+	}
+}
+
+/**
+ * Customize Setting to represent a nav_menu.
+ *
+ * Subclass of WP_Customize_Setting to represent a nav_menu taxonomy term, and
+ * the IDs for the nav_menu_items associated with the nav menu.
+ *
+ * @since 4.3.0
+ *
+ * @see wp_get_nav_menu_object()
+ * @see WP_Customize_Setting
+ */
+class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
+
+	const ID_PATTERN = '/^nav_menu\[(?P-?\d+)\]$/';
+
+	const TAXONOMY = 'nav_menu';
+
+	const TYPE = 'nav_menu';
+
+	/**
+	 * Setting type.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = self::TYPE;
+
+	/**
+	 * Default setting value.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var array
+	 *
+	 * @see wp_get_nav_menu_object()
+	 */
+	public $default = array(
+		'name'        => '',
+		'description' => '',
+		'parent'      => 0,
+		'auto_add'    => false,
+	);
+
+	/**
+	 * Default transport.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string
+	 */
+	public $transport = 'postMessage';
+
+	/**
+	 * The term ID represented by this setting instance.
+	 *
+	 * A negative value represents a placeholder ID for a new menu not yet saved.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 */
+	public $term_id;
+
+	/**
+	 * Previous (placeholder) term ID used before creating a new menu.
+	 *
+	 * This value will be exported to JS via the customize_save_response filter
+	 * so that JavaScript can update the settings to refer to the newly-assigned
+	 * term ID. This value is always negative to indicate it does not refer to
+	 * a real term.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var int
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+	 */
+	public $previous_term_id;
+
+	/**
+	 * Whether or not preview() was called.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var bool
+	 */
+	protected $is_previewed = false;
+
+	/**
+	 * Whether or not update() was called.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var bool
+	 */
+	protected $is_updated = false;
+
+	/**
+	 * Status for calling the update method, used in customize_save_response filter.
+	 *
+	 * When status is inserted, the placeholder term ID is stored in $previous_term_id.
+	 * When status is error, the error is stored in $update_error.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var string updated|inserted|deleted|error
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+	 */
+	public $update_status;
+
+	/**
+	 * Any error object returned by wp_update_nav_menu_object() when setting is updated.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 * @var WP_Error
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::update()
+	 * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+	 */
+	public $update_error;
+
+	/**
+	 * Constructor.
+	 *
+	 * Any supplied $args override class property defaults.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param WP_Customize_Manager $manager Bootstrap Customizer instance.
+	 * @param string               $id      An specific ID of the setting. Can be a
+	 *                                      theme mod or option name.
+	 * @param array                $args    Optional. Setting arguments.
+	 *
+	 * @throws Exception If $id is not valid for this setting type.
+	 */
+	public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
+		if ( empty( $manager->nav_menus ) ) {
+			throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+		}
+
+		if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
+			throw new Exception( "Illegal widget setting ID: $id" );
+		}
+
+		$this->term_id = intval( $matches['id'] );
+
+		parent::__construct( $manager, $id, $args );
+	}
+
+	/**
+	 * Get the instance data for a given widget setting.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_get_nav_menu_object()
+	 *
+	 * @return array Instance data.
+	 */
+	public function value() {
+		if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+			$undefined  = new stdClass(); // Symbol.
+			$post_value = $this->post_value( $undefined );
+
+			if ( $undefined === $post_value ) {
+				$value = $this->_original_value;
+			} else {
+				$value = $post_value;
+			}
+		} else {
+			$value = false;
+
+			// Note that a term_id of less than one indicates a nav_menu not yet inserted.
+			if ( $this->term_id > 0 ) {
+				$term = wp_get_nav_menu_object( $this->term_id );
+
+				if ( $term ) {
+					$value = wp_array_slice_assoc( (array) $term, array_keys( $this->default ) );
+
+					$nav_menu_options  = (array) get_option( 'nav_menu_options', array() );
+					$value['auto_add'] = false;
+
+					if ( isset( $nav_menu_options['auto_add'] ) && is_array( $nav_menu_options['auto_add'] ) ) {
+						$value['auto_add'] = in_array( $term->term_id, $nav_menu_options['auto_add'] );
+					}
+				}
+			}
+
+			if ( ! is_array( $value ) ) {
+				$value = $this->default;
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Handle previewing the setting.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Manager::post_value()
+	 */
+	public function preview() {
+		if ( $this->is_previewed ) {
+			return;
+		}
+
+		$this->is_previewed       = true;
+		$this->_original_value    = $this->value();
+		$this->_previewed_blog_id = get_current_blog_id();
+
+		add_filter( 'wp_get_nav_menus', array( $this, 'filter_wp_get_nav_menus' ), 10, 2 );
+		add_filter( 'wp_get_nav_menu_object', array( $this, 'filter_wp_get_nav_menu_object' ), 10, 2 );
+		add_filter( 'default_option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
+		add_filter( 'option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
+	}
+
+	/**
+	 * Filter the wp_get_nav_menus() result to ensure the inserted menu object is included, and the deleted one is removed.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_get_nav_menus()
+	 *
+	 * @param array $menus An array of menu objects.
+	 * @param array $args  An array of arguments used to retrieve menu objects.
+	 * @return array
+	 */
+	public function filter_wp_get_nav_menus( $menus, $args ) {
+		if ( get_current_blog_id() !== $this->_previewed_blog_id ) {
+			return $menus;
+		}
+
+		$setting_value = $this->value();
+		$is_delete = ( false === $setting_value );
+		$index = -1;
+
+		// Find the existing menu item's position in the list.
+		foreach ( $menus as $i => $menu ) {
+			if ( (int) $this->term_id === (int) $menu->term_id || (int) $this->previous_term_id === (int) $menu->term_id ) {
+				$index = $i;
+				break;
+			}
+		}
+
+		if ( $is_delete ) {
+			// Handle deleted menu by removing it from the list.
+			if ( -1 !== $index ) {
+				array_splice( $menus, $index, 1 );
+			}
+		} else {
+			// Handle menus being updated or inserted.
+			$menu_obj = (object) array_merge( array(
+				'term_id'          => $this->term_id,
+				'term_taxonomy_id' => $this->term_id,
+				'slug'             => sanitize_title( $setting_value['name'] ),
+				'count'            => 0,
+				'term_group'       => 0,
+				'taxonomy'         => self::TAXONOMY,
+				'filter'           => 'raw',
+			), $setting_value );
+
+			array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
+		}
+
+		// Make sure the menu objects get re-sorted after an update/insert.
+		if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
+			$this->_current_menus_sort_orderby = $args['orderby'];
+			usort( $menus, array( $this, '_sort_menus_by_orderby' ) );
+		}
+		// @todo add support for $args['hide_empty'] === true
+
+		return $menus;
+	}
+
+	/**
+	 * Temporary non-closure passing of orderby value to function.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @var string
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus()
+	 * @see WP_Customize_Nav_Menu_Setting::_sort_menus_by_orderby()
+	 */
+	protected $_current_menus_sort_orderby;
+
+	/**
+	 * Sort menu objects by the class-supplied orderby property.
+	 *
+	 * This is a workaround for a lack of closures.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 * @param object $menu1
+	 * @param object $menu2
+	 * @return int
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus()
+	 */
+	protected function _sort_menus_by_orderby( $menu1, $menu2 ) {
+		$key = $this->_current_menus_sort_orderby;
+		return strcmp( $menu1->$key, $menu2->$key );
+	}
+
+	/**
+	 * Filter the wp_get_nav_menu_object() result to supply the previewed menu object.
+	 *
+	 * Requesting a nav_menu object by anything but ID is not supported.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see wp_get_nav_menu_object()
+	 *
+	 * @param object|null $menu_obj Object returned by wp_get_nav_menu_object().
+	 * @param string      $menu_id  ID of the nav_menu term. Requests by slug or name will be ignored.
+	 * @return object|null
+	 */
+	public function filter_wp_get_nav_menu_object( $menu_obj, $menu_id ) {
+		$ok = (
+			get_current_blog_id() === $this->_previewed_blog_id
+			&&
+			is_int( $menu_id )
+			&&
+			$menu_id === $this->term_id
+		);
+		if ( ! $ok ) {
+			return $menu_obj;
+		}
+
+		$setting_value = $this->value();
+
+		// Handle deleted menus.
+		if ( false === $setting_value ) {
+			return false;
+		}
+
+		// Handle sanitization failure by preventing short-circuiting.
+		if ( null === $setting_value ) {
+			return $menu_obj;
+		}
+
+		$menu_obj = (object) array_merge( array(
+				'term_id'          => $this->term_id,
+				'term_taxonomy_id' => $this->term_id,
+				'slug'             => sanitize_title( $setting_value['name'] ),
+				'count'            => 0,
+				'term_group'       => 0,
+				'taxonomy'         => self::TAXONOMY,
+				'filter'           => 'raw',
+			), $setting_value );
+
+		return $menu_obj;
+	}
+
+	/**
+	 * Filter the nav_menu_options option to include this menu's auto_add preference.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $nav_menu_options Nav menu options including auto_add.
+	 * @return array (Kaybe) modified nav menu options.
+	 */
+	public function filter_nav_menu_options( $nav_menu_options ) {
+		if ( $this->_previewed_blog_id !== get_current_blog_id() ) {
+			return $nav_menu_options;
+		}
+
+		$menu = $this->value();
+		$nav_menu_options = $this->filter_nav_menu_options_value(
+			$nav_menu_options,
+			$this->term_id,
+			false === $menu ? false : $menu['auto_add']
+		);
+
+		return $nav_menu_options;
+	}
+
+	/**
+	 * Sanitize an input.
+	 *
+	 * Note that parent::sanitize() erroneously does wp_unslash() on $value, but
+	 * we remove that in this override.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @param array $value The value to sanitize.
+	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
+	 *                          Otherwise the sanitized value.
+	 */
+	public function sanitize( $value ) {
+		// Menu is marked for deletion.
+		if ( false === $value ) {
+			return $value;
+		}
+
+		// Invalid.
+		if ( ! is_array( $value ) ) {
+			return null;
+		}
+
+		$default = array(
+			'name'        => '',
+			'description' => '',
+			'parent'      => 0,
+			'auto_add'    => false,
+		);
+		$value = array_merge( $default, $value );
+		$value = wp_array_slice_assoc( $value, array_keys( $default ) );
+
+		$value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
+		$value['description'] = sanitize_text_field( $value['description'] );
+		$value['parent']      = max( 0, intval( $value['parent'] ) );
+		$value['auto_add']    = ! empty( $value['auto_add'] );
+
+		if ( '' === $value['name'] ) {
+			$value['name'] = _x( '(unnamed)', 'Missing menu name.' );
+		}
+
+		/** This filter is documented in wp-includes/class-wp-customize-setting.php */
+		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+	}
+
+	/**
+	 * Storage for data to be sent back to client in customize_save_response filter.
+	 *
+	 * @access protected
+	 * @since 4.3.0
+	 * @var array
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+	 */
+	protected $_widget_nav_menu_updates = array();
+
+	/**
+	 * Create/update the nav_menu term for this setting.
+	 *
+	 * Any created menus will have their assigned term IDs exported to the client
+	 * via the customize_save_response filter. Likewise, any errors will be exported
+	 * to the client via the customize_save_response() filter.
+	 *
+	 * To delete a menu, the client can send false as the value.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see wp_update_nav_menu_object()
+	 *
+	 * @param array|false $value {
+	 *     The value to update. Note that slug cannot be updated via wp_update_nav_menu_object().
+	 *     If false, then the menu will be deleted entirely.
+	 *
+	 *     @type string $name        The name of the menu to save.
+	 *     @type string $description The term description. Default empty string.
+	 *     @type int    $parent      The id of the parent term. Default 0.
+	 *     @type bool   $auto_add    Whether pages will auto_add to this menu. Default false.
+	 * }
+	 * @return null|void
+	 */
+	protected function update( $value ) {
+		if ( $this->is_updated ) {
+			return;
+		}
+
+		$this->is_updated = true;
+		$is_placeholder   = ( $this->term_id < 0 );
+		$is_delete        = ( false === $value );
+
+		add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+
+		$auto_add = null;
+		if ( $is_delete ) {
+			// If the current setting term is a placeholder, a delete request is a no-op.
+			if ( $is_placeholder ) {
+				$this->update_status = 'deleted';
+			} else {
+				$r = wp_delete_nav_menu( $this->term_id );
+
+				if ( is_wp_error( $r ) ) {
+					$this->update_status = 'error';
+					$this->update_error  = $r;
+				} else {
+					$this->update_status = 'deleted';
+					$auto_add = false;
+				}
+			}
+		} else {
+			// Insert or update menu.
+			$menu_data = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
+			$menu_data['menu-name'] = $value['name'];
+
+			$menu_id = $is_placeholder ? 0 : $this->term_id;
+			$r = wp_update_nav_menu_object( $menu_id, $menu_data );
+			$original_name = $menu_data['menu-name'];
+			$name_conflict_suffix = 1;
+			while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
+				$name_conflict_suffix += 1;
+				/* translators: 1: original menu name, 2: duplicate count */
+				$menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
+				$r = wp_update_nav_menu_object( $menu_id, $menu_data );
+			}
+
+			if ( is_wp_error( $r ) ) {
+				$this->update_status = 'error';
+				$this->update_error  = $r;
+			} else {
+				if ( $is_placeholder ) {
+					$this->previous_term_id = $this->term_id;
+					$this->term_id          = $r;
+					$this->update_status    = 'inserted';
+				} else {
+					$this->update_status = 'updated';
+				}
+
+				$auto_add = $value['auto_add'];
+			}
+		}
+
+		if ( null !== $auto_add ) {
+			$nav_menu_options = $this->filter_nav_menu_options_value(
+				(array) get_option( 'nav_menu_options', array() ),
+				$this->term_id,
+				$auto_add
+			);
+			update_option( 'nav_menu_options', $nav_menu_options );
+		}
+
+		if ( 'inserted' === $this->update_status ) {
+			// Make sure that new menus assigned to nav menu locations use their new IDs.
+			foreach ( $this->manager->settings() as $setting ) {
+				if ( ! preg_match( '/^nav_menu_locations\[/', $setting->id ) ) {
+					continue;
+				}
+
+				$post_value = $setting->post_value( null );
+				if ( ! is_null( $post_value ) && $this->previous_term_id === intval( $post_value ) ) {
+					$this->manager->set_post_value( $setting->id, $this->term_id );
+					$setting->save();
+				}
+			}
+
+			// Make sure that any nav_menu widgets referencing the placeholder nav menu get updated and sent back to client.
+			foreach ( array_keys( $this->manager->unsanitized_post_values() ) as $setting_id ) {
+				$nav_menu_widget_setting = $this->manager->get_setting( $setting_id );
+				if ( ! $nav_menu_widget_setting || ! preg_match( '/^widget_nav_menu\[/', $nav_menu_widget_setting->id ) ) {
+					continue;
+				}
+
+				$widget_instance = $nav_menu_widget_setting->post_value(); // Note that this calls WP_Customize_Widgets::sanitize_widget_instance().
+				if ( empty( $widget_instance['nav_menu'] ) || intval( $widget_instance['nav_menu'] ) !== $this->previous_term_id ) {
+					continue;
+				}
+
+				$widget_instance['nav_menu'] = $this->term_id;
+				$updated_widget_instance = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
+				$this->manager->set_post_value( $nav_menu_widget_setting->id, $updated_widget_instance );
+				$nav_menu_widget_setting->save();
+
+				$this->_widget_nav_menu_updates[ $nav_menu_widget_setting->id ] = $updated_widget_instance;
+			}
+		}
+	}
+
+	/**
+	 * Updates a nav_menu_options array.
+	 *
+	 * @since 4.3.0
+	 * @access protected
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::filter_nav_menu_options()
+	 * @see WP_Customize_Nav_Menu_Setting::update()
+	 *
+	 * @param array $nav_menu_options Array as returned by get_option( 'nav_menu_options' ).
+	 * @param int   $menu_id          The term ID for the given menu.
+	 * @param bool  $auto_add         Whether to auto-add or not.
+	 * @return array (Maybe) modified nav_menu_otions array.
+	 */
+	protected function filter_nav_menu_options_value( $nav_menu_options, $menu_id, $auto_add ) {
+		$nav_menu_options = (array) $nav_menu_options;
+		if ( ! isset( $nav_menu_options['auto_add'] ) ) {
+			$nav_menu_options['auto_add'] = array();
+		}
+
+		$i = array_search( $menu_id, $nav_menu_options['auto_add'] );
+		if ( $auto_add && false === $i ) {
+			array_push( $nav_menu_options['auto_add'], $this->term_id );
+		} elseif ( ! $auto_add && false !== $i ) {
+			array_splice( $nav_menu_options['auto_add'], $i, 1 );
+		}
+
+		return $nav_menu_options;
+	}
+
+	/**
+	 * Export data for the JS client.
+	 *
+	 * @since 4.3.0
+	 * @access public
+	 *
+	 * @see WP_Customize_Nav_Menu_Setting::update()
+	 *
+	 * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
+	 * @return array Export data.
+	 */
+	public function amend_customize_save_response( $data ) {
+		if ( ! isset( $data['nav_menu_updates'] ) ) {
+			$data['nav_menu_updates'] = array();
+		}
+		if ( ! isset( $data['widget_nav_menu_updates'] ) ) {
+			$data['widget_nav_menu_updates'] = array();
+		}
+
+		$data['nav_menu_updates'][] = array(
+			'term_id'          => $this->term_id,
+			'previous_term_id' => $this->previous_term_id,
+			'error'            => $this->update_error ? $this->update_error->get_error_code() : null,
+			'status'           => $this->update_status,
+			'saved_value'      => 'deleted' === $this->update_status ? null : $this->value(),
+		);
+
+		$data['widget_nav_menu_updates'] = array_merge(
+			$data['widget_nav_menu_updates'],
+			$this->_widget_nav_menu_updates
+		);
+		$this->_widget_nav_menu_updates = array();
+
+		return $data;
+	}
+}
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-customize-widgets.php b/pavillonmadeleine.fr/wp-includes/class-wp-customize-widgets.php
index 728bb5f0..31781c8f 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-customize-widgets.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-customize-widgets.php
@@ -108,14 +108,36 @@ final class WP_Customize_Widgets {
 	 * @since 4.2.0
 	 * @access protected
 	 *
+<<<<<<< .mine
+	 * @staticvar array $cache
+	 *
+	 * @param $setting_id Setting ID.
+	 * @return string|void Setting type.
+||||||| .r11156
+	 * @param string $name    Post value.
+	 * @param mixed  $default Default post value.
+	 * @return mixed Unslashed post value or default value.
+=======
 	 * @param $setting_id Setting ID.
 	 * @return string|null Setting type. Null otherwise.
+>>>>>>> .r12027
 	 */
 	protected function get_setting_type( $setting_id ) {
 		static $cache = array();
 		if ( isset( $cache[ $setting_id ] ) ) {
 			return $cache[ $setting_id ];
 		}
+<<<<<<< .mine
+		foreach ( $this->setting_id_patterns as $type => $pattern ) {
+			if ( preg_match( $pattern, $setting_id ) ) {
+				$cache[ $setting_id ] = $type;
+				return $type;
+			}
+		}
+||||||| .r11156
+
+		return wp_unslash( $_POST[$name] );
+=======
 		foreach ( $this->setting_id_patterns as $type => $pattern ) {
 			if ( preg_match( $pattern, $setting_id ) ) {
 				$cache[ $setting_id ] = $type;
@@ -123,6 +145,7 @@ final class WP_Customize_Widgets {
 			}
 		}
 		return null;
+>>>>>>> .r12027
 	}
 
 	/**
@@ -204,6 +227,9 @@ final class WP_Customize_Widgets {
 	 *
 	 * @since 3.9.0
 	 * @access public
+	 *
+	 * @global array $sidebars_widgets
+	 * @global array $_wp_sidebars_widgets
 	 */
 	public function override_sidebars_widgets_for_theme_switch() {
 		global $sidebars_widgets;
@@ -219,7 +245,13 @@ final class WP_Customize_Widgets {
 		$sidebars_widgets = $this->old_sidebars_widgets;
 		$sidebars_widgets = retrieve_widgets( 'customize' );
 		add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
+<<<<<<< .mine
+		// reset global cache var used by wp_get_sidebars_widgets()
+		unset( $GLOBALS['_wp_sidebars_widgets'] );
+||||||| .r11156
+=======
 		unset( $GLOBALS['_wp_sidebars_widgets'] ); // reset global cache var used by wp_get_sidebars_widgets()
+>>>>>>> .r12027
 	}
 
 	/**
@@ -235,7 +267,14 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+<<<<<<< .mine
 	 * @param array $old_sidebars_widgets
+	 * @return array
+||||||| .r11156
+	 * @param array $sidebars_widgets
+=======
+	 * @param array $old_sidebars_widgets
+>>>>>>> .r12027
 	 */
 	public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_widgets ) {
 		return $this->old_sidebars_widgets;
@@ -252,7 +291,10 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $sidebars_widgets
+	 *
 	 * @param array $sidebars_widgets
+	 * @return array
 	 */
 	public function filter_option_sidebars_widgets_for_theme_switch( $sidebars_widgets ) {
 		$sidebars_widgets = $GLOBALS['sidebars_widgets'];
@@ -302,13 +344,17 @@ final class WP_Customize_Widgets {
 	 *
 	 * @since 3.9.0
 	 * @access public
+	 *
+	 * @global array $wp_registered_widgets
+	 * @global array $wp_registered_widget_controls
+	 * @global array $wp_registered_sidebars
 	 */
 	public function customize_register() {
 		global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_sidebars;
 
 		$sidebars_widgets = array_merge(
 			array( 'wp_inactive_widgets' => array() ),
-			array_fill_keys( array_keys( $GLOBALS['wp_registered_sidebars'] ), array() ),
+			array_fill_keys( array_keys( $wp_registered_sidebars ), array() ),
 			wp_get_sidebars_widgets()
 		);
 
@@ -352,7 +398,7 @@ final class WP_Customize_Widgets {
 				$sidebar_widget_ids = array();
 			}
 
-			$is_registered_sidebar = isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] );
+			$is_registered_sidebar = isset( $wp_registered_sidebars[ $sidebar_id ] );
 			$is_inactive_widgets   = ( 'wp_inactive_widgets' === $sidebar_id );
 			$is_active_sidebar     = ( $is_registered_sidebar && ! $is_inactive_widgets );
 
@@ -373,8 +419,8 @@ final class WP_Customize_Widgets {
 				if ( $is_active_sidebar ) {
 
 					$section_args = array(
-						'title' => $GLOBALS['wp_registered_sidebars'][ $sidebar_id ]['name'],
-						'description' => $GLOBALS['wp_registered_sidebars'][ $sidebar_id ]['description'],
+						'title' => $wp_registered_sidebars[ $sidebar_id ]['name'],
+						'description' => $wp_registered_sidebars[ $sidebar_id ]['description'],
 						'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
 						'panel' => 'widgets',
 						'sidebar_id' => $sidebar_id,
@@ -409,13 +455,13 @@ final class WP_Customize_Widgets {
 			foreach ( $sidebar_widget_ids as $i => $widget_id ) {
 
 				// Skip widgets that may have gone away due to a plugin being deactivated.
-				if ( ! $is_active_sidebar || ! isset( $GLOBALS['wp_registered_widgets'][$widget_id] ) ) {
+				if ( ! $is_active_sidebar || ! isset( $wp_registered_widgets[$widget_id] ) ) {
 					continue;
 				}
 
-				$registered_widget = $GLOBALS['wp_registered_widgets'][$widget_id];
+				$registered_widget = $wp_registered_widgets[$widget_id];
 				$setting_id        = $this->get_setting_id( $widget_id );
-				$id_base           = $GLOBALS['wp_registered_widget_controls'][$widget_id]['id_base'];
+				$id_base           = $wp_registered_widget_controls[$widget_id]['id_base'];
 
 				$control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array(
 					'label'          => $registered_widget['name'],
@@ -473,6 +519,8 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global $wp_registered_widget_controls
+	 *
 	 * @param string $widget_id Widget ID.
 	 * @return bool Whether or not the widget is a "wide" widget.
 	 */
@@ -576,8 +624,14 @@ final class WP_Customize_Widgets {
 	 *
 	 * @since 3.9.0
 	 * @access public
+	 *
+	 * @global WP_Scripts $wp_scripts
+	 * @global array $wp_registered_sidebars
+	 * @global array $wp_registered_widgets
 	 */
 	public function enqueue_scripts() {
+		global $wp_scripts, $wp_registered_sidebars, $wp_registered_widgets;
+
 		wp_enqueue_style( 'customize-widgets' );
 		wp_enqueue_script( 'customize-widgets' );
 
@@ -621,12 +675,10 @@ final class WP_Customize_Widgets {
 			'
 		);
 
-		global $wp_scripts;
-
 		$settings = array(
 			'nonce'                => wp_create_nonce( 'update-widget' ),
-			'registeredSidebars'   => array_values( $GLOBALS['wp_registered_sidebars'] ),
-			'registeredWidgets'    => $GLOBALS['wp_registered_widgets'],
+			'registeredSidebars'   => array_values( $wp_registered_sidebars ),
+			'registeredWidgets'    => $wp_registered_widgets,
 			'availableWidgets'     => $available_widgets, // @todo Merge this with registered_widgets
 			'l10n' => array(
 				'saveBtnLabel'     => __( 'Apply' ),
@@ -664,6 +716,18 @@ final class WP_Customize_Widgets {
 		?>
 		
 		
+			
+				
+				
+					manager->get_panel( 'widgets' )->title ) );
+					?>
+					
+				
+			
 			
 				
 				
@@ -712,6 +776,18 @@ final class WP_Customize_Widgets {
 			'transport'  => 'refresh',
 			'default'    => array(),
 		);
+<<<<<<< .mine
+
+		if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
+			$args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
+			$args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
+		} elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
+			$args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
+			$args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
+		}
+
+||||||| .r11156
+=======
 
 		if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
 			$args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
@@ -721,6 +797,7 @@ final class WP_Customize_Widgets {
 			$args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
 		}
 
+>>>>>>> .r12027
 		$args = array_merge( $args, $overrides );
 
 		/**
@@ -762,6 +839,10 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $wp_registered_widgets
+	 * @global array $wp_registered_widget_controls
+	 * @staticvar array $available_widgets
+	 *
 	 * @see wp_list_widgets()
 	 *
 	 * @return array List of available widgets.
@@ -843,7 +924,6 @@ final class WP_Customize_Widgets {
 	 * Naturally order available widgets by name.
 	 *
 	 * @since 3.9.0
-	 * @static
 	 * @access protected
 	 *
 	 * @param array $widget_a The first widget to compare.
@@ -918,6 +998,7 @@ final class WP_Customize_Widgets {
 	 * @access public
 	 *
 	 * @param array $sidebars_widgets List of widgets for the current sidebar.
+	 * @return array
 	 */
 	public function preview_sidebars_widgets( $sidebars_widgets ) {
 		$sidebars_widgets = get_option( 'sidebars_widgets' );
@@ -965,15 +1046,26 @@ final class WP_Customize_Widgets {
 	 *
 	 * @since 3.9.0
 	 * @access public
+     *
+	 * @global array $wp_registered_sidebars
+	 * @global array $wp_registered_widgets
 	 */
 	public function export_preview_data() {
+<<<<<<< .mine
+		global $wp_registered_sidebars, $wp_registered_widgets;
+		// Prepare Customizer settings to pass to JavaScript.
+||||||| .r11156
+
+		// Prepare customizer settings to pass to Javascript.
+=======
 
 		// Prepare Customizer settings to pass to JavaScript.
+>>>>>>> .r12027
 		$settings = array(
 			'renderedSidebars'   => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
 			'renderedWidgets'    => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
-			'registeredSidebars' => array_values( $GLOBALS['wp_registered_sidebars'] ),
-			'registeredWidgets'  => $GLOBALS['wp_registered_widgets'],
+			'registeredSidebars' => array_values( $wp_registered_sidebars ),
+			'registeredWidgets'  => $wp_registered_widgets,
 			'l10n'               => array(
 				'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
 			),
@@ -1038,8 +1130,11 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $wp_registered_sidebars
+	 *
 	 * @param bool   $is_active  Whether the sidebar is active.
 	 * @param string $sidebar_id Sidebar ID.
+	 * @return bool
 	 */
 	public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
 		if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
@@ -1063,8 +1158,11 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $wp_registered_sidebars
+	 *
 	 * @param bool   $has_widgets Whether the current sidebar has widgets.
 	 * @param string $sidebar_id  Sidebar ID.
+	 * @return bool
 	 */
 	public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
 		if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
@@ -1105,7 +1203,7 @@ final class WP_Customize_Widgets {
 	 * @access public
 	 *
 	 * @param array $value Widget instance to sanitize.
-	 * @return array Sanitized widget instance.
+	 * @return array|void Sanitized widget instance.
 	 */
 	public function sanitize_widget_instance( $value ) {
 		if ( $value === array() ) {
@@ -1116,21 +1214,29 @@ final class WP_Customize_Widgets {
 			|| empty( $value['instance_hash_key'] )
 			|| empty( $value['encoded_serialized_instance'] ) )
 		{
-			return null;
+			return;
 		}
 
 		$decoded = base64_decode( $value['encoded_serialized_instance'], true );
 		if ( false === $decoded ) {
-			return null;
+			return;
 		}
 
+<<<<<<< .mine
 		if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
+			return;
+||||||| .r11156
+		if ( $this->get_instance_hash_key( $decoded ) !== $value['instance_hash_key'] ) {
 			return null;
+=======
+		if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
+			return null;
+>>>>>>> .r12027
 		}
 
 		$instance = unserialize( $decoded );
 		if ( false === $instance ) {
-			return null;
+			return;
 		}
 
 		return $instance;
@@ -1168,6 +1274,8 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $wp_registered_widgets
+	 *
 	 * @param array $widget_ids List of widget IDs.
 	 * @return array Parsed list of widget IDs.
 	 */
@@ -1185,6 +1293,9 @@ final class WP_Customize_Widgets {
 	 * @since 3.9.0
 	 * @access public
 	 *
+	 * @global array $wp_registered_widget_updates
+	 * @global array $wp_registered_widget_controls
+	 *
 	 * @param  string $widget_id Widget ID.
 	 * @return WP_Error|array Array containing the updated widget information.
 	 *                        A WP_Error object, otherwise.
@@ -1192,6 +1303,20 @@ final class WP_Customize_Widgets {
 	public function call_widget_update( $widget_id ) {
 		global $wp_registered_widget_updates, $wp_registered_widget_controls;
 
+		$setting_id = $this->get_setting_id( $widget_id );
+
+		/*
+		 * Make sure that other setting changes have previewed since this widget
+		 * may depend on them (e.g. Menus being present for Custom Menu widget).
+		 */
+		if ( ! did_action( 'customize_preview_init' ) ) {
+			foreach ( $this->manager->settings() as $setting ) {
+				if ( $setting->id !== $setting_id ) {
+					$setting->preview();
+				}
+			}
+		}
+
 		$this->start_capturing_option_updates();
 		$parsed_id   = $this->parse_widget_id( $widget_id );
 		$option_name = 'widget_' . $parsed_id['id_base'];
@@ -1258,6 +1383,25 @@ final class WP_Customize_Widgets {
 			}
 		}
 
+<<<<<<< .mine
+		// Obtain the widget instance.
+		$option = $this->get_captured_option( $option_name );
+		if ( null !== $parsed_id['number'] ) {
+			$instance = $option[ $parsed_id['number'] ];
+		} else {
+			$instance = $option;
+		}
+
+		/*
+		 * Override the incoming $_POST['customized'] for a newly-created widget's
+		 * setting with the new $instance so that the preview filter currently
+		 * in place from WP_Customize_Setting::preview() will use this value
+		 * instead of the default widget instance value (an empty array).
+		 */
+		$this->manager->set_post_value( $setting_id, $instance );
+
+||||||| .r11156
+=======
 		// Obtain the widget instance.
 		$option = $this->get_captured_option( $option_name );
 		if ( null !== $parsed_id['number'] ) {
@@ -1275,6 +1419,7 @@ final class WP_Customize_Widgets {
 		$setting_id = $this->get_setting_id( $widget_id );
 		$this->manager->set_post_value( $setting_id, $instance );
 
+>>>>>>> .r12027
 		// Obtain the widget control with the updated instance in place.
 		ob_start();
 		$form = $wp_registered_widget_controls[ $widget_id ];
@@ -1344,7 +1489,13 @@ final class WP_Customize_Widgets {
 
 		$updated_widget = $this->call_widget_update( $widget_id ); // => {instance,form}
 		if ( is_wp_error( $updated_widget ) ) {
+<<<<<<< .mine
+			wp_send_json_error( $updated_widget->get_error_code() );
+||||||| .r11156
+			wp_send_json_error();
+=======
 			wp_send_json_error( $updated_widget->get_error_message() );
+>>>>>>> .r12027
 		}
 
 		$form = $updated_widget['form'];
@@ -1382,7 +1533,7 @@ final class WP_Customize_Widgets {
 	 * @access protected
 	 *
 	 * @param string $option_name Option name.
-	 * @return boolean Whether the option capture is ignored.
+	 * @return bool Whether the option capture is ignored.
 	 */
 	protected function is_option_capture_ignored( $option_name ) {
 		return ( 0 === strpos( $option_name, '_transient_' ) );
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-editor.php b/pavillonmadeleine.fr/wp-includes/class-wp-editor.php
index ae026215..e43489b1 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-editor.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-editor.php
@@ -25,12 +25,14 @@ final class _WP_Editors {
 	private static $has_medialib = false;
 	private static $editor_buttons_css = true;
 	private static $drag_drop_upload = false;
+	private static $old_dfw_compat = false;
 
 	private function __construct() {}
 
 	/**
 	 * Parse default arguments for the editor instance.
 	 *
+	 * @static
 	 * @param string $editor_id ID for the current editor instance.
 	 * @param array  $settings {
 	 *     Array of editor arguments.
@@ -52,8 +54,7 @@ final class _WP_Editors {
 	 *     @type string     $editor_class      Extra classes to add to the editor textarea elemen. Default empty.
 	 *     @type bool       $teeny             Whether to output the minimal editor config. Examples include
 	 *                                         Press This and the Comment editor. Default false.
-	 *     @type bool       $dfw               Whether to replace the default fullscreen with "Distraction Free
-	 *                                         Writing". DFW requires specific DOM elements and css). Default false.
+	 *     @type bool       $dfw               Deprecated in 4.1. Since 4.3 used only to enqueue wp-fullscreen-stub.js for backwards compatibility.
 	 *     @type bool|array $tinymce           Whether to load TinyMCE. Can be used to pass settings directly to
 	 *                                         TinyMCE using an array. Default true.
 	 *     @type bool|array $quicktags         Whether to load Quicktags. Can be used to pass settings directly to
@@ -110,6 +111,10 @@ final class _WP_Editors {
 		if ( self::$this_quicktags )
 			self::$has_quicktags = true;
 
+		if ( $set['dfw'] ) {
+			self::$old_dfw_compat = true;
+		}
+
 		if ( empty( $set['editor_height'] ) )
 			return $set;
 
@@ -132,76 +137,90 @@ final class _WP_Editors {
 	/**
 	 * Outputs the HTML for a single instance of the editor.
 	 *
+	 * @static
 	 * @param string $content The initial content of the editor.
 	 * @param string $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
 	 * @param array $settings See the _parse_settings() method for description.
 	 */
 	public static function editor( $content, $editor_id, $settings = array() ) {
-
 		$set = self::parse_settings( $editor_id, $settings );
-		$editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
+		$editor_class = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
 		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
-		$switch_class = 'html-active';
+		$default_editor = 'html';
 		$toolbar = $buttons = $autocomplete = '';
+		$editor_id_attr = esc_attr( $editor_id );
 
 		if ( $set['drag_drop_upload'] ) {
 			self::$drag_drop_upload = true;
 		}
 
-		if ( ! empty( $set['editor_height'] ) )
-			$height = ' style="height: ' . $set['editor_height'] . 'px"';
-		else
-			$height = ' rows="' . $set['textarea_rows'] . '"';
+		if ( ! empty( $set['editor_height'] ) ) {
+			$height = ' style="height: ' . (int) $set['editor_height'] . 'px"';
+		} else {
+			$height = ' rows="' . (int) $set['textarea_rows'] . '"';
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
+		if ( ! current_user_can( 'upload_files' ) ) {
 			$set['media_buttons'] = false;
+		}
 
-		if ( ! self::$this_quicktags && self::$this_tinymce ) {
-			$switch_class = 'tmce-active';
-			$autocomplete = ' autocomplete="off"';
-		} elseif ( self::$this_quicktags && self::$this_tinymce ) {
-			$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
+		if ( self::$this_tinymce ) {
 			$autocomplete = ' autocomplete="off"';
 
-			// 'html' is used for the "Text" editor tab.
-			if ( 'html' === $default_editor ) {
-				add_filter('the_editor_content', 'wp_htmledit_pre');
-				$switch_class = 'html-active';
+			if ( self::$this_quicktags ) {
+				$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
+				// 'html' is used for the "Text" editor tab.
+				if ( 'html' !== $default_editor ) {
+					$default_editor = 'tinymce';
+				}
+
+				$buttons .= '\n";
+				$buttons .= '\n";
 			} else {
-				add_filter('the_editor_content', 'wp_richedit_pre');
-				$switch_class = 'tmce-active';
+				$default_editor = 'tinymce';
 			}
+<<<<<<< .mine
+||||||| .r11156
+
+			$buttons .= '' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "\n";
+			$buttons .= '' . __('Visual') . "\n";
+=======
 
 			$buttons .= '\n";
 			$buttons .= '\n";
+>>>>>>> .r12027
 		}
 
+		$switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active';
 		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
 
 		if ( $set['_content_editor_dfw'] ) {
 			$wrap_class .= ' has-dfw';
 		}
 
-		echo '';
+		echo '';
 
 		if ( self::$editor_buttons_css ) {
-			wp_print_styles('editor-buttons');
+			wp_print_styles( 'editor-buttons' );
 			self::$editor_buttons_css = false;
 		}
 
-		if ( !empty($set['editor_css']) )
+		if ( ! empty( $set['editor_css'] ) ) {
 			echo $set['editor_css'] . "\n";
+		}
 
-		if ( !empty($buttons) || $set['media_buttons'] ) {
-			echo '';
+		if ( ! empty( $buttons ) || $set['media_buttons'] ) {
+			echo '';
 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
 
-				if ( !function_exists('media_buttons') )
-					include(ABSPATH . 'wp-admin/includes/media.php');
+				if ( ! function_exists( 'media_buttons' ) )
+					include( ABSPATH . 'wp-admin/includes/media.php' );
 
-				echo '';
+				echo '';
 
 				/**
 				 * Fires after the default media button(s) are displayed.
@@ -218,6 +237,18 @@ final class _WP_Editors {
 			echo "\n";
 		}
 
+		$quicktags_toolbar = '';
+
+		if ( self::$this_quicktags ) {
+			if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
+				$toolbar_id = 'ed_toolbar';
+			} else {
+				$toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
+			}
+
+			$quicktags_toolbar = '';
+		}
+
 		/**
 		 * Filter the HTML markup output that displays the editor.
 		 *
@@ -225,9 +256,15 @@ final class _WP_Editors {
 		 *
 		 * @param string $output Editor's HTML markup.
 		 */
-		$the_editor = apply_filters( 'the_editor', '' .
-			'%s' );
+		$the_editor = apply_filters( 'the_editor', '' .
+			$quicktags_toolbar .
+			'%s' );
+
+		// Prepare the content for the Visual or Text editor
+		if ( self::$this_tinymce ) {
+			add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+		}
 
 		/**
 		 * Filter the default editor content.
@@ -236,19 +273,48 @@ final class _WP_Editors {
 		 *
 		 * @param string $content Default editor content.
 		 */
-		$content = apply_filters( 'the_editor_content', $content );
+		$content = apply_filters( 'the_editor_content', $content, $default_editor );
+
+		// Back-compat for the `htmledit_pre` and `richedit_pre` filters
+		if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
+			// TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
+			_deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+			$content = apply_filters( 'htmledit_pre', $content );
+		} elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
+			_deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+			$content = apply_filters( 'richedit_pre', $content );
+		}
+
+		if ( false !== stripos( $content, 'textarea' ) ) {
+			$content = preg_replace( '%\n\n";
 
-		self::editor_settings($editor_id, $set);
+		self::editor_settings( $editor_id, $set );
 	}
 
+<<<<<<< .mine
 	/**
+	 * @static
+	 *
+	 * @global string $wp_version
+	 * @global string $tinymce_version
+	 *
 	 * @param string $editor_id
 	 * @param array  $set
 	 */
+||||||| .r11156
+=======
+	/**
+	 * @param string $editor_id
+	 * @param array  $set
+	 */
+>>>>>>> .r12027
 	public static function editor_settings($editor_id, $set) {
+		global $wp_version, $tinymce_version;
+
 		$first_run = false;
 
 		if ( empty(self::$first_init) ) {
@@ -274,8 +340,9 @@ final class _WP_Editors {
 			if ( empty($qtInit['buttons']) )
 				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
-			if ( $set['dfw'] )
-				$qtInit['buttons'] .= ',fullscreen';
+			if ( $set['_content_editor_dfw'] ) {
+				$qtInit['buttons'] .= ',dfw';
+			}
 
 			if ( $set['_content_editor_dfw'] ) {
 				$qtInit['buttons'] .= ',dfw';
@@ -358,7 +425,8 @@ final class _WP_Editors {
 						'wpgallery',
 						'wplink',
 						'wpdialogs',
-						'wpview',
+						'wptextpattern',
+						'wpview'
 					);
 
 					if ( ! self::$has_medialib ) {
@@ -460,9 +528,6 @@ final class _WP_Editors {
 					}
 				}
 
-				if ( $set['dfw'] )
-					$plugins[] = 'wpfullscreen';
-
 				self::$plugins = $plugins;
 				self::$ext_plugins = $ext_plugins;
 
@@ -470,21 +535,21 @@ final class _WP_Editors {
 					'theme' => 'modern',
 					'skin' => 'lightgray',
 					'language' => self::$mce_locale,
-					'formats' => "{
-						alignleft: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
-						],
-						aligncenter: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
-						],
-						alignright: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'alignright'}
-						],
-						strikethrough: {inline: 'del'}
-					}",
+					'formats' => '{' .
+						'alignleft: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
+						'],' .
+						'aligncenter: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
+						'],' .
+						'alignright: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
+						'],' .
+						'strikethrough: {inline: "del"}' .
+					'}',
 					'relative_urls' => false,
 					'remove_script_host' => false,
 					'convert_urls' => false,
@@ -493,7 +558,12 @@ final class _WP_Editors {
 					'entities' => '38,amp,60,lt,62,gt',
 					'entity_encoding' => 'raw',
 					'keep_styles' => false,
+<<<<<<< .mine
+					'cache_suffix' => 'wp-mce-' . $tinymce_version,
+||||||| .r11156
+=======
 					'cache_suffix' => 'wp-mce-' . $GLOBALS['tinymce_version'],
+>>>>>>> .r12027
 
 					// Limit the preview styles in the menu/toolbar
 					'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
@@ -508,8 +578,8 @@ final class _WP_Editors {
 					self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
 				}
 
-				$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-				$version = 'ver=' . $GLOBALS['wp_version'];
+				$suffix = SCRIPT_DEBUG ? '' : '.min';
+				$version = 'ver=' . $wp_version;
 				$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
 
 				// WordPress default stylesheet and dashicons
@@ -628,18 +698,6 @@ final class _WP_Editors {
 				unset($set['tinymce']['body_class']);
 			}
 
-			if ( $set['dfw'] ) {
-				// replace the first 'fullscreen' with 'wp_fullscreen'
-				if ( ($key = array_search('fullscreen', $mce_buttons)) !== false )
-					$mce_buttons[$key] = 'wp_fullscreen';
-				elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
-					$mce_buttons_2[$key] = 'wp_fullscreen';
-				elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
-					$mce_buttons_3[$key] = 'wp_fullscreen';
-				elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
-					$mce_buttons_4[$key] = 'wp_fullscreen';
-			}
-
 			$mceInit = array (
 				'selector' => "#$editor_id",
 				'resize' => 'vertical',
@@ -654,8 +712,8 @@ final class _WP_Editors {
 				'body_class' => $body_class
 			);
 
-			if ( $first_run )
-				$mceInit = array_merge( self::$first_init, $mceInit );
+			// Merge with the first part of the init array
+			$mceInit = array_merge( self::$first_init, $mceInit );
 
 			if ( is_array( $set['tinymce'] ) )
 				$mceInit = array_merge( $mceInit, $set['tinymce'] );
@@ -666,7 +724,7 @@ final class _WP_Editors {
 			 * before tinyMCE.init. Setting "valid_elements", "invalid_elements"
 			 * and "extended_valid_elements" can be done through this filter. Best
 			 * is to use the default cleanup by not specifying valid_elements,
-			 * as TinyMCE contains full set of XHTML 1.0.
+			 * as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
 			 */
 			if ( $set['teeny'] ) {
 
@@ -701,6 +759,12 @@ final class _WP_Editors {
 		} // end if self::$this_tinymce
 	}
 
+	/**
+	 *
+	 * @static
+	 * @param array $init
+	 * @return string
+	 */
 	private static function _parse_init($init) {
 		$options = '';
 
@@ -719,9 +783,11 @@ final class _WP_Editors {
 		return '{' . trim( $options, ' ,' ) . '}';
 	}
 
+	/**
+	 *
+	 * @static
+	 */
 	public static function enqueue_scripts() {
-		wp_enqueue_script('word-count');
-
 		if ( self::$has_tinymce )
 			wp_enqueue_script('editor');
 
@@ -734,8 +800,9 @@ final class _WP_Editors {
 			wp_enqueue_script('wplink');
 		}
 
-		if ( in_array('wpfullscreen', self::$plugins, true) || in_array('fullscreen', self::$qt_buttons, true) )
-			wp_enqueue_script('wp-fullscreen');
+		if ( self::$old_dfw_compat ) {
+			wp_enqueue_script('wp-fullscreen-stub');
+		}
 
 		if ( self::$has_medialib ) {
 			add_thickbox();
@@ -756,15 +823,30 @@ final class _WP_Editors {
 		) );
 	}
 
+<<<<<<< .mine
 	/**
 	 * Translates the default TinyMCE strings and returns them as JSON encoded object ready to be loaded with tinymce.addI18n().
 	 * Can be used directly (_WP_Editors::wp_mce_translation()) by passing the same locale as set in the TinyMCE init object.
 	 *
+	 * @static
 	 * @param string $mce_locale The locale used for the editor.
 	 * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
 	 * @return string Translation object, JSON encoded.
 	 */
 	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
+||||||| .r11156
+	public static function wp_mce_translation() {
+=======
+	/**
+	 * Translates the default TinyMCE strings and returns them as JSON encoded object ready to be loaded with tinymce.addI18n().
+	 * Can be used directly (_WP_Editors::wp_mce_translation()) by passing the same locale as set in the TinyMCE init object.
+	 *
+	 * @param string $mce_locale The locale used for the editor.
+	 * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
+	 * @return string Translation object, JSON encoded.
+	 */
+	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
+>>>>>>> .r12027
 
 		$mce_translation = array(
 			// Default TinyMCE strings
@@ -785,6 +867,7 @@ final class _WP_Editors {
 			'Blockquote' => __( 'Blockquote' ),
 			'Div' => _x( 'Div', 'HTML tag' ),
 			'Pre' => _x( 'Pre', 'HTML tag' ),
+			'Preformatted' => _x( 'Preformatted', 'HTML tag' ),
 			'Address' => _x( 'Address', 'HTML tag' ),
 
 			'Inline' => _x( 'Inline', 'HTML elements' ),
@@ -984,14 +1067,45 @@ final class _WP_Editors {
 			'Format' => _x( 'Format', 'TinyMCE menu' ),
 
 			// WordPress strings
-			'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
 			'Toolbar Toggle' => __( 'Toolbar Toggle' ),
 			'Insert Read More tag' => __( 'Insert Read More tag' ),
+			'Insert Page Break tag' => __( 'Insert Page Break tag' ),
 			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
+<<<<<<< .mine
+			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
+			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
+			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
+			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+
+			// Shortcuts help modal
+			'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
+			'Default shortcuts,' => __( 'Default shortcuts,' ),
+			'Additional shortcuts,' => __( 'Additional shortcuts,' ),
+			'Focus shortcuts:' => __( 'Focus shortcuts:' ),
+			'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
+			'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
+			'Editor toolbar' => __( 'Editor toolbar' ),
+			'Elements path' => __( 'Elements path' ),
+			'Ctrl + Alt + letter:' => __( 'Ctrl + Alt + letter:' ),
+			'Shift + Alt + letter:' => __( 'Shift + Alt + letter:' ),
+			'Cmd + letter:' => __( 'Cmd + letter:' ),
+			'Ctrl + letter:' => __( 'Ctrl + letter:' ),
+			'Letter' => __( 'Letter' ),
+			'Action' => __( 'Action' ),
+			'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
+				__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+			'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
+				__( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+			'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
+				__( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
+||||||| .r11156
+			'Distraction Free Writing' => __( 'Distraction Free Writing' ),
+=======
 			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
 			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
 			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
 			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+>>>>>>> .r12027
 		);
 
 		/**
@@ -1046,8 +1160,16 @@ final class _WP_Editors {
 			"tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
 	}
 
+	/**
+	 *
+	 * @static
+	 * @global string $wp_version
+	 * @global string $tinymce_version
+	 * @global bool   $concatenate_scripts
+	 * @global bool   $compress_scripts
+	 */
 	public static function editor_js() {
-		global $tinymce_version, $concatenate_scripts, $compress_scripts;
+		global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
 
 		/**
 		 * Filter "tiny_mce_version" is deprecated
@@ -1092,7 +1214,7 @@ final class _WP_Editors {
 			'language' => self::$mce_locale
 		);
 
-		$suffix = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 		/**
 		 * Fires immediately before the TinyMCE settings are printed.
@@ -1125,7 +1247,7 @@ final class _WP_Editors {
 
 		$baseurl = self::$baseurl;
 		// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
-		$mce_suffix = false !== strpos( $GLOBALS['wp_version'], '-src' ) ? '' : '.min';
+		$mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
 
 		if ( $tmce_on ) {
 			if ( $compressed ) {
@@ -1166,54 +1288,29 @@ final class _WP_Editors {
 		?>
 
 		( function() {
-			var init, edId, qtId, firstInit, wrapper;
+			var init, id, $wrap;
 
 			if ( typeof tinymce !== 'undefined' ) {
-				for ( edId in tinyMCEPreInit.mceInit ) {
-					if ( firstInit ) {
-						init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
-					} else {
-						init = firstInit = tinyMCEPreInit.mceInit[edId];
-					}
-
-					wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
+				for ( id in tinyMCEPreInit.mceInit ) {
+					init = tinyMCEPreInit.mceInit[id];
+					$wrap = tinymce.$( '#wp-' + id + '-wrap' );
 
-					if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
-						! init.wp_skip_init ) {
+					if ( ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) && ! init.wp_skip_init ) {
+						tinymce.init( init );
 
-						try {
-							tinymce.init( init );
-
-							if ( ! window.wpActiveEditor ) {
-								window.wpActiveEditor = edId;
-							}
-						} catch(e){}
+						if ( ! window.wpActiveEditor ) {
+							window.wpActiveEditor = id;
+						}
 					}
 				}
 			}
 
 			if ( typeof quicktags !== 'undefined' ) {
-				for ( qtId in tinyMCEPreInit.qtInit ) {
-					try {
-						quicktags( tinyMCEPreInit.qtInit[qtId] );
+				for ( id in tinyMCEPreInit.qtInit ) {
+					quicktags( tinyMCEPreInit.qtInit[id] );
 
-						if ( ! window.wpActiveEditor ) {
-							window.wpActiveEditor = qtId;
-						}
-					} catch(e){};
-				}
-			}
-
-			if ( typeof jQuery !== 'undefined' ) {
-				jQuery('.wp-editor-wrap').on( 'click.wp-editor', function() {
-					if ( this.id ) {
-						window.wpActiveEditor = this.id.slice( 3, -5 );
-					}
-				});
-			} else {
-				for ( qtId in tinyMCEPreInit.qtInit ) {
-					document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() {
-						window.wpActiveEditor = this.id.slice( 3, -5 );
+					if ( ! window.wpActiveEditor ) {
+						window.wpActiveEditor = id;
 					}
 				}
 			}
@@ -1224,9 +1321,6 @@ final class _WP_Editors {
 		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) )
 			self::wp_link_dialog();
 
-		if ( in_array( 'wpfullscreen', self::$plugins, true ) || in_array( 'fullscreen', self::$qt_buttons, true ) )
-			self::wp_fullscreen_html();
-
 		/**
 		 * Fires after any core TinyMCE editor instances are created.
 		 *
@@ -1237,7 +1331,106 @@ final class _WP_Editors {
 		do_action( 'after_wp_tiny_mce', self::$mce_settings );
 	}
 
+	/**
+	 *
+	 * @static
+	 * @global int $content_width
+	 */
 	public static function wp_fullscreen_html() {
+<<<<<<< .mine
+		_deprecated_function( __FUNCTION__, '4.3' );
+||||||| .r11156
+		global $content_width;
+		$post = get_post();
+
+		$width = isset( $content_width ) && 800 > $content_width ? $content_width : 800;
+		$width = $width + 22; // compensate for the padding and border
+		$dfw_width = get_user_setting( 'dfw_width', $width );
+		$save = isset( $post->post_status ) && $post->post_status == 'publish' ? __('Update') : __('Save');
+
+		?>
+		
+		
+			
+			
+			
+
+			
+				
+					
+					
+				
+			
+
+			
+		 array( 'title' => __('Bold (Ctrl + B)'), 'both' => false ),
+			'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'both' => false ),
+			'bullist' => array( 'title' => __('Unordered list (Alt + Shift + U)'), 'both' => false ),
+			'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'both' => false ),
+			'blockquote' => array( 'title' => __('Blockquote (Alt + Shift + Q)'), 'both' => false ),
+			'wp-media-library' => array( 'title' => __('Media library (Alt + Shift + M)'), 'both' => true ),
+			'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'both' => true ),
+			'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'both' => false ),
+			'help' => array( 'title' => __('Help (Alt + Shift + H)'), 'both' => false ),
+		);
+
+		/**
+		 * Filter the list of TinyMCE buttons for the fullscreen
+		 * 'Distraction Free Writing' editor.
+		 *
+		 * @since 3.2.0
+		 *
+		 * @param array $buttons An array of TinyMCE buttons for the DFW editor.
+		 */
+		$buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
+
+		foreach ( $buttons as $button => $args ) {
+			if ( 'separator' == $args ) {
+				continue;
+			}
+
+			$onclick = ! empty( $args['onclick'] ) ? ' onclick="' . $args['onclick'] . '"' : '';
+			$title = esc_attr( $args['title'] );
+			?>
+
+			
+			
+			
+			
+
+		
+
+		
+			
+			post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?>
+			
+			
+		
+
+		
+		
+	
+	
+		
+			0' ); ?>
+			
+		
+	
+	
+
+	
+	
+	
 	
 	>>>>>> .r12027
 	}
 
 	/**
@@ -1335,6 +1529,7 @@ final class _WP_Editors {
 	 *
 	 * @since 3.1.0
 	 *
+	 * @static
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return false|array Results.
 	 */
@@ -1423,6 +1618,8 @@ final class _WP_Editors {
 	 * Dialog for internal linking.
 	 *
 	 * @since 3.1.0
+	 *
+	 * @static
 	 */
 	public static function wp_link_dialog() {
 		$search_panel_visible = '1' == get_user_setting( 'wplink', '0' ) ? ' search-panel-visible' : '';
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-embed.php b/pavillonmadeleine.fr/wp-includes/class-wp-embed.php
index e3426ab8..351315a3 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-embed.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-embed.php
@@ -11,6 +11,8 @@ class WP_Embed {
 	public $post_ID;
 	public $usecache = true;
 	public $linkifunknown = true;
+	public $last_attr = array();
+	public $last_url = '';
 
 	/**
 	 * When an URL cannot be embedded, return false instead of returning a link
@@ -42,7 +44,16 @@ class WP_Embed {
 	 * this function removes all existing shortcodes, registers the [embed] shortcode,
 	 * calls {@link do_shortcode()}, and then re-registers the old shortcodes.
 	 *
+<<<<<<< .mine
+	 * @global array $shortcode_tags
+||||||| .r11156
 	 * @uses $shortcode_tags
+	 * @uses remove_all_shortcodes()
+	 * @uses add_shortcode()
+	 * @uses do_shortcode()
+=======
+	 * @uses $shortcode_tags
+>>>>>>> .r12027
 	 *
 	 * @param string $content Content to parse
 	 * @return string Content with shortcode parsed
@@ -90,7 +101,7 @@ class WP_Embed {
 	 *
 	 * @param string $id An internal ID/name for the handler. Needs to be unique.
 	 * @param string $regex The regex that will be used to see if this handler should be used for a URL.
-	 * @param callback $callback The callback function that will be called if the regex is matched.
+	 * @param callable $callback The callback function that will be called if the regex is matched.
 	 * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
 	 */
 	public function register_handler( $id, $regex, $callback, $priority = 10 ) {
@@ -107,8 +118,7 @@ class WP_Embed {
 	 * @param int $priority Optional. The priority of the handler to be removed (default: 10).
 	 */
 	public function unregister_handler( $id, $priority = 10 ) {
-		if ( isset($this->handlers[$priority][$id]) )
-			unset($this->handlers[$priority][$id]);
+		unset( $this->handlers[ $priority ][ $id ] );
 	}
 
 	/**
@@ -134,13 +144,25 @@ class WP_Embed {
 			$url = $attr['src'];
 		}
 
+<<<<<<< .mine
+		$this->last_url = $url;
+
+		if ( empty( $url ) ) {
+			$this->last_attr = $attr;
+||||||| .r11156
+		if ( empty( $url ) )
+=======
 
 		if ( empty( $url ) )
+>>>>>>> .r12027
 			return '';
+		}
 
 		$rawattr = $attr;
 		$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
 
+		$this->last_attr = $attr;
+
 		// kses converts & into & and we need to undo this
 		// See https://core.trac.wordpress.org/ticket/11311
 		$url = str_replace( '&', '&', $url );
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-error.php b/pavillonmadeleine.fr/wp-includes/class-wp-error.php
index c1b07ab6..0969b12e 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-error.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-error.php
@@ -144,7 +144,7 @@ class WP_Error {
 	 * @since 2.1.0
 	 *
 	 * @param string|int $code Optional. Error code.
-	 * @return mixed Null, if no errors.
+	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
 		if ( empty($code) )
@@ -152,7 +152,6 @@ class WP_Error {
 
 		if ( isset($this->error_data[$code]) )
 			return $this->error_data[$code];
-		return null;
 	}
 
 	/**
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-http-ixr-client.php b/pavillonmadeleine.fr/wp-includes/class-wp-http-ixr-client.php
index 0605955d..e0309bf9 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-http-ixr-client.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-http-ixr-client.php
@@ -46,6 +46,9 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 		$this->timeout = $timeout;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function query() {
 		$args = func_get_args();
 		$method = array_shift($args);
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-gd.php b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-gd.php
index 371552c2..bae9a546 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-gd.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-gd.php
@@ -15,10 +15,21 @@
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
+<<<<<<< .mine
+	/**
+	 * GD Resource.
+	 *
+	 * @access protected
+	 * @var resource
+	 */
+	protected $image;
+||||||| .r11156
+=======
 	/**
 	 * @var resource
 	 */
 	protected $image; // GD Resource
+>>>>>>> .r12027
 
 	public function __destruct() {
 		if ( $this->image ) {
@@ -31,9 +42,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Checks to see if current environment supports GD.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 *
-	 * @return boolean
+	 * @param array $args
+	 * @return bool
 	 */
 	public static function test( $args = array() ) {
 		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
@@ -54,10 +68,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Checks to see if editor supports the mime-type specified.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 *
 	 * @param string $mime_type
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function supports_mime_type( $mime_type ) {
 		$image_types = imagetypes();
@@ -79,7 +95,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access protected
 	 *
-	 * @return boolean|WP_Error True if loaded successfully; WP_Error on failure.
+	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
 		if ( $this->image )
@@ -127,6 +143,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 *
 	 * @param int $width
 	 * @param int $height
+	 * @return true
 	 */
 	protected function update_size( $width = false, $height = false ) {
 		if ( ! $width )
@@ -151,8 +168,8 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 *
 	 * @param  int|null $max_w Image width.
 	 * @param  int|null $max_h Image height.
-	 * @param  boolean  $crop
-	 * @return boolean|WP_Error
+	 * @param  bool     $crop
+	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
 		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
@@ -171,6 +188,13 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
 	}
 
+	/**
+	 *
+	 * @param int $max_w
+	 * @param int $max_h
+	 * @param bool|array $crop
+	 * @return resource|WP_Error
+	 */
 	protected function _resize( $max_w, $max_h, $crop = false ) {
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
 		if ( ! $dims ) {
@@ -256,6 +280,26 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access public
 	 *
+<<<<<<< .mine
+	 * @param int  $src_x   The start x position to crop from.
+	 * @param int  $src_y   The start y position to crop from.
+	 * @param int  $src_w   The width to crop.
+	 * @param int  $src_h   The height to crop.
+	 * @param int  $dst_w   Optional. The destination width.
+	 * @param int  $dst_h   Optional. The destination height.
+	 * @param bool $src_abs Optional. If the source crop points are absolute.
+	 * @return bool|WP_Error
+||||||| .r11156
+	 * @param string|int $src The source file or Attachment ID.
+	 * @param int $src_x The start x position to crop from.
+	 * @param int $src_y The start y position to crop from.
+	 * @param int $src_w The width to crop.
+	 * @param int $src_h The height to crop.
+	 * @param int $dst_w Optional. The destination width.
+	 * @param int $dst_h Optional. The destination height.
+	 * @param boolean $src_abs Optional. If the source crop points are absolute.
+	 * @return boolean|WP_Error
+=======
 	 * @param int $src_x The start x position to crop from.
 	 * @param int $src_y The start y position to crop from.
 	 * @param int $src_w The width to crop.
@@ -264,6 +308,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @param int $dst_h Optional. The destination height.
 	 * @param boolean $src_abs Optional. If the source crop points are absolute.
 	 * @return boolean|WP_Error
+>>>>>>> .r12027
 	 */
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		// If destination width/height isn't specified, use same as
@@ -303,7 +348,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @access public
 	 *
 	 * @param float $angle
-	 * @return boolean|WP_Error
+	 * @return true|WP_Error
 	 */
 	public function rotate( $angle ) {
 		if ( function_exists('imagerotate') ) {
@@ -328,9 +373,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access public
 	 *
-	 * @param boolean $horz Flip along Horizontal Axis
-	 * @param boolean $vert Flip along Vertical Axis
-	 * @returns boolean|WP_Error
+	 * @param bool $horz Flip along Horizontal Axis
+	 * @param bool $vert Flip along Vertical Axis
+	 * @return true|WP_Error
 	 */
 	public function flip( $horz, $vert ) {
 		$w = $this->size['width'];
@@ -433,6 +478,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @access public
 	 *
 	 * @param string $mime_type
+	 * @return bool
 	 */
 	public function stream( $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
@@ -459,7 +505,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @param string|stream $filename
 	 * @param callable $function
 	 * @param array $arguments
-	 * @return boolean
+	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
 		if ( wp_is_stream( $filename ) )
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-imagick.php b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-imagick.php
index a70bebda..8cf92ddc 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-imagick.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor-imagick.php
@@ -15,10 +15,21 @@
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {
+<<<<<<< .mine
+	/**
+	 * Imagick object.
+	 *
+	 * @access protected
+	 * @var Imagick
+	 */
+	protected $image;
+||||||| .r11156
+=======
 	/**
 	 * @var Imagick
 	 */
 	protected $image; // Imagick Object
+>>>>>>> .r12027
 
 	public function __destruct() {
 		if ( $this->image instanceof Imagick ) {
@@ -35,9 +46,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * method can be called statically.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 *
-	 * @return boolean
+	 * @param array $args
+	 * @return bool
 	 */
 	public static function test( $args = array() ) {
 
@@ -82,10 +96,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Checks to see if editor supports the mime-type specified.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 *
 	 * @param string $mime_type
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
@@ -112,7 +128,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access protected
 	 *
-	 * @return boolean|WP_Error True if loaded; WP_Error on failure.
+	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
 		if ( $this->image instanceof Imagick )
@@ -128,7 +144,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		try {
 			$this->image = new Imagick( $this->file );
 
-			if( ! $this->image->valid() )
+			if ( ! $this->image->valid() )
 				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
 
 			// Select the first frame to handle animated images properly
@@ -156,7 +172,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @access public
 	 *
 	 * @param int $quality Compression Quality. Range: [1,100]
-	 * @return boolean|WP_Error True if set successfully; WP_Error on failure.
+	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
 	public function set_quality( $quality = null ) {
 		$quality_result = parent::set_quality( $quality );
@@ -225,8 +241,8 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 *
 	 * @param  int|null $max_w Image width.
 	 * @param  int|null $max_h Image height.
-	 * @param  boolean  $crop
-	 * @return boolean|WP_Error
+	 * @param  bool     $crop
+	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
 		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
@@ -330,6 +346,17 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access public
 	 *
+<<<<<<< .mine
+	 * @param int  $src_x The start x position to crop from.
+	 * @param int  $src_y The start y position to crop from.
+	 * @param int  $src_w The width to crop.
+	 * @param int  $src_h The height to crop.
+	 * @param int  $dst_w Optional. The destination width.
+	 * @param int  $dst_h Optional. The destination height.
+	 * @param bool $src_abs Optional. If the source crop points are absolute.
+	 * @return bool|WP_Error
+||||||| .r11156
+	 * @param string|int $src The source file or Attachment ID.
 	 * @param int $src_x The start x position to crop from.
 	 * @param int $src_y The start y position to crop from.
 	 * @param int $src_w The width to crop.
@@ -338,6 +365,16 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @param int $dst_h Optional. The destination height.
 	 * @param boolean $src_abs Optional. If the source crop points are absolute.
 	 * @return boolean|WP_Error
+=======
+	 * @param int $src_x The start x position to crop from.
+	 * @param int $src_y The start y position to crop from.
+	 * @param int $src_w The width to crop.
+	 * @param int $src_h The height to crop.
+	 * @param int $dst_w Optional. The destination width.
+	 * @param int $dst_h Optional. The destination height.
+	 * @param boolean $src_abs Optional. If the source crop points are absolute.
+	 * @return boolean|WP_Error
+>>>>>>> .r12027
 	 */
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		if ( $src_abs ) {
@@ -374,7 +411,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @access public
 	 *
 	 * @param float $angle
-	 * @return boolean|WP_Error
+	 * @return true|WP_Error
 	 */
 	public function rotate( $angle ) {
 		/**
@@ -403,9 +440,9 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @since 3.5.0
 	 * @access public
 	 *
-	 * @param boolean $horz Flip along Horizontal Axis
-	 * @param boolean $vert Flip along Vertical Axis
-	 * @returns boolean|WP_Error
+	 * @param bool $horz Flip along Horizontal Axis
+	 * @param bool $vert Flip along Vertical Axis
+	 * @return true|WP_Error
 	 */
 	public function flip( $horz, $vert ) {
 		try {
@@ -449,6 +486,13 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		return $saved;
 	}
 
+	/**
+	 *
+	 * @param Imagick $image
+	 * @param string $filename
+	 * @param string $mime_type
+	 * @return array|WP_Error
+	 */
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
@@ -491,7 +535,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @access public
 	 *
 	 * @param string $mime_type
-	 * @return boolean|WP_Error
+	 * @return true|WP_Error
 	 */
 	public function stream( $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor.php b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor.php
index 58643d42..55e8b719 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-image-editor.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-image-editor.php
@@ -31,11 +31,13 @@ abstract class WP_Image_Editor {
 	 * Must be overridden in a sub-class.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 * @abstract
 	 *
 	 * @param array $args
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function test( $args = array() ) {
 		return false;
@@ -46,11 +48,13 @@ abstract class WP_Image_Editor {
 	 * Must be overridden in a sub-class.
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access public
 	 * @abstract
 	 *
 	 * @param string $mime_type
-	 * @return boolean
+	 * @return bool
 	 */
 	public static function supports_mime_type( $mime_type ) {
 		return false;
@@ -63,7 +67,7 @@ abstract class WP_Image_Editor {
 	 * @access protected
 	 * @abstract
 	 *
-	 * @return boolean|WP_Error True if loaded; WP_Error on failure.
+	 * @return bool|WP_Error True if loaded; WP_Error on failure.
 	 */
 	abstract public function load();
 
@@ -93,8 +97,8 @@ abstract class WP_Image_Editor {
 	 *
 	 * @param  int|null $max_w Image width.
 	 * @param  int|null $max_h Image height.
-	 * @param  boolean  $crop
-	 * @return boolean|WP_Error
+	 * @param  bool     $crop
+	 * @return bool|WP_Error
 	 */
 	abstract public function resize( $max_w, $max_h, $crop = false );
 
@@ -131,8 +135,8 @@ abstract class WP_Image_Editor {
 	 * @param int $src_h The height to crop.
 	 * @param int $dst_w Optional. The destination width.
 	 * @param int $dst_h Optional. The destination height.
-	 * @param boolean $src_abs Optional. If the source crop points are absolute.
-	 * @return boolean|WP_Error
+	 * @param bool $src_abs Optional. If the source crop points are absolute.
+	 * @return bool|WP_Error
 	 */
 	abstract public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false );
 
@@ -144,7 +148,7 @@ abstract class WP_Image_Editor {
 	 * @abstract
 	 *
 	 * @param float $angle
-	 * @return boolean|WP_Error
+	 * @return bool|WP_Error
 	 */
 	abstract public function rotate( $angle );
 
@@ -155,9 +159,9 @@ abstract class WP_Image_Editor {
 	 * @access public
 	 * @abstract
 	 *
-	 * @param boolean $horz Flip along Horizontal Axis
-	 * @param boolean $vert Flip along Vertical Axis
-	 * @return boolean|WP_Error
+	 * @param bool $horz Flip along Horizontal Axis
+	 * @param bool $vert Flip along Vertical Axis
+	 * @return bool|WP_Error
 	 */
 	abstract public function flip( $horz, $vert );
 
@@ -169,7 +173,7 @@ abstract class WP_Image_Editor {
 	 * @abstract
 	 *
 	 * @param string $mime_type
-	 * @return boolean|WP_Error
+	 * @return bool|WP_Error
 	 */
 	abstract public function stream( $mime_type = null );
 
@@ -213,6 +217,26 @@ abstract class WP_Image_Editor {
 	 */
 	public function get_quality() {
 		if ( ! $this->quality ) {
+<<<<<<< .mine
+			$this->set_quality();
+		}
+
+		return $this->quality;
+	}
+
+	/**
+	 * Sets Image Compression quality on a 1-100% scale.
+	 *
+	 * @since 3.5.0
+	 * @access public
+	 *
+	 * @param int $quality Compression Quality. Range: [1,100]
+	 * @return true|WP_Error True if set successfully; WP_Error on failure.
+	 */
+	public function set_quality( $quality = null ) {
+		if ( null === $quality ) {
+||||||| .r11156
+=======
 			$this->set_quality();
 		}
 
@@ -230,6 +254,7 @@ abstract class WP_Image_Editor {
 	 */
 	public function set_quality( $quality = null ) {
 		if ( null === $quality ) {
+>>>>>>> .r12027
 			/**
 			 * Filter the default image compression quality setting.
 			 *
@@ -344,7 +369,7 @@ abstract class WP_Image_Editor {
 			$info = pathinfo( $filename );
 			$dir  = $info['dirname'];
 
-			if( isset( $info['extension'] ) )
+			if ( isset( $info['extension'] ) )
 				$ext = $info['extension'];
 
 			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
@@ -406,7 +431,7 @@ abstract class WP_Image_Editor {
 	 * @param string|stream $filename
 	 * @param callable $function
 	 * @param array $arguments
-	 * @return boolean
+	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
 		if ( $stream = wp_is_stream( $filename ) ) {
@@ -442,10 +467,12 @@ abstract class WP_Image_Editor {
 	 * as mapped from wp_get_mime_types()
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access protected
 	 *
 	 * @param string $extension
-	 * @return string|boolean
+	 * @return string|false
 	 */
 	protected static function get_mime_type( $extension = null ) {
 		if ( ! $extension )
@@ -468,10 +495,12 @@ abstract class WP_Image_Editor {
 	 * as mapped from wp_get_mime_types()
 	 *
 	 * @since 3.5.0
+	 *
+	 * @static
 	 * @access protected
 	 *
 	 * @param string $mime_type
-	 * @return string|boolean
+	 * @return string|false
 	 */
 	protected static function get_extension( $mime_type = null ) {
 		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-theme.php b/pavillonmadeleine.fr/wp-includes/class-wp-theme.php
index b0115aef..ad70a4bf 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-theme.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-theme.php
@@ -49,6 +49,10 @@ final class WP_Theme implements ArrayAccess {
 
 	/**
 	 * Renamed theme tags.
+	 *
+	 * @static
+	 * @access private
+	 * @var array
 	 */
 	private static $tag_map = array(
 		'fixed-width'    => 'fixed-layout',
@@ -83,6 +87,9 @@ final class WP_Theme implements ArrayAccess {
 	 * Header name from the theme's style.css after being translated.
 	 *
 	 * Cached due to sorting functions running over the translated name.
+	 *
+	 * @access private
+	 * @var string
 	 */
 	private $name_translated;
 
@@ -153,6 +160,7 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * Default is false. Can be set with the wp_cache_themes_persistently filter.
 	 *
+	 * @static
 	 * @access private
 	 * @var bool
 	 */
@@ -163,6 +171,7 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * By default the bucket is not cached, so this value is useless.
 	 *
+	 * @static
 	 * @access private
 	 * @var bool
 	 */
@@ -171,9 +180,11 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Constructor for WP_Theme.
 	 *
+	 * @global array $wp_theme_directories
+	 *
 	 * @param string $theme_dir Directory of the theme within the theme_root.
 	 * @param string $theme_root Theme root.
-	 * @param WP_Error|null $_child If this theme is a parent theme, the child may be passed for validation purposes.
+	 * @param WP_Error|void $_child If this theme is a parent theme, the child may be passed for validation purposes.
 	 */
 	public function __construct( $theme_dir, $theme_root, $_child = null ) {
 		global $wp_theme_directories;
@@ -310,6 +321,10 @@ final class WP_Theme implements ArrayAccess {
 
 	/**
 	 * __isset() magic method for properties formerly returned by current_theme_info()
+	 *
+	 * @staticvar array $properties
+	 *
+	 * @return bool
 	 */
 	public function __isset( $offset ) {
 		static $properties = array(
@@ -322,6 +337,8 @@ final class WP_Theme implements ArrayAccess {
 
 	/**
 	 * __get() magic method for properties formerly returned by current_theme_info()
+	 *
+	 * @return mixed
 	 */
 	public function __get( $offset ) {
 		switch ( $offset ) {
@@ -361,22 +378,32 @@ final class WP_Theme implements ArrayAccess {
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
+	 *
+	 * @param mixed $offset
+	 * @param mixed $value
 	 */
 	public function offsetSet( $offset, $value ) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
+	 *
+	 * @param mixed $offset
 	 */
 	public function offsetUnset( $offset ) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
+	 *
+	 * @staticvar array $keys
+	 *
+	 * @param mixed $offset
+	 * @return bool
 	 */
 	public function offsetExists( $offset ) {
 		static $keys = array(
 			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
 			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
-			 'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
+			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
 		);
 
 		return in_array( $offset, $keys );
@@ -391,6 +418,9 @@ final class WP_Theme implements ArrayAccess {
 	 * untranslated for back compatibility. This means that ['Name'] is not ideal,
 	 * and care should be taken to use $theme->display('Name') to get a properly
 	 * translated header.
+	 *
+	 * @param mixed $offset
+	 * @return mixed
 	 */
 	public function offsetGet( $offset ) {
 		switch ( $offset ) {
@@ -443,7 +473,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 * @access public
 	 *
-	 * @return WP_Error|bool WP_Error if there are errors, or false.
+	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
 	public function errors() {
 		return is_wp_error( $this->errors ) ? $this->errors : false;
@@ -470,7 +500,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 * @access public
 	 *
-	 * @return WP_Theme|bool Parent theme, or false if the current theme is not a child theme.
+	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
 	public function parent() {
 		return isset( $this->parent ) ? $this->parent : false;
@@ -481,8 +511,8 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * Cache entries keyed by the theme and the type of data.
 	 *
-	 * @access private
 	 * @since 3.4.0
+	 * @access private
 	 *
 	 * @param string $key Type of data to store (theme, screenshot, headers, page_templates)
 	 * @param string $data Data to store
@@ -497,8 +527,8 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * Cache entries are keyed by the theme and the type of data.
 	 *
-	 * @access private
 	 * @since 3.4.0
+	 * @access private
 	 *
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, page_templates)
 	 * @return mixed Retrieved data
@@ -510,8 +540,8 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Clears the cache for the theme.
 	 *
-	 * @access public
 	 * @since 3.4.0
+	 * @access public
 	 */
 	public function cache_delete() {
 		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
@@ -532,11 +562,11 @@ final class WP_Theme implements ArrayAccess {
 	 * get_template() takes into account where WordPress actually located the theme and
 	 * whether it is actually valid.
 	 *
-	 * @access public
 	 * @since 3.4.0
+	 * @access public
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
-	 * @return string|bool String on success, false on failure.
+	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
 		if ( ! isset( $this->headers[ $header ] ) )
@@ -566,13 +596,13 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Gets a theme header, formatted and translated for display.
 	 *
-	 * @access public
 	 * @since 3.4.0
+	 * @access public
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @param bool $markup Optional. Whether to mark up the header. Defaults to true.
 	 * @param bool $translate Optional. Whether to translate the header. Defaults to true.
-	 * @return string|bool Processed header, false on failure.
+	 * @return string|false Processed header, false on failure.
 	 */
 	public function display( $header, $markup = true, $translate = true ) {
 		$value = $this->get( $header );
@@ -595,8 +625,15 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Sanitize a theme header.
 	 *
+	 * @since 3.4.0
+	 * @access private
+	 *
+	 * @staticvar array $header_tags
+	 * @staticvar array $header_tags_with_a
+	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @param string $value Value to sanitize.
+	 * @return mixed
 	 */
 	private function sanitize_header( $header, $value ) {
 		switch ( $header ) {
@@ -647,8 +684,10 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Mark up a theme header.
 	 *
+     * @since 3.4.0
 	 * @access private
-	 * @since 3.4.0
+	 *
+	 * @staticvar string $comma
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @param string $value Value to mark up.
@@ -691,8 +730,10 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Translate a theme header.
 	 *
-	 * @access private
 	 * @since 3.4.0
+	 * @access private
+	 *
+	 * @staticvar array $tags_list
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @param string $value Value to translate.
@@ -881,7 +922,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @access public
 	 *
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
-	 * @return mixed Screenshot file. False if the theme does not have a screenshot.
+	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
 	 */
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
@@ -916,7 +957,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @param int $depth Optional. How deep to search for files. Defaults to a flat scan (0 depth). -1 depth is infinite.
 	 * @param bool $search_parent Optional. Whether to return parent files. Defaults to false.
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
-	 * 	being absolute paths.
+	 * 	             being absolute paths.
 	 */
 	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
 		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
@@ -987,13 +1028,20 @@ final class WP_Theme implements ArrayAccess {
 	 * Scans a directory for files of a certain extension.
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access private
 	 *
-	 * @param string $path Absolute path to search.
-	 * @param mixed  Array of extensions to find, string of a single extension, or null for all extensions.
-	 * @param int $depth How deep to search for files. Optional, defaults to a flat scan (0 depth). -1 depth is infinite.
-	 * @param string $relative_path The basename of the absolute path. Used to control the returned path
-	 * 	for the found files, particularly when this function recurses to lower depths.
+	 * @param string            $path          Absolute path to search.
+	 * @param array|string|null $extensions    Optional. Array of extensions to find, string of a single extension,
+	 *                                         or null for all extensions. Default null.
+	 * @param int               $depth         Optional. How many levels deep to search for files. Accepts 0, 1+, or
+	 *                                         -1 (infinite depth). Default 0.
+	 * @param string            $relative_path Optional. The basename of the absolute path. Used to control the
+	 *                                         returned path for the found files, particularly when this function
+	 *                                         recurses to lower depths. Default empty.
+	 * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended
+	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
 	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
 		if ( ! is_dir( $path ) )
@@ -1098,6 +1146,8 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns array of stylesheet names of themes allowed on the site or network.
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access public
 	 *
 	 * @param int $blog_id Optional. Defaults to current blog.
@@ -1119,8 +1169,12 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns array of stylesheet names of themes allowed on the network.
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access public
 	 *
+	 * @staticvar array $allowed_themes
+	 *
 	 * @return array Array of stylesheet names.
 	 */
 	public static function get_allowed_on_network() {
@@ -1134,8 +1188,12 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns array of stylesheet names of themes allowed on the site.
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access public
 	 *
+	 * @staticvar array $allowed_themes
+	 *
 	 * @param int $blog_id Optional. Defaults to current blog.
 	 * @return array Array of stylesheet names.
 	 */
@@ -1201,6 +1259,8 @@ final class WP_Theme implements ArrayAccess {
 	 * Sort themes by name.
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access public
 	 */
 	public static function sort_by_name( &$themes ) {
@@ -1218,7 +1278,11 @@ final class WP_Theme implements ArrayAccess {
 	 * Would choke on HTML but we don't care enough to slow it down with strip_tags().
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access private
+	 *
+	 * @return int
 	 */
 	private static function _name_sort( $a, $b ) {
 		return strnatcasecmp( $a->headers['Name'], $b->headers['Name'] );
@@ -1228,7 +1292,11 @@ final class WP_Theme implements ArrayAccess {
 	 * Name sort (with translation).
 	 *
 	 * @since 3.4.0
+	 *
+	 * @static
 	 * @access private
+	 *
+	 * @return int
 	 */
 	private static function _name_sort_i18n( $a, $b ) {
 		// Don't mark up; Do translate.
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-walker.php b/pavillonmadeleine.fr/wp-includes/class-wp-walker.php
index f1d75978..65d8a586 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-walker.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-walker.php
@@ -127,12 +127,11 @@ class Walker {
 	 * @param int    $depth             Depth of current element.
 	 * @param array  $args              An array of arguments.
 	 * @param string $output            Passed by reference. Used to append additional content.
-	 * @return null Null on failure with no changes to parameters.
 	 */
 	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-
-		if ( !$element )
+		if ( ! $element ) {
 			return;
+		}
 
 		$id_field = $this->db_fields['id'];
 		$id       = $element->$id_field;
@@ -188,16 +187,14 @@ class Walker {
 	 * @param int   $max_depth The maximum hierarchical depth.
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth) {
-
+	public function walk( $elements, $max_depth ) {
 		$args = array_slice(func_get_args(), 2);
 		$output = '';
 
-		if ($max_depth < -1) //invalid parameter
-			return $output;
-
-		if (empty($elements)) //nothing to walk
+		//invalid parameter or nothing to walk
+		if ( $max_depth < -1 || empty( $elements ) ) {
 			return $output;
+		}
 
 		$parent_field = $this->db_fields['parent'];
 
@@ -272,15 +269,16 @@ class Walker {
 	 *
  	 * @since 2.7.0
 	 *
- 	 * @param int $max_depth The maximum hierarchical depth.
- 	 * @param int $page_num  The specific page number, beginning with 1.
- 	 * @return string XHTML of the specified page of elements
- 	 */
+	 * @param array $elements
+	 * @param int   $max_depth The maximum hierarchical depth.
+	 * @param int   $page_num The specific page number, beginning with 1.
+	 * @param int   $per_page
+	 * @return string XHTML of the specified page of elements
+	 */
 	public function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
-
-		/* sanity check */
-		if ( empty($elements) || $max_depth < -1 )
+		if ( empty( $elements ) || $max_depth < -1 ) {
 			return '';
+		}
 
 		$args = array_slice( func_get_args(), 4 );
 		$output = '';
@@ -383,8 +381,12 @@ class Walker {
 		return $output;
 	}
 
+	/**
+	 *
+	 * @param array $elements
+	 * @return int
+	 */
 	public function get_number_of_root_elements( $elements ){
-
 		$num = 0;
 		$parent_field = $this->db_fields['parent'];
 
@@ -395,11 +397,16 @@ class Walker {
 		return $num;
 	}
 
-	// Unset all the children for a given top level element.
+	/**
+	 * Unset all the children for a given top level element.
+	 *
+	 * @param object $e
+	 * @param array $children_elements
+	 */
 	public function unset_children( $e, &$children_elements ){
-
-		if ( !$e || !$children_elements )
+		if ( ! $e || ! $children_elements ) {
 			return;
+		}
 
 		$id_field = $this->db_fields['id'];
 		$id = $e->$id_field;
@@ -408,9 +415,7 @@ class Walker {
 			foreach ( (array) $children_elements[$id] as $child )
 				$this->unset_children( $child, $children_elements );
 
-		if ( isset($children_elements[$id]) )
-			unset( $children_elements[$id] );
-
+		unset( $children_elements[ $id ] );
 	}
 
 } // Walker
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp-xmlrpc-server.php b/pavillonmadeleine.fr/wp-includes/class-wp-xmlrpc-server.php
index 10c593d2..8c611118 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp-xmlrpc-server.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp-xmlrpc-server.php
@@ -21,7 +21,39 @@
  * @since 1.5.0
  */
 class wp_xmlrpc_server extends IXR_Server {
+<<<<<<< .mine
 	/**
+	 * Methods.
+	 *
+	 * @access public
+	 * @var array
+	 */
+	public $methods;
+
+||||||| .r11156
+
+=======
+>>>>>>> .r12027
+	/**
+<<<<<<< .mine
+	 * Blog options.
+	 *
+	 * @access public
+	 * @var array
+	 */
+	public $blog_options;
+
+	/**
+	 * IXR_Error instance.
+	 *
+	 * @access public
+	 * @var IXR_Error
+	 */
+	public $error;
+
+	/**
+||||||| .r11156
+=======
 	 * @var array
 	 */
 	public $methods;
@@ -34,6 +66,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 */
 	public $error;
 	/**
+>>>>>>> .r12027
 	 * Register all of the XMLRPC methods that XMLRPC server understands.
 	 *
 	 * Sets up server and method property. Passes XMLRPC
@@ -158,7 +191,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
-	 * @return mixed|bool Return value of the callback, false otherwise.
+	 * @return array|IXR_Error|false Return value of the callback, false otherwise.
 	 */
 	public function __call( $name, $arguments ) {
 		if ( '_multisite_getUsersBlogs' === $name ) {
@@ -167,6 +200,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		return false;
 	}
 
+	/**
+	 * @access public
+	 */
 	public function serve_request() {
 		$this->IXR_Server($this->methods);
 	}
@@ -176,10 +212,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method Parameters.
-	 * @return string
+	 * @return string Hello string response.
 	 */
-	public function sayHello($args) {
+	public function sayHello() {
 		return 'Hello!';
 	}
 
@@ -188,10 +223,15 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method Parameters.
-	 * @return int
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int $number1 A number to add.
+	 *     @type int $number2 A second number to add.
+	 * }
+	 * @return int Sum of the two given numbers.
 	 */
-	public function addTwoNumbers($args) {
+	public function addTwoNumbers( $args ) {
 		$number1 = $args[0];
 		$number2 = $args[1];
 		return $number1 + $number2;
@@ -275,7 +315,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @since 1.5.2
 	 *
 	 * @param string|array $data Escape single string or array of strings.
-	 * @return string|array Type matches $data and sanitized for the database.
+	 * @return string|void Returns with string is passed, alters by-reference
+	 *                     when array is passed.
 	 */
 	public function escape( &$data ) {
 		if ( ! is_array( $data ) )
@@ -351,9 +392,11 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Set up blog options property.
 	 *
-	 * Passes property through 'xmlrpc_blog_options' filter.
+	 * Passes property through {@see 'xmlrpc_blog_options'} filter.
 	 *
 	 * @since 2.6.0
+	 *
+	 * @global string $wp_version
 	 */
 	public function initialise_blog_option_info() {
 		global $wp_version;
@@ -493,7 +536,7 @@ class wp_xmlrpc_server extends IXR_Server {
 				'option'        => 'default_comment_status'
 			),
 			'default_ping_status' => array(
-				'desc'          => __( 'Allow link notifications from other blogs (pingbacks and trackbacks)' ),
+				'desc'          => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
 				'readonly'      => false,
 				'option'        => 'default_ping_status'
 			)
@@ -514,10 +557,25 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.6.0
 	 *
+<<<<<<< .mine
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 * }
+	 * @return array|IXR_Error Array contains:
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - username
+	 *  - password
+	 * @return array. Contains:
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - username
 	 *  - password
 	 * @return array|IXR_Error Array contains:
+>>>>>>> .r12027
 	 *  - 'isAdmin'
 	 *  - 'url'
 	 *  - 'blogid'
@@ -548,7 +606,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		 *
 		 * @since 2.5.0
 		 *
-		 * @param method $name The method name.
+		 * @param string $name The method name.
 		 */
 		do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
 
@@ -556,7 +614,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$struct = array();
 
 		foreach ( $blogs as $blog ) {
-			// Don't include blogs that aren't hosted at this site
+			// Don't include blogs that aren't hosted at this site.
 			if ( $blog->site_id != get_current_site()->id )
 				continue;
 
@@ -584,10 +642,11 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Checks if the method received at least the minimum number of arguments.
 	 *
 	 * @since 3.4.0
+	 * @access protected
 	 *
 	 * @param string|array $args Sanitize single string or array of strings.
-	 * @param int $count Minimum number of arguments.
-	 * @return boolean if $args contains at least $count arguments.
+	 * @param int $count         Minimum number of arguments.
+	 * @return bool if `$args` contains at least $count arguments.
 	 */
 	protected function minimum_args( $args, $count ) {
 		if ( count( $args ) < $count ) {
@@ -603,9 +662,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param object $taxonomy The unprepared taxonomy data
-	 * @param array $fields The subset of taxonomy fields to return
-	 * @return array The prepared taxonomy data
+	 * @param object $taxonomy The unprepared taxonomy data.
+	 * @param array $fields    The subset of taxonomy fields to return.
+	 * @return array The prepared taxonomy data.
 	 */
 	protected function _prepare_taxonomy( $taxonomy, $fields ) {
 		$_taxonomy = array(
@@ -646,12 +705,12 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param array|object $term The unprepared term data
-	 * @return array The prepared term data
+	 * @param array|object $term The unprepared term data.
+	 * @return array The prepared term data.
 	 */
 	protected function _prepare_term( $term ) {
 		$_term = $term;
-		if ( ! is_array( $_term) )
+		if ( ! is_array( $_term ) )
 			$_term = get_object_vars( $_term );
 
 		// For integers which may be larger than XML-RPC supports ensure we return strings.
@@ -679,8 +738,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param string $date
-	 * @return IXR_Date
+	 * @param string $date Date string to convert.
+	 * @return IXR_Date IXR_Date object.
 	 */
 	protected function _convert_date( $date ) {
 		if ( $date === '0000-00-00 00:00:00' ) {
@@ -694,9 +753,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param string $date_gmt
-	 * @param string $date
-	 * @return IXR_Date
+	 * @param string $date_gmt WordPress GMT date string.
+	 * @param string $date     Date string.
+	 * @return IXR_Date IXR_Date object.
 	 */
 	protected function _convert_date_gmt( $date_gmt, $date ) {
 		if ( $date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00' ) {
@@ -710,15 +769,15 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param array $post The unprepared post data
-	 * @param array $fields The subset of post type fields to return
-	 * @return array The prepared post data
+	 * @param array $post   The unprepared post data.
+	 * @param array $fields The subset of post type fields to return.
+	 * @return array The prepared post data.
 	 */
 	protected function _prepare_post( $post, $fields ) {
-		// holds the data for this post. built up based on $fields
+		// Holds the data for this post. built up based on $fields.
 		$_post = array( 'post_id' => strval( $post['ID'] ) );
 
-		// prepare common post fields
+		// Prepare common post fields.
 		$post_fields = array(
 			'post_title'        => $post['post_title'],
 			'post_date'         => $this->_convert_date( $post['post_date'] ),
@@ -742,7 +801,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			'sticky'            => ( $post['post_type'] === 'post' && is_sticky( $post['ID'] ) ),
 		);
 
-		// Thumbnail
+		// Thumbnail.
 		$post_fields['post_thumbnail'] = array();
 		$thumbnail_id = get_post_thumbnail_id( $post['ID'] );
 		if ( $thumbnail_id ) {
@@ -750,16 +809,16 @@ class wp_xmlrpc_server extends IXR_Server {
 			$post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
 		}
 
-		// Consider future posts as published
+		// Consider future posts as published.
 		if ( $post_fields['post_status'] === 'future' )
 			$post_fields['post_status'] = 'publish';
 
-		// Fill in blank post format
+		// Fill in blank post format.
 		$post_fields['post_format'] = get_post_format( $post['ID'] );
 		if ( empty( $post_fields['post_format'] ) )
 			$post_fields['post_format'] = 'standard';
 
-		// Merge requested $post_fields fields into $_post
+		// Merge requested $post_fields fields into $_post.
 		if ( in_array( 'post', $fields ) ) {
 			$_post = array_merge( $_post, $post_fields );
 		} else {
@@ -809,9 +868,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param object $post_type Post type object
-	 * @param array $fields The subset of post fields to return
-	 * @return array The prepared post type data
+	 * @param object $post_type Post type object.
+	 * @param array  $fields    The subset of post fields to return.
+	 * @return array The prepared post type data.
 	 */
 	protected function _prepare_post_type( $post_type, $fields ) {
 		$_post_type = array(
@@ -859,9 +918,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param object $media_item The unprepared media item data
-	 * @param string $thumbnail_size The image size to use for the thumbnail URL
-	 * @return array The prepared media item data
+	 * @param object $media_item     The unprepared media item data.
+	 * @param string $thumbnail_size The image size to use for the thumbnail URL.
+	 * @return array The prepared media item data.
 	 */
 	protected function _prepare_media_item( $media_item, $thumbnail_size = 'thumbnail' ) {
 		$_media_item = array(
@@ -898,8 +957,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param object $page The unprepared page data
-	 * @return array The prepared page data
+	 * @param object $page The unprepared page data.
+	 * @return array The prepared page data.
 	 */
 	protected function _prepare_page( $page ) {
 		// Get all of the page content and link.
@@ -979,8 +1038,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param object $comment The unprepared comment data
-	 * @return array The prepared comment data
+	 * @param object $comment The unprepared comment data.
+	 * @return array The prepared comment data.
 	 */
 	protected function _prepare_comment( $comment ) {
 		// Format page date.
@@ -1028,9 +1087,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @access protected
 	 *
-	 * @param WP_User $user The unprepared user object
-	 * @param array $fields The subset of user fields to return
-	 * @return array The prepared user data
+	 * @param WP_User $user   The unprepared user object.
+	 * @param array   $fields The subset of user fields to return.
+	 * @return array The prepared user data.
 	 */
 	protected function _prepare_user( $user, $fields ) {
 		$_user = array( 'user_id' => strval( $user->ID ) );
@@ -1077,6 +1136,75 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @link http://en.wikipedia.org/wiki/RSS_enclosure for information on RSS enclosures.
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: top-level arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id        Blog ID (unused).
+	 *     @type string $username       Username.
+	 *     @type string $password       Password.
+	 *     @type array  $content_struct {
+	 *         Content struct for adding a new post. See wp_insert_post() for information on
+	 *         additional post fields
+	 *
+	 *         @type string $post_type      Post type. Default 'post'.
+	 *         @type string $post_status    Post status. Default 'draft'
+	 *         @type string $post_title     Post title.
+	 *         @type int    $post_author    Post author ID.
+	 *         @type string $post_excerpt   Post excerpt.
+	 *         @type string $post_content   Post content.
+	 *         @type string $post_date_gmt  Post date in GMT.
+	 *         @type string $post_date      Post date.
+	 *         @type string $post_password  Post password (20-character limit).
+	 *         @type string $comment_status Post comment enabled status. Accepts 'open' or 'closed'.
+	 *         @type string $ping_status    Post ping status. Accepts 'open' or 'closed'.
+	 *         @type bool   $sticky         Whether the post should be sticky. Automatically false if
+	 *                                      `$post_status` is 'private'.
+	 *         @type int    $post_thumbnail ID of an image to use as the post thumbnail/featured image.
+	 *         @type array  $custom_fields  Array of meta key/value pairs to add to the post.
+	 *         @type array  $terms          Associative array with taxonomy names as keys and arrays
+	 *                                      of term IDs as values.
+	 *         @type array  $terms_names    Associative array with taxonomy names as keys and arrays
+	 *                                      of term names as values.
+	 *         @type array  $enclosure      {
+	 *             Array of feed enclosure data to add to post meta.
+	 *
+	 *             @type string $url    URL for the feed enclosure.
+	 *             @type int    $length Size in bytes of the enclosure.
+	 *             @type string $type   Mime-type for the enclosure.
+	 *         }
+	 *     }
+	 * }
+	 * @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $content_struct
+	 *      $content_struct can contain:
+	 *      - post_type (default: 'post')
+	 *      - post_status (default: 'draft')
+	 *      - post_title
+	 *      - post_author
+	 *      - post_excerpt
+	 *      - post_content
+	 *      - post_date_gmt | post_date
+	 *      - post_format
+	 *      - post_password
+	 *      - comment_status - can be 'open' | 'closed'
+	 *      - ping_status - can be 'open' | 'closed'
+	 *      - sticky
+	 *      - post_thumbnail - ID of a media item to use as the post thumbnail/featured image
+	 *      - custom_fields - array, with each element containing 'key' and 'value'
+	 *      - terms - array, with taxonomy names as keys and arrays of term IDs as values
+	 *      - terms_names - array, with taxonomy names as keys and arrays of term names as values
+	 *      - enclosure
+	 *      - any other fields supported by wp_insert_post()
+	 * @return string post_id
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
@@ -1102,6 +1230,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *      - enclosure
 	 *      - any other fields supported by wp_insert_post()
 	 * @return string|IXR_Error post_id
+>>>>>>> .r12027
 	 */
 	public function wp_newPost( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -1151,13 +1280,62 @@ class wp_xmlrpc_server extends IXR_Server {
 	}
 
 	/**
-	 * Helper method for wp_newPost and wp_editPost, containing shared logic.
+	 * Encapsulate the logic for sticking a post
+	 * and determining if the user has permission to do so
+	 *
+	 * @since 4.3.0
+	 * @access private
+	 *
+	 * @param array $post_data
+	 * @param bool  $update
+	 * @return void|IXR_Error
+	 */
+	private function _toggle_sticky( $post_data, $update = false ) {
+		$post_type = get_post_type_object( $post_data['post_type'] );
+
+		// Private and password-protected posts cannot be stickied.
+		if ( 'private' === $post_data['post_status'] || ! empty( $post_data['post_password'] ) ) {
+			// Error if the client tried to stick the post, otherwise, silently unstick.
+			if ( ! empty( $post_data['sticky'] ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
+			}
+
+			if ( $update ) {
+				unstick_post( $post_data['ID'] );
+			}
+		} elseif ( isset( $post_data['sticky'] ) )  {
+			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
+			}
+
+			$sticky = wp_validate_boolean( $post_data['sticky'] );
+			if ( $sticky ) {
+				stick_post( $post_data['ID'] );
+			} else {
+				unstick_post( $post_data['ID'] );
+			}
+		}
+	}
+
+	/**
+	 * Helper method for wp_newPost() and wp_editPost(), containing shared logic.
 	 *
 	 * @since 3.4.0
-	 * @uses wp_insert_post()
+	 * @access protected
 	 *
+<<<<<<< .mine
+	 * @see wp_insert_post()
+	 *
+	 * @param WP_User         $user           The post author if post_author isn't set in $content_struct.
+	 * @param array|IXR_Error $content_struct Post data to insert.
+	 * @return IXR_Error|string
+||||||| .r11156
+	 * @param WP_User $user The post author if post_author isn't set in $content_struct.
+	 * @param array $content_struct Post data to insert.
+=======
 	 * @param WP_User $user The post author if post_author isn't set in $content_struct.
 	 * @param array|IXR_Error $content_struct Post data to insert.
+>>>>>>> .r12027
 	 */
 	protected function _insert_post( $user, $content_struct ) {
 		$defaults = array( 'post_status' => 'draft', 'post_type' => 'post', 'post_author' => 0,
@@ -1224,9 +1402,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
 			unset( $post_data['ping_status'] );
 
-		// Do some timestamp voodoo
+		// Do some timestamp voodoo.
 		if ( ! empty( $post_data['post_date_gmt'] ) ) {
-			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
+			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
 			$dateCreated = rtrim( $post_data['post_date_gmt']->getIso(), 'Z' ) . 'Z';
 		} elseif ( ! empty( $post_data['post_date'] ) ) {
 			$dateCreated = $post_data['post_date']->getIso();
@@ -1242,25 +1420,14 @@ class wp_xmlrpc_server extends IXR_Server {
 		$post_ID = $post_data['ID'];
 
 		if ( $post_data['post_type'] == 'post' ) {
-			// Private and password-protected posts cannot be stickied.
-			if ( $post_data['post_status'] == 'private' || ! empty( $post_data['post_password'] ) ) {
-				// Error if the client tried to stick the post, otherwise, silently unstick.
-				if ( ! empty( $post_data['sticky'] ) )
-					return new IXR_Error( 401, __( 'Sorry, you cannot stick a private post.' ) );
-				if ( $update )
-					unstick_post( $post_ID );
-			} elseif ( isset( $post_data['sticky'] ) )  {
-				if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
-					return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
-				if ( $post_data['sticky'] )
-					stick_post( $post_ID );
-				else
-					unstick_post( $post_ID );
+			$error = $this->_toggle_sticky( $post_data, $update );
+			if ( $error ) {
+				return $error;
 			}
 		}
 
 		if ( isset( $post_data['post_thumbnail'] ) ) {
-			// empty value deletes, non-empty value adds/updates
+			// empty value deletes, non-empty value adds/updates.
 			if ( ! $post_data['post_thumbnail'] )
 				delete_post_thumbnail( $post_ID );
 			elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
@@ -1275,14 +1442,14 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
 			$post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
 
-			// accumulate term IDs from terms and terms_names
+			// Accumulate term IDs from terms and terms_names.
 			$terms = array();
 
-			// first validate the terms specified by ID
+			// First validate the terms specified by ID.
 			if ( isset( $post_data['terms'] ) && is_array( $post_data['terms'] ) ) {
 				$taxonomies = array_keys( $post_data['terms'] );
 
-				// validating term ids
+				// Validating term ids.
 				foreach ( $taxonomies as $taxonomy ) {
 					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
 						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
@@ -1303,7 +1470,7 @@ class wp_xmlrpc_server extends IXR_Server {
 				}
 			}
 
-			// now validate terms specified by name
+			// Now validate terms specified by name.
 			if ( isset( $post_data['terms_names'] ) && is_array( $post_data['terms_names'] ) ) {
 				$taxonomies = array_keys( $post_data['terms_names'] );
 
@@ -1314,15 +1481,18 @@ class wp_xmlrpc_server extends IXR_Server {
 					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
 
-					// for hierarchical taxonomies, we can't assign a term when multiple terms in the hierarchy share the same name
+					/*
+					 * For hierarchical taxonomies, we can't assign a term when multiple terms
+					 * in the hierarchy share the same name.
+					 */
 					$ambiguous_terms = array();
 					if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 						$tax_term_names = get_terms( $taxonomy, array( 'fields' => 'names', 'hide_empty' => false ) );
 
-						// count the number of terms with the same name
+						// Count the number of terms with the same name.
 						$tax_term_names_count = array_count_values( $tax_term_names );
 
-						// filter out non-ambiguous term names
+						// Filter out non-ambiguous term names.
 						$ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one') );
 
 						$ambiguous_terms = array_keys( $ambiguous_tax_term_counts );
@@ -1336,11 +1506,11 @@ class wp_xmlrpc_server extends IXR_Server {
 						$term = get_term_by( 'name', $term_name, $taxonomy );
 
 						if ( ! $term ) {
-							// term doesn't exist, so check that the user is allowed to create new terms
+							// Term doesn't exist, so check that the user is allowed to create new terms.
 							if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
 								return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
 
-							// create the new term
+							// Create the new term.
 							$term_info = wp_insert_term( $term_name, $taxonomy );
 							if ( is_wp_error( $term_info ) )
 								return new IXR_Error( 500, $term_info->get_error_message() );
@@ -1356,7 +1526,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			$post_data['tax_input'] = $terms;
 			unset( $post_data['terms'], $post_data['terms_names'] );
 		} else {
-			// do not allow direct submission of 'tax_input', clients must use 'terms' and/or 'terms_names'
+			// Do not allow direct submission of 'tax_input', clients must use 'terms' and/or 'terms_names'.
 			unset( $post_data['tax_input'], $post_data['post_category'], $post_data['tags_input'] );
 		}
 
@@ -1369,7 +1539,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			unset( $post_data['post_format'] );
 		}
 
-		// Handle enclosures
+		// Handle enclosures.
 		$enclosure = isset( $post_data['enclosure'] ) ? $post_data['enclosure'] : null;
 		$this->add_enclosure_if_new( $post_ID, $enclosure );
 
@@ -1403,6 +1573,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id        Blog ID (unused).
+	 *     @type string $username       Username.
+	 *     @type string $password       Password.
+	 *     @type int    $post_id        Post ID.
+	 *     @type array  $content_struct Extra content arguments.
+	 * }
+	 * @return true|IXR_Error True on success, IXR_Error on failure.
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - int     $post_id
+	 *  - array   $content_struct
+	 * @return true on success
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
@@ -1410,6 +1600,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - int     $post_id
 	 *  - array   $content_struct
 	 * @return bool|IXR_Error true on success
+>>>>>>> .r12027
 	 */
 	public function wp_editPost( $args ) {
 		if ( ! $this->minimum_args( $args, 5 ) )
@@ -1440,11 +1631,13 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		// convert the date field back to IXR form
+		// Convert the date field back to IXR form.
 		$post['post_date'] = $this->_convert_date( $post['post_date'] );
 
-		// ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
-		// since _insert_post will ignore the non-GMT date if the GMT date is set
+		/*
+		 * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
+		 * since _insert_post() will ignore the non-GMT date if the GMT date is set.
+		 */
 		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
 			unset( $post['post_date_gmt'] );
 		else
@@ -1465,6 +1658,27 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see wp_delete_post()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type int    $post_id  Post ID.
+	 * }
+	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
+||||||| .r11156
+	 * @uses wp_delete_post()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - int     $post_id
+	 * @return true on success
+=======
 	 * @uses wp_delete_post()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1472,6 +1686,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $password
 	 *  - int     $post_id
 	 * @return bool|IXR_Error true on success
+>>>>>>> .r12027
 	 */
 	public function wp_deletePost( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -1518,6 +1733,28 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * groups are 'post' (all basic fields), 'taxonomies', 'custom_fields',
 	 * and 'enclosure'.
 	 *
+<<<<<<< .mine
+	 * @see get_post()
+	 *
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type int    $post_id  Post ID.
+	 *     @type array  $fields   The subset of post type fields to return.
+	 * }
+	 * @return array|IXR_Error Array contains (based on $fields parameter):
+||||||| .r11156
+	 * @uses get_post()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $post_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $fields optional
+	 * @return array contains (based on $fields parameter):
+=======
 	 * @uses get_post()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1526,6 +1763,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - int     $post_id
 	 *  - array   $fields optional
 	 * @return array|IXR_Error Array contains (based on $fields parameter):
+>>>>>>> .r12027
 	 *  - 'post_id'
 	 *  - 'post_title'
 	 *  - 'post_date'
@@ -1555,9 +1793,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$post_id  = (int) $args[3];
+||||||| .r11156
+		$blog_id            = (int) $args[0];
+		$username           = $args[1];
+		$password           = $args[2];
+		$post_id            = (int) $args[3];
+=======
 		$username           = $args[1];
 		$password           = $args[2];
 		$post_id            = (int) $args[3];
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -1567,7 +1816,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param array $fields  Array of post fields.
+			 * @param array  $fields Array of post fields. Default array contains 'post', 'terms', and 'custom_fields'.
 			 * @param string $method Method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
@@ -1595,13 +1844,36 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
-	 * The optional $filter parameter modifies the query used to retrieve posts.
-	 * Accepted keys are 'post_type', 'post_status', 'number', 'offset',
-	 * 'orderby', and 'order'.
-	 *
-	 * The optional $fields parameter specifies what fields will be included
-	 * in the response array.
+	 * @see wp_get_recent_posts()
+	 * @see wp_getPost() for more on `$fields`
+	 * @see get_posts() for more on `$filter` values
+	 *
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+<<<<<<< .mine
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type array  $filter   Optional. Modifies the query used to retrieve posts. Accepts 'post_type',
+	 *                            'post_status', 'number', 'offset', 'orderby', and 'order'.
+	 *                            Default empty array.
+	 *     @type array  $fields   Optional. The subset of post type fields to return in the response array.
+	 * }
+	 * @return array|IXR_Error Array contains a collection of posts.
+||||||| .r11156
+	 * @uses wp_get_recent_posts()
+	 * @see wp_getPost() for more on $fields
+	 * @see get_posts() for more on $filter values
 	 *
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $filter optional
+	 *  - array   $fields optional
+	 * @return array contains a collection of posts.
+=======
 	 * @uses wp_get_recent_posts()
 	 * @see wp_getPost() for more on $fields
 	 * @see get_posts() for more on $filter values
@@ -1613,6 +1885,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - array   $filter optional
 	 *  - array   $fields optional
 	 * @return array|IXR_Error Array contains a collection of posts.
+>>>>>>> .r12027
 	 */
 	public function wp_getPosts( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -1620,9 +1893,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$filter   = isset( $args[3] ) ? $args[3] : array();
+||||||| .r11156
+		$blog_id    = (int) $args[0];
+		$username   = $args[1];
+		$password   = $args[2];
+		$filter     = isset( $args[3] ) ? $args[3] : array();
+=======
 		$username   = $args[1];
 		$password   = $args[2];
 		$filter     = isset( $args[3] ) ? $args[3] : array();
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -1677,7 +1961,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( ! $posts_list )
 			return array();
 
-		// holds all the posts data
+		// Holds all the posts data.
 		$struct = array();
 
 		foreach ( $posts_list as $post ) {
@@ -1695,6 +1979,36 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see wp_insert_term()
+	 *
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id        Blog ID (unused).
+	 *     @type string $username       Username.
+	 *     @type string $password       Password.
+	 *     @type array  $content_struct Content struct for adding a new term. The struct must contain
+	 *                                  the term 'name' and 'taxonomy'. Optional accepted values include
+	 *                                  'parent', 'description', and 'slug'.
+	 * }
+	 * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
+||||||| .r11156
+	 * @uses wp_insert_term()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $content_struct
+	 *      The $content_struct must contain:
+	 *      - 'name'
+	 *      - 'taxonomy'
+	 *      Also, it can optionally contain:
+	 *      - 'parent'
+	 *      - 'description'
+	 *      - 'slug'
+	 * @return string term_id
+=======
 	 * @uses wp_insert_term()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1709,6 +2023,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *      - 'description'
 	 *      - 'slug'
 	 * @return string|IXR_Error term_id
+>>>>>>> .r12027
 	 */
 	public function wp_newTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -1716,9 +2031,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username       = $args[1];
+		$password       = $args[2];
+		$content_struct = $args[3];
+||||||| .r11156
+		$blog_id            = (int) $args[0];
 		$username           = $args[1];
 		$password           = $args[2];
 		$content_struct     = $args[3];
+=======
+		$username           = $args[1];
+		$password           = $args[2];
+		$content_struct     = $args[3];
+>>>>>>> .r12027
 
 		if ( ! $user = $this->login( $username, $password ) )
 			return $this->error;
@@ -1781,6 +2107,38 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see wp_update_term()
+	 *
+	 * @param array $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id        Blog ID (unused).
+	 *     @type string $username       Username.
+	 *     @type string $password       Password.
+	 *     @type int    $term_id        Term ID.
+	 *     @type array  $content_struct Content struct for editing a term. The struct must contain the
+	 *                                  term ''taxonomy'. Optional accepted values include 'name', 'parent',
+	 *                                  'description', and 'slug'.
+	 * }
+	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
+||||||| .r11156
+	 * @uses wp_update_term()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $term_id
+	 *  - array   $content_struct
+	 *      The $content_struct must contain:
+	 *      - 'taxonomy'
+	 *      Also, it can optionally contain:
+	 *      - 'name'
+	 *      - 'parent'
+	 *      - 'description'
+	 *      - 'slug'
+	 * @return bool True, on success.
+=======
 	 * @uses wp_update_term()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1796,6 +2154,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *      - 'description'
 	 *      - 'slug'
 	 * @return bool|IXR_Error True, on success.
+>>>>>>> .r12027
 	 */
 	public function wp_editTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 5 ) )
@@ -1803,10 +2162,23 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username       = $args[1];
+		$password       = $args[2];
+		$term_id        = (int) $args[3];
+		$content_struct = $args[4];
+||||||| .r11156
+		$blog_id            = (int) $args[0];
+		$username           = $args[1];
+		$password           = $args[2];
+		$term_id            = (int) $args[3];
+		$content_struct     = $args[4];
+=======
 		$username           = $args[1];
 		$password           = $args[2];
 		$term_id            = (int) $args[3];
 		$content_struct     = $args[4];
+>>>>>>> .r12027
 
 		if ( ! $user = $this->login( $username, $password ) )
 			return $this->error;
@@ -1880,6 +2252,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see wp_delete_term()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id      Blog ID (unused).
+	 *     @type string $username     Username.
+	 *     @type string $password     Password.
+	 *     @type string $taxnomy_name Taxonomy name.
+	 *     @type int    $term_id      Term ID.
+	 * }
+	 * @return bool|IXR_Error True on success, IXR_Error instance on failure.
+||||||| .r11156
+	 * @uses wp_delete_term()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $taxnomy_name
+	 *  - string     $term_id
+	 * @return boolean|IXR_Error If it suceeded true else a reason why not
+=======
 	 * @uses wp_delete_term()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1888,6 +2283,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $taxnomy_name
 	 *  - string     $term_id
 	 * @return boolean|IXR_Error If it suceeded true else a reason why not
+>>>>>>> .r12027
 	 */
 	public function wp_deleteTerm( $args ) {
 		if ( ! $this->minimum_args( $args, 5 ) )
@@ -1938,6 +2334,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see get_term()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type string $taxnomy  Taxonomy name.
+	 *     @type string $term_id  Term ID.
+	 * }
+	 * @return array|IXR_Error IXR_Error on failure, array on success, containing:
+||||||| .r11156
+	 * @uses get_term()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $taxonomy
+	 *  - string  $term_id
+	 * @return array contains:
+=======
 	 * @uses get_term()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -1946,6 +2365,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $taxonomy
 	 *  - string  $term_id
 	 * @return array|IXR_Error Array contains:
+>>>>>>> .r12027
 	 *  - 'term_id'
 	 *  - 'name'
 	 *  - 'slug'
@@ -2000,6 +2420,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * The optional $filter parameter modifies the query used to retrieve terms.
 	 * Accepted keys are 'number', 'offset', 'orderby', 'order', 'hide_empty', and 'search'.
 	 *
+<<<<<<< .mine
+	 * @see get_terms()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type string $taxnomy  Taxonomy name.
+	 *     @type array  $filter   Optional. Modifies the query used to retrieve posts. Accepts 'number',
+	 *                            'offset', 'orderby', 'order', 'hide_empty', and 'search'. Default empty array.
+	 * }
+	 * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
+||||||| .r11156
+	 * @uses get_terms()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $taxonomy
+	 *  - array   $filter optional
+	 * @return array terms
+=======
 	 * @uses get_terms()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -2008,6 +2452,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $taxonomy
 	 *  - array   $filter optional
 	 * @return array|IXR_Error terms
+>>>>>>> .r12027
 	 */
 	public function wp_getTerms( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -2076,6 +2521,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see get_taxonomy()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type string $taxnomy  Taxonomy name.
+	 *     @type array  $fields   Optional. Array of taxonomy fields to limit to in the return.
+	 *                            Accepts 'labels', 'cap', 'menu', and 'object_type'.
+	 *                            Default empty array.
+	 * }
+	 * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
+||||||| .r11156
+	 * @uses get_taxonomy()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $taxonomy
+	 * @return array (@see get_taxonomy())
+=======
 	 * @uses get_taxonomy()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -2083,6 +2552,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $password
 	 *  - string  $taxonomy
 	 * @return array|IXR_Error (@see get_taxonomy())
+>>>>>>> .r12027
 	 */
 	public function wp_getTaxonomy( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -2090,9 +2560,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$taxonomy = $args[3];
+||||||| .r11156
+		$blog_id        = (int) $args[0];
+		$username       = $args[1];
+		$password       = $args[2];
+		$taxonomy       = $args[3];
+=======
 		$username       = $args[1];
 		$password       = $args[2];
 		$taxonomy       = $args[3];
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -2130,12 +2611,35 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see get_taxonomies()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id  Blog ID (unused).
+	 *     @type string $username Username.
+	 *     @type string $password Password.
+	 *     @type array  $filter   Optional. An array of arguments for retrieving taxonomies.
+	 *     @type array  $fields   Optional. The subset of taxonomy fields to return.
+	 * }
+	 * @return array|IXR_Error An associative array of taxonomy data with returned fields determined
+	 *                         by `$fields`, or an IXR_Error instance on failure.
+||||||| .r11156
+	 * @uses get_taxonomies()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 * @return array taxonomies
+=======
 	 * @uses get_taxonomies()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
 	 *  - string  $password
 	 * @return array taxonomies
+>>>>>>> .r12027
 	 */
 	public function wp_getTaxonomies( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -2143,9 +2647,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+||||||| .r11156
+		$blog_id            = (int) $args[0];
+		$username           = $args[1];
+		$password           = $args[2];
+		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+=======
 		$username           = $args[1];
 		$password           = $args[2];
 		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -2188,6 +2703,27 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * groups are 'basic' and 'all'.
 	 *
 	 * @uses get_userdata()
+<<<<<<< .mine
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $user_id
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error Array contains (based on $fields parameter):
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - int     $user_id
+	 *  - array   $fields optional
+	 * @return array contains (based on $fields parameter):
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
@@ -2195,6 +2731,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - int     $user_id
 	 *  - array   $fields optional
 	 * @return array|IXR_Error Array contains (based on $fields parameter):
+>>>>>>> .r12027
 	 *  - 'user_id'
 	 *  - 'username'
 	 *  - 'first_name'
@@ -2214,9 +2751,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$user_id  = (int) $args[3];
+||||||| .r11156
+		$blog_id    = (int) $args[0];
 		$username   = $args[1];
 		$password   = $args[2];
 		$user_id    = (int) $args[3];
+=======
+		$username   = $args[1];
+		$password   = $args[2];
+		$user_id    = (int) $args[3];
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -2244,7 +2792,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$user_data = get_userdata( $user_id );
 
 		if ( ! $user_data )
-			return new IXR_Error( 404, __( 'Invalid user ID' ) );
+			return new IXR_Error( 404, __( 'Invalid user ID.' ) );
 
 		return $this->_prepare_user( $user_data, $fields );
 	}
@@ -2262,6 +2810,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @uses get_users()
 	 * @see wp_getUser() for more on $fields and return values
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $filter (optional)
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error users data
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $filter optional
+	 *  - array   $fields optional
+	 * @return array users data
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
@@ -2269,6 +2837,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - array   $filter optional
 	 *  - array   $fields optional
 	 * @return array|IXR_Error users data
+>>>>>>> .r12027
 	 */
 	public function wp_getUsers( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -2276,9 +2845,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$filter   = isset( $args[3] ) ? $args[3] : array();
+||||||| .r11156
+		$blog_id    = (int) $args[0];
 		$username   = $args[1];
 		$password   = $args[2];
 		$filter     = isset( $args[3] ) ? $args[3] : array();
+=======
+		$username   = $args[1];
+		$password   = $args[2];
+		$filter     = isset( $args[3] ) ? $args[3] : array();
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -2333,12 +2913,32 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Retrieve information about the requesting user.
 	 *
 	 * @uses get_userdata()
+<<<<<<< .mine
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error (@see wp_getUser)
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $fields optional
+	 * @return array (@see wp_getUser)
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
 	 *  - string  $password
 	 *  - array   $fields optional
 	 * @return array|IXR_Error (@see wp_getUser)
+>>>>>>> .r12027
 	 */
 	public function wp_getProfile( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -2346,8 +2946,17 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id    = (int) $args[0];
 		$username   = $args[1];
 		$password   = $args[2];
+=======
+		$username   = $args[1];
+		$password   = $args[2];
+>>>>>>> .r12027
 
 		if ( isset( $args[3] ) ) {
 			$fields = $args[3];
@@ -2374,12 +2983,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Edit user's profile.
 	 *
 	 * @uses wp_update_user()
+<<<<<<< .mine
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $content_struct It can optionally contain:
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $content_struct
+	 *      It can optionally contain:
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
 	 *  - string  $password
 	 *  - array   $content_struct
 	 *      It can optionally contain:
+>>>>>>> .r12027
 	 *      - 'first_name'
 	 *      - 'last_name'
 	 *      - 'website'
@@ -2387,7 +3014,14 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *      - 'nickname'
 	 *      - 'nicename'
 	 *      - 'bio'
+<<<<<<< .mine
+	 * }
+	 * @return true|IXR_Error True, on success.
+||||||| .r11156
+	 * @return bool True, on success.
+=======
 	 * @return bool|IXR_Error True, on success.
+>>>>>>> .r12027
 	 */
 	public function wp_editProfile( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -2450,19 +3084,49 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $page_id
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
 	 * @param array $args Method parameters. Contains:
-	 *  - blog_id (unused)
+	 *  - blog_id
+	 *  - page_id
+	 *  - username
+	 *  - password
+	 * @return array
+=======
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id (unused)
 	 *  - page_id
 	 *  - username
 	 *  - password
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_getPage($args) {
-		$this->escape($args);
+	public function wp_getPage( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$page_id  = (int) $args[1];
+		$username = $args[2];
+		$password = $args[3];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
+		$page_id	= (int) $args[1];
+		$username	= $args[2];
+		$password	= $args[3];
+=======
 		$page_id	= (int) $args[1];
 		$username	= $args[2];
 		$password	= $args[3];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) ) {
 			return $this->error;
@@ -2493,19 +3157,49 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $num_pages
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - num_pages
+	 * @return array
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - blog_id (unused)
 	 *  - username
 	 *  - password
 	 *  - num_pages
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_getPages($args) {
-		$this->escape($args);
+	public function wp_getPages( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username  = $args[1];
+		$password  = $args[2];
+		$num_pages = isset($args[3]) ? (int) $args[3] : 10;
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
 		$num_pages	= isset($args[3]) ? (int) $args[3] : 10;
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+		$num_pages	= isset($args[3]) ? (int) $args[3] : 10;
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2539,13 +3233,40 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @see wp_xmlrpc_server::mw_newPost()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $content_struct
+	 * }
+	 * @return int|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters. See {@link wp_xmlrpc_server::mw_newPost()}
+	 * @return unknown
+=======
 	 * @param array $args Method parameters. See {@link wp_xmlrpc_server::mw_newPost()}
 	 * @return int|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_newPage($args) {
+	public function wp_newPage( $args ) {
 		// Items not escaped here will be escaped in newPost.
+<<<<<<< .mine
+		$username = $this->escape( $args[1] );
+		$password = $this->escape( $args[2] );
+||||||| .r11156
 		$username	= $this->escape($args[1]);
 		$password	= $this->escape($args[2]);
+		$page		= $args[3];
+		$publish	= $args[4];
+=======
+		$username	= $this->escape($args[1]);
+		$password	= $this->escape($args[2]);
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2565,15 +3286,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $page_id
+	 * }
+	 * @return true|IXR_Error True, if success.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return bool True, if success.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error True, if success.
+>>>>>>> .r12027
 	 */
-	public function wp_deletePage($args) {
-		$this->escape($args);
+	public function wp_deletePage( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$page_id  = (int) $args[3];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
 		$page_id	= (int) $args[3];
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+		$page_id	= (int) $args[3];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2614,9 +3361,44 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $page_id
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type string $content
+	 *     @type string $publish
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return unknown
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	public function wp_editPage( $args ) {
+		// Items will be escaped in mw_editPost.
+		$page_id  = (int) $args[1];
+		$username = $args[2];
+		$password = $args[3];
+		$content  = $args[4];
+		$publish  = $args[5];
+||||||| .r11156
+	public function wp_editPage($args) {
+		// Items not escaped here will be escaped in editPost.
+		$blog_id	= (int) $args[0];
+		$page_id	= (int) $this->escape($args[1]);
+		$username	= $this->escape($args[2]);
+		$password	= $this->escape($args[3]);
+		$content	= $args[4];
+		$publish	= $args[5];
+=======
 	public function wp_editPage($args) {
 		// Items not escaped here will be escaped in editPost.
 		$page_id	= (int) $this->escape($args[1]);
@@ -2624,9 +3406,14 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password	= $this->escape($args[3]);
 		$content	= $args[4];
 		$publish	= $args[5];
+>>>>>>> .r12027
 
-		if ( !$user = $this->login($username, $password) )
+		$escaped_username = $this->escape( $username );
+		$escaped_password = $this->escape( $password );
+
+		if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editPage' );
@@ -2661,16 +3448,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @global wpdb $wpdb
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return unknown
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_getPageList($args) {
+	public function wp_getPageList( $args ) {
 		global $wpdb;
 
-		$this->escape($args);
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id				= (int) $args[0];
+		$username				= $args[1];
+		$password				= $args[2];
+=======
 		$username				= $args[1];
 		$password				= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2713,16 +3525,40 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_getAuthors($args) {
+	public function wp_getAuthors( $args ) {
+		$this->escape( $args );
 
-		$this->escape($args);
+		$username = $args[1];
+		$password = $args[2];
 
+<<<<<<< .mine
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
 
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+
+>>>>>>> .r12027
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 
@@ -2749,14 +3585,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getTags( $args ) {
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id		= (int) $args[0];
+		$username		= $args[1];
+		$password		= $args[2];
+=======
 		$username		= $args[1];
 		$password		= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2791,15 +3650,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $category
+	 * }
+	 * @return int|IXR_Error Category ID.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return int Category ID.
+=======
 	 * @param array $args Method parameters.
 	 * @return int|IXR_Error Category ID.
+>>>>>>> .r12027
 	 */
-	public function wp_newCategory($args) {
-		$this->escape($args);
+	public function wp_newCategory( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$category = $args[3];
+||||||| .r11156
+		$blog_id				= (int) $args[0];
+		$username				= $args[1];
+		$password				= $args[2];
+		$category				= $args[3];
+=======
 		$username				= $args[1];
 		$password				= $args[2];
 		$category				= $args[3];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2860,15 +3745,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $category_id
+	 * }
+	 * @return bool|IXR_Error See {@link wp_delete_term()} for return info.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return mixed See {@link wp_delete_term()} for return info.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error See {@link wp_delete_term()} for return info.
+>>>>>>> .r12027
 	 */
-	public function wp_deleteCategory($args) {
-		$this->escape($args);
+	public function wp_deleteCategory( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username    = $args[1];
+		$password    = $args[2];
+		$category_id = (int) $args[3];
+||||||| .r11156
+		$blog_id		= (int) $args[0];
+		$username		= $args[1];
+		$password		= $args[2];
+		$category_id	= (int) $args[3];
+=======
 		$username		= $args[1];
 		$password		= $args[2];
 		$category_id	= (int) $args[3];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2901,16 +3812,45 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.2.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $category
+	 *     @type int    $max_results
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function wp_suggestCategories($args) {
-		$this->escape($args);
+	public function wp_suggestCategories( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username    = $args[1];
+		$password    = $args[2];
+		$category    = $args[3];
+		$max_results = (int) $args[4];
+||||||| .r11156
+		$blog_id				= (int) $args[0];
 		$username				= $args[1];
 		$password				= $args[2];
 		$category				= $args[3];
 		$max_results			= (int) $args[4];
+=======
+		$username				= $args[1];
+		$password				= $args[2];
+		$category				= $args[3];
+		$max_results			= (int) $args[4];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -2938,8 +3878,23 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $comment_id
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getComment($args) {
 		$this->escape($args);
@@ -2979,15 +3934,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $struct
+	 * }
+	 * @return array|IXR_Error Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array. Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
+>>>>>>> .r12027
 	 */
-	public function wp_getComments($args) {
-		$this->escape($args);
+	public function wp_getComments( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$struct	  = isset( $args[3] ) ? $args[3] : array();
+||||||| .r11156
+		$blog_id	= (int) $args[0];
+		$username	= $args[1];
+		$password	= $args[2];
+		$struct		= isset( $args[3] ) ? $args[3] : array();
+=======
 		$username	= $args[1];
 		$password	= $args[2];
 		$struct		= isset( $args[3] ) ? $args[3] : array();
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3015,12 +3996,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset($struct['number']) )
 			$number = absint($struct['number']);
 
-		$comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
+		$comments = get_comments( array( 'status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
 
 		$comments_struct = array();
-
-		foreach ( $comments as $comment ) {
-			$comments_struct[] = $this->_prepare_comment( $comment );
+		if ( is_array( $comments ) ) {
+			foreach ( $comments as $comment ) {
+				$comments_struct[] = $this->_prepare_comment( $comment );
+			}
 		}
 
 		return $comments_struct;
@@ -3035,12 +4017,31 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $comment_ID
+	 * }
+	 * @return bool|IXR_Error {@link wp_delete_comment()}
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - comment_id
+	 * @return mixed {@link wp_delete_comment()}
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - blog_id (unused)
 	 *  - username
 	 *  - password
 	 *  - comment_id
 	 * @return bool|IXR_Error {@link wp_delete_comment()}
+>>>>>>> .r12027
 	 */
 	public function wp_deleteComment($args) {
 		$this->escape($args);
@@ -3066,7 +4067,7 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$status = wp_delete_comment( $comment_ID );
 
-		if ( true == $status ) {
+		if ( $status ) {
 			/**
 			 * Fires after a comment has been successfully deleted via XML-RPC.
 			 *
@@ -3093,10 +4094,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'author_email'
 	 *  - 'content'
 	 *  - 'date_created_gmt'
-	 *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See {@link get_comment_statuses()} for more details
+	 *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See get_comment_statuses() for more details
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $comment_ID
+	 *     @type array  $content_struct
+	 * }
+	 * @return true|IXR_Error True, on success.
+||||||| .r11156
+	 * @param array $args. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - comment_id
+	 *  - content_struct
+	 * @return bool True, on success.
+=======
 	 * @param array $args Contains:
 	 *  - blog_id (unused)
 	 *  - username
@@ -3104,9 +4125,10 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - comment_id
 	 *  - content_struct
 	 * @return bool|IXR_Error True, on success.
+>>>>>>> .r12027
 	 */
-	public function wp_editComment($args) {
-		$this->escape($args);
+	public function wp_editComment( $args ) {
+		$this->escape( $args );
 
 		$username	= $args[1];
 		$password	= $args[2];
@@ -3185,15 +4207,42 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int        $blog_id (unused)
+	 *     @type string     $username
+	 *     @type string     $password
+	 *     @type string|int $post
+	 *     @type array      $content_struct
+	 * }
+	 * @return int|IXR_Error {@link wp_new_comment()}
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return mixed {@link wp_new_comment()}
+=======
 	 * @param array $args Method parameters.
 	 * @return int|IXR_Error {@link wp_new_comment()}
+>>>>>>> .r12027
 	 */
 	public function wp_newComment($args) {
 		$this->escape($args);
 
+<<<<<<< .mine
+		$username       = $args[1];
+		$password       = $args[2];
+		$post           = $args[3];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
+		$username	= $args[1];
+		$password	= $args[2];
+		$post		= $args[3];
+=======
 		$username	= $args[1];
 		$password	= $args[2];
 		$post		= $args[3];
+>>>>>>> .r12027
 		$content_struct = $args[4];
 
 		/**
@@ -3288,14 +4337,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.7.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getCommentStatusList($args) {
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3314,11 +4386,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $post_id
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getCommentCount( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
 
 		$username	= $args[1];
 		$password	= $args[2];
@@ -3347,14 +4434,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getPostStatusList( $args ) {
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3373,14 +4483,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getPageStatusList( $args ) {
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3399,14 +4532,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.6.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getPageTemplates( $args ) {
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
+		$blog_id	= (int) $args[0];
 		$username	= $args[1];
 		$password	= $args[2];
+=======
+		$username	= $args[1];
+		$password	= $args[2];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3425,8 +4581,23 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.6.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $options
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getOptions( $args ) {
 		$this->escape( $args );
@@ -3478,8 +4649,23 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.6.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $options
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return unknown
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_setOptions( $args ) {
 		$this->escape( $args );
@@ -3515,12 +4701,31 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.1.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $attachment_id
+	 * }
+	 * @return array|IXR_Error Associative array contains:
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - attachment_id
+	 * @return array. Associative array containing:
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - blog_id (unused)
 	 *  - username
 	 *  - password
 	 *  - attachment_id
 	 * @return array|IXR_Error Associative array contains:
+>>>>>>> .r12027
 	 *  - 'date_created_gmt'
 	 *  - 'parent'
 	 *  - 'link'
@@ -3530,8 +4735,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'description'
 	 *  - 'metadata'
 	 */
-	public function wp_getMediaItem($args) {
-		$this->escape($args);
+	public function wp_getMediaItem( $args ) {
+		$this->escape( $args );
 
 		$username		= $args[1];
 		$password		= $args[2];
@@ -3562,18 +4767,37 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * The defaults are as follows:
 	 * - 'number' - Default is 5. Total number of media items to retrieve.
-	 * - 'offset' - Default is 0. See {@link WP_Query::query()} for more.
+	 * - 'offset' - Default is 0. See WP_Query::query() for more.
 	 * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
 	 * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
 	 *
 	 * @since 3.1.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $struct
+	 * }
+	 * @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - filter
+	 * @return array. Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - blog_id (unused)
 	 *  - username
 	 *  - password
 	 *  - filter
 	 * @return array|IXR_Error Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents
+>>>>>>> .r12027
 	 */
 	public function wp_getMediaLibrary($args) {
 		$this->escape($args);
@@ -3607,6 +4831,32 @@ class wp_xmlrpc_server extends IXR_Server {
 	}
 
 	/**
+<<<<<<< .mine
+	 * Retrieves a list of post formats used by the site.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error List of post formats, otherwise IXR_Error object.
+	 */
+||||||| .r11156
+	  * Retrieves a list of post formats used by the site
+	  *
+	  * @since 3.1.0
+	  *
+	  * @param array $args Method parameters. Contains:
+	  *  - blog_id
+	  *  - username
+	  *  - password
+	  * @return array
+	  */
+=======
 	  * Retrieves a list of post formats used by the site
 	  *
 	  * @since 3.1.0
@@ -3617,6 +4867,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	  *  - password
 	  * @return array|IXR_Error
 	  */
+>>>>>>> .r12027
 	public function wp_getPostFormats( $args ) {
 		$this->escape( $args );
 
@@ -3657,6 +4908,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see get_post_type_object()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type string $post_type_name
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error Array contains:
+||||||| .r11156
+	 * @uses get_post_type_object()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - string  $post_type_name
+	 *  - array   $fields
+	 * @return array contains:
+=======
 	 * @uses get_post_type_object()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -3665,6 +4939,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - string  $post_type_name
 	 *  - array   $fields
 	 * @return array|IXR_Error Array contains:
+>>>>>>> .r12027
 	 *  - 'labels'
 	 *  - 'description'
 	 *  - 'capability_type'
@@ -3705,12 +4980,12 @@ class wp_xmlrpc_server extends IXR_Server {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostType' );
 
-		if( ! post_type_exists( $post_type_name ) )
+		if ( ! post_type_exists( $post_type_name ) )
 			return new IXR_Error( 403, __( 'Invalid post type' ) );
 
 		$post_type = get_post_type_object( $post_type_name );
 
-		if( ! current_user_can( $post_type->cap->edit_posts ) )
+		if ( ! current_user_can( $post_type->cap->edit_posts ) )
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
 
 		return $this->_prepare_post_type( $post_type, $fields );
@@ -3721,6 +4996,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 *
+<<<<<<< .mine
+	 * @see get_post_types()
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $filter (optional)
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @uses get_post_types()
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - array   $filter
+	 *  - array   $fields
+	 * @return array
+=======
 	 * @uses get_post_types()
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
@@ -3729,6 +5027,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - array   $filter
 	 *  - array   $fields
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function wp_getPostTypes( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -3736,9 +5035,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$filter   = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+||||||| .r11156
+		$blog_id            = (int) $args[0];
 		$username           = $args[1];
 		$password           = $args[2];
 		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+=======
+		$username           = $args[1];
+		$password           = $args[2];
+		$filter             = isset( $args[3] ) ? $args[3] : array( 'public' => true );
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -3758,7 +5068,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$struct = array();
 
 		foreach( $post_types as $post_type ) {
-			if( ! current_user_can( $post_type->cap->edit_posts ) )
+			if ( ! current_user_can( $post_type->cap->edit_posts ) )
 				continue;
 
 			$struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
@@ -3778,6 +5088,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @uses wp_get_post_revisions()
 	 * @see wp_getPost() for more on $fields
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $post_id
+	 *     @type array  $fields (optional)
+	 * }
+	 * @return array|IXR_Error contains a collection of posts.
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - int     $post_id
+	 *  - array   $fields
+	 * @return array contains a collection of posts.
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
@@ -3785,6 +5115,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - int     $post_id
 	 *  - array   $fields
 	 * @return array|IXR_Error contains a collection of posts.
+>>>>>>> .r12027
 	 */
 	public function wp_getRevisions( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) )
@@ -3792,9 +5123,20 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+		$post_id  = (int) $args[3];
+||||||| .r11156
+		$blog_id    = (int) $args[0];
+		$username   = $args[1];
+		$password   = $args[2];
+		$post_id    = (int) $args[3];
+=======
 		$username   = $args[1];
 		$password   = $args[2];
 		$post_id    = (int) $args[3];
+>>>>>>> .r12027
 
 		if ( isset( $args[4] ) ) {
 			$fields = $args[4];
@@ -3817,7 +5159,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		do_action( 'xmlrpc_call', 'wp.getRevisions' );
 
 		if ( ! $post = get_post( $post_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
 		if ( ! current_user_can( 'edit_post', $post_id ) )
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
@@ -3854,12 +5196,31 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @uses wp_restore_post_revision()
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $revision_id
+	 * }
+	 * @return bool|IXR_Error false if there was an error restoring, true if success.
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - int     $blog_id
+	 *  - string  $username
+	 *  - string  $password
+	 *  - int     $post_id
+	 * @return bool false if there was an error restoring, true if success.
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - int     $blog_id (unused)
 	 *  - string  $username
 	 *  - string  $password
 	 *  - int     $post_id
 	 * @return bool|IXR_Error false if there was an error restoring, true if success.
+>>>>>>> .r12027
 	 */
 	public function wp_restoreRevision( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) )
@@ -3878,13 +5239,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		do_action( 'xmlrpc_call', 'wp.restoreRevision' );
 
 		if ( ! $revision = wp_get_post_revision( $revision_id ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
 		if ( wp_is_post_autosave( $revision ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
 		if ( ! $post = get_post( $revision->post_parent ) )
-			return new IXR_Error( 404, __( 'Invalid post ID' ) );
+			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
 		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
 			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
@@ -3909,8 +5270,22 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function blogger_getUsersBlogs($args) {
 		if ( is_multisite() )
@@ -3919,7 +5294,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$this->escape($args);
 
 		$username = $args[1];
-		$password  = $args[2];
+		$password = $args[2];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -3978,15 +5353,28 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function blogger_getUserInfo($args) {
-
-		$this->escape($args);
+	public function blogger_getUserInfo( $args ) {
+		$this->escape( $args );
 
 		$username = $args[1];
-		$password  = $args[2];
+		$password = $args[2];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -4013,16 +5401,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function blogger_getPost($args) {
-
-		$this->escape($args);
+	public function blogger_getPost( $args ) {
+		$this->escape( $args );
 
-		$post_ID    = (int) $args[1];
+		$post_ID  = (int) $args[1];
 		$username = $args[2];
-		$password  = $args[3];
+		$password = $args[3];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -4058,16 +5460,32 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type string $appkey (unused)
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $numberposts (optional)
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function blogger_getRecentPosts($args) {
+	public function blogger_getRecentPosts( $args ) {
 
 		$this->escape($args);
 
 		// $args[0] = appkey - ignored
 		$username = $args[2];
-		$password  = $args[3];
+		$password = $args[3];
 		if ( isset( $args[4] ) )
 			$query = array( 'numberposts' => absint( $args[4] ) );
 		else
@@ -4139,17 +5557,42 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type string $appkey (unused)
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type string $content
+	 *     @type string $publish
+	 * }
+	 * @return int|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return int
+=======
 	 * @param array $args Method parameters.
 	 * @return int|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function blogger_newPost($args) {
+	public function blogger_newPost( $args ) {
+		$this->escape( $args );
+
+<<<<<<< .mine
+||||||| .r11156
+		$this->escape($args);
 
+		$blog_ID    = (int) $args[1]; /* though we don't use it yet */
+=======
 		$this->escape($args);
 
+>>>>>>> .r12027
 		$username = $args[2];
-		$password  = $args[3];
-		$content    = $args[4];
-		$publish    = $args[5];
+		$password = $args[3];
+		$content  = $args[4];
+		$publish  = $args[5];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -4201,17 +5644,46 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type string $content
+	 * }
+	 * @return true|IXR_Error true when done.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return bool true when done.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error true when done.
+>>>>>>> .r12027
 	 */
 	public function blogger_editPost( $args ) {
 
 		$this->escape($args);
 
+<<<<<<< .mine
+		$post_ID  = (int) $args[1];
+		$username = $args[2];
+		$password = $args[3];
+		$content  = $args[4];
+||||||| .r11156
 		$post_ID     = (int) $args[1];
 		$username  = $args[2];
 		$password   = $args[3];
 		$content     = $args[4];
+		$publish     = $args[5];
+=======
+		$post_ID     = (int) $args[1];
+		$username  = $args[2];
+		$password   = $args[3];
+		$content     = $args[4];
+>>>>>>> .r12027
 
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
@@ -4268,15 +5740,41 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return true|IXR_Error True when post is deleted.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return bool True when post is deleted.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error True when post is deleted.
+>>>>>>> .r12027
 	 */
-	public function blogger_deletePost($args) {
-		$this->escape($args);
+	public function blogger_deletePost( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$post_ID  = (int) $args[1];
+		$username = $args[2];
+		$password = $args[3];
+||||||| .r11156
+		$post_ID     = (int) $args[1];
+		$username  = $args[2];
+		$password   = $args[3];
+		$publish     = $args[4];
+=======
 		$post_ID     = (int) $args[1];
 		$username  = $args[2];
 		$password   = $args[3];
+>>>>>>> .r12027
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -4341,6 +5839,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $content_struct
+	 *     @type int    $publish
+	 * }
+	 * @return int|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters. Contains:
+	 *  - blog_id
+	 *  - username
+	 *  - password
+	 *  - content_struct
+	 *  - publish
+	 * @return int
+=======
 	 * @param array $args Method parameters. Contains:
 	 *  - blog_id (unused)
 	 *  - username
@@ -4348,14 +5866,24 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - content_struct
 	 *  - publish
 	 * @return int|IXR_Error
+>>>>>>> .r12027
 	 */
 	public function mw_newPost($args) {
 		$this->escape($args);
 
+<<<<<<< .mine
+		$username       = $args[1];
+		$password       = $args[2];
+||||||| .r11156
+		$blog_ID     = (int) $args[0];
 		$username  = $args[1];
 		$password   = $args[2];
+=======
+		$username  = $args[1];
+		$password   = $args[2];
+>>>>>>> .r12027
 		$content_struct = $args[3];
-		$publish     = isset( $args[4] ) ? $args[4] : 0;
+		$publish        = isset( $args[4] ) ? $args[4] : 0;
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -4487,7 +6015,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			} else {
@@ -4500,12 +6028,12 @@ class wp_xmlrpc_server extends IXR_Server {
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			}
 		} else {
-			$comment_status = get_option('default_comment_status');
+			$comment_status = get_default_comment_status( $post_type );
 		}
 
 		if ( isset($content_struct['mt_allow_pings']) ) {
@@ -4518,7 +6046,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			} else {
@@ -4530,12 +6058,12 @@ class wp_xmlrpc_server extends IXR_Server {
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			}
 		} else {
-			$ping_status = get_option('default_ping_status');
+			$ping_status = get_default_comment_status( $post_type, 'pingback' );
 		}
 
 		if ( $post_more )
@@ -4580,10 +6108,12 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-			if ( $content_struct['sticky'] == true )
-				stick_post( $post_ID );
-			elseif ( $content_struct['sticky'] == false )
-				unstick_post( $post_ID );
+			$data = $postdata;
+			$data['sticky'] = $content_struct['sticky'];
+			$error = $this->_toggle_sticky( $data );
+			if ( $error ) {
+				return $error;
+			}
 		}
 
 		if ( isset($content_struct['custom_fields']) )
@@ -4654,6 +6184,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 2.1.0
 	 *
+	 * @global wpdb $wpdb
+	 *
 	 * @param int $post_ID Post ID.
 	 * @param string $post_content Post Content for attachment.
 	 */
@@ -4675,12 +6207,27 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $content_struct
+	 *     @type int    $publish
+	 * }
+	 * @return bool|IXR_Error True on success.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return bool True on success.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error True on success.
+>>>>>>> .r12027
 	 */
-	public function mw_editPost($args) {
-
-		$this->escape($args);
+	public function mw_editPost( $args ) {
+		$this->escape( $args );
 
 		$post_ID        = (int) $args[0];
 		$username       = $args[1];
@@ -4696,9 +6243,10 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$postdata = get_post( $post_ID, ARRAY_A );
 
-		// If there is no post data for the give post id, stop
-		// now and return an error. Other wise a new post will be
-		// created (which was the old behavior).
+		/*
+		 * If there is no post data for the give post id, stop now and return an error.
+		 * Otherwise a new post will be created (which was the old behavior).
+		 */
 		if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 
@@ -4788,7 +6336,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			} else {
@@ -4801,7 +6349,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$comment_status = 'open';
 						break;
 					default:
-						$comment_status = get_option('default_comment_status');
+						$comment_status = get_default_comment_status( $post_type );
 						break;
 				}
 			}
@@ -4817,7 +6365,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			} else {
@@ -4829,7 +6377,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						$ping_status = 'open';
 						break;
 					default:
-						$ping_status = get_option('default_ping_status');
+						$ping_status = get_default_comment_status( $post_type, 'pingback' );
 						break;
 				}
 			}
@@ -4873,12 +6421,27 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
 
+<<<<<<< .mine
+		if ( 'publish' == $post_status || 'private' == $post_status ) {
+			if ( 'page' == $post_type && ! current_user_can( 'publish_pages' ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
+			} elseif ( ! current_user_can( 'publish_posts' ) ) {
+				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+			}
+||||||| .r11156
+		if ( ('publish' == $post_status) ) {
+			if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
+				return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
+			else if ( !current_user_can('publish_posts') )
+				return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+=======
 		if ( ('publish' == $post_status) ) {
 			if ( ( 'page' == $post_type ) && ! current_user_can( 'publish_pages' ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
 			} elseif ( ! current_user_can( 'publish_posts' ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
 			}
+>>>>>>> .r12027
 		}
 
 		if ( $post_more )
@@ -4891,9 +6454,9 @@ class wp_xmlrpc_server extends IXR_Server {
 				$to_ping = implode(' ', $to_ping);
 		}
 
-		// Do some timestamp voodoo
+		// Do some timestamp voodoo.
 		if ( !empty( $content_struct['date_created_gmt'] ) )
-			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
+			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
 		elseif ( !empty( $content_struct['dateCreated']) )
 			$dateCreated = $content_struct['dateCreated']->getIso();
@@ -4906,7 +6469,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			$post_date_gmt = $postdata['post_date_gmt'];
 		}
 
-		// We've got all the data -- post it:
+		// We've got all the data -- post it.
 		$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
 
 		$result = wp_update_post($newpost, true);
@@ -4918,17 +6481,21 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-			if ( $content_struct['sticky'] == true )
-				stick_post( $post_ID );
-			elseif ( $content_struct['sticky'] == false )
-				unstick_post( $post_ID );
+			$data = $newpost;
+			$data['sticky'] = $content_struct['sticky'];
+			$data['post_type'] = 'post';
+			$error = $this->_toggle_sticky( $data, true );
+			if ( $error ) {
+				return $error;
+			}
 		}
 
 		if ( isset($content_struct['custom_fields']) )
 			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
 
 		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
-			// empty value deletes, non-empty value adds/updates
+
+			// Empty value deletes, non-empty value adds/updates.
 			if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
 				delete_post_thumbnail( $post_ID );
 			} else {
@@ -4938,14 +6505,13 @@ class wp_xmlrpc_server extends IXR_Server {
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
 
-		// Handle enclosures
+		// Handle enclosures.
 		$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
 		$this->add_enclosure_if_new($post_ID, $thisEnclosure);
 
 		$this->attach_uploads( $ID, $post_content );
 
-		// Handle post formats if assigned, validation is handled
-		// earlier in this function
+		// Handle post formats if assigned, validation is handled earlier in this function.
 		if ( isset( $content_struct['wp_post_format'] ) )
 			set_post_format( $post_ID, $content_struct['wp_post_format'] );
 
@@ -4967,16 +6533,30 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mw_getPost($args) {
-
-		$this->escape($args);
+	public function mw_getPost( $args ) {
+		$this->escape( $args );
 
-		$post_ID     = (int) $args[0];
-		$username  = $args[1];
-		$password   = $args[2];
+		$post_ID  = (int) $args[0];
+		$username = $args[1];
+		$password = $args[2];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -5092,15 +6672,42 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $numberposts
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mw_getRecentPosts($args) {
+	public function mw_getRecentPosts( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
 		$this->escape($args);
 
+		$blog_ID     = (int) $args[0];
 		$username  = $args[1];
 		$password   = $args[2];
+=======
+		$this->escape($args);
+
+		$username  = $args[1];
+		$password   = $args[2];
+>>>>>>> .r12027
 		if ( isset( $args[3] ) )
 			$query = array( 'numberposts' => absint( $args[3] ) );
 		else
@@ -5204,16 +6811,40 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mw_getCategories($args) {
+	public function mw_getCategories( $args ) {
+		$this->escape( $args );
 
-		$this->escape($args);
+		$username = $args[1];
+		$password = $args[2];
+
+<<<<<<< .mine
+||||||| .r11156
+		$blog_ID     = (int) $args[0];
+		$username  = $args[1];
+		$password   = $args[2];
 
+=======
 		$username  = $args[1];
 		$password   = $args[2];
 
+>>>>>>> .r12027
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 
@@ -5252,15 +6883,43 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @global wpdb $wpdb
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $data
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mw_newMediaObject($args) {
+	public function mw_newMediaObject( $args ) {
 		global $wpdb;
 
+<<<<<<< .mine
+		$username = $this->escape( $args[1] );
+		$password = $this->escape( $args[2] );
+		$data     = $args[3];
+||||||| .r11156
+		$blog_ID     = (int) $args[0];
+		$username  = $this->escape($args[1]);
+		$password   = $this->escape($args[2]);
+		$data        = $args[3];
+=======
 		$username  = $this->escape($args[1]);
 		$password   = $this->escape($args[2]);
 		$data        = $args[3];
+>>>>>>> .r12027
 
 		$name = sanitize_file_name( $data['name'] );
 		$type = $data['type'];
@@ -5365,15 +7024,42 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type int    $numberposts
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mt_getRecentPostTitles($args) {
+	public function mt_getRecentPostTitles( $args ) {
+		$this->escape( $args );
 
+<<<<<<< .mine
+		$username = $args[1];
+		$password = $args[2];
+||||||| .r11156
 		$this->escape($args);
 
+		$blog_ID     = (int) $args[0];
 		$username  = $args[1];
 		$password   = $args[2];
+=======
+		$this->escape($args);
+
+		$username  = $args[1];
+		$password   = $args[2];
+>>>>>>> .r12027
 		if ( isset( $args[3] ) )
 			$query = array( 'numberposts' => absint( $args[3] ) );
 		else
@@ -5419,16 +7105,40 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $blog_id (unused)
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mt_getCategoryList($args) {
+	public function mt_getCategoryList( $args ) {
+		$this->escape( $args );
 
-		$this->escape($args);
+		$username = $args[1];
+		$password = $args[2];
+
+<<<<<<< .mine
+||||||| .r11156
+		$blog_ID     = (int) $args[0];
+		$username  = $args[1];
+		$password   = $args[2];
 
+=======
 		$username  = $args[1];
 		$password   = $args[2];
 
+>>>>>>> .r12027
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
 
@@ -5458,16 +7168,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mt_getPostCategories($args) {
-
-		$this->escape($args);
+	public function mt_getPostCategories( $args ) {
+		$this->escape( $args );
 
-		$post_ID     = (int) $args[0];
-		$username  = $args[1];
-		$password   = $args[2];
+		$post_ID  = (int) $args[0];
+		$username = $args[1];
+		$password = $args[2];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -5502,17 +7225,31 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 *     @type array  $categories
+	 * }
+	 * @return true|IXR_Error True on success.
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return bool True on success.
+=======
 	 * @param array $args Method parameters.
 	 * @return bool|IXR_Error True on success.
+>>>>>>> .r12027
 	 */
-	public function mt_setPostCategories($args) {
-
-		$this->escape($args);
+	public function mt_setPostCategories( $args ) {
+		$this->escape( $args );
 
-		$post_ID     = (int) $args[0];
-		$username  = $args[1];
+		$post_ID    = (int) $args[0];
+		$username   = $args[1];
 		$password   = $args[2];
-		$categories  = $args[3];
+		$categories = $args[3];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -5541,30 +7278,21 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param array $args Method parameters.
 	 * @return array
 	 */
-	public function mt_supportedMethods($args) {
-
+	public function mt_supportedMethods() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.supportedMethods' );
 
-		$supported_methods = array();
-		foreach ( $this->methods as $key => $value ) {
-			$supported_methods[] = $key;
-		}
-
-		return $supported_methods;
+		return array_keys( $this->methods );
 	}
 
 	/**
 	 * Retrieve an empty array because we don't support per-post text filters.
 	 *
 	 * @since 1.5.0
-	 *
-	 * @param array $args Method parameters.
 	 */
-	public function mt_supportedTextFilters($args) {
+	public function mt_supportedTextFilters() {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.supportedTextFilters' );
 
@@ -5583,15 +7311,22 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @global wpdb $wpdb
+	 *
+	 * @param int $post_ID
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return mixed
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mt_getTrackbackPings($args) {
-
+	public function mt_getTrackbackPings( $post_ID ) {
 		global $wpdb;
 
-		$post_ID = intval($args);
-
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
 
@@ -5626,16 +7361,29 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type int    $post_ID
+	 *     @type string $username
+	 *     @type string $password
+	 * }
+	 * @return int|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return int
+=======
 	 * @param array $args Method parameters.
 	 * @return int|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function mt_publishPost($args) {
-
-		$this->escape($args);
+	public function mt_publishPost( $args ) {
+		$this->escape( $args );
 
-		$post_ID     = (int) $args[0];
-		$username  = $args[1];
-		$password   = $args[2];
+		$post_ID  = (int) $args[0];
+		$username = $args[1];
+		$password = $args[2];
 
 		if ( !$user = $this->login($username, $password) )
 			return $this->error;
@@ -5657,9 +7405,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$postdata['post_category'] = $cats;
 		$this->escape($postdata);
 
-		$result = wp_update_post($postdata);
-
-		return $result;
+		return wp_update_post( $postdata );
 	}
 
 	/* PingBack functions
@@ -5671,24 +7417,51 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @global wpdb $wpdb
+	 * @global string $wp_version
+	 *
+	 * @param array  $args {
+	 *     Method arguments. Note: arguments must be ordered as documented.
+	 *
+	 *     @type string $pagelinkedfrom
+	 *     @type string $pagelinkedto
+	 * }
+	 * @return string|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return string|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function pingback_ping($args) {
-		global $wpdb;
+	public function pingback_ping( $args ) {
+		global $wpdb, $wp_version;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'pingback.ping' );
 
-		$this->escape($args);
+		$this->escape( $args );
 
-		$pagelinkedfrom = $args[0];
-		$pagelinkedto   = $args[1];
+		$pagelinkedfrom = str_replace( '&', '&', $args[0] );
+		$pagelinkedto = str_replace( '&', '&', $args[1] );
+		$pagelinkedto = str_replace( '&', '&', $pagelinkedto );
+
+<<<<<<< .mine
+||||||| .r11156
+		$title = '';
 
 		$pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom);
 		$pagelinkedto = str_replace('&', '&', $pagelinkedto);
 		$pagelinkedto = str_replace('&', '&', $pagelinkedto);
 
+=======
+		$pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom);
+		$pagelinkedto = str_replace('&', '&', $pagelinkedto);
+		$pagelinkedto = str_replace('&', '&', $pagelinkedto);
+
+>>>>>>> .r12027
 		/**
 		 * Filter the pingback source URI.
 		 *
@@ -5766,7 +7539,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
 
 		/** This filter is documented in wp-includes/class-http.php */
-		$user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . $GLOBALS['wp_version'] . '; ' . get_bloginfo( 'url' ) );
+		$user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) );
 
 		// Let's check the remote site
 		$http_api_args = array(
@@ -5877,19 +7650,26 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 1.5.0
 	 *
+<<<<<<< .mine
+	 * @global wpdb $wpdb
+	 *
+	 * @param string $url
+	 * @return array|IXR_Error
+||||||| .r11156
+	 * @param array $args Method parameters.
+	 * @return array
+=======
 	 * @param array $args Method parameters.
 	 * @return array|IXR_Error
+>>>>>>> .r12027
 	 */
-	public function pingback_extensions_getPingbacks($args) {
-
+	public function pingback_extensions_getPingbacks( $url ) {
 		global $wpdb;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
 
-		$this->escape($args);
-
-		$url = $args;
+		$url = $this->escape( $url );
 
 		$post_ID = url_to_postid($url);
 		if ( !$post_ID ) {
@@ -5918,10 +7698,19 @@ class wp_xmlrpc_server extends IXR_Server {
 		return $pingbacks;
 	}
 
+<<<<<<< .mine
+	/**
+	 * @param integer $code
+	 * @param string $message
+	 * @return IXR_Error
+	 */
+||||||| .r11156
+=======
 	/**
 	 * @param integer $code
 	 * @param string $message
 	 */
+>>>>>>> .r12027
 	protected function pingback_error( $code, $message ) {
 		/**
 		 * Filter the XML-RPC pingback error return.
diff --git a/pavillonmadeleine.fr/wp-includes/class-wp.php b/pavillonmadeleine.fr/wp-includes/class-wp.php
index a079c122..b5d9f91c 100644
--- a/pavillonmadeleine.fr/wp-includes/class-wp.php
+++ b/pavillonmadeleine.fr/wp-includes/class-wp.php
@@ -115,6 +115,8 @@ class WP {
 	 *
 	 * @since 2.0.0
 	 *
+	 * @global WP_Rewrite $wp_rewrite
+	 *
 	 * @param array|string $extra_query_vars Set the extra query variables.
 	 */
 	public function parse_request($extra_query_vars = '') {
@@ -157,6 +159,7 @@ class WP {
 			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
 			$self = $_SERVER['PHP_SELF'];
 			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
+			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
@@ -164,13 +167,13 @@ class WP {
 			// requested permalink.
 			$req_uri = str_replace($pathinfo, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace("|^$home_path|i", '', $req_uri);
+			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
 			$req_uri = trim($req_uri, '/');
 			$pathinfo = trim($pathinfo, '/');
-			$pathinfo = preg_replace("|^$home_path|i", '', $pathinfo);
+			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
 			$pathinfo = trim($pathinfo, '/');
 			$self = trim($self, '/');
-			$self = preg_replace("|^$home_path|i", '', $self);
+			$self = preg_replace( $home_path_regex, '', $self );
 			$self = trim($self, '/');
 
 			// The requested permalink is in $pathinfo for path info requests and
@@ -306,6 +309,9 @@ class WP {
 			}
 		}
 
+		// Resolve conflicts between posts with numeric slugs and date archive queries.
+		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+
 		foreach ( (array) $this->private_query_vars as $var) {
 			if ( isset($this->extra_query_vars[$var]) )
 				$this->query_vars[$var] = $this->extra_query_vars[$var];
@@ -488,13 +494,14 @@ class WP {
 	 * be taken when naming global variables that might interfere with the
 	 * WordPress environment.
 	 *
-	 * @global string $query_string Query string for the loop.
-	 * @global array $posts The found posts.
+	 * @global WP_Query     $wp_query
+	 * @global string       $query_string Query string for the loop.
+	 * @global array        $posts The found posts.
 	 * @global WP_Post|null $post The current post, if available.
-	 * @global string $request The SQL statement for the request.
-	 * @global int $more Only set, if single page or post.
-	 * @global int $single If single page or post. Only set, if single page or post.
-	 * @global WP_User $authordata Only set, if author archive.
+	 * @global string       $request The SQL statement for the request.
+	 * @global int          $more Only set, if single page or post.
+	 * @global int          $single If single page or post. Only set, if single page or post.
+	 * @global WP_User      $authordata Only set, if author archive.
 	 *
 	 * @since 2.0.0
 	 */
@@ -533,6 +540,8 @@ class WP {
 	 * Set up the Loop based on the query variables.
 	 *
 	 * @since 2.0.0
+	 *
+	 * @global WP_Query $wp_the_query
 	 */
 	public function query_posts() {
 		global $wp_the_query;
@@ -550,6 +559,8 @@ class WP {
 	 * Otherwise, issue a 200.
 	 *
 	 * @since 2.0.0
+	 *
+	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
 		global $wp_query;
@@ -621,7 +632,6 @@ class WP {
 		 */
 		do_action_ref_array( 'wp', array( &$this ) );
 	}
-
 }
 
 /**
@@ -678,7 +688,9 @@ class WP_MatchesMapRegex {
 	 *
 	 * static helper function to ease use
 	 *
+	 * @static
 	 * @access public
+	 *
 	 * @param string $subject subject
 	 * @param array  $matches data used for substitution
 	 * @return string
@@ -710,5 +722,4 @@ class WP_MatchesMapRegex {
 		$index = intval(substr($matches[0], 9, -1));
 		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
 	}
-
 }
diff --git a/pavillonmadeleine.fr/wp-includes/class.wp-dependencies.php b/pavillonmadeleine.fr/wp-includes/class.wp-dependencies.php
index 7995a908..918c5315 100644
--- a/pavillonmadeleine.fr/wp-includes/class.wp-dependencies.php
+++ b/pavillonmadeleine.fr/wp-includes/class.wp-dependencies.php
@@ -213,7 +213,7 @@ class WP_Dependencies {
 	 * @param array  $deps   Optional. An array of item handle strings on which this item depends.
 	 * @param string $ver    Optional. Version (used for cache busting).
 	 * @param mixed  $args   Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer.
-	 * @return bool True on success, false on failure.
+	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
 		if ( isset($this->registered[$handle]) )
@@ -331,7 +331,7 @@ class WP_Dependencies {
 	 *
 	 * @param array  $queue  An array of queued _WP_Dependency handle objects.
 	 * @param string $handle Name of the item. Should be unique.
-	 * @return boolean Whether the handle is found after recursively searching the dependency tree.
+	 * @return bool Whether the handle is found after recursively searching the dependency tree.
 	 */
 	protected function recurse_deps( $queue, $handle ) {
 		foreach ( $queue as $queued ) {
diff --git a/pavillonmadeleine.fr/wp-includes/class.wp-scripts.php b/pavillonmadeleine.fr/wp-includes/class.wp-scripts.php
index b7c7deda..4c2f45df 100644
--- a/pavillonmadeleine.fr/wp-includes/class.wp-scripts.php
+++ b/pavillonmadeleine.fr/wp-includes/class.wp-scripts.php
@@ -35,6 +35,9 @@ class WP_Scripts extends WP_Dependencies {
 		add_action( 'init', array( $this, 'init' ), 0 );
 	}
 
+	/**
+	 * @access public
+	 */
 	public function init() {
 		/**
 		 * Fires when the WP_Scripts instance is initialized.
@@ -61,12 +64,24 @@ class WP_Scripts extends WP_Dependencies {
 		return $this->do_items( $handles, $group );
 	}
 
-	// Deprecated since 3.3, see print_extra_script()
+	/**
+	 * @deprecated 3.3
+	 * @see print_extra_script()
+	 *
+	 * @param string $handle
+	 * @param bool   $echo
+	 * @return bool|string|void
+	 */
 	public function print_scripts_l10n( $handle, $echo = true ) {
 		_deprecated_function( __FUNCTION__, '3.3', 'print_extra_script()' );
 		return $this->print_extra_script( $handle, $echo );
 	}
 
+	/**
+	 * @param string $handle
+	 * @param bool   $echo
+	 * @return bool|string|void
+	 */
 	public function print_extra_script( $handle, $echo = true ) {
 		if ( !$output = $this->get_data( $handle, 'data' ) )
 			return;
@@ -83,6 +98,11 @@ class WP_Scripts extends WP_Dependencies {
 		return true;
 	}
 
+	/**
+	 * @param string   $handle Name of the item. Should be unique.
+	 * @param int|bool $group
+	 * @return bool True on success, false if not set.
+	 */
 	public function do_item( $handle, $group = false ) {
 		if ( !parent::do_item($handle) )
 			return false;
@@ -163,6 +183,26 @@ class WP_Scripts extends WP_Dependencies {
 
 		$tag = "{$cond_before}\n{$cond_after}";
 
+<<<<<<< .mine
+		/**
+		 * Filter the HTML script tag of an enqueued script.
+		 *
+		 * @since 4.1.0
+		 *
+		 * @param string $tag    The `
+		 apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+		);
+
+		/*
+		 * If you're looking at a src version of this file, you'll see an "include"
+		 * statement below. This is used by the `grunt build` process to directly
+		 * include a minified version of wp-emoji-loader.js, instead of using the
+		 * readfile() method from above.
+		 *
+		 * If you're looking at a build version of this file, you'll see a string of
+		 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
+		 * and edit wp-emoji-loader.js directly.
+		 */
+		?>
+		
+		)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
+	$stop = count( $textarr );
+
+	// Ignore processing of specific tags.
+	$tags_to_ignore = 'code|pre|style|script|textarea';
+	$ignore_block_element = '';
+
+	for ( $i = 0; $i < $stop; $i++ ) {
+		$content = $textarr[$i];
+
+		// If we're in an ignore block, wait until we find its closing tag.
+		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			$ignore_block_element = $matches[1];
+		}
+
+		// If it's not a tag and not in ignore block.
+		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+			$matches = array();
+			if ( preg_match_all( '/(Ǳ(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
+				if ( ! empty( $matches[0] ) ) {
+					foreach ( $matches[0] as $flag ) {
+						$chars = str_replace( array( '&#x', ';'), '', $flag );
+
+						list( $char1, $char2 ) = str_split( $chars, 5 );
+						$entity = sprintf( '', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+
+						$content = str_replace( $flag, $entity, $content );
+					}
+				}
+			}
+
+			// Loosely match the Emoji Unicode range.
+			$regex = '/(&#x[2-3][0-9a-f]{3};|[1-6][0-9a-f]{2};)/';
+
+			$matches = array();
+			if ( preg_match_all( $regex, $content, $matches ) ) {
+				if ( ! empty( $matches[1] ) ) {
+					foreach ( $matches[1] as $emoji ) {
+						$char = str_replace( array( '&#x', ';'), '', $emoji );
+						$entity = sprintf( '', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+
+						$content = str_replace( $emoji, $entity, $content );
+					}
+				}
+			}
+		}
+
+		// Did we exit ignore block.
+		if ( '' != $ignore_block_element && '' == $content )  {
+			$ignore_block_element = '';
+		}
+
+		$output .= $content;
+	}
+
+	return $output;
+}
+
+/**
+ * Convert emoji in emails into static images.
+ *
+ * @since 4.2.0
+ *
+ * @param array $mail The email data array.
+ * @return array The email data array, with emoji in the message staticized.
+ */
+function wp_staticize_emoji_for_email( $mail ) {
+	if ( ! isset( $mail['message'] ) ) {
+		return $mail;
+	}
+
+	/*
+	 * We can only transform the emoji into images if it's a text/html email.
+	 * To do that, here's a cut down version of the same process that happens
+	 * in wp_mail() - get the Content-Type from the headers, if there is one,
+	 * then pass it through the wp_mail_content_type filter, in case a plugin
+	 * is handling changing the Content-Type.
+	 */
+	$headers = array();
+	if ( isset( $mail['headers'] ) ) {
+		if ( is_array( $mail['headers'] ) ) {
+			$headers = $mail['headers'];
+		} else {
+			$headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+		}
+	}
+
+	foreach ( $headers as $header ) {
+		if ( strpos($header, ':') === false ) {
+			continue;
+		}
+
+		// Explode them out.
+		list( $name, $content ) = explode( ':', trim( $header ), 2 );
+
+		// Cleanup crew.
+		$name    = trim( $name    );
+		$content = trim( $content );
+
+		if ( 'content-type' === strtolower( $name ) ) {
+			if ( strpos( $content, ';' ) !== false ) {
+				list( $type, $charset ) = explode( ';', $content );
+				$content_type = trim( $type );
+			} else {
+				$content_type = trim( $content );
+			}
+			break;
+		}
+	}
+
+	// Set Content-Type if we don't have a content-type from the input headers.
+	if ( ! isset( $content_type ) ) {
+		$content_type = 'text/plain';
+	}
+
+	/** This filter is documented in wp-includes/pluggable.php */
+	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+
+	if ( 'text/html' === $content_type ) {
+		$mail['message'] = wp_staticize_emoji( $mail['message'] );
+	}
+
+	return $mail;
+}
+||||||| .r11156
+=======
 
 /**
  * Print the important emoji-related styles.
@@ -4516,3 +5156,4 @@ function wp_staticize_emoji_for_email( $mail ) {
 
 	return $mail;
 }
+>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/functions.php b/pavillonmadeleine.fr/wp-includes/functions.php
index 929c4e21..1ff2ede2 100644
--- a/pavillonmadeleine.fr/wp-includes/functions.php
+++ b/pavillonmadeleine.fr/wp-includes/functions.php
@@ -78,6 +78,8 @@ function current_time( $type, $gmt = 0 ) {
  *
  * @since 0.71
  *
+ * @global WP_Locale $wp_locale
+ *
  * @param string   $dateformatstring Format to display the date.
  * @param bool|int $unixtimestamp    Optional. Unix timestamp. Default false.
  * @param bool     $gmt              Optional. Whether to use GMT timezone. Default false.
@@ -161,6 +163,8 @@ function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
  *
  * @since 2.3.0
  *
+ * @global WP_Locale $wp_locale
+ *
  * @param int $number   The number to convert based on locale.
  * @param int $decimals Optional. Precision of the number of decimal places. Default 0.
  * @return string Converted number in string format.
@@ -380,7 +384,14 @@ function maybe_serialize( $data ) {
 		return serialize( $data );
 
 	// Double serialization is required for backward compatibility.
+<<<<<<< .mine
 	// See https://core.trac.wordpress.org/ticket/12930
+	// Also the world will end. See WP 3.6.1.
+||||||| .r11156
+	// See http://core.trac.wordpress.org/ticket/12930
+=======
+	// See https://core.trac.wordpress.org/ticket/12930
+>>>>>>> .r12027
 	if ( is_serialized( $data, false ) )
 		return serialize( $data );
 
@@ -490,10 +501,10 @@ function wp_extract_urls( $content ) {
  *
  * @since 1.5.0
  *
- * @see $wpdb
+ * @global wpdb $wpdb
  *
  * @param string $content Post Content.
- * @param int $post_ID Post ID.
+ * @param int    $post_ID Post ID.
  */
 function do_enclose( $content, $post_ID ) {
 	global $wpdb;
@@ -870,7 +881,17 @@ function wp_remote_fopen( $uri ) {
  *
  * @since 2.0.0
  *
+<<<<<<< .mine
+ * @global WP       $wp_locale
+ * @global WP_Query $wp_query
+ * @global WP_Query $wp_the_query
+ *
  * @param string|array $query_vars Default WP_Query arguments.
+||||||| .r11156
+ * @param string $query_vars Default WP_Query arguments.
+=======
+ * @param string|array $query_vars Default WP_Query arguments.
+>>>>>>> .r12027
  */
 function wp( $query_vars = '' ) {
 	global $wp, $wp_query, $wp_the_query;
@@ -885,6 +906,8 @@ function wp( $query_vars = '' ) {
  *
  * @since 2.3.0
  *
+ * @global array $wp_header_to_desc
+ *
  * @param int $code HTTP status code.
  * @return string Empty string if not found, or description if found.
  */
@@ -1124,7 +1147,7 @@ function bool_from_yn( $yn ) {
  *
  * @since 2.1.0
  *
- * @uses $wp_query Used to tell if the use a comment feed.
+ * @global WP_Query $wp_query Used to tell if the use a comment feed.
  */
 function do_feed() {
 	global $wp_query;
@@ -1473,7 +1496,7 @@ function wp_mkdir_p( $target ) {
 	$wrapper = null;
 
 	// Strip the protocol.
-	if( wp_is_stream( $target ) ) {
+	if ( wp_is_stream( $target ) ) {
 		list( $wrapper, $target ) = explode( '://', $target, 2 );
 	}
 
@@ -1481,7 +1504,7 @@ function wp_mkdir_p( $target ) {
 	$target = str_replace( '//', '/', $target );
 
 	// Put the wrapper back on the target.
-	if( $wrapper !== null ) {
+	if ( $wrapper !== null ) {
 		$target = $wrapper . '://' . $target;
 	}
 
@@ -1605,10 +1628,12 @@ function wp_normalize_path( $path ) {
  *
  * @since 2.5.0
  *
+ * @staticvar string $temp
+ *
  * @return string Writable temporary directory.
  */
 function get_temp_dir() {
-	static $temp;
+	static $temp = '';
 	if ( defined('WP_TEMP_DIR') )
 		return trailingslashit(WP_TEMP_DIR);
 
@@ -1629,8 +1654,7 @@ function get_temp_dir() {
 	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
 		return $temp;
 
-	$temp = '/tmp/';
-	return $temp;
+	return '/tmp/';
 }
 
 /**
@@ -2000,8 +2024,7 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
  * @since 2.5.0
  *
  * @param string $ext The extension to search.
- * @return string|null The file type, example: audio, video, document, spreadsheet, etc.
- *                     Null if not found.
+ * @return string|void The file type, example: audio, video, document, spreadsheet, etc.
  */
 function wp_ext2type( $ext ) {
 	$ext = strtolower( $ext );
@@ -2031,8 +2054,6 @@ function wp_ext2type( $ext ) {
 	foreach ( $ext2type as $type => $exts )
 		if ( in_array( $ext, $exts ) )
 			return $type;
-
-	return null;
 }
 
 /**
@@ -2084,7 +2105,6 @@ function wp_check_filetype( $filename, $mimes = null ) {
  *               if original $filename is valid.
  */
 function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
-
 	$proper_filename = false;
 
 	// Do basic extension validation and MIME mapping
@@ -2473,6 +2493,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 >
 
 	
+	
 	<?php echo $title ?>
 	' +
+							'' +
+							'' +
+								body +
+							'' +
+						''
+					);
+
+					iframeDoc.close();
+
+					function resize() {
+						var $iframe;
+
+						if ( block ) {
+							return;
+						}
+
+						// Make sure the iframe still exists.
+						if ( iframe.contentWindow ) {
+							$iframe = $( iframe );
+							self.iframeHeight = $( iframeDoc.body ).height();
+
+							if ( $iframe.height() !== self.iframeHeight ) {
+								$iframe.height( self.iframeHeight );
+								editor.nodeChanged();
+							}
+						}
+					}
+
+					if ( self.iframeHeight ) {
+						block = true;
+
+						setTimeout( function() {
+							block = false;
+							resize();
+						}, 3000 );
+					}
+
+					$( iframe.contentWindow ).on( 'load', resize );
+
+					if ( MutationObserver ) {
+						observer = new MutationObserver( _.debounce( resize, 100 ) );
+
+						observer.observe( iframeDoc.body, {
+							attributes: true,
+							childList: true,
+							subtree: true
+						} );
+
+						$( node ).one( 'wp-mce-view-unbind', function() {
+							observer.disconnect();
+						} );
+					} else {
+						for ( i = 1; i < 6; i++ ) {
+							setTimeout( resize, i * 700 );
+						}
+					}
+||||||| .r11156
+						this.setError( this.error.message, 'admin-media' );
+					} else {
+						this.setContent( '' + this.original + '', 'replace' );
+					}
+				} else if ( this.error.statusText ) {
+					this.setError( this.error.statusText, 'admin-media' );
+				} else if ( this.original ) {
+					this.setContent( '' + this.original + '', 'replace' );
+				}
+			},
+=======
 					$( node ).one( 'wp-mce-view-unbind', function() {
 						editor.off( 'wp-body-class-change', classChange );
 					} );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+					function classChange() {
+						iframeDoc.body.className = editor.getBody().className;
+					}
+||||||| .r11156
+			stopPlayers: function( remove ) {
+				var rem = remove === 'remove';
+=======
 					callback && callback.call( self, editor, node, contentNode );
 				}, 50 );
 			}, rendered );
 		},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+					editor.on( 'wp-body-class-change', classChange );
+||||||| .r11156
+				this.getNodes( function( editor, node, content ) {
+					var p, win,
+						iframe = $( 'iframe.wpview-sandbox', content ).get(0);
+=======
 		/**
 		 * Sets a loader for all view nodes tied to this view instance.
 		 */
@@ -621,7 +1299,19 @@ window.wp = window.wp || {};
 				''
 			);
 		},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+					$( node ).one( 'wp-mce-view-unbind', function() {
+						editor.off( 'wp-body-class-change', classChange );
+					} );
+||||||| .r11156
+					if ( iframe && ( win = iframe.contentWindow ) && win.mejs ) {
+						// Sometimes ME.js may show a "Download File" placeholder and player.remove() doesn't exist there.
+						try {
+							for ( p in win.mejs.players ) {
+								win.mejs.players[p].pause();
+=======
 		/**
 		 * Sets an error for all view nodes tied to this view instance.
 		 *
@@ -636,7 +1326,64 @@ window.wp = window.wp || {};
 				''
 			);
 		},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+					callback && callback.call( self, editor, node, contentNode );
+				}, 50 );
+			}, rendered );
+		},
+
+		/**
+		 * Sets a loader for all view nodes tied to this view instance.
+		 */
+		setLoader: function() {
+			this.setContent(
+				'' +
+					'' +
+					'' +
+				''
+			);
+		},
+
+		/**
+		 * Sets an error for all view nodes tied to this view instance.
+		 *
+		 * @param {String} message  The error message to set.
+		 * @param {String} dashicon A dashicon ID. Optional. {@link https://developer.wordpress.org/resource/dashicons/}
+		 */
+		setError: function( message, dashicon ) {
+			this.setContent(
+				'' +
+					'' +
+					'' + message + '' +
+				''
+			);
+		},
+
+		/**
+		 * Tries to find a text match in a given string.
+		 *
+		 * @param {String} content The string to scan.
+		 *
+		 * @return {Object}
+		 */
+		match: function( content ) {
+			var match = shortcode.next( this.type, content );
 
+			if ( match ) {
+				return {
+					index: match.index,
+					content: match.content,
+					options: {
+						shortcode: match.shortcode
+||||||| .r11156
+								if ( rem ) {
+									win.mejs.players[p].remove();
+								}
+							}
+						} catch( er ) {}
+=======
 		/**
 		 * Tries to find a text match in a given string.
 		 *
@@ -653,6 +1400,7 @@ window.wp = window.wp || {};
 					content: match.content,
 					options: {
 						shortcode: match.shortcode
+>>>>>>> .r12027
 					}
 				};
 			}
@@ -661,10 +1409,29 @@ window.wp = window.wp || {};
 		/**
 		 * Update the text of a given view node.
 		 *
+<<<<<<< .mine
+		 * @param {String}         text   The new text.
+		 * @param {tinymce.Editor} editor The TinyMCE editor instance the view node is in.
+		 * @param {HTMLElement}    node   The view node to update.
+		 * @param {Boolean}        force  Recreate the instance. Optional.
+||||||| .r11156
+		 * @param {HTMLElement} node
+=======
 		 * @param {String}         text   The new text.
 		 * @param {tinymce.Editor} editor The TinyMCE editor instance the view node is in.
 		 * @param {HTMLElement}    node   The view node to update.
+>>>>>>> .r12027
 		 */
+<<<<<<< .mine
+		update: function( text, editor, node, force ) {
+			_.find( views, function( view, type ) {
+				var match = view.prototype.match( text );
+||||||| .r11156
+		edit: function( node ) {
+			var media = wp.media[ this.type ],
+				self = this,
+				frame, data, callback;
+=======
 		update: function( text, editor, node ) {
 			_.find( views, function( view, type ) {
 				var match = view.prototype.match( text );
@@ -710,15 +1477,75 @@ window.wp = window.wp || {};
 		edit: function( text, update ) {
 			var media = wp.media[ this.type ],
 				frame = media.edit( text );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				if ( match ) {
+					$( node ).data( 'rendered', false );
+					editor.dom.setAttrib( node, 'data-wpview-text', encodeURIComponent( text ) );
+					wp.mce.views.createInstance( type, text, match.options, force ).render();
+					editor.focus();
+||||||| .r11156
+			$( document ).trigger( 'media:edit' );
+=======
 			this.pausePlayers && this.pausePlayers();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+					return true;
+				}
+			} );
+		},
+
+		/**
+		 * Remove a given view node from the DOM.
+		 *
+		 * @param {tinymce.Editor} editor The TinyMCE editor instance the view node is in.
+		 * @param {HTMLElement}    node   The view node to remove.
+		 */
+		remove: function( editor, node ) {
+			this.unbindNode.call( this, editor, node, $( node ).find( '.wpview-content' ).get( 0 ) );
+			$( node ).trigger( 'wp-mce-view-unbind' );
+			editor.dom.remove( node );
+			editor.focus();
+		}
+	} );
+} )( window, window.wp, window.wp.shortcode, window.jQuery );
+
+/*
+ * The WordPress core TinyMCE views.
+ * Views for the gallery, audio, video, playlist and embed shortcodes,
+ * and a view for embeddable URLs.
+ */
+( function( window, views, media, $ ) {
+	var base, gallery, av, embed;
+
+	base = {
+		state: [],
 
+		edit: function( text, update ) {
+			var type = this.type,
+				frame = media[ type ].edit( text );
+
+			this.pausePlayers && this.pausePlayers();
+
+			_.each( this.state, function( state ) {
+				frame.state( state ).on( 'update', function( selection ) {
+					update( media[ type ].shortcode( selection ).string(), type === 'gallery' );
+				} );
+			} );
+
+||||||| .r11156
+			data = window.decodeURIComponent( $( node ).attr('data-wpview-text') );
+			frame = media.edit( data );
+=======
 			_.each( this.state, function( state ) {
 				frame.state( state ).on( 'update', function( selection ) {
 					update( media.shortcode( selection ).string() );
 				} );
 			} );
 
+>>>>>>> .r12027
 			frame.on( 'close', function() {
 				frame.detach();
 			} );
@@ -727,14 +1554,45 @@ window.wp = window.wp || {};
 		}
 	};
 
+<<<<<<< .mine
+	gallery = _.extend( {}, base, {
+		state: [ 'gallery-edit' ],
+		template: media.template( 'editor-gallery' ),
+||||||| .r11156
+	/**
+	 * TinyMCE handler for the video shortcode
+	 *
+	 * @mixes wp.mce.av
+	 */
+	wp.mce.views.register( 'video', _.extend( {}, wp.mce.av, {
+		state: 'video-details'
+	} ) );
+=======
 	gallery = _.extend( {}, media, {
 		state: [ 'gallery-edit' ],
 		template: wp.media.template( 'editor-gallery' ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		initialize: function() {
+			var attachments = media.gallery.attachments( this.shortcode, media.view.settings.post.id ),
+				attrs = this.shortcode.attrs.named,
+				self = this;
+||||||| .r11156
+	/**
+	 * TinyMCE handler for the audio shortcode
+	 *
+	 * @mixes wp.mce.av
+	 */
+	wp.mce.views.register( 'audio', _.extend( {}, wp.mce.av, {
+		state: 'audio-details'
+	} ) );
+=======
 		initialize: function() {
 			var attachments = wp.media.gallery.attachments( this.shortcode, postID ),
 				attrs = this.shortcode.attrs.named,
 				self = this;
+>>>>>>> .r12027
 
 			attachments.more()
 			.done( function() {
@@ -752,6 +1610,26 @@ window.wp = window.wp || {};
 					}
 				} );
 
+<<<<<<< .mine
+				self.render( self.template( {
+					attachments: attachments,
+					columns: attrs.columns ? parseInt( attrs.columns, 10 ) : media.galleryDefaults.columns
+				} ) );
+			} )
+			.fail( function( jqXHR, textStatus ) {
+				self.setError( textStatus );
+			} );
+		}
+	} );
+||||||| .r11156
+				if ( options.url ) {
+					this.shortcode = media.embed.shortcode( {
+						url: options.url
+					} );
+				} else {
+					this.shortcode = options.shortcode;
+				}
+=======
 				self.render( self.template( {
 					attachments: attachments,
 					columns: attrs.columns ? parseInt( attrs.columns, 10 ) : wp.media.galleryDefaults.columns
@@ -762,10 +1640,31 @@ window.wp = window.wp || {};
 			} );
 		}
 	} );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	av = _.extend( {}, base, {
+		action: 'parse-media-shortcode',
+||||||| .r11156
+				_.bindAll( this, 'setIframes', 'setNodes', 'fetch' );
+				$( this ).on( 'ready', this.setNodes );
+=======
 	av = _.extend( {}, media, {
 		action: 'parse-media-shortcode',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		initialize: function() {
+			var self = this;
+
+			if ( this.url ) {
+				this.loader = false;
+				this.shortcode = media.embed.shortcode( {
+					url: this.text
+				} );
+||||||| .r11156
+				this.fetch();
+=======
 		initialize: function() {
 			var self = this;
 
@@ -774,8 +1673,28 @@ window.wp = window.wp || {};
 				this.shortcode = wp.media.embed.shortcode( {
 					url: this.text
 				} );
+>>>>>>> .r12027
 			}
 
+<<<<<<< .mine
+			wp.ajax.post( this.action, {
+				post_ID: media.view.settings.post.id,
+				type: this.shortcode.tag,
+				shortcode: this.shortcode.string()
+			} )
+			.done( function( response ) {
+				self.render( response );
+			} )
+			.fail( function( response ) {
+				if ( self.url ) {
+					self.removeMarkers();
+				} else {
+					self.setError( response.message || response.statusText, 'admin-media' );
+				}
+			} );
+||||||| .r11156
+			$( document ).trigger( 'media:edit' );
+=======
 			wp.ajax.post( this.action, {
 				post_ID: postID,
 				type: this.shortcode.tag,
@@ -791,6 +1710,7 @@ window.wp = window.wp || {};
 					self.setError( response.message || response.statusText, 'admin-media' );
 				}
 			} );
+>>>>>>> .r12027
 
 			this.getEditors( function( editor ) {
 				editor.on( 'wpview-selected', function() {
@@ -811,6 +1731,27 @@ window.wp = window.wp || {};
 					} );
 				}
 			} );
+<<<<<<< .mine
+		}
+	} );
+
+	embed = _.extend( {}, av, {
+		action: 'parse-embed',
+
+		edit: function( text, update ) {
+			var frame = media.embed.edit( text, this.url ),
+				self = this;
+
+			this.pausePlayers();
+
+			frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
+				if ( url && model.get( 'url' ) ) {
+					frame.state( 'embed' ).metadata = model.toJSON();
+				}
+			} );
+
+||||||| .r11156
+=======
 		}
 	} );
 
@@ -830,13 +1771,20 @@ window.wp = window.wp || {};
 				}
 			} );
 
+>>>>>>> .r12027
 			frame.state( 'embed' ).on( 'select', function() {
 				var data = frame.state( 'embed' ).metadata;
 
 				if ( self.url ) {
 					update( data.url );
 				} else {
+<<<<<<< .mine
+					update( media.embed.shortcode( data ).string() );
+||||||| .r11156
+					shortcode = embed.shortcode( frame.state( 'embed' ).metadata ).string();
+=======
 					update( media.shortcode( data ).string() );
+>>>>>>> .r12027
 				}
 			} );
 
@@ -880,4 +1828,11 @@ window.wp = window.wp || {};
 			}
 		}
 	} ) );
+<<<<<<< .mine
+} )( window, window.wp.mce.views, window.wp.media, window.jQuery );
+||||||| .r11156
+
+}(jQuery));
+=======
 } )( window, window.wp.mce.views, window.jQuery );
+>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/mce-view.min.js b/pavillonmadeleine.fr/wp-includes/js/mce-view.min.js
index 3fe932d2..582896c1 100644
--- a/pavillonmadeleine.fr/wp-includes/js/mce-view.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/mce-view.min.js
@@ -1 +1,4 @@
-window.wp=window.wp||{},function(a,b,c){"use strict";var d={},e={};b.mce=b.mce||{},b.mce.views={register:function(a,c){d[a]=b.mce.View.extend(_.extend(c,{type:a}))},unregister:function(a){delete d[a]},get:function(a){return d[a]},unbind:function(){_.each(e,function(a){a.unbind()})},setMarkers:function(a){var b,c,e=[{content:a}],f=this;return _.each(d,function(a,d){c=e.slice(),e=[],_.each(c,function(c){var g,h,i=c.content;if(c.processed)return void e.push(c);for(;i&&(g=a.prototype.match(i));)g.index&&e.push({content:i.substring(0,g.index)}),b=f.createInstance(d,g.content,g.options),h=b.loader?".":b.text,e.push({content:''+h+"
",processed:!0}),i=i.slice(g.index+g.content.length);i&&e.push({content:i})})}),a=_.pluck(e,"content").join(""),a.replace(/\s*
")},createInstance:function(a,b,c){var d,f,g=this.get(a);return b=tinymce.DOM.decode(b),(f=this.getInstance(b))?f:(d=encodeURIComponent(b),c=_.extend(c||{},{text:b,encodedText:d}),e[d]=new g(c))},getInstance:function(a){return"string"==typeof a?e[encodeURIComponent(a)]:e[c(a).attr("data-wpview-text")]},getText:function(a){return decodeURIComponent(c(a).attr("data-wpview-text")||"")},render:function(a){_.each(e,function(b){b.render(a)})},update:function(a,b,c){var d=this.getInstance(c);d&&d.update(a,b,c)},edit:function(a,b){var c=this.getInstance(b);c&&c.edit&&c.edit(c.text,function(d){c.update(d,a,b)})},remove:function(a,b){var c=this.getInstance(b);c&&c.remove(a,b)}},b.mce.View=function(a){_.extend(this,a),this.initialize()},b.mce.View.extend=Backbone.View.extend,_.extend(b.mce.View.prototype,{content:null,loader:!0,initialize:function(){},getContent:function(){return this.content},render:function(a,b){null!=a&&(this.content=a),a=this.getContent(),(this.loader||a)&&(b&&this.unbind(),this.replaceMarkers(),a?this.setContent(a,function(a,b,d){c(b).data("rendered",!0),this.bindNode.call(this,a,b,d)},b?null:!1):this.setLoader())},bindNode:function(){},unbindNode:function(){},unbind:function(){this.getNodes(function(a,b,d){this.unbindNode.call(this,a,b,d),c(b).trigger("wp-mce-view-unbind")},!0)},getEditors:function(a){_.each(tinymce.editors,function(b){b.plugins.wpview&&a.call(this,b)},this)},getNodes:function(a,b){this.getEditors(function(d){var e=this;c(d.getBody()).find('[data-wpview-text="'+e.encodedText+'"]').filter(function(){var a;return null==b?!0:(a=c(this).data("rendered")===!0,b?a:!a)}).each(function(){a.call(e,d,this,c(this).find(".wpview-content").get(0))})})},getMarkers:function(a){this.getEditors(function(b){var d=this;c(b.getBody()).find('[data-wpview-marker="'+this.encodedText+'"]').each(function(){a.call(d,b,this)})})},replaceMarkers:function(){this.getMarkers(function(a,b){return this.loader||c(b).text()===this.text?void a.dom.replace(a.dom.createFragment('
Â 
Â 
'),b):void a.dom.setAttrib(b,"data-wpview-marker",null)})},removeMarkers:function(){this.getMarkers(function(a,b){a.dom.setAttrib(b,"data-wpview-marker",null)})},setContent:function(a,b,c){_.isObject(a)&&-1!==a.body.indexOf("
'),e.innerHTML="",e.appendChild(_.isString(a)?c.dom.createFragment(a):a),b&&b.call(this,c,d,e)},c)},setIframes:function(b,d,e,f){var g=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,h=this;this.getNodes(function(a,f,i){var j=a.dom,k="",l=a.getBody().className||"",m=a.getDoc().getElementsByTagName("head")[0];tinymce.each(j.$('link[rel="stylesheet"]',m),function(a){a.href&&-1===a.href.indexOf("skins/lightgray/content.min.css")&&-1===a.href.indexOf("skins/wordpress/wp-content.css")&&(k+=j.getOuterHTML(a))}),setTimeout(function(){function m(){var b,d;o.contentWindow&&(b=c(o),d=c(p.body).height(),b.height()!==d&&(b.height(d),a.nodeChanged()))}function n(){p.body.className=a.getBody().className}var o,p,q,r;if(i.innerHTML="",o=j.add(i,"iframe",{src:tinymce.Env.ie?'javascript:""':"",frameBorder:"0",allowTransparency:"true",scrolling:"no","class":"wpview-sandbox",style:{width:"100%",display:"block"}}),j.add(i,"div",{"class":"wpview-overlay"}),p=o.contentWindow.document,p.open(),p.write(''+b+k+''+d+""),p.close(),c(o.contentWindow).on("load",m),g)q=new g(_.debounce(m,100)),q.observe(p.body,{attributes:!0,childList:!0,subtree:!0}),c(f).one("wp-mce-view-unbind",function(){q.disconnect()});else for(r=1;6>r;r++)setTimeout(m,700*r);a.on("wp-body-class-change",n),c(f).one("wp-mce-view-unbind",function(){a.off("wp-body-class-change",n)}),e&&e.call(h,a,f,i)},50)},f)},setLoader:function(){this.setContent('
')},setError:function(a,b){this.setContent('
'+a+"
")},match:function(a){var c=b.shortcode.next(this.type,a);return c?{index:c.index,content:c.content,options:{shortcode:c.shortcode}}:void 0},update:function(a,e,f){_.find(d,function(d,g){var h=d.prototype.match(a);return h?(c(f).data("rendered",!1),e.dom.setAttrib(f,"data-wpview-text",encodeURIComponent(a)),b.mce.views.createInstance(g,a,h.options).render(),e.focus(),!0):void 0})},remove:function(a,b){this.unbindNode.call(this,a,b,c(b).find(".wpview-content").get(0)),c(b).trigger("wp-mce-view-unbind"),a.dom.remove(b),a.focus()}})}(window,window.wp,window.jQuery),function(a,b,c){var d,e,f,g,h=c("#post_ID").val()||0;d={state:[],edit:function(a,b){var c=wp.media[this.type],d=c.edit(a);this.pausePlayers&&this.pausePlayers(),_.each(this.state,function(a){d.state(a).on("update",function(a){b(c.shortcode(a).string())})}),d.on("close",function(){d.detach()}),d.open()}},e=_.extend({},d,{state:["gallery-edit"],template:wp.media.template("editor-gallery"),initialize:function(){var a=wp.media.gallery.attachments(this.shortcode,h),b=this.shortcode.attrs.named,c=this;a.more().done(function(){a=a.toJSON(),_.each(a,function(a){a.sizes&&(b.size&&a.sizes[b.size]?a.thumbnail=a.sizes[b.size]:a.sizes.thumbnail?a.thumbnail=a.sizes.thumbnail:a.sizes.full&&(a.thumbnail=a.sizes.full))}),c.render(c.template({attachments:a,columns:b.columns?parseInt(b.columns,10):wp.media.galleryDefaults.columns}))}).fail(function(a,b){c.setError(b)})}}),f=_.extend({},d,{action:"parse-media-shortcode",initialize:function(){var a=this;this.url&&(this.loader=!1,this.shortcode=wp.media.embed.shortcode({url:this.text})),wp.ajax.post(this.action,{post_ID:h,type:this.shortcode.tag,shortcode:this.shortcode.string()}).done(function(b){a.render(b)}).fail(function(b){a.url?a.removeMarkers():a.setError(b.message||b.statusText,"admin-media")}),this.getEditors(function(b){b.on("wpview-selected",function(){a.pausePlayers()})})},pausePlayers:function(){this.getNodes(function(a,b,d){var e=c("iframe.wpview-sandbox",d).get(0);e&&(e=e.contentWindow)&&e.mejs&&_.each(e.mejs.players,function(a){try{a.pause()}catch(b){}})})}}),g=_.extend({},f,{action:"parse-embed",edit:function(a,b){var c=wp.media.embed,d=c.edit(a,this.url),e=this;this.pausePlayers(),d.state("embed").props.on("change:url",function(a,b){b&&a.get("url")&&(d.state("embed").metadata=a.toJSON())}),d.state("embed").on("select",function(){var a=d.state("embed").metadata;b(e.url?a.url:c.shortcode(a).string())}),d.on("close",function(){d.detach()}),d.open()}}),b.register("gallery",_.extend({},e)),b.register("audio",_.extend({},f,{state:["audio-details"]})),b.register("video",_.extend({},f,{state:["video-details"]})),b.register("playlist",_.extend({},f,{state:["playlist-edit","video-playlist-edit"]})),b.register("embed",_.extend({},g)),b.register("embedURL",_.extend({},g,{match:function(a){var b=/(^|)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,c=b.exec(a);return c?{index:c.index+c[1].length,content:c[2],options:{url:!0}}:void 0}}))}(window,window.wp.mce.views,window.jQuery);
\ No newline at end of file
+<<<<<<< .mine
+!function(a,b,c,d){"use strict";var e={},f={};b.mce=b.mce||{},b.mce.views={register:function(a,c){e[a]=b.mce.View.extend(_.extend(c,{type:a}))},unregister:function(a){delete e[a]},get:function(a){return e[a]},unbind:function(){_.each(f,function(a){a.unbind()})},setMarkers:function(a){var b,c,d=[{content:a}],f=this;return _.each(e,function(a,e){c=d.slice(),d=[],_.each(c,function(c){var g,h,i=c.content;if(c.processed)return void d.push(c);for(;i&&(g=a.prototype.match(i));)g.index&&d.push({content:i.substring(0,g.index)}),b=f.createInstance(e,g.content,g.options),h=b.loader?".":b.text,d.push({content:'
'+h+"
",processed:!0}),i=i.slice(g.index+g.content.length);i&&d.push({content:i})})}),a=_.pluck(d,"content").join(""),a.replace(/\s*
")},createInstance:function(a,b,c,d){var e,g,h=this.get(a);return b=tinymce.DOM.decode(b),!d&&(g=this.getInstance(b))?g:(e=encodeURIComponent(b),c=_.extend(c||{},{text:b,encodedText:e}),f[e]=new h(c))},getInstance:function(a){return"string"==typeof a?f[encodeURIComponent(a)]:f[d(a).attr("data-wpview-text")]},getText:function(a){return decodeURIComponent(d(a).attr("data-wpview-text")||"")},render:function(a){_.each(f,function(b){b.render(a)})},update:function(a,b,c,d){var e=this.getInstance(c);e&&e.update(a,b,c,d)},edit:function(a,b){var c=this.getInstance(b);c&&c.edit&&c.edit(c.text,function(d,e){c.update(d,a,b,e)})},remove:function(a,b){var c=this.getInstance(b);c&&c.remove(a,b)}},b.mce.View=function(a){_.extend(this,a),this.initialize()},b.mce.View.extend=Backbone.View.extend,_.extend(b.mce.View.prototype,{content:null,loader:!0,initialize:function(){},getContent:function(){return this.content},render:function(a,b){null!=a&&(this.content=a),a=this.getContent(),(this.loader||a)&&(b&&this.unbind(),this.replaceMarkers(),a?this.setContent(a,function(a,b,c){d(b).data("rendered",!0),this.bindNode.call(this,a,b,c)},b?null:!1):this.setLoader())},bindNode:function(){},unbindNode:function(){},unbind:function(){this.getNodes(function(a,b,c){this.unbindNode.call(this,a,b,c),d(b).trigger("wp-mce-view-unbind")},!0)},getEditors:function(a){_.each(tinymce.editors,function(b){b.plugins.wpview&&a.call(this,b)},this)},getNodes:function(a,b){this.getEditors(function(c){var e=this;d(c.getBody()).find('[data-wpview-text="'+e.encodedText+'"]').filter(function(){var a;return null==b?!0:(a=d(this).data("rendered")===!0,b?a:!a)}).each(function(){a.call(e,c,this,d(this).find(".wpview-content").get(0))})})},getMarkers:function(a){this.getEditors(function(b){var c=this;d(b.getBody()).find('[data-wpview-marker="'+this.encodedText+'"]').each(function(){a.call(c,b,this)})})},replaceMarkers:function(){this.getMarkers(function(a,b){var c,e=b===a.selection.getNode();return this.loader||d(b).text()===this.text?(c=a.$('
\xa0
\xa0
'),a.$(b).replaceWith(c),void(e&&a.wp.setViewCursor(!1,c[0]))):void a.dom.setAttrib(b,"data-wpview-marker",null)})},removeMarkers:function(){this.getMarkers(function(a,b){a.dom.setAttrib(b,"data-wpview-marker",null)})},setContent:function(a,b,c){_.isObject(a)&&-1!==a.body.indexOf("
'),e.innerHTML="",e.appendChild(_.isString(a)?c.dom.createFragment(a):a),b&&b.call(this,c,d,e)},c)},setIframes:function(b,c,e,f){var g=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,h=this;this.getNodes(function(a,f,i){var j=a.dom,k="",l=a.getBody().className||"",m=a.getDoc().getElementsByTagName("head")[0];tinymce.each(j.$('link[rel="stylesheet"]',m),function(a){a.href&&-1===a.href.indexOf("skins/lightgray/content.min.css")&&-1===a.href.indexOf("skins/wordpress/wp-content.css")&&(k+=j.getOuterHTML(a))}),h.iframeHeight&&j.add(i,"div",{style:{width:"100%",height:h.iframeHeight}}),setTimeout(function(){function m(){var b;s||o.contentWindow&&(b=d(o),h.iframeHeight=d(p.body).height(),b.height()!==h.iframeHeight&&(b.height(h.iframeHeight),a.nodeChanged()))}function n(){p.body.className=a.getBody().className}var o,p,q,r,s;if(i.innerHTML="",o=j.add(i,"iframe",{src:tinymce.Env.ie?'javascript:""':"",frameBorder:"0",allowTransparency:"true",scrolling:"no","class":"wpview-sandbox",style:{width:"100%",display:"block"},height:h.iframeHeight}),j.add(i,"div",{"class":"wpview-overlay"}),p=o.contentWindow.document,p.open(),p.write(''+b+k+''+c+""),p.close(),h.iframeHeight&&(s=!0,setTimeout(function(){s=!1,m()},3e3)),d(o.contentWindow).on("load",m),g)q=new g(_.debounce(m,100)),q.observe(p.body,{attributes:!0,childList:!0,subtree:!0}),d(f).one("wp-mce-view-unbind",function(){q.disconnect()});else for(r=1;6>r;r++)setTimeout(m,700*r);a.on("wp-body-class-change",n),d(f).one("wp-mce-view-unbind",function(){a.off("wp-body-class-change",n)}),e&&e.call(h,a,f,i)},50)},f)},setLoader:function(){this.setContent('
')},setError:function(a,b){this.setContent('
'+a+"
")},match:function(a){var b=c.next(this.type,a);return b?{index:b.index,content:b.content,options:{shortcode:b.shortcode}}:void 0},update:function(a,c,f,g){_.find(e,function(e,h){var i=e.prototype.match(a);return i?(d(f).data("rendered",!1),c.dom.setAttrib(f,"data-wpview-text",encodeURIComponent(a)),b.mce.views.createInstance(h,a,i.options,g).render(),c.focus(),!0):void 0})},remove:function(a,b){this.unbindNode.call(this,a,b,d(b).find(".wpview-content").get(0)),d(b).trigger("wp-mce-view-unbind"),a.dom.remove(b),a.focus()}})}(window,window.wp,window.wp.shortcode,window.jQuery),function(a,b,c,d){var e,f,g,h;e={state:[],edit:function(a,b){var d=this.type,e=c[d].edit(a);this.pausePlayers&&this.pausePlayers(),_.each(this.state,function(a){e.state(a).on("update",function(a){b(c[d].shortcode(a).string(),"gallery"===d)})}),e.on("close",function(){e.detach()}),e.open()}},f=_.extend({},e,{state:["gallery-edit"],template:c.template("editor-gallery"),initialize:function(){var a=c.gallery.attachments(this.shortcode,c.view.settings.post.id),b=this.shortcode.attrs.named,d=this;a.more().done(function(){a=a.toJSON(),_.each(a,function(a){a.sizes&&(b.size&&a.sizes[b.size]?a.thumbnail=a.sizes[b.size]:a.sizes.thumbnail?a.thumbnail=a.sizes.thumbnail:a.sizes.full&&(a.thumbnail=a.sizes.full))}),d.render(d.template({attachments:a,columns:b.columns?parseInt(b.columns,10):c.galleryDefaults.columns}))}).fail(function(a,b){d.setError(b)})}}),g=_.extend({},e,{action:"parse-media-shortcode",initialize:function(){var a=this;this.url&&(this.loader=!1,this.shortcode=c.embed.shortcode({url:this.text})),wp.ajax.post(this.action,{post_ID:c.view.settings.post.id,type:this.shortcode.tag,shortcode:this.shortcode.string()}).done(function(b){a.render(b)}).fail(function(b){a.url?a.removeMarkers():a.setError(b.message||b.statusText,"admin-media")}),this.getEditors(function(b){b.on("wpview-selected",function(){a.pausePlayers()})})},pausePlayers:function(){this.getNodes(function(a,b,c){var e=d("iframe.wpview-sandbox",c).get(0);e&&(e=e.contentWindow)&&e.mejs&&_.each(e.mejs.players,function(a){try{a.pause()}catch(b){}})})}}),h=_.extend({},g,{action:"parse-embed",edit:function(a,b){var d=c.embed.edit(a,this.url),e=this;this.pausePlayers(),d.state("embed").props.on("change:url",function(a,b){b&&a.get("url")&&(d.state("embed").metadata=a.toJSON())}),d.state("embed").on("select",function(){var a=d.state("embed").metadata;b(e.url?a.url:c.embed.shortcode(a).string())}),d.on("close",function(){d.detach()}),d.open()}}),b.register("gallery",_.extend({},f)),b.register("audio",_.extend({},g,{state:["audio-details"]})),b.register("video",_.extend({},g,{state:["video-details"]})),b.register("playlist",_.extend({},g,{state:["playlist-edit","video-playlist-edit"]})),b.register("embed",_.extend({},h)),b.register("embedURL",_.extend({},h,{match:function(a){var b=/(^|)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,c=b.exec(a);return c?{index:c.index+c[1].length,content:c[2],options:{url:!0}}:void 0}}))}(window,window.wp.mce.views,window.wp.media,window.jQuery);||||||| .r11156
+window.wp=window.wp||{},function(a){"use strict";var b={},c={},d=wp.media,e=["encodedText"];wp.mce=wp.mce||{},wp.mce.View=function(a){a=a||{},this.type=a.type,_.extend(this,_.pick(a,e)),this.initialize.apply(this,arguments)},_.extend(wp.mce.View.prototype,{initialize:function(){},getHtml:function(){return""},loadingPlaceholder:function(){return'
'},render:function(c){(c||!this.rendered())&&(this.unbind(),this.setContent('Â 
'+(_.isFunction(b[this.type].edit)?'
':"")+'
'+(this.getHtml()||this.loadingPlaceholder())+"
"+(this.overlay?'
':"")+'
Â 
',"wrap"),a(this).trigger("ready"),this.rendered(!0))},unbind:function(){},getEditors:function(a){var b=[];return _.each(tinymce.editors,function(c){c.plugins.wpview&&(a&&a(c),b.push(c))},this),b},getNodes:function(b){var c=[],d=this;return this.getEditors(function(e){a(e.getBody()).find('[data-wpview-text="'+d.encodedText+'"]').each(function(d,f){b&&b(e,f,a(f).find(".wpview-content").get(0)),c.push(f)})}),c},setContent:function(a,b){this.getNodes(function(c,d,e){var f="wrap"===b||"replace"===b?d:e,g=a;_.isString(g)&&(g=c.dom.createFragment(g)),"replace"===b?c.dom.replace(g,f):(f.innerHTML="",f.appendChild(g))})},setIframes:function(b,c){var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,e="video"===this.type||"audio"===this.type||"playlist"===this.type;b||-1!==c.indexOf("'+b+n+''+c+""),j.close(),l=function(){i.contentWindow&&a(i).height(a(j.body).height())},d)new d(_.debounce(function(){l()},100)).observe(j.body,{attributes:!0,childList:!0,subtree:!0});else for(k=1;6>k;k++)setTimeout(l,700*k);e&&f.on("wp-body-class-change",function(){j.body.className=f.getBody().className})},50)}):this.setContent(c)},setError:function(a,b){this.setContent('
'+a+"
")},rendered:function(b){var c;return this.getNodes(function(d,e){null!=b?a(e).data("rendered",b===!0):c=c||!a(e).data("rendered")}),!c}}),wp.mce.View.extend=Backbone.View.extend,wp.mce.views={register:function(a,c){var d={type:a,View:{},toView:function(a){var b=wp.shortcode.next(this.type,a);if(b)return{index:b.index,content:b.content,options:{shortcode:b.shortcode}}}};c=_.defaults(c,d),c.View=wp.mce.View.extend(c.View),b[a]=c},get:function(a){return b[a]},unregister:function(a){delete b[a]},unbind:function(){_.each(c,function(a){a.unbind()})},toViews:function(a){var c,d=[{content:a}];return _.each(b,function(a,b){c=d.slice(),d=[],_.each(c,function(c){var e,f=c.content;if(c.processed)return void d.push(c);for(;f&&(e=a.toView(f));)e.index&&d.push({content:f.substring(0,e.index)}),d.push({content:wp.mce.views.toView(b,e.content,e.options),processed:!0}),f=f.slice(e.index+e.content.length);f&&d.push({content:f})})}),_.pluck(d,"content").join("")},toView:function(a,b,d){var e,f,g=wp.mce.views.get(a),h=window.encodeURIComponent(b);return g?(wp.mce.views.getInstance(h)||(f=d,f.type=a,f.encodedText=h,e=new g.View(f),c[h]=e),wp.html.string({tag:"div",attrs:{"class":"wpview-wrap","data-wpview-text":h,"data-wpview-type":a},content:"Â "})):b},refreshView:function(a,b){var d,e,f,g=window.encodeURIComponent(b);f=wp.mce.views.getInstance(g),f||(e=a.toView(b),d=e.options,d.type=a.type,d.encodedText=g,f=new a.View(d),c[g]=f),f.render()},getInstance:function(a){return c[a]},render:function(a){_.each(c,function(b){b.render(a)})},edit:function(b){var c=a(b).data("wpview-type"),d=wp.mce.views.get(c);d&&d.edit(b)}},wp.mce.views.register("gallery",{View:{template:d.template("editor-gallery"),postID:a("#post_ID").val(),initialize:function(a){this.shortcode=a.shortcode,this.fetch()},fetch:function(){var a=this;this.attachments=wp.media.gallery.attachments(this.shortcode,this.postID),this.dfd=this.attachments.more().done(function(){a.render(!0)})},getHtml:function(){var a,b=this.shortcode.attrs.named,c=!1;return this.dfd&&"pending"===this.dfd.state()&&!this.attachments.length?"":(this.attachments.length&&(c=this.attachments.toJSON(),_.each(c,function(a){a.sizes&&(a.sizes.thumbnail?a.thumbnail=a.sizes.thumbnail:a.sizes.full&&(a.thumbnail=a.sizes.full))})),a={attachments:c,columns:b.columns?parseInt(b.columns,10):wp.media.galleryDefaults.columns},this.template(a))}},edit:function(b){var c,d,e=wp.media.gallery,f=this;d=window.decodeURIComponent(a(b).attr("data-wpview-text")),c=e.edit(d),c.state("gallery-edit").on("update",function(c){var d=e.shortcode(c).string();a(b).attr("data-wpview-text",window.encodeURIComponent(d)),wp.mce.views.refreshView(f,d)}),c.on("close",function(){c.detach()})}}),wp.mce.av={View:{overlay:!0,action:"parse-media-shortcode",initialize:function(b){var c=this;this.shortcode=b.shortcode,_.bindAll(this,"setIframes","setNodes","fetch","stopPlayers"),a(this).on("ready",this.setNodes),a(document).on("media:edit",this.stopPlayers),this.fetch(),this.getEditors(function(a){a.on("hide",c.stopPlayers)})},setNodes:function(){this.parsed?this.setIframes(this.parsed.head,this.parsed.body):this.fail()},fetch:function(){var b=this;wp.ajax.send(this.action,{data:{post_ID:a("#post_ID").val()||0,type:this.shortcode.tag,shortcode:this.shortcode.string()}}).done(function(a){a?(b.parsed=a,b.setIframes(a.head,a.body)):b.fail(!0)}).fail(function(a){b.fail(a||!0)})},fail:function(a){if(!this.error){if(!a)return;this.error=a}this.error.message?"not-embeddable"===this.error.type&&"embed"===this.type||"not-ssl"===this.error.type||"no-items"===this.error.type?this.setError(this.error.message,"admin-media"):this.setContent(""+this.original+"
","replace"):this.error.statusText?this.setError(this.error.statusText,"admin-media"):this.original&&this.setContent(""+this.original+"
","replace")},stopPlayers:function(b){var c="remove"===b;this.getNodes(function(b,d,e){var f,g,h=a("iframe.wpview-sandbox",e).get(0);if(h&&(g=h.contentWindow)&&g.mejs)try{for(f in g.mejs.players)g.mejs.players[f].pause(),c&&g.mejs.players[f].remove()}catch(i){}})},unbind:function(){this.stopPlayers("remove")}},edit:function(b){var c,d,e,f=wp.media[this.type],g=this;a(document).trigger("media:edit"),d=window.decodeURIComponent(a(b).attr("data-wpview-text")),c=f.edit(d),c.on("close",function(){c.detach()}),e=function(d){var e=wp.media[g.type].shortcode(d).string();a(b).attr("data-wpview-text",window.encodeURIComponent(e)),wp.mce.views.refreshView(g,e),c.detach()},_.isArray(g.state)?_.each(g.state,function(a){c.state(a).on("update",e)}):c.state(g.state).on("update",e),c.open()}},wp.mce.views.register("video",_.extend({},wp.mce.av,{state:"video-details"})),wp.mce.views.register("audio",_.extend({},wp.mce.av,{state:"audio-details"})),wp.mce.views.register("playlist",_.extend({},wp.mce.av,{state:["playlist-edit","video-playlist-edit"]})),wp.mce.embedMixin={View:_.extend({},wp.mce.av.View,{overlay:!0,action:"parse-embed",initialize:function(b){this.content=b.content,this.original=b.url||b.shortcode.string(),this.shortcode=b.url?d.embed.shortcode({url:b.url}):b.shortcode,_.bindAll(this,"setIframes","setNodes","fetch"),a(this).on("ready",this.setNodes),this.fetch()}}),edit:function(b){var c,e,f=d.embed,g=this,h="embedURL"===this.type;a(document).trigger("media:edit"),e=window.decodeURIComponent(a(b).attr("data-wpview-text")),c=f.edit(e,h),c.on("close",function(){c.detach()}),c.state("embed").props.on("change:url",function(a,b){b&&(c.state("embed").metadata=a.toJSON())}),c.state("embed").on("select",function(){var d;d=h?c.state("embed").metadata.url:f.shortcode(c.state("embed").metadata).string(),a(b).attr("data-wpview-text",window.encodeURIComponent(d)),wp.mce.views.refreshView(g,d),c.detach()}),c.open()}},wp.mce.views.register("embed",_.extend({},wp.mce.embedMixin)),wp.mce.views.register("embedURL",_.extend({},wp.mce.embedMixin,{toView:function(a){var b=/(?:^|)(https?:\/\/[^\s"]+?)(?:<\/p>\s*|$)/gi,c=b.exec(tinymce.trim(a));if(c)return{index:c.index,content:c[0],options:{url:c[1]}}}}))}(jQuery);=======
+window.wp=window.wp||{},function(a,b,c){"use strict";var d={},e={};b.mce=b.mce||{},b.mce.views={register:function(a,c){d[a]=b.mce.View.extend(_.extend(c,{type:a}))},unregister:function(a){delete d[a]},get:function(a){return d[a]},unbind:function(){_.each(e,function(a){a.unbind()})},setMarkers:function(a){var b,c,e=[{content:a}],f=this;return _.each(d,function(a,d){c=e.slice(),e=[],_.each(c,function(c){var g,h,i=c.content;if(c.processed)return void e.push(c);for(;i&&(g=a.prototype.match(i));)g.index&&e.push({content:i.substring(0,g.index)}),b=f.createInstance(d,g.content,g.options),h=b.loader?".":b.text,e.push({content:'
'+h+"
",processed:!0}),i=i.slice(g.index+g.content.length);i&&e.push({content:i})})}),a=_.pluck(e,"content").join(""),a.replace(/\s*
")},createInstance:function(a,b,c){var d,f,g=this.get(a);return b=tinymce.DOM.decode(b),(f=this.getInstance(b))?f:(d=encodeURIComponent(b),c=_.extend(c||{},{text:b,encodedText:d}),e[d]=new g(c))},getInstance:function(a){return"string"==typeof a?e[encodeURIComponent(a)]:e[c(a).attr("data-wpview-text")]},getText:function(a){return decodeURIComponent(c(a).attr("data-wpview-text")||"")},render:function(a){_.each(e,function(b){b.render(a)})},update:function(a,b,c){var d=this.getInstance(c);d&&d.update(a,b,c)},edit:function(a,b){var c=this.getInstance(b);c&&c.edit&&c.edit(c.text,function(d){c.update(d,a,b)})},remove:function(a,b){var c=this.getInstance(b);c&&c.remove(a,b)}},b.mce.View=function(a){_.extend(this,a),this.initialize()},b.mce.View.extend=Backbone.View.extend,_.extend(b.mce.View.prototype,{content:null,loader:!0,initialize:function(){},getContent:function(){return this.content},render:function(a,b){null!=a&&(this.content=a),a=this.getContent(),(this.loader||a)&&(b&&this.unbind(),this.replaceMarkers(),a?this.setContent(a,function(a,b,d){c(b).data("rendered",!0),this.bindNode.call(this,a,b,d)},b?null:!1):this.setLoader())},bindNode:function(){},unbindNode:function(){},unbind:function(){this.getNodes(function(a,b,d){this.unbindNode.call(this,a,b,d),c(b).trigger("wp-mce-view-unbind")},!0)},getEditors:function(a){_.each(tinymce.editors,function(b){b.plugins.wpview&&a.call(this,b)},this)},getNodes:function(a,b){this.getEditors(function(d){var e=this;c(d.getBody()).find('[data-wpview-text="'+e.encodedText+'"]').filter(function(){var a;return null==b?!0:(a=c(this).data("rendered")===!0,b?a:!a)}).each(function(){a.call(e,d,this,c(this).find(".wpview-content").get(0))})})},getMarkers:function(a){this.getEditors(function(b){var d=this;c(b.getBody()).find('[data-wpview-marker="'+this.encodedText+'"]').each(function(){a.call(d,b,this)})})},replaceMarkers:function(){this.getMarkers(function(a,b){return this.loader||c(b).text()===this.text?void a.dom.replace(a.dom.createFragment('
Â 
Â 
'),b):void a.dom.setAttrib(b,"data-wpview-marker",null)})},removeMarkers:function(){this.getMarkers(function(a,b){a.dom.setAttrib(b,"data-wpview-marker",null)})},setContent:function(a,b,c){_.isObject(a)&&-1!==a.body.indexOf("
'),e.innerHTML="",e.appendChild(_.isString(a)?c.dom.createFragment(a):a),b&&b.call(this,c,d,e)},c)},setIframes:function(b,d,e,f){var g=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,h=this;this.getNodes(function(a,f,i){var j=a.dom,k="",l=a.getBody().className||"",m=a.getDoc().getElementsByTagName("head")[0];tinymce.each(j.$('link[rel="stylesheet"]',m),function(a){a.href&&-1===a.href.indexOf("skins/lightgray/content.min.css")&&-1===a.href.indexOf("skins/wordpress/wp-content.css")&&(k+=j.getOuterHTML(a))}),setTimeout(function(){function m(){var b,d;o.contentWindow&&(b=c(o),d=c(p.body).height(),b.height()!==d&&(b.height(d),a.nodeChanged()))}function n(){p.body.className=a.getBody().className}var o,p,q,r;if(i.innerHTML="",o=j.add(i,"iframe",{src:tinymce.Env.ie?'javascript:""':"",frameBorder:"0",allowTransparency:"true",scrolling:"no","class":"wpview-sandbox",style:{width:"100%",display:"block"}}),j.add(i,"div",{"class":"wpview-overlay"}),p=o.contentWindow.document,p.open(),p.write(''+b+k+''+d+""),p.close(),c(o.contentWindow).on("load",m),g)q=new g(_.debounce(m,100)),q.observe(p.body,{attributes:!0,childList:!0,subtree:!0}),c(f).one("wp-mce-view-unbind",function(){q.disconnect()});else for(r=1;6>r;r++)setTimeout(m,700*r);a.on("wp-body-class-change",n),c(f).one("wp-mce-view-unbind",function(){a.off("wp-body-class-change",n)}),e&&e.call(h,a,f,i)},50)},f)},setLoader:function(){this.setContent('
')},setError:function(a,b){this.setContent('
'+a+"
")},match:function(a){var c=b.shortcode.next(this.type,a);return c?{index:c.index,content:c.content,options:{shortcode:c.shortcode}}:void 0},update:function(a,e,f){_.find(d,function(d,g){var h=d.prototype.match(a);return h?(c(f).data("rendered",!1),e.dom.setAttrib(f,"data-wpview-text",encodeURIComponent(a)),b.mce.views.createInstance(g,a,h.options).render(),e.focus(),!0):void 0})},remove:function(a,b){this.unbindNode.call(this,a,b,c(b).find(".wpview-content").get(0)),c(b).trigger("wp-mce-view-unbind"),a.dom.remove(b),a.focus()}})}(window,window.wp,window.jQuery),function(a,b,c){var d,e,f,g,h=c("#post_ID").val()||0;d={state:[],edit:function(a,b){var c=wp.media[this.type],d=c.edit(a);this.pausePlayers&&this.pausePlayers(),_.each(this.state,function(a){d.state(a).on("update",function(a){b(c.shortcode(a).string())})}),d.on("close",function(){d.detach()}),d.open()}},e=_.extend({},d,{state:["gallery-edit"],template:wp.media.template("editor-gallery"),initialize:function(){var a=wp.media.gallery.attachments(this.shortcode,h),b=this.shortcode.attrs.named,c=this;a.more().done(function(){a=a.toJSON(),_.each(a,function(a){a.sizes&&(b.size&&a.sizes[b.size]?a.thumbnail=a.sizes[b.size]:a.sizes.thumbnail?a.thumbnail=a.sizes.thumbnail:a.sizes.full&&(a.thumbnail=a.sizes.full))}),c.render(c.template({attachments:a,columns:b.columns?parseInt(b.columns,10):wp.media.galleryDefaults.columns}))}).fail(function(a,b){c.setError(b)})}}),f=_.extend({},d,{action:"parse-media-shortcode",initialize:function(){var a=this;this.url&&(this.loader=!1,this.shortcode=wp.media.embed.shortcode({url:this.text})),wp.ajax.post(this.action,{post_ID:h,type:this.shortcode.tag,shortcode:this.shortcode.string()}).done(function(b){a.render(b)}).fail(function(b){a.url?a.removeMarkers():a.setError(b.message||b.statusText,"admin-media")}),this.getEditors(function(b){b.on("wpview-selected",function(){a.pausePlayers()})})},pausePlayers:function(){this.getNodes(function(a,b,d){var e=c("iframe.wpview-sandbox",d).get(0);e&&(e=e.contentWindow)&&e.mejs&&_.each(e.mejs.players,function(a){try{a.pause()}catch(b){}})})}}),g=_.extend({},f,{action:"parse-embed",edit:function(a,b){var c=wp.media.embed,d=c.edit(a,this.url),e=this;this.pausePlayers(),d.state("embed").props.on("change:url",function(a,b){b&&a.get("url")&&(d.state("embed").metadata=a.toJSON())}),d.state("embed").on("select",function(){var a=d.state("embed").metadata;b(e.url?a.url:c.shortcode(a).string())}),d.on("close",function(){d.detach()}),d.open()}}),b.register("gallery",_.extend({},e)),b.register("audio",_.extend({},f,{state:["audio-details"]})),b.register("video",_.extend({},f,{state:["video-details"]})),b.register("playlist",_.extend({},f,{state:["playlist-edit","video-playlist-edit"]})),b.register("embed",_.extend({},g)),b.register("embedURL",_.extend({},g,{match:function(a){var b=/(^|)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,c=b.exec(a);return c?{index:c.index+c[1].length,content:c[2],options:{url:!0}}:void 0}}))}(window,window.wp.mce.views,window.jQuery);>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.js b/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.js
index 8b598db6..7b86f1d9 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.js
@@ -1,16 +1,58 @@
+<<<<<<< .mine
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o>>>>>> .r12027
 
+<<<<<<< .mine
+/**
+ * @mixin
+ */
+wp.media.mixin = {
+	mejsSettings: baseSettings,
+||||||| .r11156
+(function($, _, Backbone) {
+	var media = wp.media,
+		baseSettings = {},
+		l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
+=======
 var media = wp.media,
 	baseSettings = window._wpmejsSettings || {},
 	l10n = window._wpMediaViewsL10n || {};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	removeAllPlayers: function() {
+		var p;
+||||||| .r11156
+	if ( ! _.isUndefined( window._wpmejsSettings ) ) {
+		baseSettings = _wpmejsSettings;
+	}
+=======
 /**
  * @mixin
  */
 wp.media.mixin = {
 	mejsSettings: baseSettings,
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( window.mejs && window.mejs.players ) {
+			for ( p in window.mejs.players ) {
+				window.mejs.players[p].pause();
+				this.removePlayer( window.mejs.players[p] );
+			}
+		}
+	},
 
+||||||| .r11156
+=======
 	removeAllPlayers: function() {
 		var p;
 
@@ -22,6 +64,7 @@ wp.media.mixin = {
 		}
 	},
 
+>>>>>>> .r12027
 	/**
 	 * Override the MediaElement method for removing a player.
 	 *	MediaElement tries to pull the audio/video tag out of
@@ -103,6 +146,33 @@ wp.media.playlist = new wp.media.collection({
 wp.media.audio = {
 	coerce : wp.media.coerce,
 
+<<<<<<< .mine
+	defaults : {
+		id : wp.media.view.settings.post.id,
+		src : '',
+		loop : false,
+		autoplay : false,
+		preload : 'none',
+		width : 400
+	},
+||||||| .r11156
+		/**
+		 * Allows any class that has set 'player' to a MediaElementPlayer
+		 *  instance to remove the player when listening to events.
+		 *
+		 *  Examples: modal closes, shortcode properties are removed, etc.
+		 */
+		unsetPlayers : function() {
+			if ( this.players && this.players.length ) {
+				_.each( this.players, function (player) {
+					player.pause();
+					wp.media.mixin.removePlayer( player );
+				} );
+				this.players = [];
+			}
+		}
+	};
+=======
 	defaults : {
 		id : wp.media.view.settings.post.id,
 		src : '',
@@ -134,10 +204,50 @@ wp.media.audio = {
 				delete model[ key ];
 			}
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	edit : function( data ) {
+		var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
+||||||| .r11156
+	/**
+	 * Autowire "collection"-type shortcodes
+	 */
+	wp.media.playlist = new wp.media.collection({
+		tag: 'playlist',
+		editTitle : l10n.editPlaylistTitle,
+		defaults : {
+			id: wp.media.view.settings.post.id,
+			style: 'light',
+			tracklist: true,
+			tracknumbers: true,
+			images: true,
+			artists: true,
+			type: 'audio'
+		}
+	});
+=======
 		content = model.content;
 		delete model.content;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		frame = wp.media({
+			frame: 'audio',
+			state: 'audio-details',
+			metadata: _.defaults( shortcode.attrs.named, this.defaults )
+		});
+||||||| .r11156
+	/**
+	 * Shortcode modeling for audio
+	 *  `edit()` prepares the shortcode for the media modal
+	 *  `shortcode()` builds the new shortcode after update
+	 *
+	 * @namespace
+	 */
+	wp.media.audio = {
+		coerce : wp.media.coerce,
+=======
 		return new wp.shortcode({
 			tag: 'audio',
 			attrs: model,
@@ -145,7 +255,21 @@ wp.media.audio = {
 		});
 	}
 };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return frame;
+	},
+||||||| .r11156
+		defaults : {
+			id : wp.media.view.settings.post.id,
+			src : '',
+			loop : false,
+			autoplay : false,
+			preload : 'none',
+			width : 400
+		},
+=======
 /**
  * Shortcode modeling for video
  *  `edit()` prepares the shortcode for the media modal
@@ -155,7 +279,20 @@ wp.media.audio = {
  */
 wp.media.video = {
 	coerce : wp.media.coerce,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	shortcode : function( model ) {
+		var content;
+||||||| .r11156
+		edit : function( data ) {
+			var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
+			frame = wp.media({
+				frame: 'audio',
+				state: 'audio-details',
+				metadata: _.defaults( shortcode.attrs.named, this.defaults )
+			});
+=======
 	defaults : {
 		id : wp.media.view.settings.post.id,
 		src : '',
@@ -167,38 +304,163 @@ wp.media.video = {
 		width : 640,
 		height : 360
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.each( this.defaults, function( value, key ) {
+			model[ key ] = this.coerce( model, key );
+||||||| .r11156
+			return frame;
+		},
+=======
 	edit : function( data ) {
 		var frame,
 			shortcode = wp.shortcode.next( 'video', data ).shortcode,
 			attrs;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( value === model[ key ] ) {
+				delete model[ key ];
+			}
+		}, this );
+||||||| .r11156
+		shortcode : function( model ) {
+			var self = this, content;
+=======
 		attrs = shortcode.attrs.named;
 		attrs.content = shortcode.content;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		content = model.content;
+		delete model.content;
+||||||| .r11156
+			_.each( this.defaults, function( value, key ) {
+				model[ key ] = self.coerce( model, key );
+=======
 		frame = wp.media({
 			frame: 'video',
 			state: 'video-details',
 			metadata: _.defaults( attrs, this.defaults )
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return new wp.shortcode({
+			tag: 'audio',
+			attrs: model,
+			content: content
+		});
+	}
+};
+||||||| .r11156
+				if ( value === model[ key ] ) {
+					delete model[ key ];
+				}
+			});
+=======
 		return frame;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+/**
+ * Shortcode modeling for video
+ *  `edit()` prepares the shortcode for the media modal
+ *  `shortcode()` builds the new shortcode after update
+ *
+ * @namespace
+ */
+wp.media.video = {
+	coerce : wp.media.coerce,
+||||||| .r11156
+			content = model.content;
+			delete model.content;
+=======
 	shortcode : function( model ) {
 		var content;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	defaults : {
+		id : wp.media.view.settings.post.id,
+		src : '',
+		poster : '',
+		loop : false,
+		autoplay : false,
+		preload : 'metadata',
+		content : '',
+		width : 640,
+		height : 360
+	},
+||||||| .r11156
+			return new wp.shortcode({
+				tag: 'audio',
+				attrs: model,
+				content: content
+			});
+		}
+	};
+=======
 		_.each( this.defaults, function( value, key ) {
 			model[ key ] = this.coerce( model, key );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	edit : function( data ) {
+		var frame,
+			shortcode = wp.shortcode.next( 'video', data ).shortcode,
+			attrs;
+||||||| .r11156
+	/**
+	 * Shortcode modeling for video
+	 *  `edit()` prepares the shortcode for the media modal
+	 *  `shortcode()` builds the new shortcode after update
+	 *
+	 * @namespace
+	 */
+	wp.media.video = {
+		coerce : wp.media.coerce,
+=======
 			if ( value === model[ key ] ) {
 				delete model[ key ];
 			}
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		attrs = shortcode.attrs.named;
+		attrs.content = shortcode.content;
+||||||| .r11156
+		defaults : {
+			id : wp.media.view.settings.post.id,
+			src : '',
+			poster : '',
+			loop : false,
+			autoplay : false,
+			preload : 'metadata',
+			content : '',
+			width : 640,
+			height : 360
+		},
+=======
 		content = model.content;
 		delete model.content;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		frame = wp.media({
+			frame: 'video',
+			state: 'video-details',
+			metadata: _.defaults( attrs, this.defaults )
+		});
+||||||| .r11156
+		edit : function( data ) {
+			var frame,
+				shortcode = wp.shortcode.next( 'video', data ).shortcode,
+				attrs;
+=======
 		return new wp.shortcode({
 			tag: 'video',
 			attrs: model,
@@ -206,7 +468,15 @@ wp.media.video = {
 		});
 	}
 };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return frame;
+	},
+||||||| .r11156
+			attrs = shortcode.attrs.named;
+			attrs.content = shortcode.content;
+=======
 media.model.PostMedia = require( './models/post-media.js' );
 media.controller.AudioDetails = require( './controllers/audio-details.js' );
 media.controller.VideoDetails = require( './controllers/video-details.js' );
@@ -216,10 +486,29 @@ media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' )
 media.view.MediaDetails = require( './views/media-details.js' );
 media.view.AudioDetails = require( './views/audio-details.js' );
 media.view.VideoDetails = require( './views/video-details.js' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	shortcode : function( model ) {
+		var content;
+||||||| .r11156
+			frame = wp.media({
+				frame: 'video',
+				state: 'video-details',
+				metadata: _.defaults( attrs, this.defaults )
+			});
+=======
 },{"./controllers/audio-details.js":2,"./controllers/video-details.js":3,"./models/post-media.js":4,"./views/audio-details.js":5,"./views/frame/audio-details.js":6,"./views/frame/media-details.js":7,"./views/frame/video-details.js":8,"./views/media-details.js":9,"./views/video-details.js":10}],2:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.each( this.defaults, function( value, key ) {
+			model[ key ] = this.coerce( model, key );
+||||||| .r11156
+			return frame;
+		},
+=======
 /**
  * wp.media.controller.AudioDetails
  *
@@ -232,7 +521,17 @@ media.view.VideoDetails = require( './views/video-details.js' );
 var State = wp.media.controller.State,
 	l10n = wp.media.view.l10n,
 	AudioDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( value === model[ key ] ) {
+				delete model[ key ];
+			}
+		}, this );
+||||||| .r11156
+		shortcode : function( model ) {
+			var self = this, content;
+=======
 AudioDetails = State.extend({
 	defaults: {
 		id: 'audio-details',
@@ -243,18 +542,80 @@ AudioDetails = State.extend({
 		router: false,
 		priority: 60
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		content = model.content;
+		delete model.content;
+||||||| .r11156
+			_.each( this.defaults, function( value, key ) {
+				model[ key ] = self.coerce( model, key );
+=======
 	initialize: function( options ) {
 		this.media = options.media;
 		State.prototype.initialize.apply( this, arguments );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return new wp.shortcode({
+			tag: 'video',
+			attrs: model,
+			content: content
+		});
+	}
+};
+||||||| .r11156
+				if ( value === model[ key ] ) {
+					delete model[ key ];
+				}
+			});
+=======
 module.exports = AudioDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+media.model.PostMedia = require( './models/post-media.js' );
+media.controller.AudioDetails = require( './controllers/audio-details.js' );
+media.controller.VideoDetails = require( './controllers/video-details.js' );
+media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
+media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
+media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
+media.view.MediaDetails = require( './views/media-details.js' );
+media.view.AudioDetails = require( './views/audio-details.js' );
+media.view.VideoDetails = require( './views/video-details.js' );
+||||||| .r11156
+			content = model.content;
+			delete model.content;
+=======
 },{}],3:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{"./controllers/audio-details.js":2,"./controllers/video-details.js":3,"./models/post-media.js":4,"./views/audio-details.js":5,"./views/frame/audio-details.js":6,"./views/frame/media-details.js":7,"./views/frame/video-details.js":8,"./views/media-details.js":9,"./views/video-details.js":10}],2:[function(require,module,exports){
+/**
+ * wp.media.controller.AudioDetails
+ *
+ * The controller for the Audio Details state
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var State = wp.media.controller.State,
+	l10n = wp.media.view.l10n,
+	AudioDetails;
+||||||| .r11156
+			return new wp.shortcode({
+				tag: 'video',
+				attrs: model,
+				content: content
+			});
+		}
+	};
+=======
 /**
  * wp.media.controller.VideoDetails
  *
@@ -267,7 +628,32 @@ module.exports = AudioDetails;
 var State = wp.media.controller.State,
 	l10n = wp.media.view.l10n,
 	VideoDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+AudioDetails = State.extend({
+	defaults: {
+		id: 'audio-details',
+		toolbar: 'audio-details',
+		title: l10n.audioDetailsTitle,
+		content: 'audio-details',
+		menu: 'audio-details',
+		router: false,
+		priority: 60
+	},
+||||||| .r11156
+	/**
+	 * Shared model class for audio and video. Updates the model after
+	 *   "Add Audio|Video Source" and "Replace Audio|Video" states return
+	 *
+	 * @constructor
+	 * @augments Backbone.Model
+	 */
+	media.model.PostMedia = Backbone.Model.extend({
+		initialize: function() {
+			this.attachment = false;
+		},
+=======
 VideoDetails = State.extend({
 	defaults: {
 		id: 'video-details',
@@ -278,6 +664,7 @@ VideoDetails = State.extend({
 		router: false,
 		priority: 60
 	},
+>>>>>>> .r12027
 
 	initialize: function( options ) {
 		this.media = options.media;
@@ -285,11 +672,90 @@ VideoDetails = State.extend({
 	}
 });
 
+<<<<<<< .mine
+module.exports = AudioDetails;
+||||||| .r11156
+			if ( this.get( 'src' ) && this.extension === this.get( 'src' ).split('.').pop() ) {
+				this.unset( 'src' );
+			}
+=======
 module.exports = VideoDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],3:[function(require,module,exports){
+/**
+ * wp.media.controller.VideoDetails
+ *
+ * The controller for the Video Details state
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var State = wp.media.controller.State,
+	l10n = wp.media.view.l10n,
+	VideoDetails;
+||||||| .r11156
+			if ( _.contains( wp.media.view.settings.embedExts, this.extension ) ) {
+				this.set( this.extension, this.attachment.get( 'url' ) );
+			} else {
+				this.unset( this.extension );
+			}
+		},
+=======
 },{}],4:[function(require,module,exports){
 /*globals wp, Backbone, _ */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+VideoDetails = State.extend({
+	defaults: {
+		id: 'video-details',
+		toolbar: 'video-details',
+		title: l10n.videoDetailsTitle,
+		content: 'video-details',
+		menu: 'video-details',
+		router: false,
+		priority: 60
+	},
+||||||| .r11156
+		changeAttachment: function( attachment ) {
+			var self = this;
+=======
+/**
+ * wp.media.model.PostMedia
+ *
+ * Shared model class for audio and video. Updates the model after
+ *   "Add Audio|Video Source" and "Replace Audio|Video" states return
+ *
+ * @class
+ * @augments Backbone.Model
+ */
+var PostMedia = Backbone.Model.extend({
+	initialize: function() {
+		this.attachment = false;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function( options ) {
+		this.media = options.media;
+		State.prototype.initialize.apply( this, arguments );
+	}
+});
+||||||| .r11156
+			this.setSource( attachment );
+=======
+	setSource: function( attachment ) {
+		this.attachment = attachment;
+		this.extension = attachment.get( 'filename' ).split('.').pop();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = VideoDetails;
+
+},{}],4:[function(require,module,exports){
 /**
  * wp.media.model.PostMedia
  *
@@ -309,6 +775,10 @@ var PostMedia = Backbone.Model.extend({
 		this.extension = attachment.get( 'filename' ).split('.').pop();
 
 		if ( this.get( 'src' ) && this.extension === this.get( 'src' ).split('.').pop() ) {
+||||||| .r11156
+=======
+		if ( this.get( 'src' ) && this.extension === this.get( 'src' ).split('.').pop() ) {
+>>>>>>> .r12027
 			this.unset( 'src' );
 		}
 
@@ -322,6 +792,51 @@ var PostMedia = Backbone.Model.extend({
 	changeAttachment: function( attachment ) {
 		this.setSource( attachment );
 
+<<<<<<< .mine
+		this.unset( 'src' );
+		_.each( _.without( wp.media.view.settings.embedExts, this.extension ), function( ext ) {
+			this.unset( ext );
+		}, this );
+	}
+});
+
+module.exports = PostMedia;
+
+},{}],5:[function(require,module,exports){
+/**
+ * wp.media.view.AudioDetails
+ *
+ * @class
+ * @augments wp.media.view.MediaDetails
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var MediaDetails = wp.media.view.MediaDetails,
+	AudioDetails;
+
+AudioDetails = MediaDetails.extend({
+	className: 'audio-details',
+	template:  wp.template('audio-details'),
+
+	setMedia: function() {
+		var audio = this.$('.wp-audio-shortcode');
+
+		if ( audio.find( 'source' ).length ) {
+			if ( audio.is(':hidden') ) {
+				audio.show();
+			}
+			this.media = MediaDetails.prepareSrc( audio.get(0) );
+		} else {
+			audio.hide();
+			this.media = false;
+||||||| .r11156
+		initialize: function( options ) {
+			this.media = options.media;
+			media.controller.State.prototype.initialize.apply( this, arguments );
+=======
 		this.unset( 'src' );
 		_.each( _.without( wp.media.view.settings.embedExts, this.extension ), function( ext ) {
 			this.unset( ext );
@@ -363,6 +878,7 @@ AudioDetails = MediaDetails.extend({
 		} else {
 			audio.hide();
 			this.media = false;
+>>>>>>> .r12027
 		}
 
 		return this;
@@ -371,9 +887,40 @@ AudioDetails = MediaDetails.extend({
 
 module.exports = AudioDetails;
 
+<<<<<<< .mine
+},{}],6:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.AudioDetails
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.MediaDetails
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
+	MediaLibrary = wp.media.controller.MediaLibrary,
+||||||| .r11156
+			this.media = new media.model.PostMedia( options.metadata );
+			this.options.selection = new media.model.Selection( this.media.attachment, { multiple: false } );
+			media.view.MediaFrame.Select.prototype.initialize.apply( this, arguments );
+		},
+=======
 },{}],6:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	l10n = wp.media.view.l10n,
+	AudioDetails;
+||||||| .r11156
+		bindHandlers: function() {
+			var menu = this.defaults.menu;
+=======
 /**
  * wp.media.view.MediaFrame.AudioDetails
  *
@@ -389,10 +936,39 @@ module.exports = AudioDetails;
  */
 var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+AudioDetails = MediaDetails.extend({
+	defaults: {
+		id:      'audio',
+		url:     '',
+		menu:    'audio-details',
+		content: 'audio-details',
+		toolbar: 'audio-details',
+		type:    'link',
+		title:    l10n.audioDetailsTitle,
+		priority: 120
+	},
+||||||| .r11156
+			media.view.MediaFrame.Select.prototype.bindHandlers.apply( this, arguments );
+=======
 	l10n = wp.media.view.l10n,
 	AudioDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function( options ) {
+		options.DetailsView = wp.media.view.AudioDetails;
+		options.cancelText = l10n.audioDetailsCancel;
+		options.addText = l10n.audioAddSourceTitle;
+||||||| .r11156
+			this.on( 'menu:create:' + menu, this.createMenu, this );
+			this.on( 'content:render:' + menu, this.renderDetailsContent, this );
+			this.on( 'menu:render:' + menu, this.renderMenu, this );
+			this.on( 'toolbar:render:' + menu, this.renderDetailsToolbar, this );
+		},
+=======
 AudioDetails = MediaDetails.extend({
 	defaults: {
 		id:      'audio',
@@ -404,28 +980,132 @@ AudioDetails = MediaDetails.extend({
 		title:    l10n.audioDetailsTitle,
 		priority: 120
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		MediaDetails.prototype.initialize.call( this, options );
+	},
+||||||| .r11156
+		renderDetailsContent: function() {
+			var view = new this.DetailsView({
+				controller: this,
+				model: this.state().media,
+				attachment: this.state().media.attachment
+			}).render();
+=======
 	initialize: function( options ) {
 		options.DetailsView = wp.media.view.AudioDetails;
 		options.cancelText = l10n.audioDetailsCancel;
 		options.addText = l10n.audioAddSourceTitle;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindHandlers: function() {
+		MediaDetails.prototype.bindHandlers.apply( this, arguments );
+||||||| .r11156
+			this.content.set( view );
+		},
+=======
 		MediaDetails.prototype.initialize.call( this, options );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'toolbar:render:replace-audio', this.renderReplaceToolbar, this );
+		this.on( 'toolbar:render:add-audio-source', this.renderAddSourceToolbar, this );
+	},
+||||||| .r11156
+		renderMenu: function( view ) {
+			var lastState = this.lastState(),
+				previous = lastState && lastState.id,
+				frame = this;
+=======
 	bindHandlers: function() {
 		MediaDetails.prototype.bindHandlers.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	createStates: function() {
+		this.states.add([
+			new wp.media.controller.AudioDetails( {
+				media: this.media
+			} ),
+||||||| .r11156
+			view.set({
+				cancel: {
+					text:     this.cancelText,
+					priority: 20,
+					click:    function() {
+						if ( previous ) {
+							frame.setState( previous );
+						} else {
+							frame.close();
+						}
+					}
+				},
+				separateCancel: new media.View({
+					className: 'separator',
+					priority: 40
+				})
+			});
+=======
 		this.on( 'toolbar:render:replace-audio', this.renderReplaceToolbar, this );
 		this.on( 'toolbar:render:add-audio-source', this.renderAddSourceToolbar, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			new MediaLibrary( {
+				type: 'audio',
+				id: 'replace-audio',
+				title: l10n.audioReplaceTitle,
+				toolbar: 'replace-audio',
+				media: this.media,
+				menu: 'audio-details'
+			} ),
+||||||| .r11156
+		},
+=======
 	createStates: function() {
 		this.states.add([
 			new wp.media.controller.AudioDetails( {
 				media: this.media
 			} ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			new MediaLibrary( {
+				type: 'audio',
+				id: 'add-audio-source',
+				title: l10n.audioAddSourceTitle,
+				toolbar: 'add-audio-source',
+				media: this.media,
+				menu: false
+			} )
+		]);
+	}
+});
+||||||| .r11156
+		setPrimaryButton: function(text, handler) {
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					button: {
+						style:    'primary',
+						text:     text,
+						priority: 80,
+						click:    function() {
+							var controller = this.controller;
+							handler.call( this, controller, controller.state() );
+							// Restore and reset the default state.
+							controller.setState( controller.options.state );
+							controller.reset();
+						}
+					}
+				}
+			}) );
+		},
+=======
 			new MediaLibrary( {
 				type: 'audio',
 				id: 'replace-audio',
@@ -434,7 +1114,18 @@ AudioDetails = MediaDetails.extend({
 				media: this.media,
 				menu: 'audio-details'
 			} ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = AudioDetails;
+||||||| .r11156
+		renderDetailsToolbar: function() {
+			this.setPrimaryButton( l10n.update, function( controller, state ) {
+				controller.close();
+				state.trigger( 'update', controller.media.toJSON() );
+			} );
+		},
+=======
 			new MediaLibrary( {
 				type: 'audio',
 				id: 'add-audio-source',
@@ -446,12 +1137,93 @@ AudioDetails = MediaDetails.extend({
 		]);
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],7:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.MediaDetails
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Select = wp.media.view.MediaFrame.Select,
+	l10n = wp.media.view.l10n,
+	MediaDetails;
+||||||| .r11156
+		renderReplaceToolbar: function() {
+			this.setPrimaryButton( l10n.replace, function( controller, state ) {
+				var attachment = state.get( 'selection' ).single();
+				controller.media.changeAttachment( attachment );
+				state.trigger( 'replace', controller.media.toJSON() );
+			} );
+		},
+=======
 module.exports = AudioDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+MediaDetails = Select.extend({
+	defaults: {
+		id:      'media',
+		url:     '',
+		menu:    'media-details',
+		content: 'media-details',
+		toolbar: 'media-details',
+		type:    'link',
+		priority: 120
+	},
+||||||| .r11156
+		renderAddSourceToolbar: function() {
+			this.setPrimaryButton( this.addText, function( controller, state ) {
+				var attachment = state.get( 'selection' ).single();
+				controller.media.setSource( attachment );
+				state.trigger( 'add-source', controller.media.toJSON() );
+			} );
+		}
+	});
+=======
 },{}],7:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function( options ) {
+		this.DetailsView = options.DetailsView;
+		this.cancelText = options.cancelText;
+		this.addText = options.addText;
+||||||| .r11156
+	/**
+	 * wp.media.view.MediaFrame.AudioDetails
+	 *
+	 * @constructor
+	 * @augments wp.media.view.MediaFrame.MediaDetails
+	 * @augments wp.media.view.MediaFrame.Select
+	 * @augments wp.media.view.MediaFrame
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+	 */
+	media.view.MediaFrame.AudioDetails = media.view.MediaFrame.MediaDetails.extend({
+		defaults: {
+			id:      'audio',
+			url:     '',
+			menu:    'audio-details',
+			content: 'audio-details',
+			toolbar: 'audio-details',
+			type:    'link',
+			title:    l10n.audioDetailsTitle,
+			priority: 120
+		},
+=======
 /**
  * wp.media.view.MediaFrame.MediaDetails
  *
@@ -467,7 +1239,19 @@ module.exports = AudioDetails;
 var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	MediaDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.media = new wp.media.model.PostMedia( options.metadata );
+		this.options.selection = new wp.media.model.Selection( this.media.attachment, { multiple: false } );
+		Select.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+		initialize: function( options ) {
+			options.DetailsView = media.view.AudioDetails;
+			options.cancelText = l10n.audioDetailsCancel;
+			options.addText = l10n.audioAddSourceTitle;
+=======
 MediaDetails = Select.extend({
 	defaults: {
 		id:      'media',
@@ -478,43 +1262,197 @@ MediaDetails = Select.extend({
 		type:    'link',
 		priority: 120
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindHandlers: function() {
+		var menu = this.defaults.menu;
+||||||| .r11156
+			media.view.MediaFrame.MediaDetails.prototype.initialize.call( this, options );
+		},
+=======
 	initialize: function( options ) {
 		this.DetailsView = options.DetailsView;
 		this.cancelText = options.cancelText;
 		this.addText = options.addText;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Select.prototype.bindHandlers.apply( this, arguments );
+||||||| .r11156
+		bindHandlers: function() {
+			media.view.MediaFrame.MediaDetails.prototype.bindHandlers.apply( this, arguments );
+=======
 		this.media = new wp.media.model.PostMedia( options.metadata );
 		this.options.selection = new wp.media.model.Selection( this.media.attachment, { multiple: false } );
 		Select.prototype.initialize.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'menu:create:' + menu, this.createMenu, this );
+		this.on( 'content:render:' + menu, this.renderDetailsContent, this );
+		this.on( 'menu:render:' + menu, this.renderMenu, this );
+		this.on( 'toolbar:render:' + menu, this.renderDetailsToolbar, this );
+	},
+||||||| .r11156
+			this.on( 'toolbar:render:replace-audio', this.renderReplaceToolbar, this );
+			this.on( 'toolbar:render:add-audio-source', this.renderAddSourceToolbar, this );
+		},
+=======
 	bindHandlers: function() {
 		var menu = this.defaults.menu;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	renderDetailsContent: function() {
+		var view = new this.DetailsView({
+			controller: this,
+			model: this.state().media,
+			attachment: this.state().media.attachment
+		}).render();
+||||||| .r11156
+		createStates: function() {
+			this.states.add([
+				new media.controller.AudioDetails( {
+					media: this.media
+				} ),
+=======
 		Select.prototype.bindHandlers.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.content.set( view );
+	},
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'audio',
+					id: 'replace-audio',
+					title: l10n.audioReplaceTitle,
+					toolbar: 'replace-audio',
+					media: this.media,
+					menu: 'audio-details'
+				} ),
+=======
 		this.on( 'menu:create:' + menu, this.createMenu, this );
 		this.on( 'content:render:' + menu, this.renderDetailsContent, this );
 		this.on( 'menu:render:' + menu, this.renderMenu, this );
 		this.on( 'toolbar:render:' + menu, this.renderDetailsToolbar, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	renderMenu: function( view ) {
+		var lastState = this.lastState(),
+			previous = lastState && lastState.id,
+			frame = this;
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'audio',
+					id: 'add-audio-source',
+					title: l10n.audioAddSourceTitle,
+					toolbar: 'add-audio-source',
+					media: this.media,
+					menu: false
+				} )
+			]);
+		}
+	});
+=======
 	renderDetailsContent: function() {
 		var view = new this.DetailsView({
 			controller: this,
 			model: this.state().media,
 			attachment: this.state().media.attachment
 		}).render();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		view.set({
+			cancel: {
+				text:     this.cancelText,
+				priority: 20,
+				click:    function() {
+					if ( previous ) {
+						frame.setState( previous );
+					} else {
+						frame.close();
+					}
+				}
+			},
+			separateCancel: new wp.media.View({
+				className: 'separator',
+				priority: 40
+			})
+		});
+||||||| .r11156
+	/**
+	 * wp.media.view.MediaFrame.VideoDetails
+	 *
+	 * @constructor
+	 * @augments wp.media.view.MediaFrame.MediaDetails
+	 * @augments wp.media.view.MediaFrame.Select
+	 * @augments wp.media.view.MediaFrame
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+	 */
+	media.view.MediaFrame.VideoDetails = media.view.MediaFrame.MediaDetails.extend({
+		defaults: {
+			id:      'video',
+			url:     '',
+			menu:    'video-details',
+			content: 'video-details',
+			toolbar: 'video-details',
+			type:    'link',
+			title:    l10n.videoDetailsTitle,
+			priority: 120
+		},
+=======
 		this.content.set( view );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	},
+||||||| .r11156
+		initialize: function( options ) {
+			options.DetailsView = media.view.VideoDetails;
+			options.cancelText = l10n.videoDetailsCancel;
+			options.addText = l10n.videoAddSourceTitle;
+=======
 	renderMenu: function( view ) {
 		var lastState = this.lastState(),
 			previous = lastState && lastState.id,
 			frame = this;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	setPrimaryButton: function(text, handler) {
+		this.toolbar.set( new wp.media.view.Toolbar({
+			controller: this,
+			items: {
+				button: {
+					style:    'primary',
+					text:     text,
+					priority: 80,
+					click:    function() {
+						var controller = this.controller;
+						handler.call( this, controller, controller.state() );
+						// Restore and reset the default state.
+						controller.setState( controller.options.state );
+						controller.reset();
+					}
+				}
+			}
+		}) );
+	},
+||||||| .r11156
+			media.view.MediaFrame.MediaDetails.prototype.initialize.call( this, options );
+		},
+=======
 		view.set({
 			cancel: {
 				text:     this.cancelText,
@@ -532,9 +1470,37 @@ MediaDetails = Select.extend({
 				priority: 40
 			})
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	renderDetailsToolbar: function() {
+		this.setPrimaryButton( l10n.update, function( controller, state ) {
+			controller.close();
+			state.trigger( 'update', controller.media.toJSON() );
+		} );
 	},
+||||||| .r11156
+		bindHandlers: function() {
+			media.view.MediaFrame.MediaDetails.prototype.bindHandlers.apply( this, arguments );
+=======
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	renderReplaceToolbar: function() {
+		this.setPrimaryButton( l10n.replace, function( controller, state ) {
+			var attachment = state.get( 'selection' ).single();
+			controller.media.changeAttachment( attachment );
+			state.trigger( 'replace', controller.media.toJSON() );
+		} );
+	},
+||||||| .r11156
+			this.on( 'toolbar:render:replace-video', this.renderReplaceToolbar, this );
+			this.on( 'toolbar:render:add-video-source', this.renderAddSourceToolbar, this );
+			this.on( 'toolbar:render:select-poster-image', this.renderSelectPosterImageToolbar, this );
+			this.on( 'toolbar:render:add-track', this.renderAddTrackToolbar, this );
+		},
+=======
 	setPrimaryButton: function(text, handler) {
 		this.toolbar.set( new wp.media.view.Toolbar({
 			controller: this,
@@ -554,14 +1520,44 @@ MediaDetails = Select.extend({
 			}
 		}) );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	renderAddSourceToolbar: function() {
+		this.setPrimaryButton( this.addText, function( controller, state ) {
+			var attachment = state.get( 'selection' ).single();
+			controller.media.setSource( attachment );
+			state.trigger( 'add-source', controller.media.toJSON() );
+		} );
+	}
+});
+||||||| .r11156
+		createStates: function() {
+			this.states.add([
+				new media.controller.VideoDetails({
+					media: this.media
+				}),
+=======
 	renderDetailsToolbar: function() {
 		this.setPrimaryButton( l10n.update, function( controller, state ) {
 			controller.close();
 			state.trigger( 'update', controller.media.toJSON() );
 		} );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = MediaDetails;
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'video',
+					id: 'replace-video',
+					title: l10n.videoReplaceTitle,
+					toolbar: 'replace-video',
+					media: this.media,
+					menu: 'video-details'
+				} ),
+=======
 	renderReplaceToolbar: function() {
 		this.setPrimaryButton( l10n.replace, function( controller, state ) {
 			var attachment = state.get( 'selection' ).single();
@@ -569,7 +1565,37 @@ MediaDetails = Select.extend({
 			state.trigger( 'replace', controller.media.toJSON() );
 		} );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],8:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.VideoDetails
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.MediaDetails
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
+	MediaLibrary = wp.media.controller.MediaLibrary,
+	l10n = wp.media.view.l10n,
+	VideoDetails;
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'video',
+					id: 'add-video-source',
+					title: l10n.videoAddSourceTitle,
+					toolbar: 'add-video-source',
+					media: this.media,
+					menu: false
+				} ),
+=======
 	renderAddSourceToolbar: function() {
 		this.setPrimaryButton( this.addText, function( controller, state ) {
 			var attachment = state.get( 'selection' ).single();
@@ -578,12 +1604,62 @@ MediaDetails = Select.extend({
 		} );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+VideoDetails = MediaDetails.extend({
+	defaults: {
+		id:      'video',
+		url:     '',
+		menu:    'video-details',
+		content: 'video-details',
+		toolbar: 'video-details',
+		type:    'link',
+		title:    l10n.videoDetailsTitle,
+		priority: 120
+	},
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'image',
+					id: 'select-poster-image',
+					title: l10n.videoSelectPosterImageTitle,
+					toolbar: 'select-poster-image',
+					media: this.media,
+					menu: 'video-details'
+				} ),
+=======
 module.exports = MediaDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function( options ) {
+		options.DetailsView = wp.media.view.VideoDetails;
+		options.cancelText = l10n.videoDetailsCancel;
+		options.addText = l10n.videoAddSourceTitle;
+||||||| .r11156
+				new media.controller.MediaLibrary( {
+					type: 'text',
+					id: 'add-track',
+					title: l10n.videoAddTrackTitle,
+					toolbar: 'add-track',
+					media: this.media,
+					menu: 'video-details'
+				} )
+			]);
+		},
+=======
 },{}],8:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		MediaDetails.prototype.initialize.call( this, options );
+	},
+||||||| .r11156
+		renderSelectPosterImageToolbar: function() {
+			this.setPrimaryButton( l10n.videoSelectPosterImageTitle, function( controller, state ) {
+				var urls = [], attachment = state.get( 'selection' ).single();
+=======
 /**
  * wp.media.view.MediaFrame.VideoDetails
  *
@@ -601,7 +1677,15 @@ var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
 	MediaLibrary = wp.media.controller.MediaLibrary,
 	l10n = wp.media.view.l10n,
 	VideoDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindHandlers: function() {
+		MediaDetails.prototype.bindHandlers.apply( this, arguments );
+||||||| .r11156
+				controller.media.set( 'poster', attachment.get( 'url' ) );
+				state.trigger( 'set-poster-image', controller.media.toJSON() );
+=======
 VideoDetails = MediaDetails.extend({
 	defaults: {
 		id:      'video',
@@ -613,24 +1697,124 @@ VideoDetails = MediaDetails.extend({
 		title:    l10n.videoDetailsTitle,
 		priority: 120
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'toolbar:render:replace-video', this.renderReplaceToolbar, this );
+		this.on( 'toolbar:render:add-video-source', this.renderAddSourceToolbar, this );
+		this.on( 'toolbar:render:select-poster-image', this.renderSelectPosterImageToolbar, this );
+		this.on( 'toolbar:render:add-track', this.renderAddTrackToolbar, this );
+	},
+||||||| .r11156
+				_.each( wp.media.view.settings.embedExts, function (ext) {
+					if ( controller.media.get( ext ) ) {
+						urls.push( controller.media.get( ext ) );
+					}
+				} );
+=======
 	initialize: function( options ) {
 		options.DetailsView = wp.media.view.VideoDetails;
 		options.cancelText = l10n.videoDetailsCancel;
 		options.addText = l10n.videoAddSourceTitle;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	createStates: function() {
+		this.states.add([
+			new wp.media.controller.VideoDetails({
+				media: this.media
+			}),
+||||||| .r11156
+				wp.ajax.send( 'set-attachment-thumbnail', {
+					data : {
+						urls: urls,
+						thumbnail_id: attachment.get( 'id' )
+					}
+				} );
+			} );
+		},
+=======
 		MediaDetails.prototype.initialize.call( this, options );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			new MediaLibrary( {
+				type: 'video',
+				id: 'replace-video',
+				title: l10n.videoReplaceTitle,
+				toolbar: 'replace-video',
+				media: this.media,
+				menu: 'video-details'
+			} ),
+||||||| .r11156
+		renderAddTrackToolbar: function() {
+			this.setPrimaryButton( l10n.videoAddTrackTitle, function( controller, state ) {
+				var attachment = state.get( 'selection' ).single(),
+					content = controller.media.get( 'content' );
+=======
 	bindHandlers: function() {
 		MediaDetails.prototype.bindHandlers.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			new MediaLibrary( {
+				type: 'video',
+				id: 'add-video-source',
+				title: l10n.videoAddSourceTitle,
+				toolbar: 'add-video-source',
+				media: this.media,
+				menu: false
+			} ),
+||||||| .r11156
+				if ( -1 === content.indexOf( attachment.get( 'url' ) ) ) {
+					content += [
+						''
+					].join('');
+=======
 		this.on( 'toolbar:render:replace-video', this.renderReplaceToolbar, this );
 		this.on( 'toolbar:render:add-video-source', this.renderAddSourceToolbar, this );
 		this.on( 'toolbar:render:select-poster-image', this.renderSelectPosterImageToolbar, this );
 		this.on( 'toolbar:render:add-track', this.renderAddTrackToolbar, this );
 	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			new MediaLibrary( {
+				type: 'image',
+				id: 'select-poster-image',
+				title: l10n.videoSelectPosterImageTitle,
+				toolbar: 'select-poster-image',
+				media: this.media,
+				menu: 'video-details'
+			} ),
+
+			new MediaLibrary( {
+				type: 'text',
+				id: 'add-track',
+				title: l10n.videoAddTrackTitle,
+				toolbar: 'add-track',
+				media: this.media,
+				menu: 'video-details'
+			} )
+		]);
+	},
+
+	renderSelectPosterImageToolbar: function() {
+		this.setPrimaryButton( l10n.videoSelectPosterImageTitle, function( controller, state ) {
+			var urls = [], attachment = state.get( 'selection' ).single();
+
+			controller.media.set( 'poster', attachment.get( 'url' ) );
+			state.trigger( 'set-poster-image', controller.media.toJSON() );
 
+			_.each( wp.media.view.settings.embedExts, function (ext) {
+				if ( controller.media.get( ext ) ) {
+					urls.push( controller.media.get( ext ) );
+||||||| .r11156
+					controller.media.set( 'content', content );
+=======
 	createStates: function() {
 		this.states.add([
 			new wp.media.controller.VideoDetails({
@@ -685,6 +1869,7 @@ VideoDetails = MediaDetails.extend({
 			_.each( wp.media.view.settings.embedExts, function (ext) {
 				if ( controller.media.get( ext ) ) {
 					urls.push( controller.media.get( ext ) );
+>>>>>>> .r12027
 				}
 			} );
 
@@ -718,8 +1903,20 @@ VideoDetails = MediaDetails.extend({
 
 module.exports = VideoDetails;
 
+<<<<<<< .mine
+},{}],9:[function(require,module,exports){
+/* global MediaElementPlayer */
+||||||| .r11156
+		/**
+		 *
+		 * @fires wp.media.view.MediaDetails#media:setting:remove
+		 */
+		setTracks : function() {
+			var tracks = '';
+=======
 },{}],9:[function(require,module,exports){
 /*global wp, jQuery, _, MediaElementPlayer */
+>>>>>>> .r12027
 
 /**
  * wp.media.view.MediaDetails
@@ -886,6 +2083,43 @@ MediaDetails = AttachmentDisplay.extend({
 
 module.exports = MediaDetails;
 
+<<<<<<< .mine
+},{}],10:[function(require,module,exports){
+/**
+ * wp.media.view.VideoDetails
+ *
+ * @class
+ * @augments wp.media.view.MediaDetails
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var MediaDetails = wp.media.view.MediaDetails,
+	VideoDetails;
+
+VideoDetails = MediaDetails.extend({
+	className: 'video-details',
+	template:  wp.template('video-details'),
+
+	setMedia: function() {
+		var video = this.$('.wp-video-shortcode');
+
+		if ( video.find( 'source' ).length ) {
+			if ( video.is(':hidden') ) {
+				video.show();
+			}
+
+			if ( ! video.hasClass( 'youtube-video' ) && ! video.hasClass( 'vimeo-video' ) ) {
+				this.media = MediaDetails.prepareSrc( video.get(0) );
+||||||| .r11156
+				if ( ! video.hasClass('youtube-video') ) {
+					this.media = media.view.MediaDetails.prepareSrc( video.get(0) );
+				} else {
+					this.media = video.get(0);
+				}
+=======
 },{}],10:[function(require,module,exports){
 /*globals wp */
 
@@ -917,6 +2151,7 @@ VideoDetails = MediaDetails.extend({
 
 			if ( ! video.hasClass( 'youtube-video' ) && ! video.hasClass( 'vimeo-video' ) ) {
 				this.media = MediaDetails.prepareSrc( video.get(0) );
+>>>>>>> .r12027
 			} else {
 				this.media = video.get(0);
 			}
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.min.js b/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.min.js
index f5aef740..a15b14c8 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-audiovideo.min.js
@@ -1 +1,4 @@
-!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g'].join(""),a.media.set("content",d)),b.trigger("add-track",a.media.toJSON())})}}),b.exports=c},{}],9:[function(a,b){var c,d=wp.media.view.Settings.AttachmentDisplay,e=jQuery;c=d.extend({initialize:function(){_.bindAll(this,"success"),this.players=[],this.listenTo(this.controller,"close",wp.media.mixin.unsetPlayers),this.on("ready",this.setPlayer),this.on("media:setting:remove",wp.media.mixin.unsetPlayers,this),this.on("media:setting:remove",this.render),this.on("media:setting:remove",this.setPlayer),this.events=_.extend(this.events,{"click .remove-setting":"removeSetting","change .content-track":"setTracks","click .remove-track":"setTracks","click .add-media-source":"addSource"}),d.prototype.initialize.apply(this,arguments)},prepare:function(){return _.defaults({model:this.model.toJSON()},this.options)},removeSetting:function(a){var b,c=e(a.currentTarget).parent();b=c.find("input").data("setting"),b&&(this.model.unset(b),this.trigger("media:setting:remove",this)),c.remove()},setTracks:function(){var a="";_.each(this.$(".content-track"),function(b){a+=e(b).val()}),this.model.set("content",a),this.trigger("media:setting:remove",this)},addSource:function(a){this.controller.lastMime=e(a.currentTarget).data("mime"),this.controller.setState("add-"+this.controller.defaults.id+"-source")},loadPlayer:function(){this.players.push(new MediaElementPlayer(this.media,this.settings)),this.scriptXhr=!1},setPlayer:function(){var a;this.players.length||!this.media||this.scriptXhr||(this.model.get("src").indexOf("vimeo")>-1&&!("Froogaloop"in window)?(a=wp.media.mixin.mejsSettings,this.scriptXhr=e.getScript(a.pluginPath+"froogaloop.min.js",_.bind(this.loadPlayer,this))):this.loadPlayer())},setMedia:function(){return this},success:function(a){var b=a.attributes.autoplay&&"false"!==a.attributes.autoplay;"flash"===a.pluginType&&b&&a.addEventListener("canplay",function(){a.play()},!1),this.mejs=a},render:function(){return d.prototype.render.apply(this,arguments),setTimeout(_.bind(function(){this.resetFocus()},this),10),this.settings=_.defaults({success:this.success},wp.media.mixin.mejsSettings),this.setMedia()},resetFocus:function(){this.$(".embed-media-settings").scrollTop(0)}},{instances:0,prepareSrc:function(a){var b=c.instances++;return _.each(e(a).find("source"),function(a){a.src=[a.src,a.src.indexOf("?")>-1?"&":"?","_=",b].join("")}),a}}),b.exports=c},{}],10:[function(a,b){var c,d=wp.media.view.MediaDetails;c=d.extend({className:"video-details",template:wp.template("video-details"),setMedia:function(){var a=this.$(".wp-video-shortcode");return a.find("source").length?(a.is(":hidden")&&a.show(),this.media=a.hasClass("youtube-video")||a.hasClass("vimeo-video")?a.get(0):d.prepareSrc(a.get(0))):(a.hide(),this.media=!1),this}}),b.exports=c},{}]},{},[1]);
\ No newline at end of file
+<<<<<<< .mine
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g'].join(""),a.media.set("content",d)),b.trigger("add-track",a.media.toJSON())})}}),b.exports=d},{}],9:[function(a,b,c){var d,e=wp.media.view.Settings.AttachmentDisplay,f=jQuery;d=e.extend({initialize:function(){_.bindAll(this,"success"),this.players=[],this.listenTo(this.controller,"close",wp.media.mixin.unsetPlayers),this.on("ready",this.setPlayer),this.on("media:setting:remove",wp.media.mixin.unsetPlayers,this),this.on("media:setting:remove",this.render),this.on("media:setting:remove",this.setPlayer),this.events=_.extend(this.events,{"click .remove-setting":"removeSetting","change .content-track":"setTracks","click .remove-track":"setTracks","click .add-media-source":"addSource"}),e.prototype.initialize.apply(this,arguments)},prepare:function(){return _.defaults({model:this.model.toJSON()},this.options)},removeSetting:function(a){var b,c=f(a.currentTarget).parent();b=c.find("input").data("setting"),b&&(this.model.unset(b),this.trigger("media:setting:remove",this)),c.remove()},setTracks:function(){var a="";_.each(this.$(".content-track"),function(b){a+=f(b).val()}),this.model.set("content",a),this.trigger("media:setting:remove",this)},addSource:function(a){this.controller.lastMime=f(a.currentTarget).data("mime"),this.controller.setState("add-"+this.controller.defaults.id+"-source")},loadPlayer:function(){this.players.push(new MediaElementPlayer(this.media,this.settings)),this.scriptXhr=!1},setPlayer:function(){var a;this.players.length||!this.media||this.scriptXhr||(this.model.get("src").indexOf("vimeo")>-1&&!("Froogaloop"in window)?(a=wp.media.mixin.mejsSettings,this.scriptXhr=f.getScript(a.pluginPath+"froogaloop.min.js",_.bind(this.loadPlayer,this))):this.loadPlayer())},setMedia:function(){return this},success:function(a){var b=a.attributes.autoplay&&"false"!==a.attributes.autoplay;"flash"===a.pluginType&&b&&a.addEventListener("canplay",function(){a.play()},!1),this.mejs=a},render:function(){return e.prototype.render.apply(this,arguments),setTimeout(_.bind(function(){this.resetFocus()},this),10),this.settings=_.defaults({success:this.success},wp.media.mixin.mejsSettings),this.setMedia()},resetFocus:function(){this.$(".embed-media-settings").scrollTop(0)}},{instances:0,prepareSrc:function(a){var b=d.instances++;return _.each(f(a).find("source"),function(a){a.src=[a.src,a.src.indexOf("?")>-1?"&":"?","_=",b].join("")}),a}}),b.exports=d},{}],10:[function(a,b,c){var d,e=wp.media.view.MediaDetails;d=e.extend({className:"video-details",template:wp.template("video-details"),setMedia:function(){var a=this.$(".wp-video-shortcode");return a.find("source").length?(a.is(":hidden")&&a.show(),a.hasClass("youtube-video")||a.hasClass("vimeo-video")?this.media=a.get(0):this.media=e.prepareSrc(a.get(0))):(a.hide(),this.media=!1),this}}),b.exports=d},{}]},{},[1]);||||||| .r11156
+!function(a,b,c){var d=wp.media,e={},f="undefined"==typeof _wpMediaViewsL10n?{}:_wpMediaViewsL10n;b.isUndefined(window._wpmejsSettings)||(e=_wpmejsSettings),wp.media.mixin={mejsSettings:e,removeAllPlayers:function(){var a;if(window.mejs&&window.mejs.players)for(a in window.mejs.players)window.mejs.players[a].pause(),this.removePlayer(window.mejs.players[a])},removePlayer:function(a){var b,c;if(a.options){for(b in a.options.features)if(c=a.options.features[b],a["clean"+c])try{a["clean"+c](a)}catch(d){}a.isDynamic||a.$node.remove(),"native"!==a.media.pluginType&&a.media.remove(),delete window.mejs.players[a.id],a.container.remove(),a.globalUnbind(),delete a.node.player}},unsetPlayers:function(){this.players&&this.players.length&&(b.each(this.players,function(a){a.pause(),wp.media.mixin.removePlayer(a)}),this.players=[])}},wp.media.playlist=new wp.media.collection({tag:"playlist",editTitle:f.editPlaylistTitle,defaults:{id:wp.media.view.settings.post.id,style:"light",tracklist:!0,tracknumbers:!0,images:!0,artists:!0,type:"audio"}}),wp.media.audio={coerce:wp.media.coerce,defaults:{id:wp.media.view.settings.post.id,src:"",loop:!1,autoplay:!1,preload:"none",width:400},edit:function(a){var c,d=wp.shortcode.next("audio",a).shortcode;return c=wp.media({frame:"audio",state:"audio-details",metadata:b.defaults(d.attrs.named,this.defaults)})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.content,delete a.content,new wp.shortcode({tag:"audio",attrs:a,content:c})}},wp.media.video={coerce:wp.media.coerce,defaults:{id:wp.media.view.settings.post.id,src:"",poster:"",loop:!1,autoplay:!1,preload:"metadata",content:"",width:640,height:360},edit:function(a){var c,d,e=wp.shortcode.next("video",a).shortcode;return d=e.attrs.named,d.content=e.content,c=wp.media({frame:"video",state:"video-details",metadata:b.defaults(d,this.defaults)})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.content,delete a.content,new wp.shortcode({tag:"video",attrs:a,content:c})}},d.model.PostMedia=c.Model.extend({initialize:function(){this.attachment=!1},setSource:function(a){this.attachment=a,this.extension=a.get("filename").split(".").pop(),this.get("src")&&this.extension===this.get("src").split(".").pop()&&this.unset("src"),b.contains(wp.media.view.settings.embedExts,this.extension)?this.set(this.extension,this.attachment.get("url")):this.unset(this.extension)},changeAttachment:function(a){var c=this;this.setSource(a),this.unset("src"),b.each(b.without(wp.media.view.settings.embedExts,this.extension),function(a){c.unset(a)})}}),d.controller.AudioDetails=d.controller.State.extend({defaults:{id:"audio-details",toolbar:"audio-details",title:f.audioDetailsTitle,content:"audio-details",menu:"audio-details",router:!1,priority:60},initialize:function(a){this.media=a.media,d.controller.State.prototype.initialize.apply(this,arguments)}}),d.controller.VideoDetails=d.controller.State.extend({defaults:{id:"video-details",toolbar:"video-details",title:f.videoDetailsTitle,content:"video-details",menu:"video-details",router:!1,priority:60},initialize:function(a){this.media=a.media,d.controller.State.prototype.initialize.apply(this,arguments)}}),d.view.MediaFrame.MediaDetails=d.view.MediaFrame.Select.extend({defaults:{id:"media",url:"",menu:"media-details",content:"media-details",toolbar:"media-details",type:"link",priority:120},initialize:function(a){this.DetailsView=a.DetailsView,this.cancelText=a.cancelText,this.addText=a.addText,this.media=new d.model.PostMedia(a.metadata),this.options.selection=new d.model.Selection(this.media.attachment,{multiple:!1}),d.view.MediaFrame.Select.prototype.initialize.apply(this,arguments)},bindHandlers:function(){var a=this.defaults.menu;d.view.MediaFrame.Select.prototype.bindHandlers.apply(this,arguments),this.on("menu:create:"+a,this.createMenu,this),this.on("content:render:"+a,this.renderDetailsContent,this),this.on("menu:render:"+a,this.renderMenu,this),this.on("toolbar:render:"+a,this.renderDetailsToolbar,this)},renderDetailsContent:function(){var a=new this.DetailsView({controller:this,model:this.state().media,attachment:this.state().media.attachment}).render();this.content.set(a)},renderMenu:function(a){var b=this.lastState(),c=b&&b.id,e=this;a.set({cancel:{text:this.cancelText,priority:20,click:function(){c?e.setState(c):e.close()}},separateCancel:new d.View({className:"separator",priority:40})})},setPrimaryButton:function(a,b){this.toolbar.set(new d.view.Toolbar({controller:this,items:{button:{style:"primary",text:a,priority:80,click:function(){var a=this.controller;b.call(this,a,a.state()),a.setState(a.options.state),a.reset()}}}}))},renderDetailsToolbar:function(){this.setPrimaryButton(f.update,function(a,b){a.close(),b.trigger("update",a.media.toJSON())})},renderReplaceToolbar:function(){this.setPrimaryButton(f.replace,function(a,b){var c=b.get("selection").single();a.media.changeAttachment(c),b.trigger("replace",a.media.toJSON())})},renderAddSourceToolbar:function(){this.setPrimaryButton(this.addText,function(a,b){var c=b.get("selection").single();a.media.setSource(c),b.trigger("add-source",a.media.toJSON())})}}),d.view.MediaFrame.AudioDetails=d.view.MediaFrame.MediaDetails.extend({defaults:{id:"audio",url:"",menu:"audio-details",content:"audio-details",toolbar:"audio-details",type:"link",title:f.audioDetailsTitle,priority:120},initialize:function(a){a.DetailsView=d.view.AudioDetails,a.cancelText=f.audioDetailsCancel,a.addText=f.audioAddSourceTitle,d.view.MediaFrame.MediaDetails.prototype.initialize.call(this,a)},bindHandlers:function(){d.view.MediaFrame.MediaDetails.prototype.bindHandlers.apply(this,arguments),this.on("toolbar:render:replace-audio",this.renderReplaceToolbar,this),this.on("toolbar:render:add-audio-source",this.renderAddSourceToolbar,this)},createStates:function(){this.states.add([new d.controller.AudioDetails({media:this.media}),new d.controller.MediaLibrary({type:"audio",id:"replace-audio",title:f.audioReplaceTitle,toolbar:"replace-audio",media:this.media,menu:"audio-details"}),new d.controller.MediaLibrary({type:"audio",id:"add-audio-source",title:f.audioAddSourceTitle,toolbar:"add-audio-source",media:this.media,menu:!1})])}}),d.view.MediaFrame.VideoDetails=d.view.MediaFrame.MediaDetails.extend({defaults:{id:"video",url:"",menu:"video-details",content:"video-details",toolbar:"video-details",type:"link",title:f.videoDetailsTitle,priority:120},initialize:function(a){a.DetailsView=d.view.VideoDetails,a.cancelText=f.videoDetailsCancel,a.addText=f.videoAddSourceTitle,d.view.MediaFrame.MediaDetails.prototype.initialize.call(this,a)},bindHandlers:function(){d.view.MediaFrame.MediaDetails.prototype.bindHandlers.apply(this,arguments),this.on("toolbar:render:replace-video",this.renderReplaceToolbar,this),this.on("toolbar:render:add-video-source",this.renderAddSourceToolbar,this),this.on("toolbar:render:select-poster-image",this.renderSelectPosterImageToolbar,this),this.on("toolbar:render:add-track",this.renderAddTrackToolbar,this)},createStates:function(){this.states.add([new d.controller.VideoDetails({media:this.media}),new d.controller.MediaLibrary({type:"video",id:"replace-video",title:f.videoReplaceTitle,toolbar:"replace-video",media:this.media,menu:"video-details"}),new d.controller.MediaLibrary({type:"video",id:"add-video-source",title:f.videoAddSourceTitle,toolbar:"add-video-source",media:this.media,menu:!1}),new d.controller.MediaLibrary({type:"image",id:"select-poster-image",title:f.videoSelectPosterImageTitle,toolbar:"select-poster-image",media:this.media,menu:"video-details"}),new d.controller.MediaLibrary({type:"text",id:"add-track",title:f.videoAddTrackTitle,toolbar:"add-track",media:this.media,menu:"video-details"})])},renderSelectPosterImageToolbar:function(){this.setPrimaryButton(f.videoSelectPosterImageTitle,function(a,c){var d=[],e=c.get("selection").single();a.media.set("poster",e.get("url")),c.trigger("set-poster-image",a.media.toJSON()),b.each(wp.media.view.settings.embedExts,function(b){a.media.get(b)&&d.push(a.media.get(b))}),wp.ajax.send("set-attachment-thumbnail",{data:{urls:d,thumbnail_id:e.get("id")}})})},renderAddTrackToolbar:function(){this.setPrimaryButton(f.videoAddTrackTitle,function(a,b){var c=b.get("selection").single(),d=a.media.get("content");-1===d.indexOf(c.get("url"))&&(d+=[''].join(""),a.media.set("content",d)),b.trigger("add-track",a.media.toJSON())})}}),d.view.MediaDetails=d.view.Settings.AttachmentDisplay.extend({initialize:function(){b.bindAll(this,"success"),this.players=[],this.listenTo(this.controller,"close",d.mixin.unsetPlayers),this.on("ready",this.setPlayer),this.on("media:setting:remove",d.mixin.unsetPlayers,this),this.on("media:setting:remove",this.render),this.on("media:setting:remove",this.setPlayer),this.events=b.extend(this.events,{"click .remove-setting":"removeSetting","change .content-track":"setTracks","click .remove-track":"setTracks","click .add-media-source":"addSource"}),d.view.Settings.AttachmentDisplay.prototype.initialize.apply(this,arguments)},prepare:function(){return b.defaults({model:this.model.toJSON()},this.options)},removeSetting:function(b){var c,d=a(b.currentTarget).parent();c=d.find("input").data("setting"),c&&(this.model.unset(c),this.trigger("media:setting:remove",this)),d.remove()},setTracks:function(){var c="";b.each(this.$(".content-track"),function(b){c+=a(b).val()}),this.model.set("content",c),this.trigger("media:setting:remove",this)},addSource:function(b){this.controller.lastMime=a(b.currentTarget).data("mime"),this.controller.setState("add-"+this.controller.defaults.id+"-source")},setPlayer:function(){!this.players.length&&this.media&&this.players.push(new MediaElementPlayer(this.media,this.settings))},setMedia:function(){return this},success:function(a){var b=a.attributes.autoplay&&"false"!==a.attributes.autoplay;"flash"===a.pluginType&&b&&a.addEventListener("canplay",function(){a.play()},!1),this.mejs=a},render:function(){var a=this;return d.view.Settings.AttachmentDisplay.prototype.render.apply(this,arguments),setTimeout(function(){a.resetFocus()},10),this.settings=b.defaults({success:this.success},e),this.setMedia()},resetFocus:function(){this.$(".embed-media-settings").scrollTop(0)}},{instances:0,prepareSrc:function(c){var e=d.view.MediaDetails.instances++;return b.each(a(c).find("source"),function(a){a.src=[a.src,a.src.indexOf("?")>-1?"&":"?","_=",e].join("")}),c}}),d.view.AudioDetails=d.view.MediaDetails.extend({className:"audio-details",template:d.template("audio-details"),setMedia:function(){var a=this.$(".wp-audio-shortcode");return a.find("source").length?(a.is(":hidden")&&a.show(),this.media=d.view.MediaDetails.prepareSrc(a.get(0))):(a.hide(),this.media=!1),this}}),d.view.VideoDetails=d.view.MediaDetails.extend({className:"video-details",template:d.template("video-details"),setMedia:function(){var a=this.$(".wp-video-shortcode");return a.find("source").length?(a.is(":hidden")&&a.show(),this.media=a.hasClass("youtube-video")?a.get(0):d.view.MediaDetails.prepareSrc(a.get(0))):(a.hide(),this.media=!1),this}})}(jQuery,_,Backbone);=======
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g'].join(""),a.media.set("content",d)),b.trigger("add-track",a.media.toJSON())})}}),b.exports=c},{}],9:[function(a,b){var c,d=wp.media.view.Settings.AttachmentDisplay,e=jQuery;c=d.extend({initialize:function(){_.bindAll(this,"success"),this.players=[],this.listenTo(this.controller,"close",wp.media.mixin.unsetPlayers),this.on("ready",this.setPlayer),this.on("media:setting:remove",wp.media.mixin.unsetPlayers,this),this.on("media:setting:remove",this.render),this.on("media:setting:remove",this.setPlayer),this.events=_.extend(this.events,{"click .remove-setting":"removeSetting","change .content-track":"setTracks","click .remove-track":"setTracks","click .add-media-source":"addSource"}),d.prototype.initialize.apply(this,arguments)},prepare:function(){return _.defaults({model:this.model.toJSON()},this.options)},removeSetting:function(a){var b,c=e(a.currentTarget).parent();b=c.find("input").data("setting"),b&&(this.model.unset(b),this.trigger("media:setting:remove",this)),c.remove()},setTracks:function(){var a="";_.each(this.$(".content-track"),function(b){a+=e(b).val()}),this.model.set("content",a),this.trigger("media:setting:remove",this)},addSource:function(a){this.controller.lastMime=e(a.currentTarget).data("mime"),this.controller.setState("add-"+this.controller.defaults.id+"-source")},loadPlayer:function(){this.players.push(new MediaElementPlayer(this.media,this.settings)),this.scriptXhr=!1},setPlayer:function(){var a;this.players.length||!this.media||this.scriptXhr||(this.model.get("src").indexOf("vimeo")>-1&&!("Froogaloop"in window)?(a=wp.media.mixin.mejsSettings,this.scriptXhr=e.getScript(a.pluginPath+"froogaloop.min.js",_.bind(this.loadPlayer,this))):this.loadPlayer())},setMedia:function(){return this},success:function(a){var b=a.attributes.autoplay&&"false"!==a.attributes.autoplay;"flash"===a.pluginType&&b&&a.addEventListener("canplay",function(){a.play()},!1),this.mejs=a},render:function(){return d.prototype.render.apply(this,arguments),setTimeout(_.bind(function(){this.resetFocus()},this),10),this.settings=_.defaults({success:this.success},wp.media.mixin.mejsSettings),this.setMedia()},resetFocus:function(){this.$(".embed-media-settings").scrollTop(0)}},{instances:0,prepareSrc:function(a){var b=c.instances++;return _.each(e(a).find("source"),function(a){a.src=[a.src,a.src.indexOf("?")>-1?"&":"?","_=",b].join("")}),a}}),b.exports=c},{}],10:[function(a,b){var c,d=wp.media.view.MediaDetails;c=d.extend({className:"video-details",template:wp.template("video-details"),setMedia:function(){var a=this.$(".wp-video-shortcode");return a.find("source").length?(a.is(":hidden")&&a.show(),this.media=a.hasClass("youtube-video")||a.hasClass("vimeo-video")?a.get(0):d.prepareSrc(a.get(0))):(a.hide(),this.media=!1),this}}),b.exports=c},{}]},{},[1]);>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-editor.min.js b/pavillonmadeleine.fr/wp-includes/js/media-editor.min.js
index b04f3953..e86e6bd7 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-editor.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-editor.min.js
@@ -1 +1,4 @@
-!function(a,b){var c={};wp.media.coerce=function(a,c){return b.isUndefined(a[c])&&!b.isUndefined(this.defaults[c])?a[c]=this.defaults[c]:"true"===a[c]?a[c]=!0:"false"===a[c]&&(a[c]=!1),a[c]},wp.media.string={props:function(a,c){var d,e,f,g,h,i=wp.media.view.settings.defaultProps;return h=function(a){return"image"!==a.type||a.alt||(a.alt=a.caption||a.title||"",a.alt=a.alt.replace(/<\/?[^>]+>/g,""),a.alt=a.alt.replace(/[\r\n]+/g," ")),a},a=a?b.clone(a):{},c&&c.type&&(a.type=c.type),"image"===a.type&&(a=b.defaults(a||{},{align:i.align||getUserSetting("align","none"),size:i.size||getUserSetting("imgsize","medium"),url:"",classes:[]})),c?(a.title=a.title||c.title,d=a.link||i.link||getUserSetting("urlbutton","file"),"file"===d||"embed"===d?e=c.url:"post"===d?e=c.link:"custom"===d&&(e=a.linkUrl),a.linkUrl=e||"","image"===c.type?(a.classes.push("wp-image-"+c.id),g=c.sizes,f=g&&g[a.size]?g[a.size]:c,b.extend(a,b.pick(c,"align","caption","alt"),{width:f.width,height:f.height,src:f.url,captionId:"attachment_"+c.id})):"video"===c.type||"audio"===c.type?b.extend(a,b.pick(c,"title","type","icon","mime")):(a.title=a.title||c.filename,a.rel=a.rel||"attachment wp-att-"+c.id),h(a)):h(a)},link:function(a,b){var c;return a=wp.media.string.props(a,b),c={tag:"a",content:a.title,attrs:{href:a.linkUrl}},a.rel&&(c.attrs.rel=a.rel),wp.html.string(c)},audio:function(a,b){return wp.media.string._audioVideo("audio",a,b)},video:function(a,b){return wp.media.string._audioVideo("video",a,b)},_audioVideo:function(a,c,d){var e,f,g;return c=wp.media.string.props(c,d),"embed"!==c.link?wp.media.string.link(c):(e={},"video"===a&&(d.image&&-1===d.image.src.indexOf(d.icon)&&(e.poster=d.image.src),d.width&&(e.width=d.width),d.height&&(e.height=d.height)),g=d.filename.split(".").pop(),b.contains(wp.media.view.settings.embedExts,g)?(e[g]=d.url,f=wp.shortcode.string({tag:a,attrs:e})):wp.media.string.link(c))},image:function(a,c){var d,e,f,g,h={};return a=wp.media.string.props(a,c),e=a.classes||[],h.src=b.isUndefined(c)?a.url:c.url,b.extend(h,b.pick(a,"width","height","alt")),a.align&&!a.caption&&e.push("align"+a.align),a.size&&e.push("size-"+a.size),h["class"]=b.compact(e).join(" "),d={tag:"img",attrs:h,single:!0},a.linkUrl&&(d={tag:"a",attrs:{href:a.linkUrl},content:d}),g=wp.html.string(d),a.caption&&(f={},h.width&&(f.width=h.width),a.captionId&&(f.id=a.captionId),a.align&&(f.align="align"+a.align),g=wp.shortcode.string({tag:"caption",attrs:f,content:g+" "+a.caption})),g}},wp.media.embed={coerce:wp.media.coerce,defaults:{url:"",width:"",height:""},edit:function(a,c){var d,e,f={};return c?f.url=a.replace(/<[^>]+>/g,""):(e=wp.shortcode.next("embed",a).shortcode,f=b.defaults(e.attrs.named,this.defaults),e.content&&(f.url=e.content)),d=wp.media({frame:"post",state:"embed",metadata:f})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.url,delete a.url,new wp.shortcode({tag:"embed",attrs:a,content:c})}},wp.media.collection=function(a){var c={};return b.extend({coerce:wp.media.coerce,attachments:function(a){var d,e,f,g,h=a.string(),i=c[h],j=this;return delete c[h],i?i:(d=b.defaults(a.attrs.named,this.defaults),e=b.pick(d,"orderby","order"),e.type=this.type,e.perPage=-1,void 0!==d.orderby&&(d._orderByField=d.orderby),"rand"===d.orderby&&(d._orderbyRandom=!0),(!d.orderby||/^menu_order(?: ID)?$/i.test(d.orderby))&&(e.orderby="menuOrder"),d.ids?(e.post__in=d.ids.split(","),e.orderby="post__in"):d.include&&(e.post__in=d.include.split(",")),d.exclude&&(e.post__not_in=d.exclude.split(",")),e.post__in||(e.uploadedTo=d.id),g=b.omit(d,"id","ids","include","exclude","orderby","order"),b.each(this.defaults,function(a,b){g[b]=j.coerce(g,b)}),f=wp.media.query(e),f[this.tag]=new Backbone.Model(g),f)},shortcode:function(a){var d,e,f=a.props.toJSON(),g=b.pick(f,"orderby","order");return a.type&&(g.type=a.type,delete a.type),a[this.tag]&&b.extend(g,a[this.tag].toJSON()),g.ids=a.pluck("id"),f.uploadedTo&&(g.id=f.uploadedTo),delete g.orderby,g._orderbyRandom?g.orderby="rand":g._orderByField&&"rand"!=g._orderByField&&(g.orderby=g._orderByField),delete g._orderbyRandom,delete g._orderByField,g.ids&&"post__in"===g.orderby&&delete g.orderby,g=this.setDefaults(g),d=new wp.shortcode({tag:this.tag,attrs:g,type:"single"}),e=new wp.media.model.Attachments(a.models,{props:f}),e[this.tag]=a[this.tag],c[d.string()]=e,d},edit:function(a){var c,d,e,f=wp.shortcode.next(this.tag,a),g=this.defaults.id;if(f&&f.content===a)return f=f.shortcode,b.isUndefined(f.get("id"))&&!b.isUndefined(g)&&f.set("id",g),c=this.attachments(f),d=new wp.media.model.Selection(c.models,{props:c.props.toJSON(),multiple:!0}),d[this.tag]=c[this.tag],d.more().done(function(){d.props.set({query:!1}),d.unmirror(),d.props.unset("orderby")}),this.frame&&this.frame.dispose(),e=f.attrs.named.type&&"video"===f.attrs.named.type?"video-"+this.tag+"-edit":this.tag+"-edit",this.frame=wp.media({frame:"post",state:e,title:this.editTitle,editing:!0,multiple:!0,selection:d}).open(),this.frame},setDefaults:function(a){var c=this;return b.each(this.defaults,function(b,d){a[d]=c.coerce(a,d),b===a[d]&&delete a[d]}),a}},a)},wp.media._galleryDefaults={itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",order:"ASC",id:wp.media.view.settings.post&&wp.media.view.settings.post.id,orderby:"menu_order ID"},wp.media.galleryDefaults=wp.media.view.settings.galleryDefaults?b.extend({},wp.media._galleryDefaults,wp.media.view.settings.galleryDefaults):wp.media._galleryDefaults,wp.media.gallery=new wp.media.collection({tag:"gallery",type:"image",editTitle:wp.media.view.l10n.editGalleryTitle,defaults:wp.media.galleryDefaults,setDefaults:function(a){var c=this,d=!b.isEqual(wp.media.galleryDefaults,wp.media._galleryDefaults);return b.each(this.defaults,function(b,e){a[e]=c.coerce(a,e),b!==a[e]||d&&b!==wp.media._galleryDefaults[e]||delete a[e]}),a}}),wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(b){var c=wp.media.view.settings;c.post.featuredImageId=b,wp.media.post("set-post-thumbnail",{json:!0,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(b){a(".inside","#postimagediv").html(b)})},frame:function(){return this._frame?this._frame:(this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage,new wp.media.controller.EditImage]}),this._frame.on("toolbar:create:featured-image",function(a){this.createSelectToolbar(a,{text:wp.media.view.l10n.setFeaturedImage})},this._frame),this._frame.on("content:render:edit-image",function(){var a=this.state("featured-image").get("selection"),b=new wp.media.view.EditImage({model:a.single(),controller:this}).render();this.content.set(b),b.loadEditor()},this._frame),this._frame.state("featured-image").on("select",this.select),this._frame)},select:function(){var a=this.get("selection").single();wp.media.view.settings.post.featuredImageId&&wp.media.featuredImage.set(a?a.id:-1)},init:function(){a("#postimagediv").on("click","#set-post-thumbnail",function(a){a.preventDefault(),a.stopPropagation(),wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}},a(wp.media.featuredImage.init),wp.media.editor={insert:function(a){var c,d,e=!b.isUndefined(window.tinymce),f=!b.isUndefined(window.QTags);if(d=this.activeEditor?window.wpActiveEditor=this.activeEditor:window.wpActiveEditor,window.send_to_editor)return window.send_to_editor.apply(this,arguments);if(d)e&&(c=tinymce.get(d));else if(e&&tinymce.activeEditor)c=tinymce.activeEditor,d=window.wpActiveEditor=c.id;else if(!f)return!1;if(c&&!c.isHidden()?c.execCommand("mceInsertContent",!1,a):f?QTags.insertContent(a):document.getElementById(d).value+=a,window.tb_remove)try{window.tb_remove()}catch(g){}},add:function(d,e){var f=this.get(d);return f?f:(f=c[d]=wp.media(b.defaults(e||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0})),f.on("insert",function(c){var d=f.state();c=c||d.get("selection"),c&&a.when.apply(a,c.map(function(a){var b=d.display(a).toJSON();return this.send.attachment(b,a.toJSON())},this)).done(function(){wp.media.editor.insert(b.toArray(arguments).join("\n\n"))})},this),f.state("gallery-edit").on("update",function(a){this.insert(wp.media.gallery.shortcode(a).string())},this),f.state("playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("video-playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("embed").on("select",function(){var a=f.state(),c=a.get("type"),d=a.props.toJSON();d.url=d.url||"","link"===c?(b.defaults(d,{linkText:d.url,linkUrl:d.url}),this.send.link(d).done(function(a){wp.media.editor.insert(a)})):"image"===c&&(b.defaults(d,{title:d.url,linkUrl:"",align:"none",link:"none"}),"none"===d.link?d.linkUrl="":"file"===d.link&&(d.linkUrl=d.url),this.insert(wp.media.string.image(d)))},this),f.state("featured-image").on("select",wp.media.featuredImage.select),f.setState(f.options.state),f)},id:function(a){return a?a:(a=window.wpActiveEditor,a||b.isUndefined(window.tinymce)||!tinymce.activeEditor||(a=tinymce.activeEditor.id),a=a||"")},get:function(a){return a=this.id(a),c[a]},remove:function(a){a=this.id(a),delete c[a]},send:{attachment:function(a,c){var d,e,f=c.caption;return wp.media.view.settings.captions||delete c.caption,a=wp.media.string.props(a,c),d={id:c.id,post_content:c.description,post_excerpt:f},a.linkUrl&&(d.url=a.linkUrl),"image"===c.type?(e=wp.media.string.image(a),b.each({align:"align",size:"image-size",alt:"image_alt"},function(b,c){a[c]&&(d[b]=a[c])})):"video"===c.type?e=wp.media.string.video(a,c):"audio"===c.type?e=wp.media.string.audio(a,c):(e=wp.media.string.link(a),d.post_title=a.title),wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(a){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:a.linkUrl,link_text:a.linkText,html:wp.media.string.link(a),post_id:wp.media.view.settings.post.id})}},open:function(a,b){var c;return b=b||{},a=this.id(a),this.activeEditor=a,c=this.get(a),(!c||c.options&&b.state!==c.options.state)&&(c=this.add(a,b)),c.open()},init:function(){a(document.body).on("click.add-media-button",".insert-media",function(b){var c=a(b.currentTarget),d=c.data("editor"),e={frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0};b.preventDefault(),c.blur(),c.hasClass("gallery")&&(e.state="gallery",e.title=wp.media.view.l10n.createGalleryTitle),wp.media.editor.open(d,e)}),(new wp.media.view.EditorUploader).render()}},b.bindAll(wp.media.editor,"open"),a(wp.media.editor.init)}(jQuery,_);
\ No newline at end of file
+<<<<<<< .mine
+!function(a,b){var c={};wp.media.coerce=function(a,c){return b.isUndefined(a[c])&&!b.isUndefined(this.defaults[c])?a[c]=this.defaults[c]:"true"===a[c]?a[c]=!0:"false"===a[c]&&(a[c]=!1),a[c]},wp.media.string={props:function(a,c){var d,e,f,g,h,i=wp.media.view.settings.defaultProps;return h=function(a){return"image"!==a.type||a.alt||(a.alt=a.caption||a.title||"",a.alt=a.alt.replace(/<\/?[^>]+>/g,""),a.alt=a.alt.replace(/[\r\n]+/g," ")),a},a=a?b.clone(a):{},c&&c.type&&(a.type=c.type),"image"===a.type&&(a=b.defaults(a||{},{align:i.align||getUserSetting("align","none"),size:i.size||getUserSetting("imgsize","medium"),url:"",classes:[]})),c?(a.title=a.title||c.title,d=a.link||i.link||getUserSetting("urlbutton","file"),"file"===d||"embed"===d?e=c.url:"post"===d?e=c.link:"custom"===d&&(e=a.linkUrl),a.linkUrl=e||"","image"===c.type?(a.classes.push("wp-image-"+c.id),g=c.sizes,f=g&&g[a.size]?g[a.size]:c,b.extend(a,b.pick(c,"align","caption","alt"),{width:f.width,height:f.height,src:f.url,captionId:"attachment_"+c.id})):"video"===c.type||"audio"===c.type?b.extend(a,b.pick(c,"title","type","icon","mime")):(a.title=a.title||c.filename,a.rel=a.rel||"attachment wp-att-"+c.id),h(a)):h(a)},link:function(a,b){var c;return a=wp.media.string.props(a,b),c={tag:"a",content:a.title,attrs:{href:a.linkUrl}},a.rel&&(c.attrs.rel=a.rel),wp.html.string(c)},audio:function(a,b){return wp.media.string._audioVideo("audio",a,b)},video:function(a,b){return wp.media.string._audioVideo("video",a,b)},_audioVideo:function(a,c,d){var e,f,g;return c=wp.media.string.props(c,d),"embed"!==c.link?wp.media.string.link(c):(e={},"video"===a&&(d.image&&-1===d.image.src.indexOf(d.icon)&&(e.poster=d.image.src),d.width&&(e.width=d.width),d.height&&(e.height=d.height)),g=d.filename.split(".").pop(),b.contains(wp.media.view.settings.embedExts,g)?(e[g]=d.url,f=wp.shortcode.string({tag:a,attrs:e})):wp.media.string.link(c))},image:function(a,c){var d,e,f,g,h={};return a=wp.media.string.props(a,c),e=a.classes||[],h.src=b.isUndefined(c)?a.url:c.url,b.extend(h,b.pick(a,"width","height","alt")),a.align&&!a.caption&&e.push("align"+a.align),a.size&&e.push("size-"+a.size),h["class"]=b.compact(e).join(" "),d={tag:"img",attrs:h,single:!0},a.linkUrl&&(d={tag:"a",attrs:{href:a.linkUrl},content:d}),g=wp.html.string(d),a.caption&&(f={},h.width&&(f.width=h.width),a.captionId&&(f.id=a.captionId),a.align&&(f.align="align"+a.align),g=wp.shortcode.string({tag:"caption",attrs:f,content:g+" "+a.caption})),g}},wp.media.embed={coerce:wp.media.coerce,defaults:{url:"",width:"",height:""},edit:function(a,c){var d,e,f={};return c?f.url=a.replace(/<[^>]+>/g,""):(e=wp.shortcode.next("embed",a).shortcode,f=b.defaults(e.attrs.named,this.defaults),e.content&&(f.url=e.content)),d=wp.media({frame:"post",state:"embed",metadata:f})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.url,delete a.url,new wp.shortcode({tag:"embed",attrs:a,content:c})}},wp.media.collection=function(a){var c={};return b.extend({coerce:wp.media.coerce,attachments:function(a){var d,e,f,g,h=a.string(),i=c[h],j=this;return delete c[h],i?i:(d=b.defaults(a.attrs.named,this.defaults),e=b.pick(d,"orderby","order"),e.type=this.type,e.perPage=-1,void 0!==d.orderby&&(d._orderByField=d.orderby),"rand"===d.orderby&&(d._orderbyRandom=!0),(!d.orderby||/^menu_order(?: ID)?$/i.test(d.orderby))&&(e.orderby="menuOrder"),d.ids?(e.post__in=d.ids.split(","),e.orderby="post__in"):d.include&&(e.post__in=d.include.split(",")),d.exclude&&(e.post__not_in=d.exclude.split(",")),e.post__in||(e.uploadedTo=d.id),g=b.omit(d,"id","ids","include","exclude","orderby","order"),b.each(this.defaults,function(a,b){g[b]=j.coerce(g,b)}),f=wp.media.query(e),f[this.tag]=new Backbone.Model(g),f)},shortcode:function(a){var d,e,f=a.props.toJSON(),g=b.pick(f,"orderby","order");return a.type&&(g.type=a.type,delete a.type),a[this.tag]&&b.extend(g,a[this.tag].toJSON()),g.ids=a.pluck("id"),f.uploadedTo&&(g.id=f.uploadedTo),delete g.orderby,g._orderbyRandom?g.orderby="rand":g._orderByField&&"rand"!=g._orderByField&&(g.orderby=g._orderByField),delete g._orderbyRandom,delete g._orderByField,g.ids&&"post__in"===g.orderby&&delete g.orderby,g=this.setDefaults(g),d=new wp.shortcode({tag:this.tag,attrs:g,type:"single"}),e=new wp.media.model.Attachments(a.models,{props:f}),e[this.tag]=a[this.tag],c[d.string()]=e,d},edit:function(a){var c,d,e,f=wp.shortcode.next(this.tag,a),g=this.defaults.id;if(f&&f.content===a)return f=f.shortcode,b.isUndefined(f.get("id"))&&!b.isUndefined(g)&&f.set("id",g),c=this.attachments(f),d=new wp.media.model.Selection(c.models,{props:c.props.toJSON(),multiple:!0}),d[this.tag]=c[this.tag],d.more().done(function(){d.props.set({query:!1}),d.unmirror(),d.props.unset("orderby")}),this.frame&&this.frame.dispose(),e=f.attrs.named.type&&"video"===f.attrs.named.type?"video-"+this.tag+"-edit":this.tag+"-edit",this.frame=wp.media({frame:"post",state:e,title:this.editTitle,editing:!0,multiple:!0,selection:d}).open(),this.frame},setDefaults:function(a){var c=this;return b.each(this.defaults,function(b,d){a[d]=c.coerce(a,d),b===a[d]&&delete a[d]}),a}},a)},wp.media._galleryDefaults={itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",order:"ASC",id:wp.media.view.settings.post&&wp.media.view.settings.post.id,orderby:"menu_order ID"},wp.media.view.settings.galleryDefaults?wp.media.galleryDefaults=b.extend({},wp.media._galleryDefaults,wp.media.view.settings.galleryDefaults):wp.media.galleryDefaults=wp.media._galleryDefaults,wp.media.gallery=new wp.media.collection({tag:"gallery",type:"image",editTitle:wp.media.view.l10n.editGalleryTitle,defaults:wp.media.galleryDefaults,setDefaults:function(a){var c=this,d=!b.isEqual(wp.media.galleryDefaults,wp.media._galleryDefaults);return b.each(this.defaults,function(b,e){a[e]=c.coerce(a,e),b!==a[e]||d&&b!==wp.media._galleryDefaults[e]||delete a[e]}),a}}),wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(b){var c=wp.media.view.settings;c.post.featuredImageId=b,wp.media.post("set-post-thumbnail",{json:!0,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(b){a(".inside","#postimagediv").html(b)})},frame:function(){return this._frame?this._frame:(this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage,new wp.media.controller.EditImage]}),this._frame.on("toolbar:create:featured-image",function(a){this.createSelectToolbar(a,{text:wp.media.view.l10n.setFeaturedImage})},this._frame),this._frame.on("content:render:edit-image",function(){var a=this.state("featured-image").get("selection"),b=new wp.media.view.EditImage({model:a.single(),controller:this}).render();this.content.set(b),b.loadEditor()},this._frame),this._frame.state("featured-image").on("select",this.select),this._frame)},select:function(){var a=this.get("selection").single();wp.media.view.settings.post.featuredImageId&&wp.media.featuredImage.set(a?a.id:-1)},init:function(){a("#postimagediv").on("click","#set-post-thumbnail",function(a){a.preventDefault(),a.stopPropagation(),wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}},a(wp.media.featuredImage.init),wp.media.editor={insert:function(a){var c,d,e=!b.isUndefined(window.tinymce),f=!b.isUndefined(window.QTags);if(d=this.activeEditor?window.wpActiveEditor=this.activeEditor:window.wpActiveEditor,window.send_to_editor)return window.send_to_editor.apply(this,arguments);if(d)e&&(c=tinymce.get(d));else if(e&&tinymce.activeEditor)c=tinymce.activeEditor,d=window.wpActiveEditor=c.id;else if(!f)return!1;if(c&&!c.isHidden()?c.execCommand("mceInsertContent",!1,a):f?QTags.insertContent(a):document.getElementById(d).value+=a,window.tb_remove)try{window.tb_remove()}catch(g){}},add:function(d,e){var f=this.get(d);return f?f:(f=c[d]=wp.media(b.defaults(e||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0})),f.on("insert",function(c){var d=f.state();c=c||d.get("selection"),c&&a.when.apply(a,c.map(function(a){var b=d.display(a).toJSON();return this.send.attachment(b,a.toJSON())},this)).done(function(){wp.media.editor.insert(b.toArray(arguments).join("\n\n"))})},this),f.state("gallery-edit").on("update",function(a){this.insert(wp.media.gallery.shortcode(a).string())},this),f.state("playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("video-playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("embed").on("select",function(){var a=f.state(),c=a.get("type"),d=a.props.toJSON();d.url=d.url||"","link"===c?(b.defaults(d,{linkText:d.url,linkUrl:d.url}),this.send.link(d).done(function(a){wp.media.editor.insert(a)})):"image"===c&&(b.defaults(d,{title:d.url,linkUrl:"",align:"none",link:"none"}),"none"===d.link?d.linkUrl="":"file"===d.link&&(d.linkUrl=d.url),this.insert(wp.media.string.image(d)))},this),f.state("featured-image").on("select",wp.media.featuredImage.select),f.setState(f.options.state),f)},id:function(a){return a?a:(a=window.wpActiveEditor,a||b.isUndefined(window.tinymce)||!tinymce.activeEditor||(a=tinymce.activeEditor.id),a=a||"")},get:function(a){return a=this.id(a),c[a]},remove:function(a){a=this.id(a),delete c[a]},send:{attachment:function(a,c){var d,e,f=c.caption;return wp.media.view.settings.captions||delete c.caption,a=wp.media.string.props(a,c),d={id:c.id,post_content:c.description,post_excerpt:f},a.linkUrl&&(d.url=a.linkUrl),"image"===c.type?(e=wp.media.string.image(a),b.each({align:"align",size:"image-size",alt:"image_alt"},function(b,c){a[c]&&(d[b]=a[c])})):"video"===c.type?e=wp.media.string.video(a,c):"audio"===c.type?e=wp.media.string.audio(a,c):(e=wp.media.string.link(a),d.post_title=a.title),wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(a){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:a.linkUrl,link_text:a.linkText,html:wp.media.string.link(a),post_id:wp.media.view.settings.post.id})}},open:function(a,b){var c;return b=b||{},a=this.id(a),this.activeEditor=a,c=this.get(a),(!c||c.options&&b.state!==c.options.state)&&(c=this.add(a,b)),c.open()},init:function(){a(document.body).on("click.add-media-button",".insert-media",function(b){var c=a(b.currentTarget),d=c.data("editor"),e={frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0};b.preventDefault(),c.blur(),c.hasClass("gallery")&&(e.state="gallery",e.title=wp.media.view.l10n.createGalleryTitle),wp.media.editor.open(d,e)}),(new wp.media.view.EditorUploader).render()}},b.bindAll(wp.media.editor,"open"),a(wp.media.editor.init)}(jQuery,_);||||||| .r11156
+!function(a,b){var c={};wp.media.coerce=function(a,c){return b.isUndefined(a[c])&&!b.isUndefined(this.defaults[c])?a[c]=this.defaults[c]:"true"===a[c]?a[c]=!0:"false"===a[c]&&(a[c]=!1),a[c]},wp.media.string={props:function(a,c){var d,e,f,g,h,i=wp.media.view.settings.defaultProps;return h=function(a){return"image"!==a.type||a.alt||(a.alt=a.caption||a.title||"",a.alt=a.alt.replace(/<\/?[^>]+>/g,""),a.alt=a.alt.replace(/[\r\n]+/g," ")),a},a=a?b.clone(a):{},c&&c.type&&(a.type=c.type),"image"===a.type&&(a=b.defaults(a||{},{align:i.align||getUserSetting("align","none"),size:i.size||getUserSetting("imgsize","medium"),url:"",classes:[]})),c?(a.title=a.title||c.title,d=a.link||i.link||getUserSetting("urlbutton","file"),"file"===d||"embed"===d?e=c.url:"post"===d?e=c.link:"custom"===d&&(e=a.linkUrl),a.linkUrl=e||"","image"===c.type?(a.classes.push("wp-image-"+c.id),g=c.sizes,f=g&&g[a.size]?g[a.size]:c,b.extend(a,b.pick(c,"align","caption","alt"),{width:f.width,height:f.height,src:f.url,captionId:"attachment_"+c.id})):"video"===c.type||"audio"===c.type?b.extend(a,b.pick(c,"title","type","icon","mime")):(a.title=a.title||c.filename,a.rel=a.rel||"attachment wp-att-"+c.id),h(a)):h(a)},link:function(a,b){var c;return a=wp.media.string.props(a,b),c={tag:"a",content:a.title,attrs:{href:a.linkUrl}},a.rel&&(c.attrs.rel=a.rel),wp.html.string(c)},audio:function(a,b){return wp.media.string._audioVideo("audio",a,b)},video:function(a,b){return wp.media.string._audioVideo("video",a,b)},_audioVideo:function(a,c,d){var e,f,g;return c=wp.media.string.props(c,d),"embed"!==c.link?wp.media.string.link(c):(e={},"video"===a&&(d.image&&-1===d.image.src.indexOf(d.icon)&&(e.poster=d.image.src),d.width&&(e.width=d.width),d.height&&(e.height=d.height)),g=d.filename.split(".").pop(),b.contains(wp.media.view.settings.embedExts,g)?(e[g]=d.url,f=wp.shortcode.string({tag:a,attrs:e})):wp.media.string.link(c))},image:function(a,c){var d,e,f,g,h={};return a=wp.media.string.props(a,c),e=a.classes||[],h.src=b.isUndefined(c)?a.url:c.url,b.extend(h,b.pick(a,"width","height","alt")),a.align&&!a.caption&&e.push("align"+a.align),a.size&&e.push("size-"+a.size),h["class"]=b.compact(e).join(" "),d={tag:"img",attrs:h,single:!0},a.linkUrl&&(d={tag:"a",attrs:{href:a.linkUrl},content:d}),g=wp.html.string(d),a.caption&&(f={},h.width&&(f.width=h.width),a.captionId&&(f.id=a.captionId),a.align&&(f.align="align"+a.align),g=wp.shortcode.string({tag:"caption",attrs:f,content:g+" "+a.caption})),g}},wp.media.embed={coerce:wp.media.coerce,defaults:{url:"",width:"",height:""},edit:function(a,c){var d,e,f={};return c?f.url=a.replace(/<[^>]+>/g,""):(e=wp.shortcode.next("embed",a).shortcode,f=b.defaults(e.attrs.named,this.defaults),e.content&&(f.url=e.content)),d=wp.media({frame:"post",state:"embed",metadata:f})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.url,delete a.url,new wp.shortcode({tag:"embed",attrs:a,content:c})}},wp.media.collection=function(a){var c={};return b.extend({coerce:wp.media.coerce,attachments:function(a){var d,e,f,g,h=a.string(),i=c[h],j=this;return delete c[h],i?i:(d=b.defaults(a.attrs.named,this.defaults),e=b.pick(d,"orderby","order"),e.type=this.type,e.perPage=-1,void 0!==d.orderby&&(d._orderByField=d.orderby),"rand"===d.orderby&&(d._orderbyRandom=!0),(!d.orderby||/^menu_order(?: ID)?$/i.test(d.orderby))&&(e.orderby="menuOrder"),d.ids?(e.post__in=d.ids.split(","),e.orderby="post__in"):d.include&&(e.post__in=d.include.split(",")),d.exclude&&(e.post__not_in=d.exclude.split(",")),e.post__in||(e.uploadedTo=d.id),g=b.omit(d,"id","ids","include","exclude","orderby","order"),b.each(this.defaults,function(a,b){g[b]=j.coerce(g,b)}),f=wp.media.query(e),f[this.tag]=new Backbone.Model(g),f)},shortcode:function(a){var d,e,f=a.props.toJSON(),g=b.pick(f,"orderby","order");return a.type&&(g.type=a.type,delete a.type),a[this.tag]&&b.extend(g,a[this.tag].toJSON()),g.ids=a.pluck("id"),f.uploadedTo&&(g.id=f.uploadedTo),delete g.orderby,g._orderbyRandom?g.orderby="rand":g._orderByField&&"rand"!=g._orderByField&&(g.orderby=g._orderByField),delete g._orderbyRandom,delete g._orderByField,g.ids&&"post__in"===g.orderby&&delete g.orderby,g=this.setDefaults(g),d=new wp.shortcode({tag:this.tag,attrs:g,type:"single"}),e=new wp.media.model.Attachments(a.models,{props:f}),e[this.tag]=a[this.tag],c[d.string()]=e,d},edit:function(a){var c,d,e,f=wp.shortcode.next(this.tag,a),g=this.defaults.id;if(f&&f.content===a)return f=f.shortcode,b.isUndefined(f.get("id"))&&!b.isUndefined(g)&&f.set("id",g),c=this.attachments(f),d=new wp.media.model.Selection(c.models,{props:c.props.toJSON(),multiple:!0}),d[this.tag]=c[this.tag],d.more().done(function(){d.props.set({query:!1}),d.unmirror(),d.props.unset("orderby")}),this.frame&&this.frame.dispose(),e=f.attrs.named.type&&"video"===f.attrs.named.type?"video-"+this.tag+"-edit":this.tag+"-edit",this.frame=wp.media({frame:"post",state:e,title:this.editTitle,editing:!0,multiple:!0,selection:d}).open(),this.frame},setDefaults:function(a){var c=this;return b.each(this.defaults,function(b,d){a[d]=c.coerce(a,d),b===a[d]&&delete a[d]}),a}},a)},wp.media._galleryDefaults={itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",order:"ASC",id:wp.media.view.settings.post&&wp.media.view.settings.post.id,orderby:"menu_order ID"},wp.media.galleryDefaults=wp.media.view.settings.galleryDefaults?b.extend({},wp.media._galleryDefaults,wp.media.view.settings.galleryDefaults):wp.media._galleryDefaults,wp.media.gallery=new wp.media.collection({tag:"gallery",type:"image",editTitle:wp.media.view.l10n.editGalleryTitle,defaults:wp.media.galleryDefaults,setDefaults:function(a){var c=this,d=!b.isEqual(wp.media.galleryDefaults,wp.media._galleryDefaults);return b.each(this.defaults,function(b,e){a[e]=c.coerce(a,e),b!==a[e]||d&&b!==wp.media._galleryDefaults[e]||delete a[e]}),a}}),wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(b){var c=wp.media.view.settings;c.post.featuredImageId=b,wp.media.post("set-post-thumbnail",{json:!0,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(b){a(".inside","#postimagediv").html(b)})},frame:function(){return this._frame?this._frame:(this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage,new wp.media.controller.EditImage]}),this._frame.on("toolbar:create:featured-image",function(a){this.createSelectToolbar(a,{text:wp.media.view.l10n.setFeaturedImage})},this._frame),this._frame.on("content:render:edit-image",function(){var a=this.state("featured-image").get("selection"),b=new wp.media.view.EditImage({model:a.single(),controller:this}).render();this.content.set(b),b.loadEditor()},this._frame),this._frame.state("featured-image").on("select",this.select),this._frame)},select:function(){var a=this.get("selection").single();wp.media.view.settings.post.featuredImageId&&wp.media.featuredImage.set(a?a.id:-1)},init:function(){a("#postimagediv").on("click","#set-post-thumbnail",function(a){a.preventDefault(),a.stopPropagation(),wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}},a(wp.media.featuredImage.init),wp.media.editor={insert:function(a){var c,d,e=!b.isUndefined(window.tinymce),f=!b.isUndefined(window.QTags);if(d=this.activeEditor?window.wpActiveEditor=this.activeEditor:window.wpActiveEditor,window.send_to_editor)return window.send_to_editor.apply(this,arguments);if(d)e&&(c=tinymce.get(d));else if(e&&tinymce.activeEditor)c=tinymce.activeEditor,d=window.wpActiveEditor=c.id;else if(!f)return!1;if(c&&!c.isHidden()?c.execCommand("mceInsertContent",!1,a):f?QTags.insertContent(a):document.getElementById(d).value+=a,window.tb_remove)try{window.tb_remove()}catch(g){}},add:function(d,e){var f=this.get(d);return f?f:(f=c[d]=wp.media(b.defaults(e||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0})),f.on("insert",function(c){var d=f.state();c=c||d.get("selection"),c&&a.when.apply(a,c.map(function(a){var b=d.display(a).toJSON();return this.send.attachment(b,a.toJSON())},this)).done(function(){wp.media.editor.insert(b.toArray(arguments).join("\n\n"))})},this),f.state("gallery-edit").on("update",function(a){this.insert(wp.media.gallery.shortcode(a).string())},this),f.state("playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("video-playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("embed").on("select",function(){var a=f.state(),c=a.get("type"),d=a.props.toJSON();d.url=d.url||"","link"===c?(b.defaults(d,{title:d.url,linkUrl:d.url}),this.send.link(d).done(function(a){wp.media.editor.insert(a)})):"image"===c&&(b.defaults(d,{title:d.url,linkUrl:"",align:"none",link:"none"}),"none"===d.link?d.linkUrl="":"file"===d.link&&(d.linkUrl=d.url),this.insert(wp.media.string.image(d)))},this),f.state("featured-image").on("select",wp.media.featuredImage.select),f.setState(f.options.state),f)},id:function(a){return a?a:(a=window.wpActiveEditor,a||b.isUndefined(window.tinymce)||!tinymce.activeEditor||(a=tinymce.activeEditor.id),a=a||"")},get:function(a){return a=this.id(a),c[a]},remove:function(a){a=this.id(a),delete c[a]},send:{attachment:function(a,c){var d,e,f=c.caption;return wp.media.view.settings.captions||delete c.caption,a=wp.media.string.props(a,c),d={id:c.id,post_content:c.description,post_excerpt:f},a.linkUrl&&(d.url=a.linkUrl),"image"===c.type?(e=wp.media.string.image(a),b.each({align:"align",size:"image-size",alt:"image_alt"},function(b,c){a[c]&&(d[b]=a[c])})):"video"===c.type?e=wp.media.string.video(a,c):"audio"===c.type?e=wp.media.string.audio(a,c):(e=wp.media.string.link(a),d.post_title=a.title),wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(a){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:a.linkUrl,title:a.title,html:wp.media.string.link(a),post_id:wp.media.view.settings.post.id})}},open:function(a,b){var c;return b=b||{},a=this.id(a),this.activeEditor=a,c=this.get(a),(!c||c.options&&b.state!==c.options.state)&&(c=this.add(a,b)),c.open()},init:function(){a(document.body).on("click",".insert-media",function(b){var c=a(b.currentTarget),d=c.data("editor"),e={frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0};b.preventDefault(),c.blur(),c.hasClass("gallery")&&(e.state="gallery",e.title=wp.media.view.l10n.createGalleryTitle),wp.media.editor.open(d,e)}),(new wp.media.view.EditorUploader).render()}},b.bindAll(wp.media.editor,"open"),a(wp.media.editor.init)}(jQuery,_);=======
+!function(a,b){var c={};wp.media.coerce=function(a,c){return b.isUndefined(a[c])&&!b.isUndefined(this.defaults[c])?a[c]=this.defaults[c]:"true"===a[c]?a[c]=!0:"false"===a[c]&&(a[c]=!1),a[c]},wp.media.string={props:function(a,c){var d,e,f,g,h,i=wp.media.view.settings.defaultProps;return h=function(a){return"image"!==a.type||a.alt||(a.alt=a.caption||a.title||"",a.alt=a.alt.replace(/<\/?[^>]+>/g,""),a.alt=a.alt.replace(/[\r\n]+/g," ")),a},a=a?b.clone(a):{},c&&c.type&&(a.type=c.type),"image"===a.type&&(a=b.defaults(a||{},{align:i.align||getUserSetting("align","none"),size:i.size||getUserSetting("imgsize","medium"),url:"",classes:[]})),c?(a.title=a.title||c.title,d=a.link||i.link||getUserSetting("urlbutton","file"),"file"===d||"embed"===d?e=c.url:"post"===d?e=c.link:"custom"===d&&(e=a.linkUrl),a.linkUrl=e||"","image"===c.type?(a.classes.push("wp-image-"+c.id),g=c.sizes,f=g&&g[a.size]?g[a.size]:c,b.extend(a,b.pick(c,"align","caption","alt"),{width:f.width,height:f.height,src:f.url,captionId:"attachment_"+c.id})):"video"===c.type||"audio"===c.type?b.extend(a,b.pick(c,"title","type","icon","mime")):(a.title=a.title||c.filename,a.rel=a.rel||"attachment wp-att-"+c.id),h(a)):h(a)},link:function(a,b){var c;return a=wp.media.string.props(a,b),c={tag:"a",content:a.title,attrs:{href:a.linkUrl}},a.rel&&(c.attrs.rel=a.rel),wp.html.string(c)},audio:function(a,b){return wp.media.string._audioVideo("audio",a,b)},video:function(a,b){return wp.media.string._audioVideo("video",a,b)},_audioVideo:function(a,c,d){var e,f,g;return c=wp.media.string.props(c,d),"embed"!==c.link?wp.media.string.link(c):(e={},"video"===a&&(d.image&&-1===d.image.src.indexOf(d.icon)&&(e.poster=d.image.src),d.width&&(e.width=d.width),d.height&&(e.height=d.height)),g=d.filename.split(".").pop(),b.contains(wp.media.view.settings.embedExts,g)?(e[g]=d.url,f=wp.shortcode.string({tag:a,attrs:e})):wp.media.string.link(c))},image:function(a,c){var d,e,f,g,h={};return a=wp.media.string.props(a,c),e=a.classes||[],h.src=b.isUndefined(c)?a.url:c.url,b.extend(h,b.pick(a,"width","height","alt")),a.align&&!a.caption&&e.push("align"+a.align),a.size&&e.push("size-"+a.size),h["class"]=b.compact(e).join(" "),d={tag:"img",attrs:h,single:!0},a.linkUrl&&(d={tag:"a",attrs:{href:a.linkUrl},content:d}),g=wp.html.string(d),a.caption&&(f={},h.width&&(f.width=h.width),a.captionId&&(f.id=a.captionId),a.align&&(f.align="align"+a.align),g=wp.shortcode.string({tag:"caption",attrs:f,content:g+" "+a.caption})),g}},wp.media.embed={coerce:wp.media.coerce,defaults:{url:"",width:"",height:""},edit:function(a,c){var d,e,f={};return c?f.url=a.replace(/<[^>]+>/g,""):(e=wp.shortcode.next("embed",a).shortcode,f=b.defaults(e.attrs.named,this.defaults),e.content&&(f.url=e.content)),d=wp.media({frame:"post",state:"embed",metadata:f})},shortcode:function(a){var c,d=this;return b.each(this.defaults,function(b,c){a[c]=d.coerce(a,c),b===a[c]&&delete a[c]}),c=a.url,delete a.url,new wp.shortcode({tag:"embed",attrs:a,content:c})}},wp.media.collection=function(a){var c={};return b.extend({coerce:wp.media.coerce,attachments:function(a){var d,e,f,g,h=a.string(),i=c[h],j=this;return delete c[h],i?i:(d=b.defaults(a.attrs.named,this.defaults),e=b.pick(d,"orderby","order"),e.type=this.type,e.perPage=-1,void 0!==d.orderby&&(d._orderByField=d.orderby),"rand"===d.orderby&&(d._orderbyRandom=!0),(!d.orderby||/^menu_order(?: ID)?$/i.test(d.orderby))&&(e.orderby="menuOrder"),d.ids?(e.post__in=d.ids.split(","),e.orderby="post__in"):d.include&&(e.post__in=d.include.split(",")),d.exclude&&(e.post__not_in=d.exclude.split(",")),e.post__in||(e.uploadedTo=d.id),g=b.omit(d,"id","ids","include","exclude","orderby","order"),b.each(this.defaults,function(a,b){g[b]=j.coerce(g,b)}),f=wp.media.query(e),f[this.tag]=new Backbone.Model(g),f)},shortcode:function(a){var d,e,f=a.props.toJSON(),g=b.pick(f,"orderby","order");return a.type&&(g.type=a.type,delete a.type),a[this.tag]&&b.extend(g,a[this.tag].toJSON()),g.ids=a.pluck("id"),f.uploadedTo&&(g.id=f.uploadedTo),delete g.orderby,g._orderbyRandom?g.orderby="rand":g._orderByField&&"rand"!=g._orderByField&&(g.orderby=g._orderByField),delete g._orderbyRandom,delete g._orderByField,g.ids&&"post__in"===g.orderby&&delete g.orderby,g=this.setDefaults(g),d=new wp.shortcode({tag:this.tag,attrs:g,type:"single"}),e=new wp.media.model.Attachments(a.models,{props:f}),e[this.tag]=a[this.tag],c[d.string()]=e,d},edit:function(a){var c,d,e,f=wp.shortcode.next(this.tag,a),g=this.defaults.id;if(f&&f.content===a)return f=f.shortcode,b.isUndefined(f.get("id"))&&!b.isUndefined(g)&&f.set("id",g),c=this.attachments(f),d=new wp.media.model.Selection(c.models,{props:c.props.toJSON(),multiple:!0}),d[this.tag]=c[this.tag],d.more().done(function(){d.props.set({query:!1}),d.unmirror(),d.props.unset("orderby")}),this.frame&&this.frame.dispose(),e=f.attrs.named.type&&"video"===f.attrs.named.type?"video-"+this.tag+"-edit":this.tag+"-edit",this.frame=wp.media({frame:"post",state:e,title:this.editTitle,editing:!0,multiple:!0,selection:d}).open(),this.frame},setDefaults:function(a){var c=this;return b.each(this.defaults,function(b,d){a[d]=c.coerce(a,d),b===a[d]&&delete a[d]}),a}},a)},wp.media._galleryDefaults={itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",order:"ASC",id:wp.media.view.settings.post&&wp.media.view.settings.post.id,orderby:"menu_order ID"},wp.media.galleryDefaults=wp.media.view.settings.galleryDefaults?b.extend({},wp.media._galleryDefaults,wp.media.view.settings.galleryDefaults):wp.media._galleryDefaults,wp.media.gallery=new wp.media.collection({tag:"gallery",type:"image",editTitle:wp.media.view.l10n.editGalleryTitle,defaults:wp.media.galleryDefaults,setDefaults:function(a){var c=this,d=!b.isEqual(wp.media.galleryDefaults,wp.media._galleryDefaults);return b.each(this.defaults,function(b,e){a[e]=c.coerce(a,e),b!==a[e]||d&&b!==wp.media._galleryDefaults[e]||delete a[e]}),a}}),wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(b){var c=wp.media.view.settings;c.post.featuredImageId=b,wp.media.post("set-post-thumbnail",{json:!0,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(b){a(".inside","#postimagediv").html(b)})},frame:function(){return this._frame?this._frame:(this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage,new wp.media.controller.EditImage]}),this._frame.on("toolbar:create:featured-image",function(a){this.createSelectToolbar(a,{text:wp.media.view.l10n.setFeaturedImage})},this._frame),this._frame.on("content:render:edit-image",function(){var a=this.state("featured-image").get("selection"),b=new wp.media.view.EditImage({model:a.single(),controller:this}).render();this.content.set(b),b.loadEditor()},this._frame),this._frame.state("featured-image").on("select",this.select),this._frame)},select:function(){var a=this.get("selection").single();wp.media.view.settings.post.featuredImageId&&wp.media.featuredImage.set(a?a.id:-1)},init:function(){a("#postimagediv").on("click","#set-post-thumbnail",function(a){a.preventDefault(),a.stopPropagation(),wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}},a(wp.media.featuredImage.init),wp.media.editor={insert:function(a){var c,d,e=!b.isUndefined(window.tinymce),f=!b.isUndefined(window.QTags);if(d=this.activeEditor?window.wpActiveEditor=this.activeEditor:window.wpActiveEditor,window.send_to_editor)return window.send_to_editor.apply(this,arguments);if(d)e&&(c=tinymce.get(d));else if(e&&tinymce.activeEditor)c=tinymce.activeEditor,d=window.wpActiveEditor=c.id;else if(!f)return!1;if(c&&!c.isHidden()?c.execCommand("mceInsertContent",!1,a):f?QTags.insertContent(a):document.getElementById(d).value+=a,window.tb_remove)try{window.tb_remove()}catch(g){}},add:function(d,e){var f=this.get(d);return f?f:(f=c[d]=wp.media(b.defaults(e||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0})),f.on("insert",function(c){var d=f.state();c=c||d.get("selection"),c&&a.when.apply(a,c.map(function(a){var b=d.display(a).toJSON();return this.send.attachment(b,a.toJSON())},this)).done(function(){wp.media.editor.insert(b.toArray(arguments).join("\n\n"))})},this),f.state("gallery-edit").on("update",function(a){this.insert(wp.media.gallery.shortcode(a).string())},this),f.state("playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("video-playlist-edit").on("update",function(a){this.insert(wp.media.playlist.shortcode(a).string())},this),f.state("embed").on("select",function(){var a=f.state(),c=a.get("type"),d=a.props.toJSON();d.url=d.url||"","link"===c?(b.defaults(d,{linkText:d.url,linkUrl:d.url}),this.send.link(d).done(function(a){wp.media.editor.insert(a)})):"image"===c&&(b.defaults(d,{title:d.url,linkUrl:"",align:"none",link:"none"}),"none"===d.link?d.linkUrl="":"file"===d.link&&(d.linkUrl=d.url),this.insert(wp.media.string.image(d)))},this),f.state("featured-image").on("select",wp.media.featuredImage.select),f.setState(f.options.state),f)},id:function(a){return a?a:(a=window.wpActiveEditor,a||b.isUndefined(window.tinymce)||!tinymce.activeEditor||(a=tinymce.activeEditor.id),a=a||"")},get:function(a){return a=this.id(a),c[a]},remove:function(a){a=this.id(a),delete c[a]},send:{attachment:function(a,c){var d,e,f=c.caption;return wp.media.view.settings.captions||delete c.caption,a=wp.media.string.props(a,c),d={id:c.id,post_content:c.description,post_excerpt:f},a.linkUrl&&(d.url=a.linkUrl),"image"===c.type?(e=wp.media.string.image(a),b.each({align:"align",size:"image-size",alt:"image_alt"},function(b,c){a[c]&&(d[b]=a[c])})):"video"===c.type?e=wp.media.string.video(a,c):"audio"===c.type?e=wp.media.string.audio(a,c):(e=wp.media.string.link(a),d.post_title=a.title),wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(a){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:a.linkUrl,link_text:a.linkText,html:wp.media.string.link(a),post_id:wp.media.view.settings.post.id})}},open:function(a,b){var c;return b=b||{},a=this.id(a),this.activeEditor=a,c=this.get(a),(!c||c.options&&b.state!==c.options.state)&&(c=this.add(a,b)),c.open()},init:function(){a(document.body).on("click.add-media-button",".insert-media",function(b){var c=a(b.currentTarget),d=c.data("editor"),e={frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0};b.preventDefault(),c.blur(),c.hasClass("gallery")&&(e.state="gallery",e.title=wp.media.view.l10n.createGalleryTitle),wp.media.editor.open(d,e)}),(new wp.media.view.EditorUploader).render()}},b.bindAll(wp.media.editor,"open"),a(wp.media.editor.init)}(jQuery,_);>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-grid.js b/pavillonmadeleine.fr/wp-includes/js/media-grid.js
index 6c8faa5a..6bdde4ad 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-grid.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-grid.js
@@ -1,6 +1,45 @@
+<<<<<<< .mine
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o>>>>>> .r12027
 
+<<<<<<< .mine
+EditAttachmentMetadata = wp.media.controller.State.extend({
+	defaults: {
+		id:      'edit-attachment',
+		// Title string passed to the frame's title region view.
+		title:   l10n.attachmentDetails,
+		// Region mode defaults.
+		content: 'edit-metadata',
+		menu:    false,
+		toolbar: false,
+		router:  false
+||||||| .r11156
+	// Link localized strings and settings.
+	if ( media.view.l10n ) {
+		l10n = media.view.l10n;
+	} else {
+		l10n = media.view.l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
+		delete l10n.settings;
+=======
 /**
  * wp.media.controller.EditAttachmentMetadata
  *
@@ -23,9 +62,89 @@ EditAttachmentMetadata = wp.media.controller.State.extend({
 		menu:    false,
 		toolbar: false,
 		router:  false
+>>>>>>> .r12027
 	}
 });
 
+<<<<<<< .mine
+module.exports = EditAttachmentMetadata;
+
+},{}],2:[function(require,module,exports){
+var media = wp.media;
+
+media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
+media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
+media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
+media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
+media.view.EditImage.Details = require( './views/edit-image-details.js' );
+media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
+media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
+media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
+media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
+
+},{"./controllers/edit-attachment-metadata.js":1,"./routers/manage.js":3,"./views/attachment/details-two-column.js":4,"./views/button/delete-selected-permanently.js":5,"./views/button/delete-selected.js":6,"./views/button/select-mode-toggle.js":7,"./views/edit-image-details.js":8,"./views/frame/edit-attachments.js":9,"./views/frame/manage.js":10}],3:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.Manage.Router
+ *
+ * A router for handling the browser history and application state.
+ *
+ * @class
+ * @augments Backbone.Router
+ */
+var Router = Backbone.Router.extend({
+	routes: {
+		'upload.php?item=:slug':    'showItem',
+		'upload.php?search=:query': 'search'
+	},
+
+	// Map routes against the page URL
+	baseUrl: function( url ) {
+		return 'upload.php' + url;
+	},
+
+	// Respond to the search route by filling the search field and trigggering the input event
+	search: function( query ) {
+		jQuery( '#media-search-input' ).val( query ).trigger( 'input' );
+	},
+
+	// Show the modal with a specific item
+	showItem: function( query ) {
+		var media = wp.media,
+			library = media.frame.state().get('library'),
+			item;
+
+		// Trigger the media frame to open the correct item
+		item = library.findWhere( { id: parseInt( query, 10 ) } );
+		if ( item ) {
+			media.frame.trigger( 'edit:attachment', item );
+		} else {
+			item = media.attachment( query );
+			media.frame.listenTo( item, 'change', function( model ) {
+				media.frame.stopListening( item );
+				media.frame.trigger( 'edit:attachment', model );
+			} );
+			item.fetch();
+||||||| .r11156
+	/**
+	 * wp.media.controller.EditAttachmentMetadata
+	 *
+	 * A state for editing an attachment's metadata.
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+	 */
+	media.controller.EditAttachmentMetadata = media.controller.State.extend({
+		defaults: {
+			id:      'edit-attachment',
+			// Title string passed to the frame's title region view.
+			title:   l10n.attachmentDetails,
+			// Region mode defaults.
+			content: 'edit-metadata',
+			menu:    false,
+			toolbar: false,
+			router:  false
+=======
 module.exports = EditAttachmentMetadata;
 
 },{}],2:[function(require,module,exports){
@@ -87,10 +206,41 @@ var Router = Backbone.Router.extend({
 				media.frame.trigger( 'edit:attachment', model );
 			} );
 			item.fetch();
+>>>>>>> .r12027
 		}
 	}
 });
 
+<<<<<<< .mine
+module.exports = Router;
+
+},{}],4:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.Details.TwoColumn
+ *
+ * A similar view to media.view.Attachment.Details
+ * for use in the Edit Attachment modal.
+ *
+ * @class
+ * @augments wp.media.view.Attachment.Details
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Details = wp.media.view.Attachment.Details,
+	TwoColumn;
+
+TwoColumn = Details.extend({
+	template: wp.template( 'attachment-details-two-column' ),
+
+	editAttachment: function( event ) {
+		event.preventDefault();
+		this.controller.content.mode( 'edit-image' );
+	},
+
+||||||| .r11156
+=======
 module.exports = Router;
 
 },{}],4:[function(require,module,exports){
@@ -120,6 +270,7 @@ TwoColumn = Details.extend({
 		this.controller.content.mode( 'edit-image' );
 	},
 
+>>>>>>> .r12027
 	/**
 	 * Noop this from parent class, doesn't apply here.
 	 */
@@ -138,9 +289,8 @@ TwoColumn = Details.extend({
 
 module.exports = TwoColumn;
 
+<<<<<<< .mine
 },{}],5:[function(require,module,exports){
-/*globals wp */
-
 /**
  * wp.media.view.DeleteSelectedPermanentlyButton
  *
@@ -156,40 +306,136 @@ module.exports = TwoColumn;
 var Button = wp.media.view.Button,
 	DeleteSelected = wp.media.view.DeleteSelectedButton,
 	DeleteSelectedPermanently;
+||||||| .r11156
+			// Initialize a window-wide uploader.
+			if ( this.options.uploader ) {
+				this.uploader = new media.view.UploaderWindow({
+					controller: this,
+					uploader: {
+						dropzone:  document.body,
+						container: document.body
+					}
+				}).render();
+				this.uploader.ready();
+				$('body').append( this.uploader.el );
+=======
+},{}],5:[function(require,module,exports){
+/*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 DeleteSelectedPermanently = DeleteSelected.extend({
 	initialize: function() {
 		DeleteSelected.prototype.initialize.apply( this, arguments );
 		this.listenTo( this.controller, 'select:activate', this.selectActivate );
 		this.listenTo( this.controller, 'select:deactivate', this.selectDeactivate );
 	},
+||||||| .r11156
+				this.options.uploader = false;
+			}
+=======
+/**
+ * wp.media.view.DeleteSelectedPermanentlyButton
+ *
+ * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic
+ *
+ * @class
+ * @augments wp.media.view.DeleteSelectedButton
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.view.Button,
+	DeleteSelected = wp.media.view.DeleteSelectedButton,
+	DeleteSelectedPermanently;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	filterChange: function( model ) {
 		this.canShow = ( 'trash' === model.get( 'status' ) );
 	},
+||||||| .r11156
+			this.gridRouter = new media.view.MediaFrame.Manage.Router();
+=======
+DeleteSelectedPermanently = DeleteSelected.extend({
+	initialize: function() {
+		DeleteSelected.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.controller, 'select:activate', this.selectActivate );
+		this.listenTo( this.controller, 'select:deactivate', this.selectDeactivate );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	selectActivate: function() {
 		this.toggleDisabled();
 		this.$el.toggleClass( 'hidden', ! this.canShow );
 	},
+||||||| .r11156
+			// Call 'initialize' directly on the parent class.
+			media.view.MediaFrame.prototype.initialize.apply( this, arguments );
+=======
+	filterChange: function( model ) {
+		this.canShow = ( 'trash' === model.get( 'status' ) );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	selectDeactivate: function() {
 		this.toggleDisabled();
 		this.$el.addClass( 'hidden' );
 	},
+||||||| .r11156
+			// Append the frame view directly the supplied container.
+			this.$el.appendTo( this.options.container );
+=======
+	selectActivate: function() {
+		this.toggleDisabled();
+		this.$el.toggleClass( 'hidden', ! this.canShow );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	render: function() {
 		Button.prototype.render.apply( this, arguments );
 		this.selectActivate();
 		return this;
 	}
 });
+||||||| .r11156
+			this.createStates();
+			this.bindRegionModeHandlers();
+			this.render();
+=======
+	selectDeactivate: function() {
+		this.toggleDisabled();
+		this.$el.addClass( 'hidden' );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = DeleteSelectedPermanently;
+||||||| .r11156
+			// Update the URL when entering search string (at most once per second)
+			$( '#media-search-input' ).on( 'input', _.debounce( function(e) {
+				var val = $( e.currentTarget ).val(), url = '';
+				if ( val ) {
+					url += '?search=' + val;
+				}
+				self.gridRouter.navigate( self.gridRouter.baseUrl( url ) );
+			}, 1000 ) );
+		},
+=======
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		this.selectActivate();
+		return this;
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 },{}],6:[function(require,module,exports){
-/*globals wp */
-
 /**
  * wp.media.view.DeleteSelectedButton
  *
@@ -204,7 +450,17 @@ module.exports = DeleteSelectedPermanently;
 var Button = wp.media.view.Button,
 	l10n = wp.media.view.l10n,
 	DeleteSelected;
+||||||| .r11156
+		/**
+		 * Create the default states for the frame.
+		 */
+		createStates: function() {
+			var options = this.options;
+=======
+module.exports = DeleteSelectedPermanently;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 DeleteSelected = Button.extend({
 	initialize: function() {
 		Button.prototype.initialize.apply( this, arguments );
@@ -213,7 +469,16 @@ DeleteSelected = Button.extend({
 		}
 		this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
 	},
+||||||| .r11156
+			if ( this.options.states ) {
+				return;
+			}
+=======
+},{}],6:[function(require,module,exports){
+/*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	filterChange: function( model ) {
 		if ( 'trash' === model.get( 'status' ) ) {
 			this.model.set( 'text', l10n.untrashSelected );
@@ -223,11 +488,60 @@ DeleteSelected = Button.extend({
 			this.model.set( 'text', l10n.deleteSelected );
 		}
 	},
+||||||| .r11156
+			// Add the default states.
+			this.states.add([
+				new media.controller.Library({
+					library:            media.query( options.library ),
+					multiple:           options.multiple,
+					title:              options.title,
+					content:            'browse',
+					toolbar:            'select',
+					contentUserSetting: false,
+					filterable:         'all',
+					autoSelect:         false
+				})
+			]);
+		},
+=======
+/**
+ * wp.media.view.DeleteSelectedButton
+ *
+ * A button that handles bulk Delete/Trash logic
+ *
+ * @class
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.view.Button,
+	l10n = wp.media.view.l10n,
+	DeleteSelected;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	toggleDisabled: function() {
 		this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length );
 	},
+||||||| .r11156
+		/**
+		 * Bind region mode activation events to proper handlers.
+		 */
+		bindRegionModeHandlers: function() {
+			this.on( 'content:create:browse', this.browseContent, this );
+=======
+DeleteSelected = Button.extend({
+	initialize: function() {
+		Button.prototype.initialize.apply( this, arguments );
+		if ( this.options.filters ) {
+			this.listenTo( this.options.filters.model, 'change', this.filterChange );
+		}
+		this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	render: function() {
 		Button.prototype.render.apply( this, arguments );
 		if ( this.controller.isModeActive( 'select' ) ) {
@@ -239,12 +553,35 @@ DeleteSelected = Button.extend({
 		return this;
 	}
 });
+||||||| .r11156
+			// Handle a frame-level event for editing an attachment.
+			this.on( 'edit:attachment', this.openEditAttachmentModal, this );
+=======
+	filterChange: function( model ) {
+		if ( 'trash' === model.get( 'status' ) ) {
+			this.model.set( 'text', l10n.untrashSelected );
+		} else if ( wp.media.view.settings.mediaTrash ) {
+			this.model.set( 'text', l10n.trashSelected );
+		} else {
+			this.model.set( 'text', l10n.deleteSelected );
+		}
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = DeleteSelected;
+||||||| .r11156
+			this.on( 'select:activate', this.bindKeydown, this );
+			this.on( 'select:deactivate', this.unbindKeydown, this );
+		},
+=======
+	toggleDisabled: function() {
+		this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 },{}],7:[function(require,module,exports){
-/*globals wp */
-
 /**
  * wp.media.view.SelectModeToggleButton
  *
@@ -257,18 +594,81 @@ module.exports = DeleteSelected;
 var Button = wp.media.view.Button,
 	l10n = wp.media.view.l10n,
 	SelectModeToggle;
+||||||| .r11156
+		handleKeydown: function( e ) {
+			if ( 27 === e.which ) {
+				e.preventDefault();
+				this.deactivateMode( 'select' ).activateMode( 'edit' );
+			}
+		},
+=======
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.$el.addClass( 'delete-selected-button' );
+		} else {
+			this.$el.addClass( 'delete-selected-button hidden' );
+		}
+		this.toggleDisabled();
+		return this;
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 SelectModeToggle = Button.extend({
 	initialize: function() {
+		_.defaults( this.options, {
+			size : ''
+		} );
+||||||| .r11156
+		bindKeydown: function() {
+			this.$body.on( 'keydown.select', _.bind( this.handleKeydown, this ) );
+		},
+=======
+module.exports = DeleteSelected;
+>>>>>>> .r12027
+
+<<<<<<< .mine
 		Button.prototype.initialize.apply( this, arguments );
 		this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
 		this.listenTo( this.controller, 'selection:action:done', this.back );
 	},
+||||||| .r11156
+		unbindKeydown: function() {
+			this.$body.off( 'keydown.select' );
+		},
+=======
+},{}],7:[function(require,module,exports){
+/*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	back: function () {
 		this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
 	},
+||||||| .r11156
+		fixPosition: function() {
+			var $browser, $toolbar;
+			if ( ! this.isModeActive( 'select' ) ) {
+				return;
+			}
+=======
+/**
+ * wp.media.view.SelectModeToggleButton
+ *
+ * @class
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.view.Button,
+	l10n = wp.media.view.l10n,
+	SelectModeToggle;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	click: function() {
 		Button.prototype.click.apply( this, arguments );
 		if ( this.controller.isModeActive( 'select' ) ) {
@@ -277,22 +677,172 @@ SelectModeToggle = Button.extend({
 			this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
 		}
 	},
+||||||| .r11156
+			$browser = this.$('.attachments-browser');
+			$toolbar = $browser.find('.media-toolbar');
+=======
+SelectModeToggle = Button.extend({
+	initialize: function() {
+		Button.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
+		this.listenTo( this.controller, 'selection:action:done', this.back );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	render: function() {
 		Button.prototype.render.apply( this, arguments );
 		this.$el.addClass( 'select-mode-toggle-button' );
 		return this;
 	},
+||||||| .r11156
+			// Offset doesn't appear to take top margin into account, hence +16
+			if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {
+				$browser.addClass( 'fixed' );
+				$toolbar.css('width', $browser.width() + 'px');
+			} else {
+				$browser.removeClass( 'fixed' );
+				$toolbar.css('width', '');
+			}
+		},
+=======
+	back: function () {
+		this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	toggleBulkEditHandler: function() {
 		var toolbar = this.controller.content.get().toolbar, children;
+||||||| .r11156
+		/**
+		 * Click handler for the `Add New` button.
+		 */
+		addNewClickHandler: function( event ) {
+			event.preventDefault();
+			this.trigger( 'toggle:upload:attachment' );
+		},
+=======
+	click: function() {
+		Button.prototype.click.apply( this, arguments );
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.back();
+		} else {
+			this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
+		}
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' );
 
 		// TODO: the Frame should be doing all of this.
 		if ( this.controller.isModeActive( 'select' ) ) {
-			this.model.set( 'text', l10n.cancelSelection );
-			children.not( '.media-button' ).hide();
+			this.model.set( {
+				size: 'large',
+				text: l10n.cancelSelection
+			} );
+			children.not( '.spinner, .media-button' ).hide();
+			this.$el.show();
+			toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
+		} else {
+			this.model.set( {
+				size: '',
+				text: l10n.bulkSelect
+			} );
+			this.controller.content.get().$el.removeClass( 'fixed' );
+			toolbar.$el.css( 'width', '' );
+			toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
+			children.not( '.media-button' ).show();
+			this.controller.state().get( 'selection' ).reset();
+		}
+	}
+});
+||||||| .r11156
+		/**
+		 * Open the Edit Attachment modal.
+		 */
+		openEditAttachmentModal: function( model ) {
+			// Create a new EditAttachment frame, passing along the library and the attachment model.
+			wp.media( {
+				frame:       'edit-attachments',
+				controller:  this,
+				library:     this.state().get('library'),
+				model:       model
+			} );
+		},
+=======
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		this.$el.addClass( 'select-mode-toggle-button' );
+		return this;
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = SelectModeToggle;
+||||||| .r11156
+		/**
+		 * Create an attachments browser view within the content region.
+		 *
+		 * @param {Object} contentRegion Basic object with a `view` property, which
+		 *                               should be set with the proper region view.
+		 * @this wp.media.controller.Region
+		 */
+		browseContent: function( contentRegion ) {
+			var state = this.state();
+=======
+	toggleBulkEditHandler: function() {
+		var toolbar = this.controller.content.get().toolbar, children;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],8:[function(require,module,exports){
+/**
+ * wp.media.view.EditImage.Details
+ *
+ * @class
+ * @augments wp.media.view.EditImage
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	EditImage = wp.media.view.EditImage,
+	Details;
+||||||| .r11156
+			// Browse our library of attachments.
+			this.browserView = contentRegion.view = new media.view.AttachmentsBrowser({
+				controller: this,
+				collection: state.get('library'),
+				selection:  state.get('selection'),
+				model:      state,
+				sortable:   state.get('sortable'),
+				search:     state.get('searchable'),
+				filters:    state.get('filterable'),
+				display:    state.get('displaySettings'),
+				dragInfo:   state.get('dragInfo'),
+				sidebar:    'errors',
+=======
+		children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+Details = EditImage.extend({
+	initialize: function( options ) {
+		this.editor = window.imageEdit;
+		this.frame = options.frame;
+		this.controller = options.controller;
+		View.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+				suggestedWidth:  state.get('suggestedWidth'),
+				suggestedHeight: state.get('suggestedHeight'),
+=======
+		// TODO: the Frame should be doing all of this.
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.model.set( 'text', l10n.cancelSelection );
+			children.not( '.media-button' ).hide();
 			this.$el.show();
 			toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
 		} else {
@@ -305,12 +855,41 @@ SelectModeToggle = Button.extend({
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	back: function() {
+		this.frame.content.mode( 'edit-metadata' );
+	},
+||||||| .r11156
+				AttachmentView: state.get('AttachmentView'),
+=======
 module.exports = SelectModeToggle;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	save: function() {
+		this.model.fetch().done( _.bind( function() {
+			this.frame.content.mode( 'edit-metadata' );
+		}, this ) );
+	}
+});
+||||||| .r11156
+				scrollElement: document
+			});
+			this.browserView.on( 'ready', _.bind( this.bindDeferred, this ) );
+=======
 },{}],8:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Details;
+||||||| .r11156
+			this.errors = wp.Uploader.errors;
+			this.errors.on( 'add remove reset', this.sidebarVisibility, this );
+		},
+=======
 /**
  * wp.media.view.EditImage.Details
  *
@@ -323,7 +902,33 @@ module.exports = SelectModeToggle;
 var View = wp.media.View,
 	EditImage = wp.media.view.EditImage,
 	Details;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],9:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.EditAttachments
+ *
+ * A frame for editing the details of a specific media item.
+ *
+ * Opens in a modal by default.
+ *
+ * Requires an attachment model to be passed in the options hash under `model`.
+ *
+ * @class
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Frame = wp.media.view.Frame,
+	MediaFrame = wp.media.view.MediaFrame,
+||||||| .r11156
+		sidebarVisibility: function() {
+			this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
+		},
+=======
 Details = EditImage.extend({
 	initialize: function( options ) {
 		this.editor = window.imageEdit;
@@ -331,23 +936,185 @@ Details = EditImage.extend({
 		this.controller = options.controller;
 		View.prototype.initialize.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	$ = jQuery,
+	EditAttachments;
+||||||| .r11156
+		bindDeferred: function() {
+			if ( ! this.browserView.dfd ) {
+				return;
+			}
+			this.browserView.dfd.done( _.bind( this.startHistory, this ) );
+		},
+=======
 	back: function() {
 		this.frame.content.mode( 'edit-metadata' );
 	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+EditAttachments = MediaFrame.extend({
+
+	className: 'edit-attachment-frame',
+	template:  wp.template( 'edit-attachment-frame' ),
+	regions:   [ 'title', 'content' ],
 
+	events: {
+		'click .left':  'previousMediaItem',
+		'click .right': 'nextMediaItem'
+	},
+
+	initialize: function() {
+		Frame.prototype.initialize.apply( this, arguments );
+
+		_.defaults( this.options, {
+			modal: true,
+			state: 'edit-attachment'
+		});
+
+		this.controller = this.options.controller;
+		this.gridRouter = this.controller.gridRouter;
+		this.library = this.options.library;
+
+		if ( this.options.model ) {
+			this.model = this.options.model;
+		}
+||||||| .r11156
+		startHistory: function() {
+			// Verify pushState support and activate
+			if ( window.history && window.history.pushState ) {
+				Backbone.history.start( {
+					root: _wpMediaGridSettings.adminUrl,
+					pushState: true
+				} );
+			}
+		}
+	});
+=======
 	save: function() {
 		this.model.fetch().done( _.bind( function() {
 			this.frame.content.mode( 'edit-metadata' );
 		}, this ) );
 	}
 });
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.bindHandlers();
+		this.createStates();
+		this.createModal();
+
+		this.title.mode( 'default' );
+		this.toggleNav();
+	},
+
+	bindHandlers: function() {
+		// Bind default title creation.
+		this.on( 'title:create:default', this.createTitle, this );
+
+		// Close the modal if the attachment is deleted.
+		this.listenTo( this.model, 'change:status destroy', this.close, this );
+
+		this.on( 'content:create:edit-metadata', this.editMetadataMode, this );
+		this.on( 'content:create:edit-image', this.editImageMode, this );
+		this.on( 'content:render:edit-image', this.editImageModeRender, this );
+		this.on( 'close', this.detach );
+	},
+
+	createModal: function() {
+		// Initialize modal container view.
+		if ( this.options.modal ) {
+			this.modal = new wp.media.view.Modal({
+				controller: this,
+				title:      this.options.title
+			});
+
+			this.modal.on( 'open', _.bind( function () {
+				$( 'body' ).on( 'keydown.media-modal', _.bind( this.keyEvent, this ) );
+			}, this ) );
+
+			// Completely destroy the modal DOM element when closing it.
+			this.modal.on( 'close', _.bind( function() {
+				this.modal.remove();
+				$( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
+				// Restore the original focus item if possible
+				$( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).focus();
+				this.resetRoute();
+			}, this ) );
+
+			// Set this frame as the modal's content.
+			this.modal.content( this );
+			this.modal.open();
+		}
+	},
 
+	/**
+	 * Add the default states to the frame.
+	 */
+	createStates: function() {
+		this.states.add([
+			new wp.media.controller.EditAttachmentMetadata( { model: this.model } )
+		]);
+	},
+
+	/**
+	 * Content region rendering callback for the `edit-metadata` mode.
+	 *
+	 * @param {Object} contentRegion Basic object with a `view` property, which
+	 *                               should be set with the proper region view.
+	 */
+	editMetadataMode: function( contentRegion ) {
+		contentRegion.view = new wp.media.view.Attachment.Details.TwoColumn({
+			controller: this,
+			model:      this.model
+		});
+||||||| .r11156
+	/**
+	 * A similar view to media.view.Attachment.Details
+	 * for use in the Edit Attachment modal.
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Attachment.Details
+	 * @augments wp.media.view.Attachment
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Attachment.Details.TwoColumn = media.view.Attachment.Details.extend({
+		template: media.template( 'attachment-details-two-column' ),
+=======
 module.exports = Details;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+||||||| .r11156
+		editAttachment: function( event ) {
+			event.preventDefault();
+			this.controller.content.mode( 'edit-image' );
+		},
 
+=======
 },{}],9:[function(require,module,exports){
 /*globals wp, _, jQuery */
 
+>>>>>>> .r12027
+<<<<<<< .mine
+		/**
+		 * Attach a subview to display fields added via the
+		 * `attachment_fields_to_edit` filter.
+		 */
+		contentRegion.view.views.set( '.attachment-compat', new wp.media.view.AttachmentCompat({
+			controller: this,
+			model:      this.model
+		}) );
+||||||| .r11156
+		/**
+		 * Noop this from parent class, doesn't apply here.
+		 */
+		toggleSelectionHandler: function() {},
+=======
 /**
  * wp.media.view.MediaFrame.EditAttachments
  *
@@ -366,45 +1133,204 @@ module.exports = Details;
  */
 var Frame = wp.media.view.Frame,
 	MediaFrame = wp.media.view.MediaFrame,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Update browser url when navigating media details
+		if ( this.model ) {
+			this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
+		}
+	},
+||||||| .r11156
+		render: function() {
+			media.view.Attachment.Details.prototype.render.apply( this, arguments );
+
+			media.mixin.removeAllPlayers();
+			this.$( 'audio, video' ).each( function (i, elem) {
+				var el = media.view.MediaDetails.prepareSrc( elem );
+				new MediaElementPlayer( el, media.mixin.mejsSettings );
+			} );
+		}
+	});
+=======
 	$ = jQuery,
 	EditAttachments;
 
 EditAttachments = MediaFrame.extend({
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Render the EditImage view into the frame's content region.
+	 *
+	 * @param {Object} contentRegion Basic object with a `view` property, which
+	 *                               should be set with the proper region view.
+	 */
+	editImageMode: function( contentRegion ) {
+		var editImageController = new wp.media.controller.EditImage( {
+			model: this.model,
+			frame: this
+		} );
+		// Noop some methods.
+		editImageController._toolbar = function() {};
+		editImageController._router = function() {};
+		editImageController._menu = function() {};
+||||||| .r11156
+	/**
+	 * A router for handling the browser history and application state.
+	 *
+	 * @constructor
+	 * @augments Backbone.Router
+	 */
+	media.view.MediaFrame.Manage.Router = Backbone.Router.extend({
+		routes: {
+			'upload.php?item=:slug':    'showItem',
+			'upload.php?search=:query': 'search'
+		},
+=======
 	className: 'edit-attachment-frame',
 	template:  wp.template( 'edit-attachment-frame' ),
 	regions:   [ 'title', 'content' ],
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		contentRegion.view = new wp.media.view.EditImage.Details( {
+			model: this.model,
+			frame: this,
+			controller: editImageController
+		} );
+	},
+||||||| .r11156
+		// Map routes against the page URL
+		baseUrl: function( url ) {
+			return 'upload.php' + url;
+		},
+=======
 	events: {
 		'click .left':  'previousMediaItem',
 		'click .right': 'nextMediaItem'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	editImageModeRender: function( view ) {
+		view.on( 'ready', view.loadEditor );
+	},
+||||||| .r11156
+		// Respond to the search route by filling the search field and trigggering the input event
+		search: function( query ) {
+			$( '#media-search-input' ).val( query ).trigger( 'input' );
+		},
+=======
 	initialize: function() {
 		Frame.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	toggleNav: function() {
+		this.$('.left').toggleClass( 'disabled', ! this.hasPrevious() );
+		this.$('.right').toggleClass( 'disabled', ! this.hasNext() );
+	},
+||||||| .r11156
+		// Show the modal with a specific item
+		showItem: function( query ) {
+			var library = media.frame.state().get('library'), item;
+=======
 		_.defaults( this.options, {
 			modal: true,
 			state: 'edit-attachment'
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Rerender the view.
+	 */
+	rerender: function() {
+		// Only rerender the `content` region.
+		if ( this.content.mode() !== 'edit-metadata' ) {
+			this.content.mode( 'edit-metadata' );
+		} else {
+			this.content.render();
+||||||| .r11156
+			// Trigger the media frame to open the correct item
+			item = library.findWhere( { id: parseInt( query, 10 ) } );
+			if ( item ) {
+				media.frame.trigger( 'edit:attachment', item );
+			} else {
+				item = media.attachment( query );
+				media.frame.listenTo( item, 'change', function( model ) {
+					media.frame.stopListening( item );
+					media.frame.trigger( 'edit:attachment', model );
+				} );
+				item.fetch();
+			}
+=======
 		this.controller = this.options.controller;
 		this.gridRouter = this.controller.gridRouter;
 		this.library = this.options.library;
 
 		if ( this.options.model ) {
 			this.model = this.options.model;
+>>>>>>> .r12027
 		}
 
+<<<<<<< .mine
+		this.toggleNav();
+	},
+||||||| .r11156
+	media.view.EditImage.Details = media.view.EditImage.extend({
+		initialize: function( options ) {
+			this.editor = window.imageEdit;
+			this.frame = options.frame;
+			this.controller = options.controller;
+			media.View.prototype.initialize.apply( this, arguments );
+		},
+=======
 		this.bindHandlers();
 		this.createStates();
 		this.createModal();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Click handler to switch to the previous media item.
+	 */
+	previousMediaItem: function() {
+		if ( ! this.hasPrevious() ) {
+			this.$( '.left' ).blur();
+			return;
+		}
+		this.model = this.library.at( this.getCurrentIndex() - 1 );
+		this.rerender();
+		this.$( '.left' ).focus();
+	},
+||||||| .r11156
+		back: function() {
+			this.frame.content.mode( 'edit-metadata' );
+		},
+=======
 		this.title.mode( 'default' );
 		this.toggleNav();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Click handler to switch to the next media item.
+	 */
+	nextMediaItem: function() {
+		if ( ! this.hasNext() ) {
+			this.$( '.right' ).blur();
+			return;
+||||||| .r11156
+		save: function() {
+			var self = this;
+
+			this.model.fetch().done( function() {
+				self.frame.content.mode( 'edit-metadata' );
+			});
+=======
 	bindHandlers: function() {
 		// Bind default title creation.
 		this.on( 'title:create:default', this.createTitle, this );
@@ -425,6 +1351,7 @@ EditAttachments = MediaFrame.extend({
 				controller: this,
 				title:      this.options.title
 			});
+>>>>>>> .r12027
 
 			this.modal.on( 'open', _.bind( function () {
 				$( 'body' ).on( 'keydown.media-modal', _.bind( this.keyEvent, this ) );
@@ -443,9 +1370,46 @@ EditAttachments = MediaFrame.extend({
 			this.modal.content( this );
 			this.modal.open();
 		}
+<<<<<<< .mine
+		this.model = this.library.at( this.getCurrentIndex() + 1 );
+		this.rerender();
+		this.$( '.right' ).focus();
+	},
+||||||| .r11156
+	});
+=======
+	},
+>>>>>>> .r12027
+
+	getCurrentIndex: function() {
+		return this.library.indexOf( this.model );
+	},
+
+	hasNext: function() {
+		return ( this.getCurrentIndex() + 1 ) < this.library.length;
 	},
 
+	hasPrevious: function() {
+		return ( this.getCurrentIndex() - 1 ) > -1;
+	},
 	/**
+<<<<<<< .mine
+	 * Respond to the keyboard events: right arrow, left arrow, except when
+	 * focus is in a textarea or input field.
+||||||| .r11156
+	 * A frame for editing the details of a specific media item.
+	 *
+	 * Opens in a modal by default.
+	 *
+	 * Requires an attachment model to be passed in the options hash under `model`.
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+=======
 	 * Add the default states to the frame.
 	 */
 	createStates: function() {
@@ -486,7 +1450,16 @@ EditAttachments = MediaFrame.extend({
 	 *
 	 * @param {Object} contentRegion Basic object with a `view` property, which
 	 *                               should be set with the proper region view.
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	keyEvent: function( event ) {
+		if ( ( 'INPUT' === event.target.nodeName || 'TEXTAREA' === event.target.nodeName ) && ! ( event.target.readOnly || event.target.disabled ) ) {
+			return;
+		}
+||||||| .r11156
+	media.view.MediaFrame.EditAttachments = media.view.MediaFrame.extend({
+=======
 	editImageMode: function( contentRegion ) {
 		var editImageController = new wp.media.controller.EditImage( {
 			model: this.model,
@@ -496,23 +1469,85 @@ EditAttachments = MediaFrame.extend({
 		editImageController._toolbar = function() {};
 		editImageController._router = function() {};
 		editImageController._menu = function() {};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// The right arrow key
+		if ( 39 === event.keyCode ) {
+			this.nextMediaItem();
+		}
+		// The left arrow key
+		if ( 37 === event.keyCode ) {
+			this.previousMediaItem();
+		}
+	},
+||||||| .r11156
+		className: 'edit-attachment-frame',
+		template: media.template( 'edit-attachment-frame' ),
+		regions:   [ 'title', 'content' ],
+=======
 		contentRegion.view = new wp.media.view.EditImage.Details( {
 			model: this.model,
 			frame: this,
 			controller: editImageController
 		} );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	resetRoute: function() {
+		this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );
+	}
+});
+||||||| .r11156
+		events: {
+			'click .left':  'previousMediaItem',
+			'click .right': 'nextMediaItem',
+			'keydown':      'keyEvent'
+		},
+=======
 	editImageModeRender: function( view ) {
 		view.on( 'ready', view.loadEditor );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = EditAttachments;
+||||||| .r11156
+		initialize: function() {
+			media.view.Frame.prototype.initialize.apply( this, arguments );
+=======
 	toggleNav: function() {
 		this.$('.left').toggleClass( 'disabled', ! this.hasPrevious() );
 		this.$('.right').toggleClass( 'disabled', ! this.hasNext() );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],10:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.Manage
+ *
+ * A generic management frame workflow.
+ *
+ * Used in the media grid view.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var MediaFrame = wp.media.view.MediaFrame,
+	Library = wp.media.controller.Library,
+||||||| .r11156
+			_.defaults( this.options, {
+				modal: true,
+				state: 'edit-attachment'
+			});
+=======
 	/**
 	 * Rerender the view.
 	 */
@@ -523,10 +1558,41 @@ EditAttachments = MediaFrame.extend({
 		} else {
 			this.content.render();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	$ = Backbone.$,
+	Manage;
+||||||| .r11156
+			this.controller = this.options.controller;
+			this.gridRouter = this.controller.gridRouter;
+			this.library = this.options.library;
+=======
 		this.toggleNav();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Manage = MediaFrame.extend({
+	/**
+	 * @global wp.Uploader
+	 */
+	initialize: function() {
+		_.defaults( this.options, {
+			title:     '',
+			modal:     false,
+			selection: [],
+			library:   {}, // Options hash for the query to the media library.
+			multiple:  'add',
+			state:     'library',
+			uploader:  true,
+			mode:      [ 'grid', 'edit' ]
+		});
+||||||| .r11156
+			if ( this.options.model ) {
+				this.model = this.options.model;
+			}
+=======
 	/**
 	 * Click handler to switch to the previous media item.
 	 */
@@ -539,7 +1605,19 @@ EditAttachments = MediaFrame.extend({
 		this.rerender();
 		this.$( '.left' ).focus();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$body = $( document.body );
+		this.$window = $( window );
+		this.$adminBar = $( '#wpadminbar' );
+		this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
+		$( document ).on( 'click', '.page-title-action', _.bind( this.addNewClickHandler, this ) );
+||||||| .r11156
+			this.bindHandlers();
+			this.createStates();
+			this.createModal();
+=======
 	/**
 	 * Click handler to switch to the next media item.
 	 */
@@ -552,15 +1630,53 @@ EditAttachments = MediaFrame.extend({
 		this.rerender();
 		this.$( '.right' ).focus();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Ensure core and media grid view UI is enabled.
+		this.$el.addClass('wp-core-ui');
+||||||| .r11156
+			this.title.mode( 'default' );
+			this.toggleNav();
+		},
+=======
 	getCurrentIndex: function() {
 		return this.library.indexOf( this.model );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Force the uploader off if the upload limit has been exceeded or
+		// if the browser isn't supported.
+		if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
+			this.options.uploader = false;
+		}
+||||||| .r11156
+		bindHandlers: function() {
+			// Bind default title creation.
+			this.on( 'title:create:default', this.createTitle, this );
+=======
 	hasNext: function() {
 		return ( this.getCurrentIndex() + 1 ) < this.library.length;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Initialize a window-wide uploader.
+		if ( this.options.uploader ) {
+			this.uploader = new wp.media.view.UploaderWindow({
+				controller: this,
+				uploader: {
+					dropzone:  document.body,
+					container: document.body
+				}
+			}).render();
+			this.uploader.ready();
+			$('body').append( this.uploader.el );
+||||||| .r11156
+			// Close the modal if the attachment is deleted.
+			this.listenTo( this.model, 'change:status destroy', this.close, this );
+=======
 	hasPrevious: function() {
 		return ( this.getCurrentIndex() - 1 ) > -1;
 	},
@@ -572,7 +1688,18 @@ EditAttachments = MediaFrame.extend({
 		if ( ( 'INPUT' === event.target.nodeName || 'TEXTAREA' === event.target.nodeName ) && ! ( event.target.readOnly || event.target.disabled ) ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			this.options.uploader = false;
+		}
+||||||| .r11156
+			this.on( 'content:create:edit-metadata', this.editMetadataMode, this );
+			this.on( 'content:create:edit-image', this.editImageMode, this );
+			this.on( 'content:render:edit-image', this.editImageModeRender, this );
+			this.on( 'close', this.detach );
+		},
+=======
 		// The right arrow key
 		if ( 39 === event.keyCode ) {
 			this.nextMediaItem();
@@ -582,17 +1709,62 @@ EditAttachments = MediaFrame.extend({
 			this.previousMediaItem();
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
+||||||| .r11156
+		createModal: function() {
+			var self = this;
+=======
 	resetRoute: function() {
 		this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Call 'initialize' directly on the parent class.
+		MediaFrame.prototype.initialize.apply( this, arguments );
+||||||| .r11156
+			// Initialize modal container view.
+			if ( this.options.modal ) {
+				this.modal = new media.view.Modal({
+					controller: this,
+					title:      this.options.title
+				});
+=======
 module.exports = EditAttachments;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Append the frame view directly the supplied container.
+		this.$el.appendTo( this.options.container );
+||||||| .r11156
+				this.modal.on( 'open', function () {
+					$( 'body' ).on( 'keydown.media-modal', _.bind( self.keyEvent, self ) );
+				} );
+=======
 },{}],10:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.createStates();
+		this.bindRegionModeHandlers();
+		this.render();
+		this.bindSearchHandler();
+	},
+||||||| .r11156
+				// Completely destroy the modal DOM element when closing it.
+				this.modal.on( 'close', function() {
+					self.modal.remove();
+					$( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
+					// Restore the original focus item if possible
+					$( 'li.attachment[data-id="' + self.model.get( 'id' ) +'"]' ).focus();
+					self.resetRoute();
+				} );
+=======
 /**
  * wp.media.view.MediaFrame.Manage
  *
@@ -610,10 +1782,39 @@ module.exports = EditAttachments;
  */
 var MediaFrame = wp.media.view.MediaFrame,
 	Library = wp.media.controller.Library,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindSearchHandler: function() {
+		var search = this.$( '#media-search-input' ),
+			currentSearch = this.options.container.data( 'search' ),
+			searchView = this.browserView.toolbar.get( 'search' ).$el,
+			listMode = this.$( '.view-list' ),
+||||||| .r11156
+				// Set this frame as the modal's content.
+				this.modal.content( this );
+				this.modal.open();
+			}
+		},
+=======
 	$ = Backbone.$,
 	Manage;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			input  = _.debounce( function (e) {
+				var val = $( e.currentTarget ).val(),
+					url = '';
+||||||| .r11156
+		/**
+		 * Add the default states to the frame.
+		 */
+		createStates: function() {
+			this.states.add([
+				new media.controller.EditAttachmentMetadata( { model: this.model } )
+			]);
+		},
+=======
 Manage = MediaFrame.extend({
 	/**
 	 * @global wp.Uploader
@@ -629,22 +1830,101 @@ Manage = MediaFrame.extend({
 			uploader:  true,
 			mode:      [ 'grid', 'edit' ]
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				if ( val ) {
+					url += '?search=' + val;
+				}
+				this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
+			}, 1000 );
+||||||| .r11156
+		/**
+		 * Content region rendering callback for the `edit-metadata` mode.
+		 *
+		 * @param {Object} contentRegion Basic object with a `view` property, which
+		 *                               should be set with the proper region view.
+		 */
+		editMetadataMode: function( contentRegion ) {
+			contentRegion.view = new media.view.Attachment.Details.TwoColumn({
+				controller: this,
+				model:      this.model
+			});
+=======
 		this.$body = $( document.body );
 		this.$window = $( window );
 		this.$adminBar = $( '#wpadminbar' );
 		this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
 		$( document ).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Update the URL when entering search string (at most once per second)
+		search.on( 'input', _.bind( input, this ) );
+		searchView.val( currentSearch ).trigger( 'input' );
+||||||| .r11156
+			/**
+			 * Attach a subview to display fields added via the
+			 * `attachment_fields_to_edit` filter.
+			 */
+			contentRegion.view.views.set( '.attachment-compat', new media.view.AttachmentCompat({
+				controller: this,
+				model:      this.model
+			}) );
+=======
 		// Ensure core and media grid view UI is enabled.
 		this.$el.addClass('wp-core-ui');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.gridRouter.on( 'route:search', function () {
+			var href = window.location.href;
+			if ( href.indexOf( 'mode=' ) > -1 ) {
+				href = href.replace( /mode=[^&]+/g, 'mode=list' );
+			} else {
+				href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
+			}
+			href = href.replace( 'search=', 's=' );
+			listMode.prop( 'href', href );
+		} );
+	},
+||||||| .r11156
+			// Update browser url when navigating media details
+			if ( this.model ) {
+				this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
+			}
+		},
+=======
 		// Force the uploader off if the upload limit has been exceeded or
 		// if the browser isn't supported.
 		if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
 			this.options.uploader = false;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Create the default states for the frame.
+	 */
+	createStates: function() {
+		var options = this.options;
+||||||| .r11156
+		/**
+		 * Render the EditImage view into the frame's content region.
+		 *
+		 * @param {Object} contentRegion Basic object with a `view` property, which
+		 *                               should be set with the proper region view.
+		 */
+		editImageMode: function( contentRegion ) {
+			var editImageController = new media.controller.EditImage( {
+				model: this.model,
+				frame: this
+			} );
+			// Noop some methods.
+			editImageController._toolbar = function() {};
+			editImageController._router = function() {};
+			editImageController._menu = function() {};
+=======
 		// Initialize a window-wide uploader.
 		if ( this.options.uploader ) {
 			this.uploader = new wp.media.view.UploaderWindow({
@@ -656,44 +1936,196 @@ Manage = MediaFrame.extend({
 			}).render();
 			this.uploader.ready();
 			$('body').append( this.uploader.el );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.options.states ) {
+			return;
+		}
+||||||| .r11156
+			contentRegion.view = new media.view.EditImage.Details( {
+				model: this.model,
+				frame: this,
+				controller: editImageController
+			} );
+		},
+=======
 			this.options.uploader = false;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Add the default states.
+		this.states.add([
+			new Library({
+				library:            wp.media.query( options.library ),
+				multiple:           options.multiple,
+				title:              options.title,
+				content:            'browse',
+				toolbar:            'select',
+				contentUserSetting: false,
+				filterable:         'all',
+				autoSelect:         false
+			})
+		]);
+	},
+||||||| .r11156
+		editImageModeRender: function( view ) {
+			view.on( 'ready', view.loadEditor );
+		},
+=======
 		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Bind region mode activation events to proper handlers.
+	 */
+	bindRegionModeHandlers: function() {
+		this.on( 'content:create:browse', this.browseContent, this );
+||||||| .r11156
+		toggleNav: function() {
+			this.$('.left').toggleClass( 'disabled', ! this.hasPrevious() );
+			this.$('.right').toggleClass( 'disabled', ! this.hasNext() );
+		},
+=======
 		// Call 'initialize' directly on the parent class.
 		MediaFrame.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Handle a frame-level event for editing an attachment.
+		this.on( 'edit:attachment', this.openEditAttachmentModal, this );
+||||||| .r11156
+		/**
+		 * Rerender the view.
+		 */
+		rerender: function() {
+			// Only rerender the `content` region.
+			if ( this.content.mode() !== 'edit-metadata' ) {
+				this.content.mode( 'edit-metadata' );
+			} else {
+				this.content.render();
+			}
+=======
 		// Append the frame view directly the supplied container.
 		this.$el.appendTo( this.options.container );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'select:activate', this.bindKeydown, this );
+		this.on( 'select:deactivate', this.unbindKeydown, this );
+	},
+||||||| .r11156
+			this.toggleNav();
+		},
+=======
 		this.createStates();
 		this.bindRegionModeHandlers();
 		this.render();
 		this.bindSearchHandler();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	handleKeydown: function( e ) {
+		if ( 27 === e.which ) {
+			e.preventDefault();
+			this.deactivateMode( 'select' ).activateMode( 'edit' );
+		}
+	},
+||||||| .r11156
+		/**
+		 * Click handler to switch to the previous media item.
+		 */
+		previousMediaItem: function() {
+			if ( ! this.hasPrevious() ) {
+				this.$( '.left' ).blur();
+				return;
+			}
+			this.model = this.library.at( this.getCurrentIndex() - 1 );
+			this.rerender();
+			this.$( '.left' ).focus();
+		},
+=======
 	bindSearchHandler: function() {
 		var search = this.$( '#media-search-input' ),
 			currentSearch = this.options.container.data( 'search' ),
 			searchView = this.browserView.toolbar.get( 'search' ).$el,
 			listMode = this.$( '.view-list' ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindKeydown: function() {
+		this.$body.on( 'keydown.select', _.bind( this.handleKeydown, this ) );
+	},
+||||||| .r11156
+		/**
+		 * Click handler to switch to the next media item.
+		 */
+		nextMediaItem: function() {
+			if ( ! this.hasNext() ) {
+				this.$( '.right' ).blur();
+				return;
+			}
+			this.model = this.library.at( this.getCurrentIndex() + 1 );
+			this.rerender();
+			this.$( '.right' ).focus();
+		},
+=======
 			input  = _.debounce( function (e) {
 				var val = $( e.currentTarget ).val(),
 					url = '';
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	unbindKeydown: function() {
+		this.$body.off( 'keydown.select' );
+	},
+||||||| .r11156
+		getCurrentIndex: function() {
+			return this.library.indexOf( this.model );
+		},
+=======
 				if ( val ) {
 					url += '?search=' + val;
 				}
 				this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
 			}, 1000 );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	fixPosition: function() {
+		var $browser, $toolbar;
+		if ( ! this.isModeActive( 'select' ) ) {
+			return;
+		}
+||||||| .r11156
+		hasNext: function() {
+			return ( this.getCurrentIndex() + 1 ) < this.library.length;
+		},
+=======
 		// Update the URL when entering search string (at most once per second)
 		search.on( 'input', _.bind( input, this ) );
 		searchView.val( currentSearch ).trigger( 'input' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		$browser = this.$('.attachments-browser');
+		$toolbar = $browser.find('.media-toolbar');
+||||||| .r11156
+		hasPrevious: function() {
+			return ( this.getCurrentIndex() - 1 ) > -1;
+		},
+		/**
+		 * Respond to the keyboard events: right arrow, left arrow, except when
+		 * focus is in a textarea or input field.
+		 */
+		keyEvent: function( event ) {
+			if ( ( 'INPUT' === event.target.nodeName || 'TEXTAREA' === event.target.nodeName ) && ! ( event.target.readOnly || event.target.disabled ) ) {
+				return;
+			}
+=======
 		this.gridRouter.on( 'route:search', function () {
 			var href = window.location.href;
 			if ( href.indexOf( 'mode=' ) > -1 ) {
@@ -701,11 +2133,34 @@ Manage = MediaFrame.extend({
 			} else {
 				href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
 			}
+>>>>>>> .r12027
 			href = href.replace( 'search=', 's=' );
 			listMode.prop( 'href', href );
 		} );
 	},
 
+<<<<<<< .mine
+		// Offset doesn't appear to take top margin into account, hence +16
+		if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {
+			$browser.addClass( 'fixed' );
+			$toolbar.css('width', $browser.width() + 'px');
+		} else {
+			$browser.removeClass( 'fixed' );
+			$toolbar.css('width', '');
+||||||| .r11156
+			// The right arrow key
+			if ( 39 === event.keyCode ) {
+				this.nextMediaItem();
+			}
+			// The left arrow key
+			if ( 37 === event.keyCode ) {
+				this.previousMediaItem();
+			}
+		},
+
+		resetRoute: function() {
+			this.gridRouter.navigate( this.gridRouter.baseUrl( '' ) );
+=======
 	/**
 	 * Create the default states for the frame.
 	 */
@@ -714,8 +2169,31 @@ Manage = MediaFrame.extend({
 
 		if ( this.options.states ) {
 			return;
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+	},
+||||||| .r11156
+	});
+=======
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Click handler for the `Add New` button.
+	 */
+	addNewClickHandler: function( event ) {
+		event.preventDefault();
+		this.trigger( 'toggle:upload:attachment' );
+	},
+||||||| .r11156
+	media.view.SelectModeToggleButton = media.view.Button.extend({
+		initialize: function() {
+			media.view.Button.prototype.initialize.apply( this, arguments );
+			this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
+			this.listenTo( this.controller, 'selection:action:done', this.back );
+		},
+=======
 		// Add the default states.
 		this.states.add([
 			new Library({
@@ -730,31 +2208,129 @@ Manage = MediaFrame.extend({
 			})
 		]);
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Open the Edit Attachment modal.
+	 */
+	openEditAttachmentModal: function( model ) {
+		// Create a new EditAttachment frame, passing along the library and the attachment model.
+		wp.media( {
+			frame:       'edit-attachments',
+			controller:  this,
+			library:     this.state().get('library'),
+			model:       model
+		} );
+	},
+||||||| .r11156
+		back: function () {
+			this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
+		},
+=======
 	/**
 	 * Bind region mode activation events to proper handlers.
 	 */
 	bindRegionModeHandlers: function() {
 		this.on( 'content:create:browse', this.browseContent, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Create an attachments browser view within the content region.
+	 *
+	 * @param {Object} contentRegion Basic object with a `view` property, which
+	 *                               should be set with the proper region view.
+	 * @this wp.media.controller.Region
+	 */
+	browseContent: function( contentRegion ) {
+		var state = this.state();
+||||||| .r11156
+		click: function() {
+			media.view.Button.prototype.click.apply( this, arguments );
+			if ( this.controller.isModeActive( 'select' ) ) {
+				this.back();
+			} else {
+				this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
+			}
+		},
+=======
 		// Handle a frame-level event for editing an attachment.
 		this.on( 'edit:attachment', this.openEditAttachmentModal, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Browse our library of attachments.
+		this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
+			controller: this,
+			collection: state.get('library'),
+			selection:  state.get('selection'),
+			model:      state,
+			sortable:   state.get('sortable'),
+			search:     state.get('searchable'),
+			filters:    state.get('filterable'),
+			date:       state.get('date'),
+			display:    state.get('displaySettings'),
+			dragInfo:   state.get('dragInfo'),
+			sidebar:    'errors',
+||||||| .r11156
+		render: function() {
+			media.view.Button.prototype.render.apply( this, arguments );
+			this.$el.addClass( 'select-mode-toggle-button' );
+			return this;
+		},
+=======
 		this.on( 'select:activate', this.bindKeydown, this );
 		this.on( 'select:deactivate', this.unbindKeydown, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			suggestedWidth:  state.get('suggestedWidth'),
+			suggestedHeight: state.get('suggestedHeight'),
+||||||| .r11156
+		toggleBulkEditHandler: function() {
+			var toolbar = this.controller.content.get().toolbar, children;
+=======
 	handleKeydown: function( e ) {
 		if ( 27 === e.which ) {
 			e.preventDefault();
 			this.deactivateMode( 'select' ).activateMode( 'edit' );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			AttachmentView: state.get('AttachmentView'),
+||||||| .r11156
+			children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *');
+=======
 	bindKeydown: function() {
 		this.$body.on( 'keydown.select', _.bind( this.handleKeydown, this ) );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			scrollElement: document
+		});
+		this.browserView.on( 'ready', _.bind( this.bindDeferred, this ) );
+||||||| .r11156
+			if ( this.controller.isModeActive( 'select' ) ) {
+				this.model.set( 'text', l10n.cancelSelection );
+				children.not( '.delete-selected-button' ).hide();
+				toolbar.$( '.select-mode-toggle-button' ).show();
+				toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
+			} else {
+				this.model.set( 'text', l10n.bulkSelect );
+				this.controller.content.get().$el.removeClass('fixed');
+				toolbar.$el.css('width', '');
+				toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
+				children.not( '.spinner, .delete-selected-button' ).show();
+				this.controller.state().get( 'selection' ).reset();
+			}
+		}
+	});
+=======
 	unbindKeydown: function() {
 		this.$body.off( 'keydown.select' );
 	},
@@ -764,10 +2340,41 @@ Manage = MediaFrame.extend({
 		if ( ! this.isModeActive( 'select' ) ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.errors = wp.Uploader.errors;
+		this.errors.on( 'add remove reset', this.sidebarVisibility, this );
+	},
+||||||| .r11156
+	media.view.DeleteSelectedButton = media.view.Button.extend({
+		initialize: function() {
+			media.view.Button.prototype.initialize.apply( this, arguments );
+			if ( this.options.filters ) {
+				this.listenTo( this.options.filters.model, 'change', this.filterChange );
+			}
+			this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
+		},
+=======
 		$browser = this.$('.attachments-browser');
 		$toolbar = $browser.find('.media-toolbar');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	sidebarVisibility: function() {
+		this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
+	},
+||||||| .r11156
+		filterChange: function( model ) {
+			if ( 'trash' === model.get( 'status' ) ) {
+				this.model.set( 'text', l10n.untrashSelected );
+			} else if ( media.view.settings.mediaTrash ) {
+				this.model.set( 'text', l10n.trashSelected );
+			} else {
+				this.model.set( 'text', l10n.deleteSelected );
+			}
+		},
+=======
 		// Offset doesn't appear to take top margin into account, hence +16
 		if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {
 			$browser.addClass( 'fixed' );
@@ -777,7 +2384,20 @@ Manage = MediaFrame.extend({
 			$toolbar.css('width', '');
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindDeferred: function() {
+		if ( ! this.browserView.dfd ) {
+			return;
+		}
+		this.browserView.dfd.done( _.bind( this.startHistory, this ) );
+	},
+||||||| .r11156
+		toggleDisabled: function() {
+			this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length );
+		},
+=======
 	/**
 	 * Click handler for the `Add New` button.
 	 */
@@ -785,7 +2405,31 @@ Manage = MediaFrame.extend({
 		event.preventDefault();
 		this.trigger( 'toggle:upload:attachment' );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	startHistory: function() {
+		// Verify pushState support and activate
+		if ( window.history && window.history.pushState ) {
+			Backbone.history.start( {
+				root: window._wpMediaGridSettings.adminUrl,
+				pushState: true
+			} );
+		}
+	}
+});
+||||||| .r11156
+		render: function() {
+			media.view.Button.prototype.render.apply( this, arguments );
+			if ( this.controller.isModeActive( 'select' ) ) {
+				this.$el.addClass( 'delete-selected-button' );
+			} else {
+				this.$el.addClass( 'delete-selected-button hidden' );
+			}
+			return this;
+		}
+	});
+=======
 	/**
 	 * Open the Edit Attachment modal.
 	 */
@@ -798,7 +2442,17 @@ Manage = MediaFrame.extend({
 			model:       model
 		} );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Manage;
+||||||| .r11156
+	/**
+	 * A filter dropdown for month/dates.
+	 */
+	media.view.DateFilter = media.view.AttachmentFilters.extend({
+		id: 'media-attachment-date-filters',
+=======
 	/**
 	 * Create an attachments browser view within the content region.
 	 *
@@ -808,7 +2462,36 @@ Manage = MediaFrame.extend({
 	 */
 	browseContent: function( contentRegion ) {
 		var state = this.state();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}]},{},[2]);
+||||||| .r11156
+		createFilters: function() {
+			var filters = {};
+			_.each( media.view.settings.months || {}, function( value, index ) {
+				filters[ index ] = {
+					text: value.text,
+					props: {
+						year: value.year,
+						monthnum: value.month
+					}
+				};
+			});
+			filters.all = {
+				text:  l10n.allDates,
+				props: {
+					monthnum: false,
+					year:  false
+				},
+				priority: 10
+			};
+			this.filters = filters;
+		}
+	});
 
+}(jQuery, _, Backbone, wp));
+=======
 		// Browse our library of attachments.
 		this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
 			controller: this,
@@ -861,3 +2544,4 @@ Manage = MediaFrame.extend({
 module.exports = Manage;
 
 },{}]},{},[2]);
+>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-grid.min.js b/pavillonmadeleine.fr/wp-includes/js/media-grid.min.js
index a985a70f..adfa0bdd 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-grid.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-grid.min.js
@@ -1 +1,4 @@
-!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g *, .media-toolbar-primary > *"),this.controller.isModeActive("select")?(this.model.set("text",e.cancelSelection),a.not(".media-button").hide(),this.$el.show(),b.$(".delete-selected-button").removeClass("hidden")):(this.model.set("text",e.bulkSelect),this.controller.content.get().$el.removeClass("fixed"),b.$el.css("width",""),b.$(".delete-selected-button").addClass("hidden"),a.not(".spinner, .media-button").show(),this.controller.state().get("selection").reset())}}),b.exports=c},{}],8:[function(a,b){var c,d=wp.media.View,e=wp.media.view.EditImage;c=e.extend({initialize:function(a){this.editor=window.imageEdit,this.frame=a.frame,this.controller=a.controller,d.prototype.initialize.apply(this,arguments)},back:function(){this.frame.content.mode("edit-metadata")},save:function(){this.model.fetch().done(_.bind(function(){this.frame.content.mode("edit-metadata")},this))}}),b.exports=c},{}],9:[function(a,b){var c,d=wp.media.view.Frame,e=wp.media.view.MediaFrame,f=jQuery;c=e.extend({className:"edit-attachment-frame",template:wp.template("edit-attachment-frame"),regions:["title","content"],events:{"click .left":"previousMediaItem","click .right":"nextMediaItem"},initialize:function(){d.prototype.initialize.apply(this,arguments),_.defaults(this.options,{modal:!0,state:"edit-attachment"}),this.controller=this.options.controller,this.gridRouter=this.controller.gridRouter,this.library=this.options.library,this.options.model&&(this.model=this.options.model),this.bindHandlers(),this.createStates(),this.createModal(),this.title.mode("default"),this.toggleNav()},bindHandlers:function(){this.on("title:create:default",this.createTitle,this),this.listenTo(this.model,"change:status destroy",this.close,this),this.on("content:create:edit-metadata",this.editMetadataMode,this),this.on("content:create:edit-image",this.editImageMode,this),this.on("content:render:edit-image",this.editImageModeRender,this),this.on("close",this.detach)},createModal:function(){this.options.modal&&(this.modal=new wp.media.view.Modal({controller:this,title:this.options.title}),this.modal.on("open",_.bind(function(){f("body").on("keydown.media-modal",_.bind(this.keyEvent,this))},this)),this.modal.on("close",_.bind(function(){this.modal.remove(),f("body").off("keydown.media-modal"),f('li.attachment[data-id="'+this.model.get("id")+'"]').focus(),this.resetRoute()},this)),this.modal.content(this),this.modal.open())},createStates:function(){this.states.add([new wp.media.controller.EditAttachmentMetadata({model:this.model})])},editMetadataMode:function(a){a.view=new wp.media.view.Attachment.Details.TwoColumn({controller:this,model:this.model}),a.view.views.set(".attachment-compat",new wp.media.view.AttachmentCompat({controller:this,model:this.model})),this.model&&this.gridRouter.navigate(this.gridRouter.baseUrl("?item="+this.model.id))},editImageMode:function(a){var b=new wp.media.controller.EditImage({model:this.model,frame:this});b._toolbar=function(){},b._router=function(){},b._menu=function(){},a.view=new wp.media.view.EditImage.Details({model:this.model,frame:this,controller:b})},editImageModeRender:function(a){a.on("ready",a.loadEditor)},toggleNav:function(){this.$(".left").toggleClass("disabled",!this.hasPrevious()),this.$(".right").toggleClass("disabled",!this.hasNext())},rerender:function(){"edit-metadata"!==this.content.mode()?this.content.mode("edit-metadata"):this.content.render(),this.toggleNav()},previousMediaItem:function(){return this.hasPrevious()?(this.model=this.library.at(this.getCurrentIndex()-1),this.rerender(),void this.$(".left").focus()):void this.$(".left").blur()},nextMediaItem:function(){return this.hasNext()?(this.model=this.library.at(this.getCurrentIndex()+1),this.rerender(),void this.$(".right").focus()):void this.$(".right").blur()},getCurrentIndex:function(){return this.library.indexOf(this.model)},hasNext:function(){return this.getCurrentIndex()+1-1},keyEvent:function(a){("INPUT"!==a.target.nodeName&&"TEXTAREA"!==a.target.nodeName||a.target.readOnly||a.target.disabled)&&(39===a.keyCode&&this.nextMediaItem(),37===a.keyCode&&this.previousMediaItem())},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),b.exports=c},{}],10:[function(a,b){var c,d=wp.media.view.MediaFrame,e=wp.media.controller.Library,f=Backbone.$;c=d.extend({initialize:function(){_.defaults(this.options,{title:"",modal:!1,selection:[],library:{},multiple:"add",state:"library",uploader:!0,mode:["grid","edit"]}),this.$body=f(document.body),this.$window=f(window),this.$adminBar=f("#wpadminbar"),this.$window.on("scroll resize",_.debounce(_.bind(this.fixPosition,this),15)),f(document).on("click",".add-new-h2",_.bind(this.addNewClickHandler,this)),this.$el.addClass("wp-core-ui"),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new wp.media.view.UploaderWindow({controller:this,uploader:{dropzone:document.body,container:document.body}}).render(),this.uploader.ready(),f("body").append(this.uploader.el),this.options.uploader=!1),this.gridRouter=new wp.media.view.MediaFrame.Manage.Router,d.prototype.initialize.apply(this,arguments),this.$el.appendTo(this.options.container),this.createStates(),this.bindRegionModeHandlers(),this.render(),this.bindSearchHandler()},bindSearchHandler:function(){var a=this.$("#media-search-input"),b=this.options.container.data("search"),c=this.browserView.toolbar.get("search").$el,d=this.$(".view-list"),e=_.debounce(function(a){var b=f(a.currentTarget).val(),c="";b&&(c+="?search="+b),this.gridRouter.navigate(this.gridRouter.baseUrl(c))},1e3);a.on("input",_.bind(e,this)),c.val(b).trigger("input"),this.gridRouter.on("route:search",function(){var a=window.location.href;a.indexOf("mode=")>-1?a=a.replace(/mode=[^&]+/g,"mode=list"):a+=a.indexOf("?")>-1?"&mode=list":"?mode=list",a=a.replace("search=","s="),d.prop("href",a)})},createStates:function(){var a=this.options;this.options.states||this.states.add([new e({library:wp.media.query(a.library),multiple:a.multiple,title:a.title,content:"browse",toolbar:"select",contentUserSetting:!1,filterable:"all",autoSelect:!1})])},bindRegionModeHandlers:function(){this.on("content:create:browse",this.browseContent,this),this.on("edit:attachment",this.openEditAttachmentModal,this),this.on("select:activate",this.bindKeydown,this),this.on("select:deactivate",this.unbindKeydown,this)},handleKeydown:function(a){27===a.which&&(a.preventDefault(),this.deactivateMode("select").activateMode("edit"))},bindKeydown:function(){this.$body.on("keydown.select",_.bind(this.handleKeydown,this))},unbindKeydown:function(){this.$body.off("keydown.select")},fixPosition:function(){var a,b;this.isModeActive("select")&&(a=this.$(".attachments-browser"),b=a.find(".media-toolbar"),a.offset().top+16 *, .media-toolbar-primary > *"),this.controller.isModeActive("select")?(this.model.set({size:"large",text:f.cancelSelection}),a.not(".spinner, .media-button").hide(),this.$el.show(),b.$(".delete-selected-button").removeClass("hidden")):(this.model.set({size:"",text:f.bulkSelect}),this.controller.content.get().$el.removeClass("fixed"),b.$el.css("width",""),b.$(".delete-selected-button").addClass("hidden"),a.not(".media-button").show(),this.controller.state().get("selection").reset())}}),b.exports=d},{}],8:[function(a,b,c){var d,e=wp.media.View,f=wp.media.view.EditImage;d=f.extend({initialize:function(a){this.editor=window.imageEdit,this.frame=a.frame,this.controller=a.controller,e.prototype.initialize.apply(this,arguments)},back:function(){this.frame.content.mode("edit-metadata")},save:function(){this.model.fetch().done(_.bind(function(){this.frame.content.mode("edit-metadata")},this))}}),b.exports=d},{}],9:[function(a,b,c){var d,e=wp.media.view.Frame,f=wp.media.view.MediaFrame,g=jQuery;d=f.extend({className:"edit-attachment-frame",template:wp.template("edit-attachment-frame"),regions:["title","content"],events:{"click .left":"previousMediaItem","click .right":"nextMediaItem"},initialize:function(){e.prototype.initialize.apply(this,arguments),_.defaults(this.options,{modal:!0,state:"edit-attachment"}),this.controller=this.options.controller,this.gridRouter=this.controller.gridRouter,this.library=this.options.library,this.options.model&&(this.model=this.options.model),this.bindHandlers(),this.createStates(),this.createModal(),this.title.mode("default"),this.toggleNav()},bindHandlers:function(){this.on("title:create:default",this.createTitle,this),this.listenTo(this.model,"change:status destroy",this.close,this),this.on("content:create:edit-metadata",this.editMetadataMode,this),this.on("content:create:edit-image",this.editImageMode,this),this.on("content:render:edit-image",this.editImageModeRender,this),this.on("close",this.detach)},createModal:function(){this.options.modal&&(this.modal=new wp.media.view.Modal({controller:this,title:this.options.title}),this.modal.on("open",_.bind(function(){g("body").on("keydown.media-modal",_.bind(this.keyEvent,this))},this)),this.modal.on("close",_.bind(function(){this.modal.remove(),g("body").off("keydown.media-modal"),g('li.attachment[data-id="'+this.model.get("id")+'"]').focus(),this.resetRoute()},this)),this.modal.content(this),this.modal.open())},createStates:function(){this.states.add([new wp.media.controller.EditAttachmentMetadata({model:this.model})])},editMetadataMode:function(a){a.view=new wp.media.view.Attachment.Details.TwoColumn({controller:this,model:this.model}),a.view.views.set(".attachment-compat",new wp.media.view.AttachmentCompat({controller:this,model:this.model})),this.model&&this.gridRouter.navigate(this.gridRouter.baseUrl("?item="+this.model.id))},editImageMode:function(a){var b=new wp.media.controller.EditImage({model:this.model,frame:this});b._toolbar=function(){},b._router=function(){},b._menu=function(){},a.view=new wp.media.view.EditImage.Details({model:this.model,frame:this,controller:b})},editImageModeRender:function(a){a.on("ready",a.loadEditor)},toggleNav:function(){this.$(".left").toggleClass("disabled",!this.hasPrevious()),this.$(".right").toggleClass("disabled",!this.hasNext())},rerender:function(){"edit-metadata"!==this.content.mode()?this.content.mode("edit-metadata"):this.content.render(),this.toggleNav()},previousMediaItem:function(){return this.hasPrevious()?(this.model=this.library.at(this.getCurrentIndex()-1),this.rerender(),void this.$(".left").focus()):void this.$(".left").blur()},nextMediaItem:function(){return this.hasNext()?(this.model=this.library.at(this.getCurrentIndex()+1),this.rerender(),void this.$(".right").focus()):void this.$(".right").blur()},getCurrentIndex:function(){return this.library.indexOf(this.model)},hasNext:function(){return this.getCurrentIndex()+1-1},keyEvent:function(a){("INPUT"!==a.target.nodeName&&"TEXTAREA"!==a.target.nodeName||a.target.readOnly||a.target.disabled)&&(39===a.keyCode&&this.nextMediaItem(),37===a.keyCode&&this.previousMediaItem())},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),b.exports=d},{}],10:[function(a,b,c){var d,e=wp.media.view.MediaFrame,f=wp.media.controller.Library,g=Backbone.$;d=e.extend({initialize:function(){_.defaults(this.options,{title:"",modal:!1,selection:[],library:{},multiple:"add",state:"library",uploader:!0,mode:["grid","edit"]}),this.$body=g(document.body),this.$window=g(window),this.$adminBar=g("#wpadminbar"),this.$window.on("scroll resize",_.debounce(_.bind(this.fixPosition,this),15)),g(document).on("click",".page-title-action",_.bind(this.addNewClickHandler,this)),this.$el.addClass("wp-core-ui"),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new wp.media.view.UploaderWindow({controller:this,uploader:{dropzone:document.body,container:document.body}}).render(),this.uploader.ready(),g("body").append(this.uploader.el),this.options.uploader=!1),this.gridRouter=new wp.media.view.MediaFrame.Manage.Router,e.prototype.initialize.apply(this,arguments),this.$el.appendTo(this.options.container),this.createStates(),this.bindRegionModeHandlers(),this.render(),this.bindSearchHandler()},bindSearchHandler:function(){var a=this.$("#media-search-input"),b=this.options.container.data("search"),c=this.browserView.toolbar.get("search").$el,d=this.$(".view-list"),e=_.debounce(function(a){var b=g(a.currentTarget).val(),c="";b&&(c+="?search="+b),this.gridRouter.navigate(this.gridRouter.baseUrl(c))},1e3);a.on("input",_.bind(e,this)),c.val(b).trigger("input"),this.gridRouter.on("route:search",function(){var a=window.location.href;a.indexOf("mode=")>-1?a=a.replace(/mode=[^&]+/g,"mode=list"):a+=a.indexOf("?")>-1?"&mode=list":"?mode=list",a=a.replace("search=","s="),d.prop("href",a)})},createStates:function(){var a=this.options;this.options.states||this.states.add([new f({library:wp.media.query(a.library),multiple:a.multiple,title:a.title,content:"browse",toolbar:"select",contentUserSetting:!1,filterable:"all",autoSelect:!1})])},bindRegionModeHandlers:function(){this.on("content:create:browse",this.browseContent,this),this.on("edit:attachment",this.openEditAttachmentModal,this),this.on("select:activate",this.bindKeydown,this),this.on("select:deactivate",this.unbindKeydown,this)},handleKeydown:function(a){27===a.which&&(a.preventDefault(),this.deactivateMode("select").activateMode("edit"))},bindKeydown:function(){this.$body.on("keydown.select",_.bind(this.handleKeydown,this))},unbindKeydown:function(){this.$body.off("keydown.select")},fixPosition:function(){var a,b;this.isModeActive("select")&&(a=this.$(".attachments-browser"),b=a.find(".media-toolbar"),a.offset().top+16-1},keyEvent:function(a){("INPUT"!==a.target.nodeName&&"TEXTAREA"!==a.target.nodeName||a.target.readOnly||a.target.disabled)&&(39===a.keyCode&&this.nextMediaItem(),37===a.keyCode&&this.previousMediaItem())},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),f.view.SelectModeToggleButton=f.view.Button.extend({initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.listenTo(this.controller,"select:activate select:deactivate",this.toggleBulkEditHandler),this.listenTo(this.controller,"selection:action:done",this.back)},back:function(){this.controller.deactivateMode("select").activateMode("edit")},click:function(){f.view.Button.prototype.click.apply(this,arguments),this.controller.isModeActive("select")?this.back():this.controller.deactivateMode("edit").activateMode("select")},render:function(){return f.view.Button.prototype.render.apply(this,arguments),this.$el.addClass("select-mode-toggle-button"),this},toggleBulkEditHandler:function(){var a,b=this.controller.content.get().toolbar;a=b.$(".media-toolbar-secondary > *, .media-toolbar-primary > *"),this.controller.isModeActive("select")?(this.model.set("text",e.cancelSelection),a.not(".delete-selected-button").hide(),b.$(".select-mode-toggle-button").show(),b.$(".delete-selected-button").removeClass("hidden")):(this.model.set("text",e.bulkSelect),this.controller.content.get().$el.removeClass("fixed"),b.$el.css("width",""),b.$(".delete-selected-button").addClass("hidden"),a.not(".spinner, .delete-selected-button").show(),this.controller.state().get("selection").reset())}}),f.view.DeleteSelectedButton=f.view.Button.extend({initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.options.filters&&this.listenTo(this.options.filters.model,"change",this.filterChange),this.listenTo(this.controller,"selection:toggle",this.toggleDisabled)},filterChange:function(a){"trash"===a.get("status")?this.model.set("text",e.untrashSelected):f.view.settings.mediaTrash?this.model.set("text",e.trashSelected):this.model.set("text",e.deleteSelected)},toggleDisabled:function(){this.model.set("disabled",!this.controller.state().get("selection").length)},render:function(){return f.view.Button.prototype.render.apply(this,arguments),this.$el.addClass(this.controller.isModeActive("select")?"delete-selected-button":"delete-selected-button hidden"),this}}),f.view.DateFilter=f.view.AttachmentFilters.extend({id:"media-attachment-date-filters",createFilters:function(){var a={};b.each(f.view.settings.months||{},function(b,c){a[c]={text:b.text,props:{year:b.year,monthnum:b.month}}}),a.all={text:e.allDates,props:{monthnum:!1,year:!1},priority:10},this.filters=a}})}(jQuery,_,Backbone,wp);=======
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g *, .media-toolbar-primary > *"),this.controller.isModeActive("select")?(this.model.set("text",e.cancelSelection),a.not(".media-button").hide(),this.$el.show(),b.$(".delete-selected-button").removeClass("hidden")):(this.model.set("text",e.bulkSelect),this.controller.content.get().$el.removeClass("fixed"),b.$el.css("width",""),b.$(".delete-selected-button").addClass("hidden"),a.not(".spinner, .media-button").show(),this.controller.state().get("selection").reset())}}),b.exports=c},{}],8:[function(a,b){var c,d=wp.media.View,e=wp.media.view.EditImage;c=e.extend({initialize:function(a){this.editor=window.imageEdit,this.frame=a.frame,this.controller=a.controller,d.prototype.initialize.apply(this,arguments)},back:function(){this.frame.content.mode("edit-metadata")},save:function(){this.model.fetch().done(_.bind(function(){this.frame.content.mode("edit-metadata")},this))}}),b.exports=c},{}],9:[function(a,b){var c,d=wp.media.view.Frame,e=wp.media.view.MediaFrame,f=jQuery;c=e.extend({className:"edit-attachment-frame",template:wp.template("edit-attachment-frame"),regions:["title","content"],events:{"click .left":"previousMediaItem","click .right":"nextMediaItem"},initialize:function(){d.prototype.initialize.apply(this,arguments),_.defaults(this.options,{modal:!0,state:"edit-attachment"}),this.controller=this.options.controller,this.gridRouter=this.controller.gridRouter,this.library=this.options.library,this.options.model&&(this.model=this.options.model),this.bindHandlers(),this.createStates(),this.createModal(),this.title.mode("default"),this.toggleNav()},bindHandlers:function(){this.on("title:create:default",this.createTitle,this),this.listenTo(this.model,"change:status destroy",this.close,this),this.on("content:create:edit-metadata",this.editMetadataMode,this),this.on("content:create:edit-image",this.editImageMode,this),this.on("content:render:edit-image",this.editImageModeRender,this),this.on("close",this.detach)},createModal:function(){this.options.modal&&(this.modal=new wp.media.view.Modal({controller:this,title:this.options.title}),this.modal.on("open",_.bind(function(){f("body").on("keydown.media-modal",_.bind(this.keyEvent,this))},this)),this.modal.on("close",_.bind(function(){this.modal.remove(),f("body").off("keydown.media-modal"),f('li.attachment[data-id="'+this.model.get("id")+'"]').focus(),this.resetRoute()},this)),this.modal.content(this),this.modal.open())},createStates:function(){this.states.add([new wp.media.controller.EditAttachmentMetadata({model:this.model})])},editMetadataMode:function(a){a.view=new wp.media.view.Attachment.Details.TwoColumn({controller:this,model:this.model}),a.view.views.set(".attachment-compat",new wp.media.view.AttachmentCompat({controller:this,model:this.model})),this.model&&this.gridRouter.navigate(this.gridRouter.baseUrl("?item="+this.model.id))},editImageMode:function(a){var b=new wp.media.controller.EditImage({model:this.model,frame:this});b._toolbar=function(){},b._router=function(){},b._menu=function(){},a.view=new wp.media.view.EditImage.Details({model:this.model,frame:this,controller:b})},editImageModeRender:function(a){a.on("ready",a.loadEditor)},toggleNav:function(){this.$(".left").toggleClass("disabled",!this.hasPrevious()),this.$(".right").toggleClass("disabled",!this.hasNext())},rerender:function(){"edit-metadata"!==this.content.mode()?this.content.mode("edit-metadata"):this.content.render(),this.toggleNav()},previousMediaItem:function(){return this.hasPrevious()?(this.model=this.library.at(this.getCurrentIndex()-1),this.rerender(),void this.$(".left").focus()):void this.$(".left").blur()},nextMediaItem:function(){return this.hasNext()?(this.model=this.library.at(this.getCurrentIndex()+1),this.rerender(),void this.$(".right").focus()):void this.$(".right").blur()},getCurrentIndex:function(){return this.library.indexOf(this.model)},hasNext:function(){return this.getCurrentIndex()+1-1},keyEvent:function(a){("INPUT"!==a.target.nodeName&&"TEXTAREA"!==a.target.nodeName||a.target.readOnly||a.target.disabled)&&(39===a.keyCode&&this.nextMediaItem(),37===a.keyCode&&this.previousMediaItem())},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),b.exports=c},{}],10:[function(a,b){var c,d=wp.media.view.MediaFrame,e=wp.media.controller.Library,f=Backbone.$;c=d.extend({initialize:function(){_.defaults(this.options,{title:"",modal:!1,selection:[],library:{},multiple:"add",state:"library",uploader:!0,mode:["grid","edit"]}),this.$body=f(document.body),this.$window=f(window),this.$adminBar=f("#wpadminbar"),this.$window.on("scroll resize",_.debounce(_.bind(this.fixPosition,this),15)),f(document).on("click",".add-new-h2",_.bind(this.addNewClickHandler,this)),this.$el.addClass("wp-core-ui"),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new wp.media.view.UploaderWindow({controller:this,uploader:{dropzone:document.body,container:document.body}}).render(),this.uploader.ready(),f("body").append(this.uploader.el),this.options.uploader=!1),this.gridRouter=new wp.media.view.MediaFrame.Manage.Router,d.prototype.initialize.apply(this,arguments),this.$el.appendTo(this.options.container),this.createStates(),this.bindRegionModeHandlers(),this.render(),this.bindSearchHandler()},bindSearchHandler:function(){var a=this.$("#media-search-input"),b=this.options.container.data("search"),c=this.browserView.toolbar.get("search").$el,d=this.$(".view-list"),e=_.debounce(function(a){var b=f(a.currentTarget).val(),c="";b&&(c+="?search="+b),this.gridRouter.navigate(this.gridRouter.baseUrl(c))},1e3);a.on("input",_.bind(e,this)),c.val(b).trigger("input"),this.gridRouter.on("route:search",function(){var a=window.location.href;a.indexOf("mode=")>-1?a=a.replace(/mode=[^&]+/g,"mode=list"):a+=a.indexOf("?")>-1?"&mode=list":"?mode=list",a=a.replace("search=","s="),d.prop("href",a)})},createStates:function(){var a=this.options;this.options.states||this.states.add([new e({library:wp.media.query(a.library),multiple:a.multiple,title:a.title,content:"browse",toolbar:"select",contentUserSetting:!1,filterable:"all",autoSelect:!1})])},bindRegionModeHandlers:function(){this.on("content:create:browse",this.browseContent,this),this.on("edit:attachment",this.openEditAttachmentModal,this),this.on("select:activate",this.bindKeydown,this),this.on("select:deactivate",this.unbindKeydown,this)},handleKeydown:function(a){27===a.which&&(a.preventDefault(),this.deactivateMode("select").activateMode("edit"))},bindKeydown:function(){this.$body.on("keydown.select",_.bind(this.handleKeydown,this))},unbindKeydown:function(){this.$body.off("keydown.select")},fixPosition:function(){var a,b;this.isModeActive("select")&&(a=this.$(".attachments-browser"),b=a.find(".media-toolbar"),a.offset().top+16>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-models.js b/pavillonmadeleine.fr/wp-includes/js/media-models.js
index 4bc7f61c..d719308d 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-models.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-models.js
@@ -1,9 +1,18 @@
+<<<<<<< .mine
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o>>>>>> .r12027
 window.wp = window.wp || {};
 
 /**
@@ -231,9 +240,40 @@ $(window).on('unload', function(){
 	window.wp = null;
 });
 
+<<<<<<< .mine
+},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
+/**
+ * wp.media.model.Attachment
+ *
+ * @class
+ * @augments Backbone.Model
+ */
+var $ = Backbone.$,
+	Attachment;
+||||||| .r11156
+	// Link any settings.
+	media.model.settings = l10n.settings || {};
+	delete l10n.settings;
+=======
 },{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+Attachment = Backbone.Model.extend({
+	/**
+	 * Triggered when attachment details change
+	 * Overrides Backbone.Model.sync
+||||||| .r11156
+	/**
+	 * ========================================================================
+	 * UTILITIES
+	 * ========================================================================
+	 */
 
+	/**
+	 * A basic comparator.
+=======
 /**
  * wp.media.model.Attachment
  *
@@ -247,6 +287,7 @@ Attachment = Backbone.Model.extend({
 	/**
 	 * Triggered when attachment details change
 	 * Overrides Backbone.Model.sync
+>>>>>>> .r12027
 	 *
 	 * @param {string} method
 	 * @param {wp.media.model.Attachment} model
@@ -401,9 +442,60 @@ Attachment = Backbone.Model.extend({
 
 module.exports = Attachment;
 
+<<<<<<< .mine
+},{}],3:[function(require,module,exports){
+/**
+ * wp.media.model.Attachments
+ *
+ * A collection of attachments.
+ *
+ * This collection has no persistence with the server without supplying
+ * 'options.props.query = true', which will mirror the collection
+ * to an Attachments Query collection - @see wp.media.model.Attachments.mirror().
+ *
+ * @class
+ * @augments Backbone.Collection
+ *
+ * @param {array}  [models]                Models to initialize with the collection.
+ * @param {object} [options]               Options hash for the collection.
+ * @param {string} [options.props]         Options hash for the initial query properties.
+ * @param {string} [options.props.order]   Initial order (ASC or DESC) for the collection.
+ * @param {string} [options.props.orderby] Initial attribute key to order the collection by.
+ * @param {string} [options.props.query]   Whether the collection is linked to an attachments query.
+ * @param {string} [options.observe]
+ * @param {string} [options.filters]
+ *
+ */
+var Attachments = Backbone.Collection.extend({
+	/**
+	 * @type {wp.media.model.Attachment}
+	 */
+	model: wp.media.model.Attachment,
+	/**
+	 * @param {Array} [models=[]] Array of models used to populate the collection.
+	 * @param {Object} [options={}]
+	 */
+	initialize: function( models, options ) {
+		options = options || {};
+||||||| .r11156
+			// Overload the `update` request so properties can be saved.
+			} else if ( 'update' === method ) {
+				// If we do not have the necessary nonce, fail immeditately.
+				if ( ! this.get('nonces') || ! this.get('nonces').update ) {
+					return $.Deferred().rejectWith( this ).promise();
+				}
+=======
 },{}],3:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.props   = new Backbone.Model();
+		this.filters = options.filters || {};
+||||||| .r11156
+				options = options || {};
+				options.context = this;
+=======
 /**
  * wp.media.model.Attachments
  *
@@ -437,19 +529,125 @@ var Attachments = Backbone.Collection.extend({
 	 */
 	initialize: function( models, options ) {
 		options = options || {};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Bind default `change` events to the `props` model.
+		this.props.on( 'change', this._changeFilteredProps, this );
+||||||| .r11156
+				// Set the action and ID.
+				options.data = _.extend( options.data || {}, {
+					action:  'save-attachment',
+					id:      this.id,
+					nonce:   this.get('nonces').update,
+					post_id: media.model.settings.post.id
+				});
+=======
 		this.props   = new Backbone.Model();
 		this.filters = options.filters || {};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.props.on( 'change:order',   this._changeOrder,   this );
+		this.props.on( 'change:orderby', this._changeOrderby, this );
+		this.props.on( 'change:query',   this._changeQuery,   this );
+||||||| .r11156
+				// Record the values of the changed attributes.
+				if ( model.hasChanged() ) {
+					options.data.changes = {};
+=======
 		// Bind default `change` events to the `props` model.
 		this.props.on( 'change', this._changeFilteredProps, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.props.set( _.defaults( options.props || {} ) );
+||||||| .r11156
+					_.each( model.changed, function( value, key ) {
+						options.data.changes[ key ] = this.get( key );
+					}, this );
+				}
+=======
 		this.props.on( 'change:order',   this._changeOrder,   this );
 		this.props.on( 'change:orderby', this._changeOrderby, this );
 		this.props.on( 'change:query',   this._changeQuery,   this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( options.observe ) {
+			this.observe( options.observe );
+		}
+	},
+	/**
+	 * Sort the collection when the order attribute changes.
+	 *
+	 * @access private
+	 */
+	_changeOrder: function() {
+		if ( this.comparator ) {
+			this.sort();
+		}
+	},
+	/**
+	 * Set the default comparator only when the `orderby` property is set.
+	 *
+	 * @access private
+	 *
+	 * @param {Backbone.Model} model
+	 * @param {string} orderby
+	 */
+	_changeOrderby: function( model, orderby ) {
+		// If a different comparator is defined, bail.
+		if ( this.comparator && this.comparator !== Attachments.comparator ) {
+			return;
+		}
+||||||| .r11156
+				return media.ajax( options );
+=======
 		this.props.set( _.defaults( options.props || {} ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( orderby && 'post__in' !== orderby ) {
+			this.comparator = Attachments.comparator;
+		} else {
+			delete this.comparator;
+		}
+	},
+	/**
+	 * If the `query` property is set to true, query the server using
+	 * the `props` values, and sync the results to this collection.
+	 *
+	 * @access private
+	 *
+	 * @param {Backbone.Model} model
+	 * @param {Boolean} query
+	 */
+	_changeQuery: function( model, query ) {
+		if ( query ) {
+			this.props.on( 'change', this._requery, this );
+			this._requery();
+		} else {
+			this.props.off( 'change', this._requery, this );
+		}
+	},
+	/**
+	 * @access private
+	 *
+	 * @param {Backbone.Model} model
+	 */
+	_changeFilteredProps: function( model ) {
+		// If this is a query, updating the collection will be handled by
+		// `this._requery()`.
+		if ( this.props.get('query') ) {
+			return;
+		}
+||||||| .r11156
+			// Overload the `delete` request so attachments can be removed.
+			// This will permanently delete an attachment.
+			} else if ( 'delete' === method ) {
+				options = options || {};
+=======
 		if ( options.observe ) {
 			this.observe( options.observe );
 		}
@@ -477,7 +675,17 @@ var Attachments = Backbone.Collection.extend({
 		if ( this.comparator && this.comparator !== Attachments.comparator ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		var changed = _.chain( model.changed ).map( function( t, prop ) {
+			var filter = Attachments.filters[ prop ],
+				term = model.get( prop );
+||||||| .r11156
+				if ( ! options.wait ) {
+					this.destroyed = true;
+				}
+=======
 		if ( orderby && 'post__in' !== orderby ) {
 			this.comparator = Attachments.comparator;
 		} else {
@@ -512,11 +720,39 @@ var Attachments = Backbone.Collection.extend({
 		if ( this.props.get('query') ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( ! filter ) {
+				return;
+			}
+||||||| .r11156
+				options.context = this;
+				options.data = _.extend( options.data || {}, {
+					action:   'delete-post',
+					id:       this.id,
+					_wpnonce: this.get('nonces')['delete']
+				});
+=======
 		var changed = _.chain( model.changed ).map( function( t, prop ) {
 			var filter = Attachments.filters[ prop ],
 				term = model.get( prop );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			if ( term && ! this.filters[ prop ] ) {
+				this.filters[ prop ] = filter;
+			} else if ( ! term && this.filters[ prop ] === filter ) {
+				delete this.filters[ prop ];
+||||||| .r11156
+				return media.ajax( options ).done( function() {
+					this.destroyed = true;
+				}).fail( function() {
+					this.destroyed = false;
+				});
 
+			// Otherwise, fall back to `Backbone.sync()`.
+=======
 			if ( ! filter ) {
 				return;
 			}
@@ -525,6 +761,7 @@ var Attachments = Backbone.Collection.extend({
 				this.filters[ prop ] = filter;
 			} else if ( ! term && this.filters[ prop ] === filter ) {
 				delete this.filters[ prop ];
+>>>>>>> .r12027
 			} else {
 				return;
 			}
@@ -870,6 +1107,7 @@ var Attachments = Backbone.Collection.extend({
 		 * Note that this client-side searching is *not* equivalent
 		 * to our server-side searching.
 		 *
+<<<<<<< .mine
 		 * @param {wp.media.model.Attachment} attachment
 		 *
 		 * @this wp.media.model.Attachments
@@ -889,14 +1127,66 @@ var Attachments = Backbone.Collection.extend({
 		/**
 		 * @static
 		 * @param {wp.media.model.Attachment} attachment
+||||||| .r11156
+		 * @access private
+		 */
+		_changeOrder: function() {
+			if ( this.comparator ) {
+				this.sort();
+			}
+		},
+		/**
+		 * Set the default comparator only when the `orderby` property is set.
+=======
+		 * @param {wp.media.model.Attachment} attachment
+>>>>>>> .r12027
 		 *
 		 * @this wp.media.model.Attachments
 		 *
 		 * @returns {Boolean}
 		 */
+<<<<<<< .mine
 		type: function( attachment ) {
-			var type = this.props.get('type');
-			return ! type || -1 !== type.indexOf( attachment.get('type') );
+			var type = this.props.get('type'), atts = attachment.toJSON(), mime, found;
+
+			if ( ! type || ( _.isArray( type ) && ! type.length ) ) {
+				return true;
+||||||| .r11156
+		_changeOrderby: function( model, orderby ) {
+			// If a different comparator is defined, bail.
+			if ( this.comparator && this.comparator !== Attachments.comparator ) {
+				return;
+=======
+		search: function( attachment ) {
+			if ( ! this.props.get('search') ) {
+				return true;
+>>>>>>> .r12027
+			}
+
+<<<<<<< .mine
+			mime = atts.mime || ( atts.file && atts.file.type ) || '';
+
+			if ( _.isArray( type ) ) {
+				found = _.find( type, function (t) {
+					return -1 !== mime.indexOf( t );
+				} );
+			} else {
+				found = -1 !== mime.indexOf( type );
+			}
+||||||| .r11156
+			if ( orderby && 'post__in' !== orderby ) {
+				this.comparator = Attachments.comparator;
+			} else {
+				delete this.comparator;
+			}
+=======
+			return _.any(['title','filename','description','caption','name'], function( key ) {
+				var value = attachment.get( key );
+				return value && -1 !== value.search( this.props.get('search') );
+			}, this );
+>>>>>>> .r12027
+
+			return found;
 		},
 		/**
 		 * @static
@@ -906,11 +1196,25 @@ var Attachments = Backbone.Collection.extend({
 		 *
 		 * @returns {Boolean}
 		 */
+<<<<<<< .mine
 		uploadedTo: function( attachment ) {
 			var uploadedTo = this.props.get('uploadedTo');
 			if ( _.isUndefined( uploadedTo ) ) {
 				return true;
 			}
+||||||| .r11156
+		_changeQuery: function( model, query ) {
+			if ( query ) {
+				this.props.on( 'change', this._requery, this );
+				this._requery();
+			} else {
+				this.props.off( 'change', this._requery, this );
+			}
+=======
+		type: function( attachment ) {
+			var type = this.props.get('type');
+			return ! type || -1 !== type.indexOf( attachment.get('type') );
+>>>>>>> .r12027
 
 			return uploadedTo === attachment.get('uploadedTo');
 		},
@@ -922,6 +1226,7 @@ var Attachments = Backbone.Collection.extend({
 		 *
 		 * @returns {Boolean}
 		 */
+<<<<<<< .mine
 		status: function( attachment ) {
 			var status = this.props.get('status');
 			if ( _.isUndefined( status ) ) {
@@ -936,8 +1241,6 @@ var Attachments = Backbone.Collection.extend({
 module.exports = Attachments;
 
 },{}],4:[function(require,module,exports){
-/*globals Backbone */
-
 /**
  * wp.media.model.PostImage
  *
@@ -964,31 +1267,142 @@ var PostImage = Backbone.Model.extend({
 				this.dfd.resolve();
 			} else {
 				this.dfd = this.attachment.fetch();
+||||||| .r11156
+		_changeFilteredProps: function( model ) {
+			// If this is a query, updating the collection will be handled by
+			// `this._requery()`.
+			if ( this.props.get('query') ) {
+				return;
+			}
+
+			var changed = _.chain( model.changed ).map( function( t, prop ) {
+				var filter = Attachments.filters[ prop ],
+					term = model.get( prop );
+
+				if ( ! filter ) {
+					return;
+				}
+
+				if ( term && ! this.filters[ prop ] ) {
+					this.filters[ prop ] = filter;
+				} else if ( ! term && this.filters[ prop ] === filter ) {
+					delete this.filters[ prop ];
+				} else {
+					return;
+				}
+
+				// Record the change.
+				return true;
+			}, this ).any().value();
+
+			if ( ! changed ) {
+				return;
+=======
+		uploadedTo: function( attachment ) {
+			var uploadedTo = this.props.get('uploadedTo');
+			if ( _.isUndefined( uploadedTo ) ) {
+				return true;
+>>>>>>> .r12027
 			}
 			this.bindAttachmentListeners();
 		}
 
+<<<<<<< .mine
 		// keep url in sync with changes to the type of link
 		this.on( 'change:link', this.updateLinkUrl, this );
 		this.on( 'change:size', this.updateSize, this );
 
 		this.setLinkTypeFromUrl();
 		this.setAspectRatio();
+||||||| .r11156
+			// If no `Attachments` model is provided to source the searches
+			// from, then automatically generate a source from the existing
+			// models.
+			if ( ! this._source ) {
+				this._source = new Attachments( this.models );
+			}
+
+			this.reset( this._source.filter( this.validator, this ) );
+		},
+=======
+			return uploadedTo === attachment.get('uploadedTo');
+		},
+>>>>>>> .r12027
+<<<<<<< .mine
 
 		this.set( 'originalUrl', attributes.url );
 	},
+||||||| .r11156
+
+		validateDestroyed: false,
+		/**
+		 * @param {wp.media.model.Attachment} attachment
+		 * @returns {Boolean}
+		 */
+		validator: function( attachment ) {
+			if ( ! this.validateDestroyed && attachment.destroyed ) {
+				return false;
+			}
+			return _.all( this.filters, function( filter ) {
+				return !! filter.call( this, attachment );
+			}, this );
+		},
+		/**
+		 * @param {wp.media.model.Attachment} attachment
+		 * @param {Object} options
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		validate: function( attachment, options ) {
+			var valid = this.validator( attachment ),
+				hasAttachment = !! this.get( attachment.cid );
+=======
+		/**
+		 * @static
+		 * @param {wp.media.model.Attachment} attachment
+		 *
+		 * @this wp.media.model.Attachments
+		 *
+		 * @returns {Boolean}
+		 */
+		status: function( attachment ) {
+			var status = this.props.get('status');
+			if ( _.isUndefined( status ) ) {
+				return true;
+			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	bindAttachmentListeners: function() {
 		this.listenTo( this.attachment, 'sync', this.setLinkTypeFromUrl );
 		this.listenTo( this.attachment, 'sync', this.setAspectRatio );
 		this.listenTo( this.attachment, 'change', this.updateSize );
 	},
+||||||| .r11156
+			if ( ! valid && hasAttachment ) {
+				this.remove( attachment, options );
+			} else if ( valid && ! hasAttachment ) {
+				this.add( attachment, options );
+			}
+=======
+			return status === attachment.get('status');
+		}
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	changeAttachment: function( attachment, props ) {
 		this.stopListening( this.attachment );
 		this.attachment = attachment;
 		this.bindAttachmentListeners();
+||||||| .r11156
+			return this;
+		},
+=======
+module.exports = Attachments;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.set( 'attachment_id', this.attachment.get( 'id' ) );
 		this.set( 'caption', this.attachment.get( 'caption' ) );
 		this.set( 'alt', this.attachment.get( 'alt' ) );
@@ -998,34 +1412,364 @@ var PostImage = Backbone.Model.extend({
 		this.updateLinkUrl();
 		this.updateSize();
 	},
+||||||| .r11156
+		/**
+		 * @param {wp.media.model.Attachments} attachments
+		 * @param {object} [options={}]
+		 *
+		 * @fires wp.media.model.Attachments#reset
+		 *
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		validateAll: function( attachments, options ) {
+			options = options || {};
+=======
+},{}],4:[function(require,module,exports){
+/*globals Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	setLinkTypeFromUrl: function() {
 		var linkUrl = this.get( 'linkUrl' ),
 			type;
+||||||| .r11156
+			_.each( attachments.models, function( attachment ) {
+				this.validate( attachment, { silent: true });
+			}, this );
+=======
+/**
+ * wp.media.model.PostImage
+ *
+ * An instance of an image that's been embedded into a post.
+ *
+ * Used in the embedded image attachment display settings modal - @see wp.media.view.MediaFrame.ImageDetails.
+ *
+ * @class
+ * @augments Backbone.Model
+ *
+ * @param {int} [attributes]               Initial model attributes.
+ * @param {int} [attributes.attachment_id] ID of the attachment.
+ **/
+var PostImage = Backbone.Model.extend({
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! linkUrl ) {
 			this.set( 'link', 'none' );
 			return;
 		}
-
-		// default to custom if there is a linkUrl
-		type = 'custom';
-
-		if ( this.attachment ) {
-			if ( this.attachment.get( 'url' ) === linkUrl ) {
+||||||| .r11156
+			if ( ! options.silent ) {
+				this.trigger( 'reset', this, options );
+			}
+			return this;
+		},
+		/**
+		 * @param {wp.media.model.Attachments} attachments
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		observe: function( attachments ) {
+			this.observers = this.observers || [];
+			this.observers.push( attachments );
+=======
+	initialize: function( attributes ) {
+		var Attachment = wp.media.model.Attachment;
+		this.attachment = false;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// default to custom if there is a linkUrl
+		type = 'custom';
+
+||||||| .r11156
+			attachments.on( 'add change remove', this._validateHandler, this );
+			attachments.on( 'reset', this._validateAllHandler, this );
+			this.validateAll( attachments );
+			return this;
+		},
+		/**
+		 * @param {wp.media.model.Attachments} attachments
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		unobserve: function( attachments ) {
+			if ( attachments ) {
+				attachments.off( null, null, this );
+				this.observers = _.without( this.observers, attachments );
+
+=======
+		if ( attributes.attachment_id ) {
+			this.attachment = Attachment.get( attributes.attachment_id );
+			if ( this.attachment.get( 'url' ) ) {
+				this.dfd = jQuery.Deferred();
+				this.dfd.resolve();
+>>>>>>> .r12027
+<<<<<<< .mine
+		if ( this.attachment ) {
+			if ( this.attachment.get( 'url' ) === linkUrl ) {
+				type = 'file';
+			} else if ( this.attachment.get( 'link' ) === linkUrl ) {
+				type = 'post';
+||||||| .r11156
+			} else {
+				_.each( this.observers, function( attachments ) {
+					attachments.off( null, null, this );
+				}, this );
+				delete this.observers;
+=======
+			} else {
+				this.dfd = this.attachment.fetch();
+>>>>>>> .r12027
+			}
+<<<<<<< .mine
+		} else {
+			if ( this.get( 'url' ) === linkUrl ) {
+				type = 'file';
+			}
+		}
+||||||| .r11156
+=======
+			this.bindAttachmentListeners();
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.set( 'link', type );
+	},
+||||||| .r11156
+			return this;
+		},
+		/**
+		 * @access private
+		 *
+		 * @param {wp.media.model.Attachments} attachment
+		 * @param {wp.media.model.Attachments} attachments
+		 * @param {Object} options
+		 *
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		_validateHandler: function( attachment, attachments, options ) {
+			// If we're not mirroring this `attachments` collection,
+			// only retain the `silent` option.
+			options = attachments === this.mirroring ? options : {
+				silent: options && options.silent
+			};
+=======
+		// keep url in sync with changes to the type of link
+		this.on( 'change:link', this.updateLinkUrl, this );
+		this.on( 'change:size', this.updateSize, this );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	updateLinkUrl: function() {
+		var link = this.get( 'link' ),
+			url;
+||||||| .r11156
+			return this.validate( attachment, options );
+		},
+		/**
+		 * @access private
+		 *
+		 * @param {wp.media.model.Attachments} attachments
+		 * @param {Object} options
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		_validateAllHandler: function( attachments, options ) {
+			return this.validateAll( attachments, options );
+		},
+		/**
+		 * @param {wp.media.model.Attachments} attachments
+		 * @returns {wp.media.model.Attachments} Returns itself to allow chaining
+		 */
+		mirror: function( attachments ) {
+			if ( this.mirroring && this.mirroring === attachments ) {
+				return this;
+			}
+=======
+		this.setLinkTypeFromUrl();
+		this.setAspectRatio();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		switch( link ) {
+			case 'file':
+				if ( this.attachment ) {
+					url = this.attachment.get( 'url' );
+				} else {
+					url = this.get( 'url' );
+				}
+				this.set( 'linkUrl', url );
+				break;
+			case 'post':
+				this.set( 'linkUrl', this.attachment.get( 'link' ) );
+				break;
+			case 'none':
+				this.set( 'linkUrl', '' );
+				break;
+		}
+	},
+||||||| .r11156
+			this.unmirror();
+			this.mirroring = attachments;
+=======
+		this.set( 'originalUrl', attributes.url );
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	updateSize: function() {
+		var size;
+||||||| .r11156
+			// Clear the collection silently. A `reset` event will be fired
+			// when `observe()` calls `validateAll()`.
+			this.reset( [], { silent: true } );
+			this.observe( attachments );
+=======
+	bindAttachmentListeners: function() {
+		this.listenTo( this.attachment, 'sync', this.setLinkTypeFromUrl );
+		this.listenTo( this.attachment, 'sync', this.setAspectRatio );
+		this.listenTo( this.attachment, 'change', this.updateSize );
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( ! this.attachment ) {
+			return;
+		}
+||||||| .r11156
+			return this;
+		},
+		unmirror: function() {
+			if ( ! this.mirroring ) {
+				return;
+			}
+=======
+	changeAttachment: function( attachment, props ) {
+		this.stopListening( this.attachment );
+		this.attachment = attachment;
+		this.bindAttachmentListeners();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( this.get( 'size' ) === 'custom' ) {
+			this.set( 'width', this.get( 'customWidth' ) );
+			this.set( 'height', this.get( 'customHeight' ) );
+			this.set( 'url', this.get( 'originalUrl' ) );
+			return;
+		}
+||||||| .r11156
+			this.unobserve( this.mirroring );
+			delete this.mirroring;
+		},
+		/**
+		 * @param {Object} options
+		 * @returns {Promise}
+		 */
+		more: function( options ) {
+			var deferred = $.Deferred(),
+				mirroring = this.mirroring,
+				attachments = this;
+=======
+		this.set( 'attachment_id', this.attachment.get( 'id' ) );
+		this.set( 'caption', this.attachment.get( 'caption' ) );
+		this.set( 'alt', this.attachment.get( 'alt' ) );
+		this.set( 'size', props.get( 'size' ) );
+		this.set( 'align', props.get( 'align' ) );
+		this.set( 'link', props.get( 'link' ) );
+		this.updateLinkUrl();
+		this.updateSize();
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		size = this.attachment.get( 'sizes' )[ this.get( 'size' ) ];
+||||||| .r11156
+			if ( ! mirroring || ! mirroring.more ) {
+				return deferred.resolveWith( this ).promise();
+			}
+			// If we're mirroring another collection, forward `more` to
+			// the mirrored collection. Account for a race condition by
+			// checking if we're still mirroring that collection when
+			// the request resolves.
+			mirroring.more( options ).done( function() {
+				if ( this === attachments.mirroring )
+					deferred.resolveWith( this );
+			});
+=======
+	setLinkTypeFromUrl: function() {
+		var linkUrl = this.get( 'linkUrl' ),
+			type;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( ! size ) {
+			return;
+		}
+||||||| .r11156
+			return deferred.promise();
+		},
+		/**
+		 * @returns {Boolean}
+		 */
+		hasMore: function() {
+			return this.mirroring ? this.mirroring.hasMore() : false;
+		},
+		/**
+		 * Overrides Backbone.Collection.parse
+		 *
+		 * @param {Object|Array} resp The raw response Object/Array.
+		 * @param {Object} xhr
+		 * @returns {Array} The array of model attributes to be added to the collection
+		 */
+		parse: function( resp, xhr ) {
+			if ( ! _.isArray( resp ) ) {
+				resp = [resp];
+			}
+=======
+		if ( ! linkUrl ) {
+			this.set( 'link', 'none' );
+			return;
+		}
+
+		// default to custom if there is a linkUrl
+		type = 'custom';
+
+		if ( this.attachment ) {
+			if ( this.attachment.get( 'url' ) === linkUrl ) {
 				type = 'file';
 			} else if ( this.attachment.get( 'link' ) === linkUrl ) {
 				type = 'post';
 			}
+>>>>>>> .r12027
 		} else {
 			if ( this.get( 'url' ) === linkUrl ) {
 				type = 'file';
 			}
 		}
 
+<<<<<<< .mine
+		this.set( 'url', size.url );
+		this.set( 'width', size.width );
+		this.set( 'height', size.height );
+	},
+||||||| .r11156
+			return _.map( resp, function( attrs ) {
+				var id, attachment, newAttributes;
+=======
 		this.set( 'link', type );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	setAspectRatio: function() {
+		var full;
+||||||| .r11156
+				if ( attrs instanceof Backbone.Model ) {
+					id = attrs.get( 'id' );
+					attrs = attrs.attributes;
+				} else {
+					id = attrs.id;
+				}
+=======
 	updateLinkUrl: function() {
 		var link = this.get( 'link' ),
 			url;
@@ -1037,6 +1781,7 @@ var PostImage = Backbone.Model.extend({
 				} else {
 					url = this.get( 'url' );
 				}
+>>>>>>> .r12027
 				this.set( 'linkUrl', url );
 				break;
 			case 'post':
@@ -1048,9 +1793,52 @@ var PostImage = Backbone.Model.extend({
 		}
 	},
 
+<<<<<<< .mine
+		if ( this.attachment && this.attachment.get( 'sizes' ) ) {
+			full = this.attachment.get( 'sizes' ).full;
+||||||| .r11156
+				attachment = Attachment.get( id );
+				newAttributes = attachment.parse( attrs, xhr );
+=======
 	updateSize: function() {
 		var size;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			if ( full ) {
+				this.set( 'aspectRatio', full.width / full.height );
+				return;
+			}
+||||||| .r11156
+				if ( ! _.isEqual( attachment.attributes, newAttributes ) ) {
+					attachment.set( newAttributes );
+				}
 
+				return attachment;
+			});
+		},
+		/**
+		 * @access private
+		 */
+		_requery: function( refresh ) {
+			var props;
+			if ( this.props.get('query') ) {
+				props = this.props.toJSON();
+				props.cache = ( true !== refresh );
+				this.mirror( Query.get( props ) );
+			}
+		},
+		/**
+		 * If this collection is sorted by `menuOrder`, recalculates and saves
+		 * the menu order to the database.
+		 *
+		 * @returns {undefined|Promise}
+		 */
+		saveMenuOrder: function() {
+			if ( 'menuOrder' !== this.props.get('orderby') ) {
+				return;
+			}
+=======
 		if ( ! this.attachment ) {
 			return;
 		}
@@ -1061,36 +1849,248 @@ var PostImage = Backbone.Model.extend({
 			this.set( 'url', this.get( 'originalUrl' ) );
 			return;
 		}
+>>>>>>> .r12027
+		}
 
+<<<<<<< .mine
+		this.set( 'aspectRatio', this.get( 'customWidth' ) / this.get( 'customHeight' ) );
+	}
+});
+||||||| .r11156
+			// Removes any uploading attachments, updates each attachment's
+			// menu order, and returns an object with an { id: menuOrder }
+			// mapping to pass to the request.
+			var attachments = this.chain().filter( function( attachment ) {
+				return ! _.isUndefined( attachment.id );
+			}).map( function( attachment, index ) {
+				// Indices start at 1.
+				index = index + 1;
+				attachment.set( 'menuOrder', index );
+				return [ attachment.id, index ];
+			}).object().value();
+=======
 		size = this.attachment.get( 'sizes' )[ this.get( 'size' ) ];
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = PostImage;
+
+},{}],5:[function(require,module,exports){
+/**
+ * wp.media.model.Query
+ *
+ * A collection of attachments that match the supplied query arguments.
+ *
+ * Note: Do NOT change this.args after the query has been initialized.
+ *       Things will break.
+ *
+ * @class
+ * @augments wp.media.model.Attachments
+ * @augments Backbone.Collection
+ *
+ * @param {array}  [models]                      Models to initialize with the collection.
+ * @param {object} [options]                     Options hash.
+ * @param {object} [options.args]                Attachments query arguments.
+ * @param {object} [options.args.posts_per_page]
+ */
+var Attachments = wp.media.model.Attachments,
+	Query;
+||||||| .r11156
+			if ( _.isEmpty( attachments ) ) {
+				return;
+			}
 
+			return media.post( 'save-attachment-order', {
+				nonce:       media.model.settings.post.nonce,
+				post_id:     media.model.settings.post.id,
+				attachments: attachments
+			});
+		}
+	}, {
+		/**
+		 * @static
+		 * Overrides Backbone.Collection.comparator
+		 *
+		 * @param {Backbone.Model} a
+		 * @param {Backbone.Model} b
+		 * @param {Object} options
+		 * @returns {Number} -1 if the first model should come before the second,
+		 *    0 if they are of the same rank and
+		 *    1 if the first model should come after.
+		 */
+		comparator: function( a, b, options ) {
+			var key   = this.props.get('orderby'),
+				order = this.props.get('order') || 'DESC',
+				ac    = a.cid,
+				bc    = b.cid;
+=======
 		if ( ! size ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Query = Attachments.extend({
+	/**
+	 * @global wp.Uploader
+	 *
+	 * @param {array}  [models=[]]  Array of initial models to populate the collection.
+	 * @param {object} [options={}]
+	 */
+	initialize: function( models, options ) {
+		var allowed;
+||||||| .r11156
+			a = a.get( key );
+			b = b.get( key );
+=======
 		this.set( 'url', size.url );
 		this.set( 'width', size.width );
 		this.set( 'height', size.height );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		options = options || {};
+		Attachments.prototype.initialize.apply( this, arguments );
+||||||| .r11156
+			if ( 'date' === key || 'modified' === key ) {
+				a = a || new Date();
+				b = b || new Date();
+			}
+=======
 	setAspectRatio: function() {
 		var full;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.args     = options.args;
+		this._hasMore = true;
+		this.created  = new Date();
 
+		this.filters.order = function( attachment ) {
+			var orderby = this.props.get('orderby'),
+				order = this.props.get('order');
+
+			if ( ! this.comparator ) {
+				return true;
+||||||| .r11156
+			// If `options.ties` is set, don't enforce the `cid` tiebreaker.
+			if ( options && options.ties ) {
+				ac = bc = null;
+=======
 		if ( this.attachment && this.attachment.get( 'sizes' ) ) {
 			full = this.attachment.get( 'sizes' ).full;
 
 			if ( full ) {
 				this.set( 'aspectRatio', full.width / full.height );
 				return;
+>>>>>>> .r12027
 			}
 		}
 
+<<<<<<< .mine
+			// We want any items that can be placed before the last
+			// item in the set. If we add any items after the last
+			// item, then we can't guarantee the set is complete.
+			if ( this.length ) {
+				return 1 !== this.comparator( attachment, this.last(), { ties: true });
+||||||| .r11156
+			return ( 'DESC' === order ) ? compare( a, b, ac, bc ) : compare( b, a, bc, ac );
+		},
+		/**
+		 * @namespace
+		 */
+		filters: {
+			/**
+			 * @static
+			 * Note that this client-side searching is *not* equivalent
+			 * to our server-side searching.
+			 *
+			 * @param {wp.media.model.Attachment} attachment
+			 *
+			 * @this wp.media.model.Attachments
+			 *
+			 * @returns {Boolean}
+			 */
+			search: function( attachment ) {
+				if ( ! this.props.get('search') ) {
+					return true;
+				}
+=======
 		this.set( 'aspectRatio', this.get( 'customWidth' ) / this.get( 'customHeight' ) );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Handle the case where there are no items yet and
+			// we're sorting for recent items. In that case, we want
+			// changes that occurred after we created the query.
+			} else if ( 'DESC' === order && ( 'date' === orderby || 'modified' === orderby ) ) {
+				return attachment.get( orderby ) >= this.created;
+||||||| .r11156
+				return _.any(['title','filename','description','caption','name'], function( key ) {
+					var value = attachment.get( key );
+					return value && -1 !== value.search( this.props.get('search') );
+				}, this );
+			},
+			/**
+			 * @static
+			 * @param {wp.media.model.Attachment} attachment
+			 *
+			 * @this wp.media.model.Attachments
+			 *
+			 * @returns {Boolean}
+			 */
+			type: function( attachment ) {
+				var type = this.props.get('type');
+				return ! type || -1 !== type.indexOf( attachment.get('type') );
+			},
+			/**
+			 * @static
+			 * @param {wp.media.model.Attachment} attachment
+			 *
+			 * @this wp.media.model.Attachments
+			 *
+			 * @returns {Boolean}
+			 */
+			uploadedTo: function( attachment ) {
+				var uploadedTo = this.props.get('uploadedTo');
+				if ( _.isUndefined( uploadedTo ) ) {
+					return true;
+				}
+=======
 module.exports = PostImage;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			// If we're sorting by menu order and we have no items,
+			// accept any items that have the default menu order (0).
+			} else if ( 'ASC' === order && 'menuOrder' === orderby ) {
+				return attachment.get( orderby ) === 0;
+			}
+||||||| .r11156
+				return uploadedTo === attachment.get('uploadedTo');
+			},
+			/**
+			 * @static
+			 * @param {wp.media.model.Attachment} attachment
+			 *
+			 * @this wp.media.model.Attachments
+			 *
+			 * @returns {Boolean}
+			 */
+			status: function( attachment ) {
+				var status = this.props.get('status');
+				if ( _.isUndefined( status ) ) {
+					return true;
+				}
 
+				return status === attachment.get('status');
+			}
+		}
+	});
+=======
 },{}],5:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -1113,32 +2113,215 @@ module.exports = PostImage;
  */
 var Attachments = wp.media.model.Attachments,
 	Query;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			// Otherwise, we don't want any items yet.
+			return false;
+		};
+
+		// Observe the central `wp.Uploader.queue` collection to watch for
+		// new matches for the query.
+		//
+		// Only observe when a limited number of query args are set. There
+		// are no filters for other properties, so observing will result in
+		// false positives in those queries.
+		allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent' ];
+		if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() ) {
+			this.observe( wp.Uploader.queue );
+		}
+	},
+	/**
+	 * Whether there are more attachments that haven't been sync'd from the server
+	 * that match the collection's query.
+||||||| .r11156
+	/**
+	 * @static
+	 * @member {wp.media.model.Attachments}
+	 */
+	Attachments.all = new Attachments();
 
+	/**
+	 * wp.media.query
+=======
 Query = Attachments.extend({
 	/**
 	 * @global wp.Uploader
+>>>>>>> .r12027
 	 *
+<<<<<<< .mine
+	 * @returns {boolean}
+||||||| .r11156
+	 * @static
+	 * @returns {wp.media.model.Attachments}
+=======
 	 * @param {array}  [models=[]]  Array of initial models to populate the collection.
 	 * @param {object} [options={}]
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	hasMore: function() {
+		return this._hasMore;
+	},
+||||||| .r11156
+	media.query = function( props ) {
+		return new Attachments( null, {
+			props: _.extend( _.defaults( props || {}, { orderby: 'date' } ), { query: true } )
+		});
+	};
+
+=======
 	initialize: function( models, options ) {
 		var allowed;
 
+>>>>>>> .r12027
+<<<<<<< .mine
+	/**
+	 * Fetch more attachments from the server for the collection.
+	 *
+	 * @param   {object}  [options={}]
+	 * @returns {Promise}
+	 */
+	more: function( options ) {
+		var query = this;
+||||||| .r11156
+	/**
+	 * wp.media.model.Query
+	 *
+	 * A set of attachments that corresponds to a set of consecutively paged
+	 * queries on the server.
+	 *
+	 * Note: Do NOT change this.args after the query has been initialized.
+	 *       Things will break.
+	 *
+	 * @constructor
+	 * @augments wp.media.model.Attachments
+	 * @augments Backbone.Collection
+	 */
+	Query = media.model.Query = Attachments.extend({
+		/**
+		 * @global wp.Uploader
+		 *
+		 * @param {Array} [models=[]] Array of models used to populate the collection.
+		 * @param {Object} [options={}]
+		 */
+		initialize: function( models, options ) {
+			var allowed;
+=======
 		options = options || {};
 		Attachments.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If there is already a request pending, return early with the Deferred object.
+		if ( this._more && 'pending' === this._more.state() ) {
+			return this._more;
+		}
+||||||| .r11156
+			options = options || {};
+			Attachments.prototype.initialize.apply( this, arguments );
+=======
 		this.args     = options.args;
 		this._hasMore = true;
 		this.created  = new Date();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this.hasMore() ) {
+			return jQuery.Deferred().resolveWith( this ).promise();
+		}
+||||||| .r11156
+			this.args     = options.args;
+			this._hasMore = true;
+			this.created  = new Date();
+=======
 		this.filters.order = function( attachment ) {
 			var orderby = this.props.get('orderby'),
 				order = this.props.get('order');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		options = options || {};
+		options.remove = false;
+||||||| .r11156
+			this.filters.order = function( attachment ) {
+				var orderby = this.props.get('orderby'),
+					order = this.props.get('order');
+=======
 			if ( ! this.comparator ) {
 				return true;
 			}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		return this._more = this.fetch( options ).done( function( resp ) {
+			if ( _.isEmpty( resp ) || -1 === this.args.posts_per_page || resp.length < this.args.posts_per_page ) {
+				query._hasMore = false;
+			}
+		});
+	},
+	/**
+	 * Overrides Backbone.Collection.sync
+	 * Overrides wp.media.model.Attachments.sync
+	 *
+	 * @param {String} method
+	 * @param {Backbone.Model} model
+	 * @param {Object} [options={}]
+	 * @returns {Promise}
+	 */
+	sync: function( method, model, options ) {
+		var args, fallback;
+||||||| .r11156
+				if ( ! this.comparator ) {
+					return true;
+				}
+
+				// We want any items that can be placed before the last
+				// item in the set. If we add any items after the last
+				// item, then we can't guarantee the set is complete.
+				if ( this.length ) {
+					return 1 !== this.comparator( attachment, this.last(), { ties: true });
+
+				// Handle the case where there are no items yet and
+				// we're sorting for recent items. In that case, we want
+				// changes that occurred after we created the query.
+				} else if ( 'DESC' === order && ( 'date' === orderby || 'modified' === orderby ) ) {
+					return attachment.get( orderby ) >= this.created;
+
+				// If we're sorting by menu order and we have no items,
+				// accept any items that have the default menu order (0).
+				} else if ( 'ASC' === order && 'menuOrder' === orderby ) {
+					return attachment.get( orderby ) === 0;
+				}
 
+				// Otherwise, we don't want any items yet.
+				return false;
+			};
+
+			// Observe the central `wp.Uploader.queue` collection to watch for
+			// new matches for the query.
+			//
+			// Only observe when a limited number of query args are set. There
+			// are no filters for other properties, so observing will result in
+			// false positives in those queries.
+			allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent' ];
+			if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() ) {
+				this.observe( wp.Uploader.queue );
+			}
+		},
+		/**
+		 * @returns {Boolean}
+		 */
+		hasMore: function() {
+			return this._hasMore;
+		},
+		/**
+		 * @param {Object} [options={}]
+		 * @returns {Promise}
+		 */
+		more: function( options ) {
+			var query = this;
+=======
 			// We want any items that can be placed before the last
 			// item in the set. If we add any items after the last
 			// item, then we can't guarantee the set is complete.
@@ -1194,7 +2377,21 @@ Query = Attachments.extend({
 		if ( this._more && 'pending' === this._more.state() ) {
 			return this._more;
 		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// Overload the read method so Attachment.fetch() functions correctly.
+		if ( 'read' === method ) {
+||||||| .r11156
+			if ( this._more && 'pending' === this._more.state() ) {
+				return this._more;
+			}
+
+			if ( ! this.hasMore() ) {
+				return $.Deferred().resolveWith( this ).promise();
+			}
 
+=======
 		if ( ! this.hasMore() ) {
 			return jQuery.Deferred().resolveWith( this ).promise();
 		}
@@ -1220,6 +2417,7 @@ Query = Attachments.extend({
 	sync: function( method, model, options ) {
 		var args, fallback;
 
+>>>>>>> .r12027
 		// Overload the read method so Attachment.fetch() functions correctly.
 		if ( 'read' === method ) {
 			options = options || {};
@@ -1401,9 +2599,42 @@ Query = Attachments.extend({
 
 module.exports = Query;
 
+<<<<<<< .mine
+},{}],6:[function(require,module,exports){
+/**
+ * wp.media.model.Selection
+ *
+ * A selection of attachments.
+ *
+ * @class
+ * @augments wp.media.model.Attachments
+ * @augments Backbone.Collection
+ */
+var Attachments = wp.media.model.Attachments,
+	Selection;
+||||||| .r11156
+				// Otherwise, create a new query and add it to the cache.
+				if ( ! query ) {
+					query = new Query( [], _.extend( options || {}, {
+						props: props,
+						args:  args
+					} ) );
+					queries.push( query );
+				}
+=======
 },{}],6:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+Selection = Attachments.extend({
+||||||| .r11156
+				return query;
+			};
+		}())
+	});
 
+=======
 /**
  * wp.media.model.Selection
  *
@@ -1416,6 +2647,7 @@ module.exports = Query;
 var Attachments = wp.media.model.Attachments,
 	Selection;
 
+>>>>>>> .r12027
 Selection = Attachments.extend({
 	/**
 	 * Refresh the `single` model whenever the selection changes.
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-models.min.js b/pavillonmadeleine.fr/wp-includes/js/media-models.min.js
index b419a92a..67e1f6db 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-models.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-models.min.js
@@ -1 +1,4 @@
-!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gd?-1:1:a>b?-1:1},_.extend(e,{template:wp.template,post:wp.ajax.post,ajax:wp.ajax.send,fit:function(a){var b,c=a.width,d=a.height,e=a.maxWidth,f=a.maxHeight;return _.isUndefined(e)||_.isUndefined(f)?_.isUndefined(f)?b="width":_.isUndefined(e)&&d>f&&(b="height"):b=c/d>e/f?"width":"height","width"===b&&c>e?{width:e,height:Math.round(e*d/c)}:"height"===b&&d>f?{width:Math.round(f*c/d),height:f}:{width:c,height:d}},truncate:function(a,b,c){return b=b||30,c=c||"…",a.length<=b?a:a.substr(0,b/2)+c+a.substr(-1*b/2)}}),e.attachment=function(a){return b.get(a)},c.all=new c,e.query=function(a){return new c(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},f(window).on("unload",function(){window.wp=null})},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(a,b){var c,d=Backbone.$;c=Backbone.Model.extend({sync:function(a,b,c){return _.isUndefined(this.id)?d.Deferred().rejectWith(this).promise():"read"===a?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"get-attachment",id:this.id}),wp.media.ajax(c)):"update"===a?this.get("nonces")&&this.get("nonces").update?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"save-attachment",id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id}),b.hasChanged()&&(c.data.changes={},_.each(b.changed,function(a,b){c.data.changes[b]=this.get(b)},this)),wp.media.ajax(c)):d.Deferred().rejectWith(this).promise():"delete"===a?(c=c||{},c.wait||(this.destroyed=!0),c.context=this,c.data=_.extend(c.data||{},{action:"delete-post",id:this.id,_wpnonce:this.get("nonces")["delete"]}),wp.media.ajax(c).done(function(){this.destroyed=!0}).fail(function(){this.destroyed=!1})):Backbone.Model.prototype.sync.apply(this,arguments)},parse:function(a){return a?(a.date=new Date(a.date),a.modified=new Date(a.modified),a):a},saveCompat:function(a,b){var c=this;return this.get("nonces")&&this.get("nonces").update?wp.media.post("save-attachment-compat",_.defaults({id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id},a)).done(function(a,d,e){c.set(c.parse(a,e),b)}):d.Deferred().rejectWith(this).promise()}},{create:function(a){var b=wp.media.model.Attachments;return b.all.push(a)},get:_.memoize(function(a,b){var c=wp.media.model.Attachments;return c.all.push(b||{id:a})})}),b.exports=c},{}],3:[function(a,b){var c=Backbone.Collection.extend({model:wp.media.model.Attachment,initialize:function(a,b){b=b||{},this.props=new Backbone.Model,this.filters=b.filters||{},this.props.on("change",this._changeFilteredProps,this),this.props.on("change:order",this._changeOrder,this),this.props.on("change:orderby",this._changeOrderby,this),this.props.on("change:query",this._changeQuery,this),this.props.set(_.defaults(b.props||{})),b.observe&&this.observe(b.observe)},_changeOrder:function(){this.comparator&&this.sort()},_changeOrderby:function(a,b){this.comparator&&this.comparator!==c.comparator||(b&&"post__in"!==b?this.comparator=c.comparator:delete this.comparator)},_changeQuery:function(a,b){b?(this.props.on("change",this._requery,this),this._requery()):this.props.off("change",this._requery,this)},_changeFilteredProps:function(a){if(!this.props.get("query")){var b=_.chain(a.changed).map(function(b,d){var e=c.filters[d],f=a.get(d);if(e){if(f&&!this.filters[d])this.filters[d]=e;else{if(f||this.filters[d]!==e)return;delete this.filters[d]}return!0}},this).any().value();b&&(this._source||(this._source=new c(this.models)),this.reset(this._source.filter(this.validator,this)))}},validateDestroyed:!1,validator:function(a){return!this.validateDestroyed&&a.destroyed?!1:_.all(this.filters,function(b){return!!b.call(this,a)},this)},validate:function(a,b){var c=this.validator(a),d=!!this.get(a.cid);return!c&&d?this.remove(a,b):c&&!d&&this.add(a,b),this},validateAll:function(a,b){return b=b||{},_.each(a.models,function(a){this.validate(a,{silent:!0})},this),b.silent||this.trigger("reset",this,b),this},observe:function(a){return this.observers=this.observers||[],this.observers.push(a),a.on("add change remove",this._validateHandler,this),a.on("reset",this._validateAllHandler,this),this.validateAll(a),this},unobserve:function(a){return a?(a.off(null,null,this),this.observers=_.without(this.observers,a)):(_.each(this.observers,function(a){a.off(null,null,this)},this),delete this.observers),this},_validateHandler:function(a,b,c){return c=b===this.mirroring?c:{silent:c&&c.silent},this.validate(a,c)},_validateAllHandler:function(a,b){return this.validateAll(a,b)},mirror:function(a){return this.mirroring&&this.mirroring===a?this:(this.unmirror(),this.mirroring=a,this.reset([],{silent:!0}),this.observe(a),this)},unmirror:function(){this.mirroring&&(this.unobserve(this.mirroring),delete this.mirroring)},more:function(a){var b=jQuery.Deferred(),c=this.mirroring,d=this;return c&&c.more?(c.more(a).done(function(){this===d.mirroring&&b.resolveWith(this)}),b.promise()):b.resolveWith(this).promise()},hasMore:function(){return this.mirroring?this.mirroring.hasMore():!1},parse:function(a,b){return _.isArray(a)||(a=[a]),_.map(a,function(a){var c,d,e;return a instanceof Backbone.Model?(c=a.get("id"),a=a.attributes):c=a.id,d=wp.media.model.Attachment.get(c),e=d.parse(a,b),_.isEqual(d.attributes,e)||d.set(e),d})},_requery:function(a){var b;this.props.get("query")&&(b=this.props.toJSON(),b.cache=!0!==a,this.mirror(wp.media.model.Query.get(b)))},saveMenuOrder:function(){if("menuOrder"===this.props.get("orderby")){var a=this.chain().filter(function(a){return!_.isUndefined(a.id)}).map(function(a,b){return b+=1,a.set("menuOrder",b),[a.id,b]}).object().value();if(!_.isEmpty(a))return wp.media.post("save-attachment-order",{nonce:wp.media.model.settings.post.nonce,post_id:wp.media.model.settings.post.id,attachments:a})}}},{comparator:function(a,b,c){var d=this.props.get("orderby"),e=this.props.get("order")||"DESC",f=a.cid,g=b.cid;return a=a.get(d),b=b.get(d),("date"===d||"modified"===d)&&(a=a||new Date,b=b||new Date),c&&c.ties&&(f=g=null),"DESC"===e?wp.media.compare(a,b,f,g):wp.media.compare(b,a,g,f)},filters:{search:function(a){return this.props.get("search")?_.any(["title","filename","description","caption","name"],function(b){var c=a.get(b);return c&&-1!==c.search(this.props.get("search"))},this):!0},type:function(a){var b=this.props.get("type");return!b||-1!==b.indexOf(a.get("type"))},uploadedTo:function(a){var b=this.props.get("uploadedTo");return _.isUndefined(b)?!0:b===a.get("uploadedTo")},status:function(a){var b=this.props.get("status");return _.isUndefined(b)?!0:b===a.get("status")}}});b.exports=c},{}],4:[function(a,b){var c=Backbone.Model.extend({initialize:function(a){var b=wp.media.model.Attachment;this.attachment=!1,a.attachment_id&&(this.attachment=b.get(a.attachment_id),this.attachment.get("url")?(this.dfd=jQuery.Deferred(),this.dfd.resolve()):this.dfd=this.attachment.fetch(),this.bindAttachmentListeners()),this.on("change:link",this.updateLinkUrl,this),this.on("change:size",this.updateSize,this),this.setLinkTypeFromUrl(),this.setAspectRatio(),this.set("originalUrl",a.url)},bindAttachmentListeners:function(){this.listenTo(this.attachment,"sync",this.setLinkTypeFromUrl),this.listenTo(this.attachment,"sync",this.setAspectRatio),this.listenTo(this.attachment,"change",this.updateSize)},changeAttachment:function(a,b){this.stopListening(this.attachment),this.attachment=a,this.bindAttachmentListeners(),this.set("attachment_id",this.attachment.get("id")),this.set("caption",this.attachment.get("caption")),this.set("alt",this.attachment.get("alt")),this.set("size",b.get("size")),this.set("align",b.get("align")),this.set("link",b.get("link")),this.updateLinkUrl(),this.updateSize()},setLinkTypeFromUrl:function(){var a,b=this.get("linkUrl");return b?(a="custom",this.attachment?this.attachment.get("url")===b?a="file":this.attachment.get("link")===b&&(a="post"):this.get("url")===b&&(a="file"),void this.set("link",a)):void this.set("link","none")},updateLinkUrl:function(){var a,b=this.get("link");switch(b){case"file":a=this.attachment?this.attachment.get("url"):this.get("url"),this.set("linkUrl",a);break;case"post":this.set("linkUrl",this.attachment.get("link"));break;case"none":this.set("linkUrl","")}},updateSize:function(){var a;if(this.attachment){if("custom"===this.get("size"))return this.set("width",this.get("customWidth")),this.set("height",this.get("customHeight")),void this.set("url",this.get("originalUrl"));a=this.attachment.get("sizes")[this.get("size")],a&&(this.set("url",a.url),this.set("width",a.width),this.set("height",a.height))}},setAspectRatio:function(){var a;return this.attachment&&this.attachment.get("sizes")&&(a=this.attachment.get("sizes").full)?void this.set("aspectRatio",a.width/a.height):void this.set("aspectRatio",this.get("customWidth")/this.get("customHeight"))}});b.exports=c},{}],5:[function(a,b){var c,d=wp.media.model.Attachments;c=d.extend({initialize:function(a,b){var c;b=b||{},d.prototype.initialize.apply(this,arguments),this.args=b.args,this._hasMore=!0,this.created=new Date,this.filters.order=function(a){var b=this.props.get("orderby"),c=this.props.get("order");return this.comparator?this.length?1!==this.comparator(a,this.last(),{ties:!0}):"DESC"!==c||"date"!==b&&"modified"!==b?"ASC"===c&&"menuOrder"===b?0===a.get(b):!1:a.get(b)>=this.created:!0},c=["s","order","orderby","posts_per_page","post_mime_type","post_parent"],wp.Uploader&&_(this.args).chain().keys().difference(c).isEmpty().value()&&this.observe(wp.Uploader.queue)},hasMore:function(){return this._hasMore},more:function(a){var b=this;return this._more&&"pending"===this._more.state()?this._more:this.hasMore()?(a=a||{},a.remove=!1,this._more=this.fetch(a).done(function(a){(_.isEmpty(a)||-1===this.args.posts_per_page||a.lengthd?-1:1:a>b?-1:1},_.extend(g,{template:wp.template,post:wp.ajax.post,ajax:wp.ajax.send,fit:function(a){var b,c=a.width,d=a.height,e=a.maxWidth,f=a.maxHeight;return _.isUndefined(e)||_.isUndefined(f)?_.isUndefined(f)?b="width":_.isUndefined(e)&&d>f&&(b="height"):b=c/d>e/f?"width":"height","width"===b&&c>e?{width:e,height:Math.round(e*d/c)}:"height"===b&&d>f?{width:Math.round(f*c/d),height:f}:{width:c,height:d}},truncate:function(a,b,c){return b=b||30,c=c||"…",a.length<=b?a:a.substr(0,b/2)+c+a.substr(-1*b/2)}}),g.attachment=function(a){return d.get(a)},e.all=new e,g.query=function(a){return new e(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},h(window).on("unload",function(){window.wp=null})},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(a,b,c){var d,e=Backbone.$;d=Backbone.Model.extend({sync:function(a,b,c){return _.isUndefined(this.id)?e.Deferred().rejectWith(this).promise():"read"===a?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"get-attachment",id:this.id}),wp.media.ajax(c)):"update"===a?this.get("nonces")&&this.get("nonces").update?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"save-attachment",id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id}),b.hasChanged()&&(c.data.changes={},_.each(b.changed,function(a,b){c.data.changes[b]=this.get(b)},this)),wp.media.ajax(c)):e.Deferred().rejectWith(this).promise():"delete"===a?(c=c||{},c.wait||(this.destroyed=!0),c.context=this,c.data=_.extend(c.data||{},{action:"delete-post",id:this.id,_wpnonce:this.get("nonces")["delete"]}),wp.media.ajax(c).done(function(){this.destroyed=!0}).fail(function(){this.destroyed=!1})):Backbone.Model.prototype.sync.apply(this,arguments)},parse:function(a){return a?(a.date=new Date(a.date),a.modified=new Date(a.modified),a):a},saveCompat:function(a,b){var c=this;return this.get("nonces")&&this.get("nonces").update?wp.media.post("save-attachment-compat",_.defaults({id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id},a)).done(function(a,d,e){c.set(c.parse(a,e),b)}):e.Deferred().rejectWith(this).promise()}},{create:function(a){var b=wp.media.model.Attachments;return b.all.push(a)},get:_.memoize(function(a,b){var c=wp.media.model.Attachments;return c.all.push(b||{id:a})})}),b.exports=d},{}],3:[function(a,b,c){var d=Backbone.Collection.extend({model:wp.media.model.Attachment,initialize:function(a,b){b=b||{},this.props=new Backbone.Model,this.filters=b.filters||{},this.props.on("change",this._changeFilteredProps,this),this.props.on("change:order",this._changeOrder,this),this.props.on("change:orderby",this._changeOrderby,this),this.props.on("change:query",this._changeQuery,this),this.props.set(_.defaults(b.props||{})),b.observe&&this.observe(b.observe)},_changeOrder:function(){this.comparator&&this.sort()},_changeOrderby:function(a,b){this.comparator&&this.comparator!==d.comparator||(b&&"post__in"!==b?this.comparator=d.comparator:delete this.comparator)},_changeQuery:function(a,b){b?(this.props.on("change",this._requery,this),this._requery()):this.props.off("change",this._requery,this)},_changeFilteredProps:function(a){if(!this.props.get("query")){var b=_.chain(a.changed).map(function(b,c){var e=d.filters[c],f=a.get(c);if(e){if(f&&!this.filters[c])this.filters[c]=e;else{if(f||this.filters[c]!==e)return;delete this.filters[c]}return!0}},this).any().value();b&&(this._source||(this._source=new d(this.models)),this.reset(this._source.filter(this.validator,this)))}},validateDestroyed:!1,validator:function(a){return!this.validateDestroyed&&a.destroyed?!1:_.all(this.filters,function(b){return!!b.call(this,a)},this)},validate:function(a,b){var c=this.validator(a),d=!!this.get(a.cid);return!c&&d?this.remove(a,b):c&&!d&&this.add(a,b),this},validateAll:function(a,b){return b=b||{},_.each(a.models,function(a){this.validate(a,{silent:!0})},this),b.silent||this.trigger("reset",this,b),this},observe:function(a){return this.observers=this.observers||[],this.observers.push(a),a.on("add change remove",this._validateHandler,this),a.on("reset",this._validateAllHandler,this),this.validateAll(a),this},unobserve:function(a){return a?(a.off(null,null,this),this.observers=_.without(this.observers,a)):(_.each(this.observers,function(a){a.off(null,null,this)},this),delete this.observers),this},_validateHandler:function(a,b,c){return c=b===this.mirroring?c:{silent:c&&c.silent},this.validate(a,c)},_validateAllHandler:function(a,b){return this.validateAll(a,b)},mirror:function(a){return this.mirroring&&this.mirroring===a?this:(this.unmirror(),this.mirroring=a,this.reset([],{silent:!0}),this.observe(a),this)},unmirror:function(){this.mirroring&&(this.unobserve(this.mirroring),delete this.mirroring)},more:function(a){var b=jQuery.Deferred(),c=this.mirroring,d=this;return c&&c.more?(c.more(a).done(function(){this===d.mirroring&&b.resolveWith(this)}),b.promise()):b.resolveWith(this).promise()},hasMore:function(){return this.mirroring?this.mirroring.hasMore():!1},parse:function(a,b){return _.isArray(a)||(a=[a]),_.map(a,function(a){var c,d,e;return a instanceof Backbone.Model?(c=a.get("id"),a=a.attributes):c=a.id,d=wp.media.model.Attachment.get(c),e=d.parse(a,b),_.isEqual(d.attributes,e)||d.set(e),d})},_requery:function(a){var b;this.props.get("query")&&(b=this.props.toJSON(),b.cache=!0!==a,this.mirror(wp.media.model.Query.get(b)))},saveMenuOrder:function(){if("menuOrder"===this.props.get("orderby")){var a=this.chain().filter(function(a){return!_.isUndefined(a.id)}).map(function(a,b){return b+=1,a.set("menuOrder",b),[a.id,b]}).object().value();if(!_.isEmpty(a))return wp.media.post("save-attachment-order",{nonce:wp.media.model.settings.post.nonce,post_id:wp.media.model.settings.post.id,attachments:a})}}},{comparator:function(a,b,c){var d=this.props.get("orderby"),e=this.props.get("order")||"DESC",f=a.cid,g=b.cid;return a=a.get(d),b=b.get(d),("date"===d||"modified"===d)&&(a=a||new Date,b=b||new Date),c&&c.ties&&(f=g=null),"DESC"===e?wp.media.compare(a,b,f,g):wp.media.compare(b,a,g,f)},filters:{search:function(a){return this.props.get("search")?_.any(["title","filename","description","caption","name"],function(b){var c=a.get(b);return c&&-1!==c.search(this.props.get("search"))},this):!0},type:function(a){var b,c,d=this.props.get("type"),e=a.toJSON();return!d||_.isArray(d)&&!d.length?!0:(b=e.mime||e.file&&e.file.type||"",c=_.isArray(d)?_.find(d,function(a){return-1!==b.indexOf(a)}):-1!==b.indexOf(d))},uploadedTo:function(a){var b=this.props.get("uploadedTo");return _.isUndefined(b)?!0:b===a.get("uploadedTo")},status:function(a){var b=this.props.get("status");return _.isUndefined(b)?!0:b===a.get("status")}}});b.exports=d},{}],4:[function(a,b,c){var d=Backbone.Model.extend({initialize:function(a){var b=wp.media.model.Attachment;this.attachment=!1,a.attachment_id&&(this.attachment=b.get(a.attachment_id),this.attachment.get("url")?(this.dfd=jQuery.Deferred(),this.dfd.resolve()):this.dfd=this.attachment.fetch(),this.bindAttachmentListeners()),this.on("change:link",this.updateLinkUrl,this),this.on("change:size",this.updateSize,this),this.setLinkTypeFromUrl(),this.setAspectRatio(),this.set("originalUrl",a.url)},bindAttachmentListeners:function(){this.listenTo(this.attachment,"sync",this.setLinkTypeFromUrl),this.listenTo(this.attachment,"sync",this.setAspectRatio),this.listenTo(this.attachment,"change",this.updateSize)},changeAttachment:function(a,b){this.stopListening(this.attachment),this.attachment=a,this.bindAttachmentListeners(),this.set("attachment_id",this.attachment.get("id")),this.set("caption",this.attachment.get("caption")),this.set("alt",this.attachment.get("alt")),this.set("size",b.get("size")),this.set("align",b.get("align")),this.set("link",b.get("link")),this.updateLinkUrl(),this.updateSize()},setLinkTypeFromUrl:function(){var a,b=this.get("linkUrl");return b?(a="custom",this.attachment?this.attachment.get("url")===b?a="file":this.attachment.get("link")===b&&(a="post"):this.get("url")===b&&(a="file"),void this.set("link",a)):void this.set("link","none")},updateLinkUrl:function(){var a,b=this.get("link");switch(b){case"file":a=this.attachment?this.attachment.get("url"):this.get("url"),this.set("linkUrl",a);break;case"post":this.set("linkUrl",this.attachment.get("link"));break;case"none":this.set("linkUrl","")}},updateSize:function(){var a;if(this.attachment){if("custom"===this.get("size"))return this.set("width",this.get("customWidth")),this.set("height",this.get("customHeight")),void this.set("url",this.get("originalUrl"));a=this.attachment.get("sizes")[this.get("size")],a&&(this.set("url",a.url),this.set("width",a.width),this.set("height",a.height))}},setAspectRatio:function(){var a;return this.attachment&&this.attachment.get("sizes")&&(a=this.attachment.get("sizes").full)?void this.set("aspectRatio",a.width/a.height):void this.set("aspectRatio",this.get("customWidth")/this.get("customHeight"))}});b.exports=d},{}],5:[function(a,b,c){var d,e=wp.media.model.Attachments;d=e.extend({initialize:function(a,b){var c;b=b||{},e.prototype.initialize.apply(this,arguments),this.args=b.args,this._hasMore=!0,this.created=new Date,this.filters.order=function(a){var b=this.props.get("orderby"),c=this.props.get("order");return this.comparator?this.length?1!==this.comparator(a,this.last(),{ties:!0}):"DESC"!==c||"date"!==b&&"modified"!==b?"ASC"===c&&"menuOrder"===b?0===a.get(b):!1:a.get(b)>=this.created:!0},c=["s","order","orderby","posts_per_page","post_mime_type","post_parent"],wp.Uploader&&_(this.args).chain().keys().difference(c).isEmpty().value()&&this.observe(wp.Uploader.queue)},hasMore:function(){return this._hasMore},more:function(a){var b=this;return this._more&&"pending"===this._more.state()?this._more:this.hasMore()?(a=a||{},a.remove=!1,this._more=this.fetch(a).done(function(a){(_.isEmpty(a)||-1===this.args.posts_per_page||a.lengthd?-1:1:a>b?-1:1},_.extend(h,{template:wp.template,post:wp.ajax.post,ajax:wp.ajax.send,fit:function(a){var b,c=a.width,d=a.height,e=a.maxWidth,f=a.maxHeight;return _.isUndefined(e)||_.isUndefined(f)?_.isUndefined(f)?b="width":_.isUndefined(e)&&d>f&&(b="height"):b=c/d>e/f?"width":"height","width"===b&&c>e?{width:e,height:Math.round(e*d/c)}:"height"===b&&d>f?{width:Math.round(f*c/d),height:f}:{width:c,height:d}},truncate:function(a,b,c){return b=b||30,c=c||"…",a.length<=b?a:a.substr(0,b/2)+c+a.substr(-1*b/2)}}),h.attachment=function(a){return b.get(a)},b=h.model.Attachment=Backbone.Model.extend({sync:function(b,c,d){return _.isUndefined(this.id)?a.Deferred().rejectWith(this).promise():"read"===b?(d=d||{},d.context=this,d.data=_.extend(d.data||{},{action:"get-attachment",id:this.id}),h.ajax(d)):"update"===b?this.get("nonces")&&this.get("nonces").update?(d=d||{},d.context=this,d.data=_.extend(d.data||{},{action:"save-attachment",id:this.id,nonce:this.get("nonces").update,post_id:h.model.settings.post.id}),c.hasChanged()&&(d.data.changes={},_.each(c.changed,function(a,b){d.data.changes[b]=this.get(b)},this)),h.ajax(d)):a.Deferred().rejectWith(this).promise():"delete"===b?(d=d||{},d.wait||(this.destroyed=!0),d.context=this,d.data=_.extend(d.data||{},{action:"delete-post",id:this.id,_wpnonce:this.get("nonces")["delete"]}),h.ajax(d).done(function(){this.destroyed=!0}).fail(function(){this.destroyed=!1})):Backbone.Model.prototype.sync.apply(this,arguments)},parse:function(a){return a?(a.date=new Date(a.date),a.modified=new Date(a.modified),a):a},saveCompat:function(b,c){var d=this;return this.get("nonces")&&this.get("nonces").update?h.post("save-attachment-compat",_.defaults({id:this.id,nonce:this.get("nonces").update,post_id:h.model.settings.post.id},b)).done(function(a,b,e){d.set(d.parse(a,e),c)}):a.Deferred().rejectWith(this).promise()}},{create:function(a){return c.all.push(a)},get:_.memoize(function(a,b){return c.all.push(b||{id:a})})}),e=h.model.PostImage=Backbone.Model.extend({initialize:function(c){this.attachment=!1,c.attachment_id&&(this.attachment=b.get(c.attachment_id),this.attachment.get("url")?(this.dfd=a.Deferred(),this.dfd.resolve()):this.dfd=this.attachment.fetch(),this.bindAttachmentListeners()),this.on("change:link",this.updateLinkUrl,this),this.on("change:size",this.updateSize,this),this.setLinkTypeFromUrl(),this.setAspectRatio(),this.set("originalUrl",c.url)},bindAttachmentListeners:function(){this.listenTo(this.attachment,"sync",this.setLinkTypeFromUrl),this.listenTo(this.attachment,"sync",this.setAspectRatio),this.listenTo(this.attachment,"change",this.updateSize)},changeAttachment:function(a,b){this.stopListening(this.attachment),this.attachment=a,this.bindAttachmentListeners(),this.set("attachment_id",this.attachment.get("id")),this.set("caption",this.attachment.get("caption")),this.set("alt",this.attachment.get("alt")),this.set("size",b.get("size")),this.set("align",b.get("align")),this.set("link",b.get("link")),this.updateLinkUrl(),this.updateSize()},setLinkTypeFromUrl:function(){var a,b=this.get("linkUrl");return b?(a="custom",this.attachment?this.attachment.get("url")===b?a="file":this.attachment.get("link")===b&&(a="post"):this.get("url")===b&&(a="file"),void this.set("link",a)):void this.set("link","none")},updateLinkUrl:function(){var a,b=this.get("link");switch(b){case"file":a=this.attachment?this.attachment.get("url"):this.get("url"),this.set("linkUrl",a);break;case"post":this.set("linkUrl",this.attachment.get("link"));break;case"none":this.set("linkUrl","")}},updateSize:function(){var a;if(this.attachment){if("custom"===this.get("size"))return this.set("width",this.get("customWidth")),this.set("height",this.get("customHeight")),void this.set("url",this.get("originalUrl"));a=this.attachment.get("sizes")[this.get("size")],a&&(this.set("url",a.url),this.set("width",a.width),this.set("height",a.height))}},setAspectRatio:function(){var a;return this.attachment&&this.attachment.get("sizes")&&(a=this.attachment.get("sizes").full)?void this.set("aspectRatio",a.width/a.height):void this.set("aspectRatio",this.get("customWidth")/this.get("customHeight"))}}),c=h.model.Attachments=Backbone.Collection.extend({model:b,initialize:function(a,b){b=b||{},this.props=new Backbone.Model,this.filters=b.filters||{},this.props.on("change",this._changeFilteredProps,this),this.props.on("change:order",this._changeOrder,this),this.props.on("change:orderby",this._changeOrderby,this),this.props.on("change:query",this._changeQuery,this),this.props.set(_.defaults(b.props||{})),b.observe&&this.observe(b.observe)},_changeOrder:function(){this.comparator&&this.sort()},_changeOrderby:function(a,b){this.comparator&&this.comparator!==c.comparator||(b&&"post__in"!==b?this.comparator=c.comparator:delete this.comparator)},_changeQuery:function(a,b){b?(this.props.on("change",this._requery,this),this._requery()):this.props.off("change",this._requery,this)},_changeFilteredProps:function(a){if(!this.props.get("query")){var b=_.chain(a.changed).map(function(b,d){var e=c.filters[d],f=a.get(d);if(e){if(f&&!this.filters[d])this.filters[d]=e;else{if(f||this.filters[d]!==e)return;delete this.filters[d]}return!0}},this).any().value();b&&(this._source||(this._source=new c(this.models)),this.reset(this._source.filter(this.validator,this)))}},validateDestroyed:!1,validator:function(a){return!this.validateDestroyed&&a.destroyed?!1:_.all(this.filters,function(b){return!!b.call(this,a)},this)},validate:function(a,b){var c=this.validator(a),d=!!this.get(a.cid);return!c&&d?this.remove(a,b):c&&!d&&this.add(a,b),this},validateAll:function(a,b){return b=b||{},_.each(a.models,function(a){this.validate(a,{silent:!0})},this),b.silent||this.trigger("reset",this,b),this},observe:function(a){return this.observers=this.observers||[],this.observers.push(a),a.on("add change remove",this._validateHandler,this),a.on("reset",this._validateAllHandler,this),this.validateAll(a),this},unobserve:function(a){return a?(a.off(null,null,this),this.observers=_.without(this.observers,a)):(_.each(this.observers,function(a){a.off(null,null,this)},this),delete this.observers),this},_validateHandler:function(a,b,c){return c=b===this.mirroring?c:{silent:c&&c.silent},this.validate(a,c)},_validateAllHandler:function(a,b){return this.validateAll(a,b)},mirror:function(a){return this.mirroring&&this.mirroring===a?this:(this.unmirror(),this.mirroring=a,this.reset([],{silent:!0}),this.observe(a),this)},unmirror:function(){this.mirroring&&(this.unobserve(this.mirroring),delete this.mirroring)},more:function(b){var c=a.Deferred(),d=this.mirroring,e=this;return d&&d.more?(d.more(b).done(function(){this===e.mirroring&&c.resolveWith(this)}),c.promise()):c.resolveWith(this).promise()},hasMore:function(){return this.mirroring?this.mirroring.hasMore():!1},parse:function(a,c){return _.isArray(a)||(a=[a]),_.map(a,function(a){var d,e,f;return a instanceof Backbone.Model?(d=a.get("id"),a=a.attributes):d=a.id,e=b.get(d),f=e.parse(a,c),_.isEqual(e.attributes,f)||e.set(f),e})},_requery:function(a){var b;this.props.get("query")&&(b=this.props.toJSON(),b.cache=!0!==a,this.mirror(d.get(b)))},saveMenuOrder:function(){if("menuOrder"===this.props.get("orderby")){var a=this.chain().filter(function(a){return!_.isUndefined(a.id)}).map(function(a,b){return b+=1,a.set("menuOrder",b),[a.id,b]}).object().value();if(!_.isEmpty(a))return h.post("save-attachment-order",{nonce:h.model.settings.post.nonce,post_id:h.model.settings.post.id,attachments:a})}}},{comparator:function(a,b,c){var d=this.props.get("orderby"),e=this.props.get("order")||"DESC",g=a.cid,h=b.cid;return a=a.get(d),b=b.get(d),("date"===d||"modified"===d)&&(a=a||new Date,b=b||new Date),c&&c.ties&&(g=h=null),"DESC"===e?f(a,b,g,h):f(b,a,h,g)},filters:{search:function(a){return this.props.get("search")?_.any(["title","filename","description","caption","name"],function(b){var c=a.get(b);return c&&-1!==c.search(this.props.get("search"))},this):!0},type:function(a){var b=this.props.get("type");return!b||-1!==b.indexOf(a.get("type"))},uploadedTo:function(a){var b=this.props.get("uploadedTo");return _.isUndefined(b)?!0:b===a.get("uploadedTo")},status:function(a){var b=this.props.get("status");return _.isUndefined(b)?!0:b===a.get("status")}}}),c.all=new c,h.query=function(a){return new c(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},d=h.model.Query=c.extend({initialize:function(a,b){var d;b=b||{},c.prototype.initialize.apply(this,arguments),this.args=b.args,this._hasMore=!0,this.created=new Date,this.filters.order=function(a){var b=this.props.get("orderby"),c=this.props.get("order");return this.comparator?this.length?1!==this.comparator(a,this.last(),{ties:!0}):"DESC"!==c||"date"!==b&&"modified"!==b?"ASC"===c&&"menuOrder"===b?0===a.get(b):!1:a.get(b)>=this.created:!0},d=["s","order","orderby","posts_per_page","post_mime_type","post_parent"],wp.Uploader&&_(this.args).chain().keys().difference(d).isEmpty().value()&&this.observe(wp.Uploader.queue)},hasMore:function(){return this._hasMore},more:function(b){var c=this;return this._more&&"pending"===this._more.state()?this._more:this.hasMore()?(b=b||{},b.remove=!1,this._more=this.fetch(b).done(function(a){(_.isEmpty(a)||-1===this.args.posts_per_page||a.lengthd?-1:1:a>b?-1:1},_.extend(e,{template:wp.template,post:wp.ajax.post,ajax:wp.ajax.send,fit:function(a){var b,c=a.width,d=a.height,e=a.maxWidth,f=a.maxHeight;return _.isUndefined(e)||_.isUndefined(f)?_.isUndefined(f)?b="width":_.isUndefined(e)&&d>f&&(b="height"):b=c/d>e/f?"width":"height","width"===b&&c>e?{width:e,height:Math.round(e*d/c)}:"height"===b&&d>f?{width:Math.round(f*c/d),height:f}:{width:c,height:d}},truncate:function(a,b,c){return b=b||30,c=c||"…",a.length<=b?a:a.substr(0,b/2)+c+a.substr(-1*b/2)}}),e.attachment=function(a){return b.get(a)},c.all=new c,e.query=function(a){return new c(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},f(window).on("unload",function(){window.wp=null})},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(a,b){var c,d=Backbone.$;c=Backbone.Model.extend({sync:function(a,b,c){return _.isUndefined(this.id)?d.Deferred().rejectWith(this).promise():"read"===a?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"get-attachment",id:this.id}),wp.media.ajax(c)):"update"===a?this.get("nonces")&&this.get("nonces").update?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"save-attachment",id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id}),b.hasChanged()&&(c.data.changes={},_.each(b.changed,function(a,b){c.data.changes[b]=this.get(b)},this)),wp.media.ajax(c)):d.Deferred().rejectWith(this).promise():"delete"===a?(c=c||{},c.wait||(this.destroyed=!0),c.context=this,c.data=_.extend(c.data||{},{action:"delete-post",id:this.id,_wpnonce:this.get("nonces")["delete"]}),wp.media.ajax(c).done(function(){this.destroyed=!0}).fail(function(){this.destroyed=!1})):Backbone.Model.prototype.sync.apply(this,arguments)},parse:function(a){return a?(a.date=new Date(a.date),a.modified=new Date(a.modified),a):a},saveCompat:function(a,b){var c=this;return this.get("nonces")&&this.get("nonces").update?wp.media.post("save-attachment-compat",_.defaults({id:this.id,nonce:this.get("nonces").update,post_id:wp.media.model.settings.post.id},a)).done(function(a,d,e){c.set(c.parse(a,e),b)}):d.Deferred().rejectWith(this).promise()}},{create:function(a){var b=wp.media.model.Attachments;return b.all.push(a)},get:_.memoize(function(a,b){var c=wp.media.model.Attachments;return c.all.push(b||{id:a})})}),b.exports=c},{}],3:[function(a,b){var c=Backbone.Collection.extend({model:wp.media.model.Attachment,initialize:function(a,b){b=b||{},this.props=new Backbone.Model,this.filters=b.filters||{},this.props.on("change",this._changeFilteredProps,this),this.props.on("change:order",this._changeOrder,this),this.props.on("change:orderby",this._changeOrderby,this),this.props.on("change:query",this._changeQuery,this),this.props.set(_.defaults(b.props||{})),b.observe&&this.observe(b.observe)},_changeOrder:function(){this.comparator&&this.sort()},_changeOrderby:function(a,b){this.comparator&&this.comparator!==c.comparator||(b&&"post__in"!==b?this.comparator=c.comparator:delete this.comparator)},_changeQuery:function(a,b){b?(this.props.on("change",this._requery,this),this._requery()):this.props.off("change",this._requery,this)},_changeFilteredProps:function(a){if(!this.props.get("query")){var b=_.chain(a.changed).map(function(b,d){var e=c.filters[d],f=a.get(d);if(e){if(f&&!this.filters[d])this.filters[d]=e;else{if(f||this.filters[d]!==e)return;delete this.filters[d]}return!0}},this).any().value();b&&(this._source||(this._source=new c(this.models)),this.reset(this._source.filter(this.validator,this)))}},validateDestroyed:!1,validator:function(a){return!this.validateDestroyed&&a.destroyed?!1:_.all(this.filters,function(b){return!!b.call(this,a)},this)},validate:function(a,b){var c=this.validator(a),d=!!this.get(a.cid);return!c&&d?this.remove(a,b):c&&!d&&this.add(a,b),this},validateAll:function(a,b){return b=b||{},_.each(a.models,function(a){this.validate(a,{silent:!0})},this),b.silent||this.trigger("reset",this,b),this},observe:function(a){return this.observers=this.observers||[],this.observers.push(a),a.on("add change remove",this._validateHandler,this),a.on("reset",this._validateAllHandler,this),this.validateAll(a),this},unobserve:function(a){return a?(a.off(null,null,this),this.observers=_.without(this.observers,a)):(_.each(this.observers,function(a){a.off(null,null,this)},this),delete this.observers),this},_validateHandler:function(a,b,c){return c=b===this.mirroring?c:{silent:c&&c.silent},this.validate(a,c)},_validateAllHandler:function(a,b){return this.validateAll(a,b)},mirror:function(a){return this.mirroring&&this.mirroring===a?this:(this.unmirror(),this.mirroring=a,this.reset([],{silent:!0}),this.observe(a),this)},unmirror:function(){this.mirroring&&(this.unobserve(this.mirroring),delete this.mirroring)},more:function(a){var b=jQuery.Deferred(),c=this.mirroring,d=this;return c&&c.more?(c.more(a).done(function(){this===d.mirroring&&b.resolveWith(this)}),b.promise()):b.resolveWith(this).promise()},hasMore:function(){return this.mirroring?this.mirroring.hasMore():!1},parse:function(a,b){return _.isArray(a)||(a=[a]),_.map(a,function(a){var c,d,e;return a instanceof Backbone.Model?(c=a.get("id"),a=a.attributes):c=a.id,d=wp.media.model.Attachment.get(c),e=d.parse(a,b),_.isEqual(d.attributes,e)||d.set(e),d})},_requery:function(a){var b;this.props.get("query")&&(b=this.props.toJSON(),b.cache=!0!==a,this.mirror(wp.media.model.Query.get(b)))},saveMenuOrder:function(){if("menuOrder"===this.props.get("orderby")){var a=this.chain().filter(function(a){return!_.isUndefined(a.id)}).map(function(a,b){return b+=1,a.set("menuOrder",b),[a.id,b]}).object().value();if(!_.isEmpty(a))return wp.media.post("save-attachment-order",{nonce:wp.media.model.settings.post.nonce,post_id:wp.media.model.settings.post.id,attachments:a})}}},{comparator:function(a,b,c){var d=this.props.get("orderby"),e=this.props.get("order")||"DESC",f=a.cid,g=b.cid;return a=a.get(d),b=b.get(d),("date"===d||"modified"===d)&&(a=a||new Date,b=b||new Date),c&&c.ties&&(f=g=null),"DESC"===e?wp.media.compare(a,b,f,g):wp.media.compare(b,a,g,f)},filters:{search:function(a){return this.props.get("search")?_.any(["title","filename","description","caption","name"],function(b){var c=a.get(b);return c&&-1!==c.search(this.props.get("search"))},this):!0},type:function(a){var b=this.props.get("type");return!b||-1!==b.indexOf(a.get("type"))},uploadedTo:function(a){var b=this.props.get("uploadedTo");return _.isUndefined(b)?!0:b===a.get("uploadedTo")},status:function(a){var b=this.props.get("status");return _.isUndefined(b)?!0:b===a.get("status")}}});b.exports=c},{}],4:[function(a,b){var c=Backbone.Model.extend({initialize:function(a){var b=wp.media.model.Attachment;this.attachment=!1,a.attachment_id&&(this.attachment=b.get(a.attachment_id),this.attachment.get("url")?(this.dfd=jQuery.Deferred(),this.dfd.resolve()):this.dfd=this.attachment.fetch(),this.bindAttachmentListeners()),this.on("change:link",this.updateLinkUrl,this),this.on("change:size",this.updateSize,this),this.setLinkTypeFromUrl(),this.setAspectRatio(),this.set("originalUrl",a.url)},bindAttachmentListeners:function(){this.listenTo(this.attachment,"sync",this.setLinkTypeFromUrl),this.listenTo(this.attachment,"sync",this.setAspectRatio),this.listenTo(this.attachment,"change",this.updateSize)},changeAttachment:function(a,b){this.stopListening(this.attachment),this.attachment=a,this.bindAttachmentListeners(),this.set("attachment_id",this.attachment.get("id")),this.set("caption",this.attachment.get("caption")),this.set("alt",this.attachment.get("alt")),this.set("size",b.get("size")),this.set("align",b.get("align")),this.set("link",b.get("link")),this.updateLinkUrl(),this.updateSize()},setLinkTypeFromUrl:function(){var a,b=this.get("linkUrl");return b?(a="custom",this.attachment?this.attachment.get("url")===b?a="file":this.attachment.get("link")===b&&(a="post"):this.get("url")===b&&(a="file"),void this.set("link",a)):void this.set("link","none")},updateLinkUrl:function(){var a,b=this.get("link");switch(b){case"file":a=this.attachment?this.attachment.get("url"):this.get("url"),this.set("linkUrl",a);break;case"post":this.set("linkUrl",this.attachment.get("link"));break;case"none":this.set("linkUrl","")}},updateSize:function(){var a;if(this.attachment){if("custom"===this.get("size"))return this.set("width",this.get("customWidth")),this.set("height",this.get("customHeight")),void this.set("url",this.get("originalUrl"));a=this.attachment.get("sizes")[this.get("size")],a&&(this.set("url",a.url),this.set("width",a.width),this.set("height",a.height))}},setAspectRatio:function(){var a;return this.attachment&&this.attachment.get("sizes")&&(a=this.attachment.get("sizes").full)?void this.set("aspectRatio",a.width/a.height):void this.set("aspectRatio",this.get("customWidth")/this.get("customHeight"))}});b.exports=c},{}],5:[function(a,b){var c,d=wp.media.model.Attachments;c=d.extend({initialize:function(a,b){var c;b=b||{},d.prototype.initialize.apply(this,arguments),this.args=b.args,this._hasMore=!0,this.created=new Date,this.filters.order=function(a){var b=this.props.get("orderby"),c=this.props.get("order");return this.comparator?this.length?1!==this.comparator(a,this.last(),{ties:!0}):"DESC"!==c||"date"!==b&&"modified"!==b?"ASC"===c&&"menuOrder"===b?0===a.get(b):!1:a.get(b)>=this.created:!0},c=["s","order","orderby","posts_per_page","post_mime_type","post_parent"],wp.Uploader&&_(this.args).chain().keys().difference(c).isEmpty().value()&&this.observe(wp.Uploader.queue)},hasMore:function(){return this._hasMore},more:function(a){var b=this;return this._more&&"pending"===this._more.state()?this._more:this.hasMore()?(a=a||{},a.remove=!1,this._more=this.fetch(a).done(function(a){(_.isEmpty(a)||-1===this.args.posts_per_page||a.length>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-views.js b/pavillonmadeleine.fr/wp-includes/js/media-views.js
index 605459f4..a4ef04fb 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-views.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-views.js
@@ -1,6 +1,63 @@
+<<<<<<< .mine
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o>>>>>> .r12027
 
+<<<<<<< .mine
+CollectionAdd = Library.extend({
+	defaults: _.defaults( {
+		// Selection defaults. @see media.model.Selection
+		multiple:      'add',
+		// Attachments browser defaults. @see media.view.AttachmentsBrowser
+		filterable:    'uploaded',
+||||||| .r11156
+	// Link any localized strings.
+	l10n = media.view.l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
+=======
 /**
  * wp.media.controller.CollectionAdd
  *
@@ -37,31 +94,93 @@
 var Selection = wp.media.model.Selection,
 	Library = wp.media.controller.Library,
 	CollectionAdd;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		priority:      100,
+		syncSelection: false
+	}, Library.prototype.defaults ),
+||||||| .r11156
+	// Link any settings.
+	media.view.settings = l10n.settings || {};
+	delete l10n.settings;
+=======
 CollectionAdd = Library.extend({
 	defaults: _.defaults( {
 		// Selection defaults. @see media.model.Selection
 		multiple:      'add',
 		// Attachments browser defaults. @see media.view.AttachmentsBrowser
 		filterable:    'uploaded',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 */
+	initialize: function() {
+		var collectionType = this.get('collectionType');
+||||||| .r11156
+	// Copy the `post` setting over to the model settings.
+	media.model.settings.post = media.view.settings.post;
+=======
 		priority:      100,
 		syncSelection: false
 	}, Library.prototype.defaults ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( 'video' === this.get( 'type' ) ) {
+			collectionType = 'video-' + collectionType;
+		}
+||||||| .r11156
+	// Check if the browser supports CSS 3.0 transitions
+	$.support.transition = (function(){
+		var style = document.documentElement.style,
+			transitions = {
+				WebkitTransition: 'webkitTransitionEnd',
+				MozTransition:    'transitionend',
+				OTransition:      'oTransitionEnd otransitionend',
+				transition:       'transitionend'
+			}, transition;
+=======
 	/**
 	 * @since 3.9.0
 	 */
 	initialize: function() {
 		var collectionType = this.get('collectionType');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.set( 'id', collectionType + '-library' );
+		this.set( 'toolbar', collectionType + '-add' );
+		this.set( 'menu', collectionType );
+||||||| .r11156
+		transition = _.find( _.keys( transitions ), function( transition ) {
+			return ! _.isUndefined( style[ transition ] );
+		});
+=======
 		if ( 'video' === this.get( 'type' ) ) {
 			collectionType = 'video-' + collectionType;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If we haven't been provided a `library`, create a `Selection`.
+		if ( ! this.get('library') ) {
+			this.set( 'library', wp.media.query({ type: this.get('type') }) );
+		}
+		Library.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+		return transition && {
+			end: transitions[ transition ]
+		};
+	}());
+=======
 		this.set( 'id', collectionType + '-library' );
 		this.set( 'toolbar', collectionType + '-add' );
 		this.set( 'menu', collectionType );
+>>>>>>> .r12027
 
 		// If we haven't been provided a `library`, create a `Selection`.
 		if ( ! this.get('library') ) {
@@ -78,6 +197,89 @@ CollectionAdd = Library.extend({
 			editLibrary = this.get('editLibrary'),
 			edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
 
+<<<<<<< .mine
+		if ( editLibrary && editLibrary !== edit ) {
+			library.unobserve( editLibrary );
+		}
+
+		// Accepts attachments that exist in the original library and
+		// that do not exist in gallery's library.
+		library.validator = function( attachment ) {
+			return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
+		};
+
+		// Reset the library to ensure that all attachments are re-added
+		// to the collection. Do so silently, as calling `observe` will
+		// trigger the `reset` event.
+		library.reset( library.mirroring.models, { silent: true });
+		library.observe( edit );
+		this.set('editLibrary', edit);
+
+		Library.prototype.activate.apply( this, arguments );
+	}
+});
+
+module.exports = CollectionAdd;
+
+},{}],2:[function(require,module,exports){
+/**
+ * wp.media.controller.CollectionEdit
+ *
+ * A state for editing a collection, which is used by audio and video playlists,
+ * and can be used for other collections.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                      The attributes hash passed to the state.
+ * @param {string}                     attributes.title                  Title for the state. Displays in the media menu and the frame's title region.
+ * @param {wp.media.model.Attachments} [attributes.library]              The attachments collection to edit.
+ *                                                                       If one is not supplied, an empty media.model.Selection collection is created.
+ * @param {boolean}                    [attributes.multiple=false]       Whether multi-select is enabled.
+ * @param {string}                     [attributes.content=browse]       Initial mode for the content region.
+ * @param {string}                     attributes.menu                   Initial mode for the menu region. @todo this needs a better explanation.
+ * @param {boolean}                    [attributes.searchable=false]     Whether the library is searchable.
+ * @param {boolean}                    [attributes.sortable=true]        Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.date=true]            Whether to show the date filter in the browser's toolbar.
+ * @param {boolean}                    [attributes.describe=true]        Whether to offer UI to describe the attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.dragInfo=true]        Whether to show instructional text about the attachments being sortable.
+ * @param {boolean}                    [attributes.dragInfoText]         Instructional text about the attachments being sortable.
+ * @param {int}                        [attributes.idealColumnWidth=170] The ideal column width in pixels for attachments.
+ * @param {boolean}                    [attributes.editing=false]        Whether the gallery is being created, or editing an existing instance.
+ * @param {int}                        [attributes.priority=60]          The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.syncSelection=false]  Whether the Attachments selection should be persisted from the last state.
+ *                                                                       Defaults to false for this state, because the library passed in  *is* the selection.
+ * @param {view}                       [attributes.SettingsView]         The view to edit the collection instance settings (e.g. Playlist settings with "Show tracklist" checkbox).
+ * @param {view}                       [attributes.AttachmentView]       The single `Attachment` view to be used in the `Attachments`.
+ *                                                                       If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
+ * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
+ * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
+ */
+var Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	$ = jQuery,
+	CollectionEdit;
+
+CollectionEdit = Library.extend({
+	defaults: {
+		multiple:         false,
+		sortable:         true,
+		date:             false,
+		searchable:       false,
+		content:          'browse',
+		describe:         true,
+		dragInfo:         true,
+		idealColumnWidth: 170,
+		editing:          false,
+		priority:         60,
+		SettingsView:     false,
+		syncSelection:    false
+	},
+
+||||||| .r11156
+=======
 		if ( editLibrary && editLibrary !== edit ) {
 			library.unobserve( editLibrary );
 		}
@@ -160,6 +362,7 @@ CollectionEdit = Library.extend({
 		syncSelection:    false
 	},
 
+>>>>>>> .r12027
 	/**
 	 * @since 3.9.0
 	 */
@@ -265,9 +468,60 @@ CollectionEdit = Library.extend({
 
 module.exports = CollectionEdit;
 
+<<<<<<< .mine
+},{}],3:[function(require,module,exports){
+/**
+ * wp.media.controller.Cropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var l10n = wp.media.view.l10n,
+	Cropper;
+||||||| .r11156
+			/**
+			 * Create region view event.
+			 *
+			 * Region view creation takes place in an event callback on the frame.
+			 *
+			 * @event this.view#{this.id}:create:{this._mode}
+			 * @event this.view#{this.id}:create
+			 */
+			this.trigger( 'create', set );
+			view = set.view;
+=======
 },{}],3:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Cropper = wp.media.controller.State.extend({
+	defaults: {
+		id:          'cropper',
+		title:       l10n.cropImage,
+		// Region mode defaults.
+		toolbar:     'crop',
+		content:     'crop',
+		router:      false,
+||||||| .r11156
+			/**
+			 * Render region view event.
+			 *
+			 * Region view creation takes place in an event callback on the frame.
+			 *
+			 * @event this.view#{this.id}:create:{this._mode}
+			 * @event this.view#{this.id}:create
+			 */
+			this.trigger( 'render', view );
+			if ( view ) {
+				this.set( view );
+			}
+			return this;
+		},
+=======
 /**
  * wp.media.controller.Cropper
  *
@@ -279,7 +533,21 @@ module.exports = CollectionEdit;
  */
 var l10n = wp.media.view.l10n,
 	Cropper;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		canSkipCrop: false
+	},
+||||||| .r11156
+		/**
+		 * Get the region's view.
+		 *
+		 * @returns {wp.media.View}
+		 */
+		get: function() {
+			return this.view.views.first( this.selector );
+		},
+=======
 Cropper = wp.media.controller.State.extend({
 	defaults: {
 		id:          'cropper',
@@ -288,7 +556,29 @@ Cropper = wp.media.controller.State.extend({
 		toolbar:     'crop',
 		content:     'crop',
 		router:      false,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	activate: function() {
+		this.frame.on( 'content:create:crop', this.createCropContent, this );
+		this.frame.on( 'close', this.removeCropper, this );
+		this.set('selection', new Backbone.Collection(this.frame._selection.single));
+	},
+||||||| .r11156
+		/**
+		 * Set the region's view as a subview of the frame.
+		 *
+		 * @param {Array|Object} views
+		 * @param {Object} [options={}]
+		 * @returns {wp.Backbone.Subviews} Subviews is returned to allow chaining
+		 */
+		set: function( views, options ) {
+			if ( options ) {
+				options.add = false;
+			}
+			return this.view.views.set( this.selector, views, options );
+		},
+=======
 		canSkipCrop: false
 	},
 
@@ -351,7 +641,22 @@ Cropper = wp.media.controller.State.extend({
 				}
 			}
 		};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	deactivate: function() {
+		this.frame.toolbar.mode('browse');
+	},
+||||||| .r11156
+		/**
+		 * Trigger regional view events on the frame.
+		 *
+		 * @param {string} event
+		 * @returns {undefined|wp.media.controller.Region} Returns itself to allow chaining.
+		 */
+		trigger: function( event ) {
+			var base, args;
+=======
 		if ( canSkipCrop ) {
 			_.extend( toolbarOptions.items, {
 				skip: {
@@ -368,7 +673,21 @@ Cropper = wp.media.controller.State.extend({
 				}
 			});
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	createCropContent: function() {
+		this.cropperView = new wp.media.view.Cropper({
+			controller: this,
+			attachment: this.get('selection').first()
+		});
+		this.cropperView.on('image-loaded', this.createCropToolbar, this);
+		this.frame.content.set(this.cropperView);
+||||||| .r11156
+			if ( ! this._mode ) {
+				return;
+			}
+=======
 		this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
 	},
 
@@ -455,52 +774,215 @@ EditImage = wp.media.controller.State.extend({
 					}
 				}
 			}
+>>>>>>> .r12027
 		}) );
 	}
 });
 
+<<<<<<< .mine
+	},
+	removeCropper: function() {
+		this.imgSelect.cancelSelection();
+		this.imgSelect.setOptions({remove: true});
+		this.imgSelect.update();
+		this.cropperView.remove();
+	},
+	createCropToolbar: function() {
+		var canSkipCrop, toolbarOptions;
+||||||| .r11156
+			args = _.toArray( arguments );
+			base = this.id + ':' + event;
+=======
 module.exports = EditImage;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		canSkipCrop = this.get('canSkipCrop') || false;
+||||||| .r11156
+			// Trigger `{this.id}:{event}:{this._mode}` event on the frame.
+			args[0] = base + ':' + this._mode;
+			this.view.trigger.apply( this.view, args );
+=======
 },{}],5:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
-/**
- * wp.media.controller.Embed
- *
- * A state for embedding media from a URL.
- *
- * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object} attributes                         The attributes hash passed to the state.
- * @param {string} [attributes.id=embed]              Unique identifier.
- * @param {string} [attributes.title=Insert From URL] Title for the state. Displays in the media menu and the frame's title region.
- * @param {string} [attributes.content=embed]         Initial mode for the content region.
- * @param {string} [attributes.menu=default]          Initial mode for the menu region.
- * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
- * @param {string} [attributes.menu=false]            Initial mode for the menu region.
- * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
- * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
- * @param {string} [attributes.url]                   The embed URL.
- * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
- */
-var l10n = wp.media.view.l10n,
-	$ = Backbone.$,
-	Embed;
-
-Embed = wp.media.controller.State.extend({
-	defaults: {
-		id:       'embed',
-		title:    l10n.insertFromUrlTitle,
-		content:  'embed',
-		menu:     'default',
-		toolbar:  'main-embed',
-		priority: 120,
-		type:     'link',
-		url:      '',
-		metadata: {}
-	},
+<<<<<<< .mine
+		toolbarOptions = {
+			controller: this.frame,
+			items: {
+				insert: {
+					style:    'primary',
+					text:     l10n.cropImage,
+					priority: 80,
+					requires: { library: false, selection: false },
+
+					click: function() {
+						var controller = this.controller,
+							selection;
+
+						selection = controller.state().get('selection').first();
+						selection.set({cropDetails: controller.state().imgSelect.getSelection()});
+
+						this.$el.text(l10n.cropping);
+						this.$el.attr('disabled', true);
+
+						controller.state().doCrop( selection ).done( function( croppedImage ) {
+							controller.trigger('cropped', croppedImage );
+							controller.close();
+						}).fail( function() {
+							controller.trigger('content:error:crop');
+						});
+					}
+				}
+			}
+		};
+
+		if ( canSkipCrop ) {
+			_.extend( toolbarOptions.items, {
+				skip: {
+					style:      'secondary',
+					text:       l10n.skipCropping,
+					priority:   70,
+					requires:   { library: false, selection: false },
+					click:      function() {
+						var selection = this.controller.state().get('selection').first();
+						this.controller.state().cropperView.remove();
+						this.controller.trigger('skippedcrop', selection);
+						this.controller.close();
+					}
+				}
+			});
+		}
+||||||| .r11156
+			// Trigger `{this.id}:{event}` event on the frame.
+			args[0] = base;
+			this.view.trigger.apply( this.view, args );
+			return this;
+		}
+	});
+=======
+/**
+ * wp.media.controller.Embed
+ *
+ * A state for embedding media from a URL.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object} attributes                         The attributes hash passed to the state.
+ * @param {string} [attributes.id=embed]              Unique identifier.
+ * @param {string} [attributes.title=Insert From URL] Title for the state. Displays in the media menu and the frame's title region.
+ * @param {string} [attributes.content=embed]         Initial mode for the content region.
+ * @param {string} [attributes.menu=default]          Initial mode for the menu region.
+ * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
+ * @param {string} [attributes.menu=false]            Initial mode for the menu region.
+ * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
+ * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
+ * @param {string} [attributes.url]                   The embed URL.
+ * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
+ */
+var l10n = wp.media.view.l10n,
+	$ = Backbone.$,
+	Embed;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
+	},
+
+	doCrop: function( attachment ) {
+		return wp.ajax.post( 'custom-header-crop', {
+			nonce: attachment.get('nonces').edit,
+			id: attachment.get('id'),
+			cropDetails: attachment.get('cropDetails')
+		} );
+	}
+});
+
+module.exports = Cropper;
+
+},{}],4:[function(require,module,exports){
+/**
+ * wp.media.controller.CustomizeImageCropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Controller = wp.media.controller,
+	CustomizeImageCropper;
+
+CustomizeImageCropper = Controller.Cropper.extend({
+	doCrop: function( attachment ) {
+		var cropDetails = attachment.get( 'cropDetails' ),
+			control = this.get( 'control' );
+
+		cropDetails.dst_width  = control.params.width;
+		cropDetails.dst_height = control.params.height;
+
+		return wp.ajax.post( 'crop-image', {
+			wp_customize: 'on',
+			nonce: attachment.get( 'nonces' ).edit,
+			id: attachment.get( 'id' ),
+			context: control.id,
+			cropDetails: cropDetails
+		} );
+	}
+});
+
+module.exports = CustomizeImageCropper;
+
+},{}],5:[function(require,module,exports){
+/**
+ * wp.media.controller.EditImage
+ *
+ * A state for editing (cropping, etc.) an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                    attributes                      The attributes hash passed to the state.
+ * @param {wp.media.model.Attachment} attributes.model                The attachment.
+ * @param {string}                    [attributes.id=edit-image]      Unique identifier.
+ * @param {string}                    [attributes.title=Edit Image]   Title for the state. Displays in the media menu and the frame's title region.
+ * @param {string}                    [attributes.content=edit-image] Initial mode for the content region.
+ * @param {string}                    [attributes.toolbar=edit-image] Initial mode for the toolbar region.
+ * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
+ * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
+ */
+var l10n = wp.media.view.l10n,
+	EditImage;
+
+EditImage = wp.media.controller.State.extend({
+	defaults: {
+		id:      'edit-image',
+		title:   l10n.editImage,
+		menu:    false,
+		toolbar: 'edit-image',
+		content: 'edit-image',
+		url:     ''
+	},
+
+||||||| .r11156
+=======
+Embed = wp.media.controller.State.extend({
+	defaults: {
+		id:       'embed',
+		title:    l10n.insertFromUrlTitle,
+		content:  'embed',
+		menu:     'default',
+		toolbar:  'main-embed',
+		priority: 120,
+		type:     'link',
+		url:      '',
+		metadata: {}
+	},
 
 	// The amount of time used when debouncing the scan.
 	sensitivity: 200,
@@ -514,11 +996,34 @@ Embed = wp.media.controller.State.extend({
 		this.on( 'scan', this.scanImage, this );
 	},
 
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
+	 * @since 3.9.0
+||||||| .r11156
+	 * wp.media.controller.StateMachine
+	 *
+	 * @constructor
+	 * @augments Backbone.Model
+	 * @mixin
+	 * @mixes Backbone.Events
+	 *
+	 * @param {Array} states
+=======
 	 * Trigger a scan of the embedded URL's content for metadata required to embed.
 	 *
 	 * @fires wp.media.controller.Embed#scan
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	activate: function() {
+		this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+	},
+||||||| .r11156
+	media.controller.StateMachine = function( states ) {
+		this.states = new Backbone.Collection( states );
+	};
+=======
 	scan: function() {
 		var scanners,
 			embed = this,
@@ -526,14 +1031,54 @@ Embed = wp.media.controller.State.extend({
 				type: 'link',
 				scanners: []
 			};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 */
+	deactivate: function() {
+		this.stopListening( this.frame );
+	},
+||||||| .r11156
+	// Use Backbone's self-propagating `extend` inheritance method.
+	media.controller.StateMachine.extend = Backbone.Model.extend;
+=======
 		// Scan is triggered with the list of `attributes` to set on the
 		// state, useful for the 'type' attribute and 'scanners' attribute,
 		// an array of promise objects for asynchronous scan operations.
 		if ( this.props.get('url') ) {
 			this.trigger( 'scan', attributes );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 */
+	toolbar: function() {
+		var frame = this.frame,
+			lastState = frame.lastState(),
+			previous = lastState && lastState.id;
+||||||| .r11156
+	_.extend( media.controller.StateMachine.prototype, Backbone.Events, {
+		/**
+		 * Fetch a state.
+		 *
+		 * If no `id` is provided, returns the active state.
+		 *
+		 * Implicitly creates states.
+		 *
+		 * Ensure that the `states` collection exists so the `StateMachine`
+		 *   can be used as a mixin.
+		 *
+		 * @param {string} id
+		 * @returns {wp.media.controller.State} Returns a State model
+		 *   from the StateMachine collection
+		 */
+		state: function( id ) {
+			this.states = this.states || new Backbone.Collection();
+=======
 		if ( attributes.scanners.length ) {
 			scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
 			scanners.always( function() {
@@ -544,7 +1089,38 @@ Embed = wp.media.controller.State.extend({
 		} else {
 			attributes.scanners = null;
 		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		frame.toolbar.set( new wp.media.view.Toolbar({
+			controller: frame,
+			items: {
+				back: {
+					style: 'primary',
+					text:     l10n.back,
+					priority: 20,
+					click:    function() {
+						if ( previous ) {
+							frame.setState( previous );
+						} else {
+							frame.close();
+						}
+					}
+				}
+			}
+		}) );
+	}
+});
+||||||| .r11156
+			// Default to the active state.
+			id = id || this._state;
 
+			if ( id && ! this.states.get( id ) ) {
+				this.states.add({ id: id });
+			}
+			return this.states.get( id );
+		},
+=======
 		attributes.loading = !! attributes.scanners;
 		this.set( attributes );
 	},
@@ -561,44 +1137,214 @@ Embed = wp.media.controller.State.extend({
 			deferred = $.Deferred();
 
 		attributes.scanners.push( deferred.promise() );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = EditImage;
+||||||| .r11156
+		/**
+		 * Sets the active state.
+		 *
+		 * Bail if we're trying to select the current state, if we haven't
+		 * created the `states` collection, or are trying to select a state
+		 * that does not exist.
+		 *
+		 * @param {string} id
+		 *
+		 * @fires wp.media.controller.State#deactivate
+		 * @fires wp.media.controller.State#activate
+		 *
+		 * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining
+		 */
+		setState: function( id ) {
+			var previous = this.state();
+=======
 		// Try to load the image and find its width/height.
 		image.onload = function() {
 			deferred.resolve();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],6:[function(require,module,exports){
+/**
+ * wp.media.controller.Embed
+ *
+ * A state for embedding media from a URL.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object} attributes                         The attributes hash passed to the state.
+ * @param {string} [attributes.id=embed]              Unique identifier.
+ * @param {string} [attributes.title=Insert From URL] Title for the state. Displays in the media menu and the frame's title region.
+ * @param {string} [attributes.content=embed]         Initial mode for the content region.
+ * @param {string} [attributes.menu=default]          Initial mode for the menu region.
+ * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
+ * @param {string} [attributes.menu=false]            Initial mode for the menu region.
+ * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
+ * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
+ * @param {string} [attributes.url]                   The embed URL.
+ * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
+ */
+var l10n = wp.media.view.l10n,
+	$ = Backbone.$,
+	Embed;
+||||||| .r11156
+			if ( ( previous && id === previous.id ) || ! this.states || ! this.states.get( id ) ) {
+				return this;
+			}
+=======
 			if ( state !== frame.state() || url !== state.props.get('url') ) {
 				return;
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Embed = wp.media.controller.State.extend({
+	defaults: {
+		id:       'embed',
+		title:    l10n.insertFromUrlTitle,
+		content:  'embed',
+		menu:     'default',
+		toolbar:  'main-embed',
+		priority: 120,
+		type:     'link',
+		url:      '',
+		metadata: {}
+	},
+||||||| .r11156
+			if ( previous ) {
+				previous.trigger('deactivate');
+				this._lastState = previous.id;
+			}
+=======
 			state.set({
 				type: 'image'
 			});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	// The amount of time used when debouncing the scan.
+	sensitivity: 400,
+||||||| .r11156
+			this._state = id;
+			this.state().trigger('activate');
+=======
 			state.props.set({
 				width:  image.width,
 				height: image.height
 			});
 		};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function(options) {
+		this.metadata = options.metadata;
+		this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
+		this.props = new Backbone.Model( this.metadata || { url: '' });
+		this.props.on( 'change:url', this.debouncedScan, this );
+		this.props.on( 'change:url', this.refresh, this );
+		this.on( 'scan', this.scanImage, this );
+	},
+||||||| .r11156
+			return this;
+		},
+=======
 		image.onerror = deferred.reject;
 		image.src = url;
 	},
+>>>>>>> .r12027
 
-	refresh: function() {
-		this.frame.toolbar.get().refresh();
-	},
-
-	reset: function() {
-		this.props.clear().set({ url: '' });
-
-		if ( this.active ) {
-			this.refresh();
-		}
-	}
-});
-
+<<<<<<< .mine
+	/**
+	 * Trigger a scan of the embedded URL's content for metadata required to embed.
+	 *
+	 * @fires wp.media.controller.Embed#scan
+	 */
+	scan: function() {
+		var scanners,
+			embed = this,
+			attributes = {
+				type: 'link',
+				scanners: []
+			};
+
+		// Scan is triggered with the list of `attributes` to set on the
+		// state, useful for the 'type' attribute and 'scanners' attribute,
+		// an array of promise objects for asynchronous scan operations.
+		if ( this.props.get('url') ) {
+			this.trigger( 'scan', attributes );
+||||||| .r11156
+		/**
+		 * Returns the previous active state.
+		 *
+		 * Call the `state()` method with no parameters to retrieve the current
+		 * active state.
+		 *
+		 * @returns {wp.media.controller.State} Returns a State model
+		 *    from the StateMachine collection
+		 */
+		lastState: function() {
+			if ( this._lastState ) {
+				return this.state( this._lastState );
+			}
+=======
+	refresh: function() {
+		this.frame.toolbar.get().refresh();
+	},
+
+	reset: function() {
+		this.props.clear().set({ url: '' });
+
+		if ( this.active ) {
+			this.refresh();
+>>>>>>> .r12027
+		}
+<<<<<<< .mine
+||||||| .r11156
+	});
+=======
+	}
+});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( attributes.scanners.length ) {
+			scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
+			scanners.always( function() {
+				if ( embed.get('scanners') === scanners ) {
+					embed.set( 'loading', false );
+				}
+			});
+		} else {
+			attributes.scanners = null;
+		}
+||||||| .r11156
+	// Map all event binding and triggering on a StateMachine to its `states` collection.
+	_.each([ 'on', 'off', 'trigger' ], function( method ) {
+		/**
+		 * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining.
+		 */
+		media.controller.StateMachine.prototype[ method ] = function() {
+			// Ensure that the `states` collection exists so the `StateMachine`
+			// can be used as a mixin.
+			this.states = this.states || new Backbone.Collection();
+			// Forward the method to the `states` collection.
+			this.states[ method ].apply( this.states, arguments );
+			return this;
+		};
+	});
+=======
 module.exports = Embed;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		attributes.loading = !! attributes.scanners;
+		this.set( attributes );
+	},
+||||||| .r11156
+=======
 },{}],6:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -649,19 +1395,156 @@ FeaturedImage = Library.extend({
 		syncSelection: true
 	}, Library.prototype.defaults ),
 
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
+	 * Try scanning the embed as an image to discover its dimensions.
+	 *
+	 * @param {Object} attributes
+||||||| .r11156
+	 * wp.media.controller.State
+	 *
+	 * A state is a step in a workflow that when set will trigger the controllers
+	 * for the regions to be updated as specified in the frame. This is the base
+	 * class that the various states used in wp.media extend.
+	 *
+	 * @constructor
+	 * @augments Backbone.Model
+=======
 	 * @since 3.5.0
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	scanImage: function( attributes ) {
+		var frame = this.frame,
+			state = this,
+			url = this.props.get('url'),
+			image = new Image(),
+			deferred = $.Deferred();
+||||||| .r11156
+	media.controller.State = Backbone.Model.extend({
+		constructor: function() {
+			this.on( 'activate', this._preActivate, this );
+			this.on( 'activate', this.activate, this );
+			this.on( 'activate', this._postActivate, this );
+			this.on( 'deactivate', this._deactivate, this );
+			this.on( 'deactivate', this.deactivate, this );
+			this.on( 'reset', this.reset, this );
+			this.on( 'ready', this._ready, this );
+			this.on( 'ready', this.ready, this );
+			/**
+			 * Call parent constructor with passed arguments
+			 */
+			Backbone.Model.apply( this, arguments );
+			this.on( 'change:menu', this._updateMenu, this );
+		},
+		/**
+		 * @abstract
+		 */
+		ready: function() {},
+		/**
+		 * @abstract
+		 */
+		activate: function() {},
+		/**
+		 * @abstract
+		 */
+		deactivate: function() {},
+		/**
+		 * @abstract
+		 */
+		reset: function() {},
+		/**
+		 * @access private
+		 */
+		_ready: function() {
+			this._updateMenu();
+		},
+		/**
+		 * @access private
+		*/
+		_preActivate: function() {
+			this.active = true;
+		},
+		/**
+		 * @access private
+		 */
+		_postActivate: function() {
+			this.on( 'change:menu', this._menu, this );
+			this.on( 'change:titleMode', this._title, this );
+			this.on( 'change:content', this._content, this );
+			this.on( 'change:toolbar', this._toolbar, this );
+=======
 	initialize: function() {
 		var library, comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		attributes.scanners.push( deferred.promise() );
+||||||| .r11156
+			this.frame.on( 'title:render:default', this._renderTitle, this );
+=======
 		// If we haven't been provided a `library`, create a `Selection`.
 		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query({ type: 'image' }) );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Try to load the image and find its width/height.
+		image.onload = function() {
+			deferred.resolve();
+||||||| .r11156
+			this._title();
+			this._menu();
+			this._toolbar();
+			this._content();
+			this._router();
+		},
+		/**
+		 * @access private
+		 */
+		_deactivate: function() {
+			this.active = false;
+=======
 		Library.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			if ( state !== frame.state() || url !== state.props.get('url') ) {
+				return;
+||||||| .r11156
+			this.frame.off( 'title:render:default', this._renderTitle, this );
+
+			this.off( 'change:menu', this._menu, this );
+			this.off( 'change:titleMode', this._title, this );
+			this.off( 'change:content', this._content, this );
+			this.off( 'change:toolbar', this._toolbar, this );
+		},
+		/**
+		 * @access private
+		 */
+		_title: function() {
+			this.frame.title.render( this.get('titleMode') || 'default' );
+		},
+		/**
+		 * @access private
+		 */
+		_renderTitle: function( view ) {
+			view.$el.text( this.get('title') || '' );
+		},
+		/**
+		 * @access private
+		 */
+		_router: function() {
+			var router = this.frame.router,
+				mode = this.get('router'),
+				view;
 
+			this.frame.$el.toggleClass( 'hide-router', ! mode );
+			if ( ! mode ) {
+				return;
+=======
 		library    = this.get('library');
 		comparator = library.comparator;
 
@@ -677,33 +1560,110 @@ FeaturedImage = Library.extend({
 				return 1;
 			} else {
 				return comparator.apply( this, arguments );
+>>>>>>> .r12027
 			}
 		};
 
+<<<<<<< .mine
+			state.set({
+				type: 'image'
+			});
+||||||| .r11156
+			this.frame.router.render( mode );
+=======
 		// Add all items in the selection to the library, so any featured
 		// images that are not initially loaded still appear.
 		library.observe( this.get('selection') );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			state.props.set({
+				width:  image.width,
+				height: image.height
+			});
+		};
+||||||| .r11156
+			view = router.get();
+			if ( view && view.select ) {
+				view.select( this.frame.content.mode() );
+			}
+		},
+		/**
+		 * @access private
+		 */
+		_menu: function() {
+			var menu = this.frame.menu,
+				mode = this.get('menu'),
+				view;
+=======
 	/**
 	 * @since 3.5.0
 	 */
 	activate: function() {
 		this.updateSelection();
 		this.frame.on( 'open', this.updateSelection, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		image.onerror = deferred.reject;
+		image.src = url;
+	},
+||||||| .r11156
+			this.frame.$el.toggleClass( 'hide-menu', ! mode );
+			if ( ! mode ) {
+				return;
+			}
+=======
 		Library.prototype.activate.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	refresh: function() {
+		this.frame.toolbar.get().refresh();
+	},
+||||||| .r11156
+			menu.mode( mode );
+=======
 	/**
 	 * @since 3.5.0
 	 */
 	deactivate: function() {
 		this.frame.off( 'open', this.updateSelection, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	reset: function() {
+		this.props.clear().set({ url: '' });
+||||||| .r11156
+			view = menu.get();
+			if ( view && view.select ) {
+				view.select( this.id );
+			}
+		},
+		/**
+		 * @access private
+		 */
+		_updateMenu: function() {
+			var previous = this.previous('menu'),
+				menu = this.get('menu');
+=======
 		Library.prototype.deactivate.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.active ) {
+			this.refresh();
+		}
+	}
+});
+||||||| .r11156
+			if ( previous ) {
+				this.frame.off( 'menu:render:' + previous, this._renderMenu, this );
+			}
+=======
 	/**
 	 * @since 3.5.0
 	 */
@@ -711,21 +1671,117 @@ FeaturedImage = Library.extend({
 		var selection = this.get('selection'),
 			id = wp.media.view.settings.post.featuredImageId,
 			attachment;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Embed;
+||||||| .r11156
+			if ( menu ) {
+				this.frame.on( 'menu:render:' + menu, this._renderMenu, this );
+			}
+		},
+		/**
+		 * @access private
+		 */
+		_renderMenu: function( view ) {
+			var menuItem = this.get('menuItem'),
+				title = this.get('title'),
+				priority = this.get('priority');
+=======
 		if ( '' !== id && -1 !== id ) {
 			attachment = Attachment.get( id );
 			attachment.fetch();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],7:[function(require,module,exports){
+/**
+ * wp.media.controller.FeaturedImage
+ *
+ * A state for selecting a featured image for a post.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                          The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=featured-image]        Unique identifier.
+ * @param {string}                     [attributes.title=Set Featured Image] Title for the state. Displays in the media menu and the frame's title region.
+ * @param {wp.media.model.Attachments} [attributes.library]                  The attachments collection to browse.
+ *                                                                           If one is not supplied, a collection of all images will be created.
+ * @param {boolean}                    [attributes.multiple=false]           Whether multi-select is enabled.
+ * @param {string}                     [attributes.content=upload]           Initial mode for the content region.
+ *                                                                           Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                     [attributes.menu=default]             Initial mode for the menu region.
+ * @param {string}                     [attributes.router=browse]            Initial mode for the router region.
+ * @param {string}                     [attributes.toolbar=featured-image]   Initial mode for the toolbar region.
+ * @param {int}                        [attributes.priority=60]              The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.searchable=true]          Whether the library is searchable.
+ * @param {boolean|string}             [attributes.filterable=false]         Whether the library is filterable, and if so what filters should be shown.
+ *                                                                           Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {boolean}                    [attributes.sortable=true]            Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.autoSelect=true]          Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                    [attributes.describe=false]           Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.contentUserSetting=true]  Whether the content region's mode should be set and persisted per user.
+ * @param {boolean}                    [attributes.syncSelection=true]       Whether the Attachments selection should be persisted from the last state.
+ */
+var Attachment = wp.media.model.Attachment,
+	Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	FeaturedImage;
+||||||| .r11156
+			if ( ! menuItem && title ) {
+				menuItem = { text: title };
+=======
 		selection.reset( attachment ? [ attachment ] : [] );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+FeaturedImage = Library.extend({
+	defaults: _.defaults({
+		id:            'featured-image',
+		title:         l10n.setFeaturedImageTitle,
+		multiple:      false,
+		filterable:    'uploaded',
+		toolbar:       'featured-image',
+		priority:      60,
+		syncSelection: true
+	}, Library.prototype.defaults ),
+||||||| .r11156
+				if ( priority ) {
+					menuItem.priority = priority;
+				}
+			}
+=======
 module.exports = FeaturedImage;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	initialize: function() {
+		var library, comparator;
+||||||| .r11156
+			if ( ! menuItem ) {
+				return;
+			}
+=======
 },{}],7:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If we haven't been provided a `library`, create a `Selection`.
+		if ( ! this.get('library') ) {
+			this.set( 'library', wp.media.query({ type: 'image' }) );
+||||||| .r11156
+			view.set( this.id, menuItem );
+=======
 /**
  * wp.media.controller.GalleryAdd
  *
@@ -781,8 +1837,39 @@ GalleryAdd = Library.extend({
 		// If a library wasn't supplied, create a library of images.
 		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query({ type: 'image' }) );
+>>>>>>> .r12027
 		}
 
+<<<<<<< .mine
+		Library.prototype.initialize.apply( this, arguments );
+
+		library    = this.get('library');
+		comparator = library.comparator;
+
+		// Overload the library's comparator to push items that are not in
+		// the mirrored query to the front of the aggregate collection.
+		library.comparator = function( a, b ) {
+			var aInQuery = !! this.mirroring.get( a.cid ),
+				bInQuery = !! this.mirroring.get( b.cid );
+
+			if ( ! aInQuery && bInQuery ) {
+				return -1;
+			} else if ( aInQuery && ! bInQuery ) {
+				return 1;
+			} else {
+				return comparator.apply( this, arguments );
+			}
+||||||| .r11156
+	_.each(['toolbar','content'], function( region ) {
+		/**
+		 * @access private
+		 */
+		media.controller.State.prototype[ '_' + region ] = function() {
+			var mode = this.get( region );
+			if ( mode ) {
+				this.frame[ region ].render( mode );
+			}
+=======
 		Library.prototype.initialize.apply( this, arguments );
 	},
 
@@ -801,24 +1888,91 @@ GalleryAdd = Library.extend({
 		// that do not exist in gallery's library.
 		library.validator = function( attachment ) {
 			return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
+>>>>>>> .r12027
 		};
 
+<<<<<<< .mine
+		// Add all items in the selection to the library, so any featured
+		// images that are not initially loaded still appear.
+		library.observe( this.get('selection') );
+	},
+||||||| .r11156
+	media.selectionSync = {
+		syncSelection: function() {
+			var selection = this.get('selection'),
+				manager = this.frame._selection;
+=======
 		// Reset the library to ensure that all attachments are re-added
 		// to the collection. Do so silently, as calling `observe` will
 		// trigger the `reset` event.
 		library.reset( library.mirroring.models, { silent: true });
 		library.observe( edit );
 		this.editLibrary = edit;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	activate: function() {
+		this.updateSelection();
+		this.frame.on( 'open', this.updateSelection, this );
+||||||| .r11156
+			if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+				return;
+			}
+=======
 		Library.prototype.activate.apply( this, arguments );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.activate.apply( this, arguments );
+	},
+||||||| .r11156
+			// If the selection supports multiple items, validate the stored
+			// attachments based on the new selection's conditions. Record
+			// the attachments that are not included; we'll maintain a
+			// reference to those. Other attachments are considered in flux.
+			if ( selection.multiple ) {
+				selection.reset( [], { silent: true });
+				selection.validateAll( manager.attachments );
+				manager.difference = _.difference( manager.attachments.models, selection.models );
+			}
+=======
 module.exports = GalleryAdd;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	deactivate: function() {
+		this.frame.off( 'open', this.updateSelection, this );
+||||||| .r11156
+			// Sync the selection's single item with the master.
+			selection.single( manager.single );
+		},
+=======
 },{}],8:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.deactivate.apply( this, arguments );
+	},
+||||||| .r11156
+		/**
+		 * Record the currently active attachments, which is a combination
+		 * of the selection's attachments and the set of selected
+		 * attachments that this specific selection considered invalid.
+		 * Reset the difference and record the single attachment.
+		 */
+		recordSelection: function() {
+			var selection = this.get('selection'),
+				manager = this.frame._selection;
+=======
 /**
  * wp.media.controller.GalleryEdit
  *
@@ -854,7 +2008,21 @@ module.exports = GalleryAdd;
 var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	GalleryEdit;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	updateSelection: function() {
+		var selection = this.get('selection'),
+			id = wp.media.view.settings.post.featuredImageId,
+			attachment;
+||||||| .r11156
+			if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+				return;
+			}
+=======
 GalleryEdit = Library.extend({
 	defaults: {
 		id:               'gallery-edit',
@@ -874,7 +2042,21 @@ GalleryEdit = Library.extend({
 		priority:         60,
 		syncSelection:    false
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( '' !== id && -1 !== id ) {
+			attachment = Attachment.get( id );
+			attachment.fetch();
+		}
+||||||| .r11156
+			if ( selection.multiple ) {
+				manager.attachments.reset( selection.toArray().concat( manager.difference ) );
+				manager.difference = [];
+			} else {
+				manager.attachments.add( selection.toArray() );
+			}
+=======
 	/**
 	 * @since 3.5.0
 	 */
@@ -883,44 +2065,282 @@ GalleryEdit = Library.extend({
 		if ( ! this.get('library') ) {
 			this.set( 'library', new wp.media.model.Selection() );
 		}
+>>>>>>> .r12027
 
-		// The single `Attachment` view to be used in the `Attachments` view.
-		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
-		}
-
-		Library.prototype.initialize.apply( this, arguments );
+<<<<<<< .mine
+		selection.reset( attachment ? [ attachment ] : [] );
+	}
+});
+
+module.exports = FeaturedImage;
+
+},{}],8:[function(require,module,exports){
+/**
+ * wp.media.controller.GalleryAdd
+ *
+ * A state for selecting more images to add to a gallery.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                         The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=gallery-library]      Unique identifier.
+ * @param {string}                     [attributes.title=Add to Gallery]    Title for the state. Displays in the frame's title region.
+ * @param {boolean}                    [attributes.multiple=add]            Whether multi-select is enabled. @todo 'add' doesn't seem do anything special, and gets used as a boolean.
+ * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
+ *                                                                          If one is not supplied, a collection of all images will be created.
+ * @param {boolean|string}             [attributes.filterable=uploaded]     Whether the library is filterable, and if so what filters should be shown.
+ *                                                                          Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {string}                     [attributes.menu=gallery]            Initial mode for the menu region.
+ * @param {string}                     [attributes.content=upload]          Initial mode for the content region.
+ *                                                                          Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                     [attributes.router=browse]           Initial mode for the router region.
+ * @param {string}                     [attributes.toolbar=gallery-add]     Initial mode for the toolbar region.
+ * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
+ * @param {boolean}                    [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
+ * @param {int}                        [attributes.priority=100]            The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.syncSelection=false]     Whether the Attachments selection should be persisted from the last state.
+ *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
+ */
+var Selection = wp.media.model.Selection,
+	Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	GalleryAdd;
+
+GalleryAdd = Library.extend({
+	defaults: _.defaults({
+		id:            'gallery-library',
+		title:         l10n.addToGalleryTitle,
+		multiple:      'add',
+		filterable:    'uploaded',
+		menu:          'gallery',
+		toolbar:       'gallery-add',
+		priority:      100,
+		syncSelection: false
+	}, Library.prototype.defaults ),
+
+	/**
+	 * @since 3.5.0
+	 */
+	initialize: function() {
+		// If a library wasn't supplied, create a library of images.
+		if ( ! this.get('library') ) {
+			this.set( 'library', wp.media.query({ type: 'image' }) );
+||||||| .r11156
+			manager.single = selection._single;
+=======
+		// The single `Attachment` view to be used in the `Attachments` view.
+		if ( ! this.get('AttachmentView') ) {
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
+>>>>>>> .r12027
+		}
+
+		Library.prototype.initialize.apply( this, arguments );
 	},
 
 	/**
 	 * @since 3.5.0
 	 */
+<<<<<<< .mine
+	activate: function() {
+		var library = this.get('library'),
+			edit    = this.frame.state('gallery-edit').get('library');
+||||||| .r11156
+	media.controller.Library = media.controller.State.extend({
+		defaults: {
+			id:                 'library',
+			title:              l10n.mediaLibraryTitle,
+			// Selection defaults. @see media.model.Selection
+			multiple:           false,
+			// Initial region modes.
+			content:            'upload',
+			menu:               'default',
+			router:             'browse',
+			toolbar:            'select',
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			searchable:         true,
+			filterable:         false,
+			sortable:           true,
+=======
 	activate: function() {
 		var library = this.get('library');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.editLibrary && this.editLibrary !== edit ) {
+			library.unobserve( this.editLibrary );
+		}
+||||||| .r11156
+			autoSelect:         true,
+			describe:           false,
+			// Uses a user setting to override the content mode.
+			contentUserSetting: true,
+			// Sync the selection from the last state when 'multiple' matches.
+			syncSelection:      true
+		},
+=======
 		// Limit the library to images only.
 		library.props.set( 'type', 'image' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Accepts attachments that exist in the original library and
+		// that do not exist in gallery's library.
+		library.validator = function( attachment ) {
+			return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
+		};
+||||||| .r11156
+		/**
+		 * If a library isn't provided, query all media items.
+		 * If a selection instance isn't provided, create one.
+		 */
+		initialize: function() {
+			var selection = this.get('selection'),
+				props;
+=======
 		// Watch for uploaded attachments.
 		this.get('library').observe( wp.Uploader.queue );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Reset the library to ensure that all attachments are re-added
+		// to the collection. Do so silently, as calling `observe` will
+		// trigger the `reset` event.
+		library.reset( library.mirroring.models, { silent: true });
+		library.observe( edit );
+		this.editLibrary = edit;
+||||||| .r11156
+			if ( ! this.get('library') ) {
+				this.set( 'library', media.query() );
+			}
+=======
 		this.frame.on( 'content:render:browse', this.gallerySettings, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.activate.apply( this, arguments );
+	}
+});
+||||||| .r11156
+			if ( ! (selection instanceof media.model.Selection) ) {
+				props = selection;
+=======
 		Library.prototype.activate.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = GalleryAdd;
+||||||| .r11156
+				if ( ! props ) {
+					props = this.get('library').props.toJSON();
+					props = _.omit( props, 'orderby', 'query' );
+				}
+=======
 	/**
 	 * @since 3.5.0
 	 */
 	deactivate: function() {
 		// Stop watching for uploaded attachments.
 		this.get('library').unobserve( wp.Uploader.queue );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],9:[function(require,module,exports){
+/**
+ * wp.media.controller.GalleryEdit
+ *
+ * A state for editing a gallery's images and settings.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                       The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=gallery-edit]       Unique identifier.
+ * @param {string}                     [attributes.title=Edit Gallery]    Title for the state. Displays in the frame's title region.
+ * @param {wp.media.model.Attachments} [attributes.library]               The collection of attachments in the gallery.
+ *                                                                        If one is not supplied, an empty media.model.Selection collection is created.
+ * @param {boolean}                    [attributes.multiple=false]        Whether multi-select is enabled.
+ * @param {boolean}                    [attributes.searchable=false]      Whether the library is searchable.
+ * @param {boolean}                    [attributes.sortable=true]         Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.date=true]             Whether to show the date filter in the browser's toolbar.
+ * @param {string|false}               [attributes.content=browse]        Initial mode for the content region.
+ * @param {string|false}               [attributes.toolbar=image-details] Initial mode for the toolbar region.
+ * @param {boolean}                    [attributes.describe=true]         Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.displaySettings=true]  Whether to show the attachment display settings interface.
+ * @param {boolean}                    [attributes.dragInfo=true]         Whether to show instructional text about the attachments being sortable.
+ * @param {int}                        [attributes.idealColumnWidth=170]  The ideal column width in pixels for attachments.
+ * @param {boolean}                    [attributes.editing=false]         Whether the gallery is being created, or editing an existing instance.
+ * @param {int}                        [attributes.priority=60]           The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.syncSelection=false]   Whether the Attachments selection should be persisted from the last state.
+ *                                                                        Defaults to false for this state, because the library passed in  *is* the selection.
+ * @param {view}                       [attributes.AttachmentView]        The single `Attachment` view to be used in the `Attachments`.
+ *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
+ */
+var Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	GalleryEdit;
+||||||| .r11156
+				// If the `selection` attribute is set to an object,
+				// it will use those values as the selection instance's
+				// `props` model. Otherwise, it will copy the library's
+				// `props` model.
+				this.set( 'selection', new media.model.Selection( null, {
+					multiple: this.get('multiple'),
+					props: props
+				}) );
+			}
+=======
 		this.frame.off( 'content:render:browse', this.gallerySettings, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+GalleryEdit = Library.extend({
+	defaults: {
+		id:               'gallery-edit',
+		title:            l10n.editGalleryTitle,
+		multiple:         false,
+		searchable:       false,
+		sortable:         true,
+		date:             false,
+		display:          false,
+		content:          'browse',
+		toolbar:          'gallery-edit',
+		describe:         true,
+		displaySettings:  true,
+		dragInfo:         true,
+		idealColumnWidth: 170,
+		editing:          false,
+		priority:         60,
+		syncSelection:    false
+	},
+||||||| .r11156
+			this.resetDisplays();
+		},
+=======
 		Library.prototype.deactivate.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	initialize: function() {
+		// If we haven't been provided a `library`, create a `Selection`.
+		if ( ! this.get('library') ) {
+			this.set( 'library', new wp.media.model.Selection() );
+		}
+||||||| .r11156
+		activate: function() {
+			this.syncSelection();
+=======
 	/**
 	 * @since 3.5.0
 	 *
@@ -930,13 +2350,43 @@ GalleryEdit = Library.extend({
 		if ( ! this.get('displaySettings') ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// The single `Attachment` view to be used in the `Attachments` view.
+		if ( ! this.get('AttachmentView') ) {
+			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
+		}
+||||||| .r11156
+			wp.Uploader.queue.on( 'add', this.uploading, this );
+=======
 		var library = this.get('library');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+			this.get('selection').on( 'add remove reset', this.refreshContent, this );
+=======
 		if ( ! library || ! browser ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	activate: function() {
+		var library = this.get('library');
+||||||| .r11156
+			if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
+				this.frame.on( 'content:activate', this.saveContentMode, this );
+				this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
+			}
+		},
+=======
 		library.gallery = library.gallery || new Backbone.Model();
 
 		browser.sidebar.set({
@@ -957,12 +2407,35 @@ GalleryEdit = Library.extend({
 		});
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Limit the library to images only.
+		library.props.set( 'type', 'image' );
+||||||| .r11156
+		deactivate: function() {
+			this.recordSelection();
+=======
 module.exports = GalleryEdit;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Watch for uploaded attachments.
+		this.get('library').observe( wp.Uploader.queue );
+||||||| .r11156
+			this.frame.off( 'content:activate', this.saveContentMode, this );
+=======
 },{}],9:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.on( 'content:render:browse', this.gallerySettings, this );
+||||||| .r11156
+			// Unbind all event handlers that use this state as the context
+			// from the selection.
+			this.get('selection').off( null, null, this );
+=======
 /**
  * wp.media.controller.ImageDetails
  *
@@ -991,7 +2464,15 @@ var State = wp.media.controller.State,
 	Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.activate.apply( this, arguments );
+	},
+||||||| .r11156
+			wp.Uploader.queue.off( null, null, this );
+		},
+=======
 ImageDetails = State.extend({
 	defaults: _.defaults({
 		id:       'image-details',
@@ -1003,7 +2484,22 @@ ImageDetails = State.extend({
 		editing:  false,
 		priority: 60
 	}, Library.prototype.defaults ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	deactivate: function() {
+		// Stop watching for uploaded attachments.
+		this.get('library').unobserve( wp.Uploader.queue );
+||||||| .r11156
+		reset: function() {
+			this.get('selection').reset();
+			this.resetDisplays();
+			this.refreshContent();
+		},
+=======
 	/**
 	 * @since 3.9.0
 	 *
@@ -1013,7 +2509,21 @@ ImageDetails = State.extend({
 		this.image = options.image;
 		State.prototype.initialize.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.off( 'content:render:browse', this.gallerySettings, this );
+||||||| .r11156
+		resetDisplays: function() {
+			var defaultProps = media.view.settings.defaultProps;
+			this._displays = [];
+			this._defaultDisplaySettings = {
+				align: defaultProps.align || getUserSetting( 'align', 'none' ),
+				size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
+				link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+			};
+		},
+=======
 	/**
 	 * @since 3.9.0
 	 */
@@ -1021,12 +2531,58 @@ ImageDetails = State.extend({
 		this.frame.modal.$el.addClass('image-details');
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.deactivate.apply( this, arguments );
+	},
+||||||| .r11156
+		/**
+		 * @param {wp.media.model.Attachment} attachment
+		 * @returns {Backbone.Model}
+		 */
+		display: function( attachment ) {
+			var displays = this._displays;
+=======
 module.exports = ImageDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 *
+	 * @param browser
+	 */
+	gallerySettings: function( browser ) {
+		if ( ! this.get('displaySettings') ) {
+			return;
+		}
+||||||| .r11156
+			if ( ! displays[ attachment.cid ] ) {
+				displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
+			}
+			return displays[ attachment.cid ];
+		},
+=======
 },{}],10:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		var library = this.get('library');
+||||||| .r11156
+		/**
+		 * @param {wp.media.model.Attachment} attachment
+		 * @returns {Object}
+		 */
+		defaultDisplaySettings: function( attachment ) {
+			var settings = this._defaultDisplaySettings;
+			if ( settings.canEmbed = this.canEmbed( attachment ) ) {
+				settings.link = 'embed';
+			}
+			return settings;
+		},
+=======
 /**
  * wp.media.controller.Library
  *
@@ -1065,7 +2621,26 @@ var l10n = wp.media.view.l10n,
 	getUserSetting = window.getUserSetting,
 	setUserSetting = window.setUserSetting,
 	Library;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! library || ! browser ) {
+			return;
+		}
+||||||| .r11156
+		/**
+		 * @param {wp.media.model.Attachment} attachment
+		 * @returns {Boolean}
+		 */
+		canEmbed: function( attachment ) {
+			// If uploading, we know the filename but not the mime type.
+			if ( ! attachment.get('uploading') ) {
+				var type = attachment.get('type');
+				if ( type !== 'audio' && type !== 'video' ) {
+					return false;
+				}
+			}
+=======
 Library = wp.media.controller.State.extend({
 	defaults: {
 		id:                 'library',
@@ -1083,7 +2658,14 @@ Library = wp.media.controller.State.extend({
 		contentUserSetting: true,
 		syncSelection:      true
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		library.gallery = library.gallery || new Backbone.Model();
+||||||| .r11156
+			return _.contains( media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
+		},
+=======
 	/**
 	 * If a library isn't provided, query all media items.
 	 * If a selection instance isn't provided, create one.
@@ -1093,50 +2675,277 @@ Library = wp.media.controller.State.extend({
 	initialize: function() {
 		var selection = this.get('selection'),
 			props;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		browser.sidebar.set({
+			gallery: new wp.media.view.Settings.Gallery({
+				controller: this,
+				model:      library.gallery,
+				priority:   40
+			})
+		});
+||||||| .r11156
+=======
 		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query() );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		browser.toolbar.set( 'reverse', {
+			text:     l10n.reverseOrder,
+			priority: 80,
+||||||| .r11156
+		/**
+		 * If the state is active, no items are selected, and the current
+		 * content mode is not an option in the state's router (provided
+		 * the state has a router), reset the content mode to the default.
+		 */
+		refreshContent: function() {
+			var selection = this.get('selection'),
+				frame = this.frame,
+				router = frame.router.get(),
+				mode = frame.content.mode();
+=======
 		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
 			props = selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			click: function() {
+				library.reset( library.toArray().reverse() );
+||||||| .r11156
+			if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
+				this.frame.content.render( this.get('content') );
+=======
 			if ( ! props ) {
 				props = this.get('library').props.toJSON();
 				props = _.omit( props, 'orderby', 'query' );
+>>>>>>> .r12027
 			}
+<<<<<<< .mine
+		});
+	}
+});
+||||||| .r11156
+		},
+=======
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = GalleryEdit;
+||||||| .r11156
+		/**
+		 * If the uploader was selected, navigate to the browser.
+		 *
+		 * Automatically select any uploading attachments.
+		 *
+		 * Selections that don't support multiple attachments automatically
+		 * limit themselves to one attachment (in this case, the last
+		 * attachment in the upload queue).
+		 *
+		 * @param {wp.media.model.Attachment} attachment
+		 */
+		uploading: function( attachment ) {
+			var content = this.frame.content;
+=======
 			this.set( 'selection', new wp.media.model.Selection( null, {
 				multiple: this.get('multiple'),
 				props: props
 			}) );
 		}
+>>>>>>> .r12027
 
-		this.resetDisplays();
-	},
-
-	/**
-	 * @since 3.5.0
-	 */
-	activate: function() {
-		this.syncSelection();
-
-		wp.Uploader.queue.on( 'add', this.uploading, this );
-
-		this.get('selection').on( 'add remove reset', this.refreshContent, this );
-
-		if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
-			this.frame.on( 'content:activate', this.saveContentMode, this );
-			this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
-		}
-	},
-
-	/**
-	 * @since 3.5.0
+<<<<<<< .mine
+},{}],10:[function(require,module,exports){
+/**
+ * wp.media.controller.ImageDetails
+ *
+ * A state for editing the attachment display settings of an image that's been
+ * inserted into the editor.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                    [attributes]                       The attributes hash passed to the state.
+ * @param {string}                    [attributes.id=image-details]      Unique identifier.
+ * @param {string}                    [attributes.title=Image Details]   Title for the state. Displays in the frame's title region.
+ * @param {wp.media.model.Attachment} attributes.image                   The image's model.
+ * @param {string|false}              [attributes.content=image-details] Initial mode for the content region.
+ * @param {string|false}              [attributes.menu=false]            Initial mode for the menu region.
+ * @param {string|false}              [attributes.router=false]          Initial mode for the router region.
+ * @param {string|false}              [attributes.toolbar=image-details] Initial mode for the toolbar region.
+ * @param {boolean}                   [attributes.editing=false]         Unused.
+ * @param {int}                       [attributes.priority=60]           Unused.
+ *
+ * @todo This state inherits some defaults from media.controller.Library.prototype.defaults,
+ *       however this may not do anything.
+ */
+var State = wp.media.controller.State,
+	Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	ImageDetails;
+||||||| .r11156
+			if ( 'upload' === content.mode() ) {
+				this.frame.content.mode('browse');
+			}
+=======
+		this.resetDisplays();
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+ImageDetails = State.extend({
+	defaults: _.defaults({
+		id:       'image-details',
+		title:    l10n.imageDetailsTitle,
+		content:  'image-details',
+		menu:     false,
+		router:   false,
+		toolbar:  'image-details',
+		editing:  false,
+		priority: 60
+	}, Library.prototype.defaults ),
+||||||| .r11156
+			if ( this.get( 'autoSelect' ) ) {
+				this.get('selection').add( attachment );
+				this.frame.trigger( 'library:selection:add' );
+			}
+		},
+=======
+	/**
+	 * @since 3.5.0
+	 */
+	activate: function() {
+		this.syncSelection();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 *
+	 * @param options Attributes
+	 */
+	initialize: function( options ) {
+		this.image = options.image;
+		State.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+		/**
+		 * Only track the browse router on library states.
+		 */
+		saveContentMode: function() {
+			if ( 'browse' !== this.get('router') ) {
+				return;
+			}
+=======
+		wp.Uploader.queue.on( 'add', this.uploading, this );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 */
+	activate: function() {
+		this.frame.modal.$el.addClass('image-details');
+	}
+});
+||||||| .r11156
+			var mode = this.frame.content.mode(),
+				view = this.frame.router.get();
+=======
+		this.get('selection').on( 'add remove reset', this.refreshContent, this );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = ImageDetails;
+||||||| .r11156
+			if ( view && view.get( mode ) ) {
+				setUserSetting( 'libraryContent', mode );
+			}
+		}
+	});
+=======
+		if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
+			this.frame.on( 'content:activate', this.saveContentMode, this );
+			this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
+		}
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],11:[function(require,module,exports){
+/**
+ * wp.media.controller.Library
+ *
+ * A state for choosing an attachment or group of attachments from the media library.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ * @mixes media.selectionSync
+ *
+ * @param {object}                          [attributes]                         The attributes hash passed to the state.
+ * @param {string}                          [attributes.id=library]              Unique identifier.
+ * @param {string}                          [attributes.title=Media library]     Title for the state. Displays in the media menu and the frame's title region.
+ * @param {wp.media.model.Attachments}      [attributes.library]                 The attachments collection to browse.
+ *                                                                               If one is not supplied, a collection of all attachments will be created.
+ * @param {wp.media.model.Selection|object} [attributes.selection]               A collection to contain attachment selections within the state.
+ *                                                                               If the 'selection' attribute is a plain JS object,
+ *                                                                               a Selection will be created using its values as the selection instance's `props` model.
+ *                                                                               Otherwise, it will copy the library's `props` model.
+ * @param {boolean}                         [attributes.multiple=false]          Whether multi-select is enabled.
+ * @param {string}                          [attributes.content=upload]          Initial mode for the content region.
+ *                                                                               Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                          [attributes.menu=default]            Initial mode for the menu region.
+ * @param {string}                          [attributes.router=browse]           Initial mode for the router region.
+ * @param {string}                          [attributes.toolbar=select]          Initial mode for the toolbar region.
+ * @param {boolean}                         [attributes.searchable=true]         Whether the library is searchable.
+ * @param {boolean|string}                  [attributes.filterable=false]        Whether the library is filterable, and if so what filters should be shown.
+ *                                                                               Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {boolean}                         [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                         [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                         [attributes.describe=false]          Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
+ * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
+ */
+var l10n = wp.media.view.l10n,
+	getUserSetting = window.getUserSetting,
+	setUserSetting = window.setUserSetting,
+	Library;
+||||||| .r11156
+	_.extend( media.controller.Library.prototype, media.selectionSync );
+=======
+	/**
+	 * @since 3.5.0
 	 */
 	deactivate: function() {
 		this.recordSelection();
+>>>>>>> .r12027
+
+<<<<<<< .mine
+Library = wp.media.controller.State.extend({
+	defaults: {
+		id:                 'library',
+		title:              l10n.mediaLibraryTitle,
+		multiple:           false,
+		content:            'upload',
+		menu:               'default',
+		router:             'browse',
+		toolbar:            'select',
+		searchable:         true,
+		filterable:         false,
+		sortable:           true,
+		autoSelect:         true,
+		describe:           false,
+		contentUserSetting: true,
+		syncSelection:      true
+	},
 
+||||||| .r11156
+=======
 		this.frame.off( 'content:activate', this.saveContentMode, this );
 
 		// Unbind all event handlers that use this state as the context
@@ -1146,17 +2955,50 @@ Library = wp.media.controller.State.extend({
 		wp.Uploader.queue.off( null, null, this );
 	},
 
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
+	 * If a library isn't provided, query all media items.
+	 * If a selection instance isn't provided, create one.
+||||||| .r11156
+	 * A state for editing the settings of an image within a content editor.
+=======
 	 * Reset the library to its initial state.
+>>>>>>> .r12027
 	 *
 	 * @since 3.5.0
 	 */
+<<<<<<< .mine
+	initialize: function() {
+		var selection = this.get('selection'),
+			props;
+||||||| .r11156
+	media.controller.ImageDetails = media.controller.State.extend({
+		defaults: _.defaults({
+			id:       'image-details',
+			title:    l10n.imageDetailsTitle,
+			// Initial region modes.
+			content:  'image-details',
+			menu:     false,
+			router:   false,
+			toolbar:  'image-details',
+=======
 	reset: function() {
 		this.get('selection').reset();
 		this.resetDisplays();
 		this.refreshContent();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this.get('library') ) {
+			this.set( 'library', wp.media.query() );
+		}
+||||||| .r11156
+			editing:  false,
+			priority: 60
+		}, media.controller.Library.prototype.defaults ),
+=======
 	/**
 	 * Reset the attachment display settings defaults to the site options.
 	 *
@@ -1173,7 +3015,17 @@ Library = wp.media.controller.State.extend({
 			link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
 		};
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
+			props = selection;
+||||||| .r11156
+		initialize: function( options ) {
+			this.image = options.image;
+			media.controller.State.prototype.initialize.apply( this, arguments );
+		},
+=======
 	/**
 	 * Create a model to represent display settings (alignment, etc.) for an attachment.
 	 *
@@ -1184,21 +3036,74 @@ Library = wp.media.controller.State.extend({
 	 */
 	display: function( attachment ) {
 		var displays = this._displays;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			if ( ! props ) {
+				props = this.get('library').props.toJSON();
+				props = _.omit( props, 'orderby', 'query' );
+			}
 
+			this.set( 'selection', new wp.media.model.Selection( null, {
+				multiple: this.get('multiple'),
+				props: props
+			}) );
+||||||| .r11156
+		activate: function() {
+			this.frame.modal.$el.addClass('image-details');
+=======
 		if ( ! displays[ attachment.cid ] ) {
 			displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+||||||| .r11156
+	});
+=======
 		return displays[ attachment.cid ];
 	},
+>>>>>>> .r12027
+
+		this.resetDisplays();
+	},
 
 	/**
+<<<<<<< .mine
+	 * @since 3.5.0
+||||||| .r11156
+	 * A state for editing a gallery's images and settings.
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
 	 * Given an attachment, create attachment display settings properties.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param {wp.media.model.Attachment} attachment
 	 * @returns {Object}
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	activate: function() {
+		this.syncSelection();
+||||||| .r11156
+	media.controller.GalleryEdit = media.controller.Library.extend({
+		defaults: {
+			id:              'gallery-edit',
+			title:           l10n.editGalleryTitle,
+			// Selection defaults. @see media.model.Selection
+			multiple:        false,
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			searchable:      false,
+			sortable:        true,
+			display:         false,
+			// Initial region modes.
+			content:         'browse',
+			toolbar:         'gallery-edit',
+=======
 	defaultDisplaySettings: function( attachment ) {
 		var settings = this._defaultDisplaySettings;
 		if ( settings.canEmbed = this.canEmbed( attachment ) ) {
@@ -1206,7 +3111,18 @@ Library = wp.media.controller.State.extend({
 		}
 		return settings;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		wp.Uploader.queue.on( 'add', this.uploading, this );
+||||||| .r11156
+			describe:         true,
+			displaySettings:  true,
+			dragInfo:         true,
+			idealColumnWidth: 170,
+			editing:          false,
+			priority:         60,
+=======
 	/**
 	 * Whether an attachment can be embedded (audio or video).
 	 *
@@ -1223,11 +3139,47 @@ Library = wp.media.controller.State.extend({
 				return false;
 			}
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.get('selection').on( 'add remove reset', this.refreshContent, this );
+||||||| .r11156
+			// Don't sync the selection, as the Edit Gallery library
+			// *is* the selection.
+			syncSelection: false
+		},
+=======
 		return _.contains( wp.media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
+			this.frame.on( 'content:activate', this.saveContentMode, this );
+			this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
+		}
+	},
+||||||| .r11156
+		initialize: function() {
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') )
+				this.set( 'library', new media.model.Selection() );
+=======
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.5.0
+	 */
+	deactivate: function() {
+		this.recordSelection();
+||||||| .r11156
+			// The single `Attachment` view to be used in the `Attachments` view.
+			if ( ! this.get('AttachmentView') )
+				this.set( 'AttachmentView', media.view.Attachment.EditLibrary );
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+=======
 	/**
 	 * If the state is active, no items are selected, and the current
 	 * content mode is not an option in the state's router (provided
@@ -1240,12 +3192,28 @@ Library = wp.media.controller.State.extend({
 			frame = this.frame,
 			router = frame.router.get(),
 			mode = frame.content.mode();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.off( 'content:activate', this.saveContentMode, this );
+||||||| .r11156
+		activate: function() {
+			var library = this.get('library');
+=======
 		if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
 			this.frame.content.render( this.get('content') );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Unbind all event handlers that use this state as the context
+		// from the selection.
+		this.get('selection').off( null, null, this );
+||||||| .r11156
+			// Limit the library to images only.
+			library.props.set( 'type', 'image' );
+=======
 	/**
 	 * Callback handler when an attachment is uploaded.
 	 *
@@ -1263,17 +3231,62 @@ Library = wp.media.controller.State.extend({
 	 */
 	uploading: function( attachment ) {
 		var content = this.frame.content;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		wp.Uploader.queue.off( null, null, this );
+	},
+||||||| .r11156
+			// Watch for uploaded attachments.
+			this.get('library').observe( wp.Uploader.queue );
+=======
 		if ( 'upload' === content.mode() ) {
 			this.frame.content.mode('browse');
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Reset the library to its initial state.
+	 *
+	 * @since 3.5.0
+	 */
+	reset: function() {
+		this.get('selection').reset();
+		this.resetDisplays();
+		this.refreshContent();
+	},
+||||||| .r11156
+			this.frame.on( 'content:render:browse', this.gallerySettings, this );
+=======
 		if ( this.get( 'autoSelect' ) ) {
 			this.get('selection').add( attachment );
 			this.frame.trigger( 'library:selection:add' );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Reset the attachment display settings defaults to the site options.
+	 *
+	 * If site options don't define them, fall back to a persistent user setting.
+	 *
+	 * @since 3.5.0
+	 */
+	resetDisplays: function() {
+		var defaultProps = wp.media.view.settings.defaultProps;
+		this._displays = [];
+		this._defaultDisplaySettings = {
+			align: defaultProps.align || getUserSetting( 'align', 'none' ),
+			size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
+			link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+		};
+	},
+||||||| .r11156
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		},
+=======
 	/**
 	 * Persist the mode of the content region as a user setting.
 	 *
@@ -1283,45 +3296,187 @@ Library = wp.media.controller.State.extend({
 		if ( 'browse' !== this.get('router') ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Create a model to represent display settings (alignment, etc.) for an attachment.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {Backbone.Model}
+	 */
+	display: function( attachment ) {
+		var displays = this._displays;
+||||||| .r11156
+		deactivate: function() {
+			// Stop watching for uploaded attachments.
+			this.get('library').unobserve( wp.Uploader.queue );
+=======
 		var mode = this.frame.content.mode(),
 			view = this.frame.router.get();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! displays[ attachment.cid ] ) {
+			displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
+		}
+		return displays[ attachment.cid ];
+	},
+||||||| .r11156
+			this.frame.off( 'content:render:browse', this.gallerySettings, this );
+=======
 		if ( view && view.get( mode ) ) {
 			setUserSetting( 'libraryContent', mode );
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Given an attachment, create attachment display settings properties.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {Object}
+	 */
+	defaultDisplaySettings: function( attachment ) {
+		var settings = this._defaultDisplaySettings;
+		if ( settings.canEmbed = this.canEmbed( attachment ) ) {
+			settings.link = 'embed';
+		}
+		return settings;
+	},
+||||||| .r11156
+			media.controller.Library.prototype.deactivate.apply( this, arguments );
+		},
+=======
 // Make selectionSync available on any Media Library state.
 _.extend( Library.prototype, wp.media.selectionSync );
+>>>>>>> .r12027
 
-module.exports = Library;
-
-},{}],11:[function(require,module,exports){
-/*globals wp, _ */
-
-/**
- * wp.media.controller.MediaLibrary
- *
- * @class
- * @augments wp.media.controller.Library
+<<<<<<< .mine
+	/**
+	 * Whether an attachment can be embedded (audio or video).
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {Boolean}
+	 */
+	canEmbed: function( attachment ) {
+		// If uploading, we know the filename but not the mime type.
+		if ( ! attachment.get('uploading') ) {
+			var type = attachment.get('type');
+			if ( type !== 'audio' && type !== 'video' ) {
+				return false;
+			}
+||||||| .r11156
+		gallerySettings: function( browser ) {
+			if ( ! this.get('displaySettings') ) {
+				return;
+			}
+=======
+module.exports = Library;
+>>>>>>> .r12027
+		}
+
+<<<<<<< .mine
+		return _.contains( wp.media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
+	},
+||||||| .r11156
+			var library = this.get('library');
+=======
+},{}],11:[function(require,module,exports){
+/*globals wp, _ */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+||||||| .r11156
+			if ( ! library || ! browser ) {
+				return;
+			}
+=======
+/**
+ * wp.media.controller.MediaLibrary
+ *
+ * @class
+ * @augments wp.media.controller.Library
  * @augments wp.media.controller.State
  * @augments Backbone.Model
  */
 var Library = wp.media.controller.Library,
 	MediaLibrary;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * If the state is active, no items are selected, and the current
+	 * content mode is not an option in the state's router (provided
+	 * the state has a router), reset the content mode to the default.
+	 *
+	 * @since 3.5.0
+	 */
+	refreshContent: function() {
+		var selection = this.get('selection'),
+			frame = this.frame,
+			router = frame.router.get(),
+			mode = frame.content.mode();
+||||||| .r11156
+			library.gallery = library.gallery || new Backbone.Model();
+=======
 MediaLibrary = Library.extend({
 	defaults: _.defaults({
 		// Attachments browser defaults. @see media.view.AttachmentsBrowser
 		filterable:      'uploaded',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
+			this.frame.content.render( this.get('content') );
+		}
+	},
+||||||| .r11156
+			browser.sidebar.set({
+				gallery: new media.view.Settings.Gallery({
+					controller: this,
+					model:      library.gallery,
+					priority:   40
+				})
+			});
+=======
 		displaySettings: false,
 		priority:        80,
 		syncSelection:   false
 	}, Library.prototype.defaults ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Callback handler when an attachment is uploaded.
+	 *
+	 * Switch to the Media Library if uploaded from the 'Upload Files' tab.
+	 *
+	 * Adds any uploading attachments to the selection.
+	 *
+	 * If the state only supports one attachment to be selected and multiple
+	 * attachments are uploaded, the last attachment in the upload queue will
+	 * be selected.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {wp.media.model.Attachment} attachment
+	 */
+	uploading: function( attachment ) {
+		var content = this.frame.content;
+||||||| .r11156
+			browser.toolbar.set( 'reverse', {
+				text:     l10n.reverseOrder,
+				priority: 80,
+=======
 	/**
 	 * @since 3.9.0
 	 *
@@ -1331,7 +3486,17 @@ MediaLibrary = Library.extend({
 		this.media = options.media;
 		this.type = options.type;
 		this.set( 'library', wp.media.query({ type: this.type }) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( 'upload' === content.mode() ) {
+			this.frame.content.mode('browse');
+||||||| .r11156
+				click: function() {
+					library.reset( library.toArray().reverse() );
+				}
+			});
+=======
 		Library.prototype.initialize.apply( this, arguments );
 	},
 
@@ -1343,11 +3508,26 @@ MediaLibrary = Library.extend({
 		if ( wp.media.frame.lastMime ) {
 			this.set( 'library', wp.media.query({ type: wp.media.frame.lastMime }) );
 			delete wp.media.frame.lastMime;
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+||||||| .r11156
+	});
+=======
 		Library.prototype.activate.apply( this, arguments );
 	}
 });
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( this.get( 'autoSelect' ) ) {
+			this.get('selection').add( attachment );
+			this.frame.trigger( 'library:selection:add' );
+		}
+	},
 
+||||||| .r11156
+=======
 module.exports = MediaLibrary;
 
 },{}],12:[function(require,module,exports){
@@ -1381,9 +3561,24 @@ var Region = function( options ) {
 Region.extend = Backbone.Model.extend;
 
 _.extend( Region.prototype, {
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
+	 * Persist the mode of the content region as a user setting.
+||||||| .r11156
+	 * A state for adding an image to a gallery.
+=======
 	 * Activate a mode.
+>>>>>>> .r12027
 	 *
+<<<<<<< .mine
+	 * @since 3.5.0
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
 	 * @since 3.5.0
 	 *
 	 * @param {string} mode
@@ -1394,7 +3589,26 @@ _.extend( Region.prototype, {
 	 * @fires this.view#{this.id}:deactivate
 	 *
 	 * @returns {wp.media.controller.Region} Returns itself to allow chaining.
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	saveContentMode: function() {
+		if ( 'browse' !== this.get('router') ) {
+			return;
+		}
+||||||| .r11156
+	media.controller.GalleryAdd = media.controller.Library.extend({
+		defaults: _.defaults({
+			id:            'gallery-library',
+			title:         l10n.addToGalleryTitle,
+			// Selection defaults. @see media.model.Selection
+			multiple:      'add',
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			filterable:    'uploaded',
+			// Initial region modes.
+			menu:          'gallery',
+			toolbar:       'gallery-add',
+=======
 	mode: function( mode ) {
 		if ( ! mode ) {
 			return this._mode;
@@ -1403,7 +3617,18 @@ _.extend( Region.prototype, {
 		if ( mode === this._mode ) {
 			return this;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		var mode = this.frame.content.mode(),
+			view = this.frame.router.get();
+||||||| .r11156
+			priority:      100,
+			// Don't sync the selection, as the Edit Gallery library
+			// *is* the selection.
+			syncSelection: false
+		}, media.controller.Library.prototype.defaults ),
+=======
 		/**
 		 * Region mode deactivation event.
 		 *
@@ -1411,10 +3636,31 @@ _.extend( Region.prototype, {
 		 * @event this.view#{this.id}:deactivate
 		 */
 		this.trigger('deactivate');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( view && view.get( mode ) ) {
+			setUserSetting( 'libraryContent', mode );
+		}
+	}
+});
+||||||| .r11156
+		initialize: function() {
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') )
+				this.set( 'library', media.query({ type: 'image' }) );
+=======
 		this._mode = mode;
 		this.render( mode );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Make selectionSync available on any Media Library state.
+_.extend( Library.prototype, wp.media.selectionSync );
+||||||| .r11156
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+=======
 		/**
 		 * Region mode activation event.
 		 *
@@ -1443,10 +3689,35 @@ _.extend( Region.prototype, {
 		if ( mode && mode !== this._mode ) {
 			return this.mode( mode );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Library;
+||||||| .r11156
+		activate: function() {
+			var library = this.get('library'),
+				edit    = this.frame.state('gallery-edit').get('library');
+=======
 		var set = { view: null },
 			view;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],12:[function(require,module,exports){
+/**
+ * wp.media.controller.MediaLibrary
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Library = wp.media.controller.Library,
+	MediaLibrary;
+||||||| .r11156
+			if ( this.editLibrary && this.editLibrary !== edit )
+				library.unobserve( this.editLibrary );
+=======
 		/**
 		 * Create region view event.
 		 *
@@ -1457,7 +3728,20 @@ _.extend( Region.prototype, {
 		 */
 		this.trigger( 'create', set );
 		view = set.view;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+MediaLibrary = Library.extend({
+	defaults: _.defaults({
+		// Attachments browser defaults. @see media.view.AttachmentsBrowser
+		filterable:      'uploaded',
+||||||| .r11156
+			// Accepts attachments that exist in the original library and
+			// that do not exist in gallery's library.
+			library.validator = function( attachment ) {
+				return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && media.model.Selection.prototype.validator.apply( this, arguments );
+			};
+=======
 		/**
 		 * Render region view event.
 		 *
@@ -1472,7 +3756,21 @@ _.extend( Region.prototype, {
 		}
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		displaySettings: false,
+		priority:        80,
+		syncSelection:   false
+	}, Library.prototype.defaults ),
+||||||| .r11156
+			// Reset the library to ensure that all attachments are re-added
+			// to the collection. Do so silently, as calling `observe` will
+			// trigger the `reset` event.
+			library.reset( library.mirroring.models, { silent: true });
+			library.observe( edit );
+			this.editLibrary = edit;
+=======
 	/**
 	 * Get the region's view.
 	 *
@@ -1483,7 +3781,33 @@ _.extend( Region.prototype, {
 	get: function() {
 		return this.view.views.first( this.selector );
 	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 *
+	 * @param options
+	 */
+	initialize: function( options ) {
+		this.media = options.media;
+		this.type = options.type;
+		this.set( 'library', wp.media.query({ type: this.type }) );
+
+		Library.prototype.initialize.apply( this, arguments );
+	},
 
+	/**
+	 * @since 3.9.0
+	 */
+	activate: function() {
+		// @todo this should use this.frame.
+		if ( wp.media.frame.lastMime ) {
+			this.set( 'library', wp.media.query({ type: wp.media.frame.lastMime }) );
+			delete wp.media.frame.lastMime;
+||||||| .r11156
+			media.controller.Library.prototype.activate.apply( this, arguments );
+=======
 	/**
 	 * Set the region's view as a subview of the frame.
 	 *
@@ -1496,57 +3820,271 @@ _.extend( Region.prototype, {
 	set: function( views, options ) {
 		if ( options ) {
 			options.add = false;
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+		Library.prototype.activate.apply( this, arguments );
+	}
+});
+||||||| .r11156
+	});
+=======
 		return this.view.views.set( this.selector, views, options );
 	},
+>>>>>>> .r12027
+
+module.exports = MediaLibrary;
+
+},{}],13:[function(require,module,exports){
+/**
+ * wp.media.controller.Region
+ *
+ * A region is a persistent application layout area.
+ *
+ * A region assumes one mode at any time, and can be switched to another.
+ *
+ * When mode changes, events are triggered on the region's parent view.
+ * The parent view will listen to specific events and fill the region with an
+ * appropriate view depending on mode. For example, a frame listens for the
+ * 'browse' mode t be activated on the 'content' view and then fills the region
+ * with an AttachmentsBrowser view.
+ *
+ * @class
+ *
+ * @param {object}        options          Options hash for the region.
+ * @param {string}        options.id       Unique identifier for the region.
+ * @param {Backbone.View} options.view     A parent view the region exists within.
+ * @param {string}        options.selector jQuery selector for the region within the parent view.
+ */
+var Region = function( options ) {
+	_.extend( this, _.pick( options || {}, 'id', 'view', 'selector' ) );
+};
+
+// Use Backbone's self-propagating `extend` inheritance method.
+Region.extend = Backbone.Model.extend;
 
+_.extend( Region.prototype, {
 	/**
+<<<<<<< .mine
+	 * Activate a mode.
+||||||| .r11156
+	 * wp.media.controller.CollectionEdit
+=======
 	 * Trigger regional view events on the frame.
+>>>>>>> .r12027
+	 *
+<<<<<<< .mine
+	 * @since 3.5.0
+	 *
+	 * @param {string} mode
 	 *
+	 * @fires this.view#{this.id}:activate:{this._mode}
+	 * @fires this.view#{this.id}:activate
+	 * @fires this.view#{this.id}:deactivate:{this._mode}
+	 * @fires this.view#{this.id}:deactivate
+	 *
+	 * @returns {wp.media.controller.Region} Returns itself to allow chaining.
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
 	 * @since 3.5.0
 	 *
 	 * @param {string} event
 	 * @returns {undefined|wp.media.controller.Region} Returns itself to allow chaining.
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	mode: function( mode ) {
+		if ( ! mode ) {
+			return this._mode;
+		}
+		// Bail if we're trying to change to the current mode.
+		if ( mode === this._mode ) {
+			return this;
+		}
+||||||| .r11156
+	media.controller.CollectionEdit = media.controller.Library.extend({
+		defaults: {
+			// Selection defaults. @see media.model.Selection
+			multiple:     false,
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			sortable:     true,
+			searchable:   false,
+			// Region mode defaults.
+			content:      'browse',
+=======
 	trigger: function( event ) {
 		var base, args;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		/**
+		 * Region mode deactivation event.
+		 *
+		 * @event this.view#{this.id}:deactivate:{this._mode}
+		 * @event this.view#{this.id}:deactivate
+		 */
+		this.trigger('deactivate');
+||||||| .r11156
+			describe:         true,
+			dragInfo:         true,
+			idealColumnWidth: 170,
+			editing:          false,
+			priority:         60,
+			SettingsView:     false,
+=======
 		if ( ! this._mode ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this._mode = mode;
+		this.render( mode );
+||||||| .r11156
+			// Don't sync the selection, as the Edit {Collection} library
+			// *is* the selection.
+			syncSelection: false
+		},
+=======
 		args = _.toArray( arguments );
 		base = this.id + ':' + event;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		/**
+		 * Region mode activation event.
+		 *
+		 * @event this.view#{this.id}:activate:{this._mode}
+		 * @event this.view#{this.id}:activate
+		 */
+		this.trigger('activate');
+		return this;
+	},
+	/**
+	 * Render a mode.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {string} mode
+	 *
+	 * @fires this.view#{this.id}:create:{this._mode}
+	 * @fires this.view#{this.id}:create
+	 * @fires this.view#{this.id}:render:{this._mode}
+	 * @fires this.view#{this.id}:render
+	 *
+	 * @returns {wp.media.controller.Region} Returns itself to allow chaining
+	 */
+	render: function( mode ) {
+		// If the mode isn't active, activate it.
+		if ( mode && mode !== this._mode ) {
+			return this.mode( mode );
+		}
+||||||| .r11156
+		initialize: function() {
+			var collectionType = this.get('collectionType');
+=======
 		// Trigger `{this.id}:{event}:{this._mode}` event on the frame.
 		args[0] = base + ':' + this._mode;
 		this.view.trigger.apply( this.view, args );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		var set = { view: null },
+			view;
+||||||| .r11156
+			if ( 'video' === this.get( 'type' ) ) {
+				collectionType = 'video-' + collectionType;
+			}
+=======
 		// Trigger `{this.id}:{event}` event on the frame.
 		args[0] = base;
 		this.view.trigger.apply( this.view, args );
 		return this;
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		/**
+		 * Create region view event.
+		 *
+		 * Region view creation takes place in an event callback on the frame.
+		 *
+		 * @event this.view#{this.id}:create:{this._mode}
+		 * @event this.view#{this.id}:create
+		 */
+		this.trigger( 'create', set );
+		view = set.view;
+||||||| .r11156
+			this.set( 'id', collectionType + '-edit' );
+			this.set( 'toolbar', collectionType + '-edit' );
+=======
 module.exports = Region;
+>>>>>>> .r12027
 
-},{}],13:[function(require,module,exports){
-/*globals wp, _ */
-
-/**
- * wp.media.controller.ReplaceImage
- *
- * A state for replacing an image.
- *
- * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object}                     [attributes]                         The attributes hash passed to the state.
- * @param {string}                     [attributes.id=replace-image]        Unique identifier.
- * @param {string}                     [attributes.title=Replace Image]     Title for the state. Displays in the media menu and the frame's title region.
+<<<<<<< .mine
+		/**
+		 * Render region view event.
+		 *
+		 * Region view creation takes place in an event callback on the frame.
+		 *
+		 * @event this.view#{this.id}:create:{this._mode}
+		 * @event this.view#{this.id}:create
+		 */
+		this.trigger( 'render', view );
+		if ( view ) {
+			this.set( view );
+		}
+		return this;
+	},
+||||||| .r11156
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') ) {
+				this.set( 'library', new media.model.Selection() );
+			}
+			// The single `Attachment` view to be used in the `Attachments` view.
+			if ( ! this.get('AttachmentView') ) {
+				this.set( 'AttachmentView', media.view.Attachment.EditLibrary );
+			}
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+=======
+},{}],13:[function(require,module,exports){
+/*globals wp, _ */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	/**
+	 * Get the region's view.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @returns {wp.media.View}
+	 */
+	get: function() {
+		return this.view.views.first( this.selector );
+	},
+||||||| .r11156
+		activate: function() {
+			var library = this.get('library');
+=======
+/**
+ * wp.media.controller.ReplaceImage
+ *
+ * A state for replacing an image.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                         The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=replace-image]        Unique identifier.
+ * @param {string}                     [attributes.title=Replace Image]     Title for the state. Displays in the media menu and the frame's title region.
  * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
  *                                                                          If one is not supplied, a collection of all images will be created.
  * @param {boolean}                    [attributes.multiple=false]          Whether multi-select is enabled.
@@ -1568,7 +4106,28 @@ module.exports = Region;
 var Library = wp.media.controller.Library,
 	l10n = wp.media.view.l10n,
 	ReplaceImage;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Set the region's view as a subview of the frame.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {Array|Object} views
+	 * @param {Object} [options={}]
+	 * @returns {wp.Backbone.Subviews} Subviews is returned to allow chaining
+	 */
+	set: function( views, options ) {
+		if ( options ) {
+			options.add = false;
+		}
+		return this.view.views.set( this.selector, views, options );
+	},
+||||||| .r11156
+			// Limit the library to images only.
+			library.props.set( 'type', this.get( 'type' ) );
+=======
 ReplaceImage = Library.extend({
 	defaults: _.defaults({
 		id:            'replace-image',
@@ -1580,7 +4139,23 @@ ReplaceImage = Library.extend({
 		priority:      60,
 		syncSelection: true
 	}, Library.prototype.defaults ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Trigger regional view events on the frame.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {string} event
+	 * @returns {undefined|wp.media.controller.Region} Returns itself to allow chaining.
+	 */
+	trigger: function( event ) {
+		var base, args;
+||||||| .r11156
+			// Watch for uploaded attachments.
+			this.get('library').observe( wp.Uploader.queue );
+=======
 	/**
 	 * @since 3.9.0
 	 *
@@ -1588,24 +4163,68 @@ ReplaceImage = Library.extend({
 	 */
 	initialize: function( options ) {
 		var library, comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this._mode ) {
+			return;
+		}
+||||||| .r11156
+			this.frame.on( 'content:render:browse', this.renderSettings, this );
+=======
 		this.image = options.image;
 		// If we haven't been provided a `library`, create a `Selection`.
 		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query({ type: 'image' }) );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		args = _.toArray( arguments );
+		base = this.id + ':' + event;
+||||||| .r11156
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		},
+=======
 		Library.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Trigger `{this.id}:{event}:{this._mode}` event on the frame.
+		args[0] = base + ':' + this._mode;
+		this.view.trigger.apply( this.view, args );
+||||||| .r11156
+		deactivate: function() {
+			// Stop watching for uploaded attachments.
+			this.get('library').unobserve( wp.Uploader.queue );
+=======
 		library    = this.get('library');
 		comparator = library.comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Trigger `{this.id}:{event}` event on the frame.
+		args[0] = base;
+		this.view.trigger.apply( this.view, args );
+		return this;
+	}
+});
+||||||| .r11156
+			this.frame.off( 'content:render:browse', this.renderSettings, this );
+=======
 		// Overload the library's comparator to push items that are not in
 		// the mirrored query to the front of the aggregate collection.
 		library.comparator = function( a, b ) {
 			var aInQuery = !! this.mirroring.get( a.cid ),
 				bInQuery = !! this.mirroring.get( b.cid );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Region;
+||||||| .r11156
+			media.controller.Library.prototype.deactivate.apply( this, arguments );
+		},
+=======
 			if ( ! aInQuery && bInQuery ) {
 				return -1;
 			} else if ( aInQuery && ! bInQuery ) {
@@ -1614,12 +4233,75 @@ ReplaceImage = Library.extend({
 				return comparator.apply( this, arguments );
 			}
 		};
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],14:[function(require,module,exports){
+/**
+ * wp.media.controller.ReplaceImage
+ *
+ * A state for replacing an image.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                         The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=replace-image]        Unique identifier.
+ * @param {string}                     [attributes.title=Replace Image]     Title for the state. Displays in the media menu and the frame's title region.
+ * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
+ *                                                                          If one is not supplied, a collection of all images will be created.
+ * @param {boolean}                    [attributes.multiple=false]          Whether multi-select is enabled.
+ * @param {string}                     [attributes.content=upload]          Initial mode for the content region.
+ *                                                                          Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                     [attributes.menu=default]            Initial mode for the menu region.
+ * @param {string}                     [attributes.router=browse]           Initial mode for the router region.
+ * @param {string}                     [attributes.toolbar=replace]         Initial mode for the toolbar region.
+ * @param {int}                        [attributes.priority=60]             The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
+ * @param {boolean|string}             [attributes.filterable=uploaded]     Whether the library is filterable, and if so what filters should be shown.
+ *                                                                          Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {boolean}                    [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                    [attributes.describe=false]          Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
+ * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
+ */
+var Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	ReplaceImage;
+||||||| .r11156
+		renderSettings: function( browser ) {
+			var library = this.get('library'),
+				collectionType = this.get('collectionType'),
+				dragInfoText = this.get('dragInfoText'),
+				SettingsView = this.get('SettingsView'),
+				obj = {};
+=======
 		// Add all items in the selection to the library, so any featured
 		// images that are not initially loaded still appear.
 		library.observe( this.get('selection') );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+ReplaceImage = Library.extend({
+	defaults: _.defaults({
+		id:            'replace-image',
+		title:         l10n.replaceImageTitle,
+		multiple:      false,
+		filterable:    'uploaded',
+		toolbar:       'replace',
+		menu:          false,
+		priority:      60,
+		syncSelection: true
+	}, Library.prototype.defaults ),
+||||||| .r11156
+			if ( ! library || ! browser ) {
+				return;
+			}
+=======
 	/**
 	 * @since 3.9.0
 	 */
@@ -1627,23 +4309,93 @@ ReplaceImage = Library.extend({
 		this.updateSelection();
 		Library.prototype.activate.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 *
+	 * @param options
+	 */
+	initialize: function( options ) {
+		var library, comparator;
+||||||| .r11156
+			library[ collectionType ] = library[ collectionType ] || new Backbone.Model();
+=======
 	/**
 	 * @since 3.9.0
 	 */
 	updateSelection: function() {
 		var selection = this.get('selection'),
 			attachment = this.image.attachment;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.image = options.image;
+		// If we haven't been provided a `library`, create a `Selection`.
+		if ( ! this.get('library') ) {
+			this.set( 'library', wp.media.query({ type: 'image' }) );
+		}
+||||||| .r11156
+			obj[ collectionType ] = new SettingsView({
+				controller: this,
+				model:      library[ collectionType ],
+				priority:   40
+			});
+=======
 		selection.reset( attachment ? [ attachment ] : [] );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		Library.prototype.initialize.apply( this, arguments );
+||||||| .r11156
+			browser.sidebar.set( obj );
+=======
 module.exports = ReplaceImage;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		library    = this.get('library');
+		comparator = library.comparator;
+
+		// Overload the library's comparator to push items that are not in
+		// the mirrored query to the front of the aggregate collection.
+		library.comparator = function( a, b ) {
+			var aInQuery = !! this.mirroring.get( a.cid ),
+				bInQuery = !! this.mirroring.get( b.cid );
 
+			if ( ! aInQuery && bInQuery ) {
+				return -1;
+			} else if ( aInQuery && ! bInQuery ) {
+				return 1;
+			} else {
+				return comparator.apply( this, arguments );
+			}
+||||||| .r11156
+			if ( dragInfoText ) {
+				browser.toolbar.set( 'dragInfo', new media.View({
+					el: $( '
' + dragInfoText + '' )[0],
+					priority: -40
+				}) );
+			}
+=======
 },{}],14:[function(require,module,exports){
 /*globals _, Backbone */
+>>>>>>> .r12027
+		};
 
+<<<<<<< .mine
+		// Add all items in the selection to the library, so any featured
+		// images that are not initially loaded still appear.
+		library.observe( this.get('selection') );
+	},
+||||||| .r11156
+			browser.toolbar.set( 'reverse', {
+				text:     l10n.reverseOrder,
+				priority: 80,
+=======
 /**
  * wp.media.controller.StateMachine
  *
@@ -1665,7 +4417,24 @@ var StateMachine = function( states ) {
 	// @todo This is dead code. The states collection gets created in media.view.Frame._createStates.
 	this.states = new Backbone.Collection( states );
 };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @since 3.9.0
+	 */
+	activate: function() {
+		this.updateSelection();
+		Library.prototype.activate.apply( this, arguments );
+	},
+||||||| .r11156
+				click: function() {
+					library.reset( library.toArray().reverse() );
+				}
+			});
+		}
+	});
+=======
 // Use Backbone's self-propagating `extend` inheritance method.
 StateMachine.extend = Backbone.Model.extend;
 
@@ -1697,8 +4466,19 @@ _.extend( StateMachine.prototype, Backbone.Events, {
 		}
 		return this.states.get( id );
 	},
+>>>>>>> .r12027
 
 	/**
+<<<<<<< .mine
+	 * @since 3.9.0
+||||||| .r11156
+	 * wp.media.controller.CollectionAdd
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
 	 * Sets the active state.
 	 *
 	 * Bail if we're trying to select the current state, if we haven't
@@ -1713,25 +4493,105 @@ _.extend( StateMachine.prototype, Backbone.Events, {
 	 * @fires wp.media.controller.State#activate
 	 *
 	 * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	updateSelection: function() {
+		var selection = this.get('selection'),
+			attachment = this.image.attachment;
+||||||| .r11156
+	media.controller.CollectionAdd = media.controller.Library.extend({
+		defaults: _.defaults( {
+			// Selection defaults. @see media.model.Selection
+			multiple:      'add',
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			filterable:    'uploaded',
+=======
 	setState: function( id ) {
 		var previous = this.state();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		selection.reset( attachment ? [ attachment ] : [] );
+	}
+});
+||||||| .r11156
+			priority:      100,
+			syncSelection: false
+		}, media.controller.Library.prototype.defaults ),
+=======
 		if ( ( previous && id === previous.id ) || ! this.states || ! this.states.get( id ) ) {
 			return this;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = ReplaceImage;
+||||||| .r11156
+		initialize: function() {
+			var collectionType = this.get('collectionType');
+=======
 		if ( previous ) {
 			previous.trigger('deactivate');
 			this._lastState = previous.id;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],15:[function(require,module,exports){
+/**
+ * wp.media.controller.SiteIconCropper
+ *
+ * A state for cropping a Site Icon.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Controller = wp.media.controller,
+	SiteIconCropper;
+||||||| .r11156
+			if ( 'video' === this.get( 'type' ) ) {
+				collectionType = 'video-' + collectionType;
+			}
+=======
 		this._state = id;
 		this.state().trigger('activate');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+SiteIconCropper = Controller.Cropper.extend({
+	activate: function() {
+		this.frame.on( 'content:create:crop', this.createCropContent, this );
+		this.frame.on( 'close', this.removeCropper, this );
+		this.set('selection', new Backbone.Collection(this.frame._selection.single));
+	},
+||||||| .r11156
+			this.set( 'id', collectionType + '-library' );
+			this.set( 'toolbar', collectionType + '-add' );
+			this.set( 'menu', collectionType );
+=======
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	createCropContent: function() {
+		this.cropperView = new wp.media.view.SiteIconCropper({
+			controller: this,
+			attachment: this.get('selection').first()
+		});
+		this.cropperView.on('image-loaded', this.createCropToolbar, this);
+		this.frame.content.set(this.cropperView);
+||||||| .r11156
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') ) {
+				this.set( 'library', media.query({ type: this.get('type') }) );
+			}
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+=======
 	/**
 	 * Returns the previous active state.
 	 *
@@ -1749,7 +4609,16 @@ _.extend( StateMachine.prototype, Backbone.Events, {
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	},
+||||||| .r11156
+		activate: function() {
+			var library = this.get('library'),
+				editLibrary = this.get('editLibrary'),
+				edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
+=======
 // Map all event binding and triggering on a StateMachine to its `states` collection.
 _.each([ 'on', 'off', 'trigger' ], function( method ) {
 	/**
@@ -1764,12 +4633,51 @@ _.each([ 'on', 'off', 'trigger' ], function( method ) {
 		return this;
 	};
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	doCrop: function( attachment ) {
+		var cropDetails = attachment.get( 'cropDetails' ),
+			control = this.get( 'control' );
+||||||| .r11156
+			if ( editLibrary && editLibrary !== edit ) {
+				library.unobserve( editLibrary );
+			}
+=======
 module.exports = StateMachine;
-
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		cropDetails.dst_width  = control.params.width;
+		cropDetails.dst_height = control.params.height;
+||||||| .r11156
+			// Accepts attachments that exist in the original library and
+			// that do not exist in gallery's library.
+			library.validator = function( attachment ) {
+				return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && media.model.Selection.prototype.validator.apply( this, arguments );
+			};
+=======
 },{}],15:[function(require,module,exports){
 /*globals _, Backbone */
-
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		return wp.ajax.post( 'crop-image', {
+			nonce: attachment.get( 'nonces' ).edit,
+			id: attachment.get( 'id' ),
+			context: 'site-icon',
+			cropDetails: cropDetails
+		} );
+	}
+});
+||||||| .r11156
+			// Reset the library to ensure that all attachments are re-added
+			// to the collection. Do so silently, as calling `observe` will
+			// trigger the `reset` event.
+			library.reset( library.mirroring.models, { silent: true });
+			library.observe( edit );
+			this.set('editLibrary', edit);
+=======
 /**
  * wp.media.controller.State
  *
@@ -1815,7 +4723,15 @@ var State = Backbone.Model.extend({
 	 * @since 3.5.0
 	 */
 	ready: function() {},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = SiteIconCropper;
+||||||| .r11156
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		}
+	});
+=======
 	/**
 	 * Activate event callback.
 	 *
@@ -1823,15 +4739,93 @@ var State = Backbone.Model.extend({
 	 * @since 3.5.0
 	 */
 	activate: function() {},
+>>>>>>> .r12027
 
+},{}],16:[function(require,module,exports){
+/**
+ * wp.media.controller.StateMachine
+ *
+ * A state machine keeps track of state. It is in one state at a time,
+ * and can change from one state to another.
+ *
+ * States are stored as models in a Backbone collection.
+ *
+ * @since 3.5.0
+ *
+ * @class
+ * @augments Backbone.Model
+ * @mixin
+ * @mixes Backbone.Events
+ *
+ * @param {Array} states
+ */
+var StateMachine = function( states ) {
+	// @todo This is dead code. The states collection gets created in media.view.Frame._createStates.
+	this.states = new Backbone.Collection( states );
+};
+
+// Use Backbone's self-propagating `extend` inheritance method.
+StateMachine.extend = Backbone.Model.extend;
+
+_.extend( StateMachine.prototype, Backbone.Events, {
 	/**
+<<<<<<< .mine
+	 * Fetch a state.
+||||||| .r11156
+	 * A state for selecting a featured image for a post.
+=======
 	 * Deactivate event callback.
+>>>>>>> .r12027
 	 *
-	 * @abstract
-	 * @since 3.5.0
-	 */
-	deactivate: function() {},
+<<<<<<< .mine
+	 * If no `id` is provided, returns the active state.
+	 *
+	 * Implicitly creates states.
+	 *
+	 * Ensure that the `states` collection exists so the `StateMachine`
+	 *   can be used as a mixin.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {string} id
+	 * @returns {wp.media.controller.State} Returns a State model
+	 *   from the StateMachine collection
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
+	 * @abstract
+	 * @since 3.5.0
+>>>>>>> .r12027
+	 */
+<<<<<<< .mine
+	state: function( id ) {
+		this.states = this.states || new Backbone.Collection();
+||||||| .r11156
+	media.controller.FeaturedImage = media.controller.Library.extend({
+		defaults: _.defaults({
+			id:            'featured-image',
+			title:         l10n.setFeaturedImageTitle,
+			// Selection defaults. @see media.model.Selection
+			multiple:      false,
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			filterable:    'uploaded',
+			// Region mode defaults.
+			toolbar:       'featured-image',
+=======
+	deactivate: function() {},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Default to the active state.
+		id = id || this._state;
+||||||| .r11156
+			priority:      60,
+			syncSelection: true
+		}, media.controller.Library.prototype.defaults ),
+=======
 	/**
 	 * Reset event callback.
 	 *
@@ -1839,7 +4833,18 @@ var State = Backbone.Model.extend({
 	 * @since 3.5.0
 	 */
 	reset: function() {},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( id && ! this.states.get( id ) ) {
+			this.states.add({ id: id });
+		}
+		return this.states.get( id );
+	},
+||||||| .r11156
+		initialize: function() {
+			var library, comparator;
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1847,7 +4852,33 @@ var State = Backbone.Model.extend({
 	_ready: function() {
 		this._updateMenu();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Sets the active state.
+	 *
+	 * Bail if we're trying to select the current state, if we haven't
+	 * created the `states` collection, or are trying to select a state
+	 * that does not exist.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param {string} id
+	 *
+	 * @fires wp.media.controller.State#deactivate
+	 * @fires wp.media.controller.State#activate
+	 *
+	 * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining
+	 */
+	setState: function( id ) {
+		var previous = this.state();
+||||||| .r11156
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') ) {
+				this.set( 'library', media.query({ type: 'image' }) );
+			}
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1855,7 +4886,15 @@ var State = Backbone.Model.extend({
 	_preActivate: function() {
 		this.active = true;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ( previous && id === previous.id ) || ! this.states || ! this.states.get( id ) ) {
+			return this;
+		}
+||||||| .r11156
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1865,31 +4904,119 @@ var State = Backbone.Model.extend({
 		this.on( 'change:titleMode', this._title, this );
 		this.on( 'change:content', this._content, this );
 		this.on( 'change:toolbar', this._toolbar, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( previous ) {
+			previous.trigger('deactivate');
+			this._lastState = previous.id;
+		}
+||||||| .r11156
+			library    = this.get('library');
+			comparator = library.comparator;
+=======
 		this.frame.on( 'title:render:default', this._renderTitle, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this._state = id;
+		this.state().trigger('activate');
+||||||| .r11156
+			// Overload the library's comparator to push items that are not in
+			// the mirrored query to the front of the aggregate collection.
+			library.comparator = function( a, b ) {
+				var aInQuery = !! this.mirroring.get( a.cid ),
+					bInQuery = !! this.mirroring.get( b.cid );
+=======
 		this._title();
 		this._menu();
 		this._toolbar();
 		this._content();
 		this._router();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return this;
+	},
+||||||| .r11156
+				if ( ! aInQuery && bInQuery ) {
+					return -1;
+				} else if ( aInQuery && ! bInQuery ) {
+					return 1;
+				} else {
+					return comparator.apply( this, arguments );
+				}
+			};
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
 	 */
 	_deactivate: function() {
 		this.active = false;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Returns the previous active state.
+	 *
+	 * Call the `state()` method with no parameters to retrieve the current
+	 * active state.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @returns {wp.media.controller.State} Returns a State model
+	 *    from the StateMachine collection
+	 */
+	lastState: function() {
+		if ( this._lastState ) {
+			return this.state( this._lastState );
+		}
+	}
+});
+||||||| .r11156
+			// Add all items in the selection to the library, so any featured
+			// images that are not initially loaded still appear.
+			library.observe( this.get('selection') );
+		},
+=======
 		this.frame.off( 'title:render:default', this._renderTitle, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Map all event binding and triggering on a StateMachine to its `states` collection.
+_.each([ 'on', 'off', 'trigger' ], function( method ) {
+	/**
+	 * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining.
+	 */
+	StateMachine.prototype[ method ] = function() {
+		// Ensure that the `states` collection exists so the `StateMachine`
+		// can be used as a mixin.
+		this.states = this.states || new Backbone.Collection();
+		// Forward the method to the `states` collection.
+		this.states[ method ].apply( this.states, arguments );
+		return this;
+	};
+});
+||||||| .r11156
+		activate: function() {
+			this.updateSelection();
+			this.frame.on( 'open', this.updateSelection, this );
+=======
 		this.off( 'change:menu', this._menu, this );
 		this.off( 'change:titleMode', this._title, this );
 		this.off( 'change:content', this._content, this );
 		this.off( 'change:toolbar', this._toolbar, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = StateMachine;
+||||||| .r11156
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		},
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1897,7 +5024,59 @@ var State = Backbone.Model.extend({
 	_title: function() {
 		this.frame.title.render( this.get('titleMode') || 'default' );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],17:[function(require,module,exports){
+/**
+ * wp.media.controller.State
+ *
+ * A state is a step in a workflow that when set will trigger the controllers
+ * for the regions to be updated as specified in the frame.
+ *
+ * A state has an event-driven lifecycle:
+ *
+ *     'ready'      triggers when a state is added to a state machine's collection.
+ *     'activate'   triggers when a state is activated by a state machine.
+ *     'deactivate' triggers when a state is deactivated by a state machine.
+ *     'reset'      is not triggered automatically. It should be invoked by the
+ *                  proper controller to reset the state to its default.
+ *
+ * @class
+ * @augments Backbone.Model
+ */
+var State = Backbone.Model.extend({
+	/**
+	 * Constructor.
+	 *
+	 * @since 3.5.0
+	 */
+	constructor: function() {
+		this.on( 'activate', this._preActivate, this );
+		this.on( 'activate', this.activate, this );
+		this.on( 'activate', this._postActivate, this );
+		this.on( 'deactivate', this._deactivate, this );
+		this.on( 'deactivate', this.deactivate, this );
+		this.on( 'reset', this.reset, this );
+		this.on( 'ready', this._ready, this );
+		this.on( 'ready', this.ready, this );
+		/**
+		 * Call parent constructor with passed arguments
+		 */
+		Backbone.Model.apply( this, arguments );
+		this.on( 'change:menu', this._updateMenu, this );
+	},
+	/**
+	 * Ready event callback.
+	 *
+	 * @abstract
+	 * @since 3.5.0
+	 */
+	ready: function() {},
+||||||| .r11156
+		deactivate: function() {
+			this.frame.off( 'open', this.updateSelection, this );
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1905,7 +5084,20 @@ var State = Backbone.Model.extend({
 	_renderTitle: function( view ) {
 		view.$el.text( this.get('title') || '' );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Activate event callback.
+	 *
+	 * @abstract
+	 * @since 3.5.0
+	 */
+	activate: function() {},
+||||||| .r11156
+			media.controller.Library.prototype.deactivate.apply( this, arguments );
+		},
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1914,42 +5106,167 @@ var State = Backbone.Model.extend({
 		var router = this.frame.router,
 			mode = this.get('router'),
 			view;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Deactivate event callback.
+	 *
+	 * @abstract
+	 * @since 3.5.0
+	 */
+	deactivate: function() {},
+||||||| .r11156
+		updateSelection: function() {
+			var selection = this.get('selection'),
+				id = media.view.settings.post.featuredImageId,
+				attachment;
+=======
 		this.frame.$el.toggleClass( 'hide-router', ! mode );
 		if ( ! mode ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Reset event callback.
+	 *
+	 * @abstract
+	 * @since 3.5.0
+	 */
+	reset: function() {},
+||||||| .r11156
+			if ( '' !== id && -1 !== id ) {
+				attachment = media.model.Attachment.get( id );
+				attachment.fetch();
+			}
+=======
 		this.frame.router.render( mode );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_ready: function() {
+		this._updateMenu();
+	},
+||||||| .r11156
+			selection.reset( attachment ? [ attachment ] : [] );
+		}
+	});
+=======
 		view = router.get();
 		if ( view && view.select ) {
 			view.select( this.frame.content.mode() );
 		}
 	},
+>>>>>>> .r12027
+
+	/**
+<<<<<<< .mine
+	 * @access private
+	 * @since 3.5.0
+	*/
+	_preActivate: function() {
+		this.active = true;
+	},
 
 	/**
 	 * @access private
 	 * @since 3.5.0
+||||||| .r11156
+	 * A state for replacing an image.
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
+	 * @access private
+	 * @since 3.5.0
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	_postActivate: function() {
+		this.on( 'change:menu', this._menu, this );
+		this.on( 'change:titleMode', this._title, this );
+		this.on( 'change:content', this._content, this );
+		this.on( 'change:toolbar', this._toolbar, this );
+||||||| .r11156
+	media.controller.ReplaceImage = media.controller.Library.extend({
+		defaults: _.defaults({
+			id:            'replace-image',
+			title:         l10n.replaceImageTitle,
+			// Selection defaults. @see media.model.Selection
+			multiple:      false,
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			filterable:    'uploaded',
+			// Region mode defaults.
+			toolbar:       'replace',
+			menu:          false,
+=======
 	_menu: function() {
 		var menu = this.frame.menu,
 			mode = this.get('menu'),
 			view;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.on( 'title:render:default', this._renderTitle, this );
+||||||| .r11156
+			priority:      60,
+			syncSelection: true
+		}, media.controller.Library.prototype.defaults ),
+=======
 		this.frame.$el.toggleClass( 'hide-menu', ! mode );
 		if ( ! mode ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this._title();
+		this._menu();
+		this._toolbar();
+		this._content();
+		this._router();
+	},
+||||||| .r11156
+		initialize: function( options ) {
+			var library, comparator;
+=======
 		menu.mode( mode );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_deactivate: function() {
+		this.active = false;
+||||||| .r11156
+			this.image = options.image;
+			// If we haven't been provided a `library`, create a `Selection`.
+			if ( ! this.get('library') ) {
+				this.set( 'library', media.query({ type: 'image' }) );
+			}
+=======
 		view = menu.get();
 		if ( view && view.select ) {
 			view.select( this.id );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.off( 'title:render:default', this._renderTitle, this );
+||||||| .r11156
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+=======
 	/**
 	 * @access private
 	 * @since 3.5.0
@@ -1957,16 +5274,62 @@ var State = Backbone.Model.extend({
 	_updateMenu: function() {
 		var previous = this.previous('menu'),
 			menu = this.get('menu');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.off( 'change:menu', this._menu, this );
+		this.off( 'change:titleMode', this._title, this );
+		this.off( 'change:content', this._content, this );
+		this.off( 'change:toolbar', this._toolbar, this );
+	},
+||||||| .r11156
+			library    = this.get('library');
+			comparator = library.comparator;
+=======
 		if ( previous ) {
 			this.frame.off( 'menu:render:' + previous, this._renderMenu, this );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_title: function() {
+		this.frame.title.render( this.get('titleMode') || 'default' );
+	},
+||||||| .r11156
+			// Overload the library's comparator to push items that are not in
+			// the mirrored query to the front of the aggregate collection.
+			library.comparator = function( a, b ) {
+				var aInQuery = !! this.mirroring.get( a.cid ),
+					bInQuery = !! this.mirroring.get( b.cid );
+=======
 		if ( menu ) {
 			this.frame.on( 'menu:render:' + menu, this._renderMenu, this );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_renderTitle: function( view ) {
+		view.$el.text( this.get('title') || '' );
+	},
+||||||| .r11156
+				if ( ! aInQuery && bInQuery ) {
+					return -1;
+				} else if ( aInQuery && ! bInQuery ) {
+					return 1;
+				} else {
+					return comparator.apply( this, arguments );
+				}
+			};
+=======
 	/**
 	 * Create a view in the media menu for the state.
 	 *
@@ -1979,18 +5342,67 @@ var State = Backbone.Model.extend({
 		var menuItem = this.get('menuItem'),
 			title = this.get('title'),
 			priority = this.get('priority');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_router: function() {
+		var router = this.frame.router,
+			mode = this.get('router'),
+			view;
+||||||| .r11156
+			// Add all items in the selection to the library, so any featured
+			// images that are not initially loaded still appear.
+			library.observe( this.get('selection') );
+		},
+=======
 		if ( ! menuItem && title ) {
 			menuItem = { text: title };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.$el.toggleClass( 'hide-router', ! mode );
+		if ( ! mode ) {
+			return;
+		}
+||||||| .r11156
+		activate: function() {
+			this.updateSelection();
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		},
+=======
 			if ( priority ) {
 				menuItem.priority = priority;
 			}
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.router.render( mode );
+
+		view = router.get();
+		if ( view && view.select ) {
+			view.select( this.frame.content.mode() );
+||||||| .r11156
+		updateSelection: function() {
+			var selection = this.get('selection'),
+				attachment = this.image.attachment;
+
+			selection.reset( attachment ? [ attachment ] : [] );
+=======
 		if ( ! menuItem ) {
 			return;
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+	},
+||||||| .r11156
+	});
+=======
+>>>>>>> .r12027
 
 		view.set( this.id, menuItem );
 	}
@@ -1998,8 +5410,34 @@ var State = Backbone.Model.extend({
 
 _.each(['toolbar','content'], function( region ) {
 	/**
+<<<<<<< .mine
 	 * @access private
+	 * @since 3.5.0
+||||||| .r11156
+	 * A state for editing (cropping, etc.) an image.
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
+	 * @access private
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	_menu: function() {
+		var menu = this.frame.menu,
+			mode = this.get('menu'),
+			view;
+||||||| .r11156
+	media.controller.EditImage = media.controller.State.extend({
+		defaults: {
+			id:      'edit-image',
+			title:   l10n.editImage,
+			// Region mode defaults.
+			menu:    false,
+			toolbar: 'edit-image',
+			content: 'edit-image',
+=======
 	State.prototype[ '_' + region ] = function() {
 		var mode = this.get( region );
 		if ( mode ) {
@@ -2007,16 +5445,46 @@ _.each(['toolbar','content'], function( region ) {
 		}
 	};
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.frame.$el.toggleClass( 'hide-menu', ! mode );
+		if ( ! mode ) {
+			return;
+		}
+||||||| .r11156
+			url:     ''
+		},
+=======
 module.exports = State;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		menu.mode( mode );
+||||||| .r11156
+		activate: function() {
+			this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+		},
+=======
 },{}],16:[function(require,module,exports){
 /*globals _ */
+>>>>>>> .r12027
 
-/**
- * wp.media.selectionSync
- *
- * Sync an attachments selection in a state with another state.
+<<<<<<< .mine
+		view = menu.get();
+		if ( view && view.select ) {
+			view.select( this.id );
+		}
+	},
+||||||| .r11156
+		deactivate: function() {
+			this.stopListening( this.frame );
+		},
+=======
+/**
+ * wp.media.selectionSync
+ *
+ * Sync an attachments selection in a state with another state.
  *
  * Allows for selecting multiple images in the Insert Media workflow, and then
  * switching to the Insert Gallery workflow while preserving the attachments selection.
@@ -2030,11 +5498,49 @@ var selectionSync = {
 	syncSelection: function() {
 		var selection = this.get('selection'),
 			manager = this.frame._selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @access private
+	 * @since 3.5.0
+	 */
+	_updateMenu: function() {
+		var previous = this.previous('menu'),
+			menu = this.get('menu');
+||||||| .r11156
+		toolbar: function() {
+			var frame = this.frame,
+				lastState = frame.lastState(),
+				previous = lastState && lastState.id;
+=======
 		if ( ! this.get('syncSelection') || ! manager || ! selection ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( previous ) {
+			this.frame.off( 'menu:render:' + previous, this._renderMenu, this );
+||||||| .r11156
+			frame.toolbar.set( new media.view.Toolbar({
+				controller: frame,
+				items: {
+					back: {
+						style: 'primary',
+						text:     l10n.back,
+						priority: 20,
+						click:    function() {
+							if ( previous ) {
+								frame.setState( previous );
+							} else {
+								frame.close();
+							}
+						}
+					}
+				}
+			}) );
+=======
 		// If the selection supports multiple items, validate the stored
 		// attachments based on the new selection's conditions. Record
 		// the attachments that are not included; we'll maintain a
@@ -2043,39 +5549,133 @@ var selectionSync = {
 			selection.reset( [], { silent: true });
 			selection.validateAll( manager.attachments );
 			manager.difference = _.difference( manager.attachments.models, selection.models );
+>>>>>>> .r12027
+		}
+
+<<<<<<< .mine
+		if ( menu ) {
+			this.frame.on( 'menu:render:' + menu, this._renderMenu, this );
 		}
+	},
 
+||||||| .r11156
+=======
 		// Sync the selection's single item with the master.
 		selection.single( manager.single );
 	},
 
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
+	 * Create a view in the media menu for the state.
+||||||| .r11156
+	 * wp.media.controller.MediaLibrary
+=======
 	 * Record the currently active attachments, which is a combination
 	 * of the selection's attachments and the set of selected
 	 * attachments that this specific selection considered invalid.
 	 * Reset the difference and record the single attachment.
+>>>>>>> .r12027
+	 *
+<<<<<<< .mine
+	 * @access private
+	 * @since 3.5.0
 	 *
+	 * @param {media.view.Menu} view The menu view.
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.controller.Library
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
 	 * @since 3.5.0
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	_renderMenu: function( view ) {
+		var menuItem = this.get('menuItem'),
+			title = this.get('title'),
+			priority = this.get('priority');
+||||||| .r11156
+	media.controller.MediaLibrary = media.controller.Library.extend({
+		defaults: _.defaults({
+			// Attachments browser defaults. @see media.view.AttachmentsBrowser
+			filterable:      'uploaded',
+=======
 	recordSelection: function() {
 		var selection = this.get('selection'),
 			manager = this.frame._selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! menuItem && title ) {
+			menuItem = { text: title };
+||||||| .r11156
+			displaySettings: false,
+			priority:        80,
+			syncSelection:   false
+		}, media.controller.Library.prototype.defaults ),
+=======
 		if ( ! this.get('syncSelection') || ! manager || ! selection ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( priority ) {
+				menuItem.priority = priority;
+			}
+		}
+||||||| .r11156
+		initialize: function( options ) {
+			this.media = options.media;
+			this.type = options.type;
+			this.set( 'library', media.query({ type: this.type }) );
+=======
 		if ( selection.multiple ) {
 			manager.attachments.reset( selection.toArray().concat( manager.difference ) );
 			manager.difference = [];
 		} else {
 			manager.attachments.add( selection.toArray() );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! menuItem ) {
+			return;
+		}
+||||||| .r11156
+			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+=======
 		manager.single = selection._single;
 	}
 };
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		view.set( this.id, menuItem );
+	}
+});
 
+_.each(['toolbar','content'], function( region ) {
+	/**
+	 * @access private
+	 */
+	State.prototype[ '_' + region ] = function() {
+		var mode = this.get( region );
+		if ( mode ) {
+			this.frame[ region ].render( mode );
+		}
+||||||| .r11156
+		activate: function() {
+			if ( media.frame.lastMime ) {
+				this.set( 'library', media.query({ type: media.frame.lastMime }) );
+				delete media.frame.lastMime;
+			}
+			media.controller.Library.prototype.activate.apply( this, arguments );
+		}
+=======
 module.exports = selectionSync;
 
 },{}],17:[function(require,module,exports){
@@ -2109,20 +5709,114 @@ $.support.transition = (function(){
 
 	transition = _.find( _.keys( transitions ), function( transition ) {
 		return ! _.isUndefined( style[ transition ] );
-	});
+>>>>>>> .r12027
+	};
+});
 
+<<<<<<< .mine
+module.exports = State;
+
+},{}],18:[function(require,module,exports){
+/**
+ * wp.media.selectionSync
+ *
+ * Sync an attachments selection in a state with another state.
+ *
+ * Allows for selecting multiple images in the Insert Media workflow, and then
+ * switching to the Insert Gallery workflow while preserving the attachments selection.
+ *
+ * @mixin
+ */
+var selectionSync = {
+	/**
+	 * @since 3.5.0
+	 */
+	syncSelection: function() {
+		var selection = this.get('selection'),
+			manager = this.frame._selection;
+
+		if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+			return;
+		}
+
+		// If the selection supports multiple items, validate the stored
+		// attachments based on the new selection's conditions. Record
+		// the attachments that are not included; we'll maintain a
+		// reference to those. Other attachments are considered in flux.
+		if ( selection.multiple ) {
+			selection.reset( [], { silent: true });
+			selection.validateAll( manager.attachments );
+			manager.difference = _.difference( manager.attachments.models, selection.models );
+		}
+
+		// Sync the selection's single item with the master.
+		selection.single( manager.single );
+	},
+
+	/**
+	 * Record the currently active attachments, which is a combination
+	 * of the selection's attachments and the set of selected
+	 * attachments that this specific selection considered invalid.
+	 * Reset the difference and record the single attachment.
+	 *
+	 * @since 3.5.0
+	 */
+	recordSelection: function() {
+		var selection = this.get('selection'),
+			manager = this.frame._selection;
+||||||| .r11156
+	/**
+	 * wp.media.controller.Embed
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+	 */
+	media.controller.Embed = media.controller.State.extend({
+		defaults: {
+			id:       'embed',
+			title:    l10n.insertFromUrlTitle,
+			// Region mode defaults.
+			content:  'embed',
+			menu:     'default',
+			toolbar:  'main-embed',
+=======
 	return transition && {
 		end: transitions[ transition ]
 	};
 }());
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+			return;
+		}
+||||||| .r11156
+			priority: 120,
+			type:     'link',
+			url:      '',
+			metadata: {}
+		},
+=======
 /**
  * A shared event bus used to provide events into
  * the media workflows that 3rd-party devs can use to hook
  * in.
  */
 media.events = _.extend( {}, Backbone.Events );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( selection.multiple ) {
+			manager.attachments.reset( selection.toArray().concat( manager.difference ) );
+			manager.difference = [];
+		} else {
+			manager.attachments.add( selection.toArray() );
+		}
+||||||| .r11156
+		// The amount of time used when debouncing the scan.
+		sensitivity: 200,
+=======
 /**
  * Makes it easier to bind events using transitions.
  *
@@ -2132,32 +5826,142 @@ media.events = _.extend( {}, Backbone.Events );
  */
 media.transition = function( selector, sensitivity ) {
 	var deferred = $.Deferred();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		manager.single = selection._single;
+	}
+};
+||||||| .r11156
+		initialize: function(options) {
+			this.metadata = options.metadata;
+			this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
+			this.props = new Backbone.Model( this.metadata || { url: '' });
+			this.props.on( 'change:url', this.debouncedScan, this );
+			this.props.on( 'change:url', this.refresh, this );
+			this.on( 'scan', this.scanImage, this );
+		},
+=======
 	sensitivity = sensitivity || 2000;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = selectionSync;
+||||||| .r11156
+		/**
+		 * @fires wp.media.controller.Embed#scan
+		 */
+		scan: function() {
+			var scanners,
+				embed = this,
+				attributes = {
+					type: 'link',
+					scanners: []
+				};
+=======
 	if ( $.support.transition ) {
 		if ( ! (selector instanceof $) ) {
 			selector = $( selector );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],19:[function(require,module,exports){
+var media = wp.media,
+	$ = jQuery,
+	l10n;
+||||||| .r11156
+			// Scan is triggered with the list of `attributes` to set on the
+			// state, useful for the 'type' attribute and 'scanners' attribute,
+			// an array of promise objects for asynchronous scan operations.
+			if ( this.props.get('url') ) {
+				this.trigger( 'scan', attributes );
+			}
+=======
 		// Resolve the deferred when the first element finishes animating.
 		selector.first().one( $.support.transition.end, deferred.resolve );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+media.isTouchDevice = ( 'ontouchend' in document );
+||||||| .r11156
+			if ( attributes.scanners.length ) {
+				scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
+				scanners.always( function() {
+					if ( embed.get('scanners') === scanners ) {
+						embed.set( 'loading', false );
+					}
+				});
+			} else {
+				attributes.scanners = null;
+			}
+=======
 		// Just in case the event doesn't trigger, fire a callback.
 		_.delay( deferred.resolve, sensitivity );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Link any localized strings.
+l10n = media.view.l10n = window._wpMediaViewsL10n || {};
+||||||| .r11156
+			attributes.loading = !! attributes.scanners;
+			this.set( attributes );
+		},
+		/**
+		 * @param {Object} attributes
+		 */
+		scanImage: function( attributes ) {
+			var frame = this.frame,
+				state = this,
+				url = this.props.get('url'),
+				image = new Image(),
+				deferred = $.Deferred();
+=======
 	// Otherwise, execute on the spot.
 	} else {
 		deferred.resolve();
 	}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Link any settings.
+media.view.settings = l10n.settings || {};
+delete l10n.settings;
+||||||| .r11156
+			attributes.scanners.push( deferred.promise() );
+=======
 	return deferred.promise();
 };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Copy the `post` setting over to the model settings.
+media.model.settings.post = media.view.settings.post;
+||||||| .r11156
+			// Try to load the image and find its width/height.
+			image.onload = function() {
+				deferred.resolve();
+=======
 media.controller.Region = require( './controllers/region.js' );
 media.controller.StateMachine = require( './controllers/state-machine.js' );
 media.controller.State = require( './controllers/state.js' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Check if the browser supports CSS 3.0 transitions
+$.support.transition = (function(){
+	var style = document.documentElement.style,
+		transitions = {
+			WebkitTransition: 'webkitTransitionEnd',
+			MozTransition:    'transitionend',
+			OTransition:      'oTransitionEnd otransitionend',
+			transition:       'transitionend'
+		}, transition;
+||||||| .r11156
+				if ( state !== frame.state() || url !== state.props.get('url') ) {
+					return;
+				}
+=======
 media.selectionSync = require( './utils/selection-sync.js' );
 media.controller.Library = require( './controllers/library.js' );
 media.controller.ImageDetails = require( './controllers/image-details.js' );
@@ -2171,7 +5975,17 @@ media.controller.EditImage = require( './controllers/edit-image.js' );
 media.controller.MediaLibrary = require( './controllers/media-library.js' );
 media.controller.Embed = require( './controllers/embed.js' );
 media.controller.Cropper = require( './controllers/cropper.js' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	transition = _.find( _.keys( transitions ), function( transition ) {
+		return ! _.isUndefined( style[ transition ] );
+	});
+||||||| .r11156
+				state.set({
+					type: 'image'
+				});
+=======
 media.View = require( './views/view.js' );
 media.view.Frame = require( './views/frame.js' );
 media.view.MediaFrame = require( './views/media-frame.js' );
@@ -2226,10 +6040,36 @@ media.view.ImageDetails = require( './views/image-details.js' );
 media.view.Cropper = require( './views/cropper.js' );
 media.view.EditImage = require( './views/edit-image.js' );
 media.view.Spinner = require( './views/spinner.js' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	return transition && {
+		end: transitions[ transition ]
+	};
+}());
+||||||| .r11156
+				state.props.set({
+					width:  image.width,
+					height: image.height
+				});
+			};
+=======
 },{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/edit-image.js":4,"./controllers/embed.js":5,"./controllers/featured-image.js":6,"./controllers/gallery-add.js":7,"./controllers/gallery-edit.js":8,"./controllers/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,"./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame.js":41,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,"./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(require,module,exports){
 /*globals _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+/**
+ * A shared event bus used to provide events into
+ * the media workflows that 3rd-party devs can use to hook
+ * in.
+ */
+media.events = _.extend( {}, Backbone.Events );
+||||||| .r11156
+			image.onerror = deferred.reject;
+			image.src = url;
+		},
+=======
 /**
  * wp.media.view.AttachmentCompat
  *
@@ -2242,18 +6082,51 @@ media.view.Spinner = require( './views/spinner.js' );
  */
 var View = wp.media.View,
 	AttachmentCompat;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+/**
+ * Makes it easier to bind events using transitions.
+ *
+ * @param {string} selector
+ * @param {Number} sensitivity
+ * @returns {Promise}
+ */
+media.transition = function( selector, sensitivity ) {
+	var deferred = $.Deferred();
+||||||| .r11156
+		refresh: function() {
+			this.frame.toolbar.get().refresh();
+		},
+=======
 AttachmentCompat = View.extend({
 	tagName:   'form',
 	className: 'compat-item',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	sensitivity = sensitivity || 2000;
+||||||| .r11156
+		reset: function() {
+			this.props.clear().set({ url: '' });
+=======
 	events: {
 		'submit':          'preventDefault',
 		'change input':    'save',
 		'change select':   'save',
 		'change textarea': 'save'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	if ( $.support.transition ) {
+		if ( ! (selector instanceof $) ) {
+			selector = $( selector );
+||||||| .r11156
+			if ( this.active ) {
+				this.refresh();
+			}
+=======
 	initialize: function() {
 		this.listenTo( this.model, 'change:compat', this.render );
 	},
@@ -2263,7 +6136,12 @@ AttachmentCompat = View.extend({
 	dispose: function() {
 		if ( this.$(':focus').length ) {
 			this.save();
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+||||||| .r11156
+	});
+=======
 		/**
 		 * call 'dispose' directly on the parent class
 		 */
@@ -2277,65 +6155,332 @@ AttachmentCompat = View.extend({
 		if ( ! compat || ! compat.item ) {
 			return;
 		}
+>>>>>>> .r12027
 
-		this.views.detach();
-		this.$el.html( compat.item );
-		this.views.render();
-		return this;
-	},
-	/**
-	 * @param {Object} event
-	 */
-	preventDefault: function( event ) {
-		event.preventDefault();
-	},
-	/**
-	 * @param {Object} event
-	 */
-	save: function( event ) {
-		var data = {};
-
-		if ( event ) {
-			event.preventDefault();
-		}
-
-		_.each( this.$el.serializeArray(), function( pair ) {
-			data[ pair.name ] = pair.value;
-		});
+<<<<<<< .mine
+		// Resolve the deferred when the first element finishes animating.
+		selector.first().one( $.support.transition.end, deferred.resolve );
 
-		this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
-		this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
-	},
+		// Just in case the event doesn't trigger, fire a callback.
+		_.delay( deferred.resolve, sensitivity );
 
-	postSave: function() {
-		this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+	// Otherwise, execute on the spot.
+	} else {
+		deferred.resolve();
 	}
-});
-
-module.exports = AttachmentCompat;
-
-},{}],19:[function(require,module,exports){
-/*globals _, jQuery */
 
-/**
- * wp.media.view.AttachmentFilters
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = jQuery,
-	AttachmentFilters;
+	return deferred.promise();
+};
 
-AttachmentFilters = wp.media.View.extend({
-	tagName:   'select',
-	className: 'attachment-filters',
-	id:        'media-attachment-filters',
+media.controller.Region = require( './controllers/region.js' );
+media.controller.StateMachine = require( './controllers/state-machine.js' );
+media.controller.State = require( './controllers/state.js' );
 
-	events: {
-		change: 'change'
-	},
+media.selectionSync = require( './utils/selection-sync.js' );
+media.controller.Library = require( './controllers/library.js' );
+media.controller.ImageDetails = require( './controllers/image-details.js' );
+media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
+media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
+media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
+media.controller.CollectionAdd = require( './controllers/collection-add.js' );
+media.controller.FeaturedImage = require( './controllers/featured-image.js' );
+media.controller.ReplaceImage = require( './controllers/replace-image.js' );
+media.controller.EditImage = require( './controllers/edit-image.js' );
+media.controller.MediaLibrary = require( './controllers/media-library.js' );
+media.controller.Embed = require( './controllers/embed.js' );
+media.controller.Cropper = require( './controllers/cropper.js' );
+media.controller.CustomizeImageCropper = require( './controllers/customize-image-cropper.js' );
+media.controller.SiteIconCropper = require( './controllers/site-icon-cropper.js' );
+
+media.View = require( './views/view.js' );
+media.view.Frame = require( './views/frame.js' );
+media.view.MediaFrame = require( './views/media-frame.js' );
+media.view.MediaFrame.Select = require( './views/frame/select.js' );
+media.view.MediaFrame.Post = require( './views/frame/post.js' );
+media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
+media.view.Modal = require( './views/modal.js' );
+media.view.FocusManager = require( './views/focus-manager.js' );
+media.view.UploaderWindow = require( './views/uploader/window.js' );
+media.view.EditorUploader = require( './views/uploader/editor.js' );
+media.view.UploaderInline = require( './views/uploader/inline.js' );
+media.view.UploaderStatus = require( './views/uploader/status.js' );
+media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
+media.view.Toolbar = require( './views/toolbar.js' );
+media.view.Toolbar.Select = require( './views/toolbar/select.js' );
+media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
+media.view.Button = require( './views/button.js' );
+media.view.ButtonGroup = require( './views/button-group.js' );
+media.view.PriorityList = require( './views/priority-list.js' );
+media.view.MenuItem = require( './views/menu-item.js' );
+media.view.Menu = require( './views/menu.js' );
+media.view.RouterItem = require( './views/router-item.js' );
+media.view.Router = require( './views/router.js' );
+media.view.Sidebar = require( './views/sidebar.js' );
+media.view.Attachment = require( './views/attachment.js' );
+media.view.Attachment.Library = require( './views/attachment/library.js' );
+media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
+media.view.Attachments = require( './views/attachments.js' );
+media.view.Search = require( './views/search.js' );
+media.view.AttachmentFilters = require( './views/attachment-filters.js' );
+media.view.DateFilter = require( './views/attachment-filters/date.js' );
+media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
+media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
+media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
+media.view.Selection = require( './views/selection.js' );
+media.view.Attachment.Selection = require( './views/attachment/selection.js' );
+media.view.Attachments.Selection = require( './views/attachments/selection.js' );
+media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
+media.view.Settings = require( './views/settings.js' );
+media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
+media.view.Settings.Gallery = require( './views/settings/gallery.js' );
+media.view.Settings.Playlist = require( './views/settings/playlist.js' );
+media.view.Attachment.Details = require( './views/attachment/details.js' );
+media.view.AttachmentCompat = require( './views/attachment-compat.js' );
+media.view.Iframe = require( './views/iframe.js' );
+media.view.Embed = require( './views/embed.js' );
+media.view.Label = require( './views/label.js' );
+media.view.EmbedUrl = require( './views/embed/url.js' );
+media.view.EmbedLink = require( './views/embed/link.js' );
+media.view.EmbedImage = require( './views/embed/image.js' );
+media.view.ImageDetails = require( './views/image-details.js' );
+media.view.Cropper = require( './views/cropper.js' );
+media.view.SiteIconCropper = require( './views/site-icon-cropper.js' );
+media.view.SiteIconPreview = require( './views/site-icon-preview.js' );
+media.view.EditImage = require( './views/edit-image.js' );
+media.view.Spinner = require( './views/spinner.js' );
+
+},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/customize-image-cropper.js":4,"./controllers/edit-image.js":5,"./controllers/embed.js":6,"./controllers/featured-image.js":7,"./controllers/gallery-add.js":8,"./controllers/gallery-edit.js":9,"./controllers/image-details.js":10,"./controllers/library.js":11,"./controllers/media-library.js":12,"./controllers/region.js":13,"./controllers/replace-image.js":14,"./controllers/site-icon-cropper.js":15,"./controllers/state-machine.js":16,"./controllers/state.js":17,"./utils/selection-sync.js":18,"./views/attachment-compat.js":20,"./views/attachment-filters.js":21,"./views/attachment-filters/all.js":22,"./views/attachment-filters/date.js":23,"./views/attachment-filters/uploaded.js":24,"./views/attachment.js":25,"./views/attachment/details.js":26,"./views/attachment/edit-library.js":27,"./views/attachment/edit-selection.js":28,"./views/attachment/library.js":29,"./views/attachment/selection.js":30,"./views/attachments.js":31,"./views/attachments/browser.js":32,"./views/attachments/selection.js":33,"./views/button-group.js":34,"./views/button.js":35,"./views/cropper.js":36,"./views/edit-image.js":37,"./views/embed.js":38,"./views/embed/image.js":39,"./views/embed/link.js":40,"./views/embed/url.js":41,"./views/focus-manager.js":42,"./views/frame.js":43,"./views/frame/image-details.js":44,"./views/frame/post.js":45,"./views/frame/select.js":46,"./views/iframe.js":47,"./views/image-details.js":48,"./views/label.js":49,"./views/media-frame.js":50,"./views/menu-item.js":51,"./views/menu.js":52,"./views/modal.js":53,"./views/priority-list.js":54,"./views/router-item.js":55,"./views/router.js":56,"./views/search.js":57,"./views/selection.js":58,"./views/settings.js":59,"./views/settings/attachment-display.js":60,"./views/settings/gallery.js":61,"./views/settings/playlist.js":62,"./views/sidebar.js":63,"./views/site-icon-cropper.js":64,"./views/site-icon-preview.js":65,"./views/spinner.js":66,"./views/toolbar.js":67,"./views/toolbar/embed.js":68,"./views/toolbar/select.js":69,"./views/uploader/editor.js":70,"./views/uploader/inline.js":71,"./views/uploader/status-error.js":72,"./views/uploader/status.js":73,"./views/uploader/window.js":74,"./views/view.js":75}],20:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentCompat
+ *
+ * A view to display fields added via the `attachment_fields_to_edit` filter.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	AttachmentCompat;
+
+AttachmentCompat = View.extend({
+	tagName:   'form',
+	className: 'compat-item',
+
+	events: {
+		'submit':          'preventDefault',
+		'change input':    'save',
+		'change select':   'save',
+		'change textarea': 'save'
+	},
+
+	initialize: function() {
+		this.listenTo( this.model, 'change:compat', this.render );
+	},
+||||||| .r11156
+=======
+		this.views.detach();
+		this.$el.html( compat.item );
+		this.views.render();
+		return this;
+	},
+>>>>>>> .r12027
+	/**
+<<<<<<< .mine
+	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+||||||| .r11156
+	 * wp.media.controller.Cropper
+	 *
+	 * Allows for a cropping step.
+	 *
+	 * @constructor
+	 * @augments wp.media.controller.State
+	 * @augments Backbone.Model
+=======
+	 * @param {Object} event
+>>>>>>> .r12027
+	 */
+<<<<<<< .mine
+	dispose: function() {
+		if ( this.$(':focus').length ) {
+			this.save();
+		}
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		return View.prototype.dispose.apply( this, arguments );
+	},
+	/**
+	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+	 */
+	render: function() {
+		var compat = this.model.get('compat');
+		if ( ! compat || ! compat.item ) {
+			return;
+		}
+||||||| .r11156
+	media.controller.Cropper = media.controller.State.extend({
+		defaults: {
+			id:          'cropper',
+			title:       l10n.cropImage,
+			// Region mode defaults.
+			toolbar:     'crop',
+			content:     'crop',
+			router:      false,
+=======
+	preventDefault: function( event ) {
+		event.preventDefault();
+	},
+	/**
+	 * @param {Object} event
+	 */
+	save: function( event ) {
+		var data = {};
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.views.detach();
+		this.$el.html( compat.item );
+		this.views.render();
+		return this;
+	},
+	/**
+	 * @param {Object} event
+	 */
+	preventDefault: function( event ) {
+		event.preventDefault();
+	},
+	/**
+	 * @param {Object} event
+	 */
+	save: function( event ) {
+		var data = {};
+||||||| .r11156
+			canSkipCrop: false
+		},
+=======
+		if ( event ) {
+			event.preventDefault();
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( event ) {
+			event.preventDefault();
+		}
+||||||| .r11156
+		activate: function() {
+			this.frame.on( 'content:create:crop', this.createCropContent, this );
+			this.frame.on( 'close', this.removeCropper, this );
+			this.set('selection', new Backbone.Collection(this.frame._selection.single));
+		},
+=======
+		_.each( this.$el.serializeArray(), function( pair ) {
+			data[ pair.name ] = pair.value;
+		});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		_.each( this.$el.serializeArray(), function( pair ) {
+			data[ pair.name ] = pair.value;
+		});
+||||||| .r11156
+		deactivate: function() {
+			this.frame.toolbar.mode('browse');
+		},
+=======
+		this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
+		this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
+		this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
+	},
+||||||| .r11156
+		createCropContent: function() {
+			this.cropperView = new wp.media.view.Cropper({controller: this,
+					attachment: this.get('selection').first() });
+			this.cropperView.on('image-loaded', this.createCropToolbar, this);
+			this.frame.content.set(this.cropperView);
+=======
+	postSave: function() {
+		this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+	}
+});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	postSave: function() {
+		this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+	}
+});
+||||||| .r11156
+		},
+		removeCropper: function() {
+			this.imgSelect.cancelSelection();
+			this.imgSelect.setOptions({remove: true});
+			this.imgSelect.update();
+			this.cropperView.remove();
+		},
+		createCropToolbar: function() {
+			var canSkipCrop, toolbarOptions;
+=======
+module.exports = AttachmentCompat;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = AttachmentCompat;
+||||||| .r11156
+			canSkipCrop = this.get('canSkipCrop') || false;
+=======
+},{}],19:[function(require,module,exports){
+/*globals _, jQuery */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],21:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentFilters
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+	AttachmentFilters;
+||||||| .r11156
+			toolbarOptions = {
+				controller: this.frame,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     l10n.cropImage,
+						priority: 80,
+						requires: { library: false, selection: false },
+=======
+/**
+ * wp.media.view.AttachmentFilters
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+	AttachmentFilters;
+>>>>>>> .r12027
+
+AttachmentFilters = wp.media.View.extend({
+	tagName:   'select',
+	className: 'attachment-filters',
+	id:        'media-attachment-filters',
+
+	events: {
+		change: 'change'
+	},
 
 	keys: [],
 
@@ -2387,15 +6532,14 @@ AttachmentFilters = wp.media.View.extend({
 			}
 		});
 
+<<<<<<< .mine
 		this.$el.val( value );
 	}
 });
 
 module.exports = AttachmentFilters;
 
-},{}],20:[function(require,module,exports){
-/*globals wp */
-
+},{}],22:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.All
  *
@@ -2449,42 +6593,170 @@ All = wp.media.view.AttachmentFilters.extend({
 				},
 				priority: 20
 			};
-		}
-
-		filters.unattached = {
-			text:  l10n.unattached,
-			props: {
-				status:     null,
-				uploadedTo: 0,
-				type:       null,
-				orderby:    'menuOrder',
-				order:      'ASC'
-			},
-			priority: 50
-		};
-
-		if ( wp.media.view.settings.mediaTrash &&
-			this.controller.isModeActive( 'grid' ) ) {
-
-			filters.trash = {
-				text:  l10n.trash,
-				props: {
-					uploadedTo: null,
-					status:     'trash',
-					type:       null,
-					orderby:    'date',
-					order:      'DESC'
-				},
-				priority: 50
-			};
-		}
-
-		this.filters = filters;
+||||||| .r11156
+			return this;
+		},
+		/**
+		 * @returns {wp.media.View} Returns itself to allow chaining
+		 */
+		remove: function() {
+			this.dispose();
+			/**
+			 * call 'remove' directly on the parent class
+			 */
+			return wp.Backbone.View.prototype.remove.apply( this, arguments );
+=======
+		this.$el.val( value );
+	}
+});
+
+module.exports = AttachmentFilters;
+
+},{}],20:[function(require,module,exports){
+/*globals wp */
+
+/**
+ * wp.media.view.AttachmentFilters.All
+ *
+ * @class
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	All;
+
+All = wp.media.view.AttachmentFilters.extend({
+	createFilters: function() {
+		var filters = {};
+
+		_.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
+			filters[ key ] = {
+				text: text,
+				props: {
+					status:  null,
+					type:    key,
+					uploadedTo: null,
+					orderby: 'date',
+					order:   'DESC'
+				}
+			};
+		});
+
+		filters.all = {
+			text:  l10n.allMediaItems,
+			props: {
+				status:  null,
+				type:    null,
+				uploadedTo: null,
+				orderby: 'date',
+				order:   'DESC'
+			},
+			priority: 10
+		};
+
+		if ( wp.media.view.settings.post.id ) {
+			filters.uploaded = {
+				text:  l10n.uploadedToThisPost,
+				props: {
+					status:  null,
+					type:    null,
+					uploadedTo: wp.media.view.settings.post.id,
+					orderby: 'menuOrder',
+					order:   'ASC'
+				},
+				priority: 20
+			};
+>>>>>>> .r12027
+		}
+
+		filters.unattached = {
+			text:  l10n.unattached,
+			props: {
+				status:     null,
+				uploadedTo: 0,
+				type:       null,
+				orderby:    'menuOrder',
+				order:      'ASC'
+			},
+			priority: 50
+		};
+
+		if ( wp.media.view.settings.mediaTrash &&
+			this.controller.isModeActive( 'grid' ) ) {
+
+			filters.trash = {
+				text:  l10n.trash,
+				props: {
+					uploadedTo: null,
+					status:     'trash',
+					type:       null,
+					orderby:    'date',
+					order:      'DESC'
+				},
+				priority: 50
+			};
+		}
+
+		this.filters = filters;
 	}
 });
 
 module.exports = All;
 
+<<<<<<< .mine
+},{}],23:[function(require,module,exports){
+/**
+ * A filter dropdown for month/dates.
+ *
+ * @class
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	DateFilter;
+
+DateFilter = wp.media.view.AttachmentFilters.extend({
+	id: 'media-attachment-date-filters',
+
+	createFilters: function() {
+		var filters = {};
+		_.each( wp.media.view.settings.months || {}, function( value, index ) {
+			filters[ index ] = {
+				text: value.text,
+				props: {
+					year: value.year,
+					monthnum: value.month
+||||||| .r11156
+			_.each( this.options.mode, function( mode ) {
+				this.activateMode( mode );
+			}, this );
+		},
+		/**
+		 * @returns {wp.media.view.Frame} Returns itself to allow chaining
+		 */
+		reset: function() {
+			this.states.invoke( 'trigger', 'reset' );
+			return this;
+		},
+		/**
+		 * Map activeMode collection events to the frame.
+		 */
+		triggerModeEvents: function( model, collection, options ) {
+			var collectionEvent,
+				modeEventMap = {
+					add: 'activate',
+					remove: 'deactivate'
+				},
+				eventToTrigger;
+			// Probably a better way to do this.
+			_.each( options, function( value, key ) {
+				if ( value ) {
+					collectionEvent = key;
+=======
 },{}],21:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -2511,6 +6783,7 @@ DateFilter = wp.media.view.AttachmentFilters.extend({
 				props: {
 					year: value.year,
 					monthnum: value.month
+>>>>>>> .r12027
 				}
 			};
 		});
@@ -2528,9 +6801,96 @@ DateFilter = wp.media.view.AttachmentFilters.extend({
 
 module.exports = DateFilter;
 
+<<<<<<< .mine
+},{}],24:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentFilters.Uploaded
+ *
+ * @class
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	Uploaded;
+||||||| .r11156
+			eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
+			this.trigger( eventToTrigger );
+		},
+		/**
+		 * Activate a mode on the frame.
+		 *
+		 * @param string mode Mode ID.
+		 * @returns {this} Returns itself to allow chaining.
+		 */
+		activateMode: function( mode ) {
+			// Bail if the mode is already active.
+			if ( this.isModeActive( mode ) ) {
+				return;
+			}
+			this.activeModes.add( [ { id: mode } ] );
+			// Add a CSS class to the frame so elements can be styled for the mode.
+			this.$el.addClass( 'mode-' + mode );
+=======
 },{}],22:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+Uploaded = wp.media.view.AttachmentFilters.extend({
+	createFilters: function() {
+		var type = this.model.get('type'),
+			types = wp.media.view.settings.mimeTypes,
+			text;
+
+		if ( types && type ) {
+			text = types[ type ];
+		}
+
+		this.filters = {
+			all: {
+				text:  text || l10n.allMediaItems,
+				props: {
+					uploadedTo: null,
+					orderby: 'date',
+					order:   'DESC'
+				},
+				priority: 10
+			},
+
+			uploaded: {
+				text:  l10n.uploadedToThisPost,
+				props: {
+					uploadedTo: wp.media.view.settings.post.id,
+					orderby: 'menuOrder',
+					order:   'ASC'
+				},
+				priority: 20
+			},
 
+			unattached: {
+				text:  l10n.unattached,
+				props: {
+					uploadedTo: 0,
+					orderby: 'menuOrder',
+					order:   'ASC'
+				},
+				priority: 50
+||||||| .r11156
+			return this;
+		},
+		/**
+		 * Deactivate a mode on the frame.
+		 *
+		 * @param string mode Mode ID.
+		 * @returns {this} Returns itself to allow chaining.
+		 */
+		deactivateMode: function( mode ) {
+			// Bail if the mode isn't active.
+			if ( ! this.isModeActive( mode ) ) {
+				return this;
+=======
 /**
  * wp.media.view.AttachmentFilters.Uploaded
  *
@@ -2582,11 +6942,78 @@ Uploaded = wp.media.view.AttachmentFilters.extend({
 					order:   'ASC'
 				},
 				priority: 50
+>>>>>>> .r12027
 			}
 		};
 	}
 });
 
+<<<<<<< .mine
+module.exports = Uploaded;
+
+},{}],25:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = jQuery,
+	Attachment;
+
+Attachment = View.extend({
+	tagName:   'li',
+	className: 'attachment',
+	template:  wp.template('attachment'),
+
+	attributes: function() {
+		return {
+			'tabIndex':     0,
+			'role':         'checkbox',
+			'aria-label':   this.model.get( 'title' ),
+			'aria-checked': false,
+			'data-id':      this.model.get( 'id' )
+		};
+	},
+
+	events: {
+		'click .js--select-attachment':   'toggleSelectionHandler',
+		'change [data-setting]':          'updateSetting',
+		'change [data-setting] input':    'updateSetting',
+		'change [data-setting] select':   'updateSetting',
+		'change [data-setting] textarea': 'updateSetting',
+		'click .attachment-close':        'removeFromLibrary',
+		'click .check':                   'checkClickHandler',
+		'keydown':                        'toggleSelectionHandler'
+	},
+
+	buttons: {},
+
+	initialize: function() {
+		var selection = this.options.selection,
+			options = _.defaults( this.options, {
+				rerenderOnModelChange: true
+			} );
+
+		if ( options.rerenderOnModelChange ) {
+			this.listenTo( this.model, 'change', this.render );
+		} else {
+			this.listenTo( this.model, 'change:percent', this.progress );
+||||||| .r11156
+			return this;
+		},
+		/**
+		 * Check if a mode is enabled on the frame.
+		 *
+		 * @param  string mode Mode ID.
+		 * @return bool
+		 */
+		isModeActive: function( mode ) {
+			return Boolean( this.activeModes.where( { id: mode } ).length );
+=======
 module.exports = Uploaded;
 
 },{}],23:[function(require,module,exports){
@@ -2644,6 +7071,7 @@ Attachment = View.extend({
 			this.listenTo( this.model, 'change', this.render );
 		} else {
 			this.listenTo( this.model, 'change:percent', this.progress );
+>>>>>>> .r12027
 		}
 		this.listenTo( this.model, 'change:title', this._syncTitle );
 		this.listenTo( this.model, 'change:caption', this._syncCaption );
@@ -2756,10 +7184,28 @@ Attachment = View.extend({
 	toggleSelectionHandler: function( event ) {
 		var method;
 
+<<<<<<< .mine
+		// Don't do anything inside inputs and on the attachment check and remove buttons.
+		if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
+			return;
+		}
+||||||| .r11156
+			// Generate the tab states.
+			_.each( tabs, function( title, id ) {
+				this.state( 'iframe:' + id ).set( _.defaults({
+					tab:     id,
+					src:     tabUrl + '&tab=' + id,
+					title:   title,
+					content: 'iframe',
+					menu:    'default'
+				}, options ) );
+			}, this );
+=======
 		// Don't do anything inside inputs.
 		if ( 'INPUT' === event.target.nodeName ) {
 			return;
 		}
+>>>>>>> .r12027
 
 		// Catch arrow events
 		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
@@ -2797,6 +7243,23 @@ Attachment = View.extend({
 			method: method
 		});
 
+<<<<<<< .mine
+		this.controller.trigger( 'selection:toggle' );
+	},
+	/**
+	 * @param {Object} options
+	 */
+	toggleSelection: function( options ) {
+		var collection = this.collection,
+			selection = this.options.selection,
+			model = this.model,
+			method = options && options.method,
+			single, models, singleIndex, modelIndex;
+||||||| .r11156
+			if ( ! window.tb_remove || this._tb_remove ) {
+				return;
+			}
+=======
 		this.controller.trigger( 'selection:toggle' );
 	},
 	/**
@@ -2823,16 +7286,57 @@ Attachment = View.extend({
 			if ( single === model ) {
 				return;
 			}
+>>>>>>> .r12027
 
-			singleIndex = collection.indexOf( single );
+<<<<<<< .mine
+		if ( ! selection ) {
+			return;
+		}
+||||||| .r11156
+			this._tb_remove = window.tb_remove;
+			window.tb_remove = function() {
+				frame.close();
+				frame.reset();
+				frame.setState( frame.options.state );
+				frame._tb_remove.call( window );
+			};
+		},
+=======
+			singleIndex = collection.indexOf( single );
 			modelIndex  = collection.indexOf( this.model );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		single = selection.single();
+		method = _.isUndefined( method ) ? selection.multiple : method;
 
+		// If the `method` is set to `between`, select all models that
+		// exist between the current and the selected model.
+		if ( 'between' === method && single && selection.multiple ) {
+			// If the models are the same, short-circuit.
+			if ( single === model ) {
+				return;
+||||||| .r11156
+		restoreThickbox: function() {
+			if ( ! this._tb_remove ) {
+				return;
+=======
 			if ( singleIndex < modelIndex ) {
 				models = collection.models.slice( singleIndex, modelIndex + 1 );
 			} else {
 				models = collection.models.slice( modelIndex, singleIndex + 1 );
+>>>>>>> .r12027
 			}
 
+<<<<<<< .mine
+			singleIndex = collection.indexOf( single );
+			modelIndex  = collection.indexOf( this.model );
+||||||| .r11156
+			window.tb_remove = this._tb_remove;
+			delete this._tb_remove;
+		}
+	});
+=======
 			selection.add( models );
 			selection.single( model );
 			return;
@@ -2848,12 +7352,59 @@ Attachment = View.extend({
 			selection.single( model );
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( singleIndex < modelIndex ) {
+				models = collection.models.slice( singleIndex, modelIndex + 1 );
+			} else {
+				models = collection.models.slice( modelIndex, singleIndex + 1 );
+			}
+||||||| .r11156
+	// Map some of the modal's methods to the frame.
+	_.each(['open','close','attach','detach','escape'], function( method ) {
+		/**
+		 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
+		 */
+		media.view.MediaFrame.prototype[ method ] = function() {
+			if ( this.modal ) {
+				this.modal[ method ].apply( this.modal, arguments );
+			}
+			return this;
+		};
+	});
+=======
 		// Fixes bug that loses focus when selecting a featured image
 		if ( ! method ) {
 			method = 'add';
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			selection.add( models );
+			selection.single( model );
+			return;
+||||||| .r11156
+	/**
+	 * wp.media.view.MediaFrame.Select
+	 *
+	 * Type of media frame that is used to select an item or items from the media library
+	 *
+	 * @constructor
+	 * @augments wp.media.view.MediaFrame
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+	 */
+	media.view.MediaFrame.Select = media.view.MediaFrame.extend({
+		initialize: function() {
+			/**
+			 * call 'initialize' directly on the parent class
+			 */
+			media.view.MediaFrame.prototype.initialize.apply( this, arguments );
+=======
 		if ( method !== 'add' ) {
 			method = 'reset';
 		}
@@ -2891,19 +7442,70 @@ Attachment = View.extend({
 	select: function( model, collection ) {
 		var selection = this.options.selection,
 			controller = this.controller;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the `method` is set to `toggle`, just flip the selection
+		// status, regardless of whether the model is the single model.
+		} else if ( 'toggle' === method ) {
+			selection[ this.selected() ? 'remove' : 'add' ]( model );
+			selection.single( model );
+			return;
+		} else if ( 'add' === method ) {
+			selection.add( model );
+			selection.single( model );
+			return;
+		}
+||||||| .r11156
+			_.defaults( this.options, {
+				selection: [],
+				library:   {},
+				multiple:  false,
+				state:    'library'
+			});
+=======
 		// Check if a selection exists and if it's the collection provided.
 		// If they're not the same collection, bail; we're in another
 		// selection's event loop.
 		if ( ! selection || ( collection && collection !== selection ) ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Fixes bug that loses focus when selecting a featured image
+		if ( ! method ) {
+			method = 'add';
+		}
+||||||| .r11156
+			this.createSelection();
+			this.createStates();
+			this.bindHandlers();
+		},
+=======
 		// Bail if the model is already selected.
 		if ( this.$el.hasClass( 'selected' ) ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( method !== 'add' ) {
+			method = 'reset';
+		}
+||||||| .r11156
+		/**
+		 * Attach a selection collection to the frame.
+		 *
+		 * A selection is a collection of attachments used for a specific purpose
+		 * by a media frame. e.g. Selecting an attachment (or many) to insert into
+		 * post content.
+		 *
+		 * @see media.model.Selection
+		 */
+		createSelection: function() {
+			var selection = this.options.selection;
+=======
 		// Add 'selected' class to model, set aria-checked to true.
 		this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
 		//  Make the checkbox tabable, except in media grid (bulk select mode).
@@ -2917,7 +7519,29 @@ Attachment = View.extend({
 	 */
 	deselect: function( model, collection ) {
 		var selection = this.options.selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.selected() ) {
+			// If the model is the single model, remove it.
+			// If it is not the same as the single model,
+			// it now becomes the single model.
+			selection[ single === model ? 'remove' : 'single' ]( model );
+		} else {
+			// If the model is not selected, run the `method` on the
+			// selection. By default, we `reset` the selection, but the
+			// `method` can be set to `add` the model to the selection.
+			selection[ method ]( model );
+			selection.single( model );
+		}
+	},
+||||||| .r11156
+			if ( ! (selection instanceof media.model.Selection) ) {
+				this.options.selection = new media.model.Selection( selection, {
+					multiple: this.options.multiple
+				});
+			}
+=======
 		// Check if a selection exists and if it's the collection provided.
 		// If they're not the same collection, bail; we're in another
 		// selection's event loop.
@@ -2968,12 +7592,55 @@ Attachment = View.extend({
 			} else if ( sizes.full ) {
 				matched = sizes.full;
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	updateSelect: function() {
+		this[ this.selected() ? 'select' : 'deselect' ]();
+	},
+	/**
+	 * @returns {unresolved|Boolean}
+	 */
+	selected: function() {
+		var selection = this.options.selection;
+		if ( selection ) {
+			return !! selection.get( this.model.cid );
+		}
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	select: function( model, collection ) {
+		var selection = this.options.selection,
+			controller = this.controller;
+||||||| .r11156
+			this._selection = {
+				attachments: new media.model.Attachments(),
+				difference: []
+			};
+		},
+=======
 			if ( matched ) {
 				return _.clone( matched );
 			}
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Check if a selection exists and if it's the collection provided.
+		// If they're not the same collection, bail; we're in another
+		// selection's event loop.
+		if ( ! selection || ( collection && collection !== selection ) ) {
+			return;
+		}
+||||||| .r11156
+		/**
+		 * Create the default states on the frame.
+		 */
+		createStates: function() {
+			var options = this.options;
+=======
 		return {
 			url:         this.model.get('url'),
 			width:       this.model.get('width'),
@@ -2987,7 +7654,18 @@ Attachment = View.extend({
 	updateSetting: function( event ) {
 		var $setting = $( event.target ).closest('[data-setting]'),
 			setting, value;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Bail if the model is already selected.
+		if ( this.$el.hasClass( 'selected' ) ) {
+			return;
+		}
+||||||| .r11156
+			if ( this.options.states ) {
+				return;
+			}
+=======
 		if ( ! $setting.length ) {
 			return;
 		}
@@ -3024,7 +7702,35 @@ Attachment = View.extend({
 			if ( save.requests !== requests ) {
 				return;
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Add 'selected' class to model, set aria-checked to true.
+		this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
+		//  Make the checkbox tabable, except in media grid (bulk select mode).
+		if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
+			this.$( '.check' ).attr( 'tabindex', '0' );
+		}
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	deselect: function( model, collection ) {
+		var selection = this.options.selection;
+||||||| .r11156
+			// Add the default states.
+			this.states.add([
+				// Main states.
+				new media.controller.Library({
+					library:   media.query( options.library ),
+					multiple:  options.multiple,
+					title:     options.title,
+					priority:  20
+				})
+			]);
+		},
+=======
 			view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
 			save.savedTimer = setTimeout( function() {
 				view.updateSave('ready');
@@ -3038,38 +7744,193 @@ Attachment = View.extend({
 	 */
 	updateSave: function( status ) {
 		var save = this._save = this._save || { status: 'ready' };
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Check if a selection exists and if it's the collection provided.
+		// If they're not the same collection, bail; we're in another
+		// selection's event loop.
+		if ( ! selection || ( collection && collection !== selection ) ) {
+			return;
+		}
+		this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
+			.find( '.check' ).attr( 'tabindex', '-1' );
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	details: function( model, collection ) {
+		var selection = this.options.selection,
+			details;
+||||||| .r11156
+		/**
+		 * Bind region mode event callbacks.
+		 *
+		 * @see media.controller.Region.render
+		 */
+		bindHandlers: function() {
+			this.on( 'router:create:browse', this.createRouter, this );
+			this.on( 'router:render:browse', this.browseRouter, this );
+			this.on( 'content:create:browse', this.browseContent, this );
+			this.on( 'content:render:upload', this.uploadContent, this );
+			this.on( 'toolbar:create:select', this.createSelectToolbar, this );
+		},
+=======
 		if ( status && status !== save.status ) {
 			this.$el.removeClass( 'save-' + save.status );
 			save.status = status;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( selection !== collection ) {
+			return;
+		}
+||||||| .r11156
+		/**
+		 * Render callback for the router region in the `browse` mode.
+		 *
+		 * @param {wp.media.view.Router} routerView
+		 */
+		browseRouter: function( routerView ) {
+			routerView.set({
+				upload: {
+					text:     l10n.uploadFilesTitle,
+					priority: 20
+				},
+				browse: {
+					text:     l10n.mediaLibraryTitle,
+					priority: 40
+				}
+			});
+		},
+=======
 		this.$el.addClass( 'save-' + save.status );
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		details = selection.single();
+		this.$el.toggleClass( 'details', details === this.model );
+	},
+	/**
+	 * @param {string} size
+	 * @returns {Object}
+	 */
+	imageSize: function( size ) {
+		var sizes = this.model.get('sizes'), matched = false;
+||||||| .r11156
+		/**
+		 * Render callback for the content region in the `browse` mode.
+		 *
+		 * @param {wp.media.controller.Region} contentRegion
+		 */
+		browseContent: function( contentRegion ) {
+			var state = this.state();
+=======
 	updateAll: function() {
 		var $settings = this.$('[data-setting]'),
 			model = this.model,
 			changed;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		size = size || 'medium';
+||||||| .r11156
+			this.$el.removeClass('hide-toolbar');
+=======
 		changed = _.chain( $settings ).map( function( el ) {
 			var $input = $('input, textarea, select, [value]', el ),
 				setting, value;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Use the provided image size if possible.
+		if ( sizes ) {
+			if ( sizes[ size ] ) {
+				matched = sizes[ size ];
+			} else if ( sizes.large ) {
+				matched = sizes.large;
+			} else if ( sizes.thumbnail ) {
+				matched = sizes.thumbnail;
+			} else if ( sizes.full ) {
+				matched = sizes.full;
+			}
+||||||| .r11156
+			// Browse our library of attachments.
+			contentRegion.view = new media.view.AttachmentsBrowser({
+				controller: this,
+				collection: state.get('library'),
+				selection:  state.get('selection'),
+				model:      state,
+				sortable:   state.get('sortable'),
+				search:     state.get('searchable'),
+				filters:    state.get('filterable'),
+				display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
+				dragInfo:   state.get('dragInfo'),
+=======
 			if ( ! $input.length ) {
 				return;
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( matched ) {
+				return _.clone( matched );
+			}
+		}
+||||||| .r11156
+				idealColumnWidth: state.get('idealColumnWidth'),
+				suggestedWidth:   state.get('suggestedWidth'),
+				suggestedHeight:  state.get('suggestedHeight'),
+=======
 			setting = $(el).data('setting');
 			value = $input.val();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return {
+			url:         this.model.get('url'),
+			width:       this.model.get('width'),
+			height:      this.model.get('height'),
+			orientation: this.model.get('orientation')
+		};
+	},
+	/**
+	 * @param {Object} event
+	 */
+	updateSetting: function( event ) {
+		var $setting = $( event.target ).closest('[data-setting]'),
+			setting, value;
+||||||| .r11156
+				AttachmentView: state.get('AttachmentView')
+			});
+		},
+=======
 			// Record the value if it changed.
 			if ( model.get( setting ) !== value ) {
 				return [ setting, value ];
 			}
 		}).compact().object().value();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! $setting.length ) {
+			return;
+		}
+||||||| .r11156
+		/**
+		 * Render callback for the content region in the `upload` mode.
+		 */
+		uploadContent: function() {
+			this.$el.removeClass( 'hide-toolbar' );
+			this.content.set( new media.view.UploaderInline({
+				controller: this
+			}) );
+		},
+=======
 		if ( ! _.isEmpty( changed ) ) {
 			model.save( changed );
 		}
@@ -3082,20 +7943,88 @@ Attachment = View.extend({
 		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		setting = $setting.data('setting');
+		value   = event.target.value;
+||||||| .r11156
+		/**
+		 * Toolbars
+		 *
+		 * @param {Object} toolbar
+		 * @param {Object} [options={}]
+		 * @this wp.media.controller.Region
+		 */
+		createSelectToolbar: function( toolbar, options ) {
+			options = options || this.options.button || {};
+			options.controller = this;
+=======
 		// Stop propagation so the model isn't selected.
 		event.stopPropagation();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.model.get( setting ) !== value ) {
+			this.save( setting, value );
+		}
+	},
+||||||| .r11156
+			toolbar.view = new media.view.Toolbar.Select( options );
+		}
+	});
+=======
 		this.collection.remove( this.model );
 	},
+>>>>>>> .r12027
 
 	/**
+<<<<<<< .mine
+	 * Pass all the arguments to the model's save method.
+||||||| .r11156
+	 * wp.media.view.MediaFrame.Post
+=======
 	 * Add the model if it isn't in the selection, if it is in the selection,
 	 * remove it.
+>>>>>>> .r12027
 	 *
+<<<<<<< .mine
+	 * Records the aggregate status of all save requests and updates the
+	 * view's classes accordingly.
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.view.MediaFrame.Select
+	 * @augments wp.media.view.MediaFrame
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+=======
 	 * @param  {[type]} event [description]
 	 * @return {[type]}       [description]
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	save: function() {
+		var view = this,
+			save = this._save = this._save || { status: 'ready' },
+			request = this.model.save.apply( this.model, arguments ),
+			requests = save.requests ? $.when( request, save.requests ) : request;
+||||||| .r11156
+	media.view.MediaFrame.Post = media.view.MediaFrame.Select.extend({
+		initialize: function() {
+			this.counts = {
+				audio: {
+					count: media.view.settings.attachmentCounts.audio,
+					state: 'playlist'
+				},
+				video: {
+					count: media.view.settings.attachmentCounts.video,
+					state: 'video-playlist'
+				}
+			};
+=======
 	checkClickHandler: function ( event ) {
 		var selection = this.options.selection;
 		if ( ! selection ) {
@@ -3111,7 +8040,26 @@ Attachment = View.extend({
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If we're waiting to remove 'Saved.', stop.
+		if ( save.savedTimer ) {
+			clearTimeout( save.savedTimer );
+		}
+||||||| .r11156
+			_.defaults( this.options, {
+				multiple:  true,
+				editing:   false,
+				state:    'insert',
+				metadata:  {}
+			});
+			/**
+			 * call 'initialize' directly on the parent class
+			 */
+			media.view.MediaFrame.Select.prototype.initialize.apply( this, arguments );
+			this.createIframeStates();
+=======
 // Ensure settings remain in sync between attachment views.
 _.each({
 	caption: '_syncCaption',
@@ -3126,11 +8074,42 @@ _.each({
 	 */
 	Attachment.prototype[ method ] = function( model, value ) {
 		var $setting = this.$('[data-setting="' + setting + '"]');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.updateSave('waiting');
+		save.requests = requests;
+		requests.always( function() {
+			// If we've performed another request since this one, bail.
+			if ( save.requests !== requests ) {
+				return;
+			}
+||||||| .r11156
+		},
+=======
 		if ( ! $setting.length ) {
 			return this;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
+			save.savedTimer = setTimeout( function() {
+				view.updateSave('ready');
+				delete save.savedTimer;
+			}, 2000 );
+		});
+	},
+	/**
+	 * @param {string} status
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 */
+	updateSave: function( status ) {
+		var save = this._save = this._save || { status: 'ready' };
+||||||| .r11156
+		createStates: function() {
+			var options = this.options;
+=======
 		// If the updated value is in sync with the value in the DOM, there
 		// is no need to re-render. If we're currently editing the value,
 		// it will automatically be in sync, suppressing the re-render for
@@ -3138,16 +8117,75 @@ _.each({
 		if ( value === $setting.find('input, textarea, select, [value]').val() ) {
 			return this;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( status && status !== save.status ) {
+			this.$el.removeClass( 'save-' + save.status );
+			save.status = status;
+		}
+||||||| .r11156
+			// Add the default states.
+			this.states.add([
+				// Main states.
+				new media.controller.Library({
+					id:         'insert',
+					title:      l10n.insertMediaTitle,
+					priority:   20,
+					toolbar:    'main-insert',
+					filterable: 'all',
+					library:    media.query( options.library ),
+					multiple:   options.multiple ? 'reset' : false,
+					editable:   true,
+=======
 		return this.render();
 	};
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$el.addClass( 'save-' + save.status );
+		return this;
+	},
+||||||| .r11156
+					// If the user isn't allowed to edit fields,
+					// can they still edit it locally?
+					allowLocalEdits: true,
+=======
 module.exports = Attachment;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	updateAll: function() {
+		var $settings = this.$('[data-setting]'),
+			model = this.model,
+			changed;
+||||||| .r11156
+					// Show the attachment display settings.
+					displaySettings: true,
+					// Update user settings when users adjust the
+					// attachment display settings.
+					displayUserSettings: true
+				}),
+=======
 },{}],24:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		changed = _.chain( $settings ).map( function( el ) {
+			var $input = $('input, textarea, select, [value]', el ),
+				setting, value;
+||||||| .r11156
+				new media.controller.Library({
+					id:         'gallery',
+					title:      l10n.createGalleryTitle,
+					priority:   40,
+					toolbar:    'main-gallery',
+					filterable: 'uploaded',
+					multiple:   'add',
+					editable:   false,
+=======
 /**
  * wp.media.view.Attachment.Details
  *
@@ -3160,19 +8198,48 @@ module.exports = Attachment;
 var Attachment = wp.media.view.Attachment,
 	l10n = wp.media.view.l10n,
 	Details;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( ! $input.length ) {
+				return;
+			}
+||||||| .r11156
+					library:  media.query( _.defaults({
+						type: 'image'
+					}, options.library ) )
+				}),
+=======
 Details = Attachment.extend({
 	tagName:   'div',
 	className: 'attachment-details',
 	template:  wp.template('attachment-details'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			setting = $(el).data('setting');
+			value = $input.val();
+||||||| .r11156
+				// Embed states.
+				new media.controller.Embed( { metadata: options.metadata } ),
+=======
 	attributes: function() {
 		return {
 			'tabIndex':     0,
 			'data-id':      this.model.get( 'id' )
 		};
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Record the value if it changed.
+			if ( model.get( setting ) !== value ) {
+				return [ setting, value ];
+			}
+		}).compact().object().value();
+||||||| .r11156
+				new media.controller.EditImage( { model: options.editImage } ),
+=======
 	events: {
 		'change [data-setting]':          'updateSetting',
 		'change [data-setting] input':    'updateSetting',
@@ -3185,17 +8252,60 @@ Details = Attachment.extend({
 		'click .refresh-attachment':      'refreshAttachment',
 		'keydown':                        'toggleSelectionHandler'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! _.isEmpty( changed ) ) {
+			model.save( changed );
+		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	removeFromLibrary: function( event ) {
+		// Catch enter and space events
+		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+			return;
+		}
+||||||| .r11156
+				// Gallery states.
+				new media.controller.GalleryEdit({
+					library: options.selection,
+					editing: options.editing,
+					menu:    'gallery'
+				}),
+=======
 	initialize: function() {
 		this.options = _.defaults( this.options, {
 			rerenderOnModelChange: false
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Stop propagation so the model isn't selected.
+		event.stopPropagation();
+||||||| .r11156
+				new media.controller.GalleryAdd(),
+=======
 		this.on( 'ready', this.initialFocus );
 		// Call 'initialize' directly on the parent class.
 		Attachment.prototype.initialize.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.collection.remove( this.model );
+	},
+||||||| .r11156
+				new media.controller.Library({
+					id:         'playlist',
+					title:      l10n.createPlaylistTitle,
+					priority:   60,
+					toolbar:    'main-playlist',
+					filterable: 'uploaded',
+					multiple:   'add',
+					editable:   false,
+=======
 	initialFocus: function() {
 		if ( ! wp.media.isTouchDevice ) {
 			this.$( ':input' ).eq( 0 ).focus();
@@ -3206,7 +8316,37 @@ Details = Attachment.extend({
 	 */
 	deleteAttachment: function( event ) {
 		event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * Add the model if it isn't in the selection, if it is in the selection,
+	 * remove it.
+	 *
+	 * @param  {[type]} event [description]
+	 * @return {[type]}       [description]
+	 */
+	checkClickHandler: function ( event ) {
+		var selection = this.options.selection;
+		if ( ! selection ) {
+			return;
+		}
+		event.stopPropagation();
+		if ( selection.where( { id: this.model.get( 'id' ) } ).length ) {
+			selection.remove( this.model );
+			// Move focus back to the attachment tile (from the check).
+			this.$el.focus();
+		} else {
+			selection.add( this.model );
+		}
+	}
+});
+||||||| .r11156
+					library:  media.query( _.defaults({
+						type: 'audio'
+					}, options.library ) )
+				}),
+=======
 		if ( window.confirm( l10n.warnDelete ) ) {
 			this.model.destroy();
 			// Keep focus inside media modal
@@ -3220,10 +8360,52 @@ Details = Attachment.extend({
 	trashAttachment: function( event ) {
 		var library = this.controller.library;
 		event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+// Ensure settings remain in sync between attachment views.
+_.each({
+	caption: '_syncCaption',
+	title:   '_syncTitle',
+	artist:  '_syncArtist',
+	album:   '_syncAlbum'
+}, function( method, setting ) {
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {string} value
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 */
+	Attachment.prototype[ method ] = function( model, value ) {
+		var $setting = this.$('[data-setting="' + setting + '"]');
+||||||| .r11156
+				// Playlist states.
+				new media.controller.CollectionEdit({
+					type: 'audio',
+					collectionType: 'playlist',
+					title:          l10n.editPlaylistTitle,
+					SettingsView:   media.view.Settings.Playlist,
+					library:        options.selection,
+					editing:        options.editing,
+					menu:           'playlist',
+					dragInfoText:   l10n.playlistDragInfo,
+					dragInfo:       false
+				}),
+=======
 		if ( wp.media.view.settings.mediaTrash &&
 			'edit-metadata' === this.controller.content.mode() ) {
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! $setting.length ) {
+			return this;
+		}
+||||||| .r11156
+				new media.controller.CollectionAdd({
+					type: 'audio',
+					collectionType: 'playlist',
+					title: l10n.addToPlaylistTitle
+				}),
+=======
 			this.model.set( 'status', 'trash' );
 			this.model.save().done( function() {
 				library._requery( true );
@@ -3238,7 +8420,26 @@ Details = Attachment.extend({
 	untrashAttachment: function( event ) {
 		var library = this.controller.library;
 		event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the updated value is in sync with the value in the DOM, there
+		// is no need to re-render. If we're currently editing the value,
+		// it will automatically be in sync, suppressing the re-render for
+		// the view we're editing, while updating any others.
+		if ( value === $setting.find('input, textarea, select, [value]').val() ) {
+			return this;
+		}
+||||||| .r11156
+				new media.controller.Library({
+					id:         'video-playlist',
+					title:      l10n.createVideoPlaylistTitle,
+					priority:   60,
+					toolbar:    'main-video-playlist',
+					filterable: 'uploaded',
+					multiple:   'add',
+					editable:   false,
+=======
 		this.model.set( 'status', 'inherit' );
 		this.model.save().done( function() {
 			library._requery( true );
@@ -3251,7 +8452,18 @@ Details = Attachment.extend({
 		var editState = this.controller.states.get( 'edit-image' );
 		if ( window.imageEdit && editState ) {
 			event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return this.render();
+	};
+});
+||||||| .r11156
+					library:  media.query( _.defaults({
+						type: 'video'
+					}, options.library ) )
+				}),
+=======
 			editState.set( 'image', this.model );
 			this.controller.setState( 'edit-image' );
 		} else {
@@ -3277,19 +8489,82 @@ Details = Attachment.extend({
 			this.controller.trigger( 'attachment:details:shift-tab', event );
 			return false;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Attachment;
+||||||| .r11156
+				new media.controller.CollectionEdit({
+					type: 'video',
+					collectionType: 'playlist',
+					title:          l10n.editVideoPlaylistTitle,
+					SettingsView:   media.view.Settings.Playlist,
+					library:        options.selection,
+					editing:        options.editing,
+					menu:           'video-playlist',
+					dragInfoText:   l10n.videoPlaylistDragInfo,
+					dragInfo:       false
+				}),
+=======
 		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
 			this.controller.trigger( 'attachment:keydown:arrow', event );
 			return;
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],26:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.Details
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Attachment = wp.media.view.Attachment,
+	l10n = wp.media.view.l10n,
+	Details;
+||||||| .r11156
+				new media.controller.CollectionAdd({
+					type: 'video',
+					collectionType: 'playlist',
+					title: l10n.addToVideoPlaylistTitle
+				})
+			]);
+=======
 module.exports = Details;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Details = Attachment.extend({
+	tagName:   'div',
+	className: 'attachment-details',
+	template:  wp.template('attachment-details'),
+||||||| .r11156
+			if ( media.view.settings.post.featuredImageId ) {
+				this.states.add( new media.controller.FeaturedImage() );
+			}
+		},
+=======
 },{}],25:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	attributes: function() {
+		return {
+			'tabIndex':     0,
+			'data-id':      this.model.get( 'id' )
+		};
+	},
+||||||| .r11156
+		bindHandlers: function() {
+			var handlers, checkCounts;
+=======
 /**
  * wp.media.view.Attachment.EditLibrary
  *
@@ -3304,12 +8579,49 @@ var EditLibrary = wp.media.view.Attachment.extend({
 		close: true
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'change [data-setting]':          'updateSetting',
+		'change [data-setting] input':    'updateSetting',
+		'change [data-setting] select':   'updateSetting',
+		'change [data-setting] textarea': 'updateSetting',
+		'click .delete-attachment':       'deleteAttachment',
+		'click .trash-attachment':        'trashAttachment',
+		'click .untrash-attachment':      'untrashAttachment',
+		'click .edit-attachment':         'editAttachment',
+		'keydown':                        'toggleSelectionHandler'
+	},
+||||||| .r11156
+			media.view.MediaFrame.Select.prototype.bindHandlers.apply( this, arguments );
+=======
 module.exports = EditLibrary;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.options = _.defaults( this.options, {
+			rerenderOnModelChange: false
+		});
+||||||| .r11156
+			this.on( 'activate', this.activate, this );
+=======
 },{}],26:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'ready', this.initialFocus );
+		// Call 'initialize' directly on the parent class.
+		Attachment.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+			// Only bother checking media type counts if one of the counts is zero
+			checkCounts = _.find( this.counts, function( type ) {
+				return type.count === 0;
+			} );
+=======
 /**
  * wp.media.view.Attachments.EditSelection
  *
@@ -3325,12 +8637,75 @@ var EditSelection = wp.media.view.Attachment.Selection.extend({
 		close: true
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialFocus: function() {
+		if ( ! wp.media.isTouchDevice ) {
+			/*
+			Previously focused the first ':input' (the readonly URL text field).
+			Since the first ':input' is now a button (delete/trash): when pressing
+			spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
+			as soon as focus is moved. Explicitly target the first text field for now.
+			@todo change initial focus logic, also for accessibility.
+			*/
+			this.$( 'input[type="text"]' ).eq( 0 ).focus();
+		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	deleteAttachment: function( event ) {
+		event.preventDefault();
+||||||| .r11156
+			if ( typeof checkCounts !== 'undefined' ) {
+				this.listenTo( media.model.Attachments.all, 'change:type', this.mediaTypeCounts );
+			}
+=======
 module.exports = EditSelection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( window.confirm( l10n.warnDelete ) ) {
+			this.model.destroy();
+			// Keep focus inside media modal
+			// after image is deleted
+			this.controller.modal.focusManager.focus();
+		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	trashAttachment: function( event ) {
+		var library = this.controller.library;
+		event.preventDefault();
+||||||| .r11156
+			this.on( 'menu:create:gallery', this.createMenu, this );
+			this.on( 'menu:create:playlist', this.createMenu, this );
+			this.on( 'menu:create:video-playlist', this.createMenu, this );
+			this.on( 'toolbar:create:main-insert', this.createToolbar, this );
+			this.on( 'toolbar:create:main-gallery', this.createToolbar, this );
+			this.on( 'toolbar:create:main-playlist', this.createToolbar, this );
+			this.on( 'toolbar:create:main-video-playlist', this.createToolbar, this );
+			this.on( 'toolbar:create:featured-image', this.featuredImageToolbar, this );
+			this.on( 'toolbar:create:main-embed', this.mainEmbedToolbar, this );
+=======
 },{}],27:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( wp.media.view.settings.mediaTrash &&
+			'edit-metadata' === this.controller.content.mode() ) {
+||||||| .r11156
+			handlers = {
+				menu: {
+					'default': 'mainMenu',
+					'gallery': 'galleryMenu',
+					'playlist': 'playlistMenu',
+					'video-playlist': 'videoPlaylistMenu'
+				},
+=======
 /**
  * wp.media.view.Attachment.Library
  *
@@ -3345,12 +8720,91 @@ var Library = wp.media.view.Attachment.extend({
 		check: true
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			this.model.set( 'status', 'trash' );
+			this.model.save().done( function() {
+				library._requery( true );
+			} );
+		}  else {
+			this.model.destroy();
+		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	untrashAttachment: function( event ) {
+		var library = this.controller.library;
+		event.preventDefault();
+||||||| .r11156
+				content: {
+					'embed':          'embedContent',
+					'edit-image':     'editImageContent',
+					'edit-selection': 'editSelectionContent'
+				},
+=======
 module.exports = Library;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.model.set( 'status', 'inherit' );
+		this.model.save().done( function() {
+			library._requery( true );
+		} );
+	},
+	/**
+	 * @param {Object} event
+	 */
+	editAttachment: function( event ) {
+		var editState = this.controller.states.get( 'edit-image' );
+		if ( window.imageEdit && editState ) {
+			event.preventDefault();
+||||||| .r11156
+				toolbar: {
+					'main-insert':      'mainInsertToolbar',
+					'main-gallery':     'mainGalleryToolbar',
+					'gallery-edit':     'galleryEditToolbar',
+					'gallery-add':      'galleryAddToolbar',
+					'main-playlist':	'mainPlaylistToolbar',
+					'playlist-edit':	'playlistEditToolbar',
+					'playlist-add':		'playlistAddToolbar',
+					'main-video-playlist': 'mainVideoPlaylistToolbar',
+					'video-playlist-edit': 'videoPlaylistEditToolbar',
+					'video-playlist-add': 'videoPlaylistAddToolbar'
+				}
+			};
+=======
 },{}],28:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			editState.set( 'image', this.model );
+			this.controller.setState( 'edit-image' );
+		} else {
+			this.$el.addClass('needs-refresh');
+		}
+	},
+	/**
+	 * When reverse tabbing(shift+tab) out of the right details panel, deliver
+	 * the focus to the item in the list that was being edited.
+	 *
+	 * @param {Object} event
+	 */
+	toggleSelectionHandler: function( event ) {
+		if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
+			this.controller.trigger( 'attachment:details:shift-tab', event );
+			return false;
+		}
+||||||| .r11156
+			_.each( handlers, function( regionHandlers, region ) {
+				_.each( regionHandlers, function( callback, handler ) {
+					this.on( region + ':render:' + handler, this[ callback ], this );
+				}, this );
+			}, this );
+		},
+=======
 /**
  * wp.media.view.Attachment.Selection
  *
@@ -3362,19 +8816,99 @@ module.exports = Library;
  */
 var Selection = wp.media.view.Attachment.extend({
 	className: 'attachment selection',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+			this.controller.trigger( 'attachment:keydown:arrow', event );
+			return;
+		}
+	}
+});
+||||||| .r11156
+		activate: function() {
+			// Hide menu items for states tied to particular media types if there are no items
+			_.each( this.counts, function( type ) {
+				if ( type.count < 1 ) {
+					this.menuItemVisibility( type.state, 'hide' );
+				}
+			}, this );
+		},
+=======
 	// On click, just select the model, instead of removing the model from
 	// the selection.
 	toggleSelection: function() {
 		this.options.selection.single( this.model );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Details;
+||||||| .r11156
+		mediaTypeCounts: function( model, attr ) {
+			if ( typeof this.counts[ attr ] !== 'undefined' && this.counts[ attr ].count < 1 ) {
+				this.counts[ attr ].count++;
+				this.menuItemVisibility( this.counts[ attr ].state, 'show' );
+			}
+		},
+=======
 module.exports = Selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],27:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.EditLibrary
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var EditLibrary = wp.media.view.Attachment.extend({
+	buttons: {
+		close: true
+	}
+});
+||||||| .r11156
+		// Menus
+		/**
+		 * @param {wp.Backbone.View} view
+		 */
+		mainMenu: function( view ) {
+			view.set({
+				'library-separator': new media.View({
+					className: 'separator',
+					priority: 100
+				})
+			});
+		},
+=======
 },{}],29:[function(require,module,exports){
 /*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = EditLibrary;
+||||||| .r11156
+		menuItemVisibility: function( state, visibility ) {
+			var menu = this.menu.get();
+			if ( visibility === 'hide' ) {
+				menu.hide( state );
+			} else if ( visibility === 'show' ) {
+				menu.show( state );
+			}
+		},
+		/**
+		 * @param {wp.Backbone.View} view
+		 */
+		galleryMenu: function( view ) {
+			var lastState = this.lastState(),
+				previous = lastState && lastState.id,
+				frame = this;
+=======
 /**
  * wp.media.view.Attachments
  *
@@ -3386,92 +8920,412 @@ module.exports = Selection;
 var View = wp.media.View,
 	$ = jQuery,
 	Attachments;
+>>>>>>> .r12027
 
-Attachments = View.extend({
-	tagName:   'ul',
-	className: 'attachments',
-
-	attributes: {
-		tabIndex: -1
-	},
-
-	initialize: function() {
-		this.el.id = _.uniqueId('__attachments-view-');
-
-		_.defaults( this.options, {
-			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
-			refreshThreshold:   3,
-			AttachmentView:     wp.media.view.Attachment,
-			sortable:           false,
-			resize:             true,
-			idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
-		});
-
-		this._viewsByCid = {};
+<<<<<<< .mine
+},{}],28:[function(require,module,exports){
+/**
+ * wp.media.view.Attachments.EditSelection
+ *
+ * @class
+ * @augments wp.media.view.Attachment.Selection
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var EditSelection = wp.media.view.Attachment.Selection.extend({
+	buttons: {
+		close: true
+	}
+});
+||||||| .r11156
+			view.set({
+				cancel: {
+					text:     l10n.cancelGalleryTitle,
+					priority: 20,
+					click:    function() {
+						if ( previous ) {
+							frame.setState( previous );
+						} else {
+							frame.close();
+						}
+=======
+Attachments = View.extend({
+	tagName:   'ul',
+	className: 'attachments',
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = EditSelection;
+||||||| .r11156
+						// Keep focus inside media modal
+						// after canceling a gallery
+						this.controller.modal.focusManager.focus();
+					}
+				},
+				separateCancel: new media.View({
+					className: 'separator',
+					priority: 40
+				})
+			});
+		},
+=======
+	attributes: {
+		tabIndex: -1
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],29:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.Library
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Library = wp.media.view.Attachment.extend({
+	buttons: {
+		check: true
+	}
+});
+||||||| .r11156
+		playlistMenu: function( view ) {
+			var lastState = this.lastState(),
+				previous = lastState && lastState.id,
+				frame = this;
+=======
+	initialize: function() {
+		this.el.id = _.uniqueId('__attachments-view-');
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = Library;
+||||||| .r11156
+			view.set({
+				cancel: {
+					text:     l10n.cancelPlaylistTitle,
+					priority: 20,
+					click:    function() {
+						if ( previous ) {
+							frame.setState( previous );
+						} else {
+							frame.close();
+						}
+					}
+				},
+				separateCancel: new media.View({
+					className: 'separator',
+					priority: 40
+				})
+			});
+		},
+=======
+		_.defaults( this.options, {
+			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
+			refreshThreshold:   3,
+			AttachmentView:     wp.media.view.Attachment,
+			sortable:           false,
+			resize:             true,
+			idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
+		});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],30:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.Selection
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Selection = wp.media.view.Attachment.extend({
+	className: 'attachment selection',
+||||||| .r11156
+		videoPlaylistMenu: function( view ) {
+			var lastState = this.lastState(),
+				previous = lastState && lastState.id,
+				frame = this;
+=======
+		this._viewsByCid = {};
 		this.$window = $( window );
 		this.resizeEvent = 'resize.media-modal-columns';
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	// On click, just select the model, instead of removing the model from
+	// the selection.
+	toggleSelection: function() {
+		this.options.selection.single( this.model );
+	}
+});
+||||||| .r11156
+			view.set({
+				cancel: {
+					text:     l10n.cancelVideoPlaylistTitle,
+					priority: 20,
+					click:    function() {
+						if ( previous ) {
+							frame.setState( previous );
+						} else {
+							frame.close();
+						}
+					}
+				},
+				separateCancel: new media.View({
+					className: 'separator',
+					priority: 40
+				})
+			});
+		},
+=======
 		this.collection.on( 'add', function( attachment ) {
 			this.views.add( this.createAttachmentView( attachment ), {
 				at: this.collection.indexOf( attachment )
 			});
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Selection;
+||||||| .r11156
+		// Content
+		embedContent: function() {
+			var view = new media.view.Embed({
+				controller: this,
+				model:      this.state()
+			}).render();
+=======
 		this.collection.on( 'remove', function( attachment ) {
 			var view = this._viewsByCid[ attachment.cid ];
 			delete this._viewsByCid[ attachment.cid ];
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],31:[function(require,module,exports){
+/**
+ * wp.media.view.Attachments
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = jQuery,
+	Attachments;
+
+Attachments = View.extend({
+	tagName:   'ul',
+	className: 'attachments',
+||||||| .r11156
+			this.content.set( view );
 
+			if ( ! isTouchDevice ) {
+				view.url.focus();
+			}
+		},
+=======
 			if ( view ) {
 				view.remove();
 			}
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	attributes: {
+		tabIndex: -1
+	},
+||||||| .r11156
+		editSelectionContent: function() {
+			var state = this.state(),
+				selection = state.get('selection'),
+				view;
+=======
 		this.collection.on( 'reset', this.render, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.el.id = _.uniqueId('__attachments-view-');
+||||||| .r11156
+			view = new media.view.AttachmentsBrowser({
+				controller: this,
+				collection: selection,
+				selection:  selection,
+				model:      state,
+				sortable:   true,
+				search:     false,
+				dragInfo:   true,
+=======
 		this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.defaults( this.options, {
+			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
+			refreshThreshold:   3,
+			AttachmentView:     wp.media.view.Attachment,
+			sortable:           false,
+			resize:             true,
+			idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
+		});
+||||||| .r11156
+				AttachmentView: media.view.Attachment.EditSelection
+			}).render();
+=======
 		// Throttle the scroll handler and bind this.
 		this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this._viewsByCid = {};
+		this.$window = $( window );
+		this.resizeEvent = 'resize.media-modal-columns';
+||||||| .r11156
+			view.toolbar.set( 'backToLibrary', {
+				text:     l10n.returnToLibrary,
+				priority: -100,
+=======
 		this.options.scrollElement = this.options.scrollElement || this.el;
 		$( this.options.scrollElement ).on( 'scroll', this.scroll );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.collection.on( 'add', function( attachment ) {
+			this.views.add( this.createAttachmentView( attachment ), {
+				at: this.collection.indexOf( attachment )
+			});
+||||||| .r11156
+				click: function() {
+					this.controller.content.mode('browse');
+				}
+			});
+=======
 		this.initSortable();
+>>>>>>> .r12027
+		}, this );
 
+<<<<<<< .mine
+		this.collection.on( 'remove', function( attachment ) {
+			var view = this._viewsByCid[ attachment.cid ];
+			delete this._viewsByCid[ attachment.cid ];
+||||||| .r11156
+			// Browse our library of attachments.
+			this.content.set( view );
+		},
+=======
 		_.bindAll( this, 'setColumns' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( view ) {
+				view.remove();
+			}
+		}, this );
+||||||| .r11156
+		editImageContent: function() {
+			var image = this.state().get('image'),
+				view = new media.view.EditImage( { model: image, controller: this } ).render();
+=======
 		if ( this.options.resize ) {
 			this.on( 'ready', this.bindEvents );
 			this.controller.on( 'open', this.setColumns );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.collection.on( 'reset', this.render, this );
+||||||| .r11156
+			this.content.set( view );
+=======
 			// Call this.setColumns() after this view has been rendered in the DOM so
 			// attachments get proper width applied.
 			_.defer( this.setColumns, this );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
+||||||| .r11156
+			// after creating the wrapper view, load the actual editor via an ajax call
+			view.loadEditor();
+=======
 	bindEvents: function() {
 		this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Throttle the scroll handler and bind this.
+		this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
+||||||| .r11156
+		},
+=======
 	attachmentFocus: function() {
 		this.$( 'li:first' ).focus();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.options.scrollElement = this.options.scrollElement || this.el;
+		$( this.options.scrollElement ).on( 'scroll', this.scroll );
+||||||| .r11156
+		// Toolbars
+=======
 	restoreFocus: function() {
 		this.$( 'li.selected:first' ).focus();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.initSortable();
+||||||| .r11156
+		/**
+		 * @param {wp.Backbone.View} view
+		 */
+		selectionStatusToolbar: function( view ) {
+			var editable = this.state().get('editable');
+=======
 	arrowEvent: function( event ) {
 		var attachments = this.$el.children( 'li' ),
 			perRow = this.columns,
 			index = attachments.filter( ':focus' ).index(),
 			row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.bindAll( this, 'setColumns' );
+||||||| .r11156
+			view.set( 'selection', new media.view.Selection({
+				controller: this,
+				collection: this.state().get('selection'),
+				priority:   -40,
+=======
 		if ( index === -1 ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.options.resize ) {
+			this.on( 'ready', this.bindEvents );
+			this.controller.on( 'open', this.setColumns );
+||||||| .r11156
+				// If the selection is editable, pass the callback to
+				// switch the content mode.
+				editable: editable && function() {
+					this.controller.content.mode('edit-selection');
+				}
+			}).render() );
+		},
+=======
 		// Left arrow
 		if ( 37 === event.keyCode ) {
 			if ( 0 === index ) {
@@ -3479,7 +9333,21 @@ Attachments = View.extend({
 			}
 			attachments.eq( index - 1 ).focus();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Call this.setColumns() after this view has been rendered in the DOM so
+			// attachments get proper width applied.
+			_.defer( this.setColumns, this );
+		}
+	},
+||||||| .r11156
+		/**
+		 * @param {wp.Backbone.View} view
+		 */
+		mainInsertToolbar: function( view ) {
+			var controller = this;
+=======
 		// Up arrow
 		if ( 38 === event.keyCode ) {
 			if ( 1 === row ) {
@@ -3487,7 +9355,15 @@ Attachments = View.extend({
 			}
 			attachments.eq( index - perRow ).focus();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	bindEvents: function() {
+		this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
+	},
+||||||| .r11156
+			this.selectionStatusToolbar( view );
+=======
 		// Right arrow
 		if ( 39 === event.keyCode ) {
 			if ( attachments.length === index ) {
@@ -3495,7 +9371,19 @@ Attachments = View.extend({
 			}
 			attachments.eq( index + 1 ).focus();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	attachmentFocus: function() {
+		this.$( 'li:first' ).focus();
+	},
+||||||| .r11156
+			view.set( 'insert', {
+				style:    'primary',
+				priority: 80,
+				text:     l10n.insertIntoPost,
+				requires: { selection: true },
+=======
 		// Down arrow
 		if ( 40 === event.keyCode ) {
 			if ( Math.ceil( attachments.length / perRow ) === row ) {
@@ -3504,62 +9392,238 @@ Attachments = View.extend({
 			attachments.eq( index + perRow ).focus();
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	restoreFocus: function() {
+		this.$( 'li.selected:first' ).focus();
+	},
+||||||| .r11156
+				/**
+				 * @fires wp.media.controller.State#insert
+				 */
+				click: function() {
+					var state = controller.state(),
+						selection = state.get('selection');
+=======
 	dispose: function() {
 		this.collection.props.off( null, null, this );
 		if ( this.options.resize ) {
 			this.$window.off( this.resizeEvent );
 		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	arrowEvent: function( event ) {
+		var attachments = this.$el.children( 'li' ),
+			perRow = this.columns,
+			index = attachments.filter( ':focus' ).index(),
+			row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
+
+||||||| .r11156
+					controller.close();
+					state.trigger( 'insert', selection ).reset();
+				}
+			});
+		},
 
+=======
+>>>>>>> .r12027
+<<<<<<< .mine
+		if ( index === -1 ) {
+			return;
+		}
+||||||| .r11156
+		/**
+		 * @param {wp.Backbone.View} view
+		 */
+		mainGalleryToolbar: function( view ) {
+			var controller = this;
+=======
 		/**
 		 * call 'dispose' directly on the parent class
 		 */
 		View.prototype.dispose.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Left arrow
+		if ( 37 === event.keyCode ) {
+			if ( 0 === index ) {
+				return;
+			}
+			attachments.eq( index - 1 ).focus();
+		}
+||||||| .r11156
+			this.selectionStatusToolbar( view );
+=======
 	setColumns: function() {
 		var prev = this.columns,
 			width = this.$el.width();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Up arrow
+		if ( 38 === event.keyCode ) {
+			if ( 1 === row ) {
+				return;
+			}
+			attachments.eq( index - perRow ).focus();
+		}
+||||||| .r11156
+			view.set( 'gallery', {
+				style:    'primary',
+				text:     l10n.createNewGallery,
+				priority: 60,
+				requires: { selection: true },
+=======
 		if ( width ) {
 			this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Right arrow
+		if ( 39 === event.keyCode ) {
+			if ( attachments.length === index ) {
+				return;
+			}
+			attachments.eq( index + 1 ).focus();
+		}
+||||||| .r11156
+				click: function() {
+					var selection = controller.state().get('selection'),
+						edit = controller.state('gallery-edit'),
+						models = selection.where({ type: 'image' });
+=======
 			if ( ! prev || prev !== this.columns ) {
 				this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
 			}
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Down arrow
+		if ( 40 === event.keyCode ) {
+			if ( Math.ceil( attachments.length / perRow ) === row ) {
+				return;
+			}
+			attachments.eq( index + perRow ).focus();
+		}
+	},
+||||||| .r11156
+					edit.set( 'library', new media.model.Selection( models, {
+						props:    selection.props.toJSON(),
+						multiple: true
+					}) );
+=======
 	initSortable: function() {
 		var collection = this.collection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	dispose: function() {
+		this.collection.props.off( null, null, this );
+		if ( this.options.resize ) {
+			this.$window.off( this.resizeEvent );
+		}
+||||||| .r11156
+					this.controller.setState('gallery-edit');
+=======
 		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		View.prototype.dispose.apply( this, arguments );
+	},
+||||||| .r11156
+					// Keep focus inside media modal
+					// after jumping to gallery view
+					this.controller.modal.focusManager.focus();
+				}
+			});
+		},
+=======
 		this.$el.sortable( _.extend({
 			// If the `collection` has a `comparator`, disable sorting.
 			disabled: !! collection.comparator,
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	setColumns: function() {
+		var prev = this.columns,
+			width = this.$el.width();
+||||||| .r11156
+		mainPlaylistToolbar: function( view ) {
+			var controller = this;
+=======
 			// Change the position of the attachment as soon as the
 			// mouse pointer overlaps a thumbnail.
 			tolerance: 'pointer',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( width ) {
+			this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
+||||||| .r11156
+			this.selectionStatusToolbar( view );
+=======
 			// Record the initial `index` of the dragged model.
 			start: function( event, ui ) {
 				ui.item.data('sortableIndexStart', ui.item.index());
 			},
+>>>>>>> .r12027
 
-			// Update the model's index in the collection.
-			// Do so silently, as the view is already accurate.
-			update: function( event, ui ) {
+<<<<<<< .mine
+			if ( ! prev || prev !== this.columns ) {
+				this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
+			}
+		}
+	},
+||||||| .r11156
+			view.set( 'playlist', {
+				style:    'primary',
+				text:     l10n.createNewPlaylist,
+				priority: 100,
+				requires: { selection: true },
+=======
+			// Update the model's index in the collection.
+			// Do so silently, as the view is already accurate.
+			update: function( event, ui ) {
 				var model = collection.at( ui.item.data('sortableIndexStart') ),
 					comparator = collection.comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initSortable: function() {
+		var collection = this.collection;
+||||||| .r11156
+				click: function() {
+					var selection = controller.state().get('selection'),
+						edit = controller.state('playlist-edit'),
+						models = selection.where({ type: 'audio' });
+=======
 				// Temporarily disable the comparator to prevent `add`
 				// from re-sorting.
 				delete collection.comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+			return;
+		}
+||||||| .r11156
+					edit.set( 'library', new media.model.Selection( models, {
+						props:    selection.props.toJSON(),
+						multiple: true
+					}) );
+=======
 				// Silently shift the model to its new index.
 				collection.remove( model, {
 					silent: true
@@ -3568,42 +9632,143 @@ Attachments = View.extend({
 					silent: true,
 					at:     ui.item.index()
 				});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$el.sortable( _.extend({
+			// If the `collection` has a `comparator`, disable sorting.
+			disabled: !! collection.comparator,
+||||||| .r11156
+					this.controller.setState('playlist-edit');
+=======
 				// Restore the comparator.
 				collection.comparator = comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Change the position of the attachment as soon as the
+			// mouse pointer overlaps a thumbnail.
+			tolerance: 'pointer',
+||||||| .r11156
+					// Keep focus inside media modal
+					// after jumping to playlist view
+					this.controller.modal.focusManager.focus();
+				}
+			});
+		},
+=======
 				// Fire the `reset` event to ensure other collections sync.
 				collection.trigger( 'reset', collection );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Record the initial `index` of the dragged model.
+			start: function( event, ui ) {
+				ui.item.data('sortableIndexStart', ui.item.index());
+			},
+||||||| .r11156
+		mainVideoPlaylistToolbar: function( view ) {
+			var controller = this;
+=======
 				// If the collection is sorted by menu order,
 				// update the menu order.
 				collection.saveMenuOrder();
 			}
 		}, this.options.sortable ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			// Update the model's index in the collection.
+			// Do so silently, as the view is already accurate.
+			update: function( event, ui ) {
+				var model = collection.at( ui.item.data('sortableIndexStart') ),
+					comparator = collection.comparator;
+||||||| .r11156
+			this.selectionStatusToolbar( view );
+=======
 		// If the `orderby` property is changed on the `collection`,
 		// check to see if we have a `comparator`. If so, disable sorting.
 		collection.props.on( 'change:orderby', function() {
 			this.$el.sortable( 'option', 'disabled', !! collection.comparator );
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				// Temporarily disable the comparator to prevent `add`
+				// from re-sorting.
+				delete collection.comparator;
+||||||| .r11156
+			view.set( 'video-playlist', {
+				style:    'primary',
+				text:     l10n.createNewVideoPlaylist,
+				priority: 100,
+				requires: { selection: true },
+=======
 		this.collection.props.on( 'change:orderby', this.refreshSortable, this );
 		this.refreshSortable();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				// Silently shift the model to its new index.
+				collection.remove( model, {
+					silent: true
+				});
+				collection.add( model, {
+					silent: true,
+					at:     ui.item.index()
+				});
+||||||| .r11156
+				click: function() {
+					var selection = controller.state().get('selection'),
+						edit = controller.state('video-playlist-edit'),
+						models = selection.where({ type: 'video' });
+=======
 	refreshSortable: function() {
 		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				// Restore the comparator.
+				collection.comparator = comparator;
+||||||| .r11156
+					edit.set( 'library', new media.model.Selection( models, {
+						props:    selection.props.toJSON(),
+						multiple: true
+					}) );
+=======
 		// If the `collection` has a `comparator`, disable sorting.
 		var collection = this.collection,
 			orderby = collection.props.get('orderby'),
 			enabled = 'menuOrder' === orderby || ! collection.comparator;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				// Fire the `reset` event to ensure other collections sync.
+				collection.trigger( 'reset', collection );
+||||||| .r11156
+					this.controller.setState('video-playlist-edit');
+=======
 		this.$el.sortable( 'option', 'disabled', ! enabled );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				// If the collection is sorted by menu order,
+				// update the menu order.
+				collection.saveMenuOrder();
+			}
+		}, this.options.sortable ) );
+||||||| .r11156
+					// Keep focus inside media modal
+					// after jumping to video playlist view
+					this.controller.modal.focusManager.focus();
+				}
+			});
+		},
+=======
 	/**
 	 * @param {wp.media.model.Attachment} attachment
 	 * @returns {wp.media.View}
@@ -3615,53 +9780,211 @@ Attachments = View.extend({
 			collection:           this.collection,
 			selection:            this.options.selection
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the `orderby` property is changed on the `collection`,
+		// check to see if we have a `comparator`. If so, disable sorting.
+		collection.props.on( 'change:orderby', function() {
+			this.$el.sortable( 'option', 'disabled', !! collection.comparator );
+		}, this );
+||||||| .r11156
+		featuredImageToolbar: function( toolbar ) {
+			this.createSelectToolbar( toolbar, {
+				text:  l10n.setFeaturedImage,
+				state: this.options.state
+			});
+		},
+=======
 		return this._viewsByCid[ attachment.cid ] = view;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.collection.props.on( 'change:orderby', this.refreshSortable, this );
+		this.refreshSortable();
+	},
+||||||| .r11156
+		mainEmbedToolbar: function( toolbar ) {
+			toolbar.view = new media.view.Toolbar.Embed({
+				controller: this
+			});
+		},
+=======
 	prepare: function() {
 		// Create all of the Attachment views, and replace
 		// the list in a single DOM operation.
 		if ( this.collection.length ) {
 			this.views.set( this.collection.map( this.createAttachmentView, this ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	refreshSortable: function() {
+		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+			return;
+		}
+||||||| .r11156
+		galleryEditToolbar: function() {
+			var editing = this.state().get('editing');
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     editing ? l10n.updateGallery : l10n.insertGallery,
+						priority: 80,
+						requires: { library: true },
+=======
 		// If there are no elements, clear the views and load some.
 		} else {
 			this.views.unset();
 			this.collection.more().done( this.scroll );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the `collection` has a `comparator`, disable sorting.
+		var collection = this.collection,
+			orderby = collection.props.get('orderby'),
+			enabled = 'menuOrder' === orderby || ! collection.comparator;
+||||||| .r11156
+						/**
+						 * @fires wp.media.controller.State#update
+						 */
+						click: function() {
+							var controller = this.controller,
+								state = controller.state();
+=======
 	ready: function() {
 		// Trigger the scroll event to check if we're within the
 		// threshold to query for additional attachments.
 		this.scroll();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$el.sortable( 'option', 'disabled', ! enabled );
+	},
+||||||| .r11156
+							controller.close();
+							state.trigger( 'update', state.get('library') );
+=======
 	scroll: function() {
 		var view = this,
 			el = this.options.scrollElement,
 			scrollTop = el.scrollTop,
 			toolbar;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {wp.media.View}
+	 */
+	createAttachmentView: function( attachment ) {
+		var view = new this.options.AttachmentView({
+			controller:           this.controller,
+			model:                attachment,
+			collection:           this.collection,
+			selection:            this.options.selection
+		});
+||||||| .r11156
+							// Restore and reset the default state.
+							controller.setState( controller.options.state );
+							controller.reset();
+						}
+					}
+				}
+			}) );
+		},
+=======
 		// The scroll event occurs on the document, but the element
 		// that should be checked is the document body.
 		if ( el === document ) {
 			el = document.body;
 			scrollTop = $(document).scrollTop();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return this._viewsByCid[ attachment.cid ] = view;
+	},
+||||||| .r11156
+		galleryAddToolbar: function() {
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     l10n.addToGallery,
+						priority: 80,
+						requires: { selection: true },
+=======
 		if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	prepare: function() {
+		// Create all of the Attachment views, and replace
+		// the list in a single DOM operation.
+		if ( this.collection.length ) {
+			this.views.set( this.collection.map( this.createAttachmentView, this ) );
+||||||| .r11156
+						/**
+						 * @fires wp.media.controller.State#reset
+						 */
+						click: function() {
+							var controller = this.controller,
+								state = controller.state(),
+								edit = controller.state('gallery-edit');
+=======
 		toolbar = this.views.parent.toolbar;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If there are no elements, clear the views and load some.
+		} else {
+			this.views.unset();
+			this.collection.more().done( this.scroll );
+		}
+	},
+||||||| .r11156
+							edit.get('library').add( state.get('selection').models );
+							state.trigger('reset');
+							controller.setState('gallery-edit');
+						}
+					}
+				}
+			}) );
+		},
+=======
 		// Show the spinner only if we are close to the bottom.
 		if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
 			toolbar.get('spinner').show();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	ready: function() {
+		// Trigger the scroll event to check if we're within the
+		// threshold to query for additional attachments.
+		this.scroll();
+	},
+||||||| .r11156
+		playlistEditToolbar: function() {
+			var editing = this.state().get('editing');
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     editing ? l10n.updatePlaylist : l10n.insertPlaylist,
+						priority: 80,
+						requires: { library: true },
+=======
 		if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
 			this.collection.more().done(function() {
 				view.scroll();
@@ -3670,12 +9993,54 @@ Attachments = View.extend({
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	scroll: function() {
+		var view = this,
+			el = this.options.scrollElement,
+			scrollTop = el.scrollTop,
+			toolbar;
+||||||| .r11156
+						/**
+						 * @fires wp.media.controller.State#update
+						 */
+						click: function() {
+							var controller = this.controller,
+								state = controller.state();
+=======
 module.exports = Attachments;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// The scroll event occurs on the document, but the element
+		// that should be checked is the document body.
+		if ( el === document ) {
+			el = document.body;
+			scrollTop = $(document).scrollTop();
+		}
+||||||| .r11156
+							controller.close();
+							state.trigger( 'update', state.get('library') );
+=======
 },{}],30:[function(require,module,exports){
 /*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
+			return;
+		}
+||||||| .r11156
+							// Restore and reset the default state.
+							controller.setState( controller.options.state );
+							controller.reset();
+						}
+					}
+				}
+			}) );
+		},
+=======
 /**
  * wp.media.view.AttachmentsBrowser
  *
@@ -3701,11 +10066,40 @@ var View = wp.media.View,
 	l10n = wp.media.view.l10n,
 	$ = jQuery,
 	AttachmentsBrowser;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		toolbar = this.views.parent.toolbar;
+||||||| .r11156
+		playlistAddToolbar: function() {
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     l10n.addToPlaylist,
+						priority: 80,
+						requires: { selection: true },
+=======
 AttachmentsBrowser = View.extend({
 	tagName:   'div',
 	className: 'attachments-browser',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Show the spinner only if we are close to the bottom.
+		if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
+			toolbar.get('spinner').show();
+		}
+||||||| .r11156
+						/**
+						 * @fires wp.media.controller.State#reset
+						 */
+						click: function() {
+							var controller = this.controller,
+								state = controller.state(),
+								edit = controller.state('playlist-edit');
+=======
 	initialize: function() {
 		_.defaults( this.options, {
 			filters: false,
@@ -3715,7 +10109,27 @@ AttachmentsBrowser = View.extend({
 			sidebar: true,
 			AttachmentView: wp.media.view.Attachment.Library
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
+			this.collection.more().done(function() {
+				view.scroll();
+				toolbar.get('spinner').hide();
+			});
+		}
+	}
+});
+||||||| .r11156
+							edit.get('library').add( state.get('selection').models );
+							state.trigger('reset');
+							controller.setState('playlist-edit');
+						}
+					}
+				}
+			}) );
+		},
+=======
 		this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
 		this.controller.on( 'edit:selection', this.editSelection );
 		this.createToolbar();
@@ -3725,22 +10139,115 @@ AttachmentsBrowser = View.extend({
 		this.createUploader();
 		this.createAttachments();
 		this.updateContent();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Attachments;
+||||||| .r11156
+		videoPlaylistEditToolbar: function() {
+			var editing = this.state().get('editing');
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     editing ? l10n.updateVideoPlaylist : l10n.insertVideoPlaylist,
+						priority: 140,
+						requires: { library: true },
+=======
 		if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
 			this.$el.addClass( 'hide-sidebar' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],32:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentsBrowser
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ *
+ * @param {object}         [options]               The options hash passed to the view.
+ * @param {boolean|string} [options.filters=false] Which filters to show in the browser's toolbar.
+ *                                                 Accepts 'uploaded' and 'all'.
+ * @param {boolean}        [options.search=true]   Whether to show the search interface in the
+ *                                                 browser's toolbar.
+ * @param {boolean}        [options.date=true]     Whether to show the date filter in the
+ *                                                 browser's toolbar.
+ * @param {boolean}        [options.display=false] Whether to show the attachments display settings
+ *                                                 view in the sidebar.
+ * @param {boolean|string} [options.sidebar=true]  Whether to create a sidebar for the browser.
+ *                                                 Accepts true, false, and 'errors'.
+ */
+var View = wp.media.View,
+	mediaTrash = wp.media.view.settings.mediaTrash,
+	l10n = wp.media.view.l10n,
+	$ = jQuery,
+	AttachmentsBrowser;
+||||||| .r11156
+						click: function() {
+							var controller = this.controller,
+								state = controller.state(),
+								library = state.get('library');
+=======
 			if ( 'errors' === this.options.sidebar ) {
 				this.$el.addClass( 'sidebar-for-errors' );
 			}
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+AttachmentsBrowser = View.extend({
+	tagName:   'div',
+	className: 'attachments-browser',
+||||||| .r11156
+							library.type = 'video';
+=======
 		this.collection.on( 'add remove reset', this.updateContent, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		_.defaults( this.options, {
+			filters: false,
+			search:  true,
+			date:    true,
+			display: false,
+			sidebar: true,
+			AttachmentView: wp.media.view.Attachment.Library
+		});
+||||||| .r11156
+							controller.close();
+							state.trigger( 'update', library );
+=======
 	editSelection: function( modal ) {
 		modal.$( '.media-button-backToLibrary' ).focus();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
+		this.controller.on( 'edit:selection', this.editSelection );
+		this.createToolbar();
+		if ( this.options.sidebar ) {
+			this.createSidebar();
+		}
+		this.createUploader();
+		this.createAttachments();
+		this.updateContent();
+||||||| .r11156
+							// Restore and reset the default state.
+							controller.setState( controller.options.state );
+							controller.reset();
+						}
+					}
+				}
+			}) );
+		},
+=======
 	/**
 	 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
 	 */
@@ -3749,29 +10256,161 @@ AttachmentsBrowser = View.extend({
 		View.prototype.dispose.apply( this, arguments );
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
+			this.$el.addClass( 'hide-sidebar' );
+||||||| .r11156
+		videoPlaylistAddToolbar: function() {
+			this.toolbar.set( new media.view.Toolbar({
+				controller: this,
+				items: {
+					insert: {
+						style:    'primary',
+						text:     l10n.addToVideoPlaylist,
+						priority: 140,
+						requires: { selection: true },
+=======
 	createToolbar: function() {
 		var LibraryViewSwitcher, Filters, toolbarOptions;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( 'errors' === this.options.sidebar ) {
+				this.$el.addClass( 'sidebar-for-errors' );
+			}
+||||||| .r11156
+						click: function() {
+							var controller = this.controller,
+								state = controller.state(),
+								edit = controller.state('video-playlist-edit');
+
+							edit.get('library').add( state.get('selection').models );
+							state.trigger('reset');
+							controller.setState('video-playlist-edit');
+						}
+					}
+				}
+			}) );
+=======
 		toolbarOptions = {
 			controller: this.controller
 		};
 
 		if ( this.controller.isModeActive( 'grid' ) ) {
 			toolbarOptions.className = 'media-toolbar wp-filter';
+>>>>>>> .r12027
 		}
 
+<<<<<<< .mine
+		this.collection.on( 'add remove reset', this.updateContent, this );
+	},
+
+	editSelection: function( modal ) {
+		modal.$( '.media-button-backToLibrary' ).focus();
+	},
+
+	/**
+	 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
+	 */
+	dispose: function() {
+		this.options.selection.off( null, null, this );
+		View.prototype.dispose.apply( this, arguments );
+		return this;
+	},
+||||||| .r11156
+	/**
+	 * wp.media.view.MediaFrame.ImageDetails
+	 *
+	 * @constructor
+	 * @augments wp.media.view.MediaFrame.Select
+	 * @augments wp.media.view.MediaFrame
+	 * @augments wp.media.view.Frame
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 * @mixes wp.media.controller.StateMachine
+	 */
+	media.view.MediaFrame.ImageDetails = media.view.MediaFrame.Select.extend({
+		defaults: {
+			id:      'image',
+			url:     '',
+			menu:    'image-details',
+			content: 'image-details',
+			toolbar: 'image-details',
+			type:    'link',
+			title:    l10n.imageDetailsTitle,
+			priority: 120
+		},
+=======
 		/**
 		* @member {wp.media.view.Toolbar}
 		*/
 		this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	createToolbar: function() {
+		var LibraryViewSwitcher, Filters, toolbarOptions;
+||||||| .r11156
+		initialize: function( options ) {
+			this.image = new media.model.PostImage( options.metadata );
+			this.options.selection = new media.model.Selection( this.image.attachment, { multiple: false } );
+			media.view.MediaFrame.Select.prototype.initialize.apply( this, arguments );
+		},
+=======
 		this.views.add( this.toolbar );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		toolbarOptions = {
+			controller: this.controller
+		};
+||||||| .r11156
+		bindHandlers: function() {
+			media.view.MediaFrame.Select.prototype.bindHandlers.apply( this, arguments );
+			this.on( 'menu:create:image-details', this.createMenu, this );
+			this.on( 'content:create:image-details', this.imageDetailsContent, this );
+			this.on( 'content:render:edit-image', this.editImageContent, this );
+			this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
+			// override the select toolbar
+			this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
+		},
+=======
 		this.toolbar.set( 'spinner', new wp.media.view.Spinner({
 			priority: -60
 		}) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.controller.isModeActive( 'grid' ) ) {
+			toolbarOptions.className = 'media-toolbar wp-filter';
+		}
+||||||| .r11156
+		createStates: function() {
+			this.states.add([
+				new media.controller.ImageDetails({
+					image: this.image,
+					editable: false
+				}),
+				new media.controller.ReplaceImage({
+					id: 'replace-image',
+					library:   media.query( { type: 'image' } ),
+					image: this.image,
+					multiple:  false,
+					title:     l10n.imageReplaceTitle,
+					toolbar: 'replace',
+					priority:  80,
+					displaySettings: true
+				}),
+				new media.controller.EditImage( {
+					image: this.image,
+					selection: this.options.selection
+				} )
+			]);
+		},
+=======
 		if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
 			// "Filters" will return a , screen reader text needs to be rendered before
+<<<<<<< .mine
+		this.toolbar.set( 'spinner', new wp.media.view.Spinner({
+			priority: -60
+		}) );
+
+		if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
+			// "Filters" will return a , screen reader text needs to be rendered before
+			this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
+				value: l10n.filterByDate,
+				attributes: {
+					'for': 'media-attachment-date-filters'
+				},
+				priority: -75
+			}).render() );
+			this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
+				controller: this.controller,
+				model:      this.collection.props,
+				priority: -75
+			}).render() );
+>>>>>>> .r12027
+		}
+
+<<<<<<< .mine
+		// Feels odd to bring the global media library switcher into the Attachment
+		// browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
+		// which the controller can tap into and add this view?
+		if ( this.controller.isModeActive( 'grid' ) ) {
+			LibraryViewSwitcher = View.extend({
+				className: 'view-switch media-grid-view-switch',
+				template: wp.template( 'media-library-view-switcher')
+			});
+||||||| .r11156
+			view = new media.view.EditImage( { model: model, controller: this } ).render();
+=======
+			// BulkSelection is a  with subviews, including screen reader text
+			this.toolbar.set( 'selectModeToggleButton', new wp.media.view.SelectModeToggleButton({
+				text: l10n.bulkSelect,
+				controller: this.controller,
+				priority: -70
+			}).render() );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
+				controller: this.controller,
+				priority: -90
+			}).render() );
+||||||| .r11156
+			this.content.set( view );
+=======
+			this.toolbar.set( 'deleteSelectedButton', new wp.media.view.DeleteSelectedButton({
+				filters: Filters,
+				style: 'primary',
+				disabled: true,
+				text: mediaTrash ? l10n.trashSelected : l10n.deleteSelected,
+				controller: this.controller,
+				priority: -60,
+				click: function() {
+					var changed = [], removed = [],
+						selection = this.controller.state().get( 'selection' ),
+						library = this.controller.state().get( 'library' );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+			// DateFilter is a ').val( this.model.get('url') );
 		this.input = this.$input[0];
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = EmbedLink;
+||||||| .r11156
+		containerDragover: function( event ) {
+			if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+				return;
+			}
+=======
 		this.spinner = $('')[0];
 		this.$el.append([ this.input, this.spinner ]);
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],41:[function(require,module,exports){
+/**
+ * wp.media.view.EmbedUrl
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = jQuery,
+	EmbedUrl;
+||||||| .r11156
+			this.overContainer = true;
+			this.refresh();
+		},
+=======
 		this.listenTo( this.model, 'change:url', this.render );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+EmbedUrl = View.extend({
+	tagName:   'label',
+	className: 'embed-url',
+||||||| .r11156
+		containerDragleave: function() {
+			this.overContainer = false;
+=======
 		if ( this.model.get( 'url' ) ) {
 			_.delay( _.bind( function () {
 				this.model.trigger( 'change:url' );
@@ -4631,11 +12315,34 @@ EmbedUrl = View.extend({
 	 */
 	render: function() {
 		var $input = this.$input;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'input':  'url',
+		'keyup':  'url',
+		'change': 'url'
+	},
+||||||| .r11156
+			// Throttle dragleave because it's called when bouncing from some elements to others.
+			_.delay( _.bind( this.refresh, this ), 50 );
+		},
+=======
 		if ( $input.is(':focus') ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.$input = $('').val( this.model.get('url') );
+		this.input = this.$input[0];
+||||||| .r11156
+		dropzoneDragover: function( event ) {
+			if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+				return;
+			}
+=======
 		this.input.value = this.model.get('url') || 'http://';
 		/**
 		 * Call `render` directly on parent class with passed arguments
@@ -4643,17 +12350,49 @@ EmbedUrl = View.extend({
 		View.prototype.render.apply( this, arguments );
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.spinner = $('')[0];
+		this.$el.append([ this.input, this.spinner ]);
+||||||| .r11156
+			this.overDropzone = true;
+			this.refresh( event );
+			return false;
+		},
+=======
 	ready: function() {
 		if ( ! wp.media.isTouchDevice ) {
 			this.focus();
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.listenTo( this.model, 'change:url', this.render );
+||||||| .r11156
+		dropzoneDragleave: function( e ) {
+			this.overDropzone = false;
+			_.delay( _.bind( this.refresh, this, e ), 50 );
+		},
+=======
 	url: function( event ) {
 		this.model.set( 'url', event.target.value );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.model.get( 'url' ) ) {
+			_.delay( _.bind( function () {
+				this.model.trigger( 'change:url' );
+			}, this ), 500 );
+||||||| .r11156
+		click: function( e ) {
+			// In the rare case where the dropzone gets stuck, hide it on click.
+			this.containerDragleave( e );
+			this.dropzoneDragleave( e );
+			this.localDrag = false;
+=======
 	/**
 	 * If the input is visible, focus and select its contents.
 	 */
@@ -4661,10 +12400,18 @@ EmbedUrl = View.extend({
 		var $input = this.$input;
 		if ( $input.is(':visible') ) {
 			$input.focus()[0].select();
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+	},
+||||||| .r11156
+	});
+
+=======
 	}
 });
 
+>>>>>>> .r12027
 module.exports = EmbedUrl;
 
 },{}],40:[function(require,module,exports){
@@ -4686,19 +12433,78 @@ var FocusManager = wp.media.View.extend({
 		this.$('.media-menu-item').first().focus();
 	},
 	/**
+<<<<<<< .mine
+	 * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
+||||||| .r11156
+	 * wp.media.view.UploaderInline
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+=======
 	 * @param {Object} event
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
+	render: function() {
+		var $input = this.$input;
+||||||| .r11156
+	media.view.UploaderInline = media.View.extend({
+		tagName:   'div',
+		className: 'uploader-inline',
+		template:  media.template('uploader-inline'),
+=======
 	constrainTabbing: function( event ) {
 		var tabbables;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( $input.is(':focus') ) {
+			return;
+		}
+||||||| .r11156
+		events: {
+			'click .close': 'hide'
+		},
+=======
 		// Look for the tab key.
 		if ( 9 !== event.keyCode ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.input.value = this.model.get('url') || 'http://';
+		/**
+		 * Call `render` directly on parent class with passed arguments
+		 */
+		View.prototype.render.apply( this, arguments );
+		return this;
+	},
+||||||| .r11156
+		initialize: function() {
+			_.defaults( this.options, {
+				message: '',
+				status:  true,
+				canClose: false
+			});
+=======
 		// Skip the file input added by Plupload.
 		tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	ready: function() {
+		if ( ! wp.media.isTouchDevice ) {
+			this.focus();
+		}
+	},
+||||||| .r11156
+			if ( ! this.options.$browser && this.controller.uploader ) {
+				this.options.$browser = this.controller.uploader.$browser;
+			}
+=======
 		// Keep tab focus within media modal while it's open
 		if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
 			tabbables.first().focus();
@@ -4708,14 +12514,69 @@ var FocusManager = wp.media.View.extend({
 			return false;
 		}
 	}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	url: function( event ) {
+		this.model.set( 'url', event.target.value );
+	},
+||||||| .r11156
+			if ( _.isUndefined( this.options.postId ) ) {
+				this.options.postId = media.view.settings.post.id;
+			}
+=======
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * If the input is visible, focus and select its contents.
+	 */
+	focus: function() {
+		var $input = this.$input;
+		if ( $input.is(':visible') ) {
+			$input.focus()[0].select();
+		}
+	}
+});
+||||||| .r11156
+			if ( this.options.status ) {
+				this.views.set( '.upload-inline-status', new media.view.UploaderStatus({
+					controller: this.controller
+				}) );
+			}
+		},
+=======
 module.exports = FocusManager;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = EmbedUrl;
+||||||| .r11156
+		prepare: function() {
+			var suggestedWidth = this.controller.state().get('suggestedWidth'),
+				suggestedHeight = this.controller.state().get('suggestedHeight'),
+				data = {};
+=======
 },{}],41:[function(require,module,exports){
 /*globals _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],42:[function(require,module,exports){
+/**
+ * wp.media.view.FocusManager
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var FocusManager = wp.media.View.extend({
+||||||| .r11156
+			data.message = this.options.message;
+			data.canClose = this.options.canClose;
+=======
 /**
  * wp.media.view.Frame
  *
@@ -4740,11 +12601,46 @@ var Frame = wp.media.View.extend({
 		this._createStates();
 		this._createModes();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'keydown': 'constrainTabbing'
+	},
+||||||| .r11156
+			if ( suggestedWidth && suggestedHeight ) {
+				data.suggestedWidth = suggestedWidth;
+				data.suggestedHeight = suggestedHeight;
+			}
+=======
 	_createRegions: function() {
 		// Clone the regions array.
 		this.regions = this.regions ? this.regions.slice() : [];
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	focus: function() { // Reset focus on first left menu item
+		this.$('.media-menu-item').first().focus();
+	},
+	/**
+	 * @param {Object} event
+	 */
+	constrainTabbing: function( event ) {
+		var tabbables;
+||||||| .r11156
+			return data;
+		},
+		/**
+		 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+		 */
+		dispose: function() {
+			if ( this.disposing ) {
+				/**
+				 * call 'dispose' directly on the parent class
+				 */
+				return media.View.prototype.dispose.apply( this, arguments );
+			}
+=======
 		// Initialize regions.
 		_.each( this.regions, function( region ) {
 			this[ region ] = new wp.media.controller.Region({
@@ -4767,18 +12663,64 @@ var Frame = wp.media.View.extend({
 		this.states = new Backbone.Collection( null, {
 			model: wp.media.controller.State
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Look for the tab key.
+		if ( 9 !== event.keyCode ) {
+			return;
+		}
+||||||| .r11156
+			// Run remove on `dispose`, so we can be sure to refresh the
+			// uploader with a view-less DOM. Track whether we're disposing
+			// so we don't trigger an infinite loop.
+			this.disposing = true;
+			return this.remove();
+		},
+		/**
+		 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+		 */
+		remove: function() {
+			/**
+			 * call 'remove' directly on the parent class
+			 */
+			var result = media.View.prototype.remove.apply( this, arguments );
+=======
 		// Ensure states have a reference to the frame.
 		this.states.on( 'add', function( model ) {
 			model.frame = this;
 			model.trigger('ready');
 		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Skip the file input added by Plupload.
+		tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
+||||||| .r11156
+			_.defer( _.bind( this.refresh, this ) );
+			return result;
+		},
+=======
 		if ( this.options.states ) {
 			this.states.add( this.options.states );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Keep tab focus within media modal while it's open
+		if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+			tabbables.first().focus();
+			return false;
+		} else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+			tabbables.last().focus();
+			return false;
+		}
+	}
+||||||| .r11156
+		refresh: function() {
+			var uploader = this.controller.uploader;
+=======
 	/**
 	 * A frame can be in a mode or multiple modes at one time.
 	 *
@@ -4788,7 +12730,22 @@ var Frame = wp.media.View.extend({
 		// Store active "modes" that the frame is in. Unrelated to region modes.
 		this.activeModes = new Backbone.Collection();
 		this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+});
+||||||| .r11156
+			if ( uploader ) {
+				uploader.refresh();
+			}
+		},
+		/**
+		 * @returns {wp.media.view.UploaderInline}
+		 */
+		ready: function() {
+			var $browser = this.options.$browser,
+				$placeholder;
+=======
 		_.each( this.options.mode, function( mode ) {
 			this.activateMode( mode );
 		}, this );
@@ -4818,11 +12775,51 @@ var Frame = wp.media.View.extend({
 				collectionEvent = key;
 			}
 		} );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = FocusManager;
+||||||| .r11156
+			if ( this.controller.uploader ) {
+				$placeholder = this.$('.browser');
+=======
 		if ( ! _.has( modeEventMap, collectionEvent ) ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],43:[function(require,module,exports){
+/**
+ * wp.media.view.Frame
+ *
+ * A frame is a composite view consisting of one or more regions and one or more
+ * states.
+ *
+ * @see wp.media.controller.State
+ * @see wp.media.controller.Region
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Frame = wp.media.View.extend({
+	initialize: function() {
+		_.defaults( this.options, {
+			mode: [ 'select' ]
+		});
+		this._createRegions();
+		this._createStates();
+		this._createModes();
+	},
+||||||| .r11156
+				// Check if we've already replaced the placeholder.
+				if ( $placeholder[0] === $browser[0] ) {
+					return;
+				}
+=======
 		eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
 		this.trigger( eventToTrigger );
 	},
@@ -4840,7 +12837,59 @@ var Frame = wp.media.View.extend({
 		this.activeModes.add( [ { id: mode } ] );
 		// Add a CSS class to the frame so elements can be styled for the mode.
 		this.$el.addClass( 'mode-' + mode );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	_createRegions: function() {
+		// Clone the regions array.
+		this.regions = this.regions ? this.regions.slice() : [];
+
+		// Initialize regions.
+		_.each( this.regions, function( region ) {
+			this[ region ] = new wp.media.controller.Region({
+				view:     this,
+				id:       region,
+				selector: '.media-frame-' + region
+			});
+		}, this );
+	},
+	/**
+	 * Create the frame's states.
+	 *
+	 * @see wp.media.controller.State
+	 * @see wp.media.controller.StateMachine
+	 *
+	 * @fires wp.media.controller.State#ready
+	 */
+	_createStates: function() {
+		// Create the default `states` collection.
+		this.states = new Backbone.Collection( null, {
+			model: wp.media.controller.State
+		});
+
+		// Ensure states have a reference to the frame.
+		this.states.on( 'add', function( model ) {
+			model.frame = this;
+			model.trigger('ready');
+		}, this );
 
+		if ( this.options.states ) {
+			this.states.add( this.options.states );
+||||||| .r11156
+				$browser.detach().text( $placeholder.text() );
+				$browser[0].className = $placeholder[0].className;
+				$placeholder.replaceWith( $browser.show() );
+			}
+
+			this.refresh();
+			return this;
+		},
+		show: function() {
+			this.$el.removeClass( 'hidden' );
+		},
+		hide: function() {
+			this.$el.addClass( 'hidden' );
+=======
 		return this;
 	},
 	/**
@@ -4853,7 +12902,12 @@ var Frame = wp.media.View.extend({
 		// Bail if the mode isn't active.
 		if ( ! this.isModeActive( mode ) ) {
 			return this;
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+	},
+||||||| .r11156
+=======
 		this.activeModes.remove( this.activeModes.where( { id: mode } ) );
 		this.$el.removeClass( 'mode-' + mode );
 		/**
@@ -4862,28 +12916,253 @@ var Frame = wp.media.View.extend({
 		 * @event this#{mode}:deactivate
 		 */
 		this.trigger( mode + ':deactivate' );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	/**
+	 * A frame can be in a mode or multiple modes at one time.
+	 *
+	 * For example, the manage media frame can be in the `Bulk Select` or `Edit` mode.
+	 */
+	_createModes: function() {
+		// Store active "modes" that the frame is in. Unrelated to region modes.
+		this.activeModes = new Backbone.Collection();
+		this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
+
+||||||| .r11156
+	});
 
+=======
 		return this;
 	},
+>>>>>>> .r12027
+		_.each( this.options.mode, function( mode ) {
+			this.activateMode( mode );
+		}, this );
+	},
 	/**
+<<<<<<< .mine
+	 * Reset all states on the frame to their defaults.
+||||||| .r11156
+	 * wp.media.view.UploaderStatus
+=======
 	 * Check if a mode is enabled on the frame.
+>>>>>>> .r12027
 	 *
+<<<<<<< .mine
+	 * @returns {wp.media.view.Frame} Returns itself to allow chaining
+||||||| .r11156
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+=======
 	 * @param  string mode Mode ID.
 	 * @return bool
+>>>>>>> .r12027
 	 */
-	isModeActive: function( mode ) {
-		return Boolean( this.activeModes.where( { id: mode } ).length );
-	}
-});
-
-// Make the `Frame` a `StateMachine`.
-_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
+<<<<<<< .mine
+	reset: function() {
+		this.states.invoke( 'trigger', 'reset' );
+		return this;
+	},
+	/**
+	 * Map activeMode collection events to the frame.
+	 */
+	triggerModeEvents: function( model, collection, options ) {
+		var collectionEvent,
+			modeEventMap = {
+				add: 'activate',
+				remove: 'deactivate'
+			},
+			eventToTrigger;
+		// Probably a better way to do this.
+		_.each( options, function( value, key ) {
+			if ( value ) {
+				collectionEvent = key;
+			}
+		} );
+||||||| .r11156
+	media.view.UploaderStatus = media.View.extend({
+		className: 'media-uploader-status',
+		template:  media.template('uploader-status'),
+=======
+	isModeActive: function( mode ) {
+		return Boolean( this.activeModes.where( { id: mode } ).length );
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! _.has( modeEventMap, collectionEvent ) ) {
+			return;
+		}
+||||||| .r11156
+		events: {
+			'click .upload-dismiss-errors': 'dismiss'
+		},
+=======
+// Make the `Frame` a `StateMachine`.
+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
+		this.trigger( eventToTrigger );
+	},
+	/**
+	 * Activate a mode on the frame.
+	 *
+	 * @param string mode Mode ID.
+	 * @returns {this} Returns itself to allow chaining.
+	 */
+	activateMode: function( mode ) {
+		// Bail if the mode is already active.
+		if ( this.isModeActive( mode ) ) {
+			return;
+		}
+		this.activeModes.add( [ { id: mode } ] );
+		// Add a CSS class to the frame so elements can be styled for the mode.
+		this.$el.addClass( 'mode-' + mode );
+||||||| .r11156
+		initialize: function() {
+			this.queue = wp.Uploader.queue;
+			this.queue.on( 'add remove reset', this.visibility, this );
+			this.queue.on( 'add remove reset change:percent', this.progress, this );
+			this.queue.on( 'add remove reset change:uploading', this.info, this );
+=======
 module.exports = Frame;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return this;
+	},
+	/**
+	 * Deactivate a mode on the frame.
+	 *
+	 * @param string mode Mode ID.
+	 * @returns {this} Returns itself to allow chaining.
+	 */
+	deactivateMode: function( mode ) {
+		// Bail if the mode isn't active.
+		if ( ! this.isModeActive( mode ) ) {
+			return this;
+		}
+		this.activeModes.remove( this.activeModes.where( { id: mode } ) );
+		this.$el.removeClass( 'mode-' + mode );
+		/**
+		 * Frame mode deactivation event.
+		 *
+		 * @event this#{mode}:deactivate
+		 */
+		this.trigger( mode + ':deactivate' );
+||||||| .r11156
+			this.errors = wp.Uploader.errors;
+			this.errors.reset();
+			this.errors.on( 'add remove reset', this.visibility, this );
+			this.errors.on( 'add', this.error, this );
+		},
+		/**
+		 * @global wp.Uploader
+		 * @returns {wp.media.view.UploaderStatus}
+		 */
+		dispose: function() {
+			wp.Uploader.queue.off( null, null, this );
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			media.View.prototype.dispose.apply( this, arguments );
+			return this;
+		},
+=======
 },{}],42:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		return this;
+	},
+	/**
+	 * Check if a mode is enabled on the frame.
+	 *
+	 * @param  string mode Mode ID.
+	 * @return bool
+	 */
+	isModeActive: function( mode ) {
+		return Boolean( this.activeModes.where( { id: mode } ).length );
+	}
+});
+||||||| .r11156
+		visibility: function() {
+			this.$el.toggleClass( 'uploading', !! this.queue.length );
+			this.$el.toggleClass( 'errors', !! this.errors.length );
+			this.$el.toggle( !! this.queue.length || !! this.errors.length );
+		},
+=======
+/**
+ * wp.media.view.MediaFrame.ImageDetails
+ *
+ * A media frame for manipulating an image that's already been inserted
+ * into a post.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Select = wp.media.view.MediaFrame.Select,
+	l10n = wp.media.view.l10n,
+	ImageDetails;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+// Make the `Frame` a `StateMachine`.
+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
+||||||| .r11156
+		ready: function() {
+			_.each({
+				'$bar':      '.media-progress-bar div',
+				'$index':    '.upload-index',
+				'$total':    '.upload-total',
+				'$filename': '.upload-filename'
+			}, function( selector, key ) {
+				this[ key ] = this.$( selector );
+			}, this );
+=======
+ImageDetails = Select.extend({
+	defaults: {
+		id:      'image',
+		url:     '',
+		menu:    'image-details',
+		content: 'image-details',
+		toolbar: 'image-details',
+		type:    'link',
+		title:    l10n.imageDetailsTitle,
+		priority: 120
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Frame;
+||||||| .r11156
+			this.visibility();
+			this.progress();
+			this.info();
+		},
+=======
+	initialize: function( options ) {
+		this.image = new wp.media.model.PostImage( options.metadata );
+		this.options.selection = new wp.media.model.Selection( this.image.attachment, { multiple: false } );
+		Select.prototype.initialize.apply( this, arguments );
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],44:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.ImageDetails
  *
@@ -4902,7 +13181,23 @@ module.exports = Frame;
 var Select = wp.media.view.MediaFrame.Select,
 	l10n = wp.media.view.l10n,
 	ImageDetails;
+||||||| .r11156
+		progress: function() {
+			var queue = this.queue,
+				$bar = this.$bar;
+=======
+	bindHandlers: function() {
+		Select.prototype.bindHandlers.apply( this, arguments );
+		this.on( 'menu:create:image-details', this.createMenu, this );
+		this.on( 'content:create:image-details', this.imageDetailsContent, this );
+		this.on( 'content:render:edit-image', this.editImageContent, this );
+		this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
+		// override the select toolbar
+		this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 ImageDetails = Select.extend({
 	defaults: {
 		id:      'image',
@@ -4914,13 +13209,57 @@ ImageDetails = Select.extend({
 		title:    l10n.imageDetailsTitle,
 		priority: 120
 	},
+||||||| .r11156
+			if ( ! $bar || ! queue.length ) {
+				return;
+			}
+=======
+	createStates: function() {
+		this.states.add([
+			new wp.media.controller.ImageDetails({
+				image: this.image,
+				editable: false
+			}),
+			new wp.media.controller.ReplaceImage({
+				id: 'replace-image',
+				library: wp.media.query( { type: 'image' } ),
+				image: this.image,
+				multiple:  false,
+				title:     l10n.imageReplaceTitle,
+				toolbar: 'replace',
+				priority:  80,
+				displaySettings: true
+			}),
+			new wp.media.controller.EditImage( {
+				image: this.image,
+				selection: this.options.selection
+			} )
+		]);
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	initialize: function( options ) {
 		this.image = new wp.media.model.PostImage( options.metadata );
 		this.options.selection = new wp.media.model.Selection( this.image.attachment, { multiple: false } );
 		Select.prototype.initialize.apply( this, arguments );
 	},
+||||||| .r11156
+			$bar.width( ( queue.reduce( function( memo, attachment ) {
+				if ( ! attachment.get('uploading') ) {
+					return memo + 100;
+				}
+=======
+	imageDetailsContent: function( options ) {
+		options.view = new wp.media.view.ImageDetails({
+			controller: this,
+			model: this.state().image,
+			attachment: this.state().image.attachment
+		});
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	bindHandlers: function() {
 		Select.prototype.bindHandlers.apply( this, arguments );
 		this.on( 'menu:create:image-details', this.createMenu, this );
@@ -4930,7 +13269,19 @@ ImageDetails = Select.extend({
 		// override the select toolbar
 		this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
 	},
+||||||| .r11156
+				var percent = attachment.get('percent');
+				return memo + ( _.isNumber( percent ) ? percent : 100 );
+			}, 0 ) / queue.length ) + '%' );
+		},
+=======
+	editImageContent: function() {
+		var state = this.state(),
+			model = state.get('image'),
+			view;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	createStates: function() {
 		this.states.add([
 			new wp.media.controller.ImageDetails({
@@ -4953,7 +13304,17 @@ ImageDetails = Select.extend({
 			} )
 		]);
 	},
+||||||| .r11156
+		info: function() {
+			var queue = this.queue,
+				index = 0, active;
+=======
+		if ( ! model ) {
+			return;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	imageDetailsContent: function( options ) {
 		options.view = new wp.media.view.ImageDetails({
 			controller: this,
@@ -4961,20 +13322,88 @@ ImageDetails = Select.extend({
 			attachment: this.state().image.attachment
 		});
 	},
+||||||| .r11156
+			if ( ! queue.length ) {
+				return;
+			}
+=======
+		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	editImageContent: function() {
 		var state = this.state(),
 			model = state.get('image'),
 			view;
+||||||| .r11156
+			active = this.queue.find( function( attachment, i ) {
+				index = i;
+				return attachment.get('uploading');
+			});
+=======
+		this.content.set( view );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! model ) {
 			return;
 		}
+||||||| .r11156
+			this.$index.text( index + 1 );
+			this.$total.text( queue.length );
+			this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
+		},
+		/**
+		 * @param {string} filename
+		 * @returns {string}
+		 */
+		filename: function( filename ) {
+			return media.truncate( _.escape( filename ), 24 );
+		},
+		/**
+		 * @param {Backbone.Model} error
+		 */
+		error: function( error ) {
+			this.views.add( '.upload-errors', new media.view.UploaderStatusError({
+				filename: this.filename( error.get('file').name ),
+				message:  error.get('message')
+			}), { at: 0 });
+		},
+=======
+		// after bringing in the frame, load the actual editor via an ajax call
+		view.loadEditor();
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
+||||||| .r11156
+		/**
+		 * @global wp.Uploader
+		 *
+		 * @param {Object} event
+		 */
+		dismiss: function( event ) {
+			var errors = this.views.get('.upload-errors');
+=======
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.content.set( view );
+||||||| .r11156
+			event.preventDefault();
+=======
+	renderImageDetailsToolbar: function() {
+		this.toolbar.set( new wp.media.view.Toolbar({
+			controller: this,
+			items: {
+				select: {
+					style:    'primary',
+					text:     l10n.update,
+					priority: 80,
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// after bringing in the frame, load the actual editor via an ajax call
 		view.loadEditor();
 
@@ -5004,6 +13433,26 @@ ImageDetails = Select.extend({
 						controller.reset();
 					}
 				}
+||||||| .r11156
+			if ( errors ) {
+				_.invoke( errors, 'remove' );
+=======
+					click: function() {
+						var controller = this.controller,
+							state = controller.state();
+
+						controller.close();
+
+						// not sure if we want to use wp.media.string.image which will create a shortcode or
+						// perhaps wp.html.string to at least to build the 
+						state.trigger( 'update', controller.image.toJSON() );
+
+						// Restore and reset the default state.
+						controller.setState( controller.options.state );
+						controller.reset();
+					}
+				}
+>>>>>>> .r12027
 			}
 		}) );
 	},
@@ -5060,6 +13509,41 @@ ImageDetails = Select.extend({
 
 module.exports = ImageDetails;
 
+<<<<<<< .mine
+},{}],45:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame.Post
+ *
+ * The frame for manipulating media on the Edit Post page.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Select = wp.media.view.MediaFrame.Select,
+	Library = wp.media.controller.Library,
+	l10n = wp.media.view.l10n,
+	Post;
+
+Post = Select.extend({
+	initialize: function() {
+		this.counts = {
+			audio: {
+				count: wp.media.view.settings.attachmentCounts.audio,
+				state: 'playlist'
+			},
+			video: {
+				count: wp.media.view.settings.attachmentCounts.video,
+				state: 'video-playlist'
+||||||| .r11156
+			if ( this.library ) {
+				this.library.off( null, null, this );
+=======
 },{}],43:[function(require,module,exports){
 /*globals wp, _ */
 
@@ -5092,6 +13576,7 @@ Post = Select.extend({
 			video: {
 				count: wp.media.view.settings.attachmentCounts.video,
 				state: 'video-playlist'
+>>>>>>> .r12027
 			}
 		};
 
@@ -5797,9 +14282,8 @@ Post = Select.extend({
 
 module.exports = Post;
 
-},{}],44:[function(require,module,exports){
-/*globals wp, _ */
-
+<<<<<<< .mine
+},{}],46:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Select
  *
@@ -5835,12 +14319,53 @@ Select = MediaFrame.extend({
 		this.bindHandlers();
 	},
 
-	/**
-	 * Attach a selection collection to the frame.
-	 *
-	 * A selection is a collection of attachments used for a specific purpose
-	 * by a media frame. e.g. Selecting an attachment (or many) to insert into
-	 * post content.
+||||||| .r11156
+=======
+},{}],44:[function(require,module,exports){
+/*globals wp, _ */
+
+/**
+ * wp.media.view.MediaFrame.Select
+ *
+ * A frame for selecting an item or items from the media library.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+
+var MediaFrame = wp.media.view.MediaFrame,
+	l10n = wp.media.view.l10n,
+	Select;
+
+Select = MediaFrame.extend({
+	initialize: function() {
+		// Call 'initialize' directly on the parent class.
+		MediaFrame.prototype.initialize.apply( this, arguments );
+
+		_.defaults( this.options, {
+			selection: [],
+			library:   {},
+			multiple:  false,
+			state:    'library'
+		});
+
+		this.createSelection();
+		this.createStates();
+		this.bindHandlers();
+	},
+
+>>>>>>> .r12027
+	/**
+	 * Attach a selection collection to the frame.
+	 *
+	 * A selection is a collection of attachments used for a specific purpose
+	 * by a media frame. e.g. Selecting an attachment (or many) to insert into
+	 * post content.
 	 *
 	 * @see media.model.Selection
 	 */
@@ -5970,6 +14495,33 @@ Select = MediaFrame.extend({
 
 module.exports = Select;
 
+<<<<<<< .mine
+},{}],47:[function(require,module,exports){
+/**
+ * wp.media.view.Iframe
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Iframe = wp.media.View.extend({
+	className: 'media-iframe',
+	/**
+	 * @returns {wp.media.view.Iframe} Returns itself to allow chaining
+	 */
+	render: function() {
+		this.views.detach();
+		this.$el.html( '' );
+		this.views.render();
+		return this;
+	}
+});
+||||||| .r11156
+			if ( 'image' === options.type ) {
+				options.size = this.imageSize();
+			}
+=======
 },{}],45:[function(require,module,exports){
 /**
  * wp.media.view.Iframe
@@ -5991,12 +14543,58 @@ var Iframe = wp.media.View.extend({
 		return this;
 	}
 });
+>>>>>>> .r12027
 
 module.exports = Iframe;
 
+<<<<<<< .mine
+},{}],48:[function(require,module,exports){
+/**
+ * wp.media.view.ImageDetails
+ *
+ * @class
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
+	$ = jQuery,
+	ImageDetails;
+||||||| .r11156
+			if ( this.controller.state().get('allowLocalEdits') ) {
+				options.allowLocalEdits = true;
+			}
+=======
 },{}],46:[function(require,module,exports){
 /*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+ImageDetails = AttachmentDisplay.extend({
+	className: 'image-details',
+	template:  wp.template('image-details'),
+	events: _.defaults( AttachmentDisplay.prototype.events, {
+		'click .edit-attachment': 'editAttachment',
+		'click .replace-attachment': 'replaceAttachment',
+		'click .advanced-toggle': 'onToggleAdvanced',
+		'change [data-setting="customWidth"]': 'onCustomSize',
+		'change [data-setting="customHeight"]': 'onCustomSize',
+		'keyup [data-setting="customWidth"]': 'onCustomSize',
+		'keyup [data-setting="customHeight"]': 'onCustomSize'
+	} ),
+	initialize: function() {
+		// used in AttachmentDisplay.prototype.updateLinkTo
+		this.options.attachment = this.model.attachment;
+		this.listenTo( this.model, 'change:url', this.updateUrl );
+		this.listenTo( this.model, 'change:link', this.toggleLinkSettings );
+		this.listenTo( this.model, 'change:size', this.toggleCustomSize );
+||||||| .r11156
+			if ( options.uploading && ! options.percent ) {
+				options.percent = 0;
+			}
+=======
 /**
  * wp.media.view.ImageDetails
  *
@@ -6010,7 +14608,15 @@ module.exports = Iframe;
 var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
 	$ = jQuery,
 	ImageDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		AttachmentDisplay.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+			this.views.detach();
+			this.$el.html( this.template( options ) );
+=======
 ImageDetails = AttachmentDisplay.extend({
 	className: 'image-details',
 	template:  wp.template('image-details'),
@@ -6029,13 +14635,45 @@ ImageDetails = AttachmentDisplay.extend({
 		this.listenTo( this.model, 'change:url', this.updateUrl );
 		this.listenTo( this.model, 'change:link', this.toggleLinkSettings );
 		this.listenTo( this.model, 'change:size', this.toggleCustomSize );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	prepare: function() {
+		var attachment = false;
+||||||| .r11156
+			this.$el.toggleClass( 'uploading', options.uploading );
+=======
 		AttachmentDisplay.prototype.initialize.apply( this, arguments );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.model.attachment ) {
+			attachment = this.model.attachment.toJSON();
+		}
+		return _.defaults({
+			model: this.model.toJSON(),
+			attachment: attachment
+		}, this.options );
+	},
+||||||| .r11156
+			if ( options.uploading ) {
+				this.$bar = this.$('.media-progress-bar div');
+			} else {
+				delete this.$bar;
+			}
+=======
 	prepare: function() {
 		var attachment = false;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	render: function() {
+		var args = arguments;
+||||||| .r11156
+			// Check if the model is selected.
+			this.updateSelect();
+=======
 		if ( this.model.attachment ) {
 			attachment = this.model.attachment.toJSON();
 		}
@@ -6044,10 +14682,38 @@ ImageDetails = AttachmentDisplay.extend({
 			attachment: attachment
 		}, this.options );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( this.model.attachment && 'pending' === this.model.dfd.state() ) {
+			this.model.dfd
+				.done( _.bind( function() {
+					AttachmentDisplay.prototype.render.apply( this, args );
+					this.postRender();
+				}, this ) )
+				.fail( _.bind( function() {
+					this.model.attachment = false;
+					AttachmentDisplay.prototype.render.apply( this, args );
+					this.postRender();
+				}, this ) );
+		} else {
+			AttachmentDisplay.prototype.render.apply( this, arguments );
+			this.postRender();
+		}
+||||||| .r11156
+			// Update the save status.
+			this.updateSave();
+=======
 	render: function() {
 		var args = arguments;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		return this;
+	},
+||||||| .r11156
+			this.views.render();
+=======
 		if ( this.model.attachment && 'pending' === this.model.dfd.state() ) {
 			this.model.dfd
 				.done( _.bind( function() {
@@ -6063,10 +14729,37 @@ ImageDetails = AttachmentDisplay.extend({
 			AttachmentDisplay.prototype.render.apply( this, arguments );
 			this.postRender();
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	postRender: function() {
+		setTimeout( _.bind( this.resetFocus, this ), 10 );
+		this.toggleLinkSettings();
+		if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
+			this.toggleAdvanced( true );
+		}
+		this.trigger( 'post-render' );
+	},
+||||||| .r11156
+			return this;
+		},
+=======
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	resetFocus: function() {
+		this.$( '.link-to-custom' ).blur();
+		this.$( '.embed-media-settings' ).scrollTop( 0 );
+	},
+||||||| .r11156
+		progress: function() {
+			if ( this.$bar && this.$bar.length ) {
+				this.$bar.width( this.model.get('percent') + '%' );
+			}
+		},
+=======
 	postRender: function() {
 		setTimeout( _.bind( this.resetFocus, this ), 10 );
 		this.toggleLinkSettings();
@@ -6075,17 +14768,61 @@ ImageDetails = AttachmentDisplay.extend({
 		}
 		this.trigger( 'post-render' );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	updateUrl: function() {
+		this.$( '.image img' ).attr( 'src', this.model.get( 'url' ) );
+		this.$( '.url' ).val( this.model.get( 'url' ) );
+	},
+||||||| .r11156
+		/**
+		 * @param {Object} event
+		 */
+		toggleSelectionHandler: function( event ) {
+			var method;
+=======
 	resetFocus: function() {
 		this.$( '.link-to-custom' ).blur();
 		this.$( '.embed-media-settings' ).scrollTop( 0 );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	toggleLinkSettings: function() {
+		if ( this.model.get( 'link' ) === 'none' ) {
+			this.$( '.link-settings' ).addClass('hidden');
+		} else {
+			this.$( '.link-settings' ).removeClass('hidden');
+		}
+	},
+||||||| .r11156
+			// Don't do anything inside inputs.
+			if ( 'INPUT' === event.target.nodeName ) {
+				return;
+			}
+=======
 	updateUrl: function() {
 		this.$( '.image img' ).attr( 'src', this.model.get( 'url' ) );
 		this.$( '.url' ).val( this.model.get( 'url' ) );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	toggleCustomSize: function() {
+		if ( this.model.get( 'size' ) !== 'custom' ) {
+			this.$( '.custom-size' ).addClass('hidden');
+		} else {
+			this.$( '.custom-size' ).removeClass('hidden');
+		}
+	},
+||||||| .r11156
+			// Catch arrow events
+			if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+				this.controller.trigger( 'attachment:keydown:arrow', event );
+				return;
+			}
+=======
 	toggleLinkSettings: function() {
 		if ( this.model.get( 'link' ) === 'none' ) {
 			this.$( '.link-settings' ).addClass('hidden');
@@ -6093,7 +14830,19 @@ ImageDetails = AttachmentDisplay.extend({
 			this.$( '.link-settings' ).removeClass('hidden');
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	onCustomSize: function( event ) {
+		var dimension = $( event.target ).data('setting'),
+			num = $( event.target ).val(),
+			value;
+||||||| .r11156
+			// Catch enter and space events
+			if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+				return;
+			}
+=======
 	toggleCustomSize: function() {
 		if ( this.model.get( 'size' ) !== 'custom' ) {
 			this.$( '.custom-size' ).addClass('hidden');
@@ -6101,18 +14850,62 @@ ImageDetails = AttachmentDisplay.extend({
 			this.$( '.custom-size' ).removeClass('hidden');
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Ignore bogus input
+		if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
+			event.preventDefault();
+			return;
+		}
+||||||| .r11156
+			// In the grid view, bubble up an edit:attachment event to the controller.
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				if ( this.controller.isModeActive( 'edit' ) ) {
+					// Pass the current target to restore focus when closing
+					this.controller.trigger( 'edit:attachment', this.model, event.currentTarget );
+=======
 	onCustomSize: function( event ) {
 		var dimension = $( event.target ).data('setting'),
 			num = $( event.target ).val(),
 			value;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( dimension === 'customWidth' ) {
+			value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
+			this.model.set( 'customHeight', value, { silent: true } );
+			this.$( '[data-setting="customHeight"]' ).val( value );
+		} else {
+			value = Math.round( this.model.get( 'aspectRatio' ) * num );
+			this.model.set( 'customWidth', value, { silent: true  } );
+			this.$( '[data-setting="customWidth"]' ).val( value );
+		}
+	},
+||||||| .r11156
+					// Don't scroll the view and don't attempt to submit anything.
+					event.stopPropagation();
+					return;
+				}
+=======
 		// Ignore bogus input
 		if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
 			event.preventDefault();
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	onToggleAdvanced: function( event ) {
+		event.preventDefault();
+		this.toggleAdvanced();
+	},
+||||||| .r11156
+				if ( this.controller.isModeActive( 'select' ) ) {
+					method = 'toggle';
+				}
+			}
+=======
 		if ( dimension === 'customWidth' ) {
 			value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
 			this.model.set( 'customHeight', value, { silent: true } );
@@ -6123,16 +14916,51 @@ ImageDetails = AttachmentDisplay.extend({
 			this.$( '[data-setting="customWidth"]' ).val( value );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	toggleAdvanced: function( show ) {
+		var $advanced = this.$el.find( '.advanced-section' ),
+			mode;
+||||||| .r11156
+			if ( event.shiftKey ) {
+				method = 'between';
+			} else if ( event.ctrlKey || event.metaKey ) {
+				method = 'toggle';
+			}
+=======
 	onToggleAdvanced: function( event ) {
 		event.preventDefault();
 		this.toggleAdvanced();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( $advanced.hasClass('advanced-visible') || show === false ) {
+			$advanced.removeClass('advanced-visible');
+			$advanced.find('.advanced-settings').addClass('hidden');
+			mode = 'hide';
+		} else {
+			$advanced.addClass('advanced-visible');
+			$advanced.find('.advanced-settings').removeClass('hidden');
+			mode = 'show';
+		}
+||||||| .r11156
+			this.toggleSelection({
+				method: method
+			});
+=======
 	toggleAdvanced: function( show ) {
 		var $advanced = this.$el.find( '.advanced-section' ),
 			mode;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		window.setUserSetting( 'advImgDetails', mode );
+	},
+||||||| .r11156
+			this.controller.trigger( 'selection:toggle' );
+=======
 		if ( $advanced.hasClass('advanced-visible') || show === false ) {
 			$advanced.removeClass('advanced-visible');
 			$advanced.find('.advanced-settings').addClass('hidden');
@@ -6142,28 +14970,112 @@ ImageDetails = AttachmentDisplay.extend({
 			$advanced.find('.advanced-settings').removeClass('hidden');
 			mode = 'show';
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	editAttachment: function( event ) {
+		var editState = this.controller.states.get( 'edit-image' );
+||||||| .r11156
+			// Don't scroll the view and don't attempt to submit anything.
+			event.stopPropagation();
+		},
+		/**
+		 * @param {Object} options
+		 */
+		toggleSelection: function( options ) {
+			var collection = this.collection,
+				selection = this.options.selection,
+				model = this.model,
+				method = options && options.method,
+				single, models, singleIndex, modelIndex;
+=======
 		window.setUserSetting( 'advImgDetails', mode );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( window.imageEdit && editState ) {
+			event.preventDefault();
+			editState.set( 'image', this.model.attachment );
+			this.controller.setState( 'edit-image' );
+		}
+	},
+||||||| .r11156
+			if ( ! selection ) {
+				return;
+			}
+=======
 	editAttachment: function( event ) {
 		var editState = this.controller.states.get( 'edit-image' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	replaceAttachment: function( event ) {
+		event.preventDefault();
+		this.controller.setState( 'replace-image' );
+	}
+});
+||||||| .r11156
+			single = selection.single();
+			method = _.isUndefined( method ) ? selection.multiple : method;
+=======
 		if ( window.imageEdit && editState ) {
 			event.preventDefault();
 			editState.set( 'image', this.model.attachment );
 			this.controller.setState( 'edit-image' );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = ImageDetails;
+||||||| .r11156
+			// If the `method` is set to `between`, select all models that
+			// exist between the current and the selected model.
+			if ( 'between' === method && single && selection.multiple ) {
+				// If the models are the same, short-circuit.
+				if ( single === model ) {
+					return;
+				}
+=======
 	replaceAttachment: function( event ) {
 		event.preventDefault();
 		this.controller.setState( 'replace-image' );
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],49:[function(require,module,exports){
+/**
+ * wp.media.view.Label
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Label = wp.media.View.extend({
+	tagName: 'label',
+	className: 'screen-reader-text',
+||||||| .r11156
+				singleIndex = collection.indexOf( single );
+				modelIndex  = collection.indexOf( this.model );
+=======
 module.exports = ImageDetails;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.value = this.options.value;
+	},
+||||||| .r11156
+				if ( singleIndex < modelIndex ) {
+					models = collection.models.slice( singleIndex, modelIndex + 1 );
+				} else {
+					models = collection.models.slice( modelIndex, singleIndex + 1 );
+				}
+=======
 },{}],47:[function(require,module,exports){
 /**
  * wp.media.view.Label
@@ -6176,23 +15088,129 @@ module.exports = ImageDetails;
 var Label = wp.media.View.extend({
 	tagName: 'label',
 	className: 'screen-reader-text',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	render: function() {
+		this.$el.html( this.value );
+||||||| .r11156
+				selection.add( models );
+				selection.single( model );
+				return;
+=======
 	initialize: function() {
 		this.value = this.options.value;
 	},
+>>>>>>> .r12027
 
-	render: function() {
+<<<<<<< .mine
+		return this;
+	}
+});
+||||||| .r11156
+			// If the `method` is set to `toggle`, just flip the selection
+			// status, regardless of whether the model is the single model.
+			} else if ( 'toggle' === method ) {
+				selection[ this.selected() ? 'remove' : 'add' ]( model );
+				selection.single( model );
+				return;
+			} else if ( 'add' === method ) {
+				selection.add( model );
+				selection.single( model );
+				return;
+			}
+=======
+	render: function() {
 		this.$el.html( this.value );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Label;
+||||||| .r11156
+			// Fixes bug that loses focus when selecting a featured image
+			if ( ! method ) {
+				method = 'add';
+			}
+=======
 		return this;
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],50:[function(require,module,exports){
+/**
+ * wp.media.view.MediaFrame
+ *
+ * The frame used to create the media modal.
+ *
+ * @class
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Frame = wp.media.view.Frame,
+	$ = jQuery,
+	MediaFrame;
+||||||| .r11156
+			if ( method !== 'add' ) {
+				method = 'reset';
+			}
+=======
 module.exports = Label;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+MediaFrame = Frame.extend({
+	className: 'media-frame',
+	template:  wp.template('media-frame'),
+	regions:   ['menu','title','content','toolbar','router'],
+||||||| .r11156
+			if ( this.selected() ) {
+				// If the model is the single model, remove it.
+				// If it is not the same as the single model,
+				// it now becomes the single model.
+				selection[ single === model ? 'remove' : 'single' ]( model );
+			} else {
+				// If the model is not selected, run the `method` on the
+				// selection. By default, we `reset` the selection, but the
+				// `method` can be set to `add` the model to the selection.
+				selection[ method ]( model );
+				selection.single( model );
+			}
+		},
+=======
 },{}],48:[function(require,module,exports){
 /*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'click div.media-frame-title h1': 'toggleMenu'
+	},
+||||||| .r11156
+		updateSelect: function() {
+			this[ this.selected() ? 'select' : 'deselect' ]();
+		},
+		/**
+		 * @returns {unresolved|Boolean}
+		 */
+		selected: function() {
+			var selection = this.options.selection;
+			if ( selection ) {
+				return !! selection.get( this.model.cid );
+			}
+		},
+		/**
+		 * @param {Backbone.Model} model
+		 * @param {Backbone.Collection} collection
+		 */
+		select: function( model, collection ) {
+			var selection = this.options.selection,
+				controller = this.controller;
+=======
 /**
  * wp.media.view.MediaFrame
  *
@@ -6208,47 +15226,202 @@ module.exports = Label;
 var Frame = wp.media.view.Frame,
 	$ = jQuery,
 	MediaFrame;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @global wp.Uploader
+	 */
+	initialize: function() {
+		Frame.prototype.initialize.apply( this, arguments );
+||||||| .r11156
+			// Check if a selection exists and if it's the collection provided.
+			// If they're not the same collection, bail; we're in another
+			// selection's event loop.
+			if ( ! selection || ( collection && collection !== selection ) ) {
+				return;
+			}
+=======
 MediaFrame = Frame.extend({
 	className: 'media-frame',
 	template:  wp.template('media-frame'),
 	regions:   ['menu','title','content','toolbar','router'],
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.defaults( this.options, {
+			title:    '',
+			modal:    true,
+			uploader: true
+		});
+||||||| .r11156
+			// Bail if the model is already selected.
+			if ( this.$el.hasClass( 'selected' ) ) {
+				return;
+			}
+=======
 	events: {
 		'click div.media-frame-title h1': 'toggleMenu'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Ensure core UI is enabled.
+		this.$el.addClass('wp-core-ui');
+||||||| .r11156
+			// Add 'selected' class to model, set aria-checked to true.
+			this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
+			//  Make the checkbox tabable, except in media grid (bulk select mode).
+			if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
+				this.$( '.check' ).attr( 'tabindex', '0' );
+			}
+		},
+		/**
+		 * @param {Backbone.Model} model
+		 * @param {Backbone.Collection} collection
+		 */
+		deselect: function( model, collection ) {
+			var selection = this.options.selection;
+=======
 	/**
 	 * @global wp.Uploader
 	 */
 	initialize: function() {
 		Frame.prototype.initialize.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Initialize modal container view.
+		if ( this.options.modal ) {
+			this.modal = new wp.media.view.Modal({
+				controller: this,
+				title:      this.options.title
+			});
+||||||| .r11156
+			// Check if a selection exists and if it's the collection provided.
+			// If they're not the same collection, bail; we're in another
+			// selection's event loop.
+			if ( ! selection || ( collection && collection !== selection ) ) {
+				return;
+			}
+			this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
+				.find( '.check' ).attr( 'tabindex', '-1' );
+		},
+		/**
+		 * @param {Backbone.Model} model
+		 * @param {Backbone.Collection} collection
+		 */
+		details: function( model, collection ) {
+			var selection = this.options.selection,
+				details;
+=======
 		_.defaults( this.options, {
 			title:    '',
 			modal:    true,
 			uploader: true
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			this.modal.content( this );
+		}
+||||||| .r11156
+			if ( selection !== collection ) {
+				return;
+			}
+=======
 		// Ensure core UI is enabled.
 		this.$el.addClass('wp-core-ui');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Force the uploader off if the upload limit has been exceeded or
+		// if the browser isn't supported.
+		if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
+			this.options.uploader = false;
+		}
+||||||| .r11156
+			details = selection.single();
+			this.$el.toggleClass( 'details', details === this.model );
+		},
+		/**
+		 * @param {Object} event
+		 */
+		preventDefault: function( event ) {
+			event.preventDefault();
+		},
+		/**
+		 * @param {string} size
+		 * @returns {Object}
+		 */
+		imageSize: function( size ) {
+			var sizes = this.model.get('sizes');
+=======
 		// Initialize modal container view.
 		if ( this.options.modal ) {
 			this.modal = new wp.media.view.Modal({
 				controller: this,
 				title:      this.options.title
 			});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Initialize window-wide uploader.
+		if ( this.options.uploader ) {
+			this.uploader = new wp.media.view.UploaderWindow({
+				controller: this,
+				uploader: {
+					dropzone:  this.modal ? this.modal.$el : this.$el,
+					container: this.$el
+				}
+			});
+			this.views.set( '.media-frame-uploader', this.uploader );
+		}
+||||||| .r11156
+			size = size || 'medium';
+=======
 			this.modal.content( this );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'attach', _.bind( this.views.ready, this.views ), this );
+||||||| .r11156
+			// Use the provided image size if possible.
+			if ( sizes && sizes[ size ] ) {
+				return _.clone( sizes[ size ] );
+			} else {
+				return {
+					url:         this.model.get('url'),
+					width:       this.model.get('width'),
+					height:      this.model.get('height'),
+					orientation: this.model.get('orientation')
+				};
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		updateSetting: function( event ) {
+			var $setting = $( event.target ).closest('[data-setting]'),
+				setting, value;
+=======
 		// Force the uploader off if the upload limit has been exceeded or
 		// if the browser isn't supported.
 		if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
 			this.options.uploader = false;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Bind default title creation.
+		this.on( 'title:create:default', this.createTitle, this );
+		this.title.mode('default');
+||||||| .r11156
+			if ( ! $setting.length ) {
+				return;
+			}
+=======
 		// Initialize window-wide uploader.
 		if ( this.options.uploader ) {
 			this.uploader = new wp.media.view.UploaderWindow({
@@ -6260,13 +15433,43 @@ MediaFrame = Frame.extend({
 			});
 			this.views.set( '.media-frame-uploader', this.uploader );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.on( 'title:render', function( view ) {
+			view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
+		});
+||||||| .r11156
+			setting = $setting.data('setting');
+			value   = event.target.value;
+=======
 		this.on( 'attach', _.bind( this.views.ready, this.views ), this );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// Bind default menu.
+		this.on( 'menu:create:default', this.createMenu, this );
+	},
+	/**
+	 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
+	 */
+	render: function() {
+		// Activate the default state if no active state exists.
+		if ( ! this.state() && this.options.state ) {
+			this.setState( this.options.state );
+		}
+||||||| .r11156
+			if ( this.model.get( setting ) !== value ) {
+				this.save( setting, value );
+			}
+		},
 
+=======
 		// Bind default title creation.
 		this.on( 'title:create:default', this.createTitle, this );
 		this.title.mode('default');
 
+>>>>>>> .r12027
 		this.on( 'title:render', function( view ) {
 			view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
 		});
@@ -6437,6 +15640,34 @@ _.each(['open','close','attach','detach','escape'], function( method ) {
 	};
 });
 
+<<<<<<< .mine
+module.exports = MediaFrame;
+
+},{}],51:[function(require,module,exports){
+/**
+ * wp.media.view.MenuItem
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+	MenuItem;
+
+MenuItem = wp.media.View.extend({
+	tagName:   'a',
+	className: 'media-menu-item',
+
+	attributes: {
+		href: '#'
+	},
+
+	events: {
+		'click': '_click'
+	},
+||||||| .r11156
+=======
 module.exports = MediaFrame;
 
 },{}],49:[function(require,module,exports){
@@ -6464,6 +15695,7 @@ MenuItem = wp.media.View.extend({
 	events: {
 		'click': '_click'
 	},
+>>>>>>> .r12027
 	/**
 	 * @param {Object} event
 	 */
@@ -6513,6 +15745,25 @@ MenuItem = wp.media.View.extend({
 
 module.exports = MenuItem;
 
+<<<<<<< .mine
+},{}],52:[function(require,module,exports){
+/**
+ * wp.media.view.Menu
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var MenuItem = wp.media.view.MenuItem,
+	PriorityList = wp.media.view.PriorityList,
+	Menu;
+||||||| .r11156
+			this._viewsByCid = {};
+			this.$window = $( window );
+			this.resizeEvent = 'resize.media-modal-columns';
+=======
 },{}],50:[function(require,module,exports){
 /**
  * wp.media.view.Menu
@@ -6526,6 +15777,7 @@ module.exports = MenuItem;
 var MenuItem = wp.media.view.MenuItem,
 	PriorityList = wp.media.view.PriorityList,
 	Menu;
+>>>>>>> .r12027
 
 Menu = PriorityList.extend({
 	tagName:   'div',
@@ -6630,9 +15882,45 @@ Menu = PriorityList.extend({
 
 module.exports = Menu;
 
+<<<<<<< .mine
+},{}],53:[function(require,module,exports){
+/**
+ * wp.media.view.Modal
+ *
+ * A modal view, which the media modal uses as its default container.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+	Modal;
+||||||| .r11156
+			// Down arrow
+			if ( 40 === event.keyCode ) {
+				if ( Math.ceil( attachments.length / perRow ) === row ) {
+					return;
+				}
+				attachments.eq( index + perRow ).focus();
+			}
+		},
+=======
 },{}],51:[function(require,module,exports){
 /*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Modal = wp.media.View.extend({
+	tagName:  'div',
+	template: wp.template('media-modal'),
+||||||| .r11156
+		dispose: function() {
+			this.collection.props.off( null, null, this );
+			if ( this.options.resize ) {
+				this.$window.off( this.resizeEvent );
+			}
+=======
 /**
  * wp.media.view.Modal
  *
@@ -6645,20 +15933,77 @@ module.exports = Menu;
  */
 var $ = jQuery,
 	Modal;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	attributes: {
+		tabindex: 0
+	},
+||||||| .r11156
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			media.View.prototype.dispose.apply( this, arguments );
+		},
+=======
 Modal = wp.media.View.extend({
 	tagName:  'div',
 	template: wp.template('media-modal'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
+		'keydown': 'keydown'
+	},
+||||||| .r11156
+		setColumns: function() {
+			var prev = this.columns,
+				width = this.$el.width();
+=======
 	attributes: {
 		tabindex: 0
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		_.defaults( this.options, {
+			container: document.body,
+			title:     '',
+			propagate: true,
+			freeze:    true
+		});
+||||||| .r11156
+			if ( width ) {
+				this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
+=======
 	events: {
 		'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
 		'keydown': 'keydown'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.focusManager = new wp.media.view.FocusManager({
+			el: this.el
+		});
+	},
+	/**
+	 * @returns {Object}
+	 */
+	prepare: function() {
+		return {
+			title: this.options.title
+		};
+	},
+||||||| .r11156
+				if ( ! prev || prev !== this.columns ) {
+					this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
+				}
+			}
+		},
+=======
 	initialize: function() {
 		_.defaults( this.options, {
 			container: document.body,
@@ -6666,7 +16011,20 @@ Modal = wp.media.View.extend({
 			propagate: true,
 			freeze:    true
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 */
+	attach: function() {
+		if ( this.views.attached ) {
+			return this;
+		}
+||||||| .r11156
+		initSortable: function() {
+			var collection = this.collection;
+=======
 		this.focusManager = new wp.media.view.FocusManager({
 			el: this.el
 		});
@@ -6679,7 +16037,17 @@ Modal = wp.media.View.extend({
 			title: this.options.title
 		};
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! this.views.rendered ) {
+			this.render();
+		}
+||||||| .r11156
+			if ( isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+				return;
+			}
+=======
 	/**
 	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
@@ -6687,20 +16055,46 @@ Modal = wp.media.View.extend({
 		if ( this.views.attached ) {
 			return this;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$el.appendTo( this.options.container );
+||||||| .r11156
+			this.$el.sortable( _.extend({
+				// If the `collection` has a `comparator`, disable sorting.
+				disabled: !! collection.comparator,
+=======
 		if ( ! this.views.rendered ) {
 			this.render();
 		}
+>>>>>>> .r12027
 
-		this.$el.appendTo( this.options.container );
-
+<<<<<<< .mine
 		// Manually mark the view as attached and trigger ready.
 		this.views.attached = true;
 		this.views.ready();
+||||||| .r11156
+				// Prevent attachments from being dragged outside the bounding
+				// box of the list.
+				containment: this.$el,
+=======
+		this.$el.appendTo( this.options.container );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this.propagate('attach');
 	},
+||||||| .r11156
+				// Change the position of the attachment as soon as the
+				// mouse pointer overlaps a thumbnail.
+				tolerance: 'pointer',
+=======
+		// Manually mark the view as attached and trigger ready.
+		this.views.attached = true;
+		this.views.ready();
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	/**
 	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
@@ -6708,12 +16102,38 @@ Modal = wp.media.View.extend({
 		if ( this.$el.is(':visible') ) {
 			this.close();
 		}
+||||||| .r11156
+				// Record the initial `index` of the dragged model.
+				start: function( event, ui ) {
+					ui.item.data('sortableIndexStart', ui.item.index());
+				},
+=======
+		return this.propagate('attach');
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.$el.detach();
 		this.views.attached = false;
 		return this.propagate('detach');
 	},
+||||||| .r11156
+				// Update the model's index in the collection.
+				// Do so silently, as the view is already accurate.
+				update: function( event, ui ) {
+					var model = collection.at( ui.item.data('sortableIndexStart') ),
+						comparator = collection.comparator;
+=======
+	/**
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 */
+	detach: function() {
+		if ( this.$el.is(':visible') ) {
+			this.close();
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	/**
 	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
@@ -6721,27 +16141,123 @@ Modal = wp.media.View.extend({
 		var $el = this.$el,
 			options = this.options,
 			mceEditor;
+||||||| .r11156
+					// Temporarily disable the comparator to prevent `add`
+					// from re-sorting.
+					delete collection.comparator;
+=======
+		this.$el.detach();
+		this.views.attached = false;
+		return this.propagate('detach');
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( $el.is(':visible') ) {
 			return this;
 		}
+||||||| .r11156
+					// Silently shift the model to its new index.
+					collection.remove( model, {
+						silent: true
+					});
+					collection.add( model, {
+						silent: true,
+						at:     ui.item.index()
+					});
+=======
+	/**
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 */
+	open: function() {
+		var $el = this.$el,
+			options = this.options,
+			mceEditor;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! this.views.attached ) {
 			this.attach();
 		}
+||||||| .r11156
+					// Restore the comparator.
+					collection.comparator = comparator;
+=======
+		if ( $el.is(':visible') ) {
+			return this;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// If the `freeze` option is set, record the window's scroll position.
 		if ( options.freeze ) {
 			this._freeze = {
 				scrollTop: $( window ).scrollTop()
 			};
 		}
+||||||| .r11156
+					// Fire the `reset` event to ensure other collections sync.
+					collection.trigger( 'reset', collection );
+=======
+		if ( ! this.views.attached ) {
+			this.attach();
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// Disable page scrolling.
 		$( 'body' ).addClass( 'modal-open' );
-
+||||||| .r11156
+					// If the collection is sorted by menu order,
+					// update the menu order.
+					collection.saveMenuOrder();
+				}
+			}, this.options.sortable ) );
+=======
+		// If the `freeze` option is set, record the window's scroll position.
+		if ( options.freeze ) {
+			this._freeze = {
+				scrollTop: $( window ).scrollTop()
+			};
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		$el.show();
+||||||| .r11156
+			// If the `orderby` property is changed on the `collection`,
+			// check to see if we have a `comparator`. If so, disable sorting.
+			collection.props.on( 'change:orderby', function() {
+				this.$el.sortable( 'option', 'disabled', !! collection.comparator );
+			}, this );
+=======
+		// Disable page scrolling.
+		$( 'body' ).addClass( 'modal-open' );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// Try to close the onscreen keyboard
+		if ( 'ontouchend' in document ) {
+			if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
+				mceEditor.iframeElement.focus();
+				mceEditor.iframeElement.blur();
+||||||| .r11156
+			this.collection.props.on( 'change:orderby', this.refreshSortable, this );
+			this.refreshSortable();
+		},
+=======
 		$el.show();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+				setTimeout( function() {
+					mceEditor.iframeElement.blur();
+				}, 100 );
+||||||| .r11156
+		refreshSortable: function() {
+			if ( isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+				return;
+=======
 		// Try to close the onscreen keyboard
 		if ( 'ontouchend' in document ) {
 			if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
@@ -6751,6 +16267,7 @@ Modal = wp.media.View.extend({
 				setTimeout( function() {
 					mceEditor.iframeElement.blur();
 				}, 100 );
+>>>>>>> .r12027
 			}
 		}
 
@@ -6845,9 +16362,42 @@ Modal = wp.media.View.extend({
 
 module.exports = Modal;
 
+<<<<<<< .mine
+},{}],54:[function(require,module,exports){
+/**
+ * wp.media.view.PriorityList
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var PriorityList = wp.media.View.extend({
+	tagName:   'div',
+||||||| .r11156
+		events: {
+			'input':  'search',
+			'keyup':  'search',
+			'change': 'search',
+			'search': 'search'
+		},
+=======
 },{}],52:[function(require,module,exports){
 /*globals _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this._views = {};
+||||||| .r11156
+		/**
+		 * @returns {wp.media.view.Search} Returns itself to allow chaining
+		 */
+		render: function() {
+			this.el.value = this.model.escape('search');
+			return this;
+		},
+=======
 /**
  * wp.media.view.PriorityList
  *
@@ -6858,7 +16408,22 @@ module.exports = Modal;
  */
 var PriorityList = wp.media.View.extend({
 	tagName:   'div',
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
+		delete this.options.views;
 
+		if ( ! this.options.silent ) {
+			this.render();
+||||||| .r11156
+		search: function( event ) {
+			if ( event.target.value ) {
+				this.model.set( 'search', event.target.value );
+			} else {
+				this.model.unset('search');
+			}
+=======
 	initialize: function() {
 		this._views = {};
 
@@ -6867,6 +16432,7 @@ var PriorityList = wp.media.View.extend({
 
 		if ( ! this.options.silent ) {
 			this.render();
+>>>>>>> .r12027
 		}
 	},
 	/**
@@ -6944,6 +16510,44 @@ var PriorityList = wp.media.View.extend({
 
 module.exports = PriorityList;
 
+<<<<<<< .mine
+},{}],55:[function(require,module,exports){
+/**
+ * wp.media.view.RouterItem
+ *
+ * @class
+ * @augments wp.media.view.MenuItem
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var RouterItem = wp.media.view.MenuItem.extend({
+||||||| .r11156
+			this.filters = {
+				all: {
+					text:  text || l10n.allMediaItems,
+					props: {
+						uploadedTo: null,
+						orderby: 'date',
+						order:   'DESC'
+					},
+					priority: 10
+				},
+
+				uploaded: {
+					text:  l10n.uploadedToThisPost,
+					props: {
+						uploadedTo: media.view.settings.post.id,
+						orderby: 'menuOrder',
+						order:   'ASC'
+					},
+					priority: 20
+				}
+			};
+		}
+	});
+
+=======
 },{}],53:[function(require,module,exports){
 /**
  * wp.media.view.RouterItem
@@ -6955,6 +16559,7 @@ module.exports = PriorityList;
  * @augments Backbone.View
  */
 var RouterItem = wp.media.view.MenuItem.extend({
+>>>>>>> .r12027
 	/**
 	 * On click handler to activate the content region's corresponding mode.
 	 */
@@ -6968,9 +16573,59 @@ var RouterItem = wp.media.view.MenuItem.extend({
 
 module.exports = RouterItem;
 
+<<<<<<< .mine
+},{}],56:[function(require,module,exports){
+/**
+ * wp.media.view.Router
+ *
+ * @class
+ * @augments wp.media.view.Menu
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Menu = wp.media.view.Menu,
+	Router;
+||||||| .r11156
+			filters.all = {
+				text:  l10n.allMediaItems,
+				props: {
+					status:  null,
+					type:    null,
+					uploadedTo: null,
+					orderby: 'date',
+					order:   'DESC'
+				},
+				priority: 10
+			};
+=======
 },{}],54:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Router = Menu.extend({
+	tagName:   'div',
+	className: 'media-router',
+	property:  'contentMode',
+	ItemView:  wp.media.view.RouterItem,
+	region:    'router',
+||||||| .r11156
+			if ( media.view.settings.post.id ) {
+				filters.uploaded = {
+					text:  l10n.uploadedToThisPost,
+					props: {
+						status:  null,
+						type:    null,
+						uploadedTo: media.view.settings.post.id,
+						orderby: 'menuOrder',
+						order:   'ASC'
+					},
+					priority: 20
+				};
+			}
+=======
 /**
  * wp.media.view.Router
  *
@@ -6983,14 +16638,59 @@ module.exports = RouterItem;
  */
 var Menu = wp.media.view.Menu,
 	Router;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.controller.on( 'content:render', this.update, this );
+		// Call 'initialize' directly on the parent class.
+		Menu.prototype.initialize.apply( this, arguments );
+	},
+||||||| .r11156
+			filters.unattached = {
+				text:  l10n.unattached,
+				props: {
+					status:     null,
+					uploadedTo: 0,
+					type:       null,
+					orderby:    'menuOrder',
+					order:      'ASC'
+				},
+				priority: 50
+			};
+=======
 Router = Menu.extend({
 	tagName:   'div',
 	className: 'media-router',
 	property:  'contentMode',
 	ItemView:  wp.media.view.RouterItem,
 	region:    'router',
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	update: function() {
+		var mode = this.controller.content.mode();
+		if ( mode ) {
+			this.select( mode );
+||||||| .r11156
+			if ( media.view.settings.mediaTrash &&
+				this.controller.isModeActive( 'grid' ) ) {
+
+				filters.trash = {
+					text:  l10n.trash,
+					props: {
+						uploadedTo: null,
+						status:     'trash',
+						type:       null,
+						orderby:    'date',
+						order:      'DESC'
+					},
+					priority: 50
+				};
+			}
+
+			this.filters = filters;
+=======
 	initialize: function() {
 		this.controller.on( 'content:render', this.update, this );
 		// Call 'initialize' directly on the parent class.
@@ -7001,10 +16701,26 @@ Router = Menu.extend({
 		var mode = this.controller.content.mode();
 		if ( mode ) {
 			this.select( mode );
+>>>>>>> .r12027
 		}
 	}
 });
 
+<<<<<<< .mine
+module.exports = Router;
+||||||| .r11156
+	/**
+	 * wp.media.view.AttachmentsBrowser
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.AttachmentsBrowser = media.View.extend({
+		tagName:   'div',
+		className: 'attachments-browser',
+=======
 module.exports = Router;
 
 },{}],55:[function(require,module,exports){
@@ -7045,7 +16761,30 @@ Search = wp.media.View.extend({
 		this.el.value = this.model.escape('search');
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],57:[function(require,module,exports){
+/**
+ * wp.media.view.Search
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	Search;
+||||||| .r11156
+		initialize: function() {
+			_.defaults( this.options, {
+				filters: false,
+				search:  true,
+				display: false,
+				sidebar: true,
+				AttachmentView: media.view.Attachment.Library
+			});
+=======
 	search: function( event ) {
 		if ( event.target.value ) {
 			this.model.set( 'search', event.target.value );
@@ -7054,12 +16793,48 @@ Search = wp.media.View.extend({
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Search = wp.media.View.extend({
+	tagName:   'input',
+	className: 'search',
+	id:        'media-search-input',
+||||||| .r11156
+			this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
+=======
 module.exports = Search;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	attributes: {
+		type:        'search',
+		placeholder: l10n.search
+	},
+||||||| .r11156
+			this.createToolbar();
+			if ( this.options.sidebar ) {
+				this.createSidebar();
+			}
+			this.createUploader();
+			this.createAttachments();
+			this.updateContent();
+=======
 },{}],56:[function(require,module,exports){
 /*globals wp, _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'input':  'search',
+		'keyup':  'search',
+		'change': 'search',
+		'search': 'search'
+	},
+||||||| .r11156
+			if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
+				this.$el.addClass( 'hide-sidebar' );
+=======
 /**
  * wp.media.view.Selection
  *
@@ -7070,12 +16845,49 @@ module.exports = Search;
  */
 var l10n = wp.media.view.l10n,
 	Selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	/**
+	 * @returns {wp.media.view.Search} Returns itself to allow chaining
+	 */
+	render: function() {
+		this.el.value = this.model.escape('search');
+		return this;
+	},
+||||||| .r11156
+				if ( 'errors' === this.options.sidebar ) {
+					this.$el.addClass( 'sidebar-for-errors' );
+				}
+			}
+=======
 Selection = wp.media.View.extend({
 	tagName:   'div',
 	className: 'media-selection',
 	template:  wp.template('media-selection'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	search: function( event ) {
+		if ( event.target.value ) {
+			this.model.set( 'search', event.target.value );
+		} else {
+			this.model.unset('search');
+		}
+	}
+});
+||||||| .r11156
+			this.collection.on( 'add remove reset', this.updateContent, this );
+		},
+		/**
+		 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
+		 */
+		dispose: function() {
+			this.options.selection.off( null, null, this );
+			media.View.prototype.dispose.apply( this, arguments );
+			return this;
+		},
+=======
 	events: {
 		'click .edit-selection':  'edit',
 		'click .clear-selection': 'clear'
@@ -7096,55 +16908,223 @@ Selection = wp.media.View.extend({
 			selection:  this.collection,
 			model:      new Backbone.Model()
 		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Search;
+||||||| .r11156
+		createToolbar: function() {
+			var LibraryViewSwitcher, Filters, toolbarOptions;
+=======
 		this.views.set( '.selection-view', this.attachments );
 		this.collection.on( 'add remove reset', this.refresh, this );
 		this.controller.on( 'content:activate', this.refresh, this );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],58:[function(require,module,exports){
+/**
+ * wp.media.view.Selection
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	Selection;
+||||||| .r11156
+			toolbarOptions = {
+				controller: this.controller
+			};
+=======
 	ready: function() {
 		this.refresh();
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Selection = wp.media.View.extend({
+	tagName:   'div',
+	className: 'media-selection',
+	template:  wp.template('media-selection'),
+||||||| .r11156
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				toolbarOptions.className = 'media-toolbar wp-filter';
+			}
+=======
 	refresh: function() {
 		// If the selection hasn't been rendered, bail.
 		if ( ! this.$el.children().length ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	events: {
+		'click .edit-selection':  'edit',
+		'click .clear-selection': 'clear'
+	},
+||||||| .r11156
+			/**
+			* @member {wp.media.view.Toolbar}
+			*/
+			this.toolbar = new media.view.Toolbar( toolbarOptions );
+=======
 		var collection = this.collection,
 			editing = 'edit-selection' === this.controller.content.mode();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		_.defaults( this.options, {
+			editable:  false,
+			clearable: true
+		});
+||||||| .r11156
+			this.views.add( this.toolbar );
+=======
 		// If nothing is selected, display nothing.
 		this.$el.toggleClass( 'empty', ! collection.length );
 		this.$el.toggleClass( 'one', 1 === collection.length );
 		this.$el.toggleClass( 'editing', editing );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		/**
+		 * @member {wp.media.view.Attachments.Selection}
+		 */
+		this.attachments = new wp.media.view.Attachments.Selection({
+			controller: this.controller,
+			collection: this.collection,
+			selection:  this.collection,
+			model:      new Backbone.Model()
+		});
+||||||| .r11156
+			this.toolbar.set( 'spinner', new media.view.Spinner({
+				priority: -60
+			}) );
+=======
 		this.$('.count').text( l10n.selected.replace('%d', collection.length) );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.views.set( '.selection-view', this.attachments );
+		this.collection.on( 'add remove reset', this.refresh, this );
+		this.controller.on( 'content:activate', this.refresh, this );
+	},
+||||||| .r11156
+			if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
+				// "Filters" will return a <select>, need to render
+				// screen reader text before
+				this.toolbar.set( 'filtersLabel', new media.view.Label({
+					value: l10n.filterByType,
+					attributes: {
+						'for':  'media-attachment-filters'
+					},
+					priority:   -80
+				}).render() );
+=======
 	edit: function( event ) {
 		event.preventDefault();
 		if ( this.options.editable ) {
 			this.options.editable.call( this, this.collection );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	ready: function() {
+		this.refresh();
+	},
+||||||| .r11156
+				if ( 'uploaded' === this.options.filters ) {
+					this.toolbar.set( 'filters', new media.view.AttachmentFilters.Uploaded({
+						controller: this.controller,
+						model:      this.collection.props,
+						priority:   -80
+					}).render() );
+				} else {
+					Filters = new media.view.AttachmentFilters.All({
+						controller: this.controller,
+						model:      this.collection.props,
+						priority:   -80
+					});
+=======
 	clear: function( event ) {
 		event.preventDefault();
 		this.collection.reset();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	refresh: function() {
+		// If the selection hasn't been rendered, bail.
+		if ( ! this.$el.children().length ) {
+			return;
+		}
+||||||| .r11156
+					this.toolbar.set( 'filters', Filters.render() );
+				}
+			}
+=======
 		// Keep focus inside media modal
 		// after clear link is selected
 		this.controller.modal.focusManager.focus();
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		var collection = this.collection,
+			editing = 'edit-selection' === this.controller.content.mode();
+||||||| .r11156
+			// Feels odd to bring the global media library switcher into the Attachment
+			// browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
+			// which the controller can tap into and add this view?
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				LibraryViewSwitcher = media.View.extend({
+					className: 'view-switch media-grid-view-switch',
+					template: media.template( 'media-library-view-switcher')
+				});
+=======
 module.exports = Selection;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If nothing is selected, display nothing.
+		this.$el.toggleClass( 'empty', ! collection.length );
+		this.$el.toggleClass( 'one', 1 === collection.length );
+		this.$el.toggleClass( 'editing', editing );
+||||||| .r11156
+				this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
+					controller: this.controller,
+					priority: -90
+				}).render() );
+=======
 },{}],57:[function(require,module,exports){
 /*globals _, Backbone */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		this.$('.count').text( l10n.selected.replace('%d', collection.length) );
+	},
+||||||| .r11156
+				// DateFilter is a <select>, screen reader text needs to be rendered before
+				this.toolbar.set( 'dateFilterLabel', new media.view.Label({
+					value: l10n.filterByDate,
+					attributes: {
+						'for': 'media-attachment-date-filters'
+					},
+					priority: -75
+				}).render() );
+				this.toolbar.set( 'dateFilter', new media.view.DateFilter({
+					controller: this.controller,
+					model:      this.collection.props,
+					priority: -75
+				}).render() );
+=======
 /**
  * wp.media.view.Settings
  *
@@ -7156,7 +17136,23 @@ module.exports = Selection;
 var View = wp.media.View,
 	$ = Backbone.$,
 	Settings;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	edit: function( event ) {
+		event.preventDefault();
+		if ( this.options.editable ) {
+			this.options.editable.call( this, this.collection );
+		}
+	},
+||||||| .r11156
+				// BulkSelection is a <div> with subviews, including screen reader text
+				this.toolbar.set( 'selectModeToggleButton', new media.view.SelectModeToggleButton({
+					text: l10n.bulkSelect,
+					controller: this.controller,
+					priority: -70
+				}).render() );
+=======
 Settings = View.extend({
 	events: {
 		'click button':    'updateHandler',
@@ -7164,12 +17160,42 @@ Settings = View.extend({
 		'change select':   'updateHandler',
 		'change textarea': 'updateHandler'
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	clear: function( event ) {
+		event.preventDefault();
+		this.collection.reset();
+||||||| .r11156
+				this.toolbar.set( 'deleteSelectedButton', new media.view.DeleteSelectedButton({
+					filters: Filters,
+					style: 'primary',
+					disabled: true,
+					text: media.view.settings.mediaTrash ? l10n.trashSelected : l10n.deleteSelected,
+					controller: this.controller,
+					priority: -60,
+					click: function() {
+						var changed = [], removed = [], self = this,
+							selection = this.controller.state().get( 'selection' ),
+							library = this.controller.state().get( 'library' );
+=======
 	initialize: function() {
 		this.model = this.model || new Backbone.Model();
 		this.listenTo( this.model, 'change', this.updateChanges );
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Keep focus inside media modal
+		// after clear link is selected
+		this.controller.modal.focusManager.focus();
+	}
+});
+||||||| .r11156
+						if ( ! selection.length ) {
+							return;
+						}
+=======
 	prepare: function() {
 		return _.defaults({
 			model: this.model.toJSON()
@@ -7191,19 +17217,72 @@ Settings = View.extend({
 		var value = this.model.get( key ),
 			$setting = this.$('[data-setting="' + key + '"]'),
 			$buttons, $value;
+>>>>>>> .r12027
 
-		// Bail if we didn't find a matching setting.
+<<<<<<< .mine
+module.exports = Selection;
+||||||| .r11156
+						if ( ! media.view.settings.mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
+							return;
+						}
+=======
+		// Bail if we didn't find a matching setting.
 		if ( ! $setting.length ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],59:[function(require,module,exports){
+/**
+ * wp.media.view.Settings
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = Backbone.$,
+	Settings;
+||||||| .r11156
+						if ( media.view.settings.mediaTrash &&
+							'trash' !== selection.at( 0 ).get( 'status' ) &&
+							! confirm( l10n.warnBulkTrash ) ) {
+=======
 		// Attempt to determine how the setting is rendered and update
 		// the selected value.
+>>>>>>> .r12027
 
+<<<<<<< .mine
+Settings = View.extend({
+	events: {
+		'click button':    'updateHandler',
+		'change input':    'updateHandler',
+		'change select':   'updateHandler',
+		'change textarea': 'updateHandler'
+	},
+||||||| .r11156
+							return;
+						}
+=======
 		// Handle dropdowns.
 		if ( $setting.is('select') ) {
 			$value = $setting.find('[value="' + value + '"]');
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		this.model = this.model || new Backbone.Model();
+		this.listenTo( this.model, 'change', this.updateChanges );
+	},
+||||||| .r11156
+						selection.each( function( model ) {
+							if ( ! model.get( 'nonces' )['delete'] ) {
+								removed.push( model );
+								return;
+							}
+=======
 			if ( $value.length ) {
 				$setting.find('option').prop( 'selected', false );
 				$value.prop( 'selected', true );
@@ -7211,17 +17290,79 @@ Settings = View.extend({
 				// If we can't find the desired value, record what *is* selected.
 				this.model.set( key, $setting.find(':selected').val() );
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	prepare: function() {
+		return _.defaults({
+			model: this.model.toJSON()
+		}, this.options );
+	},
+	/**
+	 * @returns {wp.media.view.Settings} Returns itself to allow chaining
+	 */
+	render: function() {
+		View.prototype.render.apply( this, arguments );
+		// Select the correct values.
+		_( this.model.attributes ).chain().keys().each( this.update, this );
+		return this;
+	},
+	/**
+	 * @param {string} key
+	 */
+	update: function( key ) {
+		var value = this.model.get( key ),
+			$setting = this.$('[data-setting="' + key + '"]'),
+			$buttons, $value;
+||||||| .r11156
+							if ( media.view.settings.mediaTrash && 'trash' === model.get( 'status' ) ) {
+								model.set( 'status', 'inherit' );
+								changed.push( model.save() );
+								removed.push( model );
+							} else if ( media.view.settings.mediaTrash ) {
+								model.set( 'status', 'trash' );
+								changed.push( model.save() );
+								removed.push( model );
+							} else {
+								model.destroy();
+							}
+						} );
+=======
 		// Handle button groups.
 		} else if ( $setting.hasClass('button-group') ) {
 			$buttons = $setting.find('button').removeClass('active');
 			$buttons.filter( '[value="' + value + '"]' ).addClass('active');
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// Bail if we didn't find a matching setting.
+		if ( ! $setting.length ) {
+			return;
+		}
 
+		// Attempt to determine how the setting is rendered and update
+		// the selected value.
+||||||| .r11156
+						if ( changed.length ) {
+							selection.remove( removed );
+
+							$.when.apply( null, changed ).then( function() {
+								library._requery( true );
+								self.controller.trigger( 'selection:action:done' );
+							} );
+						} else {
+							this.controller.trigger( 'selection:action:done' );
+						}
+					}
+				}).render() );
+			}
+=======
 		// Handle text inputs and textareas.
 		} else if ( $setting.is('input[type="text"], textarea') ) {
 			if ( ! $setting.is(':focus') ) {
 				$setting.val( value );
 			}
+>>>>>>> .r12027
 		// Handle checkboxes.
 		} else if ( $setting.is('input[type="checkbox"]') ) {
 			$setting.prop( 'checked', !! value && 'false' !== value );
@@ -7235,17 +17376,88 @@ Settings = View.extend({
 			value = event.target.value,
 			userSetting;
 
+<<<<<<< .mine
+		// Handle dropdowns.
+		if ( $setting.is('select') ) {
+			$value = $setting.find('[value="' + value + '"]');
+||||||| .r11156
+			if ( this.options.search ) {
+				// Search is an input, screen reader text needs to be rendered before
+				this.toolbar.set( 'searchLabel', new media.view.Label({
+					value: l10n.searchMediaLabel,
+					attributes: {
+						'for': 'media-search-input'
+					},
+					priority:   60
+				}).render() );
+				this.toolbar.set( 'search', new media.view.Search({
+					controller: this.controller,
+					model:      this.collection.props,
+					priority:   60
+				}).render() );
+			}
+=======
 		event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			if ( $value.length ) {
+				$setting.find('option').prop( 'selected', false );
+				$value.prop( 'selected', true );
+			} else {
+				// If we can't find the desired value, record what *is* selected.
+				this.model.set( key, $setting.find(':selected').val() );
+			}
+||||||| .r11156
+			if ( this.options.dragInfo ) {
+				this.toolbar.set( 'dragInfo', new media.View({
+					el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],
+					priority: -40
+				}) );
+			}
+=======
 		if ( ! $setting.length ) {
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Handle button groups.
+		} else if ( $setting.hasClass('button-group') ) {
+			$buttons = $setting.find('button').removeClass('active');
+			$buttons.filter( '[value="' + value + '"]' ).addClass('active');
+||||||| .r11156
+			if ( this.options.suggestedWidth && this.options.suggestedHeight ) {
+				this.toolbar.set( 'suggestedDimensions', new media.View({
+					el: $( '<div class="instructions">' + l10n.suggestedDimensions + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
+					priority: -40
+				}) );
+			}
+		},
+=======
 		// Use the correct value for checkboxes.
 		if ( $setting.is('input[type="checkbox"]') ) {
 			value = $setting[0].checked;
 		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		// Handle text inputs and textareas.
+		} else if ( $setting.is('input[type="text"], textarea') ) {
+			if ( ! $setting.is(':focus') ) {
+				$setting.val( value );
+			}
+||||||| .r11156
+		updateContent: function() {
+			var view = this,
+				noItemsView;
 
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				noItemsView = view.attachmentsNoResults;
+			} else {
+				noItemsView = view.uploader;
+			}
+=======
 		// Update the corresponding setting.
 		this.model.set( $setting.data('setting'), value );
 
@@ -7255,19 +17467,89 @@ Settings = View.extend({
 			window.setUserSetting( userSetting, value );
 		}
 	},
+>>>>>>> .r12027
+		// Handle checkboxes.
+		} else if ( $setting.is('input[type="checkbox"]') ) {
+			$setting.prop( 'checked', !! value && 'false' !== value );
+		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	updateHandler: function( event ) {
+		var $setting = $( event.target ).closest('[data-setting]'),
+			value = event.target.value,
+			userSetting;
 
+<<<<<<< .mine
+		event.preventDefault();
+||||||| .r11156
+			if ( ! this.collection.length ) {
+				this.toolbar.get( 'spinner' ).show();
+				this.dfd = this.collection.more().done( function() {
+					if ( ! view.collection.length ) {
+						noItemsView.$el.removeClass( 'hidden' );
+					} else {
+						noItemsView.$el.addClass( 'hidden' );
+					}
+					view.toolbar.get( 'spinner' ).hide();
+				} );
+			} else {
+				noItemsView.$el.addClass( 'hidden' );
+				view.toolbar.get( 'spinner' ).hide();
+			}
+		},
+=======
 	updateChanges: function( model ) {
 		if ( model.hasChanged() ) {
 			_( model.changed ).chain().keys().each( this.update, this );
 		}
 	}
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( ! $setting.length ) {
+			return;
+		}
+||||||| .r11156
+		createUploader: function() {
+			this.uploader = new media.view.UploaderInline({
+				controller: this.controller,
+				status:     false,
+				message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
+				canClose:   this.controller.isModeActive( 'grid' )
+			});
+=======
 module.exports = Settings;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Use the correct value for checkboxes.
+		if ( $setting.is('input[type="checkbox"]') ) {
+			value = $setting[0].checked;
+		}
+||||||| .r11156
+			this.uploader.hide();
+			this.views.add( this.uploader );
+		},
+=======
 },{}],58:[function(require,module,exports){
 /*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// Update the corresponding setting.
+		this.model.set( $setting.data('setting'), value );
+||||||| .r11156
+		toggleUploader: function() {
+			if ( this.uploader.$el.hasClass( 'hidden' ) ) {
+				this.uploader.show();
+			} else {
+				this.uploader.hide();
+			}
+		},
+=======
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -7279,26 +17561,90 @@ module.exports = Settings;
  */
 var Settings = wp.media.view.Settings,
 	AttachmentDisplay;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the setting has a corresponding user setting,
+		// update that as well.
+		if ( userSetting = $setting.data('userSetting') ) {
+			window.setUserSetting( userSetting, value );
+		}
+	},
+||||||| .r11156
+		createAttachments: function() {
+			this.attachments = new media.view.Attachments({
+				controller:           this.controller,
+				collection:           this.collection,
+				selection:            this.options.selection,
+				model:                this.model,
+				sortable:             this.options.sortable,
+				scrollElement:        this.options.scrollElement,
+				idealColumnWidth:     this.options.idealColumnWidth,
+=======
 AttachmentDisplay = Settings.extend({
 	className: 'attachment-display-settings',
 	template:  wp.template('attachment-display-settings'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	updateChanges: function( model ) {
+		if ( model.hasChanged() ) {
+			_( model.changed ).chain().keys().each( this.update, this );
+		}
+	}
+});
+||||||| .r11156
+				// The single `Attachment` view to be used in the `Attachments` view.
+				AttachmentView: this.options.AttachmentView
+			});
+=======
 	initialize: function() {
 		var attachment = this.options.attachment;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+module.exports = Settings;
+||||||| .r11156
+			// Add keydown listener to the instance of the Attachments view
+			this.attachments.listenTo( this.controller, 'attachment:keydown:arrow',     this.attachments.arrowEvent );
+			this.attachments.listenTo( this.controller, 'attachment:details:shift-tab', this.attachments.restoreFocus );
+=======
 		_.defaults( this.options, {
 			userSettings: false
 		});
 		// Call 'initialize' directly on the parent class.
 		Settings.prototype.initialize.apply( this, arguments );
 		this.listenTo( this.model, 'change:link', this.updateLinkTo );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+},{}],60:[function(require,module,exports){
+/**
+ * wp.media.view.Settings.AttachmentDisplay
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Settings = wp.media.view.Settings,
+	AttachmentDisplay;
+||||||| .r11156
+			this.views.add( this.attachments );
+=======
 		if ( attachment ) {
 			attachment.on( 'change:uploading', this.render, this );
 		}
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+AttachmentDisplay = Settings.extend({
+	className: 'attachment-display-settings',
+	template:  wp.template('attachment-display-settings'),
+||||||| .r11156
+=======
 	dispose: function() {
 		var attachment = this.options.attachment;
 		if ( attachment ) {
@@ -7327,17 +17673,51 @@ AttachmentDisplay = Settings.extend({
 		this.updateLinkTo();
 		return this;
 	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	initialize: function() {
+		var attachment = this.options.attachment;
+||||||| .r11156
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				this.attachmentsNoResults = new media.View({
+					controller: this.controller,
+					tagName: 'p'
+				});
+=======
 	updateLinkTo: function() {
 		var linkTo = this.model.get('link'),
 			$input = this.$('.link-to-custom'),
 			attachment = this.options.attachment;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		_.defaults( this.options, {
+			userSettings: false
+		});
+		// Call 'initialize' directly on the parent class.
+		Settings.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.model, 'change:link', this.updateLinkTo );
+||||||| .r11156
+				this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
+				this.attachmentsNoResults.$el.html( l10n.noMedia );
+=======
 		if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
 			$input.addClass( 'hidden' );
 			return;
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( attachment ) {
+			attachment.on( 'change:uploading', this.render, this );
+		}
+	},
+||||||| .r11156
+				this.views.add( this.attachmentsNoResults );
+			}
+		},
+=======
 		if ( attachment ) {
 			if ( 'post' === linkTo ) {
 				$input.val( attachment.get('link') );
@@ -7346,24 +17726,113 @@ AttachmentDisplay = Settings.extend({
 			} else if ( ! this.model.get('linkUrl') ) {
 				$input.val('http://');
 			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	dispose: function() {
+		var attachment = this.options.attachment;
+		if ( attachment ) {
+			attachment.off( null, null, this );
+		}
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		Settings.prototype.dispose.apply( this, arguments );
+	},
+	/**
+	 * @returns {wp.media.view.AttachmentDisplay} Returns itself to allow chaining
+	 */
+	render: function() {
+		var attachment = this.options.attachment;
+		if ( attachment ) {
+			_.extend( this.options, {
+				sizes: attachment.get('sizes'),
+				type:  attachment.get('type')
+			});
+		}
+		/**
+		 * call 'render' directly on the parent class
+		 */
+		Settings.prototype.render.call( this );
+		this.updateLinkTo();
+		return this;
+	},
+||||||| .r11156
+		createSidebar: function() {
+			var options = this.options,
+				selection = options.selection,
+				sidebar = this.sidebar = new media.view.Sidebar({
+					controller: this.controller
+				});
+=======
 			$input.prop( 'readonly', 'custom' !== linkTo );
 		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
+	updateLinkTo: function() {
+		var linkTo = this.model.get('link'),
+			$input = this.$('.link-to-custom'),
+			attachment = this.options.attachment;
+||||||| .r11156
+			this.views.add( sidebar );
+=======
 		$input.removeClass( 'hidden' );
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
+			$input.addClass( 'hidden' );
+			return;
+		}
+||||||| .r11156
+			if ( this.controller.uploader ) {
+				sidebar.set( 'uploads', new media.view.UploaderStatus({
+					controller: this.controller,
+					priority:   40
+				}) );
+			}
+=======
 		// If the input is visible, focus and select its contents.
 		if ( ! wp.media.isTouchDevice && $input.is(':visible') ) {
 			$input.focus()[0].select();
 		}
 	}
 });
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		if ( attachment ) {
+			if ( 'post' === linkTo ) {
+				$input.val( attachment.get('link') );
+			} else if ( 'file' === linkTo ) {
+				$input.val( attachment.get('url') );
+			} else if ( ! this.model.get('linkUrl') ) {
+				$input.val('http://');
+			}
+||||||| .r11156
+			selection.on( 'selection:single', this.createSingle, this );
+			selection.on( 'selection:unsingle', this.disposeSingle, this );
 
+			if ( selection.single() ) {
+				this.createSingle();
+			}
+		},
+=======
 module.exports = AttachmentDisplay;
 
 },{}],59:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
+			$input.prop( 'readonly', 'custom' !== linkTo );
+		}
+||||||| .r11156
+		createSingle: function() {
+			var sidebar = this.sidebar,
+				single = this.options.selection.single();
+=======
 /**
  * wp.media.view.Settings.Gallery
  *
@@ -7377,47 +17846,583 @@ var Gallery = wp.media.view.Settings.extend({
 	className: 'collection-settings gallery-settings',
 	template:  wp.template('gallery-settings')
 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		$input.removeClass( 'hidden' );
+||||||| .r11156
+			sidebar.set( 'details', new media.view.Attachment.Details({
+				controller: this.controller,
+				model:      single,
+				priority:   80
+			}) );
+=======
 module.exports = Gallery;
+>>>>>>> .r12027
 
+<<<<<<< .mine
+		// If the input is visible, focus and select its contents.
+		if ( ! wp.media.isTouchDevice && $input.is(':visible') ) {
+			$input.focus()[0].select();
+		}
+	}
+});
+||||||| .r11156
+			sidebar.set( 'compat', new media.view.AttachmentCompat({
+				controller: this.controller,
+				model:      single,
+				priority:   120
+			}) );
+=======
 },{}],60:[function(require,module,exports){
 /*globals wp */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = AttachmentDisplay;
+||||||| .r11156
+			if ( this.options.display ) {
+				sidebar.set( 'display', new media.view.Settings.AttachmentDisplay({
+					controller:   this.controller,
+					model:        this.model.display( single ),
+					attachment:   single,
+					priority:     160,
+					userSettings: this.model.get('displayUserSettings')
+				}) );
+			}
+=======
+/**
+ * wp.media.view.Settings.Playlist
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Playlist = wp.media.view.Settings.extend({
+	className: 'collection-settings playlist-settings',
+	template:  wp.template('playlist-settings')
+});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],61:[function(require,module,exports){
+/**
+ * wp.media.view.Settings.Gallery
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Gallery = wp.media.view.Settings.extend({
+	className: 'collection-settings gallery-settings',
+	template:  wp.template('gallery-settings')
+});
+||||||| .r11156
+			// Show the sidebar on mobile
+			if ( this.model.id === 'insert' ) {
+				sidebar.$el.addClass( 'visible' );
+			}
+		},
+=======
+module.exports = Playlist;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = Gallery;
+||||||| .r11156
+		disposeSingle: function() {
+			var sidebar = this.sidebar;
+			sidebar.unset('details');
+			sidebar.unset('compat');
+			sidebar.unset('display');
+			// Hide the sidebar on mobile
+			sidebar.$el.removeClass( 'visible' );
+		}
+	});
+=======
+},{}],61:[function(require,module,exports){
+/**
+ * wp.media.view.Sidebar
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Sidebar = wp.media.view.PriorityList.extend({
+	className: 'media-sidebar'
+});
+
+module.exports = Sidebar;
+
+},{}],62:[function(require,module,exports){
+/*globals _ */
+
+/**
+ * wp.media.view.Spinner
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Spinner = wp.media.View.extend({
+	tagName:   'span',
+	className: 'spinner',
+	spinnerTimeout: false,
+	delay: 400,
+
+	show: function() {
+		if ( ! this.spinnerTimeout ) {
+			this.spinnerTimeout = _.delay(function( $el ) {
+				$el.addClass( 'is-active' );
+			}, this.delay, this.$el );
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],62:[function(require,module,exports){
+/**
+ * wp.media.view.Settings.Playlist
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Playlist = wp.media.view.Settings.extend({
+	className: 'collection-settings playlist-settings',
+	template:  wp.template('playlist-settings')
+});
+||||||| .r11156
+	/**
+	 * wp.media.view.Selection
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Selection = media.View.extend({
+		tagName:   'div',
+		className: 'media-selection',
+		template:  media.template('media-selection'),
+=======
+		return this;
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = Playlist;
+||||||| .r11156
+		events: {
+			'click .edit-selection':  'edit',
+			'click .clear-selection': 'clear'
+		},
+=======
+	hide: function() {
+		this.$el.removeClass( 'is-active' );
+		this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],63:[function(require,module,exports){
+/**
+ * wp.media.view.Sidebar
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Sidebar = wp.media.view.PriorityList.extend({
+	className: 'media-sidebar'
+});
+||||||| .r11156
+		initialize: function() {
+			_.defaults( this.options, {
+				editable:  false,
+				clearable: true
+			});
+=======
+		return this;
+	}
+});
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = Sidebar;
+||||||| .r11156
+			/**
+			 * @member {wp.media.view.Attachments.Selection}
+			 */
+			this.attachments = new media.view.Attachments.Selection({
+				controller: this.controller,
+				collection: this.collection,
+				selection:  this.collection,
+				model:      new Backbone.Model()
+			});
+=======
+module.exports = Spinner;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],64:[function(require,module,exports){
+/**
+ * wp.media.view.SiteIconCropper
+ *
+ * Uses the imgAreaSelect plugin to allow a user to crop a Site Icon.
+ *
+ * Takes imgAreaSelect options from
+ * wp.customize.SiteIconControl.calculateImageSelectOptions.
+ *
+ * @class
+ * @augments wp.media.view.Cropper
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.view,
+	SiteIconCropper;
+||||||| .r11156
+			this.views.set( '.selection-view', this.attachments );
+			this.collection.on( 'add remove reset', this.refresh, this );
+			this.controller.on( 'content:activate', this.refresh, this );
+		},
+=======
+},{}],63:[function(require,module,exports){
+/*globals _, Backbone */
+>>>>>>> .r12027
+
+<<<<<<< .mine
+SiteIconCropper = View.Cropper.extend({
+	className: 'crop-content site-icon',
+||||||| .r11156
+		ready: function() {
+			this.refresh();
+		},
+=======
+/**
+ * wp.media.view.Toolbar
+ *
+ * A toolbar which consists of a primary and a secondary section. Each sections
+ * can be filled with views.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	Toolbar;
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	ready: function () {
+		View.Cropper.prototype.ready.apply( this, arguments );
+||||||| .r11156
+		refresh: function() {
+			// If the selection hasn't been rendered, bail.
+			if ( ! this.$el.children().length ) {
+				return;
+			}
+=======
+Toolbar = View.extend({
+	tagName:   'div',
+	className: 'media-toolbar',
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.$( '.crop-image' ).on( 'load', _.bind( this.addSidebar, this ) );
+	},
+||||||| .r11156
+			var collection = this.collection,
+				editing = 'edit-selection' === this.controller.content.mode();
+=======
+	initialize: function() {
+		var state = this.controller.state(),
+			selection = this.selection = state.get('selection'),
+			library = this.library = state.get('library');
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	addSidebar: function() {
+		this.sidebar = new wp.media.view.Sidebar({
+			controller: this.controller
+		});
+||||||| .r11156
+			// If nothing is selected, display nothing.
+			this.$el.toggleClass( 'empty', ! collection.length );
+			this.$el.toggleClass( 'one', 1 === collection.length );
+			this.$el.toggleClass( 'editing', editing );
+=======
+		this._views = {};
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.sidebar.set( 'preview', new wp.media.view.SiteIconPreview({
+			controller: this.controller,
+			attachment: this.options.attachment
+		}) );
+||||||| .r11156
+			this.$('.count').text( l10n.selected.replace('%d', collection.length) );
+		},
+=======
+		// The toolbar is composed of two `PriorityList` views.
+		this.primary   = new wp.media.view.PriorityList();
+		this.secondary = new wp.media.view.PriorityList();
+		this.primary.$el.addClass('media-toolbar-primary search-form');
+		this.secondary.$el.addClass('media-toolbar-secondary');
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		this.controller.cropperView.views.add( this.sidebar );
+	}
+});
+||||||| .r11156
+		edit: function( event ) {
+			event.preventDefault();
+			if ( this.options.editable ) {
+				this.options.editable.call( this, this.collection );
+			}
+		},
+=======
+		this.views.set([ this.secondary, this.primary ]);
+>>>>>>> .r12027
+
+<<<<<<< .mine
+module.exports = SiteIconCropper;
+||||||| .r11156
+		clear: function( event ) {
+			event.preventDefault();
+			this.collection.reset();
+=======
+		if ( this.options.items ) {
+			this.set( this.options.items, { silent: true });
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+},{}],65:[function(require,module,exports){
+/**
+ * wp.media.view.SiteIconPreview
+ *
+ * Shows a preview of the Site Icon as a favicon and app icon while cropping.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = jQuery,
+	SiteIconPreview;
+||||||| .r11156
+			// Keep focus inside media modal
+			// after clear link is selected
+			this.controller.modal.focusManager.focus();
+		}
+	});
+=======
+		if ( ! this.options.silent ) {
+			this.render();
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+SiteIconPreview = View.extend({
+	className: 'site-icon-preview',
+	template: wp.template( 'site-icon-preview' ),
+||||||| .r11156
+=======
+		if ( selection ) {
+			selection.on( 'add remove reset', this.refresh, this );
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	ready: function() {
+		this.controller.imgSelect.setOptions({
+			onInit: this.updatePreview,
+			onSelectChange: this.updatePreview
+		});
+	},
+||||||| .r11156
+	/**
+	 * wp.media.view.Attachment.Selection
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Attachment
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Attachment.Selection = media.view.Attachment.extend({
+		className: 'attachment selection',
+=======
+		if ( library ) {
+			library.on( 'add remove reset', this.refresh, this );
+		}
+	},
+	/**
+	 * @returns {wp.media.view.Toolbar} Returns itsef to allow chaining
+	 */
+	dispose: function() {
+		if ( this.selection ) {
+			this.selection.off( null, null, this );
+		}
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	prepare: function() {
+		return {
+			url: this.options.attachment.get( 'url' )
+		};
+	},
+||||||| .r11156
+		// On click, just select the model, instead of removing the model from
+		// the selection.
+		toggleSelection: function() {
+			this.options.selection.single( this.model );
+		}
+	});
+=======
+		if ( this.library ) {
+			this.library.off( null, null, this );
+		}
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		return View.prototype.dispose.apply( this, arguments );
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
+	updatePreview: function( img, coords ) {
+		var rx = 64 / coords.width,
+			ry = 64 / coords.height,
+			preview_rx = 16 / coords.width,
+			preview_ry = 16 / coords.height;
+||||||| .r11156
+	/**
+	 * wp.media.view.Attachments.Selection
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Attachments
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Attachments.Selection = media.view.Attachments.extend({
+		events: {},
+		initialize: function() {
+			_.defaults( this.options, {
+				sortable:   true,
+				resize:     false,
+=======
+	ready: function() {
+		this.refresh();
+	},
+
+	/**
+	 * @param {string} id
+	 * @param {Backbone.View|Object} view
+	 * @param {Object} [options={}]
+	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+	 */
+	set: function( id, view, options ) {
+		var list;
+		options = options || {};
+>>>>>>> .r12027
+
+<<<<<<< .mine
+		$( '#preview-app-icon' ).css({
+			width: Math.round(rx * this.imageWidth ) + 'px',
+			height: Math.round(ry * this.imageHeight ) + 'px',
+			marginLeft: '-' + Math.round(rx * coords.x1) + 'px',
+			marginTop: '-' + Math.round(ry * coords.y1) + 'px'
+		});
+||||||| .r11156
+				// The single `Attachment` view to be used in the `Attachments` view.
+				AttachmentView: media.view.Attachment.Selection
+			});
+			/**
+			 * call 'initialize' directly on the parent class
+			 */
+			return media.view.Attachments.prototype.initialize.apply( this, arguments );
+		}
+	});
+=======
+		// Accept an object with an `id` : `view` mapping.
+		if ( _.isObject( id ) ) {
+			_.each( id, function( view, id ) {
+				this.set( id, view, { silent: true });
+			}, this );
+
+		} else {
+			if ( ! ( view instanceof Backbone.View ) ) {
+				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
+				view = new wp.media.view.Button( view ).render();
+			}
+
+			view.controller = view.controller || this.controller;
 
-/**
- * wp.media.view.Settings.Playlist
- *
- * @class
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Playlist = wp.media.view.Settings.extend({
-	className: 'collection-settings playlist-settings',
-	template:  wp.template('playlist-settings')
-});
+			this._views[ id ] = view;
 
-module.exports = Playlist;
+			list = view.options.priority < 0 ? 'secondary' : 'primary';
+			this[ list ].set( id, view, options );
+		}
+>>>>>>> .r12027
 
-},{}],61:[function(require,module,exports){
-/**
- * wp.media.view.Sidebar
- *
- * @class
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Sidebar = wp.media.view.PriorityList.extend({
-	className: 'media-sidebar'
+<<<<<<< .mine
+		$( '#preview-favicon' ).css({
+			width: Math.round( preview_rx * this.imageWidth ) + 'px',
+			height: Math.round( preview_ry * this.imageHeight ) + 'px',
+			marginLeft: '-' + Math.round( preview_rx * coords.x1 ) + 'px',
+			marginTop: '-' + Math.floor( preview_ry* coords.y1 ) + 'px'
+		});
+	}
 });
+||||||| .r11156
+	/**
+	 * wp.media.view.Attachments.EditSelection
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Attachment.Selection
+	 * @augments wp.media.view.Attachment
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Attachment.EditSelection = media.view.Attachment.Selection.extend({
+		buttons: {
+			close: true
+		}
+	});
+=======
+		if ( ! options.silent ) {
+			this.refresh();
+		}
+>>>>>>> .r12027
 
-module.exports = Sidebar;
+<<<<<<< .mine
+module.exports = SiteIconPreview;
 
-},{}],62:[function(require,module,exports){
-/*globals _ */
+||||||| .r11156
 
+=======
+		return this;
+	},
+>>>>>>> .r12027
+<<<<<<< .mine
+},{}],66:[function(require,module,exports){
 /**
  * wp.media.view.Spinner
  *
@@ -7431,30 +18436,136 @@ var Spinner = wp.media.View.extend({
 	className: 'spinner',
 	spinnerTimeout: false,
 	delay: 400,
+||||||| .r11156
+	/**
+	 * wp.media.view.Settings
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Settings = media.View.extend({
+		events: {
+			'click button':    'updateHandler',
+			'change input':    'updateHandler',
+			'change select':   'updateHandler',
+			'change textarea': 'updateHandler'
+		},
+=======
+	/**
+	 * @param {string} id
+	 * @returns {wp.media.view.Button}
+	 */
+	get: function( id ) {
+		return this._views[ id ];
+	},
+	/**
+	 * @param {string} id
+	 * @param {Object} options
+	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+	 */
+	unset: function( id, options ) {
+		delete this._views[ id ];
+		this.primary.unset( id, options );
+		this.secondary.unset( id, options );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	show: function() {
 		if ( ! this.spinnerTimeout ) {
 			this.spinnerTimeout = _.delay(function( $el ) {
 				$el.addClass( 'is-active' );
 			}, this.delay, this.$el );
 		}
+||||||| .r11156
+		initialize: function() {
+			this.model = this.model || new Backbone.Model();
+			this.model.on( 'change', this.updateChanges, this );
+		},
+=======
+		if ( ! options || ! options.silent ) {
+			this.refresh();
+		}
+		return this;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this;
 	},
+||||||| .r11156
+		prepare: function() {
+			return _.defaults({
+				model: this.model.toJSON()
+			}, this.options );
+		},
+		/**
+		 * @returns {wp.media.view.Settings} Returns itself to allow chaining
+		 */
+		render: function() {
+			media.View.prototype.render.apply( this, arguments );
+			// Select the correct values.
+			_( this.model.attributes ).chain().keys().each( this.update, this );
+			return this;
+		},
+		/**
+		 * @param {string} key
+		 */
+		update: function( key ) {
+			var value = this.model.get( key ),
+				$setting = this.$('[data-setting="' + key + '"]'),
+				$buttons, $value;
+=======
+	refresh: function() {
+		var state = this.controller.state(),
+			library = state.get('library'),
+			selection = state.get('selection');
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	hide: function() {
 		this.$el.removeClass( 'is-active' );
 		this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
+||||||| .r11156
+			// Bail if we didn't find a matching setting.
+			if ( ! $setting.length ) {
+				return;
+			}
+=======
+		_.each( this._views, function( button ) {
+			if ( ! button.model || ! button.options || ! button.options.requires ) {
+				return;
+			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this;
 	}
 });
+||||||| .r11156
+			// Attempt to determine how the setting is rendered and update
+			// the selected value.
+=======
+			var requires = button.options.requires,
+				disabled = false;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = Spinner;
+||||||| .r11156
+			// Handle dropdowns.
+			if ( $setting.is('select') ) {
+				$value = $setting.find('[value="' + value + '"]');
+=======
+			// Prevent insertion of attachments if any of them are still uploading
+			disabled = _.some( selection.models, function( attachment ) {
+				return attachment.get('uploading') === true;
+			});
+>>>>>>> .r12027
 
-},{}],63:[function(require,module,exports){
-/*globals _, Backbone */
-
+<<<<<<< .mine
+},{}],67:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar
  *
@@ -7468,38 +18579,218 @@ module.exports = Spinner;
  */
 var View = wp.media.View,
 	Toolbar;
+||||||| .r11156
+				if ( $value.length ) {
+					$setting.find('option').prop( 'selected', false );
+					$value.prop( 'selected', true );
+				} else {
+					// If we can't find the desired value, record what *is* selected.
+					this.model.set( key, $setting.find(':selected').val() );
+				}
+=======
+			if ( requires.selection && selection && ! selection.length ) {
+				disabled = true;
+			} else if ( requires.library && library && ! library.length ) {
+				disabled = true;
+			}
+			button.model.set( 'disabled', disabled );
+		});
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 Toolbar = View.extend({
 	tagName:   'div',
 	className: 'media-toolbar',
+||||||| .r11156
+			// Handle button groups.
+			} else if ( $setting.hasClass('button-group') ) {
+				$buttons = $setting.find('button').removeClass('active');
+				$buttons.filter( '[value="' + value + '"]' ).addClass('active');
+=======
+module.exports = Toolbar;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	initialize: function() {
 		var state = this.controller.state(),
 			selection = this.selection = state.get('selection'),
 			library = this.library = state.get('library');
+||||||| .r11156
+			// Handle text inputs and textareas.
+			} else if ( $setting.is('input[type="text"], textarea') ) {
+				if ( ! $setting.is(':focus') ) {
+					$setting.val( value );
+				}
+			// Handle checkboxes.
+			} else if ( $setting.is('input[type="checkbox"]') ) {
+				$setting.prop( 'checked', !! value && 'false' !== value );
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		updateHandler: function( event ) {
+			var $setting = $( event.target ).closest('[data-setting]'),
+				value = event.target.value,
+				userSetting;
+=======
+},{}],64:[function(require,module,exports){
+/*globals wp, _ */
+
+/**
+ * wp.media.view.Toolbar.Embed
+ *
+ * @class
+ * @augments wp.media.view.Toolbar.Select
+ * @augments wp.media.view.Toolbar
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Select = wp.media.view.Toolbar.Select,
+	l10n = wp.media.view.l10n,
+	Embed;
+
+Embed = Select.extend({
+	initialize: function() {
+		_.defaults( this.options, {
+			text: l10n.insertIntoPost,
+			requires: false
+		});
+		// Call 'initialize' directly on the parent class.
+		Select.prototype.initialize.apply( this, arguments );
+	},
+
+	refresh: function() {
+		var url = this.controller.state().props.get('url');
+		this.get('select').model.set( 'disabled', ! url || url === 'http://' );
+		/**
+		 * call 'refresh' directly on the parent class
+		 */
+		Select.prototype.refresh.apply( this, arguments );
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this._views = {};
+||||||| .r11156
+			event.preventDefault();
+=======
+module.exports = Embed;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// The toolbar is composed of two `PriorityList` views.
 		this.primary   = new wp.media.view.PriorityList();
 		this.secondary = new wp.media.view.PriorityList();
 		this.primary.$el.addClass('media-toolbar-primary search-form');
 		this.secondary.$el.addClass('media-toolbar-secondary');
+||||||| .r11156
+			if ( ! $setting.length ) {
+				return;
+			}
+=======
+},{}],65:[function(require,module,exports){
+/*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.views.set([ this.secondary, this.primary ]);
+||||||| .r11156
+			// Use the correct value for checkboxes.
+			if ( $setting.is('input[type="checkbox"]') ) {
+				value = $setting[0].checked;
+			}
+=======
+/**
+ * wp.media.view.Toolbar.Select
+ *
+ * @class
+ * @augments wp.media.view.Toolbar
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Toolbar = wp.media.view.Toolbar,
+	l10n = wp.media.view.l10n,
+	Select;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( this.options.items ) {
 			this.set( this.options.items, { silent: true });
 		}
+||||||| .r11156
+			// Update the corresponding setting.
+			this.model.set( $setting.data('setting'), value );
+=======
+Select = Toolbar.extend({
+	initialize: function() {
+		var options = this.options;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! this.options.silent ) {
 			this.render();
 		}
+||||||| .r11156
+			// If the setting has a corresponding user setting,
+			// update that as well.
+			if ( userSetting = $setting.data('userSetting') ) {
+				setUserSetting( userSetting, value );
+			}
+		},
+=======
+		_.bindAll( this, 'clickSelect' );
+
+		_.defaults( options, {
+			event: 'select',
+			state: false,
+			reset: true,
+			close: true,
+			text:  l10n.select,
+
+			// Does the button rely on the selection?
+			requires: {
+				selection: true
+			}
+		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( selection ) {
 			selection.on( 'add remove reset', this.refresh, this );
+||||||| .r11156
+		updateChanges: function( model ) {
+			if ( model.hasChanged() ) {
+				_( model.changed ).chain().keys().each( this.update, this );
+			}
+=======
+		options.items = _.defaults( options.items || {}, {
+			select: {
+				style:    'primary',
+				text:     options.text,
+				priority: 80,
+				click:    this.clickSelect,
+				requires: options.requires
+			}
+>>>>>>> .r12027
+<<<<<<< .mine
+		}
+||||||| .r11156
 		}
+	});
+=======
+		});
+		// Call 'initialize' directly on the parent class.
+		Toolbar.prototype.initialize.apply( this, arguments );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( library ) {
 			library.on( 'add remove reset', this.refresh, this );
 		}
@@ -7511,7 +18802,26 @@ Toolbar = View.extend({
 		if ( this.selection ) {
 			this.selection.off( null, null, this );
 		}
+||||||| .r11156
+	/**
+	 * wp.media.view.Settings.AttachmentDisplay
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Settings.AttachmentDisplay = media.view.Settings.extend({
+		className: 'attachment-display-settings',
+		template:  media.template('attachment-display-settings'),
+=======
+	clickSelect: function() {
+		var options = this.options,
+			controller = this.controller;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( this.library ) {
 			this.library.off( null, null, this );
 		}
@@ -7520,11 +18830,86 @@ Toolbar = View.extend({
 		 */
 		return View.prototype.dispose.apply( this, arguments );
 	},
+||||||| .r11156
+		initialize: function() {
+			var attachment = this.options.attachment;
+
+			_.defaults( this.options, {
+				userSettings: false
+			});
+			/**
+			 * call 'initialize' directly on the parent class
+			 */
+			media.view.Settings.prototype.initialize.apply( this, arguments );
+			this.model.on( 'change:link', this.updateLinkTo, this );
+
+			if ( attachment ) {
+				attachment.on( 'change:uploading', this.render, this );
+			}
+		},
+
+		dispose: function() {
+			var attachment = this.options.attachment;
+			if ( attachment ) {
+				attachment.off( null, null, this );
+			}
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			media.view.Settings.prototype.dispose.apply( this, arguments );
+		},
+		/**
+		 * @returns {wp.media.view.AttachmentDisplay} Returns itself to allow chaining
+		 */
+		render: function() {
+			var attachment = this.options.attachment;
+			if ( attachment ) {
+				_.extend( this.options, {
+					sizes: attachment.get('sizes'),
+					type:  attachment.get('type')
+				});
+			}
+			/**
+			 * call 'render' directly on the parent class
+			 */
+			media.view.Settings.prototype.render.call( this );
+			this.updateLinkTo();
+			return this;
+		},
+=======
+		if ( options.close ) {
+			controller.close();
+		}
+
+		if ( options.event ) {
+			controller.state().trigger( options.event );
+		}
+
+		if ( options.state ) {
+			controller.setState( options.state );
+		}
+
+		if ( options.reset ) {
+			controller.reset();
+		}
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	ready: function() {
 		this.refresh();
 	},
+||||||| .r11156
+		updateLinkTo: function() {
+			var linkTo = this.model.get('link'),
+				$input = this.$('.link-to-custom'),
+				attachment = this.options.attachment;
+=======
+module.exports = Select;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	/**
 	 * @param {string} id
 	 * @param {Backbone.View|Object} view
@@ -7534,31 +18919,120 @@ Toolbar = View.extend({
 	set: function( id, view, options ) {
 		var list;
 		options = options || {};
+||||||| .r11156
+			if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
+				$input.addClass( 'hidden' );
+				return;
+			}
+=======
+},{}],66:[function(require,module,exports){
+/*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// Accept an object with an `id` : `view` mapping.
 		if ( _.isObject( id ) ) {
 			_.each( id, function( view, id ) {
 				this.set( id, view, { silent: true });
 			}, this );
+||||||| .r11156
+			if ( attachment ) {
+				if ( 'post' === linkTo ) {
+					$input.val( attachment.get('link') );
+				} else if ( 'file' === linkTo ) {
+					$input.val( attachment.get('url') );
+				} else if ( ! this.model.get('linkUrl') ) {
+					$input.val('http://');
+				}
+=======
+/**
+ * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
+ * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
+ *
+ * wp.media.view.EditorUploader
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	l10n = wp.media.view.l10n,
+	$ = jQuery,
+	EditorUploader;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		} else {
 			if ( ! ( view instanceof Backbone.View ) ) {
 				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
 				view = new wp.media.view.Button( view ).render();
 			}
+||||||| .r11156
+				$input.prop( 'readonly', 'custom' !== linkTo );
+			}
+=======
+EditorUploader = View.extend({
+	tagName:   'div',
+	className: 'uploader-editor',
+	template:  wp.template( 'uploader-editor' ),
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			view.controller = view.controller || this.controller;
+||||||| .r11156
+			$input.removeClass( 'hidden' );
+=======
+	localDrag: false,
+	overContainer: false,
+	overDropzone: false,
+	draggingFile: null,
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			this._views[ id ] = view;
 
 			list = view.options.priority < 0 ? 'secondary' : 'primary';
 			this[ list ].set( id, view, options );
 		}
 
+||||||| .r11156
+			// If the input is visible, focus and select its contents.
+			if ( ! isTouchDevice && $input.is(':visible') ) {
+				$input.focus()[0].select();
+			}
+		}
+	});
+
+=======
+>>>>>>> .r12027
+<<<<<<< .mine
 		if ( ! options.silent ) {
 			this.refresh();
 		}
+||||||| .r11156
+	/**
+	 * wp.media.view.Settings.Gallery
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Settings.Gallery = media.view.Settings.extend({
+		className: 'collection-settings gallery-settings',
+		template:  media.template('gallery-settings')
+	});
+=======
+	/**
+	 * Bind drag'n'drop events to callbacks.
+	 */
+	initialize: function() {
+		this.initialized = false;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this;
 	},
 	/**
@@ -7568,40 +19042,197 @@ Toolbar = View.extend({
 	get: function( id ) {
 		return this._views[ id ];
 	},
+||||||| .r11156
+	/**
+	 * wp.media.view.Settings.Playlist
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Settings.Playlist = media.view.Settings.extend({
+		className: 'collection-settings playlist-settings',
+		template:  media.template('playlist-settings')
+	});
+
+=======
+		// Bail if not enabled or UA does not support drag'n'drop or File API.
+		if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
+			return this;
+		}
+
+>>>>>>> .r12027
+		this.$document = $(document);
+		this.dropzones = [];
+		this.files = [];
+
+		this.$document.on( 'drop', '.uploader-editor', _.bind( this.drop, this ) );
+		this.$document.on( 'dragover', '.uploader-editor', _.bind( this.dropzoneDragover, this ) );
+		this.$document.on( 'dragleave', '.uploader-editor', _.bind( this.dropzoneDragleave, this ) );
+		this.$document.on( 'click', '.uploader-editor', _.bind( this.click, this ) );
+
+		this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
+		this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
+
+		this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
+			this.localDrag = event.type === 'dragstart';
+		}, this ) );
+
+		this.initialized = true;
+		return this;
+	},
+
 	/**
+<<<<<<< .mine
 	 * @param {string} id
 	 * @param {Object} options
 	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+||||||| .r11156
+	 * wp.media.view.Attachment.Details
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Attachment
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+=======
+	 * Check browser support for drag'n'drop.
+	 *
+	 * @return Boolean
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
 	unset: function( id, options ) {
 		delete this._views[ id ];
 		this.primary.unset( id, options );
 		this.secondary.unset( id, options );
+||||||| .r11156
+	media.view.Attachment.Details = media.view.Attachment.extend({
+		tagName:   'div',
+		className: 'attachment-details',
+		template:  media.template('attachment-details'),
+=======
+	browserSupport: function() {
+		var supports = false, div = document.createElement('div');
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! options || ! options.silent ) {
 			this.refresh();
 		}
 		return this;
 	},
+||||||| .r11156
+		events: {
+			'change [data-setting]':          'updateSetting',
+			'change [data-setting] input':    'updateSetting',
+			'change [data-setting] select':   'updateSetting',
+			'change [data-setting] textarea': 'updateSetting',
+			'click .delete-attachment':       'deleteAttachment',
+			'click .trash-attachment':        'trashAttachment',
+			'click .untrash-attachment':      'untrashAttachment',
+			'click .edit-attachment':         'editAttachment',
+			'click .refresh-attachment':      'refreshAttachment',
+			'keydown':                        'toggleSelectionHandler'
+		},
+=======
+		supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
+		supports = supports && !! ( window.File && window.FileList && window.FileReader );
+		return supports;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	refresh: function() {
 		var state = this.controller.state(),
 			library = state.get('library'),
 			selection = state.get('selection');
+||||||| .r11156
+		initialize: function() {
+			this.options = _.defaults( this.options, {
+				rerenderOnModelChange: false
+			});
+=======
+	isDraggingFile: function( event ) {
+		if ( this.draggingFile !== null ) {
+			return this.draggingFile;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		_.each( this._views, function( button ) {
 			if ( ! button.model || ! button.options || ! button.options.requires ) {
 				return;
 			}
+||||||| .r11156
+			this.on( 'ready', this.initialFocus );
+			/**
+			 * call 'initialize' directly on the parent class
+			 */
+			media.view.Attachment.prototype.initialize.apply( this, arguments );
+		},
+
+		initialFocus: function() {
+			if ( ! isTouchDevice ) {
+				this.$( ':input' ).eq( 0 ).focus();
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		deleteAttachment: function( event ) {
+			event.preventDefault();
+=======
+		if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
+			return false;
+		}
 
+		this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+			_.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+>>>>>>> .r12027
+
+<<<<<<< .mine
 			var requires = button.options.requires,
 				disabled = false;
+||||||| .r11156
+			if ( confirm( l10n.warnDelete ) ) {
+				this.model.destroy();
+				// Keep focus inside media modal
+				// after image is deleted
+				this.controller.modal.focusManager.focus();
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		trashAttachment: function( event ) {
+			var library = this.controller.library;
+			event.preventDefault();
+=======
+		return this.draggingFile;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			// Prevent insertion of attachments if any of them are still uploading
 			disabled = _.some( selection.models, function( attachment ) {
 				return attachment.get('uploading') === true;
 			});
+||||||| .r11156
+			if ( media.view.settings.mediaTrash &&
+				'edit-metadata' === this.controller.content.mode() ) {
+=======
+	refresh: function( e ) {
+		var dropzone_id;
+		for ( dropzone_id in this.dropzones ) {
+			// Hide the dropzones only if dragging has left the screen.
+			this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			if ( requires.selection && selection && ! selection.length ) {
 				disabled = true;
 			} else if ( requires.library && library && ! library.length ) {
@@ -7611,12 +19242,50 @@ Toolbar = View.extend({
 		});
 	}
 });
+||||||| .r11156
+				this.model.set( 'status', 'trash' );
+				this.model.save().done( function() {
+					library._requery( true );
+				} );
+			}  else {
+				this.model.destroy();
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		untrashAttachment: function( event ) {
+			var library = this.controller.library;
+			event.preventDefault();
+=======
+		if ( ! _.isUndefined( e ) ) {
+			$( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = Toolbar;
+||||||| .r11156
+			this.model.set( 'status', 'inherit' );
+			this.model.save().done( function() {
+				library._requery( true );
+			} );
+		},
+		/**
+		 * @param {Object} event
+		 */
+		editAttachment: function( event ) {
+			var editState = this.controller.states.get( 'edit-image' );
+			if ( window.imageEdit && editState ) {
+				event.preventDefault();
+=======
+		if ( ! this.overContainer && ! this.overDropzone ) {
+			this.draggingFile = null;
+		}
+>>>>>>> .r12027
 
-},{}],64:[function(require,module,exports){
-/*globals wp, _ */
-
+<<<<<<< .mine
+},{}],68:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar.Embed
  *
@@ -7650,12 +19319,55 @@ Embed = Select.extend({
 		Select.prototype.refresh.apply( this, arguments );
 	}
 });
+||||||| .r11156
+				editState.set( 'image', this.model );
+				this.controller.setState( 'edit-image' );
+			} else {
+				this.$el.addClass('needs-refresh');
+			}
+		},
+		/**
+		 * @param {Object} event
+		 */
+		refreshAttachment: function( event ) {
+			this.$el.removeClass('needs-refresh');
+			event.preventDefault();
+			this.model.fetch();
+		},
+		/**
+		 * When reverse tabbing(shift+tab) out of the right details panel, deliver
+		 * the focus to the item in the list that was being edited.
+		 *
+		 * @param {Object} event
+		 */
+		toggleSelectionHandler: function( event ) {
+			if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
+				this.controller.trigger( 'attachment:details:shift-tab', event );
+				return false;
+			}
+=======
+		return this;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = Embed;
+||||||| .r11156
+			if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+				this.controller.trigger( 'attachment:keydown:arrow', event );
+				return;
+			}
+		}
+	});
+=======
+	render: function() {
+		if ( ! this.initialized ) {
+			return this;
+		}
+>>>>>>> .r12027
 
-},{}],65:[function(require,module,exports){
-/*globals wp, _ */
-
+<<<<<<< .mine
+},{}],69:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar.Select
  *
@@ -7668,11 +19380,61 @@ module.exports = Embed;
 var Toolbar = wp.media.view.Toolbar,
 	l10n = wp.media.view.l10n,
 	Select;
+||||||| .r11156
+	/**
+	 * wp.media.view.AttachmentCompat
+	 *
+	 * A view to display fields added via the `attachment_fields_to_edit` filter.
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.AttachmentCompat = media.View.extend({
+		tagName:   'form',
+		className: 'compat-item',
+=======
+		View.prototype.render.apply( this, arguments );
+		$( '.wp-editor-wrap, #wp-fullscreen-body' ).each( _.bind( this.attach, this ) );
+		return this;
+	},
+
+	attach: function( index, editor ) {
+		// Attach a dropzone to an editor.
+		var dropzone = this.$el.clone();
+		this.dropzones.push( dropzone );
+		$( editor ).append( dropzone );
+		return this;
+	},
 
+	/**
+	 * When a file is dropped on the editor uploader, open up an editor media workflow
+	 * and upload the file immediately.
+	 *
+	 * @param  {jQuery.Event} event The 'drop' event.
+	 */
+	drop: function( event ) {
+		var $wrap = null, uploadView;
+>>>>>>> .r12027
+
+<<<<<<< .mine
 Select = Toolbar.extend({
 	initialize: function() {
 		var options = this.options;
+||||||| .r11156
+		events: {
+			'submit':          'preventDefault',
+			'change input':    'save',
+			'change select':   'save',
+			'change textarea': 'save'
+		},
+=======
+		this.containerDragleave( event );
+		this.dropzoneDragleave( event );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		_.bindAll( this, 'clickSelect' );
 
 		_.defaults( options, {
@@ -7696,27 +19458,124 @@ Select = Toolbar.extend({
 				click:    this.clickSelect,
 				requires: options.requires
 			}
+||||||| .r11156
+		initialize: function() {
+			this.model.on( 'change:compat', this.render, this );
+		},
+		/**
+		 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+		 */
+		dispose: function() {
+			if ( this.$(':focus').length ) {
+				this.save();
+			}
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			return media.View.prototype.dispose.apply( this, arguments );
+		},
+		/**
+		 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+		 */
+		render: function() {
+			var compat = this.model.get('compat');
+			if ( ! compat || ! compat.item ) {
+				return;
+			}
+=======
+		this.files = event.originalEvent.dataTransfer.files;
+		if ( this.files.length < 1 ) {
+			return;
+		}
+>>>>>>> .r12027
 		});
 		// Call 'initialize' directly on the parent class.
 		Toolbar.prototype.initialize.apply( this, arguments );
 	},
 
+<<<<<<< .mine
 	clickSelect: function() {
 		var options = this.options,
 			controller = this.controller;
+||||||| .r11156
+			this.views.detach();
+			this.$el.html( compat.item );
+			this.views.render();
+			return this;
+		},
+		/**
+		 * @param {Object} event
+		 */
+		preventDefault: function( event ) {
+			event.preventDefault();
+		},
+		/**
+		 * @param {Object} event
+		 */
+		save: function( event ) {
+			var data = {};
+=======
+		// Set the active editor to the drop target.
+		$wrap = $( event.target ).parents( '.wp-editor-wrap' );
+		if ( $wrap.length > 0 && $wrap[0].id ) {
+			window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( options.close ) {
 			controller.close();
 		}
+||||||| .r11156
+			if ( event ) {
+				event.preventDefault();
+			}
+=======
+		if ( ! this.workflow ) {
+			this.workflow = wp.media.editor.open( 'content', {
+				frame:    'post',
+				state:    'insert',
+				title:    l10n.addMedia,
+				multiple: true
+			});
+			uploadView = this.workflow.uploader;
+			if ( uploadView.uploader && uploadView.uploader.ready ) {
+				this.addFiles.apply( this );
+			} else {
+				this.workflow.on( 'uploader:ready', this.addFiles, this );
+			}
+>>>>>>> .r12027
+		} else {
+			this.workflow.state().reset();
+			this.addFiles.apply( this );
+			this.workflow.open();
+		}
 
+<<<<<<< .mine
 		if ( options.event ) {
 			controller.state().trigger( options.event );
 		}
+||||||| .r11156
+			_.each( this.$el.serializeArray(), function( pair ) {
+				data[ pair.name ] = pair.value;
+			});
+=======
+		return false;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( options.state ) {
 			controller.setState( options.state );
 		}
 
+||||||| .r11156
+			this.model.saveCompat( data );
+		}
+	});
+
+=======
+>>>>>>> .r12027
 		if ( options.reset ) {
 			controller.reset();
 		}
@@ -7725,12 +19584,10 @@ Select = Toolbar.extend({
 
 module.exports = Select;
 
-},{}],66:[function(require,module,exports){
-/*globals wp, _, jQuery */
-
+},{}],70:[function(require,module,exports){
 /**
- * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
- * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
+ * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap)
+ * and relays drag'n'dropped files to a media workflow.
  *
  * wp.media.view.EditorUploader
  *
@@ -7755,16 +19612,53 @@ EditorUploader = View.extend({
 	draggingFile: null,
 
 	/**
+<<<<<<< .mine
 	 * Bind drag'n'drop events to callbacks.
+||||||| .r11156
+	 * wp.media.view.Iframe
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+=======
+	 * Add the files to the uploader.
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
 	initialize: function() {
 		this.initialized = false;
 
 		// Bail if not enabled or UA does not support drag'n'drop or File API.
 		if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
 			return this;
+||||||| .r11156
+	media.view.Iframe = media.View.extend({
+		className: 'media-iframe',
+		/**
+		 * @returns {wp.media.view.Iframe} Returns itself to allow chaining
+		 */
+		render: function() {
+			this.views.detach();
+			this.$el.html( '<iframe src="' + this.controller.state().get('src') + '" />' );
+			this.views.render();
+			return this;
+=======
+	addFiles: function() {
+		if ( this.files.length ) {
+			this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
+			this.files = [];
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+||||||| .r11156
+	});
+=======
+		return this;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.$document = $(document);
 		this.dropzones = [];
 		this.files = [];
@@ -7792,52 +19686,222 @@ EditorUploader = View.extend({
 	 */
 	browserSupport: function() {
 		var supports = false, div = document.createElement('div');
+||||||| .r11156
+	/**
+	 * wp.media.view.Embed
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Embed = media.View.extend({
+		className: 'media-embed',
+=======
+	containerDragover: function( event ) {
+		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+			return;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
 		supports = supports && !! ( window.File && window.FileList && window.FileReader );
 		return supports;
 	},
+||||||| .r11156
+		initialize: function() {
+			/**
+			 * @member {wp.media.view.EmbedUrl}
+			 */
+			this.url = new media.view.EmbedUrl({
+				controller: this.controller,
+				model:      this.model.props
+			}).render();
+=======
+		this.overContainer = true;
+		this.refresh();
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	isDraggingFile: function( event ) {
 		if ( this.draggingFile !== null ) {
 			return this.draggingFile;
 		}
+||||||| .r11156
+			this.views.set([ this.url ]);
+			this.refresh();
+			this.model.on( 'change:type', this.refresh, this );
+			this.model.on( 'change:loading', this.loading, this );
+		},
+=======
+	containerDragleave: function() {
+		this.overContainer = false;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
 			return false;
 		}
+||||||| .r11156
+		/**
+		 * @param {Object} view
+		 */
+		settings: function( view ) {
+			if ( this._settings ) {
+				this._settings.remove();
+			}
+			this._settings = view;
+			this.views.add( view );
+		},
+=======
+		// Throttle dragleave because it's called when bouncing from some elements to others.
+		_.delay( _.bind( this.refresh, this ), 50 );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
 			_.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+||||||| .r11156
+		refresh: function() {
+			var type = this.model.get('type'),
+				constructor;
+=======
+	dropzoneDragover: function( event ) {
+		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+			return;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this.draggingFile;
 	},
+||||||| .r11156
+			if ( 'image' === type ) {
+				constructor = media.view.EmbedImage;
+			} else if ( 'link' === type ) {
+				constructor = media.view.EmbedLink;
+			} else {
+				return;
+			}
+=======
+		this.overDropzone = true;
+		this.refresh( event );
+		return false;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	refresh: function( e ) {
 		var dropzone_id;
 		for ( dropzone_id in this.dropzones ) {
 			// Hide the dropzones only if dragging has left the screen.
 			this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
 		}
+||||||| .r11156
+			this.settings( new constructor({
+				controller: this.controller,
+				model:      this.model.props,
+				priority:   40
+			}) );
+		},
+=======
+	dropzoneDragleave: function( e ) {
+		this.overDropzone = false;
+		_.delay( _.bind( this.refresh, this, e ), 50 );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! _.isUndefined( e ) ) {
 			$( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
 		}
+||||||| .r11156
+		loading: function() {
+			this.$el.toggleClass( 'embed-loading', this.model.get('loading') );
+		}
+	});
+=======
+	click: function( e ) {
+		// In the rare case where the dropzone gets stuck, hide it on click.
+		this.containerDragleave( e );
+		this.dropzoneDragleave( e );
+		this.localDrag = false;
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! this.overContainer && ! this.overDropzone ) {
 			this.draggingFile = null;
 		}
+||||||| .r11156
+	/**
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Label = media.View.extend({
+		tagName: 'label',
+		className: 'screen-reader-text',
+=======
+module.exports = EditorUploader;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return this;
 	},
+||||||| .r11156
+		initialize: function() {
+			this.value = this.options.value;
+		},
+=======
+},{}],67:[function(require,module,exports){
+/*globals wp, _ */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	render: function() {
 		if ( ! this.initialized ) {
+||||||| .r11156
+		render: function() {
+			this.$el.html( this.value );
+
+=======
+/**
+ * wp.media.view.UploaderInline
+ *
+ * The inline uploader that shows up in the 'Upload Files' tab.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	UploaderInline;
+
+>>>>>>> .r12027
+<<<<<<< .mine
+			return this;
+		}
+||||||| .r11156
 			return this;
 		}
+	});
+=======
+UploaderInline = View.extend({
+	tagName:   'div',
+	className: 'uploader-inline',
+	template:  wp.template('uploader-inline'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		View.prototype.render.apply( this, arguments );
-		$( '.wp-editor-wrap, #wp-fullscreen-body' ).each( _.bind( this.attach, this ) );
+		$( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
 		return this;
 	},
 
@@ -7856,30 +19920,104 @@ EditorUploader = View.extend({
 	 * @param  {jQuery.Event} event The 'drop' event.
 	 */
 	drop: function( event ) {
-		var $wrap = null, uploadView;
+		var $wrap, uploadView;
+||||||| .r11156
+	/**
+	 * wp.media.view.EmbedUrl
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.EmbedUrl = media.View.extend({
+		tagName:   'label',
+		className: 'embed-url',
+=======
+	events: {
+		'click .close': 'hide'
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.containerDragleave( event );
 		this.dropzoneDragleave( event );
+||||||| .r11156
+		events: {
+			'input':  'url',
+			'keyup':  'url',
+			'change': 'url'
+		},
+=======
+	initialize: function() {
+		_.defaults( this.options, {
+			message: '',
+			status:  true,
+			canClose: false
+		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.files = event.originalEvent.dataTransfer.files;
 		if ( this.files.length < 1 ) {
 			return;
 		}
+||||||| .r11156
+		initialize: function() {
+			var self = this;
+=======
+		if ( ! this.options.$browser && this.controller.uploader ) {
+			this.options.$browser = this.controller.uploader.$browser;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// Set the active editor to the drop target.
 		$wrap = $( event.target ).parents( '.wp-editor-wrap' );
 		if ( $wrap.length > 0 && $wrap[0].id ) {
 			window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
 		}
+||||||| .r11156
+			this.$input = $('<input id="embed-url-field" type="url" />').val( this.model.get('url') );
+			this.input = this.$input[0];
+=======
+		if ( _.isUndefined( this.options.postId ) ) {
+			this.options.postId = wp.media.view.settings.post.id;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! this.workflow ) {
-			this.workflow = wp.media.editor.open( 'content', {
+			this.workflow = wp.media.editor.open( window.wpActiveEditor, {
 				frame:    'post',
 				state:    'insert',
 				title:    l10n.addMedia,
 				multiple: true
 			});
+||||||| .r11156
+			this.spinner = $('<span class="spinner" />')[0];
+			this.$el.append([ this.input, this.spinner ]);
+=======
+		if ( this.options.status ) {
+			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
+				controller: this.controller
+			}) );
+		}
+	},
+>>>>>>> .r12027
+
+<<<<<<< .mine
 			uploadView = this.workflow.uploader;
+||||||| .r11156
+			this.model.on( 'change:url', this.render, this );
+=======
+	prepare: function() {
+		var suggestedWidth = this.controller.state().get('suggestedWidth'),
+			suggestedHeight = this.controller.state().get('suggestedHeight'),
+			data = {};
+>>>>>>> .r12027
+
+<<<<<<< .mine
 			if ( uploadView.uploader && uploadView.uploader.ready ) {
 				this.addFiles.apply( this );
 			} else {
@@ -7890,10 +20028,38 @@ EditorUploader = View.extend({
 			this.addFiles.apply( this );
 			this.workflow.open();
 		}
+||||||| .r11156
+			if ( this.model.get( 'url' ) ) {
+				_.delay( function () {
+					self.model.trigger( 'change:url' );
+				}, 500 );
+			}
+		},
+		/**
+		 * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
+		 */
+		render: function() {
+			var $input = this.$input;
+=======
+		data.message = this.options.message;
+		data.canClose = this.options.canClose;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return false;
 	},
+||||||| .r11156
+			if ( $input.is(':focus') ) {
+				return;
+			}
+=======
+		if ( suggestedWidth && suggestedHeight ) {
+			data.suggestedWidth = suggestedWidth;
+			data.suggestedHeight = suggestedHeight;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	/**
 	 * Add the files to the uploader.
 	 */
@@ -7904,16 +20070,72 @@ EditorUploader = View.extend({
 		}
 		return this;
 	},
+||||||| .r11156
+			this.input.value = this.model.get('url') || 'http://';
+			/**
+			 * Call `render` directly on parent class with passed arguments
+			 */
+			media.View.prototype.render.apply( this, arguments );
+			return this;
+		},
+=======
+		return data;
+	},
+	/**
+	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+	 */
+	dispose: function() {
+		if ( this.disposing ) {
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			return View.prototype.dispose.apply( this, arguments );
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	containerDragover: function( event ) {
 		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
 			return;
 		}
+||||||| .r11156
+		ready: function() {
+			if ( ! isTouchDevice ) {
+				this.focus();
+			}
+		},
+=======
+		// Run remove on `dispose`, so we can be sure to refresh the
+		// uploader with a view-less DOM. Track whether we're disposing
+		// so we don't trigger an infinite loop.
+		this.disposing = true;
+		return this.remove();
+	},
+	/**
+	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+	 */
+	remove: function() {
+		/**
+		 * call 'remove' directly on the parent class
+		 */
+		var result = View.prototype.remove.apply( this, arguments );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.overContainer = true;
 		this.refresh();
 	},
+||||||| .r11156
+		url: function( event ) {
+			this.model.set( 'url', event.target.value );
+		},
+=======
+		_.defer( _.bind( this.refresh, this ) );
+		return result;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	containerDragleave: function() {
 		this.overContainer = false;
 
@@ -7924,18 +20146,75 @@ EditorUploader = View.extend({
 	dropzoneDragover: function( event ) {
 		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
 			return;
+||||||| .r11156
+		/**
+		 * If the input is visible, focus and select its contents.
+		 */
+		focus: function() {
+			var $input = this.$input;
+			if ( $input.is(':visible') ) {
+				$input.focus()[0].select();
+			}
+=======
+	refresh: function() {
+		var uploader = this.controller.uploader;
+
+		if ( uploader ) {
+			uploader.refresh();
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+
+||||||| .r11156
+	});
 
+=======
+	},
+>>>>>>> .r12027
+<<<<<<< .mine
 		this.overDropzone = true;
 		this.refresh( event );
 		return false;
 	},
+||||||| .r11156
+	/**
+	 * wp.media.view.EmbedLink
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.EmbedLink = media.view.Settings.extend({
+		className: 'embed-link-settings',
+		template:  media.template('embed-link-settings'),
+=======
+	/**
+	 * @returns {wp.media.view.UploaderInline}
+	 */
+	ready: function() {
+		var $browser = this.options.$browser,
+			$placeholder;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	dropzoneDragleave: function( e ) {
 		this.overDropzone = false;
 		_.delay( _.bind( this.refresh, this, e ), 50 );
 	},
+||||||| .r11156
+		initialize: function() {
+			this.spinner = $('<span class="spinner" />');
+			this.$el.append( this.spinner[0] );
+			this.listenTo( this.model, 'change:url', this.updateoEmbed );
+		},
+=======
+		if ( this.controller.uploader ) {
+			$placeholder = this.$('.browser');
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	click: function( e ) {
 		// In the rare case where the dropzone gets stuck, hide it on click.
 		this.containerDragleave( e );
@@ -7946,9 +20225,7 @@ EditorUploader = View.extend({
 
 module.exports = EditorUploader;
 
-},{}],67:[function(require,module,exports){
-/*globals wp, _ */
-
+},{}],71:[function(require,module,exports){
 /**
  * wp.media.view.UploaderInline
  *
@@ -7961,38 +20238,128 @@ module.exports = EditorUploader;
  */
 var View = wp.media.View,
 	UploaderInline;
+||||||| .r11156
+		updateoEmbed: function() {
+			var url = this.model.get( 'url' );
+
+			this.$('.setting.title').show();
+			// clear out previous results
+			this.$('.embed-container').hide().find('.embed-preview').html('');
+
+			// only proceed with embed if the field contains more than 6 characters
+			if ( url && url.length < 6 ) {
+				return;
+			}
+=======
+			// Check if we've already replaced the placeholder.
+			if ( $placeholder[0] === $browser[0] ) {
+				return;
+			}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 UploaderInline = View.extend({
 	tagName:   'div',
 	className: 'uploader-inline',
 	template:  wp.template('uploader-inline'),
+||||||| .r11156
+			this.spinner.show();
+=======
+			$browser.detach().text( $placeholder.text() );
+			$browser[0].className = $placeholder[0].className;
+			$placeholder.replaceWith( $browser.show() );
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	events: {
 		'click .close': 'hide'
 	},
+||||||| .r11156
+			setTimeout( _.bind( this.fetch, this ), 500 );
+		},
+=======
+		this.refresh();
+		return this;
+	},
+	show: function() {
+		this.$el.removeClass( 'hidden' );
+	},
+	hide: function() {
+		this.$el.addClass( 'hidden' );
+	}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	initialize: function() {
 		_.defaults( this.options, {
 			message: '',
 			status:  true,
 			canClose: false
 		});
+||||||| .r11156
+		fetch: function() {
+			// check if they haven't typed in 500 ms
+			if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+				return;
+			}
+=======
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( ! this.options.$browser && this.controller.uploader ) {
 			this.options.$browser = this.controller.uploader.$browser;
 		}
+||||||| .r11156
+			wp.ajax.send( 'parse-embed', {
+				data : {
+					post_ID: media.view.settings.post.id,
+					shortcode: '[embed]' + this.model.get('url') + '[/embed]'
+				}
+			} ).done( _.bind( this.renderoEmbed, this ) );
+		},
+=======
+module.exports = UploaderInline;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( _.isUndefined( this.options.postId ) ) {
 			this.options.postId = wp.media.view.settings.post.id;
 		}
+||||||| .r11156
+		renderoEmbed: function( response ) {
+			var html = ( response && response.body ) || '';
+=======
+},{}],68:[function(require,module,exports){
+/*globals wp */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( this.options.status ) {
 			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
 				controller: this.controller
 			}) );
 		}
 	},
+||||||| .r11156
+			this.spinner.hide();
+=======
+/**
+ * wp.media.view.UploaderStatusError
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var UploaderStatusError = wp.media.View.extend({
+	className: 'upload-error',
+	template:  wp.template('uploader-status-error')
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	prepare: function() {
 		var suggestedWidth = this.controller.state().get('suggestedWidth'),
 			suggestedHeight = this.controller.state().get('suggestedHeight'),
@@ -8005,7 +20372,16 @@ UploaderInline = View.extend({
 			data.suggestedWidth = suggestedWidth;
 			data.suggestedHeight = suggestedHeight;
 		}
+||||||| .r11156
+			this.$('.setting.title').hide();
+			this.$('.embed-container').show().find('.embed-preview').html( html );
+		}
+	});
+=======
+module.exports = UploaderStatusError;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		return data;
 	},
 	/**
@@ -8018,29 +20394,167 @@ UploaderInline = View.extend({
 			 */
 			return View.prototype.dispose.apply( this, arguments );
 		}
+||||||| .r11156
+	/**
+	 * wp.media.view.EmbedImage
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings.AttachmentDisplay
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.EmbedImage =  media.view.Settings.AttachmentDisplay.extend({
+		className: 'embed-media-settings',
+		template:  media.template('embed-image-settings'),
+
+		initialize: function() {
+			/**
+			 * Call `initialize` directly on parent class with passed arguments
+			 */
+			media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
+			this.model.on( 'change:url', this.updateImage, this );
+		},
+
+		updateImage: function() {
+			this.$('img').attr( 'src', this.model.get('url') );
+		}
+	});
+=======
+},{}],69:[function(require,module,exports){
+/*globals wp, _ */
+
+/**
+ * wp.media.view.UploaderStatus
+ *
+ * An uploader status for on-going uploads.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	UploaderStatus;
+
+UploaderStatus = View.extend({
+	className: 'media-uploader-status',
+	template:  wp.template('uploader-status'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// Run remove on `dispose`, so we can be sure to refresh the
 		// uploader with a view-less DOM. Track whether we're disposing
 		// so we don't trigger an infinite loop.
 		this.disposing = true;
 		return this.remove();
 	},
+||||||| .r11156
+=======
+	events: {
+		'click .upload-dismiss-errors': 'dismiss'
+	},
+
+	initialize: function() {
+		this.queue = wp.Uploader.queue;
+		this.queue.on( 'add remove reset', this.visibility, this );
+		this.queue.on( 'add remove reset change:percent', this.progress, this );
+		this.queue.on( 'add remove reset change:uploading', this.info, this );
+
+		this.errors = wp.Uploader.errors;
+		this.errors.reset();
+		this.errors.on( 'add remove reset', this.visibility, this );
+		this.errors.on( 'add', this.error, this );
+	},
+>>>>>>> .r12027
 	/**
+<<<<<<< .mine
 	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+||||||| .r11156
+	 * wp.media.view.ImageDetails
+	 *
+	 * @constructor
+	 * @augments wp.media.view.Settings.AttachmentDisplay
+	 * @augments wp.media.view.Settings
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+=======
+	 * @global wp.Uploader
+	 * @returns {wp.media.view.UploaderStatus}
+>>>>>>> .r12027
 	 */
+<<<<<<< .mine
 	remove: function() {
 		/**
 		 * call 'remove' directly on the parent class
 		 */
-		var result = View.prototype.remove.apply( this, arguments );
+		var result = View.prototype.remove.apply( this, arguments );
+||||||| .r11156
+	media.view.ImageDetails = media.view.Settings.AttachmentDisplay.extend({
+		className: 'image-details',
+		template:  media.template('image-details'),
+		events: _.defaults( media.view.Settings.AttachmentDisplay.prototype.events, {
+			'click .edit-attachment': 'editAttachment',
+			'click .replace-attachment': 'replaceAttachment',
+			'click .advanced-toggle': 'onToggleAdvanced',
+			'change [data-setting="customWidth"]': 'onCustomSize',
+			'change [data-setting="customHeight"]': 'onCustomSize',
+			'keyup [data-setting="customWidth"]': 'onCustomSize',
+			'keyup [data-setting="customHeight"]': 'onCustomSize'
+		} ),
+		initialize: function() {
+			// used in AttachmentDisplay.prototype.updateLinkTo
+			this.options.attachment = this.model.attachment;
+			this.listenTo( this.model, 'change:url', this.updateUrl );
+			this.listenTo( this.model, 'change:link', this.toggleLinkSettings );
+			this.listenTo( this.model, 'change:size', this.toggleCustomSize );
+=======
+	dispose: function() {
+		wp.Uploader.queue.off( null, null, this );
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		View.prototype.dispose.apply( this, arguments );
+		return this;
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		_.defer( _.bind( this.refresh, this ) );
 		return result;
 	},
+||||||| .r11156
+			media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
+		},
+=======
+	visibility: function() {
+		this.$el.toggleClass( 'uploading', !! this.queue.length );
+		this.$el.toggleClass( 'errors', !! this.errors.length );
+		this.$el.toggle( !! this.queue.length || !! this.errors.length );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	refresh: function() {
 		var uploader = this.controller.uploader;
+||||||| .r11156
+		prepare: function() {
+			var attachment = false;
+=======
+	ready: function() {
+		_.each({
+			'$bar':      '.media-progress-bar div',
+			'$index':    '.upload-index',
+			'$total':    '.upload-total',
+			'$filename': '.upload-filename'
+		}, function( selector, key ) {
+			this[ key ] = this.$( selector );
+		}, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( uploader ) {
 			uploader.refresh();
 		}
@@ -8051,20 +20565,79 @@ UploaderInline = View.extend({
 	ready: function() {
 		var $browser = this.options.$browser,
 			$placeholder;
+||||||| .r11156
+			if ( this.model.attachment ) {
+				attachment = this.model.attachment.toJSON();
+			}
+			return _.defaults({
+				model: this.model.toJSON(),
+				attachment: attachment
+			}, this.options );
+		},
+=======
+		this.visibility();
+		this.progress();
+		this.info();
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( this.controller.uploader ) {
 			$placeholder = this.$('.browser');
+||||||| .r11156
+		render: function() {
+			var self = this,
+				args = arguments;
+=======
+	progress: function() {
+		var queue = this.queue,
+			$bar = this.$bar;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			// Check if we've already replaced the placeholder.
 			if ( $placeholder[0] === $browser[0] ) {
 				return;
+||||||| .r11156
+			if ( this.model.attachment && 'pending' === this.model.dfd.state() ) {
+				this.model.dfd.done( function() {
+					media.view.Settings.AttachmentDisplay.prototype.render.apply( self, args );
+					self.postRender();
+				} ).fail( function() {
+					self.model.attachment = false;
+					media.view.Settings.AttachmentDisplay.prototype.render.apply( self, args );
+					self.postRender();
+				} );
+			} else {
+				media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
+				this.postRender();
+=======
+		if ( ! $bar || ! queue.length ) {
+			return;
+		}
+
+		$bar.width( ( queue.reduce( function( memo, attachment ) {
+			if ( ! attachment.get('uploading') ) {
+				return memo + 100;
+>>>>>>> .r12027
 			}
 
+<<<<<<< .mine
 			$browser.detach().text( $placeholder.text() );
 			$browser[0].className = $placeholder[0].className;
 			$placeholder.replaceWith( $browser.show() );
 		}
+||||||| .r11156
+			return this;
+		},
+=======
+			var percent = attachment.get('percent');
+			return memo + ( _.isNumber( percent ) ? percent : 100 );
+		}, 0 ) / queue.length ) + '%' );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.refresh();
 		return this;
 	},
@@ -8074,14 +20647,50 @@ UploaderInline = View.extend({
 	hide: function() {
 		this.$el.addClass( 'hidden' );
 	}
+||||||| .r11156
+		postRender: function() {
+			setTimeout( _.bind( this.resetFocus, this ), 10 );
+			this.toggleLinkSettings();
+			if ( getUserSetting( 'advImgDetails' ) === 'show' ) {
+				this.toggleAdvanced( true );
+			}
+			this.trigger( 'post-render' );
+		},
+=======
+	info: function() {
+		var queue = this.queue,
+			index = 0, active;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 });
+||||||| .r11156
+		resetFocus: function() {
+			this.$( '.link-to-custom' ).blur();
+			this.$( '.embed-media-settings' ).scrollTop( 0 );
+		},
+=======
+		if ( ! queue.length ) {
+			return;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = UploaderInline;
+||||||| .r11156
+		updateUrl: function() {
+			this.$( '.image img' ).attr( 'src', this.model.get( 'url' ) );
+			this.$( '.url' ).val( this.model.get( 'url' ) );
+		},
+=======
+		active = this.queue.find( function( attachment, i ) {
+			index = i;
+			return attachment.get('uploading');
+		});
+>>>>>>> .r12027
 
-},{}],68:[function(require,module,exports){
-/*globals wp */
-
+<<<<<<< .mine
+},{}],72:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatusError
  *
@@ -8094,12 +20703,59 @@ var UploaderStatusError = wp.media.View.extend({
 	className: 'upload-error',
 	template:  wp.template('uploader-status-error')
 });
+||||||| .r11156
+		toggleLinkSettings: function() {
+			if ( this.model.get( 'link' ) === 'none' ) {
+				this.$( '.link-settings' ).addClass('hidden');
+			} else {
+				this.$( '.link-settings' ).removeClass('hidden');
+			}
+		},
+=======
+		this.$index.text( index + 1 );
+		this.$total.text( queue.length );
+		this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
+	},
+	/**
+	 * @param {string} filename
+	 * @returns {string}
+	 */
+	filename: function( filename ) {
+		return wp.media.truncate( _.escape( filename ), 24 );
+	},
+	/**
+	 * @param {Backbone.Model} error
+	 */
+	error: function( error ) {
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+			filename: this.filename( error.get('file').name ),
+			message:  error.get('message')
+		}), { at: 0 });
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = UploaderStatusError;
+||||||| .r11156
+		toggleCustomSize: function() {
+			if ( this.model.get( 'size' ) !== 'custom' ) {
+				this.$( '.custom-size' ).addClass('hidden');
+			} else {
+				this.$( '.custom-size' ).removeClass('hidden');
+			}
+		},
+=======
+	/**
+	 * @global wp.Uploader
+	 *
+	 * @param {Object} event
+	 */
+	dismiss: function( event ) {
+		var errors = this.views.get('.upload-errors');
+>>>>>>> .r12027
 
-},{}],69:[function(require,module,exports){
-/*globals wp, _ */
-
+<<<<<<< .mine
+},{}],73:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatus
  *
@@ -8112,21 +20768,70 @@ module.exports = UploaderStatusError;
  */
 var View = wp.media.View,
 	UploaderStatus;
+||||||| .r11156
+		onCustomSize: function( event ) {
+			var dimension = $( event.target ).data('setting'),
+				num = $( event.target ).val(),
+				value;
+=======
+		event.preventDefault();
+>>>>>>> .r12027
 
+<<<<<<< .mine
 UploaderStatus = View.extend({
 	className: 'media-uploader-status',
 	template:  wp.template('uploader-status'),
+||||||| .r11156
+			// Ignore bogus input
+			if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
+				event.preventDefault();
+				return;
+			}
+=======
+		if ( errors ) {
+			_.invoke( errors, 'remove' );
+		}
+		wp.Uploader.errors.reset();
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	events: {
 		'click .upload-dismiss-errors': 'dismiss'
 	},
+||||||| .r11156
+			if ( dimension === 'customWidth' ) {
+				value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
+				this.model.set( 'customHeight', value, { silent: true } );
+				this.$( '[data-setting="customHeight"]' ).val( value );
+			} else {
+				value = Math.round( this.model.get( 'aspectRatio' ) * num );
+				this.model.set( 'customWidth', value, { silent: true  } );
+				this.$( '[data-setting="customWidth"]' ).val( value );
+			}
+		},
+=======
+module.exports = UploaderStatus;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	initialize: function() {
 		this.queue = wp.Uploader.queue;
 		this.queue.on( 'add remove reset', this.visibility, this );
 		this.queue.on( 'add remove reset change:percent', this.progress, this );
 		this.queue.on( 'add remove reset change:uploading', this.info, this );
+||||||| .r11156
+		onToggleAdvanced: function( event ) {
+			event.preventDefault();
+			this.toggleAdvanced();
+		},
+=======
+},{}],70:[function(require,module,exports){
+/*globals wp, _, jQuery */
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.errors = wp.Uploader.errors;
 		this.errors.reset();
 		this.errors.on( 'add remove reset', this.visibility, this );
@@ -8144,13 +20849,55 @@ UploaderStatus = View.extend({
 		View.prototype.dispose.apply( this, arguments );
 		return this;
 	},
+||||||| .r11156
+		toggleAdvanced: function( show ) {
+			var $advanced = this.$el.find( '.advanced-section' ),
+				mode;
+=======
+/**
+ * wp.media.view.UploaderWindow
+ *
+ * An uploader window that allows for dragging and dropping media.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ *
+ * @param {object} [options]                   Options hash passed to the view.
+ * @param {object} [options.uploader]          Uploader properties.
+ * @param {jQuery} [options.uploader.browser]
+ * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
+ * @param {object} [options.uploader.params]
+ */
+var $ = jQuery,
+	UploaderWindow;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	visibility: function() {
 		this.$el.toggleClass( 'uploading', !! this.queue.length );
 		this.$el.toggleClass( 'errors', !! this.errors.length );
 		this.$el.toggle( !! this.queue.length || !! this.errors.length );
 	},
+||||||| .r11156
+			if ( $advanced.hasClass('advanced-visible') || show === false ) {
+				$advanced.removeClass('advanced-visible');
+				$advanced.find('.advanced-settings').addClass('hidden');
+				mode = 'hide';
+			} else {
+				$advanced.addClass('advanced-visible');
+				$advanced.find('.advanced-settings').removeClass('hidden');
+				mode = 'show';
+			}
+=======
+UploaderWindow = wp.media.View.extend({
+	tagName:   'div',
+	className: 'uploader-window',
+	template:  wp.template('uploader-window'),
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	ready: function() {
 		_.each({
 			'$bar':      '.media-progress-bar div',
@@ -8160,12 +20907,27 @@ UploaderStatus = View.extend({
 		}, function( selector, key ) {
 			this[ key ] = this.$( selector );
 		}, this );
+||||||| .r11156
+			setUserSetting( 'advImgDetails', mode );
+		},
+=======
+	initialize: function() {
+		var uploader;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.visibility();
 		this.progress();
 		this.info();
 	},
+||||||| .r11156
+		editAttachment: function( event ) {
+			var editState = this.controller.states.get( 'edit-image' );
+=======
+		this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	progress: function() {
 		var queue = this.queue,
 			$bar = this.$bar;
@@ -8178,7 +20940,22 @@ UploaderStatus = View.extend({
 			if ( ! attachment.get('uploading') ) {
 				return memo + 100;
 			}
+||||||| .r11156
+			if ( window.imageEdit && editState ) {
+				event.preventDefault();
+				editState.set( 'image', this.model.attachment );
+				this.controller.setState( 'edit-image' );
+			}
+		},
+=======
+		uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
+			dropzone:  this.$el,
+			browser:   this.$browser,
+			params:    {}
+		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 			var percent = attachment.get('percent');
 			return memo + ( _.isNumber( percent ) ? percent : 100 );
 		}, 0 ) / queue.length ) + '%' );
@@ -8190,8 +20967,18 @@ UploaderStatus = View.extend({
 
 		if ( ! queue.length ) {
 			return;
+||||||| .r11156
+		replaceAttachment: function( event ) {
+			event.preventDefault();
+			this.controller.setState( 'replace-image' );
+=======
+		// Ensure the dropzone is a jQuery collection.
+		if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
+			uploader.dropzone = $( uploader.dropzone );
+>>>>>>> .r12027
 		}
 
+<<<<<<< .mine
 		active = this.queue.find( function( attachment, i ) {
 			index = i;
 			return attachment.get('uploading');
@@ -8206,7 +20993,7 @@ UploaderStatus = View.extend({
 	 * @returns {string}
 	 */
 	filename: function( filename ) {
-		return wp.media.truncate( _.escape( filename ), 24 );
+		return _.escape( filename );
 	},
 	/**
 	 * @param {Backbone.Model} error
@@ -8225,21 +21012,106 @@ UploaderStatus = View.extend({
 	 */
 	dismiss: function( event ) {
 		var errors = this.views.get('.upload-errors');
+||||||| .r11156
+	/**
+	 * wp.media.view.Cropper
+	 *
+	 * Uses the imgAreaSelect plugin to allow a user to crop an image.
+	 *
+	 * Takes imgAreaSelect options from
+	 * wp.customize.HeaderControl.calculateImageSelectOptions via
+	 * wp.customize.HeaderControl.openMM.
+	 *
+	 * @constructor
+	 * @augments wp.media.View
+	 * @augments wp.Backbone.View
+	 * @augments Backbone.View
+	 */
+	media.view.Cropper = media.View.extend({
+		className: 'crop-content',
+		template: media.template('crop-content'),
+		initialize: function() {
+			_.bindAll(this, 'onImageLoad');
+		},
+		ready: function() {
+			this.controller.frame.on('content:error:crop', this.onError, this);
+			this.$image = this.$el.find('.crop-image');
+			this.$image.on('load', this.onImageLoad);
+			$(window).on('resize.cropper', _.debounce(this.onImageLoad, 250));
+		},
+		remove: function() {
+			$(window).off('resize.cropper');
+			this.$el.remove();
+			this.$el.off();
+			wp.media.View.prototype.remove.apply(this, arguments);
+		},
+		prepare: function() {
+			return {
+				title: l10n.cropYourImage,
+				url: this.options.attachment.get('url')
+			};
+		},
+		onImageLoad: function() {
+			var imgOptions = this.controller.get('imgSelectOptions');
+			if (typeof imgOptions === 'function') {
+				imgOptions = imgOptions(this.options.attachment, this.controller);
+			}
+=======
+		this.controller.on( 'activate', this.refresh, this );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		event.preventDefault();
+||||||| .r11156
+			imgOptions = _.extend(imgOptions, {parent: this.$el});
+			this.trigger('image-loaded');
+			this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
+		},
+		onError: function() {
+			var filename = this.options.attachment.get('filename');
+=======
+		this.controller.on( 'detach', function() {
+			this.$browser.remove();
+		}, this );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( errors ) {
 			_.invoke( errors, 'remove' );
+||||||| .r11156
+			this.views.add( '.upload-errors', new media.view.UploaderStatusError({
+				filename: media.view.UploaderStatus.prototype.filename(filename),
+				message: _wpMediaViewsL10n.cropError
+			}), { at: 0 });
+=======
+	refresh: function() {
+		if ( this.uploader ) {
+			this.uploader.refresh();
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
 		wp.Uploader.errors.reset();
 	}
 });
+||||||| .r11156
+	});
+=======
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 module.exports = UploaderStatus;
+||||||| .r11156
+	media.view.EditImage = media.View.extend({
+=======
+	ready: function() {
+		var postId = wp.media.view.settings.post.id,
+			dropzone;
+>>>>>>> .r12027
 
-},{}],70:[function(require,module,exports){
-/*globals wp, _, jQuery */
-
+<<<<<<< .mine
+},{}],74:[function(require,module,exports){
 /**
  * wp.media.view.UploaderWindow
  *
@@ -8258,41 +21130,141 @@ module.exports = UploaderStatus;
  */
 var $ = jQuery,
 	UploaderWindow;
+||||||| .r11156
+		className: 'image-editor',
+		template: media.template('image-editor'),
+=======
+		// If the uploader already exists, bail.
+		if ( this.uploader ) {
+			return;
+		}
+>>>>>>> .r12027
 
+<<<<<<< .mine
 UploaderWindow = wp.media.View.extend({
 	tagName:   'div',
 	className: 'uploader-window',
 	template:  wp.template('uploader-window'),
+||||||| .r11156
+		initialize: function( options ) {
+			this.editor = window.imageEdit;
+			this.controller = options.controller;
+			media.View.prototype.initialize.apply( this, arguments );
+		},
+=======
+		if ( postId ) {
+			this.options.uploader.params.post_id = postId;
+		}
+		this.uploader = new wp.Uploader( this.options.uploader );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	initialize: function() {
 		var uploader;
+||||||| .r11156
+		prepare: function() {
+			return this.model.toJSON();
+		},
+=======
+		dropzone = this.uploader.dropzone;
+		dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
+		dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
+||||||| .r11156
+		render: function() {
+			media.View.prototype.render.apply( this, arguments );
+			return this;
+		},
+=======
+		$( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
 			dropzone:  this.$el,
 			browser:   this.$browser,
 			params:    {}
 		});
+||||||| .r11156
+		loadEditor: function() {
+			var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+			dfd.done( _.bind( this.focus, this ) );
+		},
+=======
+	_ready: function() {
+		this.controller.trigger( 'uploader:ready' );
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		// Ensure the dropzone is a jQuery collection.
 		if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
 			uploader.dropzone = $( uploader.dropzone );
 		}
+||||||| .r11156
+		focus: function() {
+			this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+		},
+=======
+	show: function() {
+		var $el = this.$el.show();
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.controller.on( 'activate', this.refresh, this );
+||||||| .r11156
+		back: function() {
+			var lastState = this.controller.lastState();
+			this.controller.setState( lastState );
+		},
+=======
+		// Ensure that the animation is triggered by waiting until
+		// the transparent element is painted into the DOM.
+		_.defer( function() {
+			$el.css({ opacity: 1 });
+		});
+	},
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		this.controller.on( 'detach', function() {
 			this.$browser.remove();
 		}, this );
 	},
+||||||| .r11156
+		refresh: function() {
+			this.model.fetch();
+		},
+=======
+	hide: function() {
+		var $el = this.$el.css({ opacity: 0 });
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	refresh: function() {
 		if ( this.uploader ) {
 			this.uploader.refresh();
 		}
 	},
+||||||| .r11156
+		save: function() {
+			var self = this,
+				lastState = this.controller.lastState();
+=======
+		wp.media.transition( $el ).done( function() {
+			// Transition end events are subject to race conditions.
+			// Make sure that the value is set as intended.
+			if ( '0' === $el.css('opacity') ) {
+				$el.hide();
+			}
+		});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 	ready: function() {
 		var postId = wp.media.view.settings.post.id,
 			dropzone;
@@ -8301,12 +21273,34 @@ UploaderWindow = wp.media.View.extend({
 		if ( this.uploader ) {
 			return;
 		}
+||||||| .r11156
+			this.model.fetch().done( function() {
+				self.controller.setState( lastState );
+			});
+		}
+=======
+		// https://core.trac.wordpress.org/ticket/27341
+		_.delay( function() {
+			if ( '0' === $el.css('opacity') && $el.is(':visible') ) {
+				$el.hide();
+			}
+		}, 500 );
+	}
+});
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		if ( postId ) {
 			this.options.uploader.params.post_id = postId;
 		}
 		this.uploader = new wp.Uploader( this.options.uploader );
+||||||| .r11156
+	});
+=======
+module.exports = UploaderWindow;
+>>>>>>> .r12027
 
+<<<<<<< .mine
 		dropzone = this.uploader.dropzone;
 		dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
 		dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
@@ -8350,6 +21344,32 @@ UploaderWindow = wp.media.View.extend({
 
 module.exports = UploaderWindow;
 
+},{}],75:[function(require,module,exports){
+/**
+ * wp.media.View
+ *
+ * The base view class for media.
+ *
+ * Undelegating events, removing events from the model, and
+ * removing events from the controller mirror the code for
+ * `Backbone.View.dispose` in Backbone 0.9.8 development.
+ *
+ * This behavior has since been removed, and should not be used
+ * outside of the media manager.
+ *
+ * @class
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.Backbone.View.extend({
+	constructor: function( options ) {
+		if ( options && options.controller ) {
+			this.controller = options.controller;
+		}
+		wp.Backbone.View.apply( this, arguments );
+	},
+||||||| .r11156
+=======
 },{}],71:[function(require,module,exports){
 /*globals wp */
 
@@ -8376,6 +21396,7 @@ var View = wp.Backbone.View.extend({
 		}
 		wp.Backbone.View.apply( this, arguments );
 	},
+>>>>>>> .r12027
 	/**
 	 * @todo The internal comment mentions this might have been a stop-gap
 	 *       before Backbone 0.9.8 came out. Figure out if Backbone core takes
@@ -8402,6 +21423,30 @@ var View = wp.Backbone.View.extend({
 			this.controller.off( null, null, this );
 		}
 
+<<<<<<< .mine
+		return this;
+	},
+	/**
+	 * @returns {wp.media.View} Returns itself to allow chaining
+	 */
+	remove: function() {
+		this.dispose();
+		/**
+		 * call 'remove' directly on the parent class
+		 */
+		return wp.Backbone.View.prototype.remove.apply( this, arguments );
+	}
+});
+
+module.exports = View;
+
+},{}]},{},[19]);
+||||||| .r11156
+			return this;
+		}
+	});
+}(jQuery, _));
+=======
 		return this;
 	},
 	/**
@@ -8419,3 +21464,4 @@ var View = wp.Backbone.View.extend({
 module.exports = View;
 
 },{}]},{},[17]);
+>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/media-views.min.js b/pavillonmadeleine.fr/wp-includes/js/media-views.min.js
index c038572f..5b0092c9 100644
--- a/pavillonmadeleine.fr/wp-includes/js/media-views.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/media-views.min.js
@@ -1,4 +1,12 @@
+<<<<<<< .mine
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){var d,e=wp.media.model.Selection,f=wp.media.controller.Library;d=f.extend({defaults:_.defaults({multiple:"add",filterable:"uploaded",priority:100,syncSelection:!1},f.prototype.defaults),initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-library"),this.set("toolbar",a+"-add"),this.set("menu",a),this.get("library")||this.set("library",wp.media.query({type:this.get("type")})),f.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.get("editLibrary"),c=this.frame.state(this.get("collectionType")+"-edit").get("library");b&&b!==c&&a.unobserve(b),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!c.get(a.cid)&&e.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(c),this.set("editLibrary",c),f.prototype.activate.apply(this,arguments)}}),b.exports=d},{}],2:[function(a,b,c){var d,e=wp.media.controller.Library,f=wp.media.view.l10n,g=jQuery;d=e.extend({defaults:{multiple:!1,sortable:!0,date:!1,searchable:!1,content:"browse",describe:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,SettingsView:!1,syncSelection:!1},initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-edit"),this.set("toolbar",a+"-edit"),this.get("library")||this.set("library",new wp.media.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",wp.media.view.Attachment.EditLibrary),e.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type",this.get("type")),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.renderSettings,this),e.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.renderSettings,this),e.prototype.deactivate.apply(this,arguments)},renderSettings:function(a){var b=this.get("library"),c=this.get("collectionType"),d=this.get("dragInfoText"),e=this.get("SettingsView"),h={};b&&a&&(b[c]=b[c]||new Backbone.Model,h[c]=new e({controller:this,model:b[c],priority:40}),a.sidebar.set(h),d&&a.toolbar.set("dragInfo",new wp.media.View({el:g('<div class="instructions">'+d+"</div>")[0],priority:-40})),a.toolbar.set("reverse",{text:f.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}),b.exports=d},{}],3:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.controller.State.extend({defaults:{id:"cropper",title:e.cropImage,toolbar:"crop",content:"crop",router:!1,canSkipCrop:!1},activate:function(){this.frame.on("content:create:crop",this.createCropContent,this),this.frame.on("close",this.removeCropper,this),this.set("selection",new Backbone.Collection(this.frame._selection.single))},deactivate:function(){this.frame.toolbar.mode("browse")},createCropContent:function(){this.cropperView=new wp.media.view.Cropper({controller:this,attachment:this.get("selection").first()}),this.cropperView.on("image-loaded",this.createCropToolbar,this),this.frame.content.set(this.cropperView)},removeCropper:function(){this.imgSelect.cancelSelection(),this.imgSelect.setOptions({remove:!0}),this.imgSelect.update(),this.cropperView.remove()},createCropToolbar:function(){var a,b;a=this.get("canSkipCrop")||!1,b={controller:this.frame,items:{insert:{style:"primary",text:e.cropImage,priority:80,requires:{library:!1,selection:!1},click:function(){var a,b=this.controller;a=b.state().get("selection").first(),a.set({cropDetails:b.state().imgSelect.getSelection()}),this.$el.text(e.cropping),this.$el.attr("disabled",!0),b.state().doCrop(a).done(function(a){b.trigger("cropped",a),b.close()}).fail(function(){b.trigger("content:error:crop")})}}}},a&&_.extend(b.items,{skip:{style:"secondary",text:e.skipCropping,priority:70,requires:{library:!1,selection:!1},click:function(){var a=this.controller.state().get("selection").first();this.controller.state().cropperView.remove(),this.controller.trigger("skippedcrop",a),this.controller.close()}}}),this.frame.toolbar.set(new wp.media.view.Toolbar(b))},doCrop:function(a){return wp.ajax.post("custom-header-crop",{nonce:a.get("nonces").edit,id:a.get("id"),cropDetails:a.get("cropDetails")})}}),b.exports=d},{}],4:[function(a,b,c){var d,e=wp.media.controller;d=e.Cropper.extend({doCrop:function(a){var b=a.get("cropDetails"),c=this.get("control");return b.dst_width=c.params.width,b.dst_height=c.params.height,wp.ajax.post("crop-image",{wp_customize:"on",nonce:a.get("nonces").edit,id:a.get("id"),context:c.id,cropDetails:b})}}),b.exports=d},{}],5:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.controller.State.extend({defaults:{id:"edit-image",title:e.editImage,menu:!1,toolbar:"edit-image",content:"edit-image",url:""},activate:function(){this.listenTo(this.frame,"toolbar:render:edit-image",this.toolbar)},deactivate:function(){this.stopListening(this.frame)},toolbar:function(){var a=this.frame,b=a.lastState(),c=b&&b.id;a.toolbar.set(new wp.media.view.Toolbar({controller:a,items:{back:{style:"primary",text:e.back,priority:20,click:function(){c?a.setState(c):a.close()}}}}))}}),b.exports=d},{}],6:[function(a,b,c){var d,e=wp.media.view.l10n,f=Backbone.$;d=wp.media.controller.State.extend({defaults:{id:"embed",title:e.insertFromUrlTitle,content:"embed",menu:"default",toolbar:"main-embed",priority:120,type:"link",url:"",metadata:{}},sensitivity:400,initialize:function(a){this.metadata=a.metadata,this.debouncedScan=_.debounce(_.bind(this.scan,this),this.sensitivity),this.props=new Backbone.Model(this.metadata||{url:""}),this.props.on("change:url",this.debouncedScan,this),this.props.on("change:url",this.refresh,this),this.on("scan",this.scanImage,this)},scan:function(){var a,b=this,c={type:"link",scanners:[]};this.props.get("url")&&this.trigger("scan",c),c.scanners.length?(a=c.scanners=f.when.apply(f,c.scanners),a.always(function(){b.get("scanners")===a&&b.set("loading",!1)})):c.scanners=null,c.loading=!!c.scanners,this.set(c)},scanImage:function(a){var b=this.frame,c=this,d=this.props.get("url"),e=new Image,g=f.Deferred();a.scanners.push(g.promise()),e.onload=function(){g.resolve(),c===b.state()&&d===c.props.get("url")&&(c.set({type:"image"}),c.props.set({width:e.width,height:e.height}))},e.onerror=g.reject,e.src=d},refresh:function(){this.frame.toolbar.get().refresh()},reset:function(){this.props.clear().set({url:""}),this.active&&this.refresh()}}),b.exports=d},{}],7:[function(a,b,c){var d,e=wp.media.model.Attachment,f=wp.media.controller.Library,g=wp.media.view.l10n;d=f.extend({defaults:_.defaults({id:"featured-image",title:g.setFeaturedImageTitle,multiple:!1,filterable:"uploaded",toolbar:"featured-image",priority:60,syncSelection:!0},f.prototype.defaults),initialize:function(){var a,b;this.get("library")||this.set("library",wp.media.query({type:"image"})),f.prototype.initialize.apply(this,arguments),a=this.get("library"),b=a.comparator,a.comparator=function(a,c){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(c.cid);return!d&&e?-1:d&&!e?1:b.apply(this,arguments)},a.observe(this.get("selection"))},activate:function(){this.updateSelection(),this.frame.on("open",this.updateSelection,this),f.prototype.activate.apply(this,arguments)},deactivate:function(){this.frame.off("open",this.updateSelection,this),f.prototype.deactivate.apply(this,arguments)},updateSelection:function(){var a,b=this.get("selection"),c=wp.media.view.settings.post.featuredImageId;""!==c&&-1!==c&&(a=e.get(c),a.fetch()),b.reset(a?[a]:[])}}),b.exports=d},{}],8:[function(a,b,c){var d,e=wp.media.model.Selection,f=wp.media.controller.Library,g=wp.media.view.l10n;d=f.extend({defaults:_.defaults({id:"gallery-library",title:g.addToGalleryTitle,multiple:"add",filterable:"uploaded",menu:"gallery",toolbar:"gallery-add",priority:100,syncSelection:!1},f.prototype.defaults),initialize:function(){this.get("library")||this.set("library",wp.media.query({type:"image"})),f.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.frame.state("gallery-edit").get("library");this.editLibrary&&this.editLibrary!==b&&a.unobserve(this.editLibrary),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!b.get(a.cid)&&e.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(b),this.editLibrary=b,f.prototype.activate.apply(this,arguments)}}),b.exports=d},{}],9:[function(a,b,c){var d,e=wp.media.controller.Library,f=wp.media.view.l10n;d=e.extend({defaults:{id:"gallery-edit",title:f.editGalleryTitle,multiple:!1,searchable:!1,sortable:!0,date:!1,display:!1,content:"browse",toolbar:"gallery-edit",describe:!0,displaySettings:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,syncSelection:!1},initialize:function(){this.get("library")||this.set("library",new wp.media.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",wp.media.view.Attachment.EditLibrary),e.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type","image"),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.gallerySettings,this),e.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.gallerySettings,this),e.prototype.deactivate.apply(this,arguments)},gallerySettings:function(a){if(this.get("displaySettings")){var b=this.get("library");b&&a&&(b.gallery=b.gallery||new Backbone.Model,a.sidebar.set({gallery:new wp.media.view.Settings.Gallery({controller:this,model:b.gallery,priority:40})}),a.toolbar.set("reverse",{text:f.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}}),b.exports=d},{}],10:[function(a,b,c){var d,e=wp.media.controller.State,f=wp.media.controller.Library,g=wp.media.view.l10n;d=e.extend({defaults:_.defaults({id:"image-details",title:g.imageDetailsTitle,content:"image-details",menu:!1,router:!1,toolbar:"image-details",editing:!1,priority:60},f.prototype.defaults),initialize:function(a){this.image=a.image,e.prototype.initialize.apply(this,arguments)},activate:function(){this.frame.modal.$el.addClass("image-details")}}),b.exports=d},{}],11:[function(a,b,c){var d,e=wp.media.view.l10n,f=window.getUserSetting,g=window.setUserSetting;d=wp.media.controller.State.extend({defaults:{id:"library",title:e.mediaLibraryTitle,multiple:!1,content:"upload",menu:"default",router:"browse",toolbar:"select",searchable:!0,filterable:!1,sortable:!0,autoSelect:!0,describe:!1,contentUserSetting:!0,syncSelection:!0},initialize:function(){var a,b=this.get("selection");this.get("library")||this.set("library",wp.media.query()),b instanceof wp.media.model.Selection||(a=b,a||(a=this.get("library").props.toJSON(),a=_.omit(a,"orderby","query")),this.set("selection",new wp.media.model.Selection(null,{multiple:this.get("multiple"),props:a}))),this.resetDisplays()},activate:function(){this.syncSelection(),wp.Uploader.queue.on("add",this.uploading,this),this.get("selection").on("add remove reset",this.refreshContent,this),this.get("router")&&this.get("contentUserSetting")&&(this.frame.on("content:activate",this.saveContentMode,this),this.set("content",f("libraryContent",this.get("content"))))},deactivate:function(){this.recordSelection(),this.frame.off("content:activate",this.saveContentMode,this),this.get("selection").off(null,null,this),wp.Uploader.queue.off(null,null,this)},reset:function(){this.get("selection").reset(),this.resetDisplays(),this.refreshContent()},resetDisplays:function(){var a=wp.media.view.settings.defaultProps;this._displays=[],this._defaultDisplaySettings={align:a.align||f("align","none"),size:a.size||f("imgsize","medium"),link:a.link||f("urlbutton","file")}},display:function(a){var b=this._displays;return b[a.cid]||(b[a.cid]=new Backbone.Model(this.defaultDisplaySettings(a))),b[a.cid]},defaultDisplaySettings:function(a){var b=this._defaultDisplaySettings;return(b.canEmbed=this.canEmbed(a))&&(b.link="embed"),b},canEmbed:function(a){if(!a.get("uploading")){var b=a.get("type");if("audio"!==b&&"video"!==b)return!1}return _.contains(wp.media.view.settings.embedExts,a.get("filename").split(".").pop())},refreshContent:function(){var a=this.get("selection"),b=this.frame,c=b.router.get(),d=b.content.mode();this.active&&!a.length&&c&&!c.get(d)&&this.frame.content.render(this.get("content"))},uploading:function(a){var b=this.frame.content;"upload"===b.mode()&&this.frame.content.mode("browse"),this.get("autoSelect")&&(this.get("selection").add(a),this.frame.trigger("library:selection:add"))},saveContentMode:function(){if("browse"===this.get("router")){var a=this.frame.content.mode(),b=this.frame.router.get();b&&b.get(a)&&g("libraryContent",a)}}}),_.extend(d.prototype,wp.media.selectionSync),b.exports=d},{}],12:[function(a,b,c){var d,e=wp.media.controller.Library;d=e.extend({defaults:_.defaults({filterable:"uploaded",displaySettings:!1,priority:80,syncSelection:!1},e.prototype.defaults),initialize:function(a){this.media=a.media,this.type=a.type,this.set("library",wp.media.query({type:this.type})),e.prototype.initialize.apply(this,arguments)},activate:function(){wp.media.frame.lastMime&&(this.set("library",wp.media.query({type:wp.media.frame.lastMime})),delete wp.media.frame.lastMime),e.prototype.activate.apply(this,arguments)}}),b.exports=d},{}],13:[function(a,b,c){var d=function(a){_.extend(this,_.pick(a||{},"id","view","selector"))};d.extend=Backbone.Model.extend,_.extend(d.prototype,{mode:function(a){return a?a===this._mode?this:(this.trigger("deactivate"),this._mode=a,this.render(a),this.trigger("activate"),this):this._mode},render:function(a){if(a&&a!==this._mode)return this.mode(a);var b,c={view:null};return this.trigger("create",c),b=c.view,this.trigger("render",b),b&&this.set(b),this},get:function(){return this.view.views.first(this.selector)},set:function(a,b){return b&&(b.add=!1),this.view.views.set(this.selector,a,b)},trigger:function(a){var b,c;if(this._mode)return c=_.toArray(arguments),b=this.id+":"+a,c[0]=b+":"+this._mode,this.view.trigger.apply(this.view,c),c[0]=b,this.view.trigger.apply(this.view,c),this}}),b.exports=d},{}],14:[function(a,b,c){var d,e=wp.media.controller.Library,f=wp.media.view.l10n;d=e.extend({defaults:_.defaults({id:"replace-image",title:f.replaceImageTitle,multiple:!1,filterable:"uploaded",toolbar:"replace",menu:!1,priority:60,syncSelection:!0},e.prototype.defaults),initialize:function(a){var b,c;this.image=a.image,this.get("library")||this.set("library",wp.media.query({type:"image"})),e.prototype.initialize.apply(this,arguments),b=this.get("library"),c=b.comparator,b.comparator=function(a,b){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(b.cid);return!d&&e?-1:d&&!e?1:c.apply(this,arguments)},b.observe(this.get("selection"))},activate:function(){this.updateSelection(),e.prototype.activate.apply(this,arguments)},updateSelection:function(){var a=this.get("selection"),b=this.image.attachment;a.reset(b?[b]:[])}}),b.exports=d},{}],15:[function(a,b,c){var d,e=wp.media.controller;d=e.Cropper.extend({activate:function(){this.frame.on("content:create:crop",this.createCropContent,this),this.frame.on("close",this.removeCropper,this),this.set("selection",new Backbone.Collection(this.frame._selection.single))},createCropContent:function(){this.cropperView=new wp.media.view.SiteIconCropper({controller:this,attachment:this.get("selection").first()}),this.cropperView.on("image-loaded",this.createCropToolbar,this),this.frame.content.set(this.cropperView)},doCrop:function(a){var b=a.get("cropDetails"),c=this.get("control");return b.dst_width=c.params.width,b.dst_height=c.params.height,wp.ajax.post("crop-image",{nonce:a.get("nonces").edit,id:a.get("id"),context:"site-icon",cropDetails:b})}}),b.exports=d},{}],16:[function(a,b,c){var d=function(a){this.states=new Backbone.Collection(a)};d.extend=Backbone.Model.extend,_.extend(d.prototype,Backbone.Events,{state:function(a){return this.states=this.states||new Backbone.Collection,a=a||this._state,a&&!this.states.get(a)&&this.states.add({id:a}),this.states.get(a)},setState:function(a){var b=this.state();return b&&a===b.id||!this.states||!this.states.get(a)?this:(b&&(b.trigger("deactivate"),this._lastState=b.id),this._state=a,this.state().trigger("activate"),this)},lastState:function(){return this._lastState?this.state(this._lastState):void 0}}),_.each(["on","off","trigger"],function(a){d.prototype[a]=function(){return this.states=this.states||new Backbone.Collection,this.states[a].apply(this.states,arguments),this}}),b.exports=d},{}],17:[function(a,b,c){var d=Backbone.Model.extend({constructor:function(){this.on("activate",this._preActivate,this),this.on("activate",this.activate,this),this.on("activate",this._postActivate,this),this.on("deactivate",this._deactivate,this),this.on("deactivate",this.deactivate,this),this.on("reset",this.reset,this),this.on("ready",this._ready,this),this.on("ready",this.ready,this),Backbone.Model.apply(this,arguments),this.on("change:menu",this._updateMenu,this)},ready:function(){},activate:function(){},deactivate:function(){},reset:function(){},_ready:function(){this._updateMenu()},_preActivate:function(){this.active=!0},_postActivate:function(){this.on("change:menu",this._menu,this),this.on("change:titleMode",this._title,this),this.on("change:content",this._content,this),this.on("change:toolbar",this._toolbar,this),this.frame.on("title:render:default",this._renderTitle,this),this._title(),this._menu(),this._toolbar(),this._content(),this._router()},_deactivate:function(){this.active=!1,this.frame.off("title:render:default",this._renderTitle,this),this.off("change:menu",this._menu,this),this.off("change:titleMode",this._title,this),this.off("change:content",this._content,this),this.off("change:toolbar",this._toolbar,this)},_title:function(){this.frame.title.render(this.get("titleMode")||"default")},_renderTitle:function(a){a.$el.text(this.get("title")||"")},_router:function(){var a,b=this.frame.router,c=this.get("router");this.frame.$el.toggleClass("hide-router",!c),c&&(this.frame.router.render(c),a=b.get(),a&&a.select&&a.select(this.frame.content.mode()))},_menu:function(){var a,b=this.frame.menu,c=this.get("menu");this.frame.$el.toggleClass("hide-menu",!c),c&&(b.mode(c),a=b.get(),a&&a.select&&a.select(this.id))},_updateMenu:function(){var a=this.previous("menu"),b=this.get("menu");a&&this.frame.off("menu:render:"+a,this._renderMenu,this),b&&this.frame.on("menu:render:"+b,this._renderMenu,this)},_renderMenu:function(a){var b=this.get("menuItem"),c=this.get("title"),d=this.get("priority");!b&&c&&(b={text:c},d&&(b.priority=d)),b&&a.set(this.id,b)}});_.each(["toolbar","content"],function(a){d.prototype["_"+a]=function(){var b=this.get(a);b&&this.frame[a].render(b)}}),b.exports=d},{}],18:[function(a,b,c){var d={syncSelection:function(){var a=this.get("selection"),b=this.frame._selection;this.get("syncSelection")&&b&&a&&(a.multiple&&(a.reset([],{silent:!0}),a.validateAll(b.attachments),b.difference=_.difference(b.attachments.models,a.models)),a.single(b.single))},recordSelection:function(){var a=this.get("selection"),b=this.frame._selection;this.get("syncSelection")&&b&&a&&(a.multiple?(b.attachments.reset(a.toArray().concat(b.difference)),b.difference=[]):b.attachments.add(a.toArray()),b.single=a._single)}};b.exports=d},{}],19:[function(a,b,c){var d,e=wp.media,f=jQuery;e.isTouchDevice="ontouchend"in document,d=e.view.l10n=window._wpMediaViewsL10n||{},e.view.settings=d.settings||{},delete d.settings,e.model.settings.post=e.view.settings.post,f.support.transition=function(){var a,b=document.documentElement.style,c={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};return a=_.find(_.keys(c),function(a){return!_.isUndefined(b[a])}),a&&{end:c[a]}}(),e.events=_.extend({},Backbone.Events),e.transition=function(a,b){var c=f.Deferred();return b=b||2e3,f.support.transition?(a instanceof f||(a=f(a)),a.first().one(f.support.transition.end,c.resolve),_.delay(c.resolve,b)):c.resolve(),c.promise()},e.controller.Region=a("./controllers/region.js"),e.controller.StateMachine=a("./controllers/state-machine.js"),e.controller.State=a("./controllers/state.js"),e.selectionSync=a("./utils/selection-sync.js"),e.controller.Library=a("./controllers/library.js"),e.controller.ImageDetails=a("./controllers/image-details.js"),e.controller.GalleryEdit=a("./controllers/gallery-edit.js"),e.controller.GalleryAdd=a("./controllers/gallery-add.js"),e.controller.CollectionEdit=a("./controllers/collection-edit.js"),e.controller.CollectionAdd=a("./controllers/collection-add.js"),e.controller.FeaturedImage=a("./controllers/featured-image.js"),e.controller.ReplaceImage=a("./controllers/replace-image.js"),e.controller.EditImage=a("./controllers/edit-image.js"),e.controller.MediaLibrary=a("./controllers/media-library.js"),e.controller.Embed=a("./controllers/embed.js"),e.controller.Cropper=a("./controllers/cropper.js"),e.controller.CustomizeImageCropper=a("./controllers/customize-image-cropper.js"),e.controller.SiteIconCropper=a("./controllers/site-icon-cropper.js"),e.View=a("./views/view.js"),e.view.Frame=a("./views/frame.js"),e.view.MediaFrame=a("./views/media-frame.js"),e.view.MediaFrame.Select=a("./views/frame/select.js"),e.view.MediaFrame.Post=a("./views/frame/post.js"),e.view.MediaFrame.ImageDetails=a("./views/frame/image-details.js"),e.view.Modal=a("./views/modal.js"),e.view.FocusManager=a("./views/focus-manager.js"),e.view.UploaderWindow=a("./views/uploader/window.js"),e.view.EditorUploader=a("./views/uploader/editor.js"),e.view.UploaderInline=a("./views/uploader/inline.js"),e.view.UploaderStatus=a("./views/uploader/status.js"),e.view.UploaderStatusError=a("./views/uploader/status-error.js"),e.view.Toolbar=a("./views/toolbar.js"),e.view.Toolbar.Select=a("./views/toolbar/select.js"),e.view.Toolbar.Embed=a("./views/toolbar/embed.js"),e.view.Button=a("./views/button.js"),e.view.ButtonGroup=a("./views/button-group.js"),e.view.PriorityList=a("./views/priority-list.js"),e.view.MenuItem=a("./views/menu-item.js"),e.view.Menu=a("./views/menu.js"),e.view.RouterItem=a("./views/router-item.js"),e.view.Router=a("./views/router.js"),e.view.Sidebar=a("./views/sidebar.js"),e.view.Attachment=a("./views/attachment.js"),e.view.Attachment.Library=a("./views/attachment/library.js"),e.view.Attachment.EditLibrary=a("./views/attachment/edit-library.js"),e.view.Attachments=a("./views/attachments.js"),e.view.Search=a("./views/search.js"),e.view.AttachmentFilters=a("./views/attachment-filters.js"),e.view.DateFilter=a("./views/attachment-filters/date.js"),e.view.AttachmentFilters.Uploaded=a("./views/attachment-filters/uploaded.js"),e.view.AttachmentFilters.All=a("./views/attachment-filters/all.js"),e.view.AttachmentsBrowser=a("./views/attachments/browser.js"),e.view.Selection=a("./views/selection.js"),e.view.Attachment.Selection=a("./views/attachment/selection.js"),e.view.Attachments.Selection=a("./views/attachments/selection.js"),e.view.Attachment.EditSelection=a("./views/attachment/edit-selection.js"),e.view.Settings=a("./views/settings.js"),e.view.Settings.AttachmentDisplay=a("./views/settings/attachment-display.js"),e.view.Settings.Gallery=a("./views/settings/gallery.js"),e.view.Settings.Playlist=a("./views/settings/playlist.js"),e.view.Attachment.Details=a("./views/attachment/details.js"),e.view.AttachmentCompat=a("./views/attachment-compat.js"),e.view.Iframe=a("./views/iframe.js"),e.view.Embed=a("./views/embed.js"),e.view.Label=a("./views/label.js"),e.view.EmbedUrl=a("./views/embed/url.js"),e.view.EmbedLink=a("./views/embed/link.js"),e.view.EmbedImage=a("./views/embed/image.js"),e.view.ImageDetails=a("./views/image-details.js"),e.view.Cropper=a("./views/cropper.js"),e.view.SiteIconCropper=a("./views/site-icon-cropper.js"),e.view.SiteIconPreview=a("./views/site-icon-preview.js"),e.view.EditImage=a("./views/edit-image.js"),e.view.Spinner=a("./views/spinner.js")},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/customize-image-cropper.js":4,"./controllers/edit-image.js":5,"./controllers/embed.js":6,"./controllers/featured-image.js":7,"./controllers/gallery-add.js":8,"./controllers/gallery-edit.js":9,"./controllers/image-details.js":10,"./controllers/library.js":11,"./controllers/media-library.js":12,"./controllers/region.js":13,"./controllers/replace-image.js":14,"./controllers/site-icon-cropper.js":15,"./controllers/state-machine.js":16,"./controllers/state.js":17,"./utils/selection-sync.js":18,"./views/attachment-compat.js":20,"./views/attachment-filters.js":21,"./views/attachment-filters/all.js":22,"./views/attachment-filters/date.js":23,"./views/attachment-filters/uploaded.js":24,"./views/attachment.js":25,"./views/attachment/details.js":26,"./views/attachment/edit-library.js":27,"./views/attachment/edit-selection.js":28,"./views/attachment/library.js":29,"./views/attachment/selection.js":30,"./views/attachments.js":31,"./views/attachments/browser.js":32,"./views/attachments/selection.js":33,"./views/button-group.js":34,"./views/button.js":35,"./views/cropper.js":36,"./views/edit-image.js":37,"./views/embed.js":38,"./views/embed/image.js":39,"./views/embed/link.js":40,"./views/embed/url.js":41,"./views/focus-manager.js":42,"./views/frame.js":43,"./views/frame/image-details.js":44,"./views/frame/post.js":45,"./views/frame/select.js":46,"./views/iframe.js":47,"./views/image-details.js":48,"./views/label.js":49,"./views/media-frame.js":50,"./views/menu-item.js":51,"./views/menu.js":52,"./views/modal.js":53,"./views/priority-list.js":54,"./views/router-item.js":55,"./views/router.js":56,"./views/search.js":57,"./views/selection.js":58,"./views/settings.js":59,"./views/settings/attachment-display.js":60,"./views/settings/gallery.js":61,"./views/settings/playlist.js":62,"./views/sidebar.js":63,"./views/site-icon-cropper.js":64,"./views/site-icon-preview.js":65,"./views/spinner.js":66,"./views/toolbar.js":67,"./views/toolbar/embed.js":68,"./views/toolbar/select.js":69,"./views/uploader/editor.js":70,"./views/uploader/inline.js":71,"./views/uploader/status-error.js":72,"./views/uploader/status.js":73,"./views/uploader/window.js":74,"./views/view.js":75}],20:[function(a,b,c){var d,e=wp.media.View;d=e.extend({tagName:"form",className:"compat-item",events:{submit:"preventDefault","change input":"save","change select":"save","change textarea":"save"},initialize:function(){this.listenTo(this.model,"change:compat",this.render)},dispose:function(){return this.$(":focus").length&&this.save(),e.prototype.dispose.apply(this,arguments)},render:function(){var a=this.model.get("compat");if(a&&a.item)return this.views.detach(),this.$el.html(a.item),this.views.render(),this},preventDefault:function(a){a.preventDefault()},save:function(a){var b={};a&&a.preventDefault(),_.each(this.$el.serializeArray(),function(a){b[a.name]=a.value}),this.controller.trigger("attachment:compat:waiting",["waiting"]),this.model.saveCompat(b).always(_.bind(this.postSave,this))},postSave:function(){this.controller.trigger("attachment:compat:ready",["ready"])}}),b.exports=d},{}],21:[function(a,b,c){var d,e=jQuery;d=wp.media.View.extend({tagName:"select",className:"attachment-filters",id:"media-attachment-filters",events:{change:"change"},keys:[],initialize:function(){this.createFilters(),_.extend(this.filters,this.options.filters),this.$el.html(_.chain(this.filters).map(function(a,b){return{el:e("<option></option>").val(b).html(a.text)[0],priority:a.priority||50}},this).sortBy("priority").pluck("el").value()),this.listenTo(this.model,"change",this.select),this.select()},createFilters:function(){this.filters={}},change:function(){var a=this.filters[this.el.value];a&&this.model.set(a.props)},select:function(){var a=this.model,b="all",c=a.toJSON();_.find(this.filters,function(a,d){var e=_.all(a.props,function(a,b){return a===(_.isUndefined(c[b])?null:c[b])});return e?b=d:void 0}),this.$el.val(b)}}),b.exports=d},{}],22:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.view.AttachmentFilters.extend({createFilters:function(){var a={};_.each(wp.media.view.settings.mimeTypes||{},function(b,c){a[c]={text:b,props:{status:null,type:c,uploadedTo:null,orderby:"date",order:"DESC"}}}),a.all={text:e.allMediaItems,props:{status:null,type:null,uploadedTo:null,orderby:"date",order:"DESC"},priority:10},wp.media.view.settings.post.id&&(a.uploaded={text:e.uploadedToThisPost,props:{status:null,type:null,uploadedTo:wp.media.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20}),a.unattached={text:e.unattached,props:{status:null,uploadedTo:0,type:null,orderby:"menuOrder",order:"ASC"},priority:50},wp.media.view.settings.mediaTrash&&this.controller.isModeActive("grid")&&(a.trash={text:e.trash,props:{uploadedTo:null,status:"trash",type:null,orderby:"date",order:"DESC"},priority:50}),this.filters=a}}),b.exports=d},{}],23:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.view.AttachmentFilters.extend({id:"media-attachment-date-filters",createFilters:function(){var a={};_.each(wp.media.view.settings.months||{},function(b,c){a[c]={text:b.text,props:{year:b.year,monthnum:b.month}}}),a.all={text:e.allDates,props:{monthnum:!1,year:!1},priority:10},this.filters=a}}),b.exports=d},{}],24:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.view.AttachmentFilters.extend({createFilters:function(){var a,b=this.model.get("type"),c=wp.media.view.settings.mimeTypes;c&&b&&(a=c[b]),this.filters={all:{text:a||e.allMediaItems,props:{uploadedTo:null,orderby:"date",order:"DESC"},priority:10},uploaded:{text:e.uploadedToThisPost,props:{uploadedTo:wp.media.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20},unattached:{text:e.unattached,props:{uploadedTo:0,orderby:"menuOrder",order:"ASC"},priority:50}}}}),b.exports=d},{}],25:[function(a,b,c){var d,e=wp.media.View,f=jQuery;d=e.extend({tagName:"li",className:"attachment",template:wp.template("attachment"),attributes:function(){return{tabIndex:0,role:"checkbox","aria-label":this.model.get("title"),"aria-checked":!1,"data-id":this.model.get("id")}},events:{"click .js--select-attachment":"toggleSelectionHandler","change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .attachment-close":"removeFromLibrary","click .check":"checkClickHandler",keydown:"toggleSelectionHandler"},buttons:{},initialize:function(){var a=this.options.selection,b=_.defaults(this.options,{rerenderOnModelChange:!0});b.rerenderOnModelChange?this.listenTo(this.model,"change",this.render):this.listenTo(this.model,"change:percent",this.progress),this.listenTo(this.model,"change:title",this._syncTitle),this.listenTo(this.model,"change:caption",this._syncCaption),this.listenTo(this.model,"change:artist",this._syncArtist),this.listenTo(this.model,"change:album",this._syncAlbum),this.listenTo(this.model,"add",this.select),this.listenTo(this.model,"remove",this.deselect),a&&(a.on("reset",this.updateSelect,this),this.listenTo(this.model,"selection:single selection:unsingle",this.details),this.details(this.model,this.controller.state().get("selection"))),this.listenTo(this.controller,"attachment:compat:waiting attachment:compat:ready",this.updateSave)},dispose:function(){var a=this.options.selection;return this.updateAll(),a&&a.off(null,null,this),
+e.prototype.dispose.apply(this,arguments),this},render:function(){var a=_.defaults(this.model.toJSON(),{orientation:"landscape",uploading:!1,type:"",subtype:"",icon:"",filename:"",caption:"",title:"",dateFormatted:"",width:"",height:"",compat:!1,alt:"",description:""},this.options);return a.buttons=this.buttons,a.describe=this.controller.state().get("describe"),"image"===a.type&&(a.size=this.imageSize()),a.can={},a.nonces&&(a.can.remove=!!a.nonces["delete"],a.can.save=!!a.nonces.update),this.controller.state().get("allowLocalEdits")&&(a.allowLocalEdits=!0),a.uploading&&!a.percent&&(a.percent=0),this.views.detach(),this.$el.html(this.template(a)),this.$el.toggleClass("uploading",a.uploading),a.uploading?this.$bar=this.$(".media-progress-bar div"):delete this.$bar,this.updateSelect(),this.updateSave(),this.views.render(),this},progress:function(){this.$bar&&this.$bar.length&&this.$bar.width(this.model.get("percent")+"%")},toggleSelectionHandler:function(a){var b;if("INPUT"!==a.target.nodeName&&"BUTTON"!==a.target.nodeName){if(37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode)return void this.controller.trigger("attachment:keydown:arrow",a);if("keydown"!==a.type||13===a.keyCode||32===a.keyCode){if(a.preventDefault(),this.controller.isModeActive("grid")){if(this.controller.isModeActive("edit"))return void this.controller.trigger("edit:attachment",this.model,a.currentTarget);this.controller.isModeActive("select")&&(b="toggle")}a.shiftKey?b="between":(a.ctrlKey||a.metaKey)&&(b="toggle"),this.toggleSelection({method:b}),this.controller.trigger("selection:toggle")}}},toggleSelection:function(a){var b,c,d,e,f=this.collection,g=this.options.selection,h=this.model,i=a&&a.method;if(g){if(b=g.single(),i=_.isUndefined(i)?g.multiple:i,"between"===i&&b&&g.multiple){if(b===h)return;return d=f.indexOf(b),e=f.indexOf(this.model),c=e>d?f.models.slice(d,e+1):f.models.slice(e,d+1),g.add(c),void g.single(h)}if("toggle"===i)return g[this.selected()?"remove":"add"](h),void g.single(h);if("add"===i)return g.add(h),void g.single(h);i||(i="add"),"add"!==i&&(i="reset"),this.selected()?g[b===h?"remove":"single"](h):(g[i](h),g.single(h))}},updateSelect:function(){this[this.selected()?"select":"deselect"]()},selected:function(){var a=this.options.selection;return a?!!a.get(this.model.cid):void 0},select:function(a,b){var c=this.options.selection,d=this.controller;!c||b&&b!==c||this.$el.hasClass("selected")||(this.$el.addClass("selected").attr("aria-checked",!0),d.isModeActive("grid")&&d.isModeActive("select")||this.$(".check").attr("tabindex","0"))},deselect:function(a,b){var c=this.options.selection;!c||b&&b!==c||this.$el.removeClass("selected").attr("aria-checked",!1).find(".check").attr("tabindex","-1")},details:function(a,b){var c,d=this.options.selection;d===b&&(c=d.single(),this.$el.toggleClass("details",c===this.model))},imageSize:function(a){var b=this.model.get("sizes"),c=!1;return a=a||"medium",b&&(b[a]?c=b[a]:b.large?c=b.large:b.thumbnail?c=b.thumbnail:b.full&&(c=b.full),c)?_.clone(c):{url:this.model.get("url"),width:this.model.get("width"),height:this.model.get("height"),orientation:this.model.get("orientation")}},updateSetting:function(a){var b,c,d=f(a.target).closest("[data-setting]");d.length&&(b=d.data("setting"),c=a.target.value,this.model.get(b)!==c&&this.save(b,c))},save:function(){var a=this,b=this._save=this._save||{status:"ready"},c=this.model.save.apply(this.model,arguments),d=b.requests?f.when(c,b.requests):c;b.savedTimer&&clearTimeout(b.savedTimer),this.updateSave("waiting"),b.requests=d,d.always(function(){b.requests===d&&(a.updateSave("resolved"===d.state()?"complete":"error"),b.savedTimer=setTimeout(function(){a.updateSave("ready"),delete b.savedTimer},2e3))})},updateSave:function(a){var b=this._save=this._save||{status:"ready"};return a&&a!==b.status&&(this.$el.removeClass("save-"+b.status),b.status=a),this.$el.addClass("save-"+b.status),this},updateAll:function(){var a,b=this.$("[data-setting]"),c=this.model;a=_.chain(b).map(function(a){var b,d,e=f("input, textarea, select, [value]",a);if(e.length)return b=f(a).data("setting"),d=e.val(),c.get(b)!==d?[b,d]:void 0}).compact().object().value(),_.isEmpty(a)||c.save(a)},removeFromLibrary:function(a){("keydown"!==a.type||13===a.keyCode||32===a.keyCode)&&(a.stopPropagation(),this.collection.remove(this.model))},checkClickHandler:function(a){var b=this.options.selection;b&&(a.stopPropagation(),b.where({id:this.model.get("id")}).length?(b.remove(this.model),this.$el.focus()):b.add(this.model))}}),_.each({caption:"_syncCaption",title:"_syncTitle",artist:"_syncArtist",album:"_syncAlbum"},function(a,b){d.prototype[a]=function(a,c){var d=this.$('[data-setting="'+b+'"]');return d.length?c===d.find("input, textarea, select, [value]").val()?this:this.render():this}}),b.exports=d},{}],26:[function(a,b,c){var d,e=wp.media.view.Attachment,f=wp.media.view.l10n;d=e.extend({tagName:"div",className:"attachment-details",template:wp.template("attachment-details"),attributes:function(){return{tabIndex:0,"data-id":this.model.get("id")}},events:{"change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .delete-attachment":"deleteAttachment","click .trash-attachment":"trashAttachment","click .untrash-attachment":"untrashAttachment","click .edit-attachment":"editAttachment",keydown:"toggleSelectionHandler"},initialize:function(){this.options=_.defaults(this.options,{rerenderOnModelChange:!1}),this.on("ready",this.initialFocus),e.prototype.initialize.apply(this,arguments)},initialFocus:function(){wp.media.isTouchDevice||this.$('input[type="text"]').eq(0).focus()},deleteAttachment:function(a){a.preventDefault(),window.confirm(f.warnDelete)&&(this.model.destroy(),this.controller.modal.focusManager.focus())},trashAttachment:function(a){var b=this.controller.library;a.preventDefault(),wp.media.view.settings.mediaTrash&&"edit-metadata"===this.controller.content.mode()?(this.model.set("status","trash"),this.model.save().done(function(){b._requery(!0)})):this.model.destroy()},untrashAttachment:function(a){var b=this.controller.library;a.preventDefault(),this.model.set("status","inherit"),this.model.save().done(function(){b._requery(!0)})},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b?(a.preventDefault(),b.set("image",this.model),this.controller.setState("edit-image")):this.$el.addClass("needs-refresh")},toggleSelectionHandler:function(a){return"keydown"===a.type&&9===a.keyCode&&a.shiftKey&&a.target===this.$(":tabbable").get(0)?(this.controller.trigger("attachment:details:shift-tab",a),!1):37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode?void this.controller.trigger("attachment:keydown:arrow",a):void 0}}),b.exports=d},{}],27:[function(a,b,c){var d=wp.media.view.Attachment.extend({buttons:{close:!0}});b.exports=d},{}],28:[function(a,b,c){var d=wp.media.view.Attachment.Selection.extend({buttons:{close:!0}});b.exports=d},{}],29:[function(a,b,c){var d=wp.media.view.Attachment.extend({buttons:{check:!0}});b.exports=d},{}],30:[function(a,b,c){var d=wp.media.view.Attachment.extend({className:"attachment selection",toggleSelection:function(){this.options.selection.single(this.model)}});b.exports=d},{}],31:[function(a,b,c){var d,e=wp.media.View,f=jQuery;d=e.extend({tagName:"ul",className:"attachments",attributes:{tabIndex:-1},initialize:function(){this.el.id=_.uniqueId("__attachments-view-"),_.defaults(this.options,{refreshSensitivity:wp.media.isTouchDevice?300:200,refreshThreshold:3,AttachmentView:wp.media.view.Attachment,sortable:!1,resize:!0,idealColumnWidth:f(window).width()<640?135:150}),this._viewsByCid={},this.$window=f(window),this.resizeEvent="resize.media-modal-columns",this.collection.on("add",function(a){this.views.add(this.createAttachmentView(a),{at:this.collection.indexOf(a)})},this),this.collection.on("remove",function(a){var b=this._viewsByCid[a.cid];delete this._viewsByCid[a.cid],b&&b.remove()},this),this.collection.on("reset",this.render,this),this.listenTo(this.controller,"library:selection:add",this.attachmentFocus),this.scroll=_.chain(this.scroll).bind(this).throttle(this.options.refreshSensitivity).value(),this.options.scrollElement=this.options.scrollElement||this.el,f(this.options.scrollElement).on("scroll",this.scroll),this.initSortable(),_.bindAll(this,"setColumns"),this.options.resize&&(this.on("ready",this.bindEvents),this.controller.on("open",this.setColumns),_.defer(this.setColumns,this))},bindEvents:function(){this.$window.off(this.resizeEvent).on(this.resizeEvent,_.debounce(this.setColumns,50))},attachmentFocus:function(){this.$("li:first").focus()},restoreFocus:function(){this.$("li.selected:first").focus()},arrowEvent:function(a){var b=this.$el.children("li"),c=this.columns,d=b.filter(":focus").index(),e=c>=d+1?1:Math.ceil((d+1)/c);if(-1!==d){if(37===a.keyCode){if(0===d)return;b.eq(d-1).focus()}if(38===a.keyCode){if(1===e)return;b.eq(d-c).focus()}if(39===a.keyCode){if(b.length===d)return;b.eq(d+1).focus()}if(40===a.keyCode){if(Math.ceil(b.length/c)===e)return;b.eq(d+c).focus()}}},dispose:function(){this.collection.props.off(null,null,this),this.options.resize&&this.$window.off(this.resizeEvent),e.prototype.dispose.apply(this,arguments)},setColumns:function(){var a=this.columns,b=this.$el.width();b&&(this.columns=Math.min(Math.round(b/this.options.idealColumnWidth),12)||1,a&&a===this.columns||this.$el.closest(".media-frame-content").attr("data-columns",this.columns))},initSortable:function(){var a=this.collection;!wp.media.isTouchDevice&&this.options.sortable&&f.fn.sortable&&(this.$el.sortable(_.extend({disabled:!!a.comparator,tolerance:"pointer",start:function(a,b){b.item.data("sortableIndexStart",b.item.index())},update:function(b,c){var d=a.at(c.item.data("sortableIndexStart")),e=a.comparator;delete a.comparator,a.remove(d,{silent:!0}),a.add(d,{silent:!0,at:c.item.index()}),a.comparator=e,a.trigger("reset",a),a.saveMenuOrder()}},this.options.sortable)),a.props.on("change:orderby",function(){this.$el.sortable("option","disabled",!!a.comparator)},this),this.collection.props.on("change:orderby",this.refreshSortable,this),this.refreshSortable())},refreshSortable:function(){if(!wp.media.isTouchDevice&&this.options.sortable&&f.fn.sortable){var a=this.collection,b=a.props.get("orderby"),c="menuOrder"===b||!a.comparator;this.$el.sortable("option","disabled",!c)}},createAttachmentView:function(a){var b=new this.options.AttachmentView({controller:this.controller,model:a,collection:this.collection,selection:this.options.selection});return this._viewsByCid[a.cid]=b},prepare:function(){this.collection.length?this.views.set(this.collection.map(this.createAttachmentView,this)):(this.views.unset(),this.collection.more().done(this.scroll))},ready:function(){this.scroll()},scroll:function(){var a,b=this,c=this.options.scrollElement,d=c.scrollTop;c===document&&(c=document.body,d=f(document).scrollTop()),f(c).is(":visible")&&this.collection.hasMore()&&(a=this.views.parent.toolbar,c.scrollHeight-(d+c.clientHeight)<c.clientHeight/3&&a.get("spinner").show(),c.scrollHeight<d+c.clientHeight*this.options.refreshThreshold&&this.collection.more().done(function(){b.scroll(),a.get("spinner").hide()}))}}),b.exports=d},{}],32:[function(a,b,c){var d,e=wp.media.View,f=wp.media.view.settings.mediaTrash,g=wp.media.view.l10n,h=jQuery;d=e.extend({tagName:"div",className:"attachments-browser",initialize:function(){_.defaults(this.options,{filters:!1,search:!0,date:!0,display:!1,sidebar:!0,AttachmentView:wp.media.view.Attachment.Library}),this.listenTo(this.controller,"toggle:upload:attachment",_.bind(this.toggleUploader,this)),this.controller.on("edit:selection",this.editSelection),this.createToolbar(),this.options.sidebar&&this.createSidebar(),this.createUploader(),this.createAttachments(),this.updateContent(),this.options.sidebar&&"errors"!==this.options.sidebar||(this.$el.addClass("hide-sidebar"),"errors"===this.options.sidebar&&this.$el.addClass("sidebar-for-errors")),this.collection.on("add remove reset",this.updateContent,this)},editSelection:function(a){a.$(".media-button-backToLibrary").focus()},dispose:function(){return this.options.selection.off(null,null,this),e.prototype.dispose.apply(this,arguments),this},createToolbar:function(){var a,b,c;c={controller:this.controller},this.controller.isModeActive("grid")&&(c.className="media-toolbar wp-filter"),this.toolbar=new wp.media.view.Toolbar(c),this.views.add(this.toolbar),this.toolbar.set("spinner",new wp.media.view.Spinner({priority:-60})),-1!==h.inArray(this.options.filters,["uploaded","all"])&&(this.toolbar.set("filtersLabel",new wp.media.view.Label({value:g.filterByType,attributes:{"for":"media-attachment-filters"},priority:-80}).render()),"uploaded"===this.options.filters?this.toolbar.set("filters",new wp.media.view.AttachmentFilters.Uploaded({controller:this.controller,model:this.collection.props,priority:-80}).render()):(b=new wp.media.view.AttachmentFilters.All({controller:this.controller,model:this.collection.props,priority:-80}),this.toolbar.set("filters",b.render()))),this.controller.isModeActive("grid")?(a=e.extend({className:"view-switch media-grid-view-switch",template:wp.template("media-library-view-switcher")}),this.toolbar.set("libraryViewSwitcher",new a({controller:this.controller,priority:-90}).render()),this.toolbar.set("dateFilterLabel",new wp.media.view.Label({value:g.filterByDate,attributes:{"for":"media-attachment-date-filters"},priority:-75}).render()),this.toolbar.set("dateFilter",new wp.media.view.DateFilter({controller:this.controller,model:this.collection.props,priority:-75}).render()),this.toolbar.set("selectModeToggleButton",new wp.media.view.SelectModeToggleButton({text:g.bulkSelect,controller:this.controller,priority:-70}).render()),this.toolbar.set("deleteSelectedButton",new wp.media.view.DeleteSelectedButton({filters:b,style:"primary",disabled:!0,text:f?g.trashSelected:g.deleteSelected,controller:this.controller,priority:-60,click:function(){var a=[],b=[],c=this.controller.state().get("selection"),d=this.controller.state().get("library");c.length&&(f||window.confirm(g.warnBulkDelete))&&(!f||"trash"===c.at(0).get("status")||window.confirm(g.warnBulkTrash))&&(c.each(function(c){return c.get("nonces")["delete"]?void(f&&"trash"===c.get("status")?(c.set("status","inherit"),a.push(c.save()),b.push(c)):f?(c.set("status","trash"),a.push(c.save()),b.push(c)):c.destroy({wait:!0})):void b.push(c)}),a.length?(c.remove(b),h.when.apply(null,a).then(_.bind(function(){d._requery(!0),this.controller.trigger("selection:action:done")},this))):this.controller.trigger("selection:action:done"))}}).render()),f&&this.toolbar.set("deleteSelectedPermanentlyButton",new wp.media.view.DeleteSelectedPermanentlyButton({filters:b,style:"primary",disabled:!0,text:g.deleteSelected,controller:this.controller,priority:-55,click:function(){var a=[],b=this.controller.state().get("selection");b.length&&window.confirm(g.warnBulkDelete)&&(b.each(function(b){return b.get("nonces")["delete"]?void b.destroy():void a.push(b)}),b.remove(a),this.controller.trigger("selection:action:done"))}}).render())):this.options.date&&(this.toolbar.set("dateFilterLabel",new wp.media.view.Label({value:g.filterByDate,attributes:{"for":"media-attachment-date-filters"},priority:-75}).render()),this.toolbar.set("dateFilter",new wp.media.view.DateFilter({controller:this.controller,model:this.collection.props,priority:-75}).render())),this.options.search&&(this.toolbar.set("searchLabel",new wp.media.view.Label({value:g.searchMediaLabel,attributes:{"for":"media-search-input"},priority:60}).render()),this.toolbar.set("search",new wp.media.view.Search({controller:this.controller,model:this.collection.props,priority:60}).render())),this.options.dragInfo&&this.toolbar.set("dragInfo",new e({el:h('<div class="instructions">'+g.dragInfo+"</div>")[0],priority:-40})),this.options.suggestedWidth&&this.options.suggestedHeight&&this.toolbar.set("suggestedDimensions",new e({el:h('<div class="instructions">'+g.suggestedDimensions+" "+this.options.suggestedWidth+" &times; "+this.options.suggestedHeight+"</div>")[0],priority:-40}))},updateContent:function(){var a,b=this;a=this.controller.isModeActive("grid")?b.attachmentsNoResults:b.uploader,this.collection.length?(a.$el.addClass("hidden"),b.toolbar.get("spinner").hide()):(this.toolbar.get("spinner").show(),this.dfd=this.collection.more().done(function(){b.collection.length?a.$el.addClass("hidden"):a.$el.removeClass("hidden"),b.toolbar.get("spinner").hide()}))},createUploader:function(){this.uploader=new wp.media.view.UploaderInline({controller:this.controller,status:!1,message:this.controller.isModeActive("grid")?"":g.noItemsFound,canClose:this.controller.isModeActive("grid")}),this.uploader.hide(),this.views.add(this.uploader)},toggleUploader:function(){this.uploader.$el.hasClass("hidden")?this.uploader.show():this.uploader.hide()},createAttachments:function(){this.attachments=new wp.media.view.Attachments({controller:this.controller,collection:this.collection,selection:this.options.selection,model:this.model,sortable:this.options.sortable,scrollElement:this.options.scrollElement,idealColumnWidth:this.options.idealColumnWidth,AttachmentView:this.options.AttachmentView}),this.attachments.listenTo(this.controller,"attachment:keydown:arrow",this.attachments.arrowEvent),this.attachments.listenTo(this.controller,"attachment:details:shift-tab",this.attachments.restoreFocus),this.views.add(this.attachments),this.controller.isModeActive("grid")&&(this.attachmentsNoResults=new e({controller:this.controller,tagName:"p"}),this.attachmentsNoResults.$el.addClass("hidden no-media"),this.attachmentsNoResults.$el.html(g.noMedia),this.views.add(this.attachmentsNoResults))},createSidebar:function(){var a=this.options,b=a.selection,c=this.sidebar=new wp.media.view.Sidebar({controller:this.controller});this.views.add(c),this.controller.uploader&&c.set("uploads",new wp.media.view.UploaderStatus({controller:this.controller,priority:40})),b.on("selection:single",this.createSingle,this),b.on("selection:unsingle",this.disposeSingle,this),b.single()&&this.createSingle()},createSingle:function(){var a=this.sidebar,b=this.options.selection.single();a.set("details",new wp.media.view.Attachment.Details({controller:this.controller,model:b,priority:80})),a.set("compat",new wp.media.view.AttachmentCompat({controller:this.controller,model:b,priority:120})),this.options.display&&a.set("display",new wp.media.view.Settings.AttachmentDisplay({controller:this.controller,model:this.model.display(b),attachment:b,priority:160,userSettings:this.model.get("displayUserSettings")})),"insert"===this.model.id&&a.$el.addClass("visible")},disposeSingle:function(){var a=this.sidebar;a.unset("details"),a.unset("compat"),a.unset("display"),a.$el.removeClass("visible")}}),b.exports=d},{}],33:[function(a,b,c){var d,e=wp.media.view.Attachments;d=e.extend({events:{},initialize:function(){return _.defaults(this.options,{sortable:!1,resize:!1,AttachmentView:wp.media.view.Attachment.Selection}),e.prototype.initialize.apply(this,arguments)}}),b.exports=d},{}],34:[function(a,b,c){var d,e=Backbone.$;d=wp.media.View.extend({tagName:"div",className:"button-group button-large media-button-group",initialize:function(){this.buttons=_.map(this.options.buttons||[],function(a){return a instanceof Backbone.View?a:new wp.media.view.Button(a).render()}),delete this.options.buttons,this.options.classes&&this.$el.addClass(this.options.classes)},render:function(){return this.$el.html(e(_.pluck(this.buttons,"el")).detach()),this}}),b.exports=d},{}],35:[function(a,b,c){var d=wp.media.View.extend({tagName:"button",className:"media-button",attributes:{type:"button"},events:{click:"click"},defaults:{text:"",style:"",size:"large",disabled:!1},initialize:function(){this.model=new Backbone.Model(this.defaults),_.each(this.defaults,function(a,b){var c=this.options[b];_.isUndefined(c)||(this.model.set(b,c),delete this.options[b])},this),this.listenTo(this.model,"change",this.render)},render:function(){var a=["button",this.className],b=this.model.toJSON();return b.style&&a.push("button-"+b.style),b.size&&a.push("button-"+b.size),a=_.uniq(a.concat(this.options.classes)),this.el.className=a.join(" "),this.$el.attr("disabled",b.disabled),this.$el.text(this.model.get("text")),this},click:function(a){"#"===this.attributes.href&&a.preventDefault(),this.options.click&&!this.model.get("disabled")&&this.options.click.apply(this,arguments)}});b.exports=d},{}],36:[function(a,b,c){var d,e=wp.media.View,f=wp.media.view.UploaderStatus,g=wp.media.view.l10n,h=jQuery;d=e.extend({className:"crop-content",template:wp.template("crop-content"),initialize:function(){_.bindAll(this,"onImageLoad")},ready:function(){this.controller.frame.on("content:error:crop",this.onError,this),this.$image=this.$el.find(".crop-image"),this.$image.on("load",this.onImageLoad),h(window).on("resize.cropper",_.debounce(this.onImageLoad,250))},remove:function(){h(window).off("resize.cropper"),this.$el.remove(),this.$el.off(),e.prototype.remove.apply(this,arguments)},prepare:function(){return{title:g.cropYourImage,url:this.options.attachment.get("url")}},onImageLoad:function(){var a=this.controller.get("imgSelectOptions");"function"==typeof a&&(a=a(this.options.attachment,this.controller)),a=_.extend(a,{parent:this.$el}),this.trigger("image-loaded"),this.controller.imgSelect=this.$image.imgAreaSelect(a)},onError:function(){var a=this.options.attachment.get("filename");this.views.add(".upload-errors",new wp.media.view.UploaderStatusError({filename:f.prototype.filename(a),message:window._wpMediaViewsL10n.cropError}),{at:0})}}),b.exports=d},{}],37:[function(a,b,c){var d,e=wp.media.View;d=e.extend({className:"image-editor",template:wp.template("image-editor"),initialize:function(a){this.editor=window.imageEdit,this.controller=a.controller,e.prototype.initialize.apply(this,arguments)},prepare:function(){return this.model.toJSON()},loadEditor:function(){var a=this.editor.open(this.model.get("id"),this.model.get("nonces").edit,this);a.done(_.bind(this.focus,this))},focus:function(){this.$(".imgedit-submit .button").eq(0).focus()},back:function(){var a=this.controller.lastState();this.controller.setState(a)},refresh:function(){this.model.fetch()},save:function(){var a=this.controller.lastState();this.model.fetch().done(_.bind(function(){this.controller.setState(a)},this))}}),b.exports=d},{}],38:[function(a,b,c){var d=wp.media.View.extend({className:"media-embed",initialize:function(){this.url=new wp.media.view.EmbedUrl({controller:this.controller,model:this.model.props}).render(),this.views.set([this.url]),this.refresh(),this.listenTo(this.model,"change:type",this.refresh),this.listenTo(this.model,"change:loading",this.loading)},settings:function(a){this._settings&&this._settings.remove(),this._settings=a,this.views.add(a)},refresh:function(){var a,b=this.model.get("type");if("image"===b)a=wp.media.view.EmbedImage;else{if("link"!==b)return;a=wp.media.view.EmbedLink}this.settings(new a({controller:this.controller,model:this.model.props,priority:40}))},loading:function(){this.$el.toggleClass("embed-loading",this.model.get("loading"))}});b.exports=d},{}],39:[function(a,b,c){var d,e=wp.media.view.Settings.AttachmentDisplay;d=e.extend({className:"embed-media-settings",template:wp.template("embed-image-settings"),initialize:function(){e.prototype.initialize.apply(this,arguments),this.listenTo(this.model,"change:url",this.updateImage)},updateImage:function(){this.$("img").attr("src",this.model.get("url"))}}),b.exports=d},{}],40:[function(a,b,c){var d,e=jQuery;d=wp.media.view.Settings.extend({className:"embed-link-settings",template:wp.template("embed-link-settings"),initialize:function(){this.listenTo(this.model,"change:url",this.updateoEmbed)},updateoEmbed:_.debounce(function(){var a=this.model.get("url");this.$(".embed-container").hide().find(".embed-preview").empty(),this.$(".setting").hide(),a&&(a.length<11||!a.match(/^http(s)?:\/\//))||this.fetch()},wp.media.controller.Embed.sensitivity),fetch:function(){var a;e("#embed-url-field").val()===this.model.get("url")&&(this.dfd&&"pending"===this.dfd.state()&&this.dfd.abort(),a=new wp.shortcode({tag:"embed",attrs:_.pick(this.model.attributes,["width","height","src"]),content:this.model.get("url")}),this.dfd=e.ajax({type:"POST",url:wp.ajax.settings.url,context:this,data:{action:"parse-embed",post_ID:wp.media.view.settings.post.id,shortcode:a.string()}}).done(this.renderoEmbed).fail(this.renderFail))},renderFail:function(a,b){"abort"!==b&&this.$(".link-text").show()},renderoEmbed:function(a){var b=a&&a.data&&a.data.body||"";b?this.$(".embed-container").show().find(".embed-preview").html(b):this.renderFail()}}),b.exports=d},{}],41:[function(a,b,c){var d,e=wp.media.View,f=jQuery;d=e.extend({tagName:"label",className:"embed-url",events:{input:"url",keyup:"url",change:"url"},initialize:function(){this.$input=f('<input id="embed-url-field" type="url" />').val(this.model.get("url")),this.input=this.$input[0],this.spinner=f('<span class="spinner" />')[0],this.$el.append([this.input,this.spinner]),this.listenTo(this.model,"change:url",this.render),this.model.get("url")&&_.delay(_.bind(function(){this.model.trigger("change:url")},this),500)},render:function(){var a=this.$input;if(!a.is(":focus"))return this.input.value=this.model.get("url")||"http://",e.prototype.render.apply(this,arguments),this},ready:function(){wp.media.isTouchDevice||this.focus()},url:function(a){this.model.set("url",a.target.value)},focus:function(){var a=this.$input;a.is(":visible")&&a.focus()[0].select()}}),b.exports=d},{}],42:[function(a,b,c){var d=wp.media.View.extend({events:{keydown:"constrainTabbing"},focus:function(){this.$(".media-menu-item").first().focus()},constrainTabbing:function(a){var b;if(9===a.keyCode)return b=this.$(":tabbable").not('.moxie-shim input[type="file"]'),b.last()[0]!==a.target||a.shiftKey?b.first()[0]===a.target&&a.shiftKey?(b.last().focus(),!1):void 0:(b.first().focus(),!1)}});b.exports=d},{}],43:[function(a,b,c){var d=wp.media.View.extend({initialize:function(){_.defaults(this.options,{mode:["select"]}),this._createRegions(),this._createStates(),this._createModes()},_createRegions:function(){this.regions=this.regions?this.regions.slice():[],_.each(this.regions,function(a){this[a]=new wp.media.controller.Region({view:this,id:a,selector:".media-frame-"+a})},this)},_createStates:function(){this.states=new Backbone.Collection(null,{model:wp.media.controller.State}),this.states.on("add",function(a){a.frame=this,a.trigger("ready")},this),this.options.states&&this.states.add(this.options.states)},_createModes:function(){this.activeModes=new Backbone.Collection,this.activeModes.on("add remove reset",_.bind(this.triggerModeEvents,this)),_.each(this.options.mode,function(a){this.activateMode(a)},this)},reset:function(){return this.states.invoke("trigger","reset"),this},triggerModeEvents:function(a,b,c){var d,e,f={add:"activate",remove:"deactivate"};_.each(c,function(a,b){a&&(d=b)}),_.has(f,d)&&(e=a.get("id")+":"+f[d],this.trigger(e))},activateMode:function(a){return this.isModeActive(a)?void 0:(this.activeModes.add([{id:a}]),this.$el.addClass("mode-"+a),this)},deactivateMode:function(a){return this.isModeActive(a)?(this.activeModes.remove(this.activeModes.where({id:a})),this.$el.removeClass("mode-"+a),this.trigger(a+":deactivate"),this):this},isModeActive:function(a){return Boolean(this.activeModes.where({id:a}).length)}});_.extend(d.prototype,wp.media.controller.StateMachine.prototype),b.exports=d},{}],44:[function(a,b,c){var d,e=wp.media.view.MediaFrame.Select,f=wp.media.view.l10n;d=e.extend({defaults:{id:"image",url:"",menu:"image-details",content:"image-details",toolbar:"image-details",type:"link",title:f.imageDetailsTitle,priority:120},initialize:function(a){this.image=new wp.media.model.PostImage(a.metadata),this.options.selection=new wp.media.model.Selection(this.image.attachment,{multiple:!1}),e.prototype.initialize.apply(this,arguments)},bindHandlers:function(){e.prototype.bindHandlers.apply(this,arguments),this.on("menu:create:image-details",this.createMenu,this),this.on("content:create:image-details",this.imageDetailsContent,this),this.on("content:render:edit-image",this.editImageContent,this),this.on("toolbar:render:image-details",this.renderImageDetailsToolbar,this),this.on("toolbar:render:replace",this.renderReplaceImageToolbar,this)},createStates:function(){this.states.add([new wp.media.controller.ImageDetails({image:this.image,editable:!1}),new wp.media.controller.ReplaceImage({id:"replace-image",library:wp.media.query({type:"image"}),image:this.image,multiple:!1,title:f.imageReplaceTitle,toolbar:"replace",priority:80,displaySettings:!0}),new wp.media.controller.EditImage({image:this.image,selection:this.options.selection})])},imageDetailsContent:function(a){a.view=new wp.media.view.ImageDetails({controller:this,model:this.state().image,attachment:this.state().image.attachment})},editImageContent:function(){var a,b=this.state(),c=b.get("image");c&&(a=new wp.media.view.EditImage({model:c,controller:this}).render(),this.content.set(a),a.loadEditor())},renderImageDetailsToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{select:{style:"primary",text:f.update,priority:80,click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))},renderReplaceImageToolbar:function(){var a=this,b=a.lastState(),c=b&&b.id;this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{back:{text:f.back,priority:20,click:function(){c?a.setState(c):a.close()}},replace:{style:"primary",text:f.replace,priority:80,click:function(){var a=this.controller,b=a.state(),c=b.get("selection"),d=c.single();a.close(),a.image.changeAttachment(d,b.display(d)),b.trigger("replace",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))}}),b.exports=d},{}],45:[function(a,b,c){var d,e=wp.media.view.MediaFrame.Select,f=wp.media.controller.Library,g=wp.media.view.l10n;d=e.extend({initialize:function(){this.counts={audio:{count:wp.media.view.settings.attachmentCounts.audio,state:"playlist"},video:{count:wp.media.view.settings.attachmentCounts.video,state:"video-playlist"}},_.defaults(this.options,{multiple:!0,editing:!1,state:"insert",metadata:{}}),e.prototype.initialize.apply(this,arguments),this.createIframeStates()},createStates:function(){var a=this.options;this.states.add([new f({id:"insert",title:g.insertMediaTitle,priority:20,toolbar:"main-insert",filterable:"all",library:wp.media.query(a.library),multiple:a.multiple?"reset":!1,editable:!0,allowLocalEdits:!0,displaySettings:!0,displayUserSettings:!0}),new f({id:"gallery",title:g.createGalleryTitle,priority:40,toolbar:"main-gallery",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({type:"image"},a.library))}),new wp.media.controller.Embed({metadata:a.metadata}),new wp.media.controller.EditImage({model:a.editImage}),new wp.media.controller.GalleryEdit({library:a.selection,editing:a.editing,menu:"gallery"}),new wp.media.controller.GalleryAdd,new f({id:"playlist",title:g.createPlaylistTitle,priority:60,toolbar:"main-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({type:"audio"},a.library))}),new wp.media.controller.CollectionEdit({type:"audio",collectionType:"playlist",title:g.editPlaylistTitle,SettingsView:wp.media.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"playlist",dragInfoText:g.playlistDragInfo,dragInfo:!1}),new wp.media.controller.CollectionAdd({type:"audio",collectionType:"playlist",title:g.addToPlaylistTitle}),new f({id:"video-playlist",title:g.createVideoPlaylistTitle,priority:60,toolbar:"main-video-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({
+type:"video"},a.library))}),new wp.media.controller.CollectionEdit({type:"video",collectionType:"playlist",title:g.editVideoPlaylistTitle,SettingsView:wp.media.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"video-playlist",dragInfoText:g.videoPlaylistDragInfo,dragInfo:!1}),new wp.media.controller.CollectionAdd({type:"video",collectionType:"playlist",title:g.addToVideoPlaylistTitle})]),wp.media.view.settings.post.featuredImageId&&this.states.add(new wp.media.controller.FeaturedImage)},bindHandlers:function(){var a,b;e.prototype.bindHandlers.apply(this,arguments),this.on("activate",this.activate,this),b=_.find(this.counts,function(a){return 0===a.count}),"undefined"!=typeof b&&this.listenTo(wp.media.model.Attachments.all,"change:type",this.mediaTypeCounts),this.on("menu:create:gallery",this.createMenu,this),this.on("menu:create:playlist",this.createMenu,this),this.on("menu:create:video-playlist",this.createMenu,this),this.on("toolbar:create:main-insert",this.createToolbar,this),this.on("toolbar:create:main-gallery",this.createToolbar,this),this.on("toolbar:create:main-playlist",this.createToolbar,this),this.on("toolbar:create:main-video-playlist",this.createToolbar,this),this.on("toolbar:create:featured-image",this.featuredImageToolbar,this),this.on("toolbar:create:main-embed",this.mainEmbedToolbar,this),a={menu:{"default":"mainMenu",gallery:"galleryMenu",playlist:"playlistMenu","video-playlist":"videoPlaylistMenu"},content:{embed:"embedContent","edit-image":"editImageContent","edit-selection":"editSelectionContent"},toolbar:{"main-insert":"mainInsertToolbar","main-gallery":"mainGalleryToolbar","gallery-edit":"galleryEditToolbar","gallery-add":"galleryAddToolbar","main-playlist":"mainPlaylistToolbar","playlist-edit":"playlistEditToolbar","playlist-add":"playlistAddToolbar","main-video-playlist":"mainVideoPlaylistToolbar","video-playlist-edit":"videoPlaylistEditToolbar","video-playlist-add":"videoPlaylistAddToolbar"}},_.each(a,function(a,b){_.each(a,function(a,c){this.on(b+":render:"+c,this[a],this)},this)},this)},activate:function(){_.each(this.counts,function(a){a.count<1&&this.menuItemVisibility(a.state,"hide")},this)},mediaTypeCounts:function(a,b){"undefined"!=typeof this.counts[b]&&this.counts[b].count<1&&(this.counts[b].count++,this.menuItemVisibility(this.counts[b].state,"show"))},mainMenu:function(a){a.set({"library-separator":new wp.media.View({className:"separator",priority:100})})},menuItemVisibility:function(a,b){var c=this.menu.get();"hide"===b?c.hide(a):"show"===b&&c.show(a)},galleryMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:g.cancelGalleryTitle,priority:20,click:function(){c?d.setState(c):d.close(),this.controller.modal.focusManager.focus()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},playlistMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:g.cancelPlaylistTitle,priority:20,click:function(){c?d.setState(c):d.close()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},videoPlaylistMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:g.cancelVideoPlaylistTitle,priority:20,click:function(){c?d.setState(c):d.close()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},embedContent:function(){var a=new wp.media.view.Embed({controller:this,model:this.state()}).render();this.content.set(a),wp.media.isTouchDevice||a.url.focus()},editSelectionContent:function(){var a,b=this.state(),c=b.get("selection");a=new wp.media.view.AttachmentsBrowser({controller:this,collection:c,selection:c,model:b,sortable:!0,search:!1,date:!1,dragInfo:!0,AttachmentView:wp.media.view.Attachments.EditSelection}).render(),a.toolbar.set("backToLibrary",{text:g.returnToLibrary,priority:-100,click:function(){this.controller.content.mode("browse")}}),this.content.set(a),this.trigger("edit:selection",this)},editImageContent:function(){var a=this.state().get("image"),b=new wp.media.view.EditImage({model:a,controller:this}).render();this.content.set(b),b.loadEditor()},selectionStatusToolbar:function(a){var b=this.state().get("editable");a.set("selection",new wp.media.view.Selection({controller:this,collection:this.state().get("selection"),priority:-40,editable:b&&function(){this.controller.content.mode("edit-selection")}}).render())},mainInsertToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("insert",{style:"primary",priority:80,text:g.insertIntoPost,requires:{selection:!0},click:function(){var a=b.state(),c=a.get("selection");b.close(),a.trigger("insert",c).reset()}})},mainGalleryToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("gallery",{style:"primary",text:g.createNewGallery,priority:60,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("gallery-edit"),d=a.where({type:"image"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("gallery-edit"),this.controller.modal.focusManager.focus()}})},mainPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("playlist",{style:"primary",text:g.createNewPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("playlist-edit"),d=a.where({type:"audio"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("playlist-edit"),this.controller.modal.focusManager.focus()}})},mainVideoPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("video-playlist",{style:"primary",text:g.createNewVideoPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("video-playlist-edit"),d=a.where({type:"video"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("video-playlist-edit"),this.controller.modal.focusManager.focus()}})},featuredImageToolbar:function(a){this.createSelectToolbar(a,{text:g.setFeaturedImage,state:this.options.state})},mainEmbedToolbar:function(a){a.view=new wp.media.view.Toolbar.Embed({controller:this})},galleryEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?g.updateGallery:g.insertGallery,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},galleryAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:g.addToGallery,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("gallery-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("gallery-edit")}}}}))},playlistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?g.updatePlaylist:g.insertPlaylist,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},playlistAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:g.addToPlaylist,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("playlist-edit")}}}}))},videoPlaylistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?g.updateVideoPlaylist:g.insertVideoPlaylist,priority:140,requires:{library:!0},click:function(){var a=this.controller,b=a.state(),c=b.get("library");c.type="video",a.close(),b.trigger("update",c),a.setState(a.options.state),a.reset()}}}}))},videoPlaylistAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:g.addToVideoPlaylist,priority:140,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("video-playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("video-playlist-edit")}}}}))}}),b.exports=d},{}],46:[function(a,b,c){var d,e=wp.media.view.MediaFrame,f=wp.media.view.l10n;d=e.extend({initialize:function(){e.prototype.initialize.apply(this,arguments),_.defaults(this.options,{selection:[],library:{},multiple:!1,state:"library"}),this.createSelection(),this.createStates(),this.bindHandlers()},createSelection:function(){var a=this.options.selection;a instanceof wp.media.model.Selection||(this.options.selection=new wp.media.model.Selection(a,{multiple:this.options.multiple})),this._selection={attachments:new wp.media.model.Attachments,difference:[]}},createStates:function(){var a=this.options;this.options.states||this.states.add([new wp.media.controller.Library({library:wp.media.query(a.library),multiple:a.multiple,title:a.title,priority:20})])},bindHandlers:function(){this.on("router:create:browse",this.createRouter,this),this.on("router:render:browse",this.browseRouter,this),this.on("content:create:browse",this.browseContent,this),this.on("content:render:upload",this.uploadContent,this),this.on("toolbar:create:select",this.createSelectToolbar,this)},browseRouter:function(a){a.set({upload:{text:f.uploadFilesTitle,priority:20},browse:{text:f.mediaLibraryTitle,priority:40}})},browseContent:function(a){var b=this.state();this.$el.removeClass("hide-toolbar"),a.view=new wp.media.view.AttachmentsBrowser({controller:this,collection:b.get("library"),selection:b.get("selection"),model:b,sortable:b.get("sortable"),search:b.get("searchable"),filters:b.get("filterable"),date:b.get("date"),display:b.has("display")?b.get("display"):b.get("displaySettings"),dragInfo:b.get("dragInfo"),idealColumnWidth:b.get("idealColumnWidth"),suggestedWidth:b.get("suggestedWidth"),suggestedHeight:b.get("suggestedHeight"),AttachmentView:b.get("AttachmentView")})},uploadContent:function(){this.$el.removeClass("hide-toolbar"),this.content.set(new wp.media.view.UploaderInline({controller:this}))},createSelectToolbar:function(a,b){b=b||this.options.button||{},b.controller=this,a.view=new wp.media.view.Toolbar.Select(b)}}),b.exports=d},{}],47:[function(a,b,c){var d=wp.media.View.extend({className:"media-iframe",render:function(){return this.views.detach(),this.$el.html('<iframe src="'+this.controller.state().get("src")+'" />'),this.views.render(),this}});b.exports=d},{}],48:[function(a,b,c){var d,e=wp.media.view.Settings.AttachmentDisplay,f=jQuery;d=e.extend({className:"image-details",template:wp.template("image-details"),events:_.defaults(e.prototype.events,{"click .edit-attachment":"editAttachment","click .replace-attachment":"replaceAttachment","click .advanced-toggle":"onToggleAdvanced",'change [data-setting="customWidth"]':"onCustomSize",'change [data-setting="customHeight"]':"onCustomSize",'keyup [data-setting="customWidth"]':"onCustomSize",'keyup [data-setting="customHeight"]':"onCustomSize"}),initialize:function(){this.options.attachment=this.model.attachment,this.listenTo(this.model,"change:url",this.updateUrl),this.listenTo(this.model,"change:link",this.toggleLinkSettings),this.listenTo(this.model,"change:size",this.toggleCustomSize),e.prototype.initialize.apply(this,arguments)},prepare:function(){var a=!1;return this.model.attachment&&(a=this.model.attachment.toJSON()),_.defaults({model:this.model.toJSON(),attachment:a},this.options)},render:function(){var a=arguments;return this.model.attachment&&"pending"===this.model.dfd.state()?this.model.dfd.done(_.bind(function(){e.prototype.render.apply(this,a),this.postRender()},this)).fail(_.bind(function(){this.model.attachment=!1,e.prototype.render.apply(this,a),this.postRender()},this)):(e.prototype.render.apply(this,arguments),this.postRender()),this},postRender:function(){setTimeout(_.bind(this.resetFocus,this),10),this.toggleLinkSettings(),"show"===window.getUserSetting("advImgDetails")&&this.toggleAdvanced(!0),this.trigger("post-render")},resetFocus:function(){this.$(".link-to-custom").blur(),this.$(".embed-media-settings").scrollTop(0)},updateUrl:function(){this.$(".image img").attr("src",this.model.get("url")),this.$(".url").val(this.model.get("url"))},toggleLinkSettings:function(){"none"===this.model.get("link")?this.$(".link-settings").addClass("hidden"):this.$(".link-settings").removeClass("hidden")},toggleCustomSize:function(){"custom"!==this.model.get("size")?this.$(".custom-size").addClass("hidden"):this.$(".custom-size").removeClass("hidden")},onCustomSize:function(a){var b,c=f(a.target).data("setting"),d=f(a.target).val();return!/^\d+/.test(d)||parseInt(d,10)<1?void a.preventDefault():void("customWidth"===c?(b=Math.round(1/this.model.get("aspectRatio")*d),this.model.set("customHeight",b,{silent:!0}),this.$('[data-setting="customHeight"]').val(b)):(b=Math.round(this.model.get("aspectRatio")*d),this.model.set("customWidth",b,{silent:!0}),this.$('[data-setting="customWidth"]').val(b)))},onToggleAdvanced:function(a){a.preventDefault(),this.toggleAdvanced()},toggleAdvanced:function(a){var b,c=this.$el.find(".advanced-section");c.hasClass("advanced-visible")||a===!1?(c.removeClass("advanced-visible"),c.find(".advanced-settings").addClass("hidden"),b="hide"):(c.addClass("advanced-visible"),c.find(".advanced-settings").removeClass("hidden"),b="show"),window.setUserSetting("advImgDetails",b)},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b&&(a.preventDefault(),b.set("image",this.model.attachment),this.controller.setState("edit-image"))},replaceAttachment:function(a){a.preventDefault(),this.controller.setState("replace-image")}}),b.exports=d},{}],49:[function(a,b,c){var d=wp.media.View.extend({tagName:"label",className:"screen-reader-text",initialize:function(){this.value=this.options.value},render:function(){return this.$el.html(this.value),this}});b.exports=d},{}],50:[function(a,b,c){var d,e=wp.media.view.Frame,f=jQuery;d=e.extend({className:"media-frame",template:wp.template("media-frame"),regions:["menu","title","content","toolbar","router"],events:{"click div.media-frame-title h1":"toggleMenu"},initialize:function(){e.prototype.initialize.apply(this,arguments),_.defaults(this.options,{title:"",modal:!0,uploader:!0}),this.$el.addClass("wp-core-ui"),this.options.modal&&(this.modal=new wp.media.view.Modal({controller:this,title:this.options.title}),this.modal.content(this)),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new wp.media.view.UploaderWindow({controller:this,uploader:{dropzone:this.modal?this.modal.$el:this.$el,container:this.$el}}),this.views.set(".media-frame-uploader",this.uploader)),this.on("attach",_.bind(this.views.ready,this.views),this),this.on("title:create:default",this.createTitle,this),this.title.mode("default"),this.on("title:render",function(a){a.$el.append('<span class="dashicons dashicons-arrow-down"></span>')}),this.on("menu:create:default",this.createMenu,this)},render:function(){return!this.state()&&this.options.state&&this.setState(this.options.state),e.prototype.render.apply(this,arguments)},createTitle:function(a){a.view=new wp.media.View({controller:this,tagName:"h1"})},createMenu:function(a){a.view=new wp.media.view.Menu({controller:this})},toggleMenu:function(){this.$el.find(".media-menu").toggleClass("visible")},createToolbar:function(a){a.view=new wp.media.view.Toolbar({controller:this})},createRouter:function(a){a.view=new wp.media.view.Router({controller:this})},createIframeStates:function(a){var b,c=wp.media.view.settings,d=c.tabs,e=c.tabUrl;d&&e&&(b=f("#post_ID"),b.length&&(e+="&post_id="+b.val()),_.each(d,function(b,c){this.state("iframe:"+c).set(_.defaults({tab:c,src:e+"&tab="+c,title:b,content:"iframe",menu:"default"},a))},this),this.on("content:create:iframe",this.iframeContent,this),this.on("content:deactivate:iframe",this.iframeContentCleanup,this),this.on("menu:render:default",this.iframeMenu,this),this.on("open",this.hijackThickbox,this),this.on("close",this.restoreThickbox,this))},iframeContent:function(a){this.$el.addClass("hide-toolbar"),a.view=new wp.media.view.Iframe({controller:this})},iframeContentCleanup:function(){this.$el.removeClass("hide-toolbar")},iframeMenu:function(a){var b={};a&&(_.each(wp.media.view.settings.tabs,function(a,c){b["iframe:"+c]={text:this.state("iframe:"+c).get("title"),priority:200}},this),a.set(b))},hijackThickbox:function(){var a=this;window.tb_remove&&!this._tb_remove&&(this._tb_remove=window.tb_remove,window.tb_remove=function(){a.close(),a.reset(),a.setState(a.options.state),a._tb_remove.call(window)})},restoreThickbox:function(){this._tb_remove&&(window.tb_remove=this._tb_remove,delete this._tb_remove)}}),_.each(["open","close","attach","detach","escape"],function(a){d.prototype[a]=function(){return this.modal&&this.modal[a].apply(this.modal,arguments),this}}),b.exports=d},{}],51:[function(a,b,c){var d,e=jQuery;d=wp.media.View.extend({tagName:"a",className:"media-menu-item",attributes:{href:"#"},events:{click:"_click"},_click:function(a){var b=this.options.click;a&&a.preventDefault(),b?b.call(this):this.click(),wp.media.isTouchDevice||e(".media-frame-content input").first().focus()},click:function(){var a=this.options.state;a&&(this.controller.setState(a),this.views.parent.$el.removeClass("visible"))},render:function(){var a=this.options;return a.text?this.$el.text(a.text):a.html&&this.$el.html(a.html),this}}),b.exports=d},{}],52:[function(a,b,c){var d,e=wp.media.view.MenuItem,f=wp.media.view.PriorityList;d=f.extend({tagName:"div",className:"media-menu",property:"state",ItemView:e,region:"menu",toView:function(a,b){return a=a||{},a[this.property]=a[this.property]||b,new this.ItemView(a).render()},ready:function(){f.prototype.ready.apply(this,arguments),this.visibility()},set:function(){f.prototype.set.apply(this,arguments),this.visibility()},unset:function(){f.prototype.unset.apply(this,arguments),this.visibility()},visibility:function(){var a=this.region,b=this.controller[a].get(),c=this.views.get(),d=!c||c.length<2;this===b&&this.controller.$el.toggleClass("hide-"+a,d)},select:function(a){var b=this.get(a);b&&(this.deselect(),b.$el.addClass("active"))},deselect:function(){this.$el.children().removeClass("active")},hide:function(a){var b=this.get(a);b&&b.$el.addClass("hidden")},show:function(a){var b=this.get(a);b&&b.$el.removeClass("hidden")}}),b.exports=d},{}],53:[function(a,b,c){var d,e=jQuery;d=wp.media.View.extend({tagName:"div",template:wp.template("media-modal"),attributes:{tabindex:0},events:{"click .media-modal-backdrop, .media-modal-close":"escapeHandler",keydown:"keydown"},initialize:function(){_.defaults(this.options,{container:document.body,title:"",propagate:!0,freeze:!0}),this.focusManager=new wp.media.view.FocusManager({el:this.el})},prepare:function(){return{title:this.options.title}},attach:function(){return this.views.attached?this:(this.views.rendered||this.render(),this.$el.appendTo(this.options.container),this.views.attached=!0,this.views.ready(),this.propagate("attach"))},detach:function(){return this.$el.is(":visible")&&this.close(),this.$el.detach(),this.views.attached=!1,this.propagate("detach")},open:function(){var a,b=this.$el,c=this.options;return b.is(":visible")?this:(this.views.attached||this.attach(),c.freeze&&(this._freeze={scrollTop:e(window).scrollTop()}),e("body").addClass("modal-open"),b.show(),"ontouchend"in document&&(a=window.tinymce&&window.tinymce.activeEditor)&&!a.isHidden()&&a.iframeElement&&(a.iframeElement.focus(),a.iframeElement.blur(),setTimeout(function(){a.iframeElement.blur()},100)),this.$el.focus(),this.propagate("open"))},close:function(a){var b=this._freeze;return this.views.attached&&this.$el.is(":visible")?(e("body").removeClass("modal-open"),this.$el.hide().undelegate("keydown"),e("#wpbody-content").focus(),this.propagate("close"),b&&e(window).scrollTop(b.scrollTop),a&&a.escape&&this.propagate("escape"),this):this},escape:function(){return this.close({escape:!0})},escapeHandler:function(a){a.preventDefault(),this.escape()},content:function(a){return this.views.set(".media-modal-content",a),this},propagate:function(a){return this.trigger(a),this.options.propagate&&this.controller.trigger(a),this},keydown:function(a){27===a.which&&this.$el.is(":visible")&&(this.escape(),a.stopImmediatePropagation())}}),b.exports=d},{}],54:[function(a,b,c){var d=wp.media.View.extend({tagName:"div",initialize:function(){this._views={},this.set(_.extend({},this._views,this.options.views),{silent:!0}),delete this.options.views,this.options.silent||this.render()},set:function(a,b,c){var d,e,f;return c=c||{},_.isObject(a)?(_.each(a,function(a,b){this.set(b,a)},this),this):(b instanceof Backbone.View||(b=this.toView(b,a,c)),b.controller=b.controller||this.controller,this.unset(a),d=b.options.priority||10,e=this.views.get()||[],_.find(e,function(a,b){return a.options.priority>d?(f=b,!0):void 0}),this._views[a]=b,this.views.add(b,{at:_.isNumber(f)?f:e.length||0}),this)},get:function(a){return this._views[a]},unset:function(a){var b=this.get(a);return b&&b.remove(),delete this._views[a],this},toView:function(a){return new wp.media.View(a)}});b.exports=d},{}],55:[function(a,b,c){var d=wp.media.view.MenuItem.extend({click:function(){var a=this.options.contentMode;a&&this.controller.content.mode(a)}});b.exports=d},{}],56:[function(a,b,c){var d,e=wp.media.view.Menu;d=e.extend({tagName:"div",className:"media-router",property:"contentMode",ItemView:wp.media.view.RouterItem,region:"router",initialize:function(){this.controller.on("content:render",this.update,this),e.prototype.initialize.apply(this,arguments)},update:function(){var a=this.controller.content.mode();a&&this.select(a)}}),b.exports=d},{}],57:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.View.extend({tagName:"input",className:"search",id:"media-search-input",attributes:{type:"search",placeholder:e.search},events:{input:"search",keyup:"search",change:"search",search:"search"},render:function(){return this.el.value=this.model.escape("search"),this},search:function(a){a.target.value?this.model.set("search",a.target.value):this.model.unset("search")}}),b.exports=d},{}],58:[function(a,b,c){var d,e=wp.media.view.l10n;d=wp.media.View.extend({tagName:"div",className:"media-selection",template:wp.template("media-selection"),events:{"click .edit-selection":"edit","click .clear-selection":"clear"},initialize:function(){_.defaults(this.options,{editable:!1,clearable:!0}),this.attachments=new wp.media.view.Attachments.Selection({controller:this.controller,collection:this.collection,selection:this.collection,model:new Backbone.Model}),this.views.set(".selection-view",this.attachments),this.collection.on("add remove reset",this.refresh,this),this.controller.on("content:activate",this.refresh,this)},ready:function(){this.refresh()},refresh:function(){if(this.$el.children().length){var a=this.collection,b="edit-selection"===this.controller.content.mode();this.$el.toggleClass("empty",!a.length),this.$el.toggleClass("one",1===a.length),this.$el.toggleClass("editing",b),this.$(".count").text(e.selected.replace("%d",a.length))}},edit:function(a){a.preventDefault(),this.options.editable&&this.options.editable.call(this,this.collection)},clear:function(a){a.preventDefault(),this.collection.reset(),this.controller.modal.focusManager.focus()}}),b.exports=d},{}],59:[function(a,b,c){var d,e=wp.media.View,f=Backbone.$;d=e.extend({events:{"click button":"updateHandler","change input":"updateHandler","change select":"updateHandler","change textarea":"updateHandler"},initialize:function(){this.model=this.model||new Backbone.Model,this.listenTo(this.model,"change",this.updateChanges)},prepare:function(){return _.defaults({model:this.model.toJSON()},this.options)},render:function(){return e.prototype.render.apply(this,arguments),_(this.model.attributes).chain().keys().each(this.update,this),this},update:function(a){var b,c,d=this.model.get(a),e=this.$('[data-setting="'+a+'"]');e.length&&(e.is("select")?(c=e.find('[value="'+d+'"]'),c.length?(e.find("option").prop("selected",!1),c.prop("selected",!0)):this.model.set(a,e.find(":selected").val())):e.hasClass("button-group")?(b=e.find("button").removeClass("active"),b.filter('[value="'+d+'"]').addClass("active")):e.is('input[type="text"], textarea')?e.is(":focus")||e.val(d):e.is('input[type="checkbox"]')&&e.prop("checked",!!d&&"false"!==d))},updateHandler:function(a){var b,c=f(a.target).closest("[data-setting]"),d=a.target.value;a.preventDefault(),c.length&&(c.is('input[type="checkbox"]')&&(d=c[0].checked),this.model.set(c.data("setting"),d),(b=c.data("userSetting"))&&window.setUserSetting(b,d))},updateChanges:function(a){a.hasChanged()&&_(a.changed).chain().keys().each(this.update,this)}}),b.exports=d},{}],60:[function(a,b,c){var d,e=wp.media.view.Settings;d=e.extend({className:"attachment-display-settings",template:wp.template("attachment-display-settings"),initialize:function(){var a=this.options.attachment;_.defaults(this.options,{userSettings:!1}),e.prototype.initialize.apply(this,arguments),this.listenTo(this.model,"change:link",this.updateLinkTo),a&&a.on("change:uploading",this.render,this)},dispose:function(){var a=this.options.attachment;a&&a.off(null,null,this),e.prototype.dispose.apply(this,arguments)},render:function(){var a=this.options.attachment;return a&&_.extend(this.options,{sizes:a.get("sizes"),type:a.get("type")}),e.prototype.render.call(this),this.updateLinkTo(),this},updateLinkTo:function(){var a=this.model.get("link"),b=this.$(".link-to-custom"),c=this.options.attachment;return"none"===a||"embed"===a||!c&&"custom"!==a?void b.addClass("hidden"):(c&&("post"===a?b.val(c.get("link")):"file"===a?b.val(c.get("url")):this.model.get("linkUrl")||b.val("http://"),b.prop("readonly","custom"!==a)),b.removeClass("hidden"),void(!wp.media.isTouchDevice&&b.is(":visible")&&b.focus()[0].select()))}}),b.exports=d},{}],61:[function(a,b,c){var d=wp.media.view.Settings.extend({className:"collection-settings gallery-settings",template:wp.template("gallery-settings")});b.exports=d},{}],62:[function(a,b,c){var d=wp.media.view.Settings.extend({className:"collection-settings playlist-settings",template:wp.template("playlist-settings")});b.exports=d},{}],63:[function(a,b,c){var d=wp.media.view.PriorityList.extend({className:"media-sidebar"});b.exports=d},{}],64:[function(a,b,c){var d,e=wp.media.view;d=e.Cropper.extend({className:"crop-content site-icon",ready:function(){e.Cropper.prototype.ready.apply(this,arguments),this.$(".crop-image").on("load",_.bind(this.addSidebar,this))},addSidebar:function(){this.sidebar=new wp.media.view.Sidebar({controller:this.controller}),this.sidebar.set("preview",new wp.media.view.SiteIconPreview({controller:this.controller,attachment:this.options.attachment})),this.controller.cropperView.views.add(this.sidebar)}}),b.exports=d},{}],65:[function(a,b,c){var d,e=wp.media.View,f=jQuery;d=e.extend({className:"site-icon-preview",template:wp.template("site-icon-preview"),ready:function(){this.controller.imgSelect.setOptions({onInit:this.updatePreview,onSelectChange:this.updatePreview})},prepare:function(){return{url:this.options.attachment.get("url")}},updatePreview:function(a,b){var c=64/b.width,d=64/b.height,e=16/b.width,g=16/b.height;f("#preview-app-icon").css({width:Math.round(c*this.imageWidth)+"px",height:Math.round(d*this.imageHeight)+"px",marginLeft:"-"+Math.round(c*b.x1)+"px",marginTop:"-"+Math.round(d*b.y1)+"px"}),f("#preview-favicon").css({width:Math.round(e*this.imageWidth)+"px",height:Math.round(g*this.imageHeight)+"px",marginLeft:"-"+Math.round(e*b.x1)+"px",marginTop:"-"+Math.floor(g*b.y1)+"px"})}}),b.exports=d},{}],66:[function(a,b,c){var d=wp.media.View.extend({tagName:"span",className:"spinner",spinnerTimeout:!1,delay:400,show:function(){return this.spinnerTimeout||(this.spinnerTimeout=_.delay(function(a){a.addClass("is-active")},this.delay,this.$el)),this},hide:function(){return this.$el.removeClass("is-active"),this.spinnerTimeout=clearTimeout(this.spinnerTimeout),this}});b.exports=d},{}],67:[function(a,b,c){var d,e=wp.media.View;d=e.extend({tagName:"div",className:"media-toolbar",initialize:function(){var a=this.controller.state(),b=this.selection=a.get("selection"),c=this.library=a.get("library");this._views={},this.primary=new wp.media.view.PriorityList,this.secondary=new wp.media.view.PriorityList,this.primary.$el.addClass("media-toolbar-primary search-form"),this.secondary.$el.addClass("media-toolbar-secondary"),this.views.set([this.secondary,this.primary]),this.options.items&&this.set(this.options.items,{silent:!0}),this.options.silent||this.render(),b&&b.on("add remove reset",this.refresh,this),c&&c.on("add remove reset",this.refresh,this)},dispose:function(){return this.selection&&this.selection.off(null,null,this),this.library&&this.library.off(null,null,this),e.prototype.dispose.apply(this,arguments)},ready:function(){this.refresh()},set:function(a,b,c){var d;return c=c||{},_.isObject(a)?_.each(a,function(a,b){this.set(b,a,{silent:!0})},this):(b instanceof Backbone.View||(b.classes=["media-button-"+a].concat(b.classes||[]),b=new wp.media.view.Button(b).render()),b.controller=b.controller||this.controller,this._views[a]=b,d=b.options.priority<0?"secondary":"primary",this[d].set(a,b,c)),c.silent||this.refresh(),this},get:function(a){return this._views[a]},unset:function(a,b){return delete this._views[a],this.primary.unset(a,b),this.secondary.unset(a,b),b&&b.silent||this.refresh(),this},refresh:function(){var a=this.controller.state(),b=a.get("library"),c=a.get("selection");_.each(this._views,function(a){if(a.model&&a.options&&a.options.requires){var d=a.options.requires,e=!1;e=_.some(c.models,function(a){return a.get("uploading")===!0}),d.selection&&c&&!c.length?e=!0:d.library&&b&&!b.length&&(e=!0),a.model.set("disabled",e)}})}}),b.exports=d},{}],68:[function(a,b,c){var d,e=wp.media.view.Toolbar.Select,f=wp.media.view.l10n;d=e.extend({initialize:function(){_.defaults(this.options,{text:f.insertIntoPost,requires:!1}),e.prototype.initialize.apply(this,arguments)},refresh:function(){var a=this.controller.state().props.get("url");this.get("select").model.set("disabled",!a||"http://"===a),e.prototype.refresh.apply(this,arguments)}}),b.exports=d},{}],69:[function(a,b,c){var d,e=wp.media.view.Toolbar,f=wp.media.view.l10n;d=e.extend({initialize:function(){var a=this.options;_.bindAll(this,"clickSelect"),_.defaults(a,{event:"select",state:!1,reset:!0,close:!0,text:f.select,requires:{selection:!0}}),a.items=_.defaults(a.items||{},{select:{style:"primary",text:a.text,priority:80,click:this.clickSelect,requires:a.requires}}),e.prototype.initialize.apply(this,arguments)},clickSelect:function(){var a=this.options,b=this.controller;a.close&&b.close(),a.event&&b.state().trigger(a.event),a.state&&b.setState(a.state),a.reset&&b.reset()}}),b.exports=d},{}],70:[function(a,b,c){var d,e=wp.media.View,f=wp.media.view.l10n,g=jQuery;d=e.extend({tagName:"div",className:"uploader-editor",template:wp.template("uploader-editor"),localDrag:!1,overContainer:!1,overDropzone:!1,draggingFile:null,initialize:function(){return this.initialized=!1,window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&this.browserSupport()?(this.$document=g(document),this.dropzones=[],this.files=[],this.$document.on("drop",".uploader-editor",_.bind(this.drop,this)),this.$document.on("dragover",".uploader-editor",_.bind(this.dropzoneDragover,this)),this.$document.on("dragleave",".uploader-editor",_.bind(this.dropzoneDragleave,this)),this.$document.on("click",".uploader-editor",_.bind(this.click,this)),this.$document.on("dragover",_.bind(this.containerDragover,this)),
+this.$document.on("dragleave",_.bind(this.containerDragleave,this)),this.$document.on("dragstart dragend drop",_.bind(function(a){this.localDrag="dragstart"===a.type},this)),this.initialized=!0,this):this},browserSupport:function(){var a=!1,b=document.createElement("div");return a="draggable"in b||"ondragstart"in b&&"ondrop"in b,a=a&&!!(window.File&&window.FileList&&window.FileReader)},isDraggingFile:function(a){return null!==this.draggingFile?this.draggingFile:_.isUndefined(a.originalEvent)||_.isUndefined(a.originalEvent.dataTransfer)?!1:(this.draggingFile=_.indexOf(a.originalEvent.dataTransfer.types,"Files")>-1&&-1===_.indexOf(a.originalEvent.dataTransfer.types,"text/plain"),this.draggingFile)},refresh:function(a){var b;for(b in this.dropzones)this.dropzones[b].toggle(this.overContainer||this.overDropzone);return _.isUndefined(a)||g(a.target).closest(".uploader-editor").toggleClass("droppable",this.overDropzone),this.overContainer||this.overDropzone||(this.draggingFile=null),this},render:function(){return this.initialized?(e.prototype.render.apply(this,arguments),g(".wp-editor-wrap").each(_.bind(this.attach,this)),this):this},attach:function(a,b){var c=this.$el.clone();return this.dropzones.push(c),g(b).append(c),this},drop:function(a){var b,c;return this.containerDragleave(a),this.dropzoneDragleave(a),this.files=a.originalEvent.dataTransfer.files,this.files.length<1?void 0:(b=g(a.target).parents(".wp-editor-wrap"),b.length>0&&b[0].id&&(window.wpActiveEditor=b[0].id.slice(3,-5)),this.workflow?(this.workflow.state().reset(),this.addFiles.apply(this),this.workflow.open()):(this.workflow=wp.media.editor.open(window.wpActiveEditor,{frame:"post",state:"insert",title:f.addMedia,multiple:!0}),c=this.workflow.uploader,c.uploader&&c.uploader.ready?this.addFiles.apply(this):this.workflow.on("uploader:ready",this.addFiles,this)),!1)},addFiles:function(){return this.files.length&&(this.workflow.uploader.uploader.uploader.addFile(_.toArray(this.files)),this.files=[]),this},containerDragover:function(a){!this.localDrag&&this.isDraggingFile(a)&&(this.overContainer=!0,this.refresh())},containerDragleave:function(){this.overContainer=!1,_.delay(_.bind(this.refresh,this),50)},dropzoneDragover:function(a){return!this.localDrag&&this.isDraggingFile(a)?(this.overDropzone=!0,this.refresh(a),!1):void 0},dropzoneDragleave:function(a){this.overDropzone=!1,_.delay(_.bind(this.refresh,this,a),50)},click:function(a){this.containerDragleave(a),this.dropzoneDragleave(a),this.localDrag=!1}}),b.exports=d},{}],71:[function(a,b,c){var d,e=wp.media.View;d=e.extend({tagName:"div",className:"uploader-inline",template:wp.template("uploader-inline"),events:{"click .close":"hide"},initialize:function(){_.defaults(this.options,{message:"",status:!0,canClose:!1}),!this.options.$browser&&this.controller.uploader&&(this.options.$browser=this.controller.uploader.$browser),_.isUndefined(this.options.postId)&&(this.options.postId=wp.media.view.settings.post.id),this.options.status&&this.views.set(".upload-inline-status",new wp.media.view.UploaderStatus({controller:this.controller}))},prepare:function(){var a=this.controller.state().get("suggestedWidth"),b=this.controller.state().get("suggestedHeight"),c={};return c.message=this.options.message,c.canClose=this.options.canClose,a&&b&&(c.suggestedWidth=a,c.suggestedHeight=b),c},dispose:function(){return this.disposing?e.prototype.dispose.apply(this,arguments):(this.disposing=!0,this.remove())},remove:function(){var a=e.prototype.remove.apply(this,arguments);return _.defer(_.bind(this.refresh,this)),a},refresh:function(){var a=this.controller.uploader;a&&a.refresh()},ready:function(){var a,b=this.options.$browser;if(this.controller.uploader){if(a=this.$(".browser"),a[0]===b[0])return;b.detach().text(a.text()),b[0].className=a[0].className,a.replaceWith(b.show())}return this.refresh(),this},show:function(){this.$el.removeClass("hidden")},hide:function(){this.$el.addClass("hidden")}}),b.exports=d},{}],72:[function(a,b,c){var d=wp.media.View.extend({className:"upload-error",template:wp.template("uploader-status-error")});b.exports=d},{}],73:[function(a,b,c){var d,e=wp.media.View;d=e.extend({className:"media-uploader-status",template:wp.template("uploader-status"),events:{"click .upload-dismiss-errors":"dismiss"},initialize:function(){this.queue=wp.Uploader.queue,this.queue.on("add remove reset",this.visibility,this),this.queue.on("add remove reset change:percent",this.progress,this),this.queue.on("add remove reset change:uploading",this.info,this),this.errors=wp.Uploader.errors,this.errors.reset(),this.errors.on("add remove reset",this.visibility,this),this.errors.on("add",this.error,this)},dispose:function(){return wp.Uploader.queue.off(null,null,this),e.prototype.dispose.apply(this,arguments),this},visibility:function(){this.$el.toggleClass("uploading",!!this.queue.length),this.$el.toggleClass("errors",!!this.errors.length),this.$el.toggle(!!this.queue.length||!!this.errors.length)},ready:function(){_.each({$bar:".media-progress-bar div",$index:".upload-index",$total:".upload-total",$filename:".upload-filename"},function(a,b){this[b]=this.$(a)},this),this.visibility(),this.progress(),this.info()},progress:function(){var a=this.queue,b=this.$bar;b&&a.length&&b.width(a.reduce(function(a,b){if(!b.get("uploading"))return a+100;var c=b.get("percent");return a+(_.isNumber(c)?c:100)},0)/a.length+"%")},info:function(){var a,b=this.queue,c=0;b.length&&(a=this.queue.find(function(a,b){return c=b,a.get("uploading")}),this.$index.text(c+1),this.$total.text(b.length),this.$filename.html(a?this.filename(a.get("filename")):""))},filename:function(a){return _.escape(a)},error:function(a){this.views.add(".upload-errors",new wp.media.view.UploaderStatusError({filename:this.filename(a.get("file").name),message:a.get("message")}),{at:0})},dismiss:function(a){var b=this.views.get(".upload-errors");a.preventDefault(),b&&_.invoke(b,"remove"),wp.Uploader.errors.reset()}}),b.exports=d},{}],74:[function(a,b,c){var d,e=jQuery;d=wp.media.View.extend({tagName:"div",className:"uploader-window",template:wp.template("uploader-window"),initialize:function(){var a;this.$browser=e('<a href="#" class="browser" />').hide().appendTo("body"),a=this.options.uploader=_.defaults(this.options.uploader||{},{dropzone:this.$el,browser:this.$browser,params:{}}),!a.dropzone||a.dropzone instanceof e||(a.dropzone=e(a.dropzone)),this.controller.on("activate",this.refresh,this),this.controller.on("detach",function(){this.$browser.remove()},this)},refresh:function(){this.uploader&&this.uploader.refresh()},ready:function(){var a,b=wp.media.view.settings.post.id;this.uploader||(b&&(this.options.uploader.params.post_id=b),this.uploader=new wp.Uploader(this.options.uploader),a=this.uploader.dropzone,a.on("dropzone:enter",_.bind(this.show,this)),a.on("dropzone:leave",_.bind(this.hide,this)),e(this.uploader).on("uploader:ready",_.bind(this._ready,this)))},_ready:function(){this.controller.trigger("uploader:ready")},show:function(){var a=this.$el.show();_.defer(function(){a.css({opacity:1})})},hide:function(){var a=this.$el.css({opacity:0});wp.media.transition(a).done(function(){"0"===a.css("opacity")&&a.hide()}),_.delay(function(){"0"===a.css("opacity")&&a.is(":visible")&&a.hide()},500)}}),b.exports=d},{}],75:[function(a,b,c){var d=wp.Backbone.View.extend({constructor:function(a){a&&a.controller&&(this.controller=a.controller),wp.Backbone.View.apply(this,arguments)},dispose:function(){return this.undelegateEvents(),this.model&&this.model.off&&this.model.off(null,null,this),this.collection&&this.collection.off&&this.collection.off(null,null,this),this.controller&&this.controller.off&&this.controller.off(null,null,this),this},remove:function(){return this.dispose(),wp.Backbone.View.prototype.remove.apply(this,arguments)}});b.exports=d},{}]},{},[19]);||||||| .r11156
+!function(a,b){var c,d=wp.media,e="ontouchend"in document;c=d.view.l10n="undefined"==typeof _wpMediaViewsL10n?{}:_wpMediaViewsL10n,d.view.settings=c.settings||{},delete c.settings,d.model.settings.post=d.view.settings.post,a.support.transition=function(){var a,c=document.documentElement.style,d={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};return a=b.find(b.keys(d),function(a){return!b.isUndefined(c[a])}),a&&{end:d[a]}}(),d.events=b.extend({},Backbone.Events),d.transition=function(c,d){var e=a.Deferred();return d=d||2e3,a.support.transition?(c instanceof a||(c=a(c)),c.first().one(a.support.transition.end,e.resolve),b.delay(e.resolve,d)):e.resolve(),e.promise()},d.controller.Region=function(a){b.extend(this,b.pick(a||{},"id","view","selector"))},d.controller.Region.extend=Backbone.Model.extend,b.extend(d.controller.Region.prototype,{mode:function(a){return a?a===this._mode?this:(this.trigger("deactivate"),this._mode=a,this.render(a),this.trigger("activate"),this):this._mode},render:function(a){if(a&&a!==this._mode)return this.mode(a);var b,c={view:null};return this.trigger("create",c),b=c.view,this.trigger("render",b),b&&this.set(b),this},get:function(){return this.view.views.first(this.selector)},set:function(a,b){return b&&(b.add=!1),this.view.views.set(this.selector,a,b)},trigger:function(a){var c,d;if(this._mode)return d=b.toArray(arguments),c=this.id+":"+a,d[0]=c+":"+this._mode,this.view.trigger.apply(this.view,d),d[0]=c,this.view.trigger.apply(this.view,d),this}}),d.controller.StateMachine=function(a){this.states=new Backbone.Collection(a)},d.controller.StateMachine.extend=Backbone.Model.extend,b.extend(d.controller.StateMachine.prototype,Backbone.Events,{state:function(a){return this.states=this.states||new Backbone.Collection,a=a||this._state,a&&!this.states.get(a)&&this.states.add({id:a}),this.states.get(a)},setState:function(a){var b=this.state();return b&&a===b.id||!this.states||!this.states.get(a)?this:(b&&(b.trigger("deactivate"),this._lastState=b.id),this._state=a,this.state().trigger("activate"),this)},lastState:function(){return this._lastState?this.state(this._lastState):void 0}}),b.each(["on","off","trigger"],function(a){d.controller.StateMachine.prototype[a]=function(){return this.states=this.states||new Backbone.Collection,this.states[a].apply(this.states,arguments),this}}),d.controller.State=Backbone.Model.extend({constructor:function(){this.on("activate",this._preActivate,this),this.on("activate",this.activate,this),this.on("activate",this._postActivate,this),this.on("deactivate",this._deactivate,this),this.on("deactivate",this.deactivate,this),this.on("reset",this.reset,this),this.on("ready",this._ready,this),this.on("ready",this.ready,this),Backbone.Model.apply(this,arguments),this.on("change:menu",this._updateMenu,this)},ready:function(){},activate:function(){},deactivate:function(){},reset:function(){},_ready:function(){this._updateMenu()},_preActivate:function(){this.active=!0},_postActivate:function(){this.on("change:menu",this._menu,this),this.on("change:titleMode",this._title,this),this.on("change:content",this._content,this),this.on("change:toolbar",this._toolbar,this),this.frame.on("title:render:default",this._renderTitle,this),this._title(),this._menu(),this._toolbar(),this._content(),this._router()},_deactivate:function(){this.active=!1,this.frame.off("title:render:default",this._renderTitle,this),this.off("change:menu",this._menu,this),this.off("change:titleMode",this._title,this),this.off("change:content",this._content,this),this.off("change:toolbar",this._toolbar,this)},_title:function(){this.frame.title.render(this.get("titleMode")||"default")},_renderTitle:function(a){a.$el.text(this.get("title")||"")},_router:function(){var a,b=this.frame.router,c=this.get("router");this.frame.$el.toggleClass("hide-router",!c),c&&(this.frame.router.render(c),a=b.get(),a&&a.select&&a.select(this.frame.content.mode()))},_menu:function(){var a,b=this.frame.menu,c=this.get("menu");this.frame.$el.toggleClass("hide-menu",!c),c&&(b.mode(c),a=b.get(),a&&a.select&&a.select(this.id))},_updateMenu:function(){var a=this.previous("menu"),b=this.get("menu");a&&this.frame.off("menu:render:"+a,this._renderMenu,this),b&&this.frame.on("menu:render:"+b,this._renderMenu,this)},_renderMenu:function(a){var b=this.get("menuItem"),c=this.get("title"),d=this.get("priority");!b&&c&&(b={text:c},d&&(b.priority=d)),b&&a.set(this.id,b)}}),b.each(["toolbar","content"],function(a){d.controller.State.prototype["_"+a]=function(){var b=this.get(a);b&&this.frame[a].render(b)}}),d.selectionSync={syncSelection:function(){var a=this.get("selection"),c=this.frame._selection;this.get("syncSelection")&&c&&a&&(a.multiple&&(a.reset([],{silent:!0}),a.validateAll(c.attachments),c.difference=b.difference(c.attachments.models,a.models)),a.single(c.single))},recordSelection:function(){var a=this.get("selection"),b=this.frame._selection;this.get("syncSelection")&&b&&a&&(a.multiple?(b.attachments.reset(a.toArray().concat(b.difference)),b.difference=[]):b.attachments.add(a.toArray()),b.single=a._single)}},d.controller.Library=d.controller.State.extend({defaults:{id:"library",title:c.mediaLibraryTitle,multiple:!1,content:"upload",menu:"default",router:"browse",toolbar:"select",searchable:!0,filterable:!1,sortable:!0,autoSelect:!0,describe:!1,contentUserSetting:!0,syncSelection:!0},initialize:function(){var a,c=this.get("selection");this.get("library")||this.set("library",d.query()),c instanceof d.model.Selection||(a=c,a||(a=this.get("library").props.toJSON(),a=b.omit(a,"orderby","query")),this.set("selection",new d.model.Selection(null,{multiple:this.get("multiple"),props:a}))),this.resetDisplays()},activate:function(){this.syncSelection(),wp.Uploader.queue.on("add",this.uploading,this),this.get("selection").on("add remove reset",this.refreshContent,this),this.get("router")&&this.get("contentUserSetting")&&(this.frame.on("content:activate",this.saveContentMode,this),this.set("content",getUserSetting("libraryContent",this.get("content"))))},deactivate:function(){this.recordSelection(),this.frame.off("content:activate",this.saveContentMode,this),this.get("selection").off(null,null,this),wp.Uploader.queue.off(null,null,this)},reset:function(){this.get("selection").reset(),this.resetDisplays(),this.refreshContent()},resetDisplays:function(){var a=d.view.settings.defaultProps;this._displays=[],this._defaultDisplaySettings={align:a.align||getUserSetting("align","none"),size:a.size||getUserSetting("imgsize","medium"),link:a.link||getUserSetting("urlbutton","file")}},display:function(a){var b=this._displays;return b[a.cid]||(b[a.cid]=new Backbone.Model(this.defaultDisplaySettings(a))),b[a.cid]},defaultDisplaySettings:function(a){var b=this._defaultDisplaySettings;return(b.canEmbed=this.canEmbed(a))&&(b.link="embed"),b},canEmbed:function(a){if(!a.get("uploading")){var c=a.get("type");if("audio"!==c&&"video"!==c)return!1}return b.contains(d.view.settings.embedExts,a.get("filename").split(".").pop())},refreshContent:function(){var a=this.get("selection"),b=this.frame,c=b.router.get(),d=b.content.mode();this.active&&!a.length&&c&&!c.get(d)&&this.frame.content.render(this.get("content"))},uploading:function(a){var b=this.frame.content;"upload"===b.mode()&&this.frame.content.mode("browse"),this.get("autoSelect")&&(this.get("selection").add(a),this.frame.trigger("library:selection:add"))},saveContentMode:function(){if("browse"===this.get("router")){var a=this.frame.content.mode(),b=this.frame.router.get();b&&b.get(a)&&setUserSetting("libraryContent",a)}}}),b.extend(d.controller.Library.prototype,d.selectionSync),d.controller.ImageDetails=d.controller.State.extend({defaults:b.defaults({id:"image-details",title:c.imageDetailsTitle,content:"image-details",menu:!1,router:!1,toolbar:"image-details",editing:!1,priority:60},d.controller.Library.prototype.defaults),initialize:function(a){this.image=a.image,d.controller.State.prototype.initialize.apply(this,arguments)},activate:function(){this.frame.modal.$el.addClass("image-details")}}),d.controller.GalleryEdit=d.controller.Library.extend({defaults:{id:"gallery-edit",title:c.editGalleryTitle,multiple:!1,searchable:!1,sortable:!0,display:!1,content:"browse",toolbar:"gallery-edit",describe:!0,displaySettings:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,syncSelection:!1},initialize:function(){this.get("library")||this.set("library",new d.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",d.view.Attachment.EditLibrary),d.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type","image"),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.gallerySettings,this),d.controller.Library.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.gallerySettings,this),d.controller.Library.prototype.deactivate.apply(this,arguments)},gallerySettings:function(a){if(this.get("displaySettings")){var b=this.get("library");b&&a&&(b.gallery=b.gallery||new Backbone.Model,a.sidebar.set({gallery:new d.view.Settings.Gallery({controller:this,model:b.gallery,priority:40})}),a.toolbar.set("reverse",{text:c.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}}),d.controller.GalleryAdd=d.controller.Library.extend({defaults:b.defaults({id:"gallery-library",title:c.addToGalleryTitle,multiple:"add",filterable:"uploaded",menu:"gallery",toolbar:"gallery-add",priority:100,syncSelection:!1},d.controller.Library.prototype.defaults),initialize:function(){this.get("library")||this.set("library",d.query({type:"image"})),d.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.frame.state("gallery-edit").get("library");this.editLibrary&&this.editLibrary!==b&&a.unobserve(this.editLibrary),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!b.get(a.cid)&&d.model.Selection.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(b),this.editLibrary=b,d.controller.Library.prototype.activate.apply(this,arguments)}}),d.controller.CollectionEdit=d.controller.Library.extend({defaults:{multiple:!1,sortable:!0,searchable:!1,content:"browse",describe:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,SettingsView:!1,syncSelection:!1},initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-edit"),this.set("toolbar",a+"-edit"),this.get("library")||this.set("library",new d.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",d.view.Attachment.EditLibrary),d.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type",this.get("type")),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.renderSettings,this),d.controller.Library.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.renderSettings,this),d.controller.Library.prototype.deactivate.apply(this,arguments)},renderSettings:function(b){var e=this.get("library"),f=this.get("collectionType"),g=this.get("dragInfoText"),h=this.get("SettingsView"),i={};e&&b&&(e[f]=e[f]||new Backbone.Model,i[f]=new h({controller:this,model:e[f],priority:40}),b.sidebar.set(i),g&&b.toolbar.set("dragInfo",new d.View({el:a('<div class="instructions">'+g+"</div>")[0],priority:-40})),b.toolbar.set("reverse",{text:c.reverseOrder,priority:80,click:function(){e.reset(e.toArray().reverse())}}))}}),d.controller.CollectionAdd=d.controller.Library.extend({defaults:b.defaults({multiple:"add",filterable:"uploaded",priority:100,syncSelection:!1},d.controller.Library.prototype.defaults),initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-library"),this.set("toolbar",a+"-add"),this.set("menu",a),this.get("library")||this.set("library",d.query({type:this.get("type")})),d.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.get("editLibrary"),c=this.frame.state(this.get("collectionType")+"-edit").get("library");b&&b!==c&&a.unobserve(b),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!c.get(a.cid)&&d.model.Selection.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(c),this.set("editLibrary",c),d.controller.Library.prototype.activate.apply(this,arguments)}}),d.controller.FeaturedImage=d.controller.Library.extend({defaults:b.defaults({id:"featured-image",title:c.setFeaturedImageTitle,multiple:!1,filterable:"uploaded",toolbar:"featured-image",priority:60,syncSelection:!0},d.controller.Library.prototype.defaults),initialize:function(){var a,b;this.get("library")||this.set("library",d.query({type:"image"})),d.controller.Library.prototype.initialize.apply(this,arguments),a=this.get("library"),b=a.comparator,a.comparator=function(a,c){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(c.cid);return!d&&e?-1:d&&!e?1:b.apply(this,arguments)},a.observe(this.get("selection"))},activate:function(){this.updateSelection(),this.frame.on("open",this.updateSelection,this),d.controller.Library.prototype.activate.apply(this,arguments)},deactivate:function(){this.frame.off("open",this.updateSelection,this),d.controller.Library.prototype.deactivate.apply(this,arguments)},updateSelection:function(){var a,b=this.get("selection"),c=d.view.settings.post.featuredImageId;""!==c&&-1!==c&&(a=d.model.Attachment.get(c),a.fetch()),b.reset(a?[a]:[])}}),d.controller.ReplaceImage=d.controller.Library.extend({defaults:b.defaults({id:"replace-image",title:c.replaceImageTitle,multiple:!1,filterable:"uploaded",toolbar:"replace",menu:!1,priority:60,syncSelection:!0},d.controller.Library.prototype.defaults),initialize:function(a){var b,c;this.image=a.image,this.get("library")||this.set("library",d.query({type:"image"})),d.controller.Library.prototype.initialize.apply(this,arguments),b=this.get("library"),c=b.comparator,b.comparator=function(a,b){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(b.cid);return!d&&e?-1:d&&!e?1:c.apply(this,arguments)},b.observe(this.get("selection"))},activate:function(){this.updateSelection(),d.controller.Library.prototype.activate.apply(this,arguments)},updateSelection:function(){var a=this.get("selection"),b=this.image.attachment;a.reset(b?[b]:[])}}),d.controller.EditImage=d.controller.State.extend({defaults:{id:"edit-image",title:c.editImage,menu:!1,toolbar:"edit-image",content:"edit-image",url:""},activate:function(){this.listenTo(this.frame,"toolbar:render:edit-image",this.toolbar)},deactivate:function(){this.stopListening(this.frame)},toolbar:function(){var a=this.frame,b=a.lastState(),e=b&&b.id;a.toolbar.set(new d.view.Toolbar({controller:a,items:{back:{style:"primary",text:c.back,priority:20,click:function(){e?a.setState(e):a.close()}}}}))}}),d.controller.MediaLibrary=d.controller.Library.extend({defaults:b.defaults({filterable:"uploaded",displaySettings:!1,priority:80,syncSelection:!1},d.controller.Library.prototype.defaults),initialize:function(a){this.media=a.media,this.type=a.type,this.set("library",d.query({type:this.type})),d.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){d.frame.lastMime&&(this.set("library",d.query({type:d.frame.lastMime})),delete d.frame.lastMime),d.controller.Library.prototype.activate.apply(this,arguments)}}),d.controller.Embed=d.controller.State.extend({defaults:{id:"embed",title:c.insertFromUrlTitle,content:"embed",menu:"default",toolbar:"main-embed",priority:120,type:"link",url:"",metadata:{}},sensitivity:200,initialize:function(a){this.metadata=a.metadata,this.debouncedScan=b.debounce(b.bind(this.scan,this),this.sensitivity),this.props=new Backbone.Model(this.metadata||{url:""}),this.props.on("change:url",this.debouncedScan,this),this.props.on("change:url",this.refresh,this),this.on("scan",this.scanImage,this)},scan:function(){var b,c=this,d={type:"link",scanners:[]};this.props.get("url")&&this.trigger("scan",d),d.scanners.length?(b=d.scanners=a.when.apply(a,d.scanners),b.always(function(){c.get("scanners")===b&&c.set("loading",!1)})):d.scanners=null,d.loading=!!d.scanners,this.set(d)},scanImage:function(b){var c=this.frame,d=this,e=this.props.get("url"),f=new Image,g=a.Deferred();b.scanners.push(g.promise()),f.onload=function(){g.resolve(),d===c.state()&&e===d.props.get("url")&&(d.set({type:"image"}),d.props.set({width:f.width,height:f.height}))},f.onerror=g.reject,f.src=e},refresh:function(){this.frame.toolbar.get().refresh()},reset:function(){this.props.clear().set({url:""}),this.active&&this.refresh()}}),d.controller.Cropper=d.controller.State.extend({defaults:{id:"cropper",title:c.cropImage,toolbar:"crop",content:"crop",router:!1,canSkipCrop:!1},activate:function(){this.frame.on("content:create:crop",this.createCropContent,this),this.frame.on("close",this.removeCropper,this),this.set("selection",new Backbone.Collection(this.frame._selection.single))},deactivate:function(){this.frame.toolbar.mode("browse")},createCropContent:function(){this.cropperView=new wp.media.view.Cropper({controller:this,attachment:this.get("selection").first()}),this.cropperView.on("image-loaded",this.createCropToolbar,this),this.frame.content.set(this.cropperView)},removeCropper:function(){this.imgSelect.cancelSelection(),this.imgSelect.setOptions({remove:!0}),this.imgSelect.update(),this.cropperView.remove()},createCropToolbar:function(){var a,d;a=this.get("canSkipCrop")||!1,d={controller:this.frame,items:{insert:{style:"primary",text:c.cropImage,priority:80,requires:{library:!1,selection:!1},click:function(){var a=this,b=this.controller.state().get("selection").first();b.set({cropDetails:this.controller.state().imgSelect.getSelection()}),this.$el.text(c.cropping),this.$el.attr("disabled",!0),this.controller.state().doCrop(b).done(function(b){a.controller.trigger("cropped",b),a.controller.close()}).fail(function(){a.controller.trigger("content:error:crop")})}}}},a&&b.extend(d.items,{skip:{style:"secondary",text:c.skipCropping,priority:70,requires:{library:!1,selection:!1},click:function(){var a=this.controller.state().get("selection").first();this.controller.state().cropperView.remove(),this.controller.trigger("skippedcrop",a),this.controller.close()}}}),this.frame.toolbar.set(new wp.media.view.Toolbar(d))},doCrop:function(a){return wp.ajax.post("custom-header-crop",{nonce:a.get("nonces").edit,id:a.get("id"),cropDetails:a.get("cropDetails")})}}),d.View=wp.Backbone.View.extend({constructor:function(a){a&&a.controller&&(this.controller=a.controller),wp.Backbone.View.apply(this,arguments)},dispose:function(){return this.undelegateEvents(),this.model&&this.model.off&&this.model.off(null,null,this),this.collection&&this.collection.off&&this.collection.off(null,null,this),this.controller&&this.controller.off&&this.controller.off(null,null,this),this},remove:function(){return this.dispose(),wp.Backbone.View.prototype.remove.apply(this,arguments)}}),d.view.Frame=d.View.extend({initialize:function(){b.defaults(this.options,{mode:["select"]}),this._createRegions(),this._createStates(),this._createModes()},_createRegions:function(){this.regions=this.regions?this.regions.slice():[],b.each(this.regions,function(a){this[a]=new d.controller.Region({view:this,id:a,selector:".media-frame-"+a})},this)},_createStates:function(){this.states=new Backbone.Collection(null,{model:d.controller.State}),this.states.on("add",function(a){a.frame=this,a.trigger("ready")},this),this.options.states&&this.states.add(this.options.states)},_createModes:function(){this.activeModes=new Backbone.Collection,this.activeModes.on("add remove reset",b.bind(this.triggerModeEvents,this)),b.each(this.options.mode,function(a){this.activateMode(a)},this)},reset:function(){return this.states.invoke("trigger","reset"),this},triggerModeEvents:function(a,c,d){var e,f,g={add:"activate",remove:"deactivate"};b.each(d,function(a,b){a&&(e=b)}),b.has(g,e)&&(f=a.get("id")+":"+g[e],this.trigger(f))},activateMode:function(a){return this.isModeActive(a)?void 0:(this.activeModes.add([{id:a}]),this.$el.addClass("mode-"+a),this)},deactivateMode:function(a){return this.isModeActive(a)?(this.activeModes.remove(this.activeModes.where({id:a})),this.$el.removeClass("mode-"+a),this.trigger(a+":deactivate"),this):this},isModeActive:function(a){return Boolean(this.activeModes.where({id:a}).length)}}),b.extend(d.view.Frame.prototype,d.controller.StateMachine.prototype),d.view.MediaFrame=d.view.Frame.extend({className:"media-frame",template:d.template("media-frame"),regions:["menu","title","content","toolbar","router"],events:{"click div.media-frame-title h1":"toggleMenu"},initialize:function(){d.view.Frame.prototype.initialize.apply(this,arguments),b.defaults(this.options,{title:"",modal:!0,uploader:!0}),this.$el.addClass("wp-core-ui"),this.options.modal&&(this.modal=new d.view.Modal({controller:this,title:this.options.title}),this.modal.content(this)),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new d.view.UploaderWindow({controller:this,uploader:{dropzone:this.modal?this.modal.$el:this.$el,container:this.$el}}),this.views.set(".media-frame-uploader",this.uploader)),this.on("attach",b.bind(this.views.ready,this.views),this),this.on("title:create:default",this.createTitle,this),this.title.mode("default"),this.on("title:render",function(a){a.$el.append('<span class="dashicons dashicons-arrow-down"></span>')}),this.on("menu:create:default",this.createMenu,this)},render:function(){return!this.state()&&this.options.state&&this.setState(this.options.state),d.view.Frame.prototype.render.apply(this,arguments)},createTitle:function(a){a.view=new d.View({controller:this,tagName:"h1"})},createMenu:function(a){a.view=new d.view.Menu({controller:this})},toggleMenu:function(){this.$el.find(".media-menu").toggleClass("visible")},createToolbar:function(a){a.view=new d.view.Toolbar({controller:this})},createRouter:function(a){a.view=new d.view.Router({controller:this})},createIframeStates:function(c){var e,f=d.view.settings,g=f.tabs,h=f.tabUrl;g&&h&&(e=a("#post_ID"),e.length&&(h+="&post_id="+e.val()),b.each(g,function(a,d){this.state("iframe:"+d).set(b.defaults({tab:d,src:h+"&tab="+d,title:a,content:"iframe",menu:"default"},c))},this),this.on("content:create:iframe",this.iframeContent,this),this.on("menu:render:default",this.iframeMenu,this),this.on("open",this.hijackThickbox,this),this.on("close",this.restoreThickbox,this))},iframeContent:function(a){this.$el.addClass("hide-toolbar"),a.view=new d.view.Iframe({controller:this})},iframeMenu:function(a){var c={};a&&(b.each(d.view.settings.tabs,function(a,b){c["iframe:"+b]={text:this.state("iframe:"+b).get("title"),priority:200}},this),a.set(c))},hijackThickbox:function(){var a=this;window.tb_remove&&!this._tb_remove&&(this._tb_remove=window.tb_remove,window.tb_remove=function(){a.close(),a.reset(),a.setState(a.options.state),a._tb_remove.call(window)})},restoreThickbox:function(){this._tb_remove&&(window.tb_remove=this._tb_remove,delete this._tb_remove)}}),b.each(["open","close","attach","detach","escape"],function(a){d.view.MediaFrame.prototype[a]=function(){return this.modal&&this.modal[a].apply(this.modal,arguments),this}}),d.view.MediaFrame.Select=d.view.MediaFrame.extend({initialize:function(){d.view.MediaFrame.prototype.initialize.apply(this,arguments),b.defaults(this.options,{selection:[],library:{},multiple:!1,state:"library"}),this.createSelection(),this.createStates(),this.bindHandlers()},createSelection:function(){var a=this.options.selection;a instanceof d.model.Selection||(this.options.selection=new d.model.Selection(a,{multiple:this.options.multiple})),this._selection={attachments:new d.model.Attachments,difference:[]}},createStates:function(){var a=this.options;this.options.states||this.states.add([new d.controller.Library({library:d.query(a.library),multiple:a.multiple,title:a.title,priority:20})])},bindHandlers:function(){this.on("router:create:browse",this.createRouter,this),this.on("router:render:browse",this.browseRouter,this),this.on("content:create:browse",this.browseContent,this),this.on("content:render:upload",this.uploadContent,this),this.on("toolbar:create:select",this.createSelectToolbar,this)},browseRouter:function(a){a.set({upload:{text:c.uploadFilesTitle,priority:20},browse:{text:c.mediaLibraryTitle,priority:40}})},browseContent:function(a){var b=this.state();this.$el.removeClass("hide-toolbar"),a.view=new d.view.AttachmentsBrowser({controller:this,collection:b.get("library"),selection:b.get("selection"),model:b,sortable:b.get("sortable"),search:b.get("searchable"),filters:b.get("filterable"),display:b.get(b.has("display")?"display":"displaySettings"),dragInfo:b.get("dragInfo"),idealColumnWidth:b.get("idealColumnWidth"),suggestedWidth:b.get("suggestedWidth"),suggestedHeight:b.get("suggestedHeight"),AttachmentView:b.get("AttachmentView")})},uploadContent:function(){this.$el.removeClass("hide-toolbar"),this.content.set(new d.view.UploaderInline({controller:this}))},createSelectToolbar:function(a,b){b=b||this.options.button||{},b.controller=this,a.view=new d.view.Toolbar.Select(b)}}),d.view.MediaFrame.Post=d.view.MediaFrame.Select.extend({initialize:function(){this.counts={audio:{count:d.view.settings.attachmentCounts.audio,state:"playlist"},video:{count:d.view.settings.attachmentCounts.video,state:"video-playlist"}},b.defaults(this.options,{multiple:!0,editing:!1,state:"insert",metadata:{}}),d.view.MediaFrame.Select.prototype.initialize.apply(this,arguments),this.createIframeStates()},createStates:function(){var a=this.options;this.states.add([new d.controller.Library({id:"insert",title:c.insertMediaTitle,priority:20,toolbar:"main-insert",filterable:"all",library:d.query(a.library),multiple:a.multiple?"reset":!1,editable:!0,allowLocalEdits:!0,displaySettings:!0,displayUserSettings:!0}),new d.controller.Library({id:"gallery",title:c.createGalleryTitle,priority:40,toolbar:"main-gallery",filterable:"uploaded",multiple:"add",editable:!1,library:d.query(b.defaults({type:"image"},a.library))}),new d.controller.Embed({metadata:a.metadata}),new d.controller.EditImage({model:a.editImage}),new d.controller.GalleryEdit({library:a.selection,editing:a.editing,menu:"gallery"}),new d.controller.GalleryAdd,new d.controller.Library({id:"playlist",title:c.createPlaylistTitle,priority:60,toolbar:"main-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:d.query(b.defaults({type:"audio"},a.library))}),new d.controller.CollectionEdit({type:"audio",collectionType:"playlist",title:c.editPlaylistTitle,SettingsView:d.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"playlist",dragInfoText:c.playlistDragInfo,dragInfo:!1}),new d.controller.CollectionAdd({type:"audio",collectionType:"playlist",title:c.addToPlaylistTitle}),new d.controller.Library({id:"video-playlist",title:c.createVideoPlaylistTitle,priority:60,toolbar:"main-video-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:d.query(b.defaults({type:"video"},a.library))}),new d.controller.CollectionEdit({type:"video",collectionType:"playlist",title:c.editVideoPlaylistTitle,SettingsView:d.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"video-playlist",dragInfoText:c.videoPlaylistDragInfo,dragInfo:!1}),new d.controller.CollectionAdd({type:"video",collectionType:"playlist",title:c.addToVideoPlaylistTitle})]),d.view.settings.post.featuredImageId&&this.states.add(new d.controller.FeaturedImage)},bindHandlers:function(){var a,c;d.view.MediaFrame.Select.prototype.bindHandlers.apply(this,arguments),this.on("activate",this.activate,this),c=b.find(this.counts,function(a){return 0===a.count}),"undefined"!=typeof c&&this.listenTo(d.model.Attachments.all,"change:type",this.mediaTypeCounts),this.on("menu:create:gallery",this.createMenu,this),this.on("menu:create:playlist",this.createMenu,this),this.on("menu:create:video-playlist",this.createMenu,this),this.on("toolbar:create:main-insert",this.createToolbar,this),this.on("toolbar:create:main-gallery",this.createToolbar,this),this.on("toolbar:create:main-playlist",this.createToolbar,this),this.on("toolbar:create:main-video-playlist",this.createToolbar,this),this.on("toolbar:create:featured-image",this.featuredImageToolbar,this),this.on("toolbar:create:main-embed",this.mainEmbedToolbar,this),a={menu:{"default":"mainMenu",gallery:"galleryMenu",playlist:"playlistMenu","video-playlist":"videoPlaylistMenu"},content:{embed:"embedContent","edit-image":"editImageContent","edit-selection":"editSelectionContent"},toolbar:{"main-insert":"mainInsertToolbar","main-gallery":"mainGalleryToolbar","gallery-edit":"galleryEditToolbar","gallery-add":"galleryAddToolbar","main-playlist":"mainPlaylistToolbar","playlist-edit":"playlistEditToolbar","playlist-add":"playlistAddToolbar","main-video-playlist":"mainVideoPlaylistToolbar","video-playlist-edit":"videoPlaylistEditToolbar","video-playlist-add":"videoPlaylistAddToolbar"}},b.each(a,function(a,c){b.each(a,function(a,b){this.on(c+":render:"+b,this[a],this)},this)},this)},activate:function(){b.each(this.counts,function(a){a.count<1&&this.menuItemVisibility(a.state,"hide")},this)},mediaTypeCounts:function(a,b){"undefined"!=typeof this.counts[b]&&this.counts[b].count<1&&(this.counts[b].count++,this.menuItemVisibility(this.counts[b].state,"show"))},mainMenu:function(a){a.set({"library-separator":new d.View({className:"separator",priority:100})})},menuItemVisibility:function(a,b){var c=this.menu.get();"hide"===b?c.hide(a):"show"===b&&c.show(a)},galleryMenu:function(a){var b=this.lastState(),e=b&&b.id,f=this;a.set({cancel:{text:c.cancelGalleryTitle,priority:20,click:function(){e?f.setState(e):f.close(),this.controller.modal.focusManager.focus()}},separateCancel:new d.View({className:"separator",priority:40})})},playlistMenu:function(a){var b=this.lastState(),e=b&&b.id,f=this;a.set({cancel:{text:c.cancelPlaylistTitle,priority:20,click:function(){e?f.setState(e):f.close()}},separateCancel:new d.View({className:"separator",priority:40})})},videoPlaylistMenu:function(a){var b=this.lastState(),e=b&&b.id,f=this;a.set({cancel:{text:c.cancelVideoPlaylistTitle,priority:20,click:function(){e?f.setState(e):f.close()}},separateCancel:new d.View({className:"separator",priority:40})})},embedContent:function(){var a=new d.view.Embed({controller:this,model:this.state()}).render();this.content.set(a),e||a.url.focus()},editSelectionContent:function(){var a,b=this.state(),e=b.get("selection");a=new d.view.AttachmentsBrowser({controller:this,collection:e,selection:e,model:b,sortable:!0,search:!1,dragInfo:!0,AttachmentView:d.view.Attachment.EditSelection}).render(),a.toolbar.set("backToLibrary",{text:c.returnToLibrary,priority:-100,click:function(){this.controller.content.mode("browse")}}),this.content.set(a)},editImageContent:function(){var a=this.state().get("image"),b=new d.view.EditImage({model:a,controller:this}).render();this.content.set(b),b.loadEditor()},selectionStatusToolbar:function(a){var b=this.state().get("editable");a.set("selection",new d.view.Selection({controller:this,collection:this.state().get("selection"),priority:-40,editable:b&&function(){this.controller.content.mode("edit-selection")}}).render())},mainInsertToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("insert",{style:"primary",priority:80,text:c.insertIntoPost,requires:{selection:!0},click:function(){var a=b.state(),c=a.get("selection");b.close(),a.trigger("insert",c).reset()}})},mainGalleryToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("gallery",{style:"primary",text:c.createNewGallery,priority:60,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("gallery-edit"),e=a.where({type:"image"});
+c.set("library",new d.model.Selection(e,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("gallery-edit"),this.controller.modal.focusManager.focus()}})},mainPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("playlist",{style:"primary",text:c.createNewPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("playlist-edit"),e=a.where({type:"audio"});c.set("library",new d.model.Selection(e,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("playlist-edit"),this.controller.modal.focusManager.focus()}})},mainVideoPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("video-playlist",{style:"primary",text:c.createNewVideoPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("video-playlist-edit"),e=a.where({type:"video"});c.set("library",new d.model.Selection(e,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("video-playlist-edit"),this.controller.modal.focusManager.focus()}})},featuredImageToolbar:function(a){this.createSelectToolbar(a,{text:c.setFeaturedImage,state:this.options.state})},mainEmbedToolbar:function(a){a.view=new d.view.Toolbar.Embed({controller:this})},galleryEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?c.updateGallery:c.insertGallery,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},galleryAddToolbar:function(){this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:c.addToGallery,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("gallery-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("gallery-edit")}}}}))},playlistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?c.updatePlaylist:c.insertPlaylist,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},playlistAddToolbar:function(){this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:c.addToPlaylist,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("playlist-edit")}}}}))},videoPlaylistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?c.updateVideoPlaylist:c.insertVideoPlaylist,priority:140,requires:{library:!0},click:function(){var a=this.controller,b=a.state(),c=b.get("library");c.type="video",a.close(),b.trigger("update",c),a.setState(a.options.state),a.reset()}}}}))},videoPlaylistAddToolbar:function(){this.toolbar.set(new d.view.Toolbar({controller:this,items:{insert:{style:"primary",text:c.addToVideoPlaylist,priority:140,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("video-playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("video-playlist-edit")}}}}))}}),d.view.MediaFrame.ImageDetails=d.view.MediaFrame.Select.extend({defaults:{id:"image",url:"",menu:"image-details",content:"image-details",toolbar:"image-details",type:"link",title:c.imageDetailsTitle,priority:120},initialize:function(a){this.image=new d.model.PostImage(a.metadata),this.options.selection=new d.model.Selection(this.image.attachment,{multiple:!1}),d.view.MediaFrame.Select.prototype.initialize.apply(this,arguments)},bindHandlers:function(){d.view.MediaFrame.Select.prototype.bindHandlers.apply(this,arguments),this.on("menu:create:image-details",this.createMenu,this),this.on("content:create:image-details",this.imageDetailsContent,this),this.on("content:render:edit-image",this.editImageContent,this),this.on("toolbar:render:image-details",this.renderImageDetailsToolbar,this),this.on("toolbar:render:replace",this.renderReplaceImageToolbar,this)},createStates:function(){this.states.add([new d.controller.ImageDetails({image:this.image,editable:!1}),new d.controller.ReplaceImage({id:"replace-image",library:d.query({type:"image"}),image:this.image,multiple:!1,title:c.imageReplaceTitle,toolbar:"replace",priority:80,displaySettings:!0}),new d.controller.EditImage({image:this.image,selection:this.options.selection})])},imageDetailsContent:function(a){a.view=new d.view.ImageDetails({controller:this,model:this.state().image,attachment:this.state().image.attachment})},editImageContent:function(){var a,b=this.state(),c=b.get("image");c&&(a=new d.view.EditImage({model:c,controller:this}).render(),this.content.set(a),a.loadEditor())},renderImageDetailsToolbar:function(){this.toolbar.set(new d.view.Toolbar({controller:this,items:{select:{style:"primary",text:c.update,priority:80,click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))},renderReplaceImageToolbar:function(){var a=this,b=a.lastState(),e=b&&b.id;this.toolbar.set(new d.view.Toolbar({controller:this,items:{back:{text:c.back,priority:20,click:function(){e?a.setState(e):a.close()}},replace:{style:"primary",text:c.replace,priority:80,click:function(){var a=this.controller,b=a.state(),c=b.get("selection"),d=c.single();a.close(),a.image.changeAttachment(d,b.display(d)),b.trigger("replace",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))}}),d.view.Modal=d.View.extend({tagName:"div",template:d.template("media-modal"),attributes:{tabindex:0},events:{"click .media-modal-backdrop, .media-modal-close":"escapeHandler",keydown:"keydown"},initialize:function(){b.defaults(this.options,{container:document.body,title:"",propagate:!0,freeze:!0}),this.focusManager=new d.view.FocusManager({el:this.el})},prepare:function(){return{title:this.options.title}},attach:function(){return this.views.attached?this:(this.views.rendered||this.render(),this.$el.appendTo(this.options.container),this.views.attached=!0,this.views.ready(),this.propagate("attach"))},detach:function(){return this.$el.is(":visible")&&this.close(),this.$el.detach(),this.views.attached=!1,this.propagate("detach")},open:function(){var b,c=this.$el,d=this.options;return c.is(":visible")?this:(this.views.attached||this.attach(),d.freeze&&(this._freeze={scrollTop:a(window).scrollTop()}),a("body").addClass("modal-open"),c.show(),"ontouchend"in document&&(b=window.tinymce&&window.tinymce.activeEditor)&&!b.isHidden()&&b.iframeElement&&(b.iframeElement.focus(),b.iframeElement.blur(),setTimeout(function(){b.iframeElement.blur()},100)),this.$el.focus(),this.propagate("open"))},close:function(b){var c=this._freeze;return this.views.attached&&this.$el.is(":visible")?(a("body").removeClass("modal-open"),this.$el.hide().undelegate("keydown"),a("#wpbody-content").focus(),this.propagate("close"),c&&a(window).scrollTop(c.scrollTop),b&&b.escape&&this.propagate("escape"),this):this},escape:function(){return this.close({escape:!0})},escapeHandler:function(a){a.preventDefault(),this.escape()},content:function(a){return this.views.set(".media-modal-content",a),this},propagate:function(a){return this.trigger(a),this.options.propagate&&this.controller.trigger(a),this},keydown:function(a){27===a.which&&this.$el.is(":visible")&&(this.escape(),a.stopImmediatePropagation())}}),d.view.FocusManager=d.View.extend({events:{keydown:"constrainTabbing"},focus:function(){this.$(".media-menu-item").first().focus()},constrainTabbing:function(a){var b;if(9===a.keyCode)return b=this.$(":tabbable"),b.last()[0]!==a.target||a.shiftKey?b.first()[0]===a.target&&a.shiftKey?(b.last().focus(),!1):void 0:(b.first().focus(),!1)}}),d.view.UploaderWindow=d.View.extend({tagName:"div",className:"uploader-window",template:d.template("uploader-window"),initialize:function(){var c;this.$browser=a('<a href="#" class="browser" />').hide().appendTo("body"),c=this.options.uploader=b.defaults(this.options.uploader||{},{dropzone:this.$el,browser:this.$browser,params:{}}),!c.dropzone||c.dropzone instanceof a||(c.dropzone=a(c.dropzone)),this.controller.on("activate",this.refresh,this),this.controller.on("detach",function(){this.$browser.remove()},this)},refresh:function(){this.uploader&&this.uploader.refresh()},ready:function(){var c,e=d.view.settings.post.id;this.uploader||(e&&(this.options.uploader.params.post_id=e),this.uploader=new wp.Uploader(this.options.uploader),c=this.uploader.dropzone,c.on("dropzone:enter",b.bind(this.show,this)),c.on("dropzone:leave",b.bind(this.hide,this)),a(this.uploader).on("uploader:ready",b.bind(this._ready,this)))},_ready:function(){this.controller.trigger("uploader:ready")},show:function(){var a=this.$el.show();b.defer(function(){a.css({opacity:1})})},hide:function(){var a=this.$el.css({opacity:0});d.transition(a).done(function(){"0"===a.css("opacity")&&a.hide()}),b.delay(function(){"0"===a.css("opacity")&&a.is(":visible")&&a.hide()},500)}}),d.view.EditorUploader=d.View.extend({tagName:"div",className:"uploader-editor",template:d.template("uploader-editor"),localDrag:!1,overContainer:!1,overDropzone:!1,draggingFile:null,initialize:function(){var c=this;return this.initialized=!1,window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&this.browserSupport()?(this.$document=a(document),this.dropzones=[],this.files=[],this.$document.on("drop",".uploader-editor",b.bind(this.drop,this)),this.$document.on("dragover",".uploader-editor",b.bind(this.dropzoneDragover,this)),this.$document.on("dragleave",".uploader-editor",b.bind(this.dropzoneDragleave,this)),this.$document.on("click",".uploader-editor",b.bind(this.click,this)),this.$document.on("dragover",b.bind(this.containerDragover,this)),this.$document.on("dragleave",b.bind(this.containerDragleave,this)),this.$document.on("dragstart dragend drop",function(a){c.localDrag="dragstart"===a.type}),this.initialized=!0,this):this},browserSupport:function(){var a=!1,b=document.createElement("div");return a="draggable"in b||"ondragstart"in b&&"ondrop"in b,a=a&&!!(window.File&&window.FileList&&window.FileReader)},isDraggingFile:function(a){return null!==this.draggingFile?this.draggingFile:b.isUndefined(a.originalEvent)||b.isUndefined(a.originalEvent.dataTransfer)?!1:(this.draggingFile=b.indexOf(a.originalEvent.dataTransfer.types,"Files")>-1&&-1===b.indexOf(a.originalEvent.dataTransfer.types,"text/plain"),this.draggingFile)},refresh:function(c){var d;for(d in this.dropzones)this.dropzones[d].toggle(this.overContainer||this.overDropzone);return b.isUndefined(c)||a(c.target).closest(".uploader-editor").toggleClass("droppable",this.overDropzone),this.overContainer||this.overDropzone||(this.draggingFile=null),this},render:function(){return this.initialized?(d.View.prototype.render.apply(this,arguments),a(".wp-editor-wrap, #wp-fullscreen-body").each(b.bind(this.attach,this)),this):this},attach:function(b,c){var d=this.$el.clone();return this.dropzones.push(d),a(c).append(d),this},drop:function(b){var c=null;return this.containerDragleave(b),this.dropzoneDragleave(b),this.files=b.originalEvent.dataTransfer.files,this.files.length<1?void 0:(c=a(b.target).parents(".wp-editor-wrap"),c.length>0&&c[0].id&&(window.wpActiveEditor=c[0].id.slice(3,-5)),this.workflow?(this.workflow.state().reset(),this.addFiles.apply(this),this.workflow.open()):(this.workflow=wp.media.editor.open("content",{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:!0}),this.workflow.on("uploader:ready",this.addFiles,this)),!1)},addFiles:function(){return this.files.length&&(this.workflow.uploader.uploader.uploader.addFile(b.toArray(this.files)),this.files=[]),this},containerDragover:function(a){!this.localDrag&&this.isDraggingFile(a)&&(this.overContainer=!0,this.refresh())},containerDragleave:function(){this.overContainer=!1,b.delay(b.bind(this.refresh,this),50)},dropzoneDragover:function(a){return!this.localDrag&&this.isDraggingFile(a)?(this.overDropzone=!0,this.refresh(a),!1):void 0},dropzoneDragleave:function(a){this.overDropzone=!1,b.delay(b.bind(this.refresh,this,a),50)},click:function(a){this.containerDragleave(a),this.dropzoneDragleave(a),this.localDrag=!1}}),d.view.UploaderInline=d.View.extend({tagName:"div",className:"uploader-inline",template:d.template("uploader-inline"),events:{"click .close":"hide"},initialize:function(){b.defaults(this.options,{message:"",status:!0,canClose:!1}),!this.options.$browser&&this.controller.uploader&&(this.options.$browser=this.controller.uploader.$browser),b.isUndefined(this.options.postId)&&(this.options.postId=d.view.settings.post.id),this.options.status&&this.views.set(".upload-inline-status",new d.view.UploaderStatus({controller:this.controller}))},prepare:function(){var a=this.controller.state().get("suggestedWidth"),b=this.controller.state().get("suggestedHeight"),c={};return c.message=this.options.message,c.canClose=this.options.canClose,a&&b&&(c.suggestedWidth=a,c.suggestedHeight=b),c},dispose:function(){return this.disposing?d.View.prototype.dispose.apply(this,arguments):(this.disposing=!0,this.remove())},remove:function(){var a=d.View.prototype.remove.apply(this,arguments);return b.defer(b.bind(this.refresh,this)),a},refresh:function(){var a=this.controller.uploader;a&&a.refresh()},ready:function(){var a,b=this.options.$browser;if(this.controller.uploader){if(a=this.$(".browser"),a[0]===b[0])return;b.detach().text(a.text()),b[0].className=a[0].className,a.replaceWith(b.show())}return this.refresh(),this},show:function(){this.$el.removeClass("hidden")},hide:function(){this.$el.addClass("hidden")}}),d.view.UploaderStatus=d.View.extend({className:"media-uploader-status",template:d.template("uploader-status"),events:{"click .upload-dismiss-errors":"dismiss"},initialize:function(){this.queue=wp.Uploader.queue,this.queue.on("add remove reset",this.visibility,this),this.queue.on("add remove reset change:percent",this.progress,this),this.queue.on("add remove reset change:uploading",this.info,this),this.errors=wp.Uploader.errors,this.errors.reset(),this.errors.on("add remove reset",this.visibility,this),this.errors.on("add",this.error,this)},dispose:function(){return wp.Uploader.queue.off(null,null,this),d.View.prototype.dispose.apply(this,arguments),this},visibility:function(){this.$el.toggleClass("uploading",!!this.queue.length),this.$el.toggleClass("errors",!!this.errors.length),this.$el.toggle(!!this.queue.length||!!this.errors.length)},ready:function(){b.each({$bar:".media-progress-bar div",$index:".upload-index",$total:".upload-total",$filename:".upload-filename"},function(a,b){this[b]=this.$(a)},this),this.visibility(),this.progress(),this.info()},progress:function(){var a=this.queue,c=this.$bar;c&&a.length&&c.width(a.reduce(function(a,c){if(!c.get("uploading"))return a+100;var d=c.get("percent");return a+(b.isNumber(d)?d:100)},0)/a.length+"%")},info:function(){var a,b=this.queue,c=0;b.length&&(a=this.queue.find(function(a,b){return c=b,a.get("uploading")}),this.$index.text(c+1),this.$total.text(b.length),this.$filename.html(a?this.filename(a.get("filename")):""))},filename:function(a){return d.truncate(b.escape(a),24)},error:function(a){this.views.add(".upload-errors",new d.view.UploaderStatusError({filename:this.filename(a.get("file").name),message:a.get("message")}),{at:0})},dismiss:function(a){var c=this.views.get(".upload-errors");a.preventDefault(),c&&b.invoke(c,"remove"),wp.Uploader.errors.reset()}}),d.view.UploaderStatusError=d.View.extend({className:"upload-error",template:d.template("uploader-status-error")}),d.view.Toolbar=d.View.extend({tagName:"div",className:"media-toolbar",initialize:function(){var a=this.controller.state(),b=this.selection=a.get("selection"),c=this.library=a.get("library");this._views={},this.primary=new d.view.PriorityList,this.secondary=new d.view.PriorityList,this.primary.$el.addClass("media-toolbar-primary search-form"),this.secondary.$el.addClass("media-toolbar-secondary"),this.views.set([this.secondary,this.primary]),this.options.items&&this.set(this.options.items,{silent:!0}),this.options.silent||this.render(),b&&b.on("add remove reset",this.refresh,this),c&&c.on("add remove reset",this.refresh,this)},dispose:function(){return this.selection&&this.selection.off(null,null,this),this.library&&this.library.off(null,null,this),d.View.prototype.dispose.apply(this,arguments)},ready:function(){this.refresh()},set:function(a,c,e){var f;return e=e||{},b.isObject(a)?b.each(a,function(a,b){this.set(b,a,{silent:!0})},this):(c instanceof Backbone.View||(c.classes=["media-button-"+a].concat(c.classes||[]),c=new d.view.Button(c).render()),c.controller=c.controller||this.controller,this._views[a]=c,f=c.options.priority<0?"secondary":"primary",this[f].set(a,c,e)),e.silent||this.refresh(),this},get:function(a){return this._views[a]},unset:function(a,b){return delete this._views[a],this.primary.unset(a,b),this.secondary.unset(a,b),b&&b.silent||this.refresh(),this},refresh:function(){var a=this.controller.state(),c=a.get("library"),d=a.get("selection");b.each(this._views,function(a){if(a.model&&a.options&&a.options.requires){var e=a.options.requires,f=!1;f=b.some(d.models,function(a){return a.get("uploading")===!0}),e.selection&&d&&!d.length?f=!0:e.library&&c&&!c.length&&(f=!0),a.model.set("disabled",f)}})}}),d.view.Toolbar.Select=d.view.Toolbar.extend({initialize:function(){var a=this.options;b.bindAll(this,"clickSelect"),b.defaults(a,{event:"select",state:!1,reset:!0,close:!0,text:c.select,requires:{selection:!0}}),a.items=b.defaults(a.items||{},{select:{style:"primary",text:a.text,priority:80,click:this.clickSelect,requires:a.requires}}),d.view.Toolbar.prototype.initialize.apply(this,arguments)},clickSelect:function(){var a=this.options,b=this.controller;a.close&&b.close(),a.event&&b.state().trigger(a.event),a.state&&b.setState(a.state),a.reset&&b.reset()}}),d.view.Toolbar.Embed=d.view.Toolbar.Select.extend({initialize:function(){b.defaults(this.options,{text:c.insertIntoPost,requires:!1}),d.view.Toolbar.Select.prototype.initialize.apply(this,arguments)},refresh:function(){var a=this.controller.state().props.get("url");this.get("select").model.set("disabled",!a||"http://"===a),d.view.Toolbar.Select.prototype.refresh.apply(this,arguments)}}),d.view.Button=d.View.extend({tagName:"a",className:"media-button",attributes:{href:"#"},events:{click:"click"},defaults:{text:"",style:"",size:"large",disabled:!1},initialize:function(){this.model=new Backbone.Model(this.defaults),b.each(this.defaults,function(a,c){var d=this.options[c];b.isUndefined(d)||(this.model.set(c,d),delete this.options[c])},this),this.model.on("change",this.render,this)},render:function(){var a=["button",this.className],c=this.model.toJSON();return c.style&&a.push("button-"+c.style),c.size&&a.push("button-"+c.size),a=b.uniq(a.concat(this.options.classes)),this.el.className=a.join(" "),this.$el.attr("disabled",c.disabled),this.$el.text(this.model.get("text")),this},click:function(a){"#"===this.attributes.href&&a.preventDefault(),this.options.click&&!this.model.get("disabled")&&this.options.click.apply(this,arguments)}}),d.view.ButtonGroup=d.View.extend({tagName:"div",className:"button-group button-large media-button-group",initialize:function(){this.buttons=b.map(this.options.buttons||[],function(a){return a instanceof Backbone.View?a:new d.view.Button(a).render()}),delete this.options.buttons,this.options.classes&&this.$el.addClass(this.options.classes)},render:function(){return this.$el.html(a(b.pluck(this.buttons,"el")).detach()),this}}),d.view.PriorityList=d.View.extend({tagName:"div",initialize:function(){this._views={},this.set(b.extend({},this._views,this.options.views),{silent:!0}),delete this.options.views,this.options.silent||this.render()},set:function(a,c,d){var e,f,g;return d=d||{},b.isObject(a)?(b.each(a,function(a,b){this.set(b,a)},this),this):(c instanceof Backbone.View||(c=this.toView(c,a,d)),c.controller=c.controller||this.controller,this.unset(a),e=c.options.priority||10,f=this.views.get()||[],b.find(f,function(a,b){return a.options.priority>e?(g=b,!0):void 0}),this._views[a]=c,this.views.add(c,{at:b.isNumber(g)?g:f.length||0}),this)},get:function(a){return this._views[a]},unset:function(a){var b=this.get(a);return b&&b.remove(),delete this._views[a],this},toView:function(a){return new d.View(a)}}),d.view.MenuItem=d.View.extend({tagName:"a",className:"media-menu-item",attributes:{href:"#"},events:{click:"_click"},_click:function(b){var c=this.options.click;b&&b.preventDefault(),c?c.call(this):this.click(),e||a(".media-frame-content input").first().focus()},click:function(){var a=this.options.state;a&&(this.controller.setState(a),this.views.parent.$el.removeClass("visible"))},render:function(){var a=this.options;return a.text?this.$el.text(a.text):a.html&&this.$el.html(a.html),this}}),d.view.Menu=d.view.PriorityList.extend({tagName:"div",className:"media-menu",property:"state",ItemView:d.view.MenuItem,region:"menu",toView:function(a,b){return a=a||{},a[this.property]=a[this.property]||b,new this.ItemView(a).render()},ready:function(){d.view.PriorityList.prototype.ready.apply(this,arguments),this.visibility()},set:function(){d.view.PriorityList.prototype.set.apply(this,arguments),this.visibility()},unset:function(){d.view.PriorityList.prototype.unset.apply(this,arguments),this.visibility()},visibility:function(){var a=this.region,b=this.controller[a].get(),c=this.views.get(),d=!c||c.length<2;this===b&&this.controller.$el.toggleClass("hide-"+a,d)},select:function(a){var b=this.get(a);b&&(this.deselect(),b.$el.addClass("active"))},deselect:function(){this.$el.children().removeClass("active")},hide:function(a){var b=this.get(a);b&&b.$el.addClass("hidden")},show:function(a){var b=this.get(a);b&&b.$el.removeClass("hidden")}}),d.view.RouterItem=d.view.MenuItem.extend({click:function(){var a=this.options.contentMode;a&&this.controller.content.mode(a)}}),d.view.Router=d.view.Menu.extend({tagName:"div",className:"media-router",property:"contentMode",ItemView:d.view.RouterItem,region:"router",initialize:function(){this.controller.on("content:render",this.update,this),d.view.Menu.prototype.initialize.apply(this,arguments)},update:function(){var a=this.controller.content.mode();a&&this.select(a)}}),d.view.Sidebar=d.view.PriorityList.extend({className:"media-sidebar"}),d.view.Attachment=d.View.extend({tagName:"li",className:"attachment",template:d.template("attachment"),attributes:function(){return{tabIndex:0,role:"checkbox","aria-label":this.model.get("title"),"aria-checked":!1,"data-id":this.model.get("id")}},events:{"click .js--select-attachment":"toggleSelectionHandler","change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .close":"removeFromLibrary","click .check":"checkClickHandler","click a":"preventDefault",keydown:"toggleSelectionHandler"},buttons:{},initialize:function(){var a=this.options.selection,c=b.defaults(this.options,{rerenderOnModelChange:!0});c.rerenderOnModelChange?this.model.on("change",this.render,this):this.model.on("change:percent",this.progress,this),this.model.on("change:title",this._syncTitle,this),this.model.on("change:caption",this._syncCaption,this),this.model.on("change:artist",this._syncArtist,this),this.model.on("change:album",this._syncAlbum,this),this.model.on("add",this.select,this),this.model.on("remove",this.deselect,this),a&&(a.on("reset",this.updateSelect,this),this.model.on("selection:single selection:unsingle",this.details,this),this.details(this.model,this.controller.state().get("selection")))},dispose:function(){var a=this.options.selection;return this.updateAll(),a&&a.off(null,null,this),d.View.prototype.dispose.apply(this,arguments),this},render:function(){var a=b.defaults(this.model.toJSON(),{orientation:"landscape",uploading:!1,type:"",subtype:"",icon:"",filename:"",caption:"",title:"",dateFormatted:"",width:"",height:"",compat:!1,alt:"",description:""},this.options);return a.buttons=this.buttons,a.describe=this.controller.state().get("describe"),"image"===a.type&&(a.size=this.imageSize()),a.can={},a.nonces&&(a.can.remove=!!a.nonces["delete"],a.can.save=!!a.nonces.update),this.controller.state().get("allowLocalEdits")&&(a.allowLocalEdits=!0),a.uploading&&!a.percent&&(a.percent=0),this.views.detach(),this.$el.html(this.template(a)),this.$el.toggleClass("uploading",a.uploading),a.uploading?this.$bar=this.$(".media-progress-bar div"):delete this.$bar,this.updateSelect(),this.updateSave(),this.views.render(),this},progress:function(){this.$bar&&this.$bar.length&&this.$bar.width(this.model.get("percent")+"%")},toggleSelectionHandler:function(a){var b;if("INPUT"!==a.target.nodeName){if(37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode)return void this.controller.trigger("attachment:keydown:arrow",a);if("keydown"!==a.type||13===a.keyCode||32===a.keyCode){if(this.controller.isModeActive("grid")){if(this.controller.isModeActive("edit"))return this.controller.trigger("edit:attachment",this.model,a.currentTarget),void a.stopPropagation();this.controller.isModeActive("select")&&(b="toggle")}a.shiftKey?b="between":(a.ctrlKey||a.metaKey)&&(b="toggle"),this.toggleSelection({method:b}),this.controller.trigger("selection:toggle"),a.stopPropagation()}}},toggleSelection:function(a){var c,d,e,f,g=this.collection,h=this.options.selection,i=this.model,j=a&&a.method;if(h){if(c=h.single(),j=b.isUndefined(j)?h.multiple:j,"between"===j&&c&&h.multiple){if(c===i)return;return e=g.indexOf(c),f=g.indexOf(this.model),d=f>e?g.models.slice(e,f+1):g.models.slice(f,e+1),h.add(d),void h.single(i)}if("toggle"===j)return h[this.selected()?"remove":"add"](i),void h.single(i);if("add"===j)return h.add(i),void h.single(i);j||(j="add"),"add"!==j&&(j="reset"),this.selected()?h[c===i?"remove":"single"](i):(h[j](i),h.single(i))}},updateSelect:function(){this[this.selected()?"select":"deselect"]()},selected:function(){var a=this.options.selection;return a?!!a.get(this.model.cid):void 0},select:function(a,b){var c=this.options.selection,d=this.controller;!c||b&&b!==c||this.$el.hasClass("selected")||(this.$el.addClass("selected").attr("aria-checked",!0),d.isModeActive("grid")&&d.isModeActive("select")||this.$(".check").attr("tabindex","0"))},deselect:function(a,b){var c=this.options.selection;!c||b&&b!==c||this.$el.removeClass("selected").attr("aria-checked",!1).find(".check").attr("tabindex","-1")},details:function(a,b){var c,d=this.options.selection;d===b&&(c=d.single(),this.$el.toggleClass("details",c===this.model))},preventDefault:function(a){a.preventDefault()},imageSize:function(a){var c=this.model.get("sizes");return a=a||"medium",c&&c[a]?b.clone(c[a]):{url:this.model.get("url"),width:this.model.get("width"),height:this.model.get("height"),orientation:this.model.get("orientation")}},updateSetting:function(b){var c,d,e=a(b.target).closest("[data-setting]");e.length&&(c=e.data("setting"),d=b.target.value,this.model.get(c)!==d&&this.save(c,d))},save:function(){var b=this,c=this._save=this._save||{status:"ready"},d=this.model.save.apply(this.model,arguments),e=c.requests?a.when(d,c.requests):d;c.savedTimer&&clearTimeout(c.savedTimer),this.updateSave("waiting"),c.requests=e,e.always(function(){c.requests===e&&(b.updateSave("resolved"===e.state()?"complete":"error"),c.savedTimer=setTimeout(function(){b.updateSave("ready"),delete c.savedTimer},2e3))})},updateSave:function(a){var b=this._save=this._save||{status:"ready"};return a&&a!==b.status&&(this.$el.removeClass("save-"+b.status),b.status=a),this.$el.addClass("save-"+b.status),this},updateAll:function(){var c,d=this.$("[data-setting]"),e=this.model;c=b.chain(d).map(function(b){var c,d,f=a("input, textarea, select, [value]",b);if(f.length)return c=a(b).data("setting"),d=f.val(),e.get(c)!==d?[c,d]:void 0}).compact().object().value(),b.isEmpty(c)||e.save(c)},removeFromLibrary:function(a){a.stopPropagation(),this.collection.remove(this.model)},checkClickHandler:function(a){var b=this.options.selection;b&&(a.stopPropagation(),b.where({id:this.model.get("id")}).length?(b.remove(this.model),this.$el.focus()):b.add(this.model))}}),b.each({caption:"_syncCaption",title:"_syncTitle",artist:"_syncArtist",album:"_syncAlbum"},function(a,b){d.view.Attachment.prototype[a]=function(a,c){var d=this.$('[data-setting="'+b+'"]');return d.length?c===d.find("input, textarea, select, [value]").val()?this:this.render():this}}),d.view.Attachment.Library=d.view.Attachment.extend({buttons:{check:!0}}),d.view.Attachment.EditLibrary=d.view.Attachment.extend({buttons:{close:!0}}),d.view.Attachments=d.View.extend({tagName:"ul",className:"attachments",attributes:{tabIndex:-1},initialize:function(){this.el.id=b.uniqueId("__attachments-view-"),b.defaults(this.options,{refreshSensitivity:e?300:200,refreshThreshold:3,AttachmentView:d.view.Attachment,sortable:!1,resize:!0,idealColumnWidth:a(window).width()<640?135:150}),this._viewsByCid={},this.$window=a(window),this.resizeEvent="resize.media-modal-columns",this.collection.on("add",function(a){this.views.add(this.createAttachmentView(a),{at:this.collection.indexOf(a)})},this),this.collection.on("remove",function(a){var b=this._viewsByCid[a.cid];delete this._viewsByCid[a.cid],b&&b.remove()},this),this.collection.on("reset",this.render,this),this.listenTo(this.controller,"library:selection:add",this.attachmentFocus),this.scroll=b.chain(this.scroll).bind(this).throttle(this.options.refreshSensitivity).value(),this.options.scrollElement=this.options.scrollElement||this.el,a(this.options.scrollElement).on("scroll",this.scroll),this.initSortable(),b.bindAll(this,"setColumns"),this.options.resize&&(this.on("ready",this.bindEvents),this.controller.on("open",this.setColumns),b.defer(this.setColumns,this))},bindEvents:function(){this.$window.off(this.resizeEvent).on(this.resizeEvent,b.debounce(this.setColumns,50))},attachmentFocus:function(){this.$("li:first").focus()},restoreFocus:function(){this.$("li.selected:first").focus()},arrowEvent:function(a){var b=this.$el.children("li"),c=this.columns,d=b.filter(":focus").index(),e=c>=d+1?1:Math.ceil((d+1)/c);if(-1!==d){if(37===a.keyCode){if(0===d)return;b.eq(d-1).focus()}if(38===a.keyCode){if(1===e)return;b.eq(d-c).focus()}if(39===a.keyCode){if(b.length===d)return;b.eq(d+1).focus()}if(40===a.keyCode){if(Math.ceil(b.length/c)===e)return;b.eq(d+c).focus()}}},dispose:function(){this.collection.props.off(null,null,this),this.options.resize&&this.$window.off(this.resizeEvent),d.View.prototype.dispose.apply(this,arguments)},setColumns:function(){var a=this.columns,b=this.$el.width();b&&(this.columns=Math.min(Math.round(b/this.options.idealColumnWidth),12)||1,a&&a===this.columns||this.$el.closest(".media-frame-content").attr("data-columns",this.columns))},initSortable:function(){var c=this.collection;!e&&this.options.sortable&&a.fn.sortable&&(this.$el.sortable(b.extend({disabled:!!c.comparator,containment:this.$el,tolerance:"pointer",start:function(a,b){b.item.data("sortableIndexStart",b.item.index())},update:function(a,b){var d=c.at(b.item.data("sortableIndexStart")),e=c.comparator;delete c.comparator,c.remove(d,{silent:!0}),c.add(d,{silent:!0,at:b.item.index()}),c.comparator=e,c.trigger("reset",c),c.saveMenuOrder()}},this.options.sortable)),c.props.on("change:orderby",function(){this.$el.sortable("option","disabled",!!c.comparator)},this),this.collection.props.on("change:orderby",this.refreshSortable,this),this.refreshSortable())},refreshSortable:function(){if(!e&&this.options.sortable&&a.fn.sortable){var b=this.collection,c=b.props.get("orderby"),d="menuOrder"===c||!b.comparator;this.$el.sortable("option","disabled",!d)
+}},createAttachmentView:function(a){var b=new this.options.AttachmentView({controller:this.controller,model:a,collection:this.collection,selection:this.options.selection});return this._viewsByCid[a.cid]=b},prepare:function(){this.collection.length?this.views.set(this.collection.map(this.createAttachmentView,this)):(this.views.unset(),this.collection.more().done(this.scroll))},ready:function(){this.scroll()},scroll:function(){var b,c=this,d=this.options.scrollElement,e=d.scrollTop;d==document&&(d=document.body,e=a(document).scrollTop()),a(d).is(":visible")&&this.collection.hasMore()&&(b=this.views.parent.toolbar,d.scrollHeight-(e+d.clientHeight)<d.clientHeight/3&&b.get("spinner").show(),d.scrollHeight<e+d.clientHeight*this.options.refreshThreshold&&this.collection.more().done(function(){c.scroll(),b.get("spinner").hide()}))}}),d.view.Search=d.View.extend({tagName:"input",className:"search",id:"media-search-input",attributes:{type:"search",placeholder:c.search},events:{input:"search",keyup:"search",change:"search",search:"search"},render:function(){return this.el.value=this.model.escape("search"),this},search:function(a){a.target.value?this.model.set("search",a.target.value):this.model.unset("search")}}),d.view.AttachmentFilters=d.View.extend({tagName:"select",className:"attachment-filters",id:"media-attachment-filters",events:{change:"change"},keys:[],initialize:function(){this.createFilters(),b.extend(this.filters,this.options.filters),this.$el.html(b.chain(this.filters).map(function(b,c){return{el:a("<option></option>").val(c).html(b.text)[0],priority:b.priority||50}},this).sortBy("priority").pluck("el").value()),this.model.on("change",this.select,this),this.select()},createFilters:function(){this.filters={}},change:function(){var a=this.filters[this.el.value];a&&this.model.set(a.props)},select:function(){var a=this.model,c="all",d=a.toJSON();b.find(this.filters,function(a,e){var f=b.all(a.props,function(a,c){return a===(b.isUndefined(d[c])?null:d[c])});return f?c=e:void 0}),this.$el.val(c)}}),d.view.AttachmentFilters.Uploaded=d.view.AttachmentFilters.extend({createFilters:function(){var a,b=this.model.get("type"),e=d.view.settings.mimeTypes;e&&b&&(a=e[b]),this.filters={all:{text:a||c.allMediaItems,props:{uploadedTo:null,orderby:"date",order:"DESC"},priority:10},uploaded:{text:c.uploadedToThisPost,props:{uploadedTo:d.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20}}}}),d.view.AttachmentFilters.All=d.view.AttachmentFilters.extend({createFilters:function(){var a={};b.each(d.view.settings.mimeTypes||{},function(b,c){a[c]={text:b,props:{status:null,type:c,uploadedTo:null,orderby:"date",order:"DESC"}}}),a.all={text:c.allMediaItems,props:{status:null,type:null,uploadedTo:null,orderby:"date",order:"DESC"},priority:10},d.view.settings.post.id&&(a.uploaded={text:c.uploadedToThisPost,props:{status:null,type:null,uploadedTo:d.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20}),a.unattached={text:c.unattached,props:{status:null,uploadedTo:0,type:null,orderby:"menuOrder",order:"ASC"},priority:50},d.view.settings.mediaTrash&&this.controller.isModeActive("grid")&&(a.trash={text:c.trash,props:{uploadedTo:null,status:"trash",type:null,orderby:"date",order:"DESC"},priority:50}),this.filters=a}}),d.view.AttachmentsBrowser=d.View.extend({tagName:"div",className:"attachments-browser",initialize:function(){b.defaults(this.options,{filters:!1,search:!0,display:!1,sidebar:!0,AttachmentView:d.view.Attachment.Library}),this.listenTo(this.controller,"toggle:upload:attachment",b.bind(this.toggleUploader,this)),this.createToolbar(),this.options.sidebar&&this.createSidebar(),this.createUploader(),this.createAttachments(),this.updateContent(),this.options.sidebar&&"errors"!==this.options.sidebar||(this.$el.addClass("hide-sidebar"),"errors"===this.options.sidebar&&this.$el.addClass("sidebar-for-errors")),this.collection.on("add remove reset",this.updateContent,this)},dispose:function(){return this.options.selection.off(null,null,this),d.View.prototype.dispose.apply(this,arguments),this},createToolbar:function(){var b,e,f;f={controller:this.controller},this.controller.isModeActive("grid")&&(f.className="media-toolbar wp-filter"),this.toolbar=new d.view.Toolbar(f),this.views.add(this.toolbar),this.toolbar.set("spinner",new d.view.Spinner({priority:-60})),-1!==a.inArray(this.options.filters,["uploaded","all"])&&(this.toolbar.set("filtersLabel",new d.view.Label({value:c.filterByType,attributes:{"for":"media-attachment-filters"},priority:-80}).render()),"uploaded"===this.options.filters?this.toolbar.set("filters",new d.view.AttachmentFilters.Uploaded({controller:this.controller,model:this.collection.props,priority:-80}).render()):(e=new d.view.AttachmentFilters.All({controller:this.controller,model:this.collection.props,priority:-80}),this.toolbar.set("filters",e.render()))),this.controller.isModeActive("grid")&&(b=d.View.extend({className:"view-switch media-grid-view-switch",template:d.template("media-library-view-switcher")}),this.toolbar.set("libraryViewSwitcher",new b({controller:this.controller,priority:-90}).render()),this.toolbar.set("dateFilterLabel",new d.view.Label({value:c.filterByDate,attributes:{"for":"media-attachment-date-filters"},priority:-75}).render()),this.toolbar.set("dateFilter",new d.view.DateFilter({controller:this.controller,model:this.collection.props,priority:-75}).render()),this.toolbar.set("selectModeToggleButton",new d.view.SelectModeToggleButton({text:c.bulkSelect,controller:this.controller,priority:-70}).render()),this.toolbar.set("deleteSelectedButton",new d.view.DeleteSelectedButton({filters:e,style:"primary",disabled:!0,text:d.view.settings.mediaTrash?c.trashSelected:c.deleteSelected,controller:this.controller,priority:-60,click:function(){var b=[],e=[],f=this,g=this.controller.state().get("selection"),h=this.controller.state().get("library");g.length&&(d.view.settings.mediaTrash||confirm(c.warnBulkDelete))&&(!d.view.settings.mediaTrash||"trash"===g.at(0).get("status")||confirm(c.warnBulkTrash))&&(g.each(function(a){return a.get("nonces")["delete"]?void(d.view.settings.mediaTrash&&"trash"===a.get("status")?(a.set("status","inherit"),b.push(a.save()),e.push(a)):d.view.settings.mediaTrash?(a.set("status","trash"),b.push(a.save()),e.push(a)):a.destroy()):void e.push(a)}),b.length?(g.remove(e),a.when.apply(null,b).then(function(){h._requery(!0),f.controller.trigger("selection:action:done")})):this.controller.trigger("selection:action:done"))}}).render())),this.options.search&&(this.toolbar.set("searchLabel",new d.view.Label({value:c.searchMediaLabel,attributes:{"for":"media-search-input"},priority:60}).render()),this.toolbar.set("search",new d.view.Search({controller:this.controller,model:this.collection.props,priority:60}).render())),this.options.dragInfo&&this.toolbar.set("dragInfo",new d.View({el:a('<div class="instructions">'+c.dragInfo+"</div>")[0],priority:-40})),this.options.suggestedWidth&&this.options.suggestedHeight&&this.toolbar.set("suggestedDimensions",new d.View({el:a('<div class="instructions">'+c.suggestedDimensions+" "+this.options.suggestedWidth+" &times; "+this.options.suggestedHeight+"</div>")[0],priority:-40}))},updateContent:function(){var a,b=this;a=this.controller.isModeActive("grid")?b.attachmentsNoResults:b.uploader,this.collection.length?(a.$el.addClass("hidden"),b.toolbar.get("spinner").hide()):(this.toolbar.get("spinner").show(),this.dfd=this.collection.more().done(function(){b.collection.length?a.$el.addClass("hidden"):a.$el.removeClass("hidden"),b.toolbar.get("spinner").hide()}))},createUploader:function(){this.uploader=new d.view.UploaderInline({controller:this.controller,status:!1,message:this.controller.isModeActive("grid")?"":c.noItemsFound,canClose:this.controller.isModeActive("grid")}),this.uploader.hide(),this.views.add(this.uploader)},toggleUploader:function(){this.uploader.$el.hasClass("hidden")?this.uploader.show():this.uploader.hide()},createAttachments:function(){this.attachments=new d.view.Attachments({controller:this.controller,collection:this.collection,selection:this.options.selection,model:this.model,sortable:this.options.sortable,scrollElement:this.options.scrollElement,idealColumnWidth:this.options.idealColumnWidth,AttachmentView:this.options.AttachmentView}),this.attachments.listenTo(this.controller,"attachment:keydown:arrow",this.attachments.arrowEvent),this.attachments.listenTo(this.controller,"attachment:details:shift-tab",this.attachments.restoreFocus),this.views.add(this.attachments),this.controller.isModeActive("grid")&&(this.attachmentsNoResults=new d.View({controller:this.controller,tagName:"p"}),this.attachmentsNoResults.$el.addClass("hidden no-media"),this.attachmentsNoResults.$el.html(c.noMedia),this.views.add(this.attachmentsNoResults))},createSidebar:function(){var a=this.options,b=a.selection,c=this.sidebar=new d.view.Sidebar({controller:this.controller});this.views.add(c),this.controller.uploader&&c.set("uploads",new d.view.UploaderStatus({controller:this.controller,priority:40})),b.on("selection:single",this.createSingle,this),b.on("selection:unsingle",this.disposeSingle,this),b.single()&&this.createSingle()},createSingle:function(){var a=this.sidebar,b=this.options.selection.single();a.set("details",new d.view.Attachment.Details({controller:this.controller,model:b,priority:80})),a.set("compat",new d.view.AttachmentCompat({controller:this.controller,model:b,priority:120})),this.options.display&&a.set("display",new d.view.Settings.AttachmentDisplay({controller:this.controller,model:this.model.display(b),attachment:b,priority:160,userSettings:this.model.get("displayUserSettings")})),"insert"===this.model.id&&a.$el.addClass("visible")},disposeSingle:function(){var a=this.sidebar;a.unset("details"),a.unset("compat"),a.unset("display"),a.$el.removeClass("visible")}}),d.view.Selection=d.View.extend({tagName:"div",className:"media-selection",template:d.template("media-selection"),events:{"click .edit-selection":"edit","click .clear-selection":"clear"},initialize:function(){b.defaults(this.options,{editable:!1,clearable:!0}),this.attachments=new d.view.Attachments.Selection({controller:this.controller,collection:this.collection,selection:this.collection,model:new Backbone.Model}),this.views.set(".selection-view",this.attachments),this.collection.on("add remove reset",this.refresh,this),this.controller.on("content:activate",this.refresh,this)},ready:function(){this.refresh()},refresh:function(){if(this.$el.children().length){var a=this.collection,b="edit-selection"===this.controller.content.mode();this.$el.toggleClass("empty",!a.length),this.$el.toggleClass("one",1===a.length),this.$el.toggleClass("editing",b),this.$(".count").text(c.selected.replace("%d",a.length))}},edit:function(a){a.preventDefault(),this.options.editable&&this.options.editable.call(this,this.collection)},clear:function(a){a.preventDefault(),this.collection.reset(),this.controller.modal.focusManager.focus()}}),d.view.Attachment.Selection=d.view.Attachment.extend({className:"attachment selection",toggleSelection:function(){this.options.selection.single(this.model)}}),d.view.Attachments.Selection=d.view.Attachments.extend({events:{},initialize:function(){return b.defaults(this.options,{sortable:!0,resize:!1,AttachmentView:d.view.Attachment.Selection}),d.view.Attachments.prototype.initialize.apply(this,arguments)}}),d.view.Attachment.EditSelection=d.view.Attachment.Selection.extend({buttons:{close:!0}}),d.view.Settings=d.View.extend({events:{"click button":"updateHandler","change input":"updateHandler","change select":"updateHandler","change textarea":"updateHandler"},initialize:function(){this.model=this.model||new Backbone.Model,this.model.on("change",this.updateChanges,this)},prepare:function(){return b.defaults({model:this.model.toJSON()},this.options)},render:function(){return d.View.prototype.render.apply(this,arguments),b(this.model.attributes).chain().keys().each(this.update,this),this},update:function(a){var b,c,d=this.model.get(a),e=this.$('[data-setting="'+a+'"]');e.length&&(e.is("select")?(c=e.find('[value="'+d+'"]'),c.length?(e.find("option").prop("selected",!1),c.prop("selected",!0)):this.model.set(a,e.find(":selected").val())):e.hasClass("button-group")?(b=e.find("button").removeClass("active"),b.filter('[value="'+d+'"]').addClass("active")):e.is('input[type="text"], textarea')?e.is(":focus")||e.val(d):e.is('input[type="checkbox"]')&&e.prop("checked",!!d&&"false"!==d))},updateHandler:function(b){var c,d=a(b.target).closest("[data-setting]"),e=b.target.value;b.preventDefault(),d.length&&(d.is('input[type="checkbox"]')&&(e=d[0].checked),this.model.set(d.data("setting"),e),(c=d.data("userSetting"))&&setUserSetting(c,e))},updateChanges:function(a){a.hasChanged()&&b(a.changed).chain().keys().each(this.update,this)}}),d.view.Settings.AttachmentDisplay=d.view.Settings.extend({className:"attachment-display-settings",template:d.template("attachment-display-settings"),initialize:function(){var a=this.options.attachment;b.defaults(this.options,{userSettings:!1}),d.view.Settings.prototype.initialize.apply(this,arguments),this.model.on("change:link",this.updateLinkTo,this),a&&a.on("change:uploading",this.render,this)},dispose:function(){var a=this.options.attachment;a&&a.off(null,null,this),d.view.Settings.prototype.dispose.apply(this,arguments)},render:function(){var a=this.options.attachment;return a&&b.extend(this.options,{sizes:a.get("sizes"),type:a.get("type")}),d.view.Settings.prototype.render.call(this),this.updateLinkTo(),this},updateLinkTo:function(){var a=this.model.get("link"),b=this.$(".link-to-custom"),c=this.options.attachment;return"none"===a||"embed"===a||!c&&"custom"!==a?void b.addClass("hidden"):(c&&("post"===a?b.val(c.get("link")):"file"===a?b.val(c.get("url")):this.model.get("linkUrl")||b.val("http://"),b.prop("readonly","custom"!==a)),b.removeClass("hidden"),void(!e&&b.is(":visible")&&b.focus()[0].select()))}}),d.view.Settings.Gallery=d.view.Settings.extend({className:"collection-settings gallery-settings",template:d.template("gallery-settings")}),d.view.Settings.Playlist=d.view.Settings.extend({className:"collection-settings playlist-settings",template:d.template("playlist-settings")}),d.view.Attachment.Details=d.view.Attachment.extend({tagName:"div",className:"attachment-details",template:d.template("attachment-details"),events:{"change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .delete-attachment":"deleteAttachment","click .trash-attachment":"trashAttachment","click .untrash-attachment":"untrashAttachment","click .edit-attachment":"editAttachment","click .refresh-attachment":"refreshAttachment",keydown:"toggleSelectionHandler"},initialize:function(){this.options=b.defaults(this.options,{rerenderOnModelChange:!1}),this.on("ready",this.initialFocus),d.view.Attachment.prototype.initialize.apply(this,arguments)},initialFocus:function(){e||this.$(":input").eq(0).focus()},deleteAttachment:function(a){a.preventDefault(),confirm(c.warnDelete)&&(this.model.destroy(),this.controller.modal.focusManager.focus())},trashAttachment:function(a){var b=this.controller.library;a.preventDefault(),d.view.settings.mediaTrash&&"edit-metadata"===this.controller.content.mode()?(this.model.set("status","trash"),this.model.save().done(function(){b._requery(!0)})):this.model.destroy()},untrashAttachment:function(a){var b=this.controller.library;a.preventDefault(),this.model.set("status","inherit"),this.model.save().done(function(){b._requery(!0)})},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b?(a.preventDefault(),b.set("image",this.model),this.controller.setState("edit-image")):this.$el.addClass("needs-refresh")},refreshAttachment:function(a){this.$el.removeClass("needs-refresh"),a.preventDefault(),this.model.fetch()},toggleSelectionHandler:function(a){return"keydown"===a.type&&9===a.keyCode&&a.shiftKey&&a.target===this.$(":tabbable").get(0)?(this.controller.trigger("attachment:details:shift-tab",a),!1):37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode?void this.controller.trigger("attachment:keydown:arrow",a):void 0}}),d.view.AttachmentCompat=d.View.extend({tagName:"form",className:"compat-item",events:{submit:"preventDefault","change input":"save","change select":"save","change textarea":"save"},initialize:function(){this.model.on("change:compat",this.render,this)},dispose:function(){return this.$(":focus").length&&this.save(),d.View.prototype.dispose.apply(this,arguments)},render:function(){var a=this.model.get("compat");if(a&&a.item)return this.views.detach(),this.$el.html(a.item),this.views.render(),this},preventDefault:function(a){a.preventDefault()},save:function(a){var c={};a&&a.preventDefault(),b.each(this.$el.serializeArray(),function(a){c[a.name]=a.value}),this.model.saveCompat(c)}}),d.view.Iframe=d.View.extend({className:"media-iframe",render:function(){return this.views.detach(),this.$el.html('<iframe src="'+this.controller.state().get("src")+'" />'),this.views.render(),this}}),d.view.Embed=d.View.extend({className:"media-embed",initialize:function(){this.url=new d.view.EmbedUrl({controller:this.controller,model:this.model.props}).render(),this.views.set([this.url]),this.refresh(),this.model.on("change:type",this.refresh,this),this.model.on("change:loading",this.loading,this)},settings:function(a){this._settings&&this._settings.remove(),this._settings=a,this.views.add(a)},refresh:function(){var a,b=this.model.get("type");if("image"===b)a=d.view.EmbedImage;else{if("link"!==b)return;a=d.view.EmbedLink}this.settings(new a({controller:this.controller,model:this.model.props,priority:40}))},loading:function(){this.$el.toggleClass("embed-loading",this.model.get("loading"))}}),d.view.Label=d.View.extend({tagName:"label",className:"screen-reader-text",initialize:function(){this.value=this.options.value},render:function(){return this.$el.html(this.value),this}}),d.view.EmbedUrl=d.View.extend({tagName:"label",className:"embed-url",events:{input:"url",keyup:"url",change:"url"},initialize:function(){var c=this;this.$input=a('<input id="embed-url-field" type="url" />').val(this.model.get("url")),this.input=this.$input[0],this.spinner=a('<span class="spinner" />')[0],this.$el.append([this.input,this.spinner]),this.model.on("change:url",this.render,this),this.model.get("url")&&b.delay(function(){c.model.trigger("change:url")},500)},render:function(){var a=this.$input;if(!a.is(":focus"))return this.input.value=this.model.get("url")||"http://",d.View.prototype.render.apply(this,arguments),this},ready:function(){e||this.focus()},url:function(a){this.model.set("url",a.target.value)},focus:function(){var a=this.$input;a.is(":visible")&&a.focus()[0].select()}}),d.view.EmbedLink=d.view.Settings.extend({className:"embed-link-settings",template:d.template("embed-link-settings"),initialize:function(){this.spinner=a('<span class="spinner" />'),this.$el.append(this.spinner[0]),this.listenTo(this.model,"change:url",this.updateoEmbed)},updateoEmbed:function(){var a=this.model.get("url");this.$(".setting.title").show(),this.$(".embed-container").hide().find(".embed-preview").html(""),a&&a.length<6||(this.spinner.show(),setTimeout(b.bind(this.fetch,this),500))},fetch:function(){a("#embed-url-field").val()===this.model.get("url")&&wp.ajax.send("parse-embed",{data:{post_ID:d.view.settings.post.id,shortcode:"[embed]"+this.model.get("url")+"[/embed]"}}).done(b.bind(this.renderoEmbed,this))},renderoEmbed:function(a){var b=a&&a.body||"";this.spinner.hide(),this.$(".setting.title").hide(),this.$(".embed-container").show().find(".embed-preview").html(b)}}),d.view.EmbedImage=d.view.Settings.AttachmentDisplay.extend({className:"embed-media-settings",template:d.template("embed-image-settings"),initialize:function(){d.view.Settings.AttachmentDisplay.prototype.initialize.apply(this,arguments),this.model.on("change:url",this.updateImage,this)},updateImage:function(){this.$("img").attr("src",this.model.get("url"))}}),d.view.ImageDetails=d.view.Settings.AttachmentDisplay.extend({className:"image-details",template:d.template("image-details"),events:b.defaults(d.view.Settings.AttachmentDisplay.prototype.events,{"click .edit-attachment":"editAttachment","click .replace-attachment":"replaceAttachment","click .advanced-toggle":"onToggleAdvanced",'change [data-setting="customWidth"]':"onCustomSize",'change [data-setting="customHeight"]':"onCustomSize",'keyup [data-setting="customWidth"]':"onCustomSize",'keyup [data-setting="customHeight"]':"onCustomSize"}),initialize:function(){this.options.attachment=this.model.attachment,this.listenTo(this.model,"change:url",this.updateUrl),this.listenTo(this.model,"change:link",this.toggleLinkSettings),this.listenTo(this.model,"change:size",this.toggleCustomSize),d.view.Settings.AttachmentDisplay.prototype.initialize.apply(this,arguments)},prepare:function(){var a=!1;return this.model.attachment&&(a=this.model.attachment.toJSON()),b.defaults({model:this.model.toJSON(),attachment:a},this.options)},render:function(){var a=this,b=arguments;return this.model.attachment&&"pending"===this.model.dfd.state()?this.model.dfd.done(function(){d.view.Settings.AttachmentDisplay.prototype.render.apply(a,b),a.postRender()}).fail(function(){a.model.attachment=!1,d.view.Settings.AttachmentDisplay.prototype.render.apply(a,b),a.postRender()}):(d.view.Settings.AttachmentDisplay.prototype.render.apply(this,arguments),this.postRender()),this},postRender:function(){setTimeout(b.bind(this.resetFocus,this),10),this.toggleLinkSettings(),"show"===getUserSetting("advImgDetails")&&this.toggleAdvanced(!0),this.trigger("post-render")},resetFocus:function(){this.$(".link-to-custom").blur(),this.$(".embed-media-settings").scrollTop(0)},updateUrl:function(){this.$(".image img").attr("src",this.model.get("url")),this.$(".url").val(this.model.get("url"))},toggleLinkSettings:function(){"none"===this.model.get("link")?this.$(".link-settings").addClass("hidden"):this.$(".link-settings").removeClass("hidden")},toggleCustomSize:function(){"custom"!==this.model.get("size")?this.$(".custom-size").addClass("hidden"):this.$(".custom-size").removeClass("hidden")},onCustomSize:function(b){var c,d=a(b.target).data("setting"),e=a(b.target).val();return!/^\d+/.test(e)||parseInt(e,10)<1?void b.preventDefault():void("customWidth"===d?(c=Math.round(1/this.model.get("aspectRatio")*e),this.model.set("customHeight",c,{silent:!0}),this.$('[data-setting="customHeight"]').val(c)):(c=Math.round(this.model.get("aspectRatio")*e),this.model.set("customWidth",c,{silent:!0}),this.$('[data-setting="customWidth"]').val(c)))},onToggleAdvanced:function(a){a.preventDefault(),this.toggleAdvanced()},toggleAdvanced:function(a){var b,c=this.$el.find(".advanced-section");c.hasClass("advanced-visible")||a===!1?(c.removeClass("advanced-visible"),c.find(".advanced-settings").addClass("hidden"),b="hide"):(c.addClass("advanced-visible"),c.find(".advanced-settings").removeClass("hidden"),b="show"),setUserSetting("advImgDetails",b)},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b&&(a.preventDefault(),b.set("image",this.model.attachment),this.controller.setState("edit-image"))},replaceAttachment:function(a){a.preventDefault(),this.controller.setState("replace-image")}}),d.view.Cropper=d.View.extend({className:"crop-content",template:d.template("crop-content"),initialize:function(){b.bindAll(this,"onImageLoad")},ready:function(){this.controller.frame.on("content:error:crop",this.onError,this),this.$image=this.$el.find(".crop-image"),this.$image.on("load",this.onImageLoad),a(window).on("resize.cropper",b.debounce(this.onImageLoad,250))},remove:function(){a(window).off("resize.cropper"),this.$el.remove(),this.$el.off(),wp.media.View.prototype.remove.apply(this,arguments)},prepare:function(){return{title:c.cropYourImage,url:this.options.attachment.get("url")}},onImageLoad:function(){var a=this.controller.get("imgSelectOptions");"function"==typeof a&&(a=a(this.options.attachment,this.controller)),a=b.extend(a,{parent:this.$el}),this.trigger("image-loaded"),this.controller.imgSelect=this.$image.imgAreaSelect(a)},onError:function(){var a=this.options.attachment.get("filename");this.views.add(".upload-errors",new d.view.UploaderStatusError({filename:d.view.UploaderStatus.prototype.filename(a),message:_wpMediaViewsL10n.cropError}),{at:0})}}),d.view.EditImage=d.View.extend({className:"image-editor",template:d.template("image-editor"),initialize:function(a){this.editor=window.imageEdit,this.controller=a.controller,d.View.prototype.initialize.apply(this,arguments)},prepare:function(){return this.model.toJSON()},render:function(){return d.View.prototype.render.apply(this,arguments),this},loadEditor:function(){var a=this.editor.open(this.model.get("id"),this.model.get("nonces").edit,this);a.done(b.bind(this.focus,this))},focus:function(){this.$(".imgedit-submit .button").eq(0).focus()},back:function(){var a=this.controller.lastState();this.controller.setState(a)},refresh:function(){this.model.fetch()},save:function(){var a=this,b=this.controller.lastState();this.model.fetch().done(function(){a.controller.setState(b)})}}),d.view.Spinner=d.View.extend({tagName:"span",className:"spinner",spinnerTimeout:!1,delay:400,show:function(){return this.spinnerTimeout||(this.spinnerTimeout=b.delay(function(a){a.show()},this.delay,this.$el)),this},hide:function(){return this.$el.hide(),this.spinnerTimeout=clearTimeout(this.spinnerTimeout),this}})}(jQuery,_);=======
 !function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b){var c,d=wp.media.model.Selection,e=wp.media.controller.Library;c=e.extend({defaults:_.defaults({multiple:"add",filterable:"uploaded",priority:100,syncSelection:!1},e.prototype.defaults),initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-library"),this.set("toolbar",a+"-add"),this.set("menu",a),this.get("library")||this.set("library",wp.media.query({type:this.get("type")})),e.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.get("editLibrary"),c=this.frame.state(this.get("collectionType")+"-edit").get("library");b&&b!==c&&a.unobserve(b),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!c.get(a.cid)&&d.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(c),this.set("editLibrary",c),e.prototype.activate.apply(this,arguments)}}),b.exports=c},{}],2:[function(a,b){var c,d=wp.media.controller.Library,e=wp.media.view.l10n,f=jQuery;c=d.extend({defaults:{multiple:!1,sortable:!0,date:!1,searchable:!1,content:"browse",describe:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,SettingsView:!1,syncSelection:!1},initialize:function(){var a=this.get("collectionType");"video"===this.get("type")&&(a="video-"+a),this.set("id",a+"-edit"),this.set("toolbar",a+"-edit"),this.get("library")||this.set("library",new wp.media.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",wp.media.view.Attachment.EditLibrary),d.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type",this.get("type")),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.renderSettings,this),d.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.renderSettings,this),d.prototype.deactivate.apply(this,arguments)},renderSettings:function(a){var b=this.get("library"),c=this.get("collectionType"),d=this.get("dragInfoText"),g=this.get("SettingsView"),h={};b&&a&&(b[c]=b[c]||new Backbone.Model,h[c]=new g({controller:this,model:b[c],priority:40}),a.sidebar.set(h),d&&a.toolbar.set("dragInfo",new wp.media.View({el:f('<div class="instructions">'+d+"</div>")[0],priority:-40})),a.toolbar.set("reverse",{text:e.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}),b.exports=c},{}],3:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.controller.State.extend({defaults:{id:"cropper",title:d.cropImage,toolbar:"crop",content:"crop",router:!1,canSkipCrop:!1},activate:function(){this.frame.on("content:create:crop",this.createCropContent,this),this.frame.on("close",this.removeCropper,this),this.set("selection",new Backbone.Collection(this.frame._selection.single))},deactivate:function(){this.frame.toolbar.mode("browse")},createCropContent:function(){this.cropperView=new wp.media.view.Cropper({controller:this,attachment:this.get("selection").first()}),this.cropperView.on("image-loaded",this.createCropToolbar,this),this.frame.content.set(this.cropperView)},removeCropper:function(){this.imgSelect.cancelSelection(),this.imgSelect.setOptions({remove:!0}),this.imgSelect.update(),this.cropperView.remove()},createCropToolbar:function(){var a,b;a=this.get("canSkipCrop")||!1,b={controller:this.frame,items:{insert:{style:"primary",text:d.cropImage,priority:80,requires:{library:!1,selection:!1},click:function(){var a,b=this.controller;a=b.state().get("selection").first(),a.set({cropDetails:b.state().imgSelect.getSelection()}),this.$el.text(d.cropping),this.$el.attr("disabled",!0),b.state().doCrop(a).done(function(a){b.trigger("cropped",a),b.close()}).fail(function(){b.trigger("content:error:crop")})}}}},a&&_.extend(b.items,{skip:{style:"secondary",text:d.skipCropping,priority:70,requires:{library:!1,selection:!1},click:function(){var a=this.controller.state().get("selection").first();this.controller.state().cropperView.remove(),this.controller.trigger("skippedcrop",a),this.controller.close()}}}),this.frame.toolbar.set(new wp.media.view.Toolbar(b))},doCrop:function(a){return wp.ajax.post("custom-header-crop",{nonce:a.get("nonces").edit,id:a.get("id"),cropDetails:a.get("cropDetails")})}}),b.exports=c},{}],4:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.controller.State.extend({defaults:{id:"edit-image",title:d.editImage,menu:!1,toolbar:"edit-image",content:"edit-image",url:""},activate:function(){this.listenTo(this.frame,"toolbar:render:edit-image",this.toolbar)},deactivate:function(){this.stopListening(this.frame)},toolbar:function(){var a=this.frame,b=a.lastState(),c=b&&b.id;a.toolbar.set(new wp.media.view.Toolbar({controller:a,items:{back:{style:"primary",text:d.back,priority:20,click:function(){c?a.setState(c):a.close()}}}}))}}),b.exports=c},{}],5:[function(a,b){var c,d=wp.media.view.l10n,e=Backbone.$;c=wp.media.controller.State.extend({defaults:{id:"embed",title:d.insertFromUrlTitle,content:"embed",menu:"default",toolbar:"main-embed",priority:120,type:"link",url:"",metadata:{}},sensitivity:200,initialize:function(a){this.metadata=a.metadata,this.debouncedScan=_.debounce(_.bind(this.scan,this),this.sensitivity),this.props=new Backbone.Model(this.metadata||{url:""}),this.props.on("change:url",this.debouncedScan,this),this.props.on("change:url",this.refresh,this),this.on("scan",this.scanImage,this)},scan:function(){var a,b=this,c={type:"link",scanners:[]};this.props.get("url")&&this.trigger("scan",c),c.scanners.length?(a=c.scanners=e.when.apply(e,c.scanners),a.always(function(){b.get("scanners")===a&&b.set("loading",!1)})):c.scanners=null,c.loading=!!c.scanners,this.set(c)},scanImage:function(a){var b=this.frame,c=this,d=this.props.get("url"),f=new Image,g=e.Deferred();a.scanners.push(g.promise()),f.onload=function(){g.resolve(),c===b.state()&&d===c.props.get("url")&&(c.set({type:"image"}),c.props.set({width:f.width,height:f.height}))},f.onerror=g.reject,f.src=d},refresh:function(){this.frame.toolbar.get().refresh()},reset:function(){this.props.clear().set({url:""}),this.active&&this.refresh()}}),b.exports=c},{}],6:[function(a,b){var c,d=wp.media.model.Attachment,e=wp.media.controller.Library,f=wp.media.view.l10n;c=e.extend({defaults:_.defaults({id:"featured-image",title:f.setFeaturedImageTitle,multiple:!1,filterable:"uploaded",toolbar:"featured-image",priority:60,syncSelection:!0},e.prototype.defaults),initialize:function(){var a,b;this.get("library")||this.set("library",wp.media.query({type:"image"})),e.prototype.initialize.apply(this,arguments),a=this.get("library"),b=a.comparator,a.comparator=function(a,c){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(c.cid);return!d&&e?-1:d&&!e?1:b.apply(this,arguments)},a.observe(this.get("selection"))},activate:function(){this.updateSelection(),this.frame.on("open",this.updateSelection,this),e.prototype.activate.apply(this,arguments)},deactivate:function(){this.frame.off("open",this.updateSelection,this),e.prototype.deactivate.apply(this,arguments)},updateSelection:function(){var a,b=this.get("selection"),c=wp.media.view.settings.post.featuredImageId;""!==c&&-1!==c&&(a=d.get(c),a.fetch()),b.reset(a?[a]:[])}}),b.exports=c},{}],7:[function(a,b){var c,d=wp.media.model.Selection,e=wp.media.controller.Library,f=wp.media.view.l10n;c=e.extend({defaults:_.defaults({id:"gallery-library",title:f.addToGalleryTitle,multiple:"add",filterable:"uploaded",menu:"gallery",toolbar:"gallery-add",priority:100,syncSelection:!1},e.prototype.defaults),initialize:function(){this.get("library")||this.set("library",wp.media.query({type:"image"})),e.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library"),b=this.frame.state("gallery-edit").get("library");this.editLibrary&&this.editLibrary!==b&&a.unobserve(this.editLibrary),a.validator=function(a){return!!this.mirroring.get(a.cid)&&!b.get(a.cid)&&d.prototype.validator.apply(this,arguments)},a.reset(a.mirroring.models,{silent:!0}),a.observe(b),this.editLibrary=b,e.prototype.activate.apply(this,arguments)}}),b.exports=c},{}],8:[function(a,b){var c,d=wp.media.controller.Library,e=wp.media.view.l10n;c=d.extend({defaults:{id:"gallery-edit",title:e.editGalleryTitle,multiple:!1,searchable:!1,sortable:!0,date:!1,display:!1,content:"browse",toolbar:"gallery-edit",describe:!0,displaySettings:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,syncSelection:!1},initialize:function(){this.get("library")||this.set("library",new wp.media.model.Selection),this.get("AttachmentView")||this.set("AttachmentView",wp.media.view.Attachment.EditLibrary),d.prototype.initialize.apply(this,arguments)},activate:function(){var a=this.get("library");a.props.set("type","image"),this.get("library").observe(wp.Uploader.queue),this.frame.on("content:render:browse",this.gallerySettings,this),d.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue),this.frame.off("content:render:browse",this.gallerySettings,this),d.prototype.deactivate.apply(this,arguments)},gallerySettings:function(a){if(this.get("displaySettings")){var b=this.get("library");b&&a&&(b.gallery=b.gallery||new Backbone.Model,a.sidebar.set({gallery:new wp.media.view.Settings.Gallery({controller:this,model:b.gallery,priority:40})}),a.toolbar.set("reverse",{text:e.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}}),b.exports=c},{}],9:[function(a,b){var c,d=wp.media.controller.State,e=wp.media.controller.Library,f=wp.media.view.l10n;c=d.extend({defaults:_.defaults({id:"image-details",title:f.imageDetailsTitle,content:"image-details",menu:!1,router:!1,toolbar:"image-details",editing:!1,priority:60},e.prototype.defaults),initialize:function(a){this.image=a.image,d.prototype.initialize.apply(this,arguments)},activate:function(){this.frame.modal.$el.addClass("image-details")}}),b.exports=c},{}],10:[function(a,b){var c,d=wp.media.view.l10n,e=window.getUserSetting,f=window.setUserSetting;c=wp.media.controller.State.extend({defaults:{id:"library",title:d.mediaLibraryTitle,multiple:!1,content:"upload",menu:"default",router:"browse",toolbar:"select",searchable:!0,filterable:!1,sortable:!0,autoSelect:!0,describe:!1,contentUserSetting:!0,syncSelection:!0},initialize:function(){var a,b=this.get("selection");this.get("library")||this.set("library",wp.media.query()),b instanceof wp.media.model.Selection||(a=b,a||(a=this.get("library").props.toJSON(),a=_.omit(a,"orderby","query")),this.set("selection",new wp.media.model.Selection(null,{multiple:this.get("multiple"),props:a}))),this.resetDisplays()},activate:function(){this.syncSelection(),wp.Uploader.queue.on("add",this.uploading,this),this.get("selection").on("add remove reset",this.refreshContent,this),this.get("router")&&this.get("contentUserSetting")&&(this.frame.on("content:activate",this.saveContentMode,this),this.set("content",e("libraryContent",this.get("content"))))},deactivate:function(){this.recordSelection(),this.frame.off("content:activate",this.saveContentMode,this),this.get("selection").off(null,null,this),wp.Uploader.queue.off(null,null,this)},reset:function(){this.get("selection").reset(),this.resetDisplays(),this.refreshContent()},resetDisplays:function(){var a=wp.media.view.settings.defaultProps;this._displays=[],this._defaultDisplaySettings={align:a.align||e("align","none"),size:a.size||e("imgsize","medium"),link:a.link||e("urlbutton","file")}},display:function(a){var b=this._displays;return b[a.cid]||(b[a.cid]=new Backbone.Model(this.defaultDisplaySettings(a))),b[a.cid]},defaultDisplaySettings:function(a){var b=this._defaultDisplaySettings;return(b.canEmbed=this.canEmbed(a))&&(b.link="embed"),b},canEmbed:function(a){if(!a.get("uploading")){var b=a.get("type");if("audio"!==b&&"video"!==b)return!1}return _.contains(wp.media.view.settings.embedExts,a.get("filename").split(".").pop())},refreshContent:function(){var a=this.get("selection"),b=this.frame,c=b.router.get(),d=b.content.mode();this.active&&!a.length&&c&&!c.get(d)&&this.frame.content.render(this.get("content"))},uploading:function(a){var b=this.frame.content;"upload"===b.mode()&&this.frame.content.mode("browse"),this.get("autoSelect")&&(this.get("selection").add(a),this.frame.trigger("library:selection:add"))},saveContentMode:function(){if("browse"===this.get("router")){var a=this.frame.content.mode(),b=this.frame.router.get();b&&b.get(a)&&f("libraryContent",a)}}}),_.extend(c.prototype,wp.media.selectionSync),b.exports=c},{}],11:[function(a,b){var c,d=wp.media.controller.Library;c=d.extend({defaults:_.defaults({filterable:"uploaded",displaySettings:!1,priority:80,syncSelection:!1},d.prototype.defaults),initialize:function(a){this.media=a.media,this.type=a.type,this.set("library",wp.media.query({type:this.type})),d.prototype.initialize.apply(this,arguments)},activate:function(){wp.media.frame.lastMime&&(this.set("library",wp.media.query({type:wp.media.frame.lastMime})),delete wp.media.frame.lastMime),d.prototype.activate.apply(this,arguments)}}),b.exports=c},{}],12:[function(a,b){var c=function(a){_.extend(this,_.pick(a||{},"id","view","selector"))};c.extend=Backbone.Model.extend,_.extend(c.prototype,{mode:function(a){return a?a===this._mode?this:(this.trigger("deactivate"),this._mode=a,this.render(a),this.trigger("activate"),this):this._mode},render:function(a){if(a&&a!==this._mode)return this.mode(a);var b,c={view:null};return this.trigger("create",c),b=c.view,this.trigger("render",b),b&&this.set(b),this},get:function(){return this.view.views.first(this.selector)},set:function(a,b){return b&&(b.add=!1),this.view.views.set(this.selector,a,b)},trigger:function(a){var b,c;if(this._mode)return c=_.toArray(arguments),b=this.id+":"+a,c[0]=b+":"+this._mode,this.view.trigger.apply(this.view,c),c[0]=b,this.view.trigger.apply(this.view,c),this}}),b.exports=c},{}],13:[function(a,b){var c,d=wp.media.controller.Library,e=wp.media.view.l10n;c=d.extend({defaults:_.defaults({id:"replace-image",title:e.replaceImageTitle,multiple:!1,filterable:"uploaded",toolbar:"replace",menu:!1,priority:60,syncSelection:!0},d.prototype.defaults),initialize:function(a){var b,c;this.image=a.image,this.get("library")||this.set("library",wp.media.query({type:"image"})),d.prototype.initialize.apply(this,arguments),b=this.get("library"),c=b.comparator,b.comparator=function(a,b){var d=!!this.mirroring.get(a.cid),e=!!this.mirroring.get(b.cid);return!d&&e?-1:d&&!e?1:c.apply(this,arguments)},b.observe(this.get("selection"))},activate:function(){this.updateSelection(),d.prototype.activate.apply(this,arguments)},updateSelection:function(){var a=this.get("selection"),b=this.image.attachment;a.reset(b?[b]:[])}}),b.exports=c},{}],14:[function(a,b){var c=function(a){this.states=new Backbone.Collection(a)};c.extend=Backbone.Model.extend,_.extend(c.prototype,Backbone.Events,{state:function(a){return this.states=this.states||new Backbone.Collection,a=a||this._state,a&&!this.states.get(a)&&this.states.add({id:a}),this.states.get(a)},setState:function(a){var b=this.state();return b&&a===b.id||!this.states||!this.states.get(a)?this:(b&&(b.trigger("deactivate"),this._lastState=b.id),this._state=a,this.state().trigger("activate"),this)},lastState:function(){return this._lastState?this.state(this._lastState):void 0}}),_.each(["on","off","trigger"],function(a){c.prototype[a]=function(){return this.states=this.states||new Backbone.Collection,this.states[a].apply(this.states,arguments),this}}),b.exports=c},{}],15:[function(a,b){var c=Backbone.Model.extend({constructor:function(){this.on("activate",this._preActivate,this),this.on("activate",this.activate,this),this.on("activate",this._postActivate,this),this.on("deactivate",this._deactivate,this),this.on("deactivate",this.deactivate,this),this.on("reset",this.reset,this),this.on("ready",this._ready,this),this.on("ready",this.ready,this),Backbone.Model.apply(this,arguments),this.on("change:menu",this._updateMenu,this)},ready:function(){},activate:function(){},deactivate:function(){},reset:function(){},_ready:function(){this._updateMenu()},_preActivate:function(){this.active=!0},_postActivate:function(){this.on("change:menu",this._menu,this),this.on("change:titleMode",this._title,this),this.on("change:content",this._content,this),this.on("change:toolbar",this._toolbar,this),this.frame.on("title:render:default",this._renderTitle,this),this._title(),this._menu(),this._toolbar(),this._content(),this._router()},_deactivate:function(){this.active=!1,this.frame.off("title:render:default",this._renderTitle,this),this.off("change:menu",this._menu,this),this.off("change:titleMode",this._title,this),this.off("change:content",this._content,this),this.off("change:toolbar",this._toolbar,this)},_title:function(){this.frame.title.render(this.get("titleMode")||"default")},_renderTitle:function(a){a.$el.text(this.get("title")||"")},_router:function(){var a,b=this.frame.router,c=this.get("router");this.frame.$el.toggleClass("hide-router",!c),c&&(this.frame.router.render(c),a=b.get(),a&&a.select&&a.select(this.frame.content.mode()))},_menu:function(){var a,b=this.frame.menu,c=this.get("menu");this.frame.$el.toggleClass("hide-menu",!c),c&&(b.mode(c),a=b.get(),a&&a.select&&a.select(this.id))},_updateMenu:function(){var a=this.previous("menu"),b=this.get("menu");a&&this.frame.off("menu:render:"+a,this._renderMenu,this),b&&this.frame.on("menu:render:"+b,this._renderMenu,this)},_renderMenu:function(a){var b=this.get("menuItem"),c=this.get("title"),d=this.get("priority");!b&&c&&(b={text:c},d&&(b.priority=d)),b&&a.set(this.id,b)}});_.each(["toolbar","content"],function(a){c.prototype["_"+a]=function(){var b=this.get(a);b&&this.frame[a].render(b)}}),b.exports=c},{}],16:[function(a,b){var c={syncSelection:function(){var a=this.get("selection"),b=this.frame._selection;this.get("syncSelection")&&b&&a&&(a.multiple&&(a.reset([],{silent:!0}),a.validateAll(b.attachments),b.difference=_.difference(b.attachments.models,a.models)),a.single(b.single))},recordSelection:function(){var a=this.get("selection"),b=this.frame._selection;this.get("syncSelection")&&b&&a&&(a.multiple?(b.attachments.reset(a.toArray().concat(b.difference)),b.difference=[]):b.attachments.add(a.toArray()),b.single=a._single)}};b.exports=c},{}],17:[function(a){var b,c=wp.media,d=jQuery;c.isTouchDevice="ontouchend"in document,b=c.view.l10n=window._wpMediaViewsL10n||{},c.view.settings=b.settings||{},delete b.settings,c.model.settings.post=c.view.settings.post,d.support.transition=function(){var a,b=document.documentElement.style,c={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};return a=_.find(_.keys(c),function(a){return!_.isUndefined(b[a])}),a&&{end:c[a]}}(),c.events=_.extend({},Backbone.Events),c.transition=function(a,b){var c=d.Deferred();return b=b||2e3,d.support.transition?(a instanceof d||(a=d(a)),a.first().one(d.support.transition.end,c.resolve),_.delay(c.resolve,b)):c.resolve(),c.promise()},c.controller.Region=a("./controllers/region.js"),c.controller.StateMachine=a("./controllers/state-machine.js"),c.controller.State=a("./controllers/state.js"),c.selectionSync=a("./utils/selection-sync.js"),c.controller.Library=a("./controllers/library.js"),c.controller.ImageDetails=a("./controllers/image-details.js"),c.controller.GalleryEdit=a("./controllers/gallery-edit.js"),c.controller.GalleryAdd=a("./controllers/gallery-add.js"),c.controller.CollectionEdit=a("./controllers/collection-edit.js"),c.controller.CollectionAdd=a("./controllers/collection-add.js"),c.controller.FeaturedImage=a("./controllers/featured-image.js"),c.controller.ReplaceImage=a("./controllers/replace-image.js"),c.controller.EditImage=a("./controllers/edit-image.js"),c.controller.MediaLibrary=a("./controllers/media-library.js"),c.controller.Embed=a("./controllers/embed.js"),c.controller.Cropper=a("./controllers/cropper.js"),c.View=a("./views/view.js"),c.view.Frame=a("./views/frame.js"),c.view.MediaFrame=a("./views/media-frame.js"),c.view.MediaFrame.Select=a("./views/frame/select.js"),c.view.MediaFrame.Post=a("./views/frame/post.js"),c.view.MediaFrame.ImageDetails=a("./views/frame/image-details.js"),c.view.Modal=a("./views/modal.js"),c.view.FocusManager=a("./views/focus-manager.js"),c.view.UploaderWindow=a("./views/uploader/window.js"),c.view.EditorUploader=a("./views/uploader/editor.js"),c.view.UploaderInline=a("./views/uploader/inline.js"),c.view.UploaderStatus=a("./views/uploader/status.js"),c.view.UploaderStatusError=a("./views/uploader/status-error.js"),c.view.Toolbar=a("./views/toolbar.js"),c.view.Toolbar.Select=a("./views/toolbar/select.js"),c.view.Toolbar.Embed=a("./views/toolbar/embed.js"),c.view.Button=a("./views/button.js"),c.view.ButtonGroup=a("./views/button-group.js"),c.view.PriorityList=a("./views/priority-list.js"),c.view.MenuItem=a("./views/menu-item.js"),c.view.Menu=a("./views/menu.js"),c.view.RouterItem=a("./views/router-item.js"),c.view.Router=a("./views/router.js"),c.view.Sidebar=a("./views/sidebar.js"),c.view.Attachment=a("./views/attachment.js"),c.view.Attachment.Library=a("./views/attachment/library.js"),c.view.Attachment.EditLibrary=a("./views/attachment/edit-library.js"),c.view.Attachments=a("./views/attachments.js"),c.view.Search=a("./views/search.js"),c.view.AttachmentFilters=a("./views/attachment-filters.js"),c.view.DateFilter=a("./views/attachment-filters/date.js"),c.view.AttachmentFilters.Uploaded=a("./views/attachment-filters/uploaded.js"),c.view.AttachmentFilters.All=a("./views/attachment-filters/all.js"),c.view.AttachmentsBrowser=a("./views/attachments/browser.js"),c.view.Selection=a("./views/selection.js"),c.view.Attachment.Selection=a("./views/attachment/selection.js"),c.view.Attachments.Selection=a("./views/attachments/selection.js"),c.view.Attachment.EditSelection=a("./views/attachment/edit-selection.js"),c.view.Settings=a("./views/settings.js"),c.view.Settings.AttachmentDisplay=a("./views/settings/attachment-display.js"),c.view.Settings.Gallery=a("./views/settings/gallery.js"),c.view.Settings.Playlist=a("./views/settings/playlist.js"),c.view.Attachment.Details=a("./views/attachment/details.js"),c.view.AttachmentCompat=a("./views/attachment-compat.js"),c.view.Iframe=a("./views/iframe.js"),c.view.Embed=a("./views/embed.js"),c.view.Label=a("./views/label.js"),c.view.EmbedUrl=a("./views/embed/url.js"),c.view.EmbedLink=a("./views/embed/link.js"),c.view.EmbedImage=a("./views/embed/image.js"),c.view.ImageDetails=a("./views/image-details.js"),c.view.Cropper=a("./views/cropper.js"),c.view.EditImage=a("./views/edit-image.js"),c.view.Spinner=a("./views/spinner.js")},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/edit-image.js":4,"./controllers/embed.js":5,"./controllers/featured-image.js":6,"./controllers/gallery-add.js":7,"./controllers/gallery-edit.js":8,"./controllers/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,"./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame.js":41,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,"./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(a,b){var c,d=wp.media.View;c=d.extend({tagName:"form",className:"compat-item",events:{submit:"preventDefault","change input":"save","change select":"save","change textarea":"save"},initialize:function(){this.listenTo(this.model,"change:compat",this.render)},dispose:function(){return this.$(":focus").length&&this.save(),d.prototype.dispose.apply(this,arguments)},render:function(){var a=this.model.get("compat");if(a&&a.item)return this.views.detach(),this.$el.html(a.item),this.views.render(),this},preventDefault:function(a){a.preventDefault()},save:function(a){var b={};a&&a.preventDefault(),_.each(this.$el.serializeArray(),function(a){b[a.name]=a.value}),this.controller.trigger("attachment:compat:waiting",["waiting"]),this.model.saveCompat(b).always(_.bind(this.postSave,this))},postSave:function(){this.controller.trigger("attachment:compat:ready",["ready"])}}),b.exports=c},{}],19:[function(a,b){var c,d=jQuery;c=wp.media.View.extend({tagName:"select",className:"attachment-filters",id:"media-attachment-filters",events:{change:"change"},keys:[],initialize:function(){this.createFilters(),_.extend(this.filters,this.options.filters),this.$el.html(_.chain(this.filters).map(function(a,b){return{el:d("<option></option>").val(b).html(a.text)[0],priority:a.priority||50}},this).sortBy("priority").pluck("el").value()),this.listenTo(this.model,"change",this.select),this.select()},createFilters:function(){this.filters={}},change:function(){var a=this.filters[this.el.value];a&&this.model.set(a.props)},select:function(){var a=this.model,b="all",c=a.toJSON();_.find(this.filters,function(a,d){var e=_.all(a.props,function(a,b){return a===(_.isUndefined(c[b])?null:c[b])});return e?b=d:void 0}),this.$el.val(b)}}),b.exports=c},{}],20:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.view.AttachmentFilters.extend({createFilters:function(){var a={};_.each(wp.media.view.settings.mimeTypes||{},function(b,c){a[c]={text:b,props:{status:null,type:c,uploadedTo:null,orderby:"date",order:"DESC"}}}),a.all={text:d.allMediaItems,props:{status:null,type:null,uploadedTo:null,orderby:"date",order:"DESC"},priority:10},wp.media.view.settings.post.id&&(a.uploaded={text:d.uploadedToThisPost,props:{status:null,type:null,uploadedTo:wp.media.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20}),a.unattached={text:d.unattached,props:{status:null,uploadedTo:0,type:null,orderby:"menuOrder",order:"ASC"},priority:50},wp.media.view.settings.mediaTrash&&this.controller.isModeActive("grid")&&(a.trash={text:d.trash,props:{uploadedTo:null,status:"trash",type:null,orderby:"date",order:"DESC"},priority:50}),this.filters=a}}),b.exports=c},{}],21:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.view.AttachmentFilters.extend({id:"media-attachment-date-filters",createFilters:function(){var a={};_.each(wp.media.view.settings.months||{},function(b,c){a[c]={text:b.text,props:{year:b.year,monthnum:b.month}}}),a.all={text:d.allDates,props:{monthnum:!1,year:!1},priority:10},this.filters=a}}),b.exports=c},{}],22:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.view.AttachmentFilters.extend({createFilters:function(){var a,b=this.model.get("type"),c=wp.media.view.settings.mimeTypes;c&&b&&(a=c[b]),this.filters={all:{text:a||d.allMediaItems,props:{uploadedTo:null,orderby:"date",order:"DESC"},priority:10},uploaded:{text:d.uploadedToThisPost,props:{uploadedTo:wp.media.view.settings.post.id,orderby:"menuOrder",order:"ASC"},priority:20},unattached:{text:d.unattached,props:{uploadedTo:0,orderby:"menuOrder",order:"ASC"},priority:50}}}}),b.exports=c},{}],23:[function(a,b){var c,d=wp.media.View,e=jQuery;c=d.extend({tagName:"li",className:"attachment",template:wp.template("attachment"),attributes:function(){return{tabIndex:0,role:"checkbox","aria-label":this.model.get("title"),"aria-checked":!1,"data-id":this.model.get("id")}},events:{"click .js--select-attachment":"toggleSelectionHandler","change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .close":"removeFromLibrary","click .check":"checkClickHandler","click a":"preventDefault","keydown .close":"removeFromLibrary",keydown:"toggleSelectionHandler"},buttons:{},initialize:function(){var a=this.options.selection,b=_.defaults(this.options,{rerenderOnModelChange:!0});b.rerenderOnModelChange?this.listenTo(this.model,"change",this.render):this.listenTo(this.model,"change:percent",this.progress),this.listenTo(this.model,"change:title",this._syncTitle),this.listenTo(this.model,"change:caption",this._syncCaption),this.listenTo(this.model,"change:artist",this._syncArtist),this.listenTo(this.model,"change:album",this._syncAlbum),this.listenTo(this.model,"add",this.select),this.listenTo(this.model,"remove",this.deselect),a&&(a.on("reset",this.updateSelect,this),this.listenTo(this.model,"selection:single selection:unsingle",this.details),this.details(this.model,this.controller.state().get("selection"))),this.listenTo(this.controller,"attachment:compat:waiting attachment:compat:ready",this.updateSave)},dispose:function(){var a=this.options.selection;return this.updateAll(),a&&a.off(null,null,this),d.prototype.dispose.apply(this,arguments),this},render:function(){var a=_.defaults(this.model.toJSON(),{orientation:"landscape",uploading:!1,type:"",subtype:"",icon:"",filename:"",caption:"",title:"",dateFormatted:"",width:"",height:"",compat:!1,alt:"",description:""},this.options);return a.buttons=this.buttons,a.describe=this.controller.state().get("describe"),"image"===a.type&&(a.size=this.imageSize()),a.can={},a.nonces&&(a.can.remove=!!a.nonces["delete"],a.can.save=!!a.nonces.update),this.controller.state().get("allowLocalEdits")&&(a.allowLocalEdits=!0),a.uploading&&!a.percent&&(a.percent=0),this.views.detach(),this.$el.html(this.template(a)),this.$el.toggleClass("uploading",a.uploading),a.uploading?this.$bar=this.$(".media-progress-bar div"):delete this.$bar,this.updateSelect(),this.updateSave(),this.views.render(),this},progress:function(){this.$bar&&this.$bar.length&&this.$bar.width(this.model.get("percent")+"%")},toggleSelectionHandler:function(a){var b;if("INPUT"!==a.target.nodeName){if(37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode)return void this.controller.trigger("attachment:keydown:arrow",a);if("keydown"!==a.type||13===a.keyCode||32===a.keyCode){if(a.preventDefault(),this.controller.isModeActive("grid")){if(this.controller.isModeActive("edit"))return void this.controller.trigger("edit:attachment",this.model,a.currentTarget);this.controller.isModeActive("select")&&(b="toggle")}a.shiftKey?b="between":(a.ctrlKey||a.metaKey)&&(b="toggle"),this.toggleSelection({method:b
 }),this.controller.trigger("selection:toggle")}}},toggleSelection:function(a){var b,c,d,e,f=this.collection,g=this.options.selection,h=this.model,i=a&&a.method;if(g){if(b=g.single(),i=_.isUndefined(i)?g.multiple:i,"between"===i&&b&&g.multiple){if(b===h)return;return d=f.indexOf(b),e=f.indexOf(this.model),c=e>d?f.models.slice(d,e+1):f.models.slice(e,d+1),g.add(c),void g.single(h)}if("toggle"===i)return g[this.selected()?"remove":"add"](h),void g.single(h);if("add"===i)return g.add(h),void g.single(h);i||(i="add"),"add"!==i&&(i="reset"),this.selected()?g[b===h?"remove":"single"](h):(g[i](h),g.single(h))}},updateSelect:function(){this[this.selected()?"select":"deselect"]()},selected:function(){var a=this.options.selection;return a?!!a.get(this.model.cid):void 0},select:function(a,b){var c=this.options.selection,d=this.controller;!c||b&&b!==c||this.$el.hasClass("selected")||(this.$el.addClass("selected").attr("aria-checked",!0),d.isModeActive("grid")&&d.isModeActive("select")||this.$(".check").attr("tabindex","0"))},deselect:function(a,b){var c=this.options.selection;!c||b&&b!==c||this.$el.removeClass("selected").attr("aria-checked",!1).find(".check").attr("tabindex","-1")},details:function(a,b){var c,d=this.options.selection;d===b&&(c=d.single(),this.$el.toggleClass("details",c===this.model))},preventDefault:function(a){a.preventDefault()},imageSize:function(a){var b=this.model.get("sizes"),c=!1;return a=a||"medium",b&&(b[a]?c=b[a]:b.large?c=b.large:b.thumbnail?c=b.thumbnail:b.full&&(c=b.full),c)?_.clone(c):{url:this.model.get("url"),width:this.model.get("width"),height:this.model.get("height"),orientation:this.model.get("orientation")}},updateSetting:function(a){var b,c,d=e(a.target).closest("[data-setting]");d.length&&(b=d.data("setting"),c=a.target.value,this.model.get(b)!==c&&this.save(b,c))},save:function(){var a=this,b=this._save=this._save||{status:"ready"},c=this.model.save.apply(this.model,arguments),d=b.requests?e.when(c,b.requests):c;b.savedTimer&&clearTimeout(b.savedTimer),this.updateSave("waiting"),b.requests=d,d.always(function(){b.requests===d&&(a.updateSave("resolved"===d.state()?"complete":"error"),b.savedTimer=setTimeout(function(){a.updateSave("ready"),delete b.savedTimer},2e3))})},updateSave:function(a){var b=this._save=this._save||{status:"ready"};return a&&a!==b.status&&(this.$el.removeClass("save-"+b.status),b.status=a),this.$el.addClass("save-"+b.status),this},updateAll:function(){var a,b=this.$("[data-setting]"),c=this.model;a=_.chain(b).map(function(a){var b,d,f=e("input, textarea, select, [value]",a);if(f.length)return b=e(a).data("setting"),d=f.val(),c.get(b)!==d?[b,d]:void 0}).compact().object().value(),_.isEmpty(a)||c.save(a)},removeFromLibrary:function(a){("keydown"!==a.type||13===a.keyCode||32===a.keyCode)&&(a.stopPropagation(),this.collection.remove(this.model))},checkClickHandler:function(a){var b=this.options.selection;b&&(a.stopPropagation(),b.where({id:this.model.get("id")}).length?(b.remove(this.model),this.$el.focus()):b.add(this.model))}}),_.each({caption:"_syncCaption",title:"_syncTitle",artist:"_syncArtist",album:"_syncAlbum"},function(a,b){c.prototype[a]=function(a,c){var d=this.$('[data-setting="'+b+'"]');return d.length?c===d.find("input, textarea, select, [value]").val()?this:this.render():this}}),b.exports=c},{}],24:[function(a,b){var c,d=wp.media.view.Attachment,e=wp.media.view.l10n;c=d.extend({tagName:"div",className:"attachment-details",template:wp.template("attachment-details"),attributes:function(){return{tabIndex:0,"data-id":this.model.get("id")}},events:{"change [data-setting]":"updateSetting","change [data-setting] input":"updateSetting","change [data-setting] select":"updateSetting","change [data-setting] textarea":"updateSetting","click .delete-attachment":"deleteAttachment","click .trash-attachment":"trashAttachment","click .untrash-attachment":"untrashAttachment","click .edit-attachment":"editAttachment","click .refresh-attachment":"refreshAttachment",keydown:"toggleSelectionHandler"},initialize:function(){this.options=_.defaults(this.options,{rerenderOnModelChange:!1}),this.on("ready",this.initialFocus),d.prototype.initialize.apply(this,arguments)},initialFocus:function(){wp.media.isTouchDevice||this.$(":input").eq(0).focus()},deleteAttachment:function(a){a.preventDefault(),window.confirm(e.warnDelete)&&(this.model.destroy(),this.controller.modal.focusManager.focus())},trashAttachment:function(a){var b=this.controller.library;a.preventDefault(),wp.media.view.settings.mediaTrash&&"edit-metadata"===this.controller.content.mode()?(this.model.set("status","trash"),this.model.save().done(function(){b._requery(!0)})):this.model.destroy()},untrashAttachment:function(a){var b=this.controller.library;a.preventDefault(),this.model.set("status","inherit"),this.model.save().done(function(){b._requery(!0)})},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b?(a.preventDefault(),b.set("image",this.model),this.controller.setState("edit-image")):this.$el.addClass("needs-refresh")},refreshAttachment:function(a){this.$el.removeClass("needs-refresh"),a.preventDefault(),this.model.fetch()},toggleSelectionHandler:function(a){return"keydown"===a.type&&9===a.keyCode&&a.shiftKey&&a.target===this.$(":tabbable").get(0)?(this.controller.trigger("attachment:details:shift-tab",a),!1):37===a.keyCode||38===a.keyCode||39===a.keyCode||40===a.keyCode?void this.controller.trigger("attachment:keydown:arrow",a):void 0}}),b.exports=c},{}],25:[function(a,b){var c=wp.media.view.Attachment.extend({buttons:{close:!0}});b.exports=c},{}],26:[function(a,b){var c=wp.media.view.Attachment.Selection.extend({buttons:{close:!0}});b.exports=c},{}],27:[function(a,b){var c=wp.media.view.Attachment.extend({buttons:{check:!0}});b.exports=c},{}],28:[function(a,b){var c=wp.media.view.Attachment.extend({className:"attachment selection",toggleSelection:function(){this.options.selection.single(this.model)}});b.exports=c},{}],29:[function(a,b){var c,d=wp.media.View,e=jQuery;c=d.extend({tagName:"ul",className:"attachments",attributes:{tabIndex:-1},initialize:function(){this.el.id=_.uniqueId("__attachments-view-"),_.defaults(this.options,{refreshSensitivity:wp.media.isTouchDevice?300:200,refreshThreshold:3,AttachmentView:wp.media.view.Attachment,sortable:!1,resize:!0,idealColumnWidth:e(window).width()<640?135:150}),this._viewsByCid={},this.$window=e(window),this.resizeEvent="resize.media-modal-columns",this.collection.on("add",function(a){this.views.add(this.createAttachmentView(a),{at:this.collection.indexOf(a)})},this),this.collection.on("remove",function(a){var b=this._viewsByCid[a.cid];delete this._viewsByCid[a.cid],b&&b.remove()},this),this.collection.on("reset",this.render,this),this.listenTo(this.controller,"library:selection:add",this.attachmentFocus),this.scroll=_.chain(this.scroll).bind(this).throttle(this.options.refreshSensitivity).value(),this.options.scrollElement=this.options.scrollElement||this.el,e(this.options.scrollElement).on("scroll",this.scroll),this.initSortable(),_.bindAll(this,"setColumns"),this.options.resize&&(this.on("ready",this.bindEvents),this.controller.on("open",this.setColumns),_.defer(this.setColumns,this))},bindEvents:function(){this.$window.off(this.resizeEvent).on(this.resizeEvent,_.debounce(this.setColumns,50))},attachmentFocus:function(){this.$("li:first").focus()},restoreFocus:function(){this.$("li.selected:first").focus()},arrowEvent:function(a){var b=this.$el.children("li"),c=this.columns,d=b.filter(":focus").index(),e=c>=d+1?1:Math.ceil((d+1)/c);if(-1!==d){if(37===a.keyCode){if(0===d)return;b.eq(d-1).focus()}if(38===a.keyCode){if(1===e)return;b.eq(d-c).focus()}if(39===a.keyCode){if(b.length===d)return;b.eq(d+1).focus()}if(40===a.keyCode){if(Math.ceil(b.length/c)===e)return;b.eq(d+c).focus()}}},dispose:function(){this.collection.props.off(null,null,this),this.options.resize&&this.$window.off(this.resizeEvent),d.prototype.dispose.apply(this,arguments)},setColumns:function(){var a=this.columns,b=this.$el.width();b&&(this.columns=Math.min(Math.round(b/this.options.idealColumnWidth),12)||1,a&&a===this.columns||this.$el.closest(".media-frame-content").attr("data-columns",this.columns))},initSortable:function(){var a=this.collection;!wp.media.isTouchDevice&&this.options.sortable&&e.fn.sortable&&(this.$el.sortable(_.extend({disabled:!!a.comparator,tolerance:"pointer",start:function(a,b){b.item.data("sortableIndexStart",b.item.index())},update:function(b,c){var d=a.at(c.item.data("sortableIndexStart")),e=a.comparator;delete a.comparator,a.remove(d,{silent:!0}),a.add(d,{silent:!0,at:c.item.index()}),a.comparator=e,a.trigger("reset",a),a.saveMenuOrder()}},this.options.sortable)),a.props.on("change:orderby",function(){this.$el.sortable("option","disabled",!!a.comparator)},this),this.collection.props.on("change:orderby",this.refreshSortable,this),this.refreshSortable())},refreshSortable:function(){if(!wp.media.isTouchDevice&&this.options.sortable&&e.fn.sortable){var a=this.collection,b=a.props.get("orderby"),c="menuOrder"===b||!a.comparator;this.$el.sortable("option","disabled",!c)}},createAttachmentView:function(a){var b=new this.options.AttachmentView({controller:this.controller,model:a,collection:this.collection,selection:this.options.selection});return this._viewsByCid[a.cid]=b},prepare:function(){this.collection.length?this.views.set(this.collection.map(this.createAttachmentView,this)):(this.views.unset(),this.collection.more().done(this.scroll))},ready:function(){this.scroll()},scroll:function(){var a,b=this,c=this.options.scrollElement,d=c.scrollTop;c===document&&(c=document.body,d=e(document).scrollTop()),e(c).is(":visible")&&this.collection.hasMore()&&(a=this.views.parent.toolbar,c.scrollHeight-(d+c.clientHeight)<c.clientHeight/3&&a.get("spinner").show(),c.scrollHeight<d+c.clientHeight*this.options.refreshThreshold&&this.collection.more().done(function(){b.scroll(),a.get("spinner").hide()}))}}),b.exports=c},{}],30:[function(a,b){var c,d=wp.media.View,e=wp.media.view.settings.mediaTrash,f=wp.media.view.l10n,g=jQuery;c=d.extend({tagName:"div",className:"attachments-browser",initialize:function(){_.defaults(this.options,{filters:!1,search:!0,date:!0,display:!1,sidebar:!0,AttachmentView:wp.media.view.Attachment.Library}),this.listenTo(this.controller,"toggle:upload:attachment",_.bind(this.toggleUploader,this)),this.controller.on("edit:selection",this.editSelection),this.createToolbar(),this.options.sidebar&&this.createSidebar(),this.createUploader(),this.createAttachments(),this.updateContent(),this.options.sidebar&&"errors"!==this.options.sidebar||(this.$el.addClass("hide-sidebar"),"errors"===this.options.sidebar&&this.$el.addClass("sidebar-for-errors")),this.collection.on("add remove reset",this.updateContent,this)},editSelection:function(a){a.$(".media-button-backToLibrary").focus()},dispose:function(){return this.options.selection.off(null,null,this),d.prototype.dispose.apply(this,arguments),this},createToolbar:function(){var a,b,c;c={controller:this.controller},this.controller.isModeActive("grid")&&(c.className="media-toolbar wp-filter"),this.toolbar=new wp.media.view.Toolbar(c),this.views.add(this.toolbar),this.toolbar.set("spinner",new wp.media.view.Spinner({priority:-60})),-1!==g.inArray(this.options.filters,["uploaded","all"])&&(this.toolbar.set("filtersLabel",new wp.media.view.Label({value:f.filterByType,attributes:{"for":"media-attachment-filters"},priority:-80}).render()),"uploaded"===this.options.filters?this.toolbar.set("filters",new wp.media.view.AttachmentFilters.Uploaded({controller:this.controller,model:this.collection.props,priority:-80}).render()):(b=new wp.media.view.AttachmentFilters.All({controller:this.controller,model:this.collection.props,priority:-80}),this.toolbar.set("filters",b.render()))),this.controller.isModeActive("grid")?(a=d.extend({className:"view-switch media-grid-view-switch",template:wp.template("media-library-view-switcher")}),this.toolbar.set("libraryViewSwitcher",new a({controller:this.controller,priority:-90}).render()),this.toolbar.set("dateFilterLabel",new wp.media.view.Label({value:f.filterByDate,attributes:{"for":"media-attachment-date-filters"},priority:-75}).render()),this.toolbar.set("dateFilter",new wp.media.view.DateFilter({controller:this.controller,model:this.collection.props,priority:-75}).render()),this.toolbar.set("selectModeToggleButton",new wp.media.view.SelectModeToggleButton({text:f.bulkSelect,controller:this.controller,priority:-70}).render()),this.toolbar.set("deleteSelectedButton",new wp.media.view.DeleteSelectedButton({filters:b,style:"primary",disabled:!0,text:e?f.trashSelected:f.deleteSelected,controller:this.controller,priority:-60,click:function(){var a=[],b=[],c=this.controller.state().get("selection"),d=this.controller.state().get("library");c.length&&(e||window.confirm(f.warnBulkDelete))&&(!e||"trash"===c.at(0).get("status")||window.confirm(f.warnBulkTrash))&&(c.each(function(c){return c.get("nonces")["delete"]?void(e&&"trash"===c.get("status")?(c.set("status","inherit"),a.push(c.save()),b.push(c)):e?(c.set("status","trash"),a.push(c.save()),b.push(c)):c.destroy({wait:!0})):void b.push(c)}),a.length?(c.remove(b),g.when.apply(null,a).then(_.bind(function(){d._requery(!0),this.controller.trigger("selection:action:done")},this))):this.controller.trigger("selection:action:done"))}}).render()),e&&this.toolbar.set("deleteSelectedPermanentlyButton",new wp.media.view.DeleteSelectedPermanentlyButton({filters:b,style:"primary",disabled:!0,text:f.deleteSelected,controller:this.controller,priority:-55,click:function(){var a=[],b=this.controller.state().get("selection");b.length&&window.confirm(f.warnBulkDelete)&&(b.each(function(b){return b.get("nonces")["delete"]?void b.destroy():void a.push(b)}),b.remove(a),this.controller.trigger("selection:action:done"))}}).render())):this.options.date&&(this.toolbar.set("dateFilterLabel",new wp.media.view.Label({value:f.filterByDate,attributes:{"for":"media-attachment-date-filters"},priority:-75}).render()),this.toolbar.set("dateFilter",new wp.media.view.DateFilter({controller:this.controller,model:this.collection.props,priority:-75}).render())),this.options.search&&(this.toolbar.set("searchLabel",new wp.media.view.Label({value:f.searchMediaLabel,attributes:{"for":"media-search-input"},priority:60}).render()),this.toolbar.set("search",new wp.media.view.Search({controller:this.controller,model:this.collection.props,priority:60}).render())),this.options.dragInfo&&this.toolbar.set("dragInfo",new d({el:g('<div class="instructions">'+f.dragInfo+"</div>")[0],priority:-40})),this.options.suggestedWidth&&this.options.suggestedHeight&&this.toolbar.set("suggestedDimensions",new d({el:g('<div class="instructions">'+f.suggestedDimensions+" "+this.options.suggestedWidth+" &times; "+this.options.suggestedHeight+"</div>")[0],priority:-40}))},updateContent:function(){var a,b=this;a=this.controller.isModeActive("grid")?b.attachmentsNoResults:b.uploader,this.collection.length?(a.$el.addClass("hidden"),b.toolbar.get("spinner").hide()):(this.toolbar.get("spinner").show(),this.dfd=this.collection.more().done(function(){b.collection.length?a.$el.addClass("hidden"):a.$el.removeClass("hidden"),b.toolbar.get("spinner").hide()}))},createUploader:function(){this.uploader=new wp.media.view.UploaderInline({controller:this.controller,status:!1,message:this.controller.isModeActive("grid")?"":f.noItemsFound,canClose:this.controller.isModeActive("grid")}),this.uploader.hide(),this.views.add(this.uploader)},toggleUploader:function(){this.uploader.$el.hasClass("hidden")?this.uploader.show():this.uploader.hide()},createAttachments:function(){this.attachments=new wp.media.view.Attachments({controller:this.controller,collection:this.collection,selection:this.options.selection,model:this.model,sortable:this.options.sortable,scrollElement:this.options.scrollElement,idealColumnWidth:this.options.idealColumnWidth,AttachmentView:this.options.AttachmentView}),this.attachments.listenTo(this.controller,"attachment:keydown:arrow",this.attachments.arrowEvent),this.attachments.listenTo(this.controller,"attachment:details:shift-tab",this.attachments.restoreFocus),this.views.add(this.attachments),this.controller.isModeActive("grid")&&(this.attachmentsNoResults=new d({controller:this.controller,tagName:"p"}),this.attachmentsNoResults.$el.addClass("hidden no-media"),this.attachmentsNoResults.$el.html(f.noMedia),this.views.add(this.attachmentsNoResults))},createSidebar:function(){var a=this.options,b=a.selection,c=this.sidebar=new wp.media.view.Sidebar({controller:this.controller});this.views.add(c),this.controller.uploader&&c.set("uploads",new wp.media.view.UploaderStatus({controller:this.controller,priority:40})),b.on("selection:single",this.createSingle,this),b.on("selection:unsingle",this.disposeSingle,this),b.single()&&this.createSingle()},createSingle:function(){var a=this.sidebar,b=this.options.selection.single();a.set("details",new wp.media.view.Attachment.Details({controller:this.controller,model:b,priority:80})),a.set("compat",new wp.media.view.AttachmentCompat({controller:this.controller,model:b,priority:120})),this.options.display&&a.set("display",new wp.media.view.Settings.AttachmentDisplay({controller:this.controller,model:this.model.display(b),attachment:b,priority:160,userSettings:this.model.get("displayUserSettings")})),"insert"===this.model.id&&a.$el.addClass("visible")},disposeSingle:function(){var a=this.sidebar;a.unset("details"),a.unset("compat"),a.unset("display"),a.$el.removeClass("visible")}}),b.exports=c},{}],31:[function(a,b){var c,d=wp.media.view.Attachments;c=d.extend({events:{},initialize:function(){return _.defaults(this.options,{sortable:!1,resize:!1,AttachmentView:wp.media.view.Attachment.Selection}),d.prototype.initialize.apply(this,arguments)}}),b.exports=c},{}],32:[function(a,b){var c,d=Backbone.$;c=wp.media.View.extend({tagName:"div",className:"button-group button-large media-button-group",initialize:function(){this.buttons=_.map(this.options.buttons||[],function(a){return a instanceof Backbone.View?a:new wp.media.view.Button(a).render()}),delete this.options.buttons,this.options.classes&&this.$el.addClass(this.options.classes)},render:function(){return this.$el.html(d(_.pluck(this.buttons,"el")).detach()),this}}),b.exports=c},{}],33:[function(a,b){var c=wp.media.View.extend({tagName:"a",className:"media-button",attributes:{href:"#"},events:{click:"click"},defaults:{text:"",style:"",size:"large",disabled:!1},initialize:function(){this.model=new Backbone.Model(this.defaults),_.each(this.defaults,function(a,b){var c=this.options[b];_.isUndefined(c)||(this.model.set(b,c),delete this.options[b])},this),this.listenTo(this.model,"change",this.render)},render:function(){var a=["button",this.className],b=this.model.toJSON();return b.style&&a.push("button-"+b.style),b.size&&a.push("button-"+b.size),a=_.uniq(a.concat(this.options.classes)),this.el.className=a.join(" "),this.$el.attr("disabled",b.disabled),this.$el.text(this.model.get("text")),this},click:function(a){"#"===this.attributes.href&&a.preventDefault(),this.options.click&&!this.model.get("disabled")&&this.options.click.apply(this,arguments)}});b.exports=c},{}],34:[function(a,b){var c,d=wp.media.View,e=wp.media.view.UploaderStatus,f=wp.media.view.l10n,g=jQuery;c=d.extend({className:"crop-content",template:wp.template("crop-content"),initialize:function(){_.bindAll(this,"onImageLoad")},ready:function(){this.controller.frame.on("content:error:crop",this.onError,this),this.$image=this.$el.find(".crop-image"),this.$image.on("load",this.onImageLoad),g(window).on("resize.cropper",_.debounce(this.onImageLoad,250))},remove:function(){g(window).off("resize.cropper"),this.$el.remove(),this.$el.off(),d.prototype.remove.apply(this,arguments)},prepare:function(){return{title:f.cropYourImage,url:this.options.attachment.get("url")}},onImageLoad:function(){var a=this.controller.get("imgSelectOptions");"function"==typeof a&&(a=a(this.options.attachment,this.controller)),a=_.extend(a,{parent:this.$el}),this.trigger("image-loaded"),this.controller.imgSelect=this.$image.imgAreaSelect(a)},onError:function(){var a=this.options.attachment.get("filename");this.views.add(".upload-errors",new wp.media.view.UploaderStatusError({filename:e.prototype.filename(a),message:window._wpMediaViewsL10n.cropError}),{at:0})}}),b.exports=c},{}],35:[function(a,b){var c,d=wp.media.View;c=d.extend({className:"image-editor",template:wp.template("image-editor"),initialize:function(a){this.editor=window.imageEdit,this.controller=a.controller,d.prototype.initialize.apply(this,arguments)},prepare:function(){return this.model.toJSON()},loadEditor:function(){var a=this.editor.open(this.model.get("id"),this.model.get("nonces").edit,this);a.done(_.bind(this.focus,this))},focus:function(){this.$(".imgedit-submit .button").eq(0).focus()},back:function(){var a=this.controller.lastState();this.controller.setState(a)},refresh:function(){this.model.fetch()},save:function(){var a=this.controller.lastState();this.model.fetch().done(_.bind(function(){this.controller.setState(a)},this))}}),b.exports=c},{}],36:[function(a,b){var c=wp.media.View.extend({className:"media-embed",initialize:function(){this.url=new wp.media.view.EmbedUrl({controller:this.controller,model:this.model.props}).render(),this.views.set([this.url]),this.refresh(),this.listenTo(this.model,"change:type",this.refresh),this.listenTo(this.model,"change:loading",this.loading)},settings:function(a){this._settings&&this._settings.remove(),this._settings=a,this.views.add(a)},refresh:function(){var a,b=this.model.get("type");if("image"===b)a=wp.media.view.EmbedImage;else{if("link"!==b)return;a=wp.media.view.EmbedLink}this.settings(new a({controller:this.controller,model:this.model.props,priority:40}))},loading:function(){this.$el.toggleClass("embed-loading",this.model.get("loading"))}});b.exports=c},{}],37:[function(a,b){var c,d=wp.media.view.Settings.AttachmentDisplay;c=d.extend({className:"embed-media-settings",template:wp.template("embed-image-settings"),initialize:function(){d.prototype.initialize.apply(this,arguments),this.listenTo(this.model,"change:url",this.updateImage)},updateImage:function(){this.$("img").attr("src",this.model.get("url"))}}),b.exports=c},{}],38:[function(a,b){var c,d=jQuery;c=wp.media.view.Settings.extend({className:"embed-link-settings",template:wp.template("embed-link-settings"),initialize:function(){this.spinner=d('<span class="spinner" />'),this.$el.append(this.spinner[0]),this.listenTo(this.model,"change:url",this.updateoEmbed)},updateoEmbed:_.debounce(function(){var a=this.model.get("url");this.$(".embed-container").hide().find(".embed-preview").empty(),this.$(".setting").hide(),a&&a.length<6||this.fetch()},600),fetch:function(){d("#embed-url-field").val()===this.model.get("url")&&wp.ajax.send("parse-embed",{data:{post_ID:wp.media.view.settings.post.id,shortcode:"[embed]"+this.model.get("url")+"[/embed]"}}).done(_.bind(this.renderoEmbed,this)).fail(_.bind(this.renderFail,this))},renderFail:function(){this.$(".link-text").show()},renderoEmbed:function(a){var b=a&&a.body||"";b?this.$(".embed-container").show().find(".embed-preview").html(b):this.renderFail()}}),b.exports=c},{}],39:[function(a,b){var c,d=wp.media.View,e=jQuery;c=d.extend({tagName:"label",className:"embed-url",events:{input:"url",keyup:"url",change:"url"},initialize:function(){this.$input=e('<input id="embed-url-field" type="url" />').val(this.model.get("url")),this.input=this.$input[0],this.spinner=e('<span class="spinner" />')[0],this.$el.append([this.input,this.spinner]),this.listenTo(this.model,"change:url",this.render),this.model.get("url")&&_.delay(_.bind(function(){this.model.trigger("change:url")},this),500)},render:function(){var a=this.$input;if(!a.is(":focus"))return this.input.value=this.model.get("url")||"http://",d.prototype.render.apply(this,arguments),this},ready:function(){wp.media.isTouchDevice||this.focus()},url:function(a){this.model.set("url",a.target.value)},focus:function(){var a=this.$input;a.is(":visible")&&a.focus()[0].select()}}),b.exports=c},{}],40:[function(a,b){var c=wp.media.View.extend({events:{keydown:"constrainTabbing"},focus:function(){this.$(".media-menu-item").first().focus()},constrainTabbing:function(a){var b;if(9===a.keyCode)return b=this.$(":tabbable").not('.moxie-shim input[type="file"]'),b.last()[0]!==a.target||a.shiftKey?b.first()[0]===a.target&&a.shiftKey?(b.last().focus(),!1):void 0:(b.first().focus(),!1)}});b.exports=c},{}],41:[function(a,b){var c=wp.media.View.extend({initialize:function(){_.defaults(this.options,{mode:["select"]}),this._createRegions(),this._createStates(),this._createModes()},_createRegions:function(){this.regions=this.regions?this.regions.slice():[],_.each(this.regions,function(a){this[a]=new wp.media.controller.Region({view:this,id:a,selector:".media-frame-"+a})},this)},_createStates:function(){this.states=new Backbone.Collection(null,{model:wp.media.controller.State}),this.states.on("add",function(a){a.frame=this,a.trigger("ready")},this),this.options.states&&this.states.add(this.options.states)},_createModes:function(){this.activeModes=new Backbone.Collection,this.activeModes.on("add remove reset",_.bind(this.triggerModeEvents,this)),_.each(this.options.mode,function(a){this.activateMode(a)},this)},reset:function(){return this.states.invoke("trigger","reset"),this},triggerModeEvents:function(a,b,c){var d,e,f={add:"activate",remove:"deactivate"};_.each(c,function(a,b){a&&(d=b)}),_.has(f,d)&&(e=a.get("id")+":"+f[d],this.trigger(e))},activateMode:function(a){return this.isModeActive(a)?void 0:(this.activeModes.add([{id:a}]),this.$el.addClass("mode-"+a),this)},deactivateMode:function(a){return this.isModeActive(a)?(this.activeModes.remove(this.activeModes.where({id:a})),this.$el.removeClass("mode-"+a),this.trigger(a+":deactivate"),this):this},isModeActive:function(a){return Boolean(this.activeModes.where({id:a}).length)}});_.extend(c.prototype,wp.media.controller.StateMachine.prototype),b.exports=c},{}],42:[function(a,b){var c,d=wp.media.view.MediaFrame.Select,e=wp.media.view.l10n;c=d.extend({defaults:{id:"image",url:"",menu:"image-details",content:"image-details",toolbar:"image-details",type:"link",title:e.imageDetailsTitle,priority:120},initialize:function(a){this.image=new wp.media.model.PostImage(a.metadata),this.options.selection=new wp.media.model.Selection(this.image.attachment,{multiple:!1}),d.prototype.initialize.apply(this,arguments)},bindHandlers:function(){d.prototype.bindHandlers.apply(this,arguments),this.on("menu:create:image-details",this.createMenu,this),this.on("content:create:image-details",this.imageDetailsContent,this),this.on("content:render:edit-image",this.editImageContent,this),this.on("toolbar:render:image-details",this.renderImageDetailsToolbar,this),this.on("toolbar:render:replace",this.renderReplaceImageToolbar,this)},createStates:function(){this.states.add([new wp.media.controller.ImageDetails({image:this.image,editable:!1}),new wp.media.controller.ReplaceImage({id:"replace-image",library:wp.media.query({type:"image"}),image:this.image,multiple:!1,title:e.imageReplaceTitle,toolbar:"replace",priority:80,displaySettings:!0}),new wp.media.controller.EditImage({image:this.image,selection:this.options.selection})])},imageDetailsContent:function(a){a.view=new wp.media.view.ImageDetails({controller:this,model:this.state().image,attachment:this.state().image.attachment})},editImageContent:function(){var a,b=this.state(),c=b.get("image");c&&(a=new wp.media.view.EditImage({model:c,controller:this}).render(),this.content.set(a),a.loadEditor())},renderImageDetailsToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{select:{style:"primary",text:e.update,priority:80,click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))},renderReplaceImageToolbar:function(){var a=this,b=a.lastState(),c=b&&b.id;this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{back:{text:e.back,priority:20,click:function(){c?a.setState(c):a.close()}},replace:{style:"primary",text:e.replace,priority:80,click:function(){var a=this.controller,b=a.state(),c=b.get("selection"),d=c.single();a.close(),a.image.changeAttachment(d,b.display(d)),b.trigger("replace",a.image.toJSON()),a.setState(a.options.state),a.reset()}}}}))}}),b.exports=c},{}],43:[function(a,b){var c,d=wp.media.view.MediaFrame.Select,e=wp.media.controller.Library,f=wp.media.view.l10n;c=d.extend({initialize:function(){this.counts={audio:{count:wp.media.view.settings.attachmentCounts.audio,state:"playlist"},video:{count:wp.media.view.settings.attachmentCounts.video,state:"video-playlist"}},_.defaults(this.options,{multiple:!0,editing:!1,state:"insert",metadata:{}}),d.prototype.initialize.apply(this,arguments),this.createIframeStates()},createStates:function(){var a=this.options;this.states.add([new e({id:"insert",title:f.insertMediaTitle,priority:20,toolbar:"main-insert",filterable:"all",library:wp.media.query(a.library),multiple:a.multiple?"reset":!1,editable:!0,allowLocalEdits:!0,displaySettings:!0,displayUserSettings:!0}),new e({id:"gallery",title:f.createGalleryTitle,priority:40,toolbar:"main-gallery",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({type:"image"},a.library))}),new wp.media.controller.Embed({metadata:a.metadata}),new wp.media.controller.EditImage({model:a.editImage}),new wp.media.controller.GalleryEdit({library:a.selection,editing:a.editing,menu:"gallery"}),new wp.media.controller.GalleryAdd,new e({id:"playlist",title:f.createPlaylistTitle,priority:60,toolbar:"main-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({type:"audio"},a.library))}),new wp.media.controller.CollectionEdit({type:"audio",collectionType:"playlist",title:f.editPlaylistTitle,SettingsView:wp.media.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"playlist",dragInfoText:f.playlistDragInfo,dragInfo:!1}),new wp.media.controller.CollectionAdd({type:"audio",collectionType:"playlist",title:f.addToPlaylistTitle}),new e({id:"video-playlist",title:f.createVideoPlaylistTitle,priority:60,toolbar:"main-video-playlist",filterable:"uploaded",multiple:"add",editable:!1,library:wp.media.query(_.defaults({type:"video"},a.library))}),new wp.media.controller.CollectionEdit({type:"video",collectionType:"playlist",title:f.editVideoPlaylistTitle,SettingsView:wp.media.view.Settings.Playlist,library:a.selection,editing:a.editing,menu:"video-playlist",dragInfoText:f.videoPlaylistDragInfo,dragInfo:!1}),new wp.media.controller.CollectionAdd({type:"video",collectionType:"playlist",title:f.addToVideoPlaylistTitle})]),wp.media.view.settings.post.featuredImageId&&this.states.add(new wp.media.controller.FeaturedImage)},bindHandlers:function(){var a,b;d.prototype.bindHandlers.apply(this,arguments),this.on("activate",this.activate,this),b=_.find(this.counts,function(a){return 0===a.count}),"undefined"!=typeof b&&this.listenTo(wp.media.model.Attachments.all,"change:type",this.mediaTypeCounts),this.on("menu:create:gallery",this.createMenu,this),this.on("menu:create:playlist",this.createMenu,this),this.on("menu:create:video-playlist",this.createMenu,this),this.on("toolbar:create:main-insert",this.createToolbar,this),this.on("toolbar:create:main-gallery",this.createToolbar,this),this.on("toolbar:create:main-playlist",this.createToolbar,this),this.on("toolbar:create:main-video-playlist",this.createToolbar,this),this.on("toolbar:create:featured-image",this.featuredImageToolbar,this),this.on("toolbar:create:main-embed",this.mainEmbedToolbar,this),a={menu:{"default":"mainMenu",gallery:"galleryMenu",playlist:"playlistMenu","video-playlist":"videoPlaylistMenu"},content:{embed:"embedContent","edit-image":"editImageContent","edit-selection":"editSelectionContent"},toolbar:{"main-insert":"mainInsertToolbar",
 "main-gallery":"mainGalleryToolbar","gallery-edit":"galleryEditToolbar","gallery-add":"galleryAddToolbar","main-playlist":"mainPlaylistToolbar","playlist-edit":"playlistEditToolbar","playlist-add":"playlistAddToolbar","main-video-playlist":"mainVideoPlaylistToolbar","video-playlist-edit":"videoPlaylistEditToolbar","video-playlist-add":"videoPlaylistAddToolbar"}},_.each(a,function(a,b){_.each(a,function(a,c){this.on(b+":render:"+c,this[a],this)},this)},this)},activate:function(){_.each(this.counts,function(a){a.count<1&&this.menuItemVisibility(a.state,"hide")},this)},mediaTypeCounts:function(a,b){"undefined"!=typeof this.counts[b]&&this.counts[b].count<1&&(this.counts[b].count++,this.menuItemVisibility(this.counts[b].state,"show"))},mainMenu:function(a){a.set({"library-separator":new wp.media.View({className:"separator",priority:100})})},menuItemVisibility:function(a,b){var c=this.menu.get();"hide"===b?c.hide(a):"show"===b&&c.show(a)},galleryMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:f.cancelGalleryTitle,priority:20,click:function(){c?d.setState(c):d.close(),this.controller.modal.focusManager.focus()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},playlistMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:f.cancelPlaylistTitle,priority:20,click:function(){c?d.setState(c):d.close()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},videoPlaylistMenu:function(a){var b=this.lastState(),c=b&&b.id,d=this;a.set({cancel:{text:f.cancelVideoPlaylistTitle,priority:20,click:function(){c?d.setState(c):d.close()}},separateCancel:new wp.media.View({className:"separator",priority:40})})},embedContent:function(){var a=new wp.media.view.Embed({controller:this,model:this.state()}).render();this.content.set(a),wp.media.isTouchDevice||a.url.focus()},editSelectionContent:function(){var a,b=this.state(),c=b.get("selection");a=new wp.media.view.AttachmentsBrowser({controller:this,collection:c,selection:c,model:b,sortable:!0,search:!1,date:!1,dragInfo:!0,AttachmentView:wp.media.view.Attachments.EditSelection}).render(),a.toolbar.set("backToLibrary",{text:f.returnToLibrary,priority:-100,click:function(){this.controller.content.mode("browse")}}),this.content.set(a),this.trigger("edit:selection",this)},editImageContent:function(){var a=this.state().get("image"),b=new wp.media.view.EditImage({model:a,controller:this}).render();this.content.set(b),b.loadEditor()},selectionStatusToolbar:function(a){var b=this.state().get("editable");a.set("selection",new wp.media.view.Selection({controller:this,collection:this.state().get("selection"),priority:-40,editable:b&&function(){this.controller.content.mode("edit-selection")}}).render())},mainInsertToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("insert",{style:"primary",priority:80,text:f.insertIntoPost,requires:{selection:!0},click:function(){var a=b.state(),c=a.get("selection");b.close(),a.trigger("insert",c).reset()}})},mainGalleryToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("gallery",{style:"primary",text:f.createNewGallery,priority:60,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("gallery-edit"),d=a.where({type:"image"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("gallery-edit"),this.controller.modal.focusManager.focus()}})},mainPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("playlist",{style:"primary",text:f.createNewPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("playlist-edit"),d=a.where({type:"audio"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("playlist-edit"),this.controller.modal.focusManager.focus()}})},mainVideoPlaylistToolbar:function(a){var b=this;this.selectionStatusToolbar(a),a.set("video-playlist",{style:"primary",text:f.createNewVideoPlaylist,priority:100,requires:{selection:!0},click:function(){var a=b.state().get("selection"),c=b.state("video-playlist-edit"),d=a.where({type:"video"});c.set("library",new wp.media.model.Selection(d,{props:a.props.toJSON(),multiple:!0})),this.controller.setState("video-playlist-edit"),this.controller.modal.focusManager.focus()}})},featuredImageToolbar:function(a){this.createSelectToolbar(a,{text:f.setFeaturedImage,state:this.options.state})},mainEmbedToolbar:function(a){a.view=new wp.media.view.Toolbar.Embed({controller:this})},galleryEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?f.updateGallery:f.insertGallery,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},galleryAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:f.addToGallery,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("gallery-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("gallery-edit")}}}}))},playlistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?f.updatePlaylist:f.insertPlaylist,priority:80,requires:{library:!0},click:function(){var a=this.controller,b=a.state();a.close(),b.trigger("update",b.get("library")),a.setState(a.options.state),a.reset()}}}}))},playlistAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:f.addToPlaylist,priority:80,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("playlist-edit")}}}}))},videoPlaylistEditToolbar:function(){var a=this.state().get("editing");this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:a?f.updateVideoPlaylist:f.insertVideoPlaylist,priority:140,requires:{library:!0},click:function(){var a=this.controller,b=a.state(),c=b.get("library");c.type="video",a.close(),b.trigger("update",c),a.setState(a.options.state),a.reset()}}}}))},videoPlaylistAddToolbar:function(){this.toolbar.set(new wp.media.view.Toolbar({controller:this,items:{insert:{style:"primary",text:f.addToVideoPlaylist,priority:140,requires:{selection:!0},click:function(){var a=this.controller,b=a.state(),c=a.state("video-playlist-edit");c.get("library").add(b.get("selection").models),b.trigger("reset"),a.setState("video-playlist-edit")}}}}))}}),b.exports=c},{}],44:[function(a,b){var c,d=wp.media.view.MediaFrame,e=wp.media.view.l10n;c=d.extend({initialize:function(){d.prototype.initialize.apply(this,arguments),_.defaults(this.options,{selection:[],library:{},multiple:!1,state:"library"}),this.createSelection(),this.createStates(),this.bindHandlers()},createSelection:function(){var a=this.options.selection;a instanceof wp.media.model.Selection||(this.options.selection=new wp.media.model.Selection(a,{multiple:this.options.multiple})),this._selection={attachments:new wp.media.model.Attachments,difference:[]}},createStates:function(){var a=this.options;this.options.states||this.states.add([new wp.media.controller.Library({library:wp.media.query(a.library),multiple:a.multiple,title:a.title,priority:20})])},bindHandlers:function(){this.on("router:create:browse",this.createRouter,this),this.on("router:render:browse",this.browseRouter,this),this.on("content:create:browse",this.browseContent,this),this.on("content:render:upload",this.uploadContent,this),this.on("toolbar:create:select",this.createSelectToolbar,this)},browseRouter:function(a){a.set({upload:{text:e.uploadFilesTitle,priority:20},browse:{text:e.mediaLibraryTitle,priority:40}})},browseContent:function(a){var b=this.state();this.$el.removeClass("hide-toolbar"),a.view=new wp.media.view.AttachmentsBrowser({controller:this,collection:b.get("library"),selection:b.get("selection"),model:b,sortable:b.get("sortable"),search:b.get("searchable"),filters:b.get("filterable"),date:b.get("date"),display:b.get(b.has("display")?"display":"displaySettings"),dragInfo:b.get("dragInfo"),idealColumnWidth:b.get("idealColumnWidth"),suggestedWidth:b.get("suggestedWidth"),suggestedHeight:b.get("suggestedHeight"),AttachmentView:b.get("AttachmentView")})},uploadContent:function(){this.$el.removeClass("hide-toolbar"),this.content.set(new wp.media.view.UploaderInline({controller:this}))},createSelectToolbar:function(a,b){b=b||this.options.button||{},b.controller=this,a.view=new wp.media.view.Toolbar.Select(b)}}),b.exports=c},{}],45:[function(a,b){var c=wp.media.View.extend({className:"media-iframe",render:function(){return this.views.detach(),this.$el.html('<iframe src="'+this.controller.state().get("src")+'" />'),this.views.render(),this}});b.exports=c},{}],46:[function(a,b){var c,d=wp.media.view.Settings.AttachmentDisplay,e=jQuery;c=d.extend({className:"image-details",template:wp.template("image-details"),events:_.defaults(d.prototype.events,{"click .edit-attachment":"editAttachment","click .replace-attachment":"replaceAttachment","click .advanced-toggle":"onToggleAdvanced",'change [data-setting="customWidth"]':"onCustomSize",'change [data-setting="customHeight"]':"onCustomSize",'keyup [data-setting="customWidth"]':"onCustomSize",'keyup [data-setting="customHeight"]':"onCustomSize"}),initialize:function(){this.options.attachment=this.model.attachment,this.listenTo(this.model,"change:url",this.updateUrl),this.listenTo(this.model,"change:link",this.toggleLinkSettings),this.listenTo(this.model,"change:size",this.toggleCustomSize),d.prototype.initialize.apply(this,arguments)},prepare:function(){var a=!1;return this.model.attachment&&(a=this.model.attachment.toJSON()),_.defaults({model:this.model.toJSON(),attachment:a},this.options)},render:function(){var a=arguments;return this.model.attachment&&"pending"===this.model.dfd.state()?this.model.dfd.done(_.bind(function(){d.prototype.render.apply(this,a),this.postRender()},this)).fail(_.bind(function(){this.model.attachment=!1,d.prototype.render.apply(this,a),this.postRender()},this)):(d.prototype.render.apply(this,arguments),this.postRender()),this},postRender:function(){setTimeout(_.bind(this.resetFocus,this),10),this.toggleLinkSettings(),"show"===window.getUserSetting("advImgDetails")&&this.toggleAdvanced(!0),this.trigger("post-render")},resetFocus:function(){this.$(".link-to-custom").blur(),this.$(".embed-media-settings").scrollTop(0)},updateUrl:function(){this.$(".image img").attr("src",this.model.get("url")),this.$(".url").val(this.model.get("url"))},toggleLinkSettings:function(){"none"===this.model.get("link")?this.$(".link-settings").addClass("hidden"):this.$(".link-settings").removeClass("hidden")},toggleCustomSize:function(){"custom"!==this.model.get("size")?this.$(".custom-size").addClass("hidden"):this.$(".custom-size").removeClass("hidden")},onCustomSize:function(a){var b,c=e(a.target).data("setting"),d=e(a.target).val();return!/^\d+/.test(d)||parseInt(d,10)<1?void a.preventDefault():void("customWidth"===c?(b=Math.round(1/this.model.get("aspectRatio")*d),this.model.set("customHeight",b,{silent:!0}),this.$('[data-setting="customHeight"]').val(b)):(b=Math.round(this.model.get("aspectRatio")*d),this.model.set("customWidth",b,{silent:!0}),this.$('[data-setting="customWidth"]').val(b)))},onToggleAdvanced:function(a){a.preventDefault(),this.toggleAdvanced()},toggleAdvanced:function(a){var b,c=this.$el.find(".advanced-section");c.hasClass("advanced-visible")||a===!1?(c.removeClass("advanced-visible"),c.find(".advanced-settings").addClass("hidden"),b="hide"):(c.addClass("advanced-visible"),c.find(".advanced-settings").removeClass("hidden"),b="show"),window.setUserSetting("advImgDetails",b)},editAttachment:function(a){var b=this.controller.states.get("edit-image");window.imageEdit&&b&&(a.preventDefault(),b.set("image",this.model.attachment),this.controller.setState("edit-image"))},replaceAttachment:function(a){a.preventDefault(),this.controller.setState("replace-image")}}),b.exports=c},{}],47:[function(a,b){var c=wp.media.View.extend({tagName:"label",className:"screen-reader-text",initialize:function(){this.value=this.options.value},render:function(){return this.$el.html(this.value),this}});b.exports=c},{}],48:[function(a,b){var c,d=wp.media.view.Frame,e=jQuery;c=d.extend({className:"media-frame",template:wp.template("media-frame"),regions:["menu","title","content","toolbar","router"],events:{"click div.media-frame-title h1":"toggleMenu"},initialize:function(){d.prototype.initialize.apply(this,arguments),_.defaults(this.options,{title:"",modal:!0,uploader:!0}),this.$el.addClass("wp-core-ui"),this.options.modal&&(this.modal=new wp.media.view.Modal({controller:this,title:this.options.title}),this.modal.content(this)),(wp.Uploader.limitExceeded||!wp.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new wp.media.view.UploaderWindow({controller:this,uploader:{dropzone:this.modal?this.modal.$el:this.$el,container:this.$el}}),this.views.set(".media-frame-uploader",this.uploader)),this.on("attach",_.bind(this.views.ready,this.views),this),this.on("title:create:default",this.createTitle,this),this.title.mode("default"),this.on("title:render",function(a){a.$el.append('<span class="dashicons dashicons-arrow-down"></span>')}),this.on("menu:create:default",this.createMenu,this)},render:function(){return!this.state()&&this.options.state&&this.setState(this.options.state),d.prototype.render.apply(this,arguments)},createTitle:function(a){a.view=new wp.media.View({controller:this,tagName:"h1"})},createMenu:function(a){a.view=new wp.media.view.Menu({controller:this})},toggleMenu:function(){this.$el.find(".media-menu").toggleClass("visible")},createToolbar:function(a){a.view=new wp.media.view.Toolbar({controller:this})},createRouter:function(a){a.view=new wp.media.view.Router({controller:this})},createIframeStates:function(a){var b,c=wp.media.view.settings,d=c.tabs,f=c.tabUrl;d&&f&&(b=e("#post_ID"),b.length&&(f+="&post_id="+b.val()),_.each(d,function(b,c){this.state("iframe:"+c).set(_.defaults({tab:c,src:f+"&tab="+c,title:b,content:"iframe",menu:"default"},a))},this),this.on("content:create:iframe",this.iframeContent,this),this.on("content:deactivate:iframe",this.iframeContentCleanup,this),this.on("menu:render:default",this.iframeMenu,this),this.on("open",this.hijackThickbox,this),this.on("close",this.restoreThickbox,this))},iframeContent:function(a){this.$el.addClass("hide-toolbar"),a.view=new wp.media.view.Iframe({controller:this})},iframeContentCleanup:function(){this.$el.removeClass("hide-toolbar")},iframeMenu:function(a){var b={};a&&(_.each(wp.media.view.settings.tabs,function(a,c){b["iframe:"+c]={text:this.state("iframe:"+c).get("title"),priority:200}},this),a.set(b))},hijackThickbox:function(){var a=this;window.tb_remove&&!this._tb_remove&&(this._tb_remove=window.tb_remove,window.tb_remove=function(){a.close(),a.reset(),a.setState(a.options.state),a._tb_remove.call(window)})},restoreThickbox:function(){this._tb_remove&&(window.tb_remove=this._tb_remove,delete this._tb_remove)}}),_.each(["open","close","attach","detach","escape"],function(a){c.prototype[a]=function(){return this.modal&&this.modal[a].apply(this.modal,arguments),this}}),b.exports=c},{}],49:[function(a,b){var c,d=jQuery;c=wp.media.View.extend({tagName:"a",className:"media-menu-item",attributes:{href:"#"},events:{click:"_click"},_click:function(a){var b=this.options.click;a&&a.preventDefault(),b?b.call(this):this.click(),wp.media.isTouchDevice||d(".media-frame-content input").first().focus()},click:function(){var a=this.options.state;a&&(this.controller.setState(a),this.views.parent.$el.removeClass("visible"))},render:function(){var a=this.options;return a.text?this.$el.text(a.text):a.html&&this.$el.html(a.html),this}}),b.exports=c},{}],50:[function(a,b){var c,d=wp.media.view.MenuItem,e=wp.media.view.PriorityList;c=e.extend({tagName:"div",className:"media-menu",property:"state",ItemView:d,region:"menu",toView:function(a,b){return a=a||{},a[this.property]=a[this.property]||b,new this.ItemView(a).render()},ready:function(){e.prototype.ready.apply(this,arguments),this.visibility()},set:function(){e.prototype.set.apply(this,arguments),this.visibility()},unset:function(){e.prototype.unset.apply(this,arguments),this.visibility()},visibility:function(){var a=this.region,b=this.controller[a].get(),c=this.views.get(),d=!c||c.length<2;this===b&&this.controller.$el.toggleClass("hide-"+a,d)},select:function(a){var b=this.get(a);b&&(this.deselect(),b.$el.addClass("active"))},deselect:function(){this.$el.children().removeClass("active")},hide:function(a){var b=this.get(a);b&&b.$el.addClass("hidden")},show:function(a){var b=this.get(a);b&&b.$el.removeClass("hidden")}}),b.exports=c},{}],51:[function(a,b){var c,d=jQuery;c=wp.media.View.extend({tagName:"div",template:wp.template("media-modal"),attributes:{tabindex:0},events:{"click .media-modal-backdrop, .media-modal-close":"escapeHandler",keydown:"keydown"},initialize:function(){_.defaults(this.options,{container:document.body,title:"",propagate:!0,freeze:!0}),this.focusManager=new wp.media.view.FocusManager({el:this.el})},prepare:function(){return{title:this.options.title}},attach:function(){return this.views.attached?this:(this.views.rendered||this.render(),this.$el.appendTo(this.options.container),this.views.attached=!0,this.views.ready(),this.propagate("attach"))},detach:function(){return this.$el.is(":visible")&&this.close(),this.$el.detach(),this.views.attached=!1,this.propagate("detach")},open:function(){var a,b=this.$el,c=this.options;return b.is(":visible")?this:(this.views.attached||this.attach(),c.freeze&&(this._freeze={scrollTop:d(window).scrollTop()}),d("body").addClass("modal-open"),b.show(),"ontouchend"in document&&(a=window.tinymce&&window.tinymce.activeEditor)&&!a.isHidden()&&a.iframeElement&&(a.iframeElement.focus(),a.iframeElement.blur(),setTimeout(function(){a.iframeElement.blur()},100)),this.$el.focus(),this.propagate("open"))},close:function(a){var b=this._freeze;return this.views.attached&&this.$el.is(":visible")?(d("body").removeClass("modal-open"),this.$el.hide().undelegate("keydown"),d("#wpbody-content").focus(),this.propagate("close"),b&&d(window).scrollTop(b.scrollTop),a&&a.escape&&this.propagate("escape"),this):this},escape:function(){return this.close({escape:!0})},escapeHandler:function(a){a.preventDefault(),this.escape()},content:function(a){return this.views.set(".media-modal-content",a),this},propagate:function(a){return this.trigger(a),this.options.propagate&&this.controller.trigger(a),this},keydown:function(a){27===a.which&&this.$el.is(":visible")&&(this.escape(),a.stopImmediatePropagation())}}),b.exports=c},{}],52:[function(a,b){var c=wp.media.View.extend({tagName:"div",initialize:function(){this._views={},this.set(_.extend({},this._views,this.options.views),{silent:!0}),delete this.options.views,this.options.silent||this.render()},set:function(a,b,c){var d,e,f;return c=c||{},_.isObject(a)?(_.each(a,function(a,b){this.set(b,a)},this),this):(b instanceof Backbone.View||(b=this.toView(b,a,c)),b.controller=b.controller||this.controller,this.unset(a),d=b.options.priority||10,e=this.views.get()||[],_.find(e,function(a,b){return a.options.priority>d?(f=b,!0):void 0}),this._views[a]=b,this.views.add(b,{at:_.isNumber(f)?f:e.length||0}),this)},get:function(a){return this._views[a]},unset:function(a){var b=this.get(a);return b&&b.remove(),delete this._views[a],this},toView:function(a){return new wp.media.View(a)}});b.exports=c},{}],53:[function(a,b){var c=wp.media.view.MenuItem.extend({click:function(){var a=this.options.contentMode;a&&this.controller.content.mode(a)}});b.exports=c},{}],54:[function(a,b){var c,d=wp.media.view.Menu;c=d.extend({tagName:"div",className:"media-router",property:"contentMode",ItemView:wp.media.view.RouterItem,region:"router",initialize:function(){this.controller.on("content:render",this.update,this),d.prototype.initialize.apply(this,arguments)},update:function(){var a=this.controller.content.mode();a&&this.select(a)}}),b.exports=c},{}],55:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.View.extend({tagName:"input",className:"search",id:"media-search-input",attributes:{type:"search",placeholder:d.search},events:{input:"search",keyup:"search",change:"search",search:"search"},render:function(){return this.el.value=this.model.escape("search"),this},search:function(a){a.target.value?this.model.set("search",a.target.value):this.model.unset("search")}}),b.exports=c},{}],56:[function(a,b){var c,d=wp.media.view.l10n;c=wp.media.View.extend({tagName:"div",className:"media-selection",template:wp.template("media-selection"),events:{"click .edit-selection":"edit","click .clear-selection":"clear"},initialize:function(){_.defaults(this.options,{editable:!1,clearable:!0}),this.attachments=new wp.media.view.Attachments.Selection({controller:this.controller,collection:this.collection,selection:this.collection,model:new Backbone.Model}),this.views.set(".selection-view",this.attachments),this.collection.on("add remove reset",this.refresh,this),this.controller.on("content:activate",this.refresh,this)},ready:function(){this.refresh()},refresh:function(){if(this.$el.children().length){var a=this.collection,b="edit-selection"===this.controller.content.mode();this.$el.toggleClass("empty",!a.length),this.$el.toggleClass("one",1===a.length),this.$el.toggleClass("editing",b),this.$(".count").text(d.selected.replace("%d",a.length))}},edit:function(a){a.preventDefault(),this.options.editable&&this.options.editable.call(this,this.collection)},clear:function(a){a.preventDefault(),this.collection.reset(),this.controller.modal.focusManager.focus()}}),b.exports=c},{}],57:[function(a,b){var c,d=wp.media.View,e=Backbone.$;c=d.extend({events:{"click button":"updateHandler","change input":"updateHandler","change select":"updateHandler","change textarea":"updateHandler"},initialize:function(){this.model=this.model||new Backbone.Model,this.listenTo(this.model,"change",this.updateChanges)},prepare:function(){return _.defaults({model:this.model.toJSON()},this.options)},render:function(){return d.prototype.render.apply(this,arguments),_(this.model.attributes).chain().keys().each(this.update,this),this},update:function(a){var b,c,d=this.model.get(a),e=this.$('[data-setting="'+a+'"]');e.length&&(e.is("select")?(c=e.find('[value="'+d+'"]'),c.length?(e.find("option").prop("selected",!1),c.prop("selected",!0)):this.model.set(a,e.find(":selected").val())):e.hasClass("button-group")?(b=e.find("button").removeClass("active"),b.filter('[value="'+d+'"]').addClass("active")):e.is('input[type="text"], textarea')?e.is(":focus")||e.val(d):e.is('input[type="checkbox"]')&&e.prop("checked",!!d&&"false"!==d))},updateHandler:function(a){var b,c=e(a.target).closest("[data-setting]"),d=a.target.value;a.preventDefault(),c.length&&(c.is('input[type="checkbox"]')&&(d=c[0].checked),this.model.set(c.data("setting"),d),(b=c.data("userSetting"))&&window.setUserSetting(b,d))},updateChanges:function(a){a.hasChanged()&&_(a.changed).chain().keys().each(this.update,this)}}),b.exports=c},{}],58:[function(a,b){var c,d=wp.media.view.Settings;c=d.extend({className:"attachment-display-settings",template:wp.template("attachment-display-settings"),initialize:function(){var a=this.options.attachment;_.defaults(this.options,{userSettings:!1}),d.prototype.initialize.apply(this,arguments),this.listenTo(this.model,"change:link",this.updateLinkTo),a&&a.on("change:uploading",this.render,this)},dispose:function(){var a=this.options.attachment;a&&a.off(null,null,this),d.prototype.dispose.apply(this,arguments)},render:function(){var a=this.options.attachment;return a&&_.extend(this.options,{sizes:a.get("sizes"),type:a.get("type")}),d.prototype.render.call(this),this.updateLinkTo(),this},updateLinkTo:function(){var a=this.model.get("link"),b=this.$(".link-to-custom"),c=this.options.attachment;return"none"===a||"embed"===a||!c&&"custom"!==a?void b.addClass("hidden"):(c&&("post"===a?b.val(c.get("link")):"file"===a?b.val(c.get("url")):this.model.get("linkUrl")||b.val("http://"),b.prop("readonly","custom"!==a)),b.removeClass("hidden"),void(!wp.media.isTouchDevice&&b.is(":visible")&&b.focus()[0].select()))}}),b.exports=c},{}],59:[function(a,b){var c=wp.media.view.Settings.extend({className:"collection-settings gallery-settings",template:wp.template("gallery-settings")});b.exports=c},{}],60:[function(a,b){var c=wp.media.view.Settings.extend({className:"collection-settings playlist-settings",template:wp.template("playlist-settings")});b.exports=c},{}],61:[function(a,b){var c=wp.media.view.PriorityList.extend({className:"media-sidebar"});b.exports=c},{}],62:[function(a,b){var c=wp.media.View.extend({tagName:"span",className:"spinner",spinnerTimeout:!1,delay:400,show:function(){return this.spinnerTimeout||(this.spinnerTimeout=_.delay(function(a){a.addClass("is-active")},this.delay,this.$el)),this},hide:function(){return this.$el.removeClass("is-active"),this.spinnerTimeout=clearTimeout(this.spinnerTimeout),this}});b.exports=c},{}],63:[function(a,b){var c,d=wp.media.View;c=d.extend({tagName:"div",className:"media-toolbar",initialize:function(){var a=this.controller.state(),b=this.selection=a.get("selection"),c=this.library=a.get("library");this._views={},this.primary=new wp.media.view.PriorityList,this.secondary=new wp.media.view.PriorityList,this.primary.$el.addClass("media-toolbar-primary search-form"),this.secondary.$el.addClass("media-toolbar-secondary"),this.views.set([this.secondary,this.primary]),this.options.items&&this.set(this.options.items,{silent:!0}),this.options.silent||this.render(),b&&b.on("add remove reset",this.refresh,this),c&&c.on("add remove reset",this.refresh,this)},dispose:function(){return this.selection&&this.selection.off(null,null,this),this.library&&this.library.off(null,null,this),d.prototype.dispose.apply(this,arguments)},ready:function(){this.refresh()},set:function(a,b,c){var d;return c=c||{},_.isObject(a)?_.each(a,function(a,b){this.set(b,a,{silent:!0})},this):(b instanceof Backbone.View||(b.classes=["media-button-"+a].concat(b.classes||[]),b=new wp.media.view.Button(b).render()),b.controller=b.controller||this.controller,this._views[a]=b,d=b.options.priority<0?"secondary":"primary",this[d].set(a,b,c)),c.silent||this.refresh(),this},get:function(a){return this._views[a]},unset:function(a,b){return delete this._views[a],this.primary.unset(a,b),this.secondary.unset(a,b),b&&b.silent||this.refresh(),this},refresh:function(){var a=this.controller.state(),b=a.get("library"),c=a.get("selection");_.each(this._views,function(a){if(a.model&&a.options&&a.options.requires){var d=a.options.requires,e=!1;e=_.some(c.models,function(a){return a.get("uploading")===!0}),d.selection&&c&&!c.length?e=!0:d.library&&b&&!b.length&&(e=!0),a.model.set("disabled",e)}})}}),b.exports=c},{}],64:[function(a,b){var c,d=wp.media.view.Toolbar.Select,e=wp.media.view.l10n;c=d.extend({initialize:function(){_.defaults(this.options,{text:e.insertIntoPost,requires:!1}),d.prototype.initialize.apply(this,arguments)},refresh:function(){var a=this.controller.state().props.get("url");this.get("select").model.set("disabled",!a||"http://"===a),d.prototype.refresh.apply(this,arguments)}}),b.exports=c},{}],65:[function(a,b){var c,d=wp.media.view.Toolbar,e=wp.media.view.l10n;c=d.extend({initialize:function(){var a=this.options;_.bindAll(this,"clickSelect"),_.defaults(a,{event:"select",state:!1,reset:!0,close:!0,text:e.select,requires:{selection:!0}}),a.items=_.defaults(a.items||{},{select:{style:"primary",text:a.text,priority:80,click:this.clickSelect,requires:a.requires}}),d.prototype.initialize.apply(this,arguments)},clickSelect:function(){var a=this.options,b=this.controller;a.close&&b.close(),a.event&&b.state().trigger(a.event),a.state&&b.setState(a.state),a.reset&&b.reset()}}),b.exports=c},{}],66:[function(a,b){var c,d=wp.media.View,e=wp.media.view.l10n,f=jQuery;c=d.extend({tagName:"div",className:"uploader-editor",template:wp.template("uploader-editor"),localDrag:!1,overContainer:!1,overDropzone:!1,draggingFile:null,initialize:function(){return this.initialized=!1,window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&this.browserSupport()?(this.$document=f(document),this.dropzones=[],this.files=[],this.$document.on("drop",".uploader-editor",_.bind(this.drop,this)),this.$document.on("dragover",".uploader-editor",_.bind(this.dropzoneDragover,this)),this.$document.on("dragleave",".uploader-editor",_.bind(this.dropzoneDragleave,this)),this.$document.on("click",".uploader-editor",_.bind(this.click,this)),this.$document.on("dragover",_.bind(this.containerDragover,this)),this.$document.on("dragleave",_.bind(this.containerDragleave,this)),this.$document.on("dragstart dragend drop",_.bind(function(a){this.localDrag="dragstart"===a.type},this)),this.initialized=!0,this):this},browserSupport:function(){var a=!1,b=document.createElement("div");return a="draggable"in b||"ondragstart"in b&&"ondrop"in b,a=a&&!!(window.File&&window.FileList&&window.FileReader)},isDraggingFile:function(a){return null!==this.draggingFile?this.draggingFile:_.isUndefined(a.originalEvent)||_.isUndefined(a.originalEvent.dataTransfer)?!1:(this.draggingFile=_.indexOf(a.originalEvent.dataTransfer.types,"Files")>-1&&-1===_.indexOf(a.originalEvent.dataTransfer.types,"text/plain"),this.draggingFile)},refresh:function(a){var b;for(b in this.dropzones)this.dropzones[b].toggle(this.overContainer||this.overDropzone);return _.isUndefined(a)||f(a.target).closest(".uploader-editor").toggleClass("droppable",this.overDropzone),this.overContainer||this.overDropzone||(this.draggingFile=null),this},render:function(){return this.initialized?(d.prototype.render.apply(this,arguments),f(".wp-editor-wrap, #wp-fullscreen-body").each(_.bind(this.attach,this)),this):this},attach:function(a,b){var c=this.$el.clone();return this.dropzones.push(c),f(b).append(c),this},drop:function(a){var b,c=null;return this.containerDragleave(a),this.dropzoneDragleave(a),this.files=a.originalEvent.dataTransfer.files,this.files.length<1?void 0:(c=f(a.target).parents(".wp-editor-wrap"),c.length>0&&c[0].id&&(window.wpActiveEditor=c[0].id.slice(3,-5)),this.workflow?(this.workflow.state().reset(),this.addFiles.apply(this),this.workflow.open()):(this.workflow=wp.media.editor.open("content",{frame:"post",state:"insert",title:e.addMedia,multiple:!0}),b=this.workflow.uploader,b.uploader&&b.uploader.ready?this.addFiles.apply(this):this.workflow.on("uploader:ready",this.addFiles,this)),!1)},addFiles:function(){return this.files.length&&(this.workflow.uploader.uploader.uploader.addFile(_.toArray(this.files)),this.files=[]),this},containerDragover:function(a){!this.localDrag&&this.isDraggingFile(a)&&(this.overContainer=!0,this.refresh())},containerDragleave:function(){this.overContainer=!1,_.delay(_.bind(this.refresh,this),50)},dropzoneDragover:function(a){return!this.localDrag&&this.isDraggingFile(a)?(this.overDropzone=!0,this.refresh(a),!1):void 0},dropzoneDragleave:function(a){this.overDropzone=!1,_.delay(_.bind(this.refresh,this,a),50)},click:function(a){this.containerDragleave(a),this.dropzoneDragleave(a),this.localDrag=!1}}),b.exports=c},{}],67:[function(a,b){var c,d=wp.media.View;c=d.extend({tagName:"div",className:"uploader-inline",template:wp.template("uploader-inline"),events:{"click .close":"hide"},initialize:function(){_.defaults(this.options,{message:"",status:!0,canClose:!1}),!this.options.$browser&&this.controller.uploader&&(this.options.$browser=this.controller.uploader.$browser),_.isUndefined(this.options.postId)&&(this.options.postId=wp.media.view.settings.post.id),
-this.options.status&&this.views.set(".upload-inline-status",new wp.media.view.UploaderStatus({controller:this.controller}))},prepare:function(){var a=this.controller.state().get("suggestedWidth"),b=this.controller.state().get("suggestedHeight"),c={};return c.message=this.options.message,c.canClose=this.options.canClose,a&&b&&(c.suggestedWidth=a,c.suggestedHeight=b),c},dispose:function(){return this.disposing?d.prototype.dispose.apply(this,arguments):(this.disposing=!0,this.remove())},remove:function(){var a=d.prototype.remove.apply(this,arguments);return _.defer(_.bind(this.refresh,this)),a},refresh:function(){var a=this.controller.uploader;a&&a.refresh()},ready:function(){var a,b=this.options.$browser;if(this.controller.uploader){if(a=this.$(".browser"),a[0]===b[0])return;b.detach().text(a.text()),b[0].className=a[0].className,a.replaceWith(b.show())}return this.refresh(),this},show:function(){this.$el.removeClass("hidden")},hide:function(){this.$el.addClass("hidden")}}),b.exports=c},{}],68:[function(a,b){var c=wp.media.View.extend({className:"upload-error",template:wp.template("uploader-status-error")});b.exports=c},{}],69:[function(a,b){var c,d=wp.media.View;c=d.extend({className:"media-uploader-status",template:wp.template("uploader-status"),events:{"click .upload-dismiss-errors":"dismiss"},initialize:function(){this.queue=wp.Uploader.queue,this.queue.on("add remove reset",this.visibility,this),this.queue.on("add remove reset change:percent",this.progress,this),this.queue.on("add remove reset change:uploading",this.info,this),this.errors=wp.Uploader.errors,this.errors.reset(),this.errors.on("add remove reset",this.visibility,this),this.errors.on("add",this.error,this)},dispose:function(){return wp.Uploader.queue.off(null,null,this),d.prototype.dispose.apply(this,arguments),this},visibility:function(){this.$el.toggleClass("uploading",!!this.queue.length),this.$el.toggleClass("errors",!!this.errors.length),this.$el.toggle(!!this.queue.length||!!this.errors.length)},ready:function(){_.each({$bar:".media-progress-bar div",$index:".upload-index",$total:".upload-total",$filename:".upload-filename"},function(a,b){this[b]=this.$(a)},this),this.visibility(),this.progress(),this.info()},progress:function(){var a=this.queue,b=this.$bar;b&&a.length&&b.width(a.reduce(function(a,b){if(!b.get("uploading"))return a+100;var c=b.get("percent");return a+(_.isNumber(c)?c:100)},0)/a.length+"%")},info:function(){var a,b=this.queue,c=0;b.length&&(a=this.queue.find(function(a,b){return c=b,a.get("uploading")}),this.$index.text(c+1),this.$total.text(b.length),this.$filename.html(a?this.filename(a.get("filename")):""))},filename:function(a){return wp.media.truncate(_.escape(a),24)},error:function(a){this.views.add(".upload-errors",new wp.media.view.UploaderStatusError({filename:this.filename(a.get("file").name),message:a.get("message")}),{at:0})},dismiss:function(a){var b=this.views.get(".upload-errors");a.preventDefault(),b&&_.invoke(b,"remove"),wp.Uploader.errors.reset()}}),b.exports=c},{}],70:[function(a,b){var c,d=jQuery;c=wp.media.View.extend({tagName:"div",className:"uploader-window",template:wp.template("uploader-window"),initialize:function(){var a;this.$browser=d('<a href="#" class="browser" />').hide().appendTo("body"),a=this.options.uploader=_.defaults(this.options.uploader||{},{dropzone:this.$el,browser:this.$browser,params:{}}),!a.dropzone||a.dropzone instanceof d||(a.dropzone=d(a.dropzone)),this.controller.on("activate",this.refresh,this),this.controller.on("detach",function(){this.$browser.remove()},this)},refresh:function(){this.uploader&&this.uploader.refresh()},ready:function(){var a,b=wp.media.view.settings.post.id;this.uploader||(b&&(this.options.uploader.params.post_id=b),this.uploader=new wp.Uploader(this.options.uploader),a=this.uploader.dropzone,a.on("dropzone:enter",_.bind(this.show,this)),a.on("dropzone:leave",_.bind(this.hide,this)),d(this.uploader).on("uploader:ready",_.bind(this._ready,this)))},_ready:function(){this.controller.trigger("uploader:ready")},show:function(){var a=this.$el.show();_.defer(function(){a.css({opacity:1})})},hide:function(){var a=this.$el.css({opacity:0});wp.media.transition(a).done(function(){"0"===a.css("opacity")&&a.hide()}),_.delay(function(){"0"===a.css("opacity")&&a.is(":visible")&&a.hide()},500)}}),b.exports=c},{}],71:[function(a,b){var c=wp.Backbone.View.extend({constructor:function(a){a&&a.controller&&(this.controller=a.controller),wp.Backbone.View.apply(this,arguments)},dispose:function(){return this.undelegateEvents(),this.model&&this.model.off&&this.model.off(null,null,this),this.collection&&this.collection.off&&this.collection.off(null,null,this),this.controller&&this.controller.off&&this.controller.off(null,null,this),this},remove:function(){return this.dispose(),wp.Backbone.View.prototype.remove.apply(this,arguments)}});b.exports=c},{}]},{},[17]);
\ No newline at end of file
+this.options.status&&this.views.set(".upload-inline-status",new wp.media.view.UploaderStatus({controller:this.controller}))},prepare:function(){var a=this.controller.state().get("suggestedWidth"),b=this.controller.state().get("suggestedHeight"),c={};return c.message=this.options.message,c.canClose=this.options.canClose,a&&b&&(c.suggestedWidth=a,c.suggestedHeight=b),c},dispose:function(){return this.disposing?d.prototype.dispose.apply(this,arguments):(this.disposing=!0,this.remove())},remove:function(){var a=d.prototype.remove.apply(this,arguments);return _.defer(_.bind(this.refresh,this)),a},refresh:function(){var a=this.controller.uploader;a&&a.refresh()},ready:function(){var a,b=this.options.$browser;if(this.controller.uploader){if(a=this.$(".browser"),a[0]===b[0])return;b.detach().text(a.text()),b[0].className=a[0].className,a.replaceWith(b.show())}return this.refresh(),this},show:function(){this.$el.removeClass("hidden")},hide:function(){this.$el.addClass("hidden")}}),b.exports=c},{}],68:[function(a,b){var c=wp.media.View.extend({className:"upload-error",template:wp.template("uploader-status-error")});b.exports=c},{}],69:[function(a,b){var c,d=wp.media.View;c=d.extend({className:"media-uploader-status",template:wp.template("uploader-status"),events:{"click .upload-dismiss-errors":"dismiss"},initialize:function(){this.queue=wp.Uploader.queue,this.queue.on("add remove reset",this.visibility,this),this.queue.on("add remove reset change:percent",this.progress,this),this.queue.on("add remove reset change:uploading",this.info,this),this.errors=wp.Uploader.errors,this.errors.reset(),this.errors.on("add remove reset",this.visibility,this),this.errors.on("add",this.error,this)},dispose:function(){return wp.Uploader.queue.off(null,null,this),d.prototype.dispose.apply(this,arguments),this},visibility:function(){this.$el.toggleClass("uploading",!!this.queue.length),this.$el.toggleClass("errors",!!this.errors.length),this.$el.toggle(!!this.queue.length||!!this.errors.length)},ready:function(){_.each({$bar:".media-progress-bar div",$index:".upload-index",$total:".upload-total",$filename:".upload-filename"},function(a,b){this[b]=this.$(a)},this),this.visibility(),this.progress(),this.info()},progress:function(){var a=this.queue,b=this.$bar;b&&a.length&&b.width(a.reduce(function(a,b){if(!b.get("uploading"))return a+100;var c=b.get("percent");return a+(_.isNumber(c)?c:100)},0)/a.length+"%")},info:function(){var a,b=this.queue,c=0;b.length&&(a=this.queue.find(function(a,b){return c=b,a.get("uploading")}),this.$index.text(c+1),this.$total.text(b.length),this.$filename.html(a?this.filename(a.get("filename")):""))},filename:function(a){return wp.media.truncate(_.escape(a),24)},error:function(a){this.views.add(".upload-errors",new wp.media.view.UploaderStatusError({filename:this.filename(a.get("file").name),message:a.get("message")}),{at:0})},dismiss:function(a){var b=this.views.get(".upload-errors");a.preventDefault(),b&&_.invoke(b,"remove"),wp.Uploader.errors.reset()}}),b.exports=c},{}],70:[function(a,b){var c,d=jQuery;c=wp.media.View.extend({tagName:"div",className:"uploader-window",template:wp.template("uploader-window"),initialize:function(){var a;this.$browser=d('<a href="#" class="browser" />').hide().appendTo("body"),a=this.options.uploader=_.defaults(this.options.uploader||{},{dropzone:this.$el,browser:this.$browser,params:{}}),!a.dropzone||a.dropzone instanceof d||(a.dropzone=d(a.dropzone)),this.controller.on("activate",this.refresh,this),this.controller.on("detach",function(){this.$browser.remove()},this)},refresh:function(){this.uploader&&this.uploader.refresh()},ready:function(){var a,b=wp.media.view.settings.post.id;this.uploader||(b&&(this.options.uploader.params.post_id=b),this.uploader=new wp.Uploader(this.options.uploader),a=this.uploader.dropzone,a.on("dropzone:enter",_.bind(this.show,this)),a.on("dropzone:leave",_.bind(this.hide,this)),d(this.uploader).on("uploader:ready",_.bind(this._ready,this)))},_ready:function(){this.controller.trigger("uploader:ready")},show:function(){var a=this.$el.show();_.defer(function(){a.css({opacity:1})})},hide:function(){var a=this.$el.css({opacity:0});wp.media.transition(a).done(function(){"0"===a.css("opacity")&&a.hide()}),_.delay(function(){"0"===a.css("opacity")&&a.is(":visible")&&a.hide()},500)}}),b.exports=c},{}],71:[function(a,b){var c=wp.Backbone.View.extend({constructor:function(a){a&&a.controller&&(this.controller=a.controller),wp.Backbone.View.apply(this,arguments)},dispose:function(){return this.undelegateEvents(),this.model&&this.model.off&&this.model.off(null,null,this),this.collection&&this.collection.off&&this.collection.off(null,null,this),this.controller&&this.controller.off&&this.controller.off(null,null,this),this},remove:function(){return this.dispose(),wp.Backbone.View.prototype.remove.apply(this,arguments)}});b.exports=c},{}]},{},[17]);>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/mediaelement/flashmediaelement.swf b/pavillonmadeleine.fr/wp-includes/js/mediaelement/flashmediaelement.swf
index fd966046..0b81b4fa 100644
Binary files a/pavillonmadeleine.fr/wp-includes/js/mediaelement/flashmediaelement.swf and b/pavillonmadeleine.fr/wp-includes/js/mediaelement/flashmediaelement.swf differ
diff --git a/pavillonmadeleine.fr/wp-includes/js/mediaelement/mediaelement-and-player.min.js b/pavillonmadeleine.fr/wp-includes/js/mediaelement/mediaelement-and-player.min.js
index 0132a227..fd0cf4ab 100644
--- a/pavillonmadeleine.fr/wp-includes/js/mediaelement/mediaelement-and-player.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/mediaelement/mediaelement-and-player.min.js
@@ -1,4 +1,94 @@
 /*!
+<<<<<<< .mine
+ *
+ * MediaElement.js
+ * HTML5 <video> and <audio> shim and player
+ * http://mediaelementjs.com/
+ *
+ * Creates a JavaScript object that mimics HTML5 MediaElement API
+ * for browsers that don't understand HTML5 or can't play the provided codec
+ * Can play MP4 (H.264), Ogg, WebM, FLV, WMV, WMA, ACC, and MP3
+ *
+ * Copyright 2010-2014, John Dyer (http://j.hn)
+ * License: MIT
+ *
+ */
+function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.17.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&amp;").split("<").join("&lt;").split('"').join("&quot;")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='<a href="'+this.escapeHTML(a)+'">x</a>',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e<a.length;e++)d=1,e>0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f<h.length;f++)h[f]=parseInt(h[f].match(/\d+/),10)}else if("undefined"!=typeof window.ActiveXObject)try{g=new ActiveXObject(c),g&&(h=d(g))}catch(i){}return h}},mejs.PluginDetector.addPlugin("flash","Shockwave Flash","application/x-shockwave-flash","ShockwaveFlash.ShockwaveFlash",function(a){var b=[],c=a.GetVariable("$version");return c&&(c=c.split(" ")[1].split(","),b=[parseInt(c[0],10),parseInt(c[1],10),parseInt(c[2],10)]),b}),mejs.PluginDetector.addPlugin("silverlight","Silverlight Plug-In","application/x-silverlight-2","AgControl.AgControl",function(a){var b=[0,0,0,0],c=function(a,b,c,d){for(;a.isVersionSupported(b[0]+"."+b[1]+"."+b[2]+"."+b[3]);)b[c]+=d;b[c]-=d};return c(a,b,0,1),c(a,b,1,1),c(a,b,2,1e4),c(a,b,2,1e3),c(a,b,2,100),c(a,b,2,10),c(a,b,2,1),c(a,b,3,1),b}),mejs.MediaFeatures={init:function(){var a,b,c=this,d=document,e=mejs.PluginDetector.nav,f=mejs.PluginDetector.ua.toLowerCase(),g=["source","track","audio","video"];c.isiPad=null!==f.match(/ipad/i),c.isiPhone=null!==f.match(/iphone/i),c.isiOS=c.isiPhone||c.isiPad,c.isAndroid=null!==f.match(/android/i),c.isBustedAndroid=null!==f.match(/android 2\.[12]/),c.isBustedNativeHTTPS="https:"===location.protocol&&(null!==f.match(/android [12]\./)||null!==f.match(/macintosh.* version.* safari/)),c.isIE=-1!=e.appName.toLowerCase().indexOf("microsoft")||null!==e.appName.toLowerCase().match(/trident/gi),c.isChrome=null!==f.match(/chrome/gi),c.isChromium=null!==f.match(/chromium/gi),c.isFirefox=null!==f.match(/firefox/gi),c.isWebkit=null!==f.match(/webkit/gi),c.isGecko=null!==f.match(/gecko/gi)&&!c.isWebkit&&!c.isIE,c.isOpera=null!==f.match(/opera/gi),c.hasTouch="ontouchstart"in window,c.svg=!!document.createElementNS&&!!document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect;for(a=0;a<g.length;a++)b=document.createElement(g[a]);c.supportsMediaTag="undefined"!=typeof b.canPlayType||c.isBustedAndroid;try{b.canPlayType("video/mp4")}catch(h){c.supportsMediaTag=!1}c.hasSemiNativeFullScreen="undefined"!=typeof b.webkitEnterFullscreen,c.hasNativeFullscreen="undefined"!=typeof b.requestFullscreen,c.hasWebkitNativeFullScreen="undefined"!=typeof b.webkitRequestFullScreen,c.hasMozNativeFullScreen="undefined"!=typeof b.mozRequestFullScreen,c.hasMsNativeFullScreen="undefined"!=typeof b.msRequestFullscreen,c.hasTrueNativeFullScreen=c.hasWebkitNativeFullScreen||c.hasMozNativeFullScreen||c.hasMsNativeFullScreen,c.nativeFullScreenEnabled=c.hasTrueNativeFullScreen,c.hasMozNativeFullScreen?c.nativeFullScreenEnabled=document.mozFullScreenEnabled:c.hasMsNativeFullScreen&&(c.nativeFullScreenEnabled=document.msFullscreenEnabled),c.isChrome&&(c.hasSemiNativeFullScreen=!1),c.hasTrueNativeFullScreen&&(c.fullScreenEventName="",c.hasWebkitNativeFullScreen?c.fullScreenEventName="webkitfullscreenchange":c.hasMozNativeFullScreen?c.fullScreenEventName="mozfullscreenchange":c.hasMsNativeFullScreen&&(c.fullScreenEventName="MSFullscreenChange"),c.isFullScreen=function(){return c.hasMozNativeFullScreen?d.mozFullScreen:c.hasWebkitNativeFullScreen?d.webkitIsFullScreen:c.hasMsNativeFullScreen?null!==d.msFullscreenElement:void 0},c.requestFullScreen=function(a){c.hasWebkitNativeFullScreen?a.webkitRequestFullScreen():c.hasMozNativeFullScreen?a.mozRequestFullScreen():c.hasMsNativeFullScreen&&a.msRequestFullscreen()},c.cancelFullScreen=function(){c.hasWebkitNativeFullScreen?document.webkitCancelFullScreen():c.hasMozNativeFullScreen?document.mozCancelFullScreen():c.hasMsNativeFullScreen&&document.msExitFullscreen()}),c.hasSemiNativeFullScreen&&f.match(/mac os x 10_5/i)&&(c.hasNativeFullScreen=!1,c.hasSemiNativeFullScreen=!1)}},mejs.MediaFeatures.init(),mejs.HtmlMediaElement={pluginType:"native",isFullScreen:!1,setCurrentTime:function(a){this.currentTime=a},setMuted:function(a){this.muted=a},setVolume:function(a){this.volume=a},stop:function(){this.pause()},setSrc:function(a){for(var b=this.getElementsByTagName("source");b.length>0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c<a.length;c++)if(d=a[c],this.canPlayType(d.type)){this.src=d.src;break}}},setVideoSize:function(a,b){this.width=a,this.height=b}},mejs.PluginMediaElement=function(a,b,c){this.id=a,this.pluginType=b,this.src=c,this.events={},this.attributes={}},mejs.PluginMediaElement.prototype={pluginElement:null,pluginType:"",isFullScreen:!1,playbackRate:-1,defaultPlaybackRate:-1,seekable:[],played:[],paused:!0,ended:!1,seeking:!1,duration:0,error:null,tagName:"",muted:!1,volume:1,currentTime:0,play:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.playVideo():this.pluginApi.playMedia(),this.paused=!1)},load:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType||this.pluginApi.loadMedia(),this.paused=!1)},pause:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.pauseVideo():this.pluginApi.pauseMedia(),this.paused=!0)},stop:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.stopVideo():this.pluginApi.stopMedia(),this.paused=!0)},canPlayType:function(a){var b,c,d,e=mejs.plugins[this.pluginType];for(b=0;b<e.length;b++)if(d=e[b],mejs.PluginDetector.hasPluginVersion(this.pluginType,d.version))for(c=0;c<d.types.length;c++)if(a==d.types[c])return"probably";return""},positionFullscreenButton:function(a,b,c){null!=this.pluginApi&&this.pluginApi.positionFullscreenButton&&this.pluginApi.positionFullscreenButton(Math.floor(a),Math.floor(b),c)},hideFullscreenButton:function(){null!=this.pluginApi&&this.pluginApi.hideFullscreenButton&&this.pluginApi.hideFullscreenButton()},setSrc:function(a){if("string"==typeof a)this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(a)),this.src=mejs.Utility.absolutizeUrl(a);else{var b,c;for(b=0;b<a.length;b++)if(c=a[b],this.canPlayType(c.type)){this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(c.src)),this.src=mejs.Utility.absolutizeUrl(a);break}}},setCurrentTime:function(a){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.seekTo(a):this.pluginApi.setCurrentTime(a),this.currentTime=a)},setVolume:function(a){null!=this.pluginApi&&(this.pluginApi.setVolume("youtube"==this.pluginType?100*a:a),this.volume=a)},setMuted:function(a){null!=this.pluginApi&&("youtube"==this.pluginType?(a?this.pluginApi.mute():this.pluginApi.unMute(),this.muted=a,this.dispatchEvent("volumechange")):this.pluginApi.setMuted(a),this.muted=a)},setVideoSize:function(a,b){this.pluginElement&&this.pluginElement.style&&(this.pluginElement.style.width=a+"px",this.pluginElement.style.height=b+"px"),null!=this.pluginApi&&this.pluginApi.setVideoSize&&this.pluginApi.setVideoSize(a,b)},setFullscreen:function(a){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.pluginApi.setFullscreen(a)},enterFullScreen:function(){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.setFullscreen(!0)},exitFullScreen:function(){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.setFullscreen(!1)},addEventListener:function(a,b){this.events[a]=this.events[a]||[],this.events[a].push(b)},removeEventListener:function(a,b){if(!a)return this.events={},!0;var c=this.events[a];if(!c)return!0;if(!b)return this.events[a]=[],!0;for(var d=0;d<c.length;d++)if(c[d]===b)return this.events[a].splice(d,1),!0;return!1},dispatchEvent:function(a){var b,c,d=this.events[a];if(d)for(c=Array.prototype.slice.call(arguments,1),b=0;b<d.length;b++)d[b].apply(this,c)},hasAttribute:function(a){return a in this.attributes},removeAttribute:function(a){delete this.attributes[a]},getAttribute:function(a){return this.hasAttribute(a)?this.attributes[a]:""},setAttribute:function(a,b){this.attributes[a]=b},remove:function(){mejs.Utility.removeSwf(this.pluginElement.id),mejs.MediaPluginBridge.unregisterPluginElement(this.pluginElement.id)}},mejs.MediaPluginBridge={pluginMediaElements:{},htmlMediaElements:{},registerPluginElement:function(a,b,c){this.pluginMediaElements[a]=b,this.htmlMediaElements[a]=c},unregisterPluginElement:function(a){delete this.pluginMediaElements[a],delete this.htmlMediaElements[a]},initPlugin:function(a){var b=this.pluginMediaElements[a],c=this.htmlMediaElements[a];if(b){switch(b.pluginType){case"flash":b.pluginElement=b.pluginApi=document.getElementById(a);break;case"silverlight":b.pluginElement=document.getElementById(b.id),b.pluginApi=b.pluginElement.Content.MediaElementJS}null!=b.pluginApi&&b.success&&b.success(b,c)}},fireEvent:function(a,b,c){var d,e,f,g=this.pluginMediaElements[a];if(g){d={type:b,target:g};for(e in c)g[e]=c[e],d[e]=c[e];f=c.bufferedTime||0,d.target.buffered=d.buffered={start:function(){return 0},end:function(){return f},length:1},g.dispatchEvent(d.type,d)}}},mejs.MediaElementDefaults={mode:"auto",plugins:["flash","silverlight","youtube","vimeo"],enablePluginDebug:!1,httpsBasicAuthSite:!1,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:!1,enablePseudoStreaming:!1,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,defaultVideoHeight:270,pluginWidth:-1,pluginHeight:-1,pluginVars:[],timerRate:250,startVolume:.8,success:function(){},error:function(){}},mejs.MediaElement=function(a,b){return mejs.HtmlMediaElementShim.create(a,b)},mejs.HtmlMediaElementShim={create:function(a,b){var c,d,e=mejs.MediaElementDefaults,f="string"==typeof a?document.getElementById(a):a,g=f.tagName.toLowerCase(),h="audio"===g||"video"===g,i=f.getAttribute(h?"src":"href"),j=f.getAttribute("poster"),k=f.getAttribute("autoplay"),l=f.getAttribute("preload"),m=f.getAttribute("controls");for(d in b)e[d]=b[d];return i="undefined"==typeof i||null===i||""==i?null:i,j="undefined"==typeof j||null===j?"":j,l="undefined"==typeof l||null===l||"false"===l?"none":l,k=!("undefined"==typeof k||null===k||"false"===k),m=!("undefined"==typeof m||null===m||"false"===m),c=this.determinePlayback(f,e,mejs.MediaFeatures.supportsMediaTag,h,i),c.url=null!==c.url?mejs.Utility.absolutizeUrl(c.url):"","native"==c.method?(mejs.MediaFeatures.isBustedAndroid&&(f.src=c.url,f.addEventListener("click",function(){f.play()},!1)),this.updateNative(c,e,k,l)):""!==c.method?this.createPlugin(c,e,j,k,l,m):(this.createErrorMessage(c,e,j),this)},determinePlayback:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=[],r={method:"",url:"",htmlMediaElement:a,isVideo:"audio"!=a.tagName.toLowerCase()};if("undefined"!=typeof b.type&&""!==b.type)if("string"==typeof b.type)q.push({type:b.type,url:e});else for(f=0;f<b.type.length;f++)q.push({type:b.type[f],url:e});else if(null!==e)k=this.formatType(e,a.getAttribute("type")),q.push({type:k,url:e});else for(f=0;f<a.childNodes.length;f++)j=a.childNodes[f],1==j.nodeType&&"source"==j.tagName.toLowerCase()&&(e=j.getAttribute("src"),k=this.formatType(e,j.getAttribute("type")),p=j.getAttribute("media"),(!p||!window.matchMedia||window.matchMedia&&window.matchMedia(p).matches)&&q.push({type:k,url:e}));if(!d&&q.length>0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f<q.length;f++)if("video/m3u8"==q[f].type||""!==a.canPlayType(q[f].type).replace(/no/,"")||""!==a.canPlayType(q[f].type.replace(/mp3/,"mpeg")).replace(/no/,"")||""!==a.canPlayType(q[f].type.replace(/m4a/,"mp4")).replace(/no/,"")){r.method="native",r.url=q[f].url;break}if("native"===r.method&&(null!==r.url&&(a.src=r.url),"auto_plugin"!==b.mode))return r}if("auto"===b.mode||"auto_plugin"===b.mode||"shim"===b.mode)for(f=0;f<q.length;f++)for(k=q[f].type,g=0;g<b.plugins.length;g++)for(l=b.plugins[g],m=mejs.plugins[l],h=0;h<m.length;h++)if(n=m[h],null==n.version||mejs.PluginDetector.hasPluginVersion(l,n.version))for(i=0;i<n.types.length;i++)if(k==n.types[i])return r.method=l,r.url=q[f].url,r;return"auto_plugin"===b.mode&&"native"===r.method?r:(""===r.method&&q.length>0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'<a href="'+a.url+'"><img src="'+c+'" width="100%" height="100%" /></a>':'<a href="'+a.url+'"><span>'+mejs.i18n.t("Download File")+"</span></a>",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p<j.attributes.length;p++){var q=j.attributes[p];1==q.specified&&n.setAttribute(q.name,q.value)}for(h=j.parentNode;null!==h&&null!=h.tagName&&"body"!==h.tagName.toLowerCase()&&null!=h.parentNode&&null!=h.parentNode.tagName&&null!=h.parentNode.constructor&&"ShadowRoot"===h.parentNode.constructor.name;){if("p"===h.parentNode.tagName.toLowerCase()){h.parentNode.parentNode.insertBefore(h,h.parentNode);break}h=h.parentNode}switch(a.isVideo?(k=b.pluginWidth>0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" id="'+m+'" name="'+m+'" width="'+k+'" height="'+l+'" class="mejs-shim"><param name="initParams" value="'+i.join(",")+'" /><param name="windowless" value="true" /><param name="background" value="black" /><param name="minRuntimeVersion" value="3.0.0.0" /><param name="autoUpgrade" value="true" /><param name="source" value="'+b.pluginPath+b.silverlightName+'" /></object>';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="//download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" id="'+m+'" width="'+k+'" height="'+l+'" class="mejs-shim"><param name="movie" value="'+b.pluginPath+b.flashName+"?x="+new Date+'" /><param name="flashvars" value="'+i.join("&amp;")+'" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><param name="wmode" value="transparent" /><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="true" /><param name="scale" value="default" /></object>'):o.innerHTML='<embed id="'+m+'" name="'+m+'" play="true" loop="false" quality="high" bgcolor="#000000" wmode="transparent" allowScriptAccess="always" allowFullScreen="true" type="application/x-shockwave-flash" pluginspage="//www.macromedia.com/go/getflashplayer" src="'+b.pluginPath+b.flashName+'" flashvars="'+i.join("&")+'" width="'+k+'" height="'+l+'" scale="default"class="mejs-shim"></embed>';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='<iframe src="//player.vimeo.com/video/'+n.vimeoid+"?api=1&portrait=0&byline=0&title=0&player_id="+s+'" width="'+k+'" height="'+l+'" frameborder="0" class="mejs-shim" id="'+s+'" webkitallowfullscreen mozallowfullscreen allowfullscreen>',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*!
+ *
+||||||| .r11156
+* MediaElement.js
+* HTML5 ').appendTo(b).click(function(g){g.preventDefault();e.paused?e.play():e.pause();return false});e.addEventListener("play",function(){d.removeClass("mejs-play").addClass("mejs-pause")},
+false);e.addEventListener("playing",function(){d.removeClass("mejs-play").addClass("mejs-pause")},false);e.addEventListener("pause",function(){d.removeClass("mejs-pause").addClass("mejs-play")},false);e.addEventListener("paused",function(){d.removeClass("mejs-pause").addClass("mejs-play")},false)}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{stopText:"Stop"});f.extend(MediaElementPlayer.prototype,{buildstop:function(a,b,c,e){f('').appendTo(b).click(function(){e.paused||e.pause();if(e.currentTime>0){e.setCurrentTime(0);e.pause();b.find(".mejs-time-current").width("0px");b.find(".mejs-time-handle").css("left",
+"0px");b.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0));b.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0));c.find(".mejs-poster").show()}})}})})(mejs.$);
+(function(f){f.extend(MediaElementPlayer.prototype,{buildprogress:function(a,b,c,e){f('00:00').appendTo(b);b.find(".mejs-time-buffering").hide();var d=
+this,g=b.find(".mejs-time-total");c=b.find(".mejs-time-loaded");var k=b.find(".mejs-time-current"),j=b.find(".mejs-time-handle"),m=b.find(".mejs-time-float"),q=b.find(".mejs-time-float-current"),p=function(h){h=h.originalEvent.changedTouches?h.originalEvent.changedTouches[0].pageX:h.pageX;var l=g.offset(),r=g.outerWidth(true),n=0,o=n=0;if(e.duration){if(hr+l.left)h=r+l.left;o=h-l.left;n=o/r;n=n<=0.02?0:n*e.duration;t&&n!==e.currentTime&&e.setCurrentTime(n);if(!mejs.MediaFeatures.hasTouch){m.css("left",
+o);q.html(mejs.Utility.secondsToTimeCode(n));m.show()}}},t=false;g.bind("mousedown touchstart",function(h){if(h.which===1||h.which===0){t=true;p(h);d.globalBind("mousemove.dur touchmove.dur",function(l){p(l)});d.globalBind("mouseup.dur touchend.dur",function(){t=false;m.hide();d.globalUnbind(".dur")});return false}}).bind("mouseenter",function(){d.globalBind("mousemove.dur",function(h){p(h)});mejs.MediaFeatures.hasTouch||m.show()}).bind("mouseleave",function(){if(!t){d.globalUnbind(".dur");m.hide()}});
+e.addEventListener("progress",function(h){a.setProgressRail(h);a.setCurrentRail(h)},false);e.addEventListener("timeupdate",function(h){a.setProgressRail(h);a.setCurrentRail(h)},false);d.loaded=c;d.total=g;d.current=k;d.handle=j},setProgressRail:function(a){var b=a!=undefined?a.target:this.media,c=null;if(b&&b.buffered&&b.buffered.length>0&&b.buffered.end&&b.duration)c=b.buffered.end(0)/b.duration;else if(b&&b.bytesTotal!=undefined&&b.bytesTotal>0&&b.bufferedBytes!=undefined)c=b.bufferedBytes/b.bytesTotal;
+else if(a&&a.lengthComputable&&a.total!=0)c=a.loaded/a.total;if(c!==null){c=Math.min(1,Math.max(0,c));this.loaded&&this.total&&this.loaded.width(this.total.width()*c)}},setCurrentRail:function(){if(this.media.currentTime!=undefined&&this.media.duration)if(this.total&&this.handle){var a=Math.round(this.total.width()*this.media.currentTime/this.media.duration),b=a-Math.round(this.handle.outerWidth(true)/2);this.current.width(a);this.handle.css("left",b)}}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "});f.extend(MediaElementPlayer.prototype,{buildcurrent:function(a,b,c,e){f(''+(a.options.alwaysShowHours?"00:":"")+(a.options.showTimecodeFrameCount?"00:00:00":"00:00")+"").appendTo(b);this.currenttime=this.controls.find(".mejs-currenttime");e.addEventListener("timeupdate",function(){a.updateCurrent()},false)},buildduration:function(a,b,
+c,e){if(b.children().last().find(".mejs-currenttime").length>0)f(this.options.timeAndDurationSeparator+''+(this.options.duration>0?mejs.Utility.secondsToTimeCode(this.options.duration,this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25):(a.options.alwaysShowHours?"00:":"")+(a.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(b.find(".mejs-time"));else{b.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container");
+f(''+(this.options.duration>0?mejs.Utility.secondsToTimeCode(this.options.duration,this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25):(a.options.alwaysShowHours?"00:":"")+(a.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(b)}this.durationD=this.controls.find(".mejs-duration");e.addEventListener("timeupdate",function(){a.updateDuration()},
+false)},updateCurrent:function(){if(this.currenttime)this.currenttime.html(mejs.Utility.secondsToTimeCode(this.media.currentTime,this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))},updateDuration:function(){this.container.toggleClass("mejs-long-video",this.media.duration>3600);if(this.durationD&&(this.options.duration>0||this.media.duration))this.durationD.html(mejs.Utility.secondsToTimeCode(this.options.duration>0?this.options.duration:
+this.media.duration,this.options.alwaysShowHours,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),hideVolumeOnTouchDevices:true,audioVolume:"horizontal",videoVolume:"vertical"});f.extend(MediaElementPlayer.prototype,{buildvolume:function(a,b,c,e){if(!((mejs.MediaFeatures.isAndroid||mejs.MediaFeatures.isiOS)&&this.options.hideVolumeOnTouchDevices)){var d=this,g=d.isVideo?d.options.videoVolume:d.options.audioVolume,k=g=="horizontal"?f('
').appendTo(b):f('
').appendTo(b),
+j=d.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),m=d.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),q=d.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),p=d.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),t=function(n,o){if(!j.is(":visible")&&typeof o=="undefined"){j.show();t(n,true);j.hide()}else{n=Math.max(0,n);n=Math.min(n,1);n==0?k.removeClass("mejs-mute").addClass("mejs-unmute"):k.removeClass("mejs-unmute").addClass("mejs-mute");
+if(g=="vertical"){var s=m.height(),u=m.position(),v=s-s*n;p.css("top",Math.round(u.top+v-p.height()/2));q.height(s-v);q.css("top",u.top+v)}else{s=m.width();u=m.position();s=s*n;p.css("left",Math.round(u.left+s-p.width()/2));q.width(Math.round(s))}}},h=function(n){var o=null,s=m.offset();if(g=="vertical"){o=m.height();parseInt(m.css("top").replace(/px/,""),10);o=(o-(n.pageY-s.top))/o;if(s.top==0||s.left==0)return}else{o=m.width();o=(n.pageX-s.left)/o}o=Math.max(0,o);o=Math.min(o,1);t(o);o==0?e.setMuted(true):
+e.setMuted(false);e.setVolume(o)},l=false,r=false;k.hover(function(){j.show();r=true},function(){r=false;!l&&g=="vertical"&&j.hide()});j.bind("mouseover",function(){r=true}).bind("mousedown",function(n){h(n);d.globalBind("mousemove.vol",function(o){h(o)});d.globalBind("mouseup.vol",function(){l=false;d.globalUnbind(".vol");!r&&g=="vertical"&&j.hide()});l=true;return false});k.find("button").click(function(){e.setMuted(!e.muted)});e.addEventListener("volumechange",function(){if(!l)if(e.muted){t(0);
+k.removeClass("mejs-mute").addClass("mejs-unmute")}else{t(e.volume);k.removeClass("mejs-unmute").addClass("mejs-mute")}},false);if(d.container.is(":visible")){t(a.options.startVolume);a.options.startVolume===0&&e.setMuted(true);e.pluginType==="native"&&e.setVolume(a.options.startVolume)}}}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{usePluginFullScreen:true,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")});f.extend(MediaElementPlayer.prototype,{isFullScreen:false,isNativeFullScreen:false,isInIframe:false,buildfullscreen:function(a,b,c,e){if(a.isVideo){a.isInIframe=window.location!=window.parent.location;mejs.MediaFeatures.hasTrueNativeFullScreen&&a.globalBind(mejs.MediaFeatures.fullScreenEventName,function(){if(a.isFullScreen)if(mejs.MediaFeatures.isFullScreen()){a.isNativeFullScreen=
+true;a.setControlsSize()}else{a.isNativeFullScreen=false;a.exitFullScreen()}});var d=this,g=f('').appendTo(b);if(d.media.pluginType==="native"||!d.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)g.click(function(){mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||a.isFullScreen?
+a.exitFullScreen():a.enterFullScreen()});else{var k=null;if(function(){var h=document.createElement("x"),l=document.documentElement,r=window.getComputedStyle;if(!("pointerEvents"in h.style))return false;h.style.pointerEvents="auto";h.style.pointerEvents="x";l.appendChild(h);r=r&&r(h,"").pointerEvents==="auto";l.removeChild(h);return!!r}()&&!mejs.MediaFeatures.isOpera){var j=false,m=function(){if(j){for(var h in q)q[h].hide();g.css("pointer-events","");d.controls.css("pointer-events","");d.media.removeEventListener("click",
+d.clickToPlayPauseCallback);j=false}},q={};b=["top","left","right","bottom"];var p,t=function(){var h=g.offset().left-d.container.offset().left,l=g.offset().top-d.container.offset().top,r=g.outerWidth(true),n=g.outerHeight(true),o=d.container.width(),s=d.container.height();for(p in q)q[p].css({position:"absolute",top:0,left:0});q.top.width(o).height(l);q.left.width(h).height(n).css({top:l});q.right.width(o-h-r).height(n).css({top:l,left:h+r});q.bottom.width(o).height(s-n-l).css({top:l+n})};d.globalBind("resize",
+function(){t()});p=0;for(c=b.length;p').appendTo(d.container).mouseover(m).hide();g.on("mouseover",function(){if(!d.isFullScreen){var h=g.offset(),l=a.container.offset();e.positionFullscreenButton(h.left-l.left,h.top-l.top,false);g.css("pointer-events","none");d.controls.css("pointer-events","none");d.media.addEventListener("click",d.clickToPlayPauseCallback);for(p in q)q[p].show();t();j=true}});e.addEventListener("fullscreenchange",function(){d.isFullScreen=
+!d.isFullScreen;d.isFullScreen?d.media.removeEventListener("click",d.clickToPlayPauseCallback):d.media.addEventListener("click",d.clickToPlayPauseCallback);m()});d.globalBind("mousemove",function(h){if(j){var l=g.offset();if(h.pageYl.top+g.outerHeight(true)||h.pageXl.left+g.outerWidth(true)){g.css("pointer-events","");d.controls.css("pointer-events","");j=false}}})}else g.on("mouseover",function(){if(k!==null){clearTimeout(k);delete k}var h=g.offset(),l=a.container.offset();
+e.positionFullscreenButton(h.left-l.left,h.top-l.top,true)}).on("mouseout",function(){if(k!==null){clearTimeout(k);delete k}k=setTimeout(function(){e.hideFullscreenButton()},1500)})}a.fullscreenBtn=g;d.globalBind("keydown",function(h){if((mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||d.isFullScreen)&&h.keyCode==27)a.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var a=this;if(!(a.media.pluginType!==
+"native"&&(mejs.MediaFeatures.isFirefox||a.options.usePluginFullScreen))){f(document.documentElement).addClass("mejs-fullscreen");normalHeight=a.container.height();normalWidth=a.container.width();if(a.media.pluginType==="native")if(mejs.MediaFeatures.hasTrueNativeFullScreen){mejs.MediaFeatures.requestFullScreen(a.container[0]);a.isInIframe&&setTimeout(function c(){if(a.isNativeFullScreen){var e=(window.devicePixelRatio||1)*f(window).width(),d=screen.width;Math.abs(d-e)>d*0.0020?a.exitFullScreen():
+setTimeout(c,500)}},500)}else if(mejs.MediaFeatures.hasSemiNativeFullScreen){a.media.webkitEnterFullscreen();return}if(a.isInIframe){var b=a.options.newWindowCallback(this);if(b!=="")if(mejs.MediaFeatures.hasTrueNativeFullScreen)setTimeout(function(){if(!a.isNativeFullScreen){a.pause();window.open(b,a.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no")}},250);else{a.pause();window.open(b,a.id,"top=0,left=0,width="+screen.availWidth+
+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");return}}a.container.addClass("mejs-container-fullscreen").width("100%").height("100%");a.containerSizeTimeout=setTimeout(function(){a.container.css({width:"100%",height:"100%"});a.setControlsSize()},500);if(a.media.pluginType==="native")a.$media.width("100%").height("100%");else{a.container.find(".mejs-shim").width("100%").height("100%");a.media.setVideoSize(f(window).width(),f(window).height())}a.layers.children("div").width("100%").height("100%");
+a.fullscreenBtn&&a.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen");a.setControlsSize();a.isFullScreen=true;a.container.find(".mejs-captions-text").css("font-size",screen.width/a.width*1*100+"%");a.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){clearTimeout(this.containerSizeTimeout);if(this.media.pluginType!=="native"&&mejs.MediaFeatures.isFirefox)this.media.setFullscreen(false);else{if(mejs.MediaFeatures.hasTrueNativeFullScreen&&
+(mejs.MediaFeatures.isFullScreen()||this.isFullScreen))mejs.MediaFeatures.cancelFullScreen();f(document.documentElement).removeClass("mejs-fullscreen");this.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight);if(this.media.pluginType==="native")this.$media.width(normalWidth).height(normalHeight);else{this.container.find(".mejs-shim").width(normalWidth).height(normalHeight);this.media.setVideoSize(normalWidth,normalHeight)}this.layers.children("div").width(normalWidth).height(normalHeight);
+this.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen");this.setControlsSize();this.isFullScreen=false;this.container.find(".mejs-captions-text").css("font-size","");this.container.find(".mejs-captions-position").css("bottom","")}}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{speeds:["1.50","1.25","1.00","0.75"],defaultSpeed:"1.00"});f.extend(MediaElementPlayer.prototype,{buildspeed:function(a,b,c,e){if(this.media.pluginType=="native"){c='';var d;f.inArray(this.options.defaultSpeed,this.options.speeds)===-1&&this.options.speeds.push(this.options.defaultSpeed);this.options.speeds.sort(function(g,
+k){return parseFloat(k)-parseFloat(g)});for(d=0;d'+this.options.speeds[d]+"x"}else c+='/>'+this.options.speeds[d]+"x"}c+="";a.speedButton=
+f(c).appendTo(b);a.playbackspeed=this.options.defaultSpeed;a.speedButton.on("click","input[type=radio]",function(){a.playbackspeed=f(this).attr("value");e.playbackRate=parseFloat(a.playbackspeed);a.speedButton.find("button").text(a.playbackspeed+"x");a.speedButton.find(".mejs-speed-selected").removeClass("mejs-speed-selected");a.speedButton.find("input[type=radio]:checked").next().addClass("mejs-speed-selected")});b=a.speedButton.find(".mejs-speed-selector");b.height(this.speedButton.find(".mejs-speed-selector ul").outerHeight(true)+
+a.speedButton.find(".mejs-speed-translations").outerHeight(true));b.css("top",-1*b.height()+"px")}}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:true,toggleCaptionsButtonWhenOnlyOne:false,slidesSelector:""});f.extend(MediaElementPlayer.prototype,{hasChapters:false,buildtracks:function(a,b,c,e){if(a.tracks.length!==0){var d;if(this.domNode.textTracks)for(d=this.domNode.textTracks.length-1;d>=0;d--)this.domNode.textTracks[d].mode="hidden";a.chapters=f('').prependTo(c).hide();
+a.captions=f('
').prependTo(c).hide();a.captionsText=a.captions.find(".mejs-captions-text");a.captionsButton=f(''+mejs.i18n.t("None")+"
").appendTo(b);for(d=b=0;d0&&b.displayChapters(c)},false);c.kind=="slides"&&b.setupSlides(c)},error:function(){b.loadNextTrack()}})},enableTrackButton:function(a,b){if(b==="")b=mejs.language.codes[a]||a;this.captionsButton.find("input[value="+a+"]").prop("disabled",false).siblings("label").html(b);
+this.options.startLanguage==a&&f("#"+this.id+"_captions_"+a).prop("checked",true).trigger("click");this.adjustLanguageBox()},addTrackButton:function(a,b){if(b==="")b=mejs.language.codes[a]||a;this.captionsButton.find("ul").append(f(''+b+" (loading)"));this.adjustLanguageBox();this.container.find(".mejs-captions-translations option[value="+
+a+"]").remove()},adjustLanguageBox:function(){this.captionsButton.find(".mejs-captions-selector").height(this.captionsButton.find(".mejs-captions-selector ul").outerHeight(true)+this.captionsButton.find(".mejs-captions-translations").outerHeight(true))},checkForTracks:function(){var a=false;if(this.options.hideCaptionsButtonWhenEmpty){for(i=0;i=b.entries.times[a].start&&this.media.currentTime<=b.entries.times[a].stop){this.captionsText.html(b.entries.text[a]).attr("class","mejs-captions-text "+(b.entries.times[a].identifier||""));this.captions.show().height(0);return}this.captions.hide()}},setupSlides:function(a){this.slides=a;this.slides.entries.imgs=[this.slides.entries.text.length];this.showSlide(0)},showSlide:function(a){if(!(typeof this.tracks==
+"undefined"||typeof this.slidesContainer=="undefined")){var b=this,c=b.slides.entries.text[a],e=b.slides.entries.imgs[a];if(typeof e=="undefined"||typeof e.fadeIn=="undefined")b.slides.entries.imgs[a]=e=f('').on("load",function(){e.appendTo(b.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()});else!e.is(":visible")&&!e.is(":animated")&&e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if(typeof this.slides!="undefined"){var a=this.slides,b;for(b=0;b<
+a.entries.times.length;b++)if(this.media.currentTime>=a.entries.times[b].start&&this.media.currentTime<=a.entries.times[b].stop){this.showSlide(b);break}}},displayChapters:function(){var a;for(a=0;a100||c==a.entries.times.length-1&&e+d<100)e=100-d;b.chapters.append(f(''+a.entries.text[c]+''+mejs.Utility.secondsToTimeCode(a.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(a.entries.times[c].stop)+
+""));d+=e}b.chapters.find("div.mejs-chapter").click(function(){b.media.setCurrentTime(parseFloat(f(this).attr("rel")));b.media.paused&&b.media.play()});b.chapters.show()}});mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",
+el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}};mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,
+parse:function(a){var b=0;a=mejs.TrackFormatParser.split2(a,/\r?\n/);for(var c={text:[],times:[]},e,d,g;b=0&&a[b-1]!=="")g=a[b-1];b++;d=a[b];for(b++;a[b]!==""&&b$1");c.text.push(d);c.times.push({identifier:g,start:mejs.Utility.convertSMPTEtoSeconds(e[1])===0?0.2:mejs.Utility.convertSMPTEtoSeconds(e[1]),
+stop:mejs.Utility.convertSMPTEtoSeconds(e[3]),settings:e[5]})}g=""}return c}},dfxp:{parse:function(a){a=f(a).filter("tt");var b=0;b=a.children("div").eq(0);var c=b.find("p");b=a.find("#"+b.attr("style"));var e,d;a={text:[],times:[]};if(b.length){d=b.removeAttr("id").get(0).attributes;if(d.length){e={};for(b=0;b$1");a.text.push(d);if(a.times.start===0)a.times.start=2}return a}},split2:function(a,b){return a.split(b)}};if("x\n\ny".split(/\n/gi).length!=3)mejs.TrackFormatParser.split2=function(a,b){var c=[],e="",d;for(d=0;d').appendTo(f("body")).hide();a.container.bind("contextmenu",function(b){if(a.isContextMenuEnabled){b.preventDefault();a.renderContextMenu(b.clientX-1,b.clientY-1);return false}});a.container.bind("click",function(){a.contextMenu.hide()});a.contextMenu.bind("mouseleave",function(){a.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},
+isContextMenuEnabled:true,enableContextMenu:function(){this.isContextMenuEnabled=true},disableContextMenu:function(){this.isContextMenuEnabled=false},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer();a.contextMenuTimer=setTimeout(function(){a.hideContextMenu();a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;if(a!=null){clearTimeout(a);delete a}},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(a,
+b){for(var c=this,e="",d=c.options.contextMenuItems,g=0,k=d.length;g
';else{var j=d[g].render(c);if(j!=null)e+=''+j+""}c.contextMenu.empty().append(f(e)).css({top:b,left:a}).show();c.contextMenu.find(".mejs-contextmenu-item").each(function(){var m=f(this),q=parseInt(m.data("itemindex"),10),p=c.options.contextMenuItems[q];typeof p.show!=
+"undefined"&&p.show(m,c);m.click(function(){typeof p.click!="undefined"&&p.click(c);c.contextMenu.hide()})});setTimeout(function(){c.killControlsTimer("rev3")},100)}})})(mejs.$);
+(function(f){f.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")});f.extend(MediaElementPlayer.prototype,{buildpostroll:function(a,b,c){var e=this.container.find('link[rel="postroll"]').attr("href");if(typeof e!=="undefined"){a.postroll=f(''+this.options.postrollCloseText+'').prependTo(c).hide();this.media.addEventListener("ended",
+function(){f.ajax({dataType:"html",url:e,success:function(d){c.find(".mejs-postroll-layer-content").html(d)}});a.postroll.show()},false)}}})})(mejs.$);
+=======
  */
 "undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?a.play():a.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.setMuted(a.media.muted?!1:!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],"undefined"!=typeof d.node.player?d.node.player:(d.node.player=d,"undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d)},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isVideo=b.isDynamic?b.options.isVideo:"audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=mejs.i18n.t(b.isVideo?"Video Player":"Audio Player");if(a(''+f+"").insertBefore(b.$media),b.container=a('
').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(){if(!b.controlsAreVisible){b.showControls(!0);var a=b.container.find(".mejs-playpause-button > button");a.focus()}}),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),c.isiOS){var g=b.$media.clone();b.container.find(".mejs-mediaelement").append(g),b.$media.remove(),b.$node=b.$media=g,b.node=b.media=g[0]}else b.container.find(".mejs-mediaelement").append(b.$media);b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var h=b.isVideo?"video":"audio",i=h.substring(0,1).toUpperCase()+h.substring(1);b.width=b.options[h+"Width"]>0||b.options[h+"Width"].toString().indexOf("%")>-1?b.options[h+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.media.style.width:null!==b.media.getAttribute("width")?b.$media.attr("width"):b.options["default"+i+"Width"],b.height=b.options[h+"Height"]>0||b.options[h+"Height"].toString().indexOf("%")>-1?b.options[h+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.media.style.height:null!==b.$media[0].getAttribute("height")?b.$media.attr("height"):b.options["default"+i+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.css("visibility","visible").css("display","block"),b.container.find(".mejs-control").css("visibility","visible").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block")})):(c.controls.css("visibility","hidden").css("display","block"),c.container.find(".mejs-control").css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:1500,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(){var a=this;null!==a.controlsTimer&&(clearTimeout(a.controlsTimer),delete a.controlsTimer,a.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){f.options.clickToPlayPause&&(f.media.paused?f.play():f.pause())},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter mouseover",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(2500)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(2500))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(1e3))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),b.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(b){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&f.container.find(".mejs-overlay-play").hide()}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(b,c){var d=this;if(!d.options.setDimensions)return!1;if("undefined"!=typeof b&&(d.width=b),"undefined"!=typeof c&&(d.height=c),d.height.toString().indexOf("%")>0||"100%"===d.$node.css("max-width")||d.$node[0].currentStyle&&"100%"===d.$node[0].currentStyle.maxWidth){var e=function(){return d.isVideo?d.media.videoWidth&&d.media.videoWidth>0?d.media.videoWidth:null!==d.media.getAttribute("width")?d.media.getAttribute("width"):d.options.defaultVideoWidth:d.options.defaultAudioWidth}(),f=function(){return d.isVideo?d.media.videoHeight&&d.media.videoHeight>0?d.media.videoHeight:null!==d.media.getAttribute("height")?d.media.getAttribute("height"):d.options.defaultVideoHeight:d.options.defaultAudioHeight}(),g=d.container.parent().closest(":visible").width(),h=d.container.parent().closest(":visible").height(),i=d.isVideo||!d.options.autosizeProgress?parseInt(g*f/e,10):f;isNaN(i)&&(i=h),"body"===d.container.parent()[0].tagName.toLowerCase()&&(g=a(window).width(),i=a(window).height()),i&&g&&(d.container.width(g).height(i),d.$media.add(d.container.find(".mejs-shim")).width("100%").height("100%"),d.isVideo&&d.media.setVideoSize&&d.media.setVideoSize(g,i),d.layers.children(".mejs-layer").width("100%").height("100%"))}else d.container.width(d.width).height(d.height),d.layers.children(".mejs-layer").width(d.width).height(d.height);var j=d.layers.find(".mejs-overlay-play"),k=j.find(".mejs-overlay-button");j.height(d.container.height()-d.controls.height()),k.css("margin-top","-"+(k.height()/2-d.controls.height()/2).toString()+"px")},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=(b.controls.find(".mejs-time-current"),b.controls.find(".mejs-time-loaded"),e.siblings()),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.position(),d--);while(null!==i&&i.top>0&&d>0);b.setProgressRail&&b.setProgressRail(),b.setCurrentRail&&b.setCurrentRail()}},buildposter:function(b,c,d,e){var f=this,g=a('
').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('
').hide().appendTo(d),h=a('
').hide().appendTo(d),i=a('
').appendTo(d).bind("click",function(){f.options.clickToPlayPause&&e.paused&&e.play()});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(){g.hide(),c.find(".mejs-time-buffering").hide(),h.show(),h.find("mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(a){return f.onkeydown(b,e,a)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){this.media.setSrc(a)},remove:function(){var a,b,c=this;for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this;c=b(c,f.id),c.d&&a(document).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this;c=b(c,e.id),c.d&&a(document).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return this.each(b===!1?function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}:function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('
').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){{var f=this;a('
').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0)),d.find(".mejs-poster").show())})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{progessHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){a('00:00
').appendTo(c),c.find(".mejs-time-buffering").hide();var f=this,g=c.find(".mejs-time-total"),h=c.find(".mejs-time-loaded"),i=c.find(".mejs-time-current"),j=c.find(".mejs-time-handle"),k=c.find(".mejs-time-float"),l=c.find(".mejs-time-float-current"),m=c.find(".mejs-time-slider"),n=function(a){var b,c=g.offset(),d=g.outerWidth(!0),f=0,h=0,i=0;b=a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.pageX,e.duration&&(bd+c.left&&(b=d+c.left),i=b-c.left,f=i/d,h=.02>=f?0:f*e.duration,o&&h!==e.currentTime&&e.setCurrentTime(h),mejs.MediaFeatures.hasTouch||(k.css("left",i),l.html(mejs.Utility.secondsToTimeCode(h)),k.show()))},o=!1,p=!1,q=0,r=!1,s=b.options.autoRewind,t=function(){var a=e.currentTime,b=mejs.i18n.t("Time Slider"),c=mejs.Utility.secondsToTimeCode(a),d=e.duration;m.attr({"aria-label":b,"aria-valuemin":0,"aria-valuemax":d,"aria-valuenow":a,"aria-valuetext":c,role:"slider",tabindex:0})},u=function(){var a=new Date;a-q>=1e3&&e.play()};m.bind("focus",function(){b.options.autoRewind=!1}),m.bind("blur",function(){b.options.autoRewind=s}),m.bind("keydown",function(a){new Date-q>=1e3&&(r=e.paused);var b=a.keyCode,c=e.duration,d=e.currentTime;switch(b){case 37:d-=1;break;case 39:d+=1;break;case 38:d+=Math.floor(.1*c);break;case 40:d-=Math.floor(.1*c);break;case 36:d=0;break;case 35:d=c;break;case 10:return void(e.paused?e.play():e.pause());case 13:return void(e.paused?e.play():e.pause());default:return}return d=0>d?0:d>=c?c:Math.floor(d),q=new Date,r||e.pause(),d0&&c.buffered.end&&c.duration?d=c.buffered.end(0)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a(''+(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00")+"
").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a(''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"
").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){b.updateDuration()},!1)},updateCurrent:function(){var a=this;a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(a.media.currentTime,a.options.alwaysShowHours||a.media.duration>3600,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))},updateDuration:function(){var a=this;a.container.toggleClass("mejs-long-video",a.media.duration>3600),a.durationD&&(a.options.duration>0||a.media.duration)&&a.durationD.html(mejs.Utility.secondsToTimeCode(a.options.duration>0?a.options.duration:a.media.duration,a.options.alwaysShowHours,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('
'+f.options.allyVolumeControlText+'
').appendTo(c):a(''+f.options.allyVolumeControlText+'
').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?h.removeClass("mejs-mute").addClass("mejs-unmute"):h.removeClass("mejs-unmute").addClass("mejs-mute");var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=(parseInt(j.css("top").replace(/px/,""),10),a.pageY-c.top);if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),e.setMuted(0===b?!0:!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(){var a=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("volumeSlider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":a,"aria-valuetext":a+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c+=.1;break;case 40:c-=.1;break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}).bind("blur",function(){i.hide()}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),f.container.is(":visible")&&(m(b.options.startVolume),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume))}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,buildfullscreen:function(b,c,d,e){if(b.isVideo){if(b.isInIframe=window.location!=window.parent.location,mejs.MediaFeatures.hasTrueNativeFullScreen){var f=function(){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,f)}var g=this,h=(b.container,a('
').appendTo(c));if("native"===g.media.pluginType||!g.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)h.click(function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()});else{var i=null,j=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}();if(j&&!mejs.MediaFeatures.isOpera){var k,l,m=!1,n=function(){if(m){for(var a in o)o[a].hide();h.css("pointer-events",""),g.controls.css("pointer-events",""),g.media.removeEventListener("click",g.clickToPlayPauseCallback),m=!1}},o={},p=["top","left","right","bottom"],q=function(){var a=h.offset().left-g.container.offset().left,b=h.offset().top-g.container.offset().top,c=h.outerWidth(!0),d=h.outerHeight(!0),e=g.container.width(),f=g.container.height();for(k in o)o[k].css({position:"absolute",top:0,left:0});o.top.width(e).height(b),o.left.width(a).height(d).css({top:b}),o.right.width(e-a-c).height(d).css({top:b,left:a+c}),o.bottom.width(e).height(f-d-b).css({top:b+d})};for(g.globalBind("resize",function(){q()}),k=0,l=p.length;l>k;k++)o[p[k]]=a('').appendTo(g.container).mouseover(n).hide();h.on("mouseover",function(){if(!g.isFullScreen){var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!1),h.css("pointer-events","none"),g.controls.css("pointer-events","none"),g.media.addEventListener("click",g.clickToPlayPauseCallback);for(k in o)o[k].show();q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1)
-}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='"+f.options.speeds[j]+f.options.speedChar+"
";i+="
",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
').prependTo(d).hide(),b.captions=a('
').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a(''+mejs.i18n.t("None")+"
").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a(''+c+" (loading)
")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a(''+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
';else{var i=f[g].render(d);null!=i&&(e+=''+i+"
")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a(''+e.options.postrollCloseText+'').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$);
\ No newline at end of file
+}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='"+f.options.speeds[j]+f.options.speedChar+"
";i+="
",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
').prependTo(d).hide(),b.captions=a('
').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a(''+mejs.i18n.t("None")+"
").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a(''+c+" (loading)
")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a(''+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
';else{var i=f[g].render(d);null!=i&&(e+=''+i+"
")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a(''+e.options.postrollCloseText+'').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$);>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/mediaelement/wp-mediaelement.css b/pavillonmadeleine.fr/wp-includes/js/mediaelement/wp-mediaelement.css
index ae90c8dd..daa659d5 100644
--- a/pavillonmadeleine.fr/wp-includes/js/mediaelement/wp-mediaelement.css
+++ b/pavillonmadeleine.fr/wp-includes/js/mediaelement/wp-mediaelement.css
@@ -106,12 +106,16 @@
 }
 
 .media-embed-details .setting p,
-.media-embed-details .setting a {
+.media-embed-details .setting .remove-setting {
 	color: #a00;
 	font-size: 10px;
 	text-transform: uppercase;
 }
 
+.media-embed-details .setting .remove-setting {
+	padding: 0;
+}
+
 .media-embed-details .setting a:hover {
 	color: #f00;
 }
diff --git a/pavillonmadeleine.fr/wp-includes/js/quicktags.js b/pavillonmadeleine.fr/wp-includes/js/quicktags.js
index 9b2f8c8d..6ac2fd24 100644
--- a/pavillonmadeleine.fr/wp-includes/js/quicktags.js
+++ b/pavillonmadeleine.fr/wp-includes/js/quicktags.js
@@ -163,7 +163,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
 			id = settings.id,
 			canvas = document.getElementById(id),
 			name = 'qt_' + id,
-			tb, onclick, toolbar_id;
+			tb, onclick, toolbar_id, wrap, setActiveEditor;
 
 		if ( !id || !canvas ) {
 			return false;
@@ -182,12 +182,13 @@ function edButton(id, display, tagStart, tagEnd, access) {
 			toolbar_id = name + '_toolbar';
 		}
 
-		tb = document.createElement('div');
-		tb.id = toolbar_id;
-		tb.className = 'quicktags-toolbar';
-		tb.onclick = function() {
-			window.wpActiveEditor = id;
-		};
+		tb = document.getElementById( toolbar_id );
+
+		if ( ! tb ) {
+			tb = document.createElement('div');
+			tb.id = toolbar_id;
+			tb.className = 'quicktags-toolbar';
+		}
 
 		canvas.parentNode.insertBefore(tb, canvas);
 		t.toolbar = tb;
@@ -214,10 +215,24 @@ function edButton(id, display, tagStart, tagEnd, access) {
 			}
 		};
 
+		setActiveEditor = function() {
+			window.wpActiveEditor = id;
+		};
+
+		wrap = document.getElementById( 'wp-' + id + '-wrap' );
+
 		if ( tb.addEventListener ) {
-			tb.addEventListener('click', onclick, false);
+			tb.addEventListener( 'click', onclick, false );
+			
+			if ( wrap ) {
+				wrap.addEventListener( 'click', setActiveEditor, false );
+			}
 		} else if ( tb.attachEvent ) {
-			tb.attachEvent('onclick', onclick);
+			tb.attachEvent( 'onclick', onclick );
+
+			if ( wrap ) {
+				wrap.attachEvent( 'onclick', setActiveEditor );
+			}
 		}
 
 		t.getButton = function(id) {
@@ -236,6 +251,12 @@ function edButton(id, display, tagStart, tagEnd, access) {
 		}
 	};
 
+	function _escape( text ) {
+		text = text || '';
+		text = text.replace( /&([^#])(?![a-z1-4]{1,8};)/gi, '&$1' );
+		return text.replace( //g, '>' ).replace( /"/g, '"' ).replace( /'/g, ''' );
+	}
+
 	qt.instances = {};
 
 	qt.getInstance = function(id) {
@@ -283,16 +304,21 @@ function edButton(id, display, tagStart, tagEnd, access) {
 				}
 			}
 
-			if ( use && use.indexOf(',fullscreen,') !== -1 ) {
-				theButtons.fullscreen = new qt.FullscreenButton();
-				html += theButtons.fullscreen.html(name + '_');
+			if ( use && use.indexOf(',dfw,') !== -1 ) {
+				theButtons.dfw = new qt.DFWButton();
+				html += theButtons.dfw.html( name + '_' );
 			}
 
+<<<<<<< .mine
+||||||| .r11156
+
+=======
 			if ( use && use.indexOf(',dfw,') !== -1 ) {
 				theButtons.dfw = new qt.DFWButton();
 				html += theButtons.dfw.html( name + '_' );
 			}
 
+>>>>>>> .r12027
 			if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) {
 				theButtons.textdirection = new qt.TextDirectionButton();
 				html += theButtons.textdirection.html(name + '_');
@@ -331,10 +357,17 @@ function edButton(id, display, tagStart, tagEnd, access) {
 	 * @param string access_key Deprecated Not used
 	 * @param string title Optional. Button's title="..."
 	 * @param int priority Optional. Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
+<<<<<<< .mine
+	 * @param string instance Optional. Limit the button to a specific instance of Quicktags, add to all instances if not present.
+	 * @param attr object Optional. Used to pass additional attributes. Currently supports `ariaLabel` and `ariaLabelClose` (for "close tag" state)
+||||||| .r11156
+	 * @param string instance Optional. Limit the button to a specifric instance of Quicktags, add to all instances if not present.
+=======
 	 * @param string instance Optional. Limit the button to a specific instance of Quicktags, add to all instances if not present.
+>>>>>>> .r12027
 	 * @return mixed null or the button object that is needed for back-compat.
 	 */
-	qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
+	qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance, attr ) {
 		var btn;
 
 		if ( !id || !display ) {
@@ -343,12 +376,13 @@ function edButton(id, display, tagStart, tagEnd, access) {
 
 		priority = priority || 0;
 		arg2 = arg2 || '';
+		attr = attr || {};
 
 		if ( typeof(arg1) === 'function' ) {
-			btn = new qt.Button(id, display, access_key, title, instance);
+			btn = new qt.Button( id, display, access_key, title, instance, attr );
 			btn.callback = arg1;
 		} else if ( typeof(arg1) === 'string' ) {
-			btn = new qt.TagButton(id, display, arg1, arg2, access_key, title, instance);
+			btn = new qt.TagButton( id, display, arg1, arg2, access_key, title, instance, attr );
 		} else {
 			return;
 		}
@@ -404,6 +438,23 @@ function edButton(id, display, tagStart, tagEnd, access) {
 	};
 
 	// a plain, dumb button
+<<<<<<< .mine
+	qt.Button = function( id, display, access, title, instance, attr ) {
+		this.id = id;
+		this.display = display;
+		this.access = '';
+		this.title = title || '';
+		this.instance = instance || '';
+		this.attr = attr || {};
+||||||| .r11156
+	qt.Button = function(id, display, access, title, instance) {
+		var t = this;
+		t.id = id;
+		t.display = display;
+		t.access = access;
+		t.title = title || '';
+		t.instance = instance || '';
+=======
 	qt.Button = function(id, display, access, title, instance) {
 		var t = this;
 		t.id = id;
@@ -411,52 +462,90 @@ function edButton(id, display, tagStart, tagEnd, access) {
 		t.access = '';
 		t.title = title || '';
 		t.instance = instance || '';
+>>>>>>> .r12027
 	};
 	qt.Button.prototype.html = function(idPrefix) {
+<<<<<<< .mine
+		var active, on, wp,
+			title = this.title ? ' title="' + _escape( this.title ) + '"' : '',
+			ariaLabel = this.attr && this.attr.ariaLabel ? ' aria-label="' + _escape( this.attr.ariaLabel ) + '"' : '',
+			val = this.display ? ' value="' + _escape( this.display ) + '"' : '',
+			id = this.id ? ' id="' + _escape( idPrefix + this.id ) + '"' : '',
+			dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
+
+||||||| .r11156
+		var access = this.access ? ' accesskey="' + this.access + '"' : '';
+=======
 		var title = this.title ? ' title="' + this.title + '"' : '',
 			active, on, wp,
 			dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
 
+>>>>>>> .r12027
 		if ( this.id === 'fullscreen' ) {
+<<<<<<< .mine
+			return '';
+		} else if ( this.id === 'dfw' ) {
+			active = dfw && dfw.isActive() ? '' : ' disabled="disabled"';
+			on = dfw && dfw.isOn() ? ' active' : '';
+
+			return '';
+||||||| .r11156
+			return '';
+=======
 			return '';
 		} else if ( this.id === 'dfw' ) {
 			active = dfw && dfw.isActive() ? '' : ' disabled="disabled"';
 			on = dfw && dfw.isOn() ? ' active' : '';
 
 			return '';
+>>>>>>> .r12027
 		}
+<<<<<<< .mine
+
+		return '';
+||||||| .r11156
+		return '';
+=======
 
 		return '';
+>>>>>>> .r12027
 	};
 	qt.Button.prototype.callback = function(){};
 
 	// a button that inserts HTML tag
-	qt.TagButton = function(id, display, tagStart, tagEnd, access, title, instance) {
+	qt.TagButton = function( id, display, tagStart, tagEnd, access, title, instance, attr ) {
 		var t = this;
-		qt.Button.call(t, id, display, access, title, instance);
+		qt.Button.call( t, id, display, access, title, instance, attr );
 		t.tagStart = tagStart;
 		t.tagEnd = tagEnd;
 	};
 	qt.TagButton.prototype = new qt.Button();
-	qt.TagButton.prototype.openTag = function(e, ed) {
-		var t = this;
-
+	qt.TagButton.prototype.openTag = function( element, ed ) {
 		if ( ! ed.openTags ) {
 			ed.openTags = [];
 		}
-		if ( t.tagEnd ) {
-			ed.openTags.push(t.id);
-			e.value = '/' + e.value;
+
+		if ( this.tagEnd ) {
+			ed.openTags.push( this.id );
+			element.value = '/' + element.value;
+
+			if ( this.attr.ariaLabelClose ) {
+				element.setAttribute( 'aria-label', this.attr.ariaLabelClose );
+			}
 		}
 	};
-	qt.TagButton.prototype.closeTag = function(e, ed) {
-		var t = this, i = t.isOpen(ed);
+	qt.TagButton.prototype.closeTag = function( element, ed ) {
+		var i = this.isOpen(ed);
 
 		if ( i !== false ) {
-			ed.openTags.splice(i, 1);
+			ed.openTags.splice( i, 1 );
 		}
 
-		e.value = t.display;
+		element.value = this.display;
+
+		if ( this.attr.ariaLabel ) {
+			element.setAttribute( 'aria-label', this.attr.ariaLabel );
+		}
 	};
 	// whether a tag is open or not. Returns false if not open, or current open depth of the tag
 	qt.TagButton.prototype.isOpen = function (ed) {
@@ -549,7 +638,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
 
 	// the close tags button
 	qt.CloseButton = function() {
-		qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags);
+		qt.Button.call( this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags );
 	};
 
 	qt.CloseButton.prototype = new qt.Button();
@@ -580,7 +669,17 @@ function edButton(id, display, tagStart, tagEnd, access) {
 
 	// the link button
 	qt.LinkButton = function() {
+<<<<<<< .mine
+		var attr = {
+			ariaLabel: quicktagsL10n.link
+		};
+
+		qt.TagButton.call( this, 'link', 'link', '', '', '', '', '', attr );
+||||||| .r11156
+		qt.TagButton.call(this, 'link', 'link', '', '', 'a');
+=======
 		qt.TagButton.call(this, 'link', 'link', '', '');
+>>>>>>> .r12027
 	};
 	qt.LinkButton.prototype = new qt.TagButton();
 	qt.LinkButton.prototype.callback = function(e, c, ed, defaultValue) {
@@ -596,7 +695,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
 		}
 
 		if ( t.isOpen(ed) === false ) {
-			URL = prompt(quicktagsL10n.enterURL, defaultValue);
+			URL = prompt( quicktagsL10n.enterURL, defaultValue );
 			if ( URL ) {
 				t.tagStart = '';
 				qt.TagButton.prototype.callback.call(t, e, c, ed);
@@ -608,7 +707,17 @@ function edButton(id, display, tagStart, tagEnd, access) {
 
 	// the img button
 	qt.ImgButton = function() {
+<<<<<<< .mine
+		var attr = {
+			ariaLabel: quicktagsL10n.image
+		};
+
+		qt.TagButton.call( this, 'img', 'img', '', '', '', '', '', attr );
+||||||| .r11156
+		qt.TagButton.call(this, 'img', 'img', '', '', 'm');
+=======
 		qt.TagButton.call(this, 'img', 'img', '', '');
+>>>>>>> .r12027
 	};
 	qt.ImgButton.prototype = new qt.TagButton();
 	qt.ImgButton.prototype.callback = function(e, c, ed, defaultValue) {
@@ -623,16 +732,18 @@ function edButton(id, display, tagStart, tagEnd, access) {
 		}
 	};
 
-	qt.FullscreenButton = function() {
-		qt.Button.call(this, 'fullscreen', quicktagsL10n.fullscreen, 'f', quicktagsL10n.toggleFullscreen);
+	qt.DFWButton = function() {
+		qt.Button.call( this, 'dfw', '', 'f', quicktagsL10n.dfw );
 	};
-	qt.FullscreenButton.prototype = new qt.Button();
-	qt.FullscreenButton.prototype.callback = function(e, c) {
-		if ( ! c.id || typeof wp === 'undefined' || ! wp.editor || ! wp.editor.fullscreen ) {
+	qt.DFWButton.prototype = new qt.Button();
+	qt.DFWButton.prototype.callback = function() {
+		var wp;
+
+		if ( ! ( wp = window.wp ) || ! wp.editor || ! wp.editor.dfw ) {
 			return;
 		}
 
-		wp.editor.fullscreen.on();
+		window.wp.editor.dfw.toggle();
 	};
 
 	qt.DFWButton = function() {
@@ -650,7 +761,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
 	};
 
 	qt.TextDirectionButton = function() {
-		qt.Button.call(this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection);
+		qt.Button.call( this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection );
 	};
 	qt.TextDirectionButton.prototype = new qt.Button();
 	qt.TextDirectionButton.prototype.callback = function(e, c) {
@@ -666,6 +777,33 @@ function edButton(id, display, tagStart, tagEnd, access) {
 	};
 
 	// ensure backward compatibility
+<<<<<<< .mine
+	edButtons[10]  = new qt.TagButton( 'strong', 'b', '', '', '', '', '', { ariaLabel: quicktagsL10n.strong, ariaLabelClose: quicktagsL10n.strongClose } );
+	edButtons[20]  = new qt.TagButton( 'em', 'i', '', '', '', '', '', { ariaLabel: quicktagsL10n.em, ariaLabelClose: quicktagsL10n.emClose } );
+	edButtons[30]  = new qt.LinkButton(); // special case
+	edButtons[40]  = new qt.TagButton( 'block', 'b-quote', '\n\n', '\n\n', '', '', '', { ariaLabel: quicktagsL10n.blockquote, ariaLabelClose: quicktagsL10n.blockquoteClose } );
+	edButtons[50]  = new qt.TagButton( 'del', 'del', '', '', '', '', '', { ariaLabel: quicktagsL10n.del, ariaLabelClose: quicktagsL10n.delClose } );
+	edButtons[60]  = new qt.TagButton( 'ins', 'ins', '', '', '', '', '', { ariaLabel: quicktagsL10n.ins, ariaLabelClose: quicktagsL10n.insClose } );
+	edButtons[70]  = new qt.ImgButton(); // special case
+	edButtons[80]  = new qt.TagButton( 'ul', 'ul', '\n', '\n\n', '', '', '', { ariaLabel: quicktagsL10n.ul, ariaLabelClose: quicktagsL10n.ulClose } );
+	edButtons[90]  = new qt.TagButton( 'ol', 'ol', '\n', '\n\n', '', '', '', { ariaLabel: quicktagsL10n.ol, ariaLabelClose: quicktagsL10n.olClose } );
+	edButtons[100] = new qt.TagButton( 'li', 'li', '\t', '\n', '', '', '', { ariaLabel: quicktagsL10n.li, ariaLabelClose: quicktagsL10n.liClose } );
+	edButtons[110] = new qt.TagButton( 'code', 'code', '', '', '', '', '', { ariaLabel: quicktagsL10n.code, ariaLabelClose: quicktagsL10n.codeClose } );
+	edButtons[120] = new qt.TagButton( 'more', 'more', '\n\n', '', '', '', '', { ariaLabel: quicktagsL10n.more } );
+||||||| .r11156
+	edButtons[10] = new qt.TagButton('strong','b','','','b');
+	edButtons[20] = new qt.TagButton('em','i','','','i'),
+	edButtons[30] = new qt.LinkButton(), // special case
+	edButtons[40] = new qt.TagButton('block','b-quote','\n\n','\n\n','q'),
+	edButtons[50] = new qt.TagButton('del','del','','','d'),
+	edButtons[60] = new qt.TagButton('ins','ins','','','s'),
+	edButtons[70] = new qt.ImgButton(), // special case
+	edButtons[80] = new qt.TagButton('ul','ul','\n','\n\n','u'),
+	edButtons[90] = new qt.TagButton('ol','ol','\n','\n\n','o'),
+	edButtons[100] = new qt.TagButton('li','li','\t','\n','l'),
+	edButtons[110] = new qt.TagButton('code','code','','','c'),
+	edButtons[120] = new qt.TagButton('more','more','\n\n','','t'),
+=======
 	edButtons[10] = new qt.TagButton('strong','b','','');
 	edButtons[20] = new qt.TagButton('em','i','',''),
 	edButtons[30] = new qt.LinkButton(), // special case
@@ -678,6 +816,7 @@ function edButton(id, display, tagStart, tagEnd, access) {
 	edButtons[100] = new qt.TagButton('li','li','\t','\n'),
 	edButtons[110] = new qt.TagButton('code','code','',''),
 	edButtons[120] = new qt.TagButton('more','more','\n\n',''),
+>>>>>>> .r12027
 	edButtons[140] = new qt.CloseButton();
 
 })();
diff --git a/pavillonmadeleine.fr/wp-includes/js/quicktags.min.js b/pavillonmadeleine.fr/wp-includes/js/quicktags.min.js
index 5a278a3f..6cf96be7 100644
--- a/pavillonmadeleine.fr/wp-includes/js/quicktags.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/quicktags.min.js
@@ -1 +1,4 @@
-function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){var a,b=function(a){var c,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(c=b,c.funcs=[],c.ready=function(){if(!c.isReady)for(c.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=j}else edButtons[edButtons.length]=j;this.buttonsInitDone&&this._buttonsInit()}},a.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e,g.focus()):(g.value+=a,g.focus()),!0):!1},a.Button=function(a,b,c,d,e){var f=this;f.id=a,f.display=b,f.access="",f.title=d||"",f.instance=e||""},a.Button.prototype.html=function(a){var b,c,d,e=this.title?' title="'+this.title+'"':"",f=(d=window.wp)&&d.editor&&d.editor.dfw;return"fullscreen"===this.id?'":"dfw"===this.id?(b=f&&f.isActive()?"":' disabled="disabled"',c=f&&f.isOn()?" active":"",'"):''},a.Button.prototype.callback=function(){},a.TagButton=function(b,c,d,e,f,g,h){var i=this;a.Button.call(i,b,c,f,g,h),i.tagStart=d,i.tagEnd=e},a.TagButton.prototype=new a.Button,a.TagButton.prototype.openTag=function(a,b){var c=this;b.openTags||(b.openTags=[]),c.tagEnd&&(b.openTags.push(c.id),a.value="/"+a.value)},a.TagButton.prototype.closeTag=function(a,b){var c=this,d=c.isOpen(b);d!==!1&&b.openTags.splice(d,1),a.value=c.display},a.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?k.text=l.tagEnd?l.tagStart+k.text+n:k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g,b.focus()):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},a.SpellButton=function(){},a.CloseButton=function(){a.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},a.CloseButton.prototype=new a.Button,a._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},a.CloseButton.prototype.callback=a._close,a.closeAllTags=function(b){var c=this.getInstance(b);a._close("",c.canvas,c)},a.LinkButton=function(){a.TagButton.call(this,"link","link","","")},a.LinkButton.prototype=new a.TagButton,a.LinkButton.prototype.callback=function(b,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',a.TagButton.prototype.callback.call(g,b,c,d))):a.TagButton.prototype.callback.call(g,b,c,d)))},a.ImgButton=function(){a.TagButton.call(this,"img","img","","")},a.ImgButton.prototype=new a.TagButton,a.ImgButton.prototype.callback=function(b,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart='',a.TagButton.prototype.callback.call(this,b,c,d))},a.FullscreenButton=function(){a.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)},a.FullscreenButton.prototype=new a.Button,a.FullscreenButton.prototype.callback=function(a,b){b.id&&"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&wp.editor.fullscreen.on()},a.DFWButton=function(){a.Button.call(this,"dfw","","f",quicktagsL10n.dfw)},a.DFWButton.prototype=new a.Button,a.DFWButton.prototype.callback=function(){var a;(a=window.wp)&&a.editor&&a.editor.dfw&&window.wp.editor.dfw.toggle()},a.TextDirectionButton=function(){a.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},a.TextDirectionButton.prototype=new a.Button,a.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new a.TagButton("strong","b","",""),edButtons[20]=new a.TagButton("em","i","",""),edButtons[30]=new a.LinkButton,edButtons[40]=new a.TagButton("block","b-quote","\n\n","
\n\n"),edButtons[50]=new a.TagButton("del","del",'',""),edButtons[60]=new a.TagButton("ins","ins",'',""),edButtons[70]=new a.ImgButton,edButtons[80]=new a.TagButton("ul","ul","\n","
\n\n"),edButtons[90]=new a.TagButton("ol","ol","\n","
\n\n"),edButtons[100]=new a.TagButton("li","li","	","
\n"),edButtons[110]=new a.TagButton("code","code","",""),edButtons[120]=new a.TagButton("more","more","\n\n",""),edButtons[140]=new a.CloseButton}();
\ No newline at end of file
+<<<<<<< .mine
+function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){function a(a){return a=a||"",a=a.replace(/&([^#])(?![a-z1-4]{1,8};)/gi,"&$1"),a.replace(//g,">").replace(/"/g,""").replace(/'/g,"'")}var b,c=function(a){var b,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(b=c,b.funcs=[],b.ready=function(){if(!b.isReady)for(b.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=k}else edButtons[edButtons.length]=k;this.buttonsInitDone&&this._buttonsInit()}},b.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e,g.focus()):(g.value+=a,g.focus()),!0):!1},b.Button=function(a,b,c,d,e,f){this.id=a,this.display=b,this.access="",this.title=d||"",this.instance=e||"",this.attr=f||{}},b.Button.prototype.html=function(b){var c,d,e,f=this.title?' title="'+a(this.title)+'"':"",g=this.attr&&this.attr.ariaLabel?' aria-label="'+a(this.attr.ariaLabel)+'"':"",h=this.display?' value="'+a(this.display)+'"':"",i=this.id?' id="'+a(b+this.id)+'"':"",j=(e=window.wp)&&e.editor&&e.editor.dfw;return"fullscreen"===this.id?'":"dfw"===this.id?(c=j&&j.isActive()?"":' disabled="disabled"',d=j&&j.isOn()?" active":"",'"):'"},b.Button.prototype.callback=function(){},b.TagButton=function(a,c,d,e,f,g,h,i){var j=this;b.Button.call(j,a,c,f,g,h,i),j.tagStart=d,j.tagEnd=e},b.TagButton.prototype=new b.Button,b.TagButton.prototype.openTag=function(a,b){b.openTags||(b.openTags=[]),this.tagEnd&&(b.openTags.push(this.id),a.value="/"+a.value,this.attr.ariaLabelClose&&a.setAttribute("aria-label",this.attr.ariaLabelClose))},b.TagButton.prototype.closeTag=function(a,b){var c=this.isOpen(b);c!==!1&&b.openTags.splice(c,1),a.value=this.display,this.attr.ariaLabel&&a.setAttribute("aria-label",this.attr.ariaLabel)},b.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?l.tagEnd?k.text=l.tagStart+k.text+n:k.text=k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g,b.focus()):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},b.SpellButton=function(){},b.CloseButton=function(){b.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},b.CloseButton.prototype=new b.Button,b._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},b.CloseButton.prototype.callback=b._close,b.closeAllTags=function(a){var c=this.getInstance(a);b._close("",c.canvas,c)},b.LinkButton=function(){var a={ariaLabel:quicktagsL10n.link};b.TagButton.call(this,"link","link","","","","","",a)},b.LinkButton.prototype=new b.TagButton,b.LinkButton.prototype.callback=function(a,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',b.TagButton.prototype.callback.call(g,a,c,d))):b.TagButton.prototype.callback.call(g,a,c,d)))},b.ImgButton=function(){var a={ariaLabel:quicktagsL10n.image};b.TagButton.call(this,"img","img","","","","","",a)},b.ImgButton.prototype=new b.TagButton,b.ImgButton.prototype.callback=function(a,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart='',b.TagButton.prototype.callback.call(this,a,c,d))},b.DFWButton=function(){b.Button.call(this,"dfw","","f",quicktagsL10n.dfw)},b.DFWButton.prototype=new b.Button,b.DFWButton.prototype.callback=function(){var a;(a=window.wp)&&a.editor&&a.editor.dfw&&window.wp.editor.dfw.toggle()},b.TextDirectionButton=function(){b.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},b.TextDirectionButton.prototype=new b.Button,b.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new b.TagButton("strong","b","","","","","",{ariaLabel:quicktagsL10n.strong,ariaLabelClose:quicktagsL10n.strongClose}),edButtons[20]=new b.TagButton("em","i","","","","","",{ariaLabel:quicktagsL10n.em,ariaLabelClose:quicktagsL10n.emClose}),edButtons[30]=new b.LinkButton,edButtons[40]=new b.TagButton("block","b-quote","\n\n","
\n\n","","","",{ariaLabel:quicktagsL10n.blockquote,ariaLabelClose:quicktagsL10n.blockquoteClose}),edButtons[50]=new b.TagButton("del","del",'',"","","","",{ariaLabel:quicktagsL10n.del,ariaLabelClose:quicktagsL10n.delClose}),edButtons[60]=new b.TagButton("ins","ins",'',"","","","",{ariaLabel:quicktagsL10n.ins,ariaLabelClose:quicktagsL10n.insClose}),edButtons[70]=new b.ImgButton,edButtons[80]=new b.TagButton("ul","ul","\n","
\n\n","","","",{ariaLabel:quicktagsL10n.ul,ariaLabelClose:quicktagsL10n.ulClose}),edButtons[90]=new b.TagButton("ol","ol","\n","
\n\n","","","",{ariaLabel:quicktagsL10n.ol,ariaLabelClose:quicktagsL10n.olClose}),edButtons[100]=new b.TagButton("li","li","	","
\n","","","",{ariaLabel:quicktagsL10n.li,ariaLabelClose:quicktagsL10n.liClose}),edButtons[110]=new b.TagButton("code","code","","","","","",{ariaLabel:quicktagsL10n.code,ariaLabelClose:quicktagsL10n.codeClose}),edButtons[120]=new b.TagButton("more","more","\n\n","","","","",{ariaLabel:quicktagsL10n.more}),edButtons[140]=new b.CloseButton}();||||||| .r11156
+function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){var a,b=function(a){var c,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(c=b,c.funcs=[],c.ready=function(){if(!c.isReady)for(c.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=j}else edButtons[edButtons.length]=j;this.buttonsInitDone&&this._buttonsInit()}},a.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e,g.focus()):(g.value+=a,g.focus()),!0):!1},a.Button=function(a,b,c,d,e){var f=this;f.id=a,f.display=b,f.access=c,f.title=d||"",f.instance=e||""},a.Button.prototype.html=function(a){var b=this.access?' accesskey="'+this.access+'"':"";return"fullscreen"===this.id?'':''},a.Button.prototype.callback=function(){},a.TagButton=function(b,c,d,e,f,g,h){var i=this;a.Button.call(i,b,c,f,g,h),i.tagStart=d,i.tagEnd=e},a.TagButton.prototype=new a.Button,a.TagButton.prototype.openTag=function(a,b){var c=this;b.openTags||(b.openTags=[]),c.tagEnd&&(b.openTags.push(c.id),a.value="/"+a.value)},a.TagButton.prototype.closeTag=function(a,b){var c=this,d=c.isOpen(b);d!==!1&&b.openTags.splice(d,1),a.value=c.display},a.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?k.text=l.tagEnd?l.tagStart+k.text+n:k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g,b.focus()):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},a.SpellButton=function(){},a.CloseButton=function(){a.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},a.CloseButton.prototype=new a.Button,a._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},a.CloseButton.prototype.callback=a._close,a.closeAllTags=function(b){var c=this.getInstance(b);a._close("",c.canvas,c)},a.LinkButton=function(){a.TagButton.call(this,"link","link","","","a")},a.LinkButton.prototype=new a.TagButton,a.LinkButton.prototype.callback=function(b,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',a.TagButton.prototype.callback.call(g,b,c,d))):a.TagButton.prototype.callback.call(g,b,c,d)))},a.ImgButton=function(){a.TagButton.call(this,"img","img","","","m")},a.ImgButton.prototype=new a.TagButton,a.ImgButton.prototype.callback=function(b,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart='',a.TagButton.prototype.callback.call(this,b,c,d))},a.FullscreenButton=function(){a.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)},a.FullscreenButton.prototype=new a.Button,a.FullscreenButton.prototype.callback=function(a,b){b.id&&"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&wp.editor.fullscreen.on()},a.TextDirectionButton=function(){a.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},a.TextDirectionButton.prototype=new a.Button,a.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new a.TagButton("strong","b","","","b"),edButtons[20]=new a.TagButton("em","i","","","i"),edButtons[30]=new a.LinkButton,edButtons[40]=new a.TagButton("block","b-quote","\n\n","
\n\n","q"),edButtons[50]=new a.TagButton("del","del",'',"","d"),edButtons[60]=new a.TagButton("ins","ins",'',"","s"),edButtons[70]=new a.ImgButton,edButtons[80]=new a.TagButton("ul","ul","\n","
\n\n","u"),edButtons[90]=new a.TagButton("ol","ol","\n","
\n\n","o"),edButtons[100]=new a.TagButton("li","li","	","
\n","l"),edButtons[110]=new a.TagButton("code","code","","","c"),edButtons[120]=new a.TagButton("more","more","\n\n","","t"),edButtons[140]=new a.CloseButton}();=======
+function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){var a,b=function(a){var c,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(c=b,c.funcs=[],c.ready=function(){if(!c.isReady)for(c.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=j}else edButtons[edButtons.length]=j;this.buttonsInitDone&&this._buttonsInit()}},a.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e,g.focus()):(g.value+=a,g.focus()),!0):!1},a.Button=function(a,b,c,d,e){var f=this;f.id=a,f.display=b,f.access="",f.title=d||"",f.instance=e||""},a.Button.prototype.html=function(a){var b,c,d,e=this.title?' title="'+this.title+'"':"",f=(d=window.wp)&&d.editor&&d.editor.dfw;return"fullscreen"===this.id?'":"dfw"===this.id?(b=f&&f.isActive()?"":' disabled="disabled"',c=f&&f.isOn()?" active":"",'"):''},a.Button.prototype.callback=function(){},a.TagButton=function(b,c,d,e,f,g,h){var i=this;a.Button.call(i,b,c,f,g,h),i.tagStart=d,i.tagEnd=e},a.TagButton.prototype=new a.Button,a.TagButton.prototype.openTag=function(a,b){var c=this;b.openTags||(b.openTags=[]),c.tagEnd&&(b.openTags.push(c.id),a.value="/"+a.value)},a.TagButton.prototype.closeTag=function(a,b){var c=this,d=c.isOpen(b);d!==!1&&b.openTags.splice(d,1),a.value=c.display},a.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?k.text=l.tagEnd?l.tagStart+k.text+n:k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g,b.focus()):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},a.SpellButton=function(){},a.CloseButton=function(){a.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},a.CloseButton.prototype=new a.Button,a._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},a.CloseButton.prototype.callback=a._close,a.closeAllTags=function(b){var c=this.getInstance(b);a._close("",c.canvas,c)},a.LinkButton=function(){a.TagButton.call(this,"link","link","","")},a.LinkButton.prototype=new a.TagButton,a.LinkButton.prototype.callback=function(b,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',a.TagButton.prototype.callback.call(g,b,c,d))):a.TagButton.prototype.callback.call(g,b,c,d)))},a.ImgButton=function(){a.TagButton.call(this,"img","img","","")},a.ImgButton.prototype=new a.TagButton,a.ImgButton.prototype.callback=function(b,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart='',a.TagButton.prototype.callback.call(this,b,c,d))},a.FullscreenButton=function(){a.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)},a.FullscreenButton.prototype=new a.Button,a.FullscreenButton.prototype.callback=function(a,b){b.id&&"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&wp.editor.fullscreen.on()},a.DFWButton=function(){a.Button.call(this,"dfw","","f",quicktagsL10n.dfw)},a.DFWButton.prototype=new a.Button,a.DFWButton.prototype.callback=function(){var a;(a=window.wp)&&a.editor&&a.editor.dfw&&window.wp.editor.dfw.toggle()},a.TextDirectionButton=function(){a.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},a.TextDirectionButton.prototype=new a.Button,a.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new a.TagButton("strong","b","",""),edButtons[20]=new a.TagButton("em","i","",""),edButtons[30]=new a.LinkButton,edButtons[40]=new a.TagButton("block","b-quote","\n\n","
\n\n"),edButtons[50]=new a.TagButton("del","del",'',""),edButtons[60]=new a.TagButton("ins","ins",'',""),edButtons[70]=new a.ImgButton,edButtons[80]=new a.TagButton("ul","ul","\n","
\n\n"),edButtons[90]=new a.TagButton("ol","ol","\n","
\n\n"),edButtons[100]=new a.TagButton("li","li","	","
\n"),edButtons[110]=new a.TagButton("code","code","",""),edButtons[120]=new a.TagButton("more","more","\n\n",""),edButtons[140]=new a.CloseButton}();>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/thickbox/thickbox.js b/pavillonmadeleine.fr/wp-includes/js/thickbox/thickbox.js
index 09c8a993..60a9eb77 100644
--- a/pavillonmadeleine.fr/wp-includes/js/thickbox/thickbox.js
+++ b/pavillonmadeleine.fr/wp-includes/js/thickbox/thickbox.js
@@ -231,7 +231,9 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 					jQuery("#TB_load").remove();
 					jQuery("#TB_window").css({'visibility':'visible'});
 				}else{
-					jQuery("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
+					var load_url = url;
+					load_url += -1 === url.indexOf('?') ? '?' : '&';
+					jQuery("#TB_ajaxContent").load(load_url += "random=" + (new Date().getTime()),function(){//to do a post change this load method
 						tb_position();
 						jQuery("#TB_load").remove();
 						tb_init("#TB_ajaxContent a.thickbox");
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.js
index 19f18658..91181b9f 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -381,16 +381,18 @@ tinymce.PluginManager.add('charmap', function(editor) {
 		});
 	}
 
+	editor.addCommand('mceShowCharmap', showDialog);
+
 	editor.addButton('charmap', {
 		icon: 'charmap',
 		tooltip: 'Special character',
-		onclick: showDialog
+		cmd: 'mceShowCharmap'
 	});
 
 	editor.addMenuItem('charmap', {
 		icon: 'charmap',
 		text: 'Special character',
-		onclick: showDialog,
+		cmd: 'mceShowCharmap',
 		context: 'insert'
 	});
 });
\ No newline at end of file
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.min.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
index 3f414ad5..10973903 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
@@ -1 +1,4 @@
-tinymce.PluginManager.add("charmap",function(a){function b(){function b(a){for(;a;){if("TD"==a.nodeName)return a;a=a.parentNode}}var d,e,f,g;d='';var h=25,i=Math.ceil(c.length/h);for(f=0;i>f;f++){for(d+="",e=0;h>e;e++){var j=f*h+e;if(j'+(k?String.fromCharCode(parseInt(k[0],10)):" ")+"
"}else d+=""}d+=""}d+="";var l={type:"container",html:d,onclick:function(c){var d=c.target;/^(TD|DIV)$/.test(d.nodeName)&&b(d).firstChild&&(a.execCommand("mceInsertContent",!1,tinymce.trim(d.innerText||d.textContent)),c.ctrlKey||g.close())},onmouseover:function(a){var c=b(a.target);c&&c.firstChild?(g.find("#preview").text(c.firstChild.firstChild.data),g.find("#previewTitle").text(c.title)):(g.find("#preview").text(" "),g.find("#previewTitle").text(" "))}};g=a.windowManager.open({title:"Special character",spacing:10,padding:10,items:[l,{type:"container",layout:"flex",direction:"column",align:"center",spacing:5,minWidth:160,minHeight:160,items:[{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:140,minHeight:80},{type:"label",name:"previewTitle",text:" ",style:"text-align: center",border:1,minWidth:140,minHeight:80}]}],buttons:[{text:"Close",onclick:function(){g.close()}}]})}var c=[["160","no-break space"],["173","soft hyphen"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"]];a.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:b}),a.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:b,context:"insert"})});
\ No newline at end of file
+<<<<<<< .mine
+tinymce.PluginManager.add("charmap",function(a){function b(){function b(a){for(;a;){if("TD"==a.nodeName)return a;a=a.parentNode}}var d,e,f,g;d='';var h=25,i=Math.ceil(c.length/h);for(f=0;i>f;f++){for(d+="",e=0;h>e;e++){var j=f*h+e;if(j'+(k?String.fromCharCode(parseInt(k[0],10)):" ")+"
"}else d+=""}d+=""}d+="";var l={type:"container",html:d,onclick:function(c){var d=c.target;/^(TD|DIV)$/.test(d.nodeName)&&b(d).firstChild&&(a.execCommand("mceInsertContent",!1,tinymce.trim(d.innerText||d.textContent)),c.ctrlKey||g.close())},onmouseover:function(a){var c=b(a.target);c&&c.firstChild?(g.find("#preview").text(c.firstChild.firstChild.data),g.find("#previewTitle").text(c.title)):(g.find("#preview").text(" "),g.find("#previewTitle").text(" "))}};g=a.windowManager.open({title:"Special character",spacing:10,padding:10,items:[l,{type:"container",layout:"flex",direction:"column",align:"center",spacing:5,minWidth:160,minHeight:160,items:[{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:140,minHeight:80},{type:"label",name:"previewTitle",text:" ",style:"text-align: center",border:1,minWidth:140,minHeight:80}]}],buttons:[{text:"Close",onclick:function(){g.close()}}]})}var c=[["160","no-break space"],["173","soft hyphen"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"]];a.addCommand("mceShowCharmap",b),a.addButton("charmap",{icon:"charmap",tooltip:"Special character",cmd:"mceShowCharmap"}),a.addMenuItem("charmap",{icon:"charmap",text:"Special character",cmd:"mceShowCharmap",context:"insert"})});||||||| .r11156
+tinymce.PluginManager.add("charmap",function(e){function a(){function a(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var t,r,o,n;t='';var l=25;for(o=0;10>o;o++){for(t+="",r=0;l>r;r++){var s=i[o*l+r];t+='"}t+=""}t+="'+(s?String.fromCharCode(parseInt(s[0],10)):" ")+"";var c={type:"container",html:t,onclick:function(a){var i=a.target;"TD"==i.tagName&&(i=i.firstChild),"DIV"==i.tagName&&(e.execCommand("mceInsertContent",!1,i.firstChild.data),a.ctrlKey||n.close())},onmouseover:function(e){var i=a(e.target);i&&n.find("#preview").text(i.firstChild.firstChild.data)}};n=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[c,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){n.close()}}]})}var i=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:a}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:a,context:"insert"})});=======
+tinymce.PluginManager.add("charmap",function(a){function b(){function b(a){for(;a;){if("TD"==a.nodeName)return a;a=a.parentNode}}var d,e,f,g;d='';var h=25,i=Math.ceil(c.length/h);for(f=0;i>f;f++){for(d+="",e=0;h>e;e++){var j=f*h+e;if(j'+(k?String.fromCharCode(parseInt(k[0],10)):" ")+"
"}else d+=""}d+=""}d+="";var l={type:"container",html:d,onclick:function(c){var d=c.target;/^(TD|DIV)$/.test(d.nodeName)&&b(d).firstChild&&(a.execCommand("mceInsertContent",!1,tinymce.trim(d.innerText||d.textContent)),c.ctrlKey||g.close())},onmouseover:function(a){var c=b(a.target);c&&c.firstChild?(g.find("#preview").text(c.firstChild.firstChild.data),g.find("#previewTitle").text(c.title)):(g.find("#preview").text(" "),g.find("#previewTitle").text(" "))}};g=a.windowManager.open({title:"Special character",spacing:10,padding:10,items:[l,{type:"container",layout:"flex",direction:"column",align:"center",spacing:5,minWidth:160,minHeight:160,items:[{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:140,minHeight:80},{type:"label",name:"previewTitle",text:" ",style:"text-align: center",border:1,minWidth:140,minHeight:80}]}],buttons:[{text:"Close",onclick:function(){g.close()}}]})}var c=[["160","no-break space"],["173","soft hyphen"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"]];a.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:b}),a.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:b,context:"insert"})});>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/colorpicker/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/colorpicker/plugin.js
index 11d0af3b..e82daa3b 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/colorpicker/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/colorpicker/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
index 2b8cb13b..4d1f29ff 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
@@ -1,4 +1,4 @@
-@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=latin-ext,latin);
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=latin-ext,latin");
 
 /* Generic */
 body {
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/plugin.js
index cc6e3229..e9957e0a 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/compat3x/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -278,7 +278,7 @@
 	tinymce.addI18n = function(prefix, o) {
 		var I18n = tinymce.util.I18n, each = tinymce.each;
 
-		if (typeof(prefix) == "string" && prefix.indexOf('.') === -1) {
+		if (typeof prefix == "string" && prefix.indexOf('.') === -1) {
 			I18n.add(prefix, o);
 			return;
 		}
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/directionality/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/directionality/plugin.js
index 3fd0dabc..59257339 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/directionality/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/directionality/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/fullscreen/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/fullscreen/plugin.js
index 2a3cf20e..ad379382 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/fullscreen/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/fullscreen/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/hr/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/hr/plugin.js
index 915a563c..29372f6f 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/hr/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/hr/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.js
index 8d755a56..f7d5a2bf 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -23,7 +23,7 @@ tinymce.PluginManager.add('image', function(editor) {
 		}
 
 		img.onload = function() {
-			done(img.clientWidth, img.clientHeight);
+			done(Math.max(img.width, img.clientWidth), Math.max(img.height, img.clientHeight));
 		};
 
 		img.onerror = function() {
@@ -308,6 +308,7 @@ tinymce.PluginManager.add('image', function(editor) {
 					win.find('#src').value(e.control.value()).fire('change');
 				},
 				onPostRender: function() {
+					/*eslint consistent-this: 0*/
 					imageListCtrl = this;
 				}
 			};
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.min.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.min.js
index afcbb224..08a06660 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.min.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/image/plugin.min.js
@@ -1 +1,4 @@
-tinymce.PluginManager.add("image",function(a){function b(a,b){function c(a,c){d.parentNode&&d.parentNode.removeChild(d),b({width:a,height:c})}var d=document.createElement("img");d.onload=function(){c(d.clientWidth,d.clientHeight)},d.onerror=function(){c()};var e=d.style;e.visibility="hidden",e.position="fixed",e.bottom=e.left=0,e.width=e.height="auto",document.body.appendChild(d),d.src=a}function c(a,b,c){function d(a,c){return c=c||[],tinymce.each(a,function(a){var e={text:a.text||a.title};a.menu?e.menu=d(a.menu):(e.value=a.value,b(e)),c.push(e)}),c}return d(a,c||[])}function d(b){return function(){var c=a.settings.image_list;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):"function"==typeof c?c(b):b(c)}}function e(d){function e(){var a,b,c,d;a=l.find("#width")[0],b=l.find("#height")[0],a&&b&&(c=a.value(),d=b.value(),l.find("#constrain")[0].checked()&&m&&n&&c&&d&&(m!=c?(d=Math.round(c/m*d),isNaN(d)||b.value(d)):(c=Math.round(d/n*c),isNaN(c)||a.value(c))),m=c,n=d)}function f(){function b(b){function c(){b.onload=b.onerror=null,a.selection&&(a.selection.select(b),a.nodeChanged())}b.onload=function(){q.width||q.height||!t||(r.setAttribs(b,{width:b.clientWidth,height:b.clientHeight}),a.fire("wpNewImageRefresh",{node:b})),c()},b.onerror=c}j(),e(),q=tinymce.extend(q,l.toJSON());var c=q.caption;q.alt||(q.alt=""),q.title||(q.title=""),""===q.width&&(q.width=null),""===q.height&&(q.height=null),q.style||(q.style=null),q={src:q.src,alt:q.alt,title:q.title,width:q.width,height:q.height,style:q.style,"class":q["class"]},a.undoManager.transact(function(){var d={node:s,data:q,caption:c};return a.fire("wpImageFormSubmit",{imgData:d}),d.cancel?void b(d.node):q.src?(""===q.title&&(q.title=null),s?r.setAttribs(s,q):(q.id="__mcenew",a.focus(),a.selection.setContent(r.createHTML("img",q)),s=r.get("__mcenew"),r.setAttrib(s,"id",null)),void b(s)):void(s&&(r.remove(s),a.focus(),a.nodeChanged()))})}function g(a){return a&&(a=a.replace(/px$/,"")),a}function h(c){var d,e,f,g=c.meta||{};o&&o.value(a.convertURL(this.value(),"src")),tinymce.each(g,function(a,b){l.find("#"+b).value(a)}),g.width||g.height||(d=a.convertURL(this.value(),"src"),e=a.settings.image_prepend_url,f=new RegExp("^(?:[a-z]+:)?//","i"),e&&!f.test(d)&&d.substring(0,e.length)!==e&&(d=e+d),this.value(d),b(a.documentBaseURI.toAbsolute(this.value()),function(a){a.width&&a.height&&t&&(m=a.width,n=a.height,l.find("#width").value(m),l.find("#height").value(n))}))}function i(a){if(a.margin){var b=a.margin.split(" ");switch(b.length){case 1:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[0],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[0];break;case 2:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[1];break;case 3:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[1];break;case 4:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[3]}delete a.margin}return a}function j(){function b(a){return a.length>0&&/^[0-9]+$/.test(a)&&(a+="px"),a}if(a.settings.image_advtab){var c=l.toJSON(),d=r.parseStyle(c.style);d=i(d),c.vspace&&(d["margin-top"]=d["margin-bottom"]=b(c.vspace)),c.hspace&&(d["margin-left"]=d["margin-right"]=b(c.hspace)),c.border&&(d["border-width"]=b(c.border)),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(d))))}}function k(){if(a.settings.image_advtab){var b=l.toJSON(),c=r.parseStyle(b.style);l.find("#vspace").value(""),l.find("#hspace").value(""),c=i(c),(c["margin-top"]&&c["margin-bottom"]||c["margin-right"]&&c["margin-left"])&&(l.find("#vspace").value(c["margin-top"]===c["margin-bottom"]?g(c["margin-top"]):""),l.find("#hspace").value(c["margin-right"]===c["margin-left"]?g(c["margin-right"]):"")),c["border-width"]&&l.find("#border").value(g(c["border-width"])),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(c))))}}var l,m,n,o,p,q={},r=a.dom,s=a.selection.getNode(),t=a.settings.image_dimensions!==!1;m=r.getAttrib(s,"width"),n=r.getAttrib(s,"height"),"IMG"!=s.nodeName||s.getAttribute("data-mce-object")||s.getAttribute("data-mce-placeholder")?s=null:(q={src:r.getAttrib(s,"src"),alt:r.getAttrib(s,"alt"),title:r.getAttrib(s,"title"),"class":r.getAttrib(s,"class"),width:m,height:n},a.fire("wpLoadImageData",{imgData:{data:q,node:s}})),d&&(o={type:"listbox",label:"Image list",values:c(d,function(b){b.value=a.convertURL(b.value||b.url,"src")},[{text:"None",value:""}]),value:q.src&&a.convertURL(q.src,"src"),onselect:function(a){var b=l.find("#alt");(!b.value()||a.lastControl&&b.value()==a.lastControl.text())&&b.value(a.control.text()),l.find("#src").value(a.control.value()).fire("change")},onPostRender:function(){o=this}}),a.settings.image_class_list&&(p={name:"class",type:"listbox",label:"Class",values:c(a.settings.image_class_list,function(b){b.value&&(b.textStyle=function(){return a.formatter.getCssText({inline:"img",classes:[b.value]})})})});var u=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:h},o];a.settings.image_description!==!1&&u.push({name:"alt",type:"textbox",label:"Image description"}),a.settings.image_title&&u.push({name:"title",type:"textbox",label:"Image Title"}),t&&u.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),u.push(p),a.fire("wpLoadImageForm",{data:u}),a.settings.image_advtab?(s&&(s.style.marginLeft&&s.style.marginRight&&s.style.marginLeft===s.style.marginRight&&(q.hspace=g(s.style.marginLeft)),s.style.marginTop&&s.style.marginBottom&&s.style.marginTop===s.style.marginBottom&&(q.vspace=g(s.style.marginTop)),s.style.borderWidth&&(q.border=g(s.style.borderWidth)),q.style=a.dom.serializeStyle(a.dom.parseStyle(a.dom.getAttrib(s,"style")))),l=a.windowManager.open({title:"Insert/edit image",data:q,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:k},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:j},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:f})):l=a.windowManager.open({title:"Insert/edit image",data:q,body:u,onSubmit:f})}a.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:d(e),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),a.addMenuItem("image",{icon:"image",text:"Insert/edit image",onclick:d(e),context:"insert",prependToContext:!0}),a.addCommand("mceImage",d(e))});
\ No newline at end of file
+<<<<<<< .mine
+tinymce.PluginManager.add("image",function(a){function b(a,b){function c(a,c){d.parentNode&&d.parentNode.removeChild(d),b({width:a,height:c})}var d=document.createElement("img");d.onload=function(){c(Math.max(d.width,d.clientWidth),Math.max(d.height,d.clientHeight))},d.onerror=function(){c()};var e=d.style;e.visibility="hidden",e.position="fixed",e.bottom=e.left=0,e.width=e.height="auto",document.body.appendChild(d),d.src=a}function c(a,b,c){function d(a,c){return c=c||[],tinymce.each(a,function(a){var e={text:a.text||a.title};a.menu?e.menu=d(a.menu):(e.value=a.value,b(e)),c.push(e)}),c}return d(a,c||[])}function d(b){return function(){var c=a.settings.image_list;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):"function"==typeof c?c(b):b(c)}}function e(d){function e(){var a,b,c,d;a=l.find("#width")[0],b=l.find("#height")[0],a&&b&&(c=a.value(),d=b.value(),l.find("#constrain")[0].checked()&&m&&n&&c&&d&&(m!=c?(d=Math.round(c/m*d),isNaN(d)||b.value(d)):(c=Math.round(d/n*c),isNaN(c)||a.value(c))),m=c,n=d)}function f(){function b(b){function c(){b.onload=b.onerror=null,a.selection&&(a.selection.select(b),a.nodeChanged())}b.onload=function(){q.width||q.height||!t||(r.setAttribs(b,{width:b.clientWidth,height:b.clientHeight}),a.fire("wpNewImageRefresh",{node:b})),c()},b.onerror=c}j(),e(),q=tinymce.extend(q,l.toJSON());var c=q.caption;q.alt||(q.alt=""),q.title||(q.title=""),""===q.width&&(q.width=null),""===q.height&&(q.height=null),q.style||(q.style=null),q={src:q.src,alt:q.alt,title:q.title,width:q.width,height:q.height,style:q.style,"class":q["class"]},a.undoManager.transact(function(){var d={node:s,data:q,caption:c};return a.fire("wpImageFormSubmit",{imgData:d}),d.cancel?void b(d.node):q.src?(""===q.title&&(q.title=null),s?r.setAttribs(s,q):(q.id="__mcenew",a.focus(),a.selection.setContent(r.createHTML("img",q)),s=r.get("__mcenew"),r.setAttrib(s,"id",null)),void b(s)):void(s&&(r.remove(s),a.focus(),a.nodeChanged()))})}function g(a){return a&&(a=a.replace(/px$/,"")),a}function h(c){var d,e,f,g=c.meta||{};o&&o.value(a.convertURL(this.value(),"src")),tinymce.each(g,function(a,b){l.find("#"+b).value(a)}),g.width||g.height||(d=a.convertURL(this.value(),"src"),e=a.settings.image_prepend_url,f=new RegExp("^(?:[a-z]+:)?//","i"),e&&!f.test(d)&&d.substring(0,e.length)!==e&&(d=e+d),this.value(d),b(a.documentBaseURI.toAbsolute(this.value()),function(a){a.width&&a.height&&t&&(m=a.width,n=a.height,l.find("#width").value(m),l.find("#height").value(n))}))}function i(a){if(a.margin){var b=a.margin.split(" ");switch(b.length){case 1:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[0],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[0];break;case 2:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[1];break;case 3:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[1];break;case 4:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[3]}delete a.margin}return a}function j(){function b(a){return a.length>0&&/^[0-9]+$/.test(a)&&(a+="px"),a}if(a.settings.image_advtab){var c=l.toJSON(),d=r.parseStyle(c.style);d=i(d),c.vspace&&(d["margin-top"]=d["margin-bottom"]=b(c.vspace)),c.hspace&&(d["margin-left"]=d["margin-right"]=b(c.hspace)),c.border&&(d["border-width"]=b(c.border)),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(d))))}}function k(){if(a.settings.image_advtab){var b=l.toJSON(),c=r.parseStyle(b.style);l.find("#vspace").value(""),l.find("#hspace").value(""),c=i(c),(c["margin-top"]&&c["margin-bottom"]||c["margin-right"]&&c["margin-left"])&&(l.find("#vspace").value(c["margin-top"]===c["margin-bottom"]?g(c["margin-top"]):""),l.find("#hspace").value(c["margin-right"]===c["margin-left"]?g(c["margin-right"]):"")),c["border-width"]&&l.find("#border").value(g(c["border-width"])),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(c))))}}var l,m,n,o,p,q={},r=a.dom,s=a.selection.getNode(),t=a.settings.image_dimensions!==!1;m=r.getAttrib(s,"width"),n=r.getAttrib(s,"height"),"IMG"!=s.nodeName||s.getAttribute("data-mce-object")||s.getAttribute("data-mce-placeholder")?s=null:(q={src:r.getAttrib(s,"src"),alt:r.getAttrib(s,"alt"),title:r.getAttrib(s,"title"),"class":r.getAttrib(s,"class"),width:m,height:n},a.fire("wpLoadImageData",{imgData:{data:q,node:s}})),d&&(o={type:"listbox",label:"Image list",values:c(d,function(b){b.value=a.convertURL(b.value||b.url,"src")},[{text:"None",value:""}]),value:q.src&&a.convertURL(q.src,"src"),onselect:function(a){var b=l.find("#alt");(!b.value()||a.lastControl&&b.value()==a.lastControl.text())&&b.value(a.control.text()),l.find("#src").value(a.control.value()).fire("change")},onPostRender:function(){o=this}}),a.settings.image_class_list&&(p={name:"class",type:"listbox",label:"Class",values:c(a.settings.image_class_list,function(b){b.value&&(b.textStyle=function(){return a.formatter.getCssText({inline:"img",classes:[b.value]})})})});var u=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:h},o];a.settings.image_description!==!1&&u.push({name:"alt",type:"textbox",label:"Image description"}),a.settings.image_title&&u.push({name:"title",type:"textbox",label:"Image Title"}),t&&u.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),u.push(p),a.fire("wpLoadImageForm",{data:u}),a.settings.image_advtab?(s&&(s.style.marginLeft&&s.style.marginRight&&s.style.marginLeft===s.style.marginRight&&(q.hspace=g(s.style.marginLeft)),s.style.marginTop&&s.style.marginBottom&&s.style.marginTop===s.style.marginBottom&&(q.vspace=g(s.style.marginTop)),s.style.borderWidth&&(q.border=g(s.style.borderWidth)),q.style=a.dom.serializeStyle(a.dom.parseStyle(a.dom.getAttrib(s,"style")))),l=a.windowManager.open({title:"Insert/edit image",data:q,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:k},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:j},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:f})):l=a.windowManager.open({title:"Insert/edit image",data:q,body:u,onSubmit:f})}a.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:d(e),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),a.addMenuItem("image",{icon:"image",text:"Insert/edit image",onclick:d(e),context:"insert",prependToContext:!0}),a.addCommand("mceImage",d(e))});||||||| .r11156
+tinymce.PluginManager.add("image",function(a){function b(a,b){function c(a,c){d.parentNode&&d.parentNode.removeChild(d),b({width:a,height:c})}var d=document.createElement("img");d.onload=function(){c(d.clientWidth,d.clientHeight)},d.onerror=function(){c()};var e=d.style;e.visibility="hidden",e.position="fixed",e.bottom=e.left=0,e.width=e.height="auto",document.body.appendChild(d),d.src=a}function c(a,b,c){function d(a,c){return c=c||[],tinymce.each(a,function(a){var e={text:a.text||a.title};a.menu?e.menu=d(a.menu):(e.value=a.value,b(e)),c.push(e)}),c}return d(a,c||[])}function d(b){return function(){var c=a.settings.image_list;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):"function"==typeof c?c(b):b(c)}}function e(d){function e(){var a,b,c,d;a=j.find("#width")[0],b=j.find("#height")[0],a&&b&&(c=a.value(),d=b.value(),j.find("#constrain")[0].checked()&&k&&l&&c&&d&&(k!=c?(d=Math.round(c/k*d),b.value(d)):(c=Math.round(d/l*c),a.value(c))),k=c,l=d)}function f(){function b(b){function c(){b.onload=b.onerror=null,a.selection&&(a.selection.select(b),a.nodeChanged())}b.onload=function(){o.width||o.height||!r||(p.setAttribs(b,{width:b.clientWidth,height:b.clientHeight}),a.fire("wpNewImageRefresh",{node:b})),c()},b.onerror=c}i(),e(),o=tinymce.extend(o,j.toJSON());var c=o.caption;o.alt||(o.alt=""),""===o.width&&(o.width=null),""===o.height&&(o.height=null),o.style||(o.style=null),o={src:o.src,alt:o.alt,width:o.width,height:o.height,style:o.style,"class":o["class"]},a.undoManager.transact(function(){var d={node:q,data:o,caption:c};return a.fire("wpImageFormSubmit",{imgData:d}),d.cancel?void b(d.node):o.src?(q?p.setAttribs(q,o):(o.id="__mcenew",a.focus(),a.selection.setContent(p.createHTML("img",o)),q=p.get("__mcenew"),p.setAttrib(q,"id",null)),void b(q)):void(q&&(p.remove(q),a.focus(),a.nodeChanged()))})}function g(a){return a&&(a=a.replace(/px$/,"")),a}function h(c){var d=c.meta||{};m&&m.value(a.convertURL(this.value(),"src")),tinymce.each(d,function(a,b){j.find("#"+b).value(a)}),d.width||d.height||b(this.value(),function(a){a.width&&a.height&&r&&(k=a.width,l=a.height,j.find("#width").value(k),j.find("#height").value(l))})}function i(){function b(a){return a.length>0&&/^[0-9]+$/.test(a)&&(a+="px"),a}if(a.settings.image_advtab){var c=j.toJSON(),d=p.parseStyle(c.style);delete d.margin,d["margin-top"]=d["margin-bottom"]=b(c.vspace),d["margin-left"]=d["margin-right"]=b(c.hspace),d["border-width"]=b(c.border),j.find("#style").value(p.serializeStyle(p.parseStyle(p.serializeStyle(d))))}}var j,k,l,m,n,o={},p=a.dom,q=a.selection.getNode(),r=a.settings.image_dimensions!==!1;k=p.getAttrib(q,"width"),l=p.getAttrib(q,"height"),"IMG"!=q.nodeName||q.getAttribute("data-mce-object")||q.getAttribute("data-mce-placeholder")?q=null:(o={src:p.getAttrib(q,"src"),alt:p.getAttrib(q,"alt"),"class":p.getAttrib(q,"class"),width:k,height:l},a.fire("wpLoadImageData",{imgData:{data:o,node:q}})),d&&(m={type:"listbox",label:"Image list",values:c(d,function(b){b.value=a.convertURL(b.value||b.url,"src")},[{text:"None",value:""}]),value:o.src&&a.convertURL(o.src,"src"),onselect:function(a){var b=j.find("#alt");(!b.value()||a.lastControl&&b.value()==a.lastControl.text())&&b.value(a.control.text()),j.find("#src").value(a.control.value()).fire("change")},onPostRender:function(){m=this}}),a.settings.image_class_list&&(n={name:"class",type:"listbox",label:"Class",values:c(a.settings.image_class_list,function(b){b.value&&(b.textStyle=function(){return a.formatter.getCssText({inline:"img",classes:[b.value]})})})});var s=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:h},m];a.settings.image_description!==!1&&s.push({name:"alt",type:"textbox",label:"Image description"}),r&&s.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),s.push(n),a.fire("wpLoadImageForm",{data:s}),a.settings.image_advtab?(q&&(o.hspace=g(q.style.marginLeft||q.style.marginRight),o.vspace=g(q.style.marginTop||q.style.marginBottom),o.border=g(q.style.borderWidth),o.style=a.dom.serializeStyle(a.dom.parseStyle(a.dom.getAttrib(q,"style")))),j=a.windowManager.open({title:"Insert/edit image",data:o,bodyType:"tabpanel",body:[{title:"General",type:"form",items:s},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:i},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:f})):j=a.windowManager.open({title:"Insert/edit image",data:o,body:s,onSubmit:f})}a.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:d(e),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),a.addMenuItem("image",{icon:"image",text:"Insert image",onclick:d(e),context:"insert",prependToContext:!0}),a.addCommand("mceImage",d(e))});=======
+tinymce.PluginManager.add("image",function(a){function b(a,b){function c(a,c){d.parentNode&&d.parentNode.removeChild(d),b({width:a,height:c})}var d=document.createElement("img");d.onload=function(){c(d.clientWidth,d.clientHeight)},d.onerror=function(){c()};var e=d.style;e.visibility="hidden",e.position="fixed",e.bottom=e.left=0,e.width=e.height="auto",document.body.appendChild(d),d.src=a}function c(a,b,c){function d(a,c){return c=c||[],tinymce.each(a,function(a){var e={text:a.text||a.title};a.menu?e.menu=d(a.menu):(e.value=a.value,b(e)),c.push(e)}),c}return d(a,c||[])}function d(b){return function(){var c=a.settings.image_list;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):"function"==typeof c?c(b):b(c)}}function e(d){function e(){var a,b,c,d;a=l.find("#width")[0],b=l.find("#height")[0],a&&b&&(c=a.value(),d=b.value(),l.find("#constrain")[0].checked()&&m&&n&&c&&d&&(m!=c?(d=Math.round(c/m*d),isNaN(d)||b.value(d)):(c=Math.round(d/n*c),isNaN(c)||a.value(c))),m=c,n=d)}function f(){function b(b){function c(){b.onload=b.onerror=null,a.selection&&(a.selection.select(b),a.nodeChanged())}b.onload=function(){q.width||q.height||!t||(r.setAttribs(b,{width:b.clientWidth,height:b.clientHeight}),a.fire("wpNewImageRefresh",{node:b})),c()},b.onerror=c}j(),e(),q=tinymce.extend(q,l.toJSON());var c=q.caption;q.alt||(q.alt=""),q.title||(q.title=""),""===q.width&&(q.width=null),""===q.height&&(q.height=null),q.style||(q.style=null),q={src:q.src,alt:q.alt,title:q.title,width:q.width,height:q.height,style:q.style,"class":q["class"]},a.undoManager.transact(function(){var d={node:s,data:q,caption:c};return a.fire("wpImageFormSubmit",{imgData:d}),d.cancel?void b(d.node):q.src?(""===q.title&&(q.title=null),s?r.setAttribs(s,q):(q.id="__mcenew",a.focus(),a.selection.setContent(r.createHTML("img",q)),s=r.get("__mcenew"),r.setAttrib(s,"id",null)),void b(s)):void(s&&(r.remove(s),a.focus(),a.nodeChanged()))})}function g(a){return a&&(a=a.replace(/px$/,"")),a}function h(c){var d,e,f,g=c.meta||{};o&&o.value(a.convertURL(this.value(),"src")),tinymce.each(g,function(a,b){l.find("#"+b).value(a)}),g.width||g.height||(d=a.convertURL(this.value(),"src"),e=a.settings.image_prepend_url,f=new RegExp("^(?:[a-z]+:)?//","i"),e&&!f.test(d)&&d.substring(0,e.length)!==e&&(d=e+d),this.value(d),b(a.documentBaseURI.toAbsolute(this.value()),function(a){a.width&&a.height&&t&&(m=a.width,n=a.height,l.find("#width").value(m),l.find("#height").value(n))}))}function i(a){if(a.margin){var b=a.margin.split(" ");switch(b.length){case 1:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[0],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[0];break;case 2:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[0],a["margin-left"]=a["margin-left"]||b[1];break;case 3:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[1];break;case 4:a["margin-top"]=a["margin-top"]||b[0],a["margin-right"]=a["margin-right"]||b[1],a["margin-bottom"]=a["margin-bottom"]||b[2],a["margin-left"]=a["margin-left"]||b[3]}delete a.margin}return a}function j(){function b(a){return a.length>0&&/^[0-9]+$/.test(a)&&(a+="px"),a}if(a.settings.image_advtab){var c=l.toJSON(),d=r.parseStyle(c.style);d=i(d),c.vspace&&(d["margin-top"]=d["margin-bottom"]=b(c.vspace)),c.hspace&&(d["margin-left"]=d["margin-right"]=b(c.hspace)),c.border&&(d["border-width"]=b(c.border)),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(d))))}}function k(){if(a.settings.image_advtab){var b=l.toJSON(),c=r.parseStyle(b.style);l.find("#vspace").value(""),l.find("#hspace").value(""),c=i(c),(c["margin-top"]&&c["margin-bottom"]||c["margin-right"]&&c["margin-left"])&&(l.find("#vspace").value(c["margin-top"]===c["margin-bottom"]?g(c["margin-top"]):""),l.find("#hspace").value(c["margin-right"]===c["margin-left"]?g(c["margin-right"]):"")),c["border-width"]&&l.find("#border").value(g(c["border-width"])),l.find("#style").value(r.serializeStyle(r.parseStyle(r.serializeStyle(c))))}}var l,m,n,o,p,q={},r=a.dom,s=a.selection.getNode(),t=a.settings.image_dimensions!==!1;m=r.getAttrib(s,"width"),n=r.getAttrib(s,"height"),"IMG"!=s.nodeName||s.getAttribute("data-mce-object")||s.getAttribute("data-mce-placeholder")?s=null:(q={src:r.getAttrib(s,"src"),alt:r.getAttrib(s,"alt"),title:r.getAttrib(s,"title"),"class":r.getAttrib(s,"class"),width:m,height:n},a.fire("wpLoadImageData",{imgData:{data:q,node:s}})),d&&(o={type:"listbox",label:"Image list",values:c(d,function(b){b.value=a.convertURL(b.value||b.url,"src")},[{text:"None",value:""}]),value:q.src&&a.convertURL(q.src,"src"),onselect:function(a){var b=l.find("#alt");(!b.value()||a.lastControl&&b.value()==a.lastControl.text())&&b.value(a.control.text()),l.find("#src").value(a.control.value()).fire("change")},onPostRender:function(){o=this}}),a.settings.image_class_list&&(p={name:"class",type:"listbox",label:"Class",values:c(a.settings.image_class_list,function(b){b.value&&(b.textStyle=function(){return a.formatter.getCssText({inline:"img",classes:[b.value]})})})});var u=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:h},o];a.settings.image_description!==!1&&u.push({name:"alt",type:"textbox",label:"Image description"}),a.settings.image_title&&u.push({name:"title",type:"textbox",label:"Image Title"}),t&&u.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),u.push(p),a.fire("wpLoadImageForm",{data:u}),a.settings.image_advtab?(s&&(s.style.marginLeft&&s.style.marginRight&&s.style.marginLeft===s.style.marginRight&&(q.hspace=g(s.style.marginLeft)),s.style.marginTop&&s.style.marginBottom&&s.style.marginTop===s.style.marginBottom&&(q.vspace=g(s.style.marginTop)),s.style.borderWidth&&(q.border=g(s.style.borderWidth)),q.style=a.dom.serializeStyle(a.dom.parseStyle(a.dom.getAttrib(s,"style")))),l=a.windowManager.open({title:"Insert/edit image",data:q,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:k},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:j},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:f})):l=a.windowManager.open({title:"Insert/edit image",data:q,body:u,onSubmit:f})}a.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:d(e),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),a.addMenuItem("image",{icon:"image",text:"Insert/edit image",onclick:d(e),context:"insert",prependToContext:!0}),a.addCommand("mceImage",d(e))});>>>>>>> .r12027
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/lists/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/lists/plugin.js
index a13c8ec5..e476abcd 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/lists/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/lists/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -350,23 +350,21 @@ tinymce.PluginManager.add('lists', function(editor) {
 				}
 
 				return true;
-			} else {
-				if (ulParent.nodeName == 'LI') {
-					ul = ulParent;
-					newBlock = createNewTextBlock(li, 'LI');
-				} else if (isListNode(ulParent)) {
-					newBlock = createNewTextBlock(li, 'LI');
-				} else {
-					newBlock = createNewTextBlock(li);
-				}
-
-				splitList(ul, li, newBlock);
-				normalizeList(ul.parentNode);
+			}
 
-				return true;
+			if (ulParent.nodeName == 'LI') {
+				ul = ulParent;
+				newBlock = createNewTextBlock(li, 'LI');
+			} else if (isListNode(ulParent)) {
+				newBlock = createNewTextBlock(li, 'LI');
+			} else {
+				newBlock = createNewTextBlock(li);
 			}
 
-			return false;
+			splitList(ul, li, newBlock);
+			normalizeList(ul.parentNode);
+
+			return true;
 		}
 
 		function indent(li) {
diff --git a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/media/plugin.js b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/media/plugin.js
index 4507e6bf..a3532093 100644
--- a/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/media/plugin.js
+++ b/pavillonmadeleine.fr/wp-includes/js/tinymce/plugins/media/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -14,11 +14,11 @@
 
 tinymce.PluginManager.add('media', function(editor, url) {
 	var urlPatterns = [
-		{regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1'},
-		{regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2'},
-		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'},
-		{regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0"},
-		{regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"'}
+		{regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1', allowFullscreen: true},
+		{regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2', allowFullscreen: true},
+		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc', allowfullscreen: true},
+		{regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0", allowfullscreen: true},
+		{regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"', allowFullscreen: false}
 	];
 
 	var embedChange = (tinymce.Env.ie && tinymce.Env.ie <= 8) ? 'onChange' : 'onInput';
@@ -175,7 +175,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 
 				{
 					title: 'Embed',
-					type: "panel",
+					type: "container",
 					layout: 'flex',
 					direction: 'column',
 					align: 'stretch',
@@ -265,6 +265,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 
 				data.source1 = url;
 				data.type = pattern.type;
+				data.allowFullscreen = pattern.allowFullscreen;
 				data.width = data.width || pattern.w;
 				data.height = data.height || pattern.h;
 			}
@@ -288,7 +289,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
 			});
 
 			if (data.type == "iframe") {
-				html += '';
+				var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
+				html += '';
 			} else if (data.source1mime == "application/x-shockwave-flash") {
 				html += '

+ +	+ checkbox( 'forcerewritetitle', __( 'Enable force rewrite titles', 'wordpress-seo' ) ); + /* translators: %1$s expands to Yoast SEO */ + echo ' ', sprintf( __( '%1$s has auto-detected whether it needs to force rewrite the titles for your pages, if you think it\'s wrong and you know what you\'re doing, you can change the setting here.', 'wordpress-seo' ), 'Yoast SEO' ) . ' '; + ?> +
+ +	+ radio( 'separator', WPSEO_Option_Titles::get_instance()->get_separator_options(), '' ); + echo ' ', __( 'Choose the symbol to use as your title separator. This will display, for instance, between your post title and site name.', 'wordpress-seo' ), ' ', __( 'Symbols are shown in the size they\'ll appear in in search results.', 'wordpress-seo' ), ' '; + ?> +

+ + Version 4.3.1 +

First Things First

Installation: Famous 5-minute install

Updating

Using the Automatic Updater

Updating Manually

Migrating from other systems

System Requirements

Recommendations

Online Resources

Final Notes

Share the Love

License

- - - - - - - -

+ + + +

' . $title . "

' . esc_html( $title ) . "

+ + + + +

' . $this->options['title'] . '

' . $this->options['title'] . '

' . $this->upgrader->strings['skin_before_update_header'] . '

' . __( 'Updating translations for %1$s (%2$s)…' ) . '

$type", $comment_post_link." ".$comment_link ); ?>

' . __( 'Configuration Error' ) . '

' . __( 'Configuration Error' ) . '

+======= + + +>>>>>>> .r12027 - - +

+>>>>>>> .r12027 - -

+

- ' . __('Search results for “%s”') . '', get_search_query() ); ?> -

+

- + - + +<<<<<<< .mine +

-

+

- + - + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> -

+%2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'widgets' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } +?> +

} ?>

Can’t select database

Can’t select database

Impossible de choisir la base de donnÃ©es

Can’t select database

Impossible de choisir la base de donnÃ©es

Error establishing a database connection

Erreur de connexion Ã la base de donnÃ©es

Error establishing a database connection

Erreur de connexion Ã la base de donnÃ©es

get_title() ); ?>

" + heading + "

Cache Exclusions

Cache Exclusions

Wordfence Cron Viewer

Wordfence Live Activity:

License

Basic Options

Advanced Options:

Alerts

Email Summary

Live Traffic View

Scans to include

Firewall Rules

Login Security Options

Other Options

Exporting and Importing Wordfence Settings

Current list of ranges and patterns you've blocked

New Issues

Ignored Issues

Please wait 3 minutes and try again

Your request was received

+ Top 10 IP's Blocked +

Top 10 Countries Blocked

Top 10 Failed Logins

Recently Modified Files

Updates Needed

Core

Plugins

Themes

Top 10 IP's Blocked

Top 10 Countries Blocked

Top 10 Failed Logins

Recently Modified Files

Updates Needed

+ +
Version 4.3.1 +

+======= +
+
+>>>>>>> .r12027 - -
+